--- np2/win9x/np2.h	2005/02/16 09:31:55	1.20
+++ np2/win9x/np2.h	2007/11/11 07:11:27	1.26
@@ -1,4 +1,16 @@
 
+#if !defined(SUPPORT_PC9821)
+#define PROJECTNAME			"Neko Project II"
+#else
+#define PROJECTNAME			"Neko Project 21"
+#endif
+
+#if !defined(_WIN64)
+#define PROJECTSUBNAME		""
+#else
+#define PROJECTSUBNAME		" x64"
+#endif
+
 typedef struct {
 	UINT8	port;
 	UINT8	def_en;
@@ -18,6 +30,8 @@ typedef struct {
 	int		winy;
 	UINT	paddingx;
 	UINT	paddingy;
+	UINT	fscrn_cx;
+	UINT	fscrn_cy;
 	UINT8	force400;
 	UINT8	WINSNAP;
 	UINT8	NOWAIT;
@@ -51,7 +65,9 @@ typedef struct {
 
 	UINT8	resume;													// ver0.30
 	UINT8	statsave;
+#if !defined(_WIN64)
 	UINT8	disablemmx;
+#endif
 	UINT8	wintype;
 	UINT8	toolwin;
 	UINT8	keydisp;
@@ -62,6 +78,7 @@ typedef struct {
 	UINT8	thickframe;
 	UINT8	xrollkey;
 	UINT8	fscrnbpp;
+	UINT8	fscrnmod;
 } NP2OSCFG;
 
 
@@ -76,30 +93,6 @@ enum {
 };
 
 enum {
-	IDM_TOOLWIN			= 20000,
-	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			= 20050,
-	IDM_SCRNMUL4		= (IDM_SCRNMUL + 4),
-	IDM_SCRNMUL6		= (IDM_SCRNMUL + 6),
-	IDM_SCRNMUL8		= (IDM_SCRNMUL + 8),
-	IDM_SCRNMUL10		= (IDM_SCRNMUL + 10),
-	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,12 +111,14 @@ enum {
 
 
 extern	NP2OSCFG	np2oscfg;
-extern	HWND		hWndMain;
-extern	HINSTANCE	hInst;
-extern	HINSTANCE	hPrev;
-extern	int			mmxflag;
+extern	HWND		g_hWndMain;
+extern	HINSTANCE	g_hInstance;
+extern	HINSTANCE	g_hPrevInst;
 extern	UINT8		np2break;
 extern	BOOL		winui_en;
+#if !defined(_WIN64)
+extern	int			mmxflag;
+#endif
 
 extern	OEMCHAR		modulefile[MAX_PATH];
 extern	OEMCHAR		fddfolder[MAX_PATH];