summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win/tclWinFile.c6
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 <nijtmans@users.sf.net>
+
+ * win/tclWinFile.c: [Bug 3185609] File normalization
+ corner case of ... broken with -DUNICODE
+
2011-03-11 Donal K. Fellows <dkf@users.sf.net>
* 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.