--- np2/wince/w32/compiler.h	2003/12/21 16:05:26	1.10
+++ np2/wince/w32/compiler.h	2004/06/22 07:11:45	1.20
@@ -1,9 +1,13 @@
 #include	<windows.h>
+#include	<tchar.h>
 #include	<stdio.h>
 #include	<stddef.h>
 
+
 #define	BYTESEX_LITTLE
+#if !defined(OSLANG_ANK) && !defined(OSLANG_SJIS) && !defined(OSLANG_EUC) && !defined(OSLANG_UTF8) && !defined(OSLANG_UCS2) && !defined(OSLANG_UCS4)
 #define	OSLANG_SJIS
+#endif
 #define	OSLINEBREAK_CRLF
 
 
@@ -17,22 +21,27 @@ typedef	unsigned int	UINT32;
 
 #if !defined(SIZE_VGA)
 #define	SIZE_QVGA
+#if !defined(SIZE_VGATEST)
 #define	RGB16			UINT32
-#define	SUPPORT_SOFTKBD
 #endif
+#define	SUPPORT_SOFTKBD		1
+#endif
+
 
 // for RISC test
 #define	REG8		UINT
 #define REG16		UINT
-#define	LOW12(a)				((((UINT)(a)) << 20) >> 20)
-#define	LOW14(a)				((((UINT)(a)) << 18) >> 18)
-#define	LOW15(a)				((((UINT)(a)) << 17) >> 17)
+#define	LOW12(a)				(((UINT32)((a) << 20)) >> 20)
+#define	LOW14(a)				(((UINT32)((a) << 18)) >> 18)
+#define	LOW15(a)				(((UINT32)((a) << 17)) >> 17)
 #define	LOW16(a)				((UINT16)(a))
 #define	HIGH16(a)				(((UINT32)(a)) >> 16)
 
 
 #include	"common.h"
+#include	"oemtext.h"
 #include	"milstr.h"
+#include	"ucscnv.h"
 #include	"_memory.h"
 #include	"rect.h"
 #include	"lstarray.h"
@@ -40,13 +49,22 @@ typedef	unsigned int	UINT32;
 
 
 #define	GETTICK()	GetTickCount()
+#if defined(UNICODE)
+#define	SPRINTF		sprintf
+#define	STRLEN		strlen
+#else
 #define	SPRINTF		wsprintf
+#define	STRLEN		lstrlen
+#endif
 #define	__ASSERT(s)
 
 #define	VERMOUTH_LIB
 #define SOUND_CRITICAL
 
 #define	SUPPORT_SJIS
+#if defined(OSLANG_UTF8)
+#define	SUPPORT_UTF8
+#endif
 
 #define	SUPPORT_16BPP
 #define	MEMOPTIMIZE		2
@@ -55,5 +73,9 @@ typedef	unsigned int	UINT32;
 
 #define	SCREEN_BPP		16
 
+#define	SUPPORT_HOSTDRV
+#define	SUPPORT_CRT15KHZ
+#define	SUPPORT_SWSEEKSND
+
 #define	CPUSTRUC_MEMWAIT