From c0da1f0e9497671f47c40110f9a695c8319cb7e1 Mon Sep 17 00:00:00 2001
From: dolphin6k <shin1@wmail.plala.or.jp>
Date: Fri, 11 Feb 2022 08:33:29 +0900
Subject: [PATCH] Removed "#ifdef WIN32" block around label embedding.

It has likely become unneccessary by recent fix for the common part.

Also backported a fix for uppercase issue from sdl2.0 branch (Define Windows native
function for mbstowcs/wcstombs).
---
 src/onscreen_keyboard.c |  2 +-
 src/tuxpaint.c          | 40 +++-------------------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/src/onscreen_keyboard.c b/src/onscreen_keyboard.c
index c8ebe4665..9fa975f87 100644
--- a/src/onscreen_keyboard.c
+++ b/src/onscreen_keyboard.c
@@ -63,7 +63,7 @@ static void print_composemap(osk_composenode * composemap, char *sp);
 
 #ifdef WIN32
 #include <windows.h>
-#define mbstowcs(wtok, tok, size) MultiByteToWideChar(CP_UTF8,MB_COMPOSITE,tok,-1,wtok,size)
+#define mbstowcs(wtok, tok, size) MultiByteToWideChar(CP_UTF8,0,tok,-1,wtok,size)
 #endif
 
 struct osk_keyboard *osk_create(char * layout_name, SDL_Surface * canvas,
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 1ac83a9df..9d13062e7 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -341,30 +341,11 @@ typedef struct safer_dirent
 #undef max
 #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, n;
-  iconv_t trans;
-
-  in = size;
-  out = size;
-  n = size / sizeof(wchar_t);
-
-  trans = iconv_open("WCHAR_T", "UTF-8");
-  iconv(trans, (char **)&tok, &in, &wrptr, &out);
-  *((wchar_t *) wrptr) = L'\0';
-  swprintf(wtok, n, L"%ls", ui16);
-  free(ui16);
-  iconv_close(trans);
-}
-
 extern int win32_trash(const char *path);
 
+#define mbstowcs(wtok, tok, size) MultiByteToWideChar(CP_UTF8,0,tok,-1,wtok,size)
+#define wcstombs(tok, wtok, size) WideCharToMultiByte(CP_UTF8,0,wtok,-1,tok,size,NULL,NULL)
+
 #undef iswprint
 int iswprint(wchar_t wc)
 {
@@ -23890,20 +23871,6 @@ static void load_info_about_label_surface(FILE * lfi)
 
       // printf("Reading %d wide chars\n", new_node->save_texttool_len); fflush(stdout);
 
-#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];
-        }
-      new_node->save_texttool_str[l] = L'\0';
-#else
 /*
       // Use of fscanf() around here seems to be be causing
       // things to go amiss when a string begins with a space!
@@ -23952,7 +23919,6 @@ static void load_info_about_label_surface(FILE * lfi)
 
           // printf("Fixed \"%ls\"\n", new_node->save_texttool_str); fflush(stdout);
         }
-#endif
 
       tmp_fscanf_return = fscanf(lfi, "%u\n", &l);
       new_node->save_color.r = (Uint8) l;