--- np2/win9x/dosio.cpp	2005/02/12 12:13:59	1.9
+++ np2/win9x/dosio.cpp	2005/04/01 15:35:49	1.13
@@ -1,4 +1,5 @@
 #include	"compiler.h"
+#include	"oemtext.h"
 #include	"dosio.h"
 
 
@@ -11,17 +12,23 @@ static	OEMCHAR	*curfilep = curpath;
 void dosio_init(void) { }
 void dosio_term(void) { }
 
+
 											// ファイル操作
 FILEH DOSIOCALL file_open(const OEMCHAR *path) {
 
-	FILEH	ret;
-
-	if ((ret = CreateFile(path, GENERIC_READ | GENERIC_WRITE,
-						0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL))
-													== INVALID_HANDLE_VALUE) {
-		if ((ret = CreateFile(path, GENERIC_READ,
-						0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL))
-													== INVALID_HANDLE_VALUE) {
+#if defined(OEMCHAR_SAME_TCHAR)
+	const TCHAR *tcharpath = path;
+#else
+	TCHAR tcharpath[MAX_PATH];
+	oemtotchar(tcharpath, NELEMENTS(tcharpath), path, (UINT)-1);
+#endif
+	FILEH ret;
+	ret = CreateFile(tcharpath, GENERIC_READ | GENERIC_WRITE,
+						0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (ret == INVALID_HANDLE_VALUE) {
+		ret = CreateFile(tcharpath, GENERIC_READ,
+						0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+		if (ret == INVALID_HANDLE_VALUE) {
 			return(FILEH_INVALID);
 		}
 	}
@@ -30,26 +37,40 @@ FILEH DOSIOCALL file_open(const OEMCHAR 
 
 FILEH DOSIOCALL file_open_rb(const OEMCHAR *path) {
 
-	FILEH	ret;
-
-	if ((ret = CreateFile(path, GENERIC_READ, FILE_SHARE_READ, 0,
-								OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL))
-													== INVALID_HANDLE_VALUE) {
+#if defined(OEMCHAR_SAME_TCHAR)
+	const TCHAR *tcharpath = path;
+#else
+	TCHAR tcharpath[MAX_PATH];
+	oemtotchar(tcharpath, NELEMENTS(tcharpath), path, (UINT)-1);
+#endif
+	FILEH ret;
+	ret = CreateFile(tcharpath, GENERIC_READ, FILE_SHARE_READ, 0,
+								OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (ret != INVALID_HANDLE_VALUE) {
+		return(ret);
+	}
+	else {
 		return(FILEH_INVALID);
 	}
-	return(ret);
 }
 
 FILEH DOSIOCALL file_create(const OEMCHAR *path) {
 
-	FILEH	ret;
-
-	if ((ret = CreateFile(path, GENERIC_READ | GENERIC_WRITE,
-						 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL))
-											== INVALID_HANDLE_VALUE) {
+#if defined(OEMCHAR_SAME_TCHAR)
+	const TCHAR *tcharpath = path;
+#else
+	TCHAR tcharpath[MAX_PATH];
+	oemtotchar(tcharpath, NELEMENTS(tcharpath), path, (UINT)-1);
+#endif
+	FILEH ret;
+	ret = CreateFile(tcharpath, GENERIC_READ | GENERIC_WRITE,
+						 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (ret != INVALID_HANDLE_VALUE) {
+		return(ret);
+	}
+	else {
 		return(FILEH_INVALID);
 	}
-	return(ret);
 }
 
 long DOSIOCALL file_seek(FILEH handle, long pointer, int method) {
@@ -93,7 +114,8 @@ UINT DOSIOCALL file_getsize(FILEH handle
 	return(GetFileSize(handle, NULL));
 }
 
-static BRESULT DOSIOCALL cnvdatetime(FILETIME *file, DOSDATE *dosdate, DOSTIME *dostime) {
+static BRESULT DOSIOCALL cnvdatetime(const FILETIME *file,
+										DOSDATE *dosdate, DOSTIME *dostime) {
 
 	FILETIME	localtime;
 	SYSTEMTIME	systime;
@@ -115,7 +137,8 @@ static BRESULT DOSIOCALL cnvdatetime(FIL
 	return(SUCCESS);
 }
 
-short DOSIOCALL file_getdatetime(FILEH handle, DOSDATE *dosdate, DOSTIME *dostime) {
+short DOSIOCALL file_getdatetime(FILEH handle,
+										DOSDATE *dosdate, DOSTIME *dostime) {
 
 	FILETIME	lastwrite;
 
@@ -128,17 +151,35 @@ short DOSIOCALL file_getdatetime(FILEH h
 
 short DOSIOCALL file_delete(const OEMCHAR *path) {
 
-	return(DeleteFile(path)?0:-1);
+#if defined(OEMCHAR_SAME_TCHAR)
+	const TCHAR *tcharpath = path;
+#else
+	TCHAR tcharpath[MAX_PATH];
+	oemtotchar(tcharpath, NELEMENTS(tcharpath), path, (UINT)-1);
+#endif
+	return(DeleteFile(tcharpath)?0:-1);
 }
 
 short DOSIOCALL file_attr(const OEMCHAR *path) {
 
-	return((short)GetFileAttributes(path));
+#if defined(OEMCHAR_SAME_TCHAR)
+const TCHAR *tcharpath = path;
+#else
+	TCHAR tcharpath[MAX_PATH];
+	oemtotchar(tcharpath, NELEMENTS(tcharpath), path, (UINT)-1);
+#endif
+	return((short)GetFileAttributes(tcharpath));
 }
 
 short DOSIOCALL file_dircreate(const OEMCHAR *path) {
 
-	return(CreateDirectory(path, NULL)?0:-1);
+#if defined(OEMCHAR_SAME_TCHAR)
+	const TCHAR *tcharpath = path;
+#else
+	TCHAR tcharpath[MAX_PATH];
+	oemtotchar(tcharpath, NELEMENTS(tcharpath), path, (UINT)-1);
+#endif
+	return(CreateDirectory(tcharpath, NULL)?0:-1);
 }
 
 
@@ -152,47 +193,55 @@ void DOSIOCALL file_setcd(const OEMCHAR 
 
 OEMCHAR * DOSIOCALL file_getcd(const OEMCHAR *path) {
 
-	file_cpyname(curfilep, path, sizeof(curpath) - (curfilep - curpath));
+	file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath));
 	return(curpath);
 }
 
 FILEH DOSIOCALL file_open_c(const OEMCHAR *path) {
 
-	file_cpyname(curfilep, path, sizeof(curpath) - (curfilep - curpath));
+	file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath));
 	return(file_open(curpath));
 }
 
 FILEH DOSIOCALL file_open_rb_c(const OEMCHAR *path) {
 
-	file_cpyname(curfilep, path, sizeof(curpath) - (curfilep - curpath));
+	file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath));
 	return(file_open_rb(curpath));
 }
 
 FILEH DOSIOCALL file_create_c(const OEMCHAR *path) {
 
-	file_cpyname(curfilep, path, sizeof(curpath) - (curfilep - curpath));
+	file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath));
 	return(file_create(curpath));
 }
 
 short DOSIOCALL file_delete_c(const OEMCHAR *path) {
 
-	file_cpyname(curfilep, path, sizeof(curpath) - (curfilep - curpath));
+	file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath));
 	return(file_delete(curpath));
 }
 
 short DOSIOCALL file_attr_c(const OEMCHAR *path) {
 
-	file_cpyname(curfilep, path, sizeof(curpath) - (curfilep - curpath));
+	file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath));
 	return(file_attr(curpath));
 }
 
 
+// ----
+
+#if !defined(_WIN32_WCE)
+static const TCHAR str_selfdir[] = _T(".");
+static const TCHAR str_parentdir[] = _T("..");
+#endif
+static const OEMCHAR str_wildcard[] = OEMTEXT("*.*");
+
 static BRESULT DOSIOCALL setflist(WIN32_FIND_DATA *w32fd, FLINFO *fli) {
 
 #if !defined(_WIN32_WCE)
 	if ((w32fd->dwFileAttributes & FILEATTR_DIRECTORY) &&
-		((!file_cmpname(w32fd->cFileName, OEMTEXT("."))) ||
-		(!file_cmpname(w32fd->cFileName, OEMTEXT(".."))))) {
+		((!lstrcmp(w32fd->cFileName, str_selfdir)) ||
+		(!lstrcmp(w32fd->cFileName, str_parentdir)))) {
 		return(FAILURE);
 	}
 #endif
@@ -200,21 +249,30 @@ static BRESULT DOSIOCALL setflist(WIN32_
 	fli->size = w32fd->nFileSizeLow;
 	fli->attr = w32fd->dwFileAttributes;
 	cnvdatetime(&w32fd->ftLastWriteTime, &fli->date, &fli->time);
-	milstr_ncpy(fli->path, w32fd->cFileName, NELEMENTS(fli->path));
+#if defined(OEMCHAR_SAME_TCHAR)
+	file_cpyname(fli->path, w32fd->cFileName, NELEMENTS(fli->path));
+#else
+	tchartooem(fli->path, NELEMENTS(fli->path), w32fd->cFileName, (UINT)-1);
+#endif
 	return(SUCCESS);
 }
 
 FLISTH DOSIOCALL file_list1st(const OEMCHAR *dir, FLINFO *fli) {
 
-	OEMCHAR			path[MAX_PATH];
-	HANDLE			hdl;
-	WIN32_FIND_DATA	w32fd;
-
-	milstr_ncpy(path, dir, NELEMENTS(path));
+	OEMCHAR path[MAX_PATH];
+	file_cpyname(path, dir, NELEMENTS(path));
 	file_setseparator(path, NELEMENTS(path));
-	milstr_ncat(path, OEMTEXT("*.*"), NELEMENTS(path));
+	file_catname(path, str_wildcard, NELEMENTS(path));
 	TRACEOUT(("file_list1st %s", path));
-	hdl = FindFirstFile(path, &w32fd);
+#if defined(OEMCHAR_SAME_TCHAR)
+const TCHAR *tcharpath = path;
+#else
+	TCHAR tcharpath[MAX_PATH];
+	oemtotchar(tcharpath, NELEMENTS(tcharpath), path, (UINT)-1);
+#endif
+	HANDLE hdl;
+	WIN32_FIND_DATA w32fd;
+	hdl = FindFirstFile(tcharpath, &w32fd);
 	if (hdl != INVALID_HANDLE_VALUE) {
 		do {
 			if (setflist(&w32fd, fli) == SUCCESS) {
@@ -251,10 +309,9 @@ const OEMCHAR	*ret;
 
 	ret = path;
 	while((csize = milstr_charsize(path)) != 0) {
-		if (csize == 1) {
-			if ((*path == '\\') || (*path == '/') || (*path == ':')) {
-				ret = path + 1;
-			}
+		if ((csize == 1) &&
+			((*path == '\\') || (*path == '/') || (*path == ':'))) {
+			ret = path + 1;
 		}
 		path += csize;
 	}
@@ -278,7 +335,7 @@ const OEMCHAR	*q;
 	p = file_getname(path);
 	q = NULL;
 	while((csize = milstr_charsize(p)) != 0) {
-		if ((csize == 1) && (*path == '.')) {
+		if ((csize == 1) && (*p == '.')) {
 			q = p + 1;
 		}
 		p += csize;
@@ -298,7 +355,7 @@ void DOSIOCALL file_cutext(OEMCHAR *path
 	p = file_getname(path);
 	q = NULL;
 	while((csize = milstr_charsize(p)) != 0) {
-		if ((csize == 1) && (*path == '.')) {
+		if ((csize == 1) && (*p == '.')) {
 			q = p;
 		}
 		p += csize;