diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-09 11:25:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-09 11:25:29 (GMT) |
| commit | c582be3c0f71b3545bb5ad4c4e7509fddd547586 (patch) | |
| tree | 50590849f17448d69e2a07794f34df7c4e738d0e /win/tkWinSendCom.c | |
| parent | 87e7625c3c920df32eff50d6d50e98ba73bf495b (diff) | |
| parent | 3764526f9b0411b4d6f7b469aa0c12d7c0b1771a (diff) | |
| download | tk-c582be3c0f71b3545bb5ad4c4e7509fddd547586.zip tk-c582be3c0f71b3545bb5ad4c4e7509fddd547586.tar.gz tk-c582be3c0f71b3545bb5ad4c4e7509fddd547586.tar.bz2 | |
Merge trunk
Diffstat (limited to 'win/tkWinSendCom.c')
| -rw-r--r-- | win/tkWinSendCom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win/tkWinSendCom.c b/win/tkWinSendCom.c index ebeef1e..5cd57d5 100644 --- a/win/tkWinSendCom.c +++ b/win/tkWinSendCom.c @@ -386,7 +386,7 @@ Async( Tcl_Obj *scriptPtr; Tcl_DStringInit(&ds); - Tcl_UniCharToUtfDString(vCmd.bstrVal, SysStringLen(vCmd.bstrVal), &ds); + Tcl_WCharToUtfDString(vCmd.bstrVal, SysStringLen(vCmd.bstrVal), &ds); scriptPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds)); Tcl_DStringFree(&ds); @@ -427,7 +427,7 @@ Send( HRESULT hr = S_OK; int result = TCL_OK; VARIANT v; - register Tcl_Interp *interp = obj->interp; + Tcl_Interp *interp = obj->interp; Tcl_Obj *scriptPtr; Tcl_DString ds; @@ -441,7 +441,7 @@ Send( } Tcl_DStringInit(&ds); - Tcl_UniCharToUtfDString(v.bstrVal, SysStringLen(v.bstrVal), &ds); + Tcl_WCharToUtfDString(v.bstrVal, SysStringLen(v.bstrVal), &ds); scriptPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds)); Tcl_DStringFree(&ds); Tcl_Preserve(interp); @@ -458,7 +458,7 @@ Send( obj = Tcl_GetObjResult(interp); src = Tcl_GetString(obj); Tcl_DStringInit(&ds); - Tcl_UtfToUniCharDString(src, obj->length, &ds); + Tcl_UtfToWCharDString(src, obj->length, &ds); pvResult->bstrVal = SysAllocString((WCHAR *) Tcl_DStringValue(&ds)); Tcl_DStringFree(&ds); } |