Index: win32/user32/windows/message.c
===================================================================
--- win32/user32/windows/message.c	(revision 40524)
+++ win32/user32/windows/message.c	(working copy)
@@ -2490,6 +2490,12 @@
    HeapFree(GetProcessHeap(), 0, RealHandles);
    NtUserMsqClearWakeMask();
 
+   /* Don't return the result of the internal MessageQueueHandle */
+   if (Result != WAIT_FAILED && Result != WAIT_TIMEOUT)
+   {
+      Result--;
+   }
+
    return Result;
 }