Changeset 7756 for trunk/src/kernel32/hmdevio.cpp

Timestamp:

Jan 9, 2002, 5:13:17 PM (24 years ago)

Author:

sandervl

Message:

Add driver data parameter to custom device driver calls

File:

• trunk/src/kernel32/hmdevio.cpp (modified) (8 diffs)

trunk/src/kernel32/hmdevio.cpp

@@ -1 @@
-/* $Id: hmdevio.cpp,v 1.24 2001-12-14 12:44:56 sandervl Exp $ */
+/* $Id: hmdevio.cpp,v 1.25 2002-01-09 16:13:17 sandervl Exp $ */
 
 /*
@@ -432 +432 @@
                                   PHMHANDLEDATA pHMHandleDataTemplate)
 {
-   pHMHandleData->hHMHandle = pfnDriverOpen(pHMHandleData->dwAccess, pHMHandleData->dwShare, pHMHandleData->dwFlags);
+   pHMHandleData->hHMHandle = pfnDriverOpen(pHMHandleData->dwAccess, pHMHandleData->dwShare, pHMHandleData->dwFlags, (PVOID *)&pHMHandleData->dwUserData);
    if(pHMHandleData->hHMHandle == INVALID_HANDLE_VALUE_W) {
        return GetLastError();
@@ -443 +443 @@
 {
    if(pHMHandleData->hHMHandle) {
-        pfnDriverClose(pHMHandleData->hHMHandle, pHMHandleData->dwFlags);
+        pfnDriverClose(pHMHandleData->hHMHandle, pHMHandleData->dwFlags, (PVOID)pHMHandleData->dwUserData);
    }
    pHMHandleData->hHMHandle = 0;
@@ -464 +464 @@
 
    ret = pfnDriverIOCtl(pHMHandleData->hHMHandle, pHMHandleData->dwFlags, dwIoControlCode, lpInBuffer, nInBufferSize,
-                        lpOutBuffer, nOutBufferSize, lpBytesReturned, lpOverlapped);
+                        lpOutBuffer, nOutBufferSize, lpBytesReturned, lpOverlapped, (PVOID)pHMHandleData->dwUserData);
    dprintf(("DeviceIoControl %x returned %d", dwIoControlCode, ret));
    return ret;
@@ -500 +500 @@
    }
    ret = pfnDriverRead(pHMHandleData->hHMHandle, pHMHandleData->dwFlags, lpBuffer, nNumberOfBytesToRead,
-                      lpNumberOfBytesRead, lpOverlapped, lpCompletionRoutine);
+                      lpNumberOfBytesRead, lpOverlapped, lpCompletionRoutine,
+                      (PVOID)pHMHandleData->dwUserData);
    dprintf(("pfnDriverRead %x %x %x %x %x %x returned %x", pHMHandleData->hHMHandle, lpBuffer, nNumberOfBytesToRead,
              lpNumberOfBytesRead, lpOverlapped, lpCompletionRoutine, ret));
@@ -537 +538 @@
    }
    ret = pfnDriverWrite(pHMHandleData->hHMHandle, pHMHandleData->dwFlags, lpBuffer, nNumberOfBytesToWrite,
-                        lpNumberOfBytesWritten, lpOverlapped, lpCompletionRoutine);
+                        lpNumberOfBytesWritten, lpOverlapped, lpCompletionRoutine,
+                        (PVOID)pHMHandleData->dwUserData);
    dprintf(("pfnDriverWrite %x %x %x %x %x %x returned %x", pHMHandleData->hHMHandle, lpBuffer, nNumberOfBytesToWrite,
             lpNumberOfBytesWritten, lpOverlapped, lpCompletionRoutine, ret));
@@ -561 +563 @@
        return FALSE;
    }
-   ret = pfnDriverCancelIo(pHMHandleData->hHMHandle, pHMHandleData->dwFlags);
+   ret = pfnDriverCancelIo(pHMHandleData->hHMHandle, pHMHandleData->dwFlags, (PVOID)pHMHandleData->dwUserData);
    dprintf(("pfnDriverCancelIo %x returned %x", pHMHandleData->hHMHandle, ret));
    return ret;
@@ -600 +602 @@
         return FALSE;
     }
-    return pfnDriverGetOverlappedResult(pHMHandleData->hHMHandle, pHMHandleData->dwFlags, lpOverlapped, lpcbTransfer, fWait);
+    return pfnDriverGetOverlappedResult(pHMHandleData->hHMHandle, pHMHandleData->dwFlags, 
+                                        lpOverlapped, lpcbTransfer, fWait, (PVOID)pHMHandleData->dwUserData);
 }
 //******************************************************************************