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

Timestamp:

Jun 1, 2000, 1:28:48 PM (25 years ago)

Author:

sandervl

Message:

Rewrote file io apis

File:

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

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.39 2000-05-22 19:07:52 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.40 2000-06-01 11:28:42 sandervl Exp $ */
 
 /*
@@ -52 +52 @@
 #include "HMOpen32.h"
 #include "HMEvent.h"
+#include "HMFile.h"
 #include "HMMutex.h"
 #include "HMSemaphore.h"
@@ -125 +126 @@
   HMDeviceHandler        *pHMOpen32;      /* default handle manager instance */
   HMDeviceHandler        *pHMEvent;        /* static instances of subsystems */
+  HMDeviceHandler        *pHMFile;
   HMDeviceHandler        *pHMMutex;
   HMDeviceHandler        *pHMSemaphore;
@@ -354 +356 @@
     HMGlobals.pHMOpen32     = new HMDeviceOpen32Class("\\\\.\\");
     HMGlobals.pHMEvent      = new HMDeviceEventClass("\\\\EVENT\\");
+    HMGlobals.pHMFile       = new HMDeviceFileClass("\\\\FILE\\");
     HMGlobals.pHMMutex      = new HMDeviceMutexClass("\\\\MUTEX\\");
     HMGlobals.pHMSemaphore  = new HMDeviceSemaphoreClass("\\\\SEM\\");
@@ -383 +386 @@
   delete HMGlobals.pHMOpen32;
   delete HMGlobals.pHMEvent;
+  delete HMGlobals.pHMFile;
   delete HMGlobals.pHMMutex;
   delete HMGlobals.pHMSemaphore;
@@ -706 +710 @@
   HMDeviceHandler *pDeviceHandler;         /* device handler for this handle */
   PHMHANDLEDATA   pHMHandleData;
-  DWORD           rc;                                     /* API return code */
+  BOOL            rc;                                     /* API return code */
 
   if(HMHandleValidate(srchandle) != NO_ERROR)
@@ -758 +762 @@
     HMCloseHandle(srchandle);
 
-  if (rc != NO_ERROR)     /* oops, creation failed within the device handler */
+  if(rc == FALSE)     /* oops, creation failed within the device handler */
   {
     TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
-    SetLastError(rc);          /* Hehe, OS/2 and NT are pretty compatible :) */
     return FALSE;                           /* signal error */
   }
@@ -827 +830 @@
     else
       pHMHandleData  = NULL;
+
+    if(pDeviceHandler == HMGlobals.pHMOpen32) {
+        pDeviceHandler = HMGlobals.pHMFile;
+    }
   }
 
@@ -962 +969 @@
     pHMHandleData  = NULL;
 
+  if(pDeviceHandler == HMGlobals.pHMOpen32) {
+    pDeviceHandler = HMGlobals.pHMFile;
+  }
 
   iIndexNew = _HMHandleGetFree();                         /* get free handle */
@@ -1003 +1013 @@
 #endif
 
-  if (rc != NO_ERROR)     /* oops, creation failed within the device handler */
-  {
-    TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
-    SetLastError(rc);          /* Hehe, OS/2 and NT are pretty compatible :) */
-    return (INVALID_HANDLE_VALUE);                           /* signal error */
-  }
-  else
-    SetLastError(ERROR_SUCCESS); //@@@PH 1999/10/27 rc5desg requires this?
+  if(rc != NO_ERROR)     /* oops, creation failed within the device handler */
+  {
+        TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
+        SetLastError(rc);          /* Hehe, OS/2 and NT are pretty compatible :) */
+        return (INVALID_HANDLE_VALUE);                           /* signal error */
+  }
+  else {
+        if(fuMode & (OF_DELETE|OF_EXIST)) {
+                //file handle already closed
+                TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
+                return TRUE; //TODO: correct?
+        }
+        if(fuMode & OF_PARSE) {
+                TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
+                return 0;
+        }
+        if(fuMode & OF_VERIFY) {
+                TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
+                return 1; //TODO: correct?
+        }
+  }
 
 #ifdef DEBUG_LOCAL
@@ -1119 +1142 @@
   return (fResult);                                   /* deliver return code */
 }
