marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Use standard dlopen() instead of the libwine wrappers. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Alexandre Julliard 2020-04-06 22:38:00 +02:00
parent 1938ddc651
commit f64e34b014
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/ntdll/loader.c
View File

@ -2596,7 +2596,6 @@ done:
static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name,
const char *so_name, WINE_MODREF** pwm ) const char *so_name, WINE_MODREF** pwm )
{ {
char error[256];
void *handle; void *handle;
struct builtin_load_info info, *prev_info; struct builtin_load_info info, *prev_info;
ANSI_STRING unix_name; ANSI_STRING unix_name;
@ -2620,7 +2619,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name,
prev_info = builtin_load_info; prev_info = builtin_load_info;
builtin_load_info = &info; builtin_load_info = &info;
handle = wine_dlopen( so_name ? so_name : unix_name.Buffer, RTLD_NOW, error, sizeof(error) ); handle = dlopen( so_name ? so_name : unix_name.Buffer, RTLD_NOW );
builtin_load_info = prev_info; builtin_load_info = prev_info;
RtlFreeHeap( GetProcessHeap(), 0, unix_name.Buffer ); RtlFreeHeap( GetProcessHeap(), 0, unix_name.Buffer );
@ -2628,10 +2627,10 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name,
{ {
if (so_name) if (so_name)
{ {
ERR("failed to load .so lib %s: %s\n", debugstr_a(so_name), error ); ERR("failed to load .so lib %s: %s\n", debugstr_a(so_name), dlerror() );
return STATUS_PROCEDURE_NOT_FOUND; return STATUS_PROCEDURE_NOT_FOUND;
} }
WARN( "failed to load .so lib %s: %s\n", debugstr_us(nt_name), error ); WARN( "failed to load .so lib %s: %s\n", debugstr_us(nt_name), dlerror() );
return STATUS_INVALID_IMAGE_FORMAT; return STATUS_INVALID_IMAGE_FORMAT;
} }
@ -2651,7 +2650,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name,
debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress, debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress,
debugstr_us(nt_name) ); debugstr_us(nt_name) );
if (info.wm->ldr.LoadCount != -1) info.wm->ldr.LoadCount++; if (info.wm->ldr.LoadCount != -1) info.wm->ldr.LoadCount++;
wine_dlclose( handle, NULL, 0 ); /* release the libdl refcount */ dlclose( handle ); /* release the libdl refcount */
} }
else else
{ {
@ -2664,7 +2663,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name,
return STATUS_SUCCESS; return STATUS_SUCCESS;
failed: failed:
wine_dlclose( handle, NULL, 0 ); dlclose( handle );
return info.status; return info.status;
} }
@ -3588,8 +3587,7 @@ static void free_modref( WINE_MODREF *wm )
free_tls_slot( &wm->ldr ); free_tls_slot( &wm->ldr );
RtlReleaseActivationContext( wm->ldr.ActivationContext ); RtlReleaseActivationContext( wm->ldr.ActivationContext );
if ((wm->ldr.Flags & LDR_WINE_INTERNAL) && wm->ldr.SectionHandle) if ((wm->ldr.Flags & LDR_WINE_INTERNAL) && wm->ldr.SectionHandle) dlclose( wm->ldr.SectionHandle );
wine_dlclose( wm->ldr.SectionHandle, NULL, 0 );
NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress );
if (cached_modref == wm) cached_modref = NULL; if (cached_modref == wm) cached_modref = NULL;
RtlFreeUnicodeString( &wm->ldr.FullDllName ); RtlFreeUnicodeString( &wm->ldr.FullDllName );