--- np2/win9x/dialog/d_disk.cpp 2007/01/08 07:52:01 1.17 +++ np2/win9x/dialog/d_disk.cpp 2007/11/11 07:11:28 1.19 @@ -13,83 +13,69 @@ #include "fddfile.h" #include "newdisk.h" - -static const TCHAR fddui_title[] = _T("Select floppy image"); -static const TCHAR fddui_filter[] = \ - _T("D88 image files (*.D88;*.D98)\0") \ - _T("*.d88;*.88d;*.d98;*.98d\0") \ - _T("Floppy disk images (*.XDF;*.HDM;*.DUP;*.2HD)\0") \ - _T("*.xdf;*.hdm;*.dup;*.2hd;*.tfd\0") \ - _T("All supported Files\0") \ - _T("*.d88;*.88d;*.d98;*.98d;*.fdi;") \ - _T("*.xdf;*.hdm;*.dup;*.2hd;*.tfd\0") \ - _T("All files (*.*)\0*.*\0"); -static const FILESEL fddui = {fddui_title, tchar_d88, fddui_filter, 3}; +static const FSPARAM fpFDD = +{ + MAKEINTRESOURCE(IDS_FDDTITLE), + MAKEINTRESOURCE(IDS_FDDEXT), + MAKEINTRESOURCE(IDS_FDDFILTER), + 3 +}; #if defined(SUPPORT_SASI) -static const TCHAR sasiui_title[] = _T("Select SASI/IDE HDD image"); -#else -static const TCHAR sasiui_title[] = _T("Select HDD image"); -#endif -static const TCHAR sasiui_filter[] = \ - _T("Anex86 harddisk image files (*.HDI)\0") \ - _T("*.hdi\0") \ - _T("T98 harddisk image files (*.THD)\0") \ - _T("*.thd\0") \ - _T("T98-Next harddisk image files (*.NHD)\0") \ - _T("*.nhd\0") \ - _T("All supported Files\0") \ - _T("*.thd;*.nhd;*.hdi\0"); -static const FILESEL sasiui = {sasiui_title, tchar_thd, sasiui_filter, 4}; +static const FSPARAM fpSASI = +{ + MAKEINTRESOURCE(IDS_SASITITLE), + MAKEINTRESOURCE(IDS_HDDEXT), + MAKEINTRESOURCE(IDS_HDDFILTER), + 4 +}; +#else // defined(SUPPORT_SASI) +static const FSPARAM fpSASI = +{ + MAKEINTRESOURCE(IDS_HDDTITLE), + MAKEINTRESOURCE(IDS_HDDEXT), + MAKEINTRESOURCE(IDS_HDDFILTER), + 4 +}; +#endif // defined(SUPPORT_SASI) #if defined(SUPPORT_IDEIO) -static const TCHAR isoui_title[] = _T("Select ISO-9660 image"); -static const TCHAR tchar_iso[] = _T("iso"); -static const TCHAR isoui_filter[] = \ - _T("Cue sheets\0") \ - _T("*.cue\0") \ - _T("ISO-9660 image files\0") \ - _T("*.iso;*.img\0") \ - _T("All supported Files\0") \ - _T("*.cue;*.iso;*.img\0") \ - _T("All Files\0") \ - _T("*.*\0"); -static const FILESEL isoui = {isoui_title, tchar_iso, isoui_filter, 3}; -#endif +static const FSPARAM fpISO = +{ + MAKEINTRESOURCE(IDS_ISOTITLE), + MAKEINTRESOURCE(IDS_ISOEXT), + MAKEINTRESOURCE(IDS_ISOFILTER), + 3 +}; +#endif // defined(SUPPORT_IDEIO) #if defined(SUPPORT_SCSI) -static const TCHAR scsiui_title[] = _T("Select SCSI HDD image"); -static const TCHAR scsiui_filter[] = \ - _T("Virtual98 harddisk image files (*.HDD)\0") \ - _T("*.hdd\0"); -static const FILESEL scsiui = {scsiui_title, tchar_hdd, scsiui_filter, 1}; -#endif +static const FSPARAM fpSCSI = +{ + MAKEINTRESOURCE(IDS_SCSITITLE), + MAKEINTRESOURCE(IDS_SCSIEXT), + MAKEINTRESOURCE(IDS_SCSIFILTER), + 1 +}; +#endif // defined(SUPPORT_SCSI) -static const TCHAR newdisk_title[] = _T("Create disk image"); #if defined(SUPPORT_SCSI) -static const TCHAR newdisk_filter[] = \ - _T("D88 image files (*.D88;*.88D)\0") \ - _T("*.d88;*.88d;*.d98;*.98d\0") \ - _T("Anex86 harddisk image files (*.HDI)\0") \ - _T("*.hdi\0") \ - _T("T98 harddisk image files (*.THD)\0") \ - _T("*.thd\0") \ - _T("T98-Next harddisk image files (*.NHD)\0") \ - _T("*.nhd\0") \ - _T("Virtual98 harddisk image files (*.HDD)\0") \ - _T("*.hdd\0"); -#else -static const TCHAR newdisk_filter[] = \ - _T("D88 image files (*.D88;*.88D)\0") \ - _T("*.d88;*.88d;*.d98;*.98d\0") \ - _T("Anex86 harddisk image files (*.HDI)\0") \ - _T("*.hdi\0") \ - _T("T98 harddisk image files (*.THD)\0") \ - _T("*.thd\0") \ - _T("T98-Next harddisk image files (*.NHD)\0") \ - _T("*.nhd\0"); -#endif -static const FILESEL newdiskui = {newdisk_title, tchar_d88, newdisk_filter, 1}; +static const FSPARAM fpNewDisk = +{ + MAKEINTRESOURCE(IDS_NEWDISKTITLE), + MAKEINTRESOURCE(IDS_NEWDISKEXT), + MAKEINTRESOURCE(IDS_NEWDISKFILTER), + 1 +}; +#else // defined(SUPPORT_SCSI) +static const FSPARAM fpNewDisk = +{ + MAKEINTRESOURCE(IDS_NEWDISKTITLE), + MAKEINTRESOURCE(IDS_NEWDISKEXT), + MAKEINTRESOURCE(IDS_NEWDISKFILTER2), + 1 +}; +#endif // defined(SUPPORT_SCSI) // ---- @@ -106,7 +92,8 @@ const OEMCHAR *p; p = fddfolder; } file_cpyname(path, p, NELEMENTS(path)); - if (dlgs_selectfile(hWnd, &fddui, path, NELEMENTS(path), &readonly)) { + if (dlgs_openfile(hWnd, &fpFDD, path, NELEMENTS(path), &readonly)) + { file_cpyname(fddfolder, path, NELEMENTS(fddfolder)); sysmng_update(SYS_UPDATEOSCFG); diskdrv_setfdd(drv, path, readonly); @@ -119,37 +106,45 @@ void dialog_changehdd(HWND hWnd, REG8 dr UINT num; const OEMCHAR *p; -const FILESEL *hddui; + PCFSPARAM pfp; OEMCHAR path[MAX_PATH]; p = diskdrv_getsxsi(drv); num = drv & 0x0f; - hddui = NULL; - if (!(drv & 0x20)) { // SASI/IDE - if (num < 2) { - hddui = &sasiui; + pfp = NULL; + if (!(drv & 0x20)) // SASI/IDE + { + if (num < 2) + { + pfp = &fpSASI; } #if defined(SUPPORT_IDEIO) - else if (num == 2) { - hddui = &isoui; + else if (num == 2) + { + pfp = &fpISO; } #endif } #if defined(SUPPORT_SCSI) - else { // SCSI - if (num < 4) { - hddui = &scsiui; + else // SCSI + { + if (num < 4) + { + pfp = &fpSCSI; } } #endif - if (hddui == NULL) { + if (pfp == NULL) + { return; } - if ((p == NULL) || (p[0] == '\0')) { + if ((p == NULL) || (p[0] == '\0')) + { p = hddfolder; } file_cpyname(path, p, NELEMENTS(path)); - if (dlgs_selectfile(hWnd, hddui, path, NELEMENTS(path), NULL)) { + if (dlgs_openfile(hWnd, pfp, path, NELEMENTS(path), NULL)) + { file_cpyname(hddfolder, path, NELEMENTS(hddfolder)); sysmng_update(SYS_UPDATEOSCFG); diskdrv_sethdd(drv, path); @@ -348,7 +343,8 @@ const OEMCHAR *ext; file_cutname(path); file_catname(path, str_newdisk, NELEMENTS(path)); - if (!dlgs_selectwritefile(hWnd, &newdiskui, path, NELEMENTS(path))) { + if (!dlgs_createfile(hWnd, &fpNewDisk, path, NELEMENTS(path))) + { return; } hinst = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE);