--- np2/wince/np2.h	2003/11/24 11:46:54	1.1
+++ np2/wince/np2.h	2005/02/11 21:17:23	1.7
@@ -1,23 +1,48 @@
 
 typedef struct {
-	BYTE	NOWAIT;
-	BYTE	DRAW_SKIP;
-	BYTE	F12KEY;
-	BYTE	resume;
+	UINT8	NOWAIT;
+	UINT8	DRAW_SKIP;
+	UINT8	F12KEY;
+	UINT8	resume;
+
+#if !defined(GX_DLL)
+	int		winx;
+	int		winy;
+#endif
+#if defined(WIN32_PLATFORM_PSPC)
+	UINT8	bindcur;
+	UINT8	bindbtn;
+#endif
+
+	UINT8	jastsnd;
 } NP2OSCFG;
 
 
 #if defined(SIZE_QVGA)
+#if defined(SUPPORT_SOFTKBD)
 enum {
 	FULLSCREEN_WIDTH	= 320,
 	FULLSCREEN_HEIGHT	= 240
 };
 #else
 enum {
+	FULLSCREEN_WIDTH	= 320,
+	FULLSCREEN_HEIGHT	= 200
+};
+#endif
+#else
+#if defined(SUPPORT_SOFTKBD)
+enum {
+	FULLSCREEN_WIDTH	= 640,
+	FULLSCREEN_HEIGHT	= 480
+};
+#else
+enum {
 	FULLSCREEN_WIDTH	= 640,
 	FULLSCREEN_HEIGHT	= 400
 };
 #endif
+#endif
 
 enum {
 	WM_NP2CMD			= (WM_USER + 200)
@@ -41,5 +66,5 @@ extern	NP2OSCFG	np2oscfg;
 extern	HWND		hWndMain;
 extern	HINSTANCE	hInst;
 extern	HINSTANCE	hPrev;
-extern	char		modulefile[MAX_PATH];
+extern	OEMCHAR		modulefile[MAX_PATH];