commit c192ba24687d1016a4a990236b1f53ae463e58d3
author Alexandre Julliard <julliard@winehq.org> Mon May 29 21:25:10 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon May 29 21:25:10 2000 +0000
tree fb264c7d8ea5587f26bf4e918ff916c0cb6f40c3
parent 8f65001f781c3e07fe555def3b018ff1952a01ee

Exec a separate wine binary for every win32 process so that they run
in separate address spaces.
Run 16-bit tasks as Win32 threads, not processes.

misc/options.c

diff --git a/misc/options.c b/misc/options.c
index ff47176..37cc31c 100644
--- a/misc/options.c
+++ b/misc/options.c
@@ -27,6 +27,20 @@
 int _ARGC;
 char **_ARGV;
 
+/* default options */
+struct options Options =
+{
+    NULL,           /* desktopGeometry */
+    NULL,           /* display */
+    NULL,           /* dllFlags */
+    FALSE,          /* synchronous */
+    0,              /* language */
+    FALSE,          /* Managed windows */
+    NULL            /* Alternate config file name */
+};
+
+const char *argv0;
+
 static void do_config( const char *arg );
 static void do_desktop( const char *arg );
 static void do_display( const char *arg );
@@ -116,10 +130,9 @@
     Options.configFileName = strdup( arg );
 }
 
-static inline void remove_options( int *argc, char *argv[], int pos, int count )
+static inline void remove_options( char *argv[], int pos, int count )
 {
     while ((argv[pos] = argv[pos+count])) pos++;
-    *argc -= count;
 }
 
 /***********************************************************************
@@ -128,7 +141,7 @@
 void OPTIONS_Usage(void)
 {
     const struct option *opt;
-    MESSAGE( "Usage: %s [options] \"program_name [arguments]\"\n\n", argv0 );
+    MESSAGE( "Usage: %s [options] program_name [arguments]\n\n", argv0 );
     MESSAGE( "Options:\n" );
     for (opt = option_table; opt->longname; opt++) MESSAGE( "   %s\n", opt->usage );
     ExitProcess(0);
@@ -137,7 +150,7 @@
 /***********************************************************************
  *              OPTIONS_ParseOptions
  */
-void OPTIONS_ParseOptions( int argc, char *argv[] )
+void OPTIONS_ParseOptions( char *argv[] )
 {
     const struct option *opt;
     int i;
@@ -163,12 +176,12 @@
         if (opt->has_arg && argv[i+1])
         {
             opt->func( argv[i+1] );
-            remove_options( &argc, argv, i, 2 );
+            remove_options( argv, i, 2 );
         }
         else
         {
             opt->func( "" );
-            remove_options( &argc, argv, i, 1 );
+            remove_options( argv, i, 1 );
         }
         i--;
     }
@@ -178,7 +191,7 @@
     {
         if (!strcmp( argv[i], "--" ))
         {
-            remove_options( &argc, argv, i, 1 );
+            remove_options( argv, i, 1 );
             break;
         }
         if (argv[i][0] == '-')
@@ -187,8 +200,9 @@
             OPTIONS_Usage();
         }
     }
-    Options.argc = argc;
-    Options.argv = argv;
-    _ARGC = argc;
+
+    /* count the resulting arguments */
     _ARGV = argv;
+    _ARGC = 0;
+    while (argv[_ARGC]) _ARGC++;
 }