Rename the old threading tutorial, start a new one,

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

diff --git a/win32/dl_win32.xs b/win32/dl_win32.xs
index 5c6f627..fb3e332 100644 (file)
--- a/win32/dl_win32.xs
+++ b/win32/dl_win32.xs
@@ -24,14 +24,12 @@ calls.
 #include <windows.h>
 #include <string.h>
 
+#define PERL_NO_GET_CONTEXT
+
 #include "EXTERN.h"
 #include "perl.h"
 #include "win32.h"
 
-#ifdef PERL_OBJECT
-#define NO_XSLOCKS
-#endif  /* PERL_OBJECT */
-
 #include "XSUB.h"
 
 static SV *error_sv;
@@ -43,7 +41,7 @@ OS_Error_String(pTHX)
  STRLEN len;
  if (!error_sv)
   error_sv = newSVpvn("",0);
- win32_str_os_error(aTHX_ error_sv,err);
+ PerlProc_GetOSError(error_sv,err);
  return SvPV(error_sv,len);
 }
 
@@ -103,20 +101,13 @@ dl_load_file(filename,flags=0)
     PREINIT:
     CODE:
   {
-    WCHAR wfilename[MAX_PATH];
-    DLDEBUG(1,PerlIO_printf(PerlIO_stderr(),"dl_load_file(%s):\n", filename));
+    DLDEBUG(1,PerlIO_printf(Perl_debug_log,"dl_load_file(%s):\n", filename));
     if (dl_static_linked(filename) == 0) {
-       if (USING_WIDE()) {
-           A2WHELPER(filename, wfilename, sizeof(wfilename), GETINTERPMODE());
-           RETVAL = (void*) LoadLibraryExW(wfilename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-       }
-       else {
-           RETVAL = (void*) LoadLibraryExA(filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-       }
+       RETVAL = PerlProc_DynaLoad(filename);
     }
     else
        RETVAL = (void*) GetModuleHandle(NULL);
-    DLDEBUG(2,PerlIO_printf(PerlIO_stderr()," libref=%x\n", RETVAL));
+    DLDEBUG(2,PerlIO_printf(Perl_debug_log," libref=%x\n", RETVAL));
     ST(0) = sv_newmortal() ;
     if (RETVAL == NULL)
        SaveError(aTHX_ "load_file:%s",
@@ -130,10 +121,10 @@ dl_find_symbol(libhandle, symbolname)
     void *     libhandle
     char *     symbolname
     CODE:
-    DLDEBUG(2,PerlIO_printf(PerlIO_stderr(),"dl_find_symbol(handle=%x, symbol=%s)\n",
+    DLDEBUG(2,PerlIO_printf(Perl_debug_log,"dl_find_symbol(handle=%x, symbol=%s)\n",
                      libhandle, symbolname));
     RETVAL = (void*) GetProcAddress((HINSTANCE) libhandle, symbolname);
-    DLDEBUG(2,PerlIO_printf(PerlIO_stderr(),"  symbolref = %x\n", RETVAL));
+    DLDEBUG(2,PerlIO_printf(Perl_debug_log,"  symbolref = %x\n", RETVAL));
     ST(0) = sv_newmortal() ;
     if (RETVAL == NULL)
        SaveError(aTHX_ "find_symbol:%s",
@@ -156,7 +147,7 @@ dl_install_xsub(perl_name, symref, filename="$Package")
     void *             symref 
     char *             filename
     CODE:
-    DLDEBUG(2,PerlIO_printf(PerlIO_stderr(),"dl_install_xsub(name=%s, symref=%x)\n",
+    DLDEBUG(2,PerlIO_printf(Perl_debug_log,"dl_install_xsub(name=%s, symref=%x)\n",
                      perl_name, symref));
     ST(0) = sv_2mortal(newRV((SV*)newXS(perl_name,
                                        (void(*)(pTHX_ CV *))symref,