--- np2/win9x/compiler.h	2004/06/02 11:02:54	1.20
+++ np2/win9x/compiler.h	2005/02/09 20:11:35	1.23
@@ -2,16 +2,24 @@
 #define	_WIN32_IE	0x0200
 
 #include	<windows.h>
+#include	<tchar.h>
 #include	<stdio.h>
 #include	<stddef.h>
 #include	<setjmp.h>
+#if defined(TRACE)
+#include	<assert.h>
+#endif
 
 #define	BYTESEX_LITTLE
+#if !defined(UNICODE)
 #define	OSLANG_SJIS
+#else
+#define	OSLANG_UCS2
+#endif
 #define	OSLINEBREAK_CRLF
 
-
 #ifndef __GNUC__
+typedef signed int			SINT;
 typedef signed char			SINT8;
 typedef unsigned char		UINT8;
 typedef	signed short		SINT16;
@@ -48,18 +56,35 @@ typedef signed __int64		SINT64;
 #define	siglongjmp(env, val)	longjmp(env, val)
 #define	msgbox(title, msg)		MessageBox(NULL, msg, title, MB_OK)
 
+#define	STRCALL		__stdcall
+
+#define	BRESULT				UINT8
+#define	OEMCHAR				TCHAR
+#define	OEMTEXT(string)		_T(string)
+#define	OEMSPRINTF			wsprintf
+#define	OEMSTRLEN			lstrlen
 
 #include	"common.h"
 #include	"milstr.h"
 #include	"_memory.h"
+#include	"trace.h"
 #include	"rect.h"
 #include	"lstarray.h"
-#include	"trace.h"
 
 
 #define	GETTICK()			GetTickCount()
-#define	SPRINTF				wsprintf
+#if defined(TRACE)
+#define	__ASSERT(s)			assert(s)
+#else
 #define	__ASSERT(s)
+#endif
+#if defined(UNICODE)
+#define	SPRINTF				sprintf
+#define	STRLEN				strlen
+#else
+#define	SPRINTF				wsprintf
+#define	STRLEN				lstrlen
+#endif
 
 #define	LABEL				__declspec(naked)
 #define RELEASE(x) 			if (x) {(x)->Release(); (x) = NULL;}
@@ -76,7 +101,11 @@ typedef signed __int64		SINT64;
 #define	VRAMCALL	__fastcall
 #define	SCRNCALL	__fastcall
 
+#if !defined(UNICODE)
 #define	SUPPORT_SJIS
+#else
+#define	SUPPORT_ANK
+#endif
 
 #define	SUPPORT_8BPP
 #define	SUPPORT_16BPP
@@ -92,7 +121,7 @@ typedef signed __int64		SINT64;
 #endif
 #define	SUPPORT_CRT15KHZ
 #define	SUPPORT_PC9861K
-// #define	SUPPORT_SOFTKBD		0
+#define	SUPPORT_SOFTKBD		0
 #define	SUPPORT_S98
 #define	SUPPORT_KEYDISP
 #define	SUPPORT_MEMDBG32