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

Timestamp:

Jan 14, 2001, 6:16:55 PM (25 years ago)

Author:

sandervl

Message:

odininst update, CreateProcess fix & workaround for PM hang in WaitForSingleObject (process handle)

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.110 2000-11-23 19:23:51 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.111 2001-01-14 17:16:55 sandervl Exp $ */
 
 /*
@@ -1568 +1568 @@
         sprintf(cmdline, "%s", lpCommandLine);
     }
+
     char szAppName[255];
+    DWORD fileAttr;
     char *exename = szAppName;
     strncpy(szAppName, cmdline, sizeof(szAppName));
@@ -1576 +1578 @@
         while(*exename != 0 && *exename != '"')
              exename++;
+
+        if(*exename != 0) {
+             *exename = 0;
+        }
+        exename = &szAppName[1];
     }
     else {
+        BOOL fTerminate = FALSE;
+        DWORD fileAttr;
+
         //TODO: doesn't work for directories with spaces!
-        while(*exename != 0 && *exename != ' ' && *exename != '"')
-             exename++;
-    }
-    if(*exename != 0) {
-         *exename = 0;
-    }
-    if(szAppName[0] == '"') {
-        exename = &szAppName[1];
-    }
-    else exename = szAppName;
-
-    if(GetFileAttributesA(exename) == -1) {
+        while(*exename != 0) {
+             while(*exename != 0 && *exename != ' ')
+                  exename++;
+
+             if(*exename != 0) {
+                  *exename = 0;
+                  fTerminate = TRUE;
+             }
+
+             fileAttr = GetFileAttributesA(szAppName);
+             if(fileAttr != -1 && !(fileAttr & FILE_ATTRIBUTE_DIRECTORY)) {
+                  break;
+             }
+             if(fTerminate) {
+                  *exename = ' ';
+                  exename++;
+                  fTerminate = FALSE;
+             }
+        }
+        exename = szAppName;
+    }
+    fileAttr = GetFileAttributesA(exename);
+    if(fileAttr == -1 || (fileAttr & FILE_ATTRIBUTE_DIRECTORY)) {
         dprintf(("CreateProcess: can't find executable!"));
         SetLastError(ERROR_FILE_NOT_FOUND);
         return FALSE;
     }
+
     dprintf(("KERNEL32:  CreateProcess %s\n", cmdline));