Changeset 3897 for trunk/src

Timestamp:

Jul 26, 2000, 8:06:22 PM (25 years ago)

Author:

sandervl

Message:

fixed wrong error translation for WaitForSingleObject

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (2 diffs)
• critsection.cpp (modified) (2 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.43 2000-07-17 00:40:17 phaller Exp $ */
+/* $Id: HandleManager.cpp,v 1.44 2000-07-26 18:06:21 sandervl Exp $ */
 
 /*
@@ -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 */
 }

trunk/src/kernel32/critsection.cpp

@@ -1 @@
-/* $Id: critsection.cpp,v 1.5 2000-03-29 17:17:17 sandervl Exp $ */
+/* $Id: critsection.cpp,v 1.6 2000-07-26 18:06:22 sandervl Exp $ */
 /*
  * Win32 critical sections
@@ -115 +115 @@
             RtlRaiseException( &rec );
 #endif
+            dprintf(("ERROR: EnterCritSection: WaitForSingleObject returned %d -> RaiseException", res));
             RaiseException(EXCEPTION_CRITICAL_SECTION_WAIT, 0, 1, (DWORD *)crit);
         }