--- np2/win9x/debuguty/viewcmn.cpp	2003/10/16 17:59:09	1.1
+++ np2/win9x/debuguty/viewcmn.cpp	2005/02/09 20:11:36	1.7
@@ -1,12 +1,8 @@
 #include	"compiler.h"
 #include	"resource.h"
 #include	"np2.h"
-#include	"i286.h"
-#include	"memory.h"
-#include	"pccore.h"
-#include	"iocore.h"
-#include	"bios.h"
 #include	"viewer.h"
+#include	"viewcmn.h"
 #include	"viewmenu.h"
 #include	"viewmem.h"
 #include	"viewreg.h"
@@ -14,6 +10,10 @@
 #include	"view1mb.h"
 #include	"viewasm.h"
 #include	"viewsnd.h"
+#include	"cpucore.h"
+#include	"pccore.h"
+#include	"iocore.h"
+#include	"bios.h"
 
 
 char viewcmn_hex[16] = {
@@ -21,26 +21,26 @@ char viewcmn_hex[16] = {
 				'8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 
 
-void viewcmn_caption(NP2VIEW_T *view, char *buf) {
+void viewcmn_caption(NP2VIEW_T *view, OEMCHAR *buf) {
 
 	int		num;
-	char	*p;
+	OEMCHAR	*p;
 
 	num = ((int)view - (int)np2view) / sizeof(NP2VIEW_T);
 
 	if (view->lock) {
-		p = "Locked";
+		p = OEMTEXT("Locked");
 	}
 	else {
-		p = "Realtime";
+		p = OEMTEXT("Realtime");
 	}
-	wsprintf(buf, "%d.%s - NP2 Debug Utility", num+1, p);
+	OEMSPRINTF(buf, OEMTEXT("%d.%s - NP2 Debug Utility"), num + 1, p);
 }
 
 
 void viewcmn_putcaption(NP2VIEW_T *view) {
 
-	char	buf[256];
+	OEMCHAR	buf[256];
 
 	viewcmn_caption(view, buf);
 	SetWindowText(view->hwnd, buf);
@@ -52,7 +52,7 @@ void viewcmn_putcaption(NP2VIEW_T *view)
 
 BOOL viewcmn_alloc(VIEWMEMBUF *buf, DWORD size) {
 
-	if (buf->type == ALOOCTYPE_ERROR) {
+	if (buf->type == ALLOCTYPE_ERROR) {
 		return(FAILURE);
 	}
 	if (buf->size < size) {
@@ -62,7 +62,7 @@ BOOL viewcmn_alloc(VIEWMEMBUF *buf, DWOR
 		ZeroMemory(buf, sizeof(VIEWMEMBUF));
 		buf->ptr = malloc(size);
 		if (!buf->ptr) {
-			buf->type = ALOOCTYPE_ERROR;
+			buf->type = ALLOCTYPE_ERROR;
 			return(FAILURE);
 		}
 		buf->size = size;
@@ -155,19 +155,19 @@ void viewcmn_setbank(NP2VIEW_T *view) {
 
 	dmem = &view->dmem;
 	dmem->vram = gdcs.disp;
-	dmem->itf = itf.bank;
-	dmem->A20 = (BYTE)((extmem.adrsmask >> 20) & 1);
+	dmem->itf = CPU_ITFBANK;
+	dmem->A20 = (BYTE)((CPU_ADRSMASK >> 20) & 1);
 }
 
 
 // ----
 
 static void modmenu(HMENU hmenu, int pos, WORD id,
-											const char *seg, WORD value) {
+											const OEMCHAR *seg, WORD value) {
 
-	char	buf[256];
+	OEMCHAR	buf[256];
 
-	wsprintf(buf, "Seg = &%s [%04x]", seg, value);
+	OEMSPRINTF(buf, OEMTEXT("Seg = &%s [%04x]"), seg, value);
 	ModifyMenu(hmenu, pos, MF_BYPOSITION | MF_STRING, id, buf);
 }
 
@@ -183,10 +183,10 @@ void viewcmn_setmenuseg(HWND hwnd) {
 	hmenu = GetSubMenu(hparent, 2);
 
 	if (hmenu) {
-		modmenu(hmenu, 2, IDM_SEGCS, "CS", I286_CS);
-		modmenu(hmenu, 3, IDM_SEGDS, "DS", I286_DS);
-		modmenu(hmenu, 4, IDM_SEGES, "ES", I286_ES);
-		modmenu(hmenu, 5, IDM_SEGSS, "SS", I286_SS);
+		modmenu(hmenu, 2, IDM_SEGCS, OEMTEXT("CS"), CPU_CS);
+		modmenu(hmenu, 3, IDM_SEGDS, OEMTEXT("DS"), CPU_DS);
+		modmenu(hmenu, 4, IDM_SEGES, OEMTEXT("ES"), CPU_ES);
+		modmenu(hmenu, 5, IDM_SEGSS, OEMTEXT("SS"), CPU_SS);
 		DrawMenuBar(hwnd);
 	}
 }