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

[c23] simplify boolean checks

Browse Source
This commit is contained in:
Armin Novak
2026-02-24 21:44:33 +01:00
parent f9ad8dd488
commit e58819830a
134 changed files with 505 additions and 944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/Sample/sf_encomsp.c
View File

@@ -36,8 +36,5 @@ BOOL sf_peer_encomsp_init(testPeerContext* context)
context->encomsp->rdpcontext = &context->_p;
WINPR_ASSERT(context->encomsp->Start);
if (context->encomsp->Start(context->encomsp) != CHANNEL_RC_OK)
return FALSE;
return TRUE;
return (context->encomsp->Start(context->encomsp) == CHANNEL_RC_OK);
}

7
server/Sample/sf_rdpsnd.c
View File

@@ -53,10 +53,5 @@ BOOL sf_peer_rdpsnd_init(testPeerContext* context)
context->rdpsnd->Activated = sf_peer_rdpsnd_activated;
WINPR_ASSERT(context->rdpsnd->Initialize);
if (context->rdpsnd->Initialize(context->rdpsnd, TRUE) != CHANNEL_RC_OK)
{
return FALSE;
}
return TRUE;
return (context->rdpsnd->Initialize(context->rdpsnd, TRUE) == CHANNEL_RC_OK);
}

10
server/proxy/channels/pf_channel_drdynvc.c
View File

