From 239440e28df8776fe56535f2895a55d7614397f2 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 20 Sep 2024 16:32:14 +0200 Subject: [PATCH] [warnings] remove or comment unused macros --- client/SDL/SDL2/dialogs/sdl_dialogs.cpp | 2 -- client/SDL/SDL2/sdl_pointer.cpp | 2 -- client/SDL/SDL2/sdl_touch.cpp | 2 -- client/SDL/SDL3/dialogs/sdl_dialogs.cpp | 2 -- client/SDL/SDL3/sdl_pointer.cpp | 2 -- client/SDL/SDL3/sdl_touch.cpp | 2 -- client/Wayland/wlf_cliprdr.c | 2 -- client/Wayland/wlf_input.c | 2 -- client/X11/xf_cliprdr.c | 1 - client/X11/xf_floatbar.c | 9 ------- client/X11/xf_window.c | 26 +++++++++---------- client/common/client_cliprdr_file.c | 1 - client/common/file.c | 6 ++--- libfreerdp/cache/persistent.c | 3 --- libfreerdp/codec/dsp.c | 4 +-- libfreerdp/codec/neon/nsc_neon.c | 6 +++-- libfreerdp/codec/neon/rfx_neon.c | 2 -- libfreerdp/codec/nsc.c | 8 ------ libfreerdp/codec/rfx_encode.c | 2 -- libfreerdp/codec/sse/nsc_sse2.c | 3 --- libfreerdp/codec/sse/rfx_sse2.c | 3 --- libfreerdp/codec/xcrush.c | 2 -- libfreerdp/core/errbase.c | 2 -- libfreerdp/core/errconnect.c | 2 -- libfreerdp/core/gateway/rdg.c | 5 ++-- libfreerdp/core/heartbeat.c | 2 -- libfreerdp/core/input.c | 2 -- libfreerdp/core/license.c | 18 ++++++------- libfreerdp/core/nla.c | 4 +-- libfreerdp/crypto/certificate.c | 2 +- libfreerdp/crypto/certificate_data.c | 3 --- libfreerdp/crypto/certificate_store.c | 1 - libfreerdp/emu/scard/smartcard_virtual_gids.c | 20 +++++++------- libfreerdp/gdi/brush.c | 2 -- libfreerdp/gdi/video.c | 2 -- libfreerdp/locale/keyboard_layout.c | 3 +++ libfreerdp/primitives/prim_alphaComp.c | 3 --- libfreerdp/primitives/prim_copy.c | 2 -- libfreerdp/primitives/sse/prim_copy_avx2.c | 2 +- libfreerdp/primitives/sse/prim_copy_sse4_1.c | 2 +- libfreerdp/utils/pcap.c | 3 --- libfreerdp/utils/rdpdr_utils.c | 1 - libfreerdp/utils/ringbuffer.c | 2 +- libfreerdp/utils/smartcard_call.c | 1 - server/shadow/shadow_audin.c | 2 -- server/shadow/shadow_capture.c | 2 -- server/shadow/shadow_rdpgfx.c | 2 -- 47 files changed, 52 insertions(+), 130 deletions(-) diff --git a/client/SDL/SDL2/dialogs/sdl_dialogs.cpp b/client/SDL/SDL2/dialogs/sdl_dialogs.cpp index 1d44c288b..54dfd4e13 100644 --- a/client/SDL/SDL2/dialogs/sdl_dialogs.cpp +++ b/client/SDL/SDL2/dialogs/sdl_dialogs.cpp @@ -33,8 +33,6 @@ #include "sdl_select.hpp" #include "sdl_selectlist.hpp" -#define TAG CLIENT_TAG("SDL.dialogs") - enum { SHOW_DIALOG_ACCEPT_REJECT = 1, diff --git a/client/SDL/SDL2/sdl_pointer.cpp b/client/SDL/SDL2/sdl_pointer.cpp index f9e8707e1..a296f2e36 100644 --- a/client/SDL/SDL2/sdl_pointer.cpp +++ b/client/SDL/SDL2/sdl_pointer.cpp @@ -28,8 +28,6 @@ #include -#define TAG CLIENT_TAG("SDL.pointer") - using sdlPointer = struct { rdpPointer pointer; diff --git a/client/SDL/SDL2/sdl_touch.cpp b/client/SDL/SDL2/sdl_touch.cpp index 81fcbfb0c..d9e4fd210 100644 --- a/client/SDL/SDL2/sdl_touch.cpp +++ b/client/SDL/SDL2/sdl_touch.cpp @@ -30,8 +30,6 @@ #include -#define TAG CLIENT_TAG("SDL.touch") - BOOL sdl_scale_coordinates(SdlContext* sdl, Uint32 windowId, INT32* px, INT32* py, BOOL fromLocalToRDP, BOOL applyOffset) { diff --git a/client/SDL/SDL3/dialogs/sdl_dialogs.cpp b/client/SDL/SDL3/dialogs/sdl_dialogs.cpp index 99ba96289..af6c7e9b2 100644 --- a/client/SDL/SDL3/dialogs/sdl_dialogs.cpp +++ b/client/SDL/SDL3/dialogs/sdl_dialogs.cpp @@ -33,8 +33,6 @@ #include "sdl_select.hpp" #include "sdl_selectlist.hpp" -#define TAG CLIENT_TAG("SDL.dialogs") - enum { SHOW_DIALOG_ACCEPT_REJECT = 1, diff --git a/client/SDL/SDL3/sdl_pointer.cpp b/client/SDL/SDL3/sdl_pointer.cpp index 254dc38a0..449fe1301 100644 --- a/client/SDL/SDL3/sdl_pointer.cpp +++ b/client/SDL/SDL3/sdl_pointer.cpp @@ -28,8 +28,6 @@ #include -#define TAG CLIENT_TAG("SDL.pointer") - typedef struct { rdpPointer pointer; diff --git a/client/SDL/SDL3/sdl_touch.cpp b/client/SDL/SDL3/sdl_touch.cpp index 13068a19e..47f98eb5a 100644 --- a/client/SDL/SDL3/sdl_touch.cpp +++ b/client/SDL/SDL3/sdl_touch.cpp @@ -30,8 +30,6 @@ #include -#define TAG CLIENT_TAG("SDL.touch") - BOOL sdl_scale_coordinates(SdlContext* sdl, Uint32 windowId, INT32* px, INT32* py, BOOL fromLocalToRDP, BOOL applyOffset) { diff --git a/client/Wayland/wlf_cliprdr.c b/client/Wayland/wlf_cliprdr.c index cfe08f8c7..0718b6ac9 100644 --- a/client/Wayland/wlf_cliprdr.c +++ b/client/Wayland/wlf_cliprdr.c @@ -38,8 +38,6 @@ #define TAG CLIENT_TAG("wayland.cliprdr") -#define MAX_CLIPBOARD_FORMATS 255 - #define mime_text_plain "text/plain" #define mime_text_utf8 mime_text_plain ";charset=utf-8" diff --git a/client/Wayland/wlf_input.c b/client/Wayland/wlf_input.c index 60603db50..bfe490366 100644 --- a/client/Wayland/wlf_input.c +++ b/client/Wayland/wlf_input.c @@ -35,8 +35,6 @@ #include "wlfreerdp.h" #include "wlf_input.h" -#define TAG CLIENT_TAG("wayland.input") - static BOOL scale_signed_coordinates(rdpContext* context, int32_t* x, int32_t* y, BOOL fromLocalToRDP) { diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c index b3272fb15..2881ad83f 100644 --- a/client/X11/xf_cliprdr.c +++ b/client/X11/xf_cliprdr.c @@ -53,7 +53,6 @@ #define TAG CLIENT_TAG("x11.cliprdr") #define MAX_CLIPBOARD_FORMATS 255 -#define WIN32_FILETIME_TO_UNIX_EPOCH_USEC UINT64_C(116444736000000000) #ifdef WITH_DEBUG_CLIPRDR #define DEBUG_CLIPRDR(...) WLog_DBG(TAG, __VA_ARGS__) diff --git a/client/X11/xf_floatbar.c b/client/X11/xf_floatbar.c index e4e290a12..c9ec975c6 100644 --- a/client/X11/xf_floatbar.c +++ b/client/X11/xf_floatbar.c @@ -42,15 +42,6 @@ #define FLOATBAR_COLOR_BORDER "RGB:75/9a/c8" #define FLOATBAR_COLOR_FOREGROUND "RGB:FF/FF/FF" -#ifdef WITH_DEBUG_X11 -#define DEBUG_X11(...) WLog_DBG(TAG, __VA_ARGS__) -#else -#define DEBUG_X11(...) \ - do \ - { \ - } while (0) -#endif - #define XF_FLOATBAR_MODE_NONE 0 #define XF_FLOATBAR_MODE_DRAGGING 1 #define XF_FLOATBAR_MODE_RESIZE_LEFT 2 diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c index 83ac4f911..0c17646a3 100644 --- a/client/X11/xf_window.c +++ b/client/X11/xf_window.c @@ -77,25 +77,25 @@ /* bit definitions for MwmHints.flags */ #define MWM_HINTS_FUNCTIONS (1L << 0) #define MWM_HINTS_DECORATIONS (1L << 1) -#define MWM_HINTS_INPUT_MODE (1L << 2) -#define MWM_HINTS_STATUS (1L << 3) +// #define MWM_HINTS_INPUT_MODE (1L << 2) +// #define MWM_HINTS_STATUS (1L << 3) /* bit definitions for MwmHints.functions */ #define MWM_FUNC_ALL (1L << 0) -#define MWM_FUNC_RESIZE (1L << 1) -#define MWM_FUNC_MOVE (1L << 2) -#define MWM_FUNC_MINIMIZE (1L << 3) -#define MWM_FUNC_MAXIMIZE (1L << 4) -#define MWM_FUNC_CLOSE (1L << 5) +// #define MWM_FUNC_RESIZE (1L << 1) +// #define MWM_FUNC_MOVE (1L << 2) +// #define MWM_FUNC_MINIMIZE (1L << 3) +// #define MWM_FUNC_MAXIMIZE (1L << 4) +// #define MWM_FUNC_CLOSE (1L << 5) /* bit definitions for MwmHints.decorations */ #define MWM_DECOR_ALL (1L << 0) -#define MWM_DECOR_BORDER (1L << 1) -#define MWM_DECOR_RESIZEH (1L << 2) -#define MWM_DECOR_TITLE (1L << 3) -#define MWM_DECOR_MENU (1L << 4) -#define MWM_DECOR_MINIMIZE (1L << 5) -#define MWM_DECOR_MAXIMIZE (1L << 6) +// #define MWM_DECOR_BORDER (1L << 1) +// #define MWM_DECOR_RESIZEH (1L << 2) +// #define MWM_DECOR_TITLE (1L << 3) +// #define MWM_DECOR_MENU (1L << 4) +// #define MWM_DECOR_MINIMIZE (1L << 5) +// #define MWM_DECOR_MAXIMIZE (1L << 6) #define PROP_MOTIF_WM_HINTS_ELEMENTS 5 diff --git a/client/common/client_cliprdr_file.c b/client/common/client_cliprdr_file.c index efba81713..2f20327e0 100644 --- a/client/common/client_cliprdr_file.c +++ b/client/common/client_cliprdr_file.c @@ -55,7 +55,6 @@ #include #define MAX_CLIP_DATA_DIR_LEN 10 -#define MAX_CLIPBOARD_FORMATS 255 #define NO_CLIP_DATA_ID (UINT64_C(1) << 32) #define WIN32_FILETIME_TO_UNIX_EPOCH UINT64_C(11644473600) diff --git a/client/common/file.c b/client/common/file.c index 2a67e6b7f..c4634f059 100644 --- a/client/common/file.c +++ b/client/common/file.c @@ -57,13 +57,13 @@ static const BYTE BOM_UTF16_LE[2] = { 0xFF, 0xFE }; -#define INVALID_INTEGER_VALUE 0xFFFFFFFF +// #define INVALID_INTEGER_VALUE 0xFFFFFFFF #define RDP_FILE_LINE_FLAG_FORMATTED 0x00000001 -#define RDP_FILE_LINE_FLAG_STANDARD 0x00000002 +// #define RDP_FILE_LINE_FLAG_STANDARD 0x00000002 #define RDP_FILE_LINE_FLAG_TYPE_STRING 0x00000010 #define RDP_FILE_LINE_FLAG_TYPE_INTEGER 0x00000020 -#define RDP_FILE_LINE_FLAG_TYPE_BINARY 0x00000040 +// #define RDP_FILE_LINE_FLAG_TYPE_BINARY 0x00000040 struct rdp_file_line { diff --git a/libfreerdp/cache/persistent.c b/libfreerdp/cache/persistent.c index 2a85b5d7c..01cfe6a87 100644 --- a/libfreerdp/cache/persistent.c +++ b/libfreerdp/cache/persistent.c @@ -26,11 +26,8 @@ #include #include -#include #include -#define TAG FREERDP_TAG("cache.persistent") - struct rdp_persistent_cache { FILE* fp; diff --git a/libfreerdp/codec/dsp.c b/libfreerdp/codec/dsp.c index f5b959800..913a886a5 100644 --- a/libfreerdp/codec/dsp.c +++ b/libfreerdp/codec/dsp.c @@ -67,10 +67,10 @@ #include "dsp_ffmpeg.h" #endif -#define TAG FREERDP_TAG("dsp") - #if !defined(WITH_DSP_FFMPEG) +#define TAG FREERDP_TAG("dsp") + typedef union { struct diff --git a/libfreerdp/codec/neon/nsc_neon.c b/libfreerdp/codec/neon/nsc_neon.c index 9526752a8..2b67f694b 100644 --- a/libfreerdp/codec/neon/nsc_neon.c +++ b/libfreerdp/codec/neon/nsc_neon.c @@ -26,14 +26,16 @@ #include "../nsc_types.h" #include "nsc_neon.h" -#define TAG FREERDP_TAG("codec.nsc.neon") - #if defined(WITH_NEON) #if defined(_M_ARM64) || defined(_M_ARM) #define NEON_ENABLED #endif #endif +#if defined(NEON_ENABLED) +#define TAG FREERDP_TAG("codec.nsc.neon") +#endif + void nsc_init_neon(NSC_CONTEXT* context) { #if defined(NEON_ENABLED) diff --git a/libfreerdp/codec/neon/rfx_neon.c b/libfreerdp/codec/neon/rfx_neon.c index 709610b06..5c26a5126 100644 --- a/libfreerdp/codec/neon/rfx_neon.c +++ b/libfreerdp/codec/neon/rfx_neon.c @@ -24,8 +24,6 @@ #include "../rfx_types.h" #include "rfx_neon.h" -#define TAG FREERDP_TAG("codec.rfx.neon") - #if defined(WITH_NEON) #if defined(_M_ARM64) || defined(_M_ARM) #define NEON_ENABLED diff --git a/libfreerdp/codec/nsc.c b/libfreerdp/codec/nsc.c index 65c93025f..5056dcdee 100644 --- a/libfreerdp/codec/nsc.c +++ b/libfreerdp/codec/nsc.c @@ -38,14 +38,6 @@ #include "neon/nsc_neon.h" #include -#define TAG FREERDP_TAG("codec.nsc") - -#ifndef NSC_INIT_SIMD -#define NSC_INIT_SIMD(_nsc_context) \ - do \ - { \ - } while (0) -#endif static BOOL nsc_decode(NSC_CONTEXT* WINPR_RESTRICT context) { diff --git a/libfreerdp/codec/rfx_encode.c b/libfreerdp/codec/rfx_encode.c index 59a7b9f34..850462b8b 100644 --- a/libfreerdp/codec/rfx_encode.c +++ b/libfreerdp/codec/rfx_encode.c @@ -37,8 +37,6 @@ #include "rfx_encode.h" -#define MINMAX(_v, _l, _h) ((_v) < (_l) ? (_l) : ((_v) > (_h) ? (_h) : (_v))) - static void rfx_encode_format_rgb(const BYTE* WINPR_RESTRICT rgb_data, int width, int height, int rowstride, UINT32 pixel_format, const BYTE* WINPR_RESTRICT palette, INT16* WINPR_RESTRICT r_buf, diff --git a/libfreerdp/codec/sse/nsc_sse2.c b/libfreerdp/codec/sse/nsc_sse2.c index 6c680aa25..a20428a58 100644 --- a/libfreerdp/codec/sse/nsc_sse2.c +++ b/libfreerdp/codec/sse/nsc_sse2.c @@ -19,13 +19,10 @@ #include #include -#include #include "../nsc_types.h" #include "nsc_sse2.h" -#define TAG FREERDP_TAG("codec.nsc.sse2") - #if defined(WITH_SSE2) #if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) || defined(_M_IX86_AMD64) #define SSE2_ENABLED diff --git a/libfreerdp/codec/sse/rfx_sse2.c b/libfreerdp/codec/sse/rfx_sse2.c index d21a6b35c..f3026fda2 100644 --- a/libfreerdp/codec/sse/rfx_sse2.c +++ b/libfreerdp/codec/sse/rfx_sse2.c @@ -20,13 +20,10 @@ #include #include -#include #include "../rfx_types.h" #include "rfx_sse2.h" -#define TAG FREERDP_TAG("codec.rfx.sse2") - #if defined(WITH_SSE2) #if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) || defined(_M_IX86_AMD64) #define SSE2_ENABLED diff --git a/libfreerdp/codec/xcrush.c b/libfreerdp/codec/xcrush.c index c1bbcacb5..1d23e82cc 100644 --- a/libfreerdp/codec/xcrush.c +++ b/libfreerdp/codec/xcrush.c @@ -29,8 +29,6 @@ #include #include "xcrush.h" -#define TAG FREERDP_TAG("codec") - #pragma pack(push, 1) typedef struct diff --git a/libfreerdp/core/errbase.c b/libfreerdp/core/errbase.c index cb04fb0d4..4a59d0e45 100644 --- a/libfreerdp/core/errbase.c +++ b/libfreerdp/core/errbase.c @@ -26,8 +26,6 @@ #include "errinfo.h" -#define TAG FREERDP_TAG("core") - #define ERRBASE_DEFINE(_code) \ { \ ERRBASE_##_code, "ERRBASE_" #_code, ERRBASE_##_code##_STRING, "" \ diff --git a/libfreerdp/core/errconnect.c b/libfreerdp/core/errconnect.c index c98a3eb40..5fc62748f 100644 --- a/libfreerdp/core/errconnect.c +++ b/libfreerdp/core/errconnect.c @@ -26,8 +26,6 @@ #include "errinfo.h" -#define TAG FREERDP_TAG("core") - #define ERRCONNECT_DEFINE(_code, category) \ { \ ERRCONNECT_##_code, "ERRCONNECT_" #_code, ERRCONNECT_##_code##_STRING, category \ diff --git a/libfreerdp/core/gateway/rdg.c b/libfreerdp/core/gateway/rdg.c index 26a4d8672..fc9ec77f6 100644 --- a/libfreerdp/core/gateway/rdg.c +++ b/libfreerdp/core/gateway/rdg.c @@ -78,7 +78,7 @@ #define PKT_TYPE_CLOSE_CHANNEL_RESPONSE 0x11 /* HTTP tunnel auth fields present flags. */ -#define HTTP_TUNNEL_AUTH_FIELD_SOH 0x1 +// #define HTTP_TUNNEL_AUTH_FIELD_SOH 0x1 /* HTTP tunnel auth response fields present flags. */ #define HTTP_TUNNEL_AUTH_RESPONSE_FIELD_REDIR_FLAGS 0x1 @@ -87,7 +87,7 @@ /* HTTP tunnel packet fields present flags. */ #define HTTP_TUNNEL_PACKET_FIELD_PAA_COOKIE 0x1 -#define HTTP_TUNNEL_PACKET_FIELD_REAUTH 0x2 +// #define HTTP_TUNNEL_PACKET_FIELD_REAUTH 0x2 /* HTTP tunnel response fields present flags. */ #define HTTP_TUNNEL_RESPONSE_FIELD_TUNNEL_ID 0x1 @@ -1904,6 +1904,7 @@ static BOOL rdg_process_control_packet(rdpRdg* rdg, int type, size_t packetLengt status = rdg_process_service_message(rdg, s); break; + case PKT_TYPE_REAUTH_MESSAGE: default: status = rdg_process_unknown_packet(rdg, type); break; diff --git a/libfreerdp/core/heartbeat.c b/libfreerdp/core/heartbeat.c index 6a77bd562..58d3ba5f7 100644 --- a/libfreerdp/core/heartbeat.c +++ b/libfreerdp/core/heartbeat.c @@ -19,8 +19,6 @@ #include -#define WITH_DEBUG_HEARTBEAT - #include "heartbeat.h" state_run_t rdp_recv_heartbeat_packet(rdpRdp* rdp, wStream* s) diff --git a/libfreerdp/core/input.c b/libfreerdp/core/input.c index a7497544f..45b2ea190 100644 --- a/libfreerdp/core/input.c +++ b/libfreerdp/core/input.c @@ -40,8 +40,6 @@ #define INPUT_EVENT_MOUSEX 0x8002 #define INPUT_EVENT_MOUSEREL 0x8004 -#define RDP_CLIENT_INPUT_PDU_HEADER_LENGTH 4 - static void rdp_write_client_input_pdu_header(wStream* s, UINT16 number) { WINPR_ASSERT(s); diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c index 143494bd4..568f74650 100644 --- a/libfreerdp/core/license.c +++ b/libfreerdp/core/license.c @@ -65,11 +65,11 @@ enum LicenseRequestType ERROR_ALERT = 0xFF }; -#define LICENSE_PKT_CS_MASK \ - (LICENSE_INFO | NEW_LICENSE_REQUEST | PLATFORM_CHALLENGE_RESPONSE | ERROR_ALERT) -#define LICENSE_PKT_SC_MASK \ - (LICENSE_REQUEST | PLATFORM_CHALLENGE | NEW_LICENSE | UPGRADE_LICENSE | ERROR_ALERT) -#define LICENSE_PKT_MASK (LICENSE_PKT_CS_MASK | LICENSE_PKT_SC_MASK) +// #define LICENSE_PKT_CS_MASK \ +// (LICENSE_INFO | NEW_LICENSE_REQUEST | PLATFORM_CHALLENGE_RESPONSE | ERROR_ALERT) +//#define LICENSE_PKT_SC_MASK \ +// (LICENSE_REQUEST | PLATFORM_CHALLENGE | NEW_LICENSE | UPGRADE_LICENSE | ERROR_ALERT) +//#define LICENSE_PKT_MASK (LICENSE_PKT_CS_MASK | LICENSE_PKT_SC_MASK) #define LICENSE_PREAMBLE_LENGTH 4 @@ -82,15 +82,15 @@ enum LicenseRequestType #define MAC_SALT_KEY_LENGTH 16 #define LICENSING_ENCRYPTION_KEY_LENGTH 16 #define HWID_PLATFORM_ID_LENGTH 4 -#define HWID_UNIQUE_DATA_LENGTH 16 +// #define HWID_UNIQUE_DATA_LENGTH 16 #define HWID_LENGTH 20 -#define LICENSING_PADDING_SIZE 8 +// #define LICENSING_PADDING_SIZE 8 /* Preamble Flags */ -#define PREAMBLE_VERSION_2_0 0x02 +// #define PREAMBLE_VERSION_2_0 0x02 #define PREAMBLE_VERSION_3_0 0x03 -#define LicenseProtocolVersionMask 0x0F +// #define LicenseProtocolVersionMask 0x0F #define EXTENDED_ERROR_MSG_SUPPORTED 0x80 /** @brief binary Blob Types */ diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c index 11b70ef0c..760d1a731 100644 --- a/libfreerdp/core/nla.c +++ b/libfreerdp/core/nla.c @@ -54,7 +54,7 @@ #define TAG FREERDP_TAG("core.nla") -#define SERVER_KEY "Software\\" FREERDP_VENDOR_STRING "\\" FREERDP_PRODUCT_STRING "\\Server" +// #define SERVER_KEY "Software\\" FREERDP_VENDOR_STRING "\\" FREERDP_PRODUCT_STRING "\\Server" #define NLA_AUTH_PKG NEGO_SSP_NAME @@ -107,8 +107,6 @@ typedef enum * */ -#define NLA_PKG_NAME CREDSSP_AUTH_PKG_SPNEGO - struct rdp_nla { BOOL server; diff --git a/libfreerdp/crypto/certificate.c b/libfreerdp/crypto/certificate.c index d7dc74188..d15bf4420 100644 --- a/libfreerdp/crypto/certificate.c +++ b/libfreerdp/crypto/certificate.c @@ -58,8 +58,8 @@ #define TAG FREERDP_TAG("core") -#define CERTIFICATE_TAG FREERDP_TAG("core.certificate") #ifdef WITH_DEBUG_CERTIFICATE +#define CERTIFICATE_TAG FREERDP_TAG("core.certificate") #define DEBUG_CERTIFICATE(...) WLog_DBG(TAG, __VA_ARGS__) #else #define DEBUG_CERTIFICATE(...) \ diff --git a/libfreerdp/crypto/certificate_data.c b/libfreerdp/crypto/certificate_data.c index ca95fcfef..5d754c684 100644 --- a/libfreerdp/crypto/certificate_data.c +++ b/libfreerdp/crypto/certificate_data.c @@ -34,9 +34,6 @@ #include "certificate.h" -#include -#define TAG FREERDP_TAG("crypto") - struct rdp_certificate_data { char* hostname; diff --git a/libfreerdp/crypto/certificate_store.c b/libfreerdp/crypto/certificate_store.c index 7349e39e8..bace3af97 100644 --- a/libfreerdp/crypto/certificate_store.c +++ b/libfreerdp/crypto/certificate_store.c @@ -38,7 +38,6 @@ #include #include #include -#define TAG FREERDP_TAG("crypto") struct rdp_certificate_store { diff --git a/libfreerdp/emu/scard/smartcard_virtual_gids.c b/libfreerdp/emu/scard/smartcard_virtual_gids.c index a81569a3b..a516c3896 100644 --- a/libfreerdp/emu/scard/smartcard_virtual_gids.c +++ b/libfreerdp/emu/scard/smartcard_virtual_gids.c @@ -37,11 +37,11 @@ #define VGIDS_EFID_MASTER 0xA000 #define VGIDS_EFID_COMMON 0xA010 -#define VGIDS_EFID_CARDCF VGIDS_EFID_COMMON -#define VGIDS_EFID_CARDAPPS VGIDS_EFID_COMMON -#define VGIDS_EFID_CMAPFILE VGIDS_EFID_COMMON +// #define VGIDS_EFID_CARDCF VGIDS_EFID_COMMON +// #define VGIDS_EFID_CARDAPPS VGIDS_EFID_COMMON +// #define VGIDS_EFID_CMAPFILE VGIDS_EFID_COMMON #define VGIDS_EFID_CARDID 0xA012 -#define VGIDS_EFID_KXC00 VGIDS_EFID_COMMON +// #define VGIDS_EFID_KXC00 VGIDS_EFID_COMMON #define VGIDS_EFID_CURRENTDF 0x3FFF #define VGIDS_DO_FILESYSTEMTABLE 0xDF1F @@ -58,23 +58,23 @@ #define VGIDS_DEFAULT_RETRY_COUNTER 3 #define VGIDS_KEY_TYPE_KEYEXCHANGE 0x9A -#define VGIDS_KEY_TYPE_SIGNATURE 0x9C +// #define VGIDS_KEY_TYPE_SIGNATURE 0x9C #define VGIDS_ALGID_RSA_1024 0x06 #define VGIDS_ALGID_RSA_2048 0x07 #define VGIDS_ALGID_RSA_3072 0x08 #define VGIDS_ALGID_RSA_4096 0x09 -#define VGIDS_SE_CRT_AUTH 0xA4 +// #define VGIDS_SE_CRT_AUTH 0xA4 #define VGIDS_SE_CRT_SIGN 0xB6 #define VGIDS_SE_CRT_CONF 0xB8 #define VGIDS_SE_ALGOID_CT_PAD_PKCS1 0x40 #define VGIDS_SE_ALGOID_CT_PAD_OAEP 0x80 -#define VGIDS_SE_ALGOID_CT_RSA_1024 0x06 -#define VGIDS_SE_ALGOID_CT_RSA_2048 0x07 -#define VGIDS_SE_ALGOID_CT_RSA_3072 0x08 -#define VGIDS_SE_ALGOID_CT_RSA_4096 0x09 +// #define VGIDS_SE_ALGOID_CT_RSA_1024 0x06 +// #define VGIDS_SE_ALGOID_CT_RSA_2048 0x07 +// #define VGIDS_SE_ALGOID_CT_RSA_3072 0x08 +// #define VGIDS_SE_ALGOID_CT_RSA_4096 0x09 #define VGIDS_SE_ALGOID_DST_PAD_PKCS1 0x40 #define VGIDS_SE_ALGOID_DST_RSA_1024 0x06 diff --git a/libfreerdp/gdi/brush.c b/libfreerdp/gdi/brush.c index 28aa59d80..d1edef9a1 100644 --- a/libfreerdp/gdi/brush.c +++ b/libfreerdp/gdi/brush.c @@ -34,8 +34,6 @@ #include "brush.h" #include "clipping.h" -#define TAG FREERDP_TAG("gdi.brush") - const char* gdi_rop_to_string(UINT32 code) { switch (code) diff --git a/libfreerdp/gdi/video.c b/libfreerdp/gdi/video.c index b574fb73c..83932ec76 100644 --- a/libfreerdp/gdi/video.c +++ b/libfreerdp/gdi/video.c @@ -27,8 +27,6 @@ #include #include -#define TAG FREERDP_TAG("video") - void gdi_video_geometry_init(rdpGdi* gdi, GeometryClientContext* geom) { WINPR_ASSERT(gdi); diff --git a/libfreerdp/locale/keyboard_layout.c b/libfreerdp/locale/keyboard_layout.c index 2f3ee16c5..d648448e5 100644 --- a/libfreerdp/locale/keyboard_layout.c +++ b/libfreerdp/locale/keyboard_layout.c @@ -34,7 +34,10 @@ #include #include + +#if defined(WITH_KEYBOARD_LAYOUT_FROM_FILE) #define TAG FREERDP_TAG("locale.keyboard.layouts") +#endif // #define DUMP_LAYOUTS_TO_JSON diff --git a/libfreerdp/primitives/prim_alphaComp.c b/libfreerdp/primitives/prim_alphaComp.c index 1f668477f..e2aaaf5ef 100644 --- a/libfreerdp/primitives/prim_alphaComp.c +++ b/libfreerdp/primitives/prim_alphaComp.c @@ -28,9 +28,6 @@ #include "prim_alphaComp.h" #define ALPHA(_k_) (((_k_)&0xFF000000U) >> 24) -#define RED(_k_) (((_k_)&0x00FF0000U) >> 16) -#define GRN(_k_) (((_k_)&0x0000FF00U) >> 8) -#define BLU(_k_) (((_k_)&0x000000FFU)) /* ------------------------------------------------------------------------- */ static pstatus_t general_alphaComp_argb(const BYTE* pSrc1, UINT32 src1Step, const BYTE* pSrc2, diff --git a/libfreerdp/primitives/prim_copy.c b/libfreerdp/primitives/prim_copy.c index 3630f7e2c..4c33615e2 100644 --- a/libfreerdp/primitives/prim_copy.c +++ b/libfreerdp/primitives/prim_copy.c @@ -26,8 +26,6 @@ #include -#define TAG FREERDP_TAG("primitives.copy") - static primitives_t* generic = NULL; /* ------------------------------------------------------------------------- */ diff --git a/libfreerdp/primitives/sse/prim_copy_avx2.c b/libfreerdp/primitives/sse/prim_copy_avx2.c index 0d2add101..bf6614a76 100644 --- a/libfreerdp/primitives/sse/prim_copy_avx2.c +++ b/libfreerdp/primitives/sse/prim_copy_avx2.c @@ -28,9 +28,9 @@ #include +#if defined(SSE2_ENABLED) #define TAG FREERDP_TAG("primitives.copy") -#if defined(SSE2_ENABLED) #include #include diff --git a/libfreerdp/primitives/sse/prim_copy_sse4_1.c b/libfreerdp/primitives/sse/prim_copy_sse4_1.c index e21eae95b..e1ef89fe2 100644 --- a/libfreerdp/primitives/sse/prim_copy_sse4_1.c +++ b/libfreerdp/primitives/sse/prim_copy_sse4_1.c @@ -28,9 +28,9 @@ #include +#if defined(SSE2_ENABLED) #define TAG FREERDP_TAG("primitives.copy") -#if defined(SSE2_ENABLED) #include #include diff --git a/libfreerdp/utils/pcap.c b/libfreerdp/utils/pcap.c index 9dacbd09c..bd4e274e4 100644 --- a/libfreerdp/utils/pcap.c +++ b/libfreerdp/utils/pcap.c @@ -28,9 +28,6 @@ #include #include #include -#include - -#define TAG FREERDP_TAG("utils") #include #include diff --git a/libfreerdp/utils/rdpdr_utils.c b/libfreerdp/utils/rdpdr_utils.c index d92d16225..3e1fc87d1 100644 --- a/libfreerdp/utils/rdpdr_utils.c +++ b/libfreerdp/utils/rdpdr_utils.c @@ -27,7 +27,6 @@ #include #include -#define TAG FREERDP_TAG("utils.scard") LONG scard_log_status_error(const char* tag, const char* what, LONG status) { diff --git a/libfreerdp/utils/ringbuffer.c b/libfreerdp/utils/ringbuffer.c index d8390de8d..b74deed8f 100644 --- a/libfreerdp/utils/ringbuffer.c +++ b/libfreerdp/utils/ringbuffer.c @@ -28,9 +28,9 @@ #include #include +#ifdef WITH_DEBUG_RINGBUFFER #define TAG FREERDP_TAG("utils.ringbuffer") -#ifdef WITH_DEBUG_RINGBUFFER #define DEBUG_RINGBUFFER(...) WLog_DBG(TAG, __VA_ARGS__) #else #define DEBUG_RINGBUFFER(...) \ diff --git a/libfreerdp/utils/smartcard_call.c b/libfreerdp/utils/smartcard_call.c index f253ba6c8..aa1fb264e 100644 --- a/libfreerdp/utils/smartcard_call.c +++ b/libfreerdp/utils/smartcard_call.c @@ -47,7 +47,6 @@ #if defined(WITH_SMARTCARD_EMULATE) #include -#define str(x) #x #define wrap(ctx, fkt, ...) \ ctx->useEmulatedCard ? Emulate_##fkt(ctx->emulation, ##__VA_ARGS__) \ : ctx->pWinSCardApi->pfn##fkt(__VA_ARGS__) diff --git a/server/shadow/shadow_audin.c b/server/shadow/shadow_audin.c index 9e7f6ef69..4f1a30e61 100644 --- a/server/shadow/shadow_audin.c +++ b/server/shadow/shadow_audin.c @@ -29,8 +29,6 @@ #include #endif -#define TAG SERVER_TAG("shadow") - #if defined(CHANNEL_AUDIN_SERVER) static UINT AudinServerData(audin_server_context* audin, const SNDIN_DATA* data) diff --git a/server/shadow/shadow_capture.c b/server/shadow/shadow_capture.c index 3393d9fa7..e5f97b664 100644 --- a/server/shadow/shadow_capture.c +++ b/server/shadow/shadow_capture.c @@ -27,8 +27,6 @@ #include "shadow_capture.h" -#define TAG SERVER_TAG("shadow") - int shadow_capture_align_clip_rect(RECTANGLE_16* rect, const RECTANGLE_16* clip) { int dx = 0; diff --git a/server/shadow/shadow_rdpgfx.c b/server/shadow/shadow_rdpgfx.c index d89440619..781ee20d2 100644 --- a/server/shadow/shadow_rdpgfx.c +++ b/server/shadow/shadow_rdpgfx.c @@ -23,8 +23,6 @@ #include "shadow_rdpgfx.h" -#define TAG SERVER_TAG("shadow") - int shadow_client_rdpgfx_init(rdpShadowClient* client) { WINPR_ASSERT(client);