Changeset 271 for trunk/src/kernel32/hmopen32.cpp

Timestamp:

Jul 5, 1999, 11:58:14 AM (26 years ago)

Author:

phaller

Message:

Fix: streamlined Handlemanager

File:

• trunk/src/kernel32/hmopen32.cpp (modified) (18 diffs)

trunk/src/kernel32/hmopen32.cpp

@@ -1 @@
-/* $Id: hmopen32.cpp,v 1.6 1999-07-05 07:55:10 phaller Exp $ */
+/* $Id: hmopen32.cpp,v 1.7 1999-07-05 09:58:14 phaller Exp $ */
 
 /*
@@ -108 +108 @@
   // create from template
   if (pHMHandleDataTemplate != NULL)
-     hTemplate = pHMHandleDataTemplate->hWinHandle;
+     hTemplate = pHMHandleDataTemplate->hHMHandle;
   else
      hTemplate = 0;
@@ -122 +122 @@
   if (hFile != INVALID_HANDLE_ERROR)
   {
-     pHMHandleData->hWinHandle = hFile;
+     pHMHandleData->hHMHandle = hFile;
      return (NO_ERROR);
   }
@@ -147 +147 @@
 
   dprintfl(("KERNEL32: HandleManager::Open32::CloseHandle(%08x)\n",
-           pHMHandleData->hWinHandle));
-
-  bRC = O32_CloseHandle(pHMHandleData->hWinHandle);
+           pHMHandleData->hHMHandle));
+
+  bRC = O32_CloseHandle(pHMHandleData->hHMHandle);
 
   dprintfl(("KERNEL32: HandleManager::Open32::CloseHandle returned %08xh\n",
@@ -190 +190 @@
            lpOverlapped));
 
-  bRC = O32_ReadFile(pHMHandleData->hWinHandle,
+  bRC = O32_ReadFile(pHMHandleData->hHMHandle,
                      (PVOID)lpBuffer,
                      nNumberOfBytesToRead,
@@ -235 +235 @@
            lpOverlapped));
 
-  bRC = O32_WriteFile(pHMHandleData->hWinHandle,
+  bRC = O32_WriteFile(pHMHandleData->hHMHandle,
                       lpBuffer,
                       nNumberOfBytesToWrite,
@@ -266 +266 @@
            pHMHandleData));
 
-  return O32_GetFileType(pHMHandleData->hWinHandle);
+  return O32_GetFileType(pHMHandleData->hHMHandle);
 }
 
@@ -291 +291 @@
            pHFI));
 
-  return O32_GetFileInformationByHandle(pHMHandleData->hWinHandle,
+  return O32_GetFileInformationByHandle(pHMHandleData->hHMHandle,
                                         pHFI);
 }
@@ -314 +314 @@
            pHMHandleData));
 
-  return O32_SetEndOfFile(pHMHandleData->hWinHandle);
+  return O32_SetEndOfFile(pHMHandleData->hHMHandle);
 }
 
@@ -345 +345 @@
            pFT3));
 
-  return O32_SetFileTime(pHMHandleData->hWinHandle,
+  return O32_SetFileTime(pHMHandleData->hHMHandle,
                          pFT1,
                          pFT2,
@@ -373 +373 @@
            pSize));
 
-  return O32_GetFileSize(pHMHandleData->hWinHandle,
+  return O32_GetFileSize(pHMHandleData->hHMHandle,
                          pSize);
 }
@@ -405 +405 @@
            dwMoveMethod));
 
-  return O32_SetFilePointer(pHMHandleData->hWinHandle,
+  return O32_SetFilePointer(pHMHandleData->hHMHandle,
                             lDistanceToMove,
                             lpDistanceToMoveHigh,
@@ -442 +442 @@
            arg5));
 
-  return O32_LockFile(pHMHandleData->hWinHandle,
+  return O32_LockFile(pHMHandleData->hHMHandle,
                       arg2,
                       arg3,
@@ -486 +486 @@
 
 
-  return(O32_LockFile(pHMHandleData->hWinHandle,
+  return(O32_LockFile(pHMHandleData->hHMHandle,
                       lpOverlapped->Offset,
                       lpOverlapped->OffsetHigh,
@@ -540 +540 @@
   if (hFile != INVALID_HANDLE_ERROR)
   {
-    pHMHandleData->hWinHandle = hFile;
+    pHMHandleData->hHMHandle = hFile;
+
     GetFileTime(hFile,
                 NULL,
@@ -551 +552 @@
            filedatetime,
            sizeof(pOFStruct->reserved) );
+
     return (NO_ERROR);
   }
 
   // error branch
-  hFile = O32_GetLastError();
-  pOFStruct->nErrCode = hFile;
+  pOFStruct->nErrCode = O32_GetLastError();
   dprintf(("KERNEL32: HandleManager::Open32::OpenFile Error %08xh\n",
             pOFStruct->nErrCode));
 
+  // return != NO_ERROR => error code
   return(hFile);
 }
@@ -594 +596 @@
            arg5));
 
-  return O32_UnlockFile(pHMHandleData->hWinHandle,
+  return O32_UnlockFile(pHMHandleData->hHMHandle,
                         arg2,
                         arg3,
@@ -637 +639 @@
            lpOverlapped));
 
-  return(O32_UnlockFile(pHMHandleData->hWinHandle,
+  return(O32_UnlockFile(pHMHandleData->hHMHandle,
                    lpOverlapped->Offset,
                    lpOverlapped->OffsetHigh,