--- np2/win9x/dosio.cpp 2005/02/09 20:11:35 1.8 +++ np2/win9x/dosio.cpp 2005/04/01 15:35:49 1.13 @@ -1,29 +1,34 @@ #include "compiler.h" +#include "oemtext.h" #include "dosio.h" static OEMCHAR curpath[MAX_PATH]; static OEMCHAR *curfilep = curpath; -#define ISKANJI(c) (((((c) ^ 0x20) - 0xa1) & 0xff) < 0x3c) - // ---- 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); } } @@ -32,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) { @@ -95,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; @@ -117,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; @@ -130,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); } @@ -154,53 +193,55 @@ void DOSIOCALL file_setcd(const OEMCHAR OEMCHAR * DOSIOCALL file_getcd(const OEMCHAR *path) { - *curfilep = '\0'; - file_catname(curpath, path, NELEMENTS(curpath)); + file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath)); return(curpath); } FILEH DOSIOCALL file_open_c(const OEMCHAR *path) { - *curfilep = '\0'; - file_catname(curpath, path, NELEMENTS(curpath)); + file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath)); return(file_open(curpath)); } FILEH DOSIOCALL file_open_rb_c(const OEMCHAR *path) { - *curfilep = '\0'; - file_catname(curpath, path, NELEMENTS(curpath)); + file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath)); return(file_open_rb(curpath)); } FILEH DOSIOCALL file_create_c(const OEMCHAR *path) { - *curfilep = '\0'; - file_catname(curpath, path, NELEMENTS(curpath)); + file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath)); return(file_create(curpath)); } short DOSIOCALL file_delete_c(const OEMCHAR *path) { - *curfilep = '\0'; - file_catname(curpath, path, NELEMENTS(curpath)); + file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath)); return(file_delete(curpath)); } short DOSIOCALL file_attr_c(const OEMCHAR *path) { - *curfilep = '\0'; - file_catname(curpath, path, NELEMENTS(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 @@ -208,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) { @@ -255,20 +305,15 @@ void DOSIOCALL file_listclose(FLISTH hdl OEMCHAR * DOSIOCALL file_getname(const OEMCHAR *path) { const OEMCHAR *ret; + int csize; ret = path; - while(*path != '\0') { - if (!ISKANJI(*path)) { - if ((*path == '\\') || (*path == '/') || (*path == ':')) { - ret = path + 1; - } - } - else { - if (path[1]) { - path++; - } + while((csize = milstr_charsize(path)) != 0) { + if ((csize == 1) && + ((*path == '\\') || (*path == '/') || (*path == ':'))) { + ret = path + 1; } - path++; + path += csize; } return((OEMCHAR *)ret); } @@ -285,24 +330,17 @@ OEMCHAR * DOSIOCALL file_getext(const OE const OEMCHAR *p; const OEMCHAR *q; + int csize; p = file_getname(path); q = NULL; - - while(*p != '\0') { - if (!ISKANJI(*p)) { - if (*p == '.') { - q = p + 1; - } + while((csize = milstr_charsize(p)) != 0) { + if ((csize == 1) && (*p == '.')) { + q = p + 1; } - else { - if (p[1]) { - p++; - } - } - p++; + p += csize; } - if (!q) { + if (q == NULL) { q = p; } return((OEMCHAR *)q); @@ -312,21 +350,15 @@ void DOSIOCALL file_cutext(OEMCHAR *path OEMCHAR *p; OEMCHAR *q; + int csize; p = file_getname(path); q = NULL; - while(*p != '\0') { - if (!ISKANJI(*p)) { - if (*p == '.') { - q = p; - } - } - else { - if (p[1]) { - p++; - } + while((csize = milstr_charsize(p)) != 0) { + if ((csize == 1) && (*p == '.')) { + q = p; } - p++; + p += csize; } if (q) { *q = '\0';