--- np2/wince/dosio.h	2004/01/27 10:55:47	1.4
+++ np2/wince/dosio.h	2005/04/01 15:35:50	1.8
@@ -45,7 +45,7 @@ typedef struct {
 	UINT32	attr;
 	DOSDATE	date;
 	DOSTIME	time;
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 } FLINFO;
 
 
@@ -57,41 +57,51 @@ extern "C" {
 void dosio_init(void);
 void dosio_term(void);
 											// ファイル操作
-FILEH file_open(const char *path);
-FILEH file_open_rb(const char *path);
-FILEH file_create(const char *path);
+FILEH file_open(const OEMCHAR *path);
+FILEH file_open_rb(const OEMCHAR *path);
+FILEH file_create(const OEMCHAR *path);
 long file_seek(FILEH handle, long pointer, int method);
 UINT file_read(FILEH handle, void *data, UINT length);
 UINT file_write(FILEH handle, const void *data, UINT length);
 short file_close(FILEH handle);
 UINT file_getsize(FILEH handle);
 short file_getdatetime(FILEH handle, DOSDATE *dosdate, DOSTIME *dostime);
-short file_delete(const char *path);
-short file_attr(const char *path);
-short file_dircreate(const char *path);
+short file_delete(const OEMCHAR *path);
+short file_attr(const OEMCHAR *path);
+short file_dircreate(const OEMCHAR *path);
 
 											// カレントファイル操作
-void file_setcd(const char *exepath);
-char *file_getcd(const char *path);
-FILEH file_open_c(const char *path);
-FILEH file_open_rb_c(const char *path);
-FILEH file_create_c(const char *path);
-short file_delete_c(const char *path);
-short file_attr_c(const char *path);
+void file_setcd(const OEMCHAR *exepath);
+OEMCHAR *file_getcd(const OEMCHAR *path);
+FILEH file_open_c(const OEMCHAR *path);
+FILEH file_open_rb_c(const OEMCHAR *path);
+FILEH file_create_c(const OEMCHAR *path);
+short file_delete_c(const OEMCHAR *path);
+short file_attr_c(const OEMCHAR *path);
 
-FLISTH file_list1st(const char *dir, FLINFO *fli);
-BOOL file_listnext(FLISTH hdl, FLINFO *fli);
+FLISTH file_list1st(const OEMCHAR *dir, FLINFO *fli);
+BRESULT file_listnext(FLISTH hdl, FLINFO *fli);
 void file_listclose(FLISTH hdl);
 
+#if defined(OSLANG_SJIS)
 #define	file_cpyname(a, b, c)	milsjis_ncpy(a, b, c)
 #define	file_catname(a, b, c)	milsjis_ncat(a, b, c)
 #define	file_cmpname(a, b)		milsjis_cmp(a, b)
-char *file_getname(char *path);
-void file_cutname(char *path);
-char *file_getext(char *path);
-void file_cutext(char *path);
-void file_cutseparator(char *path);
-void file_setseparator(char *path, int maxlen);
+#elif defined(OSLANG_UTF8)
+#define	file_cpyname(a, b, c)	milutf8_ncpy(a, b, c)
+#define	file_catname(a, b, c)	milutf8_ncat(a, b, c)
+#define	file_cmpname(a, b)		milutf8_cmp(a, b)
+#else
+#define	file_cpyname(a, b, c)	milank_ncpy(a, b, c)
+#define	file_catname(a, b, c)	milank_ncat(a, b, c)
+#define	file_cmpname(a, b)		milank_cmp(a, b)
+#endif
+OEMCHAR *file_getname(const OEMCHAR *path);
+void file_cutname(OEMCHAR *path);
+OEMCHAR *file_getext(const OEMCHAR *path);
+void file_cutext(OEMCHAR *path);
+void file_cutseparator(OEMCHAR *path);
+void file_setseparator(OEMCHAR *path, int maxlen);
 
 #ifdef __cplusplus
 }