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

[warnings] fix -Wc++20-designator

Browse Source
This commit is contained in:
akallabeth 2025-01-20 11:37:12 +01:00
parent bb5bd928c9
commit e25d00fceb
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,9 +238,9 @@ bool sdlClip::handle_update(const SDL_ClipboardEvent& ev)
clientFormats.erase(u, clientFormats.end()); clientFormats.erase(u, clientFormats.end());
const CLIPRDR_FORMAT_LIST formatList = { const CLIPRDR_FORMAT_LIST formatList = {
.common = { .msgType = CB_FORMAT_LIST, .msgFlags = 0, .dataLen = 0 }, { CB_FORMAT_LIST, 0, 0 },
.numFormats = static_cast<UINT32>(clientFormats.size()), static_cast<UINT32>(clientFormats.size()),
.formats = clientFormats.data(), clientFormats.data(),
}; };
WLog_Print(_log, WLOG_TRACE, WLog_Print(_log, WLOG_TRACE,
@ -283,15 +283,11 @@ UINT sdlClip::MonitorReady(CliprdrClientContext* context, const CLIPRDR_MONITOR_
UINT sdlClip::SendClientCapabilities() UINT sdlClip::SendClientCapabilities()
{ {
CLIPRDR_GENERAL_CAPABILITY_SET generalCapabilitySet = { CLIPRDR_GENERAL_CAPABILITY_SET generalCapabilitySet = {
.capabilitySetType = CB_CAPSTYPE_GENERAL, CB_CAPSTYPE_GENERAL, 12, CB_CAPS_VERSION_2,
.capabilitySetLength = 12, CB_USE_LONG_FORMAT_NAMES | cliprdr_file_context_current_flags(_file)
.version = CB_CAPS_VERSION_2,
.generalFlags = CB_USE_LONG_FORMAT_NAMES | cliprdr_file_context_current_flags(_file)
}; };
CLIPRDR_CAPABILITIES capabilities = { const CLIPRDR_CAPABILITIES capabilities = {
.common = { .msgType = CB_TYPE_NONE, .msgFlags = 0, .dataLen = 0 }, { CB_TYPE_NONE, 0, 0 }, 1, reinterpret_cast<CLIPRDR_CAPABILITY_SET*>(&generalCapabilitySet)
.cCapabilitiesSets = 1,
.capabilitySets = reinterpret_cast<CLIPRDR_CAPABILITY_SET*>(&generalCapabilitySet)
}; };
WINPR_ASSERT(_ctx); WINPR_ASSERT(_ctx);
@ -308,9 +304,8 @@ void sdlClip::clearServerFormats()
UINT sdlClip::SendFormatListResponse(BOOL status) UINT sdlClip::SendFormatListResponse(BOOL status)
{ {
const CLIPRDR_FORMAT_LIST_RESPONSE formatListResponse = { const CLIPRDR_FORMAT_LIST_RESPONSE formatListResponse = {
.common = { .msgType = CB_FORMAT_LIST_RESPONSE, { CB_FORMAT_LIST_RESPONSE, static_cast<UINT16>(status ? CB_RESPONSE_OK : CB_RESPONSE_FAIL),
.msgFlags = static_cast<UINT16>(status ? CB_RESPONSE_OK : CB_RESPONSE_FAIL), 0 }
.dataLen = 0 }
}; };
WINPR_ASSERT(_ctx); WINPR_ASSERT(_ctx);
WINPR_ASSERT(_ctx->ClientFormatListResponse); WINPR_ASSERT(_ctx->ClientFormatListResponse);
@ -335,10 +330,7 @@ UINT sdlClip::SendDataResponse(const BYTE* data, size_t size)
UINT sdlClip::SendDataRequest(uint32_t formatID, const std::string& mime) UINT sdlClip::SendDataRequest(uint32_t formatID, const std::string& mime)
{ {
CLIPRDR_FORMAT_DATA_REQUEST request = { const CLIPRDR_FORMAT_DATA_REQUEST request = { { CB_TYPE_NONE, 0, 0 }, formatID };
.common = { .msgType = CB_TYPE_NONE, .msgFlags = 0, .dataLen = 0 },
.requestedFormatId = formatID
};
_request_queue.emplace(formatID, mime); _request_queue.emplace(formatID, mime);