- Revert 49767 on Pierre's request, which reverted this:

[reactos.git] / reactos / dll / win32 / kernel32 / misc / ldr.c

diff --git a/reactos/dll/win32/kernel32/misc/ldr.c b/reactos/dll/win32/kernel32/misc/ldr.c
index 9e32478..da2f582 100644 (file)
--- a/reactos/dll/win32/kernel32/misc/ldr.c
+++ b/reactos/dll/win32/kernel32/misc/ldr.c
@@ -102,19 +102,18 @@ GetDllLoadPath(LPCWSTR lpModule)
  */
 BOOL
 WINAPI
-DisableThreadLibraryCalls (
-       HMODULE hLibModule
-       )
+DisableThreadLibraryCalls(
+    IN HMODULE hLibModule)
 {
-       NTSTATUS Status;
+    NTSTATUS Status;
 
-       Status = LdrDisableThreadCalloutsForDll ((PVOID)hLibModule);
-       if (!NT_SUCCESS (Status))
-       {
-               SetLastErrorByStatus (Status);
-               return FALSE;
-       }
-       return TRUE;
+    Status = LdrDisableThreadCalloutsForDll((PVOID)hLibModule);
+    if (!NT_SUCCESS(Status))
+    {
+        BaseSetLastNTError(Status);
+        return FALSE;
+    }
+    return TRUE;
 }
 
 
@@ -136,18 +135,17 @@ LoadLibraryA (
  */
 HINSTANCE
 WINAPI
-LoadLibraryExA (
-       LPCSTR  lpLibFileName,
-       HANDLE  hFile,
-       DWORD   dwFlags
-       )
+LoadLibraryExA(
+    LPCSTR lpLibFileName,
+    HANDLE hFile,
+    DWORD dwFlags)
 {
-   PWCHAR FileNameW;
+   PUNICODE_STRING FileNameW;
 
-   if (!(FileNameW = FilenameA2W(lpLibFileName, FALSE)))
-      return FALSE;
+    if (!(FileNameW = Basep8BitStringToStaticUnicodeString(lpLibFileName)))
+        return NULL;
 
-   return LoadLibraryExW(FileNameW, hFile, dwFlags);
+    return LoadLibraryExW(FileNameW->Buffer, hFile, dwFlags);
 }