Changeset 3837

Timestamp:

Jul 17, 2000, 2:40:55 AM (25 years ago)

Author:

phaller

Message:

Fix: HMWaitForSingleObject

Location:

trunk

Files:

• changelog (modified) (1 diff)
• src/kernel32/HandleManager.cpp (modified) (3 diffs)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.1034 2000-07-17 00:34:03 phaller Exp $ */
+ /* $Id: changelog,v 1.1035 2000-07-17 00:40:55 phaller Exp $ */
 
  2000-07-17: Patrick Haller <phaller@gmx.net>
     - KERNEL32: fixed ReadFile/WriteFile bugfix
+                fixed return codes for HMWaitForSingleObject
 
  2000-07-16: knut st. osmundsen <knut.stange.osmundsen@mynd.no>

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.42 2000-07-12 18:21:40 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.43 2000-07-17 00:40:17 phaller Exp $ */
 
 /*
@@ -70 +70 @@
 
                     /* this is the size of our currently static handle table */
-#define MAX_OS2_HMHANDLES 2048
+#define MAX_OS2_HMHANDLES 4096
 
 
@@ -1764 +1764 @@
   dwResult = pHMHandle->pDeviceHandler->WaitForSingleObject(&pHMHandle->hmHandleData,
                                                             dwTimeout);
-
+  // @@@PH Note: return code is wrong!
+  switch (dwResult)
+  {
+    case 1: // OS/2: ERROR_INVALID_FUNCTION
+      dprintf(("KERNEL32: HandleManager:HMWaitForSingleObject(%08xh) %s needs implementation\n",
+               pHMHandle->pDeviceHandler->lpHMDeviceName));
+      dwResult = WAIT_ABANDONED;
+      break;
+  
+    case 640: // OS/2: ERROR_TIMEOUT
+      dwResult = WAIT_TIMEOUT;
+      break;
+  
+    case 105: // ERROR_SEM_OWNER_DIED:
+    case 95:  // ERROR_INTERRUPT
+      dwResult = WAIT_ABANDONED;
+      break;
+      
+    case NO_ERROR:
+      dwResult = WAIT_OBJECT_0;
+      break;
+      
+    default:
+      SetLastError(dwResult);
+      dwResult = WAIT_FAILED;
+      break;
+  }
+  
   return (dwResult);                                  /* deliver return code */
 }