--- np2/win9x/np2.h	2004/01/05 07:22:02	1.10
+++ np2/win9x/np2.h	2006/12/24 00:52:29	1.21
@@ -1,37 +1,37 @@
 
 typedef struct {
-	BYTE	port;
-	BYTE	def_en;
-	BYTE	param;
+	UINT8	port;
+	UINT8	def_en;
+	UINT8	param;
 	UINT32	speed;
-	char	mout[MAXPNAMELEN];
-	char	min[MAXPNAMELEN];
-	char	mdl[64];
-	char	def[MAX_PATH];
+	OEMCHAR	mout[MAXPNAMELEN];
+	OEMCHAR	min[MAXPNAMELEN];
+	OEMCHAR	mdl[64];
+	OEMCHAR	def[MAX_PATH];
 } COMCFG;
 
 typedef struct {
-	char	titles[256];
-	char	winid[4];
+	OEMCHAR	titles[256];
+	OEMCHAR	winid[4];
 
 	int		winx;
 	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;
@@ -40,24 +40,28 @@ 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;
-	BYTE	jastsnd;
+	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;
+	UINT8	fscrnbpp;
 } NP2OSCFG;
 
 
@@ -74,14 +78,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),
@@ -93,7 +99,6 @@ enum {
 
 	IDM_FLAGSAVE		= 20100,
 	IDM_FLAGLOAD		= 20150,
-	IDM_I286SAVE		= 20200,
 
 	WM_NP2CMD			= (WM_USER + 200),
 	WM_SSTP				= (WM_USER + 201)
@@ -116,14 +121,16 @@ extern	NP2OSCFG	np2oscfg;
 extern	HWND		hWndMain;
 extern	HINSTANCE	hInst;
 extern	HINSTANCE	hPrev;
-extern	int			mmxflag;
-extern	BYTE		np2break;
+extern	UINT8		np2break;
 extern	BOOL		winui_en;
+#if !defined(_WIN64)
+extern	int			mmxflag;
+#endif
 
-extern	char		modulefile[MAX_PATH];
-extern	char		fddfolder[MAX_PATH];
-extern	char		hddfolder[MAX_PATH];
-extern	char		bmpfilefolder[MAX_PATH];
+extern	OEMCHAR		modulefile[MAX_PATH];
+extern	OEMCHAR		fddfolder[MAX_PATH];
+extern	OEMCHAR		hddfolder[MAX_PATH];
+extern	OEMCHAR		bmpfilefolder[MAX_PATH];
 
 void np2active_renewal(void);