Fix Bug #3545367: DDE test failures

It turns out that "dde poke" had the same bug, unfortunately we cannot make a test-case for that.
Also modified more test-cases to use unicode variable names, so we can more reliably detect this

2 files changed, 28 insertions, 18 deletions

diff --git a/tests/winDde.test b/tests/winDde.test
index 9e0b20a..01fb54c 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -139,25 +139,25 @@ test winDde-3.2 {DDE execute -async locally} -constraints dde -body {
     set \xe1
 } -result foo
 test winDde-3.3 {DDE request locally} -constraints dde -body {
-    set a ""
-    dde execute TclEval self [list set a foo]
-    dde request TclEval self a
+    set \xe1 ""
+    dde execute TclEval self [list set \xe1 foo]
+    dde request TclEval self \xe1
 } -result foo
 test winDde-3.4 {DDE eval locally} -constraints dde -body {
     set \xe1 ""
     dde eval self set \xe1 foo
 } -result foo
 test winDde-3.5 {DDE request locally} -constraints dde -body {
-    set a ""
-    dde execute TclEval self [list set a foo]
-    dde request -binary TclEval self a
+    set \xe1 ""
+    dde execute TclEval self [list set \xe1 foo]
+    dde request -binary TclEval self \xe1
 } -result "foo\x00"
 # Set variable a to A with diaeresis (unicode C4) by relying on the fact
 # that utf8 is sent (e.g. "c3 84" on the wire)
 test winDde-3.6 {DDE request utf8} -constraints dde -body {
-    set a "not set"
-    dde execute TclEval self "set a \xc4"
-    scan $a %c
+    set \xe1 "not set"
+    dde execute TclEval self "set \xe1 \xc4"
+    scan [set \xe1] %c
 } -result 196
 # Set variable a to A with diaeresis (unicode C4) using binary execute
 # and compose utf-8 (e.g. "c3 84" ) manualy
@@ -189,23 +189,23 @@ test winDde-4.2 {DDE execute async remotely} -constraints {dde stdio} -body {
     set \xe1
 } -result ""
 test winDde-4.3 {DDE request remotely} -constraints {dde stdio} -body {
-    set a ""
+    set \xe1 ""
     set name ch\xEDld-4.3
     set child [createChildProcess $name]
     dde execute TclEval $name [list set a foo]
-    set a [dde request TclEval $name a]
+    set \xe1 [dde request TclEval $name a]
     dde execute TclEval $name {set done 1}
     update
-    set a
+    set \xe1
 } -result foo
 test winDde-4.4 {DDE eval remotely} -constraints {dde stdio} -body {
-    set a ""
+    set \xe1 ""
     set name ch\xEDld-4.4
     set child [createChildProcess $name]
-    set a [dde eval $name set a foo]
+    set \xe1 [dde eval $name set a foo]
     dde execute TclEval $name {set done 1}
     update
-    set a
+    set \xe1
 }  -result foo
 
 # -------------------------------------------------------------------------
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index da583da..1cd6c46 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -1483,8 +1483,13 @@ DdeObjCmd(
 	break;
     }
     case DDE_REQUEST: {
-	const char *itemString = Tcl_GetStringFromObj(objv[firstArg + 2],
+#ifdef UNICODE
+	const TCHAR *itemString = (TCHAR *) Tcl_GetUnicodeFromObj(objv[firstArg + 2],
+		&length);
+#else
+	const TCHAR *itemString = Tcl_GetStringFromObj(objv[firstArg + 2],
 		&length);
+#endif
 
 	if (length == 0) {
 	    Tcl_SetObjResult(interp,
@@ -1503,7 +1508,7 @@ DdeObjCmd(
 	} else {
 	    Tcl_Obj *returnObjPtr;
 	    ddeItem = DdeCreateStringHandle(ddeInstance, (void *) itemString,
-		    CP_WINANSI);
+		    CP_WINUNICODE);
 	    if (ddeItem != NULL) {
 		ddeData = DdeClientTransaction(NULL, 0, hConv, ddeItem,
 			CF_TEXT, XTYP_REQUEST, 5000, NULL);
@@ -1537,8 +1542,13 @@ DdeObjCmd(
 	break;
     }
     case DDE_POKE: {
-	const char *itemString = Tcl_GetStringFromObj(objv[firstArg + 2],
+#ifdef UNICODE
+	const TCHAR *itemString = (TCHAR *) Tcl_GetUnicodeFromObj(objv[firstArg + 2],
+		&length);
+#else
+	const TCHAR *itemString = Tcl_GetStringFromObj(objv[firstArg + 2],
 		&length);
+#endif
 	BYTE *dataString;
 
 	if (length == 0) {