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

win32: lua getfilename() returns long file name (converted to UTF8)

Browse Source 
see http://pulkomandy.tk/projects/GrafX2/ticket/123
This commit is contained in:
Thomas Bernard 2019-05-28 16:07:27 +02:00
parent 5a292d744e
commit 6f97932ae1
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
3 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored Normal file
View File

@ -0,0 +1,6 @@
[submodule "tools/font8x8"]
path = tools/font8x8
url = https://github.com/dhepper/font8x8
[submodule "tools/8x8fonts/font8x8"]
path = tools/8x8fonts/font8x8
url = https://github.com/dhepper/font8x8

36
src/factory.c
View File

@ -1989,8 +1989,44 @@ int L_GetFileName(lua_State* L)
LUA_ARG_LIMIT (0, "getfilename"); LUA_ARG_LIMIT (0, "getfilename");
#if defined(WIN32)
if (Main.backups->Pages->Filename_unicode == NULL || Main.backups->Pages->Filename_unicode[0] == 0)
lua_pushstring(L, Main.backups->Pages->Filename);
else
{
// convert Filename_unicode to UTF8 (Lua strings are 8bits)
size_t unicode_len = Unicode_strlen(Main.backups->Pages->Filename_unicode);
int len = WideCharToMultiByte(CP_UTF8, 0, Main.backups->Pages->Filename_unicode, unicode_len, NULL, 0, NULL, NULL);
if (len <= 0)
{
GFX2_Log(GFX2_WARNING, "WideCharToMultiByte() failed\n");
lua_pushstring(L, Main.backups->Pages->Filename);
}
else
{
char * utf8name = (char *)GFX2_malloc(len);
if (utf8name == NULL)
lua_pushstring(L, Main.backups->Pages->Filename);
else
{
if (WideCharToMultiByte(CP_UTF8, 0, Main.backups->Pages->Filename_unicode, unicode_len, utf8name, len, NULL, NULL) > 0)
lua_pushlstring(L, utf8name, len);
else
{
DWORD error = GetLastError();
GFX2_Log(GFX2_WARNING, "WideCharToMultiByte() failed error=%u\n", error);
lua_pushstring(L, Main.backups->Pages->Filename);
}
free(utf8name);
}
}
}
// still using the "short name" directory path at the moment
lua_pushstring(L, Main.backups->Pages->File_directory);
#else
lua_pushstring(L, Main.backups->Pages->Filename); lua_pushstring(L, Main.backups->Pages->Filename);
lua_pushstring(L, Main.backups->Pages->File_directory); lua_pushstring(L, Main.backups->Pages->File_directory);
#endif
return 2; return 2;
} }

1
tools/8x8fonts/font8x8 Submodule

@ -0,0 +1 @@
Subproject commit 592f4119ee38ccfdf61d8c8c0e41a48d2d370324