Alexandre Julliard : ntdll: Skip dependency only for the actually loaded ntdll and kernel32, instead of matching by name.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a3ff624bcc2822b36e46c14e12c122505f890246
URL:    https://gitlab.winehq.org/wine/wine/-/commit/a3ff624bcc2822b36e46c14e12c1225...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue Feb 28 09:48:01 2023 +0100

ntdll: Skip dependency only for the actually loaded ntdll and kernel32, instead of matching by name.

---

 dlls/ntdll/loader.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index d0d9bae7f0b..a0ac61d8156 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -1404,14 +1404,9 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path )
     {
         dep_after = wm->ldr.DdagNode->Dependencies.Tail;
         if (!import_dll( wm->ldr.DllBase, &imports[i], load_path, &imp ))
-        {
-            imp = NULL;
             status = STATUS_DLL_NOT_FOUND;
-        }
-        else if (imp && !is_import_dll_system( &wm->ldr, &imports[i] ))
-        {
+        else if (imp && imp->ldr.DdagNode != node_ntdll && imp->ldr.DdagNode != node_kernel32)
             add_module_dependency_after( wm->ldr.DdagNode, imp->ldr.DdagNode, dep_after );
-        }
     }
     current_modref = prev;
     if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie );