fixup! Windows native IDN

Author: mlt

src/msmtp.c

@@ -3763,7 +3763,7 @@ void msmtp_print_conf(msmtp_cmdline_conf_t conf, account_t *account)
 
 int main(int argc, char *argv[])
 {
-#if defined(W32_NATIVE) && !defined(_UNICODE) && !defined(HAVE_LIBIDN)// && !defined(ENABLE_NLS)
+#if defined(W32_NATIVE) && !defined(_UNICODE) && !defined(HAVE_LIBIDN) && !defined(ENABLE_NLS)
     /* We need this for proper IDN conversion later on using Windows native way
      * AND proper console output.
      * > At program startup, the equivalent of the following statement is executed :

src/net.c

@@ -765,12 +765,14 @@ int net_open_socket(
     /* FIXME: Something messes up locale (at least on MSYS2/UCRT64) and setlocale(LC_ALL, "") won't fix it.
      * The commented code below is the way to get proper console output for hostname.
      * Otherwise let's make sure we get proper IDN conversion and that is it. */
+    /*
     char locale_name[LOCALE_NAME_MAX_LENGTH * sizeof(WCHAR)];
     GetSystemDefaultLocaleName((LPWSTR)locale_name, LOCALE_NAME_MAX_LENGTH);
     size_t len = wcsnlen_s((LPWSTR)locale_name, LOCALE_NAME_MAX_LENGTH);
     for (int i = 1; i <= len; ++i)
         locale_name[i] = locale_name[i * 2];
     setlocale(LC_ALL, locale_name);
+    */
     _locale_t locale = _create_locale(LC_ALL, "");
     errno_t err = _mbstowcs_s_l(&conv, hostname_wide, ARRAYSIZE(hostname_wide), hostname, _TRUNCATE, locale);
     _free_locale(locale);