diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-12-28 18:51:12 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-12-28 18:51:12 (GMT) |
commit | a27cc004d279f6e156c70540cee7c5f68f315025 (patch) | |
tree | 445d334c9f8c0a64e81ff06888b363c532c43185 /generic/tclStubInit.c | |
parent | 9a9b619c9f29470dab9e33b0c593b7e648224515 (diff) | |
parent | 301f6bcb839b301e1e3d3a92e3713696780c95ca (diff) | |
download | tcl-a27cc004d279f6e156c70540cee7c5f68f315025.zip tcl-a27cc004d279f6e156c70540cee7c5f68f315025.tar.gz tcl-a27cc004d279f6e156c70540cee7c5f68f315025.tar.bz2 |
merge core-8-6-branch
Diffstat (limited to 'generic/tclStubInit.c')
-rw-r--r-- | generic/tclStubInit.c | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index bd0971b..fe5bd9d 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -138,7 +138,9 @@ TclWinGetPlatformId(void) # define TclWinFlushDirtyChannels doNothing # define TclWinResetInterfaces doNothing +#if TCL_UTF_MAX < 4 static Tcl_Encoding winTCharEncoding; +#endif static int TclpIsAtty(int fd) @@ -150,7 +152,7 @@ void *TclWinGetTclInstance() { void *hInstance = NULL; GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (const char *)&winTCharEncoding, &hInstance); + (const char *)&TclpIsAtty, &hInstance); return hInstance; } @@ -211,11 +213,24 @@ Tcl_WinUtfToTChar( int len, Tcl_DString *dsPtr) { +#if TCL_UTF_MAX > 3 + WCHAR *wp; + int size = MultiByteToWideChar(CP_UTF8, 0, string, len, 0, 0); + + Tcl_DStringInit(dsPtr); + Tcl_DStringSetLength(dsPtr, 2*size+2); + wp = (WCHAR *)Tcl_DStringValue(dsPtr); + MultiByteToWideChar(CP_UTF8, 0, string, len, wp, size+1); + Tcl_DStringSetLength(dsPtr, 2*size); + wp[size] = 0; + return (char *)wp; +#else if (!winTCharEncoding) { winTCharEncoding = Tcl_GetEncoding(0, "unicode"); } return Tcl_UtfToExternalDString(winTCharEncoding, string, len, dsPtr); +#endif } char * @@ -224,11 +239,28 @@ Tcl_WinTCharToUtf( int len, Tcl_DString *dsPtr) { +#if TCL_UTF_MAX > 3 + char *p; + int size; + + if (len > 0) { + len /= 2; + } + size = WideCharToMultiByte(CP_UTF8, 0, string, len, 0, 0, NULL, NULL); + Tcl_DStringInit(dsPtr); + Tcl_DStringSetLength(dsPtr, size+1); + p = (char *)Tcl_DStringValue(dsPtr); + WideCharToMultiByte(CP_UTF8, 0, string, len, p, size, NULL, NULL); + Tcl_DStringSetLength(dsPtr, size); + p[size] = 0; + return p; +#else if (!winTCharEncoding) { winTCharEncoding = Tcl_GetEncoding(0, "unicode"); } return Tcl_ExternalToUtfDString(winTCharEncoding, string, len, dsPtr); +#endif } #if defined(TCL_WIDE_INT_IS_LONG) |