Make the CD/DVD-ROM passthrough actually work (WIP)

Still WIP, eject/reload in the qt side is a bit broken.

src/cdrom/cdrom.c

@@ -1973,7 +1973,7 @@ cdrom_hard_reset(void)
 
                 cdrom_image_open(dev, dev->image_path);
             } else if (dev->host_drive == 201)
-                cdrom_ioctl_open(dev, dev->image_path, dev->letter);
+                cdrom_ioctl_open(dev, dev->drive);
         }
     }
 
@@ -2028,6 +2028,8 @@ cdrom_eject(uint8_t id)
 
     if (dev->host_drive == 200)
         strcpy(dev->prev_image_path, dev->image_path);
+    else if (dev->host_drive == 201)
+        cdrom_ioctl_eject();
 
     dev->prev_host_drive = dev->host_drive + (dev->host ? 1 : 0);
     dev->host_drive      = 0;
@@ -2049,7 +2051,7 @@ cdrom_reload(uint8_t id)
 {
     cdrom_t *dev = &cdrom[id];
 
-    if ((dev->host_drive == dev->prev_host_drive) || (dev->prev_host_drive == 0) || (dev->host_drive != 0)) {
+    if (!dev->host && ((dev->host_drive == dev->prev_host_drive) || (dev->prev_host_drive == 0) || (dev->host_drive != 0))) {
         /* Switch from empty to empty. Do nothing. */
         return;
     }
@@ -2061,7 +2063,8 @@ cdrom_reload(uint8_t id)
 
     if (dev->prev_host_drive >= 200) {
         /* Reload a previous image. */
-        strcpy(dev->image_path, dev->prev_image_path);
+        if (dev->prev_host_drive == 200)
+            strcpy(dev->image_path, dev->prev_image_path);
 
 #ifdef _WIN32
         if (dev->prev_host_drive == 200) {
@@ -2076,13 +2079,13 @@ cdrom_reload(uint8_t id)
 #endif
 
         if (dev->prev_host_drive > 200)
-            cdrom_ioctl_open(dev, dev->image_path, dev->letter);
+            cdrom_ioctl_open(dev, dev->drive);
         else
             cdrom_image_open(dev, dev->image_path);
 
         cdrom_insert(id);
 
-        if ((strlen(dev->image_path) == 0) && !dev->letter)
+        if ((strlen(dev->image_path) == 0) && !dev->drive)
             dev->host_drive = 0;
         else
             dev->host_drive = 200 + (dev->host ? 1 : 0);

src/cdrom/cdrom_ioctl.c

@@ -208,11 +208,17 @@ cdrom_ioctl_open_abort(cdrom_t *dev)
     return 1;
 }
 
+void
+cdrom_ioctl_eject(void)
+{
+    plat_cdrom_eject();
+}
+
 int
-cdrom_ioctl_open(cdrom_t *dev, char *path, int letter)
+cdrom_ioctl_open(cdrom_t *dev, int drive)
 {
     /* Open the image. */
-    int i = plat_cdrom_open(path, letter);
+    int i = plat_cdrom_set_drive(drive);
     if (!i)
         return cdrom_ioctl_open_abort(dev);
 

src/include/86box/cdrom.h

@@ -247,7 +247,7 @@ typedef struct cdrom {
     int audio_muted_soft;
     int sony_msf;
     int host;
-    int letter;
+    int drive;
 
     const cdrom_ops_t *ops;
 
@@ -311,7 +311,7 @@ extern void cdrom_image_reset(cdrom_t *dev);
 
 extern void cdrom_ioctl_eject(void);
 extern void cdrom_ioctl_load(void);
-extern int  cdrom_ioctl_open(cdrom_t *dev, char *path, int letter);
+extern int  cdrom_ioctl_open(cdrom_t *dev, int drive);
 
 extern void cdrom_update_cdb(uint8_t *cdb, int lba_pos,
                              int number_of_blocks);

src/include/86box/plat_cdrom.h

@@ -57,7 +57,7 @@ extern int plat_cdrom_get_audio_sub(uint32_t sector, uint8_t *attr, uint8_t *tra
 extern int plat_cdrom_get_sector_size(uint32_t sector);
 extern int plat_cdrom_read_sector(uint8_t *buffer, int raw, uint32_t sector);
 extern void plat_cdrom_close(void);
-extern int plat_cdrom_open(char *path, int letter);
+extern int plat_cdrom_set_drive(int drive);
 
 #ifdef __cplusplus
 }

src/qt/qt_mediamenu.cpp

@@ -146,8 +146,8 @@ MediaMenu::refresh(QMenu *parentMenu)
         cdromMutePos = menu->children().count();
         menu->addAction(QApplication::style()->standardIcon(QStyle::SP_MediaVolumeMuted), tr("&Mute"), [this, i]() { cdromMute(i); })->setCheckable(true);
         menu->addSeparator();
-        menu->addAction(ProgSettings::loadIcon("/cdrom.ico"), tr("&Image..."), [this, i]() { cdrom[i].host = 0; cdrom[i].letter = 0; cdromMount(i, 0); })->setCheckable(false);
+        menu->addAction(ProgSettings::loadIcon("/cdrom.ico"), tr("&Image..."), [this, i]() { cdrom[i].host = 0; cdrom[i].drive = 0; cdromMount(i, 0); })->setCheckable(false);
-        menu->addAction(QApplication::style()->standardIcon(QStyle::SP_DirIcon), tr("&Folder..."), [this, i]() { cdrom[i].host = 0; cdrom[i].letter = 0; cdromMount(i, 1); })->setCheckable(false);
+        menu->addAction(QApplication::style()->standardIcon(QStyle::SP_DirIcon), tr("&Folder..."), [this, i]() { cdrom[i].host = 0; cdrom[i].drive = 0; cdromMount(i, 1); })->setCheckable(false);
         menu->addSeparator();
         for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
             cdromImageHistoryPos[slot] = menu->children().count();
@@ -160,7 +160,7 @@ MediaMenu::refresh(QMenu *parentMenu)
         for (auto &letter : driveLetters) {
             auto drive =  QString::asprintf("%c:\\", letter).toUtf8().constData();
             if (GetDriveType(drive) == DRIVE_CDROM) {
-                menu->addAction(ProgSettings::loadIcon("/cdrom.ico"), tr("Host CD/DVD Drive (%1:)").arg(letter), [this, i, letter]() { cdrom[i].host = 1; cdrom[i].letter = letter; cdromMount(i, 0); })->setCheckable(false);
+                menu->addAction(ProgSettings::loadIcon("/cdrom.ico"), tr("Host CD/DVD Drive (%1:)").arg(letter), [this, i, letter]() { cdrom[i].host = 1; cdrom[i].drive = letter; cdromMount(i, 0); })->setCheckable(false);
             }
         }
         menu->addSeparator();
@@ -487,22 +487,22 @@ MediaMenu::cdromMount(int i, const QString &filename)
     cdrom[i].ops = nullptr;
     memset(cdrom[i].image_path, 0, sizeof(cdrom[i].image_path));
 #ifdef _WIN32
-    if ((fn.data() != NULL) && (strlen(fn.data()) >= 1) && (fn.data()[strlen(fn.data()) - 1] == '/'))
+    if (!cdrom[i].host && (fn.data() != NULL) && (strlen(fn.data()) >= 1) && (fn.data()[strlen(fn.data()) - 1] == '/'))
         fn.data()[strlen(fn.data()) - 1] = '\\';
 #else
     if ((fn.data() != NULL) && (strlen(fn.data()) >= 1) && (fn.data()[strlen(fn.data()) - 1] == '\\'))
         fn.data()[strlen(fn.data()) - 1] = '/';
 #endif
     if (cdrom[i].host)
-        cdrom_ioctl_open(&(cdrom[i]), fn.data(), cdrom[i].letter);
+        cdrom_ioctl_open(&(cdrom[i]), cdrom[i].drive);
     else
         cdrom_image_open(&(cdrom[i]), fn.data());
     /* Signal media change to the emulated machine. */
     if (cdrom[i].insert)
         cdrom[i].insert(cdrom[i].priv);
-    cdrom[i].host_drive = (strlen(cdrom[i].image_path) == 0 && !cdrom[i].letter) ? 0 : (200 + (cdrom[i].host ? 1 : 0));
+    cdrom[i].host_drive = (strlen(cdrom[i].image_path) == 0 && !cdrom[i].drive) ? 0 : (200 + (cdrom[i].host ? 1 : 0));
 
-    pclog("HostDrive=%d, letter=%d.\n", cdrom[i].host_drive, cdrom[i].letter);
+    pclog("HostDrive=%d, drive=%d.\n", cdrom[i].host_drive, cdrom[i].drive);
     if (cdrom[i].host_drive >= 200) {
         ui_sb_update_icon_state(SB_CDROM | i, 0);
     } else {
@@ -524,7 +524,7 @@ MediaMenu::cdromMount(int i, int dir)
 
     pclog("IsHost?=%d.\n", cdrom[i].host);
     if (cdrom[i].host) {
-        filename = QString(cdrom[i].letter);
+        filename = QString(cdrom[i].drive);
     } else {
         if (dir) {
             filename = QFileDialog::getExistingDirectory(
@@ -536,10 +536,11 @@ MediaMenu::cdromMount(int i, int dir)
                 QString(),
                 tr("CD-ROM images") % util::DlgFilter({ "iso", "cue" }) % tr("All files") % util::DlgFilter({ "*" }, true));
         }
+    }
 
-        if (filename.isEmpty()) {
+    if (filename.isEmpty()) {
-            return;
+        pclog("File is empty.\n");
-        }
+        return;
     }
 
     cdromMount(i, filename);

src/qt/win_cdrom_ioctl.c

@@ -38,7 +38,22 @@
 #define MSFtoLBA(m, s, f) ((((m * 60) + s) * 75) + f)
 
 static HANDLE handle;
-static char ioctl_path[8];
+static WCHAR ioctl_path[256];
+
+static int
+plat_cdrom_open(void)
+{
+    plat_cdrom_close();
+
+    handle = CreateFileW((LPCWSTR)ioctl_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+    pclog("handle=%p, error=%x.\n", handle, GetLastError());
+    if (handle != INVALID_HANDLE_VALUE) {
+        long size;
+        DeviceIoControl(handle, IOCTL_STORAGE_LOAD_MEDIA, NULL, 0, NULL, 0, (LPDWORD)&size, NULL);
+        return 1;
+    }
+    return 0;
+}
 
 int
 plat_cdrom_is_track_audio(uint32_t sector)
@@ -49,6 +64,7 @@ plat_cdrom_is_track_audio(uint32_t sector)
     int control = 0;
     uint32_t track_addr = 0;
 
+    plat_cdrom_open();
     DeviceIoControl(handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), (LPDWORD)&size, NULL);
     plat_cdrom_close();
 
@@ -71,6 +87,7 @@ plat_cdrom_get_last_block(void)
 	long        size = 0;
 	uint32_t    address = 0;
 
+	plat_cdrom_open();
     DeviceIoControl(handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), (LPDWORD)&size, NULL);
     plat_cdrom_close();
 
@@ -79,7 +96,7 @@ plat_cdrom_get_last_block(void)
         if (address > lb)
             lb = address;
     }
-    pclog("LBCapacity=%x.\n", lb);
+    pclog("LBCapacity=%d.\n", lb);
     return lb;
 }
 
@@ -89,6 +106,7 @@ plat_cdrom_get_audio_tracks(int *st_track, int *end, TMSF *lead_out)
 	CDROM_TOC toc;
 	long size       = 0;
 
+	plat_cdrom_open();
     DeviceIoControl(handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), (LPDWORD)&size, NULL);
     plat_cdrom_close();
 
@@ -106,6 +124,7 @@ plat_cdrom_get_audio_track_info(UNUSED(int end), int track, int *track_num, TMSF
 	CDROM_TOC   toc;
 	long size = 0;
 
+	plat_cdrom_open();
     DeviceIoControl(handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), (LPDWORD)&size, NULL);
     plat_cdrom_close();
 
@@ -132,6 +151,7 @@ plat_cdrom_get_audio_sub(UNUSED(uint32_t sector), uint8_t *attr, uint8_t *track,
 
     insub.Format = IOCTL_CDROM_CURRENT_POSITION;
 
+	plat_cdrom_open();
 	DeviceIoControl(handle, IOCTL_CDROM_READ_Q_CHANNEL, &insub, sizeof(insub), &sub, sizeof(sub), (LPDWORD)&size, NULL);
     plat_cdrom_close();
 
@@ -155,7 +175,15 @@ plat_cdrom_get_audio_sub(UNUSED(uint32_t sector), uint8_t *attr, uint8_t *track,
 int
 plat_cdrom_get_sector_size(UNUSED(uint32_t sector))
 {
-    return COOKED_SECTOR_SIZE;
+    long size;
+    DISK_GEOMETRY dgCDROM;
+
+    plat_cdrom_open();
+	DeviceIoControl(handle, IOCTL_CDROM_GET_DRIVE_GEOMETRY, NULL, 0, &dgCDROM, sizeof(dgCDROM), (LPDWORD)&size, NULL);
+	plat_cdrom_close();
+
+	pclog("BytesPerSector=%d.\n", dgCDROM.BytesPerSector);
+    return dgCDROM.BytesPerSector;
 }
 
 int
@@ -167,6 +195,7 @@ plat_cdrom_read_sector(uint8_t *buffer, int raw, uint32_t sector)
 
 	int	buflen = raw ? RAW_SECTOR_SIZE : COOKED_SECTOR_SIZE;
 
+	plat_cdrom_open();
 	if (!raw) {
         pclog("Cooked.\n");
 		// Cooked
@@ -186,12 +215,22 @@ plat_cdrom_read_sector(uint8_t *buffer, int raw, uint32_t sector)
 		status = DeviceIoControl(handle, IOCTL_CDROM_RAW_READ, &in, sizeof(in),
 								buffer, buflen, (LPDWORD)&size, NULL);
 	}
-
     plat_cdrom_close();
 	pclog("ReadSector status=%d, sector=%d, size=%d.\n", status, sector, size);
 	return (size == buflen) && (status > 0);
 }
 
+void
+plat_cdrom_eject(void)
+{
+	long size;
+    int ret;
+
+    plat_cdrom_open();
+    DeviceIoControl(handle, IOCTL_STORAGE_EJECT_MEDIA, NULL, 0, NULL, 0, (LPDWORD)&size, NULL);
+    plat_cdrom_close();
+}
+
 void
 plat_cdrom_close(void)
 {
@@ -201,21 +240,14 @@ plat_cdrom_close(void)
     }
 }
 
-static int
+int
-plat_cdrom_load(char *path, int letter)
+plat_cdrom_set_drive(int drive)
 {
     plat_cdrom_close();
-    strcpy(ioctl_path, "\\\\.\\");
-    strcat(ioctl_path, path);
 
-    /* Data track (shouldn't there be a lead in track?). */
+    wsprintf(ioctl_path, L"\\\\.\\%c:", drive);
-    handle = CreateFileW((LPCWSTR)ioctl_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+    pclog("Path is %s\n", ioctl_path);
-    pclog("handle=%p, error=%x, drive=%s.\n", handle, GetLastError(), ioctl_path);
-    return (handle != INVALID_HANDLE_VALUE);
-}
 
-int
+    plat_cdrom_open();
-plat_cdrom_open(char *path, int letter)
+    return 1;
-{
-    return plat_cdrom_load(path, letter);
 }