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

Timestamp:

Nov 24, 2000, 5:16:18 PM (25 years ago)

Author:

phaller

Message:

accelerated get handle type

File:

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

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.54 2000-11-14 14:26:55 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.55 2000-11-24 16:16:18 phaller Exp $ */
 
 /*
@@ -1370 +1370 @@
   PHMHANDLE pHMHandle;       /* pointer to the handle structure in the table */
 
-  //Must return FILE_TYPE_CHAR here; (used to fail index check)
-  if((hFile == GetStdHandle(STD_INPUT_HANDLE)) ||
-     (hFile == GetStdHandle(STD_OUTPUT_HANDLE)) ||
-     (hFile == GetStdHandle(STD_ERROR_HANDLE)))
-  {
-      return FILE_TYPE_CHAR;
-  }
                                                           /* validate handle */
   iIndex = _HMHandleQuery(hFile);                           /* get the index */
   if (-1 == iIndex)                                               /* error ? */
   {
-    SetLastError(ERROR_INVALID_HANDLE);       /* set win32 error information */
-    return FILE_TYPE_UNKNOWN;                         /* signal failure */
+    //Must return FILE_TYPE_CHAR here; (used to fail index check)
+    if((hFile == GetStdHandle(STD_INPUT_HANDLE)) ||
+       (hFile == GetStdHandle(STD_OUTPUT_HANDLE)) ||
+       (hFile == GetStdHandle(STD_ERROR_HANDLE)))
+    {
+        return FILE_TYPE_CHAR;
+    }
+    else
+    {
+      SetLastError(ERROR_INVALID_HANDLE);     /* set win32 error information */
+      return FILE_TYPE_UNKNOWN;                            /* signal failure */
+    }
   }