--- np2/win9x/debuguty/viewer.cpp	2003/11/04 15:44:59	1.3
+++ np2/win9x/debuguty/viewer.cpp	2007/11/11 07:11:27	1.10
@@ -3,15 +3,15 @@
 #include	"np2.h"
 #include	"viewer.h"
 #include	"viewcmn.h"
-#include	"i286.h"
+#include	"cpucore.h"
 
 
-static	char		np2viewclass[] = "NP2-ViewWindow";
-		NP2VIEW_T	np2view[NP2VIEW_MAX];
-extern	HINSTANCE	hInst;
+static	const TCHAR		np2viewclass[] = _T("NP2-ViewWindow");
+		const TCHAR		np2viewfont[] = _T("£Í£Ó ¥´¥·¥Ã¥¯");
+		NP2VIEW_T		np2view[NP2VIEW_MAX];
 
 
-static void viewer_segmode(HWND hwnd, BYTE type) {
+static void viewer_segmode(HWND hwnd, UINT8 type) {
 
 	NP2VIEW_T	*view;
 
@@ -61,7 +61,7 @@ LRESULT CALLBACK ViewProc(HWND hWnd, UIN
 		case WM_COMMAND:
 			switch(LOWORD(wParam)) {
 				case IDM_VIEWWINNEW:
-					viewer_open();
+					viewer_open(g_hInstance);
 					break;
 
 				case IDM_VIEWWINCLOSE:
@@ -105,7 +105,7 @@ LRESULT CALLBACK ViewProc(HWND hWnd, UIN
 			if (view) {
 				RECT	rc;
 				GetClientRect(hWnd, &rc);
-				view->step = rc.bottom / 16;
+				view->step = (UINT16)(rc.bottom / 16);
 				viewcmn_setvscroll(hWnd, view);
 			}
 			break;
@@ -113,7 +113,7 @@ LRESULT CALLBACK ViewProc(HWND hWnd, UIN
 		case WM_VSCROLL:
 			view = viewcmn_find(hWnd);
 			if (view) {
-				DWORD newpos = view->pos;
+				UINT32 newpos = view->pos;
 				switch(LOWORD(wParam)) {
 					case SB_LINEUP:
 						if (newpos) {
@@ -187,26 +187,24 @@ LRESULT CALLBACK ViewProc(HWND hWnd, UIN
 
 // -----------------------------------------------------------------------
 
-BOOL viewer_init(HINSTANCE hPreInst) {
+BOOL viewer_init(HINSTANCE hInstance) {
 
 	WNDCLASS	np2vc;
 
 	ZeroMemory(np2view, sizeof(np2view));
 
-	if (!hPreInst) {
-		np2vc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW;
-		np2vc.lpfnWndProc = ViewProc;
-		np2vc.cbClsExtra = 0;
-		np2vc.cbWndExtra = 0;
-		np2vc.hInstance = hInst;
-		np2vc.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON2));
-		np2vc.hCursor = LoadCursor(NULL, IDC_ARROW);
-		np2vc.hbrBackground = (HBRUSH)0;
-		np2vc.lpszMenuName = MAKEINTRESOURCE(IDR_VIEW);
-		np2vc.lpszClassName = np2viewclass;
-		if (!RegisterClass(&np2vc)) {
-			return(FAILURE);
-		}
+	np2vc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW;
+	np2vc.lpfnWndProc = ViewProc;
+	np2vc.cbClsExtra = 0;
+	np2vc.cbWndExtra = 0;
+	np2vc.hInstance = hInstance;
+	np2vc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON2));
+	np2vc.hCursor = LoadCursor(NULL, IDC_ARROW);
+	np2vc.hbrBackground = (HBRUSH)0;
+	np2vc.lpszMenuName = MAKEINTRESOURCE(IDR_VIEW);
+	np2vc.lpszClassName = np2viewclass;
+	if (!RegisterClass(&np2vc)) {
+		return(FAILURE);
 	}
 	return(SUCCESS);
 }
@@ -217,7 +215,7 @@ void viewer_term(void) {
 }
 
 
-void viewer_open(void) {
+void viewer_open(HINSTANCE hInstance) {
 
 	int			i;
 	NP2VIEW_T	*view;
@@ -225,7 +223,7 @@ void viewer_open(void) {
 	view = np2view;
 	for (i=0; i<NP2VIEW_MAX; i++, view++) {
 		if (!view->alive) {
-			char buf[256];
+			TCHAR buf[256];
 			viewcmn_caption(view, buf);
 			ZeroMemory(view, sizeof(NP2VIEW_T));
 			view->alive = TRUE;
@@ -234,7 +232,7 @@ void viewer_open(void) {
 							WS_OVERLAPPEDWINDOW | WS_VSCROLL,
 							CW_USEDEFAULT, CW_USEDEFAULT,
 							CW_USEDEFAULT, CW_USEDEFAULT,
-							NULL, NULL, hInst, NULL);
+							NULL, NULL, hInstance, NULL);
 			viewcmn_setmode(view, NULL, VIEWMODE_REG);
 			ShowWindow(view->hwnd, SW_SHOWNORMAL);
 			UpdateWindow(view->hwnd);
@@ -262,8 +260,8 @@ void viewer_allclose(void) {
 
 void viewer_allreload(BOOL force) {
 
-static	DWORD	last = 0;
-		DWORD	now;
+static UINT32	last = 0;
+	UINT32		now;
 
 	now = GetTickCount();
 	if ((force) || ((now - last) >= 200)) {
@@ -275,8 +273,8 @@ static	DWORD	last = 0;
 		for (i=0; i<NP2VIEW_MAX; i++, view++) {
 			if ((view->alive) && (!view->lock)) {
 				if (view->type == VIEWMODE_ASM) {
-					view->seg = I286_CS;
-					view->off = I286_IP;
+					view->seg = CPU_CS;
+					view->off = CPU_IP;
 					view->pos = 0;
 					viewcmn_setvscroll(view->hwnd, view);
 				}