Signed-off-by: Fabian Maurer dark.shadow4@web.de --- dlls/kernel32/tests/sxs.c | 4 ---- dlls/ntdll/loader.c | 9 ++++++--- 2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/kernel32/tests/sxs.c b/dlls/kernel32/tests/sxs.c index ed3bb06514..a1153284b2 100644 --- a/dlls/kernel32/tests/sxs.c +++ b/dlls/kernel32/tests/sxs.c @@ -161,12 +161,10 @@ static void test_two_dlls_at_same_time(void) if(fill_sxs_info(&dll_2, "2", "sxs_dll_2.dll", "sxs_exe_2.manifest", "sxs_dll_2.manifest")) goto cleanup;
- todo_wine ok(dll_1.module != dll_2.module, "Libraries are the same\n"); ret = dll_1.test_func(); ok(ret == 1, "Got %d\n", ret); ret = dll_2.test_func(); - todo_wine ok(ret == 2, "Got %d\n", ret);
cleanup: @@ -198,10 +196,8 @@ static void test_one_sxs_and_one_local_1(void) if(fill_sxs_info(&dll, "1", "sxs_dll_1.dll", "sxs_exe_1.manifest", "sxs_dll_1.manifest")) goto cleanup;
- todo_wine ok(dll.module != module, "Libraries are the same\n"); ret = dll.test_func(); - todo_wine ok(ret == 1, "Got %d\n", ret); ret = test_func(); ok(ret == 2, "Got %d\n", ret); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 034b98cfee..2294bce8cc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2670,10 +2670,13 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (!contains_path( libname )) { WCHAR *fullname = NULL; + NTSTATUS status_actctx = find_actctx_dll( libname, &fullname ); + if (status_actctx != STATUS_SUCCESS) + { + if ((*pwm = find_basename_module( libname )) != NULL) goto done; + } + status = status_actctx;
- if ((*pwm = find_basename_module( libname )) != NULL) goto done; - - status = find_actctx_dll( libname, &fullname ); if (status == STATUS_SUCCESS) { TRACE ("found %s for %s\n", debugstr_w(fullname), debugstr_w(libname) ); -- 2.21.0