Changeset 7631 for trunk/src/kernel32/overlappedio.cpp

Timestamp:

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

Author:

sandervl

Message:

enabled overlapped io for custom device drivers

File:

• trunk/src/kernel32/overlappedio.cpp (modified) (4 diffs)

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));