Merge trunk.

Convert Tcl_SetVar/Tcl_UnsetVar/Tcl_GetVar/Tcl_TraceVar to macros, calling the *2 variants of the function. No change of functionality.

1 files changed, 34 insertions, 11 deletions

diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 05c5e2a..3f953ce 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -11,8 +11,9 @@
  */
 
 #undef STATIC_BUILD
-#undef USE_TCL_STUBS
-#define USE_TCL_STUBS
+#ifndef USE_TCL_STUBS
+#   define USE_TCL_STUBS
+#endif
 #include "tclInt.h"
 #include <dde.h>
 #include <ddeml.h>
@@ -574,13 +575,21 @@ ExecuteRemoteObject(
 	    Tcl_GetObjResult(riPtr->interp));
 
     if (result == TCL_ERROR) {
-	Tcl_Obj *errorObjPtr = Tcl_GetVar2Ex(riPtr->interp, "errorCode", NULL,
+	Tcl_Obj *errorObjPtr;
+	Tcl_Obj *varName = Tcl_NewStringObj("errorCode", -1);
+
+	Tcl_IncrRefCount(varName);
+	errorObjPtr = Tcl_ObjGetVar2(riPtr->interp, varName, NULL,
 		TCL_GLOBAL_ONLY);
+	Tcl_DecrRefCount(varName);
 	if (errorObjPtr) {
 	    Tcl_ListObjAppendElement(NULL, returnPackagePtr, errorObjPtr);
 	}
-	errorObjPtr = Tcl_GetVar2Ex(riPtr->interp, "errorInfo", NULL,
+	varName = Tcl_NewStringObj("errorInfo", -1);
+	Tcl_IncrRefCount(varName);
+	errorObjPtr = Tcl_ObjGetVar2(riPtr->interp, varName, NULL,
 		TCL_GLOBAL_ONLY);
+	Tcl_DecrRefCount(varName);
 	if (errorObjPtr) {
 	    Tcl_ListObjAppendElement(NULL, returnPackagePtr, errorObjPtr);
 	}
@@ -753,10 +762,15 @@ DdeServerProc(
 		} else {
 		    Tcl_DString ds;
 		    Tcl_Obj *variableObjPtr;
+		    Tcl_Obj *varName;
+
 		    Tcl_WinTCharToUtf(utilString, -1, &ds);
-		    variableObjPtr = Tcl_GetVar2Ex(
-			    convPtr->riPtr->interp, Tcl_DStringValue(&ds), NULL,
+		    varName = Tcl_NewStringObj(Tcl_DStringValue(&ds), -1);
+		    Tcl_IncrRefCount(varName);
+		    variableObjPtr = Tcl_ObjGetVar2(
+			    convPtr->riPtr->interp, varName, NULL,
 			    TCL_GLOBAL_ONLY);
+		    Tcl_DecrRefCount(varName);
 		    if (variableObjPtr != NULL) {
 			if (uFmt == CF_TEXT) {
 			    returnString = Tcl_GetStringFromObj(
@@ -801,6 +815,7 @@ DdeServerProc(
 	if (convPtr && !Tcl_IsSafe(convPtr->riPtr->interp)) {
 	    Tcl_DString ds;
 	    Tcl_Obj *variableObjPtr;
+	    Tcl_Obj *varName;
 
 	    len = DdeQueryString(ddeInstance, ddeItem, NULL, 0, CP_WINUNICODE);
 	    Tcl_DStringInit(&dString);
@@ -816,9 +831,11 @@ DdeServerProc(
 		variableObjPtr = Tcl_NewUnicodeObj(utilString, -1);
 	    }
 
-	    Tcl_SetVar2Ex(convPtr->riPtr->interp, Tcl_DStringValue(&ds), NULL,
+	    varName = Tcl_NewStringObj(Tcl_DStringValue(&ds), -1);
+	    Tcl_IncrRefCount(varName);
+	    Tcl_ObjSetVar2(convPtr->riPtr->interp, varName, NULL,
 		    variableObjPtr, TCL_GLOBAL_ONLY);
-
+	    Tcl_DecrRefCount(varName);
 	    Tcl_DStringFree(&ds);
 	    Tcl_DStringFree(&dString);
 		ddeReturn = (HDDEDATA) DDE_FACK;
@@ -1733,20 +1750,26 @@ DdeObjCmd(
 	    }
 	    if (interp != sendInterp) {
 		if (result == TCL_ERROR) {
+		    Tcl_Obj *varName;
 		    /*
 		     * An error occurred, so transfer error information from
 		     * the destination interpreter back to our interpreter.
 		     */
 
 		    Tcl_ResetResult(interp);
-		    objPtr = Tcl_GetVar2Ex(sendInterp, "errorInfo", NULL,
+		    varName = Tcl_NewStringObj("errorInfo", -1);
+			Tcl_IncrRefCount(varName);
+		    objPtr = Tcl_ObjGetVar2(sendInterp, varName, NULL,
 			    TCL_GLOBAL_ONLY);
+		    Tcl_DecrRefCount(varName);
 		    if (objPtr) {
 			Tcl_AppendObjToErrorInfo(interp, objPtr);
 		    }
-
-		    objPtr = Tcl_GetVar2Ex(sendInterp, "errorCode", NULL,
+		    varName = Tcl_NewStringObj("errorCode", -1);
+			Tcl_IncrRefCount(varName);
+		    objPtr = Tcl_ObjGetVar2(sendInterp, varName, NULL,
 			    TCL_GLOBAL_ONLY);
+		    Tcl_DecrRefCount(varName);
 		    if (objPtr) {
 			Tcl_SetObjErrorCode(interp, objPtr);
 		    }