Alexandre Julliard : ntdll: Get rid of the loadorder wildcard support,
builtin is always the default now.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Mar 31 13:05:17 CST 2006
Module: wine
Branch: refs/heads/master
Commit: e17df7ae7f5d1b6bd346a4b6ec3e8150e01a781b
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e17df7ae7f5d1b6bd346a4b6ec3e8150e01a781b
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Mar 31 17:39:21 2006 +0200
ntdll: Get rid of the loadorder wildcard support, builtin is always the default now.
---
dlls/ntdll/loadorder.c | 56 ------------------------------------------------
1 files changed, 0 insertions(+), 56 deletions(-)
diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c
index ac4dcb8..833c53c 100644
--- a/dlls/ntdll/loadorder.c
+++ b/dlls/ntdll/loadorder.c
@@ -51,28 +51,6 @@ struct loadorder_list
module_loadorder_t *order;
};
-/* dll to load as builtins if not explicitly specified otherwise */
-/* the list must remain sorted by dll name */
-static const WCHAR default_builtins[][10] =
-{
- { 'g','d','i','3','2',0 },
- { 'i','c','m','p',0 },
- { 'k','e','r','n','e','l','3','2',0 },
- { 'n','t','d','l','l',0 },
- { 'o','d','b','c','3','2',0 },
- { 't','t','y','d','r','v',0 },
- { 'u','s','e','r','3','2',0 },
- { 'w','3','2','s','k','r','n','l',0 },
- { 'w','i','n','e','d','o','s',0 },
- { 'w','i','n','e','p','s',0 },
- { 'w','i','n','m','m',0 },
- { 'w','n','a','s','p','i','3','2',0 },
- { 'w','o','w','3','2',0 },
- { 'w','s','2','_','3','2',0 },
- { 'w','s','o','c','k','3','2',0 },
- { 'x','1','1','d','r','v',0 }
-};
-
static const WCHAR separatorsW[] = {',',' ','\t',0};
static int init_done;
@@ -92,15 +70,6 @@ static int cmp_sort_func(const void *s1,
/***************************************************************************
- * strcmp_func
- */
-static int strcmp_func(const void *s1, const void *s2)
-{
- return strcmpiW( (const WCHAR *)s1, (const WCHAR *)s2 );
-}
-
-
-/***************************************************************************
* get_basename
*
* Return the base name of a file name (i.e. remove the path components).
@@ -321,21 +290,6 @@ static inline enum loadorder get_env_loa
/***************************************************************************
- * get_default_load_order
- *
- * Get the load order for a given module from the default list.
- */
-static inline enum loadorder get_default_load_order( const WCHAR *module )
-{
- const int count = sizeof(default_builtins) / sizeof(default_builtins[0]);
- if (!bsearch( module, default_builtins, count, sizeof(default_builtins[0]), strcmp_func ))
- return FALSE;
- TRACE( "got compiled-in builtin default for %s\n", debugstr_w(module) );
- return LO_BUILTIN;
-}
-
-
-/***************************************************************************
* get_standard_key
*
* Return a handle to the standard DllOverrides registry section.
@@ -478,8 +432,6 @@ static enum loadorder get_load_order_val
*/
enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path )
{
- static const WCHAR wildcardW[] = {'*',0};
-
enum loadorder ret = LO_INVALID;
HANDLE std_key, app_key = 0;
WCHAR *module, *basename;
@@ -522,14 +474,6 @@ enum loadorder get_load_order( const WCH
if (basename != module+1 && ((ret = get_load_order_value( std_key, app_key, basename )) != LO_INVALID))
goto done;
- /* then compiled-in defaults */
- if ((ret = get_default_load_order( basename )) != LO_INVALID)
- goto done;
-
- /* then wildcard entry (only if no explicit path) */
- if (basename == module+1 && ((ret = get_load_order_value( std_key, app_key, wildcardW )) != LO_INVALID))
- 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) );
More information about the wine-cvs
mailing list