--- np2/win9x/dialog/d_screen.cpp	2005/02/07 15:39:27	1.8
+++ np2/win9x/dialog/d_screen.cpp	2005/02/09 20:11:36	1.9
@@ -15,12 +15,12 @@
 #include	"palettes.h"
 
 
-static const char str_scropt[] = "Screen option";
+static const OEMCHAR str_scropt[] = OEMTEXT("Screen option");
 
 
 static LRESULT CALLBACK Scropt1DlgProc(HWND hWnd, UINT msg,
 													WPARAM wp, LPARAM lp) {
-	char	work[32];
+	OEMCHAR	work[32];
 	UINT16	ret;
 	UINT8	b;
 	int		renewal;
@@ -36,7 +36,7 @@ static LRESULT CALLBACK Scropt1DlgProc(H
 											MAKELONG(0, 255));
 			SendDlgItemMessage(hWnd, IDC_SKIPLIGHT, TBM_SETPOS, TRUE,
 											np2cfg.skiplight);
-			wsprintf(work, str_d, np2cfg.skiplight);
+			OEMSPRINTF(work, str_d, np2cfg.skiplight);
 			SetDlgItemText(hWnd, IDC_LIGHTSTR, work);
 			return(TRUE);
 
@@ -54,7 +54,7 @@ static LRESULT CALLBACK Scropt1DlgProc(H
 				case IDC_SKIPLIGHT:
 					ret = (UINT16)SendDlgItemMessage(hWnd, IDC_SKIPLIGHT,
 													TBM_GETPOS, 0, 0);
-					wsprintf(work, str_d, ret);
+					OEMSPRINTF(work, str_d, ret);
 					SetDlgItemText(hWnd, IDC_LIGHTSTR, work);
 					break;
 			}
@@ -157,7 +157,7 @@ static LRESULT CALLBACK Scropt2DlgProc(H
 static LRESULT CALLBACK Scropt3DlgProc(HWND hWnd, UINT msg,
 													WPARAM wp, LPARAM lp) {
 
-	char	work[32];
+	OEMCHAR	work[32];
 	UINT8	value[6];
 	UINT8	b;
 	UINT	update;
@@ -168,26 +168,26 @@ static LRESULT CALLBACK Scropt3DlgProc(H
 											MAKELONG(0, 32));
 			SendDlgItemMessage(hWnd, IDC_TRAMWAIT, TBM_SETPOS, TRUE,
 											np2cfg.wait[0]);
-			wsprintf(work, str_u, np2cfg.wait[0]);
+			OEMSPRINTF(work, str_u, np2cfg.wait[0]);
 			SetDlgItemText(hWnd, IDC_TRAMSTR, work);
 			SendDlgItemMessage(hWnd, IDC_VRAMWAIT, TBM_SETRANGE, TRUE,
 											MAKELONG(0, 32));
 			SendDlgItemMessage(hWnd, IDC_VRAMWAIT, TBM_SETPOS, TRUE,
 											np2cfg.wait[2]);
-			wsprintf(work, str_u, np2cfg.wait[2]);
+			OEMSPRINTF(work, str_u, np2cfg.wait[2]);
 			SetDlgItemText(hWnd, IDC_VRAMSTR, work);
 			SendDlgItemMessage(hWnd, IDC_GRCGWAIT, TBM_SETRANGE, TRUE,
 											MAKELONG(0, 32));
 			SendDlgItemMessage(hWnd, IDC_GRCGWAIT, TBM_SETPOS, TRUE,
 											np2cfg.wait[4]);
-			wsprintf(work, str_u, np2cfg.wait[4]);
+			OEMSPRINTF(work, str_u, np2cfg.wait[4]);
 			SetDlgItemText(hWnd, IDC_GRCGSTR, work);
 
 			SendDlgItemMessage(hWnd, IDC_REALPAL, TBM_SETRANGE, TRUE,
 											MAKELONG(0, 64));
 			SendDlgItemMessage(hWnd, IDC_REALPAL, TBM_SETPOS, TRUE,
 											np2cfg.realpal);
-			wsprintf(work, str_d, (int)np2cfg.realpal - 32);
+			OEMSPRINTF(work, str_d, (int)np2cfg.realpal - 32);
 			SetDlgItemText(hWnd, IDC_REALPALSTR, work);
 
 			return(TRUE);
@@ -197,25 +197,25 @@ static LRESULT CALLBACK Scropt3DlgProc(H
 				case IDC_TRAMWAIT:
 					b = (UINT8)SendDlgItemMessage(hWnd, IDC_TRAMWAIT,
 													TBM_GETPOS, 0, 0);
-					wsprintf(work, str_u, b);
+					OEMSPRINTF(work, str_u, b);
 					SetDlgItemText(hWnd, IDC_TRAMSTR, work);
 					break;
 				case IDC_VRAMWAIT:
 					b = (UINT8)SendDlgItemMessage(hWnd, IDC_VRAMWAIT,
 													TBM_GETPOS, 0, 0);
-					wsprintf(work, str_u, b);
+					OEMSPRINTF(work, str_u, b);
 					SetDlgItemText(hWnd, IDC_VRAMSTR, work);
 					break;
 				case IDC_GRCGWAIT:
 					b = (UINT8)SendDlgItemMessage(hWnd, IDC_GRCGWAIT,
 													TBM_GETPOS, 0, 0);
-					wsprintf(work, str_u, b);
+					OEMSPRINTF(work, str_u, b);
 					SetDlgItemText(hWnd, IDC_GRCGSTR, work);
 					break;
 				case IDC_REALPAL:
 					b = (UINT8)SendDlgItemMessage(hWnd, IDC_REALPAL,
 													TBM_GETPOS, 0, 0);
-					wsprintf(work, str_d, (int)b - 32);
+					OEMSPRINTF(work, str_d, (int)b - 32);
 					SetDlgItemText(hWnd, IDC_REALPALSTR, work);
 			}
 			break;