--- np2/wince/np2.cpp	2004/02/18 06:52:34	1.13
+++ np2/wince/np2.cpp	2004/06/14 13:35:40	1.16
@@ -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");
@@ -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
 				}
 			}
@@ -346,9 +344,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 +384,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	TRACEINIT();
 
 	inputmng_init();
-	keystat_reset();
+	keystat_initialize();
 
 //	if (!hPreInst) {
 		np2.style = CS_HREDRAW | CS_VREDRAW;