ntdll: Default to native loadorder for the main exe if not in system directory.

Unlike dlls, executables can have the same name without necessarily being the same application, so defaulting to native is more likely to do the right thing.

ntdll: Default to native loadorder for the main exe if not in system directory.
c6d95770 · Alexandre Julliard · f2f44de6 · c6d95770
Commit c6d95770 authored Aug 15, 2006 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

loadorder.c dlls/ntdll/loadorder.c +9 -1

No files found.
--- a/dlls/ntdll/loadorder.c
+++ b/dlls/ntdll/loadorder.c
@@ -474,9 +474,17 @@ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path )
    if (basename != module+1 && ((ret = get_load_order_value( std_key, app_key, basename )) != LO_INVALID))
        goto done;

+    /* if loading the main exe with an explicit path, try native first */
+    if (!app_name && basename != module+1)
+    {
+        ret = LO_NATIVE_BUILTIN;
+        TRACE( "got main exe default %s for %s\n", debugstr_loadorder(ret), debugstr_w(path) );
+        goto done;
+    }
+
    /* and last the hard-coded default */
    ret = LO_DEFAULT;
-    TRACE( "got hardcoded default %s for %s\n", debugstr_loadorder(ret), debugstr_w(path) );
+    TRACE( "got hardcoded %s for %s\n", debugstr_loadorder(ret), debugstr_w(path) );

 done:
    RtlFreeHeap( GetProcessHeap(), 0, module );