From 0d3106376c20bbe48cba344885fcad371b72b50f Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sat, 12 Mar 2011 00:52:22 +0000 Subject: [Bug 3185609] File normalization corner case of ... broken with -DUNICODE --- ChangeLog | 5 +++++ win/tclWinFile.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 088a51f..99c6758 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-03-12 Jan Nijtmans + + * win/tclWinFile.c: [Bug 3185609] File normalization + corner case of ... broken with -DUNICODE + 2011-03-11 Donal K. Fellows * tests/unixInit.test: Make better use of tcltest2. diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 34be41f..620c454 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -2776,9 +2776,9 @@ TclpObjNormalizePath( * path segment and continue. */ - Tcl_DStringAppend(&dsNorm, (const char *) - ((WCHAR *)(nativePath + Tcl_DStringLength(&ds)) - - dotLen), (int)(dotLen * sizeof(WCHAR))); + Tcl_DStringAppend(&dsNorm, + ((const char *) nativePath) + Tcl_DStringLength(&ds) + - (dotLen * sizeof(TCHAR)), (int)(dotLen * sizeof(TCHAR))); } else { /* * Normal path. -- cgit v0.12