dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed crash and some memory leaks in FS module

Browse Source
This commit is contained in:
BADIM-PC\Vadim
2018-02-16 12:59:39 +03:00
parent a2d961f060
commit 148552893a
3 changed files with 132 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ext/file_dialog.c
View File

@@ -34,9 +34,6 @@ FILE* _wfopen(const wchar_t *, const wchar_t *);
wchar_t* wcsrchr(const wchar_t *, wchar_t);
wchar_t* wcscpy(wchar_t *, const wchar_t *);
#define UTF8ToString(S) (wchar_t *)SDL_iconv_string("UTF-16LE", "UTF-8", (char *)(S), SDL_strlen(S)+1)
#define StringToUTF8(S) SDL_iconv_string("UTF-8", "UTF-16LE", (char *)(S), (SDL_wcslen(S)+1)*sizeof(wchar_t))
void file_dialog_load(file_dialog_load_callback callback, void* data)
{
OPENFILENAMEW ofn;
@@ -71,7 +68,10 @@ void file_dialog_load(file_dialog_load_callback callback, void* data)
const wchar_t* basename = wcsrchr(filename, L'\\');
const wchar_t* name = basename ? basename + 1 : filename;
callback(StringToUTF8(name), buffer, size, data, 0);
char resName[MAX_PATH];
wcstombs(resName, name, MAX_PATH);
callback(resName, buffer, size, data, 0);
free(buffer);
return;
}
@@ -87,8 +87,7 @@ void file_dialog_save(file_dialog_save_callback callback, const char* name, cons
SDL_zero(ofn);
wchar_t filename[MAX_PATH];
memset(filename, 0, sizeof(filename));
wcscpy(filename, UTF8ToString(name));
mbstowcs(filename, name, MAX_PATH);
ofn.lStructSize = sizeof(ofn);
ofn.lpstrFile = filename;