--- np2/win9x/oemtext.cpp 2005/03/19 20:46:07 1.3 +++ np2/win9x/oemtext.cpp 2005/03/20 06:09:16 1.4 @@ -1,7 +1,8 @@ #include "compiler.h" +#include "oemtext.h" #if defined(OSLANG_UTF8) -UINT oemtext_sjistooem(char *dst, UINT dcnt, const char *src, UINT scnt) { +UINT oemtext_sjistooem(OEMCHAR *dst, UINT dcnt, const char *src, UINT scnt) { UINT leng; UINT16 *ucs2; @@ -23,7 +24,7 @@ UINT oemtext_sjistooem(char *dst, UINT d return(ret); } -UINT oemtext_oemtosjis(char *dst, UINT dcnt, const char *src, UINT scnt) { +UINT oemtext_oemtosjis(char *dst, UINT dcnt, const OEMCHAR *src, UINT scnt) { UINT leng; UINT16 *ucs2; @@ -44,5 +45,15 @@ UINT oemtext_oemtosjis(char *dst, UINT d _MFREE(ucs2); return(ret); } +#elif defined(OSLANG_UCS2) +UINT oemtext_sjistooem(OEMCHAR *dst, UINT dcnt, const char *src, UINT scnt) { + + return(MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, src, -1, dst, dcnt)); +} + +UINT oemtext_oemtosjis(char *dst, UINT dcnt, const OEMCHAR *src, UINT scnt) { + + return(WideCharToMultiByte(CP_ACP, 0, src, -1, dst, dcnt, NULL, NULL)); +} #endif