Changeset 6079 for trunk/src

Timestamp:

Jun 23, 2001, 9:45:43 AM (24 years ago)

Author:

sandervl

Message:

compile fixes

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (4 diffs)
• hmsemaphore.cpp (modified) (3 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.66 2001-06-22 19:40:27 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.67 2001-06-23 07:45:42 sandervl Exp $ */
 
 /*
@@ -3025 +3025 @@
   ULONG   ulIndex;
   PHANDLE pArrayOfHandles;
-  PHANDLE pLoop1 = pHandles;
+  PHANDLE pLoop1 = lphObjects;
   PHANDLE pLoop2;
   DWORD   rc;
 
   // allocate array for handle table
-  pArrayOfHandles = (PHANDLE)alloca(nCount * sizeof(HANDLE));
+  pArrayOfHandles = (PHANDLE)alloca(cObjects * sizeof(HANDLE));
   if (pArrayOfHandles == NULL)
   {
-  dprintf(("ERROR: HMMsgWaitForMultipleObjects: alloca failed to allocate %d handles", nCount));
+      dprintf(("ERROR: HMMsgWaitForMultipleObjects: alloca failed to allocate %d handles", cObjects));
       O32_SetLastError(ERROR_NOT_ENOUGH_MEMORY);
       return WAIT_FAILED;
@@ -3043 +3043 @@
   for (ulIndex = 0;
 
-       ulIndex < nCount;
+       ulIndex < cObjects;
 
        ulIndex++,
@@ -3068 +3068 @@
   // @@@PH: Note this will fail on handles that do NOT belong to Open32
   //        but to i.e. the console subsystem!
-  rc = O32_MsgWaitForMultipleObjects(nCount,
+  rc = O32_MsgWaitForMultipleObjects(cObjects,
                                      pArrayOfHandles,
-                                     fWaitAll, dwMilliseconds,
+                                     fWaitAll, dwTimeout,
                                      dwWakeMask);
 

trunk/src/kernel32/hmsemaphore.cpp

@@ -1 @@
-/* $Id: hmsemaphore.cpp,v 1.6 2001-06-22 19:40:28 sandervl Exp $ */
+/* $Id: hmsemaphore.cpp,v 1.7 2001-06-23 07:45:43 sandervl Exp $ */
 
 /*
@@ -60 +60 @@
                                 /* waiter and auto-reset the semaphore when*/
                                 /* there are multiple waiters.             */
-#endif
-
+
+#endif
+
+#ifdef USE_OS2SEMAPHORES
 typedef struct {
     LONG currentCount;
@@ -68 +70 @@
     HEV  hev;
 } SEM_INFO, *PSEM_INFO;
+#endif
 
 /*****************************************************************************