Changeset 7272 for trunk/src/kernel32/hmdisk.cpp

Timestamp:

Oct 30, 2001, 1:46:17 AM (24 years ago)

Author:

sandervl

Message:

IOCTL_CDROM_READ_TOC bugfix

File:

• trunk/src/kernel32/hmdisk.cpp (modified) (12 diffs)

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.26 2001-10-29 20:08:40 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.27 2001-10-30 00:46:17 sandervl Exp $ */
 
 /*
@@ -38 +38 @@
     ULONG     driveType;
     CHAR      signature[8];
+    DWORD     dwAccess;
+    DWORD     dwShare;
+    DWORD     dwCreation;
+    DWORD     dwFlags;
+    LPSECURITY_ATTRIBUTES lpSecurityAttributes;
+    HFILE     hTemplate;
 } DRIVE_INFO;
 
@@ -137 +143 @@
 
         memset(drvInfo, 0, sizeof(DRIVE_INFO));
+        drvInfo->dwAccess  = pHMHandleData->dwAccess;
+        drvInfo->dwAccess  = pHMHandleData->dwShare;
+        drvInfo->lpSecurityAttributes  = (LPSECURITY_ATTRIBUTES)lpSecurityAttributes;
+        drvInfo->dwAccess  = pHMHandleData->dwCreation;
+        drvInfo->dwAccess  = pHMHandleData->dwFlags;
+        drvInfo->hTemplate = hTemplate;
+
         drvInfo->driveLetter = *lpFileName; //save drive letter
         if(drvInfo->driveLetter >= 'a') {
@@ -173 +186 @@
         return(GetLastError());
     }
+}
+//******************************************************************************
+//******************************************************************************
+DWORD HMDeviceDiskClass::OpenDisk(PVOID pDrvInfo)
+{
+    char filename[3];
+    DRIVE_INFO *drvInfo = (DRIVE_INFO*)pDrvInfo;
+    HFILE hFile;
+
+    filename[0] = 'A' + drvInfo->driveLetter;
+    filename[1] = ':';
+    filename[2] = 0;
+
+    //Disable error popus. NT allows an app to open a cdrom/dvd drive without a disk inside
+    //OS/2 fails in that case with error ERROR_NOT_READY
+    ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS);
+    hFile = OSLibDosCreateFile(filename,
+                               drvInfo->dwAccess,
+                               drvInfo->dwShare,
+                               drvInfo->lpSecurityAttributes,
+                               drvInfo->dwCreation,
+                               drvInfo->dwFlags,
+                               drvInfo->hTemplate);
+    SetErrorMode(oldmode);
+
+    if (hFile != INVALID_HANDLE_ERROR || GetLastError() == ERROR_NOT_READY)
+    {
+        if(hFile == INVALID_HANDLE_ERROR) {
+             dprintf(("Drive not ready"));
+             return 0; 
+        }
+        else return hFile;
+    }
+    return 0;
 }
 //******************************************************************************
@@ -523 +570 @@
         APIRET rc;
 
+        if(!pHMHandleData->hHMHandle) {
+            pHMHandleData->hHMHandle = OpenDisk(drvInfo);
+            if(!pHMHandleData->hHMHandle) {
+                dprintf(("No disk inserted; aborting"));
+                SetLastError(ERROR_NOT_READY);
+                return FALSE;
+            }
+        }
+
         //Applications can use this IOCTL to check if the floppy has been changed
         //OSLibDosGetDiskGeometry won't fail when that happens so we read one
@@ -651 +707 @@
             pTOC->TrackData[i].Reserved1   = 0;
             //big endian format
-            pTOC->TrackData[i].Address[0]  = HIWORD(HIBYTE(trackinfo.ulTrackAddr));
-            pTOC->TrackData[i].Address[1]  = HIWORD(LOBYTE(trackinfo.ulTrackAddr));
-            pTOC->TrackData[i].Address[2]  = LOWORD(HIBYTE(trackinfo.ulTrackAddr));
-            pTOC->TrackData[i].Address[3]  = LOWORD(LOBYTE(trackinfo.ulTrackAddr));
-        }
+            pTOC->TrackData[i].Address[0]  = HIBYTE(HIWORD(trackinfo.ulTrackAddr));
+            pTOC->TrackData[i].Address[1]  = LOBYTE(HIWORD(trackinfo.ulTrackAddr));
+            pTOC->TrackData[i].Address[2]  = HIBYTE(LOWORD(trackinfo.ulTrackAddr));
+            pTOC->TrackData[i].Address[3]  = LOBYTE(LOWORD(trackinfo.ulTrackAddr));
+        }
+
         //Add a track at the end (presumably so the app can determine the size of the 1st track)
         //That is what NT4, SP6 does anyway
@@ -665 +722 @@
         //big endian format
         //Address of pseudo track is the address of the lead-out track
-        pTOC->TrackData[numtracks].Address[0]  = HIWORD(HIBYTE(diskinfo.ulLeadOutAddr));
-        pTOC->TrackData[numtracks].Address[1]  = HIWORD(LOBYTE(diskinfo.ulLeadOutAddr));
-        pTOC->TrackData[numtracks].Address[2]  = LOWORD(HIBYTE(diskinfo.ulLeadOutAddr));
-        pTOC->TrackData[numtracks].Address[3]  = LOWORD(LOBYTE(diskinfo.ulLeadOutAddr));
+        pTOC->TrackData[numtracks].Address[0]  = HIBYTE(HIWORD(diskinfo.ulLeadOutAddr));
+        pTOC->TrackData[numtracks].Address[1]  = LOBYTE(HIWORD(diskinfo.ulLeadOutAddr));
+        pTOC->TrackData[numtracks].Address[2]  = HIBYTE(LOWORD(diskinfo.ulLeadOutAddr));
+        pTOC->TrackData[numtracks].Address[3]  = LOBYTE(LOWORD(diskinfo.ulLeadOutAddr));
 
         if(lpBytesReturned)
@@ -876 +933 @@
             *lpBytesReturned = 0;
         }
+
+        if(!pHMHandleData->hHMHandle) {
+            pHMHandleData->hHMHandle = OpenDisk(drvInfo);
+            if(!pHMHandleData->hHMHandle) {
+                dprintf(("No disk inserted; aborting"));
+                SetLastError(ERROR_NOT_READY);
+                return FALSE;
+            }
+        }
+
 #pragma pack(1)
       typedef struct
@@ -954 +1021 @@
         SRB_ExecSCSICmd *psrb;
 
-        if(drvInfo->hInstAspi == NULL) {
+        if(drvInfo->hInstAspi == NULL) 
+        {
             SetLastError(ERROR_ACCESS_DENIED);
             return FALSE;
@@ -968 +1036 @@
             *lpBytesReturned = 0;
         }
+
         psrb = (SRB_ExecSCSICmd *)alloca(sizeof(SRB_ExecSCSICmd)+pPacket->SenseInfoLength);
         if(psrb == NULL) {
@@ -1145 +1214 @@
     return FALSE;
   }
+
+  if(!pHMHandleData->hHMHandle) {
+      DRIVE_INFO *drvInfo = (DRIVE_INFO*)pHMHandleData->dwUserData;
+      pHMHandleData->hHMHandle = OpenDisk(drvInfo);
+      if(!pHMHandleData->hHMHandle) {
+          dprintf(("No disk inserted; aborting"));
+          SetLastError(ERROR_NOT_READY);
+          return -1;
+      }
+  }
+
   if(!(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) && lpOverlapped) {
     dprintf(("Warning: lpOverlapped != NULL & !FILE_FLAG_OVERLAPPED; sync operation"));
@@ -1212 +1292 @@
            dwMoveMethod));
 
+  if(!pHMHandleData->hHMHandle) {
+      DRIVE_INFO *drvInfo = (DRIVE_INFO*)pHMHandleData->dwUserData;
+      pHMHandleData->hHMHandle = OpenDisk(drvInfo);
+      if(!pHMHandleData->hHMHandle) {
+          dprintf(("No disk inserted; aborting"));
+          SetLastError(ERROR_NOT_READY);
+          return -1;
+      }
+  }
+
   ret = OSLibDosSetFilePointer(pHMHandleData->hHMHandle,
                                lDistanceToMove,