[PATCH v12 7/7] ntdll: Remove superflous NULL check for importer.

[Jinoh Kang]

From: Jinoh Kang

---
 dlls/ntdll/loader.c | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index e1b1db3b273..4e71e217eba 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 */
@@ -987,19 +987,12 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS
         if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) &&
             wm->ldr.DdagNode != node_ntdll && wm->ldr.DdagNode != node_kernel32)
         {
-            if (importer)
-            {
-                /* Prepare for the callee stealing the reference */
-                if (wm_owned_ref) wm_owned_ref = FALSE;
-                else if (wm->ldr.LoadCount != -1) wm->ldr.LoadCount++;
-                add_module_dependency( importer->ldr.DdagNode, wm->ldr.DdagNode );
-            }
-            else if (wm_owned_ref && process_attach( wm->ldr.DdagNode, NULL ) != STATUS_SUCCESS)
-            {
-                proc = NULL;
-            }
+            /* Prepare for the callee stealing the reference */
+            if (wm_owned_ref) wm_owned_ref = FALSE;
+            else if (wm->ldr.LoadCount != -1) wm->ldr.LoadCount++;
+            add_module_dependency( importer->ldr.DdagNode, wm->ldr.DdagNode );
         }
-        if (proc && wm_owned_ref)
+        if (wm_owned_ref)
         {
             /* Owned, but no way to bind to a dependency; leak the reference instead */
             wm_owned_ref = FALSE;
@@ -1040,12 +1033,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;