diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-12-28 18:53:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-12-28 18:53:23 (GMT) |
| commit | 7172ae907187d2ca151b9834bdc2f2e6e05ad2d8 (patch) | |
| tree | 9e562f9243473b4156c939dcce042fa9049494a8 /generic/tclStubInit.c | |
| parent | 63224df965c165226da5226eba2d0036d0b6d2b3 (diff) | |
| parent | a27cc004d279f6e156c70540cee7c5f68f315025 (diff) | |
| download | tcl-7172ae907187d2ca151b9834bdc2f2e6e05ad2d8.zip tcl-7172ae907187d2ca151b9834bdc2f2e6e05ad2d8.tar.gz tcl-7172ae907187d2ca151b9834bdc2f2e6e05ad2d8.tar.bz2 | |
merge core-8-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 d26b67c..10ca66b 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -54,7 +54,9 @@ # define TclWinFlushDirtyChannels doNothing # define TclWinResetInterfaces doNothing +#if TCL_UTF_MAX < 4 static Tcl_Encoding winTCharEncoding; +#endif static int TclpIsAtty(int fd) @@ -66,7 +68,7 @@ void *TclWinGetTclInstance() { void *hInstance = NULL; GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (const char *)&winTCharEncoding, &hInstance); + (const char *)&TclpIsAtty, &hInstance); return hInstance; } @@ -102,11 +104,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 * @@ -115,11 +130,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) |