Changeset 7631

Timestamp:

Dec 14, 2001, 1:45:49 PM (24 years ago)

Author:

sandervl

Message:

enabled overlapped io for custom device drivers

Location:

trunk

Files:

• include/custombuild.h (modified) (4 diffs)
• include/overlappedio.h (added)
• src/kernel32/hmdevio.cpp (modified) (8 diffs)
• src/kernel32/overlappedio.cpp (modified) (4 diffs)
• src/kernel32/overlappedio.h (deleted)

trunk/include/custombuild.h

@@ -14 +14 @@
 
 
-typedef HANDLE (* WIN32API PFNDRVOPEN)(DWORD dwAccess, DWORD dwShare);
-typedef void   (* WIN32API PFNDRVCLOSE)(HANDLE hDevice);
-typedef BOOL   (* WIN32API PFNDRVIOCTL)(HANDLE hDevice, DWORD dwIoControlCode,
+typedef HANDLE (* WIN32API PFNDRVOPEN)(DWORD dwAccess, DWORD dwShare, DWORD dwFlags);
+typedef void   (* WIN32API PFNDRVCLOSE)(HANDLE hDevice, DWORD dwFlags);
+typedef BOOL   (* WIN32API PFNDRVIOCTL)(HANDLE hDevice, DWORD dwFlags, DWORD dwIoControlCode,
                                         LPVOID lpInBuffer, DWORD nInBufferSize,
                                         LPVOID lpOutBuffer, DWORD nOutBufferSize,
@@ -22 +22 @@
 
 typedef BOOL   (* WIN32API PFNDRVREAD)(HANDLE        hDevice,
+                                       DWORD         dwFlags,
                                        LPCVOID       lpBuffer,
                                        DWORD         nNumberOfBytesToRead,
@@ -29 +30 @@
 
 typedef BOOL   (* WIN32API PFNDRVWRITE)(HANDLE        hDevice,
+                                        DWORD         dwFlags,
                                         LPCVOID       lpBuffer,
                                         DWORD         nNumberOfBytesToWrite,
@@ -35 +37 @@
                                         LPOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine);
 
-typedef BOOL   (* WIN32API PFNDRVCANCELIO)(HANDLE hDevice);
+typedef BOOL   (* WIN32API PFNDRVCANCELIO)(HANDLE hDevice, DWORD dwFlags);
 typedef DWORD  (* WIN32API PFNDRVGETOVERLAPPEDRESULT)(HANDLE        hDevice,
+                                                      DWORD         dwFlags,
                                                       LPOVERLAPPED  lpOverlapped,
                                                       LPDWORD       lpcbTransfer,

trunk/src/kernel32/hmdevio.cpp

@@ -1 @@
-/* $Id: hmdevio.cpp,v 1.23 2001-12-14 10:22:38 sandervl Exp $ */
+/* $Id: hmdevio.cpp,v 1.24 2001-12-14 12:44:56 sandervl Exp $ */
 
 /*
@@ -432 +432 @@
                                   PHMHANDLEDATA pHMHandleDataTemplate)
 {
-   pHMHandleData->hHMHandle = pfnDriverOpen(pHMHandleData->dwAccess, pHMHandleData->dwShare);
+   pHMHandleData->hHMHandle = pfnDriverOpen(pHMHandleData->dwAccess, pHMHandleData->dwShare, pHMHandleData->dwFlags);
    if(pHMHandleData->hHMHandle == INVALID_HANDLE_VALUE_W) {
        return GetLastError();
@@ -443 +443 @@
 {
    if(pHMHandleData->hHMHandle) {
-        pfnDriverClose(pHMHandleData->hHMHandle);
+        pfnDriverClose(pHMHandleData->hHMHandle, pHMHandleData->dwFlags);
    }
    pHMHandleData->hHMHandle = 0;
@@ -463 +463 @@
    }
 
-   ret = pfnDriverIOCtl(pHMHandleData->hHMHandle, dwIoControlCode, lpInBuffer, nInBufferSize,
+   ret = pfnDriverIOCtl(pHMHandleData->hHMHandle, pHMHandleData->dwFlags, dwIoControlCode, lpInBuffer, nInBufferSize,
                         lpOutBuffer, nOutBufferSize, lpBytesReturned, lpOverlapped);
    dprintf(("DeviceIoControl %x returned %d", dwIoControlCode, ret));
@@ -499 +499 @@
        return FALSE;
    }
-   ret = pfnDriverRead(pHMHandleData->hHMHandle, lpBuffer, nNumberOfBytesToRead,
+   ret = pfnDriverRead(pHMHandleData->hHMHandle, pHMHandleData->dwFlags, lpBuffer, nNumberOfBytesToRead,
                       lpNumberOfBytesRead, lpOverlapped, lpCompletionRoutine);
    dprintf(("pfnDriverRead %x %x %x %x %x %x returned %x", pHMHandleData->hHMHandle, lpBuffer, nNumberOfBytesToRead,
@@ -536 +536 @@
        return FALSE;
    }
-   ret = pfnDriverWrite(pHMHandleData->hHMHandle, lpBuffer, nNumberOfBytesToWrite,
+   ret = pfnDriverWrite(pHMHandleData->hHMHandle, pHMHandleData->dwFlags, lpBuffer, nNumberOfBytesToWrite,
                         lpNumberOfBytesWritten, lpOverlapped, lpCompletionRoutine);
    dprintf(("pfnDriverWrite %x %x %x %x %x %x returned %x", pHMHandleData->hHMHandle, lpBuffer, nNumberOfBytesToWrite,
@@ -561 +561 @@
        return FALSE;
    }
-   ret = pfnDriverCancelIo(pHMHandleData->hHMHandle);
+   ret = pfnDriverCancelIo(pHMHandleData->hHMHandle, pHMHandleData->dwFlags);
    dprintf(("pfnDriverCancelIo %x returned %x", pHMHandleData->hHMHandle, ret));
    return ret;
@@ -600 +600 @@
         return FALSE;
     }
-    return pfnDriverGetOverlappedResult(pHMHandleData->hHMHandle, lpOverlapped, lpcbTransfer, fWait);
+    return pfnDriverGetOverlappedResult(pHMHandleData->hHMHandle, pHMHandleData->dwFlags, lpOverlapped, lpcbTransfer, fWait);
 }
 //******************************************************************************

trunk/src/kernel32/overlappedio.cpp

@@ -1 @@
-/* $Id: overlappedio.cpp,v 1.12 2001-12-10 14:04:24 sandervl Exp $ */
+/* $Id: overlappedio.cpp,v 1.13 2001-12-14 12:44:57 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 #include <handlemanager.h>
 #include <heapstring.h>
-#include "overlappedio.h"
+#include <overlappedio.h>
 #include "oslibdos.h"
 
@@ -239 +239 @@
                 else lpRequest->dwLastError = lpWriteHandler(lpRequest, &dwResult, NULL);
 
-                lpOverlapped->Internal     = lpRequest->dwLastError;
-                lpOverlapped->InternalHigh = dwResult;
-                if(lpRequest->lpdwResult) {
-                    *lpRequest->lpdwResult = dwResult;
+                if(!lpRequest->fCancelled) 
+                {
+                    lpOverlapped->Internal     = lpRequest->dwLastError;
+                    lpOverlapped->InternalHigh = dwResult;
+                    if(lpRequest->lpdwResult) {
+                        *lpRequest->lpdwResult = dwResult;
+                    }
+#ifdef DEBUG
+                    if(lpRequest->dwAsyncType == ASYNCIO_READ) {
+                         dprintf(("ASYNCIO_READ %x finished; result %x, last error %d", lpOverlapped, dwResult, lpRequest->dwLastError));
+                    }
+                    else dprintf(("ASYNCIO_WRITE %x finished; result %x, last error %d", lpOverlapped, dwResult, lpRequest->dwLastError));
+#endif
+                    //wake up user thread
+                    ::SetEvent(lpOverlapped->hEvent);
                 }
-#ifdef DEBUG
-                if(lpRequest->dwAsyncType == ASYNCIO_READ) {
-                     dprintf(("ASYNCIO_READ %x finished; result %x, last error %d", lpOverlapped, dwResult, lpRequest->dwLastError));
-                }
-                else dprintf(("ASYNCIO_WRITE %x finished; result %x, last error %d", lpOverlapped, dwResult, lpRequest->dwLastError));
-#endif
-                //wake up user thread
-                ::SetEvent(lpOverlapped->hEvent);
                 break;
 
@@ -279 +282 @@
                 }
                 //Don't access the overlapped & result memory when CancelIo was used to cancel the operation
-                if(ret == WAIT_TIMEOUT)
+                if(ret == WAIT_TIMEOUT && !lpRequest->fCancelled)
                 {
                     dprintf(("ASYNCIO_POLL %x: result %x, last error %d", lpOverlapped, dwResult, lpRequest->dwLastError));