minor cleanup

[p5sagit/p5-mst-13.2.git] / win32 / dl_win32.xs

diff --git a/win32/dl_win32.xs b/win32/dl_win32.xs
index f25a30f..c650acf 100644 (file)
--- a/win32/dl_win32.xs
+++ b/win32/dl_win32.xs
@@ -26,6 +26,7 @@ calls.
 
 #include "EXTERN.h"
 #include "perl.h"
+#include "win32.h"
 
 #ifdef PERL_OBJECT
 #define NO_XSLOCKS
@@ -33,32 +34,67 @@ calls.
 
 #include "XSUB.h"
 
+static SV *error_sv;
+
+static char *
+OS_Error_String(CPERLarg)
+{
+ DWORD err = GetLastError();
+ STRLEN len;
+ if (!error_sv)
+  error_sv = newSVpv("",0);
+ win32_str_os_error(error_sv,err);
+ return SvPV(error_sv,len);
+}
+
 #include "dlutils.c"   /* SaveError() etc      */
 
 static void
 dl_private_init(CPERLarg)
 {
-    (void)dl_generic_private_init(THIS);
+    (void)dl_generic_private_init(PERL_OBJECT_THIS);
 }
 
-#ifdef PERL_OBJECT
-#define dl_static_linked(x) 0
-#else
+/* 
+    This function assumes the list staticlinkmodules
+    will be formed from package names with '::' replaced
+    with '/'. Thus Win32::OLE is in the list as Win32/OLE
+*/
 static int
 dl_static_linked(char *filename)
 {
     char **p;
+    char* ptr;
+    static char subStr[] = "/auto/";
+    char szBuffer[MAX_PATH];
+
+    /* change all the '\\' to '/' */
+    strcpy(szBuffer, filename);
+    for(ptr = szBuffer; ptr = strchr(ptr, '\\'); ++ptr)
+       *ptr = '/';
+
+    /* delete the file name */
+    ptr = strrchr(szBuffer, '/');
+    if(ptr != NULL)
+       *ptr = '\0';
+
+    /* remove leading lib path */
+    ptr = strstr(szBuffer, subStr);
+    if(ptr != NULL)
+       ptr += sizeof(subStr)-1;
+    else
+       ptr = szBuffer;
+
     for (p = staticlinkmodules; *p;p++) {
-       if (strstr(filename, *p)) return 1;
+       if (strstr(ptr, *p)) return 1;
     };
     return 0;
 }
-#endif
 
 MODULE = DynaLoader    PACKAGE = DynaLoader
 
 BOOT:
-    (void)dl_private_init();
+    (void)dl_private_init(PERL_OBJECT_THIS);
 
 void *
 dl_load_file(filename,flags=0)
@@ -74,7 +110,8 @@ dl_load_file(filename,flags=0)
     DLDEBUG(2,PerlIO_printf(PerlIO_stderr()," libref=%x\n", RETVAL));
     ST(0) = sv_newmortal() ;
     if (RETVAL == NULL)
-       SaveError("%d",GetLastError()) ;
+       SaveError(PERL_OBJECT_THIS_ "load_file:%s",
+                 OS_Error_String(PERL_OBJECT_THIS)) ;
     else
        sv_setiv( ST(0), (IV)RETVAL);
 
@@ -90,7 +127,8 @@ dl_find_symbol(libhandle, symbolname)
     DLDEBUG(2,PerlIO_printf(PerlIO_stderr(),"  symbolref = %x\n", RETVAL));
     ST(0) = sv_newmortal() ;
     if (RETVAL == NULL)
-       SaveError("%d",GetLastError()) ;
+       SaveError(PERL_OBJECT_THIS_ "find_symbol:%s",
+                 OS_Error_String(PERL_OBJECT_THIS)) ;
     else
        sv_setiv( ST(0), (IV)RETVAL);
 
@@ -111,7 +149,7 @@ dl_install_xsub(perl_name, symref, filename="$Package")
     CODE:
     DLDEBUG(2,PerlIO_printf(PerlIO_stderr(),"dl_install_xsub(name=%s, symref=%x)\n",
                      perl_name, symref));
-    ST(0)=sv_2mortal(newRV((SV*)newXS(perl_name, (void(*)(CV*))symref, filename)));
+    ST(0)=sv_2mortal(newRV((SV*)newXS(perl_name, (void(*)(CV* _CPERLarg))symref, filename)));
 
 
 char *