reactos/lib/user32/misc
diff -u -r1.71 -r1.72
--- stubs.c 25 Dec 2004 22:59:10 -0000 1.71
+++ stubs.c 27 Dec 2004 16:48:29 -0000 1.72
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.71 2004/12/25 22:59:10 navaraf Exp $
+/* $Id: stubs.c,v 1.72 2004/12/27 16:48:29 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll
@@ -112,23 +112,6 @@
/*
* @unimplemented
*/
-DWORD
-STDCALL
-MsgWaitForMultipleObjects(
- DWORD nCount,
- CONST HANDLE *pHandles,
- BOOL fWaitAll,
- DWORD dwMilliseconds,
- DWORD dwWakeMask)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
-
-/*
- * @unimplemented
- */
BOOL
STDCALL
TrackMouseEvent(
reactos/lib/user32/windows
diff -u -r1.47 -r1.48
--- message.c 25 Dec 2004 22:59:10 -0000 1.47
+++ message.c 27 Dec 2004 16:48:29 -0000 1.48
@@ -1,4 +1,4 @@
-/* $Id: message.c,v 1.47 2004/12/25 22:59:10 navaraf Exp $
+/* $Id: message.c,v 1.48 2004/12/27 16:48:29 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll
@@ -2075,11 +2075,36 @@
return Result;
}
-DWORD WINAPI MsgWaitForMultipleObjectsEx(DWORD nCount, CONST HANDLE *lpHandles, DWORD dwMilliseconds, DWORD dwWakeMask, DWORD dwFlags)
+/*
+ * @implemented
+ */
+DWORD WINAPI
+MsgWaitForMultipleObjectsEx(
+ DWORD nCount,
+ CONST HANDLE *lpHandles,
+ DWORD dwMilliseconds,
+ DWORD dwWakeMask,
+ DWORD dwFlags)
{
- return IsInsideMessagePumpHook() ? gmph.RealMsgWaitForMultipleObjectsEx(nCount, lpHandles, dwMilliseconds, dwWakeMask, dwFlags) : RealMsgWaitForMultipleObjectsEx(nCount, lpHandles,dwMilliseconds, dwWakeMask, dwFlags);
+ return IsInsideMessagePumpHook() ? gmph.RealMsgWaitForMultipleObjectsEx(nCount, lpHandles, dwMilliseconds, dwWakeMask, dwFlags) : RealMsgWaitForMultipleObjectsEx(nCount, lpHandles,dwMilliseconds, dwWakeMask, dwFlags);
}
+/*
+ * @implemented
+ */
+DWORD STDCALL
+MsgWaitForMultipleObjects(
+ DWORD nCount,
+ CONST HANDLE *lpHandles,
+ BOOL fWaitAll,
+ DWORD dwMilliseconds,
+ DWORD dwWakeMask)
+{
+ return MsgWaitForMultipleObjectsEx(nCount, lpHandles, dwMilliseconds,
+ dwWakeMask, fWaitAll ? MWMO_WAITALL : 0);
+}
+
+
BOOL FASTCALL MessageInit()
{
InitializeCriticalSection(&DdeCrst);