--- np2/win9x/oemtext.h	2005/02/14 06:25:31	1.2
+++ np2/win9x/oemtext.h	2005/04/01 15:35:49	1.5
@@ -1,19 +1,91 @@
 
+#include	"codecnv.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+UINT oemtext_sjistoucs2(UINT16 *dst, UINT dcnt, const char *src, UINT scnt);
+UINT oemtext_ucs2tosjis(char *dst, UINT dcnt, const UINT16 *src, UINT scnt);
+UINT oemtext_sjistoutf8(char *dst, UINT dcnt, const char *src, UINT scnt);
+UINT oemtext_utf8tosjis(char *dst, UINT dcnt, const char *src, UINT scnt);
+
+#ifdef __cplusplus
+}
+#endif
+
 #if defined(OSLANG_UTF8)
-UINT oemtext_sjistooem(OEMCHAR *dst, UINT dcnt, const char *src, UINT scnt);
-UINT oemtext_oemtosjis(char *dst, UINT dcnt, const OEMCHAR *src, UINT scnt);
+#define oemtext_sjistooem		oemtext_sjistoutf8
+#define	oemtext_oemtosjis		oemtext_utf8tosjis
 #elif defined(OSLANG_UCS2)
-#define oemtext_sjistooem(dst, dcnt, src, scnt) \
-			MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, src, -1, dst, dcnt)
-#define oemtext_oemtosjis(dst, dcnt, src, scnt) \
-			WideCharToMultiByte(CP_ACP, 0, src, -1, dst, dcnt, NULL, NULL)
+#define oemtext_sjistooem		oemtext_sjistoucs2
+#define	oemtext_oemtosjis		oemtext_ucs2tosjis
 #endif
 
-#ifdef __cplusplus
-}
+
+// ---- WindowsÍÑ TCHAR-OEMCHARÊÑ´¹
+
+#undef OEMCHAR_SAME_TCHAR
+
+#if !defined(_UNICODE) && defined(OSLANG_UCS2)
+#define	tchartooem		oemtext_sjistoucs2
+#define	oemtotchar		oemtext_ucs2tosjis
+#elif !defined(_UNICODE) && defined(OSLANG_UTF8)
+#define	tchartooem		oemtext_sjistoutf8
+#define	oemtotchar		oemtext_utf8tosjis
+#elif defined(_UNICODE) && (defined(OSLANG_ANK) || defined(OSLANG_SJIS))
+#define tchartooem		oemtext_ucs2tosjis
+#define oemtotchar		oemtext_sjistoucs2
+#elif defined(_UNICODE) && defined(OSLANG_UTF8)
+#define	tchartooem		codecnv_ucs2toutf8
+#define	oemtotchar		codecnv_utf8toucs2
+#else
+#define OEMCHAR_SAME_TCHAR
+#endif
+
+
+// ---- strres
+
+#if defined(OEMCHAR_SAME_TCHAR)
+
+#define	tchar_null		str_null
+#define	tchar_d			str_d
+#define	tchar_u			str_u
+#define	tchar_2x		str_2x
+#define	tchar_2d		str_2d
+#define	tchar_4X		str_4X
+#define	tchar_bmp		str_bmp
+#define	tchar_d88		str_d88
+#define	tchar_thd		str_thd
+#define	tchar_hdd		str_hdd
+
+#else
+
+extern const TCHAR tchar_null[];
+extern const TCHAR tchar_d[];
+extern const TCHAR tchar_u[];
+extern const TCHAR tchar_2x[];
+extern const TCHAR tchar_2d[];
+extern const TCHAR tchar_4X[];
+extern const TCHAR tchar_bmp[];
+extern const TCHAR tchar_d88[];
+extern const TCHAR tchar_thd[];
+extern const TCHAR tchar_hdd[];
+
+#endif
+
+
+// ---- milstr
+
+#if defined(OEMCHAR_SAME_TCHAR)
+
+#define	miltchar_solveHEX(s)	milstr_solveHEX(s)
+#define	miltchar_solveINT(s)	milstr_solveINT(s)
+
+#else
+
+long STRCALL miltchar_solveHEX(const TCHAR *str);
+long STRCALL miltchar_solveINT(const TCHAR *str);
+
 #endif