From 59237b6ac5e62f44c6451465d76f19bb3c97469b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 19 Jun 2019 13:35:21 +0000
Subject: Don't re-reference encoding "unicode", when we can re-use the
 encoding.

---
 win/tkWinFont.c | 2 +-
 win/tkWinTest.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index e47637c..6e8d3bd 100644
--- a/win/tkWinFont.c
+++ b/win/tkWinFont.c
@@ -1823,7 +1823,7 @@ AllocFontFamily(
     }
 
     if (encoding == NULL) {
-	encoding = Tcl_GetEncoding(NULL, "unicode");
+	encoding = TkWinGetUnicodeEncoding();
 	familyPtr->textOutProc =
 	    (BOOL (WINAPI *)(HDC, int, int, TCHAR *, int)) TextOutW;
 	familyPtr->getTextExtentPoint32Proc =
diff --git a/win/tkWinTest.c b/win/tkWinTest.c
index 6e79df3..e51b6a2 100644
--- a/win/tkWinTest.c
+++ b/win/tkWinTest.c
@@ -175,12 +175,9 @@ AppendSystemError(
 	}
 	msg = msgBuf;
     } else {
-	Tcl_Encoding encoding;
 	char *msgPtr;
 
-	encoding = Tcl_GetEncoding(NULL, "unicode");
-	Tcl_ExternalToUtfDString(encoding, (char *) wMsgPtr, -1, &ds);
-	Tcl_FreeEncoding(encoding);
+	Tcl_WinTCharToUtf(wMsgPtr, wcslen(wMsgPtr), &ds);
 	LocalFree(wMsgPtr);
 
 	msgPtr = Tcl_DStringValue(&ds);
-- 
cgit v0.12