Tcl Source Code

2012-05-09  Jan Nijtmans  <[email protected]>

	* win/tclWinDde.c:    [Bug 473946]: special characters not correctly sent

2012-05-02  Jan Nijtmans  <[email protected]>

	* generic/configure.in:    Better detection and implementation for cpuid
	* generic/configure:       instruction on Intel-derived processors, both
	* generic/tclUnixCompat.c: 32-bit and 64-bit.
	* generic/tclTest.c:       Move cpuid testcase from win-specific to generic
	* win/tclWinTest.c:        tests, as it should work on all Intel-related

int Tcl_DdeObjCmd(ClientData clientData,	/* Used only for deletion */
	Tcl_Interp *interp,		/* The interp we are sending from */
	int objc,			/* Number of arguments */
	Tcl_Obj *CONST objv[]);	/* The arguments */

EXTERN int Dde_Init(Tcl_Interp *interp);

/*
 * The following structures allow us to select between the Unicode and ASCII
 * interfaces at run time based on whether Unicode APIs are available.  The
 * Unicode APIs are preferable because they will handle characters outside
 * of the current code page.
 */

typedef struct DdeWinProcs {
    int uFmt;
} DdeWinProcs;

static DdeWinProcs *ddeWinProcs;

static DdeWinProcs asciiProcs = {
    CF_TEXT
};

static DdeWinProcs unicodeProcs = {
    CF_UNICODETEXT
};

/*
 *----------------------------------------------------------------------
 *
 * Dde_Init --
 *
 *	This procedure initializes the dde command.
 *

int
Dde_Init(
    Tcl_Interp *interp)
{
    if (!Tcl_InitStubs(interp, "8.0", 0)) {
	return TCL_ERROR;
    }
    /*
     * Determine if the unicode interfaces are available and select the
     * appropriate dde function table.
     */

    if (TclWinGetPlatformId() == VER_PLATFORM_WIN32_NT) {
	ddeWinProcs = &unicodeProcs;
    } else {
	ddeWinProcs = &asciiProcs;
    }

    Tcl_CreateObjCommand(interp, "dde", Tcl_DdeObjCmd, NULL, NULL);

    Tcl_CreateExitHandler(DdeExitProc, NULL);

    return Tcl_PkgProvide(interp, TCL_DDE_PACKAGE_NAME, TCL_DDE_VERSION);
}

	    /*
	     * This could be either a request for a value of a Tcl variable,
	     * or it could be the send command requesting the results of the
	     * last execute.
	     */

	    if ((uFmt != CF_TEXT) && (uFmt != ddeWinProcs->uFmt)) {
		return (HDDEDATA) FALSE;
	    }

	    ddeReturn = (HDDEDATA) FALSE;
	    for (convPtr = tsdPtr->currentConversations; (convPtr != NULL)
		    && (convPtr->hConv != hConv); convPtr = convPtr->nextPtr) {
		/*

		Tcl_DStringSetLength(&dString, len);
		utilString = Tcl_DStringValue(&dString);
		DdeQueryString(ddeInstance, ddeItem, utilString, 
                        (DWORD) len + 1, CP_WINANSI);
		if (stricmp(utilString, "$TCLEVAL$EXECUTE$RESULT") == 0) {
		    returnString =
		        Tcl_GetStringFromObj(convPtr->returnPackagePtr, &len);
		    if (uFmt == CF_UNICODETEXT) {
			Tcl_DStringFree(&dString);
		    returnString =
				Tcl_WinUtfToTChar(returnString, len, &dString);
			len = Tcl_DStringLength(&dString) + 1;
		    }
		    ddeReturn = DdeCreateDataHandle(ddeInstance,
		    		(BYTE *)returnString, (DWORD) len+1, 0, ddeItem, uFmt,
			    0);
		} else {
		    Tcl_Obj *variableObjPtr = Tcl_GetVar2Ex(
			    convPtr->riPtr->interp, utilString, NULL, 
			    TCL_GLOBAL_ONLY);
		    if (variableObjPtr != NULL) {
			returnString = Tcl_GetStringFromObj(variableObjPtr,
				&len);
			if (uFmt == CF_UNICODETEXT) {
			    Tcl_DStringFree(&dString);
		    returnString =
				    Tcl_WinUtfToTChar(returnString, len, &dString);
				    len = Tcl_DStringLength(&dString) + 1;
			}
			ddeReturn = DdeCreateDataHandle(ddeInstance,
					(BYTE *)returnString, (DWORD) len+1, 0, ddeItem,
				uFmt, 0);
		    } else {
			ddeReturn = NULL;
		    }
		}
		Tcl_DStringFree(&dString);
	    }
	    return ddeReturn;