--- np2/win9x/debuguty/view1mb.cpp	2003/10/16 17:59:10	1.1.1.1
+++ np2/win9x/debuguty/view1mb.cpp	2005/03/20 08:58:19	1.6
@@ -1,19 +1,19 @@
 #include	"compiler.h"
 #include	"resource.h"
 #include	"np2.h"
-#include	"i286.h"
 #include	"viewer.h"
 #include	"viewcmn.h"
 #include	"viewmenu.h"
 #include	"viewmem.h"
 #include	"view1mb.h"
+#include	"cpucore.h"
 
 
-static void set_viewseg(HWND hwnd, NP2VIEW_T *view, WORD seg) {
+static void set_viewseg(HWND hwnd, NP2VIEW_T *view, UINT16 seg) {
 
-	DWORD	pos;
+	UINT32	pos;
 
-	pos = (DWORD)seg;
+	pos = (UINT32)seg;
 	if (view->pos != pos) {
 		view->pos = pos;
 		viewcmn_setvscroll(hwnd, view);
@@ -26,15 +26,15 @@ static void view1mb_paint(NP2VIEW_T *vie
 
 	int		x;
 	LONG	y;
-	DWORD	off;
-	BYTE	*p;
-	BYTE	buf[16];
-	char	str[16];
+	UINT32	off;
+	UINT8	*p;
+	UINT8	buf[16];
+	TCHAR	str[16];
 	HFONT	hfont;
 
 	hfont = CreateFont(16, 0, 0, 0, 0, 0, 0, 0, 
 					SHIFTJIS_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
-					DEFAULT_QUALITY, FIXED_PITCH, "ＭＳゴシック");
+					DEFAULT_QUALITY, FIXED_PITCH, np2viewfont);
 	SetTextColor(hdc, 0xffffff);
 	SetBkColor(hdc, 0x400000);
 	hfont = (HFONT)SelectObject(hdc, hfont);
@@ -48,7 +48,7 @@ static void view1mb_paint(NP2VIEW_T *vie
 			else {
 				view->buf1.type = ALLOCTYPE_1MB;
 				viewmem_read(&view->dmem, 0,
-										(BYTE *)view->buf1.ptr, 0x10fff0);
+										(UINT8 *)view->buf1.ptr, 0x10fff0);
 			}
 			viewcmn_putcaption(view);
 		}
@@ -56,10 +56,10 @@ static void view1mb_paint(NP2VIEW_T *vie
 
 	off = (view->pos) << 4;
 	for (y=0; y<rc->bottom && off<0x10fff0; y+=16, off+=16) {
-		wsprintf(str, "%08x", off);
+		wsprintf(str, _T("%08x"), off);
 		TextOut(hdc, 0, y, str, 8);
 		if (view->lock) {
-			p = (BYTE *)view->buf1.ptr;
+			p = (UINT8 *)view->buf1.ptr;
 			p += off;
 		}
 		else {
@@ -71,7 +71,7 @@ static void view1mb_paint(NP2VIEW_T *vie
 			str[1] = viewcmn_hex[*p & 15];
 			str[2] = 0;
 			p++;
-			TextOut(hdc, (10 + x*3)*8, y, str, 2);
+			TextOut(hdc, (10 + x * 3) * 8, y, str, 2);
 		}
 	}
 
@@ -86,19 +86,19 @@ LRESULT CALLBACK view1mb_proc(NP2VIEW_T 
 		case WM_COMMAND:
 			switch(LOWORD(wp)) {
 				case IDM_SEGCS:
-					set_viewseg(hwnd, view, I286_CS);
+					set_viewseg(hwnd, view, CPU_CS);
 					break;
 
 				case IDM_SEGDS:
-					set_viewseg(hwnd, view, I286_DS);
+					set_viewseg(hwnd, view, CPU_DS);
 					break;
 
 				case IDM_SEGES:
-					set_viewseg(hwnd, view, I286_ES);
+					set_viewseg(hwnd, view, CPU_ES);
 					break;
 
 				case IDM_SEGSS:
-					set_viewseg(hwnd, view, I286_SS);
+					set_viewseg(hwnd, view, CPU_SS);
 					break;
 
 				case IDM_SEGTEXT:
