From: Paul Gofman <pgofman@codeweavers.com> --- dlls/kernel32/tests/module.c | 4 ++-- dlls/ntdll/loader.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 9f008d0bda8..17881b88672 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -579,7 +579,7 @@ static void test_LoadLibraryEx_search_flags(void) mod = (void *)0xdeadbeef; status = pLdrLoadDll( (void *)(ULONG_PTR)(LOAD_LIBRARY_SEARCH_SYSTEM32 | 1), NULL, &name, &mod ); ok( status == STATUS_DLL_NOT_FOUND, "got %#lx.\n", status ); - todo_wine ok( mod == (HMODULE)0xdeadbeef, "got %p.\n", mod ); + ok( mod == (HMODULE)0xdeadbeef, "got %p.\n", mod ); load_flags = LOAD_LIBRARY_SEARCH_SYSTEM32; mod = (void *)0xdeadbeef; @@ -597,7 +597,7 @@ static void test_LoadLibraryEx_search_flags(void) mod = (void *)0xdeadbeef; status = pLdrLoadDll( load_path, NULL, &name, &mod ); ok( status == STATUS_DLL_NOT_FOUND, "got %#lx.\n", status ); - todo_wine ok( mod == (HMODULE)0xdeadbeef, "got %p.\n", mod ); + ok( mod == (HMODULE)0xdeadbeef, "got %p.\n", mod ); RtlReleasePath( load_path ); mod = (void *)0xdeadbeef; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 58a265f5b70..61cc9e1e112 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3473,7 +3473,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR search_path, DWORD *load_fl wm = NULL; } } - *hModule = (wm) ? wm->ldr.DllBase : NULL; + if (wm) *hModule = wm->ldr.DllBase; RtlLeaveCriticalSection( &loader_section ); RtlFreeHeap( GetProcessHeap(), 0, dllname ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9888