--- np2/win9x/np2.h	2003/11/04 15:44:59	1.7
+++ np2/win9x/np2.h	2005/02/07 14:46:14	1.18
@@ -1,8 +1,8 @@
 
 typedef struct {
-	BYTE	port;
-	BYTE	def_en;
-	BYTE	param;
+	UINT8	port;
+	UINT8	def_en;
+	UINT8	param;
 	UINT32	speed;
 	char	mout[MAXPNAMELEN];
 	char	min[MAXPNAMELEN];
@@ -18,21 +18,20 @@ typedef struct {
 	int		winy;
 	UINT	paddingx;
 	UINT	paddingy;
-	BYTE	force400;
-	BYTE	WINSNAP;
-	BYTE	NOWAIT;
-	BYTE	DRAW_SKIP;
-
-	BYTE	background;
-	BYTE	DISPCLK;
-
-	BYTE	KEYBOARD;
-	BYTE	F12COPY;
-
-	BYTE	MOUSE_SW;
-	BYTE	JOYPAD1;
-	BYTE	JOYPAD2;
-	BYTE	JOY1BTN[4];
+	UINT8	force400;
+	UINT8	WINSNAP;
+	UINT8	NOWAIT;
+	UINT8	DRAW_SKIP;
+
+	UINT8	background;
+	UINT8	DISPCLK;
+	UINT8	KEYBOARD;
+	UINT8	F12COPY;
+
+	UINT8	MOUSE_SW;
+	UINT8	JOYPAD1;
+	UINT8	JOYPAD2;
+	UINT8	JOY1BTN[4];
 
 	COMCFG	mpu;
 	COMCFG	com1;
@@ -41,30 +40,31 @@ typedef struct {
 
 	UINT32	clk_color1;
 	UINT32	clk_color2;
-	BYTE	clk_x;
-	BYTE	clk_fnt;
+	UINT8	clk_x;
+	UINT8	clk_fnt;
 
-	BYTE	comfirm;
-	BYTE	shortcut;												// ver0.30
+	UINT8	comfirm;
+	UINT8	shortcut;												// ver0.30
 
-	BYTE	sstp;
+	UINT8	sstp;
 	UINT16	sstpport;												// ver0.30
 
-	BYTE	resume;													// ver0.30
-	BYTE	statsave;
-	BYTE	disablemmx;
-	BYTE	wintype;
-	BYTE	toolwin;
-	BYTE	keydisp;
-	BYTE	I286SAVE;
-	BYTE	hostdrv_write;
+	UINT8	resume;													// ver0.30
+	UINT8	statsave;
+	UINT8	disablemmx;
+	UINT8	wintype;
+	UINT8	toolwin;
+	UINT8	keydisp;
+	UINT8	I286SAVE;
+	UINT8	hostdrv_write;
+	UINT8	jastsnd;
+	UINT8	useromeo;
+	UINT8	thickframe;
+	UINT8	xrollkey;
 } NP2OSCFG;
 
 
 enum {
-	SCREEN_WBASE		= 80,
-	SCREEN_HBASE		= 50,
-	SCREEN_DEFMUL		= 8,
 	FULLSCREEN_WIDTH	= 640,
 	FULLSCREEN_HEIGHT	= 480
 };
@@ -77,14 +77,16 @@ enum {
 enum {
 	IDM_TOOLWIN			= 20000,
 	IDM_KEYDISP			= 20001,
-	IDM_SCREENCENTER	= 20002,
-	IDM_SNAPENABLE		= 20003,
-	IDM_BACKGROUND		= 20004,
-	IDM_BGSOUND			= 20005,
-	IDM_TRACEONOFF		= 20006,
-	IDM_MEMORYDUMP		= 20007,
-	IDM_DEBUGUTY		= 20008,
-	IDM_VIEWER			= 20009,
+	IDM_SOFTKBD			= 20002,
+	IDM_MEMDBG32		= 20003,
+	IDM_SCREENCENTER	= 20004,
+	IDM_SNAPENABLE		= 20005,
+	IDM_BACKGROUND		= 20006,
+	IDM_BGSOUND			= 20007,
+	IDM_TRACEONOFF		= 20008,
+	IDM_MEMORYDUMP		= 20009,
+	IDM_DEBUGUTY		= 20010,
+	IDM_VIEWER			= 20011,
 
 	IDM_SCRNMUL			= 20050,
 	IDM_SCRNMUL4		= (IDM_SCRNMUL + 4),
@@ -96,7 +98,6 @@ enum {
 
 	IDM_FLAGSAVE		= 20100,
 	IDM_FLAGLOAD		= 20150,
-	IDM_I286SAVE		= 20200,
 
 	WM_NP2CMD			= (WM_USER + 200),
 	WM_SSTP				= (WM_USER + 201)
@@ -120,7 +121,7 @@ extern	HWND		hWndMain;
 extern	HINSTANCE	hInst;
 extern	HINSTANCE	hPrev;
 extern	int			mmxflag;
-extern	BYTE		np2break;
+extern	UINT8		np2break;
 extern	BOOL		winui_en;
 
 extern	char		modulefile[MAX_PATH];