--- np2/win9x/debuguty/viewer.h	2003/10/16 17:59:09	1.1.1.1
+++ np2/win9x/debuguty/viewer.h	2005/03/20 08:58:19	1.6
@@ -1,9 +1,10 @@
+
 #define	NP2VIEW_MAX	8
 
 typedef struct {
-	BYTE	vram;
-	BYTE	itf;
-	BYTE	A20;
+	UINT8	vram;
+	UINT8	itf;
+	UINT8	A20;
 } VIEWMEM_T;
 
 enum {
@@ -22,13 +23,13 @@ enum {
 	ALLOCTYPE_ASM,
 	ALLOCTYPE_SND,
 
-	ALOOCTYPE_ERROR = 0xffffffff
+	ALLOCTYPE_ERROR = 0xffffffff
 };
 
 typedef struct {
-	DWORD	type;
-	DWORD	arg;
-	DWORD	size;
+	UINT32	type;
+	UINT32	arg;
+	UINT32	size;
 	void	*ptr;
 } VIEWMEMBUF;
 
@@ -36,21 +37,22 @@ typedef struct {
 	HWND		hwnd;
 	VIEWMEMBUF	buf1;
 	VIEWMEMBUF	buf2;
-	DWORD		pos;
-	DWORD		maxline;
-	WORD		step;
-	WORD		mul;
-	BYTE		alive;
-	BYTE		type;
-	BYTE		lock;
-	BYTE		active;
-	WORD		seg;
-	WORD		off;
+	UINT32		pos;
+	UINT32		maxline;
+	UINT16		step;
+	UINT16		mul;
+	UINT8		alive;
+	UINT8		type;
+	UINT8		lock;
+	UINT8		active;
+	UINT16		seg;
+	UINT16		off;
 	VIEWMEM_T	dmem;
 	SCROLLINFO	si;
 } NP2VIEW_T;
 
-extern	NP2VIEW_T	np2view[NP2VIEW_MAX];
+extern	const TCHAR		np2viewfont[];
+extern	NP2VIEW_T		np2view[NP2VIEW_MAX];
 
 
 BOOL viewer_init(HINSTANCE hPreInst);