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

Timestamp:

Jun 8, 2001, 1:04:26 PM (24 years ago)

Author:

sandervl

Message:

pe loader optimizations, WritePrivateProfileStructA added (Wine), WinExec fix

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.120 2001-05-07 10:07:40 phaller Exp $ */
+/* $Id: wprocess.cpp,v 1.121 2001-06-08 11:04:26 sandervl Exp $ */
 
 /*
@@ -1696 +1696 @@
     
     DWORD Characteristics, SubSystem;
-    if(Win32ImageBase::isPEImage(exename, &Characteristics, &SubSystem)) {
-        dprintf(("CreateProcess: not a PE executable!!"));
-        SetLastError(ERROR_BAD_EXE_FORMAT);
-        return FALSE;
-    }
-
-    char *lpszPE;
-    if(SubSystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) {
-         lpszPE = "PEC.EXE";
-    }
-    else lpszPE = "PE.EXE";
-
-    //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, "%s /OPT:[CURDIR=%s] %s", lpszPE, lpCurrentDirectory, cmdline);
-        free(cmdline);
-        cmdline = newcmdline;
-    }
-    else {
-        char *newcmdline;
-
-        newcmdline = (char *)malloc(strlen(cmdline) + 16);
-        sprintf(newcmdline, "%s %s", lpszPE, cmdline);
-        free(cmdline);
-        cmdline = newcmdline;
-    }
-    rc = O32_CreateProcess(lpszPE, (LPCSTR)cmdline,lpProcessAttributes,
-                         lpThreadAttributes, bInheritHandles, dwCreationFlags,
-                         lpEnvironment, lpCurrentDirectory, lpStartupInfo,
-                         lpProcessInfo);
+    if(Win32ImageBase::isPEImage(exename, &Characteristics, &SubSystem) == 0) {
+        char *lpszPE;
+        if(SubSystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) {
+             lpszPE = "PEC.EXE";
+        }
+        else lpszPE = "PE.EXE";
+    
+        //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, "%s /OPT:[CURDIR=%s] %s", lpszPE, lpCurrentDirectory, cmdline);
+            free(cmdline);
+            cmdline = newcmdline;
+        }
+        else {
+            char *newcmdline;
+
+            newcmdline = (char *)malloc(strlen(cmdline) + 16);
+            sprintf(newcmdline, "%s %s", lpszPE, cmdline);
+            free(cmdline);
+            cmdline = newcmdline;
+        }
+        rc = O32_CreateProcess(lpszPE, (LPCSTR)cmdline,lpProcessAttributes,
+                               lpThreadAttributes, bInheritHandles, dwCreationFlags,
+                               lpEnvironment, lpCurrentDirectory, lpStartupInfo,
+                               lpProcessInfo);
+    }
+    else {//16 bits windows app
+        rc = O32_CreateProcess(NULL, (LPCSTR)cmdline,lpProcessAttributes,
+                               lpThreadAttributes, bInheritHandles, dwCreationFlags,
+                               lpEnvironment, lpCurrentDirectory, lpStartupInfo,
+                               lpProcessInfo);
+    }
     if(rc == TRUE)
     {
@@ -1795 +1797 @@
  PROCESS_INFORMATION procinfo;
  DWORD               rc;
+ HINSTANCE           hInstance;
 
     dprintf(("KERNEL32: WinExec %s\n", lpCmdLine));
@@ -1801 +1804 @@
                       &startinfo, &procinfo) == FALSE)
     {
-        return 0;
+        hInstance = (HINSTANCE)GetLastError();
+        if(hInstance >= 32) {
+            hInstance = 11;
+        }
+        dprintf(("KERNEL32: WinExec failed with rc %d", hInstance));
+        return hInstance;
     }
     //block until the launched app waits for input (or a timeout of 15 seconds)
@@ -1809 +1817 @@
         dprintf(("WinExec: WaitForInputIdle %x returned %x", procinfo.hProcess, rc));
     }
-    return procinfo.hProcess; //correct?
+    CloseHandle(procinfo.hThread);
+    CloseHandle(procinfo.hProcess);
+    return 33;
 }
 //******************************************************************************