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

Timestamp:

Oct 26, 2001, 9:22:15 PM (24 years ago)

Author:

sandervl

Message:

IOCTL_CDROM_READ_TOC fix: add lead-out track

File:

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

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.21 2001-10-26 17:47:21 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.22 2001-10-26 19:22:15 sandervl Exp $ */
 
 /*
@@ -150 +150 @@
             *(FARPROC *)&drvInfo->GetASPI32SupportInfo = GetProcAddress(drvInfo->hInstAspi, "GetASPI32SupportInfo");
             *(FARPROC *)&drvInfo->SendASPI32Command    = GetProcAddress(drvInfo->hInstAspi, "SendASPI32Command");
+
+            if(drvInfo->GetASPI32SupportInfo() == 0) {
+                FreeLibrary(drvInfo->hInstAspi);
+                drvInfo->hInstAspi = 0;
+            }
    
             //get cdrom signature
@@ -597 +602 @@
             return FALSE;
         }
-
+        memset(pTOC, 0, nOutBufferSize);
         //IOCTL_CDROMAUDIO (0x81), CDROMAUDIO_GETAUDIODISK (0x61)
         datasize = sizeof(diskinfo);
@@ -611 +616 @@
         dprintf(("first %d, last %d, num %d", pTOC->FirstTrack, pTOC->LastTrack, numtracks));
 
-        int len = 4 + numtracks*sizeof(TRACK_DATA) - 2; //minus length itself;
+        //numtracks+1, because we have to add a track at the end
+        int length = 4 + (numtracks+1)*sizeof(TRACK_DATA); 
         //big endian format
-        pTOC->Length[0] = HIBYTE(len);
-        pTOC->Length[1] = LOBYTE(len);
-
-        if(nOutBufferSize < 4+numtracks*sizeof(TRACK_DATA)) {
+        pTOC->Length[0] = HIBYTE((length-2));  //minus length itself;
+        pTOC->Length[1] = LOBYTE((length-2));  //minus length itself;
+
+        if(nOutBufferSize < length) {
             SetLastError(ERROR_INSUFFICIENT_BUFFER);
             return FALSE;
         }
-
+        
         for(int i=0;i<numtracks;i++) 
         {
@@ -646 +652 @@
             pTOC->TrackData[i].Address[2]  = LOWORD(HIBYTE(trackinfo.ulTrackAddr));
             pTOC->TrackData[i].Address[3]  = LOWORD(LOBYTE(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
+        pTOC->TrackData[numtracks].TrackNumber = 0xAA;
+        pTOC->TrackData[numtracks].Reserved    = 0;
+        pTOC->TrackData[numtracks].Control     = pTOC->TrackData[numtracks-1].Control;
+        pTOC->TrackData[numtracks].Adr         = pTOC->TrackData[numtracks-1].Adr;
+        pTOC->TrackData[numtracks].Reserved1   = 0;
+        //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));
+
         if(lpBytesReturned)
-            *lpBytesReturned = 4 + numtracks*sizeof(TRACK_DATA);
+            *lpBytesReturned = length;
 
         SetLastError(ERROR_SUCCESS);
@@ -1015 +1035 @@
         addr->PortNumber = 0;
         addr->PathId     = 0;
+
+        if(drvInfo->hInstAspi == NULL) {
+            //Don't fail if wnaspi32 not loaded
+            addr->TargetId   = 0;
+            addr->Lun        = 0;
+            SetLastError(ERROR_SUCCESS);
+            return TRUE;
+        }
+
         numAdapters = drvInfo->GetASPI32SupportInfo();
-
-        if(LOBYTE(numAdapters) == 0) {
-            //testestest
-            i=j=k=0;
-            goto done; //failure;
-        }
 
         memset(&srb, 0, sizeof(srb));