m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win32: FindFirstFile/FindNextFile usage fix

Browse Source 
fixes http://pulkomandy.tk/projects/GrafX2/ticket/159
This commit is contained in:
Thomas Bernard 2020-12-09 01:22:13 +01:00
parent aa19b5e748
commit 2669ba9b06
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
1 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/io.c
View File

@ -687,32 +687,45 @@ void For_each_directory_entry(const char * directory_name, void * pdata, T_File_
Unicode_char_strlcat(search_string, "\\*", len); Unicode_char_strlcat(search_string, "\\*", len);
h = FindFirstFileW((WCHAR *)search_string, &fd); h = FindFirstFileW((WCHAR *)search_string, &fd);
free(search_string); free(search_string);
if (h != INVALID_HANDLE_VALUE) if (h == INVALID_HANDLE_VALUE)
{ {
do GFX2_Log(GFX2_ERROR, "FindFirstFileW failed in %s\n", directory_name);
{ return;
int i;
char short_filename[16];
if (fd.cAlternateFileName[0] != 0)
for (i = 0; fd.cAlternateFileName[i] != 0 && i < (int)sizeof(short_filename) - 1; i++)
short_filename[i] = (char)fd.cAlternateFileName[i];
else // normal name is short !
for (i = 0; fd.cFileName[i] != 0 && i < (int)sizeof(short_filename) - 1; i++)
short_filename[i] = (char)fd.cFileName[i];
short_filename[i] = '\0';
Callback(
pdata,
short_filename,
(const word *)fd.cFileName,
(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? 0 : 1,
(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? 1 : 0,
(fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? 1 : 0
);
}
while (FindNextFileW(h, &fd));
FindClose(h);
} }
do
{
int i;
char * short_filename;
const WCHAR * src;
src = (fd.cAlternateFileName[0] != 0) ? fd.cAlternateFileName : fd.cFileName;
short_filename = GFX2_malloc(lstrlenW(src) + 1);
if (short_filename == NULL)
continue;
for (i = 0; src[i] != 0; i++)
{
if (src[i] >= 256)
{
GFX2_Log(GFX2_WARNING, "Non latin1 character in translation : \\u%04x\n", (int)src[i]);
short_filename[i] = '?';
}
else
short_filename[i] = (char)src[i];
}
short_filename[i] = '\0';
Callback(
pdata,
short_filename,
(const word *)fd.cFileName,
(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? 0 : 1,
(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? 1 : 0,
(fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? 1 : 0
);
free(short_filename);
}
while (FindNextFileW(h, &fd));
FindClose(h);
#else #else
DIR* current_directory; // current directory DIR* current_directory; // current directory
struct dirent* entry; // directory entry struct struct dirent* entry; // directory entry struct