ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Try to use the name of the PE file also when loading .so builtin. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-06-24 10:30:51 +02:00
parent aa97c30b01
commit 91bbc46c99
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3481,7 +3481,6 @@ static void test_builtin_sxs(void)
GetModuleFileNameA(module_msvcp, path_msvcp, sizeof(path_msvcp)); GetModuleFileNameA(module_msvcp, path_msvcp, sizeof(path_msvcp));
GetModuleFileNameA(module_msvcr, path_msvcr, sizeof(path_msvcr)); GetModuleFileNameA(module_msvcr, path_msvcr, sizeof(path_msvcr));
ok(strnicmp(expected_path, path_msvcp, strlen(expected_path)) == 0, "Expected path to start with %s, got %s\n", expected_path, path_msvcp); ok(strnicmp(expected_path, path_msvcp, strlen(expected_path)) == 0, "Expected path to start with %s, got %s\n", expected_path, path_msvcp);
todo_wine
ok(strnicmp(expected_path, path_msvcr, strlen(expected_path)) == 0, "Expected path to start with %s, got %s\n", expected_path, path_msvcr); ok(strnicmp(expected_path, path_msvcr, strlen(expected_path)) == 0, "Expected path to start with %s, got %s\n", expected_path, path_msvcr);
DeactivateActCtx(0, cookie); DeactivateActCtx(0, cookie);

6
dlls/ntdll/loader.c
View File

@ -2427,7 +2427,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name,
} }
info.load_path = load_path; info.load_path = load_path;
info.filename = so_name ? NULL : nt_name; info.filename = nt_name;
info.status = STATUS_SUCCESS; info.status = STATUS_SUCCESS;
info.wm = NULL; info.wm = NULL;
@ -2528,7 +2528,9 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_na
return load_native_dll( load_path, nt_name, module_ptr, &image_info, flags, pwm, &st ); return load_native_dll( load_path, nt_name, module_ptr, &image_info, flags, pwm, &st );
} }
return load_so_dll( load_path, nt_name, so_name, pwm ); status = load_so_dll( load_path, nt_name, so_name, pwm );
RtlFreeHeap( GetProcessHeap(), 0, so_name );
return status;
} }