summaryrefslogtreecommitdiffstats
path: root/win/tclWinDde.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-02 12:08:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-02 12:08:37 (GMT)
commit33bcb6e718ec30da522f10e0388743eafab975c7 (patch)
tree77b059089eb70cf671ae3bf5930fda9cf184e04b /win/tclWinDde.c
parentb368bda168f6c601da96e6caa9b6d7bc8ba98fc5 (diff)
parent3546e128c0c379f71d6fdf6678ad19cd9d0a0265 (diff)
downloadtcl-33bcb6e718ec30da522f10e0388743eafab975c7.zip
tcl-33bcb6e718ec30da522f10e0388743eafab975c7.tar.gz
tcl-33bcb6e718ec30da522f10e0388743eafab975c7.tar.bz2
merge trunk
Diffstat (limited to 'win/tclWinDde.c')
-rw-r--r--win/tclWinDde.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 1e485f9..b3c8326 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,
@@ -1538,8 +1543,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) {