Changeset 21555 for trunk/src

Timestamp:

Jan 12, 2011, 12:11:50 AM (15 years ago)

Author:

dmik

Message:

user32: Make GetQueueStatus() return actual message summary in high word instead of the copy of the low word (WinQueryQueueStatus() API provides this functionality according to my tests, despite unclear docs).

Location:

trunk/src/user32

Files:

• oslibmsg.cpp (modified) (2 diffs)
• windowmsg.cpp (modified) (1 diff)

trunk/src/user32/oslibmsg.cpp

@@ -554 +554 @@
     statusOS2 = WinQueryQueueStatus(HWND_DESKTOP);
 
+    // convert the flags since last call (low word)
+
     if(statusOS2 & QS_KEY)
         statusWin32 |= QS_KEY_W;
@@ -569 +571 @@
         statusWin32 |= QS_SENDMESSAGE_W;
 
+    // convert the summary flags (high word)
+
+    statusOS2 >>= 16;
+
+    if(statusOS2 & QS_KEY)
+        statusWin32 |= QS_KEY_W << 16;
+    if(statusOS2 & QS_MOUSEBUTTON)
+        statusWin32 |= QS_MOUSEBUTTON_W << 16;
+    if(statusOS2 & QS_MOUSEMOVE)
+        statusWin32 |= QS_MOUSEMOVE_W << 16;
+    if(statusOS2 & QS_TIMER)
+        statusWin32 |= QS_TIMER_W << 16;
+    if(statusOS2 & QS_PAINT)
+        statusWin32 |= QS_PAINT_W << 16;
+    if(statusOS2 & QS_POSTMSG)
+        statusWin32 |= QS_POSTMESSAGE_W << 16;
+    if(statusOS2 & QS_SENDMSG)
+        statusWin32 |= QS_SENDMESSAGE_W << 16;
+
     return statusWin32;
 }

trunk/src/user32/windowmsg.cpp

@@ -1120 +1120 @@
 
     queueStatus = OSLibWinQueryQueueStatus();
-    queueStatus = MAKELONG(queueStatus, queueStatus);
 
     dprintf(("USER32: GetQueueStatus %x returned %x", flags, queueStatus & MAKELONG(flags, flags)));