--- np2/wince/np2.cpp	2003/12/26 23:30:26	1.9
+++ np2/wince/np2.cpp	2005/04/01 15:35:50	1.24
@@ -6,6 +6,7 @@
 #include	"resource.h"
 #include	"strres.h"
 #include	"np2.h"
+#include	"oemtext.h"
 #include	"dosio.h"
 #include	"commng.h"
 #include	"inputmng.h"
@@ -29,31 +30,29 @@
 #include	"fddfile.h"
 #include	"font.h"
 #include	"timing.h"
-#include	"statsave.h"
+#include	"keystat.h"
 #include	"vramhdl.h"
 #include	"menubase.h"
 #include	"sysmenu.h"
-#if defined(SUPPORT_SOFTKBD)
 #include	"softkbd.h"
-#endif
 
 
-static const TCHAR szAppCaption[] = STRLITERAL("Neko Project II");
-static const TCHAR szClassName[] = STRLITERAL("NP2-MainWindow");
+static const TCHAR szAppCaption[] = _T("Neko Project II");
+static const TCHAR szClassName[] = _T("NP2-MainWindow");
 
 
-		NP2OSCFG	np2oscfg = {0, 2, 0, 0,
+		NP2OSCFG	np2oscfg = {0, 0, 0, 0,
 #if !defined(GX_DLL)
 								CW_USEDEFAULT, CW_USEDEFAULT,
 #endif
 #if defined(WIN32_PLATFORM_PSPC)
 								0, 0,
 #endif
-							};
+								0};
 		HWND		hWndMain;
 		HINSTANCE	hInst;
 		HINSTANCE	hPrev;
-		char		modulefile[MAX_PATH];
+		OEMCHAR		modulefile[MAX_PATH];
 		GXKeyList	gx_keylist;
 
 enum {
@@ -69,7 +68,7 @@ static	UINT		framemax = 1;
 
 // ---- resume
 
-static void getstatfilename(char *path, const char *ext, int size) {
+static void getstatfilename(OEMCHAR *path, const OEMCHAR *ext, int size) {
 
 	file_cpyname(path, modulefile, size);
 	file_cutext(path);
@@ -77,12 +76,12 @@ static void getstatfilename(char *path, 
 	file_catname(path, ext, size);
 }
 
-static int flagsave(const char *ext) {
+static int flagsave(const OEMCHAR *ext) {
 
 	int		ret;
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
-	getstatfilename(path, ext, sizeof(path));
+	getstatfilename(path, ext, NELEMENTS(path));
 	ret = statsave_save(path);
 	if (ret) {
 		file_delete(path);
@@ -90,31 +89,31 @@ static int flagsave(const char *ext) {
 	return(ret);
 }
 
-static void flagdelete(const char *ext) {
+static void flagdelete(const OEMCHAR *ext) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
-	getstatfilename(path, ext, sizeof(path));
+	getstatfilename(path, ext, NELEMENTS(path));
 	file_delete(path);
 }
 
-static int flagload(const char *ext, const char *title, BOOL force) {
+static int flagload(const OEMCHAR *ext, const OEMCHAR *title, BOOL force) {
 
 	int		ret;
 	int		id;
-	char	path[MAX_PATH];
-	char	buf[1024];
-	char	buf2[1024 + 256];
+	OEMCHAR	path[MAX_PATH];
+	OEMCHAR	buf[1024];
+	OEMCHAR	buf2[1024 + 256];
 
-	getstatfilename(path, ext, sizeof(path));
+	getstatfilename(path, ext, NELEMENTS(path));
 	id = DID_YES;
-	ret = statsave_check(path, buf, sizeof(buf));
-	if (ret & (~NP2FLAG_DISKCHG)) {
-		menumbox("Couldn't restart", title, MBOX_OK | MBOX_ICONSTOP);
+	ret = statsave_check(path, buf, NELEMENTS(buf));
+	if (ret & (~STATFLAG_DISKCHG)) {
+		menumbox(OEMTEXT("Couldn't restart"), title, MBOX_OK | MBOX_ICONSTOP);
 		id = DID_NO;
 	}
-	else if ((!force) && (ret & NP2FLAG_DISKCHG)) {
-		SPRINTF(buf2, "Conflict!\n\n%s\nContinue?", buf);
+	else if ((!force) && (ret & STATFLAG_DISKCHG)) {
+		OEMSPRINTF(buf2, OEMTEXT("Conflict!\n\n%s\nContinue?"), buf);
 		id = menumbox(buf2, title, MBOX_YESNOCAN | MBOX_ICONQUESTION);
 	}
 	if (id == DID_YES) {
@@ -177,7 +176,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 			winkbd_keyup(wParam, lParam);
 			break;
 
-#if !defined(_WIN32_WCE)
+#if 1 // !defined(_WIN32_WCE)
 		case WM_SYSKEYDOWN:
 			winkbd_keydown(wParam, lParam);
 			break;
@@ -200,7 +199,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 				if (menuvram) {
 					menubase_moving(LOWORD(lParam), HIWORD(lParam), 1);
 				}
-				else {
+				else if (scrnmng_kbdpos(&lParam) == SUCCESS) {
 #if defined(SUPPORT_SOFTKBD)
 					softkbd_down(LOWORD(lParam), HIWORD(lParam));
 #endif
@@ -210,23 +209,15 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 
 		case WM_LBUTTONUP:
 			if (scrnmng_mousepos(&lParam) == SUCCESS) {
-
 #if defined(SUPPORT_SOFTKBD)
 				softkbd_up();
+#endif
 				if (menuvram) {
 					menubase_moving(LOWORD(lParam), HIWORD(lParam), 2);
 				}
-				else if ((LOWORD(lParam) < 32) && (HIWORD(lParam) >= 208)) {
-					sysmenu_menuopen(0, LOWORD(lParam), HIWORD(lParam));
-				}
-#else
-				if (menuvram) {
-					menubase_moving(LOWORD(lParam), HIWORD(lParam), 2);
-				}
-				else {
+				else if (scrnmng_ismenu(lParam)) {
 					sysmenu_menuopen(0, LOWORD(lParam), HIWORD(lParam));
 				}
-#endif
 			}
 			break;
 
@@ -318,37 +309,17 @@ static void processwait(UINT cnt) {
 
 // ----
 
-#if !defined(UNICODE)
-#define	GetModuleFileName_A(a, b, c)	GetModuleFileName(a, b, c)
+#if defined(_WIN32_WCE)
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
+										LPWSTR lpszCmdLine, int nCmdShow)
+#elif defined(UNICODE)
+int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
+										LPSTR lpszCmdLine, int nCmdShow)
 #else
-static DWORD GetModuleFileName_A(HMODULE hModule,
-								LPSTR lpFileName, DWORD nSize) {
-
-	TCHAR	*FileNameW;
-	DWORD	len;
-
-	if (nSize) {
-		FileNameW = (TCHAR *)_MALLOC(nSize * sizeof(TCHAR), "ModuleFile");
-		if (FileNameW) {
-			len = GetModuleFileName(hModule, FileNameW, nSize);
-			nSize = WideCharToMultiByte(CP_ACP, 0, FileNameW, -1,
-										lpFileName, nSize, NULL, NULL);
-			if (nSize) {
-				nSize--;
-			}
-			_MFREE(FileNameW);
-		}
-		else {
-			nSize = 0;
-		}
-	}
-	return(nSize);
-}
-#endif
-
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
-										LPTSTR lpszCmdLine, int nCmdShow) {
-
+										LPSTR lpszCmdLine, int nCmdShow)
+#endif
+{
 	HWND		hWnd;
 	WNDCLASS	np2;
 	int			id;
@@ -366,7 +337,13 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		return(0);
 	}
 
-	GetModuleFileName_A(NULL, modulefile, sizeof(modulefile));
+#if defined(OEMCHAR_SAME_TCHAR)
+	GetModuleFileName(NULL, modulefile, NELEMENTS(modulefile));
+#else
+	TCHAR _modulefile[MAX_PATH];
+	GetModuleFileName(NULL, _modulefile, NELEMENTS(_modulefile));
+	tchartooem(modulefile, NELEMENTS(modulefile), _modulefile, (UINT)-1);
+#endif
 	dosio_init();
 	file_setcd(modulefile);
 	initload();
@@ -378,7 +355,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	TRACEINIT();
 
 	inputmng_init();
-	keystat_reset();
+	keystat_initialize();
 
 //	if (!hPreInst) {
 		np2.style = CS_HREDRAW | CS_VREDRAW;
@@ -427,7 +404,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	}
 	if (scrnmng_create(hWnd, FULLSCREEN_WIDTH, FULLSCREEN_HEIGHT)
 																!= SUCCESS) {
-		MessageBox(hWnd, STRLITERAL("Couldn't create DirectDraw Object"),
+		MessageBox(hWnd, _T("Couldn't create DirectDraw Object"),
 									szAppCaption, MB_OK | MB_ICONSTOP);
 		DestroyWindow(hWnd);
 		goto np2main_err2;
@@ -473,7 +450,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			if (!GetMessage(&msg, NULL, 0, 0)) {
 				break;
 			}
-#if !defined(_WIN32_WCE)
+#if 1 // !defined(_WIN32_WCE)
 			if ((msg.hwnd != hWnd) ||
 				((msg.message != WM_SYSKEYDOWN) &&
 				(msg.message != WM_SYSKEYUP))) {