diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-11-11 16:09:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-11-11 16:09:04 (GMT) |
| commit | a5d30054463139d7b5aaf7f1c965190f3b88f0c4 (patch) | |
| tree | b473e92ac388c4637baa9017caad81da2d974edf /win/tclWinFile.c | |
| parent | f84d09bdd759fbee98108d0a097f322255fdf0e3 (diff) | |
| download | tcl-werner_utf_max_6.zip tcl-werner_utf_max_6.tar.gz tcl-werner_utf_max_6.tar.bz2 | |
Patches by Christian Werner, supporting TCL_UTF_MAX=6 on Windows. Doesn't work yet, but it's a start.werner_utf_max_6
Diffstat (limited to 'win/tclWinFile.c')
| -rwxr-xr-x | win/tclWinFile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 25c6ea4..ae684f3 100755 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -1449,18 +1449,18 @@ TclpGetUserHome( domain = strchr(name, '@'); if (domain != NULL) { Tcl_DStringInit(&ds); - wName = Tcl_UtfToUniCharDString(domain + 1, -1, &ds); + wName = (WCHAR *) Tcl_WinUtfToTChar(domain + 1, -1, &ds); badDomain = NetGetDCName(NULL, wName, (LPBYTE *) wDomainPtr); Tcl_DStringFree(&ds); nameLen = domain - name; } if (badDomain == 0) { Tcl_DStringInit(&ds); - wName = Tcl_UtfToUniCharDString(name, nameLen, &ds); + wName = (WCHAR *) Tcl_WinUtfToTChar(name, nameLen, &ds); if (NetUserGetInfo(wDomain, wName, 1, (LPBYTE *) uiPtrPtr) == 0) { wHomeDir = uiPtr->usri1_home_dir; if ((wHomeDir != NULL) && (wHomeDir[0] != L'\0')) { - Tcl_UniCharToUtfDString(wHomeDir, lstrlenW(wHomeDir), + Tcl_WinTCharToUtf((TCHAR *) wHomeDir, lstrlenW(wHomeDir), bufferPtr); } else { /* @@ -1472,7 +1472,7 @@ TclpGetUserHome( for (i = 0; i < size; ++i){ if (buf[i] == '\\') buf[i] = '/'; } - Tcl_UniCharToUtfDString(buf, size-1, bufferPtr); + Tcl_WinTCharToUtf(buf, size-1, bufferPtr); Tcl_DStringAppend(bufferPtr, "/", -1); Tcl_DStringAppend(bufferPtr, name, -1); } |