[PATCH v15 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 c745a488c5b..e0c107052b1 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -952,13 +952,15 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS
         wm_loaded = TRUE;
     }

-    if (wm_loaded)
+    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)
         {
             ERR( "process_attach failed for forward '%s' used by %s\n",
                  forward, debugstr_w(get_modref( module )->ldr.FullDllName.Buffer) );