commit a3e0cfc5fb2fd9a967e76685eb877918b4bb0ab3
author Alexandre Julliard <julliard@winehq.org> Sun Jul 16 18:21:34 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Jul 16 18:21:34 2000 +0000
tree ae93245e206ed67afb7e97c0d0af056bb8710ca4
parent 56adb25f7df07fc00c6b8785612475c2210685af

Get full path of argv[0] before we change directories.
Make sure process names are long path names.
Cleaned up initialisation a bit.

scheduler/client.c

diff --git a/scheduler/client.c b/scheduler/client.c
index dbe1af3..5888975 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -459,6 +459,20 @@
         break;
     }
 
+    /* if argv[0] is a relative path, make it absolute */
+    full_argv0 = argv0;
+    if (oldcwd && argv0[0] != '/' && strchr( argv0, '/' ))
+    {
+        char *new_argv0 = malloc( strlen(oldcwd) + strlen(argv0) + 2 );
+        if (new_argv0)
+        {
+            strcpy( new_argv0, oldcwd );
+            strcat( new_argv0, "/" );
+            strcat( new_argv0, argv0 );
+            full_argv0 = new_argv0;
+        }
+    }
+
     /* get the server directory name */
     if (gethostname( hostname, sizeof(hostname) ) == -1) fatal_perror( "gethostname" );
     configdir = get_config_dir();

scheduler/process.c

diff --git a/scheduler/process.c b/scheduler/process.c
index 8aea56c..656e81d 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -171,13 +171,18 @@
 
 
 /***********************************************************************
- *           PROCESS_Init
+ *           process_init
+ *
+ * Main process initialisation code
  */
-BOOL PROCESS_Init(void)
+static BOOL process_init( char *argv[] )
 {
     struct init_process_request *req;
     PDB *pdb = PROCESS_Current();
 
+    /* store the program name */
+    argv0 = argv[0];
+
     /* Fill the initial process structure */
     pdb->exit_code              = STILL_ACTIVE;
     pdb->threads                = 1;
@@ -227,7 +232,10 @@
     /* Initialize syslevel handling */
     SYSLEVEL_Init();
 
-    return TRUE;
+    /* Parse command line arguments */
+    OPTIONS_ParseOptions( argv );
+
+    return MAIN_MainInit();
 }
 
 
@@ -396,8 +404,8 @@
     {
         /* if no explicit filename, use argv[0] */
         if (!(filename = malloc( MAX_PATH ))) ExitProcess(1);
-        if (!GetFullPathNameA( argv0, MAX_PATH, filename, NULL ))
-            lstrcpynA( filename, argv0, MAX_PATH );
+        if (!GetLongPathNameA( full_argv0, filename, MAX_PATH ))
+            lstrcpynA( filename, full_argv0, MAX_PATH );
     }
 
     /* load main module */
@@ -432,7 +440,7 @@
     DWORD type;
 
     /* Initialize everything */
-    if (!MAIN_MainInit( argv )) exit(1);
+    if (!process_init( argv )) exit(1);
 
     main_exe_argv = ++argv;  /* remove argv[0] (wine itself) */
 
@@ -519,7 +527,7 @@
 {
     HMODULE main_module;
 
-    if (!MAIN_MainInit( argv )) exit(1);
+    if (!process_init( argv )) exit(1);
 
     /* create 32-bit module for main exe */
     if (!(main_module = BUILTIN32_LoadExeModule())) ExitProcess( GetLastError() );
@@ -636,11 +644,11 @@
     execve( argv[0], argv, envp );
 
     /* now try the path of argv0 of the current binary */
-    if (!(argv[0] = malloc( strlen(argv0) + 6 ))) return;
-    if ((ptr = strrchr( argv0, '/' )))
+    if (!(argv[0] = malloc( strlen(full_argv0) + 6 ))) return;
+    if ((ptr = strrchr( full_argv0, '/' )))
     {
-        memcpy( argv[0], argv0, ptr - argv0 );
-        strcpy( argv[0] + (ptr - argv0), "/wine" );
+        memcpy( argv[0], full_argv0, ptr - full_argv0 );
+        strcpy( argv[0] + (ptr - full_argv0), "/wine" );
         execve( argv[0], argv, envp );
     }
     free( argv[0] );
@@ -781,7 +789,7 @@
     }
     else  /* new wine process */
     {
-        if (!GetFullPathNameA( filename, server_remaining(req->filename), req->filename, NULL ))
+        if (!GetLongPathNameA( filename, req->filename, server_remaining(req->filename) ))
             lstrcpynA( req->filename, filename, server_remaining(req->filename) );
     }
     if (server_call( REQ_NEW_PROCESS )) return FALSE;