Changeset 6084 for trunk/src/kernel32/hmmutex.cpp

Timestamp:

Jun 23, 2001, 6:59:28 PM (24 years ago)

Author:

sandervl

Message:

semaphore updates

File:

• trunk/src/kernel32/hmmutex.cpp (modified) (6 diffs)

trunk/src/kernel32/hmmutex.cpp

@@ -1 @@
-/* $Id: hmmutex.cpp,v 1.6 2001-06-22 19:40:28 sandervl Exp $ */
+/* $Id: hmmutex.cpp,v 1.7 2001-06-23 16:59:28 sandervl Exp $ */
 
 /*
@@ -47 +47 @@
 #include "HandleManager.H"
 #include "HMMutex.h"
+#include "HMSemaphore.h"
 
 #define DBG_LOCALLOG    DBG_hmmutex
@@ -96 +97 @@
       strcat(szSemName, lpszMutexName);
       lpszMutexName = szSemName;
+      FixSemName((char *)lpszMutexName);
   }
   rc = DosCreateMutexSem(lpszMutexName, &htmx, 0, fInitialOwner);
@@ -165 +167 @@
   strcpy(szSemName, "\\SEM32\\");
   strcat(szSemName, lpszMutexName);
+  FixSemName(szSemName);
   rc = DosOpenMutexSem(szSemName, &hmtx);
   if(rc) {
@@ -376 +379 @@
                                                     DWORD      dwWakeMask)
 {
-    dprintf(("KERNEL32: ERROR: HandleManager::DeviceHandler::MsgWaitForMultipleObjects %08x %d %x %d %d %x",
-              pHMHandleData->hHMHandle, nCount, pHandles, fWaitAll, dwMilliseconds, dwWakeMask));
-
-    if(!(pHMHandleData->dwAccess & SYNCHRONIZE_W) )
-    {
-        dprintf(("ERROR: Access denied!!"));
-        SetLastError(ERROR_ACCESS_DENIED_W);
-        return WAIT_FAILED_W;
-    }
-    return WAIT_FAILED_W;
+    return HMSemMsgWaitForMultipleObjects(nCount, pHandles, fWaitAll, dwMilliseconds, dwWakeMask);
 }
 #endif
@@ -406 +400 @@
                                                  DWORD   dwTimeout)
 {
-    dprintf(("KERNEL32: ERROR: HandleManager::DeviceHandler::WaitForMultipleObjects %08x %d %x %d %x",
-              pHMHandleData->hHMHandle, cObjects, lphObjects, fWaitAll, dwTimeout));
-
-    if(!(pHMHandleData->dwAccess & SYNCHRONIZE_W) )
-    {
-        dprintf(("ERROR: Access denied!!"));
-        SetLastError(ERROR_ACCESS_DENIED_W);
-        return WAIT_FAILED_W;
-    }
-    return WAIT_FAILED_W;
+    return HMSemWaitForMultipleObjects(cObjects, lphObjects, fWaitAll, dwTimeout);
 }
 #endif