--- np2/wince/dosio.cpp 2005/02/12 12:13:59 1.9 +++ np2/wince/dosio.cpp 2005/03/24 04:40:33 1.11 @@ -191,7 +191,6 @@ short file_attr(const OEMCHAR *path) { UINT16 oempath[MAX_PATH]; MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, path, -1, oempath, NELEMENTS(oempath)); - return((short)GetFileAttributes(ucs2)); #elif defined(UNICODE) && defined(OSLANG_UTF8) UINT16 oempath[MAX_PATH]; codecnv_utf8toucs2(oempath, NELEMENTS(oempath), path, (UINT)-1); @@ -227,7 +226,7 @@ void file_setcd(const OEMCHAR *exepath) *curfilep = '\0'; } -char *file_getcd(const OEMCHAR *path) { +OEMCHAR *file_getcd(const OEMCHAR *path) { file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath)); return(curpath); @@ -415,7 +414,7 @@ void file_cutseparator(OEMCHAR *path) { int pos; - pos = strlen(path) - 1; + pos = OEMSTRLEN(path) - 1; if ((pos > 0) && // 2文字以上でー (path[pos] == '\\') && // ケツが \ でー (!milstr_kanji2nd(path, pos)) && // 漢字の2バイト目ぢゃなくてー @@ -429,7 +428,7 @@ void file_setseparator(OEMCHAR *path, in int pos; - pos = strlen(path) - 1; + pos = OEMSTRLEN(path) - 1; if ((pos < 0) || ((pos == 1) && (path[1] == ':')) || ((path[pos] == '\\') && (!milstr_kanji2nd(path, pos))) ||