fix for bug bug-3525762

1 files changed, 50 insertions, 27 deletions

diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index d3c9b85..9f6a41e 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -13,8 +13,6 @@
 #undef STATIC_BUILD
 #undef USE_TCL_STUBS
 #define USE_TCL_STUBS
-#undef UNICODE
-#undef _UNICODE
 #include "tclInt.h"
 #include <dde.h>
 #include <ddeml.h>
@@ -22,6 +20,10 @@
 #ifndef UNICODE
 #   undef CP_WINUNICODE
 #   define CP_WINUNICODE CP_WINANSI
+#   undef Tcl_WinTCharToUtf
+#   define Tcl_WinTCharToUtf(a,b,c) Tcl_UtfToExternalDString(NULL,a,b,c)
+#   undef Tcl_WinUtfToTChar
+#   define Tcl_WinUtfToTChar(a,b,c) Tcl_ExternalToUtfDString(NULL,a,b,c)
 #endif
 
 /*
@@ -345,7 +347,9 @@ DdeSetServerName(
 		    &srvPtrPtr);
 	}
 	if (r != TCL_OK) {
-	    OutputDebugString(Tcl_GetStringResult(interp));
+	    Tcl_WinUtfToTChar(Tcl_GetStringResult(interp), -1, &dString);
+	    OutputDebugString((TCHAR *) Tcl_DStringValue(&dString));
+	    Tcl_DStringFree(&dString);
 	    return NULL;
 	}
 
@@ -362,13 +366,13 @@ DdeSetServerName(
 	    lastSuffix = suffix;
 	    if (suffix > 1) {
 		if (suffix == 2) {
-		    Tcl_DStringAppend(&dString, name, -1);
-		    Tcl_DStringAppend(&dString, " #", 2);
+		    Tcl_DStringAppend(&dString, (char *)name, _tcslen(name) * sizeof(TCHAR));
+		    Tcl_DStringAppend(&dString, (char *)TEXT(" #"), 2 * sizeof(TCHAR));
 		    offset = Tcl_DStringLength(&dString);
-		    Tcl_DStringSetLength(&dString, offset + TCL_INTEGER_SPACE);
-		    actualName = Tcl_DStringValue(&dString);
+		    Tcl_DStringSetLength(&dString, offset + sizeof(TCHAR) * TCL_INTEGER_SPACE);
+		    actualName = (TCHAR *) Tcl_DStringValue(&dString);
 		}
-		sprintf(Tcl_DStringValue(&dString) + offset, "%d", suffix);
+		_stprintf((TCHAR *) (Tcl_DStringValue(&dString) + offset), TEXT("%d"), suffix);
 	    }
 
 	    /*
@@ -377,16 +381,18 @@ DdeSetServerName(
 
 	    for (n = 0; n < srvCount; ++n) {
 		Tcl_Obj* namePtr;
+		Tcl_DString ds;
 
 		Tcl_ListObjIndex(interp, srvPtrPtr[n], 1, &namePtr);
-		if (_tcscmp(actualName, Tcl_GetString(namePtr)) == 0) {
+	    Tcl_WinUtfToTChar(Tcl_GetString(namePtr), -1, &ds);
+		if (_tcscmp(actualName, (TCHAR *)Tcl_DStringValue(&ds)) == 0) {
 		    suffix++;
+		    Tcl_DStringFree(&ds);
 		    break;
 		}
+		Tcl_DStringFree(&ds);
 	    }
 	}
-	Tcl_DStringSetLength(&dString,
-		offset + (int)strlen(Tcl_DStringValue(&dString)+offset));
     }
 
     /*
@@ -745,8 +751,11 @@ DdeServerProc(
 		if (Tcl_IsSafe(convPtr->riPtr->interp)) {
 		    ddeReturn = NULL;
 		} else {
-		    Tcl_Obj *variableObjPtr = Tcl_GetVar2Ex(
-			    convPtr->riPtr->interp, utilString, NULL,
+		    Tcl_DString ds;
+		    Tcl_Obj *variableObjPtr;
+		    Tcl_WinTCharToUtf(utilString, -1, &ds);
+		    variableObjPtr = Tcl_GetVar2Ex(
+			    convPtr->riPtr->interp, Tcl_DStringValue(&ds), NULL,
 			    TCL_GLOBAL_ONLY);
 		    if (variableObjPtr != NULL) {
 			if (uFmt == CF_TEXT) {
@@ -763,6 +772,7 @@ DdeServerProc(
 		    } else {
 			ddeReturn = NULL;
 		    }
+		    Tcl_DStringFree(&ds);
 		}
 	    }
 	    Tcl_DStringFree(&dString);
@@ -776,7 +786,7 @@ DdeServerProc(
 	 */
 
 	Tcl_Obj *returnPackagePtr;
