Changeset 7270 for trunk/src

Timestamp:

Oct 29, 2001, 9:08:40 PM (24 years ago)

Author:

sandervl

Message:

minor updates

Location:

trunk/src/kernel32

Files:

• hmdisk.cpp (modified) (6 diffs)
• oslibdos.cpp (modified) (3 diffs)

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.25 2001-10-29 16:29:33 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.26 2001-10-29 20:08:40 sandervl Exp $ */
 
 /*
@@ -123 +123 @@
     {
         if(hFile == INVALID_HANDLE_ERROR) {
+             dprintf(("Drive not ready"));
              SetLastError(NO_ERROR);
              pHMHandleData->hHMHandle  = 0; //handle lookup fails if this is set to -1
@@ -153 +154 @@
             *(FARPROC *)&drvInfo->SendASPI32Command    = GetProcAddress(drvInfo->hInstAspi, "SendASPI32Command");
 
-            if(drvInfo->GetASPI32SupportInfo() == 0) {
+            if(drvInfo->GetASPI32SupportInfo() == (SS_FAILED_INIT << 8)) {
                 FreeLibrary(drvInfo->hInstAspi);
                 drvInfo->hInstAspi = 0;
@@ -997 +998 @@
              return FALSE;
         }
-        dprintf(("IOCTL_SCSI_PASS_THROUGH_DIRECT %x", pPacket->Cdb[0]));
+        dprintf(("IOCTL_SCSI_PASS_THROUGH_DIRECT %x len %x, %x%02x%02x%02x %x%02x", pPacket->Cdb[0], pPacket->DataTransferLength, pPacket->Cdb[2], pPacket->Cdb[3], pPacket->Cdb[4], pPacket->Cdb[5], pPacket->Cdb[7], pPacket->Cdb[8]));
         psrb->SRB_BufPointer = (BYTE *)pPacket->DataBuffer;
         memcpy(&psrb->CDBByte[0], &pPacket->Cdb[0], 16);
@@ -1178 +1179 @@
       dprintf(("%x -> %d", lpBuffer, IsBadWritePtr((LPVOID)lpBuffer, nNumberOfBytesToRead)));
   }
-  else dprintf2(("KERNEL32: HMDeviceDiskClass::ReadFile read %x bytes", *lpNumberOfBytesRead));
+  else dprintf2(("KERNEL32: HMDeviceDiskClass::ReadFile read %x bytes pos %x", *lpNumberOfBytesRead, SetFilePointer(pHMHandleData, 0, NULL, FILE_CURRENT)));
 
   return bRC;
@@ -1217 +1218 @@
 
   if(ret == -1) {
-    dprintf(("SetFilePointer failed (error = %d)", GetLastError()));
+      dprintf(("SetFilePointer failed (error = %d)", GetLastError()));
   }
   return ret;

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.80 2001-10-25 13:19:05 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.81 2001-10-29 20:08:40 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -729 +729 @@
   if(rc)
   {
-    SetLastError(error2WinError(rc));
-    return -1;
-  }
-  else  return newoffset;
+      SetLastError(error2WinError(rc));
+      return -1;
+  }
+  SetLastError(ERROR_SUCCESS_W);
+  return newoffset;
 }
 //******************************************************************************
@@ -742 +743 @@
   rc = DosDelete(lpszFileName);
   if(rc) {
-  SetLastError(error2WinError(rc));
-  return FALSE;
+      SetLastError(error2WinError(rc));
+      return FALSE;
   }
   return TRUE;