notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed crash bug regarding onscreen_keyboard and labels.

Browse source 
Every version after when onscreen-keyboard implimented has this bug,
which first became apparent in Windows 10. (Because of more strict
memory handling or something?)
Recommend every windows user to upgrade to 0.9.26-5.
This commit is contained in:
dolphin6k 2021-10-17 08:43:44 +09:00
parent 1c87dd98c4
commit 90baae6dfe
2 changed files with 40 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/onscreen_keyboard.c
View file

@ -51,6 +51,11 @@ static struct osk_layout *load_layout(on_screen_keyboard * keyboard, char *layou
static void print_composemap(osk_composenode * composemap, char *sp);
#endif
#ifdef WIN32
#include <windows.h>
#define mbstowcs(wtok, tok, size) MultiByteToWideChar(CP_UTF8,MB_COMPOSITE,tok,-1,wtok,size)
#endif
struct osk_keyboard *osk_create(char * layout_name, SDL_Surface * canvas,
SDL_Surface * LG_button_up, SDL_Surface * LG_button_down,
SDL_Surface * LG_button_off, SDL_Surface * LG_button_nav,

35
src/tuxpaint.c
View file

@ -336,6 +336,27 @@ typedef struct safer_dirent
#define mkdir(path,access) _mkdir(path)
static void mtw(wchar_t * wtok, char *tok, size_t size)
{
/* workaround using iconv to get a functionallity somewhat approximate as mbstowcs() */
Uint16 *ui16;
ui16 = malloc(size);
char *wrptr = (char *)ui16;
size_t in, out;
iconv_t trans;
in = size;
out = size;
trans = iconv_open("WCHAR_T", "UTF-8");
iconv(trans, (const char **)&tok, &in, &wrptr, &out);
*((wchar_t *) wrptr) = L'\0';
swprintf(wtok, size, ui16);
free(ui16);
iconv_close(trans);
}
#endif /* WIN32 */
#if defined(__MACOS__)
@ -22491,12 +22512,26 @@ static void load_info_about_label_surface(FILE * lfi)
new_node = malloc(sizeof(struct label_node));
tmp_fscanf_return = fscanf(lfi, "%u\n", &new_node->save_texttool_len);
#ifdef WIN32
char *tmpstr;
wchar_t *wtmpstr;
tmpstr = malloc(1024);
wtmpstr = malloc(1024);
fgets(tmpstr, 1024, lfi);
mtw(wtmpstr, tmpstr, 1024);
for (l = 0; l < new_node->save_texttool_len; l++)
{
new_node->save_texttool_str[l] = wtmpstr[l];
}
#else
for (l = 0; l < new_node->save_texttool_len; l++)
{
tmp_fscanf_return = fscanf(lfi, "%lc", &tmp_char);
new_node->save_texttool_str[l] = tmp_char;
}
tmp_fscanf_return = fscanf(lfi, "\n");
#endif
tmp_fscanf_return = fscanf(lfi, "%u\n", &l);
new_node->save_color.r = (Uint8) l;
tmp_fscanf_return = fscanf(lfi, "%u\n", &l);