Changeset 1653 in vbox for trunk/src/VBox

Timestamp:

Mar 23, 2007 10:14:23 AM (18 years ago)

Author:

vboxsync

Message:

More overlapped changes

File:

• trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp

@@ -80 +80 @@
     RTFILE              NamedPipe;
     /* Dummy overlapped structure. */
-    OVERLAPPED          Overlapped;
+    OVERLAPPED          OverlappedWrite;
+    /* Overlapped structure for reads. */
+    OVERLAPPED          OverlappedRead;
 #else /* !__WIN__ */
     /** Socket handle of the local socket for server. */
@@ -112 +114 @@
     {
         unsigned cbReallyRead;
-        rc = RTFileRead(pData->NamedPipe, pvBuf, *cbRead, &cbReallyRead);
+        pData->OverlappedRead.Offset     = 0;
+        pData->OverlappedRead.OffsetHigh = 0;
+        if (!ReadFile((HANDLE)pData->NamedPipe, pvBuf, *cbRead, NULL, &pData->OverlappedRead))
+        {
+            DWORD uError = GetLastError();
+
+            if (uError == ERROR_IO_PENDING)
+            {
+                /* Wait for incoming bytes. */
+                if (GetOverlappedResult((HANDLE)pData->NamedPipe, &pData->OverlappedRead, (DWORD *)&cbReallyRead, TRUE) == FALSE)
+                {
+                    uError = GetLastError();
+                }
+            }
+
+            rc = RTErrConvertFromWin32(uError);
+
+            Log(("drvNamedPipeRead: WriteFile returned %d (%Vrc)\n", uError, rc));
+        }
+
         if (VBOX_FAILURE(rc))
         {
@@ -174 +195 @@
     {
         unsigned cbWritten;
-        pData->Overlapped.Offset     = 0;
-        pData->Overlapped.OffsetHigh = 0;
-        if (!WriteFile((HANDLE)pData->NamedPipe, pvBuf, *cbWrite, NULL, &pData->Overlapped))
+        pData->OverlappedWrite.Offset     = 0;
+        pData->OverlappedWrite.OffsetHigh = 0;
+        if (!WriteFile((HANDLE)pData->NamedPipe, pvBuf, *cbWrite, NULL, &pData->OverlappedWrite))
         {
             DWORD uError = GetLastError();
@@ -395 +416 @@
     }
 
-    memset(&pData->Overlapped, 0, sizeof(pData->Overlapped));
-    pData->Overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+    memset(&pData->OverlappedWrite, 0, sizeof(pData->OverlappedWrite));
+    memset(&pData->OverlappedRead, 0, sizeof(pData->OverlappedRead));
+    pData->OverlappedWrite.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+    pData->OverlappedRead.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
 
 #else /* !__WIN__ */
@@ -465 +488 @@
 
         RTFileClose(pData->NamedPipe);
-        CloseHandle(pData->Overlapped.hEvent);
+        CloseHandle(pData->OverlappedRead.hEvent);
+        CloseHandle(pData->OverlappedWrite.hEvent);
     }
 #else /* !__WIN__ */