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

Timestamp:

Aug 25, 1999, 4:41:14 PM (26 years ago)

Author:

phaller

Message:

Fix: HandleManager cosmetic

File:

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

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.16 1999-08-25 14:27:04 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.17 1999-08-25 14:41:14 phaller Exp $ */
 
 /*
@@ -636 +636 @@
  * Name      : HANDLE  HMDuplicateHandle
  * Purpose   : replacement for Open32's HMDuplicateHandle function
- * Parameters: 
- *             
+ * Parameters:
+ *
  * Variables :
  * Result    : BOOL fSuccess
@@ -643 +643 @@
  * Status    :
  *
- * Author    : Patrick Haller [Wed, 1998/02/12 20:44]
- *****************************************************************************/
+ * Author    : Sander van Leeuwen [Wed, 1999/08/25 15:44]
+ *****************************************************************************/
+
 BOOL HMDuplicateHandle(HANDLE  srcprocess,
                        HANDLE  srchandle,
@@ -659 +660 @@
   DWORD           rc;                                     /* API return code */
 
-  if(HMHandleValidate(srchandle) != NO_ERROR) {
-        dprintf(("HMDuplicateHandle: invalid handle %x", srchandle));
-        SetLastError(ERROR_INVALID_HANDLE);      /* use this as error message */
-        return FALSE;
-  }
-
-  pDeviceHandler = TabWin32Handles[srchandle].pDeviceHandler;         /* device is predefined */
-
+  if(HMHandleValidate(srchandle) != NO_ERROR)
+  {
+    dprintf(("KERNEL32: HMDuplicateHandle: invalid handle %x", srchandle));
+    SetLastError(ERROR_INVALID_HANDLE);      /* use this as error message */
+    return FALSE;
+  }
+
+  pDeviceHandler = TabWin32Handles[srchandle].pDeviceHandler;  /* device is predefined */
   iIndexNew = _HMHandleGetFree();                         /* get free handle */
   if (-1 == iIndexNew)                            /* oops, no free handles ! */
@@ -675 +676 @@
 
   /* initialize the complete HMHANDLEDATA structure */
-  pHMHandleData = &TabWin32Handles[iIndexNew].hmHandleData;
-  pHMHandleData->dwType     = TabWin32Handles[srchandle].hmHandleData.dwType;
-  if (fdwOptions & DUPLICATE_SAME_ACCESS) {
-        pHMHandleData->dwAccess   = TabWin32Handles[srchandle].hmHandleData.dwAccess;
-  }
-  else  pHMHandleData->dwAccess   = fdwAccess;
+  pHMHandleData                = &TabWin32Handles[iIndexNew].hmHandleData;
+  pHMHandleData->dwType        = TabWin32Handles[srchandle].hmHandleData.dwType;
+  if (fdwOptions & DUPLICATE_SAME_ACCESS)
+    pHMHandleData->dwAccess    = TabWin32Handles[srchandle].hmHandleData.dwAccess;
+  else
+    pHMHandleData->dwAccess    = fdwAccess;
 
   pHMHandleData->dwShare       = TabWin32Handles[srchandle].hmHandleData.dwShare;
@@ -697 +698 @@
                                                   /* call the device handler */
   rc = pDeviceHandler->DuplicateHandle(&TabWin32Handles[iIndexNew].hmHandleData,
-                                       srcprocess, 
-                                       &TabWin32Handles[srchandle].hmHandleData, 
-                                       destprocess, desthandle,
-                                       fdwAccess, fInherit, fdwOptions & ~DUPLICATE_CLOSE_SOURCE);
+                                       srcprocess,
+                                       &TabWin32Handles[srchandle].hmHandleData,
+                                       destprocess,
+                                       desthandle,
+                                       fdwAccess,
+                                       fInherit,
+                                       fdwOptions & ~DUPLICATE_CLOSE_SOURCE);
 
   //Don't let Open32 close it for us, but do it manually (regardless of error; see SDK docs))
-  if (fdwOptions & DUPLICATE_CLOSE_SOURCE) 
-  {
-        CloseHandle(srchandle);
-  }
+  if (fdwOptions & DUPLICATE_CLOSE_SOURCE)
+    HMCloseHandle(srchandle);
 
   if (rc != NO_ERROR)     /* oops, creation failed within the device handler */
@@ -1003 +1005 @@
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
   //SvL: Check if pDeviceHandler is set
-  if (pHMHandle->pDeviceHandler) {
-        fResult = pHMHandle->pDeviceHandler->CloseHandle(&pHMHandle->hmHandleData);
-  }
-  else {
-        dprintf(("HMCloseHAndle(%08xh): pDeviceHandler not set", hObject));
-        fResult = TRUE;
+  if (pHMHandle->pDeviceHandler)
+  {
+    fResult = pHMHandle->pDeviceHandler->CloseHandle(&pHMHandle->hmHandleData);
+  }
+  else
+  {
+    dprintf(("HMCloseHAndle(%08xh): pDeviceHandler not set", hObject));
+    fResult = TRUE;
   }