mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- win32dialog: set / restore cdrom path only if changed in the dialog

Browse Source 
- insert cdrom now loads the media before trying to read a sector (Win NT/2k/XP)
This commit is contained in:
Volker Ruppert 2004-08-30 10:47:09 +00:00
parent b82f00e1f2
commit 14d5b69d96
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bochs/gui/win32dialog.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: win32dialog.cc,v 1.22 2004-06-05 08:40:24 vruppert Exp $
// $Id: win32dialog.cc,v 1.23 2004-08-30 10:47:09 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
#include "config.h"
@ -234,7 +234,9 @@ static BOOL CALLBACK Cdrom1DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP
}
break;
case WM_CLOSE:
cdromop.Opath->set(origpath);
if (lstrcmp(cdromop.Opath->getptr(), origpath)) {
cdromop.Opath->set(origpath);
}
EndDialog(hDlg, -1);
break;
case WM_COMMAND:
@ -252,19 +254,21 @@ static BOOL CALLBACK Cdrom1DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP
GetDlgItemText(hDlg, IDCDROM1, path, MAX_PATH);
if (lstrlen(path)) {
cdromop.Ostatus->set(BX_INSERTED);
if (lstrcmp(path, cdromop.Opath->getptr())) {
cdromop.Opath->set(path);
}
} else {
cdromop.Ostatus->set(BX_EJECTED);
lstrcpy(path, "none");
}
} else {
cdromop.Ostatus->set(BX_EJECTED);
lstrcpy(path, "none");
}
cdromop.Opath->set(path);
EndDialog(hDlg, 1);
break;
case IDCANCEL:
cdromop.Opath->set(origpath);
if (lstrcmp(cdromop.Opath->getptr(), origpath)) {
cdromop.Opath->set(origpath);
}
EndDialog(hDlg, -1);
break;
}
@ -450,7 +454,9 @@ static BOOL CALLBACK RuntimeDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
break;
case WM_CLOSE:
for (device=1; device<devcount; device++) {
cdromop[device].Opath->set(origpath[device]);
if (lstrcmp(cdromop[device].Opath->getptr(), origpath[device])) {
cdromop[device].Opath->set(origpath[device]);
}
}
EndDialog(hDlg, BX_CI_RT_QUIT);
break;
@ -534,15 +540,15 @@ static BOOL CALLBACK RuntimeDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
GetDlgItemText(hDlg, IDCDROM1+device, path, MAX_PATH);
if (lstrlen(path)) {
cdromop[device].Ostatus->set(BX_INSERTED);
if (lstrcmp(path, cdromop[device].Opath->getptr())) {
cdromop[device].Opath->set(path);
}
} else {
cdromop[device].Ostatus->set(BX_EJECTED);
lstrcpy(path, "none");
}
} else {
cdromop[device].Ostatus->set(BX_EJECTED);
lstrcpy(path, "none");
}
cdromop[device].Opath->set(path);
}
}
if (changed & 0x02) {
@ -591,7 +597,9 @@ static BOOL CALLBACK RuntimeDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
break;
case IDCANCEL:
for (device=1; device<devcount; device++) {
cdromop[device].Opath->set(origpath[device]);
if (lstrcmp(cdromop[device].Opath->getptr(), origpath[device])) {
cdromop[device].Opath->set(origpath[device]);
}
}
EndDialog(hDlg, BX_CI_RT_QUIT);
break;

8
bochs/iodev/cdrom.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cdrom.cc,v 1.71 2004-08-23 09:39:45 vruppert Exp $
// $Id: cdrom.cc,v 1.72 2004-08-30 10:47:09 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -521,7 +521,7 @@ cdrom_interface::cdrom_interface(char *dev)
void
cdrom_interface::init(void) {
BX_DEBUG(("Init $Id: cdrom.cc,v 1.71 2004-08-23 09:39:45 vruppert Exp $"));
BX_DEBUG(("Init $Id: cdrom.cc,v 1.72 2004-08-30 10:47:09 vruppert Exp $"));
BX_INFO(("file = '%s'",path));
}
@ -631,6 +631,10 @@ cdrom_interface::insert_cdrom(char *dev)
hFile=CreateFile((char *)&drive, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, NULL);
if (hFile !=(void *)0xFFFFFFFF)
fd=1;
if (!using_file) {
DWORD lpBytesReturned;
DeviceIoControl(hFile, IOCTL_STORAGE_LOAD_MEDIA, NULL, 0, NULL, 0, &lpBytesReturned, NULL);
}
}
#elif defined(__APPLE__)
if(strcmp(path, "drive") == 0)