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/tkWinSend.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/tkWinSend.c')
| -rw-r--r-- | win/tkWinSend.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/win/tkWinSend.c b/win/tkWinSend.c index 748ebaf..8968255 100644 --- a/win/tkWinSend.c +++ b/win/tkWinSend.c @@ -255,7 +255,7 @@ TkGetInterpNames( Tcl_DString ds; Tcl_DStringInit(&ds); - Tcl_UniCharToUtfDString(p + 1, wcslen(p + 1), &ds); + Tcl_WCharToUtfDString(p + 1, wcslen(p + 1), &ds); result = Tcl_ListObjAppendElement(interp, objList, Tcl_NewStringObj(Tcl_DStringValue(&ds), @@ -621,7 +621,7 @@ BuildMoniker( Tcl_DString dString; Tcl_DStringInit(&dString); - Tcl_UtfToUniCharDString(name, -1, &dString); + Tcl_UtfToWCharDString(name, -1, &dString); hr = CreateFileMoniker((LPOLESTR)Tcl_DStringValue(&dString), &pmkItem); Tcl_DStringFree(&dString); if (SUCCEEDED(hr)) { @@ -764,7 +764,7 @@ Send( vCmd.vt = VT_BSTR; src = Tcl_GetString(cmd); Tcl_DStringInit(&ds); - Tcl_UtfToUniCharDString(src, cmd->length, &ds); + Tcl_UtfToWCharDString(src, cmd->length, &ds); vCmd.bstrVal = SysAllocString((WCHAR *) Tcl_DStringValue(&ds)); Tcl_DStringFree(&ds); @@ -788,7 +788,7 @@ Send( ehr = VariantChangeType(&vResult, &vResult, 0, VT_BSTR); if (SUCCEEDED(ehr)) { Tcl_DStringInit(&ds); - Tcl_UniCharToUtfDString(vResult.bstrVal, SysStringLen(vResult.bstrVal), &ds); + Tcl_WCharToUtfDString(vResult.bstrVal, SysStringLen(vResult.bstrVal), &ds); Tcl_DStringResult(interp, &ds); } @@ -802,7 +802,7 @@ Send( Tcl_Obj *opError, *opErrorCode, *opErrorInfo; Tcl_DStringInit(&ds); - Tcl_UniCharToUtfDString(ei.bstrSource, SysStringLen(ei.bstrSource), &ds); + Tcl_WCharToUtfDString(ei.bstrSource, SysStringLen(ei.bstrSource), &ds); opError = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds)); Tcl_DStringFree(&ds); @@ -874,13 +874,13 @@ TkWinSend_SetExcepInfo( src = Tcl_GetString(opError); Tcl_DStringInit(&ds); - Tcl_UtfToUniCharDString(src, opError->length, &ds); + Tcl_UtfToWCharDString(src, opError->length, &ds); pExcepInfo->bstrDescription = SysAllocString((WCHAR *) Tcl_DStringValue(&ds)); Tcl_DStringFree(&ds); src = Tcl_GetString(opErrorCode); Tcl_DStringInit(&ds); - Tcl_UtfToUniCharDString(src, opErrorCode->length, &ds); + Tcl_UtfToWCharDString(src, opErrorCode->length, &ds); pExcepInfo->bstrSource = SysAllocString((WCHAR *) Tcl_DStringValue(&ds)); Tcl_DStringFree(&ds); |