Changeset 7518 for trunk/src

Timestamp:

Dec 1, 2001, 8:26:40 PM (24 years ago)

Author:

sandervl

Message:

minor update

Location:

trunk/src/kernel32

Files:

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

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.56 2001-11-26 14:53:57 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.57 2001-12-01 19:26:40 sandervl Exp $ */
 
 /*
@@ -653 +653 @@
               LPOVERLAPPED, lpOverlapped)
 {
+  if(lpNumberOfBytesRead) *lpNumberOfBytesRead = 0;
+  if(dwLength == 0) {
+      dprintf(("!WARNING!: Nothing to do"));
+      //TODO: should we fail here instead?? (wine doesn't)
+      return TRUE;
+  }
   return (HMReadFile(hFile,
                      pBuffer,
@@ -668 +674 @@
               LPOVERLAPPED_COMPLETION_ROUTINE,  lpCompletionRoutine)
 {
+  if(nNumberOfBytesToRead == 0) {
+      dprintf(("!WARNING!: Nothing to do"));
+      //TODO: should we fail here instead?? (wine doesn't)
+      return TRUE;
+  }
   return (HMReadFileEx(hFile,
                        lpBuffer,
@@ -682 +693 @@
               LPOVERLAPPED, lpOverlapped)
 {
+  if(nrbyteswritten) *nrbyteswritten = 0;
+  if(nrbytes == 0) {
+      dprintf(("!WARNING!: Nothing to do"));
+      //TODO: should we fail here instead?? (wine doesn't)
+      return TRUE;
+  }
+
   return (HMWriteFile(hFile,
                       buffer,
@@ -716 +734 @@
               LPOVERLAPPED_COMPLETION_ROUTINE,  lpCompletionRoutine)
 {
+  if(nNumberOfBytesToWrite == 0) {
+      dprintf(("!WARNING!: Nothing to do"));
+      //TODO: should we fail here instead?? (wine doesn't)
+      return TRUE;
+  }
+
   return (HMWriteFileEx(hFile,
                         (LPVOID)lpBuffer,

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.22 2001-11-30 13:52:32 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.23 2001-12-01 19:26:40 sandervl Exp $ */
 
 /*
@@ -312 +312 @@
     dprintf(("Warning: lpOverlapped != NULL & !FILE_FLAG_OVERLAPPED; sync operation"));
   }
+//testestestest
+  dprintf(("Bytes to write:"));
+  for(int i=0;i<nNumberOfBytesToWrite;i++) {
+          dprintf(("%x %c", ((char *)lpBuffer)[i], ((char *)lpBuffer)[i]));
+  }
+//testestestset
 
   ret = OSLibDosWrite(pHMHandleData->hHMHandle, (LPVOID)lpBuffer, nNumberOfBytesToWrite,
@@ -430 +436 @@
   if(ret == FALSE) {
        dprintf(("!ERROR!: ReadFile failed with rc %d", GetLastError()));
+  }
+  else {
+//testestestest
+      dprintf(("Bytes read:"));
+      for(int i=0;i<ulBytesRead;i++) {
+          dprintf(("%x %c", ((char *)lpBuffer)[i], ((char *)lpBuffer)[i]));
+      }
+//testestestset
   }
   return ret;
@@ -541 +555 @@
   dprintf(("SerialCommThread %x entered", hComm));
 
+  SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL);
   while(TRUE) 
   {