--- np2/win9x/np2.h	2003/10/28 18:21:05	1.3
+++ np2/win9x/np2.h	2004/05/23 15:01:45	1.16
@@ -25,7 +25,6 @@ typedef struct {
 
 	BYTE	background;
 	BYTE	DISPCLK;
-
 	BYTE	KEYBOARD;
 	BYTE	F12COPY;
 
@@ -53,16 +52,18 @@ typedef struct {
 	BYTE	resume;													// ver0.30
 	BYTE	statsave;
 	BYTE	disablemmx;
+	BYTE	wintype;
 	BYTE	toolwin;
+	BYTE	keydisp;
 	BYTE	I286SAVE;
 	BYTE	hostdrv_write;
+	BYTE	jastsnd;
+	BYTE	useromeo;
+	BYTE	thickframe;
 } NP2OSCFG;
 
 
 enum {
-	SCREEN_WBASE		= 80,
-	SCREEN_HBASE		= 50,
-	SCREEN_DEFMUL		= 8,
 	FULLSCREEN_WIDTH	= 640,
 	FULLSCREEN_HEIGHT	= 480
 };
@@ -74,20 +75,19 @@ enum {
 
 enum {
 	IDM_TOOLWIN			= 20000,
-	IDM_SCREENCENTER	= 20001,
-	IDM_SNAPENABLE		= 20002,
-	IDM_BACKGROUND		= 20003,
-	IDM_BGSOUND			= 20004,
-	IDM_TRACEONOFF		= 20005,
-	IDM_MEMORYDUMP		= 20006,
-	IDM_KEYDISP			= 20007,
-	IDM_DEBUGUTY		= 20008,
-	IDM_VIEWER			= 20009,
-
-	IDM_FLAGSAVE		= 20100,
-	IDM_FLAGLOAD		= 20150,
+	IDM_KEYDISP			= 20001,
+	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			= 20200,					// ver0.26
+	IDM_SCRNMUL			= 20050,
 	IDM_SCRNMUL4		= (IDM_SCRNMUL + 4),
 	IDM_SCRNMUL6		= (IDM_SCRNMUL + 6),
 	IDM_SCRNMUL8		= (IDM_SCRNMUL + 8),
@@ -95,6 +95,9 @@ enum {
 	IDM_SCRNMUL12		= (IDM_SCRNMUL + 12),
 	IDM_SCRNMUL16		= (IDM_SCRNMUL + 16),
 
+	IDM_FLAGSAVE		= 20100,
+	IDM_FLAGLOAD		= 20150,
+
 	WM_NP2CMD			= (WM_USER + 200),
 	WM_SSTP				= (WM_USER + 201)
 };
@@ -118,11 +121,12 @@ extern	HINSTANCE	hInst;
 extern	HINSTANCE	hPrev;
 extern	int			mmxflag;
 extern	BYTE		np2break;
+extern	BOOL		winui_en;
+
 extern	char		modulefile[MAX_PATH];
 extern	char		fddfolder[MAX_PATH];
 extern	char		hddfolder[MAX_PATH];
 extern	char		bmpfilefolder[MAX_PATH];
-extern	char		mimpideffile[MAX_PATH];
 
 void np2active_renewal(void);