--- np2/wince/np2.cpp	2004/08/16 07:47:18	1.20
+++ np2/wince/np2.cpp	2005/03/24 04:40:33	1.23
@@ -5,6 +5,9 @@
 #endif
 #include	"resource.h"
 #include	"strres.h"
+#if defined(UNICODE) && defined(OSLANG_UTF8)
+#include	"codecnv.h"
+#endif
 #include	"np2.h"
 #include	"dosio.h"
 #include	"commng.h"
@@ -36,8 +39,8 @@
 #include	"softkbd.h"
 
 
-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, 0, 0, 0,
@@ -67,7 +70,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);
@@ -75,12 +78,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);
@@ -88,31 +91,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));
+	ret = statsave_check(path, buf, NELEMENTS(buf));
 	if (ret & (~STATFLAG_DISKCHG)) {
-		menumbox("Couldn't restart", title, MBOX_OK | MBOX_ICONSTOP);
+		menumbox(OEMTEXT("Couldn't restart"), title, MBOX_OK | MBOX_ICONSTOP);
 		id = DID_NO;
 	}
 	else if ((!force) && (ret & STATFLAG_DISKCHG)) {
-		SPRINTF(buf2, "Conflict!\n\n%s\nContinue?", buf);
+		OEMSPRINTF(buf2, OEMTEXT("Conflict!\n\n%s\nContinue?"), buf);
 		id = menumbox(buf2, title, MBOX_YESNOCAN | MBOX_ICONQUESTION);
 	}
 	if (id == DID_YES) {
@@ -322,14 +325,14 @@ static DWORD _GetModuleFileName(HMODULE 
 	}
 	return(nSize);
 }
-#elif defined(OSLANG_UTF8)
+#elif defined(UNICODE) && defined(OSLANG_UTF8)
 static DWORD _GetModuleFileName(HMODULE hModule,
 										OEMCHAR *lpFileName, DWORD nSize) {
 
 	UINT16	ucs2[MAX_PATH];
 
 	GetModuleFileName(hModule, ucs2, NELEMENTS(ucs2));
-	nSize = ucscnv_ucs2toutf8(lpFileName, nSize, ucs2, (UINT)-1);
+	nSize = codecnv_ucs2toutf8(lpFileName, nSize, ucs2, (UINT)-1);
 	if (nSize) {
 		nSize--;
 	}
@@ -368,7 +371,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		return(0);
 	}
 
-	_GetModuleFileName(NULL, modulefile, sizeof(modulefile));
+	_GetModuleFileName(NULL, modulefile, NELEMENTS(modulefile));
 	dosio_init();
 	file_setcd(modulefile);
 	initload();
@@ -429,7 +432,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;