Changeset 6340 for trunk/src

Timestamp:

Jul 15, 2001, 5:18:58 PM (24 years ago)

Author:

sandervl

Message:

Do not use imports not available in Warp 3's PMWINX (WaitForInputIdle)

Location:

trunk/src/kernel32

Files:

• initterm.cpp (modified) (3 diffs)
• initterm.h (modified) (2 diffs)
• wprocess.cpp (modified) (3 diffs)

trunk/src/kernel32/initterm.cpp

@@ -59 +59 @@
 
 PVOID   SYSTEM _O32_GetEnvironmentStrings( VOID );
+BOOL  fVersionWarp3 = FALSE;
 
 /*-------------------------------------------------------------------*/
@@ -97 +98 @@
     size_t i;
     APIRET rc;
-    ULONG  ulSysinfo;
-
+    ULONG  ulSysinfo, version[2];
+    
     /*-------------------------------------------------------------------------*/
     /* If ulFlag is zero then the DLL is being loaded so initialization should */
@@ -196 +197 @@
                 ulSysinfo = 1;
 
+            rc = DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_MINOR, version, sizeof(version));
+            if(rc == 0){
+                if(version[0] >= 20 && version[1] <= 30) {
+                    fVersionWarp3 = TRUE;
+                }
+            }
+
             /* Setup codepage info */
             CODEPAGE_Init();

trunk/src/kernel32/initterm.h

@@ -1 @@
-/* $Id: initterm.h,v 1.6 2000-10-21 14:30:47 sandervl Exp $ */
+/* $Id: initterm.h,v 1.7 2001-07-15 15:18:57 sandervl Exp $ */
 /*
  * KERNEL32 DLL entry point header
@@ -30 +30 @@
 extern int globLoadNr; //global data
 extern int loadNr;
+extern BOOL fVersionWarp3;
 
 /* Tue 03.03.1998: knut */

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.129 2001-07-10 20:41:50 bird Exp $ */
+/* $Id: wprocess.cpp,v 1.130 2001-07-15 15:18:58 sandervl Exp $ */
 
 /*
@@ -43 +43 @@
 #include <wprocess.h>
 #include "mmap.h"
+#include "initterm.h"
 
 #define DBG_LOCALLOG    DBG_wprocess
@@ -1869 +1870 @@
     //block until the launched app waits for input (or a timeout of 15 seconds)
     //TODO: Shouldn't call Open32, but the api in user32..
-    rc = O32_WaitForInputIdle(procinfo.hProcess, 15000);
-    if(rc != 0) {
-        dprintf(("WinExec: WaitForInputIdle %x returned %x", procinfo.hProcess, rc));
+    if(fVersionWarp3) {
+        Sleep(1000); //WaitForInputIdle not available in Warp 3
+    }
+    else {
+        rc = O32_WaitForInputIdle(procinfo.hProcess, 15000);
+        if(rc != 0) {
+            dprintf(("WinExec: WaitForInputIdle %x returned %x", procinfo.hProcess, rc));
+        }
     }
     CloseHandle(procinfo.hThread);