--- np2/win9x/oemtext.cpp 2005/03/20 06:09:16 1.4 +++ np2/win9x/oemtext.cpp 2005/03/20 13:12:49 1.5 @@ -1,6 +1,7 @@ #include "compiler.h" #include "oemtext.h" + #if defined(OSLANG_UTF8) UINT oemtext_sjistooem(OEMCHAR *dst, UINT dcnt, const char *src, UINT scnt) { @@ -19,7 +20,7 @@ UINT oemtext_sjistooem(OEMCHAR *dst, UIN return(0); } MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, src, -1, ucs2, leng); - ret = ucscnv_ucs2toutf8(dst, dcnt, ucs2, leng); + ret = codecnv_ucs2toutf8(dst, dcnt, ucs2, leng); _MFREE(ucs2); return(ret); } @@ -32,7 +33,7 @@ UINT oemtext_oemtosjis(char *dst, UINT d (void)scnt; - leng = ucscnv_utf8toucs2(NULL, 0, src, (UINT)-1); + leng = codecnv_utf8toucs2(NULL, 0, src, (UINT)-1); if (leng == 0) { return(0); } @@ -40,7 +41,7 @@ UINT oemtext_oemtosjis(char *dst, UINT d if (ucs2 == NULL) { return(0); } - ucscnv_utf8toucs2(ucs2, leng, src, (UINT)-1); + codecnv_utf8toucs2(ucs2, leng, src, (UINT)-1); ret = WideCharToMultiByte(CP_ACP, 0, ucs2, leng, dst, dcnt, NULL, NULL); _MFREE(ucs2); return(ret);