commit b9c9cdc5d46b140b0cee7ae30dcadb0b32d20d5a
author Alexandre Julliard <julliard@winehq.org> Tue Mar 20 02:11:08 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 20 02:11:08 2001 +0000
tree 02c282db08058e6825699528356b820ed333ea57
parent 857abbf398da0ddd424786ab3a3a5bfc49df2dd9

- Added support for app-specific dll overrides using
  AppDefaults\<appname>\DllOverrides configuration section.
- Better support for multiple --dll options.
- Added warning message to discourage putting multiple dlls in a
  single override entry.

misc/options.c

diff --git a/misc/options.c b/misc/options.c
index 7a66171..44a5067 100644
--- a/misc/options.c
+++ b/misc/options.c
@@ -13,6 +13,7 @@
 #include "ntddk.h"
 #include "wine/library.h"
 #include "options.h"
+#include "loadorder.h"
 #include "version.h"
 #include "debugtools.h"
 
@@ -31,7 +32,6 @@
 {
     NULL,           /* desktopGeometry */
     NULL,           /* display */
-    NULL,           /* dllFlags */
     FALSE,          /* synchronous */
     FALSE           /* Managed windows */
 };
@@ -62,7 +62,6 @@
 static void do_debugmsg( const char *arg );
 static void do_desktop( const char *arg );
 static void do_display( const char *arg );
-static void do_dll( const char *arg );
 static void do_help( const char *arg );
 static void do_language( const char *arg );
 static void do_managed( const char *arg );
@@ -77,7 +76,7 @@
       "--desktop geom   Use a desktop window of the given geometry" },
     { "display",      0, 1, 0, do_display,
       "--display name   Use the specified display" },
-    { "dll",          0, 1, 1, do_dll,
+    { "dll",          0, 1, 1, MODULE_AddLoadOrderOption,
       "--dll name       Enable or disable built-in DLLs" },
     { "dosver",       0, 1, 1, VERSION_ParseDosVersion,
       "--dosver x.xx    DOS version to imitate (e.g. 6.22)\n"
@@ -125,22 +124,6 @@
     Options.display = xstrdup( arg );
 }
 
-static void do_dll( const char *arg )
-{
-    if (Options.dllFlags)
-    {
-        Options.dllFlags = (char *) realloc ( Options.dllFlags, 
-					    strlen ( Options.dllFlags ) + strlen ( arg ) + 2 );
-	if ( !Options.dllFlags ) out_of_memory(); 
-	strcat ( Options.dllFlags, "+" );
-	strcat ( Options.dllFlags, arg );
-    }
-    else 
-    {
-        Options.dllFlags = xstrdup( arg );
-    }
-}
-
 static void do_language( const char *arg )
 {
     SetEnvironmentVariableA( "LANGUAGE", arg );