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

Timestamp:

Jun 11, 2001, 12:32:18 AM (24 years ago)

Author:

sandervl

Message:

CreateProcess: launch win16 loader for NE executables

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.122 2001-06-09 19:46:01 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.123 2001-06-10 22:32:18 sandervl Exp $ */
 
 /*
@@ -786 +786 @@
 
     //test if dll is in PE or LX format
-    fPE = Win32ImageBase::isPEImage(szModname, &Characteristics);
+    fPE = Win32ImageBase::isPEImage(szModname, &Characteristics, NULL);
 
     /** @sketch
@@ -1695 +1695 @@
     dprintf(("KERNEL32: CreateProcess %s\n", cmdline));
     
-    DWORD Characteristics, SubSystem;
-    if(Win32ImageBase::isPEImage(exename, &Characteristics, &SubSystem) == 0) {
+    DWORD Characteristics, SubSystem, fNEExe;
+    if(Win32ImageBase::isPEImage(exename, &Characteristics, &SubSystem, &fNEExe) == 0) {
         char *lpszPE;
         if(SubSystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) {
@@ -1726 +1726 @@
                                lpProcessInfo);
     }
-    else {//16 bits windows app
+    else 
+    if(fNEExe) {//16 bits windows app
+        char *newcmdline;
+        
+        newcmdline = (char *)malloc(strlen(cmdline) + 16);
+        sprintf(newcmdline, "w16odin.exe %s", cmdline);
+        free(cmdline);
+        cmdline = newcmdline;
+        //Force Open32 to use DosStartSession (DosExecPgm won't do)
+        dwCreationFlags |= CREATE_NEW_PROCESS_GROUP;
+        rc = O32_CreateProcess("w16odin.exe", (LPCSTR)cmdline, lpProcessAttributes,
+                               lpThreadAttributes, bInheritHandles, dwCreationFlags,
+                               lpEnvironment, lpCurrentDirectory, lpStartupInfo,
+                               lpProcessInfo);
+    }
+    else {//os/2 app??
         rc = O32_CreateProcess(NULL, (LPCSTR)cmdline,lpProcessAttributes,
                                lpThreadAttributes, bInheritHandles, dwCreationFlags,