--- np2/win9x/debuguty/viewer.cpp	2003/10/16 17:59:09	1.1.1.1
+++ np2/win9x/debuguty/viewer.cpp	2005/03/20 08:58:19	1.8
@@ -1,16 +1,18 @@
 #include	"compiler.h"
 #include	"resource.h"
 #include	"np2.h"
-#include	"i286.h"
 #include	"viewer.h"
 #include	"viewcmn.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];
+extern	HINSTANCE		hInst;
 
-static void viewer_segmode(HWND hwnd, BYTE type) {
+
+static void viewer_segmode(HWND hwnd, UINT8 type) {
 
 	NP2VIEW_T	*view;
 
@@ -112,7 +114,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) {
@@ -201,7 +203,7 @@ BOOL viewer_init(HINSTANCE hPreInst) {
 		np2vc.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON2));
 		np2vc.hCursor = LoadCursor(NULL, IDC_ARROW);
 		np2vc.hbrBackground = (HBRUSH)0;
-		np2vc.lpszMenuName = MAKEINTRESOURCE(IDM_VIEW);
+		np2vc.lpszMenuName = MAKEINTRESOURCE(IDR_VIEW);
 		np2vc.lpszClassName = np2viewclass;
 		if (!RegisterClass(&np2vc)) {
 			return(FAILURE);
@@ -224,7 +226,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;
@@ -261,8 +263,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)) {
@@ -274,8 +276,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);
 				}