On Windows, convert the USER and USERNAME environment variables from OEM

codepage to UTF-8 encoding. This should fix the case where the user has
a username that includes non-ASCII characters (thanks Alexandre Xavier).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2495

1 files changed, 32 insertions, 0 deletions

diff --git a/setup/multiplayer.c b/setup/multiplayer.c
index ae4e98a5..e8977763 100644
--- a/setup/multiplayer.c
+++ b/setup/multiplayer.c
@@ -793,6 +793,28 @@ void SetChatMacroDefaults(void)
     }
 }
 
+#ifdef _WIN32
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+char *M_OEMToUTF8(const char *oem)
+{
+    unsigned int len = strlen(oem) + 1;
+    wchar_t *tmp;
+    char *result;
+
+    tmp = malloc(len * sizeof(wchar_t));
+    MultiByteToWideChar(CP_OEMCP, 0, oem, len, tmp, len);
+    result = malloc(len * 4);
+    WideCharToMultiByte(CP_UTF8, 0, tmp, len, result, len * 4, NULL, NULL);
+    free(tmp);
+
+    return result;
+}
+
+#endif
+
 void SetPlayerNameDefault(void)
 {
     if (net_player_name == NULL)
@@ -805,6 +827,16 @@ void SetPlayerNameDefault(void)
         net_player_name = getenv("USERNAME");
     }
 
+    // On Windows, environment variables are in OEM codepage
+    // encoding, so convert to UTF8:
+
+#ifdef _WIN32
+    if (net_player_name != NULL)
+    {
+        net_player_name = M_OEMToUTF8(net_player_name);
+    }
+#endif
+
     if (net_player_name == NULL)
     {
         net_player_name = "player";