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

Timestamp:

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

Author:

sandervl

Message:

semaphore updates

File:

• trunk/src/kernel32/hmevent.cpp (modified) (10 diffs)

trunk/src/kernel32/hmevent.cpp

@@ -1 @@
-/* $Id: hmevent.cpp,v 1.7 2001-06-22 19:40:28 sandervl Exp $ */
+/* $Id: hmevent.cpp,v 1.8 2001-06-23 16:59:27 sandervl Exp $ */
 
 /*
@@ -48 +48 @@
 #include "HandleManager.H"
 #include "HMEvent.h"
+#include "HMSemaphore.h"
 #include "oslibdos.h"
 
@@ -108 +109 @@
       strcat(szSemName, lpszEventName);
       lpszEventName = szSemName;
+      FixSemName((char *)lpszEventName);
   }
   //Manual reset means all threads waiting on the event semaphore will be
@@ -183 +185 @@
   strcpy(szSemName, "\\SEM32\\");
   strcat(szSemName, lpszEventName);
+  FixSemName(szSemName);
   rc = DosOpenEventSem(szSemName, &hev);
   if(rc) {
@@ -394 +397 @@
                                                     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
@@ -425 +418 @@
                                                  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
@@ -467 +450 @@
 
   rc = DosPostEventSem(pHMHandleData->hHMHandle);
-  if(rc) {
+  if(rc && rc != ERROR_ALREADY_POSTED) {
       dprintf(("DosPostEventSem %x failed with rc %d", pHMHandleData->hHMHandle, rc));
       SetLastError(error2WinError(rc));
@@ -512 +495 @@
 
   rc = DosPostEventSem(pHMHandleData->hHMHandle);
-  if(rc) {
+  if(rc && rc != ERROR_ALREADY_POSTED) {
       dprintf(("DosPostEventSem %x failed with rc %d", pHMHandleData->hHMHandle, rc));
       SetLastError(error2WinError(rc));
@@ -519 +502 @@
   if(pHMHandleData->dwFlags == TRUE) {//fManualReset
       rc = DosResetEventSem(pHMHandleData->hHMHandle, &count);
-      if(rc) {
+      if(rc && rc != ERROR_ALREADY_RESET) {
           dprintf(("DosResetEventSem %x failed with rc %d", pHMHandleData->hHMHandle, rc));
           SetLastError(error2WinError(rc));
@@ -565 +548 @@
 
   rc = DosResetEventSem(pHMHandleData->hHMHandle, &count);
-  if(rc) {
+  if(rc && rc != ERROR_ALREADY_RESET) {
       dprintf(("DosResetEventSem %x failed with rc %d", pHMHandleData->hHMHandle, rc));
       SetLastError(error2WinError(rc));