github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10585 from akallabeth/x11-clip-cache-fix

Browse Source 
[client,x11] fix clipboard cache
This commit is contained in:
akallabeth 2024-09-10 14:31:25 +02:00 committed by GitHub
commit ba7465abf5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/X11/xf_cliprdr.c
View File

@ -1338,6 +1338,17 @@ void xf_cliprdr_clear_cached_data(xfClipboard* clipboard)
ClipboardUnlock(clipboard->system); ClipboardUnlock(clipboard->system);
} }
static void* format_to_cache_slot(UINT32 format)
{
union
{
uintptr_t uptr;
void* vptr;
} cnv;
cnv.uptr = 0x100000000ULL + format;
return cnv.vptr;
}
static UINT32 get_dst_format_id_for_local_request(xfClipboard* clipboard, static UINT32 get_dst_format_id_for_local_request(xfClipboard* clipboard,
const xfCliprdrFormat* format) const xfCliprdrFormat* format)
{ {
@ -1452,7 +1463,7 @@ static xfCachedData* convert_data_from_existing_raw_data(xfClipboard* clipboard,
return NULL; return NULL;
} }
if (!HashTable_Insert(clipboard->cachedData, (void*)(UINT_PTR)dstFormatId, cached_data)) if (!HashTable_Insert(clipboard->cachedData, format_to_cache_slot(dstFormatId), cached_data))
{ {
WLog_WARN(TAG, "Failed to cache clipboard data"); WLog_WARN(TAG, "Failed to cache clipboard data");
xf_cached_data_free(cached_data); xf_cached_data_free(cached_data);
@ -1547,11 +1558,11 @@ static BOOL xf_cliprdr_process_selection_request(xfClipboard* clipboard,
DEBUG_CLIPRDR("formatId: %u, dstFormatId: %u", formatId, dstFormatId); DEBUG_CLIPRDR("formatId: %u, dstFormatId: %u", formatId, dstFormatId);
if (!rawTransfer) if (!rawTransfer)
cached_data = cached_data = HashTable_GetItemValue(clipboard->cachedData,
HashTable_GetItemValue(clipboard->cachedData, (void*)(UINT_PTR)dstFormatId); format_to_cache_slot(dstFormatId));
else else
cached_data = cached_data = HashTable_GetItemValue(clipboard->cachedRawData,
HashTable_GetItemValue(clipboard->cachedRawData, (void*)(UINT_PTR)formatId); format_to_cache_slot(formatId));
DEBUG_CLIPRDR("hasCachedData: %u, rawTransfer: %u", cached_data ? 1 : 0, rawTransfer); DEBUG_CLIPRDR("hasCachedData: %u, rawTransfer: %u", cached_data ? 1 : 0, rawTransfer);
@ -2290,7 +2301,8 @@ xf_cliprdr_server_format_data_response(CliprdrClientContext* context,
free(pDstData); free(pDstData);
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
} }
if (!HashTable_Insert(clipboard->cachedData, (void*)(UINT_PTR)dstFormatId, cached_data)) if (!HashTable_Insert(clipboard->cachedData, format_to_cache_slot(dstFormatId),
cached_data))
{ {
WLog_WARN(TAG, "Failed to cache clipboard data"); WLog_WARN(TAG, "Failed to cache clipboard data");
xf_cached_data_free(cached_data); xf_cached_data_free(cached_data);