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

Timestamp:

Aug 19, 1999, 2:57:41 PM (26 years ago)

Author:

phaller

Message:

Fix: HandleManager will no more return 0 as valid file handle

File:

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

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.10 1999-08-17 17:04:50 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.11 1999-08-19 12:57:41 phaller Exp $ */
 
 /*
@@ -131 +131 @@
 
                         /* get appropriate device handler by the device name */
-static HMDeviceHandler *_HMDeviceFind(PSZ pszDeviceName);
+static HMDeviceHandler*  _Optlink _HMDeviceFind(PSZ pszDeviceName);
 
                                /* get next free handle from the handle table */
-static ULONG            _HMHandleGetFree(void);
+static ULONG            _Optlink _HMHandleGetFree(void);
 
                                        /* get handle table entry from handle */
-static ULONG            _HMHandleQuery(HANDLE hHandle);
+static ULONG            _Optlink _HMHandleQuery(HANDLE hHandle);
 
 
@@ -188 +188 @@
   register ULONG ulLoop;
 
-  for (ulLoop = 0;
+  for (ulLoop = 1; // @@@PH Note, this is an experimental change
+                   // 0L as hHandle is sometimes considered invalid!
+                   // this will never return 0l as free handle now.
        ulLoop < MAX_OS2_HMHANDLES;
        ulLoop++)
@@ -396 +398 @@
 
     if (ulHandle >= MAX_OS2_HMHANDLES)                     /* check boundary */
-      ulHandle = 0;
+      ulHandle = 1;
   }
   while (ulHandle != HMGlobals.ulHandleLast);
@@ -492 +494 @@
 #endif
 
-  for (ulIndex = 0;
+  for (ulIndex = 1;
        ulIndex < MAX_OS2_HMHANDLES;
        ulIndex++)