Changeset 1267 for trunk/src/user32/user32.cpp

Timestamp:

Oct 13, 1999, 6:05:25 PM (26 years ago)

Author:

phaller

Message:

Fix: parameter checking in RedrawWindow and temp fix for MsgWaitForMultipleObjects

File:

• trunk/src/user32/user32.cpp (modified) (4 diffs)

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.40 1999-10-13 14:24:25 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.41 1999-10-13 16:02:42 phaller Exp $ */
 
 /*
@@ -22 +22 @@
 //Attention: many functions belong to other subsystems, move them to their
 //           right place!
+
+#include <odin.h>
+#include <odinwrap.h>
+#include <os2sel.h>
 
 #include <os2win.h>
@@ -74 +78 @@
 // WIN32API YieldTask
 
+ODINDEBUGCHANNEL(USER32-USER32)
+
+
 /* Coordinate Transformation */
 
@@ -1796 +1803 @@
 
 /* Synchronization Functions */
-
-DWORD WIN32API MsgWaitForMultipleObjects( DWORD nCount, LPHANDLE pHandles, BOOL fWaitAll, DWORD dwMilliseconds, DWORD  dwWakeMask)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  MsgWaitForMultipleObjects\n");
-#endif
-    return O32_MsgWaitForMultipleObjects(nCount,pHandles,fWaitAll,dwMilliseconds,dwWakeMask);
+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);
 }