Changeset 6069 for trunk/src/kernel32/HandleManager.cpp

Timestamp:

Jun 22, 2001, 9:40:28 PM (24 years ago)

Author:

sandervl

Message:

semaphore update

File:

• trunk/src/kernel32/HandleManager.cpp (modified) (7 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.65 2001-06-19 10:50:23 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.66 2001-06-22 19:40:27 sandervl Exp $ */
 
 /*
@@ -1913 +1913 @@
 
           while(TRUE) {
-              dwResult = O32_MsgWaitForMultipleObjects(1, &hObject, FALSE, 
-                                                       INFINITE, QS_ALLINPUT);
+              dwResult = HMMsgWaitForMultipleObjects(1, &hObject, FALSE, 
+                                                     INFINITE, QS_ALLINPUT);
               if(dwResult == WAIT_OBJECT_0 + 1) {
                   MSG msg ;
@@ -1948 +1948 @@
   }
 
-  // @@@PH Problem: wrong class (base class) is called instead of
-  //                open32 class ?! Why ?!
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
   dwResult = pHMHandle->pDeviceHandler->WaitForSingleObject(&pHMHandle->hmHandleData,
@@ -2877 +2875 @@
                                 DWORD   dwTimeout)
 {
+#ifdef USE_OS2SEMAPHORES
+  int       iIndex;                           /* index into the handle table */
+  DWORD     dwResult;                /* result from the device handler's API */
+  PHMHANDLE pHMHandle;       /* pointer to the handle structure in the table */
+
+  if(cObjects == 1) {
+      return HMWaitForSingleObject(*lphObjects, dwTimeout);
+  }
+                                                          /* validate handle */
+  iIndex = _HMHandleQuery(*lphObjects);                   /* get the index */
+  if (-1 == iIndex)                                       /* error ? */
+  {//oh, oh. possible problem here
+   //TODO: rewrite handling of other handles; don't forward to open32
+      dprintf(("WANRING: HMWaitForMultipleObjects: unknown handle passed on to Open32 -> will not work if other handles are semaphores"));
+      return O32_WaitForMultipleObjects(cObjects, lphObjects, fWaitAll, dwTimeout);
+  }
+
+  pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+  dwResult = pHMHandle->pDeviceHandler->WaitForMultipleObjects(&pHMHandle->hmHandleData,
+                                                               cObjects, lphObjects, fWaitAll,
+                                                               dwTimeout);
+
+  return (dwResult);                                  /* deliver return code */
+#else
   ULONG   ulIndex;
   PHANDLE pArrayOfHandles;
@@ -2933 +2955 @@
 
   return (rc);                            // OK, done
+#endif
 }
 
@@ -2973 +2996 @@
  *****************************************************************************/
 
-DWORD  HMMsgWaitForMultipleObjects  (DWORD      nCount,
-                                     LPHANDLE       pHandles,
+DWORD  HMMsgWaitForMultipleObjects  (DWORD      cObjects, 
+                                     LPHANDLE   lphObjects,
                                      BOOL       fWaitAll,
-                                     DWORD      dwMilliseconds,
+                                     DWORD      dwTimeout,
                                      DWORD      dwWakeMask)
 {
+#ifdef USE_OS2SEMAPHORES
+  int       iIndex;                           /* index into the handle table */
+  DWORD     dwResult;                /* result from the device handler's API */
+  PHMHANDLE pHMHandle;       /* pointer to the handle structure in the table */
+
+                                                          /* validate handle */
+  iIndex = _HMHandleQuery(*lphObjects);                   /* get the index */
+  if (-1 == iIndex)                                       /* error ? */
+  {//oh, oh. possible problem here
+   //TODO: rewrite handling of other handles; don't forward to open32
+      dprintf(("WANRING: HMWaitForMultipleObjects: unknown handle passed on to Open32 -> will not work if other handles are semaphores"));
+      return O32_MsgWaitForMultipleObjects(cObjects, lphObjects, fWaitAll, dwTimeout, dwWakeMask);
+  }
+
+  pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+  dwResult = pHMHandle->pDeviceHandler->MsgWaitForMultipleObjects(&pHMHandle->hmHandleData,
+                                                                  cObjects, lphObjects, fWaitAll,
+                                                                  dwTimeout, dwWakeMask);
+
+  return (dwResult);                                  /* deliver return code */
+#else
   ULONG   ulIndex;
   PHANDLE pArrayOfHandles;
@@ -3030 +3074 @@
 
   return (rc);                            // OK, done
+#endif
 }
 /*****************************************************************************