Changeset 8644 for trunk/src/kernel32

Timestamp:

Jun 11, 2002, 2:52:03 PM (23 years ago)

Author:

sandervl

Message:

Overlapped IO bugfixes

Location:

trunk/src/kernel32

Files:

• hmcomm.cpp (modified) (6 diffs)
• overlappedio.cpp (modified) (9 diffs)

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.34 2001-12-10 14:04:24 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.35 2002-06-11 12:51:43 sandervl Exp $ */
 
 /*
@@ -297 +297 @@
     PHMHANDLEDATA pHMHandleData;
     BOOL          ret;
-    ULONG         ulBytesRead;
+    ULONG         ulBytesRead, len;
 
     pHMHandleData = HMQueryHandleData(lpRequest->hHandle);
@@ -317 +317 @@
 #endif
 
-    ret = OSLibDosRead(pHMHandleData->hHMHandle, (LPVOID)lpRequest->lpBuffer, lpRequest->nNumberOfBytes,
-                       &ulBytesRead);
+    ret = OSLibDosRead(pHMHandleData->hHMHandle, (LPVOID)lpRequest->lpBuffer, lpRequest->nNumberOfBytes, &ulBytesRead);
 
     *lpdwResult = (ret) ? ulBytesRead : 0;
@@ -327 +326 @@
     }
     else {
-        //testestestest
+#ifdef DEBUG
         dprintf2(("%d Bytes read:", ulBytesRead));
-        for(int i=0;i<ulBytesRead;i++) {
+        for(int i=0;i<min(ulBytesRead, 16);i++) {
             dprintf2(("%x %c", ((char *)lpRequest->lpBuffer)[i], ((char *)lpRequest->lpBuffer)[i]));
         }
-        //testestestset
+#endif
     }
     return GetLastError();
@@ -352 +351 @@
     }
 
-    //testestestest
+#ifdef DEBUG
     dprintf2(("Bytes to write:"));
-    for(int i=0;i<lpRequest->nNumberOfBytes;i++) {
+    for(int i=0;i<min(lpRequest->nNumberOfBytes, 16);i++) {
         dprintf2(("%x %c", ((char *)lpRequest->lpBuffer)[i], ((char *)lpRequest->lpBuffer)[i]));
     }
-    //testestestset
+#endif
 
     ret = OSLibDosWrite(pHMHandleData->hHMHandle, (LPVOID)lpRequest->lpBuffer, lpRequest->nNumberOfBytes,
@@ -593 +592 @@
         dprintf(("!ERROR!: ReadFile failed with rc %d", GetLastError()));
     }
+#ifdef DEBUG
     else {
-        //testestestest
         dprintf2(("%d Bytes read:", ulBytesRead));
-        for(int i=0;i<ulBytesRead;i++) {
+        for(int i=0;i<min(ulBytesRead, 16);i++) {
             dprintf2(("%x %c", ((char *)lpBuffer)[i], ((char *)lpBuffer)[i]));
         }
-        //testestestset
-    }
+    }
+#endif
     return ret;
 }

trunk/src/kernel32/overlappedio.cpp

@@ -1 @@
-/* $Id: overlappedio.cpp,v 1.15 2002-06-10 17:46:53 sandervl Exp $ */
+/* $Id: overlappedio.cpp,v 1.16 2002-06-11 12:51:43 sandervl Exp $ */
 
 /*
@@ -154 +154 @@
     OverlappedIOHandler *lpOverlappedObj;
 
-    if(threadparam == NULL) {
+    if(threadparam == NULL || threadparam->lpOverlappedObj == NULL) {
         DebugInt3();
         return 0;
@@ -222 +222 @@
             pending[index]  = lpRequest->next;
 
-            //add to in process list
+            //add to the head of process list
             lpRequest->next = pending[ASYNC_INDEX_BUSY];
             pending[ASYNC_INDEX_BUSY] = lpRequest;
@@ -230 +230 @@
             hHandle      = lpRequest->hHandle;
 
+#ifdef DEBUG
+            switch(lpRequest->dwAsyncType) {
+            case ASYNCIO_READ:
+            case ASYNCIO_WRITE:
+            case ASYNCIO_POLL:
+                break;
+            default:
+                DebugInt3();
+                break;
+            }
+#endif
             switch(dwOperation) {
             case ASYNCIO_READ:
@@ -298 +309 @@
             }
             //remove from in-process list and delete async request object
-            findAndRemoveRequest(ASYNC_INDEX_BUSY, hHandle);
+            removeRequest(ASYNC_INDEX_BUSY, lpRequest);
             delete lpRequest;
         } //while(TRUE)
@@ -346 +357 @@
     else index = ASYNC_INDEX_WRITE;
 
-    ::EnterCriticalSection(&critsect);
-    if(pending[index]) {
-         current = pending[index];
-         while(current->next) {
-             current = current->next;
-         }
-         current->next = lpRequest;
-    }
-    else pending[index] = lpRequest;
-    ::LeaveCriticalSection(&critsect);
+    addRequest(index, lpRequest);
 
     lpOverlapped->Internal     = STATUS_PENDING;
@@ -404 +406 @@
     lpRequest->next                = NULL;
 
-    ::EnterCriticalSection(&critsect);
-    if(pending[ASYNC_INDEX_READ]) {
-         current = pending[ASYNC_INDEX_READ];
-         while(current->next) {
-             current = current->next;
-         }
-         current->next = lpRequest;
-    }
-    else pending[ASYNC_INDEX_READ] = lpRequest;
-    ::LeaveCriticalSection(&critsect);
+    addRequest(ASYNC_INDEX_READ, lpRequest);
 
     lpOverlapped->Internal     = STATUS_PENDING;
@@ -490 +483 @@
     }
 
-    ::EnterCriticalSection(&critsect);
-    if(pending[ASYNC_INDEX_POLL]) {
-         current = pending[ASYNC_INDEX_READ];
-         while(current->next) {
-             current = current->next;
-         }
-         current->next = lpRequest;
-    }
-    else pending[ASYNC_INDEX_POLL] = lpRequest;
-    ::LeaveCriticalSection(&critsect);
+    addRequest(ASYNC_INDEX_POLL, lpRequest);
 
     //wake up async thread
@@ -584 +568 @@
 //******************************************************************************
 //******************************************************************************
-
+void OverlappedIOHandler::addRequest(int index, LPASYNCIOREQUEST lpRequest)
+{
+    LPASYNCIOREQUEST current;
+
+    ::EnterCriticalSection(&critsect);
+    if(pending[index]) {
+         current = pending[index];
+         while(current->next) {
+             current = current->next;
+         }
+         current->next = lpRequest;
+    }
+    else pending[index] = lpRequest;
+    ::LeaveCriticalSection(&critsect);
+}
+//******************************************************************************
+//******************************************************************************
+void OverlappedIOHandler::removeRequest(int index, LPASYNCIOREQUEST lpRequest)
+{
+    LPASYNCIOREQUEST current;
+
+    ::EnterCriticalSection(&critsect);
+    if(pending[index]) {
+        if(pending[index] == lpRequest) {
+            pending[index] = lpRequest->next;
+        }
+        else {
+            current = pending[index];
+            while(current->next && current->next != lpRequest) {
+                current = current->next;
+            }
+            if(current->next) {
+                current->next = lpRequest->next;
+            }
+            else {
+                dprintf(("!ERROR!: request %x not found!!!!!!", lpRequest));
+                DebugInt3();
+            }
+        }
+    }
+    //else removed from list by cancelio
+    ::LeaveCriticalSection(&critsect);
+}
+//******************************************************************************
+//******************************************************************************
+