Changeset 6978 for trunk/src

Timestamp:

Oct 10, 2001, 1:01:17 PM (24 years ago)

Author:

phaller

Message:

added further IOCTL_STORAGE and IOCTL_CDROM calls

File:

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

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.13 2001-10-10 10:21:31 phaller Exp $ */
+/* $Id: hmdisk.cpp,v 1.14 2001-10-10 11:01:17 phaller Exp $ */
 
 /*
@@ -177 +177 @@
 //******************************************************************************
 //******************************************************************************
+
+// this helper function just calls the specified
+// ioctl function for the CDROM manager with no
+// parameter packet other than the CD01 signature
+// and no data packet.
+static BOOL ioctlCDROMSimple(PHMHANDLEDATA pHMHandleData,
+                             DWORD dwCategory,
+                             DWORD dwFunction,
+                             LPDWORD lpBytesReturned)
+{
+  DWORD dwParameterSize = 4;
+  DWORD dwDataSize      = 0;
+  DWORD ret;
+
+  if(lpBytesReturned)
+    *lpBytesReturned = 0;
+
+  ret = OSLibDosDevIOCtl(pHMHandleData->hHMHandle,
+                         dwCategory,
+                         dwFunction,
+                         "CD01",
+                         4,
+                         &dwParameterSize,
+                         NULL,
+                         0,
+                         &dwDataSize);
+  if(ret)
+  {
+    SetLastError(error2WinError(ret));
+    return FALSE;
+  }
+  SetLastError(ERROR_SUCCESS);
+  return TRUE;
+}
+
+
+// this helper function just calls the specified
+// ioctl function for the DISK manager with the
+// specified function codes
+static BOOL ioctlDISKUnlockEject(PHMHANDLEDATA pHMHandleData,
+                                 DWORD dwCommand,
+                                 DWORD dwDiskHandle,
+                                 LPDWORD lpBytesReturned)
+{
+#pragma pack(1)
+  struct
+  {
+    BYTE ucCommand;
+    BYTE ucHandle;
+  } ParameterBlock;
+#pragma pack()
+  
+  DWORD dwParameterSize = sizeof( ParameterBlock );
+  DWORD dwDataSize      = 0;
+  DWORD ret;
+  
+  ParameterBlock.ucCommand = dwCommand;
+  ParameterBlock.ucHandle  = dwDiskHandle;
+  
+  if(lpBytesReturned)
+    *lpBytesReturned = 0;
+
+  ret = OSLibDosDevIOCtl(pHMHandleData->hHMHandle,
+                         0x08,       // IOCTL_DISK
+                         0x40,       // DSK_UNLOCKEJECTMEDIA
+                         &ParameterBlock,
+                         sizeof( ParameterBlock ),
+                         &dwParameterSize,
+                         NULL,
+                         0,
+                         &dwDataSize);
+  if(ret)
+  {
+    SetLastError(error2WinError(ret));
+    return FALSE;
+  }
+  SetLastError(ERROR_SUCCESS);
+  return TRUE;
+}
+
+
+
 BOOL HMDeviceDiskClass::DeviceIoControl(PHMHANDLEDATA pHMHandleData, DWORD dwIoControlCode,
                              LPVOID lpInBuffer, DWORD nInBufferSize,
@@ -442 +524 @@
     case IOCTL_SERIAL_LSRMST_INSERT:
         break;
+      
+      
+    // -----------
+    // CDROM class
+    // -----------
 
     case IOCTL_CDROM_UNLOAD_DRIVER:
@@ -448 +535 @@
     case IOCTL_CDROM_PLAY_AUDIO_MSF:
     case IOCTL_CDROM_SEEK_AUDIO_MSF:
+        break;
+
+    case IOCTL_CDROM_PAUSE_AUDIO:
+      // NO BREAK CASE
+      // Note: for OS/2, pause and stop seems to be the same!
+      
     case IOCTL_CDROM_STOP_AUDIO:
-    case IOCTL_CDROM_PAUSE_AUDIO:
+    {
+      dprintf(("Stop / pause CDROM audio playback"));
+      return ioctlCDROMSimple(pHMHandleData, 
+                              0x81,   // IOCTL_CDROMAUDIO
+                              0x51,   // CDROMAUDIO_STOPAUDIO
+                              lpBytesReturned);
+    }
+      
     case IOCTL_CDROM_RESUME_AUDIO:
-        break;
+    {
+      dprintf(("Resume CDROM audio playback"));
+      return ioctlCDROMSimple(pHMHandleData, 
+                              0x81,   // IOCTL_CDROMAUDIO
+                              0x52,   // CDROMAUDIO_RESUMEAUDIO
+                              lpBytesReturned);
+    }
 
     case IOCTL_CDROM_GET_VOLUME:
@@ -531 +637 @@
     case IOCTL_CDROM_EJECT_MEDIA:
     {
-      DWORD dwParameterSize = 4;
-      DWORD dwDataSize      = 0;
-      DWORD ret;
-      
-      if(lpBytesReturned)
-        *lpBytesReturned = 0;
-
-      dprintf(("Eject CD media"));
-      ret = OSLibDosDevIOCtl(pHMHandleData->hHMHandle, 
-                             0x80,   // IOCTL_CDROM
-                             0x44,   // CDROMDISK_EJECTDISK
-                             "CD01", 
-                             4,
-                             &dwParameterSize,
-                             NULL,
-                             0,
-                             &dwDataSize);
-      if(ret) 
-      {
-        SetLastError(error2WinError(ret));
-        return FALSE;
-      }
-      SetLastError(ERROR_SUCCESS);
-      return TRUE;
+      dprintf(("Eject CDROM media"));
+      return ioctlCDROMSimple(pHMHandleData, 
+                              0x80,   // IOCTL_CDROM
+                              0x44,   // CDROMDISK_EJECTDISK
+                              lpBytesReturned);
     }
       
     case IOCTL_CDROM_LOAD_MEDIA:
+    {
+      dprintf(("Loading CDROM media"));
+      return ioctlCDROMSimple(pHMHandleData, 
+                              0x80,   // IOCTL_CDROM
+                              0x45,   // CDROMDISK_CLOSETRAY
+                              lpBytesReturned);
+    }
+      
     case IOCTL_CDROM_RESERVE:
     case IOCTL_CDROM_RELEASE:
     case IOCTL_CDROM_FIND_NEW_DEVICES:
         break;
-
+      
+      
+    // -------------
+    // STORAGE class
+    // -------------
+      
     case IOCTL_STORAGE_CHECK_VERIFY:
         if(lpBytesReturned) {
@@ -576 +676 @@
 
     case IOCTL_STORAGE_EJECT_MEDIA:
+    {
+      dprintf(("Ejecting storage media"));
+      return ioctlDISKUnlockEject(pHMHandleData,
+                                  0x02, // EJECT media
+                                  -1,
+                                  lpBytesReturned);
+    }
+      
+    case IOCTL_STORAGE_GET_MEDIA_TYPES:
          break;
       
-    case IOCTL_STORAGE_GET_MEDIA_TYPES:
     case IOCTL_STORAGE_LOAD_MEDIA:
+    // case IOCTL_STORAGE_LOAD_MEDIA2:
+    {
+      dprintf(("Loading storage media"));
+      return ioctlDISKUnlockEject(pHMHandleData,
+                                  0x03, // LOAD media
+                                  -1,
+                                  lpBytesReturned);
+    }
+      
+    // case IOCTL_STORAGE_EJECTION_CONTROL:
     case IOCTL_STORAGE_MEDIA_REMOVAL:
-        break;
+         break;
+      
+      
+    // -------------------
+    // SCSI passthru class
+    // -------------------
+      
     case IOCTL_SCSI_PASS_THROUGH:
     case IOCTL_SCSI_MINIPORT: