--- np2/win9x/dialog/dialogs.cpp	2005/02/09 20:11:36	1.6
+++ np2/win9x/dialog/dialogs.cpp	2005/03/20 23:48:03	1.9
@@ -1,19 +1,23 @@
 #include	"compiler.h"
 #include	"strres.h"
 #include	"bmpdata.h"
+#include	"oemtext.h"
 #include	"dosio.h"
 #include	"commng.h"
 #include	"dialogs.h"
+#if defined(MT32SOUND_DLL)
+#include	"mt32snd.h"
+#endif
 
 
-const OEMCHAR str_nc[] = OEMTEXT("N/C");
+const TCHAR str_nc[] = _T("N/C");
 
-const OEMCHAR str_int0[] = OEMTEXT("INT0");
-const OEMCHAR str_int1[] = OEMTEXT("INT1");
-const OEMCHAR str_int2[] = OEMTEXT("INT2");
-const OEMCHAR str_int4[] = OEMTEXT("INT4");
-const OEMCHAR str_int5[] = OEMTEXT("INT5");
-const OEMCHAR str_int6[] = OEMTEXT("INT6");
+const TCHAR str_int0[] = _T("INT0");
+const TCHAR str_int1[] = _T("INT1");
+const TCHAR str_int2[] = _T("INT2");
+const TCHAR str_int4[] = _T("INT4");
+const TCHAR str_int5[] = _T("INT5");
+const TCHAR str_int6[] = _T("INT6");
 
 
 // ---- file select
@@ -22,6 +26,9 @@ BOOL dlgs_selectfile(HWND hWnd, const FI
 										OEMCHAR *path, UINT size, int *ro) {
 
 	OPENFILENAME	ofn;
+#if defined(OSLANG_UTF8)
+	TCHAR			_path[MAX_PATH];
+#endif
 
 	if ((item == NULL) || (path == NULL) || (size == 0)) {
 		return(FALSE);
@@ -31,14 +38,23 @@ BOOL dlgs_selectfile(HWND hWnd, const FI
 	ofn.hwndOwner = hWnd;
 	ofn.lpstrFilter = item->filter;
 	ofn.nFilterIndex = item->defindex;
+#if defined(OSLANG_UTF8)
+	oemtotchar(_path, NELEMENTS(_path), path, -1);
+	ofn.lpstrFile = _path;
+	ofn.nMaxFile = NELEMENTS(_path);
+#else
 	ofn.lpstrFile = path;
 	ofn.nMaxFile = size;
+#endif
 	ofn.Flags = OFN_FILEMUSTEXIST;
 	ofn.lpstrDefExt = item->ext;
 	ofn.lpstrTitle = item->title;
 	if (!GetOpenFileName(&ofn)) {
 		return(FALSE);
 	}
+#if defined(OSLANG_UTF8)
+	tchartooem(path, NELEMENTS(path), _path, -1);
+#endif
 	if (ro) {
 		*ro = ofn.Flags & OFN_READONLY;
 	}
@@ -49,6 +65,9 @@ BOOL dlgs_selectwritefile(HWND hWnd, con
 											OEMCHAR *path, UINT size) {
 
 	OPENFILENAME	ofn;
+#if defined(OSLANG_UTF8)
+	TCHAR			_path[MAX_PATH];
+#endif
 
 	if ((item == NULL) || (path == NULL) || (size == 0)) {
 		return(FALSE);
@@ -58,14 +77,23 @@ BOOL dlgs_selectwritefile(HWND hWnd, con
 	ofn.hwndOwner = hWnd;
 	ofn.lpstrFilter = item->filter;
 	ofn.nFilterIndex = item->defindex;
+#if defined(OSLANG_UTF8)
+	oemtotchar(_path, NELEMENTS(_path), path, -1);
+	ofn.lpstrFile = _path;
+	ofn.nMaxFile = NELEMENTS(_path);
+#else
 	ofn.lpstrFile = path;
 	ofn.nMaxFile = size;
+#endif
 	ofn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY;
 	ofn.lpstrDefExt = item->ext;
 	ofn.lpstrTitle = item->title;
 	if (!GetSaveFileName(&ofn)) {
 		return(FALSE);
 	}
+#if defined(OSLANG_UTF8)
+	tchartooem(path, NELEMENTS(path), _path, -1);
+#endif
 	return(TRUE);
 }
 
@@ -107,9 +135,9 @@ BOOL dlgs_selectwritenum(HWND hWnd, cons
 
 // ---- mimpi def file
 
-static const OEMCHAR mimpi_title[] = OEMTEXT("Open MIMPI define file");
-static const OEMCHAR mimpi_ext[] = OEMTEXT("def");
-static const OEMCHAR mimpi_filter[] = OEMTEXT("MIMPI define file(*.def)\0*.def\0");
+static const TCHAR mimpi_title[] = _T("Open MIMPI define file");
+static const TCHAR mimpi_ext[] = _T("def");
+static const TCHAR mimpi_filter[] = _T("MIMPI define file(*.def)\0*.def\0");
 static const FILESEL mimpi = {mimpi_title, mimpi_ext, mimpi_filter, 1};
 
 void dlgs_browsemimpidef(HWND hWnd, UINT16 res) {
@@ -132,7 +160,7 @@ const OEMCHAR	*p;
 
 // ---- list
 
-void dlgs_setliststr(HWND hWnd, UINT16 res, const OEMCHAR **item, UINT items) {
+void dlgs_setliststr(HWND hWnd, UINT16 res, const TCHAR **item, UINT items) {
 
 	HWND	wnd;
 	UINT	i;
@@ -184,6 +212,16 @@ void dlgs_setlistmidiout(HWND hWnd, UINT
 	}
 	num++;
 #endif
+#if defined(MT32SOUND_DLL)
+	if (mt32sound_isenable()) {
+		SendMessage(wnd, CB_INSERTSTRING, (WPARAM)num,
+													(LPARAM)cmmidi_mt32sound);
+		if (!milstr_cmp(defname, cmmidi_mt32sound)) {
+			defcur = num;
+		}
+		num++;
+	}
+#endif
 	for (i=0; i<devs; i++) {
 		if (midiOutGetDevCaps(i, &moc, sizeof(moc)) == MMSYSERR_NOERROR) {
 			SendMessage(wnd, CB_INSERTSTRING,