Alexandre Julliard : ntdll: Use load_dll() to load kernel32 to support PE format.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e5c0e8e296a114aeca41fcb67c73f55e1d37d002
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e5c0e8e296a114aeca41fcb67...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Sep 28 19:38:08 2020 +0200

ntdll: Use load_dll() to load kernel32 to support PE format.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ntdll/loader.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 319cdd8c8a..20bc3f977d 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -3987,7 +3987,7 @@ static NTSTATUS process_init(void)
     static const WCHAR ntdllW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\',
                                    's','y','s','t','e','m','3','2','\\',
                                    'n','t','d','l','l','.','d','l','l',0};
-    static const WCHAR kernel32W[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\',
+    static const WCHAR kernel32W[] = {'C',':','\\','w','i','n','d','o','w','s','\\',
                                       's','y','s','t','e','m','3','2','\\',
                                       'k','e','r','n','e','l','3','2','.','d','l','l',0};
     RTL_USER_PROCESS_PARAMETERS *params;
@@ -4044,8 +4044,7 @@ static NTSTATUS process_init(void)
     status = build_builtin_module( params->DllPath.Buffer, &nt_name, meminfo.AllocationBase, 0, &wm );
     assert( !status );
 
-    RtlInitUnicodeString( &nt_name, kernel32W );
-    if ((status = load_builtin_dll( params->DllPath.Buffer, &nt_name, NULL, 0, &wm )) != STATUS_SUCCESS)
+    if ((status = load_dll( params->DllPath.Buffer, kernel32W, NULL, 0, &wm )) != STATUS_SUCCESS)
     {
         MESSAGE( "wine: could not load kernel32.dll, status %x\n", status );
         NtTerminateProcess( GetCurrentProcess(), status );