--- np2/wince/dosio.cpp	2003/11/21 06:51:15	1.2
+++ np2/wince/dosio.cpp	2004/01/10 20:15:43	1.3
@@ -162,26 +162,35 @@ UINT file_getsize(FILEH handle) {
 	return(GetFileSize(handle, NULL));
 }
 
-short file_getdatetime(FILEH handle, DOSDATE *dosdate, DOSTIME *dostime) {
+static BOOL cnvdatetime(FILETIME *file, DOSDATE *dosdate, DOSTIME *dostime) {
 
-	FILETIME	lastwrite;
-	FILETIME	localwrite;
-	SYSTEMTIME	syswrite;
+	FILETIME	localtime;
+	SYSTEMTIME	systime;
 
-	if ((GetFileTime(handle, NULL, NULL, &lastwrite) == 0) ||
-		(FileTimeToLocalFileTime(&lastwrite, &localwrite) == 0) ||
-		(FileTimeToSystemTime(&localwrite, &syswrite) == 0)) {
-		return(-1);
+	if ((FileTimeToLocalFileTime(file, &localtime) == 0) ||
+		(FileTimeToSystemTime(&localtime, &systime) == 0)) {
+		return(FAILURE);
 	}
 	if (dosdate) {
-		dosdate->year = (WORD)syswrite.wYear;
-		dosdate->month = (BYTE)syswrite.wMonth;
-		dosdate->day = (BYTE)syswrite.wDay;
+		dosdate->year = (UINT16)systime.wYear;
+		dosdate->month = (UINT8)systime.wMonth;
+		dosdate->day = (UINT8)systime.wDay;
 	}
 	if (dostime) {
-		dostime->hour = (BYTE)syswrite.wHour;
-		dostime->minute = (BYTE)syswrite.wMinute;
-		dostime->second = (BYTE)syswrite.wSecond;
+		dostime->hour = (UINT8)systime.wHour;
+		dostime->minute = (UINT8)systime.wMinute;
+		dostime->second = (UINT8)systime.wSecond;
+	}
+	return(SUCCESS);
+}
+
+short file_getdatetime(FILEH handle, DOSDATE *dosdate, DOSTIME *dostime) {
+
+	FILETIME	lastwrite;
+
+	if ((GetFileTime(handle, NULL, NULL, &lastwrite) == 0) ||
+		(cnvdatetime(&lastwrite, dosdate, dostime) != SUCCESS)) {
+		return(-1);
 	}
 	return(0);
 }
@@ -253,57 +262,65 @@ short file_attr_c(const char *path) {
 }
 
 
-FILEFINDH file_find1st(const char *dir, FILEFINDT *fft) {
+static BOOL setflist(WIN32_FIND_DATA *w32fd, FLINFO *fli) {
+
+#if !defined(_WIN32_WCE)
+	if ((w32fd->dwFileAttributes & FILEATTR_DIRECTORY) &&
+		((file_cmpname(w32fd->cFileName, ".")) ||
+		(file_cmpname(w32fd->cFileName, "..")))) {
+		return(FAILURE);
+	}
+#endif
+	fli->caps = FLICAPS_SIZE | FLICAPS_ATTR | FLICAPS_DATE | FLICAPS_TIME;
+	fli->size = w32fd->nFileSizeLow;
+	fli->attr = w32fd->dwFileAttributes;
+	cnvdatetime(&w32fd->ftLastWriteTime, &fli->date, &fli->time);
+#if defined(UNICODE)
+	WideCharToMultiByte(CP_ACP, 0, w32fd->cFileName, -1,
+								fli->path, sizeof(fli->path), NULL, NULL);
+#else
+	milstr_ncpy(fli->path, w32fd->cFileName, sizeof(fli->path));
+#endif
+	return(SUCCESS);
+}
+
+FLISTH file_list1st(const char *dir, FLINFO *fli) {
 
 	char			path[MAX_PATH];
 	HANDLE			hdl;
 	WIN32_FIND_DATA	w32fd;
 
-	file_cpyname(path, dir, sizeof(path));
+	milsjis_ncpy(path, dir, sizeof(path));
 	file_setseparator(path, sizeof(path));
-	file_catname(path, "*.*", sizeof(path));
+	milsjis_ncat(path, "*.*", sizeof(path));
+	TRACEOUT(("file_list1st %s", path));
 	hdl = FindFirstFile_A(path, &w32fd);
-	if (hdl == INVALID_HANDLE_VALUE) {
-		return(FILEFINDH_INVALID);
-	}
-	if (fft) {
-#if defined(UNICODE)
-		WideCharToMultiByte(CP_ACP, 0, w32fd.cFileName, -1,
-								fft->path, sizeof(fft->path), NULL, NULL);
-#else
-		milstr_ncpy(fft->path, w32fd.cFileName, sizeof(fft->path));
-#endif
-		fft->size = w32fd.nFileSizeLow;
-		fft->attr = w32fd.dwFileAttributes;
+	if (hdl != INVALID_HANDLE_VALUE) {
+		do {
+			if (setflist(&w32fd, fli) == SUCCESS) {
+				return(hdl);
+			}
+		} while(FindNextFile(hdl, &w32fd));
+		FindClose(hdl);
 	}
-	return(hdl);
+	return(FLISTH_INVALID);
 }
 
-BOOL file_findnext(FILEFINDH hdl, FILEFINDT *fft) {
+BOOL file_listnext(FLISTH hdl, FLINFO *fli) {
 
 	WIN32_FIND_DATA	w32fd;
 
-	if (!FindNextFile(hdl, &w32fd)) {
-		return(FAILURE);
-	}
-	if (fft) {
-#if defined(UNICODE)
-		WideCharToMultiByte(CP_ACP, 0, w32fd.cFileName, -1,
-								fft->path, sizeof(fft->path), NULL, NULL);
-#else
-		milstr_ncpy(fft->path, w32fd.cFileName, sizeof(fft->path));
-#endif
-		fft->size = w32fd.nFileSizeLow;
-		fft->attr = w32fd.dwFileAttributes;
+	while(FindNextFile(hdl, &w32fd)) {
+		if (setflist(&w32fd, fli) == SUCCESS) {
+			return(SUCCESS);
+		}
 	}
-	return(SUCCESS);
+	return(FAILURE);
 }
 
-void file_findclose(FILEFINDH hdl) {
+void file_listclose(FLISTH hdl) {
 
-	if (hdl) {
-		FindClose(hdl);
-	}
+	FindClose(hdl);
 }