From e58819830a18b23eaac480871c7f810158901326 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 24 Feb 2026 21:44:33 +0100 Subject: [PATCH] [c23] simplify boolean checks --- channels/cliprdr/client/cliprdr_main.c | 20 +-- channels/cliprdr/cliprdr_common.c | 2 +- channels/cliprdr/server/cliprdr_main.c | 14 +- channels/drive/client/drive_file.c | 12 +- channels/rail/client/rail_orders.c | 4 +- channels/rail/rail_common.c | 2 +- channels/rail/server/rail_main.c | 4 +- channels/rdpdr/server/rdpdr_main.c | 2 +- channels/rdpear/common/ndr.c | 10 +- channels/rdpecam/client/v4l/uvc_h264.c | 5 +- channels/rdpei/rdpei_common.c | 4 +- channels/rdpsnd/client/pulse/rdpsnd_pulse.c | 5 +- .../urbdrc/client/libusb/libusb_udevman.c | 5 +- client/Sample/tf_freerdp.c | 5 +- client/Wayland/wlf_cliprdr.c | 9 +- client/Wayland/wlfreerdp.c | 10 +- client/X11/xf_client.c | 24 +-- client/X11/xf_cliprdr.c | 2 +- client/X11/xf_floatbar.c | 4 +- client/X11/xf_graphics.c | 5 +- client/X11/xf_input.c | 13 +- client/X11/xf_keyboard.c | 2 +- client/common/client_cliprdr_file.c | 14 +- client/common/cmdline.c | 14 +- client/common/file.c | 18 +-- include/freerdp/codec/color.h | 5 +- include/freerdp/scancode.h | 2 +- libfreerdp/codec/color.c | 8 +- libfreerdp/codec/dsp.c | 4 +- libfreerdp/codec/h264.c | 10 +- libfreerdp/codec/interleaved.c | 12 +- libfreerdp/codec/nsc.c | 9 +- libfreerdp/codec/planar.c | 17 +- libfreerdp/codec/progressive.c | 5 +- libfreerdp/codec/region.c | 6 +- .../codec/test/TestFreeRDPCodecPlanar.c | 4 +- .../codec/test/TestFreeRDPCodecProgressive.c | 8 +- libfreerdp/codec/yuv.c | 14 +- libfreerdp/common/settings.c | 34 ++-- libfreerdp/core/aad.c | 8 +- libfreerdp/core/capabilities.c | 75 ++++----- libfreerdp/core/connection.c | 26 +-- libfreerdp/core/credssp_auth.c | 2 +- libfreerdp/core/fastpath.c | 2 +- libfreerdp/core/gateway/arm.c | 2 +- libfreerdp/core/gateway/http.c | 35 +---- libfreerdp/core/gateway/rdg.c | 24 +-- libfreerdp/core/gateway/rts.c | 4 +- libfreerdp/core/gateway/tsg.c | 5 +- libfreerdp/core/gateway/websocket.c | 5 +- libfreerdp/core/gateway/wst.c | 14 +- libfreerdp/core/gcc.c | 61 +++----- libfreerdp/core/heartbeat.c | 5 +- libfreerdp/core/info.c | 30 ++-- libfreerdp/core/license.c | 15 +- libfreerdp/core/listener.c | 2 +- libfreerdp/core/mcs.c | 16 +- libfreerdp/core/nego.c | 10 +- libfreerdp/core/nla.c | 11 +- libfreerdp/core/orders.c | 148 ++++++++---------- libfreerdp/core/peer.c | 18 +-- libfreerdp/core/rdp.c | 2 +- libfreerdp/core/rdstls.c | 15 +- libfreerdp/core/server.c | 8 +- libfreerdp/core/smartcardlogon.c | 6 +- libfreerdp/core/test/TestSettings.c | 2 +- libfreerdp/core/tpdu.c | 4 +- libfreerdp/core/transport.c | 6 +- libfreerdp/core/update.c | 13 +- libfreerdp/crypto/ber.c | 2 +- libfreerdp/crypto/certificate.c | 3 + libfreerdp/crypto/er.c | 7 +- libfreerdp/gdi/bitmap.c | 5 +- libfreerdp/gdi/gfx.c | 3 +- libfreerdp/gdi/region.c | 9 +- libfreerdp/gdi/shape.c | 5 +- libfreerdp/primitives/prim_copy.c | 2 +- libfreerdp/primitives/primitives.c | 10 +- libfreerdp/primitives/sse/prim_copy_avx2.c | 2 +- libfreerdp/primitives/sse/prim_copy_sse4_1.c | 2 +- .../primitives/test/TestPrimitivesAdd.c | 12 +- .../primitives/test/TestPrimitivesAlphaComp.c | 9 +- .../primitives/test/TestPrimitivesAndOr.c | 8 +- .../primitives/test/TestPrimitivesColors.c | 11 +- .../primitives/test/TestPrimitivesShift.c | 30 +--- .../primitives/test/TestPrimitivesYUV.c | 4 +- libfreerdp/utils/pcap.c | 5 +- libfreerdp/utils/smartcard_call.c | 2 +- server/Sample/sf_encomsp.c | 5 +- server/Sample/sf_rdpsnd.c | 7 +- server/proxy/channels/pf_channel_drdynvc.c | 10 +- server/proxy/channels/pf_channel_rdpdr.c | 18 +-- server/proxy/pf_client.c | 5 +- server/proxy/pf_config.c | 5 +- server/proxy/pf_server.c | 8 +- server/shadow/shadow_client.c | 34 ++-- server/shadow/shadow_encomsp.c | 6 +- server/shadow/shadow_server.c | 53 +++---- winpr/libwinpr/comm/comm.c | 2 +- winpr/libwinpr/comm/comm_serial_sys.c | 7 +- winpr/libwinpr/crypto/hash.c | 23 +-- winpr/libwinpr/file/generic.c | 5 +- winpr/libwinpr/file/namedPipeClient.c | 5 +- .../file/test/TestFileFindFirstFile.c | 4 +- winpr/libwinpr/library/library.c | 5 +- winpr/libwinpr/path/path.c | 8 +- winpr/libwinpr/path/shell.c | 7 +- winpr/libwinpr/rpc/rpc.c | 2 +- winpr/libwinpr/smartcard/smartcard_pcsc.c | 4 +- winpr/libwinpr/sspi/NTLM/ntlm_compute.c | 15 +- winpr/libwinpr/sspi/NTLM/ntlm_message.c | 3 +- winpr/libwinpr/sspi/Negotiate/negotiate.c | 6 +- winpr/libwinpr/synch/barrier.c | 4 +- winpr/libwinpr/synch/timer.c | 2 +- winpr/libwinpr/utils/cmdline.c | 11 +- winpr/libwinpr/utils/collections/ArrayList.c | 2 +- winpr/libwinpr/utils/collections/LinkedList.c | 2 +- .../utils/collections/ListDictionary.c | 4 +- winpr/libwinpr/utils/ini.c | 4 +- winpr/libwinpr/utils/test/TestHashTable.c | 4 +- winpr/libwinpr/utils/test/TestImage.c | 2 +- winpr/libwinpr/utils/test/TestMessageQueue.c | 5 +- winpr/libwinpr/utils/test/TestQueue.c | 12 +- winpr/libwinpr/utils/test/TestStream.c | 4 +- winpr/libwinpr/utils/wlog/BinaryAppender.c | 5 +- winpr/libwinpr/utils/wlog/FileAppender.c | 18 +-- winpr/libwinpr/utils/wlog/ImageMessage.c | 10 +- winpr/libwinpr/utils/wlog/JournaldAppender.c | 10 ++ winpr/libwinpr/utils/wlog/Layout.c | 4 +- winpr/libwinpr/utils/wlog/PacketMessage.c | 16 +- winpr/libwinpr/utils/wlog/SyslogAppender.c | 10 +- winpr/libwinpr/utils/wlog/UdpAppender.c | 15 +- winpr/libwinpr/utils/wlog/wlog.c | 2 +- winpr/libwinpr/wtsapi/wtsapi.c | 4 +- 134 files changed, 505 insertions(+), 944 deletions(-) diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c index 82af509c4..d7d40330c 100644 --- a/channels/cliprdr/client/cliprdr_main.c +++ b/channels/cliprdr/client/cliprdr_main.c @@ -165,11 +165,11 @@ static UINT cliprdr_process_general_capability(cliprdrPlugin* cliprdr, wStream* cliprdr_print_general_capability_flags(cliprdr->log, generalFlags); - cliprdr->useLongFormatNames = (generalFlags & CB_USE_LONG_FORMAT_NAMES) ? TRUE : FALSE; - cliprdr->streamFileClipEnabled = (generalFlags & CB_STREAM_FILECLIP_ENABLED) ? TRUE : FALSE; - cliprdr->fileClipNoFilePaths = (generalFlags & CB_FILECLIP_NO_FILE_PATHS) ? TRUE : FALSE; - cliprdr->canLockClipData = (generalFlags & CB_CAN_LOCK_CLIPDATA) ? TRUE : FALSE; - cliprdr->hasHugeFileSupport = (generalFlags & CB_HUGE_FILE_SUPPORT_ENABLED) ? TRUE : FALSE; + cliprdr->useLongFormatNames = (generalFlags & CB_USE_LONG_FORMAT_NAMES) != 0; + cliprdr->streamFileClipEnabled = (generalFlags & CB_STREAM_FILECLIP_ENABLED) != 0; + cliprdr->fileClipNoFilePaths = (generalFlags & CB_FILECLIP_NO_FILE_PATHS) != 0; + cliprdr->canLockClipData = (generalFlags & CB_CAN_LOCK_CLIPDATA) != 0; + cliprdr->hasHugeFileSupport = (generalFlags & CB_HUGE_FILE_SUPPORT_ENABLED) != 0; cliprdr->capabilitiesReceived = TRUE; capabilities.common.msgType = CB_CLIP_CAPS; @@ -601,11 +601,11 @@ static UINT cliprdr_client_capabilities(CliprdrClientContext* context, if (!cliprdr->hasHugeFileSupport) flags &= (uint32_t)~CB_HUGE_FILE_SUPPORT_ENABLED; - cliprdr->useLongFormatNames = (flags & CB_USE_LONG_FORMAT_NAMES) ? TRUE : FALSE; - cliprdr->streamFileClipEnabled = (flags & CB_STREAM_FILECLIP_ENABLED) ? TRUE : FALSE; - cliprdr->fileClipNoFilePaths = (flags & CB_FILECLIP_NO_FILE_PATHS) ? TRUE : FALSE; - cliprdr->canLockClipData = (flags & CB_CAN_LOCK_CLIPDATA) ? TRUE : FALSE; - cliprdr->hasHugeFileSupport = (flags & CB_HUGE_FILE_SUPPORT_ENABLED) ? TRUE : FALSE; + cliprdr->useLongFormatNames = (flags & CB_USE_LONG_FORMAT_NAMES) != 0; + cliprdr->streamFileClipEnabled = (flags & CB_STREAM_FILECLIP_ENABLED) != 0; + cliprdr->fileClipNoFilePaths = (flags & CB_FILECLIP_NO_FILE_PATHS) != 0; + cliprdr->canLockClipData = (flags & CB_CAN_LOCK_CLIPDATA) != 0; + cliprdr->hasHugeFileSupport = (flags & CB_HUGE_FILE_SUPPORT_ENABLED) != 0; Stream_Write_UINT32(s, flags); /* generalFlags */ WLog_Print(cliprdr->log, WLOG_DEBUG, "ClientCapabilities"); diff --git a/channels/cliprdr/cliprdr_common.c b/channels/cliprdr/cliprdr_common.c index 68d1154ca..50b61b4ef 100644 --- a/channels/cliprdr/cliprdr_common.c +++ b/channels/cliprdr/cliprdr_common.c @@ -389,7 +389,7 @@ UINT cliprdr_read_format_list(wLog* log, wStream* s, CLIPRDR_FORMAT_LIST* format CLIPRDR_FORMAT* formats = NULL; UINT error = ERROR_INTERNAL_ERROR; - const BOOL asciiNames = (formatList->common.msgFlags & CB_ASCII_NAMES) ? TRUE : FALSE; + const BOOL asciiNames = (formatList->common.msgFlags & CB_ASCII_NAMES) != 0; index = 0; /* empty format list */ diff --git a/channels/cliprdr/server/cliprdr_main.c b/channels/cliprdr/server/cliprdr_main.c index f1a508ac7..375e8b1e9 100644 --- a/channels/cliprdr/server/cliprdr_main.c +++ b/channels/cliprdr/server/cliprdr_main.c @@ -479,23 +479,19 @@ static UINT cliprdr_server_receive_general_capability(CliprdrServerContext* cont Stream_Read_UINT32(s, cap_set->generalFlags); /* generalFlags (4 bytes) */ if (context->useLongFormatNames) - context->useLongFormatNames = - (cap_set->generalFlags & CB_USE_LONG_FORMAT_NAMES) ? TRUE : FALSE; + context->useLongFormatNames = (cap_set->generalFlags & CB_USE_LONG_FORMAT_NAMES) != 0; if (context->streamFileClipEnabled) - context->streamFileClipEnabled = - (cap_set->generalFlags & CB_STREAM_FILECLIP_ENABLED) ? TRUE : FALSE; + context->streamFileClipEnabled = (cap_set->generalFlags & CB_STREAM_FILECLIP_ENABLED) != 0; if (context->fileClipNoFilePaths) - context->fileClipNoFilePaths = - (cap_set->generalFlags & CB_FILECLIP_NO_FILE_PATHS) ? TRUE : FALSE; + context->fileClipNoFilePaths = (cap_set->generalFlags & CB_FILECLIP_NO_FILE_PATHS) != 0; if (context->canLockClipData) - context->canLockClipData = (cap_set->generalFlags & CB_CAN_LOCK_CLIPDATA) ? TRUE : FALSE; + context->canLockClipData = (cap_set->generalFlags & CB_CAN_LOCK_CLIPDATA) != 0; if (context->hasHugeFileSupport) - context->hasHugeFileSupport = - (cap_set->generalFlags & CB_HUGE_FILE_SUPPORT_ENABLED) ? TRUE : FALSE; + context->hasHugeFileSupport = (cap_set->generalFlags & CB_HUGE_FILE_SUPPORT_ENABLED) != 0; return CHANNEL_RC_OK; } diff --git a/channels/drive/client/drive_file.c b/channels/drive/client/drive_file.c index 913c7696c..a2b3a7834 100644 --- a/channels/drive/client/drive_file.c +++ b/channels/drive/client/drive_file.c @@ -227,7 +227,7 @@ static BOOL drive_file_init(DRIVE_FILE* file) } else { - file->is_dir = ((file->CreateOptions & FILE_DIRECTORY_FILE) ? TRUE : FALSE); + file->is_dir = ((file->CreateOptions & FILE_DIRECTORY_FILE) != 0); if (file->is_dir) { @@ -491,9 +491,8 @@ static BOOL drive_file_query_from_handle_information(const DRIVE_FILE* file, Stream_Write_UINT32(output, info->nFileSizeHigh); /* EndOfFile */ Stream_Write_UINT32(output, info->nNumberOfLinks); /* NumberOfLinks */ Stream_Write_UINT8(output, file->delete_pending ? 1 : 0); /* DeletePending */ - Stream_Write_UINT8(output, info->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY - ? TRUE - : FALSE); /* Directory */ + Stream_Write_UINT8(output, (info->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != + 0); /* Directory */ /* Reserved(2), MUST NOT be added! */ break; @@ -558,9 +557,8 @@ static BOOL drive_file_query_from_attributes(const DRIVE_FILE* file, Stream_Write_UINT32(output, attrib->nFileSizeHigh); /* EndOfFile */ Stream_Write_UINT32(output, 0); /* NumberOfLinks */ Stream_Write_UINT8(output, file->delete_pending ? 1 : 0); /* DeletePending */ - Stream_Write_UINT8(output, attrib->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY - ? TRUE - : FALSE); /* Directory */ + Stream_Write_UINT8(output, (attrib->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != + 0); /* Directory */ /* Reserved(2), MUST NOT be added! */ break; diff --git a/channels/rail/client/rail_orders.c b/channels/rail/client/rail_orders.c index 35308bd0f..ae836bd8d 100644 --- a/channels/rail/client/rail_orders.c +++ b/channels/rail/client/rail_orders.c @@ -124,7 +124,7 @@ static UINT rail_read_server_localmovesize_order(wStream* s, Stream_Read_UINT32(s, localMoveSize->windowId); /* windowId (4 bytes) */ Stream_Read_UINT16(s, isMoveSizeStart); /* isMoveSizeStart (2 bytes) */ - localMoveSize->isMoveSizeStart = (isMoveSizeStart != 0) ? TRUE : FALSE; + localMoveSize->isMoveSizeStart = (isMoveSizeStart != 0); Stream_Read_UINT16(s, localMoveSize->moveSizeType); /* moveSizeType (2 bytes) */ Stream_Read_INT16(s, localMoveSize->posX); /* posX (2 bytes) */ Stream_Read_INT16(s, localMoveSize->posY); /* posY (2 bytes) */ @@ -792,7 +792,7 @@ static UINT rail_read_cloak_order(wStream* s, RAIL_CLOAK* cloak) Stream_Read_UINT32(s, cloak->windowId); /* WindowId (4 bytes) */ Stream_Read_UINT8(s, cloaked); /* Cloaked (1 byte) */ - cloak->cloak = (cloaked != 0) ? TRUE : FALSE; + cloak->cloak = (cloaked != 0); return CHANNEL_RC_OK; } diff --git a/channels/rail/rail_common.c b/channels/rail/rail_common.c index 37cfcb96e..2e10716ba 100644 --- a/channels/rail/rail_common.c +++ b/channels/rail/rail_common.c @@ -586,7 +586,7 @@ UINT rail_write_sysparam_order(wStream* s, const RAIL_SYSPARAM_ORDER* sysparam, BOOL rail_is_extended_spi_supported(UINT32 channelFlags) { - return (channelFlags & TS_RAIL_ORDER_HANDSHAKE_EX_FLAGS_EXTENDED_SPI_SUPPORTED) ? TRUE : FALSE; + return (channelFlags & TS_RAIL_ORDER_HANDSHAKE_EX_FLAGS_EXTENDED_SPI_SUPPORTED) != 0; } const char* rail_handshake_ex_flags_to_string(UINT32 flags, char* buffer, size_t len) diff --git a/channels/rail/server/rail_main.c b/channels/rail/server/rail_main.c index 6920a8cc2..f8a8e9d14 100644 --- a/channels/rail/server/rail_main.c +++ b/channels/rail/server/rail_main.c @@ -715,7 +715,7 @@ static UINT rail_read_activate_order(wStream* s, RAIL_ACTIVATE_ORDER* activate) Stream_Read_UINT32(s, activate->windowId); /* WindowId (4 bytes) */ Stream_Read_UINT8(s, enabled); /* Enabled (1 byte) */ - activate->enabled = (enabled != 0) ? TRUE : FALSE; + activate->enabled = (enabled != 0); return CHANNEL_RC_OK; } @@ -884,7 +884,7 @@ static UINT rail_read_cloak_order(wStream* s, RAIL_CLOAK* cloak) Stream_Read_UINT32(s, cloak->windowId); /* WindowId (4 bytes) */ Stream_Read_UINT8(s, cloaked); /* Cloaked (1 byte) */ - cloak->cloak = (cloaked != 0) ? TRUE : FALSE; + cloak->cloak = (cloaked != 0); return CHANNEL_RC_OK; } diff --git a/channels/rdpdr/server/rdpdr_main.c b/channels/rdpdr/server/rdpdr_main.c index 181516f4b..3acc2454e 100644 --- a/channels/rdpdr/server/rdpdr_main.c +++ b/channels/rdpdr/server/rdpdr_main.c @@ -586,7 +586,7 @@ static UINT rdpdr_server_read_general_capability_set(RdpdrServerContext* context } context->priv->ExtendedPDU = ExtendedPdu; - context->priv->UserLoggedOnPdu = (ExtendedPdu & RDPDR_USER_LOGGEDON_PDU) ? TRUE : FALSE; + context->priv->UserLoggedOnPdu = (ExtendedPdu & RDPDR_USER_LOGGEDON_PDU) != 0; if (ExtraFlags2 != 0) { diff --git a/channels/rdpear/common/ndr.c b/channels/rdpear/common/ndr.c index 32a4504fa..278374794 100644 --- a/channels/rdpear/common/ndr.c +++ b/channels/rdpear/common/ndr.c @@ -213,10 +213,7 @@ BOOL ndr_read_pickle(NdrContext* context, wStream* s) UINT32 v = 0; /* NDR format label */ - if (!ndr_read_uint32(context, s, &v) || v != 0x20000) - return FALSE; - - return TRUE; + return !(!ndr_read_uint32(context, s, &v) || v != 0x20000); } BOOL ndr_write_pickle(NdrContext* context, wStream* s) @@ -224,10 +221,7 @@ BOOL ndr_write_pickle(NdrContext* context, wStream* s) WINPR_ASSERT(context); /* NDR format label */ - if (!ndr_write_uint32(context, s, 0x20000)) - return FALSE; - - return TRUE; + return ndr_write_uint32(context, s, 0x20000); } BOOL ndr_read_constructed(NdrContext* context, wStream* s, wStream* target) diff --git a/channels/rdpecam/client/v4l/uvc_h264.c b/channels/rdpecam/client/v4l/uvc_h264.c index 976fc1ec1..b03e87876 100644 --- a/channels/rdpecam/client/v4l/uvc_h264.c +++ b/channels/rdpecam/client/v4l/uvc_h264.c @@ -262,10 +262,7 @@ BOOL set_h264_muxed_format(CamV4lStream* stream, const CAM_MEDIA_TYPE_DESCRIPTIO /* commit the format */ err = uvcx_video_commit(stream, &config_probe_req); - if (err != 0) - return FALSE; - - return TRUE; + return (err == 0); } /* diff --git a/channels/rdpei/rdpei_common.c b/channels/rdpei/rdpei_common.c index 5e046280d..65bc05f10 100644 --- a/channels/rdpei/rdpei_common.c +++ b/channels/rdpei/rdpei_common.c @@ -93,7 +93,7 @@ BOOL rdpei_read_2byte_signed(wStream* s, INT16* value) Stream_Read_UINT8(s, byte); - negative = (byte & 0x40) ? TRUE : FALSE; + negative = (byte & 0x40) != 0; const BYTE val = (byte & 0x3F); @@ -265,7 +265,7 @@ BOOL rdpei_read_4byte_signed(wStream* s, INT32* value) Stream_Read_UINT8(s, byte); count = (byte & 0xC0) >> 6; - negative = (byte & 0x20) ? TRUE : FALSE; + negative = (byte & 0x20) != 0; if (!Stream_CheckAndLogRequiredLength(TAG, s, count)) return FALSE; diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index 8a0c71806..72ace7b85 100644 --- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c +++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c @@ -354,10 +354,7 @@ static BOOL rdpsnd_pulse_context_connect(rdpsndDevicePlugin* device) pa_context_set_state_callback(pulse->context, rdpsnd_pulse_context_state_callback, pulse); - if (!rdpsnd_pulse_connect((rdpsndDevicePlugin*)pulse)) - return FALSE; - - return TRUE; + return rdpsnd_pulse_connect(&pulse->device); } static BOOL rdpsnd_pulse_open_stream(rdpsndDevicePlugin* device) diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c index 8fc4af608..1b2abccf0 100644 --- a/channels/urbdrc/client/libusb/libusb_udevman.c +++ b/channels/urbdrc/client/libusb/libusb_udevman.c @@ -97,10 +97,7 @@ static BOOL udevman_has_next(IUDEVMAN* idevman) { UDEVMAN* udevman = (UDEVMAN*)idevman; - if (!udevman || !udevman->idev) - return FALSE; - else - return TRUE; + return !(!udevman || !udevman->idev); } static IUDEVICE* udevman_get_next(IUDEVMAN* idevman) diff --git a/client/Sample/tf_freerdp.c b/client/Sample/tf_freerdp.c index 1268e82e3..ce16edfc4 100644 --- a/client/Sample/tf_freerdp.c +++ b/client/Sample/tf_freerdp.c @@ -299,10 +299,7 @@ disconnect: * if available. */ static BOOL tf_client_global_init(void) { - if (freerdp_handle_signals() != 0) - return FALSE; - - return TRUE; + return freerdp_handle_signals() == 0; } /* Optional global tear down */ diff --git a/client/Wayland/wlf_cliprdr.c b/client/Wayland/wlf_cliprdr.c index 5f4a77370..c0c56fa7d 100644 --- a/client/Wayland/wlf_cliprdr.c +++ b/client/Wayland/wlf_cliprdr.c @@ -172,10 +172,7 @@ static BOOL wlf_mime_is_image(const char* mime) static BOOL wlf_mime_is_html(const char* mime) { - if (strcmp(mime, mime_html) == 0) - return TRUE; - - return FALSE; + return strcmp(mime, mime_html) == 0; } static void wlf_cliprdr_free_server_formats(wfClipboard* clipboard) @@ -309,9 +306,7 @@ static BOOL wlf_cliprdr_add_client_format(wfClipboard* clipboard, const char* mi } ClipboardUnlock(clipboard->system); - if (wlf_cliprdr_send_client_format_list(clipboard) != CHANNEL_RC_OK) - return FALSE; - return TRUE; + return (wlf_cliprdr_send_client_format_list(clipboard) == CHANNEL_RC_OK); } /** diff --git a/client/Wayland/wlfreerdp.c b/client/Wayland/wlfreerdp.c index 6090bc2ee..ad1343a27 100644 --- a/client/Wayland/wlfreerdp.c +++ b/client/Wayland/wlfreerdp.c @@ -465,10 +465,7 @@ static BOOL handle_uwac_events(freerdp* instance, UwacDisplay* display) static BOOL handle_window_events(freerdp* instance) { - if (!instance) - return FALSE; - - return TRUE; + return instance != NULL; } static int wlfreerdp_run(freerdp* instance) @@ -554,10 +551,7 @@ static BOOL wlf_client_global_init(void) // NOLINTNEXTLINE(concurrency-mt-unsafe) (void)setlocale(LC_ALL, ""); - if (freerdp_handle_signals() != 0) - return FALSE; - - return TRUE; + return (freerdp_handle_signals() == 0); } static void wlf_client_global_uninit(void) diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c index fc6329c58..0027676f3 100644 --- a/client/X11/xf_client.c +++ b/client/X11/xf_client.c @@ -288,14 +288,10 @@ BOOL xf_picture_transform_required(xfContext* xfc) settings = xfc->common.context.settings; WINPR_ASSERT(settings); - if ((xfc->offset_x != 0) || (xfc->offset_y != 0) || + return ( + (xfc->offset_x != 0) || (xfc->offset_y != 0) || (xfc->scaledWidth != (INT64)freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth)) || - (xfc->scaledHeight != (INT64)freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight))) - { - return TRUE; - } - - return FALSE; + (xfc->scaledHeight != (INT64)freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight))); } #endif /* WITH_XRENDER defined */ @@ -345,7 +341,7 @@ static BOOL xf_desktop_resize(rdpContext* context) if (xfc->primary) { - BOOL same = (xfc->primary == xfc->drawing) ? TRUE : FALSE; + BOOL same = (xfc->primary == xfc->drawing); LogDynAndXFreePixmap(xfc->log, xfc->display, xfc->primary); WINPR_ASSERT(xfc->depth != 0); @@ -824,7 +820,7 @@ void xf_toggle_fullscreen(xfContext* xfc) if (xfc->debug) xf_ungrab(xfc); - xfc->fullscreen = (xfc->fullscreen) ? FALSE : TRUE; + xfc->fullscreen = !((xfc->fullscreen)); xfc->decorations = (xfc->fullscreen) ? FALSE : freerdp_settings_get_bool(settings, FreeRDP_Decorations); xf_SetWindowFullscreen(xfc, xfc->window, xfc->fullscreen); @@ -902,10 +898,7 @@ static BOOL xf_get_pixmap_info(xfContext* xfc) } XFree(pfs); - if ((xfc->visual == NULL) || (xfc->scanline_pad == 0)) - return FALSE; - - return TRUE; + return !((xfc->visual == NULL) || (xfc->scanline_pad == 0)); } static int xf_error_handler(Display* d, XErrorEvent* ev) @@ -1805,10 +1798,7 @@ static BOOL xfreerdp_client_global_init(void) // NOLINTNEXTLINE(concurrency-mt-unsafe) (void)setlocale(LC_ALL, ""); - if (freerdp_handle_signals() != 0) - return FALSE; - - return TRUE; + return (freerdp_handle_signals() == 0); } static void xfreerdp_client_global_uninit(void) diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c index dffeed5a8..64647f766 100644 --- a/client/X11/xf_cliprdr.c +++ b/client/X11/xf_cliprdr.c @@ -342,7 +342,7 @@ static BOOL xf_cliprdr_is_raw_transfer_available(xfClipboard* clipboard) if (result != Success) return FALSE; - return is_enabled ? TRUE : FALSE; + return is_enabled != 0; } static BOOL xf_cliprdr_formats_equal(const CLIPRDR_FORMAT* server, const xfCliprdrFormat* client) diff --git a/client/X11/xf_floatbar.c b/client/X11/xf_floatbar.c index d9d6d686e..4438b3a87 100644 --- a/client/X11/xf_floatbar.c +++ b/client/X11/xf_floatbar.c @@ -124,7 +124,7 @@ static BOOL xf_floatbar_button_onclick_locked(xfFloatbar* floatbar) if (!floatbar) return FALSE; - floatbar->locked = (floatbar->locked) ? FALSE : TRUE; + floatbar->locked = !((floatbar->locked)); return xf_floatbar_hide_and_show(floatbar); } @@ -345,7 +345,7 @@ xfFloatbar* xf_floatbar_new(xfContext* xfc, Window window, const char* title, DW floatbar->root_window = window; floatbar->flags = flags; floatbar->xfc = xfc; - floatbar->locked = (flags & 0x0002) != 0 ? TRUE : FALSE; + floatbar->locked = (flags & 0x0002) != 0; xf_floatbar_toggle_fullscreen(floatbar, FALSE); { diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c index 4e341f297..b34e52dc2 100644 --- a/client/X11/xf_graphics.c +++ b/client/X11/xf_graphics.c @@ -96,10 +96,7 @@ BOOL xf_decode_color(xfContext* xfc, const UINT32 srcColor, XColor* color) color->red = (unsigned short)(r << 8); color->flags = DoRed | DoGreen | DoBlue; - if (XAllocColor(xfc->display, xfc->colormap, color) == 0) - return FALSE; - - return TRUE; + return (XAllocColor(xfc->display, xfc->colormap, color) != 0); } static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, rdpPointer* pointer, diff --git a/client/X11/xf_input.c b/client/X11/xf_input.c index 1b41259c0..e25c9b3c3 100644 --- a/client/X11/xf_input.c +++ b/client/X11/xf_input.c @@ -297,15 +297,10 @@ static BOOL xf_input_is_duplicate(xfContext* xfc, const XGenericEventCookie* coo event = cookie->data; WINPR_ASSERT(event); - if ((xfc->lastEvent.time == event->time) && (xfc->lastEvType == cookie->evtype) && - (xfc->lastEvent.detail == event->detail) && - (fabs(xfc->lastEvent.event_x - event->event_x) < DBL_EPSILON) && - (fabs(xfc->lastEvent.event_y - event->event_y) < DBL_EPSILON)) - { - return TRUE; - } - - return FALSE; + return ((xfc->lastEvent.time == event->time) && (xfc->lastEvType == cookie->evtype) && + (xfc->lastEvent.detail == event->detail) && + (fabs(xfc->lastEvent.event_x - event->event_x) < DBL_EPSILON) && + (fabs(xfc->lastEvent.event_y - event->event_y) < DBL_EPSILON)); } static void xf_input_save_last_event(xfContext* xfc, const XGenericEventCookie* cookie) diff --git a/client/X11/xf_keyboard.c b/client/X11/xf_keyboard.c index 681878528..e9a80eb4f 100644 --- a/client/X11/xf_keyboard.c +++ b/client/X11/xf_keyboard.c @@ -1108,7 +1108,7 @@ static BOOL xf_keyboard_get_key_state(xfContext* xfc, int state, KeySym keysym) if (!keysymMask) return FALSE; - return (state & keysymMask) ? TRUE : FALSE; + return (state & keysymMask) != 0; } static BOOL xf_keyboard_set_key_state(xfContext* xfc, BOOL on, KeySym keysym) diff --git a/client/common/client_cliprdr_file.c b/client/common/client_cliprdr_file.c index 66ba764eb..8e4540cdd 100644 --- a/client/common/client_cliprdr_file.c +++ b/client/common/client_cliprdr_file.c @@ -287,10 +287,7 @@ static BOOL does_server_support_clipdata_locking(CliprdrFileContext* file_contex { WINPR_ASSERT(file_context); - if (cliprdr_file_context_remote_get_flags(file_context) & CB_CAN_LOCK_CLIPDATA) - return TRUE; - - return FALSE; + return (cliprdr_file_context_remote_get_flags(file_context) & CB_CAN_LOCK_CLIPDATA) != 0; } static UINT32 get_next_free_clip_data_id(CliprdrFileContext* file_context) @@ -1641,11 +1638,10 @@ BOOL cliprdr_file_context_init(CliprdrFileContext* file, CliprdrClientContext* c cliprdr->ServerFileContentsResponse = cliprdr_file_context_server_file_contents_response; CliprdrFuseFile* root_dir = fuse_file_new_root(file); - if (!root_dir) - return FALSE; -#endif - + return root_dir != NULL; +#else return TRUE; +#endif } #if defined(WITH_FUSE) @@ -2220,7 +2216,7 @@ static BOOL is_directory(const char* path) if (!status) return FALSE; - return (fileInformation.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? TRUE : FALSE; + return (fileInformation.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; } static BOOL add_directory(CliprdrLocalStream* stream, const char* path) diff --git a/client/common/cmdline.c b/client/common/cmdline.c index 88bd87b59..63ac2b676 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -132,10 +132,8 @@ static BOOL freerdp_path_valid(const char* path, BOOL* special) if (!path) return FALSE; - isSpecial = - (option_equals("*", path) || option_equals(DynamicDrives, path) || option_equals("%", path)) - ? TRUE - : FALSE; + isSpecial = (option_equals("*", path) || option_equals(DynamicDrives, path) || + option_equals("%", path)); if (!isSpecial) isPath = winpr_PathFileExists(path); @@ -712,9 +710,7 @@ static BOOL option_is_incident_file(const char* option) { WINPR_ASSERT(option); - if (option_ends_with(option, ".msrcIncident")) - return TRUE; - return FALSE; + return (option_ends_with(option, ".msrcIncident")); } static int freerdp_client_command_line_pre_filter(void* context, int index, int argc, LPSTR* argv) @@ -1043,7 +1039,7 @@ static int freerdp_client_command_line_post_filter_int(void* context, COMMAND_LI { rdpSettings* settings = (rdpSettings*)context; int status = CHANNEL_RC_OK; - BOOL enable = arg->Value ? TRUE : FALSE; + BOOL enable = (arg->Value != NULL); CommandLineSwitchStart(arg) CommandLineSwitchCase(arg, "a") { @@ -4708,7 +4704,7 @@ static int parse_command_line(rdpSettings* settings, const COMMAND_LINE_ARGUMENT do { - BOOL enable = arg->Value ? TRUE : FALSE; + BOOL enable = (arg->Value != NULL); if (!(arg->Flags & COMMAND_LINE_ARGUMENT_PRESENT)) continue; diff --git a/client/common/file.c b/client/common/file.c index 3810e57f1..bdca147b6 100644 --- a/client/common/file.c +++ b/client/common/file.c @@ -720,9 +720,7 @@ static BOOL freerdp_client_rdp_file_set_string(rdpFile* file, const char* name, free(*targetValue); *targetValue = _strdup(value); - if (!(*targetValue)) - return FALSE; - return TRUE; + return ((*targetValue) != NULL); } if (line) @@ -1285,9 +1283,7 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett file->DisableThemes = WINPR_ASSERTING_INT_CAST( UINT32, freerdp_settings_get_bool(settings, FreeRDP_DisableThemes)); file->BandwidthAutoDetect = (freerdp_settings_get_uint32(settings, FreeRDP_ConnectionType) >= - CONNECTION_TYPE_AUTODETECT) - ? TRUE - : FALSE; + CONNECTION_TYPE_AUTODETECT); file->NetworkAutoDetect = freerdp_settings_get_bool(settings, FreeRDP_NetworkAutoDetect) ? 1 : 0; file->AutoReconnectionEnabled = WINPR_ASSERTING_INT_CAST( @@ -1350,7 +1346,7 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett file->RedirectComPorts = (freerdp_settings_get_bool(settings, FreeRDP_RedirectSerialPorts) || freerdp_settings_get_bool(settings, FreeRDP_RedirectParallelPorts)); file->RedirectLocation = - freerdp_dynamic_channel_collection_find(settings, LOCATION_CHANNEL_NAME) ? TRUE : FALSE; + (freerdp_dynamic_channel_collection_find(settings, LOCATION_CHANNEL_NAME) != NULL); if (!FILE_POPULATE_STRING(&file->DrivesToRedirect, settings, FreeRDP_DrivesToRedirect) || !FILE_POPULATE_STRING(&file->PreconnectionBlob, settings, FreeRDP_PreconnectionBlob) || !FILE_POPULATE_STRING(&file->KdcProxyName, settings, FreeRDP_KerberosKdcUrl)) @@ -1448,7 +1444,7 @@ BOOL freerdp_client_write_rdp_file(const rdpFile* file, const char* name, BOOL u } free(buffer); - return (status == 0) ? TRUE : FALSE; + return (status == 0); } WINPR_ATTR_FORMAT_ARG(3, 4) @@ -1997,15 +1993,13 @@ BOOL freerdp_client_populate_settings_from_rdp_file_unchecked(const rdpFile* fil * 1: The remote session will appear in a window. * 2: The remote session will appear full screen. */ - if (!freerdp_settings_set_bool(settings, FreeRDP_Fullscreen, - (file->ScreenModeId == 2) ? TRUE : FALSE)) + if (!freerdp_settings_set_bool(settings, FreeRDP_Fullscreen, (file->ScreenModeId == 2))) return FALSE; } if (~(file->SmartSizing)) { - if (!freerdp_settings_set_bool(settings, FreeRDP_SmartSizing, - (file->SmartSizing == 1) ? TRUE : FALSE)) + if (!freerdp_settings_set_bool(settings, FreeRDP_SmartSizing, (file->SmartSizing == 1))) return FALSE; /** * SmartSizingWidth and SmartSizingHeight: diff --git a/include/freerdp/codec/color.h b/include/freerdp/codec/color.h index e7f90b94e..af45587ee 100644 --- a/include/freerdp/codec/color.h +++ b/include/freerdp/codec/color.h @@ -214,10 +214,7 @@ FREERDP_API DWORD FreeRDPAreColorFormatsEqualNoAlpha(DWORD first, DWORD second); { UINT32 alpha = (((format) >> 12) & 0x0F); - if (alpha == 0) - return FALSE; - - return TRUE; + return (alpha != 0); } /*** diff --git a/include/freerdp/scancode.h b/include/freerdp/scancode.h index 0ee36355c..2247ccbe2 100644 --- a/include/freerdp/scancode.h +++ b/include/freerdp/scancode.h @@ -31,7 +31,7 @@ */ #define RDP_SCANCODE_CODE(_rdp_scancode) ((BYTE)(_rdp_scancode & 0xFF)) -#define RDP_SCANCODE_EXTENDED(_rdp_scancode) (((_rdp_scancode)&KBDEXT) ? TRUE : FALSE) +#define RDP_SCANCODE_EXTENDED(_rdp_scancode) (((_rdp_scancode) & KBDEXT) != 0) #define MAKE_RDP_SCANCODE(_code, _extended) (((_code)&0xFF) | ((_extended) ? KBDEXT : 0)) /* Defines for known RDP_SCANCODE protocol values. diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c index ad2a8cee1..aa1095705 100644 --- a/libfreerdp/codec/color.c +++ b/libfreerdp/codec/color.c @@ -321,7 +321,7 @@ BOOL freerdp_image_copy_from_monochrome(BYTE* WINPR_RESTRICT pDstData, UINT32 Ds for (size_t x = 0; x < nWidth; x++) { BYTE* pDstPixel = &pDstLine[((nXDst + x) * FreeRDPGetBytesPerPixel(DstFormat))]; - BOOL monoPixel = (*monoBits & monoBit) ? TRUE : FALSE; + BOOL monoPixel = (*monoBits & monoBit) != 0; if (!(monoBit >>= 1)) { @@ -531,7 +531,7 @@ static BOOL freerdp_image_copy_from_pointer_data_1bpp( UINT32 xorPixel = 0; UINT32 andPixel = 0; - vFlip = (xorBpp == 1) ? FALSE : TRUE; + vFlip = (xorBpp != 1); andStep = (nWidth + 7) / 8; andStep += (andStep % 2); @@ -621,7 +621,7 @@ static BOOL freerdp_image_copy_from_pointer_data_xbpp( UINT32 xorBytesPerPixel = 0; dstBitsPerPixel = FreeRDPGetBitsPerPixel(DstFormat); - vFlip = (xorBpp == 1) ? FALSE : TRUE; + vFlip = (xorBpp != 1); andStep = (nWidth + 7) / 8; andStep += (andStep % 2); @@ -990,7 +990,7 @@ BOOL freerdp_image_copy_overlap(BYTE* pDstData, DWORD DstFormat, UINT32 nDstStep const UINT32 copyDstWidth = nWidth * dstByte; const UINT32 xSrcOffset = nXSrc * srcByte; const UINT32 xDstOffset = nXDst * dstByte; - const BOOL vSrcVFlip = (flags & FREERDP_FLIP_VERTICAL) ? TRUE : FALSE; + const BOOL vSrcVFlip = (flags & FREERDP_FLIP_VERTICAL) != 0; int64_t srcVOffset = 0; int64_t srcVMultiplier = 1; int64_t dstVOffset = 0; diff --git a/libfreerdp/codec/dsp.c b/libfreerdp/codec/dsp.c index 5f5ae8f05..ca5ec6c17 100644 --- a/libfreerdp/codec/dsp.c +++ b/libfreerdp/codec/dsp.c @@ -290,7 +290,7 @@ static BOOL freerdp_dsp_resample(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context, Stream_SetLength(context->common.resample, odone * rbytes); *data = Stream_Buffer(context->common.resample); *length = Stream_Length(context->common.resample); - return (error == 0) ? TRUE : FALSE; + return (error == 0) != 0; #else WLog_ERR(TAG, "Missing resample support, recompile -DWITH_SOXR=ON or -DWITH_DSP_FFMPEG=ON"); return FALSE; @@ -893,7 +893,7 @@ static const INT32 ms_adpcm_coeffs2[7] = { 0, -256, 0, 64, 0, -208, -232 }; static inline INT16 freerdp_dsp_decode_ms_adpcm_sample(ADPCM* WINPR_RESTRICT adpcm, BYTE sample, size_t channel) { - const INT8 nibble = (sample & 0x08) ? (INT8)(sample - 16) : (INT8)sample; + const INT8 nibble = (INT8)((sample & 0x08) ? (sample - 16) : sample); INT32 presample = ((adpcm->ms.sample1[channel] * ms_adpcm_coeffs1[adpcm->ms.predictor[channel]]) + (adpcm->ms.sample2[channel] * ms_adpcm_coeffs2[adpcm->ms.predictor[channel]])) / diff --git a/libfreerdp/codec/h264.c b/libfreerdp/codec/h264.c index c07bde3dc..bb9c44179 100644 --- a/libfreerdp/codec/h264.c +++ b/libfreerdp/codec/h264.c @@ -533,11 +533,9 @@ static BOOL avc444_process_rects(H264_CONTEXT* h264, const BYTE* pSrcData, UINT3 pYUVDstData[0] = ppYUVDstData[0]; pYUVDstData[1] = ppYUVDstData[1]; pYUVDstData[2] = ppYUVDstData[2]; - if (!yuv444_context_decode(h264->yuv, (BYTE)type, pYUVData, piStride, h264->height, pYUVDstData, - piDstStride, DstFormat, pDstData, nDstStep, rects, nrRects)) - return FALSE; - - return TRUE; + return (yuv444_context_decode(h264->yuv, (BYTE)type, pYUVData, piStride, h264->height, + pYUVDstData, piDstStride, DstFormat, pDstData, nDstStep, rects, + nrRects)); } #if defined(AVC444_FRAME_STAT) @@ -824,7 +822,7 @@ BOOL h264_context_set_option(H264_CONTEXT* h264, H264_CONTEXT_OPTION option, UIN h264->UsageType = value; return TRUE; case H264_CONTEXT_OPTION_HW_ACCEL: - h264->hwAccel = value ? TRUE : FALSE; + h264->hwAccel = (value); return TRUE; default: WLog_Print(h264->log, WLOG_WARN, "Unknown H264_CONTEXT_OPTION[0x%08" PRIx32 "]", diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c index 44810deb5..ccbdb0ad3 100644 --- a/libfreerdp/codec/interleaved.c +++ b/libfreerdp/codec/interleaved.c @@ -700,11 +700,8 @@ BOOL interleaved_compress(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleaved Stream_SetPosition(interleaved->bts, 0); - if (freerdp_bitmap_compress(interleaved->TempBuffer, nWidth, nHeight, s, bpp, maxSize, - nHeight - 1, interleaved->bts, 0) < 0) - status = FALSE; - else - status = TRUE; + status = (freerdp_bitmap_compress(interleaved->TempBuffer, nWidth, nHeight, s, bpp, maxSize, + nHeight - 1, interleaved->bts, 0) >= 0); Stream_SealLength(s); *pDstSize = (UINT32)Stream_Length(s); @@ -714,10 +711,7 @@ BOOL interleaved_compress(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleaved BOOL bitmap_interleaved_context_reset(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleaved) { - if (!interleaved) - return FALSE; - - return TRUE; + return (interleaved != NULL); } BITMAP_INTERLEAVED_CONTEXT* bitmap_interleaved_context_new(WINPR_ATTR_UNUSED BOOL Compressor) diff --git a/libfreerdp/codec/nsc.c b/libfreerdp/codec/nsc.c index d46490f3c..8e45dd532 100644 --- a/libfreerdp/codec/nsc.c +++ b/libfreerdp/codec/nsc.c @@ -528,10 +528,7 @@ BOOL nsc_process_message(NSC_CONTEXT* WINPR_RESTRICT context, UINT16 bpp, UINT32 return FALSE; } - if (!freerdp_image_copy_no_overlap(pDstData, DstFormat, nDstStride, nXDst, nYDst, width, height, - context->BitmapData, PIXEL_FORMAT_BGRA32, 0, 0, 0, NULL, - flip)) - return FALSE; - - return TRUE; + return (freerdp_image_copy_no_overlap(pDstData, DstFormat, nDstStride, nXDst, nYDst, width, + height, context->BitmapData, PIXEL_FORMAT_BGRA32, 0, 0, 0, + NULL, flip)); } diff --git a/libfreerdp/codec/planar.c b/libfreerdp/codec/planar.c index 825771fcc..14154acff 100644 --- a/libfreerdp/codec/planar.c +++ b/libfreerdp/codec/planar.c @@ -752,9 +752,9 @@ BOOL freerdp_bitmap_decompress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT plan const BYTE FormatHeader = *srcp++; const BYTE cll = (FormatHeader & PLANAR_FORMAT_HEADER_CLL_MASK); - const BYTE cs = (FormatHeader & PLANAR_FORMAT_HEADER_CS) ? TRUE : FALSE; - const BYTE rle = (FormatHeader & PLANAR_FORMAT_HEADER_RLE) ? TRUE : FALSE; - const BYTE alpha = (FormatHeader & PLANAR_FORMAT_HEADER_NA) ? FALSE : TRUE; + const BYTE cs = (FormatHeader & PLANAR_FORMAT_HEADER_CS) != 0; + const BYTE rle = (FormatHeader & PLANAR_FORMAT_HEADER_RLE) != 0; + const BYTE alpha = !(FormatHeader & PLANAR_FORMAT_HEADER_NA); DstFormat = planar_invert_format(planar, alpha, DstFormat); @@ -1334,7 +1334,7 @@ static inline UINT32 freerdp_bitmap_planar_encode_rle_bytes(const BYTE* WINPR_RE if (!inBufferSize) break; - const UINT32 bSymbolMatch = (symbol == *pInput) ? TRUE : FALSE; + const UINT32 bSymbolMatch = (symbol == *pInput) != 0; symbol = *pInput; pInput++; inBufferSize--; @@ -1364,7 +1364,7 @@ static inline UINT32 freerdp_bitmap_planar_encode_rle_bytes(const BYTE* WINPR_RE } nRunLength += bSymbolMatch; - cRawBytes += (!bSymbolMatch) ? TRUE : FALSE; + cRawBytes += (!bSymbolMatch) != 0; } while (outBufferSize); if (cRawBytes || nRunLength) @@ -1466,11 +1466,8 @@ static inline BOOL freerdp_bitmap_planar_compress_planes_rle(BYTE* WINPR_RESTRIC /* GreenChromeOrBluePlane */ dstSizes[3] = outPlanesSize; - if (!freerdp_bitmap_planar_compress_plane_rle(inPlanes[3], width, height, outPlanes, - &dstSizes[3])) - return FALSE; - - return TRUE; + return (freerdp_bitmap_planar_compress_plane_rle(inPlanes[3], width, height, outPlanes, + &dstSizes[3])); } BYTE* freerdp_bitmap_planar_delta_encode_plane(const BYTE* WINPR_RESTRICT inPlane, UINT32 width, diff --git a/libfreerdp/codec/progressive.c b/libfreerdp/codec/progressive.c index 03c09fb82..bd91a879a 100644 --- a/libfreerdp/codec/progressive.c +++ b/libfreerdp/codec/progressive.c @@ -2587,10 +2587,7 @@ fail: BOOL progressive_context_reset(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressive) { - if (!progressive) - return FALSE; - - return TRUE; + return (progressive != NULL); } PROGRESSIVE_CONTEXT* progressive_context_new(BOOL Compressor) diff --git a/libfreerdp/codec/region.c b/libfreerdp/codec/region.c index 01772bec0..b2d644531 100644 --- a/libfreerdp/codec/region.c +++ b/libfreerdp/codec/region.c @@ -144,7 +144,7 @@ BOOL rectangle_is_empty(const RECTANGLE_16* rect) /* A rectangle with width <= 0 or height <= 0 should be regarded * as empty. */ - return ((rect->left >= rect->right) || (rect->top >= rect->bottom)) ? TRUE : FALSE; + return ((rect->left >= rect->right) || (rect->top >= rect->bottom)); } BOOL region16_is_empty(const REGION16* region) @@ -161,9 +161,7 @@ BOOL rectangles_equal(const RECTANGLE_16* r1, const RECTANGLE_16* r2) WINPR_ASSERT(r2); return ((r1->left == r2->left) && (r1->top == r2->top) && (r1->right == r2->right) && - (r1->bottom == r2->bottom)) - ? TRUE - : FALSE; + (r1->bottom == r2->bottom)); } BOOL rectangles_intersects(const RECTANGLE_16* r1, const RECTANGLE_16* r2) diff --git a/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c b/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c index 616c348bc..a772d0488 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c @@ -384,10 +384,10 @@ static BOOL FuzzPlanar(void) ", nDstHeight=%" PRIu32 ", nDstStep=%" PRIu32 ", total size=%" PRIuz "\n", FreeRDPGetColorFormatName(DstFormat), nXDst, nYDst, nDstWidth, nDstHeight, nDstStep, sizeof(dstData)); - freerdp_planar_switch_bgr(planar, ((prand(2) % 2) != 0) ? TRUE : FALSE); + freerdp_planar_switch_bgr(planar, ((prand(2) % 2) != 0)); freerdp_bitmap_decompress_planar(planar, data, dataSize, prand(4096), prand(4096), dstData, DstFormat, nDstStep, nXDst, nYDst, nDstWidth, nDstHeight, - ((prand(2) % 2) != 0) ? TRUE : FALSE); + ((prand(2) % 2) != 0)); } rc = TRUE; diff --git a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c index 6e7bcd9c7..30f8b9f60 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c @@ -1016,9 +1016,7 @@ static BOOL diff(BYTE a, BYTE b) { BYTE big = MAX(a, b); BYTE little = MIN(a, b); - if (big - little <= 0x25) - return TRUE; - return FALSE; + return (big - little <= 0x25); } static BOOL colordiff(UINT32 format, UINT32 a, UINT32 b) @@ -1033,9 +1031,7 @@ static BOOL colordiff(UINT32 format, UINT32 a, UINT32 b) BYTE ba = 0; FreeRDPSplitColor(a, format, &ar, &ag, &ab, &aa, NULL); FreeRDPSplitColor(b, format, &br, &bg, &bb, &ba, NULL); - if (!diff(aa, ba) || !diff(ar, br) || !diff(ag, bg) || !diff(ab, bb)) - return FALSE; - return TRUE; + return !(!diff(aa, ba) || !diff(ar, br) || !diff(ag, bg) || !diff(ab, bb)); } static BOOL test_encode_decode(const char* path) diff --git a/libfreerdp/codec/yuv.c b/libfreerdp/codec/yuv.c index be6ecf037..2d5da96b2 100644 --- a/libfreerdp/codec/yuv.c +++ b/libfreerdp/codec/yuv.c @@ -90,11 +90,8 @@ static inline BOOL avc420_yuv_to_rgb(const BYTE* WINPR_RESTRICT pYUVData[3], roi.width = WINPR_ASSERTING_INT_CAST(uint32_t, width); roi.height = WINPR_ASSERTING_INT_CAST(uint32_t, height); - if (prims->YUV420ToRGB_8u_P3AC4R(pYUVPoint, iStride, pDstPoint, nDstStep, DstFormat, &roi) != - PRIMITIVES_SUCCESS) - return FALSE; - - return TRUE; + return (prims->YUV420ToRGB_8u_P3AC4R(pYUVPoint, iStride, pDstPoint, nDstStep, DstFormat, + &roi) == PRIMITIVES_SUCCESS); } static inline BOOL avc444_yuv_to_rgb(const BYTE* WINPR_RESTRICT pYUVData[3], @@ -123,11 +120,8 @@ static inline BOOL avc444_yuv_to_rgb(const BYTE* WINPR_RESTRICT pYUVData[3], roi.width = WINPR_ASSERTING_INT_CAST(uint32_t, width); roi.height = WINPR_ASSERTING_INT_CAST(uint32_t, height); - if (prims->YUV444ToRGB_8u_P3AC4R(pYUVPoint, iStride, pDstPoint, nDstStep, DstFormat, &roi) != - PRIMITIVES_SUCCESS) - return FALSE; - - return TRUE; + return (prims->YUV444ToRGB_8u_P3AC4R(pYUVPoint, iStride, pDstPoint, nDstStep, DstFormat, + &roi) == PRIMITIVES_SUCCESS); } static void CALLBACK yuv420_process_work_callback(PTP_CALLBACK_INSTANCE instance, void* context, diff --git a/libfreerdp/common/settings.c b/libfreerdp/common/settings.c index a5822c08b..4d048bdfd 100644 --- a/libfreerdp/common/settings.c +++ b/libfreerdp/common/settings.c @@ -404,7 +404,7 @@ RDPDR_DEVICE* freerdp_device_new(UINT32 Type, size_t count, const char* const ar goto fail; } if (count > 2) - device.drive->automount = (args[2] == NULL) ? TRUE : FALSE; + device.drive->automount = (args[2] == NULL); break; default: goto fail; @@ -1089,34 +1089,22 @@ void freerdp_performance_flags_split(rdpSettings* settings) { freerdp_settings_set_bool(settings, FreeRDP_AllowFontSmoothing, (freerdp_settings_get_uint32(settings, FreeRDP_PerformanceFlags) & - PERF_ENABLE_FONT_SMOOTHING) - ? TRUE - : FALSE); + PERF_ENABLE_FONT_SMOOTHING) != 0); freerdp_settings_set_bool(settings, FreeRDP_AllowDesktopComposition, (freerdp_settings_get_uint32(settings, FreeRDP_PerformanceFlags) & - PERF_ENABLE_DESKTOP_COMPOSITION) - ? TRUE - : FALSE); - freerdp_settings_set_bool( - settings, FreeRDP_DisableWallpaper, - (freerdp_settings_get_uint32(settings, FreeRDP_PerformanceFlags) & PERF_DISABLE_WALLPAPER) - ? TRUE - : FALSE); + PERF_ENABLE_DESKTOP_COMPOSITION) != 0); + freerdp_settings_set_bool(settings, FreeRDP_DisableWallpaper, + (freerdp_settings_get_uint32(settings, FreeRDP_PerformanceFlags) & + PERF_DISABLE_WALLPAPER) != 0); freerdp_settings_set_bool(settings, FreeRDP_DisableFullWindowDrag, (freerdp_settings_get_uint32(settings, FreeRDP_PerformanceFlags) & - PERF_DISABLE_FULLWINDOWDRAG) - ? TRUE - : FALSE); + PERF_DISABLE_FULLWINDOWDRAG) != 0); freerdp_settings_set_bool(settings, FreeRDP_DisableMenuAnims, (freerdp_settings_get_uint32(settings, FreeRDP_PerformanceFlags) & - PERF_DISABLE_MENUANIMATIONS) - ? TRUE - : FALSE); - freerdp_settings_set_bool( - settings, FreeRDP_DisableThemes, - (freerdp_settings_get_uint32(settings, FreeRDP_PerformanceFlags) & PERF_DISABLE_THEMING) - ? TRUE - : FALSE); + PERF_DISABLE_MENUANIMATIONS) != 0); + freerdp_settings_set_bool(settings, FreeRDP_DisableThemes, + (freerdp_settings_get_uint32(settings, FreeRDP_PerformanceFlags) & + PERF_DISABLE_THEMING) != 0); } BOOL freerdp_set_gateway_usage_method(rdpSettings* settings, UINT32 GatewayUsageMethod) diff --git a/libfreerdp/core/aad.c b/libfreerdp/core/aad.c index 3a75c2ad6..ea316f87b 100644 --- a/libfreerdp/core/aad.c +++ b/libfreerdp/core/aad.c @@ -676,11 +676,7 @@ static BOOL generate_json_base64_str(rdpAad* aad, const char* b64_hash) aad->kid = crypto_base64url_encode((const BYTE*)buffer, (size_t)length); free(buffer); - if (!aad->kid) - { - return FALSE; - } - return TRUE; + return aad->kid != NULL; } BOOL generate_pop_key(rdpAad* aad) @@ -916,7 +912,7 @@ BOOL aad_fetch_wellknown(wLog* log, rdpContext* context) if (useTenant) tenantid = freerdp_settings_get_string(context->settings, FreeRDP_GatewayAvdAadtenantid); rdp->wellknown = freerdp_utils_aad_get_wellknown(log, base, tenantid); - return rdp->wellknown ? TRUE : FALSE; + return rdp->wellknown != NULL; } const char* freerdp_utils_aad_get_wellknown_string(rdpContext* context, AAD_WELLKNOWN_VALUES which) diff --git a/libfreerdp/core/capabilities.c b/libfreerdp/core/capabilities.c index ea12a02e9..49bf12b75 100644 --- a/libfreerdp/core/capabilities.c +++ b/libfreerdp/core/capabilities.c @@ -117,9 +117,7 @@ static BOOL rdp_read_capability_set_header(wLog* log, wStream* s, UINT16* length return FALSE; Stream_Read_UINT16(s, *type); /* capabilitySetType */ Stream_Read_UINT16(s, *length); /* lengthCapability */ - if (*length < 4) - return FALSE; - return TRUE; + return (*length >= 4); } static void rdp_write_capability_set_header(wStream* s, UINT16 length, UINT16 type) @@ -239,13 +237,12 @@ static BOOL rdp_read_general_capability_set(wLog* log, wStream* s, rdpSettings* s, settings->CapsGeneralCompressionLevel); /* generalCompressionLevel (2 bytes) */ Stream_Read_UINT8(s, refreshRectSupport); /* refreshRectSupport (1 byte) */ Stream_Read_UINT8(s, suppressOutputSupport); /* suppressOutputSupport (1 byte) */ - settings->NoBitmapCompressionHeader = (extraFlags & NO_BITMAP_COMPRESSION_HDR) ? TRUE : FALSE; - settings->LongCredentialsSupported = (extraFlags & LONG_CREDENTIALS_SUPPORTED) ? TRUE : FALSE; + settings->NoBitmapCompressionHeader = (extraFlags & NO_BITMAP_COMPRESSION_HDR) != 0; + settings->LongCredentialsSupported = (extraFlags & LONG_CREDENTIALS_SUPPORTED) != 0; - settings->AutoReconnectionPacketSupported = - (extraFlags & AUTORECONNECT_SUPPORTED) ? TRUE : FALSE; - settings->FastPathOutput = (extraFlags & FASTPATH_OUTPUT_SUPPORTED) ? TRUE : FALSE; - settings->SaltedChecksum = (extraFlags & ENC_SALTED_CHECKSUM) ? TRUE : FALSE; + settings->AutoReconnectionPacketSupported = (extraFlags & AUTORECONNECT_SUPPORTED) != 0; + settings->FastPathOutput = (extraFlags & FASTPATH_OUTPUT_SUPPORTED) != 0; + settings->SaltedChecksum = (extraFlags & ENC_SALTED_CHECKSUM) != 0; settings->RefreshRect = refreshRectSupport; settings->SuppressOutput = suppressOutputSupport; @@ -422,11 +419,10 @@ static BOOL rdp_read_bitmap_capability_set(wLog* log, wStream* s, rdpSettings* s settings->DesktopResize = desktopResizeFlag; settings->DesktopWidth = desktopWidth; settings->DesktopHeight = desktopHeight; - settings->DrawAllowSkipAlpha = (drawingFlags & DRAW_ALLOW_SKIP_ALPHA) ? TRUE : FALSE; + settings->DrawAllowSkipAlpha = (drawingFlags & DRAW_ALLOW_SKIP_ALPHA) != 0; settings->DrawAllowDynamicColorFidelity = - (drawingFlags & DRAW_ALLOW_DYNAMIC_COLOR_FIDELITY) ? TRUE : FALSE; - settings->DrawAllowColorSubsampling = - (drawingFlags & DRAW_ALLOW_COLOR_SUBSAMPLING) ? TRUE : FALSE; + (drawingFlags & DRAW_ALLOW_DYNAMIC_COLOR_FIDELITY) != 0; + settings->DrawAllowColorSubsampling = (drawingFlags & DRAW_ALLOW_COLOR_SUBSAMPLING) != 0; return TRUE; } @@ -573,10 +569,8 @@ static BOOL rdp_apply_order_capability_set(rdpSettings* settings, const rdpSetti else settings->BitmapCacheV3Enabled = FALSE; - if (FrameMarkerCommandEnabled && src->FrameMarkerCommandEnabled) - settings->FrameMarkerCommandEnabled = TRUE; - else - settings->FrameMarkerCommandEnabled = FALSE; + settings->FrameMarkerCommandEnabled = + (FrameMarkerCommandEnabled && src->FrameMarkerCommandEnabled); return TRUE; } @@ -623,10 +617,9 @@ static BOOL rdp_read_order_capability_set(wLog* log, wStream* s, rdpSettings* se if (settings->OrderSupportFlags & ORDER_FLAGS_EXTRA_SUPPORT) { - BitmapCacheV3Enabled = - (settings->OrderSupportFlagsEx & CACHE_BITMAP_V3_SUPPORT) ? TRUE : FALSE; + BitmapCacheV3Enabled = (settings->OrderSupportFlagsEx & CACHE_BITMAP_V3_SUPPORT) != 0; FrameMarkerCommandEnabled = - (settings->OrderSupportFlagsEx & ALTSEC_FRAME_MARKER_SUPPORT) ? TRUE : FALSE; + (settings->OrderSupportFlagsEx & ALTSEC_FRAME_MARKER_SUPPORT) != 0; } settings->BitmapCacheV3Enabled = BitmapCacheV3Enabled; @@ -1105,12 +1098,10 @@ static BOOL rdp_apply_pointer_capability_set(rdpSettings* settings, const rdpSet const UINT32 actualPointerCacheSize = MIN(pointerCacheSize, dstPointerCacheSize); const UINT32 actualColorPointerCacheSize = MIN(colorPointerCacheSize, dstColorPointerCacheSize); - if (!freerdp_settings_set_uint32(settings, FreeRDP_PointerCacheSize, actualPointerCacheSize) || + return !( + !freerdp_settings_set_uint32(settings, FreeRDP_PointerCacheSize, actualPointerCacheSize) || !freerdp_settings_set_uint32(settings, FreeRDP_ColorPointerCacheSize, - actualColorPointerCacheSize)) - return FALSE; - - return TRUE; + actualColorPointerCacheSize)); } /* @@ -1350,7 +1341,7 @@ static BOOL rdp_read_sound_capability_set(wLog* log, wStream* s, rdpSettings* se Stream_Read_UINT16(s, soundFlags); /* soundFlags (2 bytes) */ Stream_Seek_UINT16(s); /* pad2OctetsA (2 bytes) */ - settings->SoundBeepsEnabled = (soundFlags & SOUND_BEEPS_FLAG) ? TRUE : FALSE; + settings->SoundBeepsEnabled = (soundFlags & SOUND_BEEPS_FLAG) != 0; return TRUE; } @@ -1478,19 +1469,19 @@ static BOOL rdp_read_input_capability_set(wLog* log, wStream* s, rdpSettings* se (INPUT_FLAG_FASTPATH_INPUT | INPUT_FLAG_FASTPATH_INPUT2))) return FALSE; if (!freerdp_settings_set_bool(settings, FreeRDP_HasHorizontalWheel, - (inputFlags & TS_INPUT_FLAG_MOUSE_HWHEEL) ? TRUE : FALSE)) + (inputFlags & TS_INPUT_FLAG_MOUSE_HWHEEL) != 0)) return FALSE; if (!freerdp_settings_set_bool(settings, FreeRDP_UnicodeInput, - (inputFlags & INPUT_FLAG_UNICODE) ? TRUE : FALSE)) + (inputFlags & INPUT_FLAG_UNICODE) != 0)) return FALSE; if (!freerdp_settings_set_bool(settings, FreeRDP_HasRelativeMouseEvent, - (inputFlags & INPUT_FLAG_MOUSE_RELATIVE) ? TRUE : FALSE)) + (inputFlags & INPUT_FLAG_MOUSE_RELATIVE) != 0)) return FALSE; if (!freerdp_settings_set_bool(settings, FreeRDP_HasExtendedMouseEvent, - (inputFlags & INPUT_FLAG_MOUSEX) ? TRUE : FALSE)) + (inputFlags & INPUT_FLAG_MOUSEX) != 0)) return FALSE; if (!freerdp_settings_set_bool(settings, FreeRDP_HasQoeEvent, - (inputFlags & TS_INPUT_FLAG_QOE_TIMESTAMPS) ? TRUE : FALSE)) + (inputFlags & TS_INPUT_FLAG_QOE_TIMESTAMPS) != 0)) return FALSE; return TRUE; @@ -2334,8 +2325,7 @@ static BOOL rdp_read_draw_nine_grid_cache_capability_set(wLog* log, wStream* s, settings->DrawNineGridCacheEntries); /* drawNineGridCacheEntries (2 bytes) */ settings->DrawNineGridEnabled = - (drawNineGridSupportLevel & (DRAW_NINEGRID_SUPPORTED | DRAW_NINEGRID_SUPPORTED_V2)) ? TRUE - : FALSE; + (drawNineGridSupportLevel & (DRAW_NINEGRID_SUPPORTED | DRAW_NINEGRID_SUPPORTED_V2)) != 0; return TRUE; } @@ -2424,10 +2414,8 @@ static BOOL rdp_read_draw_gdiplus_cache_capability_set(wLog* log, wStream* s, rd Stream_Seek(s, 8); /* GdipCacheChunkSize (8 bytes) */ Stream_Seek(s, 6); /* GdipImageCacheProperties (6 bytes) */ - settings->DrawGdiPlusEnabled = - (drawGDIPlusSupportLevel & DRAW_GDIPLUS_SUPPORTED) ? TRUE : FALSE; - settings->DrawGdiPlusCacheEnabled = - (drawGdiplusCacheLevel & DRAW_GDIPLUS_CACHE_LEVEL_ONE) ? TRUE : FALSE; + settings->DrawGdiPlusEnabled = (drawGDIPlusSupportLevel & DRAW_GDIPLUS_SUPPORTED) != 0; + settings->DrawGdiPlusCacheEnabled = (drawGdiplusCacheLevel & DRAW_GDIPLUS_CACHE_LEVEL_ONE) != 0; return TRUE; } @@ -2522,7 +2510,7 @@ static BOOL rdp_read_remote_programs_capability_set(wLog* log, wStream* s, rdpSe Stream_Read_UINT32(s, railSupportLevel); /* railSupportLevel (4 bytes) */ - settings->RemoteApplicationMode = (railSupportLevel & RAIL_LEVEL_SUPPORTED) ? TRUE : FALSE; + settings->RemoteApplicationMode = (railSupportLevel & RAIL_LEVEL_SUPPORTED) != 0; settings->RemoteApplicationSupportLevel = railSupportLevel; return TRUE; } @@ -2963,8 +2951,8 @@ static BOOL rdp_read_surface_commands_capability_set(wLog* log, wStream* s, rdpS Stream_Seek_UINT32(s); /* reserved (4 bytes) */ settings->SurfaceCommandsSupported = cmdFlags; settings->SurfaceCommandsEnabled = - (cmdFlags & (SURFCMDS_SET_SURFACE_BITS | SURFCMDS_STREAM_SURFACE_BITS)) ? TRUE : FALSE; - settings->SurfaceFrameMarkerEnabled = (cmdFlags & SURFCMDS_FRAME_MARKER) ? TRUE : FALSE; + (cmdFlags & (SURFCMDS_SET_SURFACE_BITS | SURFCMDS_STREAM_SURFACE_BITS)) != 0; + settings->SurfaceFrameMarkerEnabled = (cmdFlags & SURFCMDS_FRAME_MARKER) != 0; return TRUE; } @@ -3416,7 +3404,7 @@ static BOOL rdp_read_codec_ts_rfx_clnt_caps_container(wLog* log, wStream* s, rdp return FALSE; settings->RemoteFxCaptureFlags = captureFlags; - settings->RemoteFxOnly = (captureFlags & CARDP_CAPS_CAPTURE_NON_CAC) ? FALSE : TRUE; + settings->RemoteFxOnly = !(captureFlags & CARDP_CAPS_CAPTURE_NON_CAC); /* [MS_RDPRFX] 2.2.1.1.1 TS_RFX_CAPS */ wStream tsbuffer = WINPR_C_ARRAY_INIT; @@ -3611,9 +3599,8 @@ static BOOL rdp_write_nsc_client_capability_container(wStream* s, const rdpSetti Stream_Write_UINT16(s, 3); /* codecPropertiesLength */ /* TS_NSCODEC_CAPABILITYSET */ - Stream_Write_UINT8(s, - fAllowDynamicFidelity ? TRUE : FALSE); /* fAllowDynamicFidelity (1 byte) */ - Stream_Write_UINT8(s, fAllowSubsampling ? TRUE : FALSE); /* fAllowSubsampling (1 byte) */ + Stream_Write_UINT8(s, fAllowDynamicFidelity != 0); /* fAllowDynamicFidelity (1 byte) */ + Stream_Write_UINT8(s, fAllowSubsampling != 0); /* fAllowSubsampling (1 byte) */ Stream_Write_UINT8(s, (UINT8)colorLossLevel); /* colorLossLevel (1 byte) */ return TRUE; } diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c index 5c851b27a..aa45cdfb7 100644 --- a/libfreerdp/core/connection.c +++ b/libfreerdp/core/connection.c @@ -581,11 +581,8 @@ static BOOL rdp_client_redirect_try_fqdn(rdpSettings* settings) if (settings->GatewayEnabled || rdp_client_redirect_resolvable(settings->RedirectionTargetFQDN)) { - if (!freerdp_settings_set_string(settings, FreeRDP_ServerHostname, - settings->RedirectionTargetFQDN)) - return FALSE; - - return TRUE; + return (freerdp_settings_set_string(settings, FreeRDP_ServerHostname, + settings->RedirectionTargetFQDN)); } } @@ -596,11 +593,8 @@ static BOOL rdp_client_redirect_try_ip(rdpSettings* settings) { if (settings->RedirectionFlags & LB_TARGET_NET_ADDRESS) { - if (!freerdp_settings_set_string(settings, FreeRDP_ServerHostname, - settings->TargetNetAddress)) - return FALSE; - - return TRUE; + return (freerdp_settings_set_string(settings, FreeRDP_ServerHostname, + settings->TargetNetAddress)); } return FALSE; @@ -613,11 +607,8 @@ static BOOL rdp_client_redirect_try_netbios(rdpSettings* settings) if (settings->GatewayEnabled || rdp_client_redirect_resolvable(settings->RedirectionTargetNetBiosName)) { - if (!freerdp_settings_set_string(settings, FreeRDP_ServerHostname, - settings->RedirectionTargetNetBiosName)) - return FALSE; - - return TRUE; + return (freerdp_settings_set_string(settings, FreeRDP_ServerHostname, + settings->RedirectionTargetNetBiosName)); } } @@ -685,8 +676,7 @@ BOOL rdp_client_redirect(rdpRdp* rdp) return FALSE; } - settings->RdstlsSecurity = - (settings->RedirectionFlags & LB_PASSWORD_IS_PK_ENCRYPTED) != 0 ? TRUE : FALSE; + settings->RdstlsSecurity = ((settings->RedirectionFlags & LB_PASSWORD_IS_PK_ENCRYPTED) != 0); WINPR_ASSERT(rdp->context); WINPR_ASSERT(rdp->context->instance); @@ -919,7 +909,7 @@ BOOL rdp_server_establish_keys(rdpRdp* rdp, wStream* s) return FALSE; } - rdp->do_crypt_license = (sec_flags & SEC_LICENSE_ENCRYPT_SC) != 0 ? TRUE : FALSE; + rdp->do_crypt_license = ((sec_flags & SEC_LICENSE_ENCRYPT_SC) != 0); if (!Stream_CheckAndLogRequiredLengthWLog(rdp->log, s, 4)) return FALSE; diff --git a/libfreerdp/core/credssp_auth.c b/libfreerdp/core/credssp_auth.c index e5756da44..316102695 100644 --- a/libfreerdp/core/credssp_auth.c +++ b/libfreerdp/core/credssp_auth.c @@ -687,7 +687,7 @@ const SecBuffer* credssp_auth_get_output_buffer(const rdpCredsspAuth* auth) BOOL credssp_auth_have_output_token(rdpCredsspAuth* auth) { WINPR_ASSERT(auth); - return auth->output_buffer.cbBuffer ? TRUE : FALSE; + return (auth->output_buffer.cbBuffer != 0); } BOOL credssp_auth_is_complete(const rdpCredsspAuth* auth) diff --git a/libfreerdp/core/fastpath.c b/libfreerdp/core/fastpath.c index 34fe1926f..26b0a0037 100644 --- a/libfreerdp/core/fastpath.c +++ b/libfreerdp/core/fastpath.c @@ -395,7 +395,7 @@ static int fastpath_recv_update(rdpFastPath* fastpath, BYTE updateCode, wStream* case FASTPATH_UPDATETYPE_SURFCMDS: status = update_recv_surfcmds(update, s); - rc = (status < 0) ? FALSE : TRUE; + rc = (status >= 0); break; case FASTPATH_UPDATETYPE_PTR_NULL: diff --git a/libfreerdp/core/gateway/arm.c b/libfreerdp/core/gateway/arm.c index eab6fccf7..54c8a5629 100644 --- a/libfreerdp/core/gateway/arm.c +++ b/libfreerdp/core/gateway/arm.c @@ -178,7 +178,7 @@ static BOOL arm_fetch_wellknown(rdpArm* arm) freerdp_settings_get_string(arm->context->settings, FreeRDP_GatewayAvdAadtenantid); rdp->wellknown = freerdp_utils_aad_get_wellknown(arm->log, base, tenantid); - return rdp->wellknown ? TRUE : FALSE; + return (rdp->wellknown != NULL); } static wStream* arm_build_http_request(rdpArm* arm, const char* method, diff --git a/libfreerdp/core/gateway/http.c b/libfreerdp/core/gateway/http.c index 7edfe2ec8..63e766ab1 100644 --- a/libfreerdp/core/gateway/http.c +++ b/libfreerdp/core/gateway/http.c @@ -177,10 +177,7 @@ BOOL http_context_set_method(HttpContext* context, const char* Method) free(context->Method); context->Method = _strdup(Method); - if (!context->Method) - return FALSE; - - return TRUE; + return (context->Method != NULL); } BOOL http_request_set_content_type(HttpRequest* request, const char* ContentType) @@ -207,10 +204,7 @@ BOOL http_context_set_uri(HttpContext* context, const char* URI) free(context->URI); context->URI = _strdup(URI); - if (!context->URI) - return FALSE; - - return TRUE; + return (context->URI != NULL); } BOOL http_context_set_user_agent(HttpContext* context, const char* UserAgent) @@ -261,10 +255,7 @@ BOOL http_context_set_connection(HttpContext* context, const char* Connection) free(context->Connection); context->Connection = _strdup(Connection); - if (!context->Connection) - return FALSE; - - return TRUE; + return (context->Connection != NULL); } WINPR_ATTR_FORMAT_ARG(2, 0) @@ -439,10 +430,7 @@ BOOL http_request_set_method(HttpRequest* request, const char* Method) free(request->Method); request->Method = _strdup(Method); - if (!request->Method) - return FALSE; - - return TRUE; + return (request->Method != NULL); } BOOL http_request_set_uri(HttpRequest* request, const char* URI) @@ -453,10 +441,7 @@ BOOL http_request_set_uri(HttpRequest* request, const char* URI) free(request->URI); request->URI = _strdup(URI); - if (!request->URI) - return FALSE; - - return TRUE; + return (request->URI != NULL); } BOOL http_request_set_auth_scheme(HttpRequest* request, const char* AuthScheme) @@ -467,10 +452,7 @@ BOOL http_request_set_auth_scheme(HttpRequest* request, const char* AuthScheme) free(request->AuthScheme); request->AuthScheme = _strdup(AuthScheme); - if (!request->AuthScheme) - return FALSE; - - return TRUE; + return (request->AuthScheme != NULL); } BOOL http_request_set_auth_param(HttpRequest* request, const char* AuthParam) @@ -481,10 +463,7 @@ BOOL http_request_set_auth_param(HttpRequest* request, const char* AuthParam) free(request->AuthParam); request->AuthParam = _strdup(AuthParam); - if (!request->AuthParam) - return FALSE; - - return TRUE; + return (request->AuthParam != NULL); } BOOL http_request_set_transfer_encoding(HttpRequest* request, TRANSFER_ENCODING TransferEncoding) diff --git a/libfreerdp/core/gateway/rdg.c b/libfreerdp/core/gateway/rdg.c index f6bd92f49..2443640e9 100644 --- a/libfreerdp/core/gateway/rdg.c +++ b/libfreerdp/core/gateway/rdg.c @@ -351,10 +351,7 @@ static BOOL rdg_write_chunked(BIO* bio, wStream* sPacket) status = BIO_write(bio, Stream_Buffer(sChunk), (int)len); Stream_Free(sChunk, TRUE); - if (status != (SSIZE_T)len) - return FALSE; - - return TRUE; + return (status == (SSIZE_T)len); } static BOOL rdg_write_packet(rdpRdg* rdg, wStream* sPacket) @@ -780,10 +777,7 @@ static BOOL rdg_recv_auth_token(wLog* log, rdpCredsspAuth* auth, HttpResponse* r free(authTokenData); rc = credssp_auth_authenticate(auth); - if (rc < 0) - return FALSE; - - return TRUE; + return (rc >= 0); } static BOOL rdg_skip_seed_payload(rdpContext* context, rdpTls* tls, size_t lastResponseLength, @@ -1305,10 +1299,7 @@ static BOOL rdg_auth_init(rdpRdg* rdg, rdpTls* tls, TCHAR* authPkg) credssp_auth_set_flags(rdg->auth, ISC_REQ_CONFIDENTIALITY | ISC_REQ_MUTUAL_AUTH); rc = credssp_auth_authenticate(rdg->auth); - if (rc < 0) - return FALSE; - - return TRUE; + return (rc >= 0); } static BOOL rdg_send_http_request(rdpRdg* rdg, rdpTls* tls, const char* method, @@ -1685,10 +1676,7 @@ BOOL rdg_connect(rdpRdg* rdg, DWORD timeout, BOOL* rpcFallback) status = rdg_tunnel_connect(rdg); - if (!status) - return FALSE; - - return TRUE; + return (status); } static int rdg_write_websocket_data_packet(rdpRdg* rdg, const BYTE* buf, int isize) @@ -1809,7 +1797,7 @@ static BOOL rdg_process_close_packet(rdpRdg* rdg, wStream* s) status = rdg_write_packet(rdg, sClose); Stream_Free(sClose, TRUE); - return (status < 0 ? FALSE : TRUE); + return ((status >= 0)); } static BOOL rdg_process_keep_alive_packet(rdpRdg* rdg) @@ -1830,7 +1818,7 @@ static BOOL rdg_process_keep_alive_packet(rdpRdg* rdg) status = rdg_write_packet(rdg, sKeepAlive); Stream_Free(sKeepAlive, TRUE); - return (status < 0 ? FALSE : TRUE); + return ((status >= 0)); } static BOOL rdg_process_service_message(rdpRdg* rdg, wStream* s) diff --git a/libfreerdp/core/gateway/rts.c b/libfreerdp/core/gateway/rts.c index 130793acc..91ccdd4ea 100644 --- a/libfreerdp/core/gateway/rts.c +++ b/libfreerdp/core/gateway/rts.c @@ -2503,9 +2503,7 @@ BOOL rts_conditional_check_and_log(const char* tag, wStream* s, size_t size, BOO if (silent) { const size_t rem = Stream_GetRemainingLength(s); - if (rem < size) - return FALSE; - return TRUE; + return (rem >= size); } return Stream_CheckAndLogRequiredLengthEx(tag, WLOG_WARN, s, size, 1, "%s(%s:%" PRIuz ")", fkt, diff --git a/libfreerdp/core/gateway/tsg.c b/libfreerdp/core/gateway/tsg.c index b828fca28..d3f898745 100644 --- a/libfreerdp/core/gateway/tsg.c +++ b/libfreerdp/core/gateway/tsg.c @@ -702,10 +702,7 @@ static BOOL tsg_ndr_read_quarenc_response(wLog* log, wStream* s, UINT32* index, return FALSE; Stream_Read(s, &quarenc->nonce, sizeof(quarenc->nonce)); - if (!tsg_ndr_pointer_read(log, s, index, &VersionCapsPtr, TRUE)) - return FALSE; - - return TRUE; + return (tsg_ndr_pointer_read(log, s, index, &VersionCapsPtr, TRUE)); } static BOOL tsg_ndr_read_quarenc_data(wLog* log, wStream* s, UINT32* index, diff --git a/libfreerdp/core/gateway/websocket.c b/libfreerdp/core/gateway/websocket.c index 36b999ab3..bd1b6b4d0 100644 --- a/libfreerdp/core/gateway/websocket.c +++ b/libfreerdp/core/gateway/websocket.c @@ -71,10 +71,7 @@ BOOL websocket_context_mask_and_send(BIO* bio, wStream* sPacket, wStream* sDataP const int status = websocket_write_all(bio, Stream_Buffer(sPacket), size); Stream_Free(sPacket, TRUE); - if ((status < 0) || ((size_t)status != size)) - return FALSE; - - return TRUE; + return !((status < 0) || ((size_t)status != size)); } wStream* websocket_context_packet_new(size_t len, WEBSOCKET_OPCODE opcode, UINT32* pMaskingKey) diff --git a/libfreerdp/core/gateway/wst.c b/libfreerdp/core/gateway/wst.c index 7b09c9116..a85897401 100644 --- a/libfreerdp/core/gateway/wst.c +++ b/libfreerdp/core/gateway/wst.c @@ -127,10 +127,7 @@ static BOOL wst_auth_init(rdpWst* wst, rdpTls* tls, TCHAR* authPkg) credssp_auth_set_flags(wst->auth, ISC_REQ_CONFIDENTIALITY | ISC_REQ_MUTUAL_AUTH); rc = credssp_auth_authenticate(wst->auth); - if (rc < 0) - return FALSE; - - return TRUE; + return (rc >= 0); } static BOOL wst_set_auth_header(rdpCredsspAuth* auth, HttpRequest* request) @@ -203,10 +200,7 @@ static BOOL wst_recv_auth_token(rdpCredsspAuth* auth, HttpResponse* response) free(authTokenData); rc = credssp_auth_authenticate(auth); - if (rc < 0) - return FALSE; - - return TRUE; + return (rc >= 0); } static BOOL wst_tls_connect(rdpWst* wst, rdpTls* tls, UINT32 timeout) @@ -845,9 +839,7 @@ static BOOL wst_parse_url(rdpWst* wst, const char* url) else wst->gwport = 443; wst->gwpath = _strdup(pos); - if (!wst->gwpath) - return FALSE; - return TRUE; + return (wst->gwpath != NULL); } rdpWst* wst_new(rdpContext* context) diff --git a/libfreerdp/core/gcc.c b/libfreerdp/core/gcc.c index 2609bcaaa..497cf413b 100644 --- a/libfreerdp/core/gcc.c +++ b/libfreerdp/core/gcc.c @@ -936,10 +936,8 @@ BOOL gcc_read_user_data_header(wLog* log, wStream* s, UINT16* type, UINT16* leng Stream_Read_UINT16(s, *type); /* type */ Stream_Read_UINT16(s, *length); /* length */ - if ((*length < 4) || (!Stream_CheckAndLogRequiredLengthWLog(log, s, (size_t)(*length - 4)))) - return FALSE; - - return TRUE; + return !((*length < 4) || + (!Stream_CheckAndLogRequiredLengthWLog(log, s, (size_t)(*length - 4)))); } /** @@ -1074,8 +1072,7 @@ static BOOL updateEarlyClientCaps(wLog* log, rdpSettings* settings, UINT32 early WINPR_ASSERT(settings); if (settings->SupportErrorInfoPdu) - settings->SupportErrorInfoPdu = - (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_ERRINFO_PDU) ? TRUE : FALSE; + settings->SupportErrorInfoPdu = (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_ERRINFO_PDU) != 0; /* RNS_UD_CS_WANT_32BPP_SESSION is already handled in gcc_read_client_core_data: * @@ -1085,11 +1082,11 @@ static BOOL updateEarlyClientCaps(wLog* log, rdpSettings* settings, UINT32 early if (settings->SupportStatusInfoPdu) settings->SupportStatusInfoPdu = - (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_STATUSINFO_PDU) ? TRUE : FALSE; + (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_STATUSINFO_PDU) != 0; if (settings->SupportAsymetricKeys) settings->SupportAsymetricKeys = - (earlyCapabilityFlags & RNS_UD_CS_STRONG_ASYMMETRIC_KEYS) ? TRUE : FALSE; + (earlyCapabilityFlags & RNS_UD_CS_STRONG_ASYMMETRIC_KEYS) != 0; if (settings->HasRelativeMouseEvent) { @@ -1098,7 +1095,7 @@ static BOOL updateEarlyClientCaps(wLog* log, rdpSettings* settings, UINT32 early if (settings->RdpVersion >= RDP_VERSION_10_12) { settings->HasRelativeMouseEvent = - (earlyCapabilityFlags & RNS_UD_CS_RELATIVE_MOUSE_INPUT) ? TRUE : FALSE; + (earlyCapabilityFlags & RNS_UD_CS_RELATIVE_MOUSE_INPUT) != 0; } else settings->HasRelativeMouseEvent = FALSE; @@ -1106,27 +1103,27 @@ static BOOL updateEarlyClientCaps(wLog* log, rdpSettings* settings, UINT32 early if (settings->NetworkAutoDetect) settings->NetworkAutoDetect = - (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_NETCHAR_AUTODETECT) ? TRUE : FALSE; + (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_NETCHAR_AUTODETECT) != 0; if (settings->SupportSkipChannelJoin) settings->SupportSkipChannelJoin = - (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_SKIP_CHANNELJOIN) ? TRUE : FALSE; + (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_SKIP_CHANNELJOIN) != 0; if (settings->SupportMonitorLayoutPdu) settings->SupportMonitorLayoutPdu = - (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_MONITOR_LAYOUT_PDU) ? TRUE : FALSE; + (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_MONITOR_LAYOUT_PDU) != 0; if (settings->SupportHeartbeatPdu) settings->SupportHeartbeatPdu = - (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_HEARTBEAT_PDU) ? TRUE : FALSE; + (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_HEARTBEAT_PDU) != 0; if (settings->SupportGraphicsPipeline) settings->SupportGraphicsPipeline = - (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_DYNVC_GFX_PROTOCOL) ? TRUE : FALSE; + (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_DYNVC_GFX_PROTOCOL) != 0; if (settings->SupportDynamicTimeZone) settings->SupportDynamicTimeZone = - (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_DYNAMIC_TIME_ZONE) ? TRUE : FALSE; + (earlyCapabilityFlags & RNS_UD_CS_SUPPORT_DYNAMIC_TIME_ZONE) != 0; if ((earlyCapabilityFlags & RNS_UD_CS_VALID_CONNECTION_TYPE) == 0) connectionType = 0; @@ -1141,25 +1138,15 @@ static BOOL updateEarlyServerCaps(wLog* log, rdpSettings* settings, UINT32 early { WINPR_ASSERT(settings); - settings->SupportEdgeActionV1 = - settings->SupportEdgeActionV1 && - (earlyCapabilityFlags & RNS_UD_SC_EDGE_ACTIONS_SUPPORTED_V1) - ? TRUE - : FALSE; - settings->SupportDynamicTimeZone = - settings->SupportDynamicTimeZone && (earlyCapabilityFlags & RNS_UD_SC_DYNAMIC_DST_SUPPORTED) - ? TRUE - : FALSE; - settings->SupportEdgeActionV2 = - settings->SupportEdgeActionV2 && - (earlyCapabilityFlags & RNS_UD_SC_EDGE_ACTIONS_SUPPORTED_V2) - ? TRUE - : FALSE; + settings->SupportEdgeActionV1 = (settings->SupportEdgeActionV1 && + (earlyCapabilityFlags & RNS_UD_SC_EDGE_ACTIONS_SUPPORTED_V1)); + settings->SupportDynamicTimeZone = (settings->SupportDynamicTimeZone && + (earlyCapabilityFlags & RNS_UD_SC_DYNAMIC_DST_SUPPORTED)); + settings->SupportEdgeActionV2 = (settings->SupportEdgeActionV2 && + (earlyCapabilityFlags & RNS_UD_SC_EDGE_ACTIONS_SUPPORTED_V2)); settings->SupportSkipChannelJoin = - settings->SupportSkipChannelJoin && - (earlyCapabilityFlags & RNS_UD_SC_SKIP_CHANNELJOIN_SUPPORTED) - ? TRUE - : FALSE; + (settings->SupportSkipChannelJoin && + (earlyCapabilityFlags & RNS_UD_SC_SKIP_CHANNELJOIN_SUPPORTED)); filterAndLogEarlyServerCapabilityFlags(log, earlyCapabilityFlags); return TRUE; @@ -2052,10 +2039,8 @@ BOOL gcc_read_client_cluster_data(wStream* s, rdpMcs* mcs) if (settings->ClusterInfoFlags & REDIRECTED_SESSIONID_FIELD_VALID) settings->RedirectedSessionId = redirectedSessionId; - settings->ConsoleSession = - (settings->ClusterInfoFlags & REDIRECTED_SESSIONID_FIELD_VALID) ? TRUE : FALSE; - settings->RedirectSmartCards = - (settings->ClusterInfoFlags & REDIRECTED_SMARTCARD) ? TRUE : FALSE; + settings->ConsoleSession = (settings->ClusterInfoFlags & REDIRECTED_SESSIONID_FIELD_VALID) != 0; + settings->RedirectSmartCards = (settings->ClusterInfoFlags & REDIRECTED_SMARTCARD) != 0; if (Stream_GetRemainingLength(s) > 0) { @@ -2189,7 +2174,7 @@ BOOL gcc_read_client_monitor_data(wStream* s, rdpMcs* mcs) current->y = top; current->width = WINPR_ASSERTING_INT_CAST(int32_t, w + 1); current->height = WINPR_ASSERTING_INT_CAST(int32_t, h + 1); - current->is_primary = (flags & MONITOR_PRIMARY) ? TRUE : FALSE; + current->is_primary = (flags & MONITOR_PRIMARY) != 0; } return TRUE; diff --git a/libfreerdp/core/heartbeat.c b/libfreerdp/core/heartbeat.c index 50728fd79..b1b7096be 100644 --- a/libfreerdp/core/heartbeat.c +++ b/libfreerdp/core/heartbeat.c @@ -73,10 +73,7 @@ BOOL freerdp_heartbeat_send_heartbeat_pdu(freerdp_peer* peer, BYTE period, BYTE "sending Heartbeat PDU -> period=%" PRIu8 ", count1=%" PRIu8 ", count2=%" PRIu8 "", period, count1, count2); - if (!rdp_send_message_channel_pdu(rdp, s, sec_flags | SEC_HEARTBEAT)) - return FALSE; - - return TRUE; + return (rdp_send_message_channel_pdu(rdp, s, sec_flags | SEC_HEARTBEAT)); } rdpHeartbeat* heartbeat_new(void) diff --git a/libfreerdp/core/info.c b/libfreerdp/core/info.c index a58c6e49d..e04eff753 100644 --- a/libfreerdp/core/info.c +++ b/libfreerdp/core/info.c @@ -78,7 +78,7 @@ static BOOL rdp_read_info_null_string(rdpSettings* settings, FreeRDP_Settings_Ke const char* what, UINT32 flags, wStream* s, size_t cbLen, size_t max) { - const BOOL unicode = (flags & INFO_UNICODE) ? TRUE : FALSE; + const BOOL unicode = (flags & INFO_UNICODE) != 0; if (!freerdp_settings_set_string(settings, id, NULL)) return FALSE; @@ -325,7 +325,7 @@ static BOOL rdp_read_extended_info_packet(rdpRdp* rdp, wStream* s) Stream_Read_UINT16(s, clientAddressFamily); /* clientAddressFamily (2 bytes) */ Stream_Read_UINT16(s, cbClientAddress); /* cbClientAddress (2 bytes) */ - settings->IPv6Enabled = (clientAddressFamily == ADDRESS_FAMILY_INET6 ? TRUE : FALSE); + settings->IPv6Enabled = ((clientAddressFamily == ADDRESS_FAMILY_INET6)); if (!rdp_read_info_null_string(settings, FreeRDP_ClientAddress, "cbClientAddress", INFO_UNICODE, s, cbClientAddress, rdp_get_client_address_max_size(rdp))) @@ -600,7 +600,7 @@ static BOOL rdp_read_info_string(rdpSettings* settings, FreeRDP_Settings_Keys_St BYTE b[2]; } terminator; - const BOOL unicode = (flags & INFO_UNICODE) ? TRUE : FALSE; + const BOOL unicode = (flags & INFO_UNICODE) != 0; const size_t nullSize = unicode ? sizeof(WCHAR) : sizeof(CHAR); if (!freerdp_settings_set_string(settings, id, NULL)) @@ -673,18 +673,18 @@ static BOOL rdp_read_info_packet(rdpRdp* rdp, wStream* s, UINT16 tpktlength) Stream_Read_UINT32(s, settings->KeyboardCodePage); /* CodePage (4 bytes ) */ Stream_Read_UINT32(s, flags); /* flags (4 bytes) */ - settings->AudioCapture = ((flags & INFO_AUDIOCAPTURE) ? TRUE : FALSE); - settings->AudioPlayback = ((flags & INFO_NOAUDIOPLAYBACK) ? FALSE : TRUE); - settings->AutoLogonEnabled = ((flags & INFO_AUTOLOGON) ? TRUE : FALSE); - settings->RemoteApplicationMode = ((flags & INFO_RAIL) ? TRUE : FALSE); - settings->HiDefRemoteApp = ((flags & INFO_HIDEF_RAIL_SUPPORTED) ? TRUE : FALSE); - settings->RemoteConsoleAudio = ((flags & INFO_REMOTECONSOLEAUDIO) ? TRUE : FALSE); - settings->CompressionEnabled = ((flags & INFO_COMPRESSION) ? TRUE : FALSE); - settings->LogonNotify = ((flags & INFO_LOGONNOTIFY) ? TRUE : FALSE); - settings->MouseHasWheel = ((flags & INFO_MOUSE_HAS_WHEEL) ? TRUE : FALSE); - settings->DisableCtrlAltDel = ((flags & INFO_DISABLECTRLALTDEL) ? TRUE : FALSE); - settings->ForceEncryptedCsPdu = ((flags & INFO_FORCE_ENCRYPTED_CS_PDU) ? TRUE : FALSE); - settings->PasswordIsSmartcardPin = ((flags & INFO_PASSWORD_IS_SC_PIN) ? TRUE : FALSE); + settings->AudioCapture = ((flags & INFO_AUDIOCAPTURE) != 0); + settings->AudioPlayback = (!(flags & INFO_NOAUDIOPLAYBACK)); + settings->AutoLogonEnabled = ((flags & INFO_AUTOLOGON) != 0); + settings->RemoteApplicationMode = ((flags & INFO_RAIL) != 0); + settings->HiDefRemoteApp = ((flags & INFO_HIDEF_RAIL_SUPPORTED) != 0); + settings->RemoteConsoleAudio = ((flags & INFO_REMOTECONSOLEAUDIO) != 0); + settings->CompressionEnabled = ((flags & INFO_COMPRESSION) != 0); + settings->LogonNotify = ((flags & INFO_LOGONNOTIFY) != 0); + settings->MouseHasWheel = ((flags & INFO_MOUSE_HAS_WHEEL) != 0); + settings->DisableCtrlAltDel = ((flags & INFO_DISABLECTRLALTDEL) != 0); + settings->ForceEncryptedCsPdu = ((flags & INFO_FORCE_ENCRYPTED_CS_PDU) != 0); + settings->PasswordIsSmartcardPin = ((flags & INFO_PASSWORD_IS_SC_PIN) != 0); if (flags & INFO_COMPRESSION) { diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c index 7eb54b353..8ea53f090 100644 --- a/libfreerdp/core/license.c +++ b/libfreerdp/core/license.c @@ -465,12 +465,9 @@ static BOOL license_check_stream_capacity(wLog* log, wStream* s, size_t expect, { WINPR_ASSERT(where); - if (!Stream_CheckAndLogRequiredCapacityWLogEx(log, WLOG_WARN, s, expect, 1, - "%s(%s:%" PRIuz ") %s", __func__, __FILE__, - (size_t)__LINE__, where)) - return FALSE; - - return TRUE; + return (Stream_CheckAndLogRequiredCapacityWLogEx(log, WLOG_WARN, s, expect, 1, + "%s(%s:%" PRIuz ") %s", __func__, __FILE__, + (size_t)__LINE__, where)); } static BOOL computeCalHash(wLog* log, const char* hostname, char* hashStr, size_t len) @@ -1082,6 +1079,8 @@ static BOOL license_generate_keys(rdpLicense* license) license->LicensingEncryptionKey, sizeof(license->LicensingEncryptionKey)); /* LicensingEncryptionKey */ + WLog_Print(license->log, WLOG_TRACE, "license keys %s generated", ret ? "successfully" : "NOT"); + #ifdef WITH_DEBUG_LICENSE WLog_Print(license->log, WLOG_DEBUG, "ClientRandom:"); winpr_HexLogDump(license->log, WLOG_DEBUG, license->ClientRandom, @@ -2025,6 +2024,8 @@ BOOL license_read_platform_challenge_packet(rdpLicense* license, wStream* s) license->PlatformChallenge, macData)) return FALSE; + WLog_Print(license->log, WLOG_TRACE, "platform challenge read"); + #ifdef WITH_DEBUG_LICENSE WLog_Print(license->log, WLOG_DEBUG, "EncryptedPlatformChallenge:"); winpr_HexLogDump(license->log, WLOG_DEBUG, license->EncryptedPlatformChallenge->data, @@ -2358,6 +2359,8 @@ BOOL license_write_new_license_request_packet(const rdpLicense* license, wStream return FALSE; } + WLog_Print(license->log, WLOG_TRACE, "new license written"); + #ifdef WITH_DEBUG_LICENSE WLog_Print(license->log, WLOG_DEBUG, "PreferredKeyExchangeAlg: 0x%08" PRIX32 "", license->PreferredKeyExchangeAlg); diff --git a/libfreerdp/core/listener.c b/libfreerdp/core/listener.c index 78ec4878c..1bc6ccdaf 100644 --- a/libfreerdp/core/listener.c +++ b/libfreerdp/core/listener.c @@ -240,7 +240,7 @@ static BOOL freerdp_listener_open(freerdp_listener* instance, const char* bind_a } freeaddrinfo(res); - return (listener->num_sockfds > 0 ? TRUE : FALSE); + return ((listener->num_sockfds > 0)); } static BOOL freerdp_listener_open_local(freerdp_listener* instance, const char* path) diff --git a/libfreerdp/core/mcs.c b/libfreerdp/core/mcs.c index d82efaeaa..34c0e4752 100644 --- a/libfreerdp/core/mcs.c +++ b/libfreerdp/core/mcs.c @@ -907,7 +907,7 @@ out: Stream_Free(s, TRUE); Stream_Free(gcc_CCrq, TRUE); Stream_Free(client_data, TRUE); - return (status < 0 ? FALSE : TRUE); + return ((status >= 0)); } /** @@ -1026,7 +1026,7 @@ out: Stream_Free(s, TRUE); Stream_Free(gcc_CCrsp, TRUE); Stream_Free(server_data, TRUE); - return (status < 0) ? FALSE : TRUE; + return (status >= 0); } /** @@ -1091,7 +1091,7 @@ BOOL mcs_send_erect_domain_request(rdpMcs* mcs) status = transport_write(transport, s); out: Stream_Free(s, TRUE); - return (status < 0) ? FALSE : TRUE; + return (status >= 0); } /** @@ -1145,7 +1145,7 @@ BOOL mcs_send_attach_user_request(rdpMcs* mcs) fail: Stream_Free(s, TRUE); - return (status < 0) ? FALSE : TRUE; + return (status >= 0); } /** @@ -1206,7 +1206,7 @@ BOOL mcs_send_attach_user_confirm(rdpMcs* mcs) status = transport_write(transport, s); out: Stream_Free(s, TRUE); - return (status < 0) ? FALSE : TRUE; + return (status >= 0); } /** @@ -1281,7 +1281,7 @@ BOOL mcs_send_channel_join_request(rdpMcs* mcs, UINT16 channelId) out: Stream_Free(s, TRUE); - return (status < 0) ? FALSE : TRUE; + return (status >= 0); } /** @@ -1355,7 +1355,7 @@ BOOL mcs_send_channel_join_confirm(rdpMcs* mcs, UINT16 channelId) fail: Stream_Free(s, TRUE); - return (status < 0) ? FALSE : TRUE; + return (status >= 0); } /** @@ -1441,7 +1441,7 @@ fail: WLog_Print(mcs->log, WLOG_DEBUG, "sending DisconnectProviderUltimatum(%s)", freerdp_disconnect_reason_string((int)reason)); Stream_Free(s, TRUE); - return (status < 0) ? FALSE : TRUE; + return (status >= 0); } BOOL mcs_client_begin(rdpMcs* mcs) diff --git a/libfreerdp/core/nego.c b/libfreerdp/core/nego.c index d5a474f30..e83287ebc 100644 --- a/libfreerdp/core/nego.c +++ b/libfreerdp/core/nego.c @@ -768,10 +768,7 @@ BOOL nego_recv_response(rdpNego* nego) status = nego_recv(nego->transport, s, nego); Stream_Free(s, TRUE); - if (status < 0) - return FALSE; - - return TRUE; + return (status >= 0); } /** @@ -1956,10 +1953,7 @@ BOOL nego_set_cookie(rdpNego* nego, const char* cookie) nego->cookie = _strdup(cookie); - if (!nego->cookie) - return FALSE; - - return TRUE; + return (nego->cookie != NULL); } /** diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c index 12fad8d00..c1f728ec8 100644 --- a/libfreerdp/core/nla.c +++ b/libfreerdp/core/nla.c @@ -1898,11 +1898,8 @@ static BOOL nla_encrypt_ts_credentials(rdpNla* nla) return FALSE; sspi_SecBufferFree(&nla->authInfo); - if (!credssp_auth_encrypt(nla->auth, &nla->tsCredentials, &nla->authInfo, NULL, - nla->sendSeqNum++)) - return FALSE; - - return TRUE; + return (credssp_auth_encrypt(nla->auth, &nla->tsCredentials, &nla->authInfo, NULL, + nla->sendSeqNum++)); } static BOOL nla_decrypt_ts_credentials(rdpNla* nla) @@ -2377,9 +2374,7 @@ BOOL nla_set_state(rdpNla* nla, NLA_STATE state) BOOL nla_set_service_principal(rdpNla* nla, const char* service, const char* hostname) { - if (!credssp_auth_set_spn(nla->auth, service, hostname)) - return FALSE; - return TRUE; + return (credssp_auth_set_spn(nla->auth, service, hostname)); } BOOL nla_impersonate(rdpNla* nla) diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c index a6ddefe15..f9e8891df 100644 --- a/libfreerdp/core/orders.c +++ b/libfreerdp/core/orders.c @@ -754,7 +754,7 @@ static inline BOOL update_read_2byte_signed(wStream* s, INT32* value) return FALSE; Stream_Read_UINT8(s, byte); - negative = (byte & 0x40) ? TRUE : FALSE; + negative = (byte & 0x40) != 0; *value = (byte & 0x3F); if (byte & 0x80) @@ -1314,13 +1314,11 @@ static inline BOOL FIELD_SKIP_BUFFER16(wStream* s, UINT32 TARGET_LEN) static BOOL update_read_dstblt_order(const char* orderName, wStream* s, const ORDER_INFO* orderInfo, DSTBLT_ORDER* dstblt) { - if (read_order_field_coord(orderName, orderInfo, s, 1, &dstblt->nLeftRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 2, &dstblt->nTopRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 3, &dstblt->nWidth, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 4, &dstblt->nHeight, FALSE) && - read_order_field_byte(orderName, orderInfo, s, 5, &dstblt->bRop, TRUE)) - return TRUE; - return FALSE; + return (read_order_field_coord(orderName, orderInfo, s, 1, &dstblt->nLeftRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 2, &dstblt->nTopRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 3, &dstblt->nWidth, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 4, &dstblt->nHeight, FALSE) && + read_order_field_byte(orderName, orderInfo, s, 5, &dstblt->bRop, TRUE)); } size_t update_approximate_dstblt_order(ORDER_INFO* orderInfo, const DSTBLT_ORDER* dstblt) @@ -1356,17 +1354,15 @@ BOOL update_write_dstblt_order(wStream* s, ORDER_INFO* orderInfo, const DSTBLT_O static BOOL update_read_patblt_order(const char* orderName, wStream* s, const ORDER_INFO* orderInfo, PATBLT_ORDER* patblt) { - if (read_order_field_coord(orderName, orderInfo, s, 1, &patblt->nLeftRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 2, &patblt->nTopRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 3, &patblt->nWidth, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 4, &patblt->nHeight, FALSE) && - read_order_field_byte(orderName, orderInfo, s, 5, &patblt->bRop, TRUE) && - read_order_field_color(orderName, orderInfo, s, 6, &patblt->backColor, TRUE) && - read_order_field_color(orderName, orderInfo, s, 7, &patblt->foreColor, TRUE) && - update_read_brush(s, &patblt->brush, - get_checked_uint8((orderInfo->fieldFlags >> 7) & 0x1F))) - return TRUE; - return FALSE; + return (read_order_field_coord(orderName, orderInfo, s, 1, &patblt->nLeftRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 2, &patblt->nTopRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 3, &patblt->nWidth, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 4, &patblt->nHeight, FALSE) && + read_order_field_byte(orderName, orderInfo, s, 5, &patblt->bRop, TRUE) && + read_order_field_color(orderName, orderInfo, s, 6, &patblt->backColor, TRUE) && + read_order_field_color(orderName, orderInfo, s, 7, &patblt->foreColor, TRUE) && + update_read_brush(s, &patblt->brush, + get_checked_uint8((orderInfo->fieldFlags >> 7) & 0x1F))); } size_t update_approximate_patblt_order(ORDER_INFO* orderInfo, PATBLT_ORDER* patblt) @@ -1414,15 +1410,13 @@ static BOOL update_read_scrblt_order(const char* orderName, wStream* s, const OR { WINPR_ASSERT(orderInfo); WINPR_ASSERT(scrblt); - if (read_order_field_coord(orderName, orderInfo, s, 1, &scrblt->nLeftRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 2, &scrblt->nTopRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 3, &scrblt->nWidth, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 4, &scrblt->nHeight, FALSE) && - read_order_field_byte(orderName, orderInfo, s, 5, &scrblt->bRop, TRUE) && - read_order_field_coord(orderName, orderInfo, s, 6, &scrblt->nXSrc, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 7, &scrblt->nYSrc, FALSE)) - return TRUE; - return FALSE; + return (read_order_field_coord(orderName, orderInfo, s, 1, &scrblt->nLeftRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 2, &scrblt->nTopRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 3, &scrblt->nWidth, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 4, &scrblt->nHeight, FALSE) && + read_order_field_byte(orderName, orderInfo, s, 5, &scrblt->bRop, TRUE) && + read_order_field_coord(orderName, orderInfo, s, 6, &scrblt->nXSrc, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 7, &scrblt->nYSrc, FALSE)); } size_t update_approximate_scrblt_order(ORDER_INFO* orderInfo, const SCRBLT_ORDER* scrblt) @@ -1461,9 +1455,7 @@ BOOL update_write_scrblt_order(wStream* s, ORDER_INFO* orderInfo, const SCRBLT_O if (!update_write_coord(s, scrblt->nXSrc)) return FALSE; orderInfo->fieldFlags |= ORDER_FIELD_07; - if (!update_write_coord(s, scrblt->nYSrc)) - return FALSE; - return TRUE; + return (update_write_coord(s, scrblt->nYSrc)); } static BOOL update_read_opaque_rect_order(const char* orderName, wStream* s, const ORDER_INFO* orderInfo, @@ -1553,13 +1545,11 @@ static BOOL update_read_draw_nine_grid_order(const char* orderName, wStream* s, const ORDER_INFO* orderInfo, DRAW_NINE_GRID_ORDER* draw_nine_grid) { - if (read_order_field_coord(orderName, orderInfo, s, 1, &draw_nine_grid->srcLeft, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 2, &draw_nine_grid->srcTop, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 3, &draw_nine_grid->srcRight, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 4, &draw_nine_grid->srcBottom, FALSE) && - read_order_field_uint16(orderName, orderInfo, s, 5, &draw_nine_grid->bitmapId, FALSE)) - return TRUE; - return FALSE; + return (read_order_field_coord(orderName, orderInfo, s, 1, &draw_nine_grid->srcLeft, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 2, &draw_nine_grid->srcTop, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 3, &draw_nine_grid->srcRight, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 4, &draw_nine_grid->srcBottom, FALSE) && + read_order_field_uint16(orderName, orderInfo, s, 5, &draw_nine_grid->bitmapId, FALSE)); } static BOOL update_read_multi_dstblt_order(const char* orderName, wStream* s, @@ -1781,18 +1771,16 @@ static BOOL update_read_multi_draw_nine_grid_order(const char* orderName, wStrea static BOOL update_read_line_to_order(const char* orderName, wStream* s, const ORDER_INFO* orderInfo, LINE_TO_ORDER* line_to) { - if (read_order_field_uint16(orderName, orderInfo, s, 1, &line_to->backMode, TRUE) && - read_order_field_coord(orderName, orderInfo, s, 2, &line_to->nXStart, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 3, &line_to->nYStart, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 4, &line_to->nXEnd, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 5, &line_to->nYEnd, FALSE) && - read_order_field_color(orderName, orderInfo, s, 6, &line_to->backColor, TRUE) && - read_order_field_byte(orderName, orderInfo, s, 7, &line_to->bRop2, TRUE) && - read_order_field_byte(orderName, orderInfo, s, 8, &line_to->penStyle, TRUE) && - read_order_field_byte(orderName, orderInfo, s, 9, &line_to->penWidth, TRUE) && - read_order_field_color(orderName, orderInfo, s, 10, &line_to->penColor, TRUE)) - return TRUE; - return FALSE; + return (read_order_field_uint16(orderName, orderInfo, s, 1, &line_to->backMode, TRUE) && + read_order_field_coord(orderName, orderInfo, s, 2, &line_to->nXStart, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 3, &line_to->nYStart, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 4, &line_to->nXEnd, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 5, &line_to->nYEnd, FALSE) && + read_order_field_color(orderName, orderInfo, s, 6, &line_to->backColor, TRUE) && + read_order_field_byte(orderName, orderInfo, s, 7, &line_to->bRop2, TRUE) && + read_order_field_byte(orderName, orderInfo, s, 8, &line_to->penStyle, TRUE) && + read_order_field_byte(orderName, orderInfo, s, 9, &line_to->penWidth, TRUE) && + read_order_field_color(orderName, orderInfo, s, 10, &line_to->penColor, TRUE)); } size_t update_approximate_line_to_order(ORDER_INFO* orderInfo, const LINE_TO_ORDER* line_to) @@ -1966,15 +1954,13 @@ static BOOL update_read_save_bitmap_order(const char* orderName, wStream* s, const ORDER_INFO* orderInfo, SAVE_BITMAP_ORDER* save_bitmap) { - if (read_order_field_uint32(orderName, orderInfo, s, 1, &save_bitmap->savedBitmapPosition, - TRUE) && - read_order_field_coord(orderName, orderInfo, s, 2, &save_bitmap->nLeftRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 3, &save_bitmap->nTopRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 4, &save_bitmap->nRightRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 5, &save_bitmap->nBottomRect, FALSE) && - read_order_field_byte(orderName, orderInfo, s, 6, &save_bitmap->operation, TRUE)) - return TRUE; - return FALSE; + return (read_order_field_uint32(orderName, orderInfo, s, 1, &save_bitmap->savedBitmapPosition, + TRUE) && + read_order_field_coord(orderName, orderInfo, s, 2, &save_bitmap->nLeftRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 3, &save_bitmap->nTopRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 4, &save_bitmap->nRightRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 5, &save_bitmap->nBottomRect, FALSE) && + read_order_field_byte(orderName, orderInfo, s, 6, &save_bitmap->operation, TRUE)); } static BOOL update_read_glyph_index_order(const char* orderName, wStream* s, const ORDER_INFO* orderInfo, @@ -2300,31 +2286,27 @@ static BOOL update_read_polygon_cb_order(const char* orderName, wStream* s, static BOOL update_read_ellipse_sc_order(const char* orderName, wStream* s, const ORDER_INFO* orderInfo, ELLIPSE_SC_ORDER* ellipse_sc) { - if (read_order_field_coord(orderName, orderInfo, s, 1, &ellipse_sc->leftRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 2, &ellipse_sc->topRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 3, &ellipse_sc->rightRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 4, &ellipse_sc->bottomRect, FALSE) && - read_order_field_byte(orderName, orderInfo, s, 5, &ellipse_sc->bRop2, TRUE) && - read_order_field_byte(orderName, orderInfo, s, 6, &ellipse_sc->fillMode, TRUE) && - read_order_field_color(orderName, orderInfo, s, 7, &ellipse_sc->color, TRUE)) - return TRUE; - return FALSE; + return (read_order_field_coord(orderName, orderInfo, s, 1, &ellipse_sc->leftRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 2, &ellipse_sc->topRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 3, &ellipse_sc->rightRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 4, &ellipse_sc->bottomRect, FALSE) && + read_order_field_byte(orderName, orderInfo, s, 5, &ellipse_sc->bRop2, TRUE) && + read_order_field_byte(orderName, orderInfo, s, 6, &ellipse_sc->fillMode, TRUE) && + read_order_field_color(orderName, orderInfo, s, 7, &ellipse_sc->color, TRUE)); } static BOOL update_read_ellipse_cb_order(const char* orderName, wStream* s, const ORDER_INFO* orderInfo, ELLIPSE_CB_ORDER* ellipse_cb) { - if (read_order_field_coord(orderName, orderInfo, s, 1, &ellipse_cb->leftRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 2, &ellipse_cb->topRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 3, &ellipse_cb->rightRect, FALSE) && - read_order_field_coord(orderName, orderInfo, s, 4, &ellipse_cb->bottomRect, FALSE) && - read_order_field_byte(orderName, orderInfo, s, 5, &ellipse_cb->bRop2, TRUE) && - read_order_field_byte(orderName, orderInfo, s, 6, &ellipse_cb->fillMode, TRUE) && - read_order_field_color(orderName, orderInfo, s, 7, &ellipse_cb->backColor, TRUE) && - read_order_field_color(orderName, orderInfo, s, 8, &ellipse_cb->foreColor, TRUE) && - update_read_brush(s, &ellipse_cb->brush, - get_checked_uint8((orderInfo->fieldFlags >> 8) & 0x1F))) - return TRUE; - return FALSE; + return (read_order_field_coord(orderName, orderInfo, s, 1, &ellipse_cb->leftRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 2, &ellipse_cb->topRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 3, &ellipse_cb->rightRect, FALSE) && + read_order_field_coord(orderName, orderInfo, s, 4, &ellipse_cb->bottomRect, FALSE) && + read_order_field_byte(orderName, orderInfo, s, 5, &ellipse_cb->bRop2, TRUE) && + read_order_field_byte(orderName, orderInfo, s, 6, &ellipse_cb->fillMode, TRUE) && + read_order_field_color(orderName, orderInfo, s, 7, &ellipse_cb->backColor, TRUE) && + read_order_field_color(orderName, orderInfo, s, 8, &ellipse_cb->foreColor, TRUE) && + update_read_brush(s, &ellipse_cb->brush, + get_checked_uint8((orderInfo->fieldFlags >> 8) & 0x1F))); } /* Secondary Drawing Orders */ @@ -3245,7 +3227,7 @@ update_read_create_offscreen_bitmap_order(wStream* s, Stream_Read_UINT16(s, flags); /* flags (2 bytes) */ create_offscreen_bitmap->id = flags & 0x7FFF; - deleteListPresent = (flags & 0x8000) ? TRUE : FALSE; + deleteListPresent = (flags & 0x8000) != 0; Stream_Read_UINT16(s, create_offscreen_bitmap->cx); /* cx (2 bytes) */ Stream_Read_UINT16(s, create_offscreen_bitmap->cy); /* cy (2 bytes) */ deleteList = &(create_offscreen_bitmap->deleteList); @@ -3318,7 +3300,7 @@ BOOL update_write_create_offscreen_bitmap_order( deleteList = &(create_offscreen_bitmap->deleteList); flags = create_offscreen_bitmap->id & 0x7FFF; - deleteListPresent = (deleteList->cIndices > 0) ? TRUE : FALSE; + deleteListPresent = (deleteList->cIndices > 0); if (deleteListPresent) flags |= 0x8000; @@ -3866,7 +3848,7 @@ static BOOL update_recv_primary_order(rdpUpdate* update, wStream* s, BYTE flags) return FALSE; } - orderInfo->deltaCoordinates = (flags & ORDER_DELTA_COORDINATES) ? TRUE : FALSE; + orderInfo->deltaCoordinates = (flags & ORDER_DELTA_COORDINATES) != 0; if (!read_primary_order(up->log, orderName, s, orderInfo, &primary->common)) return FALSE; diff --git a/libfreerdp/core/peer.c b/libfreerdp/core/peer.c index 85ff2f813..21034f4b2 100644 --- a/libfreerdp/core/peer.c +++ b/libfreerdp/core/peer.c @@ -277,10 +277,7 @@ static BOOL freerdp_peer_initialize(freerdp_peer* client) nego_set_RCG_supported(rdp->nego, settings->RemoteCredentialGuard); nego_set_restricted_admin_mode_supported(rdp->nego, settings->RestrictedAdminModeSupported); - if (!rdp_server_transition_to_state(rdp, CONNECTION_STATE_INITIAL)) - return FALSE; - - return TRUE; + return (rdp_server_transition_to_state(rdp, CONNECTION_STATE_INITIAL)); } #if defined(WITH_FREERDP_DEPRECATED) @@ -330,10 +327,7 @@ static BOOL freerdp_peer_check_fds(freerdp_peer* peer) rdp = peer->context->rdp; status = rdp_check_fds(rdp); - if (status < 0) - return FALSE; - - return TRUE; + return (status >= 0); } static state_run_t peer_recv_data_pdu(freerdp_peer* client, wStream* s, @@ -829,10 +823,10 @@ static state_run_t peer_recv_callback_internal(WINPR_ATTR_UNUSED rdpTransport* t { const UINT32 SelectedProtocol = nego_get_selected_protocol(rdp->nego); - settings->RdstlsSecurity = (SelectedProtocol & PROTOCOL_RDSTLS) ? TRUE : FALSE; - settings->NlaSecurity = (SelectedProtocol & PROTOCOL_HYBRID) ? TRUE : FALSE; - settings->TlsSecurity = (SelectedProtocol & PROTOCOL_SSL) ? TRUE : FALSE; - settings->RdpSecurity = (SelectedProtocol == PROTOCOL_RDP) ? TRUE : FALSE; + settings->RdstlsSecurity = (SelectedProtocol & PROTOCOL_RDSTLS) != 0; + settings->NlaSecurity = (SelectedProtocol & PROTOCOL_HYBRID) != 0; + settings->TlsSecurity = (SelectedProtocol & PROTOCOL_SSL) != 0; + settings->RdpSecurity = (SelectedProtocol == PROTOCOL_RDP) != 0; client->authenticated = FALSE; if (SelectedProtocol & PROTOCOL_HYBRID) diff --git a/libfreerdp/core/rdp.c b/libfreerdp/core/rdp.c index e7a96f22b..ef5770678 100644 --- a/libfreerdp/core/rdp.c +++ b/libfreerdp/core/rdp.c @@ -2829,7 +2829,7 @@ static BOOL parse_on_off_option(const char* value) errno = 0; long val = strtol(value, NULL, 0); if (errno == 0) - return val == 0 ? FALSE : TRUE; + return (val != 0); return FALSE; } diff --git a/libfreerdp/core/rdstls.c b/libfreerdp/core/rdstls.c index 0e44f9ddc..852d28732 100644 --- a/libfreerdp/core/rdstls.c +++ b/libfreerdp/core/rdstls.c @@ -347,10 +347,7 @@ static BOOL rdstls_write_authentication_request_with_cookie(WINPR_ATTR_UNUSED rd Stream_Write_UINT16(s, RDSTLS_DATA_AUTORECONNECT_COOKIE); Stream_Write_UINT32(s, settings->RedirectedSessionId); - if (!rdstls_write_cookie(s, settings->ServerAutoReconnectCookie)) - return FALSE; - - return TRUE; + return (rdstls_write_cookie(s, settings->ServerAutoReconnectCookie)); } static BOOL rdstls_write_authentication_response(rdpRdstls* rdstls, wStream* s) @@ -412,10 +409,7 @@ static BOOL rdstls_read_unicode_string(WINPR_ATTR_UNUSED wLog* log, wStream* s, } *str = Stream_Read_UTF16_String_As_UTF8(s, length / sizeof(WCHAR), NULL); - if (!*str) - return FALSE; - - return TRUE; + return (*str) != NULL; } static BOOL rdstls_read_data(WINPR_ATTR_UNUSED wLog* log, wStream* s, UINT16* pLength, @@ -698,10 +692,7 @@ static BOOL rdstls_send(WINPR_ATTR_UNUSED rdpTransport* transport, wStream* s, v return FALSE; } - if (transport_write(rdstls->transport, s) < 0) - return FALSE; - - return TRUE; + return (transport_write(rdstls->transport, s) >= 0); } static int rdstls_recv(WINPR_ATTR_UNUSED rdpTransport* transport, wStream* s, void* extra) diff --git a/libfreerdp/core/server.c b/libfreerdp/core/server.c index 598e89be0..1c3767de9 100644 --- a/libfreerdp/core/server.c +++ b/libfreerdp/core/server.c @@ -692,8 +692,7 @@ BOOL WTSIsChannelJoinedByName(freerdp_peer* client, const char* channel_name) if (!client || !client->context || !client->context->rdp) return FALSE; - return wts_get_joined_channel_by_name(client->context->rdp->mcs, channel_name) == NULL ? FALSE - : TRUE; + return (wts_get_joined_channel_by_name(client->context->rdp->mcs, channel_name) != NULL); } BOOL WTSIsChannelJoinedById(freerdp_peer* client, UINT16 channel_id) @@ -701,8 +700,7 @@ BOOL WTSIsChannelJoinedById(freerdp_peer* client, UINT16 channel_id) if (!client || !client->context || !client->context->rdp) return FALSE; - return wts_get_joined_channel_by_id(client->context->rdp->mcs, channel_id) == NULL ? FALSE - : TRUE; + return (wts_get_joined_channel_by_id(client->context->rdp->mcs, channel_id) != NULL); } BOOL WTSVirtualChannelManagerIsChannelJoined(HANDLE hServer, const char* name) @@ -712,7 +710,7 @@ BOOL WTSVirtualChannelManagerIsChannelJoined(HANDLE hServer, const char* name) if (!vcm || !vcm->rdp) return FALSE; - return wts_get_joined_channel_by_name(vcm->rdp->mcs, name) == NULL ? FALSE : TRUE; + return (wts_get_joined_channel_by_name(vcm->rdp->mcs, name) != NULL); } BYTE WTSVirtualChannelManagerGetDrdynvcState(HANDLE hServer) diff --git a/libfreerdp/core/smartcardlogon.c b/libfreerdp/core/smartcardlogon.c index dd45494e7..72a3033ff 100644 --- a/libfreerdp/core/smartcardlogon.c +++ b/libfreerdp/core/smartcardlogon.c @@ -256,10 +256,8 @@ static BOOL build_pkinit_args(NCRYPT_PROV_HANDLE provider, SmartcardCertInfo* sc const char* pkModule = winpr_NCryptGetModulePath(provider); size_t size = 0; - if (winpr_asprintf(&scCert->pkinitArgs, &size, "PKCS11:module_name=%s:slotid=%" PRIu16, - pkModule, (UINT16)scCert->slotId) <= 0) - return FALSE; - return TRUE; + return (winpr_asprintf(&scCert->pkinitArgs, &size, "PKCS11:module_name=%s:slotid=%" PRIu16, + pkModule, (UINT16)scCert->slotId) > 0); } #endif /* _WIN32 */ diff --git a/libfreerdp/core/test/TestSettings.c b/libfreerdp/core/test/TestSettings.c index 0152ae454..3efa92879 100644 --- a/libfreerdp/core/test/TestSettings.c +++ b/libfreerdp/core/test/TestSettings.c @@ -725,7 +725,7 @@ static BOOL check_args(const RDPDR_DEVICE* what, size_t count, const char* args[ } if (count > 2) { - return a->automount == (args[2] == NULL) ? TRUE : FALSE; + return (a->automount == (args[2] == NULL)); } else return !a->automount; diff --git a/libfreerdp/core/tpdu.c b/libfreerdp/core/tpdu.c index 21c2bd93d..69619cb11 100644 --- a/libfreerdp/core/tpdu.c +++ b/libfreerdp/core/tpdu.c @@ -203,9 +203,7 @@ BOOL tpdu_read_connection_confirm(wStream* s, BYTE* li, UINT16 tpktlength) */ bytes_read = (Stream_GetPosition(s) - position) - 1; - if (!Stream_CheckAndLogRequiredLength(TAG, s, (size_t)(*li - bytes_read))) - return FALSE; - return TRUE; + return Stream_CheckAndLogRequiredLength(TAG, s, (size_t)(*li - bytes_read)); } /** diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c index 0f0836bd8..e5e66ebcf 100644 --- a/libfreerdp/core/transport.c +++ b/libfreerdp/core/transport.c @@ -676,10 +676,8 @@ BOOL transport_connect_childsession(rdpTransport* transport) BOOL transport_accept_rdp(rdpTransport* transport) { - if (!transport) - return FALSE; + return transport != NULL; /* RDP encryption */ - return TRUE; } BOOL transport_accept_tls(rdpTransport* transport) @@ -1561,7 +1559,7 @@ static BOOL transport_default_set_blocking_mode(rdpTransport* transport, BOOL bl if (transport->frontBio) { - if (!BIO_set_nonblock(transport->frontBio, blocking ? FALSE : TRUE)) + if (!BIO_set_nonblock(transport->frontBio, !(blocking))) return FALSE; } diff --git a/libfreerdp/core/update.c b/libfreerdp/core/update.c index 7360c53aa..dfc0bf71c 100644 --- a/libfreerdp/core/update.c +++ b/libfreerdp/core/update.c @@ -1145,10 +1145,8 @@ static BOOL update_set_bounds(rdpContext* context, const rdpBounds* bounds) static BOOL update_bounds_is_null(rdpBounds* bounds) { WINPR_ASSERT(bounds); - if ((bounds->left == 0) && (bounds->top == 0) && (bounds->right == 0) && (bounds->bottom == 0)) - return TRUE; - - return FALSE; + return ((bounds->left == 0) && (bounds->top == 0) && (bounds->right == 0) && + (bounds->bottom == 0)); } static BOOL update_bounds_equals(rdpBounds* bounds1, rdpBounds* bounds2) @@ -1156,11 +1154,8 @@ static BOOL update_bounds_equals(rdpBounds* bounds1, rdpBounds* bounds2) WINPR_ASSERT(bounds1); WINPR_ASSERT(bounds2); - if ((bounds1->left == bounds2->left) && (bounds1->top == bounds2->top) && - (bounds1->right == bounds2->right) && (bounds1->bottom == bounds2->bottom)) - return TRUE; - - return FALSE; + return ((bounds1->left == bounds2->left) && (bounds1->top == bounds2->top) && + (bounds1->right == bounds2->right) && (bounds1->bottom == bounds2->bottom)); } static size_t update_prepare_bounds(rdpContext* context, ORDER_INFO* orderInfo) diff --git a/libfreerdp/crypto/ber.c b/libfreerdp/crypto/ber.c index 31368ddfd..6043e97c4 100644 --- a/libfreerdp/crypto/ber.c +++ b/libfreerdp/crypto/ber.c @@ -557,7 +557,7 @@ BOOL ber_read_BOOL(wStream* s, BOOL* value) return FALSE; Stream_Read_UINT8(s, v); - *value = (v ? TRUE : FALSE); + *value = (v != 0); return TRUE; } diff --git a/libfreerdp/crypto/certificate.c b/libfreerdp/crypto/certificate.c index dda192c52..44d0bd53f 100644 --- a/libfreerdp/crypto/certificate.c +++ b/libfreerdp/crypto/certificate.c @@ -754,7 +754,10 @@ static BOOL certificate_process_server_public_signature(rdpCertificate* certific Stream_Read(s, encsig, siglen); if (siglen < 8) + { + WLog_WARN(TAG, "public signature too short: %" PRIu32, siglen); return FALSE; + } /* Last 8 bytes shall be all zero. */ #if defined(CERT_VALIDATE_PADDING) diff --git a/libfreerdp/crypto/er.c b/libfreerdp/crypto/er.c index d22c1d7d8..c1e58e23e 100644 --- a/libfreerdp/crypto/er.c +++ b/libfreerdp/crypto/er.c @@ -100,10 +100,7 @@ BOOL er_read_universal_tag(wStream* s, BYTE tag, BOOL pc) Stream_Read_UINT8(s, byte); - if (byte != (ER_CLASS_UNIV | ER_PC(pc) | (ER_TAG_MASK & tag))) - return FALSE; - - return TRUE; + return (byte == (ER_CLASS_UNIV | ER_PC(pc) | (ER_TAG_MASK & tag))); } /** @@ -337,7 +334,7 @@ BOOL er_read_BOOL(wStream* s, BOOL* value) if (length != 1) return FALSE; Stream_Read_UINT8(s, v); - *value = (v ? TRUE : FALSE); + *value = v != 0; return TRUE; } diff --git a/libfreerdp/gdi/bitmap.c b/libfreerdp/gdi/bitmap.c index 42c268405..4b0804d1e 100644 --- a/libfreerdp/gdi/bitmap.c +++ b/libfreerdp/gdi/bitmap.c @@ -671,8 +671,5 @@ BOOL gdi_BitBlt(HGDI_DC hdcDest, INT32 nXDest, INT32 nYDest, INT32 nWidth, INT32 break; } - if (!gdi_InvalidateRegion(hdcDest, nXDest, nYDest, nWidth, nHeight)) - return FALSE; - - return TRUE; + return gdi_InvalidateRegion(hdcDest, nXDest, nYDest, nWidth, nHeight); } diff --git a/libfreerdp/gdi/gfx.c b/libfreerdp/gdi/gfx.c index ce2c0611a..b16762b05 100644 --- a/libfreerdp/gdi/gfx.c +++ b/libfreerdp/gdi/gfx.c @@ -1367,8 +1367,7 @@ static UINT gdi_SurfaceToSurface(RdpgfxClientContext* context, WINPR_ASSERT(context->GetSurfaceData); surfaceSrc = (gdiGfxSurface*)context->GetSurfaceData(context, surfaceToSurface->surfaceIdSrc); - sameSurface = - (surfaceToSurface->surfaceIdSrc == surfaceToSurface->surfaceIdDest) ? TRUE : FALSE; + sameSurface = (surfaceToSurface->surfaceIdSrc == surfaceToSurface->surfaceIdDest); if (!sameSurface) surfaceDst = diff --git a/libfreerdp/gdi/region.c b/libfreerdp/gdi/region.c index 6837ee111..e9769bb64 100644 --- a/libfreerdp/gdi/region.c +++ b/libfreerdp/gdi/region.c @@ -548,13 +548,8 @@ inline BOOL gdi_EqualRgn(const GDI_RGN* hSrcRgn1, const GDI_RGN* hSrcRgn2) { WINPR_ASSERT(hSrcRgn1); WINPR_ASSERT(hSrcRgn2); - if ((hSrcRgn1->x == hSrcRgn2->x) && (hSrcRgn1->y == hSrcRgn2->y) && - (hSrcRgn1->w == hSrcRgn2->w) && (hSrcRgn1->h == hSrcRgn2->h)) - { - return TRUE; - } - - return FALSE; + return ((hSrcRgn1->x == hSrcRgn2->x) && (hSrcRgn1->y == hSrcRgn2->y) && + (hSrcRgn1->w == hSrcRgn2->w) && (hSrcRgn1->h == hSrcRgn2->h)); } /** diff --git a/libfreerdp/gdi/shape.c b/libfreerdp/gdi/shape.c index ceee7957b..3a8d54cc7 100644 --- a/libfreerdp/gdi/shape.c +++ b/libfreerdp/gdi/shape.c @@ -228,10 +228,7 @@ BOOL gdi_FillRect(HGDI_DC hdc, const GDI_RECT* rect, HGDI_BRUSH hbr) break; } - if (!gdi_InvalidateRegion(hdc, nXDest, nYDest, nWidth, nHeight)) - return FALSE; - - return TRUE; + return gdi_InvalidateRegion(hdc, nXDest, nYDest, nWidth, nHeight); } /** diff --git a/libfreerdp/primitives/prim_copy.c b/libfreerdp/primitives/prim_copy.c index 39c2c67ac..3178d55eb 100644 --- a/libfreerdp/primitives/prim_copy.c +++ b/libfreerdp/primitives/prim_copy.c @@ -378,7 +378,7 @@ static pstatus_t generic_image_copy_no_overlap(BYTE* WINPR_RESTRICT pDstData, DW const gdiPalette* WINPR_RESTRICT palette, UINT32 flags) { - const BOOL vSrcVFlip = (flags & FREERDP_FLIP_VERTICAL) ? TRUE : FALSE; + const BOOL vSrcVFlip = (flags & FREERDP_FLIP_VERTICAL) != 0; int64_t srcVOffset = 0; int64_t srcVMultiplier = 1; int64_t dstVOffset = 0; diff --git a/libfreerdp/primitives/primitives.c b/libfreerdp/primitives/primitives.c index dba14cbc6..780ec0902 100644 --- a/libfreerdp/primitives/primitives.c +++ b/libfreerdp/primitives/primitives.c @@ -294,10 +294,7 @@ static BOOL CALLBACK primitives_init_gpu_cb(PINIT_ONCE once, PVOID param, PVOID* WINPR_UNUSED(param); WINPR_UNUSED(context); - if (!primitives_init_opencl(&pPrimitivesGpu)) - return FALSE; - - return TRUE; + return primitives_init_opencl(&pPrimitivesGpu); } #endif @@ -308,10 +305,7 @@ static BOOL CALLBACK primitives_init_cpu_cb(PINIT_ONCE once, PVOID param, PVOID* WINPR_UNUSED(param); WINPR_UNUSED(context); - if (!primitives_init_optimized(&pPrimitivesCpu)) - return FALSE; - - return TRUE; + return (primitives_init_optimized(&pPrimitivesCpu)); } #endif diff --git a/libfreerdp/primitives/sse/prim_copy_avx2.c b/libfreerdp/primitives/sse/prim_copy_avx2.c index c48db558c..e9fa18919 100644 --- a/libfreerdp/primitives/sse/prim_copy_avx2.c +++ b/libfreerdp/primitives/sse/prim_copy_avx2.c @@ -219,7 +219,7 @@ static pstatus_t avx2_image_copy_no_overlap(BYTE* WINPR_RESTRICT pDstData, DWORD UINT32 nSrcStep, UINT32 nXSrc, UINT32 nYSrc, const gdiPalette* WINPR_RESTRICT palette, UINT32 flags) { - const BOOL vSrcVFlip = (flags & FREERDP_FLIP_VERTICAL) ? TRUE : FALSE; + const BOOL vSrcVFlip = (flags & FREERDP_FLIP_VERTICAL) != 0; int64_t srcVOffset = 0; int64_t srcVMultiplier = 1; int64_t dstVOffset = 0; diff --git a/libfreerdp/primitives/sse/prim_copy_sse4_1.c b/libfreerdp/primitives/sse/prim_copy_sse4_1.c index df96c36cd..10943e7a5 100644 --- a/libfreerdp/primitives/sse/prim_copy_sse4_1.c +++ b/libfreerdp/primitives/sse/prim_copy_sse4_1.c @@ -198,7 +198,7 @@ static pstatus_t sse_image_copy_no_overlap(BYTE* WINPR_RESTRICT pDstData, DWORD UINT32 nSrcStep, UINT32 nXSrc, UINT32 nYSrc, const gdiPalette* WINPR_RESTRICT palette, UINT32 flags) { - const BOOL vSrcVFlip = (flags & FREERDP_FLIP_VERTICAL) ? TRUE : FALSE; + const BOOL vSrcVFlip = (flags & FREERDP_FLIP_VERTICAL) != 0; int64_t srcVOffset = 0; int64_t srcVMultiplier = 1; int64_t dstVOffset = 0; diff --git a/libfreerdp/primitives/test/TestPrimitivesAdd.c b/libfreerdp/primitives/test/TestPrimitivesAdd.c index f37036dc7..35de8c763 100644 --- a/libfreerdp/primitives/test/TestPrimitivesAdd.c +++ b/libfreerdp/primitives/test/TestPrimitivesAdd.c @@ -36,10 +36,7 @@ static BOOL test_add16s_func(void) /* Unaligned */ status = optimized->add_16s(src1 + 1, src2 + 1, d2 + 2, FUNC_TEST_SIZE); - if (status != PRIMITIVES_SUCCESS) - return FALSE; - - return TRUE; + return (status == PRIMITIVES_SUCCESS); } /* ------------------------------------------------------------------------- */ @@ -55,11 +52,8 @@ static BOOL test_add16s_speed(void) winpr_RAND(src1, sizeof(src1)); winpr_RAND(src2, sizeof(src2)); - if (!speed_test("add16s", "aligned", g_Iterations, (speed_test_fkt)generic->add_16s, - (speed_test_fkt)optimized->add_16s, src1, src2, dst, FUNC_TEST_SIZE)) - return FALSE; - - return TRUE; + return (speed_test("add16s", "aligned", g_Iterations, (speed_test_fkt)generic->add_16s, + (speed_test_fkt)optimized->add_16s, src1, src2, dst, FUNC_TEST_SIZE)); } int TestPrimitivesAdd(int argc, char* argv[]) diff --git a/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c b/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c index c648951f1..06924f73c 100644 --- a/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c +++ b/libfreerdp/primitives/test/TestPrimitivesAlphaComp.c @@ -174,12 +174,9 @@ static int test_alphaComp_speed(void) for (UINT32 i = 0; i < sizeof(src2) / 4; ++i) *ptr++ |= 0xFF000000U; - if (!speed_test("add16s", "aligned", g_Iterations, (speed_test_fkt)generic->alphaComp_argb, - (speed_test_fkt)optimized->alphaComp_argb, src1, 4 * SRC1_WIDTH, src2, - 4 * SRC2_WIDTH, dst1, 4 * DST_WIDTH, TEST_WIDTH, TEST_HEIGHT)) - return FALSE; - - return TRUE; + return (speed_test("add16s", "aligned", g_Iterations, (speed_test_fkt)generic->alphaComp_argb, + (speed_test_fkt)optimized->alphaComp_argb, src1, 4 * SRC1_WIDTH, src2, + 4 * SRC2_WIDTH, dst1, 4 * DST_WIDTH, TEST_WIDTH, TEST_HEIGHT)); } int TestPrimitivesAlphaComp(int argc, char* argv[]) diff --git a/libfreerdp/primitives/test/TestPrimitivesAndOr.c b/libfreerdp/primitives/test/TestPrimitivesAndOr.c index bd0c953d0..b596b56b0 100644 --- a/libfreerdp/primitives/test/TestPrimitivesAndOr.c +++ b/libfreerdp/primitives/test/TestPrimitivesAndOr.c @@ -137,11 +137,9 @@ static BOOL test_or_32u_speed(void) winpr_RAND(src, sizeof(src)); - if (!speed_test("add16s", "aligned", g_Iterations, (speed_test_fkt)generic->orC_32u, - (speed_test_fkt)optimized->orC_32u, src + 1, VALUE, dst + 1, FUNC_TEST_SIZE)) - return FALSE; - - return TRUE; + return (speed_test("add16s", "aligned", g_Iterations, (speed_test_fkt)generic->orC_32u, + (speed_test_fkt)optimized->orC_32u, src + 1, VALUE, dst + 1, + FUNC_TEST_SIZE)); } int TestPrimitivesAndOr(int argc, char* argv[]) diff --git a/libfreerdp/primitives/test/TestPrimitivesColors.c b/libfreerdp/primitives/test/TestPrimitivesColors.c index c8ef97a43..6d8c5bfb0 100644 --- a/libfreerdp/primitives/test/TestPrimitivesColors.c +++ b/libfreerdp/primitives/test/TestPrimitivesColors.c @@ -238,13 +238,10 @@ static int test_yCbCrToRGB_16s16s_P3P3_speed(void) output[1] = g; output[2] = b; - if (!speed_test("yCbCrToRGB_16s16s_P3P3", "aligned", g_Iterations, - (speed_test_fkt)generic->yCbCrToRGB_16s16s_P3P3, - (speed_test_fkt)optimized->yCbCrToRGB_16s16s_P3P3, input, 64 * 2, output, - 64 * 2, &roi)) - return FALSE; - - return TRUE; + return (speed_test("yCbCrToRGB_16s16s_P3P3", "aligned", g_Iterations, + (speed_test_fkt)generic->yCbCrToRGB_16s16s_P3P3, + (speed_test_fkt)optimized->yCbCrToRGB_16s16s_P3P3, input, 64 * 2, output, + 64 * 2, &roi)); } int TestPrimitivesColors(int argc, char* argv[]) diff --git a/libfreerdp/primitives/test/TestPrimitivesShift.c b/libfreerdp/primitives/test/TestPrimitivesShift.c index 949c63b2b..3293e6c99 100644 --- a/libfreerdp/primitives/test/TestPrimitivesShift.c +++ b/libfreerdp/primitives/test/TestPrimitivesShift.c @@ -58,10 +58,7 @@ static BOOL test_lShift_16s_func(void) status = optimized->lShiftC_16s(src + 1, val, d1 + 2, FUNC_TEST_SIZE); - if (status != PRIMITIVES_SUCCESS) - return FALSE; - - return TRUE; + return (status == PRIMITIVES_SUCCESS); } static BOOL test_lShift_16u_func(void) @@ -104,10 +101,7 @@ static BOOL test_lShift_16u_func(void) status = optimized->lShiftC_16u(src + 1, val, d1 + 2, FUNC_TEST_SIZE); - if (status != PRIMITIVES_SUCCESS) - return FALSE; - - return TRUE; + return (status == PRIMITIVES_SUCCESS); } static BOOL test_rShift_16s_func(void) @@ -150,10 +144,7 @@ static BOOL test_rShift_16s_func(void) status = optimized->rShiftC_16s(src + 1, val, d1 + 2, FUNC_TEST_SIZE); - if (status != PRIMITIVES_SUCCESS) - return FALSE; - - return TRUE; + return (status == PRIMITIVES_SUCCESS); } static BOOL test_rShift_16u_func(void) @@ -195,10 +186,7 @@ static BOOL test_rShift_16u_func(void) status = optimized->rShiftC_16u(src + 1, val, d1 + 2, FUNC_TEST_SIZE); - if (status != PRIMITIVES_SUCCESS) - return FALSE; - - return TRUE; + return (status == PRIMITIVES_SUCCESS); } static BOOL test_ShiftWrapper_16s_func(void) @@ -261,10 +249,7 @@ static BOOL test_ShiftWrapper_16s_func(void) status = optimized->shiftC_16s(src + 1, -val, d1 + 2, FUNC_TEST_SIZE); - if (status != PRIMITIVES_SUCCESS) - return FALSE; - - return TRUE; + return (status == PRIMITIVES_SUCCESS); } static BOOL test_ShiftWrapper_16u_func(void) @@ -326,10 +311,7 @@ static BOOL test_ShiftWrapper_16u_func(void) status = optimized->shiftC_16u(src + 1, -val, d1 + 2, FUNC_TEST_SIZE); - if (status != PRIMITIVES_SUCCESS) - return FALSE; - - return TRUE; + return (status == PRIMITIVES_SUCCESS); } /* ------------------------------------------------------------------------- */ diff --git a/libfreerdp/primitives/test/TestPrimitivesYUV.c b/libfreerdp/primitives/test/TestPrimitivesYUV.c index 6f5d4e530..191e16da5 100644 --- a/libfreerdp/primitives/test/TestPrimitivesYUV.c +++ b/libfreerdp/primitives/test/TestPrimitivesYUV.c @@ -1291,9 +1291,7 @@ static BOOL similarYUV(const BYTE* line1, const BYTE* line2, size_t len) const int a = line1[x]; const int b = line2[x]; const int diff = abs(a - b); - if (diff >= 2) - return FALSE; - return TRUE; + return (diff < 2); } } diff --git a/libfreerdp/utils/pcap.c b/libfreerdp/utils/pcap.c index 8c93601ab..795a043d5 100644 --- a/libfreerdp/utils/pcap.c +++ b/libfreerdp/utils/pcap.c @@ -154,10 +154,7 @@ BOOL pcap_has_next_record(const rdpPcap* pcap) { WINPR_ASSERT(pcap); - if (pcap->file_size - (_ftelli64(pcap->fp)) <= 16) - return FALSE; - - return TRUE; + return (pcap->file_size - (_ftelli64(pcap->fp)) > 16); } BOOL pcap_get_next_record_header(rdpPcap* pcap, pcap_record* record) diff --git a/libfreerdp/utils/smartcard_call.c b/libfreerdp/utils/smartcard_call.c index f3bc26097..abed448f1 100644 --- a/libfreerdp/utils/smartcard_call.c +++ b/libfreerdp/utils/smartcard_call.c @@ -1436,7 +1436,7 @@ static LONG smartcard_GetAttrib_Call(scard_call_context* smartcard, wStream* out if (!call->fpbAttrIsNULL) { - autoAllocate = (call->cbAttrLen == SCARD_AUTOALLOCATE) ? TRUE : FALSE; + autoAllocate = (call->cbAttrLen == SCARD_AUTOALLOCATE); cbAttrLen = call->cbAttrLen; if (cbAttrLen && !autoAllocate) { diff --git a/server/Sample/sf_encomsp.c b/server/Sample/sf_encomsp.c index 6d03f793a..c1aa628da 100644 --- a/server/Sample/sf_encomsp.c +++ b/server/Sample/sf_encomsp.c @@ -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); } diff --git a/server/Sample/sf_rdpsnd.c b/server/Sample/sf_rdpsnd.c index 6d4c1ecc3..05559c253 100644 --- a/server/Sample/sf_rdpsnd.c +++ b/server/Sample/sf_rdpsnd.c @@ -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); } diff --git a/server/proxy/channels/pf_channel_drdynvc.c b/server/proxy/channels/pf_channel_drdynvc.c index 33f24ee0b..29d22985d 100644 --- a/server/proxy/channels/pf_channel_drdynvc.c +++ b/server/proxy/channels/pf_channel_drdynvc.c @@ -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); diff --git a/server/proxy/channels/pf_channel_rdpdr.c b/server/proxy/channels/pf_channel_rdpdr.c index 503d8b704..c258182e8 100644 --- a/server/proxy/channels/pf_channel_rdpdr.c +++ b/server/proxy/channels/pf_channel_rdpdr.c @@ -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 diff --git a/server/proxy/pf_client.c b/server/proxy/pf_client.c index 8c3269735..2fcf7ec9f 100644 --- a/server/proxy/pf_client.c +++ b/server/proxy/pf_client.c @@ -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) diff --git a/server/proxy/pf_config.c b/server/proxy/pf_config.c index c8902df0e..fc055f577 100644 --- a/server/proxy/pf_config.c +++ b/server/proxy/pf_config.c @@ -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 diff --git a/server/proxy/pf_server.c b/server/proxy/pf_server.c index c39ea288b..0a77efc0c 100644 --- a/server/proxy/pf_server.c +++ b/server/proxy/pf_server.c @@ -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)); } /** diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c index 8389c5492..93c8a7330 100644 --- a/server/shadow/shadow_client.c +++ b/server/shadow/shadow_client.c @@ -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); diff --git a/server/shadow/shadow_encomsp.c b/server/shadow/shadow_encomsp.c index 663613584..b3c48887c 100644 --- a/server/shadow/shadow_encomsp.c +++ b/server/shadow/shadow_encomsp.c @@ -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) { diff --git a/server/shadow/shadow_server.c b/server/shadow/shadow_server.c index 9703d0121..9adb406bc 100644 --- a/server/shadow/shadow_server.c +++ b/server/shadow/shadow_server.c @@ -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") diff --git a/winpr/libwinpr/comm/comm.c b/winpr/libwinpr/comm/comm.c index d1b3ef4cb..bef73aff3 100644 --- a/winpr/libwinpr/comm/comm.c +++ b/winpr/libwinpr/comm/comm.c @@ -1806,7 +1806,7 @@ static BOOL CommStatusErrorEx(WINPR_COMM* pComm, unsigned long int ctl, const ch const char* fkt, size_t line) { WINPR_ASSERT(pComm); - BOOL rc = pComm->permissive ? TRUE : FALSE; + BOOL rc = (pComm->permissive); const DWORD level = rc ? WLOG_DEBUG : WLOG_WARN; char ebuffer[256] = WINPR_C_ARRAY_INIT; const char* str = CommIoCtlToStr(ctl); diff --git a/winpr/libwinpr/comm/comm_serial_sys.c b/winpr/libwinpr/comm/comm_serial_sys.c index 4439a5995..998801a81 100644 --- a/winpr/libwinpr/comm/comm_serial_sys.c +++ b/winpr/libwinpr/comm/comm_serial_sys.c @@ -1424,12 +1424,7 @@ static BOOL refresh_PendingEvents(WINPR_COMM* pComm) WINPR_ASSERT(pComm); /* NB: also ensures PendingEvents to be up to date */ - if (!get_commstatus(pComm, &serialStatus)) - { - return FALSE; - } - - return TRUE; + return (get_commstatus(pComm, &serialStatus)); } static void consume_event(WINPR_COMM* pComm, ULONG* pOutputMask, ULONG event) diff --git a/winpr/libwinpr/crypto/hash.c b/winpr/libwinpr/crypto/hash.c index 568364201..4c11d740e 100644 --- a/winpr/libwinpr/crypto/hash.c +++ b/winpr/libwinpr/crypto/hash.c @@ -239,8 +239,7 @@ BOOL winpr_HMAC_Init(WINPR_HMAC_CTX* ctx, WINPR_MD_TYPE md, const void* key, siz const OSSL_PARAM param[] = { OSSL_PARAM_construct_utf8_string(param_name, hash, 0), OSSL_PARAM_construct_end() }; - if (EVP_MAC_init(ctx->xhmac, key, keylen, param) == 1) - return TRUE; + return EVP_MAC_init(ctx->xhmac, key, keylen, param) == 1; #else HMAC_CTX* hmac = ctx->hmac; const EVP_MD* evp = winpr_openssl_get_evp_md(md); @@ -301,8 +300,7 @@ BOOL winpr_HMAC_Update(WINPR_HMAC_CTX* ctx, const void* input, size_t ilen) #if defined(WITH_OPENSSL) #if OPENSSL_VERSION_NUMBER >= 0x30000000L - if (EVP_MAC_update(ctx->xhmac, input, ilen) == 1) - return TRUE; + return EVP_MAC_update(ctx->xhmac, input, ilen) == 1; #else HMAC_CTX* hmac = ctx->hmac; #if (OPENSSL_VERSION_NUMBER < 0x10000000L) || \ @@ -345,8 +343,7 @@ BOOL winpr_HMAC_Final(WINPR_HMAC_CTX* ctx, void* output, size_t olen) #if defined(WITH_OPENSSL) #if OPENSSL_VERSION_NUMBER >= 0x30000000L const int rc = EVP_MAC_final(ctx->xhmac, output, NULL, olen); - if (rc == 1) - return TRUE; + return (rc == 1); #else HMAC_CTX* hmac = ctx->hmac; #if (OPENSSL_VERSION_NUMBER < 0x10000000L) || \ @@ -616,8 +613,7 @@ BOOL winpr_Digest_Update(WINPR_DIGEST_CTX* ctx, const void* input, size_t ilen) #if defined(WITH_OPENSSL) EVP_MD_CTX* mdctx = ctx->mdctx; - if (EVP_DigestUpdate(mdctx, input, ilen) != 1) - return FALSE; + return EVP_DigestUpdate(mdctx, input, ilen) == 1; #elif defined(WITH_MBEDTLS) mbedtls_md_context_t* mdctx = ctx->mdctx; @@ -657,8 +653,7 @@ BOOL winpr_Digest_Final(WINPR_DIGEST_CTX* ctx, void* output, WINPR_ATTR_UNUSED s #if defined(WITH_OPENSSL) EVP_MD_CTX* mdctx = ctx->mdctx; - if (EVP_DigestFinal_ex(mdctx, output, NULL) == 1) - return TRUE; + return EVP_DigestFinal_ex(mdctx, output, NULL) == 1; #elif defined(WITH_MBEDTLS) mbedtls_md_context_t* mdctx = ctx->mdctx; @@ -680,9 +675,7 @@ BOOL winpr_DigestSign_Init(WINPR_DIGEST_CTX* ctx, WINPR_MD_TYPE md, void* key) return FALSE; const int rdsi = EVP_DigestSignInit(ctx->mdctx, NULL, evp, NULL, key); - if (rdsi <= 0) - return FALSE; - return TRUE; + return (rdsi > 0); #else return FALSE; #endif @@ -695,9 +688,7 @@ BOOL winpr_DigestSign_Update(WINPR_DIGEST_CTX* ctx, const void* input, size_t il #if defined(WITH_OPENSSL) EVP_MD_CTX* mdctx = ctx->mdctx; - if (EVP_DigestSignUpdate(mdctx, input, ilen) != 1) - return FALSE; - return TRUE; + return (EVP_DigestSignUpdate(mdctx, input, ilen) == 1); #else return FALSE; #endif diff --git a/winpr/libwinpr/file/generic.c b/winpr/libwinpr/file/generic.c index fea29c9c3..a62592492 100644 --- a/winpr/libwinpr/file/generic.c +++ b/winpr/libwinpr/file/generic.c @@ -1237,10 +1237,7 @@ BOOL FindClose(HANDLE hFindFile) BOOL CreateDirectoryA(LPCSTR lpPathName, WINPR_ATTR_UNUSED LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - if (!mkdir(lpPathName, S_IRUSR | S_IWUSR | S_IXUSR)) - return TRUE; - - return FALSE; + return mkdir(lpPathName, S_IRUSR | S_IWUSR | S_IXUSR) == 0; } BOOL CreateDirectoryW(LPCWSTR lpPathName, LPSECURITY_ATTRIBUTES lpSecurityAttributes) diff --git a/winpr/libwinpr/file/namedPipeClient.c b/winpr/libwinpr/file/namedPipeClient.c index 0f4ed4605..277c002dc 100644 --- a/winpr/libwinpr/file/namedPipeClient.c +++ b/winpr/libwinpr/file/namedPipeClient.c @@ -225,10 +225,7 @@ const HANDLE_CREATOR* GetNamedPipeClientHandleCreator(void) BOOL IsNamedPipeFileNameA(LPCSTR lpName) { - if (strncmp(lpName, NAMED_PIPE_PREFIX_PATH, sizeof(NAMED_PIPE_PREFIX_PATH) - 1) != 0) - return FALSE; - - return TRUE; + return (strncmp(lpName, NAMED_PIPE_PREFIX_PATH, sizeof(NAMED_PIPE_PREFIX_PATH) - 1) == 0); } char* GetNamedPipeNameWithoutPrefixA(LPCSTR lpName) diff --git a/winpr/libwinpr/file/test/TestFileFindFirstFile.c b/winpr/libwinpr/file/test/TestFileFindFirstFile.c index c190325fd..e7fcb66f5 100644 --- a/winpr/libwinpr/file/test/TestFileFindFirstFile.c +++ b/winpr/libwinpr/file/test/TestFileFindFirstFile.c @@ -190,9 +190,7 @@ static BOOL list_directory_star(const char* BasePath, wArrayList* files) fcount++; } - if (fcount != count) - return FALSE; - return TRUE; + return (fcount == count); } static BOOL find_first_file_fail(const char* FilePath) diff --git a/winpr/libwinpr/library/library.c b/winpr/libwinpr/library/library.c index a24cf0c66..dfbb93a67 100644 --- a/winpr/libwinpr/library/library.c +++ b/winpr/libwinpr/library/library.c @@ -201,10 +201,7 @@ BOOL FreeLibrary(HMODULE hLibModule) int status = 0; status = dlclose(hLibModule); - if (status != 0) - return FALSE; - - return TRUE; + return (status == 0); } HMODULE GetModuleHandleA(LPCSTR lpModuleName) diff --git a/winpr/libwinpr/path/path.c b/winpr/libwinpr/path/path.c index 13a5b74ae..85451c05e 100644 --- a/winpr/libwinpr/path/path.c +++ b/winpr/libwinpr/path/path.c @@ -718,9 +718,7 @@ HRESULT PathCchStripPrefixA(PSTR pszPath, size_t cchPath) return E_INVALIDARG; hasPrefix = ((pszPath[0] == '\\') && (pszPath[1] == '\\') && (pszPath[2] == '?') && - (pszPath[3] == '\\')) - ? TRUE - : FALSE; + (pszPath[3] == '\\')); if (hasPrefix) { @@ -753,9 +751,7 @@ HRESULT PathCchStripPrefixW(PWSTR pszPath, size_t cchPath) return E_INVALIDARG; hasPrefix = ((pszPath[0] == '\\') && (pszPath[1] == '\\') && (pszPath[2] == '?') && - (pszPath[3] == '\\')) - ? TRUE - : FALSE; + (pszPath[3] == '\\')); if (hasPrefix) { diff --git a/winpr/libwinpr/path/shell.c b/winpr/libwinpr/path/shell.c index addc9b959..d66f66a56 100644 --- a/winpr/libwinpr/path/shell.c +++ b/winpr/libwinpr/path/shell.c @@ -689,10 +689,7 @@ BOOL PathFileExistsA(LPCSTR pszPath) { struct stat stat_info; - if (stat(pszPath, &stat_info) != 0) - return FALSE; - - return TRUE; + return (stat(pszPath, &stat_info) == 0); } BOOL PathFileExistsW(LPCWSTR pszPath) @@ -818,7 +815,7 @@ BOOL winpr_DeleteFile(const char* lpFileName) return FALSE; const int status = unlink(lpFileName); - return (status != -1) ? TRUE : FALSE; + return (status != -1); #else LPWSTR lpFileNameW = NULL; BOOL result = FALSE; diff --git a/winpr/libwinpr/rpc/rpc.c b/winpr/libwinpr/rpc/rpc.c index a90c395ef..2bf3ab1a5 100644 --- a/winpr/libwinpr/rpc/rpc.c +++ b/winpr/libwinpr/rpc/rpc.c @@ -946,7 +946,7 @@ RPC_STATUS UuidCreateNil(UUID* NilUuid) int UuidEqual(const UUID* Uuid1, const UUID* Uuid2, RPC_STATUS* Status) { - return ((UuidCompare(Uuid1, Uuid2, Status) == 0) ? TRUE : FALSE); + return UuidCompare(Uuid1, Uuid2, Status) == 0; } unsigned short UuidHash(WINPR_ATTR_UNUSED const UUID* Uuid, WINPR_ATTR_UNUSED RPC_STATUS* Status) diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c index e84582ca5..1559418f0 100644 --- a/winpr/libwinpr/smartcard/smartcard_pcsc.c +++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c @@ -1719,7 +1719,7 @@ static LONG WINAPI PCSC_SCardConnect_Internal(SCARDCONTEXT hContext, LPCSTR szRe if (!g_PCSC.pfnSCardConnect) return PCSC_SCard_LogError("g_PCSC.pfnSCardConnect"); - shared = (dwShareMode == SCARD_SHARE_DIRECT) ? TRUE : FALSE; + shared = (dwShareMode == SCARD_SHARE_DIRECT) != 0; PCSC_WaitForCardAccess(hContext, 0, shared); szReaderPCSC = szReader; @@ -1811,7 +1811,7 @@ static LONG WINAPI PCSC_SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode, if (!g_PCSC.pfnSCardReconnect) return PCSC_SCard_LogError("g_PCSC.pfnSCardReconnect"); - shared = (dwShareMode == SCARD_SHARE_DIRECT) ? TRUE : FALSE; + shared = (dwShareMode == SCARD_SHARE_DIRECT) != 0; PCSC_WaitForCardAccess(0, hCard, shared); pcsc_dwPreferredProtocols = (PCSC_DWORD)PCSC_ConvertProtocolsFromWinSCard(dwPreferredProtocols); status = g_PCSC.pfnSCardReconnect(hCard, pcsc_dwShareMode, pcsc_dwPreferredProtocols, diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_compute.c b/winpr/libwinpr/sspi/NTLM/ntlm_compute.c index 7319e7608..f375ab808 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_compute.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_compute.c @@ -471,9 +471,8 @@ static BOOL ntlm_compute_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) } else if (context->HashCallback) { - int ret = 0; - SecBuffer proofValue; - SecBuffer micValue; + SecBuffer proofValue = WINPR_C_ARRAY_INIT; + SecBuffer micValue = WINPR_C_ARRAY_INIT; if (ntlm_computeProofValue(context, &proofValue) != SEC_E_OK) return FALSE; @@ -484,13 +483,13 @@ static BOOL ntlm_compute_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) return FALSE; } - ret = context->HashCallback(context->HashCallbackArg, &credentials->identity, &proofValue, - context->EncryptedRandomSessionKey, - context->AUTHENTICATE_MESSAGE.MessageIntegrityCheck, &micValue, - hash); + const SECURITY_STATUS ret = context->HashCallback( + context->HashCallbackArg, &credentials->identity, &proofValue, + context->EncryptedRandomSessionKey, context->AUTHENTICATE_MESSAGE.MessageIntegrityCheck, + &micValue, hash); sspi_SecBufferFree(&proofValue); sspi_SecBufferFree(&micValue); - return ret ? TRUE : FALSE; + return ret == SEC_E_OK; } else if (context->UseSamFileDatabase) { diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_message.c b/winpr/libwinpr/sspi/NTLM/ntlm_message.c index ec404cc9b..dedcc54c5 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_message.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_message.c @@ -986,8 +986,7 @@ SECURITY_STATUS ntlm_read_AuthenticateMessage(NTLM_CONTEXT* context, PSecBuffer if (!ntlm_read_negotiate_flags(s, &message->NegotiateFlags, 0, "NTLM_AUTHENTICATE_MESSAGE")) goto fail; - context->NegotiateKeyExchange = - (message->NegotiateFlags & NTLMSSP_NEGOTIATE_KEY_EXCH) ? TRUE : FALSE; + context->NegotiateKeyExchange = (message->NegotiateFlags & NTLMSSP_NEGOTIATE_KEY_EXCH) != 0; if ((context->NegotiateKeyExchange && !message->EncryptedRandomSessionKey.Len) || (!context->NegotiateKeyExchange && message->EncryptedRandomSessionKey.Len)) diff --git a/winpr/libwinpr/sspi/Negotiate/negotiate.c b/winpr/libwinpr/sspi/Negotiate/negotiate.c index 964119ff3..be4ca6b01 100644 --- a/winpr/libwinpr/sspi/Negotiate/negotiate.c +++ b/winpr/libwinpr/sspi/Negotiate/negotiate.c @@ -353,14 +353,14 @@ static BOOL negotiate_get_config(void* pAuthData, BOOL* kerberos, BOOL* ntlm, BO DWORD dwValue = 0; if (negotiate_get_dword(hKey, PACKAGE_NAME_KERBEROS, &dwValue)) - *kerberos = (dwValue != 0) ? TRUE : FALSE; + *kerberos = (dwValue != 0); if (negotiate_get_dword(hKey, PACKAGE_NAME_KERBEROS_U2U, &dwValue)) - *u2u = (dwValue != 0) ? TRUE : FALSE; + *u2u = (dwValue != 0); #if !defined(WITH_KRB5_NO_NTLM_FALLBACK) if (negotiate_get_dword(hKey, PACKAGE_NAME_NTLM, &dwValue)) - *ntlm = (dwValue != 0) ? TRUE : FALSE; + *ntlm = (dwValue != 0); #endif RegCloseKey(hKey); diff --git a/winpr/libwinpr/synch/barrier.c b/winpr/libwinpr/synch/barrier.c index 8d2680bc2..1fd839ac6 100644 --- a/winpr/libwinpr/synch/barrier.c +++ b/winpr/libwinpr/synch/barrier.c @@ -179,8 +179,8 @@ BOOL WINAPI winpr_EnterSynchronizationBarrier(LPSYNCHRONIZATION_BARRIER lpBarrie if (remainingThreads > 0) { DWORD dwProcessors = lpBarrier->Reserved4; - BOOL spinOnly = (dwFlags & SYNCHRONIZATION_BARRIER_FLAGS_SPIN_ONLY) ? TRUE : FALSE; - BOOL blockOnly = (dwFlags & SYNCHRONIZATION_BARRIER_FLAGS_BLOCK_ONLY) ? TRUE : FALSE; + BOOL spinOnly = (dwFlags & SYNCHRONIZATION_BARRIER_FLAGS_SPIN_ONLY) != 0; + BOOL blockOnly = (dwFlags & SYNCHRONIZATION_BARRIER_FLAGS_BLOCK_ONLY) != 0; BOOL block = TRUE; /** diff --git a/winpr/libwinpr/synch/timer.c b/winpr/libwinpr/synch/timer.c index 9772873a6..95721084b 100644 --- a/winpr/libwinpr/synch/timer.c +++ b/winpr/libwinpr/synch/timer.c @@ -396,7 +396,7 @@ HANDLE CreateWaitableTimerW(LPSECURITY_ATTRIBUTES lpTimerAttributes, BOOL bManua HANDLE CreateWaitableTimerExA(LPSECURITY_ATTRIBUTES lpTimerAttributes, LPCSTR lpTimerName, DWORD dwFlags, DWORD dwDesiredAccess) { - BOOL bManualReset = (dwFlags & CREATE_WAITABLE_TIMER_MANUAL_RESET) ? TRUE : FALSE; + BOOL bManualReset = (dwFlags & CREATE_WAITABLE_TIMER_MANUAL_RESET) != 0; if (dwDesiredAccess != 0) WLog_WARN(TAG, "[%s] does not support dwDesiredAccess 0x%08" PRIx32, lpTimerName, diff --git a/winpr/libwinpr/utils/cmdline.c b/winpr/libwinpr/utils/cmdline.c index 21476d1db..eb30a9c4c 100644 --- a/winpr/libwinpr/utils/cmdline.c +++ b/winpr/libwinpr/utils/cmdline.c @@ -309,11 +309,8 @@ int CommandLineParseArgumentsA(int argc, LPSTR* argv, COMMAND_LINE_ARGUMENT_A* o value_present = 0; } - if ((cur->Flags & COMMAND_LINE_VALUE_REQUIRED) || - (cur->Flags & COMMAND_LINE_VALUE_OPTIONAL)) - argument = TRUE; - else - argument = FALSE; + argument = (((cur->Flags & COMMAND_LINE_VALUE_REQUIRED) != 0) || + ((cur->Flags & COMMAND_LINE_VALUE_OPTIONAL) != 0)); if (value_present && argument) { @@ -712,9 +709,7 @@ static BOOL is_valid_fullquoted(const char* string) } /* The string did not terminate with the same quote as it started. */ - if (last != quote) - return FALSE; - return TRUE; + return (last == quote); } char** CommandLineParseCommaSeparatedValuesEx(const char* name, const char* list, size_t* count) diff --git a/winpr/libwinpr/utils/collections/ArrayList.c b/winpr/libwinpr/utils/collections/ArrayList.c index 86b1bc880..d0e872713 100644 --- a/winpr/libwinpr/utils/collections/ArrayList.c +++ b/winpr/libwinpr/utils/collections/ArrayList.c @@ -523,7 +523,7 @@ SSIZE_T ArrayList_LastIndexOf(wArrayList* arrayList, const void* obj, SSIZE_T st static BOOL ArrayList_DefaultCompare(const void* objA, const void* objB) { - return objA == objB ? TRUE : FALSE; + return (objA == objB); } wObject* ArrayList_Object(wArrayList* arrayList) diff --git a/winpr/libwinpr/utils/collections/LinkedList.c b/winpr/libwinpr/utils/collections/LinkedList.c index 48d64d94e..cdca11404 100644 --- a/winpr/libwinpr/utils/collections/LinkedList.c +++ b/winpr/libwinpr/utils/collections/LinkedList.c @@ -116,7 +116,7 @@ BOOL LinkedList_Contains(wLinkedList* list, const void* value) item = item->next; } - return (item) ? TRUE : FALSE; + return (item != NULL); } static wLinkedListNode* LinkedList_FreeNode(wLinkedList* list, wLinkedListNode* node) diff --git a/winpr/libwinpr/utils/collections/ListDictionary.c b/winpr/libwinpr/utils/collections/ListDictionary.c index ea7dbc2b1..b4846e307 100644 --- a/winpr/libwinpr/utils/collections/ListDictionary.c +++ b/winpr/libwinpr/utils/collections/ListDictionary.c @@ -339,7 +339,7 @@ BOOL ListDictionary_Contains(wListDictionary* listDictionary, const void* key) if (listDictionary->synchronized) ListDictionary_Unlock(listDictionary); - return (item) ? TRUE : FALSE; + return (item != NULL); } /** @@ -514,7 +514,7 @@ BOOL ListDictionary_SetItemValue(wListDictionary* listDictionary, const void* ke if (item) item_set(listDictionary, item, value); - status = (item) ? TRUE : FALSE; + status = (item != NULL); } if (listDictionary->synchronized) diff --git a/winpr/libwinpr/utils/ini.c b/winpr/libwinpr/utils/ini.c index b475fb4a9..9633735df 100644 --- a/winpr/libwinpr/utils/ini.c +++ b/winpr/libwinpr/utils/ini.c @@ -83,7 +83,7 @@ static BOOL IniFile_Load_NextLine(wIniFile* ini, char* str) ini->nextLine = NULL; } - return (ini->nextLine) ? TRUE : FALSE; + return (ini->nextLine != NULL); } static BOOL IniFile_BufferResize(wIniFile* ini, size_t size) @@ -195,7 +195,7 @@ static BOOL IniFile_Load_HasNextLine(wIniFile* ini) { WINPR_ASSERT(ini); - return (ini->nextLine) ? TRUE : FALSE; + return (ini->nextLine != NULL); } static char* IniFile_Load_GetNextLine(wIniFile* ini) diff --git a/winpr/libwinpr/utils/test/TestHashTable.c b/winpr/libwinpr/utils/test/TestHashTable.c index c1f2292d2..2bb8505e1 100644 --- a/winpr/libwinpr/utils/test/TestHashTable.c +++ b/winpr/libwinpr/utils/test/TestHashTable.c @@ -309,9 +309,7 @@ static BOOL foreachFn2(const void* key, void* value, void* arg) WINPR_UNUSED(value); d->foreachCalls++; - if (d->foreachCalls == 2) - return FALSE; - return TRUE; + return (d->foreachCalls != 2); } static BOOL foreachFn3(const void* key, void* value, void* arg) diff --git a/winpr/libwinpr/utils/test/TestImage.c b/winpr/libwinpr/utils/test/TestImage.c index a8fe52904..4e3106117 100644 --- a/winpr/libwinpr/utils/test/TestImage.c +++ b/winpr/libwinpr/utils/test/TestImage.c @@ -183,7 +183,7 @@ static BOOL test_load_file(const char* name) goto fail; const int res = winpr_image_read(image, name); - rc = (res > 0) ? TRUE : FALSE; + rc = (res > 0); fail: winpr_image_free(image, TRUE); diff --git a/winpr/libwinpr/utils/test/TestMessageQueue.c b/winpr/libwinpr/utils/test/TestMessageQueue.c index 010615b8a..73e0881d0 100644 --- a/winpr/libwinpr/utils/test/TestMessageQueue.c +++ b/winpr/libwinpr/utils/test/TestMessageQueue.c @@ -161,10 +161,7 @@ static bool test_operation_run(wMessageQueue* queue, HANDLE thread) return false; const DWORD status = WaitForSingleObject(thread, INFINITE); - if (status != WAIT_OBJECT_0) - return false; - - return true; + return (status == WAIT_OBJECT_0); } static bool test_operation(wMessageQueue* queue) diff --git a/winpr/libwinpr/utils/test/TestQueue.c b/winpr/libwinpr/utils/test/TestQueue.c index 2a217e30f..329f3a90a 100644 --- a/winpr/libwinpr/utils/test/TestQueue.c +++ b/winpr/libwinpr/utils/test/TestQueue.c @@ -113,9 +113,7 @@ static bool check_size(wQueue* queue, size_t expected) WINPR_ASSERT(queue); const size_t count = Queue_Count(queue); printf("queue count: %" PRIuz "\n", count); - if (count != expected) - return false; - return true; + return (count == expected); } static bool enqueue(wQueue* queue, size_t val) @@ -130,9 +128,7 @@ static bool dequeue(wQueue* queue, size_t expected) WINPR_ASSERT(queue); const void* pexpect = (void*)(23 + expected); void* ptr = Queue_Dequeue(queue); - if (pexpect != ptr) - return false; - return true; + return (pexpect == ptr); } static bool legacy_test(wQueue* queue) @@ -214,9 +210,7 @@ static bool legacy_test(wQueue* queue) Queue_Clear(queue); - if (!check_size(queue, 0)) - return false; - return true; + return check_size(queue, 0); } int TestQueue(WINPR_ATTR_UNUSED int argc, WINPR_ATTR_UNUSED char* argv[]) diff --git a/winpr/libwinpr/utils/test/TestStream.c b/winpr/libwinpr/utils/test/TestStream.c index 168b3890c..55104eab6 100644 --- a/winpr/libwinpr/utils/test/TestStream.c +++ b/winpr/libwinpr/utils/test/TestStream.c @@ -188,7 +188,7 @@ static BOOL TestStream_Create(size_t count, BOOL selfAlloc) } } - Stream_Free(s, buffer ? FALSE : TRUE); + Stream_Free(s, buffer == NULL); free(buffer); } @@ -198,7 +198,7 @@ fail: if (s) { - Stream_Free(s, buffer ? FALSE : TRUE); + Stream_Free(s, buffer == NULL); } return FALSE; diff --git a/winpr/libwinpr/utils/wlog/BinaryAppender.c b/winpr/libwinpr/utils/wlog/BinaryAppender.c index c66752f22..34b35d941 100644 --- a/winpr/libwinpr/utils/wlog/BinaryAppender.c +++ b/winpr/libwinpr/utils/wlog/BinaryAppender.c @@ -78,10 +78,7 @@ static BOOL WLog_BinaryAppender_Open(wLog* log, wLogAppender* appender) binaryAppender->FileDescriptor = winpr_fopen(binaryAppender->FullFileName, "a+"); - if (!binaryAppender->FileDescriptor) - return FALSE; - - return TRUE; + return binaryAppender->FileDescriptor != NULL; } static BOOL WLog_BinaryAppender_Close(WINPR_ATTR_UNUSED wLog* log, wLogAppender* appender) diff --git a/winpr/libwinpr/utils/wlog/FileAppender.c b/winpr/libwinpr/utils/wlog/FileAppender.c index 53bb0f8b1..ccb6df381 100644 --- a/winpr/libwinpr/utils/wlog/FileAppender.c +++ b/winpr/libwinpr/utils/wlog/FileAppender.c @@ -39,22 +39,19 @@ typedef struct static BOOL WLog_FileAppender_SetOutputFileName(wLogFileAppender* appender, const char* filename) { + WINPR_ASSERT(appender); + WINPR_ASSERT(filename); + appender->FileName = _strdup(filename); - if (!appender->FileName) - return FALSE; - - return TRUE; + return appender->FileName != NULL; } static BOOL WLog_FileAppender_SetOutputFilePath(wLogFileAppender* appender, const char* filepath) { appender->FilePath = _strdup(filepath); - if (!appender->FilePath) - return FALSE; - - return TRUE; + return appender->FilePath != NULL; } static BOOL WLog_FileAppender_Open(wLog* log, wLogAppender* appender) @@ -103,10 +100,7 @@ static BOOL WLog_FileAppender_Open(wLog* log, wLogAppender* appender) fileAppender->FileDescriptor = winpr_fopen(fileAppender->FullFileName, "a+"); - if (!fileAppender->FileDescriptor) - return FALSE; - - return TRUE; + return fileAppender->FileDescriptor != NULL; } static BOOL WLog_FileAppender_Close(wLog* log, wLogAppender* appender) diff --git a/winpr/libwinpr/utils/wlog/ImageMessage.c b/winpr/libwinpr/utils/wlog/ImageMessage.c index ce600323f..1e1ec56d7 100644 --- a/winpr/libwinpr/utils/wlog/ImageMessage.c +++ b/winpr/libwinpr/utils/wlog/ImageMessage.c @@ -26,12 +26,6 @@ BOOL WLog_ImageMessage_Write(char* filename, void* data, size_t width, size_t height, size_t bpp) { - int status = 0; - - status = winpr_bitmap_write(filename, data, width, height, bpp); - - if (status < 0) - return FALSE; - - return TRUE; + const int status = winpr_bitmap_write(filename, data, width, height, bpp); + return (status >= 0); } diff --git a/winpr/libwinpr/utils/wlog/JournaldAppender.c b/winpr/libwinpr/utils/wlog/JournaldAppender.c index 45f0d275f..5c51b586a 100644 --- a/winpr/libwinpr/utils/wlog/JournaldAppender.c +++ b/winpr/libwinpr/utils/wlog/JournaldAppender.c @@ -65,9 +65,17 @@ static BOOL WLog_JournaldAppender_Open(wLog* log, wLogAppender* appender) static BOOL WLog_JournaldAppender_Close(wLog* log, wLogAppender* appender) { + wLogJournaldAppender* journaldAppender = (wLogJournaldAppender*)appender; if (!log || !appender) return FALSE; + if (journaldAppender->stream) + (void)fclose(journaldAppender->stream); + + free(journaldAppender->identifier); + + journaldAppender->stream = NULL; + journaldAppender->identifier = NULL; return TRUE; } @@ -124,6 +132,7 @@ static BOOL WLog_JournaldAppender_WriteDataMessage(wLog* log, wLogAppender* appe if (!log || !appender || !message) return FALSE; + (void)fprintf(stderr, "[TODO: %s] data messages not implemented! Ignoring.\n", __func__); return TRUE; } @@ -133,6 +142,7 @@ static BOOL WLog_JournaldAppender_WriteImageMessage(wLog* log, wLogAppender* app if (!log || !appender || !message) return FALSE; + (void)fprintf(stderr, "[TODO: %s] image messages not implemented! Ignoring.\n", __func__); return TRUE; } diff --git a/winpr/libwinpr/utils/wlog/Layout.c b/winpr/libwinpr/utils/wlog/Layout.c index efef9b4c8..b4b1f47ea 100644 --- a/winpr/libwinpr/utils/wlog/Layout.c +++ b/winpr/libwinpr/utils/wlog/Layout.c @@ -230,9 +230,7 @@ static BOOL replace_format_string(const char* FormatString, struct format_option } } - if (!check_and_log_format_size(format, formatlen, index, 0)) - return FALSE; - return TRUE; + return check_and_log_format_size(format, formatlen, index, 0); } BOOL WLog_Layout_GetMessagePrefix(wLog* log, wLogLayout* layout, const wLogMessage* message, diff --git a/winpr/libwinpr/utils/wlog/PacketMessage.c b/winpr/libwinpr/utils/wlog/PacketMessage.c index 97afbd908..28a84fc3f 100644 --- a/winpr/libwinpr/utils/wlog/PacketMessage.c +++ b/winpr/libwinpr/utils/wlog/PacketMessage.c @@ -36,30 +36,22 @@ static BOOL Pcap_Read_Header(wPcap* pcap, wPcapHeader* header) { - if (pcap && pcap->fp && fread((void*)header, sizeof(wPcapHeader), 1, pcap->fp) == 1) - return TRUE; - return FALSE; + return (pcap && pcap->fp && fread((void*)header, sizeof(wPcapHeader), 1, pcap->fp) == 1); } static BOOL Pcap_Write_Header(wPcap* pcap, wPcapHeader* header) { - if (pcap && pcap->fp && fwrite((void*)header, sizeof(wPcapHeader), 1, pcap->fp) == 1) - return TRUE; - return FALSE; + return (pcap && pcap->fp && fwrite((void*)header, sizeof(wPcapHeader), 1, pcap->fp) == 1); } static BOOL Pcap_Write_RecordHeader(wPcap* pcap, wPcapRecordHeader* record) { - if (pcap && pcap->fp && fwrite((void*)record, sizeof(wPcapRecordHeader), 1, pcap->fp) == 1) - return TRUE; - return FALSE; + return (pcap && pcap->fp && fwrite((void*)record, sizeof(wPcapRecordHeader), 1, pcap->fp) == 1); } static BOOL Pcap_Write_RecordContent(wPcap* pcap, wPcapRecord* record) { - if (pcap && pcap->fp && fwrite(record->data, record->length, 1, pcap->fp) == 1) - return TRUE; - return FALSE; + return (pcap && pcap->fp && fwrite(record->data, record->length, 1, pcap->fp) == 1); } static BOOL Pcap_Write_Record(wPcap* pcap, wPcapRecord* record) diff --git a/winpr/libwinpr/utils/wlog/SyslogAppender.c b/winpr/libwinpr/utils/wlog/SyslogAppender.c index 05dc5009a..10826ff55 100644 --- a/winpr/libwinpr/utils/wlog/SyslogAppender.c +++ b/winpr/libwinpr/utils/wlog/SyslogAppender.c @@ -51,18 +51,12 @@ static int getSyslogLevel(DWORD level) static BOOL WLog_SyslogAppender_Open(wLog* log, wLogAppender* appender) { - if (!log || !appender) - return FALSE; - - return TRUE; + return !(!log || !appender); } static BOOL WLog_SyslogAppender_Close(wLog* log, wLogAppender* appender) { - if (!log || !appender) - return FALSE; - - return TRUE; + return !(!log || !appender); } static BOOL WLog_SyslogAppender_WriteMessage(wLog* log, wLogAppender* appender, diff --git a/winpr/libwinpr/utils/wlog/UdpAppender.c b/winpr/libwinpr/utils/wlog/UdpAppender.c index 60097f9ca..69dd0aae8 100644 --- a/winpr/libwinpr/utils/wlog/UdpAppender.c +++ b/winpr/libwinpr/utils/wlog/UdpAppender.c @@ -81,10 +81,7 @@ static BOOL WLog_UdpAppender_Open(WINPR_ATTR_UNUSED wLog* log, wLogAppender* app static BOOL WLog_UdpAppender_Close(wLog* log, wLogAppender* appender) { - if (!log || !appender) - return FALSE; - - return TRUE; + return !(!log || !appender); } static BOOL WLog_UdpAppender_WriteMessage(wLog* log, wLogAppender* appender, @@ -111,19 +108,13 @@ static BOOL WLog_UdpAppender_WriteMessage(wLog* log, wLogAppender* appender, static BOOL WLog_UdpAppender_WriteDataMessage(wLog* log, wLogAppender* appender, const wLogMessage* message) { - if (!log || !appender || !message) - return FALSE; - - return TRUE; + return !(!log || !appender || !message); } static BOOL WLog_UdpAppender_WriteImageMessage(wLog* log, wLogAppender* appender, const wLogMessage* message) { - if (!log || !appender || !message) - return FALSE; - - return TRUE; + return !(!log || !appender || !message); } static BOOL WLog_UdpAppender_Set(wLogAppender* appender, const char* setting, void* value) diff --git a/winpr/libwinpr/utils/wlog/wlog.c b/winpr/libwinpr/utils/wlog/wlog.c index e92fcee02..62650c32e 100644 --- a/winpr/libwinpr/utils/wlog/wlog.c +++ b/winpr/libwinpr/utils/wlog/wlog.c @@ -611,7 +611,7 @@ BOOL WLog_SetLogLevel(wLog* log, DWORD logLevel) logLevel = WLOG_OFF; log->Level = logLevel; - log->inherit = (logLevel == WLOG_LEVEL_INHERIT) ? TRUE : FALSE; + log->inherit = (logLevel == WLOG_LEVEL_INHERIT); for (DWORD x = 0; x < log->ChildrenCount; x++) { diff --git a/winpr/libwinpr/wtsapi/wtsapi.c b/winpr/libwinpr/wtsapi/wtsapi.c index 6f358be43..c2683f092 100644 --- a/winpr/libwinpr/wtsapi/wtsapi.c +++ b/winpr/libwinpr/wtsapi/wtsapi.c @@ -690,9 +690,7 @@ BOOL WTSRegisterWtsApiFunctionTable(const WtsApiFunctionTable* table) } cnv; cnv.cpv = table; InitOnceExecuteOnce(&wtsapiInitOnce, InitializeWtsApiStubs, cnv.pv, NULL); - if (!g_WtsApi) - return FALSE; - return TRUE; + return g_WtsApi != NULL; } static BOOL LoadAndInitialize(char* library)