Changeset 4445 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Oct 6, 2000, 5:16:07 PM (25 years ago)

Author:

sandervl

Message:

changes for setting current dir of new process

File:

• trunk/src/kernel32/wprocess.cpp (modified) (3 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.101 2000-10-04 19:36:26 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.102 2000-10-06 15:16:07 sandervl Exp $ */
 
 /*
@@ -1563 +1563 @@
             }
             cmdline = (char *)malloc(strlen(lpApplicationName)+strlen(lpCommandLine) + 16);
-            sprintf(cmdline, "PE.EXE %s %s", lpApplicationName, lpCommandLine);
+            sprintf(cmdline, "%s %s", lpApplicationName, lpCommandLine);
          }
          else {
             cmdline = (char *)malloc(strlen(lpApplicationName) + 16);
-            sprintf(cmdline, "PE.EXE %s", lpApplicationName);
+            sprintf(cmdline, "%s", lpApplicationName);
         }
     }
     else {
         cmdline = (char *)malloc(strlen(lpCommandLine) + 16);
-        sprintf(cmdline, "PE.EXE %s", lpCommandLine);
+        sprintf(cmdline, "%s", lpCommandLine);
     }
     char szAppName[255];
     char *exename = szAppName;
-    strncpy(szAppName, &cmdline[7], sizeof(szAppName)); //skip pe.exe
+    strncpy(szAppName, cmdline, sizeof(szAppName));
     szAppName[254] = 0;
     if(*exename == '"') {
@@ -1600 +1600 @@
     }    
     dprintf(("KERNEL32:  CreateProcess %s\n", cmdline));
+
+    //SvL: Allright. Before we call O32_CreateProcess, we must take care of 
+    //     lpCurrentDirectory ourselves. (Open32 ignores it!)
+    if(lpCurrentDirectory) {
+        char *newcmdline;
+
+        newcmdline = (char *)malloc(strlen(lpCurrentDirectory) + strlen(cmdline) + 32);
+        sprintf(newcmdline, "PE.EXE /OPT:[CURDIR=%s] %s", lpCurrentDirectory, cmdline);
+        free(cmdline);
+        cmdline = newcmdline;
+    }
+    else {
+        char *newcmdline;
+
+        newcmdline = (char *)malloc(strlen(cmdline) + 16);
+        sprintf(newcmdline, "PE.EXE %s", cmdline);
+        free(cmdline);
+        cmdline = newcmdline;
+    }
     rc = O32_CreateProcess("PE.EXE", (LPCSTR)cmdline,lpProcessAttributes,
                          lpThreadAttributes, bInheritHandles, dwCreationFlags,
                          lpEnvironment, lpCurrentDirectory, lpStartupInfo,
                          lpProcessInfo);
-    if(rc == TRUE) {
+    if(rc == TRUE) 
+    {
       if (dwCreationFlags & DEBUG_PROCESS && pThreadDB != NULL)
       {