@@ -434,8 +434,8 @@ static PfChannelResult DynvcTrackerHandleCreateBack(ChannelStateTracker* tracker
dynChannel->openStatus = CHANNEL_OPENSTATE_WAITING_OPEN_STATUS;
const BOOL firstPacket = (flags & CHANNEL_FLAG_FIRST) ? TRUE : FALSE;
const BOOL lastPacket = (flags & CHANNEL_FLAG_LAST) ? TRUE : FALSE;
const BOOL firstPacket = (flags & CHANNEL_FLAG_FIRST) != 0;
const BOOL lastPacket = (flags & CHANNEL_FLAG_LAST) != 0;
// NOLINTNEXTLINE(clang-analyzer-unix.Malloc): HashTable_Insert owns dynChannel
return channelTracker_flushCurrent(tracker, firstPacket, lastPacket, FALSE);
@@ -463,8 +463,8 @@ static PfChannelResult DynvcTrackerHandleCreateFront(ChannelStateTracker* tracke
if (dynChannel && (creationStatus == 0))
dynChannel->openStatus = CHANNEL_OPENSTATE_OPENED;
const BOOL firstPacket = (flags & CHANNEL_FLAG_FIRST) ? TRUE : FALSE;
const BOOL lastPacket = (flags & CHANNEL_FLAG_LAST) ? TRUE : FALSE;
const BOOL firstPacket = (flags & CHANNEL_FLAG_FIRST) != 0;
const BOOL lastPacket = (flags & CHANNEL_FLAG_LAST) != 0;
return channelTracker_flushCurrent(tracker, firstPacket, lastPacket, TRUE);
}
@@ -482,7 +482,7 @@ static PfChannelResult DynvcTrackerHandleCreate(ChannelStateTracker* tracker, wS
(DynChannelContext*)channelTracker_getCustomData(tracker);
WINPR_ASSERT(dynChannelContext);
const BOOL lastPacket = (flags & CHANNEL_FLAG_LAST) ? TRUE : FALSE;
const BOOL lastPacket = (flags & CHANNEL_FLAG_LAST) != 0;
const BOOL isBackData = (tracker == dynChannelContext->backTracker);
proxyData* pdata = channelTracker_getPData(tracker);

18
server/proxy/channels/pf_channel_rdpdr.c
View File

@@ -473,7 +473,7 @@ static UINT rdpdr_process_client_name_request(pf_channel_server_context* rdpdr,
return ERROR_INVALID_DATA;
Stream_Read_UINT32(s, unicodeFlag);
rdpdr->common.computerNameUnicode = ((unicodeFlag & 1) != 0) ? TRUE : FALSE;
rdpdr->common.computerNameUnicode = ((unicodeFlag & 1) != 0);
Stream_Read_UINT32(s, codePage);
WINPR_UNUSED(codePage); /* Field is ignored */
@@ -694,9 +694,7 @@ static BOOL rdpdr_write_printer_capset(wLog* log, pf_channel_common_context* rdp
const RDPDR_CAPABILITY_HEADER header = { CAP_PRINTER_TYPE, 8,
rdpdr->capabilityVersions[CAP_PRINTER_TYPE] };
if (rdpdr_write_capset_header(log, s, &header) != CHANNEL_RC_OK)
return FALSE;
return TRUE;
return (rdpdr_write_capset_header(log, s, &header) == CHANNEL_RC_OK);
}
WINPR_ATTR_NODISCARD
@@ -707,9 +705,7 @@ static BOOL rdpdr_write_port_capset(wLog* log, pf_channel_common_context* rdpdr,
const RDPDR_CAPABILITY_HEADER header = { CAP_PORT_TYPE, 8,
rdpdr->capabilityVersions[CAP_PORT_TYPE] };
if (rdpdr_write_capset_header(log, s, &header) != CHANNEL_RC_OK)
return FALSE;
return TRUE;
return (rdpdr_write_capset_header(log, s, &header) == CHANNEL_RC_OK);
}
WINPR_ATTR_NODISCARD
@@ -720,9 +716,7 @@ static BOOL rdpdr_write_drive_capset(wLog* log, pf_channel_common_context* rdpdr
const RDPDR_CAPABILITY_HEADER header = { CAP_DRIVE_TYPE, 8,
rdpdr->capabilityVersions[CAP_DRIVE_TYPE] };
if (rdpdr_write_capset_header(log, s, &header) != CHANNEL_RC_OK)
return FALSE;
return TRUE;
return (rdpdr_write_capset_header(log, s, &header) == CHANNEL_RC_OK);
}
WINPR_ATTR_NODISCARD
@@ -733,9 +727,7 @@ static BOOL rdpdr_write_smartcard_capset(wLog* log, pf_channel_common_context* r
const RDPDR_CAPABILITY_HEADER header = { CAP_SMARTCARD_TYPE, 8,
rdpdr->capabilityVersions[CAP_SMARTCARD_TYPE] };
if (rdpdr_write_capset_header(log, s, &header) != CHANNEL_RC_OK)
return FALSE;
return TRUE;
return (rdpdr_write_capset_header(log, s, &header) == CHANNEL_RC_OK);
}
WINPR_ATTR_NODISCARD

5
server/proxy/pf_client.c
View File

@@ -67,10 +67,7 @@ static BOOL proxy_server_reactivate(rdpContext* ps, const rdpContext* pc)
* which causes the reactivation.
*/
WINPR_ASSERT(ps->update);
if (!ps->update->DesktopResize(ps))
return FALSE;
return TRUE;
return (ps->update->DesktopResize(ps));
}
static void pf_client_on_error_info(void* ctx, const ErrorInfoEventArgs* e)

5
server/proxy/pf_config.c
View File

@@ -203,10 +203,7 @@ static BOOL pf_config_get_bool(wIniFile* ini, const char* section, const char* k
num_value = IniFile_GetKeyValueInt(ini, section, key);
if (num_value != 0)
return TRUE;
return FALSE;
return (num_value != 0);
}
WINPR_ATTR_NODISCARD

8
server/proxy/pf_server.c
View File

@@ -393,9 +393,7 @@ static BOOL pf_server_logon(freerdp_peer* peer, const SEC_WINNT_AUTH_IDENTITY* i
info.identity = identity;
info.automatic = automatic;
if (!pf_modules_run_filter(pdata->module, FILTER_TYPE_SERVER_PEER_LOGON, pdata, &info))
return FALSE;
return TRUE;
return (pf_modules_run_filter(pdata->module, FILTER_TYPE_SERVER_PEER_LOGON, pdata, &info));
}
WINPR_ATTR_NODISCARD
@@ -571,9 +569,7 @@ static BOOL pf_server_initialize_peer_connection(freerdp_peer* peer)
pdata->server_receive_channel_data_original = peer->ReceiveChannelData;
peer->ReceiveChannelData = pf_server_receive_channel_data_hook;
if (!stream_dump_register_handlers(peer->context, CONNECTION_STATE_NEGO, TRUE))
return FALSE;
return TRUE;
return (stream_dump_register_handlers(peer->context, CONNECTION_STATE_NEGO, TRUE));
}
/**

34
server/shadow/shadow_client.c
View File

@@ -426,11 +426,8 @@ static inline BOOL shadow_client_recalc_desktop_size(rdpShadowClient* client)
WINPR_ASSERT(width <= UINT16_MAX);
WINPR_ASSERT(height >= 0);
WINPR_ASSERT(height <= UINT16_MAX);
if (freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth) != (UINT32)width ||
freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight) != (UINT32)height)
return TRUE;
return FALSE;
return (freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth) != (UINT32)width ||
freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight) != (UINT32)height);
}
WINPR_ATTR_NODISCARD
@@ -693,7 +690,7 @@ static BOOL shadow_client_suppress_output(rdpContext* context, BYTE allow, const
WINPR_ASSERT(client);
client->suppressOutput = allow ? FALSE : TRUE;
client->suppressOutput = !(allow);
if (allow)
{
@@ -725,7 +722,7 @@ static BOOL shadow_client_activate(freerdp_peer* peer)
shadow_reset_desktop_resize(client);
client->activated = TRUE;
client->inLobby = client->mayView ? FALSE : TRUE;
client->inLobby = !(client->mayView);
if (shadow_encoder_reset(client->encoder) < 0)
{
@@ -935,7 +932,7 @@ static BOOL shadow_client_caps_test_version(RdpgfxServerContext* context, rdpSha
flags = pdu.capsSet->flags;
if (!freerdp_settings_set_bool(clientSettings, FreeRDP_GfxSmallCache,
(flags & RDPGFX_CAPS_FLAG_SMALL_CACHE) ? TRUE : FALSE))
(flags & RDPGFX_CAPS_FLAG_SMALL_CACHE) != 0))
return FALSE;
avc444v2 = avc444 = !(flags & RDPGFX_CAPS_FLAG_AVC_DISABLED);
@@ -1080,12 +1077,10 @@ static UINT shadow_client_rdpgfx_caps_advertise(RdpgfxServerContext* context,
return rc;
if (!freerdp_settings_set_bool(clientSettings, FreeRDP_GfxThinClient,
(flags & RDPGFX_CAPS_FLAG_THINCLIENT) ? TRUE
: FALSE))
(flags & RDPGFX_CAPS_FLAG_THINCLIENT) != 0))
return rc;
if (!freerdp_settings_set_bool(clientSettings, FreeRDP_GfxSmallCache,
(flags & RDPGFX_CAPS_FLAG_SMALL_CACHE) ? TRUE
: FALSE))
(flags & RDPGFX_CAPS_FLAG_SMALL_CACHE) != 0))
return rc;
#ifndef WITH_GFX_H264
@@ -1096,9 +1091,8 @@ static UINT shadow_client_rdpgfx_caps_advertise(RdpgfxServerContext* context,
if (h264)
{
if (!freerdp_settings_set_bool(
clientSettings, FreeRDP_GfxH264,
(flags & RDPGFX_CAPS_FLAG_AVC420_ENABLED) ? TRUE : FALSE))
if (!freerdp_settings_set_bool(clientSettings, FreeRDP_GfxH264,
(flags & RDPGFX_CAPS_FLAG_AVC420_ENABLED) != 0))
return rc;
}
else
@@ -1134,12 +1128,10 @@ static UINT shadow_client_rdpgfx_caps_advertise(RdpgfxServerContext* context,
return rc;
if (!freerdp_settings_set_bool(clientSettings, FreeRDP_GfxThinClient,
(flags & RDPGFX_CAPS_FLAG_THINCLIENT) ? TRUE
: FALSE))
(flags & RDPGFX_CAPS_FLAG_THINCLIENT) != 0))
return rc;
if (!freerdp_settings_set_bool(clientSettings, FreeRDP_GfxSmallCache,
(flags & RDPGFX_CAPS_FLAG_SMALL_CACHE) ? TRUE
: FALSE))
(flags & RDPGFX_CAPS_FLAG_SMALL_CACHE) != 0))
return rc;
return shadow_client_send_caps_confirm(context, client, &pdu);
@@ -1621,8 +1613,8 @@ static BOOL shadow_client_send_surface_bits(rdpShadowClient* client, BYTE* pSrcD
WINPR_ASSERT(Stream_GetPosition(s) <= UINT32_MAX);
cmd.bmp.bitmapDataLength = (UINT32)Stream_GetPosition(s);
cmd.bmp.bitmapData = Stream_Buffer(s);
first = (i == 0) ? TRUE : FALSE;
last = ((i + 1) == numMessages) ? TRUE : FALSE;
first = (i == 0);
last = ((i + 1) == numMessages);
if (!encoder->frameAck)
IFCALLRET(update->SurfaceBits, ret, update->context, &cmd);

6
server/shadow/shadow_encomsp.c
View File

@@ -46,8 +46,8 @@ encomsp_change_participant_control_level(EncomspServerContext* context,
"ChangeParticipantControlLevel: ParticipantId: %" PRIu32 " Flags: 0x%04" PRIX16 "",
pdu->ParticipantId, pdu->Flags);
mayView = (pdu->Flags & ENCOMSP_MAY_VIEW) ? TRUE : FALSE;
mayInteract = (pdu->Flags & ENCOMSP_MAY_INTERACT) ? TRUE : FALSE;
mayView = (pdu->Flags & ENCOMSP_MAY_VIEW) != 0;
mayInteract = (pdu->Flags & ENCOMSP_MAY_INTERACT) != 0;
if (mayInteract && !mayView)
mayView = TRUE; /* may interact implies may view */
@@ -90,7 +90,7 @@ encomsp_change_participant_control_level(EncomspServerContext* context,
}
}
inLobby = client->mayView ? FALSE : TRUE;
inLobby = !(client->mayView);
if (inLobby != client->inLobby)
{

53
server/shadow/shadow_server.c
View File

@@ -272,23 +272,23 @@ int shadow_server_parse_command_line(rdpShadowServer* server, int argc, char** a
}
CommandLineSwitchCase(arg, "may-view")
{
server->mayView = arg->Value ? TRUE : FALSE;
server->mayView = arg->Value != NULL;
}
CommandLineSwitchCase(arg, "bitmap-compat")
{
server->SupportMultiRectBitmapUpdates = arg->Value ? FALSE : TRUE;
server->SupportMultiRectBitmapUpdates = arg->Value == NULL;
}
CommandLineSwitchCase(arg, "may-interact")
{
server->mayInteract = arg->Value ? TRUE : FALSE;
server->mayInteract = arg->Value != NULL;
}
CommandLineSwitchCase(arg, "server-side-cursor")
{
server->ShowMouseCursor = arg->Value ? TRUE : FALSE;
server->ShowMouseCursor = arg->Value != NULL;
}
CommandLineSwitchCase(arg, "mouse-relative")
{
const BOOL val = arg->Value ? TRUE : FALSE;
const BOOL val = arg->Value != NULL;
if (!freerdp_settings_set_bool(settings, FreeRDP_MouseUseRelativeMove, val) ||
!freerdp_settings_set_bool(settings, FreeRDP_HasRelativeMouseEvent, val))
return fail_at(arg, COMMAND_LINE_ERROR);
@@ -383,24 +383,23 @@ int shadow_server_parse_command_line(rdpShadowServer* server, int argc, char** a
}
CommandLineSwitchCase(arg, "auth")
{
server->authentication = arg->Value ? TRUE : FALSE;
server->authentication = arg->Value != NULL;
}
CommandLineSwitchCase(arg, "remote-guard")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteCredentialGuard,
arg->Value ? TRUE : FALSE))
arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "restricted-admin")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_RestrictedAdminModeSupported,
arg->Value ? TRUE : FALSE))
arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "vmconnect")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_VmConnectMode,
arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_VmConnectMode, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "sec")
@@ -459,26 +458,22 @@ int shadow_server_parse_command_line(rdpShadowServer* server, int argc, char** a
}
CommandLineSwitchCase(arg, "sec-rdp")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_RdpSecurity,
arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_RdpSecurity, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "sec-tls")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_TlsSecurity,
arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_TlsSecurity, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "sec-nla")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_NlaSecurity,
arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_NlaSecurity, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "sec-ext")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_ExtSecurity,
arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_ExtSecurity, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "sam-file")
@@ -500,49 +495,45 @@ int shadow_server_parse_command_line(rdpShadowServer* server, int argc, char** a
}
CommandLineSwitchCase(arg, "nsc")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_NSCodec, arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_NSCodec, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "rfx")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteFxCodec,
arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteFxCodec, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "gfx")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_SupportGraphicsPipeline,
arg->Value ? TRUE : FALSE))
arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "gfx-progressive")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_GfxProgressive,
arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_GfxProgressive, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "gfx-rfx")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteFxCodec,
arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteFxCodec, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "gfx-planar")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_GfxPlanar, arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_GfxPlanar, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "gfx-avc420")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_GfxH264, arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_GfxH264, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "gfx-avc444")
{
if (!freerdp_settings_set_bool(settings, FreeRDP_GfxAVC444v2,
arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_GfxAVC444v2, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
if (!freerdp_settings_set_bool(settings, FreeRDP_GfxAVC444, arg->Value ? TRUE : FALSE))
if (!freerdp_settings_set_bool(settings, FreeRDP_GfxAVC444, arg->Value != NULL))
return fail_at(arg, COMMAND_LINE_ERROR);
}
CommandLineSwitchCase(arg, "keytab")