ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Get rid of the loadorder wildcard support, builtin is always the default now.

Browse Source
This commit is contained in:
Alexandre Julliard 2006-03-31 17:39:21 +02:00
parent 839f00a967
commit e17df7ae7f
1 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dlls/ntdll/loadorder.c
View File

@ -51,28 +51,6 @@ struct loadorder_list
module_loadorder_t *order; 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 const WCHAR separatorsW[] = {',',' ','\t',0};
static int init_done; static int init_done;
@ -91,15 +69,6 @@ static int cmp_sort_func(const void *s1, const void *s2)
} }
/***************************************************************************
* strcmp_func
*/
static int strcmp_func(const void *s1, const void *s2)
{
return strcmpiW( (const WCHAR *)s1, (const WCHAR *)s2 );
}
/*************************************************************************** /***************************************************************************
* get_basename * get_basename
* *
@ -320,21 +289,6 @@ static inline enum loadorder get_env_load_order( const WCHAR *module )
} }
/***************************************************************************
* 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 * get_standard_key
* *
@ -478,8 +432,6 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, cons
*/ */
enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path )
{ {
static const WCHAR wildcardW[] = {'*',0};
enum loadorder ret = LO_INVALID; enum loadorder ret = LO_INVALID;
HANDLE std_key, app_key = 0; HANDLE std_key, app_key = 0;
WCHAR *module, *basename; WCHAR *module, *basename;
@ -522,14 +474,6 @@ 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)) if (basename != module+1 && ((ret = get_load_order_value( std_key, app_key, basename )) != LO_INVALID))
goto done; 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 */ /* and last the hard-coded default */
ret = LO_DEFAULT; ret = LO_DEFAULT;
TRACE( "got hardcoded default %s for %s\n", debugstr_loadorder(ret), debugstr_w(path) ); TRACE( "got hardcoded default %s for %s\n", debugstr_loadorder(ret), debugstr_w(path) );