morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11849 from akallabeth/sdl-clip-lock

Browse Source 
[client,sdl] improve clipboard logging
This commit is contained in:
akallabeth
2025-09-10 11:00:17 +02:00
committed by GitHub
parent bc6cb2d1d7 9b9fba6709
commit abdd85bcbd
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/SDL/SDL3/sdl_clip.cpp
View File

@@ -591,7 +591,7 @@ std::shared_ptr<BYTE> sdlClip::ReceiveFormatDataRequestHandle(
ClipboardGetFormatIdString(localFormatId), localFormatId,
ClipboardGetFormatName(clipboard->_system, localFormatId));
ClipboardLockGuard give_me_a_name(clipboard->_system);
ClipboardLockGuard systemlock(clipboard->_system);
std::lock_guard<CriticalSection> lock(clipboard->_lock);
const UINT32 fileFormatId =
@@ -724,7 +724,7 @@ UINT sdlClip::ReceiveFormatDataResponse(CliprdrClientContext* context,
cliprdr_file_context_get_context(static_cast<CliprdrFileContext*>(context->custom)));
WINPR_ASSERT(clipboard);
ClipboardLockGuard give_me_a_name(clipboard->_system);
ClipboardLockGuard systemlock(clipboard->_system);
std::lock_guard<CriticalSection> lock(clipboard->_lock);
if (clipboard->_request_queue.empty())
{
@@ -789,10 +789,15 @@ UINT sdlClip::ReceiveFormatDataResponse(CliprdrClientContext* context,
WLog_Print(clipboard->_log, WLOG_ERROR, "error when setting clipboard data");
return ERROR_INTERNAL_ERROR;
}
WLog_Print(clipboard->_log, WLOG_DEBUG, "updated clipboard data %s [0x%08" PRIx32 "]",
ClipboardGetFormatName(clipboard->_system, srcFormatId), srcFormatId);
} while (false);
if (!SetEvent(clipboard->_event))
{
WLog_Print(clipboard->_log, WLOG_ERROR, "error when setting clipboard event");
return ERROR_INTERNAL_ERROR;
}
return CHANNEL_RC_OK;
}
@@ -811,7 +816,7 @@ const void* sdlClip::ClipDataCb(void* userdata, const char* mime_type, size_t* s
mime_type = "text/plain";
{
ClipboardLockGuard give_me_a_name(clip->_system);
ClipboardLockGuard systemlock(clip->_system);
std::lock_guard<CriticalSection> lock(clip->_lock);
/* check if we already used this mime type */
@@ -841,8 +846,8 @@ const void* sdlClip::ClipDataCb(void* userdata, const char* mime_type, size_t* s
}
}
WLog_Print(clip->_log, WLOG_INFO, "requesting format %s [0x%08" PRIx32 "]", mime_type,
formatID);
WLog_Print(clip->_log, WLOG_DEBUG, "requesting format %s [%s 0x%08" PRIx32 "]", mime_type,
ClipboardGetFormatName(clip->_system, formatID), formatID);
if (clip->SendDataRequest(formatID, mime_type))
return nullptr;
}
@@ -865,7 +870,7 @@ const void* sdlClip::ClipDataCb(void* userdata, const char* mime_type, size_t* s
}
{
ClipboardLockGuard give_me_a_name(clip->_system);
ClipboardLockGuard systemlock(clip->_system);
std::lock_guard<CriticalSection> lock(clip->_lock);
auto request = clip->_request_queue.front();
clip->_request_queue.pop();