Changeset 81223 in vbox for trunk/src/VBox/Additions/darwin
- Timestamp:
- Oct 11, 2019 12:06:49 PM (6 years ago)
- svn:sync-xref-src-repo-rev:
- 133910
- Location:
- trunk/src/VBox/Additions/darwin/VBoxClient
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClientClipboardGuestToHost.cpp
r80847 r81223 222 222 223 223 size_t cwcActual; /* (includes a schwarzenegger character) */ 224 int rc = vboxClipboardUtf16GetWinSize(pwszData, cbData / sizeof(RTUTF16), &cwcActual);224 int rc = ShClUtf16GetWinSize(pwszData, cbData / sizeof(RTUTF16), &cwcActual); 225 225 AssertReturn(RT_SUCCESS(rc), rc); 226 226 … … 228 228 AssertReturn(pwszWinTmp, VERR_NO_MEMORY); 229 229 230 rc = vboxClipboardUtf16LinToWin(pwszData, cbData / sizeof(RTUTF16), pwszWinTmp, cwcActual);230 rc = ShClUtf16LinToWin(pwszData, cbData / sizeof(RTUTF16), pwszWinTmp, cwcActual); 231 231 if (RT_SUCCESS(rc)) 232 232 rc = vbclClipboardHostPasteData(u32ClientId, VBOX_SHCL_FMT_UNICODETEXT, … … 250 250 const void *pvDib; 251 251 size_t cbDib; 252 int rc = vboxClipboardBmpGetDib(pvData, cbData, &pvDib, &cbDib);252 int rc = ShClBmpGetDib(pvData, cbData, &pvDib, &cbDib); 253 253 AssertRCReturn(rc, rc); 254 254 -
trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClientClipboardHostToGuest.cpp
r80847 r81223 169 169 170 170 /* Convert END-OF-LINE */ 171 rc = vboxClipboardUtf16GetLinSize((RTUTF16 *)pData, cbDataSize / 2, &cbActualLen);171 rc = ShClUtf16GetLinSize((RTUTF16 *)pData, cbDataSize / 2, &cbActualLen); 172 172 AssertReturn(RT_SUCCESS(rc), rc); 173 173 pDataInternal = (RTUTF16 *)RTMemAlloc(cbActualLen * 2); 174 174 AssertReturn(pDataInternal, VERR_NO_MEMORY); 175 rc = vboxClipboardUtf16WinToLin((RTUTF16 *)pData, cbDataSize / 2, pDataInternal, cbActualLen);175 rc = ShClUtf16WinToLin((RTUTF16 *)pData, cbDataSize / 2, pDataInternal, cbActualLen); 176 176 177 177 /* Do actual paste */ … … 217 217 AssertReturn(cbDataSize > 0, VINF_SUCCESS); 218 218 219 rc = vboxClipboardDibToBmp(pData, cbDataSize, &pBmp, &cbBmpSize);219 rc = ShClDibToBmp(pData, cbDataSize, &pBmp, &cbBmpSize); 220 220 AssertReturn(RT_SUCCESS(rc), rc); 221 221
Note:
See TracChangeset
for help on using the changeset viewer.