Changeset 2271 for trunk/src

Timestamp:

Dec 30, 1999, 7:49:32 PM (26 years ago)

Author:

sandervl

Message:

handlemanager bugfix ((Msg)WaitForMultipleObjects)

Location:

trunk/src/kernel32

Files:

• Fileio.cpp (modified) (2 diffs)
• HandleManager.cpp (modified) (3 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.20 1999-12-29 18:49:49 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.21 1999-12-30 18:49:32 sandervl Exp $ */
 
 /*
@@ -241 +241 @@
 //******************************************************************************
 ODINFUNCTION1(BOOL, DeleteFileA,
-              LPCSTR, arg1)
-{
-  return O32_DeleteFile(arg1);
+              LPCSTR, lpszFile)
+{
+  dprintf(("DeleteFileA %s", lpszFile));
+  return O32_DeleteFile(lpszFile);
 }
 //******************************************************************************

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.32 1999-12-29 13:04:52 phaller Exp $ */
+/* $Id: HandleManager.cpp,v 1.33 1999-12-30 18:49:32 sandervl Exp $ */
 
 /*
@@ -2546 +2546 @@
 
     //  @@@PH to imlpement: check handle type!
-
+    // SvL: We still use Open32 handles for threads & processes -> don't fail here!
     if (rc != NO_ERROR)
     {
-      dprintf(("KERNEL32: HMWaitForMultipleObjects - ERROR: handle %08xh is NOT an Open32 handle (not yet implemented)\n",
+      dprintf(("KERNEL32: HMWaitForMultipleObjects - WARNING: handle %08xh is NOT an Odin handle (probably Open32 thread or process)\n",
                *pLoop1));
 
-      O32_SetLastError(ERROR_INVALID_HANDLE);
-      return (WAIT_FAILED);
+          *pLoop2 = *pLoop1;
+////      O32_SetLastError(ERROR_INVALID_HANDLE);
+////      return (WAIT_FAILED);
     }
   }
@@ -2641 +2642 @@
                                  pLoop2);
 
+    // SvL: We still use Open32 handles for threads & processes -> don't fail here!
     if (rc != NO_ERROR)
     {
-      O32_SetLastError(ERROR_INVALID_HANDLE);
-      return (WAIT_FAILED);
+      dprintf(("KERNEL32: HMMsgWaitForMultipleObjects - WARNING: handle %08xh is NOT an Odin handle (probably Open32 thread or process)\n",
+               *pLoop1));
+
+          *pLoop2 = *pLoop1;
+////      O32_SetLastError(ERROR_INVALID_HANDLE);
+////      return (WAIT_FAILED);
     }
   }