Changeset 6339 for trunk/src

Timestamp:

Jul 15, 2001, 4:58:12 PM (24 years ago)

Author:

sandervl

Message:

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

Location:

trunk/src/user32

Files:

• initterm.cpp (modified) (4 diffs)
• initterm.h (modified) (2 diffs)
• user32.cpp (modified) (3 diffs)
• winkeyboard.cpp (modified) (3 diffs)

trunk/src/user32/initterm.cpp

@@ -26 +26 @@
 #define  INCL_DOSPROCESS
 #define  INCL_DOSSEMAPHORES
+#define  INCL_DOSMISC
 #include <os2wrap.h>    //Odin32 OS/2 api wrappers
 #include <stdlib.h>
@@ -61 +62 @@
 }
 DWORD hInstanceUser32 = 0;
+BOOL  fVersionWarp3 = FALSE;
 
 /****************************************************************************/
@@ -74 +76 @@
    size_t i;
    APIRET rc;
+   ULONG  version[2];
 
    /*-------------------------------------------------------------------------*/
@@ -95 +98 @@
 
          dprintf(("user32 init %s %s (%x)", __DATE__, __TIME__, DLLENTRYPOINT_NAME));
+
+         rc = DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_MINOR, version, sizeof(version));
+         if(rc == 0){
+              if(version[0] >= 20 && version[1] <= 30) {
+                  fVersionWarp3 = TRUE;
+              }
+         }
 
          /*******************************************************************/

trunk/src/user32/initterm.h

@@ -1 @@
-/* $Id: initterm.h,v 1.4 2001-04-05 09:31:27 sandervl Exp $ */
+/* $Id: initterm.h,v 1.5 2001-07-15 14:58:06 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
 
 extern DWORD hInstanceUser32;
+extern BOOL  fVersionWarp3;
 
 //winicon.cpp

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.108 2001-07-14 09:21:46 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.109 2001-07-15 14:58:07 sandervl Exp $ */
 
 /*
@@ -49 +49 @@
 #include <win32wnd.h>
 #include <winuser.h>
+#include "initterm.h"
 
 #define DBG_LOCALLOG    DBG_user32
@@ -990 +991 @@
   dprintf(("USER32: WaitForInputIdle %x %d\n", hProcess, dwTimeOut));
 
-  return O32_WaitForInputIdle(hProcess, dwTimeOut);
+  if(fVersionWarp3) {
+        Sleep(1000);
+        return 0;        
+  }
+  else  return O32_WaitForInputIdle(hProcess, dwTimeOut);
 }
 

trunk/src/user32/winkeyboard.cpp

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.13 2001-07-08 15:51:43 sandervl Exp $ */
+/* $Id: winkeyboard.cpp,v 1.14 2001-07-15 14:58:12 sandervl Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -16 +16 @@
 #include <pmscan.h>
 #include <winuser32.h>
+#include "initterm.h"
 
 #define DBG_LOCALLOG    DBG_winkeyboard
@@ -943 +944 @@
 {
     dprintf2(("USER32: GetAsyncKeyState %x", nVirtKey));
-    return O32_GetAsyncKeyState(nVirtKey);
+    if(fVersionWarp3) {//Not present in Warp 3's PMWINX
+          return O32_GetKeyState(nVirtKey);
+    }
+    else  return O32_GetAsyncKeyState(nVirtKey);
 }
 //******************************************************************************