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

Timestamp:

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

Author:

sandervl

Message:

semaphore updates

File:

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

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.67 2001-06-23 07:45:42 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.68 2001-06-23 16:59:26 sandervl Exp $ */
 
 /*
@@ -609 +609 @@
   return (NO_ERROR);
 }
-
+//*****************************************************************************
+//*****************************************************************************
+PHMHANDLEDATA HMQueryHandleData(HANDLE handle)
+{
+  int iIndex;
+
+  iIndex = _HMHandleQuery(handle);                   /* get the index */
+  if (-1 == iIndex)                                  /* error ? */
+  {
+      return NULL;
+  }
+  return &TabWin32Handles[iIndex].hmHandleData;      /* call device handler */
+}
 
 /*****************************************************************************
@@ -2883 +2895 @@
       return HMWaitForSingleObject(*lphObjects, dwTimeout);
   }
+
+  if(cObjects > MAXIMUM_WAIT_OBJECTS) {
+      dprintf(("KERNEL32: HMWaitForMultipleObjects: Too many objects (%d)", cObjects));
+      SetLastError(ERROR_INVALID_PARAMETER);
+      return WAIT_FAILED;
+  }
+
                                                           /* validate handle */
   iIndex = _HMHandleQuery(*lphObjects);                   /* get the index */
@@ -3014 +3033 @@
       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);
+  }
+
+  if(cObjects > MAXIMUM_WAIT_OBJECTS) {
+      dprintf(("KERNEL32: HMMsgWaitForMultipleObjects: Too many objects (%d)", cObjects));
+      SetLastError(ERROR_INVALID_PARAMETER);
+      return WAIT_FAILED;
   }