diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinFont.c | 2 | ||||
| -rw-r--r-- | win/tkWinInit.c | 2 | ||||
| -rw-r--r-- | win/tkWinTest.c | 5 |
3 files changed, 3 insertions, 6 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/tkWinInit.c b/win/tkWinInit.c index 780888a..e3c75de 100644 --- a/win/tkWinInit.c +++ b/win/tkWinInit.c @@ -199,7 +199,7 @@ TkWin32ErrorObj( } #ifdef _UNICODE - Tcl_WinTCharToUtf(lpBuffer, wcslen(lpBuffer) * sizeof (WCHAR), &ds); + Tcl_WinTCharToUtf(lpBuffer, -1, &ds); errPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds)); Tcl_DStringFree(&ds); #else diff --git a/win/tkWinTest.c b/win/tkWinTest.c index 6e79df3..04ecb97 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, -1, &ds); LocalFree(wMsgPtr); msgPtr = Tcl_DStringValue(&ds); |