--- np2/win9x/dialog/d_config.cpp	2003/10/31 03:40:10	1.5
+++ np2/win9x/dialog/d_config.cpp	2005/02/09 20:11:36	1.11
@@ -9,19 +9,19 @@
 #include	"pccore.h"
 
 
-static const char str_2halfmhz[] = "2.4576MHz";
-static const char str_2mhz[] = "1.9968MHz";
-static const char *basecstr[2] = {str_2halfmhz, str_2mhz};
+static const OEMCHAR str_2halfmhz[] = OEMTEXT("2.4576MHz");
+static const OEMCHAR str_2mhz[] = OEMTEXT("1.9968MHz");
+static const OEMCHAR *basecstr[2] = {str_2mhz, str_2halfmhz};
 static const UINT32 mulval[10] = {1, 2, 4, 5, 6, 8, 10, 12, 16, 20};
-static const char str_clockfmt[] = "%2u.%.4u";
+static const OEMCHAR str_clockfmt[] = OEMTEXT("%2u.%.4u");
 
 
 static void setclock(HWND hWnd, UINT multiple) {
 
 	UINT32	clock;
-	char	work[32];
+	OEMCHAR	work[32];
 
-	GetDlgItemText(hWnd, IDC_BASECLOCK, work, sizeof(work));
+	GetDlgItemText(hWnd, IDC_BASECLOCK, work, NELEMENTS(work));
 	if (work[0] == '1') {
 		clock = PCBASECLOCK20 / 100;
 	}
@@ -29,7 +29,7 @@ static void setclock(HWND hWnd, UINT mul
 		clock = PCBASECLOCK25 / 100;
 	}
 	if (multiple == 0) {
-		GetDlgItemText(hWnd, IDC_MULTIPLE, work, sizeof(work));
+		GetDlgItemText(hWnd, IDC_MULTIPLE, work, NELEMENTS(work));
 		multiple = (UINT)milstr_solveINT(work);
 	}
 	if (multiple < 1) {
@@ -39,17 +39,17 @@ static void setclock(HWND hWnd, UINT mul
 		multiple = 32;
 	}
 	clock *= multiple;
-	wsprintf(work, str_clockfmt, clock / 10000, clock % 10000);
+	OEMSPRINTF(work, str_clockfmt, clock / 10000, clock % 10000);
 	SetDlgItemText(hWnd, IDC_CLOCKMSG, work);
 }
 
 static void cfgcreate(HWND hWnd) {
 
-	char	work[32];
+	OEMCHAR	work[32];
 	UINT	val;
 
 	SETLISTSTR(hWnd, IDC_BASECLOCK, basecstr);
-	if (np2cfg.baseclock >= AVE(PCBASECLOCK25, PCBASECLOCK20)) {
+	if (np2cfg.baseclock < AVE(PCBASECLOCK25, PCBASECLOCK20)) {
 		val = 0;
 	}
 	else {
@@ -57,9 +57,20 @@ static void cfgcreate(HWND hWnd) {
 	}
 	SendDlgItemMessage(hWnd, IDC_BASECLOCK, CB_SETCURSEL, val, 0);
 	SETLISTUINT32(hWnd, IDC_MULTIPLE, mulval);
-	wsprintf(work, str_u, np2cfg.multiple);
+	OEMSPRINTF(work, str_u, np2cfg.multiple);
 	SetDlgItemText(hWnd, IDC_MULTIPLE, work);
 
+	if (!milstr_cmp(np2cfg.model, str_VM)) {
+		val = IDC_MODELVM;
+	}
+	else if (!milstr_cmp(np2cfg.model, str_EPSON)) {
+		val = IDC_MODELEPSON;
+	}
+	else {
+		val = IDC_MODELVX;
+	}
+	SetDlgItemCheck(hWnd, val, TRUE);
+
 	if (np2cfg.samplingrate < AVE(11025, 22050)) {
 		val = IDC_RATE11;
 	}
@@ -70,9 +81,10 @@ static void cfgcreate(HWND hWnd) {
 		val = IDC_RATE44;
 	}
 	SetDlgItemCheck(hWnd, val, TRUE);
-	wsprintf(work, str_u, np2cfg.delayms);
+	OEMSPRINTF(work, str_u, np2cfg.delayms);
 	SetDlgItemText(hWnd, IDC_SOUNDBUF, work);
 
+	SetDlgItemCheck(hWnd, IDC_ALLOWRESIZE, np2oscfg.thickframe);
 	if (mmxflag & MMXFLAG_NOTSUPPORT) {
 		EnableWindow(GetDlgItem(hWnd, IDC_DISABLEMMX), FALSE);
 		SetDlgItemCheck(hWnd, IDC_DISABLEMMX, TRUE);
@@ -88,12 +100,13 @@ static void cfgcreate(HWND hWnd) {
 
 static void cfgupdate(HWND hWnd) {
 
-	UINT	update;
-	char	work[32];
-	UINT	val;
+	UINT		update;
+	OEMCHAR		work[32];
+	UINT		val;
+const OEMCHAR	*str;
 
 	update = 0;
-	GetDlgItemText(hWnd, IDC_BASECLOCK, work, sizeof(work));
+	GetDlgItemText(hWnd, IDC_BASECLOCK, work, NELEMENTS(work));
 	if (work[0] == '1') {
 		val = PCBASECLOCK20;
 	}
@@ -118,6 +131,20 @@ static void cfgupdate(HWND hWnd) {
 		update |= SYS_UPDATECFG | SYS_UPDATECLOCK;
 	}
 
+	if (GetDlgItemCheck(hWnd, IDC_MODELVM)) {
+		str = str_VM;
+	}
+	else if (GetDlgItemCheck(hWnd, IDC_MODELEPSON)) {
+		str = str_EPSON;
+	}
+	else {
+		str = str_VX;
+	}
+	if (milstr_cmp(np2cfg.model, str)) {
+		milstr_ncpy(np2cfg.model, str, NELEMENTS(np2cfg.model));
+		update |= SYS_UPDATECFG;
+	}
+
 	if (GetDlgItemCheck(hWnd, IDC_RATE11)) {
 		val = 11025;
 	}
@@ -133,10 +160,10 @@ static void cfgupdate(HWND hWnd) {
 		soundrenewal = 1;
 	}
 
-	GetDlgItemText(hWnd, IDC_SOUNDBUF, work, sizeof(work));
+	GetDlgItemText(hWnd, IDC_SOUNDBUF, work, NELEMENTS(work));
 	val = (UINT)milstr_solveINT(work);
-	if (val < 100) {
-		val = 100;
+	if (val < 40) {
+		val = 40;
 	}
 	else if (val > 1000) {
 		val = 1000;
@@ -147,10 +174,16 @@ static void cfgupdate(HWND hWnd) {
 		soundrenewal = 1;
 	}
 
+	val = GetDlgItemCheck(hWnd, IDC_ALLOWRESIZE);
+	if (np2oscfg.thickframe != (UINT8)val) {
+		np2oscfg.thickframe = (UINT8)val;
+		update |= SYS_UPDATEOSCFG;
+	}
+
 	if (!(mmxflag & MMXFLAG_NOTSUPPORT)) {
 		val = GetDlgItemCheck(hWnd, IDC_DISABLEMMX);
-		if (np2oscfg.disablemmx != (BYTE)val) {
-			np2oscfg.disablemmx = (BYTE)val;
+		if (np2oscfg.disablemmx != (UINT8)val) {
+			np2oscfg.disablemmx = (UINT8)val;
 			mmxflag &= ~MMXFLAG_DISABLE;
 			mmxflag |= (val)?MMXFLAG_DISABLE:0;
 			update |= SYS_UPDATEOSCFG;
@@ -158,14 +191,14 @@ static void cfgupdate(HWND hWnd) {
 	}
 
 	val = GetDlgItemCheck(hWnd, IDC_COMFIRM);
-	if (np2oscfg.comfirm != (BYTE)val) {
-		np2oscfg.comfirm = (BYTE)val;
+	if (np2oscfg.comfirm != (UINT8)val) {
+		np2oscfg.comfirm = (UINT8)val;
 		update |= SYS_UPDATEOSCFG;
 	}
 
 	val = GetDlgItemCheck(hWnd, IDC_RESUME);
-	if (np2oscfg.resume != (BYTE)val) {
-		np2oscfg.resume = (BYTE)val;
+	if (np2oscfg.resume != (UINT8)val) {
+		np2oscfg.resume = (UINT8)val;
 		update |= SYS_UPDATEOSCFG;
 	}
 	sysmng_update(update);
@@ -179,7 +212,7 @@ LRESULT CALLBACK CfgDialogProc(HWND hWnd
 			return(FALSE);
 
 		case WM_COMMAND:
-			switch (LOWORD(wp)) {
+			switch(LOWORD(wp)) {
 				case IDOK:
 					cfgupdate(hWnd);
 					EndDialog(hWnd, IDOK);
@@ -198,7 +231,7 @@ LRESULT CALLBACK CfgDialogProc(HWND hWnd
 						UINT val;
 						val = (UINT)SendDlgItemMessage(hWnd, IDC_MULTIPLE,
 														CB_GETCURSEL, 0, 0);
-						if (val < sizeof(mulval)/sizeof(UINT32)) {
+						if (val < NELEMENTS(mulval)) {
 							setclock(hWnd, mulval[val]);
 						}
 					}