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

ntdll: Check the activation context before looking for the module basename. 

Signed-off-by: Fabian Maurer <dark.shadow4@web.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Fabian Maurer 2019-06-20 17:50:32 +02:00 committed by Alexandre Julliard
parent 91bbc46c99
commit 6525a16673
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/kernel32/tests/actctx.c
View File

@ -3300,12 +3300,10 @@ static void test_two_dlls_at_same_time(void)
if (!fill_sxs_info(&dll_2, "2", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll, TRUE))
goto cleanup;
todo_wine
ok(dll_1.module != dll_2.module, "Libraries are the same\n");
dll_1.get_path(path1, sizeof(path1));
ok(strcmp(path1, dll_1.path_dll) == 0, "Got '%s', expected '%s'\n", path1, dll_1.path_dll);
dll_2.get_path(path2, sizeof(path2));
todo_wine
ok(strcmp(path2, dll_2.path_dll) == 0, "Got '%s', expected '%s'\n", path2, dll_2.path_dll);
cleanup:
@ -3338,10 +3336,8 @@ static void test_one_sxs_and_one_local_1(void)
if (!fill_sxs_info(&dll, "1", "dummy.dll", two_dll_manifest_exe, two_dll_manifest_dll, TRUE))
goto cleanup;
todo_wine
ok(dll.module != module, "Libraries are the same\n");
dll.get_path(path1, sizeof(path1));
todo_wine
ok(strcmp(path1, dll.path_dll) == 0, "Got '%s', expected '%s'\n", path1, dll.path_dll);
get_path(path2, sizeof(path2));
ok(strcmp(path2, path_dll_local) == 0, "Got '%s', expected '%s'\n", path2, path_dll_local);
@ -3417,7 +3413,6 @@ static void test_one_with_sxs_and_GetModuleHandleA(void)
ok(success, "ActivateActCtx failed: %d\n", GetLastError());
module_temp = GetModuleHandleA("sxs_dll.dll");
todo_wine
ok (module_temp == 0, "Expected 0, got %p\n", module_temp);
DeactivateActCtx(0, dll.cookie);

14
dlls/ntdll/loader.c
View File

@ -2693,7 +2693,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
void **module, pe_image_info_t *image_info, struct stat *st )
{
WCHAR *ext, *dllname;
NTSTATUS status = STATUS_SUCCESS;
NTSTATUS status;
/* first append .dll if needed */
@ -2716,8 +2716,6 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
{
WCHAR *fullname = NULL;
if ((*pwm = find_basename_module( libname )) != NULL) goto done;
status = find_actctx_dll( libname, &fullname );
if (status == STATUS_SUCCESS)
{
@ -2725,7 +2723,15 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
RtlFreeHeap( GetProcessHeap(), 0, dllname );
libname = dllname = fullname;
}
else if (status != STATUS_SXS_KEY_NOT_FOUND) goto done;
else
{
if (status != STATUS_SXS_KEY_NOT_FOUND) goto done;
if ((*pwm = find_basename_module( libname )) != NULL)
{
status = STATUS_SUCCESS;
goto done;
}
}
}
if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH)