--- np2/wince/np2.cpp	2004/02/18 03:24:48	1.12
+++ np2/wince/np2.cpp	2004/06/20 02:57:47	1.17
@@ -33,9 +33,7 @@
 #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");
@@ -109,11 +107,11 @@ static int flagload(const char *ext, con
 	getstatfilename(path, ext, sizeof(path));
 	id = DID_YES;
 	ret = statsave_check(path, buf, sizeof(buf));
-	if (ret & (~NP2FLAG_DISKCHG)) {
+	if (ret & (~STATFLAG_DISKCHG)) {
 		menumbox("Couldn't restart", title, MBOX_OK | MBOX_ICONSTOP);
 		id = DID_NO;
 	}
-	else if ((!force) && (ret & NP2FLAG_DISKCHG)) {
+	else if ((!force) && (ret & STATFLAG_DISKCHG)) {
 		SPRINTF(buf2, "Conflict!\n\n%s\nContinue?", buf);
 		id = menumbox(buf2, title, MBOX_YESNOCAN | MBOX_ICONQUESTION);
 	}
@@ -202,7 +200,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 				}
 				else {
 #if defined(SUPPORT_SOFTKBD)
-					softkbd_down(LOWORD(lParam), HIWORD(lParam));
+					softkbd_down(LOWORD(lParam), HIWORD(lParam) - 200);
 #endif
 				}
 			}
@@ -331,8 +329,12 @@ static DWORD GetModuleFileName_A(HMODULE
 		FileNameW = (TCHAR *)_MALLOC(nSize * sizeof(TCHAR), "ModuleFile");
 		if (FileNameW) {
 			len = GetModuleFileName(hModule, FileNameW, nSize);
+#if defined(OSLANG_SJIS)
 			nSize = WideCharToMultiByte(CP_ACP, 0, FileNameW, -1,
 										lpFileName, nSize, NULL, NULL);
+#else
+			nSize = ucscnv_ucs2toutf8(lpFileName, (UINT)-1, FileNameW, nSize);
+#endif
 			if (nSize) {
 				nSize--;
 			}
@@ -346,9 +348,17 @@ static DWORD GetModuleFileName_A(HMODULE
 }
 #endif
 
+#if defined(_WIN32_WCE)
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
-										LPTSTR lpszCmdLine, int nCmdShow) {
-
+										LPWSTR lpszCmdLine, int nCmdShow)
+#elif defined(UNICODE)
+int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
+										LPSTR lpszCmdLine, int nCmdShow)
+#else
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
+										LPSTR lpszCmdLine, int nCmdShow)
+#endif
+{
 	HWND		hWnd;
 	WNDCLASS	np2;
 	int			id;
@@ -378,7 +388,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	TRACEINIT();
 
 	inputmng_init();
-	keystat_reset();
+	keystat_initialize();
 
 //	if (!hPreInst) {
 		np2.style = CS_HREDRAW | CS_VREDRAW;