--- np2/generic/hostdrvs.c	2004/07/15 13:48:39	1.11
+++ np2/generic/hostdrvs.c	2005/02/14 06:25:31	1.14
@@ -2,8 +2,8 @@
 
 #if defined(SUPPORT_HOSTDRV)
 
-#if defined(OSLANG_EUC)
-#include	"codecnv.h"
+#if defined(OSLANG_EUC) || defined(OSLANG_UTF8) || defined(OSLANG_UCS2)
+#include	"oemtext.h"
 #endif
 #include	"dosio.h"
 #include	"pccore.h"
@@ -13,7 +13,7 @@
 
 static const HDRVDIR hddroot = {"           ", 0, 0, 0, 0x10, {0}, {0}};
 
-static const BYTE dospathchr[] = {
+static const UINT8 dospathchr[] = {
 			0xfa, 0x23,		// '&%$#"!  /.-,+*)(
 			0xff, 0x03,		// 76543210 ?>=<;:98
 			0xff, 0xff,		// GFEDCBA@ ONMLKJIH
@@ -31,7 +31,7 @@ static void rcnvfcb(char *dst, UINT dlen
 		if (c == 0) {
 			break;
 		}
-#if defined(OSLANG_SJIS) || defined(OSLANG_EUC) || defined(OSLANG_UTF8)
+#if defined(OSLANG_SJIS) || defined(OSLANG_EUC) || defined(OSLANG_UTF8) || defined(OSLANG_UCS2)
 		if ((((c ^ 0x20) - 0xa1) & 0xff) < 0x3c) {
 			if ((!slen) || (src[0] == '\0')) {
 				break;
@@ -77,17 +77,14 @@ static void rcnvfcb(char *dst, UINT dlen
 
 static BOOL realname2fcb(char *fcbname, FLINFO *fli) {
 
-#if defined(OSLANG_EUC) || defined(OSLANG_UTF8)
+#if defined(OSLANG_EUC) || defined(OSLANG_UTF8) || defined(OSLANG_UCS2)
 	char	sjis[MAX_PATH];
 #endif
 	char	*realname;
 	char	*ext;
 
-#if defined(OSLANG_EUC)
-	codecnv_euc2sjis(sjis, sizeof(sjis), fli->path, NELEMENTS(fli->path));
-	realname = sjis;
-#elif defined(OSLANG_UTF8)
-	oemtext_oem2sjis(sjis, sizeof(sjis), fli->path, NELEMENTS(fli->path));
+#if defined(OSLANG_EUC) || defined(OSLANG_UTF8) || defined(OSLANG_UCS2)
+	oemtext_oemtosjis(sjis, sizeof(sjis), fli->path, NELEMENTS(fli->path));
 	realname = sjis;
 #else
 	realname = fli->path;
@@ -303,7 +300,7 @@ BOOL hostdrvs_newrealpath(HDRVPATH *hdp,
 	char		dosname[16];
 	UINT		i;
 	char		*p;
-#if defined(OSLANG_EUC) || defined(OSLANG_UTF8)
+#if defined(OSLANG_EUC) || defined(OSLANG_UTF8) || defined(OSLANG_UCS2)
 	OEMCHAR		oemname[64];
 #endif
 
@@ -334,11 +331,8 @@ BOOL hostdrvs_newrealpath(HDRVPATH *hdp,
 		}
 		*p = '\0';
 		// ここで SJIS->OEMコードに未変換！
-#if defined(OSLANG_EUC)
-		codecnv_sjis2euc(oemname, NELEMENTS(oemname), dosname, (UINT)-1);
-		file_catname(path, oemname, NELEMENTS(path));
-#elif defined(OSLANG_UTF8)
-		oemtext_sjis2oem(oemname, NELEMENTS(oemname), dosname, (UINT)-1);
+#if defined(OSLANG_EUC) || defined(OSLANG_UTF8) || defined(OSLANG_UCS2)
+		oemtext_sjistooem(oemname, NELEMENTS(oemname), dosname, (UINT)-1);
 		file_catname(path, oemname, NELEMENTS(path));
 #else
 		file_catname(path, dosname, NELEMENTS(path));