-
+/*****************************************************************************
+ * Name      : HANDLE  HMReadFileEx
+ * Purpose   : Wrapper for the ReadFileEx() API
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    :
+ *
+ * Author    : SvL
+ *****************************************************************************/
+BOOL HMReadFileEx(HANDLE                     hFile,
+                  LPVOID                     lpBuffer,
+                  DWORD                      nNumberOfBytesToRead,
+                  LPOVERLAPPED               lpOverlapped,
+                  LPOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine)
+{
+  int       iIndex;                           /* index into the handle table */
+  BOOL      fResult;       /* result from the device handler's CloseHandle() */
+  PHMHANDLE pHMHandle;       /* pointer to the handle structure in the table */
+
+                                                          /* validate handle */
+  iIndex = _HMHandleQuery(hFile);                           /* get the index */
+  if (-1 == iIndex)                                               /* error ? */
+  {
+    SetLastError(ERROR_INVALID_HANDLE);       /* set win32 error information */
+    return (FALSE);                                        /* signal failure */
+  }
+
+  pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+  fResult = pHMHandle->pDeviceHandler->ReadFileEx(&pHMHandle->hmHandleData,
+                                                  lpBuffer,
+                                                  nNumberOfBytesToRead,
+                                                  lpOverlapped,
+                                                  lpCompletionRoutine);
+
+  return (fResult);                                   /* deliver return code */
+}
 
 /*****************************************************************************
@@ -1134 +1194 @@
 
 BOOL HMWriteFile(HANDLE       hFile,
-                        LPCVOID      lpBuffer,
-                        DWORD        nNumberOfBytesToWrite,
-                        LPDWORD      lpNumberOfBytesWritten,
-                        LPOVERLAPPED lpOverlapped)
+                 LPCVOID      lpBuffer,
+                 DWORD        nNumberOfBytesToWrite,
+                 LPDWORD      lpNumberOfBytesWritten,
+                 LPOVERLAPPED lpOverlapped)
 {
   int       iIndex;                           /* index into the handle table */
@@ -1157 +1217 @@
                                                  lpNumberOfBytesWritten,
                                                  lpOverlapped);
+
+  return (fResult);                                   /* deliver return code */
+}
+
+/*****************************************************************************
+ * Name      : HANDLE  HMWriteFileEx
+ * Purpose   : Wrapper for the WriteFileEx() API
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    :
+ *
+ * Author    : SvL
+ *****************************************************************************/
+BOOL HMWriteFileEx(HANDLE                     hFile,
+                   LPVOID                     lpBuffer,
+                   DWORD                      nNumberOfBytesToWrite,
+                   LPOVERLAPPED               lpOverlapped,
+                   LPOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine)
+{
+  int       iIndex;                           /* index into the handle table */
+  BOOL      fResult;       /* result from the device handler's CloseHandle() */
+  PHMHANDLE pHMHandle;       /* pointer to the handle structure in the table */
+
+                                                          /* validate handle */
+  iIndex = _HMHandleQuery(hFile);                           /* get the index */
+  if (-1 == iIndex)                                               /* error ? */
+  {
+    SetLastError(ERROR_INVALID_HANDLE);       /* set win32 error information */
+    return (FALSE);                                        /* signal failure */
+  }
+
+  pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+  fResult = pHMHandle->pDeviceHandler->WriteFileEx(&pHMHandle->hmHandleData,
+                                                   lpBuffer,
+                                                   nNumberOfBytesToWrite,
+                                                   lpOverlapped,
+                                                   lpCompletionRoutine);
 
   return (fResult);                                   /* deliver return code */
@@ -1598 +1697 @@
 
 BOOL HMUnlockFileEx(HANDLE        hFile,
-                    DWORD         dwFlags,
                     DWORD         dwReserved,
                     DWORD         nNumberOfBytesToLockLow,
@@ -1618 +1716 @@
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
   dwResult = pHMHandle->pDeviceHandler->UnlockFileEx(&pHMHandle->hmHandleData,
-                                                     dwFlags,
                                                      dwReserved,
                                                      nNumberOfBytesToLockLow,