--- np2/win9x/dialog/d_screen.cpp	2005/02/07 15:39:27	1.8
+++ np2/win9x/dialog/d_screen.cpp	2006/12/24 00:52:30	1.12
@@ -4,6 +4,7 @@
 #include	"strres.h"
 #include	"resource.h"
 #include	"np2.h"
+#include	"oemtext.h"
 #include	"scrnmng.h"
 #include	"sysmng.h"
 #include	"np2class.h"
@@ -15,12 +16,12 @@
 #include	"palettes.h"
 
 
-static const char str_scropt[] = "Screen option";
+static const TCHAR str_scropt[] = _T("Screen option");
 
 
 static LRESULT CALLBACK Scropt1DlgProc(HWND hWnd, UINT msg,
 													WPARAM wp, LPARAM lp) {
-	char	work[32];
+	TCHAR	work[32];
 	UINT16	ret;
 	UINT8	b;
 	int		renewal;
@@ -36,7 +37,7 @@ static LRESULT CALLBACK Scropt1DlgProc(H
 											MAKELONG(0, 255));
 			SendDlgItemMessage(hWnd, IDC_SKIPLIGHT, TBM_SETPOS, TRUE,
 											np2cfg.skiplight);
-			wsprintf(work, str_d, np2cfg.skiplight);
+			wsprintf(work, tchar_u, np2cfg.skiplight);
 			SetDlgItemText(hWnd, IDC_LIGHTSTR, work);
 			return(TRUE);
 
@@ -54,7 +55,7 @@ static LRESULT CALLBACK Scropt1DlgProc(H
 				case IDC_SKIPLIGHT:
 					ret = (UINT16)SendDlgItemMessage(hWnd, IDC_SKIPLIGHT,
 													TBM_GETPOS, 0, 0);
-					wsprintf(work, str_d, ret);
+					wsprintf(work, tchar_u, ret);
 					SetDlgItemText(hWnd, IDC_LIGHTSTR, work);
 					break;
 			}
@@ -63,13 +64,14 @@ static LRESULT CALLBACK Scropt1DlgProc(H
 		case WM_NOTIFY:
 			if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) {
 				renewal = 0;
-				b = GetDlgItemCheck(hWnd, IDC_SKIPLINE);
+				b = (UINT8)GetDlgItemCheck(hWnd, IDC_SKIPLINE);
 				if (np2cfg.skipline != b) {
 					np2cfg.skipline = b;
 					renewal = 1;
 				}
-				if ((ret = (UINT16)SendDlgItemMessage(hWnd, IDC_SKIPLIGHT,
-												TBM_GETPOS, 0, 0)) > 255) {
+				ret = (UINT16)SendDlgItemMessage(hWnd, IDC_SKIPLIGHT,
+														TBM_GETPOS, 0, 0);
+				if (ret > 255) {
 					ret = 255;
 				}
 				if (np2cfg.skiplight != ret) {
@@ -79,8 +81,8 @@ static LRESULT CALLBACK Scropt1DlgProc(H
 				if (renewal) {
 					pal_makeskiptable();
 				}
-				b = GetDlgItemCheck(hWnd, IDC_LCD) |
-					(GetDlgItemCheck(hWnd, IDC_LCDX) << 1);
+				b = (GetDlgItemCheck(hWnd, IDC_LCD)?0x01:0x00) |
+					(GetDlgItemCheck(hWnd, IDC_LCDX)?0x02:0x00);
 				if (np2cfg.LCD_MODE != b) {
 					np2cfg.LCD_MODE = b;
 					pal_makelcdpal();
@@ -128,7 +130,7 @@ static LRESULT CALLBACK Scropt2DlgProc(H
 		case WM_NOTIFY:
 			if ((((NMHDR *)lp)->code) == (UINT)PSN_APPLY) {
 				update = 0;
-				b = GetDlgItemCheck(hWnd, IDC_GDC72020);
+				b = (UINT8)GetDlgItemCheck(hWnd, IDC_GDC72020);
 				if (np2cfg.uPD72020 != b) {
 					np2cfg.uPD72020 = b;
 					update |= SYS_UPDATECFG;
@@ -141,7 +143,7 @@ static LRESULT CALLBACK Scropt2DlgProc(H
 					update |= SYS_UPDATECFG;
 					gdcs.grphdisp |= GDCSCRN_ALLDRAW2;
 				}
-				b = GetDlgItemCheck(hWnd, IDC_PC980124);
+				b = (UINT8)GetDlgItemCheck(hWnd, IDC_PC980124);
 				if (np2cfg.color16 != b) {
 					np2cfg.color16 = b;
 					update |= SYS_UPDATECFG;
@@ -157,7 +159,7 @@ static LRESULT CALLBACK Scropt2DlgProc(H
 static LRESULT CALLBACK Scropt3DlgProc(HWND hWnd, UINT msg,
 													WPARAM wp, LPARAM lp) {
 
-	char	work[32];
+	TCHAR	work[32];
 	UINT8	value[6];
 	UINT8	b;
 	UINT	update;
@@ -168,26 +170,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]);
+			wsprintf(work, tchar_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]);
+			wsprintf(work, tchar_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]);
+			wsprintf(work, tchar_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);
+			wsprintf(work, tchar_d, (int)np2cfg.realpal - 32);
 			SetDlgItemText(hWnd, IDC_REALPALSTR, work);
 
 			return(TRUE);
@@ -197,25 +199,28 @@ static LRESULT CALLBACK Scropt3DlgProc(H
 				case IDC_TRAMWAIT:
 					b = (UINT8)SendDlgItemMessage(hWnd, IDC_TRAMWAIT,
 													TBM_GETPOS, 0, 0);
-					wsprintf(work, str_u, b);
+					wsprintf(work, tchar_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);
+					wsprintf(work, tchar_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);
+					wsprintf(work, tchar_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);
+					wsprintf(work, tchar_d, (int)b - 32);
 					SetDlgItemText(hWnd, IDC_REALPALSTR, work);
 			}
 			break;
@@ -266,7 +271,7 @@ void dialog_scropt(HWND hWnd) {
 	PROPSHEETHEADER	psh;
 	HPROPSHEETPAGE	hpsp[3];
 
-	hinst = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE);
+	hinst = GetWindowInst(hWnd);
 
 	ZeroMemory(&psp, sizeof(psp));
 	psp.dwSize = sizeof(PROPSHEETPAGE);