summaryrefslogtreecommitdiff
path: root/win32/dl_win32.xs
diff options
context:
space:
mode:
Diffstat (limited to 'win32/dl_win32.xs')
-rw-r--r--win32/dl_win32.xs29
1 files changed, 11 insertions, 18 deletions
diff --git a/win32/dl_win32.xs b/win32/dl_win32.xs
index 5c6f627437..3e7fdd4714 100644
--- a/win32/dl_win32.xs
+++ b/win32/dl_win32.xs
@@ -37,22 +37,22 @@ calls.
static SV *error_sv;
static char *
-OS_Error_String(pTHX)
+OS_Error_String(pTHXo)
{
DWORD err = GetLastError();
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);
}
#include "dlutils.c" /* SaveError() etc */
static void
-dl_private_init(pTHX)
+dl_private_init(pTHXo)
{
- (void)dl_generic_private_init(aTHX);
+ (void)dl_generic_private_init(aTHXo);
}
/*
@@ -94,7 +94,7 @@ dl_static_linked(char *filename)
MODULE = DynaLoader PACKAGE = DynaLoader
BOOT:
- (void)dl_private_init(aTHX);
+ (void)dl_private_init(aTHXo);
void *
dl_load_file(filename,flags=0)
@@ -103,24 +103,17 @@ dl_load_file(filename,flags=0)
PREINIT:
CODE:
{
- WCHAR wfilename[MAX_PATH];
DLDEBUG(1,PerlIO_printf(PerlIO_stderr(),"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));
ST(0) = sv_newmortal() ;
if (RETVAL == NULL)
- SaveError(aTHX_ "load_file:%s",
- OS_Error_String(aTHX)) ;
+ SaveError(aTHXo_ "load_file:%s",
+ OS_Error_String(aTHXo)) ;
else
sv_setiv( ST(0), (IV)RETVAL);
}
@@ -136,8 +129,8 @@ dl_find_symbol(libhandle, symbolname)
DLDEBUG(2,PerlIO_printf(PerlIO_stderr()," symbolref = %x\n", RETVAL));
ST(0) = sv_newmortal() ;
if (RETVAL == NULL)
- SaveError(aTHX_ "find_symbol:%s",
- OS_Error_String(aTHX)) ;
+ SaveError(aTHXo_ "find_symbol:%s",
+ OS_Error_String(aTHXo)) ;
else
sv_setiv( ST(0), (IV)RETVAL);
@@ -159,7 +152,7 @@ dl_install_xsub(perl_name, symref, filename="$Package")
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(*)(pTHX_ CV *))symref,
+ (void(*)(pTHXo_ CV *))symref,
filename)));