[dchapyshev] 40556: - More correct fix of a problem with loading dlls

Author: dchapyshev
Date: Fri Apr 17 11:15:04 2009
New Revision: 40556

URL: http://svn.reactos.org/svn/reactos?rev=40556&view=rev
Log:
- More correct fix of a problem with loading dlls

Modified:
    trunk/reactos/dll/ntdll/ldr/utils.c

Modified: trunk/reactos/dll/ntdll/ldr/utils.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=4...
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Fri Apr 17 11:15:04 2009
@@ -858,7 +858,6 @@
   PLDR_DATA_TABLE_ENTRY ModulePtr;
   BOOLEAN ContainsPath;
   UNICODE_STRING AdjustedName;
-  unsigned i;

DPRINT("LdrFindEntryForName(Name %wZ)\n", Name);

@@ -882,14 +881,8 @@
       return(STATUS_SUCCESS);
     }

-  LdrAdjustDllName (&AdjustedName, Name, TRUE);
-
-  ContainsPath = (AdjustedName.Length >= 2 * sizeof(WCHAR) && L':' == AdjustedName.Buffer[1]);
-  for (i = 0; ! ContainsPath && i < AdjustedName.Length / sizeof(WCHAR); i++)
-    {
-      ContainsPath = L'\' == AdjustedName.Buffer[i] ||
-                     L'/' == AdjustedName.Buffer[i];
-    }
+  ContainsPath = (Name->Length >= 2 * sizeof(WCHAR) && L':' == Name->Buffer[1]);
+  LdrAdjustDllName (&AdjustedName, Name, !ContainsPath);

if (LdrpLastModule)
     {