--- np2/win9x/dialog/d_disk.cpp	2005/03/20 13:12:50	1.13
+++ np2/win9x/dialog/d_disk.cpp	2007/07/20 14:39:12	1.18
@@ -14,7 +14,7 @@
 #include	"newdisk.h"
 
 
-static const TCHAR fddui_title[] = _T("Select floppy image");
+//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")			\
@@ -24,13 +24,13 @@ static const TCHAR fddui_filter[] =					
 								_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 FILESEL fddui = {MAKEINTRESOURCE(IDS_FDDTITLE), tchar_d88, fddui_filter, 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
+//#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")							\
@@ -40,7 +40,26 @@ static const TCHAR sasiui_filter[] =				
 								_T("*.nhd\0")							\
 				_T("All supported Files\0")								\
 								_T("*.thd;*.nhd;*.hdi\0");
-static const FILESEL sasiui = {sasiui_title, tchar_thd, sasiui_filter, 4};
+#if defined(SUPPORT_SASI)
+static const FILESEL sasiui = {MAKEINTRESOURCE(IDS_HDDTITLE), tchar_thd, sasiui_filter, 4};
+#else	// defined(SUPPORT_SASI)
+static const FILESEL sasiui = {MAKEINTRESOURCE(IDS_SCSITITLE), tchar_thd, sasiui_filter, 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
 
 #if defined(SUPPORT_SCSI)
 static const TCHAR scsiui_title[] = _T("Select SCSI HDD image");
@@ -107,19 +126,22 @@ const OEMCHAR	*p;
 const FILESEL	*hddui;
 	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;
 		}
+#if defined(SUPPORT_IDEIO)
+		else if (num == 2) {
+			hddui = &isoui;
+		}
+#endif
 	}
 #if defined(SUPPORT_SCSI)
 	else {						// SCSI
 		if (num < 4) {
-			p = np2cfg.scsihdd[num];
 			hddui = &scsiui;
 		}
 	}
@@ -127,7 +149,7 @@ const FILESEL	*hddui;
 	if (hddui == NULL) {
 		return;
 	}
-	if (p[0] == '\0') {
+	if ((p == NULL) || (p[0] == '\0')) {
 		p = hddfolder;
 	}
 	file_cpyname(path, p, NELEMENTS(path));
@@ -333,7 +355,7 @@ const OEMCHAR	*ext;
 	if (!dlgs_selectwritefile(hWnd, &newdiskui, 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;