Changeset 1855 for trunk/src

Timestamp:

Nov 27, 1999, 1:10:22 AM (26 years ago)

Author:

sandervl

Message:

several fixes + changes

Location:

trunk/src/user32

Files:

• oslibmsg.cpp (modified) (2 diffs)
• oslibmsg.h (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)
• user32.cpp (modified) (3 diffs)
• windowmsg.cpp (modified) (3 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.12 1999-11-24 20:11:36 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.13 1999-11-27 00:10:20 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -247 +247 @@
 }
 //******************************************************************************
-//******************************************************************************
+//TODO: QS_HOTKEY
+//******************************************************************************
+ULONG OSLibWinQueryQueueStatus()
+{
+ ULONG statusOS2, statusWin32;
+
+   statusOS2 = WinQueryQueueStatus(HWND_DESKTOP);
+
+   if(statusOS2 & QS_KEY)
+        statusWin32 |= QS_KEY_W;
+   if(statusOS2 & QS_MOUSEBUTTON)    
+        statusWin32 |= QS_MOUSEBUTTON_W;
+   if(statusOS2 & QS_MOUSEMOVE)
+        statusWin32 |= QS_MOUSEMOVE_W;
+   if(statusOS2 & QS_TIMER)    
+        statusWin32 |= QS_TIMER_W;
+   if(statusOS2 & QS_PAINT)    
+        statusWin32 |= QS_PAINT_W;
+   if(statusOS2 & QS_POSTMSG)    
+        statusWin32 |= QS_POSTMESSAGE_W;
+   if(statusOS2 & QS_SENDMSG)    
+        statusWin32 |= QS_SENDMESSAGE_W;
+
+   return statusWin32;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibmsg.h

@@ -1 @@
-/* $Id: oslibmsg.h,v 1.4 1999-11-10 14:16:45 sandervl Exp $ */
+/* $Id: oslibmsg.h,v 1.5 1999-11-27 00:10:20 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -33 +33 @@
 BOOL  OSLibInitMsgQueue();
 BOOL  OSLibWinWaitMessage();
+
+ULONG OSLibWinQueryQueueStatus();
 
 #define WINWM_NULL                  0x0000

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.57 1999-11-26 17:06:08 cbratschi Exp $ */
+/* $Id: pmwindow.cpp,v 1.58 1999-11-27 00:10:20 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -692 +692 @@
         dprintf(("PM: WM_CHAR: %x %x %d %x", SHORT1FROMMP(mp2), SHORT2FROMMP(mp2), repeatCount, scanCode));
         dprintf(("PM: WM_CHAR: %x", flags));
+
+        // vitali add begin
+        if ( ( SHORT1FROMMP(mp2) & 0x0FF ) == 0x0E0 )
+        {
+            // an extended key ( arrows, ins, del and so on )
+            // get "virtual" scancode from character code cause
+            // for "regular" keys they are equal
+            scanCode = ( SHORT1FROMMP(mp2) >> 8) & 0x0FF;
+        }       
+        // vitali add end
+
         // both WM_KEYUP & WM_KEYDOWN want a virtual key, find the right Win32 virtual key
         // given the OS/2 virtual key and OS/2 character

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.56 1999-11-26 17:06:08 cbratschi Exp $ */
+/* $Id: user32.cpp,v 1.57 1999-11-27 00:10:21 sandervl Exp $ */
 
 /*
@@ -1571 +1571 @@
 }
 
-/* Synchronization Functions */
-ODINFUNCTION5(DWORD,MsgWaitForMultipleObjects,DWORD,    nCount,
-                                              LPHANDLE, pHandles,
-                                              BOOL,     fWaitAll,
-                                              DWORD,    dwMilliseconds,
-                                              DWORD,    dwWakeMask)
-{
-  // @@@PH that's a really difficult function to implement
-
-  // @@@PH this is a temporary bugfix for WINFILE.EXE
-  if (nCount == 0)
-  {
-    // only listens to incoming thread messages.
-    return (WAIT_OBJECT_0);
-  }
-
-  return O32_MsgWaitForMultipleObjects(nCount,pHandles,fWaitAll,dwMilliseconds,dwWakeMask);
-}
-
 /* Button Functions */
 
@@ -1874 +1855 @@
 /* Message and Message Queue Functions */
 
-/*****************************************************************************
- * Name      : BOOL WIN32API GetInputState
- * Purpose   : The GetInputState function determines whether there are
- *             mouse-button or keyboard messages in the calling thread's message queue.
- * Parameters:
- * Variables :
- * Result    : If the queue contains one or more new mouse-button or keyboard
- *               messages, the return value is TRUE.
- *             If the function fails, the return value is FALSE.
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
- *****************************************************************************/
-BOOL WIN32API GetInputState(VOID)
-{
-  dprintf(("USER32:GetInputState () not implemented.\n"));
-
-  return (FALSE);
-}
-//******************************************************************************
-//******************************************************************************
-DWORD WIN32API GetQueueStatus( UINT flags)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  GetQueueStatus\n");
-#endif
-    return O32_GetQueueStatus(flags);
-}
 
 /* Font and Text Functions */

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.6 1999-11-24 19:32:23 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.7 1999-11-27 00:10:22 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -9 +9 @@
  * Copyright 1993, 1994 Alexandre Julliard
  *
