[PATCH v11 4/7] ntdll: Properly track refcount on static imports of export forwarders.

[Jinoh Kang]

From: Jinoh Kang

Today this is only done for the the main EXE.  Generalize this to DLLs
as well.
---
 dlls/kernel32/tests/loader.c | 4 ++--
 dlls/ntdll/loader.c          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index 2c7cc784be4..d0a2c514136 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -2777,7 +2777,7 @@ static void subtest_export_forwarder_dep_chain( size_t num_chained_export_module

/* FreeLibrary() should *not* unload the DLL immediately */
         module = GetModuleHandleA( temp_paths[i] );
-        todo_wine_if(i < ultimate_depender_index && i + 1 != importer_index)
+        todo_wine_if(i < ultimate_depender_index && i + 1 != importer_index && exporter_index)
         ok( module == modules[i], "modules[%Iu] expected %p, got %p (unloaded?) err=%lu\n",
             i, modules[i], module, GetLastError() );
     }
@@ -2789,7 +2789,7 @@ static void subtest_export_forwarder_dep_chain( size_t num_chained_export_module
     {
         HMODULE module = GetModuleHandleA( temp_paths[i] );

-        todo_wine_if(i < ultimate_depender_index && i + 1 != importer_index)
+        todo_wine_if(i < ultimate_depender_index && i + 1 != importer_index && exporter_index)
         ok( module == modules[i], "modules[%Iu] expected %p, got %p (unloaded?) err=%lu\n",
             i, modules[i], module, GetLastError() );
     }
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 0fb16d749df..2ca21edd279 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -983,7 +983,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS
     {
         if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS))
         {
-            if (!imports_fixup_done && importer)
+            if (importer)
             {
                 /* Prepare for the callee stealing the reference */
                 if (wm_owned_ref) wm_owned_ref = FALSE;