From: Zhiyi Zhang zzhang@codeweavers.com
WinSxS DLLs are found via find_actctx_dll(). When activation contexts are inactive, GetModuleHandle() shouldn't find WinSxS DLLs with the same base name of a normal DLL. --- dlls/kernel32/tests/actctx.c | 2 -- dlls/ntdll/loader.c | 40 +++++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index b6b34be87f6..ae289f4bd63 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3884,7 +3884,6 @@ static void test_one_with_sxs_and_GetModuleHandleA(void)
/* Normal loaded dll should be found while context is inactive */ module_temp = GetModuleHandleA("sxs_dll.dll"); - todo_wine ok(module_temp == module, "Got unexpected module.\n");
if (module) @@ -3892,7 +3891,6 @@ static void test_one_with_sxs_and_GetModuleHandleA(void)
/* Loaded SxS dll can't be found while context is inactive */ module_temp = GetModuleHandleA("sxs_dll.dll"); - todo_wine ok(module_temp == NULL, "Got unexpected module.\n");
if (dll.module) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b1a8544999c..30112243da4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -140,6 +140,7 @@ typedef struct _wine_modref struct file_id id; ULONG CheckSum; BOOL system; + BOOL sxs; } WINE_MODREF;
static UINT tls_module_count = 32; /* number of modules with TLS directory */ @@ -600,14 +601,16 @@ static WINE_MODREF *find_basename_module( LPCWSTR name )
RtlInitUnicodeString( &name_str, name );
- if (cached_modref && RtlEqualUnicodeString( &name_str, &cached_modref->ldr.BaseDllName, TRUE )) + if (cached_modref && RtlEqualUnicodeString( &name_str, &cached_modref->ldr.BaseDllName, TRUE ) + && !cached_modref->sxs) return cached_modref;
mark = &hash_table[hash_basename( &name_str )]; for (entry = mark->Flink; entry != mark; entry = entry->Flink) { WINE_MODREF *mod = CONTAINING_RECORD(entry, WINE_MODREF, ldr.HashLinks); - if (RtlEqualUnicodeString( &name_str, &mod->ldr.BaseDllName, TRUE ) && !mod->system) + if (RtlEqualUnicodeString( &name_str, &mod->ldr.BaseDllName, TRUE ) && !mod->system + && !mod->sxs) { cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr); return cached_modref; @@ -2249,7 +2252,7 @@ done: */ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, void **module, const SECTION_IMAGE_INFORMATION *image_info, const struct file_id *id, - DWORD flags, BOOL system, WINE_MODREF **pwm ) + DWORD flags, BOOL system, BOOL sxs, WINE_MODREF **pwm ) { static const char builtin_signature[] = "Wine builtin DLL"; char *signature = (char *)((IMAGE_DOS_HEADER *)*module + 1); @@ -2275,6 +2278,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, if (image_info->LoaderFlags) wm->ldr.Flags |= LDR_COR_IMAGE; if (image_info->ComPlusILOnly) wm->ldr.Flags |= LDR_COR_ILONLY; wm->system = system; + wm->sxs = sxs;
update_load_config( *module );
@@ -2798,7 +2802,7 @@ static WINE_MODREF *find_existing_module( HMODULE module ) */ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, HANDLE mapping, const SECTION_IMAGE_INFORMATION *image_info, const struct file_id *id, - DWORD flags, BOOL system, WINE_MODREF** pwm ) + DWORD flags, BOOL system, BOOL sxs, WINE_MODREF** pwm ) { void *module = NULL; SIZE_T len = 0; @@ -2820,7 +2824,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH && !convert_to_pe64( module, image_info )) status = STATUS_INVALID_IMAGE_FORMAT; #endif - if (NT_SUCCESS(status)) status = build_module( load_path, nt_name, &module, image_info, id, flags, system, pwm ); + if (NT_SUCCESS(status)) status = build_module( load_path, nt_name, &module, image_info, id, + flags, system, sxs, pwm ); if (status && module) NtUnmapViewOfSection( NtCurrentProcess(), module ); return status; } @@ -2855,7 +2860,8 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, { SECTION_IMAGE_INFORMATION image_info = { 0 };
- if ((status = build_module( load_path, ¶ms.nt_name, &module, &image_info, NULL, flags, FALSE, &wm ))) + if ((status = build_module( load_path, ¶ms.nt_name, &module, &image_info, NULL, flags, + FALSE, FALSE, &wm ))) { if (module) NtUnmapViewOfSection( NtCurrentProcess(), module ); return status; @@ -2895,7 +2901,8 @@ static WINE_MODREF *build_main_module(void) #endif status = RtlDosPathNameToNtPathName_U_WithStatus( params->ImagePathName.Buffer, &nt_name, NULL, NULL ); if (status) goto failed; - status = build_module( NULL, &nt_name, &module, &info, NULL, DONT_RESOLVE_DLL_REFERENCES, FALSE, &wm ); + status = build_module( NULL, &nt_name, &module, &info, NULL, DONT_RESOLVE_DLL_REFERENCES, FALSE, + FALSE, &wm ); if (status) goto failed; RtlFreeUnicodeString( &nt_name ); wm->ldr.LoadCount = -1; @@ -3249,13 +3256,14 @@ done: */ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNICODE_STRING *nt_name, WINE_MODREF **pwm, HANDLE *mapping, SECTION_IMAGE_INFORMATION *image_info, - struct file_id *id, BOOL find_loaded ) + struct file_id *id, BOOL *sxs, BOOL find_loaded ) { WCHAR *fullname = NULL; NTSTATUS status; ULONG wow64_old_value = 0;
*pwm = NULL; + *sxs = FALSE; nt_name->Buffer = NULL;
if (!contains_path( libname )) @@ -3263,7 +3271,11 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNI status = find_apiset_dll( libname, &fullname ); if (status == STATUS_DLL_NOT_FOUND) return status;
- if (status) status = find_actctx_dll( libname, &fullname ); + if (status) + { + status = find_actctx_dll( libname, &fullname ); + if (status == STATUS_SUCCESS) *sxs = TRUE; + }
if (status == STATUS_SUCCESS) { @@ -3317,6 +3329,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, DWORD fl SECTION_IMAGE_INFORMATION image_info; NTSTATUS nts = STATUS_DLL_NOT_FOUND; void *prev; + BOOL sxs;
TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) );
@@ -3325,7 +3338,8 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, DWORD fl
if (nts) { - nts = find_dll_file( load_path, libname, &nt_name, pwm, &mapping, &image_info, &id, FALSE ); + nts = find_dll_file( load_path, libname, &nt_name, pwm, &mapping, &image_info, &id, + &sxs, FALSE ); system = FALSE; }
@@ -3352,7 +3366,8 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, DWORD fl break;
case STATUS_SUCCESS: /* valid PE file */ - nts = load_native_dll( load_path, &nt_name, mapping, &image_info, &id, flags, system, pwm ); + nts = load_native_dll( load_path, &nt_name, mapping, &image_info, &id, flags, system, + sxs, pwm ); break; }
@@ -3497,6 +3512,7 @@ NTSTATUS WINAPI LdrGetDllHandleEx( ULONG flags, LPCWSTR load_path, ULONG *dll_ch WINE_MODREF *wm; WCHAR *dllname; HANDLE mapping; + BOOL sxs;
TRACE( "flags %#lx, load_path %p, dll_characteristics %p, name %p, base %p.\n", flags, load_path, dll_characteristics, name, base ); @@ -3515,7 +3531,7 @@ NTSTATUS WINAPI LdrGetDllHandleEx( ULONG flags, LPCWSTR load_path, ULONG *dll_ch RtlEnterCriticalSection( &loader_section );
status = find_dll_file( load_path, dllname ? dllname : name->Buffer, - &nt_name, &wm, &mapping, &image_info, &id, TRUE ); + &nt_name, &wm, &mapping, &image_info, &id, &sxs, TRUE );
if (wm) *base = wm->ldr.DllBase; else