--- np2/win9x/dialog/d_disk.cpp	2005/02/07 15:39:27	1.11
+++ np2/win9x/dialog/d_disk.cpp	2005/02/09 20:11:36	1.12
@@ -13,65 +13,29 @@
 #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 OEMCHAR fddui_title[] = OEMTEXT("Select floppy image");
+static const OEMCHAR fddui_filter[] = OEMTEXT("D88 image files (*.D88;*.D98)\0*.d88;*.88d;*.d98;*.98d\0Floppy disk images (*.XDF;*.HDM;*.DUP;*.2HD)\0*.xdf;*.hdm;*.dup;*.2hd;*.tfd\0All supported Files\0*.d88;*.88d;*.d98;*.98d;*.fdi;*.xdf;*.hdm;*.dup;*.2hd;*.tfd\0All files (*.*)\0*.*\0");
 static const FILESEL fddui = {fddui_title, str_d88, fddui_filter, 3};
 
 #if defined(SUPPORT_SASI)
-static const char sasiui_title[] = "Select SASI/IDE HDD image";
+static const OEMCHAR sasiui_title[] = OEMTEXT("Select SASI/IDE HDD image");
 #else
-static const char sasiui_title[] = "Select HDD image";
+static const OEMCHAR sasiui_title[] = OEMTEXT("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 OEMCHAR sasiui_filter[] = OEMTEXT("Anex86 harddisk image files (*.HDI)\0*.hdi\0T98 harddisk image files (*.THD)\0*.thd\0T98-Next harddisk image files (*.NHD)\0*.nhd\0All supported Files\0*.thd;*.nhd;*.hdi\0");
 static const FILESEL sasiui = {sasiui_title, str_thd, sasiui_filter, 4};
 
 #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 OEMCHAR scsiui_title[] = OEMTEXT("Select SCSI HDD image");
+static const OEMCHAR scsiui_filter[] = OEMTEXT("Virtual98 harddisk image files (*.HDD)\0*.hdd\0");
 static const FILESEL scsiui = {scsiui_title, str_hdd, scsiui_filter, 1};
 #endif
 
-static const char newdisk_title[] = "Create disk image";
+static const OEMCHAR newdisk_title[] = OEMTEXT("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";
+static const OEMCHAR newdisk_filter[] = OEMTEXT("D88 image files (*.D88;*.88D)\0*.d88;*.88d;*.d98;*.98d\0Anex86 harddisk image files (*.HDI)\0*.hdi\0T98 harddisk image files (*.THD)\0*.thd\0T98-Next harddisk image files (*.NHD)\0*.nhd\0Virtual98 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";
+static const OEMCHAR newdisk_filter[] = OEMTEXT("D88 image files (*.D88;*.88D)\0*.d88;*.88d;*.d98;*.98d\0Anex86 harddisk image files (*.HDI)\0*.hdi\0T98 harddisk image files (*.THD)\0*.thd\0T98-Next harddisk image files (*.NHD)\0*.nhd\0");
 #endif
 static const FILESEL newdiskui = {newdisk_title, str_d88, newdisk_filter, 1};
 
@@ -80,18 +44,18 @@ static const FILESEL newdiskui = {newdis
 
 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_selectfile(hWnd, &fddui, path, NELEMENTS(path), &readonly)) {
+			file_cpyname(fddfolder, path, NELEMENTS(fddfolder));
 			sysmng_update(SYS_UPDATEOSCFG);
 			diskdrv_setfdd(drv, path, readonly);
 			toolwin_setfdd(drv, path);
@@ -102,9 +66,9 @@ const char	*p;
 void dialog_changehdd(HWND hWnd, REG8 drv) {
 
 	UINT		num;
-const char		*p;
+const OEMCHAR	*p;
 const FILESEL	*hddui;
-	char		path[MAX_PATH];
+	OEMCHAR		path[MAX_PATH];
 
 	num = drv & 0x0f;
 	p = NULL;
@@ -129,9 +93,9 @@ const FILESEL	*hddui;
 	if (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_selectfile(hWnd, hddui, path, NELEMENTS(path), NULL)) {
+		file_cpyname(hddfolder, path, NELEMENTS(hddfolder));
 		sysmng_update(SYS_UPDATEOSCFG);
 		diskdrv_sethdd(drv, path);
 	}
@@ -140,7 +104,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] = {
@@ -149,7 +113,7 @@ static const UINT16 sasires[6] = {
 				IDC_NEWSASI30MB, IDC_NEWSASI40MB};
 
 static	UINT8	makefdtype = DISKTYPE_2HD << 4;
-static	char	disklabel[16+1];
+static	OEMCHAR	disklabel[16+1];
 static	UINT	hddsize;
 static	UINT	hddminsize;
 static	UINT	hddmaxsize;
@@ -158,12 +122,12 @@ static LRESULT CALLBACK NewHddDlgProc(HW
 													WPARAM wp, LPARAM lp) {
 
 	UINT	val;
-	char	work[32];
+	OEMCHAR	work[32];
 
 	switch (msg) {
 		case WM_INITDIALOG:
 			SETLISTUINT32(hWnd, IDC_HDDSIZE, hddsizetbl);
-			SPRINTF(work, "(%d-%dMB)", hddminsize, hddmaxsize);
+			OEMSPRINTF(work, OEMTEXT("(%d-%dMB)"), hddminsize, hddmaxsize);
 			SetWindowText(GetDlgItem(hWnd, IDC_HDDLIMIT), work);
 			SetFocus(GetDlgItem(hWnd, IDC_HDDSIZE));
 			return(FALSE);
@@ -172,7 +136,7 @@ static LRESULT CALLBACK NewHddDlgProc(HW
 			switch(LOWORD(wp)) {
 				case IDOK:
 					GetWindowText(GetDlgItem(hWnd, IDC_HDDSIZE),
-													work, sizeof(work));
+													work, NELEMENTS(work));
 					val = (UINT)milstr_solveINT(work);
 					if (val < hddminsize) {
 						val = hddminsize;
@@ -275,9 +239,9 @@ static LRESULT CALLBACK NewdiskDlgProc(H
 			switch(LOWORD(wp)) {
 				case IDOK:
 					GetWindowText(GetDlgItem(hWnd, IDC_DISKLABEL),
-											disklabel, sizeof(disklabel));
-					if (milstr_kanji1st(disklabel, sizeof(disklabel) - 1)) {
-						disklabel[sizeof(disklabel) - 1] = '\0';
+											disklabel, NELEMENTS(disklabel));
+					if (milstr_kanji1st(disklabel, NELEMENTS(disklabel) - 1)) {
+						disklabel[NELEMENTS(disklabel) - 1] = '\0';
 					}
 					if (GetDlgItemCheck(hWnd, IDC_MAKE2DD)) {
 						makefdtype = (DISKTYPE_2DD << 4);
@@ -312,15 +276,15 @@ 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_selectwritefile(hWnd, &newdiskui, path, NELEMENTS(path))) {
 		return;
 	}
 	hinst = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE);