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

Timestamp:

Jun 27, 2001, 3:35:47 PM (24 years ago)

Author:

sandervl

Message:

reset FPU before calling entrypoints; search executable in CreateProcess

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.126 2001-06-15 18:58:39 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.127 2001-06-27 13:35:47 sandervl Exp $ */
 
 /*
@@ -1660 +1660 @@
     }
 
-    char szAppName[255];
+    char szAppName[MAX_PATH];
+    char buffer[MAX_PATH];
     DWORD fileAttr;
-    char *exename = szAppName;
-    strncpy(szAppName, cmdline, sizeof(szAppName));
-    szAppName[254] = 0;
+    char *exename = buffer;
+    strncpy(buffer, cmdline, sizeof(szAppName));
+    buffer[MAX_PATH-1] = 0;
     if(*exename == '"') {
         exename++;
@@ -1673 +1674 @@
              *exename = 0;
         }
-        exename = &szAppName[1];
+        exename++;
+        if (SearchPathA( NULL, &buffer[1], ".exe", sizeof(szAppName), szAppName, NULL ) ||
+            SearchPathA( NULL, &buffer[1], NULL, sizeof(szAppName), szAppName, NULL )) 
+        {
+            //
+        }
     }
     else {
@@ -1687 +1693 @@
                   fTerminate = TRUE;
              }
-
-             fileAttr = GetFileAttributesA(szAppName);
-             if(fileAttr != -1 && !(fileAttr & FILE_ATTRIBUTE_DIRECTORY)) {
-                  break;
+             dprintf(("Trying '%s'", buffer ));
+             if (SearchPathA( NULL, buffer, ".exe", sizeof(szAppName), szAppName, NULL ) ||
+                 SearchPathA( NULL, buffer, NULL, sizeof(szAppName), szAppName, NULL ))
+             {
+                 if(fTerminate) exename++;
+                 break;
              }
+
              if(fTerminate) {
                   *exename = ' ';
@@ -1698 +1707 @@
              }
         }
-        exename = szAppName;
-    }
-    fileAttr = GetFileAttributesA(exename);
+    }
+    lpCommandLine = exename; //start of command line parameters
+
+    fileAttr = GetFileAttributesA(szAppName);
     if(fileAttr == -1 || (fileAttr & FILE_ATTRIBUTE_DIRECTORY)) {
         dprintf(("CreateProcess: can't find executable!"));
@@ -1707 +1717 @@
     }
 
-    dprintf(("KERNEL32: CreateProcess %s\n", cmdline));
+    dprintf(("KERNEL32: CreateProcess %s %s", szAppName, lpCommandLine));
 
     DWORD Characteristics, SubSystem, fNEExe;
-    if(Win32ImageBase::isPEImage(exename, &Characteristics, &SubSystem, &fNEExe) == 0) {
+    if(Win32ImageBase::isPEImage(szAppName, &Characteristics, &SubSystem, &fNEExe) == 0) {
         char *lpszPE;
         if(SubSystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) {
@@ -1722 +1732 @@
             char *newcmdline;
 
-            newcmdline = (char *)malloc(strlen(lpCurrentDirectory) + strlen(cmdline) + 32);
-            sprintf(newcmdline, "%s /OPT:[CURDIR=%s] %s", lpszPE, lpCurrentDirectory, cmdline);
+            newcmdline = (char *)malloc(strlen(lpCurrentDirectory) + strlen(szAppName) + strlen(lpCommandLine) + 32);
+            sprintf(newcmdline, "%s /OPT:[CURDIR=%s] %s %s", lpszPE, lpCurrentDirectory, szAppName, lpCommandLine);
             free(cmdline);
             cmdline = newcmdline;
@@ -1730 +1740 @@
             char *newcmdline;
 
-            newcmdline = (char *)malloc(strlen(cmdline) + 16);
-            sprintf(newcmdline, "%s %s", lpszPE, cmdline);
+            newcmdline = (char *)malloc(strlen(szAppName) + strlen(lpCommandLine) + 16);
+            sprintf(newcmdline, "%s %s %s", lpszPE, szAppName, lpCommandLine);
             free(cmdline);
             cmdline = newcmdline;
@@ -1744 +1754 @@
         char *newcmdline;
 
-        newcmdline = (char *)malloc(strlen(cmdline) + 16);
-        sprintf(newcmdline, "w16odin.exe %s", cmdline);
+        newcmdline = (char *)malloc(strlen(szAppName) + strlen(cmdline) + 16);
+        sprintf(newcmdline, "w16odin.exe %s", szAppName, lpCommandLine);
         free(cmdline);
         cmdline = newcmdline;
@@ -1756 +1766 @@
     }
     else {//os/2 app??
-        rc = O32_CreateProcess(NULL, (LPCSTR)cmdline,lpProcessAttributes,
+        rc = O32_CreateProcess(szAppName, (LPCSTR)lpCommandLine, lpProcessAttributes,
                                lpThreadAttributes, bInheritHandles, dwCreationFlags,
                                lpEnvironment, lpCurrentDirectory, lpStartupInfo,