-	Tcl_UniChar *uniStr;
+	char *string;
 
 	for (convPtr = tsdPtr->currentConversations; (convPtr != NULL)
 		&& (convPtr->hConv != hConv); convPtr = convPtr->nextPtr) {
@@ -790,20 +800,20 @@ DdeServerProc(
 	}
 
 	utilString = (TCHAR *) DdeAccessData(hData, &dlen);
-	uniStr = (Tcl_UniChar *) utilString;
+	string = (char *) utilString;
 	if (!dlen) {
 	    /* Empty binary array. */
 	    ddeObjectPtr = Tcl_NewObj();
-	} else if ((dlen & 1) || uniStr[(dlen>>1)-1]) {
+	} else if ((dlen & 1) || utilString[(dlen>>1)-1]) {
 	    /* Cannot be unicode, so assume utf-8 */
-	    if (!utilString[dlen-1]) {
+	    if (!string[dlen-1]) {
 		dlen--;
 	    }
-	    ddeObjectPtr = Tcl_NewStringObj(utilString, dlen);
+	    ddeObjectPtr = Tcl_NewStringObj(string, dlen);
 	} else {
 	    /* unicode */
 	    dlen >>= 1;
-	    ddeObjectPtr = Tcl_NewUnicodeObj(uniStr, dlen - 1);
+	    ddeObjectPtr = Tcl_NewUnicodeObj((Tcl_UniChar *)utilString, dlen - 1);
 	}
 	Tcl_IncrRefCount(ddeObjectPtr);
 	DdeUnaccessData(hData);
@@ -1024,6 +1034,7 @@ DdeServicesOnAck(
     ATOM topic = (ATOM)HIWORD(lParam);
     struct DdeEnumServices *es;
     TCHAR sz[255];
+    Tcl_DString dString;
 
 #ifdef _WIN64
     es = (struct DdeEnumServices *) GetWindowLongPtr(hwnd, GWLP_USERDATA);
@@ -1037,9 +1048,13 @@ DdeServicesOnAck(
 	Tcl_Obj *resultPtr = Tcl_GetObjResult(es->interp);
 
 	GlobalGetAtomName(service, sz, 255);
-	Tcl_ListObjAppendElement(NULL, matchPtr, Tcl_NewStringObj(sz, -1));
+	Tcl_WinTCharToUtf(sz, -1, &dString);
+	Tcl_ListObjAppendElement(NULL, matchPtr, Tcl_NewStringObj(Tcl_DStringValue(&dString), -1));
+	Tcl_DStringFree(&dString);
 	GlobalGetAtomName(topic, sz, 255);
-	Tcl_ListObjAppendElement(NULL, matchPtr, Tcl_NewStringObj(sz, -1));
+	Tcl_WinTCharToUtf(sz, -1, &dString);
+	Tcl_ListObjAppendElement(NULL, matchPtr, Tcl_NewStringObj(Tcl_DStringValue(&dString), -1));
+	Tcl_DStringFree(&dString);
 
 	/*
 	 * Adding the hwnd as a third list element provides a unique
@@ -1368,7 +1383,11 @@ DdeObjCmd(
     Initialize();
 
     if (firstArg != 1) {
+#ifdef UNICODE
+	serviceName = Tcl_GetUnicodeFromObj(objv[firstArg], &length);
+#else
 	serviceName = Tcl_GetStringFromObj(objv[firstArg], &length);
+#endif
     } else {
 	length = 0;
     }
@@ -1381,7 +1400,11 @@ DdeObjCmd(
     }
 
     if ((index != DDE_SERVERNAME) && (index != DDE_EVAL)) {
+#ifdef UNICODE
+	topicName = (TCHAR *) Tcl_GetUnicodeFromObj(objv[firstArg + 1], &length);
+#else
 	topicName = Tcl_GetStringFromObj(objv[firstArg + 1], &length);
+#endif
 	if (length == 0) {
 	    topicName = NULL;
 	} else {
@@ -1395,7 +1418,7 @@ DdeObjCmd(
 	serviceName = DdeSetServerName(interp, serviceName, flags,
 		handlerPtr);
 	if (serviceName != NULL) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(serviceName, -1));
+	    Tcl_SetObjResult(interp, Tcl_NewUnicodeObj((Tcl_UniChar *) serviceName, -1));
 	} else {
 	    Tcl_ResetResult(interp);
 	}
@@ -1403,18 +1426,18 @@ DdeObjCmd(
 
     case DDE_EXECUTE: {
 	int dataLength;
-	BYTE *dataString;
+	const char *dataString;
 
 	if (flags & DDE_FLAG_BINARY) {
-	    dataString = (BYTE *)
+	    dataString = (const char *)
 		    Tcl_GetByteArrayFromObj(objv[firstArg + 2], &dataLength);
 	} else {
-	    dataString = (BYTE *)
+	    dataString =
 		    Tcl_GetStringFromObj(objv[firstArg + 2], &dataLength);
 	    dataLength += 1;
 	}
 
-	if (dataLength <= ((flags & DDE_FLAG_BINARY) ? 0 : sizeof(TCHAR))) {
+	if (dataLength <= ((flags & DDE_FLAG_BINARY) ? 0 : (int)sizeof(TCHAR))) {
 	    Tcl_SetObjResult(interp,
 		    Tcl_NewStringObj("cannot execute null data", -1));
 	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", NULL);
@@ -1431,7 +1454,7 @@ DdeObjCmd(
 	    break;
 	}
 
-	ddeData = DdeCreateDataHandle(ddeInstance, dataString,
+	ddeData = DdeCreateDataHandle(ddeInstance, (BYTE *) dataString,
 		(DWORD) dataLength, 0, 0, CF_TEXT, 0);
 	if (ddeData != NULL) {
 	    if (flags & DDE_FLAG_ASYNC) {