summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-06 07:40:47 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-06 07:40:47 (GMT)
commit22298666ade7c7396ece86e2976309e955e9abd5 (patch)
treed9af3e73a3058e77a5fcd08ed1b848553da8e23d /win
parentaa7ab9ce5eba66a61032dc91795617354ca8c05f (diff)
parent6b4abc4554709c11344edd658305f417fa9c4929 (diff)
downloadtcl-22298666ade7c7396ece86e2976309e955e9abd5.zip
tcl-22298666ade7c7396ece86e2976309e955e9abd5.tar.gz
tcl-22298666ade7c7396ece86e2976309e955e9abd5.tar.bz2
Reference to correct Bug #number.
Fix warning in winDde.c, and more test-cases using Unicode characters
Diffstat (limited to 'win')
-rw-r--r--win/tclWinDde.c10
-rw-r--r--win/tclWinPort.h2
2 files changed, 10 insertions, 2 deletions
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