claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed several CD-ROM-related status bar icon bugs;

Browse Source 
CD-ROM set to host drive no longer gets reset to empty;
The CD audio thread initializer now ignores the mute status of the drives;
CD-ROM IOCTL audio handler is now more thread-safe;
Fixed CD-ROM image audio;
Added more sanity checks to memory read/write code in 808x.c;
Initial settings are now sane again.
This commit is contained in:
OBattler
2017-06-01 01:47:54 +02:00
parent 339f81b553
commit e6adf90e29
12 changed files with 193 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/WIN/win.c
View File

@@ -473,7 +473,7 @@ void create_cdrom_submenu(HMENU m, int id)
{
if ((cdrom_drives[id].host_drive >= 'A') && (cdrom_drives[id].host_drive <= 'Z'))
{
if (!host_cdrom_drive_available[cdrom_drives[id].host_drive])
if (!host_cdrom_drive_available[cdrom_drives[id].host_drive - 'A'])
{
cdrom_drives[id].host_drive = 0;
}
@@ -1189,20 +1189,17 @@ void update_status_bar_panes(HWND hwnds)
case SB_CDROM:
/* CD-ROM */
id = sb_part_meanings[i] & 0xf;
if (cdrom_drives[id].host_drive < 0x41)
if (cdrom_drives[id].host_drive == 200)
{
sb_icon_flags[i] = 256;
sb_icon_flags[i] = (wcslen(cdrom_image[id].image_path) == 0) ? 256 : 0;
}
else if ((cdrom_drives[id].host_drive >= 'A') && (cdrom_drives[id].host_drive <= 'Z'))
{
sb_icon_flags[i] = 0;
}
else
{
if (cdrom_drives[id].host_drive == 0x200)
{
sb_icon_flags[i] = (wcslen(cdrom_image[id].image_path) == 0) ? 256 : 0;
}
else
{
sb_icon_flags[i] = 0;
}
sb_icon_flags[i] = 256;
}
if (cdrom_drives[id].bus_type == CDROM_BUS_SCSI)
{