Converted the load order code to use Unicode throughout.

dlls/kernel/ne_module.c

@@ -1212,7 +1212,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_
             if ((p = strrchrW( buffer, '\\' ))) p++;
             else p = buffer;
         }
-        MODULE_GetLoadOrder(loadorder, p, basename, FALSE);
+        MODULE_GetLoadOrderA(loadorder, p, basename, FALSE);
     }
 
     for(i = 0; i < LOADORDER_NTYPES; i++)

dlls/kernel/process.c

@@ -185,7 +185,7 @@ static HANDLE open_exe_file( const char *name )
         name = buffer;
     }
 
-    MODULE_GetLoadOrder( loadorder, NULL, name, TRUE );
+    MODULE_GetLoadOrderA( loadorder, NULL, name, TRUE );
 
     for(i = 0; i < LOADORDER_NTYPES; i++)
     {
@@ -246,7 +246,7 @@ static BOOL find_exe_file( const char *name, char *buffer, int buflen, HANDLE *h
         return FALSE;
     }
 
-    MODULE_GetLoadOrder( loadorder, NULL, buffer, TRUE );
+    MODULE_GetLoadOrderA( loadorder, NULL, buffer, TRUE );
 
     for(i = 0; i < LOADORDER_NTYPES; i++)
     {

dlls/ntdll/loader.c

@@ -1374,7 +1374,7 @@ static NTSTATUS load_dll( LPCSTR libname, DWORD flags, WINE_MODREF** pwm )
     }
 
     main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress );
-    MODULE_GetLoadOrder( loadorder, main_exe->ldr.BaseDllName.Buffer, filename, TRUE);
+    MODULE_GetLoadOrderA( loadorder, main_exe->ldr.BaseDllName.Buffer, filename, TRUE);
 
     for (i = 0; i < LOADORDER_NTYPES; i++)
     {

include/module.h

@@ -203,8 +203,10 @@ extern HRSRC PE_FindResourceExW(HMODULE,LPCWSTR,LPCWSTR,WORD);
 
 /* loader/loadorder.c */
 extern BOOL MODULE_GetBuiltinPath( const char *libname, const char *ext, char *filename, UINT size );
-extern void MODULE_GetLoadOrder( enum loadorder_type plo[], const WCHAR *app_name,
-                                 const char *path, BOOL win32 );
+extern void MODULE_GetLoadOrderW( enum loadorder_type plo[], const WCHAR *app_name,
+                                  const WCHAR *path, BOOL win32 );
+extern void MODULE_GetLoadOrderA( enum loadorder_type plo[], const WCHAR *app_name,
+                                  const char *path, BOOL win32 );
 
 /* relay32/builtin.c */
 extern HMODULE BUILTIN32_LoadExeModule( HMODULE main );