diff --git a/reactos/lib/user32/misc/stubs.c b/reactos/lib/user32/misc/stubs.c
index 511f1030610..527603e359d 100644
--- a/reactos/lib/user32/misc/stubs.c
+++ b/reactos/lib/user32/misc/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.27 2003/07/27 11:54:42 dwelch Exp $
+/* $Id: stubs.c,v 1.28 2003/08/02 16:56:13 gdalsnes Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -218,19 +218,6 @@ GetMouseMovePointsEx(
 }
 
 
-/*
- * @unimplemented
- */
-DWORD
-STDCALL
-GetQueueStatus(
-  UINT flags)
-{
-  UNIMPLEMENTED;
-  return 0;
-}
-
-
 /*
  * @unimplemented
  */
diff --git a/reactos/lib/user32/windows/input.c b/reactos/lib/user32/windows/input.c
index d9419b8723a..42031590e54 100644
--- a/reactos/lib/user32/windows/input.c
+++ b/reactos/lib/user32/windows/input.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: input.c,v 1.9 2003/07/20 05:32:19 jimtabor Exp $
+/* $Id: input.c,v 1.10 2003/08/02 16:55:59 gdalsnes Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -91,16 +91,6 @@ GetKeyboardLayout(DWORD idThread)
 }
 
 
-/*
- * @unimplemented
- */
-WINBOOL STDCALL GetInputState(VOID)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
-
 /*
  * @unimplemented
  */
diff --git a/reactos/lib/user32/windows/message.c b/reactos/lib/user32/windows/message.c
index e0651e63bec..038353f8b7b 100644
--- a/reactos/lib/user32/windows/message.c
+++ b/reactos/lib/user32/windows/message.c
@@ -1,4 +1,4 @@
-/* $Id: message.c,v 1.21 2003/08/01 18:45:35 dwelch Exp $
+/* $Id: message.c,v 1.22 2003/08/02 16:55:59 gdalsnes Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -746,6 +746,54 @@ ReleaseCapture(VOID)
 }
 
 
+/*
+ * @unimplemented
+ */
+DWORD
+STDCALL
+GetQueueStatus(UINT flags)
+{
+   DWORD ret;
+   WORD changed_bits, wake_bits; 
+
+#if 0 /* wine stuff. don't know what it does... */
+
+   /* check for pending X events */
+   if (USER_Driver.pMsgWaitForMultipleObjectsEx)
+      USER_Driver.pMsgWaitForMultipleObjectsEx( 0, NULL, 0, 0, 0 );
+#endif
+
+   ret = NtUserGetQueueStatus(TRUE /*ClearChanges*/);
+
+   changed_bits = LOWORD(ret);
+   wake_bits = HIWORD(ret);
+
+   return MAKELONG(changed_bits & flags, wake_bits & flags);
+}
+
+
+/*
+ * @unimplemented
+ */
+WINBOOL STDCALL GetInputState(VOID)
+{
+   DWORD ret;
+   WORD  wake_bits;
+
+#if 0 /* wine stuff. don't know what it does... */ 
+
+   /* check for pending X events */
+   if (USER_Driver.pMsgWaitForMultipleObjectsEx)
+     USER_Driver.pMsgWaitForMultipleObjectsEx( 0, NULL, 0, 0, 0 );
+#endif
+
+   ret = NtUserGetQueueStatus(FALSE /*ClearChanges*/);
+   
+   wake_bits = HIWORD(ret);
+
+   return wake_bits & (QS_KEY | QS_MOUSEBUTTON);
+}
+
 
 
 /* EOF */