[PATCH v14 3/8] ntdll: Register module dependency for export forwarders regardless of whether the dependency is already loaded.

[Jinoh Kang]

From: Jinoh Kang

Prepare for generalization to imports from DLLs.

Calling add_module_dependency() multiple times for the same dependency
edge no longer bloats memory usage.
---
 dlls/ntdll/loader.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 40c53064059..52b47a217eb 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -971,13 +971,15 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS
             forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer),
             debugstr_w(get_modref(module)->ldr.BaseDllName.Buffer) );
     }
-    else if (wm_loaded)
+    else if (wm->ldr.DdagNode != node_ntdll && wm->ldr.DdagNode != node_kernel32)
     {
         if (!imports_fixup_done && importer)
         {
+            /* Prepare for the callee stealing the reference */
+            if (!wm_loaded && wm->ldr.LoadCount != -1) wm->ldr.LoadCount++;
             add_module_dependency( importer->ldr.DdagNode, wm->ldr.DdagNode );
         }
-        else if (process_attach( wm->ldr.DdagNode, NULL ) != STATUS_SUCCESS)
+        else if (wm_loaded && process_attach( wm->ldr.DdagNode, NULL ) != STATUS_SUCCESS)
         {
             LdrUnloadDll( wm->ldr.DllBase );
             proc = NULL;