--- np2/win9x/dosio.cpp	2004/01/10 20:15:43	1.5
+++ np2/win9x/dosio.cpp	2005/02/07 14:46:14	1.7
@@ -20,7 +20,7 @@ static HANDLE CreateFile_A(LPCSTR lpFile
 	TCHAR	FileNameW[MAX_PATH*2];
 
 	MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, lpFileName, -1,
-							FileNameW, sizeof(FileNameW)/sizeof(TCHAR));
+										FileNameW, NELEMENTS(FileNameW));
 	return(CreateFile(FileNameW, dwDesiredAccess, dwShareMode,
 						lpSecurityAttributes, dwCreationDisposition,
 						dwFlagsAndAttributes, hTemplateFile));
@@ -266,8 +266,8 @@ static BOOL setflist(WIN32_FIND_DATA *w3
 
 #if !defined(_WIN32_WCE)
 	if ((w32fd->dwFileAttributes & FILEATTR_DIRECTORY) &&
-		((file_cmpname(w32fd->cFileName, ".")) ||
-		(file_cmpname(w32fd->cFileName, "..")))) {
+		((!file_cmpname(w32fd->cFileName, ".")) ||
+		(!file_cmpname(w32fd->cFileName, "..")))) {
 		return(FAILURE);
 	}
 #endif