Changeset 7549 for trunk/src/kernel32/hmmailslot.cpp

Timestamp:

Dec 5, 2001, 3:16:38 PM (24 years ago)

Author:

sandervl

Message:

preliminary changes for new overlapped io framework

File:

• trunk/src/kernel32/hmmailslot.cpp (modified) (6 diffs)

trunk/src/kernel32/hmmailslot.cpp

@@ -1 @@
-/* $Id: hmmailslot.cpp,v 1.5 2001-11-29 13:38:51 sandervl Exp $
+/* $Id: hmmailslot.cpp,v 1.6 2001-12-05 14:16:01 sandervl Exp $
  *
  * Win32 mailslot APIs
@@ -176 +176 @@
  *****************************************************************************/
 
-DWORD HMMailslotClass::CreateFile (HANDLE        hHandle,
-                                   LPCSTR        lpFileName,
+DWORD HMMailslotClass::CreateFile (LPCSTR        lpFileName,
                                    PHMHANDLEDATA pHMHandleData,
                                    PVOID         lpSecurityAttributes,
@@ -361 +360 @@
                                DWORD         nNumberOfBytesToRead,
                                LPDWORD       lpNumberOfBytesRead,
-                               LPOVERLAPPED  lpOverlapped)
+                               LPOVERLAPPED  lpOverlapped,
+                               LPOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine)
 {
     HMMailSlotInfo *mailslot = (HMMailSlotInfo *)pHMHandleData->dwUserData;
@@ -380 +380 @@
         return FALSE;
     }
-    return ::ReadFile(mailslot->hPipe, (LPVOID)lpBuffer, nNumberOfBytesToRead,
-                      lpNumberOfBytesRead, lpOverlapped);
-}
-
-/*****************************************************************************
- * Name      : BOOL ReadFileEx
- * Purpose   : The ReadFileEx function reads data from a file asynchronously.
- *             It is designed solely for asynchronous operation, unlike the
- *             ReadFile function, which is designed for both synchronous and
- *             asynchronous operation. ReadFileEx lets an application perform
- *             other processing during a file read operation.
- *             The ReadFileEx function reports its completion status asynchronously,
- *             calling a specified completion routine when reading is completed
- *             and the calling thread is in an alertable wait state.
- * Parameters: HANDLE       hFile                handle of file to read
- *             LPVOID       lpBuffer             address of buffer
- *             DWORD        nNumberOfBytesToRead number of bytes to read
- *             LPOVERLAPPED lpOverlapped         address of offset
- *             LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine address of completion routine
- * Variables :
- * Result    : TRUE / FALSE
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
- *****************************************************************************/
-BOOL HMMailslotClass::ReadFileEx(PHMHANDLEDATA pHMHandleData,
-                           LPVOID       lpBuffer,
-                           DWORD        nNumberOfBytesToRead,
-                           LPOVERLAPPED lpOverlapped,
-                           LPOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine)
-{
-    HMMailSlotInfo *mailslot = (HMMailSlotInfo *)pHMHandleData->dwUserData;
-
-    dprintf(("HMMailslotClass::ReadFileEx(%08xh,%08xh,%08xh,%08xh,%08xh)",  pHMHandleData->hHMHandle,
-             lpBuffer, nNumberOfBytesToRead, lpOverlapped, lpCompletionRoutine));
-
-    if(mailslot == NULL) {
-        DebugInt3();
-        return FALSE;
-    }
-    if(mailslot->fServer == FALSE) {
-        dprintf(("ReadFile not allowed with client handle"));
-        SetLastError(ERROR_INVALID_FUNCTION); //TODO: right error?
-        return FALSE;
-    }
-    return ::ReadFileEx(mailslot->hPipe, lpBuffer, nNumberOfBytesToRead, lpOverlapped, lpCompletionRoutine);
-}
-
+    if(lpCompletionRoutine) {
+          return ::ReadFileEx(mailslot->hPipe, (LPVOID)lpBuffer, nNumberOfBytesToRead,
+                              lpOverlapped, lpCompletionRoutine);
+    }
+    else  return ::ReadFile(mailslot->hPipe, (LPVOID)lpBuffer, nNumberOfBytesToRead,
+                            lpNumberOfBytesRead, lpOverlapped);
+}
 
 /*****************************************************************************
@@ -447 +405 @@
 
 BOOL HMMailslotClass::WriteFile(PHMHANDLEDATA pHMHandleData,
-                                    LPCVOID       lpBuffer,
-                                    DWORD         nNumberOfBytesToWrite,
-                                    LPDWORD       lpNumberOfBytesWritten,
-                                    LPOVERLAPPED  lpOverlapped)
+                                LPCVOID       lpBuffer,
+                                DWORD         nNumberOfBytesToWrite,
+                                LPDWORD       lpNumberOfBytesWritten,
+                                LPOVERLAPPED  lpOverlapped,
+                                LPOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine)
 {
     HMMailSlotInfo *mailslot = (HMMailSlotInfo *)pHMHandleData->dwUserData;
@@ -471 +430 @@
     }
 
-    return ::WriteFile(mailslot->hPipe, lpBuffer, nNumberOfBytesToWrite,
-                       lpNumberOfBytesWritten, lpOverlapped);
-}
-
-/*****************************************************************************
- * Name      : BOOL WriteFileEx
- * Purpose   : The WriteFileEx function writes data to a file. It is designed
- *             solely for asynchronous operation, unlike WriteFile, which is
- *             designed for both synchronous and asynchronous operation.
- *             WriteFileEx reports its completion status asynchronously,
- *             calling a specified completion routine when writing is completed
- *             and the calling thread is in an alertable wait state.
- * Parameters: HANDLE       hFile                handle of file to write
- *             LPVOID       lpBuffer             address of buffer
- *             DWORD        nNumberOfBytesToRead number of bytes to write
- *             LPOVERLAPPED lpOverlapped         address of offset
- *             LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine address of completion routine
- * Variables :
- * Result    : TRUE / FALSE
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
- *****************************************************************************/
-
-BOOL HMMailslotClass::WriteFileEx(PHMHANDLEDATA pHMHandleData,
-                           LPVOID       lpBuffer,
-                           DWORD        nNumberOfBytesToWrite,
-                           LPOVERLAPPED lpOverlapped,
-                           LPOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine)
-{
-    HMMailSlotInfo *mailslot = (HMMailSlotInfo *)pHMHandleData->dwUserData;
-
-    dprintf(("HMMailslotClass::WriteFileEx(%08xh,%08xh,%08xh,%08xh,%08xh)",
-             pHMHandleData->hHMHandle, lpBuffer, nNumberOfBytesToWrite,
-             lpOverlapped,lpCompletionRoutine));
-
-    if(mailslot == NULL) {
-        DebugInt3();
-        return FALSE;
-    }
-    if(mailslot->fServer == TRUE) {
-        dprintf(("ReadFile not allowed with server handle"));
-        SetLastError(ERROR_INVALID_FUNCTION); //TODO: right error?
-        return FALSE;
-    }
-    return ::WriteFileEx(mailslot->hPipe, lpBuffer, nNumberOfBytesToWrite,lpOverlapped,lpCompletionRoutine);
-}
+    if(lpCompletionRoutine) {
+          return ::WriteFileEx(mailslot->hPipe, lpBuffer, nNumberOfBytesToWrite,
+                               lpOverlapped, lpCompletionRoutine);
+    }
+    else  return ::WriteFile(mailslot->hPipe, lpBuffer, nNumberOfBytesToWrite,
+                             lpNumberOfBytesWritten, lpOverlapped);
+}
+