Reference to correct Bug #number.

Fix warning in winDde.c, and more test-cases using Unicode characters

7 files changed, 18 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index dfe776c..709981f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -948,7 +948,7 @@
 
 2011-11-22  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* win/tclWinPort.h: [Bug 2935503]: Windows: [file mtime] sets wrong
+	* win/tclWinPort.h: [Bug 3354324]: Windows: [file mtime] sets wrong
 	* win/tclWinFile.c: time (VS2005+ only).
 	* generic/tclTest.c:
 
diff --git a/changes b/changes
index 78673db..1430f8c 100644
--- a/changes
+++ b/changes
@@ -7995,7 +7995,7 @@ like "nano()" instead of parsing as "nan o()" with missing op (duquette,porter)
 
 2011-10-31 (bug fix)[3414754] EIAS violation in fs paths (porter)
 
-2011-11-22 (bug fix)[2935503] Win: [file mtime] sets wrong time (nijtmans)
+2011-11-22 (bug fix)[3354324] Win: [file mtime] sets wrong time (nijtmans)
 
 2011-11-30 (bug fix)[967195] Simply args passed to child processes (nijtmans)
 => tcltest 2.3.4
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index 032dda7..6611480 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef _WIN64
-/* See [Bug 2935503]: file mtime sets wrong time */
+/* See [Bug 3354324]: file mtime sets wrong time */
 #   define _USE_32BIT_TIME_T
 #endif
 
diff --git a/generic/tclTest.c b/generic/tclTest.c
index b4192b2..aa5a46d 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef _WIN64
-/* See [Bug 2935503]: file mtime sets wrong time */
+/* See [Bug 3354324]: file mtime sets wrong time */
 #   define _USE_32BIT_TIME_T
 #endif
 
diff --git a/tests/winDde.test b/tests/winDde.test
index 01fb54c..8befa3c 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -162,9 +162,9 @@ test winDde-3.6 {DDE request utf8} -constraints dde -body {
 # Set variable a to A with diaeresis (unicode C4) using binary execute
 # and compose utf-8 (e.g. "c3 84" ) manualy
 test winDde-3.7 {DDE request binary} -constraints dde -body {
-    set a "not set"
-    dde execute -binary TclEval self [list set a \xc3\x84\x00]
-    scan $a %c
+    set \xe1 "not set"
+    dde execute -binary TclEval self [list set \xc3\xa1 \xc3\x84\x00]
+    scan [set \xe1] %c
 } -result 196
 
 # -------------------------------------------------------------------------
@@ -202,7 +202,7 @@ test winDde-4.4 {DDE eval remotely} -constraints {dde stdio} -body {
     set \xe1 ""
     set name ch\xEDld-4.4
     set child [createChildProcess $name]
-    set \xe1 [dde eval $name set a foo]
+    set \xe1 [dde eval $name set \xe1 foo]
     dde execute TclEval $name {set done 1}
     update
     set \xe1
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index e225989..7b9fbf4 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -948,8 +948,12 @@ MakeDdeConnection(
 
     if (ddeConv == (HCONV) NULL) {
 	if (interp != NULL) {
+	    Tcl_DString dString;
+
+	    Tcl_WinTCharToUtf(name, -1, &dString);
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "no registered server named \"%s\"", name));
+		    "no registered server named \"%s\"", Tcl_DStringValue(&dString)));
+	    Tcl_DStringFree(&dString);
 	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NO_SERVER", NULL);
 	}
 	return TCL_ERROR;
@@ -1425,7 +1429,11 @@ DdeObjCmd(
 	serviceName = DdeSetServerName(interp, serviceName, flags,
 		handlerPtr);
 	if (serviceName != NULL) {
+#ifdef UNICODE
 	    Tcl_SetObjResult(interp, Tcl_NewUnicodeObj((Tcl_UniChar *) serviceName, -1));
+#else
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(serviceName, -1));
+#endif
 	} else {
 	    Tcl_ResetResult(interp);
 	}
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index c262671..23e79b0 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -15,7 +15,7 @@
 #define _TCLWINPORT
 
 #ifndef _WIN64
-/* See [Bug 2935503]: file mtime sets wrong time */
+/* See [Bug 3354324]: file mtime sets wrong time */
 #   define _USE_32BIT_TIME_T
 #endif