From 8018ebfab5fb74e472c98cfaa95540e69c0fee67 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 16 Feb 2019 09:50:00 +0100
Subject: [PATCH] - use the Unicode version of Windows's clipboard functions.

---
 src/win32/i_input.cpp | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/win32/i_input.cpp b/src/win32/i_input.cpp
index 2854290c6..676484a30 100644
--- a/src/win32/i_input.cpp
+++ b/src/win32/i_input.cpp
@@ -860,13 +860,14 @@ void I_PutInClipboard (const char *str)
 		return;
 	EmptyClipboard ();
 
-	HGLOBAL cliphandle = GlobalAlloc (GMEM_DDESHARE, strlen (str) + 1);
+	auto wstr = WideString(str);
+	HGLOBAL cliphandle = GlobalAlloc (GMEM_DDESHARE, wstr.length() * 2 + 2);
 	if (cliphandle != NULL)
 	{
-		char *ptr = (char *)GlobalLock (cliphandle);
-		strcpy (ptr, str);
+		wchar_t *ptr = (wchar_t *)GlobalLock (cliphandle);
+		wcscpy (ptr, wstr.c_str());
 		GlobalUnlock (cliphandle);
-		SetClipboardData (CF_TEXT, cliphandle);
+		SetClipboardData (CF_UNICODETEXT, cliphandle);
 	}
 	CloseClipboard ();
 }
@@ -875,28 +876,21 @@ FString I_GetFromClipboard (bool return_nothing)
 {
 	FString retstr;
 	HGLOBAL cliphandle;
-	char *clipstr;
-	char *nlstr;
+	wchar_t *clipstr;
 
-	if (return_nothing || !IsClipboardFormatAvailable (CF_TEXT) || !OpenClipboard (Window))
+	if (return_nothing || !IsClipboardFormatAvailable (CF_UNICODETEXT) || !OpenClipboard (Window))
 		return retstr;
 
-	cliphandle = GetClipboardData (CF_TEXT);
-	if (cliphandle != NULL)
+	cliphandle = GetClipboardData (CF_UNICODETEXT);
+	if (cliphandle != nullptr)
 	{
-		clipstr = (char *)GlobalLock (cliphandle);
-		if (clipstr != NULL)
+		clipstr = (wchar_t *)GlobalLock (cliphandle);
+		if (clipstr != nullptr)
 		{
-			// Convert CR-LF pairs to just LF while copying to the FString
-			for (nlstr = clipstr; *nlstr != '\0'; ++nlstr)
-			{
-				if (nlstr[0] == '\r' && nlstr[1] == '\n')
-				{
-					nlstr++;
-				}
-				retstr += *nlstr;
-			}
-			GlobalUnlock (clipstr);
+			// Convert CR-LF pairs to just LF.
+			retstr = clipstr;
+			GlobalUnlock(clipstr);
+			retstr.Substitute("\r\n", "\n");
 		}
 	}