Changeset 7596 for trunk/src

Timestamp:

Dec 9, 2001, 10:19:28 PM (24 years ago)

Author:

sandervl

Message:

Overlapped IO fix (poll)

Location:

trunk/src/kernel32

Files:

• hmcomm.cpp (modified) (4 diffs)
• overlappedio.cpp (modified) (5 diffs)

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.31 2001-12-08 15:44:30 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.32 2001-12-09 21:19:28 sandervl Exp $ */
 
 /*
@@ -634 +634 @@
         ::SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
+    }
+
+    if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED)
+    {
+        return pDevData->iohandler->WaitForEvent(pHMHandleData->hWin32Handle, pDevData->dwEventMask, lpfdwEvtMask,
+                                                 lpo, NULL, (DWORD)pDevData);
     }
 
@@ -666 +672 @@
         else break;
 
-        if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED)
-        {
-            return pDevData->iohandler->WaitForEvent(pHMHandleData->hWin32Handle, pDevData->dwEventMask, lpfdwEvtMask,
-                                                     lpo, NULL, (DWORD)pDevData);
-        }
         DosSleep(TIMEOUT_COMM);
     }
@@ -725 +726 @@
   PHMDEVCOMDATA pDevData = (PHMDEVCOMDATA)pHMHandleData->lpHandlerData;
 
-    dprintf(("KERNEL32-WARNING: HMDeviceCommClass::GetOverlappedResult(%08xh,%08xh,%08xh,%08xh) partly implemented",
+    dprintf(("KERNEL32-WARNING: HMDeviceCommClass::GetOverlappedResult(%08xh,%08xh,%08xh,%08xh)",
              pHMHandleData->hHMHandle, lpOverlapped, lpcbTransfer, fWait));
 

trunk/src/kernel32/overlappedio.cpp

@@ -1 @@
-/* $Id: overlappedio.cpp,v 1.7 2001-12-07 14:13:38 sandervl Exp $ */
+/* $Id: overlappedio.cpp,v 1.8 2001-12-09 21:19:28 sandervl Exp $ */
 
 /*
@@ -428 +428 @@
 {
     LPASYNCIOREQUEST lpRequest, current;
+    DWORD            dwLastError, dwResult;
 
     if(!lpOverlapped || lpOverlapped->hEvent == 0) {
+        ::SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+    if(!lpPollHandler) {
+        DebugInt3();
         ::SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
@@ -451 +457 @@
     lpRequest->next                = NULL;
 
+    lpOverlapped->Internal     = ERROR_IO_PENDING;
+    lpOverlapped->InternalHigh = 0;
+    lpOverlapped->Offset       = 0;
+    lpOverlapped->OffsetHigh   = 0;
+    //reset overlapped semaphore to non-signalled
+    ::ResetEvent(lpOverlapped->hEvent);
+
+    //first check if the event has already occured; if so, return result
+    //immediately
+    dwLastError = lpPollHandler(lpRequest, &dwResult, &dwTimeOut);
+    if(dwLastError != ERROR_IO_PENDING) 
+    {
+        dprintf(("OverlappedIOHandler::WaitForEvent %x: result %x, last error %d", lpOverlapped, dwResult, dwLastError));
+        lpOverlapped->Internal     = dwLastError;
+        lpOverlapped->InternalHigh = dwResult;
+        if(lpfdwEvtMask) {
+            *lpfdwEvtMask = dwResult;
+        }
+        //wake up user thread
+        ::SetEvent(lpOverlapped->hEvent);
+
+        delete lpRequest;
+        ::SetLastError(dwLastError);
+        return (dwLastError == ERROR_SUCCESS);
+    }
+
     ::EnterCriticalSection(&critsect);
     if(pending[ASYNC_INDEX_POLL]) {
@@ -462 +494 @@
     ::LeaveCriticalSection(&critsect);
 
-    lpOverlapped->Internal     = ERROR_IO_PENDING;
-    lpOverlapped->InternalHigh = 0;
-    lpOverlapped->Offset       = 0;
-    lpOverlapped->OffsetHigh   = 0;
-    //reset overlapped semaphore to non-signalled
-    ::ResetEvent(lpOverlapped->hEvent);
-
     //wake up async thread
     ::SetEvent(hEventPoll);
@@ -514 +539 @@
     ::SetLastError(lpOverlapped->Internal);
 
+    dprintf(("GetOverlappedResult %x -> result %d last error %d", hHandle, lpOverlapped->InternalHigh, lpOverlapped->Internal));
     return (ret == WAIT_OBJECT_0);
 }