--- np2/win9x/dialog/d_serial.cpp	2005/02/07 15:39:27	1.12
+++ np2/win9x/dialog/d_serial.cpp	2006/12/24 00:52:30	1.15
@@ -15,25 +15,25 @@
 #include	"dipswbmp.h"
 
 
-static const char str_none[] = "NONE";
-static const char str_com1[] = "COM1";
-static const char str_com2[] = "COM2";
-static const char str_com3[] = "COM3";
-static const char str_com4[] = "COM4";
-static const char str_midi[] = "MIDI";
-static const char str_odd[] = "ODD";
-static const char str_even[] = "EVEN";
-static const char str_one[] = "1";
-static const char str_onehalf[] = "1.5";
-static const char str_two[] = "2";
+static const TCHAR str_none[] = _T("NONE");
+static const TCHAR str_com1[] = _T("COM1");
+static const TCHAR str_com2[] = _T("COM2");
+static const TCHAR str_com3[] = _T("COM3");
+static const TCHAR str_com4[] = _T("COM4");
+static const TCHAR str_midi[] = _T("MIDI");
+static const TCHAR str_odd[] = _T("ODD");
+static const TCHAR str_even[] = _T("EVEN");
+static const TCHAR str_one[] = _T("1");
+static const TCHAR str_onehalf[] = _T("1.5");
+static const TCHAR str_two[] = _T("2");
 
-static const char *rsport[] = {str_none, str_com1, str_com2, str_com3,
-								str_com4, str_midi};
+static const TCHAR *rsport[] = {str_none, str_com1, str_com2, str_com3,
+									str_com4, str_midi};
 static const UINT32 rscharsize[] = {5, 6, 7, 8};
-static const char *rsparity[] = {str_none, str_odd, str_even};
-static const char *rsstopbit[] = {str_one, str_onehalf, str_two};
+static const TCHAR *rsparity[] = {str_none, str_odd, str_even};
+static const TCHAR *rsstopbit[] = {str_one, str_onehalf, str_two};
 
-static const char str_seropt[] = "Serial option";
+static const TCHAR str_seropt[] = _T("Serial option");
 
 
 #ifdef __cplusplus
@@ -148,9 +148,9 @@ static LRESULT CALLBACK dlgitem_proc(HWN
 	UINT8	b;
 	LRESULT	r;
 	union {
-		char	mmap[MAXPNAMELEN];
-		char	mmdl[64];
-		char	mdef[MAX_PATH];
+		OEMCHAR	mmap[MAXPNAMELEN];
+		OEMCHAR	mmdl[64];
+		OEMCHAR	mdef[MAX_PATH];
 	} str;
 	COMCFG	*cfg;
 	UINT	update;
@@ -275,29 +275,29 @@ static LRESULT CALLBACK dlgitem_proc(HWN
 				}
 
 				GetDlgItemText(hWnd, m->idc[ID_MMAP],
-												str.mmap, sizeof(str.mmap));
+											str.mmap, NELEMENTS(str.mmap));
 				if (milstr_cmp(cfg->mout, str.mmap)) {
-					milstr_ncpy(cfg->mout, str.mmap, sizeof(cfg->mout));
+					milstr_ncpy(cfg->mout, str.mmap, NELEMENTS(cfg->mout));
 					update |= SYS_UPDATEOSCFG;
 					update |= m->update;
 				}
 				GetDlgItemText(hWnd, m->idc[ID_MMDL],
-												str.mmdl, sizeof(str.mmdl));
+											str.mmdl, NELEMENTS(str.mmdl));
 				if (milstr_cmp(cfg->mdl, str.mmdl)) {
-					milstr_ncpy(cfg->mdl, str.mmdl, sizeof(cfg->mdl));
+					milstr_ncpy(cfg->mdl, str.mmdl, NELEMENTS(cfg->mdl));
 					update |= SYS_UPDATEOSCFG;
 					update |= m->update;
 				}
 
-				cfg->def_en = GetDlgItemCheck(hWnd, m->idc[ID_DEFE]);
+				cfg->def_en = (UINT8)GetDlgItemCheck(hWnd, m->idc[ID_DEFE]);
 				cm = *m->cm;
 				if (cm) {
 					cm->msg(cm, COMMSG_MIMPIDEFEN, cfg->def_en);
 				}
 				GetDlgItemText(hWnd, m->idc[ID_DEFF],
-												str.mdef, sizeof(str.mdef));
+											str.mdef, NELEMENTS(str.mdef));
 				if (milstr_cmp(cfg->def, str.mdef)) {
-					milstr_ncpy(cfg->def, str.mdef, sizeof(cfg->def));
+					milstr_ncpy(cfg->def, str.mdef, NELEMENTS(cfg->def));
 					update |= SYS_UPDATEOSCFG;
 					if (cm) {
 						cm->msg(cm, COMMSG_MIMPIDEFFILE, (long)str.mdef);
@@ -370,11 +370,11 @@ enum {
 static const UINT32 pc9861kint1[] = {0, 1, 2, 3};
 static const UINT32 pc9861kint2[] = {0, 4, 5, 6};
 
-static const char sync0[] = "Start-Stop";
-static const char sync1[] = "ST1";
-static const char sync2[] = "ST2";
-static const char sync3[] = "RD-Sync";
-static const char *pc9861sync[] = {sync0, sync1, sync2, sync3};
+static const TCHAR sync0[] = _T("Start-Stop");
+static const TCHAR sync1[] = _T("ST1");
+static const TCHAR sync2[] = _T("ST2");
+static const TCHAR sync3[] = _T("RD-Sync");
+static const TCHAR *pc9861sync[] = {sync0, sync1, sync2, sync3};
 
 static const UINT pc9861d2sync[] = {1, 2, 3, 0};
 static const UINT pc9861d2int[] = {0, 2, 1, 3};
@@ -641,7 +641,7 @@ void dialog_serial(HWND hWnd) {
 	PROPSHEETHEADER	psh;
 	HPROPSHEETPAGE	hpsp[4];
 
-	hinst = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE);
+	hinst = GetWindowInst(hWnd);
 
 	ZeroMemory(&psp, sizeof(psp));
 	psp.dwSize = sizeof(PROPSHEETPAGE);