diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-03-06 10:24:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-03-06 10:24:15 (GMT) |
| commit | cfa443421bcf235f75def81bc137774aa0f20387 (patch) | |
| tree | 185503e31f58c5df016f0ea4b20389f408d8bea5 /win | |
| parent | 40e214cd76ab0f9fe274bb7a27b56a40194254f7 (diff) | |
| download | tcl-cfa443421bcf235f75def81bc137774aa0f20387.zip tcl-cfa443421bcf235f75def81bc137774aa0f20387.tar.gz tcl-cfa443421bcf235f75def81bc137774aa0f20387.tar.bz2 | |
Tcl_WinTCharToUtf() is deprecated, so use Tcl_WCharToUtfDString() in stead.
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWinFile.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/win/tclWinFile.c b/win/tclWinFile.c index a54077d..c7159b7 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -1476,24 +1476,22 @@ TclpGetUserHome( */ ptr = TclpGetUserName(&ds); if (ptr != NULL && strcasecmp(name, ptr) == 0) { - HANDLE hProcess; - WCHAR buf[MAX_PATH]; - DWORD nChars = sizeof(buf) / sizeof(buf[0]); - /* Sadly GetCurrentProcessToken not in Win 7 so slightly longer */ - hProcess = GetCurrentProcess(); /* Need not be closed */ - if (hProcess) { - HANDLE hToken; - if (OpenProcessToken(hProcess, TOKEN_QUERY, &hToken)) { - if (GetUserProfileDirectoryW(hToken, buf, &nChars)) { - Tcl_WinTCharToUtf((TCHAR *)buf, - (nChars-1)*sizeof(WCHAR), - bufferPtr); - result = Tcl_DStringValue(bufferPtr); - rc = 1; - } - CloseHandle(hToken); - } - } + HANDLE hProcess; + WCHAR buf[MAX_PATH]; + DWORD nChars = sizeof(buf) / sizeof(buf[0]); + /* Sadly GetCurrentProcessToken not in Win 7 so slightly longer */ + hProcess = GetCurrentProcess(); /* Need not be closed */ + if (hProcess) { + HANDLE hToken; + if (OpenProcessToken(hProcess, TOKEN_QUERY, &hToken)) { + if (GetUserProfileDirectoryW(hToken, buf, &nChars)) { + Tcl_DStringInit(bufferPtr); + result = Tcl_WCharToUtfDString(buf, nChars-1, (bufferPtr)); + rc = 1; + } + CloseHandle(hToken); + } + } } Tcl_DStringFree(&ds); } else { |