+ * TODO: GetQueueStatus: QS_HOTKEY (oslibmsg.cpp) & low word bits
+ * TODO: MsgWaitForMultipleObjects: timeout isn't handled correctly (can return too late)
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -1017 +1019 @@
         return WINPROC_CallProc32WTo32A( func, hwnd, msg, wParam, lParam);
 }
+//******************************************************************************
+//TODO: QS_HOTKEY (oslibmsg.cpp) & low word bits
+//high word = messages currently in queue
+//low word  = messages that have been added to the queue and are still in the
+//            queue since the last call to GetQueueStatus
+//******************************************************************************
+DWORD WIN32API GetQueueStatus( UINT flags)
+{
+ DWORD queueStatus;
+
+    dprintf(("USER32:  GetQueueStatus"));
+    queueStatus = OSLibWinQueryQueueStatus();
+ 
+    queueStatus = MAKELONG(queueStatus, queueStatus);
+    return queueStatus & MAKELONG(flags, flags);
+}
+/*****************************************************************************
+ * Name      : BOOL WIN32API GetInputState
+ * Purpose   : The GetInputState function determines whether there are
+ *             mouse-button or keyboard messages in the calling thread's message queue.
+ * Parameters:
+ * Variables :
+ * Result    : If the queue contains one or more new mouse-button or keyboard
+ *               messages, the return value is TRUE.
+ *             If the function fails, the return value is FALSE.
+ * Remark    :
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
+ *****************************************************************************/
+BOOL WIN32API GetInputState(VOID)
+{
+ DWORD queueStatus;
+
+  dprintf(("USER32:GetInputState()"));
+  queueStatus = OSLibWinQueryQueueStatus();
+
+  return (queueStatus & (QS_KEY | QS_MOUSEBUTTON)) ? TRUE : FALSE;
+}
+//******************************************************************************
+/* Synchronization Functions */
+//******************************************************************************
+DWORD MsgWaitForMultipleObjects(DWORD nCount, LPHANDLE pHandles, BOOL fWaitAll,
+                                DWORD dwMilliseconds, DWORD dwWakeMask)
+{
+ DWORD curtime, endtime;
+
+  dprintf(("MsgWaitForMultipleObjects %x %x %d %d %x", nCount, pHandles, fWaitAll, dwMilliseconds, dwWakeMask));
+  // @@@PH this is a temporary bugfix for WINFILE.EXE
+  if (nCount == 0)
+  {
+        if(dwMilliseconds == 0) {
+                if(GetQueueStatus(dwWakeMask) == 0) {
+                        return WAIT_TIMEOUT;
+                }
+                return WAIT_OBJECT_0;
+        }
+        //SvL: Check time, wait for any message, check msg type and determine if
+        //     we have to return
+        //TODO: Timeout isn't handled correctly (can return too late)
+        curtime = GetCurrentTime();
+        endtime = curtime + dwMilliseconds;
+        while(curtime < endtime || dwMilliseconds == INFINITE) {
+                if(OSLibWinWaitMessage() == FALSE) {
+                        dprintf(("OSLibWinWaitMessage returned FALSE!"));
+                        return -1;
+                }
+                if(GetQueueStatus(dwWakeMask) != 0) {
+                        return WAIT_OBJECT_0;
+                }
+                curtime = GetCurrentTime();
+        }
+        return WAIT_TIMEOUT;
+  }
+  return O32_MsgWaitForMultipleObjects(nCount,pHandles,fWaitAll,dwMilliseconds,dwWakeMask);
+}