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

filesel.c: fewer dependencies to <windows.h>

Browse Source
This commit is contained in:
Thomas Bernard 2020-04-13 00:15:52 +02:00
parent 8b2e925c00
commit 7f08ad5bb9
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
3 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/filesel.c
View File

@ -58,6 +58,7 @@
#include "struct.h" #include "struct.h"
#include "global.h" #include "global.h"
#include "misc.h" #include "misc.h"
#include "osdep.h"
#include "errors.h" #include "errors.h"
#include "io.h" #include "io.h"
#include "windows.h" #include "windows.h"
@ -1917,30 +1918,7 @@ byte Button_Load_or_Save(T_Selector_settings *settings, byte load, T_IO_Context
#endif #endif
{ {
#if defined(WIN32) #if defined(WIN32)
DWORD short_len = GetShortPathNameW((WCHAR *)filename_unicode, NULL, 0); GFX2_GetShortPathName(filename_ansi, sizeof(filename_ansi), filename_unicode);
if (short_len > 0)
{
WCHAR * temp_str = (WCHAR *)malloc(short_len * sizeof(WCHAR));
short_len = GetShortPathNameW((WCHAR *)filename_unicode, temp_str, short_len);
if (short_len > 0)
{
DWORD i;
for (i = 0; i < short_len && temp_str[i] != 0; i++)
filename_ansi[i] = temp_str[i];
filename_ansi[i] = '\0';
}
free(temp_str);
}
if (short_len == 0)
{
// generate a temporary ansi name
int i;
for (i = 0; (i < (int)sizeof(filename_ansi) - 1) && (filename_unicode[i] != 0); i++)
{
filename_ansi[i] = (filename_unicode[i] < 256) ? (byte)filename_unicode[i] : '_';
}
filename_ansi[i] = '\0';
}
#elif defined(ENABLE_FILENAMES_ICONV) #elif defined(ENABLE_FILENAMES_ICONV)
/* convert back from UTF16 to UTF8 */ /* convert back from UTF16 to UTF8 */
char * input = (char *)filename_unicode; char * input = (char *)filename_unicode;

30
src/osdep.c
View File

@ -574,3 +574,33 @@ bye:
return NULL; return NULL;
#endif #endif
} }
#if defined(WIN32)
void GFX2_GetShortPathName(char * shortname, size_t shortname_len, const word * longname)
{
DWORD short_len = GetShortPathNameW((WCHAR *)longname, NULL, 0);
if (short_len > 0)
{
WCHAR * temp_str = (WCHAR *)GFX2_malloc(short_len * sizeof(WCHAR));
short_len = GetShortPathNameW((WCHAR *)longname, temp_str, short_len);
if (short_len > 0)
{
DWORD i;
for (i = 0; i < short_len && temp_str[i] != 0; i++)
shortname[i] = temp_str[i];
shortname[i] = '\0';
}
free(temp_str);
}
if (short_len == 0)
{
// generate a temporary ansi name
int i;
for (i = 0; (i < (int)shortname_len - 1) && (longname[i] != 0); i++)
{
shortname[i] = (longname[i] < 256) ? (byte)longname[i] : '_';
}
shortname[i] = '\0';
}
}
#endif

2
src/osdep.h
View File

@ -56,6 +56,8 @@ unsigned long Memory_free(void);
#if defined(WIN32) #if defined(WIN32)
char * Unicode_to_utf8(const word * str, size_t * utf8len); char * Unicode_to_utf8(const word * str, size_t * utf8len);
void GFX2_GetShortPathName(char * shortname, size_t shortname_len, const word * longname);
#endif #endif
char* GFX2_GetTextClipboard(word * * unicode); char* GFX2_GetTextClipboard(word * * unicode);