--- np2/win9x/dialog/d_disk.cpp 2004/02/14 07:56:51 1.10 +++ np2/win9x/dialog/d_disk.cpp 2007/11/11 07:11:28 1.19 @@ -2,6 +2,7 @@ #include "strres.h" #include "resource.h" #include "np2.h" +#include "oemtext.h" #include "dosio.h" #include "sysmng.h" #include "toolwin.h" @@ -12,86 +13,88 @@ #include "fddfile.h" #include "newdisk.h" - -static const char fddui_title[] = "Select floppy image"; -static const char fddui_filter[] = \ - "D88 image files (*.D88;*.D98)\0" \ - "*.d88;*.88d;*.d98;*.98d\0" \ - "Floppy disk images (*.XDF;*.HDM;*.DUP;*.2HD)\0" \ - "*.xdf;*.hdm;*.dup;*.2hd;*.tfd\0" \ - "All supported Files\0" \ - "*.d88;*.88d;*.d98;*.98d;*.fdi;" \ - "*.xdf;*.hdm;*.dup;*.2hd;*.tfd\0" \ - "All files (*.*)\0*.*\0"; -static const FILESEL fddui = {fddui_title, str_d88, fddui_filter, 3}; +static const FSPARAM fpFDD = +{ + MAKEINTRESOURCE(IDS_FDDTITLE), + MAKEINTRESOURCE(IDS_FDDEXT), + MAKEINTRESOURCE(IDS_FDDFILTER), + 3 +}; #if defined(SUPPORT_SASI) -static const char sasiui_title[] = "Select SASI/IDE HDD image"; -#else -static const char sasiui_title[] = "Select HDD image"; -#endif -static const char sasiui_filter[] = \ - "Anex86 harddisk image files (*.HDI)\0" \ - "*.hdi\0" \ - "T98 harddisk image files (*.THD)\0" \ - "*.thd\0" \ - "T98-Next harddisk image files (*.NHD)\0" \ - "*.nhd\0" \ - "All supported Files\0" \ - "*.thd;*.nhd;*.hdi\0"; -static const FILESEL sasiui = {sasiui_title, str_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 FSPARAM fpISO = +{ + MAKEINTRESOURCE(IDS_ISOTITLE), + MAKEINTRESOURCE(IDS_ISOEXT), + MAKEINTRESOURCE(IDS_ISOFILTER), + 3 +}; +#endif // defined(SUPPORT_IDEIO) #if defined(SUPPORT_SCSI) -static const char scsiui_title[] = "Select SCSI HDD image"; -static const char scsiui_filter[] = \ - "Virtual98 harddisk image files (*.HDD)\0" \ - "*.hdd\0"; -static const FILESEL scsiui = {scsiui_title, str_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 char newdisk_title[] = "Create disk image"; #if defined(SUPPORT_SCSI) -static const char newdisk_filter[] = \ - "D88 image files (*.D88;*.88D)\0" \ - "*.d88;*.88d;*.d98;*.98d\0" \ - "Anex86 harddisk image files (*.HDI)\0" \ - "*.hdi\0" \ - "T98 harddisk image files (*.THD)\0" \ - "*.thd\0" \ - "T98-Next harddisk image files (*.NHD)\0" \ - "*.nhd\0" \ - "Virtual98 harddisk image files (*.HDD)\0" \ - "*.hdd\0"; -#else -static const char newdisk_filter[] = \ - "D88 image files (*.D88;*.88D)\0" \ - "*.d88;*.88d;*.d98;*.98d\0" \ - "Anex86 harddisk image files (*.HDI)\0" \ - "*.hdi\0" \ - "T98 harddisk image files (*.THD)\0" \ - "*.thd\0" \ - "T98-Next harddisk image files (*.NHD)\0" \ - "*.nhd\0"; -#endif -static const FILESEL newdiskui = {newdisk_title, str_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) // ---- void dialog_changefdd(HWND hWnd, REG8 drv) { -const char *p; - char path[MAX_PATH]; - int readonly; +const OEMCHAR *p; + OEMCHAR path[MAX_PATH]; + int readonly; if (drv < 4) { p = fdd_diskname(drv); if ((p == NULL) || (p[0] == '\0')) { p = fddfolder; } - file_cpyname(path, p, sizeof(path)); - if (dlgs_selectfile(hWnd, &fddui, path, sizeof(path), &readonly)) { - file_cpyname(fddfolder, path, sizeof(fddfolder)); + file_cpyname(path, p, NELEMENTS(path)); + if (dlgs_openfile(hWnd, &fpFDD, path, NELEMENTS(path), &readonly)) + { + file_cpyname(fddfolder, path, NELEMENTS(fddfolder)); sysmng_update(SYS_UPDATEOSCFG); diskdrv_setfdd(drv, path, readonly); toolwin_setfdd(drv, path); @@ -102,36 +105,47 @@ const char *p; void dialog_changehdd(HWND hWnd, REG8 drv) { UINT num; -const char *p; -const FILESEL *hddui; - char path[MAX_PATH]; +const OEMCHAR *p; + PCFSPARAM pfp; + OEMCHAR path[MAX_PATH]; + p = diskdrv_getsxsi(drv); num = drv & 0x0f; - p = NULL; - hddui = NULL; - if (!(drv & 0x20)) { // SASI/IDE - if (num < 2) { - p = np2cfg.sasihdd[num]; - hddui = &sasiui; + pfp = NULL; + if (!(drv & 0x20)) // SASI/IDE + { + if (num < 2) + { + pfp = &fpSASI; } +#if defined(SUPPORT_IDEIO) + else if (num == 2) + { + pfp = &fpISO; + } +#endif } #if defined(SUPPORT_SCSI) - else { // SCSI - if (num < 4) { - p = np2cfg.scsihdd[num]; - hddui = &scsiui; + else // SCSI + { + if (num < 4) + { + pfp = &fpSCSI; } } #endif - if (hddui == NULL) { + if (pfp == NULL) + { return; } - if (p[0] == '\0') { + if ((p == NULL) || (p[0] == '\0')) + { p = hddfolder; } - file_cpyname(path, p, sizeof(path)); - if (dlgs_selectfile(hWnd, hddui, path, sizeof(path), NULL)) { - file_cpyname(hddfolder, path, sizeof(hddfolder)); + file_cpyname(path, p, NELEMENTS(path)); + if (dlgs_openfile(hWnd, pfp, path, NELEMENTS(path), NULL)) + { + file_cpyname(hddfolder, path, NELEMENTS(hddfolder)); sysmng_update(SYS_UPDATEOSCFG); diskdrv_sethdd(drv, path); } @@ -140,7 +154,7 @@ const FILESEL *hddui; // ---- newdisk -static const char str_newdisk[] = "newdisk"; +static const OEMCHAR str_newdisk[] = OEMTEXT("newdisk"); static const UINT32 hddsizetbl[5] = {20, 41, 65, 80, 128}; static const UINT16 sasires[6] = { @@ -148,8 +162,8 @@ static const UINT16 sasires[6] = { IDC_NEWSASI15MB, IDC_NEWSASI20MB, IDC_NEWSASI30MB, IDC_NEWSASI40MB}; -static BYTE makefdtype = DISKTYPE_2HD << 4; -static char disklabel[16+1]; +static UINT8 makefdtype = DISKTYPE_2HD << 4; +static OEMCHAR disklabel[16+1]; static UINT hddsize; static UINT hddminsize; static UINT hddmaxsize; @@ -158,22 +172,22 @@ static LRESULT CALLBACK NewHddDlgProc(HW WPARAM wp, LPARAM lp) { UINT val; - char work[32]; + TCHAR work[32]; switch (msg) { case WM_INITDIALOG: SETLISTUINT32(hWnd, IDC_HDDSIZE, hddsizetbl); - SPRINTF(work, "(%d-%dMB)", hddminsize, hddmaxsize); + wsprintf(work, _T("(%d-%dMB)"), hddminsize, hddmaxsize); SetWindowText(GetDlgItem(hWnd, IDC_HDDLIMIT), work); SetFocus(GetDlgItem(hWnd, IDC_HDDSIZE)); return(FALSE); case WM_COMMAND: - switch (LOWORD(wp)) { + switch(LOWORD(wp)) { case IDOK: GetWindowText(GetDlgItem(hWnd, IDC_HDDSIZE), - work, sizeof(work)); - val = (UINT)milstr_solveINT(work); + work, NELEMENTS(work)); + val = (UINT)miltchar_solveINT(work); if (val < hddminsize) { val = hddminsize; } @@ -214,7 +228,7 @@ static LRESULT CALLBACK NewSASIDlgProc(H return(FALSE); case WM_COMMAND: - switch (LOWORD(wp)) { + switch(LOWORD(wp)) { case IDOK: for (val=0; val<6; val++) { if (GetDlgItemCheck(hWnd, sasires[val])) { @@ -250,7 +264,10 @@ static LRESULT CALLBACK NewSASIDlgProc(H static LRESULT CALLBACK NewdiskDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { - WORD res; + UINT16 res; +#if defined(OSLANG_UTF8) + TCHAR buf[17]; +#endif switch (msg) { case WM_INITDIALOG: @@ -272,13 +289,19 @@ static LRESULT CALLBACK NewdiskDlgProc(H return(FALSE); case WM_COMMAND: - switch (LOWORD(wp)) { + switch(LOWORD(wp)) { case IDOK: +#if defined(OSLANG_UTF8) GetWindowText(GetDlgItem(hWnd, IDC_DISKLABEL), - disklabel, sizeof(disklabel)); - if (milstr_kanji1st(disklabel, sizeof(disklabel) - 1)) { - disklabel[sizeof(disklabel) - 1] = '\0'; + buf, NELEMENTS(buf)); + tchartooem(disklabel, NELEMENTS(disklabel), buf, -1); +#else + GetWindowText(GetDlgItem(hWnd, IDC_DISKLABEL), + disklabel, NELEMENTS(disklabel)); + if (milstr_kanji1st(disklabel, NELEMENTS(disklabel) - 1)) { + disklabel[NELEMENTS(disklabel) - 1] = '\0'; } +#endif if (GetDlgItemCheck(hWnd, IDC_MAKE2DD)) { makefdtype = (DISKTYPE_2DD << 4); } @@ -312,18 +335,19 @@ static LRESULT CALLBACK NewdiskDlgProc(H void dialog_newdisk(HWND hWnd) { - char path[MAX_PATH]; + OEMCHAR path[MAX_PATH]; HINSTANCE hinst; -const char *ext; +const OEMCHAR *ext; - file_cpyname(path, fddfolder, sizeof(path)); + file_cpyname(path, fddfolder, NELEMENTS(path)); file_cutname(path); - file_catname(path, str_newdisk, sizeof(path)); + file_catname(path, str_newdisk, NELEMENTS(path)); - if (!dlgs_selectwritefile(hWnd, &newdiskui, path, sizeof(path))) { + if (!dlgs_createfile(hWnd, &fpNewDisk, path, NELEMENTS(path))) + { return; } - hinst = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE); + hinst = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); ext = file_getext(path); if (!file_cmpname(ext, str_thd)) { hddsize = 0;