[PATCH v14 8/8] ntdll: Remove superflous NULL check for importer.

[Jinoh Kang]

From: Jinoh Kang

---
 dlls/ntdll/loader.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 1e6c4f3384f..043b5692e1c 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -739,7 +739,7 @@ static NTSTATUS build_import_name( WINE_MODREF *importer, WCHAR buffer[256], con
 {
     const API_SET_NAMESPACE *map = NtCurrentTeb()->Peb->ApiSetMap;
     const API_SET_NAMESPACE_ENTRY *entry;
-    const WCHAR *host = importer ? importer->ldr.BaseDllName.Buffer : NULL;
+    const WCHAR *host = importer->ldr.BaseDllName.Buffer;
     UNICODE_STRING str;

while (len && import[len-1] == ' ') len--;  /* remove trailing spaces */
@@ -977,13 +977,10 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS
     }
     else if (wm->ldr.DdagNode != node_ntdll && wm->ldr.DdagNode != node_kernel32)
     {
-        if (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 );
-        }
-        if ((is_dynamic || !importer) && wm_loaded && process_attach( wm->ldr.DdagNode, NULL ) != STATUS_SUCCESS)
+        /* 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 );
+        if (is_dynamic && wm_loaded && process_attach( wm->ldr.DdagNode, NULL ) != STATUS_SUCCESS)
         {
             LdrUnloadDll( wm->ldr.DllBase );
             proc = NULL;
@@ -1023,12 +1020,12 @@ static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY

if (TRACE_ON(snoop))
     {
-        const WCHAR *user = !is_dynamic && importer ? importer->ldr.BaseDllName.Buffer : NULL;
+        const WCHAR *user = !is_dynamic ? importer->ldr.BaseDllName.Buffer : NULL;
         proc = SNOOP_GetProcAddress( module, exports, exp_size, proc, ordinal, user );
     }
     if (TRACE_ON(relay))
     {
-        const WCHAR *user = !is_dynamic && importer ? importer->ldr.BaseDllName.Buffer : NULL;
+        const WCHAR *user = !is_dynamic ? importer->ldr.BaseDllName.Buffer : NULL;
         proc = RELAY_GetProcAddress( module, exports, exp_size, proc, ordinal, user );
     }
     return proc;