From 65f18983edfcfbf02614273f2b9da405f96562fe Mon Sep 17 00:00:00 2001 From: akallabeth Date: Wed, 13 Aug 2025 09:00:25 +0200 Subject: [PATCH] [warnings] Fix format string errors * Fix casts of format string arguments (%p requires void*) * Fix format string to match type of arguments --- channels/audin/client/alsa/audin_alsa.c | 4 +- channels/audin/client/audin_main.c | 2 +- channels/audin/server/audin.c | 2 +- channels/cliprdr/client/cliprdr_format.c | 4 +- channels/cliprdr/client/cliprdr_main.c | 6 +- channels/drdynvc/client/drdynvc_main.c | 32 ++++- channels/parallel/client/parallel_main.c | 2 +- channels/rdpdr/client/rdpdr_main.c | 3 +- channels/rdpdr/server/rdpdr_main.c | 20 +-- channels/rdpear/common/rdpear_common.c | 2 +- channels/rdpsnd/client/rdpsnd_main.c | 2 +- channels/serial/client/serial_main.c | 4 +- channels/urbdrc/client/data_transfer.c | 9 +- channels/urbdrc/client/urbdrc_main.c | 3 +- client/SDL/SDL3/sdl_clip.cpp | 2 +- client/X11/xf_keyboard.c | 5 +- client/X11/xf_utils.c | 146 +++++++++---------- client/common/client_cliprdr_file.c | 8 +- libfreerdp/codec/dsp.c | 4 +- libfreerdp/codec/progressive.c | 25 ++-- libfreerdp/codec/rfx.c | 12 +- libfreerdp/common/assistance.c | 6 +- libfreerdp/core/aad.c | 4 +- libfreerdp/core/autodetect.c | 6 +- libfreerdp/core/capabilities.c | 27 ++-- libfreerdp/core/gateway/arm.c | 4 +- libfreerdp/core/gateway/rdg.c | 7 +- libfreerdp/core/gateway/rpc_client.c | 2 +- libfreerdp/core/gateway/rts.c | 18 +-- libfreerdp/core/gateway/tsg.c | 2 +- libfreerdp/core/gcc.c | 4 +- libfreerdp/core/license.c | 27 ++-- libfreerdp/core/orders.c | 10 +- libfreerdp/core/rdp.c | 20 +-- libfreerdp/core/rdstls.c | 29 ++-- libfreerdp/core/tpkt.c | 4 +- libfreerdp/core/transport.c | 15 +- libfreerdp/core/window.c | 4 +- libfreerdp/emu/scard/smartcard_emulate.c | 157 +++++++++++---------- libfreerdp/utils/smartcard_call.c | 7 +- libfreerdp/utils/smartcard_pack.c | 79 +++++++---- server/proxy/channels/pf_channel_drdynvc.c | 4 +- server/proxy/channels/pf_channel_rdpdr.c | 4 +- winpr/libwinpr/comm/comm.c | 8 +- winpr/libwinpr/comm/comm_ioctl.c | 2 +- winpr/libwinpr/comm/comm_serial_sys.c | 4 +- winpr/libwinpr/ncrypt/ncrypt_pkcs11.c | 3 +- winpr/libwinpr/sspi/sspi.c | 60 ++++---- winpr/libwinpr/timezone/timezone.c | 6 +- winpr/libwinpr/utils/print.c | 2 +- winpr/libwinpr/utils/stream.c | 2 +- 51 files changed, 439 insertions(+), 385 deletions(-) diff --git a/channels/audin/client/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c index 82ce66e64..96649568b 100644 --- a/channels/audin/client/alsa/audin_alsa.c +++ b/channels/audin/client/alsa/audin_alsa.c @@ -193,8 +193,8 @@ static DWORD WINAPI audin_alsa_thread_func(LPVOID arg) if (error) { - WLog_Print(alsa->log, WLOG_ERROR, "audin_alsa_thread_receive failed with error %ld", - error); + WLog_Print(alsa->log, WLOG_ERROR, + "audin_alsa_thread_receive failed with error %" PRIu32, error); break; } } diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c index eaf7281d0..d3676b96f 100644 --- a/channels/audin/client/audin_main.c +++ b/channels/audin/client/audin_main.c @@ -386,7 +386,7 @@ static UINT audin_receive_wave_data(const AUDIO_FORMAT* format, const BYTE* data return CHANNEL_RC_OK; audio_format_print(audin->log, WLOG_TRACE, audin->format); - WLog_Print(audin->log, WLOG_TRACE, "[%" PRIdz "/%" PRIdz "]", size, + WLog_Print(audin->log, WLOG_TRACE, "[%" PRIuz "/%" PRIuz "]", size, Stream_GetPosition(audin->data) - 1); if ((error = audin_send_incoming_data_pdu(callback))) diff --git a/channels/audin/server/audin.c b/channels/audin/server/audin.c index f32ac5e5d..73e5fbb5d 100644 --- a/channels/audin/server/audin.c +++ b/channels/audin/server/audin.c @@ -814,7 +814,7 @@ static UINT audin_server_open_reply_default(audin_server_context* context, WINPR_ASSERT(open_reply); /* TODO: Implement failure handling */ - WLog_Print(audin->log, WLOG_DEBUG, "Open Reply PDU: Result: %i", open_reply->Result); + WLog_Print(audin->log, WLOG_DEBUG, "Open Reply PDU: Result: %" PRIu32, open_reply->Result); return CHANNEL_RC_OK; } diff --git a/channels/cliprdr/client/cliprdr_format.c b/channels/cliprdr/client/cliprdr_format.c index 6c0415438..c76e3b6e3 100644 --- a/channels/cliprdr/client/cliprdr_format.c +++ b/channels/cliprdr/client/cliprdr_format.c @@ -140,7 +140,7 @@ UINT cliprdr_process_format_list(cliprdrPlugin* cliprdr, wStream* s, UINT32 data for (size_t x = 0; x < formatList.numFormats; x++) { const CLIPRDR_FORMAT* format = &formatList.formats[x]; - WLog_Print(cliprdr->log, level, "[%" PRIu32 "]: id=0x%08" PRIx32 " [%s|%s]", x, + WLog_Print(cliprdr->log, level, "[%" PRIuz "]: id=0x%08" PRIx32 " [%s|%s]", x, format->formatId, ClipboardGetFormatIdString(format->formatId), format->formatName); } @@ -150,7 +150,7 @@ UINT cliprdr_process_format_list(cliprdrPlugin* cliprdr, wStream* s, UINT32 data for (size_t x = 0; x < filteredFormatList.numFormats; x++) { const CLIPRDR_FORMAT* format = &filteredFormatList.formats[x]; - WLog_Print(cliprdr->log, level, "[%" PRIu32 "]: id=0x%08" PRIx32 " [%s|%s]", x, + WLog_Print(cliprdr->log, level, "[%" PRIuz "]: id=0x%08" PRIx32 " [%s|%s]", x, format->formatId, ClipboardGetFormatIdString(format->formatId), format->formatName); } diff --git a/channels/cliprdr/client/cliprdr_main.c b/channels/cliprdr/client/cliprdr_main.c index 613a5247d..5a9c40a88 100644 --- a/channels/cliprdr/client/cliprdr_main.c +++ b/channels/cliprdr/client/cliprdr_main.c @@ -66,14 +66,14 @@ static UINT cliprdr_packet_send(cliprdrPlugin* cliprdr, wStream* s) WINPR_ASSERT(s); const size_t pos = Stream_GetPosition(s); - const size_t dataLen = pos - 8; + const size_t dataLen = pos - 8ULL; WINPR_ASSERT(dataLen <= UINT32_MAX); Stream_SetPosition(s, 4); Stream_Write_UINT32(s, (UINT32)dataLen); Stream_SetPosition(s, pos); - WLog_Print(cliprdr->log, WLOG_DEBUG, "Cliprdr Sending (%" PRIu32 " bytes)", dataLen + 8); + WLog_Print(cliprdr->log, WLOG_DEBUG, "Cliprdr Sending (%" PRIuz " bytes)", dataLen + 8UL); if (!cliprdr) { @@ -700,7 +700,7 @@ static UINT cliprdr_client_format_list(CliprdrClientContext* context, for (size_t x = 0; x < filterList.numFormats; x++) { const CLIPRDR_FORMAT* format = &filterList.formats[x]; - WLog_Print(cliprdr->log, level, "[%" PRIu32 "]: id=0x%08" PRIx32 " [%s|%s]", x, + WLog_Print(cliprdr->log, level, "[%" PRIuz "]: id=0x%08" PRIx32 " [%s|%s]", x, format->formatId, ClipboardGetFormatIdString(format->formatId), format->formatName); } diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c index 65dc5fd4f..5a970909c 100644 --- a/channels/drdynvc/client/drdynvc_main.c +++ b/channels/drdynvc/client/drdynvc_main.c @@ -34,6 +34,21 @@ #define TAG CHANNELS_TAG("drdynvc.client") +static const char* channel_state2str(DVC_CHANNEL_STATE state) +{ + switch (state) + { + case DVC_CHANNEL_INIT: + return "DVC_CHANNEL_INIT"; + case DVC_CHANNEL_RUNNING: + return "DVC_CHANNEL_RUNNING"; + case DVC_CHANNEL_CLOSED: + return "DVC_CHANNEL_CLOSED"; + default: + return "DVC_CHANNEL_UNKNOWN"; + } +} + static void dvcman_channel_free(DVCMAN_CHANNEL* channel); static UINT dvcman_channel_close(DVCMAN_CHANNEL* channel, BOOL perRequest, BOOL fromHashTableFn); static void dvcman_free(drdynvcPlugin* drdynvc, IWTSVirtualChannelManager* pChannelMgr); @@ -474,11 +489,14 @@ static UINT dvcman_channel_close(DVCMAN_CHANNEL* channel, BOOL perRequest, BOOL error = dvcchannel_send_close(channel); if (error != CHANNEL_RC_OK) { - const char* msg = "error when sending close confirm for '%s'"; if (perRequest) - msg = "error when sending closeRequest for '%s'"; - - WLog_Print(drdynvc->log, WLOG_DEBUG, msg, channel->channel_name); + WLog_Print(drdynvc->log, WLOG_DEBUG, + "error when sending closeRequest for '%s'", + channel->channel_name); + else + WLog_Print(drdynvc->log, WLOG_DEBUG, + "error when sending close confirm for '%s'", + channel->channel_name); } } @@ -688,10 +706,12 @@ static DVCMAN_CHANNEL* dvcman_create_channel(drdynvcPlugin* drdynvc, case DVC_CHANNEL_CLOSED: case DVC_CHANNEL_INIT: default: - WLog_Print(drdynvc->log, WLOG_ERROR, "not expecting a createChannel from state %d", - channel->state); + { + WLog_Print(drdynvc->log, WLOG_ERROR, "not expecting a createChannel from state %s", + channel_state2str(channel->state)); *res = CHANNEL_RC_INITIALIZATION_ERROR; goto out; + } } } else diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c index 44d7a23fc..59ff9a08e 100644 --- a/channels/parallel/client/parallel_main.c +++ b/channels/parallel/client/parallel_main.c @@ -316,7 +316,7 @@ static UINT parallel_process_irp(PARALLEL_DEVICE* parallel, IRP* irp) "[%s|0x%08" PRIx32 "] completed with %s [0x%08" PRIx32 "] (IoStatus %s [0x%08" PRIx32 "])", rdpdr_irp_string(irp->MajorFunction), irp->MajorFunction, WTSErrorToString(error), - error, NtStatus2Tag(irp->IoStatus), irp->IoStatus); + error, NtStatus2Tag(irp->IoStatus), WINPR_CXX_COMPAT_CAST(UINT32, irp->IoStatus)); return error; } diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index 66b6b7a9a..efed61ac0 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -1454,8 +1454,7 @@ static BOOL device_announce(ULONG_PTR key, void* element, void* data) arg->count++; WLog_Print(rdpdr->log, WLOG_INFO, - "registered [%09s] device #%" PRIu32 ": %05s (type=%2" PRIu32 " id=%2" PRIu32 - ")", + "registered [%9s] device #%" PRIu32 ": %5s (type=%2" PRIu32 " id=%2" PRIu32 ")", rdpdr_device_type_string(device->type), arg->count, device->name, device->type, device->id); } diff --git a/channels/rdpdr/server/rdpdr_main.c b/channels/rdpdr/server/rdpdr_main.c index 48c3e486a..cd31fcbb1 100644 --- a/channels/rdpdr/server/rdpdr_main.c +++ b/channels/rdpdr/server/rdpdr_main.c @@ -225,7 +225,7 @@ static const WCHAR* rdpdr_read_ustring(wLog* log, wStream* s, size_t bytelen) return NULL; if (_wcsnlen(str, charlen) == charlen) { - WLog_Print(log, WLOG_WARN, "[rdpdr] unicode string not '\0' terminated"); + WLog_Print(log, WLOG_WARN, "[rdpdr] unicode string not '\\0' terminated"); return NULL; } Stream_Seek(s, bytelen); @@ -1331,7 +1331,7 @@ static UINT rdpdr_server_receive_io_write_request(RdpdrServerContext* context, w WLog_Print(context->priv->log, WLOG_WARN, "[MS-RDPEFS] 2.2.1.4.4 Device Write Request (DR_WRITE_REQ) not implemented"); - WLog_Print(context->priv->log, WLOG_WARN, "TODO: parse %p", data); + WLog_Print(context->priv->log, WLOG_WARN, "TODO: parse %p", (const void*)data); return CHANNEL_RC_OK; } @@ -1364,8 +1364,8 @@ static UINT rdpdr_server_receive_io_device_control_request(RdpdrServerContext* c WLog_Print(context->priv->log, WLOG_WARN, "[MS-RDPEFS] 2.2.1.4.5 Device Control Request (DR_CONTROL_REQ) not implemented"); WLog_Print(context->priv->log, WLOG_WARN, - "TODO: parse %p [%" PRIu32 "], OutputBufferLength=%" PRIu32, InputBuffer, - InputBufferLength, OutputBufferLength); + "TODO: parse %p [%" PRIu32 "], OutputBufferLength=%" PRIu32, + (const void*)InputBuffer, InputBufferLength, OutputBufferLength); return CHANNEL_RC_OK; } @@ -1397,7 +1397,7 @@ static UINT rdpdr_server_receive_io_query_volume_information_request( WLog_Print(context->priv->log, WLOG_WARN, "[MS-RDPEFS] 2.2.3.3.6 Server Drive Query Volume Information Request " "(DR_DRIVE_QUERY_VOLUME_INFORMATION_REQ) not implemented"); - WLog_Print(context->priv->log, WLOG_WARN, "TODO: parse %p", QueryVolumeBuffer); + WLog_Print(context->priv->log, WLOG_WARN, "TODO: parse %p", (const void*)QueryVolumeBuffer); return CHANNEL_RC_OK; } @@ -1431,7 +1431,7 @@ static UINT rdpdr_server_receive_io_set_volume_information_request( WLog_Print(context->priv->log, WLOG_WARN, "[MS-RDPEFS] 2.2.3.3.7 Server Drive Set Volume Information Request " "(DR_DRIVE_SET_VOLUME_INFORMATION_REQ) not implemented"); - WLog_Print(context->priv->log, WLOG_WARN, "TODO: parse %p", SetVolumeBuffer); + WLog_Print(context->priv->log, WLOG_WARN, "TODO: parse %p", (const void*)SetVolumeBuffer); return CHANNEL_RC_OK; } @@ -1467,7 +1467,7 @@ static UINT rdpdr_server_receive_io_query_information_request(RdpdrServerContext WLog_Print(context->priv->log, WLOG_WARN, "[MS-RDPEFS] 2.2.3.3.8 Server Drive Query Information Request " "(DR_DRIVE_QUERY_INFORMATION_REQ) not implemented"); - WLog_Print(context->priv->log, WLOG_WARN, "TODO: parse %p", QueryBuffer); + WLog_Print(context->priv->log, WLOG_WARN, "TODO: parse %p", (const void*)QueryBuffer); return CHANNEL_RC_OK; } @@ -1502,7 +1502,7 @@ static UINT rdpdr_server_receive_io_set_information_request(RdpdrServerContext* WLog_Print(context->priv->log, WLOG_WARN, "[MS-RDPEFS] 2.2.3.3.9 Server Drive Set Information Request " "(DR_DRIVE_SET_INFORMATION_REQ) not implemented"); - WLog_Print(context->priv->log, WLOG_WARN, "TODO: parse %p", SetBuffer); + WLog_Print(context->priv->log, WLOG_WARN, "TODO: parse %p", (const void*)SetBuffer); return CHANNEL_RC_OK; } @@ -1617,7 +1617,7 @@ static UINT rdpdr_server_receive_io_lock_control_request(RdpdrServerContext* con WLog_Print(context->priv->log, WLOG_DEBUG, "IRP_MJ_LOCK_CONTROL, Operation=%s, Lock=0x%08" PRIx32 ", NumLocks=%" PRIu32, - DR_DRIVE_LOCK_REQ2str(Operation)); + DR_DRIVE_LOCK_REQ2str(Operation), Lock, NumLocks); Lock &= 0x01; /* Only bit 0 is of importance */ @@ -1865,7 +1865,7 @@ static UINT rdpdr_server_receive_prn_cache_update_printer(RdpdrServerContext* co WLog_Print( context->priv->log, WLOG_WARN, "[MS-RDPEPC] 2.2.2.4 Update Printer Cachedata (DR_PRN_UPDATE_CACHEDATA) not implemented"); - WLog_Print(context->priv->log, WLOG_WARN, "TODO: parse %p", config); + WLog_Print(context->priv->log, WLOG_WARN, "TODO: parse %p", (const void*)config); return CHANNEL_RC_OK; } diff --git a/channels/rdpear/common/rdpear_common.c b/channels/rdpear/common/rdpear_common.c index f47af1858..616b83cc6 100644 --- a/channels/rdpear/common/rdpear_common.c +++ b/channels/rdpear/common/rdpear_common.c @@ -229,7 +229,7 @@ void ndr_dump_RPC_UNICODE_STRING(wLog* logger, UINT32 lvl, size_t indentLevel, const RPC_UNICODE_STRING* obj) { WINPR_UNUSED(indentLevel); - WLog_Print(logger, lvl, "\tLength=%d MaximumLength=%d", obj->lenHints.length, + WLog_Print(logger, lvl, "\tLength=%u MaximumLength=%u", obj->lenHints.length, obj->lenHints.maxLength); winpr_HexLogDump(logger, lvl, obj->Buffer, obj->lenHints.length); } diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c index 5be4f179b..af313f8d7 100644 --- a/channels/rdpsnd/client/rdpsnd_main.c +++ b/channels/rdpsnd/client/rdpsnd_main.c @@ -623,7 +623,7 @@ static UINT rdpsnd_treat_wave(rdpsndPlugin* rdpsnd, wStream* s, size_t size) const BYTE* data = Stream_ConstPointer(s); format = &rdpsnd->ClientFormats[rdpsnd->wCurrentFormatNo]; WLog_Print(rdpsnd->log, WLOG_DEBUG, - "%s Wave: cBlockNo: %" PRIu8 " wTimeStamp: %" PRIu16 ", size: %" PRIdz, + "%s Wave: cBlockNo: %" PRIu8 " wTimeStamp: %" PRIu16 ", size: %" PRIuz, rdpsnd_is_dyn_str(rdpsnd->dynamic), rdpsnd->cBlockNo, rdpsnd->wTimeStamp, size); if (rdpsnd->device && rdpsnd->attached && !rdpsnd_detect_overrun(rdpsnd, format, size)) diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index b3012c620..f8f95ce53 100644 --- a/channels/serial/client/serial_main.c +++ b/channels/serial/client/serial_main.c @@ -506,7 +506,7 @@ static UINT serial_process_irp(SERIAL_DEVICE* serial, IRP* irp) "[%s|0x%08" PRIx32 "] completed with %s [0x%08" PRIx32 "] (IoStatus %s [0x%08" PRIx32 "])", rdpdr_irp_string(irp->MajorFunction), irp->MajorFunction, WTSErrorToString(error), - error, NtStatus2Tag(irp->IoStatus), irp->IoStatus); + error, NtStatus2Tag(irp->IoStatus), WINPR_CXX_COMPAT_CAST(UINT32, irp->IoStatus)); return error; } @@ -947,7 +947,7 @@ FREERDP_ENTRY_POINT( } } - WLog_Print(serial->log, WLOG_DEBUG, "Server's serial driver: %s (id: %d)", driver, + WLog_Print(serial->log, WLOG_DEBUG, "Server's serial driver: %s (id: %u)", driver, serial->ServerSerialDriverId); serial->MainIrpQueue = MessageQueue_New(NULL); diff --git a/channels/urbdrc/client/data_transfer.c b/channels/urbdrc/client/data_transfer.c index 768c5446b..e2270e565 100644 --- a/channels/urbdrc/client/data_transfer.c +++ b/channels/urbdrc/client/data_transfer.c @@ -393,7 +393,7 @@ static UINT urbdrc_process_internal_io_control(IUDEVICE* pdev, GENERIC_CHANNEL_C if (4 > OutputBufferSize) { - WLog_Print(urbdrc->log, WLOG_DEBUG, "out_size %" PRIu32 " > OutputBufferSize %" PRIu32, 4, + WLog_Print(urbdrc->log, WLOG_DEBUG, "out_size %" PRIu32 " > OutputBufferSize %" PRIu32, 4u, OutputBufferSize); return ERROR_BAD_CONFIGURATION; } @@ -1314,7 +1314,7 @@ static UINT urb_pipe_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callback, PIPE_CANCEL); if (rc < 0) - WLog_Print(urbdrc->log, WLOG_DEBUG, "PIPE SET HALT: error %d", ret); + WLog_Print(urbdrc->log, WLOG_DEBUG, "PIPE SET HALT: error %u", ret); else ret = USBD_STATUS_SUCCESS; @@ -1327,7 +1327,7 @@ static UINT urb_pipe_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBACK* callback, PIPE_RESET); if (rc < 0) - WLog_Print(urbdrc->log, WLOG_DEBUG, "PIPE RESET: error %d", ret); + WLog_Print(urbdrc->log, WLOG_DEBUG, "PIPE RESET: error %u", ret); else ret = USBD_STATUS_SUCCESS; @@ -1409,7 +1409,8 @@ static UINT urb_get_current_frame_number(IUDEVICE* pdev, GENERIC_CHANNEL_CALLBAC const UINT32 OutputBufferSize = Stream_Get_UINT32(s); if (OutputBufferSize != 0) { - WLog_Print(urbdrc->log, WLOG_WARN, "OutputBufferSize=%" PRIu32 ", expected 0"); + WLog_Print(urbdrc->log, WLOG_WARN, "OutputBufferSize=%" PRIu32 ", expected 0", + OutputBufferSize); } /** Fixme: Need to fill actual frame number!!*/ const UINT32 dummy_frames = GetTickCount(); diff --git a/channels/urbdrc/client/urbdrc_main.c b/channels/urbdrc/client/urbdrc_main.c index b94dd357c..f10962b8f 100644 --- a/channels/urbdrc/client/urbdrc_main.c +++ b/channels/urbdrc/client/urbdrc_main.c @@ -204,7 +204,8 @@ static UINT urbdrc_process_channel_create(GENERIC_CHANNEL_CALLBACK* callback, wS if ((MajorVersion != 1) || (MinorVersion != 0)) { WLog_Print(urbdrc->log, WLOG_WARN, - "server supports USB channel version %" PRIu32 ".%" PRIu32); + "server supports USB channel version %" PRIu32 ".%" PRIu32, MajorVersion, + MinorVersion); WLog_Print(urbdrc->log, WLOG_WARN, "we only support channel version 1.0"); MajorVersion = 1; MinorVersion = 0; diff --git a/client/SDL/SDL3/sdl_clip.cpp b/client/SDL/SDL3/sdl_clip.cpp index 9ea0c0549..ccf81b49b 100644 --- a/client/SDL/SDL3/sdl_clip.cpp +++ b/client/SDL/SDL3/sdl_clip.cpp @@ -227,7 +227,7 @@ bool sdlClip::handle_update(const SDL_ClipboardEvent& ev) size_t nformats = WINPR_ASSERTING_INT_CAST(size_t, ev.num_mime_types); const char** clipboard_mime_formats = ev.mime_types; - WLog_Print(_log, WLOG_TRACE, "SDL has %d formats", nformats); + WLog_Print(_log, WLOG_TRACE, "SDL has %" PRIuz " formats", nformats); bool textPushed = false; bool imgPushed = false; diff --git a/client/X11/xf_keyboard.c b/client/X11/xf_keyboard.c index 94ede4404..0347c0f2b 100644 --- a/client/X11/xf_keyboard.c +++ b/client/X11/xf_keyboard.c @@ -503,8 +503,9 @@ static int load_map_from_xkbfile(xfContext* xfc) } if (!found) { - WLog_Print(xfc->log, WLOG_WARN, "%4s: keycode: 0x%02X -> no RDP scancode found", - xkb_keyname, i); + WLog_Print(xfc->log, WLOG_WARN, + "%4s: keycode: 0x%02" PRIx32 " -> no RDP scancode found", xkb_keyname, + WINPR_ASSERTING_INT_CAST(UINT32, i)); } else status = 0; diff --git a/client/X11/xf_utils.c b/client/X11/xf_utils.c index f44d85cd8..0cd7d5bf1 100644 --- a/client/X11/xf_utils.c +++ b/client/X11/xf_utils.c @@ -108,19 +108,9 @@ static int write_result_log_expect_one(wLog* log, DWORD level, const char* fname return rc; } -static int write_result_log_ex(wLog* log, DWORD level, const char* fname, const char* fkt, - size_t line, Display* display, char* name, int rc, size_t count, ...) -{ - va_list ap; - va_start(ap, count); - (void)write_result_log_va(log, level, fname, fkt, line, display, name, rc, count, ap); - va_end(ap); - return rc; -} - char* Safe_XGetAtomNameEx(wLog* log, Display* display, Atom atom, const char* varname) { - WLog_Print(log, log_level, "XGetAtomName(%s, 0x%08" PRIx32 ")", varname, atom); + WLog_Print(log, log_level, "XGetAtomName(%s, 0x%08lx)", varname, atom); if (atom == None) return strdup("Atom_None"); return XGetAtomName(display, atom); @@ -131,8 +121,9 @@ Atom Logging_XInternAtom(wLog* log, Display* display, _Xconst char* atom_name, B Atom atom = XInternAtom(display, atom_name, only_if_exists); if (WLog_IsLevelActive(log, log_level)) { - WLog_Print(log, log_level, "XInternAtom(0x%08" PRIx32 ", %s, %s) -> 0x%08" PRIx32, display, - atom_name, only_if_exists ? "True" : "False", atom); + WLog_Print(log, log_level, "XInternAtom(%p, %s, %s) -> 0x%08" PRIx32, (void*)display, + atom_name, only_if_exists ? "True" : "False", + WINPR_CXX_COMPAT_CAST(UINT32, atom)); } return atom; } @@ -152,8 +143,8 @@ int LogDynAndXChangeProperty_ex(wLog* log, const char* file, const char* fkt, si char* propstr = Safe_XGetAtomName(log, display, property); char* typestr = Safe_XGetAtomName(log, display, type); write_log(log, log_level, file, fkt, line, - "XChangeProperty(%p, %d, %s [%d], %s [%d], %d, %d, %p, %d)", display, w, propstr, - property, typestr, type, format, mode, data, nelements); + "XChangeProperty(%p, %lu, %s [%lu], %s [%lu], %d, %d, %p, %d)", (void*)display, w, + propstr, property, typestr, type, format, mode, (const void*)data, nelements); XFree(propstr); XFree(typestr); } @@ -168,8 +159,8 @@ int LogDynAndXDeleteProperty_ex(wLog* log, const char* file, const char* fkt, si if (WLog_IsLevelActive(log, log_level)) { char* propstr = Safe_XGetAtomName(log, display, property); - write_log(log, log_level, file, fkt, line, "XDeleteProperty(%p, %d, %s [%d])", display, w, - propstr, property); + write_log(log, log_level, file, fkt, line, "XDeleteProperty(%p, %lu, %s [%lu])", + (void*)display, w, propstr, property); XFree(propstr); } const int rc = XDeleteProperty(display, w, property); @@ -187,8 +178,8 @@ int LogDynAndXConvertSelection_ex(wLog* log, const char* file, const char* fkt, char* targetstr = Safe_XGetAtomName(log, display, target); char* propstr = Safe_XGetAtomName(log, display, property); write_log(log, log_level, file, fkt, line, - "XConvertSelection(%p, %s [%d], %s [%d], %s [%d], %d, %lu)", display, selectstr, - selection, targetstr, target, propstr, property, requestor, time); + "XConvertSelection(%p, %s [%lu], %s [%lu], %s [%lu], %lu, %lu)", (void*)display, + selectstr, selection, targetstr, target, propstr, property, requestor, time); XFree(propstr); XFree(targetstr); XFree(selectstr); @@ -209,11 +200,12 @@ int LogDynAndXGetWindowProperty_ex(wLog* log, const char* file, const char* fkt, { char* propstr = Safe_XGetAtomName(log, display, property); char* req_type_str = Safe_XGetAtomName(log, display, req_type); - write_log(log, log_level, file, fkt, line, - "XGetWindowProperty(%p, %d, %s [%d], %ld, %ld, %d, %s [%d], %p, %p, %p, %p, %p)", - display, w, propstr, property, long_offset, long_length, delete, req_type_str, - req_type, actual_type_return, actual_format_return, nitems_return, - bytes_after_return, prop_return); + write_log( + log, log_level, file, fkt, line, + "XGetWindowProperty(%p, %lu, %s [%lu], %ld, %ld, %d, %s [%lu], %p, %p, %p, %p, %p)", + (void*)display, w, propstr, property, long_offset, long_length, delete, req_type_str, + req_type, (void*)actual_type_return, (void*)actual_format_return, (void*)nitems_return, + (void*)bytes_after_return, (void*)prop_return); XFree(propstr); XFree(req_type_str); } @@ -300,17 +292,17 @@ int LogDynAndXCopyArea_ex(wLog* log, const char* file, const char* fkt, size_t l write_log(log, log_level, file, fkt, line, "XCopyArea(%p, src: {%lu}, dest: [%d]{%lu, %lu, %d}, gc: {%p}, src_x: {%d}, " "src_y: {%d}, " - "width: {%d}, " - "height: {%d}, dest_x: {%d}, dest_y: {%d})", - display, src, rc, dest, attr.root, attr.depth, gc, src_x, src_y, width, height, - dest_x, dest_y); + "width: {%u}, " + "height: {%u}, dest_x: {%d}, dest_y: {%d})", + (void*)display, src, rc, dest, attr.root, attr.depth, (void*)gc, src_x, src_y, + width, height, dest_x, dest_y); } if ((width == 0) || (height == 0)) { const DWORD lvl = WLOG_WARN; if (WLog_IsLevelActive(log, lvl)) - write_log(log, lvl, file, fkt, line, "XCopyArea(width=%d, height=%d) !", width, height); + write_log(log, lvl, file, fkt, line, "XCopyArea(width=%u, height=%u) !", width, height); return Success; } @@ -327,17 +319,17 @@ int LogDynAndXPutImage_ex(wLog* log, const char* file, const char* fkt, size_t l write_log(log, log_level, file, fkt, line, "XPutImage(%p, d: {%lu}, gc: {%p}, image: [%p]{%d}, src_x: {%d}, src_y: {%d}, " "dest_x: {%d}, " - "dest_y: {%d}, width: {%d}, " - "height: {%d})", - display, d, gc, image, image ? image->depth : -1, src_x, src_y, dest_x, dest_y, - width, height); + "dest_y: {%d}, width: {%u}, " + "height: {%u})", + (void*)display, d, (void*)gc, (void*)image, image ? image->depth : -1, src_x, + src_y, dest_x, dest_y, width, height); } if ((width == 0) || (height == 0)) { const DWORD lvl = WLOG_WARN; if (WLog_IsLevelActive(log, lvl)) - write_log(log, lvl, file, fkt, line, "XPutImage(width=%d, height=%d) !", width, height); + write_log(log, lvl, file, fkt, line, "XPutImage(width=%u, height=%u) !", width, height); return Success; } @@ -356,9 +348,9 @@ Status LogDynAndXSendEvent_ex(wLog* log, const char* file, const char* fkt, size if (WLog_IsLevelActive(log, log_level)) { write_log(log, log_level, file, fkt, line, - "XSendEvent(%p, d: {%lu}, w: {%lu}, propagate: {%d}, event_mask: {%d}, " + "XSendEvent(d: {%p}, w: {%lu}, propagate: {%d}, event_mask: {%ld}, " "event_send: [%p]{TODO})", - display, w, propagate, event_mask, event_send); + (void*)display, w, propagate, event_mask, (void*)event_send); } const int rc = XSendEvent(display, w, propagate, event_mask, event_send); @@ -369,7 +361,7 @@ int LogDynAndXFlush_ex(wLog* log, const char* file, const char* fkt, size_t line { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XFlush(%p)", display); + write_log(log, log_level, file, fkt, line, "XFlush(%p)", (void*)display); } const int rc = XFlush(display); @@ -382,7 +374,7 @@ Window LogDynAndXGetSelectionOwner_ex(wLog* log, const char* file, const char* f if (WLog_IsLevelActive(log, log_level)) { char* selectionstr = Safe_XGetAtomName(log, display, selection); - write_log(log, log_level, file, fkt, line, "XGetSelectionOwner(%p, %s)", display, + write_log(log, log_level, file, fkt, line, "XGetSelectionOwner(%p, %s)", (void*)display, selectionstr); XFree(selectionstr); } @@ -394,7 +386,8 @@ int LogDynAndXDestroyWindow_ex(wLog* log, const char* file, const char* fkt, siz { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XDestroyWindow(%p, %lu)", display, window); + write_log(log, log_level, file, fkt, line, "XDestroyWindow(%p, %lu)", (void*)display, + window); } const int rc = XDestroyWindow(display, window); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XDestroyWindow", @@ -406,7 +399,7 @@ int LogDynAndXSync_ex(wLog* log, const char* file, const char* fkt, size_t line, { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XSync(%p, %d)", display, discard); + write_log(log, log_level, file, fkt, line, "XSync(%p, %d)", (void*)display, discard); } const int rc = XSync(display, discard); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XSync", rc); @@ -419,7 +412,7 @@ int LogDynAndXChangeWindowAttributes_ex(wLog* log, const char* file, const char* if (WLog_IsLevelActive(log, log_level)) { write_log(log, log_level, file, fkt, line, "XChangeWindowAttributes(%p, %lu, 0x%08lu, %p)", - display, window, valuemask, attributes); + (void*)display, window, valuemask, (void*)attributes); } const int rc = XChangeWindowAttributes(display, window, valuemask, attributes); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, @@ -431,8 +424,8 @@ int LogDynAndXSetTransientForHint_ex(wLog* log, const char* file, const char* fk { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XSetTransientForHint(%p, %lu, %lu)", display, - window, prop_window); + write_log(log, log_level, file, fkt, line, "XSetTransientForHint(%p, %lu, %lu)", + (void*)display, window, prop_window); } const int rc = XSetTransientForHint(display, window, prop_window); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, @@ -444,7 +437,7 @@ int LogDynAndXCloseDisplay_ex(wLog* log, const char* file, const char* fkt, size { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XCloseDisplay(%p)", display); + write_log(log, log_level, file, fkt, line, "XCloseDisplay(%p)", (void*)display); } const int rc = XCloseDisplay(display); return write_result_log_expect_success(log, WLOG_WARN, file, fkt, line, display, @@ -458,7 +451,7 @@ XImage* LogDynAndXCreateImage_ex(wLog* log, const char* file, const char* fkt, s { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XCreateImage(%p)", display); + write_log(log, log_level, file, fkt, line, "XCreateImage(%p)", (void*)display); } return XCreateImage(display, visual, depth, format, offset, data, width, height, bitmap_pad, bytes_per_line); @@ -472,7 +465,7 @@ Window LogDynAndXCreateWindow_ex(wLog* log, const char* file, const char* fkt, s { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XCreateWindow(%p)", display); + write_log(log, log_level, file, fkt, line, "XCreateWindow(%p)", (void*)display); } return XCreateWindow(display, parent, x, y, width, height, border_width, depth, class, visual, valuemask, attributes); @@ -483,7 +476,7 @@ GC LogDynAndXCreateGC_ex(wLog* log, const char* file, const char* fkt, size_t li { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XCreateGC(%p)", display); + write_log(log, log_level, file, fkt, line, "XCreateGC(%p)", (void*)display); } return XCreateGC(display, d, valuemask, values); } @@ -493,7 +486,7 @@ int LogDynAndXFreeGC_ex(wLog* log, const char* file, const char* fkt, size_t lin { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XFreeGC(%p)", display); + write_log(log, log_level, file, fkt, line, "XFreeGC(%p)", (void*)display); } const int rc = XFreeGC(display, gc); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XFreeGC", rc); @@ -506,7 +499,7 @@ Pixmap LogDynAndXCreatePixmap_ex(wLog* log, const char* file, const char* fkt, s if (WLog_IsLevelActive(log, log_level)) { write_log(log, log_level, file, fkt, line, "XCreatePixmap(%p, 0x%08lu, %u, %u, %u)", - display, d, width, height, depth); + (void*)display, d, width, height, depth); } return XCreatePixmap(display, d, width, height, depth); } @@ -516,7 +509,7 @@ int LogDynAndXFreePixmap_ex(wLog* log, const char* file, const char* fkt, size_t { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XFreePixmap(%p)", display); + write_log(log, log_level, file, fkt, line, "XFreePixmap(%p)", (void*)display); } const int rc = XFreePixmap(display, pixmap); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XFreePixmap", rc); @@ -529,7 +522,7 @@ int LogDynAndXSetSelectionOwner_ex(wLog* log, const char* file, const char* fkt, { char* selectionstr = Safe_XGetAtomName(log, display, selection); write_log(log, log_level, file, fkt, line, "XSetSelectionOwner(%p, %s, 0x%08lu, %lu)", - display, selectionstr, owner, time); + (void*)display, selectionstr, owner, time); XFree(selectionstr); } const int rc = XSetSelectionOwner(display, selection, owner, time); @@ -542,8 +535,8 @@ int LogDynAndXSetForeground_ex(wLog* log, const char* file, const char* fkt, siz { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XSetForeground(%p, %p, 0x%08lu)", display, gc, - foreground); + write_log(log, log_level, file, fkt, line, "XSetForeground(%p, %p, 0x%08lu)", + (void*)display, (void*)gc, foreground); } const int rc = XSetForeground(display, gc, foreground); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XSetForeground", @@ -555,8 +548,8 @@ int LogDynAndXMoveWindow_ex(wLog* log, const char* file, const char* fkt, size_t { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XMoveWindow(%p, 0x%08lu, %d, %d)", display, w, - x, y); + write_log(log, log_level, file, fkt, line, "XMoveWindow(%p, 0x%08lu, %d, %d)", + (void*)display, w, x, y); } const int rc = XMoveWindow(display, w, x, y); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XMoveWindow", rc); @@ -567,8 +560,8 @@ int LogDynAndXSetFillStyle_ex(wLog* log, const char* file, const char* fkt, size { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XSetFillStyle(%p, %p, %d)", display, gc, - fill_style); + write_log(log, log_level, file, fkt, line, "XSetFillStyle(%p, %p, %d)", (void*)display, + (void*)gc, fill_style); } const int rc = XSetFillStyle(display, gc, fill_style); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XSetFillStyle", @@ -580,8 +573,8 @@ int LogDynAndXSetFunction_ex(wLog* log, const char* file, const char* fkt, size_ { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XSetFunction(%p, %p, %d)", display, gc, - function); + write_log(log, log_level, file, fkt, line, "XSetFunction(%p, %p, %d)", (void*)display, + (void*)gc, function); } const int rc = XSetFunction(display, gc, function); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XSetFunction", @@ -593,7 +586,7 @@ int LogDynAndXRaiseWindow_ex(wLog* log, const char* file, const char* fkt, size_ { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XRaiseWindow(%p, %lu)", display, w); + write_log(log, log_level, file, fkt, line, "XRaiseWindow(%p, %lu)", (void*)display, w); } const int rc = XRaiseWindow(display, w); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XRaiseWindow", @@ -605,7 +598,7 @@ int LogDynAndXMapWindow_ex(wLog* log, const char* file, const char* fkt, size_t { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XMapWindow(%p, %lu)", display, w); + write_log(log, log_level, file, fkt, line, "XMapWindow(%p, %lu)", (void*)display, w); } const int rc = XMapWindow(display, w); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XMapWindow", rc); @@ -616,7 +609,7 @@ int LogDynAndXUnmapWindow_ex(wLog* log, const char* file, const char* fkt, size_ { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XUnmapWindow(%p, %lu)", display, w); + write_log(log, log_level, file, fkt, line, "XUnmapWindow(%p, %lu)", (void*)display, w); } const int rc = XUnmapWindow(display, w); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XUnmapWindow", @@ -630,7 +623,7 @@ int LogDynAndXMoveResizeWindow_ex(wLog* log, const char* file, const char* fkt, if (WLog_IsLevelActive(log, log_level)) { write_log(log, log_level, file, fkt, line, "XMoveResizeWindow(%p, %lu, %d, %d, %u, %u)", - display, w, x, y, width, height); + (void*)display, w, x, y, width, height); } const int rc = XMoveResizeWindow(display, w, x, y, width, height); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, @@ -642,8 +635,8 @@ Status LogDynAndXWithdrawWindow_ex(wLog* log, const char* file, const char* fkt, { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XWithdrawWindow(%p, %lu, %d)", display, w, - screen_number); + write_log(log, log_level, file, fkt, line, "XWithdrawWindow(%p, %lu, %d)", (void*)display, + w, screen_number); } const Status rc = XWithdrawWindow(display, w, screen_number); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XWithdrawWindow", @@ -655,8 +648,8 @@ int LogDynAndXResizeWindow_ex(wLog* log, const char* file, const char* fkt, size { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XResizeWindow(%p, %lu, %u, %u)", display, w, - width, height); + write_log(log, log_level, file, fkt, line, "XResizeWindow(%p, %lu, %u, %u)", (void*)display, + w, width, height); } const int rc = XResizeWindow(display, w, width, height); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XResizeWindow", @@ -668,7 +661,7 @@ int LogDynAndXClearWindow_ex(wLog* log, const char* file, const char* fkt, size_ { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XClearWindow(%p, %lu)", display, w); + write_log(log, log_level, file, fkt, line, "XClearWindow(%p, %lu)", (void*)display, w); } const int rc = XClearWindow(display, w); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XClearWindow", @@ -680,8 +673,8 @@ int LogDynAndXSetBackground_ex(wLog* log, const char* file, const char* fkt, siz { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XSetBackground(%p, %p, %lu)", display, gc, - background); + write_log(log, log_level, file, fkt, line, "XSetBackground(%p, %p, %lu)", (void*)display, + (void*)gc, background); } const int rc = XSetBackground(display, gc, background); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XSetBackground", @@ -693,8 +686,8 @@ int LogDynAndXSetClipMask_ex(wLog* log, const char* file, const char* fkt, size_ { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XSetClipMask(%p, %p, %lu)", display, gc, - pixmap); + write_log(log, log_level, file, fkt, line, "XSetClipMask(%p, %p, %lu)", (void*)display, + (void*)gc, pixmap); } const int rc = XSetClipMask(display, gc, pixmap); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XSetClipMask", @@ -708,7 +701,7 @@ int LogDynAndXFillRectangle_ex(wLog* log, const char* file, const char* fkt, siz if (WLog_IsLevelActive(log, log_level)) { write_log(log, log_level, file, fkt, line, "XFillRectangle(%p, %lu, %p, %d, %d, %u, %u)", - display, w, gc, x, y, width, height); + (void*)display, w, (void*)gc, x, y, width, height); } const int rc = XFillRectangle(display, w, gc, x, y, width, height); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XFillRectangle", @@ -720,7 +713,8 @@ int LogDynAndXSetRegion_ex(wLog* log, const char* file, const char* fkt, size_t { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XSetRegion(%p, %p, %lu)", display, gc, r); + write_log(log, log_level, file, fkt, line, "XSetRegion(%p, %p, %p)", (void*)display, + (void*)gc, (void*)r); } const int rc = XSetRegion(display, gc, r); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XSetRegion", rc); @@ -731,8 +725,8 @@ int LogDynAndXReparentWindow_ex(wLog* log, const char* file, const char* fkt, si { if (WLog_IsLevelActive(log, log_level)) { - write_log(log, log_level, file, fkt, line, "XReparentWindow(%p, %lu, %lu, %d, %d)", display, - w, parent, x, y); + write_log(log, log_level, file, fkt, line, "XReparentWindow(%p, %lu, %lu, %d, %d)", + (void*)display, w, parent, x, y); } const int rc = XReparentWindow(display, w, parent, x, y); return write_result_log_expect_one(log, WLOG_WARN, file, fkt, line, display, "XReparentWindow", diff --git a/client/common/client_cliprdr_file.c b/client/common/client_cliprdr_file.c index 9769b9298..3f4c513bc 100644 --- a/client/common/client_cliprdr_file.c +++ b/client/common/client_cliprdr_file.c @@ -1353,8 +1353,8 @@ static BOOL dump_streams(const void* key, void* value, WINPR_ATTR_UNUSED void* a for (size_t x = 0; x < cur->count; x++) { const CliprdrLocalFile* file = &cur->files[x]; - writelog(cur->context->log, WLOG_WARN, __FILE__, __func__, __LINE__, "file [%" PRIuz "] ", - x, file->name, file->size); + writelog(cur->context->log, WLOG_WARN, __FILE__, __func__, __LINE__, + "file [%" PRIuz "] %s: %" PRId64, x, file->name, file->size); } return TRUE; } @@ -1375,7 +1375,7 @@ static CliprdrLocalFile* file_info_for_request(CliprdrFileContext* file, UINT32 else { writelog(file->log, WLOG_WARN, __FILE__, __func__, __LINE__, - "invalid entry index for lockID %" PRIu32 ", index %" PRIu32 " [count %" PRIu32 + "invalid entry index for lockID %" PRIu32 ", index %" PRIu32 " [count %" PRIuz "] [locked %d]", lockId, listIndex, cur->count, cur->locked); } @@ -2497,7 +2497,7 @@ BOOL cliprdr_file_context_update_client_data(CliprdrFileContext* file, const cha HashTable_Lock(file->local_streams); CliprdrLocalStream* stream = HashTable_GetItemValue(file->local_streams, &lockId); - WLog_Print(file->log, WLOG_DEBUG, "update client file list (stream=%p)...", stream); + WLog_Print(file->log, WLOG_DEBUG, "update client file list (stream=%p)...", (void*)stream); if (stream) rc = cliprdr_local_stream_update(stream, data, size); else diff --git a/libfreerdp/codec/dsp.c b/libfreerdp/codec/dsp.c index cf0d70a09..dbd11f1b0 100644 --- a/libfreerdp/codec/dsp.c +++ b/libfreerdp/codec/dsp.c @@ -746,7 +746,7 @@ static const struct { 1, 4 }, { 5, 4 }, { 2, 0 }, { 6, 0 }, { 2, 4 }, { 6, 4 }, { 3, 0 }, { 7, 0 }, { 3, 4 }, { 7, 4 } }; -static BYTE dsp_encode_ima_adpcm_sample(ADPCM* WINPR_RESTRICT adpcm, int channel, INT16 sample) +static BYTE dsp_encode_ima_adpcm_sample(ADPCM* WINPR_RESTRICT adpcm, size_t channel, INT16 sample) { INT32 ss = ima_step_size_table[adpcm->ima.last_step[channel]]; INT32 e = sample - adpcm->ima.last_sample[channel]; @@ -892,7 +892,7 @@ static const INT32 ms_adpcm_coeffs1[7] = { 256, 512, 0, 192, 240, 460, 392 }; 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, - int channel) + size_t channel) { const INT8 nibble = (sample & 0x08 ? (INT8)sample - 16 : (INT8)sample); INT32 presample = diff --git a/libfreerdp/codec/progressive.c b/libfreerdp/codec/progressive.c index c7ccf730f..6396e0f2a 100644 --- a/libfreerdp/codec/progressive.c +++ b/libfreerdp/codec/progressive.c @@ -1628,8 +1628,8 @@ static INLINE SSIZE_T progressive_process_tiles( if (blockLen < 6) { - WLog_Print(progressive->log, WLOG_ERROR, "Expected >= %" PRIu32 " remaining %" PRIuz, 6, - blockLen); + WLog_Print(progressive->log, WLOG_ERROR, "Expected >= %" PRIu32 " remaining %" PRIu32, + 6u, blockLen); return -1003; } if (!Stream_CheckAndLogRequiredLength(TAG, s, blockLen - 6)) @@ -1758,7 +1758,7 @@ static INLINE SSIZE_T progressive_wb_sync(PROGRESSIVE_CONTEXT* WINPR_RESTRICT pr { WLog_Print(progressive->log, WLOG_ERROR, "PROGRESSIVE_BLOCK_SYNC::blockLen = 0x%08" PRIx32 " != 0x%08" PRIx32, - sync.blockLen, 12); + sync.blockLen, 12u); return -1005; } @@ -1808,7 +1808,7 @@ static INLINE SSIZE_T progressive_wb_frame_begin(PROGRESSIVE_CONTEXT* WINPR_REST { WLog_Print(progressive->log, WLOG_ERROR, " RFX_PROGRESSIVE_FRAME_BEGIN::blockLen = 0x%08" PRIx32 " != 0x%08" PRIx32, - frameBegin.blockLen, 12); + frameBegin.blockLen, 12u); return -1005; } @@ -1860,15 +1860,15 @@ static INLINE SSIZE_T progressive_wb_frame_end(PROGRESSIVE_CONTEXT* WINPR_RESTRI { WLog_Print(progressive->log, WLOG_ERROR, " RFX_PROGRESSIVE_FRAME_END::blockLen = 0x%08" PRIx32 " != 0x%08" PRIx32, - frameEnd.blockLen, 6); + frameEnd.blockLen, 6u); return -1005; } if (Stream_GetRemainingLength(s) != 0) { WLog_Print(progressive->log, WLOG_ERROR, - "ProgressiveFrameEnd short %" PRIuz ", expected %" PRIuz, - Stream_GetRemainingLength(s), 0); + "ProgressiveFrameEnd short %" PRIuz ", expected %u", + Stream_GetRemainingLength(s), 0U); return -1008; } @@ -1896,8 +1896,8 @@ static INLINE SSIZE_T progressive_wb_context(PROGRESSIVE_CONTEXT* WINPR_RESTRICT if (context->blockLen != 10) { WLog_Print(progressive->log, WLOG_ERROR, - "RFX_PROGRESSIVE_CONTEXT::blockLen = 0x%08" PRIx32 " != 0x%08" PRIx32, - context->blockLen, 10); + "RFX_PROGRESSIVE_CONTEXT::blockLen = 0x%08" PRIx32 " != 0x%08x", + context->blockLen, 10u); return -1005; } @@ -1955,8 +1955,7 @@ static INLINE SSIZE_T progressive_wb_read_region_header( if (region->tileSize != 64) { WLog_Print(progressive->log, WLOG_ERROR, - "ProgressiveRegion tile size %" PRIu8 ", expected %" PRIuz, region->tileSize, - 64); + "ProgressiveRegion tile size %" PRIu8 ", expected %u", region->tileSize, 64U); return -1012; } @@ -1970,8 +1969,8 @@ static INLINE SSIZE_T progressive_wb_read_region_header( if (region->numQuant > 7) { WLog_Print(progressive->log, WLOG_ERROR, - "ProgressiveRegion quant count too high %" PRIu8 ", expected < %" PRIuz, - region->numQuant, 7); + "ProgressiveRegion quant count too high %" PRIu8 ", expected < %u", + region->numQuant, 7U); return -1014; } diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c index 12f17e213..8832cd740 100644 --- a/libfreerdp/codec/rfx.c +++ b/libfreerdp/codec/rfx.c @@ -922,8 +922,8 @@ static INLINE BOOL rfx_process_message_tileset(RFX_CONTEXT* WINPR_RESTRICT conte *quants++ = (quant & 0x0F); *quants++ = (quant >> 4); WLog_Print(context->priv->log, WLOG_DEBUG, - "quant %d (%" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 - " %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 ").", + "quant %" PRIuz " (%" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 + " %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 ").", i, context->quants[i * 10], context->quants[i * 10 + 1], context->quants[i * 10 + 2], context->quants[i * 10 + 3], context->quants[i * 10 + 4], context->quants[i * 10 + 5], @@ -985,8 +985,8 @@ static INLINE BOOL rfx_process_message_tileset(RFX_CONTEXT* WINPR_RESTRICT conte if (!Stream_CheckAndLogRequiredLengthWLog(context->priv->log, s, 6)) { WLog_Print(context->priv->log, WLOG_ERROR, - "RfxMessageTileSet packet too small to read tile %d/%" PRIu16 "", i, - message->numTiles); + "RfxMessageTileSet packet too small to read tile %" PRIuz "/%" PRIu16 "", + i, message->numTiles); rc = FALSE; break; } @@ -1005,7 +1005,7 @@ static INLINE BOOL rfx_process_message_tileset(RFX_CONTEXT* WINPR_RESTRICT conte (!Stream_CheckAndLogRequiredLengthWLog(context->priv->log, sub, blockLen - 6))) { WLog_Print(context->priv->log, WLOG_ERROR, - "RfxMessageTileSet not enough bytes to read tile %d/%" PRIu16 + "RfxMessageTileSet not enough bytes to read tile %" PRIuz "/%" PRIu16 " with blocklen=%" PRIu32 "", i, message->numTiles, blockLen); rc = FALSE; @@ -1222,7 +1222,7 @@ BOOL rfx_process_message(RFX_CONTEXT* WINPR_RESTRICT context, const BYTE* WINPR_ if (blockLenNoHeader < extraBlockLen) { WLog_Print(context->priv->log, WLOG_ERROR, - "blockLen too small(%" PRIu32 "), must be >= 6 + %" PRIu16, blockLen, + "blockLen too small(%" PRIu32 "), must be >= 6 + %" PRIuz, blockLen, extraBlockLen); return FALSE; } diff --git a/libfreerdp/common/assistance.c b/libfreerdp/common/assistance.c index dfdfff890..d45017ec1 100644 --- a/libfreerdp/common/assistance.c +++ b/libfreerdp/common/assistance.c @@ -1468,9 +1468,9 @@ void freerdp_assistance_print_file(rdpAssistanceFile* file, wLog* log, DWORD lev if (x < ArrayList_Count(file->MachineUris)) uri = ArrayList_GetItem(file->MachineUris, x); - WLog_Print(log, level, "MachineAddress [%" PRIdz ": %s", x, addr); - WLog_Print(log, level, "MachinePort [%" PRIdz ": %" PRIu32, x, port); - WLog_Print(log, level, "MachineURI [%" PRIdz ": %s", x, uri); + WLog_Print(log, level, "MachineAddress [%" PRIuz ": %s", x, addr); + WLog_Print(log, level, "MachinePort [%" PRIuz ": %" PRIu32, x, port); + WLog_Print(log, level, "MachineURI [%" PRIuz ": %s", x, uri); } } diff --git a/libfreerdp/core/aad.c b/libfreerdp/core/aad.c index 5bbfca9bb..7099c2422 100644 --- a/libfreerdp/core/aad.c +++ b/libfreerdp/core/aad.c @@ -506,7 +506,7 @@ static int aad_send_auth_request(rdpAad* aad, const char* ts_nonce) if (transport_write(aad->transport, s) < 0) { - WLog_Print(aad->log, WLOG_ERROR, "transport_write [%" PRIdz " bytes] failed", + WLog_Print(aad->log, WLOG_ERROR, "transport_write [%" PRIuz " bytes] failed", Stream_Length(s)); } else @@ -593,7 +593,7 @@ int aad_recv(rdpAad* aad, wStream* s) return aad_parse_state_auth(aad, s); case AAD_STATE_FINAL: default: - WLog_Print(aad->log, WLOG_ERROR, "Invalid AAD_STATE %d", aad->state); + WLog_Print(aad->log, WLOG_ERROR, "Invalid AAD_STATE %u", aad->state); return -1; } } diff --git a/libfreerdp/core/autodetect.c b/libfreerdp/core/autodetect.c index 0262ee630..90f65ee53 100644 --- a/libfreerdp/core/autodetect.c +++ b/libfreerdp/core/autodetect.c @@ -237,8 +237,8 @@ autodetect_send_bandwidth_measure_payload(rdpAutoDetect* autodetect, if (!Stream_EnsureRemainingCapacity(s, 8 + payloadLength)) { - WLog_Print(autodetect->log, WLOG_ERROR, "Failed to ensure %" PRIuz " bytes in stream", - 8ull + payloadLength); + WLog_Print(autodetect->log, WLOG_ERROR, "Failed to ensure %lu bytes in stream", + 8ul + payloadLength); Stream_Release(s); return FALSE; } @@ -298,7 +298,7 @@ static BOOL autodetect_send_bandwidth_measure_stop(rdpAutoDetect* autodetect, if (!Stream_EnsureRemainingCapacity(s, payloadLength)) { WLog_Print(autodetect->log, WLOG_ERROR, - "Failed to ensure %" PRIuz " bytes in stream", payloadLength); + "Failed to ensure %" PRIu16 " bytes in stream", payloadLength); Stream_Release(s); return FALSE; } diff --git a/libfreerdp/core/capabilities.c b/libfreerdp/core/capabilities.c index d6062caad..b52f71f33 100644 --- a/libfreerdp/core/capabilities.c +++ b/libfreerdp/core/capabilities.c @@ -216,7 +216,8 @@ static BOOL rdp_read_general_capability_set(wLog* log, wStream* s, rdpSettings* WLog_Print(log, WLOG_ERROR, "TS_GENERAL_CAPABILITYSET::protocolVersion(0x%04" PRIx16 ") != TS_CAPS_PROTOCOLVERSION(0x%04" PRIx32 ")", - settings->CapsProtocolVersion, TS_CAPS_PROTOCOLVERSION); + settings->CapsProtocolVersion, + WINPR_CXX_COMPAT_CAST(UINT32, TS_CAPS_PROTOCOLVERSION)); if (settings->CapsProtocolVersion == 0x0000) { WLog_Print(log, WLOG_WARN, @@ -284,8 +285,9 @@ static BOOL rdp_write_general_capability_set(wLog* log, wStream* s, const rdpSet { WLog_Print(log, WLOG_ERROR, "OsMajorType=%08" PRIx32 ", OsMinorType=%08" PRIx32 - " they need to be smaller %04" PRIx16, - settings->OsMajorType, settings->OsMinorType, UINT16_MAX); + " they need to be smaller %04" PRIx32, + settings->OsMajorType, settings->OsMinorType, + WINPR_CXX_COMPAT_CAST(UINT32, UINT16_MAX)); return FALSE; } if (settings->CapsProtocolVersion != TS_CAPS_PROTOCOLVERSION) @@ -293,7 +295,8 @@ static BOOL rdp_write_general_capability_set(wLog* log, wStream* s, const rdpSet WLog_Print(log, WLOG_ERROR, "TS_GENERAL_CAPABILITYSET::protocolVersion(0x%04" PRIx16 ") != TS_CAPS_PROTOCOLVERSION(0x%04" PRIx32 ")", - settings->CapsProtocolVersion, TS_CAPS_PROTOCOLVERSION); + settings->CapsProtocolVersion, + WINPR_CXX_COMPAT_CAST(UINT32, TS_CAPS_PROTOCOLVERSION)); return FALSE; } Stream_Write_UINT16(s, (UINT16)settings->OsMajorType); /* osMajorType (2 bytes) */ @@ -1132,7 +1135,8 @@ static BOOL rdp_read_pointer_capability_set(wLog* log, wStream* s, rdpSettings* WLog_Print(log, WLOG_WARN, "[MS-RDPBCGR] 2.2.7.1.5 Pointer Capability Set " "(TS_POINTER_CAPABILITYSET)::colorPointerFlag received is %" PRIu16 - ". Value is ignored and always assumed to be TRUE"); + ". Value is ignored and always assumed to be TRUE", + colorPointerFlag); } /* pointerCacheSize is optional */ @@ -2874,7 +2878,8 @@ static BOOL rdp_read_large_pointer_capability_set(wLog* log, wStream* s, rdpSett WLog_Print( log, WLOG_WARN, "TS_LARGE_POINTER_CAPABILITYSET with unsupported flags %04X (all flags %04X) received", - largePointerSupportFlags & ~(LARGE_POINTER_FLAG_96x96 | LARGE_POINTER_FLAG_384x384), + WINPR_CXX_COMPAT_CAST(UINT32, largePointerSupportFlags & ~(LARGE_POINTER_FLAG_96x96 | + LARGE_POINTER_FLAG_384x384)), largePointerSupportFlags); } return TRUE; @@ -3156,7 +3161,7 @@ static BOOL rdp_read_codec_ts_rfx_icap(wLog* log, wStream* sub, rdpSettings* set WLog_Print(log, WLOG_ERROR, "[MS-RDPRFX] 2.2.1.1.1.1.1 TS_RFX_ICAP size %" PRIu16 " unsupported, expecting size %" PRIu16 " not supported", - icapLen, 8); + icapLen, 8u); return FALSE; } @@ -3234,8 +3239,8 @@ static BOOL rdp_read_codec_ts_rfx_icap(wLog* log, wStream* sub, rdpSettings* set else if ((codecFlags & ~CODEC_MODE) != 0) WLog_Print(log, WLOG_WARN, "[MS-RDPRFX] 2.2.1.1.1.1.1 TS_RFX_ICAP::flags unknown value " - "0x%02" PRIx8, - (codecFlags & ~CODEC_MODE)); + "0x%02" PRIx32, + WINPR_CXX_COMPAT_CAST(UINT32, (codecFlags & ~CODEC_MODE))); switch (entropyBits) { @@ -3362,7 +3367,7 @@ static BOOL rdp_read_codec_ts_rfx_caps(wLog* log, wStream* sub, rdpSettings* set if (numCapsets != 1) { WLog_Print(log, WLOG_ERROR, - "[MS_RDPRFX] 2.2.1.1.1.1 TS_RFX_CAPSET::numIcaps[" PRIu16 "] != 1", numCapsets); + "[MS_RDPRFX] 2.2.1.1.1.1 TS_RFX_CAPSET::numIcaps[%" PRIu16 "] != 1", numCapsets); return FALSE; } @@ -4562,7 +4567,7 @@ static BOOL rdp_read_capability_sets(wLog* log, wStream* s, rdpSettings* setting if (len > totalLength) { - WLog_Print(log, WLOG_ERROR, "Capability length expected %" PRIu16 ", actual %" PRIdz, + WLog_Print(log, WLOG_ERROR, "Capability length expected %" PRIu16 ", actual %" PRIuz, totalLength, len); goto fail; } diff --git a/libfreerdp/core/gateway/arm.c b/libfreerdp/core/gateway/arm.c index 6afebaf03..42e281ee4 100644 --- a/libfreerdp/core/gateway/arm.c +++ b/libfreerdp/core/gateway/arm.c @@ -409,8 +409,8 @@ static WINPR_CIPHER_CTX* treatAuthBlob(wLog* log, const BYTE* pbInput, size_t cb Stream_Read_UINT32(s, dwVersion); if (dwVersion != BCRYPT_KEY_DATA_BLOB_VERSION1) { - WLog_Print(log, WLOG_ERROR, "unsupported authBlob version %d, expecting %d", dwVersion, - BCRYPT_KEY_DATA_BLOB_VERSION1); + WLog_Print(log, WLOG_ERROR, "unsupported authBlob version %" PRIu32 ", expecting %d", + dwVersion, BCRYPT_KEY_DATA_BLOB_VERSION1); return NULL; } diff --git a/libfreerdp/core/gateway/rdg.c b/libfreerdp/core/gateway/rdg.c index a7b0591ea..0b16142bd 100644 --- a/libfreerdp/core/gateway/rdg.c +++ b/libfreerdp/core/gateway/rdg.c @@ -1000,7 +1000,7 @@ static BOOL rdg_process_extauth_sspi(rdpRdg* rdg, wStream* s) if (errorCode != ERROR_SUCCESS) { WLog_Print(rdg->log, WLOG_ERROR, "EXTAUTH_SSPI_NTLM failed with error %s [0x%08X]", - GetSecurityStatusString(errorCode), errorCode); + GetSecurityStatusString(errorCode), WINPR_CXX_COMPAT_CAST(UINT32, errorCode)); return FALSE; } @@ -1084,7 +1084,7 @@ static BOOL rdg_process_packet(rdpRdg* rdg, wStream* s) if (Stream_Length(s) < packetLength) { - WLog_Print(rdg->log, WLOG_ERROR, "Short packet %" PRIuz ", expected %" PRIuz, + WLog_Print(rdg->log, WLOG_ERROR, "Short packet %" PRIuz ", expected %" PRIu32, Stream_Length(s), packetLength); return FALSE; } @@ -1777,7 +1777,8 @@ static BOOL rdg_process_unknown_packet(rdpRdg* rdg, int type) { WINPR_UNUSED(rdg); WINPR_UNUSED(type); - WLog_Print(rdg->log, WLOG_WARN, "Unknown Control Packet received: %X", type); + WLog_Print(rdg->log, WLOG_WARN, "Unknown Control Packet received: %" PRIX32, + WINPR_CXX_COMPAT_CAST(UINT32, type)); return TRUE; } diff --git a/libfreerdp/core/gateway/rpc_client.c b/libfreerdp/core/gateway/rpc_client.c index ce6de8ea4..b1a1fda83 100644 --- a/libfreerdp/core/gateway/rpc_client.c +++ b/libfreerdp/core/gateway/rpc_client.c @@ -325,7 +325,7 @@ static int rpc_client_recv_pdu_int(rdpRpc* rpc, RPC_PDU* pdu) } else { - WLog_Print(rpc->log, WLOG_ERROR, "invalid rpc->State: %d", rpc->State); + WLog_Print(rpc->log, WLOG_ERROR, "invalid rpc->State: %u", rpc->State); } } else if (rpc->State >= RPC_CLIENT_STATE_CONTEXT_NEGOTIATED) diff --git a/libfreerdp/core/gateway/rts.c b/libfreerdp/core/gateway/rts.c index c0b851c33..fc1d56169 100644 --- a/libfreerdp/core/gateway/rts.c +++ b/libfreerdp/core/gateway/rts.c @@ -1254,9 +1254,10 @@ static BOOL rts_receive_window_size_command_read(rdpRpc* rpc, wStream* buffer, if (CommandType != RTS_CMD_RECEIVE_WINDOW_SIZE) { WLog_Print(rpc->log, WLOG_ERROR, - "[MS-RPCH] 2.2.3.5.1 ReceiveWindowSize::CommandType must be 0x08" PRIx32 ", got " + "[MS-RPCH] 2.2.3.5.1 ReceiveWindowSize::CommandType must be 0x%08" PRIx32 + ", got " "0x%08" PRIx32, - RTS_CMD_RECEIVE_WINDOW_SIZE, CommandType); + WINPR_CXX_COMPAT_CAST(UINT32, RTS_CMD_RECEIVE_WINDOW_SIZE), CommandType); return FALSE; } const UINT32 val = Stream_Get_UINT32(buffer); @@ -1354,9 +1355,10 @@ static BOOL rts_connection_timeout_command_read(WINPR_ATTR_UNUSED rdpRpc* rpc, w if (CommandType != RTS_CMD_CONNECTION_TIMEOUT) { WLog_Print(rpc->log, WLOG_ERROR, - "[MS-RPCH] 2.2.3.5.3 ConnectionTimeout::CommandType must be 0x08" PRIx32 ", got " + "[MS-RPCH] 2.2.3.5.3 ConnectionTimeout::CommandType must be 0x%08" PRIx32 + ", got " "0x%08" PRIx32, - RTS_CMD_CONNECTION_TIMEOUT, CommandType); + WINPR_CXX_COMPAT_CAST(UINT32, RTS_CMD_CONNECTION_TIMEOUT), CommandType); return FALSE; } const UINT32 val = Stream_Get_UINT32(buffer); @@ -1422,9 +1424,9 @@ static BOOL rts_version_command_read(rdpRpc* rpc, wStream* buffer, uint32_t* pve if (CommandType != RTS_CMD_VERSION) { WLog_Print(rpc->log, WLOG_ERROR, - "[MS-RPCH] 2.2.3.5.7 Version::CommandType must be 0x08" PRIx32 ", got " + "[MS-RPCH] 2.2.3.5.7 Version::CommandType must be 0x%08" PRIx32 ", got " "0x%08" PRIx32, - RTS_CMD_VERSION, CommandType); + WINPR_CXX_COMPAT_CAST(UINT32, RTS_CMD_VERSION), CommandType); return FALSE; } const uint32_t version = Stream_Get_UINT32(buffer); /* Version (4 bytes) */ @@ -1658,7 +1660,7 @@ BOOL rts_recv_CONN_A3_pdu(rdpRpc* rpc, wStream* buffer) WLog_Print(rpc->log, WLOG_ERROR, "[MS-RPCH] 2.2.4.4 CONN/A3 RTS PDU unexpected Flags=0x%08" PRIx32 ", expected 0x%08" PRIx32, - header.rts.Flags, RTS_FLAG_NONE); + header.rts.Flags, WINPR_CXX_COMPAT_CAST(UINT32, RTS_FLAG_NONE)); goto fail; } if (header.rts.NumberOfCommands != 1) @@ -1767,7 +1769,7 @@ BOOL rts_recv_CONN_C2_pdu(rdpRpc* rpc, wStream* buffer) WLog_Print(rpc->log, WLOG_ERROR, "[MS-RPCH] 2.2.4.9 CONN/C2 RTS PDU unexpected Flags=0x%08" PRIx32 ", expected 0x%08" PRIx32, - header.rts.Flags, RTS_FLAG_NONE); + header.rts.Flags, WINPR_CXX_COMPAT_CAST(UINT32, RTS_FLAG_NONE)); goto fail; } if (header.rts.NumberOfCommands != 3) diff --git a/libfreerdp/core/gateway/tsg.c b/libfreerdp/core/gateway/tsg.c index 873adf977..85640f820 100644 --- a/libfreerdp/core/gateway/tsg.c +++ b/libfreerdp/core/gateway/tsg.c @@ -1570,7 +1570,7 @@ static BOOL tsg_ndr_read_TSG_PACKET_MSG_RESPONSE(wLog* log, rdpContext* context, if (MsgPtr == 0) { WLog_Print(log, WLOG_DEBUG, - "Message {0x%08" PRIx32 "} [%s]::isMsgPresent=%" PRIu32 ", MsgPtr=0x%08" PRIx32, + "Message {0x%08" PRIx32 "} [%s]::isMsgPresent=%" PRId32 ", MsgPtr=0x%08" PRIx32, pkg->msgType, tsg_packet_id_to_string(pkg->msgType), pkg->isMsgPresent, MsgPtr); return TRUE; } diff --git a/libfreerdp/core/gcc.c b/libfreerdp/core/gcc.c index 1d741b77e..1d7ceb034 100644 --- a/libfreerdp/core/gcc.c +++ b/libfreerdp/core/gcc.c @@ -236,7 +236,7 @@ static DWORD rdp_version_common(wLog* log, DWORD serverVersion, DWORD clientVers default: WLog_Print(log, WLOG_ERROR, - "Invalid client [%" PRId32 "] and server [%" PRId32 "] versions", + "Invalid client [%" PRIu32 "] and server [%" PRIu32 "] versions", serverVersion, clientVersion); return version; } @@ -1886,7 +1886,7 @@ BOOL gcc_read_client_network_data(wStream* s, rdpMcs* mcs) if (mcs->channelCount > CHANNEL_MAX_COUNT) { - WLog_Print(mcs->log, WLOG_ERROR, "rdpMcs::channelCount %" PRIu32 " > maximum %" PRIu32, + WLog_Print(mcs->log, WLOG_ERROR, "rdpMcs::channelCount %" PRIu32 " > maximum %d", mcs->channelCount, CHANNEL_MAX_COUNT); return FALSE; } diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c index 2449af948..0115f0dd8 100644 --- a/libfreerdp/core/license.c +++ b/libfreerdp/core/license.c @@ -1185,8 +1185,8 @@ BOOL license_encrypt_premaster_secret(rdpLicense* license) const rdpCertInfo* info = freerdp_certificate_get_info(license->certificate); if (!info) { - WLog_Print(license->log, WLOG_ERROR, "info=%p, license->certificate=%p", info, - license->certificate); + WLog_Print(license->log, WLOG_ERROR, "info=%p, license->certificate=%p", (const void*)info, + (void*)license->certificate); return FALSE; } @@ -1202,7 +1202,7 @@ BOOL license_encrypt_premaster_secret(rdpLicense* license) { WLog_Print(license->log, WLOG_ERROR, "EncryptedPremasterSecret=%p, info->ModulusLength=%" PRIu32, - EncryptedPremasterSecret, info->ModulusLength); + (const void*)EncryptedPremasterSecret, info->ModulusLength); return FALSE; } @@ -1215,9 +1215,8 @@ BOOL license_encrypt_premaster_secret(rdpLicense* license) info, EncryptedPremasterSecret, info->ModulusLength); if ((length < 0) || (length > UINT16_MAX)) { - WLog_Print(license->log, WLOG_ERROR, - "RSA public encrypt length=%" PRIdz " < 0 || > %" PRIu16, length, - UINT16_MAX); + WLog_Print(license->log, WLOG_ERROR, "RSA public encrypt length=%" PRIdz " < 0 || > %d", + length, UINT16_MAX); return FALSE; } license->EncryptedPremasterSecret->length = (UINT16)length; @@ -1260,7 +1259,7 @@ static BOOL license_rc4_with_licenseKey(const rdpLicense* license, const BYTE* i error_buffer: WLog_Print(license->log, WLOG_ERROR, "Failed to create/update RC4: len=%" PRIuz ", buffer=%p", - len, buffer); + len, (const void*)buffer); winpr_RC4_Free(rc4); return FALSE; } @@ -1502,7 +1501,7 @@ BOOL license_read_binary_blob_data(wLog* log, LICENSE_BLOB* blob, UINT16 wBlobTy if (!blob->data) { WLog_Print(log, WLOG_ERROR, "license binary blob::length=%" PRIu16 ", blob::data=%p", - blob->length, blob->data); + blob->length, (const void*)blob->data); return FALSE; } memcpy(blob->data, data, blob->length); /* blobData */ @@ -2184,8 +2183,8 @@ BOOL license_read_new_or_upgrade_license_packet(rdpLicense* license, wStream* s) if (!licenseStream) { WLog_Print(license->log, WLOG_ERROR, - "license::blob::data=%p, license::blob::length=%" PRIu16, calBlob->data, - calBlob->length); + "license::blob::data=%p, license::blob::length=%" PRIu16, + (const void*)calBlob->data, calBlob->length); goto fail; } @@ -2906,8 +2905,8 @@ static BOOL license_set_string(wLog* log, const char* what, const char* value, B *cnv.w = ConvertUtf8ToWCharAlloc(value, &len); if (!*cnv.w || (len > UINT32_MAX / sizeof(WCHAR))) { - WLog_Print(log, WLOG_ERROR, "license->ProductInfo: %s == %p || %" PRIu32 " > UINT32_MAX", - what, *cnv.w, len); + WLog_Print(log, WLOG_ERROR, "license->ProductInfo: %s == %p || %" PRIuz " > UINT32_MAX", + what, (void*)(*cnv.w), len); return FALSE; } *dstLen = (UINT32)(len * sizeof(WCHAR)); @@ -2991,8 +2990,8 @@ BOOL license_server_configure(rdpLicense* license) if ((length == 0) || (length > UINT16_MAX)) { WLog_Print(license->log, WLOG_WARN, - "%s: Invalid issuer at position %" PRIuz ": length 0 < %" PRIuz - " <= %" PRIu16 " ['%s']", + "Invalid issuer at position %" PRIuz ": length 0 < %" PRIuz " <= %d" + " ['%s']", x, length, UINT16_MAX, name); return FALSE; } diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c index b7cb4d341..d171e0b67 100644 --- a/libfreerdp/core/orders.c +++ b/libfreerdp/core/orders.c @@ -87,14 +87,16 @@ static inline BOOL check_val_fits_int16_int(INT32 value, WINPR_ATTR_UNUSED const if (value < INT16_MIN) { if (WLog_IsLevelActive(log, level)) - WLog_PrintTextMessage(log, level, line, file, fkt, "value %" PRId32 " < %d", INT16_MIN); + WLog_PrintTextMessage(log, level, line, file, fkt, "value %" PRId32 " < %d", INT16_MIN, + value); return FALSE; } if (value > INT16_MAX) { if (WLog_IsLevelActive(log, level)) - WLog_PrintTextMessage(log, level, line, file, fkt, "value %" PRId32 " > %d", INT16_MAX); + WLog_PrintTextMessage(log, level, line, file, fkt, "value %" PRId32 " > %d", INT16_MAX, + value); return FALSE; } @@ -629,8 +631,8 @@ static INLINE BOOL update_write_coord_int(wStream* s, INT32 coord, const char* n wLog* log = WLog_Get(TAG); if (WLog_IsLevelActive(log, level)) { - WLog_PrintTextMessage(log, level, line, file, fkt, "[%s] 0 <= %" PRId32 " <= %" PRIu16, - name, coord, UINT16_MAX); + WLog_PrintTextMessage(log, level, line, file, fkt, "[%s] 0 <= %" PRId32 " <= %d", name, + coord, UINT16_MAX); } return FALSE; } diff --git a/libfreerdp/core/rdp.c b/libfreerdp/core/rdp.c index f50059b70..6e105fa42 100644 --- a/libfreerdp/core/rdp.c +++ b/libfreerdp/core/rdp.c @@ -276,9 +276,9 @@ BOOL rdp_read_share_control_header(rdpRdp* rdp, wStream* s, UINT16* tpktLength, char buffer[128] = { 0 }; WLog_Print(rdp->log, WLOG_DEBUG, - "[Flow control PDU] type=%s, tpktLength=%" PRIuz ", remainingLength=%" PRIuz, - pdu_type_to_str(*type, buffer, sizeof(buffer)), tpktLength ? *tpktLength : 0, - remainingLength ? *remainingLength : 0); + "[Flow control PDU] type=%s, tpktLength=%" PRIu16 ", remainingLength=%" PRIu16, + pdu_type_to_str(*type, buffer, sizeof(buffer)), tpktLength ? *tpktLength : 0u, + remainingLength ? *remainingLength : 0u); return TRUE; } @@ -311,7 +311,7 @@ BOOL rdp_read_share_control_header(rdpRdp* rdp, wStream* s, UINT16* tpktLength, *channel_id = 0; /* Windows XP can send such short DEACTIVATE_ALL PDUs. */ char buffer[128] = { 0 }; - WLog_Print(rdp->log, WLOG_DEBUG, "type=%s, tpktLength=%" PRIuz ", remainingLength=%" PRIuz, + WLog_Print(rdp->log, WLOG_DEBUG, "type=%s, tpktLength=%" PRIu16 ", remainingLength=%" PRIuz, pdu_type_to_str(*type, buffer, sizeof(buffer)), len, remLen); if (remainingLength) { @@ -502,7 +502,7 @@ BOOL rdp_set_error_info(rdpRdp* rdp, UINT32 errorInfo) } } else - WLog_Print(rdp->log, WLOG_ERROR, "missing context=%p", context); + WLog_Print(rdp->log, WLOG_ERROR, "missing context=%p", (void*)context); } else { @@ -1035,7 +1035,7 @@ static BOOL rdp_recv_server_set_keyboard_indicators_pdu(rdpRdp* rdp, wStream* s) { WLog_Print(rdp->log, WLOG_WARN, "[MS-RDPBCGR] 2.2.8.2.1.1 Set Keyboard Indicators PDU Data " - "(TS_SET_KEYBOARD_INDICATORS_PDU)::unitId should be 0, is %" PRIu8, + "(TS_SET_KEYBOARD_INDICATORS_PDU)::unitId should be 0, is %" PRIu16, unitId); } const UINT16 ledFlags = Stream_Get_UINT16(s); /* ledFlags (2 bytes) */ @@ -1055,7 +1055,7 @@ static BOOL rdp_recv_server_set_keyboard_ime_status_pdu(rdpRdp* rdp, wStream* s) { WLog_Print(rdp->log, WLOG_WARN, "[MS-RDPBCGR] 2.2.8.2.2.1 Set Keyboard IME Status PDU Data " - "(TS_SET_KEYBOARD_IME_STATUS_PDU)::unitId should be 0, is %" PRIu8, + "(TS_SET_KEYBOARD_IME_STATUS_PDU)::unitId should be 0, is %" PRIu16, unitId); } const uint32_t imeState = Stream_Get_UINT32(s); /* imeState (4 bytes) */ @@ -1774,7 +1774,7 @@ static state_run_t rdp_recv_tpkt_pdu(rdpRdp* rdp, wStream* s) { char buffer[256] = { 0 }; WLog_Print(rdp->log, WLOG_WARN, - "pduType %s not properly parsed, %" PRIdz + "pduType %s not properly parsed, %" PRIuz " bytes remaining unhandled. Skipping.", pdu_type_to_str(pduType, buffer, sizeof(buffer)), diff); } @@ -2171,7 +2171,7 @@ static state_run_t rdp_recv_callback_int(WINPR_ATTR_UNUSED rdpTransport* transpo break; default: - WLog_Print(rdp->log, WLOG_ERROR, "%s state %d", rdp_get_state_string(rdp), + WLog_Print(rdp->log, WLOG_ERROR, "%s state %u", rdp_get_state_string(rdp), rdp_get_state(rdp)); status = STATE_RUN_FAILED; break; @@ -2963,7 +2963,7 @@ static void log_build_warn(rdpRdp* rdp, const char* what, const char* msg, WLog_Print(rdp->log, WLOG_WARN, "* '%s'", tok); tok = strtok_s(NULL, " ", &saveptr); } - WLog_Print(rdp->log, WLOG_WARN, ""); + WLog_Print(rdp->log, WLOG_WARN, "*"); WLog_Print(rdp->log, WLOG_WARN, "[%s] build options %s", what, msg); WLog_Print(rdp->log, WLOG_WARN, "*************************************************"); } diff --git a/libfreerdp/core/rdstls.c b/libfreerdp/core/rdstls.c index de35c73dc..8a896997e 100644 --- a/libfreerdp/core/rdstls.c +++ b/libfreerdp/core/rdstls.c @@ -172,7 +172,7 @@ static BOOL check_transition(wLog* log, RDSTLS_STATE current, RDSTLS_STATE expec if (requested != expected) { WLog_Print(log, WLOG_ERROR, - "Unexpected rdstls state transition from %s [%d] to %s [%d], expected %s [%d]", + "Unexpected rdstls state transition from %s [%u] to %s [%u], expected %s [%u]", rdstls_get_state_str(current), current, rdstls_get_state_str(requested), requested, rdstls_get_state_str(expected), expected); return FALSE; @@ -207,7 +207,7 @@ static BOOL rdstls_set_state(rdpRdstls* rdstls, RDSTLS_STATE state) break; default: WLog_Print(rdstls->log, WLOG_ERROR, - "Invalid rdstls state %s [%d], requested transition to %s [%d]", + "Invalid rdstls state %s [%u], requested transition to %s [%u]", rdstls_get_state_str(rdstls->state), rdstls->state, rdstls_get_state_str(state), state); break; @@ -335,8 +335,8 @@ static BOOL rdstls_process_capabilities(rdpRdstls* rdstls, wStream* s) if (dataType != RDSTLS_DATA_CAPABILITIES) { WLog_Print(rdstls->log, WLOG_ERROR, - "received invalid DataType=0x%04" PRIX16 ", expected 0x%04" PRIX16, dataType, - RDSTLS_DATA_CAPABILITIES); + "received invalid DataType=0x%04" PRIX16 ", expected 0x%04" PRIX32, dataType, + WINPR_CXX_COMPAT_CAST(UINT32, RDSTLS_DATA_CAPABILITIES)); return FALSE; } @@ -344,8 +344,8 @@ static BOOL rdstls_process_capabilities(rdpRdstls* rdstls, wStream* s) if ((supportedVersions & RDSTLS_VERSION_1) == 0) { WLog_Print(rdstls->log, WLOG_ERROR, - "received invalid supportedVersions=0x%04" PRIX16 ", expected 0x%04" PRIX16, - supportedVersions, RDSTLS_VERSION_1); + "received invalid supportedVersions=0x%04" PRIX16 ", expected 0x%04" PRIX32, + supportedVersions, WINPR_CXX_COMPAT_CAST(UINT32, RDSTLS_VERSION_1)); return FALSE; } @@ -540,9 +540,10 @@ static BOOL rdstls_process_authentication_request(rdpRdstls* rdstls, wStream* s) break; default: WLog_Print(rdstls->log, WLOG_ERROR, - "received invalid DataType=0x%04" PRIX16 ", expected 0x%04" PRIX16 - " or 0x%04" PRIX16, - dataType, RDSTLS_DATA_PASSWORD_CREDS, RDSTLS_DATA_AUTORECONNECT_COOKIE); + "received invalid DataType=0x%04" PRIX16 ", expected 0x%04" PRIX32 + " or 0x%04" PRIX32, + dataType, WINPR_CXX_COMPAT_CAST(UINT32, RDSTLS_DATA_PASSWORD_CREDS), + WINPR_CXX_COMPAT_CAST(UINT32, RDSTLS_DATA_AUTORECONNECT_COOKIE)); return FALSE; } @@ -561,8 +562,8 @@ static BOOL rdstls_process_authentication_response(rdpRdstls* rdstls, wStream* s if (dataType != RDSTLS_DATA_RESULT_CODE) { WLog_Print(rdstls->log, WLOG_ERROR, - "received invalid DataType=0x%04" PRIX16 ", expected 0x%04" PRIX16, dataType, - RDSTLS_DATA_RESULT_CODE); + "received invalid DataType=0x%04" PRIX16 ", expected 0x%04" PRIX32, dataType, + WINPR_CXX_COMPAT_CAST(UINT32, RDSTLS_DATA_RESULT_CODE)); return FALSE; } @@ -655,7 +656,7 @@ static BOOL rdstls_send(WINPR_ATTR_UNUSED rdpTransport* transport, wStream* s, v return FALSE; break; default: - WLog_Print(rdstls->log, WLOG_ERROR, "Invalid rdstls state %s [%d]", + WLog_Print(rdstls->log, WLOG_ERROR, "Invalid rdstls state %s [%" PRIu32 "]", rdstls_get_state_str(state), state); return FALSE; } @@ -684,7 +685,7 @@ static int rdstls_recv(WINPR_ATTR_UNUSED rdpTransport* transport, wStream* s, vo { WLog_Print(rdstls->log, WLOG_ERROR, "received invalid RDSTLS Version=0x%04" PRIX16 ", expected 0x%04" PRIX16, - version, RDSTLS_VERSION_1); + version, WINPR_CXX_COMPAT_CAST(UINT32, RDSTLS_VERSION_1)); return -1; } @@ -724,7 +725,7 @@ static BOOL rdstls_check_state_requirements_(rdpRdstls* rdstls, RDSTLS_STATE exp const DWORD log_level = WLOG_ERROR; if (WLog_IsLevelActive(rdstls->log, log_level)) WLog_PrintTextMessage(rdstls->log, log_level, line, file, fkt, - "Unexpected rdstls state %s [%d], expected %s [%d]", + "Unexpected rdstls state %s [%u], expected %s [%u]", rdstls_get_state_str(current), current, rdstls_get_state_str(expected), expected); diff --git a/libfreerdp/core/tpkt.c b/libfreerdp/core/tpkt.c index 5d7beef20..d446b953a 100644 --- a/libfreerdp/core/tpkt.c +++ b/libfreerdp/core/tpkt.c @@ -136,7 +136,7 @@ BOOL tpkt_ensure_stream_consumed_(wLog* log, wStream* s, size_t length, const ch { if (length > UINT16_MAX) { - WLog_Print(log, WLOG_ERROR, "[%s] length %" PRIuz " > %" PRIu16, fkt, length, UINT16_MAX); + WLog_Print(log, WLOG_ERROR, "[%s] length %" PRIuz " > %d", fkt, length, UINT16_MAX); return FALSE; } @@ -144,7 +144,7 @@ BOOL tpkt_ensure_stream_consumed_(wLog* log, wStream* s, size_t length, const ch if (rem > 0) { WLog_Print(log, WLOG_ERROR, - "[%s] Received invalid TPKT header length %" PRIu16 ", %" PRIdz + "[%s] Received invalid TPKT header length %" PRIuz ", %" PRIuz " bytes too long!", fkt, length, rem); return FALSE; diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c index 43be23d9e..4ccdb37dd 100644 --- a/libfreerdp/core/transport.c +++ b/libfreerdp/core/transport.c @@ -754,21 +754,24 @@ static void transport_bio_error_log(rdpTransport* transport, LPCSTR biofunc, if (ERR_peek_error() == 0) { char ebuffer[256] = { 0 }; - const char* fmt = "%s returned a system error %d: %s"; + if (saveerrno == 0) - fmt = "%s retries exceeded"; - WLog_PrintTextMessage(transport->log, level, line, file, func, fmt, biofunc, saveerrno, - winpr_strerror(saveerrno, ebuffer, sizeof(ebuffer))); + WLog_PrintTextMessage(transport->log, level, line, file, func, "%s retries exceeded", + biofunc); + else + WLog_PrintTextMessage(transport->log, level, line, file, func, + "%s returned a system error %d: %s", biofunc, saveerrno, + winpr_strerror(saveerrno, ebuffer, sizeof(ebuffer))); return; } while ((sslerr = ERR_get_error())) { char buf[120] = { 0 }; - const char* fmt = "%s returned an error: %s"; ERR_error_string_n(sslerr, buf, 120); - WLog_PrintTextMessage(transport->log, level, line, file, func, fmt, biofunc, buf); + WLog_PrintTextMessage(transport->log, level, line, file, func, "%s returned an error: %s", + biofunc, buf); } } diff --git a/libfreerdp/core/window.c b/libfreerdp/core/window.c index 9ce080cf8..e51a0cf7c 100644 --- a/libfreerdp/core/window.c +++ b/libfreerdp/core/window.c @@ -802,7 +802,7 @@ static void dump_window_state_order(wLog* log, const char* msg, const WINDOW_ORD DUMP_APPEND(buffer, bufferSize, " appBarEdge=%s", appBarEdgeStr); } - WLog_Print(log, WLOG_DEBUG, buffer); + WLog_Print(log, WLOG_DEBUG, "%s", buffer); } static BOOL update_recv_window_info_order(rdpUpdate* update, wStream* s, @@ -1080,7 +1080,7 @@ static void dump_monitored_desktop(wLog* log, const char* msg, const WINDOW_ORDE } DUMP_APPEND(buffer, bufferSize, ")"); } - WLog_Print(log, WLOG_DEBUG, buffer); + WLog_Print(log, WLOG_DEBUG, "%s", buffer); } static BOOL update_recv_desktop_info_order(rdpUpdate* update, wStream* s, diff --git a/libfreerdp/emu/scard/smartcard_emulate.c b/libfreerdp/emu/scard/smartcard_emulate.c index bb613c33b..f8c67dd78 100644 --- a/libfreerdp/emu/scard/smartcard_emulate.c +++ b/libfreerdp/emu/scard/smartcard_emulate.c @@ -405,7 +405,7 @@ LONG WINAPI Emulate_SCardEstablishContext(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardEstablishContext } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); if (status != SCARD_S_SUCCESS) scard_context_free(ctx); @@ -432,7 +432,7 @@ LONG WINAPI Emulate_SCardReleaseContext(SmartcardEmulationContext* smartcard, SC WLog_Print(smartcard->log, smartcard->log_default_level, "SCardReleaseContext } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -459,7 +459,7 @@ LONG WINAPI Emulate_SCardIsValidContext(SmartcardEmulationContext* smartcard, SC WLog_Print(smartcard->log, smartcard->log_default_level, "SCardIsValidContext } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -482,7 +482,7 @@ LONG WINAPI Emulate_SCardListReaderGroupsA( WLog_Print(smartcard->log, smartcard->log_default_level, "SCardListReaderGroupsA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -505,7 +505,7 @@ LONG WINAPI Emulate_SCardListReaderGroupsW( WLog_Print(smartcard->log, smartcard->log_default_level, "SCardListReaderGroupsW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -544,7 +544,7 @@ LONG WINAPI Emulate_SCardListReadersA(SmartcardEmulationContext* smartcard, SCAR WLog_Print(smartcard->log, smartcard->log_default_level, "SCardListReadersA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -588,7 +588,7 @@ LONG WINAPI Emulate_SCardListReadersW(SmartcardEmulationContext* smartcard, SCAR WLog_Print(smartcard->log, smartcard->log_default_level, "SCardListReadersW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -616,7 +616,7 @@ LONG WINAPI Emulate_SCardListCardsA(SmartcardEmulationContext* smartcard, SCARDC WLog_Print(smartcard->log, smartcard->log_default_level, "SCardListCardsA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -644,7 +644,7 @@ LONG WINAPI Emulate_SCardListCardsW(SmartcardEmulationContext* smartcard, SCARDC WLog_Print(smartcard->log, smartcard->log_default_level, "SCardListCardsW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -668,7 +668,7 @@ LONG WINAPI Emulate_SCardListInterfacesA( WLog_Print(smartcard->log, smartcard->log_default_level, "SCardListInterfacesA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -692,7 +692,7 @@ LONG WINAPI Emulate_SCardListInterfacesW( WLog_Print(smartcard->log, smartcard->log_default_level, "SCardListInterfacesW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -714,7 +714,7 @@ LONG WINAPI Emulate_SCardGetProviderIdA(SmartcardEmulationContext* smartcard, SC WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetProviderIdA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -736,7 +736,7 @@ LONG WINAPI Emulate_SCardGetProviderIdW(SmartcardEmulationContext* smartcard, SC WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetProviderIdW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -762,7 +762,7 @@ LONG WINAPI Emulate_SCardGetCardTypeProviderNameA( WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetCardTypeProviderNameA } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -788,7 +788,7 @@ LONG WINAPI Emulate_SCardGetCardTypeProviderNameW( WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetCardTypeProviderNameW } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -809,7 +809,7 @@ LONG WINAPI Emulate_SCardIntroduceReaderGroupA(SmartcardEmulationContext* smartc WLog_Print(smartcard->log, smartcard->log_default_level, "SCardIntroduceReaderGroupA } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -830,7 +830,7 @@ LONG WINAPI Emulate_SCardIntroduceReaderGroupW(SmartcardEmulationContext* smartc WLog_Print(smartcard->log, smartcard->log_default_level, "SCardIntroduceReaderGroupW } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -851,7 +851,7 @@ LONG WINAPI Emulate_SCardForgetReaderGroupA(SmartcardEmulationContext* smartcard WLog_Print(smartcard->log, smartcard->log_default_level, "SCardForgetReaderGroupA } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -872,7 +872,7 @@ LONG WINAPI Emulate_SCardForgetReaderGroupW(SmartcardEmulationContext* smartcard WLog_Print(smartcard->log, smartcard->log_default_level, "SCardForgetReaderGroupW } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -897,7 +897,7 @@ LONG WINAPI Emulate_SCardIntroduceReaderA(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardIntroduceReaderA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -922,7 +922,7 @@ LONG WINAPI Emulate_SCardIntroduceReaderW(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardIntroduceReaderW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -944,7 +944,7 @@ LONG WINAPI Emulate_SCardForgetReaderA(SmartcardEmulationContext* smartcard, SCA WLog_Print(smartcard->log, smartcard->log_default_level, "SCardForgetReaderA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -966,7 +966,7 @@ LONG WINAPI Emulate_SCardForgetReaderW(SmartcardEmulationContext* smartcard, SCA WLog_Print(smartcard->log, smartcard->log_default_level, "SCardForgetReaderW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -991,7 +991,7 @@ LONG WINAPI Emulate_SCardAddReaderToGroupA(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardAddReaderToGroupA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1016,7 +1016,7 @@ LONG WINAPI Emulate_SCardAddReaderToGroupW(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardAddReaderToGroupW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1041,7 +1041,7 @@ LONG WINAPI Emulate_SCardRemoveReaderFromGroupA(SmartcardEmulationContext* smart WLog_Print(smartcard->log, smartcard->log_default_level, "SCardRemoveReaderFromGroupA } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1066,7 +1066,7 @@ LONG WINAPI Emulate_SCardRemoveReaderFromGroupW(SmartcardEmulationContext* smart WLog_Print(smartcard->log, smartcard->log_default_level, "SCardRemoveReaderFromGroupW } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1096,7 +1096,7 @@ LONG WINAPI Emulate_SCardIntroduceCardTypeA(SmartcardEmulationContext* smartcard WLog_Print(smartcard->log, smartcard->log_default_level, "SCardIntroduceCardTypeA } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1126,7 +1126,7 @@ LONG WINAPI Emulate_SCardIntroduceCardTypeW(SmartcardEmulationContext* smartcard WLog_Print(smartcard->log, smartcard->log_default_level, "SCardIntroduceCardTypeW } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1150,7 +1150,7 @@ LONG WINAPI Emulate_SCardSetCardTypeProviderNameA(SmartcardEmulationContext* sma WLog_Print(smartcard->log, smartcard->log_default_level, "SCardSetCardTypeProviderNameA } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1174,7 +1174,7 @@ LONG WINAPI Emulate_SCardSetCardTypeProviderNameW(SmartcardEmulationContext* sma WLog_Print(smartcard->log, smartcard->log_default_level, "SCardSetCardTypeProviderNameW } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1195,7 +1195,7 @@ LONG WINAPI Emulate_SCardForgetCardTypeA(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardForgetCardTypeA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1216,7 +1216,7 @@ LONG WINAPI Emulate_SCardForgetCardTypeW(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardForgetCardTypeW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1239,7 +1239,7 @@ LONG WINAPI Emulate_SCardFreeMemory(SmartcardEmulationContext* smartcard, SCARDC WLog_Print(smartcard->log, smartcard->log_default_level, "SCardFreeMemory } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1291,7 +1291,7 @@ LONG WINAPI Emulate_SCardLocateCardsA(SmartcardEmulationContext* smartcard, SCAR WLog_Print(smartcard->log, smartcard->log_default_level, "SCardLocateCardsA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1315,7 +1315,7 @@ LONG WINAPI Emulate_SCardLocateCardsW(SmartcardEmulationContext* smartcard, SCAR WLog_Print(smartcard->log, smartcard->log_default_level, "SCardLocateCardsW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1341,7 +1341,7 @@ LONG WINAPI Emulate_SCardLocateCardsByATRA(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardLocateCardsByATRA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1367,7 +1367,7 @@ LONG WINAPI Emulate_SCardLocateCardsByATRW(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardLocateCardsByATRW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1449,7 +1449,7 @@ LONG WINAPI Emulate_SCardGetStatusChangeA(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetStatusChangeA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1530,7 +1530,7 @@ LONG WINAPI Emulate_SCardGetStatusChangeW(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetStatusChangeW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1550,7 +1550,8 @@ LONG WINAPI Emulate_SCardCancel(SmartcardEmulationContext* smartcard, SCARDCONTE } WLog_Print(smartcard->log, smartcard->log_default_level, - "SCardCancel } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), status); + "SCardCancel } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1649,7 +1650,8 @@ LONG WINAPI Emulate_SCardConnectA(SmartcardEmulationContext* smartcard, SCARDCON } WLog_Print(smartcard->log, smartcard->log_default_level, - "SCardConnectA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), status); + "SCardConnectA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1674,7 +1676,8 @@ LONG WINAPI Emulate_SCardConnectW(SmartcardEmulationContext* smartcard, SCARDCON } WLog_Print(smartcard->log, smartcard->log_default_level, - "SCardConnectW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), status); + "SCardConnectW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1706,7 +1709,7 @@ LONG WINAPI Emulate_SCardReconnect(SmartcardEmulationContext* smartcard, SCARDHA WLog_Print(smartcard->log, smartcard->log_default_level, "SCardReconnect } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1733,7 +1736,7 @@ LONG WINAPI Emulate_SCardDisconnect(SmartcardEmulationContext* smartcard, SCARDH WLog_Print(smartcard->log, smartcard->log_default_level, "SCardDisconnect } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1757,7 +1760,7 @@ LONG WINAPI Emulate_SCardBeginTransaction(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardBeginTransaction } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1784,7 +1787,7 @@ LONG WINAPI Emulate_SCardEndTransaction(SmartcardEmulationContext* smartcard, SC WLog_Print(smartcard->log, smartcard->log_default_level, "SCardEndTransaction } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1808,7 +1811,7 @@ LONG WINAPI Emulate_SCardCancelTransaction(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardCancelTransaction } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1866,7 +1869,8 @@ LONG WINAPI Emulate_SCardState(SmartcardEmulationContext* smartcard, SCARDHANDLE } WLog_Print(smartcard->log, smartcard->log_default_level, - "SCardState } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), status); + "SCardState } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1914,7 +1918,8 @@ LONG WINAPI Emulate_SCardStatusA(SmartcardEmulationContext* smartcard, SCARDHAND } WLog_Print(smartcard->log, smartcard->log_default_level, - "SCardStatusA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), status); + "SCardStatusA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1961,7 +1966,8 @@ LONG WINAPI Emulate_SCardStatusW(SmartcardEmulationContext* smartcard, SCARDHAND } WLog_Print(smartcard->log, smartcard->log_default_level, - "SCardStatusW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), status); + "SCardStatusW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2007,7 +2013,8 @@ LONG WINAPI Emulate_SCardTransmit(SmartcardEmulationContext* smartcard, SCARDHAN } WLog_Print(smartcard->log, smartcard->log_default_level, - "SCardTransmit } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), status); + "SCardTransmit } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2033,7 +2040,7 @@ LONG WINAPI Emulate_SCardGetTransmitCount(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetTransmitCount } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2062,7 +2069,8 @@ LONG WINAPI Emulate_SCardControl( } WLog_Print(smartcard->log, smartcard->log_default_level, - "SCardControl } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), status); + "SCardControl } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2087,7 +2095,7 @@ LONG WINAPI Emulate_SCardGetAttrib(SmartcardEmulationContext* smartcard, SCARDHA WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetAttrib } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2110,7 +2118,7 @@ LONG WINAPI Emulate_SCardSetAttrib(SmartcardEmulationContext* smartcard, SCARDHA WLog_Print(smartcard->log, smartcard->log_default_level, "SCardSetAttrib } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2131,7 +2139,7 @@ LONG WINAPI Emulate_SCardUIDlgSelectCardA(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardUIDlgSelectCardA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2152,7 +2160,7 @@ LONG WINAPI Emulate_SCardUIDlgSelectCardW(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardUIDlgSelectCardW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2173,7 +2181,7 @@ LONG WINAPI Emulate_GetOpenCardNameA(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "GetOpenCardNameA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2194,7 +2202,7 @@ LONG WINAPI Emulate_GetOpenCardNameW(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "GetOpenCardNameW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2212,7 +2220,7 @@ LONG WINAPI Emulate_SCardDlgExtendedError(SmartcardEmulationContext* smartcard) WLog_Print(smartcard->log, smartcard->log_default_level, "SCardDlgExtendedError } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2256,7 +2264,7 @@ LONG WINAPI Emulate_SCardReadCacheA(SmartcardEmulationContext* smartcard, SCARDC WLog_Print(smartcard->log, smartcard->log_default_level, "SCardReadCacheA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2299,7 +2307,7 @@ LONG WINAPI Emulate_SCardReadCacheW(SmartcardEmulationContext* smartcard, SCARDC WLog_Print(smartcard->log, smartcard->log_default_level, "SCardReadCacheW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2373,7 +2381,7 @@ LONG WINAPI Emulate_SCardWriteCacheA(SmartcardEmulationContext* smartcard, SCARD WLog_Print(smartcard->log, smartcard->log_default_level, "SCardWriteCacheA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2407,7 +2415,7 @@ LONG WINAPI Emulate_SCardWriteCacheW(SmartcardEmulationContext* smartcard, SCARD WLog_Print(smartcard->log, smartcard->log_default_level, "SCardWriteCacheW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2440,7 +2448,7 @@ LONG WINAPI Emulate_SCardGetReaderIconA(SmartcardEmulationContext* smartcard, SC WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetReaderIconA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2473,7 +2481,7 @@ LONG WINAPI Emulate_SCardGetReaderIconW(SmartcardEmulationContext* smartcard, SC WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetReaderIconW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2500,7 +2508,7 @@ LONG WINAPI Emulate_SCardGetDeviceTypeIdA(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetDeviceTypeIdA } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2527,7 +2535,7 @@ LONG WINAPI Emulate_SCardGetDeviceTypeIdW(SmartcardEmulationContext* smartcard, WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetDeviceTypeIdW } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), - status); + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2554,7 +2562,7 @@ LONG WINAPI Emulate_SCardGetReaderDeviceInstanceIdA( WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetReaderDeviceInstanceIdA } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2581,7 +2589,7 @@ LONG WINAPI Emulate_SCardGetReaderDeviceInstanceIdW( WLog_Print(smartcard->log, smartcard->log_default_level, "SCardGetReaderDeviceInstanceIdW } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2606,7 +2614,7 @@ LONG WINAPI Emulate_SCardListReadersWithDeviceInstanceIdA( WLog_Print(smartcard->log, smartcard->log_default_level, "SCardListReadersWithDeviceInstanceIdA } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2630,7 +2638,7 @@ LONG WINAPI Emulate_SCardListReadersWithDeviceInstanceIdW( WLog_Print(smartcard->log, smartcard->log_default_level, "SCardListReadersWithDeviceInstanceIdW } status: %s (0x%08" PRIX32 ")", - SCardGetErrorString(status), status); + SCardGetErrorString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -2650,7 +2658,8 @@ LONG WINAPI Emulate_SCardAudit(SmartcardEmulationContext* smartcard, SCARDCONTEX status = SCARD_E_UNSUPPORTED_FEATURE; WLog_Print(smartcard->log, smartcard->log_default_level, - "SCardAudit } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), status); + "SCardAudit } status: %s (0x%08" PRIX32 ")", SCardGetErrorString(status), + WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } diff --git a/libfreerdp/utils/smartcard_call.c b/libfreerdp/utils/smartcard_call.c index 3f5ffaa8c..1d14dcf83 100644 --- a/libfreerdp/utils/smartcard_call.c +++ b/libfreerdp/utils/smartcard_call.c @@ -1835,7 +1835,7 @@ LONG smartcard_irp_device_control_call(scard_call_context* smartcard, wStream* o WLog_Print(smartcard->log, WLOG_WARN, "IRP failure: %s (0x%08" PRIX32 "), status: %s (0x%08" PRIX32 ")", scard_get_ioctl_string(ioControlCode, TRUE), ioControlCode, - SCardGetErrorString(result), result); + SCardGetErrorString(result), WINPR_CXX_COMPAT_CAST(UINT32, result)); } *pIoStatus = STATUS_SUCCESS; @@ -1846,7 +1846,8 @@ LONG smartcard_irp_device_control_call(scard_call_context* smartcard, wStream* o *pIoStatus = result; WLog_Print(smartcard->log, WLOG_WARN, "IRP failure: %s (0x%08" PRIX32 "), ntstatus: 0x%08" PRIX32 "", - scard_get_ioctl_string(ioControlCode, TRUE), ioControlCode, result); + scard_get_ioctl_string(ioControlCode, TRUE), ioControlCode, + WINPR_CXX_COMPAT_CAST(UINT32, result)); } Stream_SealLength(out); @@ -1869,7 +1870,7 @@ LONG smartcard_irp_device_control_call(scard_call_context* smartcard, wStream* o if (outputBufferLength > operation->outputBufferLength) { WLog_Print(smartcard->log, WLOG_WARN, - "IRP warn: expected outputBufferLength %" PRIu32 ", but current limit %" PRIu32 + "IRP warn: expected outputBufferLength %" PRIu32 ", but current limit %" PRIuz ", respond with STATUS_BUFFER_TOO_SMALL", operation->outputBufferLength, outputBufferLength); diff --git a/libfreerdp/utils/smartcard_pack.c b/libfreerdp/utils/smartcard_pack.c index 1080b42a9..b37825b9b 100644 --- a/libfreerdp/utils/smartcard_pack.c +++ b/libfreerdp/utils/smartcard_pack.c @@ -148,8 +148,8 @@ static LONG smartcard_ndr_read(wLog* log, wStream* s, BYTE** data, size_t min, s if (len != offset + len2) { WLog_Print(log, WLOG_ERROR, - "Invalid data when reading full NDR pointer: total=%" PRIu32 - ", offset=%" PRIu32 ", remaining=%" PRIu32, + "Invalid data when reading full NDR pointer: total=%" PRIuz + ", offset=%" PRIuz ", remaining=%" PRIuz, len, offset, len2); return STATUS_BUFFER_TOO_SMALL; } @@ -160,8 +160,8 @@ static LONG smartcard_ndr_read(wLog* log, wStream* s, BYTE** data, size_t min, s if ((len != min) && (min > 0)) { WLog_Print(log, WLOG_ERROR, - "Invalid data when reading simple NDR pointer: total=%" PRIu32 - ", expected=%" PRIu32, + "Invalid data when reading simple NDR pointer: total=%" PRIuz + ", expected=%" PRIuz, len, min); return STATUS_BUFFER_TOO_SMALL; } @@ -176,7 +176,7 @@ static LONG smartcard_ndr_read(wLog* log, wStream* s, BYTE** data, size_t min, s if (min > len) { WLog_Print(log, WLOG_ERROR, - "Invalid length read from NDR pointer, minimum %" PRIu32 ", got %" PRIu32, min, + "Invalid length read from NDR pointer, minimum %" PRIuz ", got %" PRIuz, min, len); return STATUS_DATA_ERROR; } @@ -544,7 +544,7 @@ static void smartcard_trace_list_reader_groups_call(wLog* log, const ListReaderG if (!WLog_IsLevelActive(log, g_LogLevel)) return; - WLog_Print(log, g_LogLevel, "ListReaderGroups%S_Call {", unicode ? "W" : "A"); + WLog_Print(log, g_LogLevel, "ListReaderGroups%s_Call {", unicode ? "W" : "A"); smartcard_log_context(log, &call->handles.hContext); WLog_Print(log, g_LogLevel, "fmszGroupsIsNULL: %" PRId32 " cchGroups: 0x%08" PRIx32, @@ -663,7 +663,8 @@ static void smartcard_trace_list_reader_groups_return(wLog* log, const ListReade WLog_Print(log, g_LogLevel, "ListReaderGroups%s_Return {", unicode ? "W" : "A"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIx32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); WLog_Print(log, g_LogLevel, " cBytes: %" PRIu32 " msz: %s", ret->cBytes, mszA); WLog_Print(log, g_LogLevel, "}"); free(mszA); @@ -717,10 +718,10 @@ static void smartcard_trace_locate_cards_a_call(wLog* log, const LocateCardsA_Ca WLog_Print(log, g_LogLevel, "LocateCardsA_Call {"); smartcard_log_context(log, &call->handles.hContext); - WLog_Print(log, g_LogLevel, " cBytes=%" PRId32, call->cBytes); + WLog_Print(log, g_LogLevel, " cBytes=%" PRIu32, call->cBytes); WLog_Print(log, g_LogLevel, " mszCards=%s", smartcard_msz_dump_a(call->mszCards, call->cBytes, buffer, sizeof(buffer))); - WLog_Print(log, g_LogLevel, " cReaders=%" PRId32, call->cReaders); + WLog_Print(log, g_LogLevel, " cReaders=%" PRIu32, call->cReaders); dump_reader_states_a(log, call->rgReaderStates, call->cReaders); WLog_Print(log, g_LogLevel, "}"); @@ -735,11 +736,12 @@ static void smartcard_trace_locate_cards_return(wLog* log, const LocateCards_Ret WLog_Print(log, g_LogLevel, "LocateCards_Return {"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); if (ret->ReturnCode == SCARD_S_SUCCESS) { - WLog_Print(log, g_LogLevel, " cReaders=%" PRId32, ret->cReaders); + WLog_Print(log, g_LogLevel, " cReaders=%" PRIu32, ret->cReaders); } WLog_Print(log, g_LogLevel, "}"); } @@ -753,11 +755,12 @@ static void smartcard_trace_get_reader_icon_return(wLog* log, const GetReaderIco WLog_Print(log, g_LogLevel, "GetReaderIcon_Return {"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); if (ret->ReturnCode == SCARD_S_SUCCESS) { - WLog_Print(log, g_LogLevel, " cbDataLen=%" PRId32, ret->cbDataLen); + WLog_Print(log, g_LogLevel, " cbDataLen=%" PRIu32, ret->cbDataLen); } WLog_Print(log, g_LogLevel, "}"); } @@ -771,7 +774,8 @@ static void smartcard_trace_get_transmit_count_return(wLog* log, const GetTransm WLog_Print(log, g_LogLevel, "GetTransmitCount_Return {"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); WLog_Print(log, g_LogLevel, " cTransmitCount=%" PRIu32, ret->cTransmitCount); WLog_Print(log, g_LogLevel, "}"); @@ -786,12 +790,13 @@ static void smartcard_trace_read_cache_return(wLog* log, const ReadCache_Return* WLog_Print(log, g_LogLevel, "ReadCache_Return {"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); if (ret->ReturnCode == SCARD_S_SUCCESS) { char buffer[1024] = { 0 }; - WLog_Print(log, g_LogLevel, " cbDataLen=%" PRId32, ret->cbDataLen); + WLog_Print(log, g_LogLevel, " cbDataLen=%" PRIu32, ret->cbDataLen); WLog_Print(log, g_LogLevel, " cbData: %s", smartcard_array_dump(ret->pbData, ret->cbDataLen, buffer, sizeof(buffer))); } @@ -808,10 +813,10 @@ static void smartcard_trace_locate_cards_w_call(wLog* log, const LocateCardsW_Ca WLog_Print(log, g_LogLevel, "LocateCardsW_Call {"); smartcard_log_context(log, &call->handles.hContext); - WLog_Print(log, g_LogLevel, " cBytes=%" PRId32, call->cBytes); + WLog_Print(log, g_LogLevel, " cBytes=%" PRIu32, call->cBytes); WLog_Print(log, g_LogLevel, " sz2=%s", smartcard_msz_dump_w(call->mszCards, call->cBytes, buffer, sizeof(buffer))); - WLog_Print(log, g_LogLevel, " cReaders=%" PRId32, call->cReaders); + WLog_Print(log, g_LogLevel, " cReaders=%" PRIu32, call->cReaders); dump_reader_states_w(log, call->rgReaderStates, call->cReaders); WLog_Print(log, g_LogLevel, "}"); } @@ -826,7 +831,8 @@ static void smartcard_trace_list_readers_return(wLog* log, const ListReaders_Ret WLog_Print(log, g_LogLevel, "ListReaders%s_Return {", unicode ? "W" : "A"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); if (ret->ReturnCode != SCARD_S_SUCCESS) { @@ -851,7 +857,8 @@ static void smartcard_trace_get_status_change_return(wLog* log, const GetStatusC WLog_Print(log, g_LogLevel, "GetStatusChange%s_Return {", unicode ? "W" : "A"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); WLog_Print(log, g_LogLevel, " cReaders: %" PRIu32 "", ret->cReaders); dump_reader_states_return(log, ret->rgReaderStates, ret->cReaders); @@ -1135,7 +1142,8 @@ static void smartcard_trace_transmit_return(wLog* log, const Transmit_Return* re WLog_Print(log, g_LogLevel, "Transmit_Return {"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); if (ret->pioRecvPci) { @@ -1183,7 +1191,8 @@ static void smartcard_trace_control_return(wLog* log, const Control_Return* ret) WLog_Print(log, g_LogLevel, "Control_Return {"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); WLog_Print(log, g_LogLevel, " cbOutBufferSize: %" PRIu32 "", ret->cbOutBufferSize); if (ret->pvOutBuffer) @@ -1245,7 +1254,7 @@ static void smartcard_trace_set_attrib_call(wLog* log, const SetAttrib_Call* cal smartcard_log_context(log, &call->handles.hContext); smartcard_log_redir_handle(log, &call->handles.hCard); WLog_Print(log, g_LogLevel, "dwAttrId: 0x%08" PRIX32, call->dwAttrId); - WLog_Print(log, g_LogLevel, "cbAttrLen: 0x%08" PRId32, call->cbAttrLen); + WLog_Print(log, g_LogLevel, "cbAttrLen: 0x%08" PRIx32, call->cbAttrLen); WLog_Print(log, g_LogLevel, "pbAttr: %s", smartcard_array_dump(call->pbAttr, call->cbAttrLen, buffer, sizeof(buffer))); WLog_Print(log, g_LogLevel, "}"); @@ -1262,7 +1271,8 @@ static void smartcard_trace_get_attrib_return(wLog* log, const GetAttrib_Return* WLog_Print(log, g_LogLevel, "GetAttrib_Return {"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); WLog_Print(log, g_LogLevel, " dwAttrId: %s (0x%08" PRIX32 ") cbAttrLen: 0x%08" PRIX32 "", SCardGetAttributeString(dwAttrId), dwAttrId, ret->cbAttrLen); WLog_Print(log, g_LogLevel, " %s", @@ -1325,7 +1335,8 @@ static void smartcard_trace_status_return(wLog* log, const Status_Return* ret, B WLog_Print(log, g_LogLevel, "Status%s_Return {", unicode ? "W" : "A"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); WLog_Print(log, g_LogLevel, " dwState: %s (0x%08" PRIX32 ") dwProtocol: %s (0x%08" PRIX32 ")", SCardGetCardStateString(ret->dwState), ret->dwState, SCardGetProtocolString(ret->dwProtocol), ret->dwProtocol); @@ -1351,7 +1362,8 @@ static void smartcard_trace_state_return(wLog* log, const State_Return* ret) state = SCardGetReaderStateString(ret->dwState); WLog_Print(log, g_LogLevel, "Reconnect_Return {"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); WLog_Print(log, g_LogLevel, " dwState: %s (0x%08" PRIX32 ")", state, ret->dwState); WLog_Print(log, g_LogLevel, " dwProtocol: %s (0x%08" PRIX32 ")", SCardGetProtocolString(ret->dwProtocol), ret->dwProtocol); @@ -1371,7 +1383,8 @@ static void smartcard_trace_reconnect_return(wLog* log, const Reconnect_Return* WLog_Print(log, g_LogLevel, "Reconnect_Return {"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); WLog_Print(log, g_LogLevel, " dwActiveProtocol: %s (0x%08" PRIX32 ")", SCardGetProtocolString(ret->dwActiveProtocol), ret->dwActiveProtocol); WLog_Print(log, g_LogLevel, "}"); @@ -1458,7 +1471,8 @@ static void smartcard_trace_establish_context_return(wLog* log, const EstablishC WLog_Print(log, g_LogLevel, "EstablishContext_Return {"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); smartcard_log_context(log, &ret->hContext); WLog_Print(log, g_LogLevel, "}"); @@ -1479,7 +1493,8 @@ void smartcard_trace_long_return_int(wLog* log, const Long_Return* ret, const ch WLog_Print(log, g_LogLevel, "%s_Return {", name); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); WLog_Print(log, g_LogLevel, "}"); } @@ -1492,7 +1507,8 @@ static void smartcard_trace_connect_return(wLog* log, const Connect_Return* ret) WLog_Print(log, g_LogLevel, "Connect_Return {"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); smartcard_log_context(log, &ret->hContext); smartcard_log_redir_handle(log, &ret->hCard); @@ -1530,7 +1546,8 @@ static void smartcard_trace_device_type_id_return(wLog* log, const GetDeviceType WLog_Print(log, g_LogLevel, "GetDeviceTypeId_Return {"); WLog_Print(log, g_LogLevel, " ReturnCode: %s (0x%08" PRIX32 ")", - SCardGetErrorString(ret->ReturnCode), ret->ReturnCode); + SCardGetErrorString(ret->ReturnCode), + WINPR_CXX_COMPAT_CAST(UINT32, ret->ReturnCode)); WLog_Print(log, g_LogLevel, " dwDeviceId=%08" PRIx32, ret->dwDeviceId); WLog_Print(log, g_LogLevel, "}"); diff --git a/server/proxy/channels/pf_channel_drdynvc.c b/server/proxy/channels/pf_channel_drdynvc.c index 0d0ba6e90..afcc5532a 100644 --- a/server/proxy/channels/pf_channel_drdynvc.c +++ b/server/proxy/channels/pf_channel_drdynvc.c @@ -400,7 +400,7 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir return PF_CHANNEL_RESULT_ERROR; } - WLog_Print(dynChannelContext->log, WLOG_DEBUG, "Adding channel '%s'[%d]", + WLog_Print(dynChannelContext->log, WLOG_DEBUG, "Adding channel '%s'[%" PRIu32 "]", dynChannel->channelName, dynChannel->channelId); if (!HashTable_Insert(dynChannelContext->channels, &dynChannel->channelId, dynChannel)) @@ -587,7 +587,7 @@ static PfChannelResult DynvcTrackerPeekFn(ChannelStateTracker* tracker, BOOL fir } break; default: - WLog_Print(dynChannelContext->log, WLOG_ERROR, "unknown channel mode %d", + WLog_Print(dynChannelContext->log, WLOG_ERROR, "unknown channel mode %u", dynChannel->channelMode); result = PF_CHANNEL_RESULT_ERROR; break; diff --git a/server/proxy/channels/pf_channel_rdpdr.c b/server/proxy/channels/pf_channel_rdpdr.c index e46f5d956..0025997a1 100644 --- a/server/proxy/channels/pf_channel_rdpdr.c +++ b/server/proxy/channels/pf_channel_rdpdr.c @@ -319,7 +319,7 @@ static BOOL rdpdr_check_version(BOOL server, wLog* log, UINT16 versionMajor, UIN { if (versionMajor != RDPDR_VERSION_MAJOR) { - RX_LOG(server, log, WLOG_WARN, "[%s | %s] expected MajorVersion %" PRIu16 ", got %" PRIu16, + RX_LOG(server, log, WLOG_WARN, "[%s | %s] expected MajorVersion %d, got %" PRIu16, rdpdr_component_string(component), rdpdr_packetid_string(PacketId), RDPDR_VERSION_MAJOR, versionMajor); return FALSE; @@ -466,7 +466,7 @@ static UINT rdpdr_process_client_name_request(pf_channel_server_context* rdpdr, if (!Stream_CheckAndLogRequiredLengthSrv(rdpdr->log, s, rdpdr->common.computerNameLen)) { SERVER_RX_LOG( - rdpdr->log, WLOG_WARN, "[%s | %s]: missing data, got %" PRIu32 ", expected %" PRIu32, + rdpdr->log, WLOG_WARN, "[%s | %s]: missing data, got %" PRIuz ", expected %" PRIu32, rdpdr_component_string(RDPDR_CTYP_CORE), rdpdr_packetid_string(PAKID_CORE_CLIENT_NAME), Stream_GetRemainingLength(s), rdpdr->common.computerNameLen); return ERROR_INVALID_DATA; diff --git a/winpr/libwinpr/comm/comm.c b/winpr/libwinpr/comm/comm.c index 8dd5b74e7..301af0529 100644 --- a/winpr/libwinpr/comm/comm.c +++ b/winpr/libwinpr/comm/comm.c @@ -645,7 +645,7 @@ BOOL SetCommState(HANDLE hFile, LPDCB lpDCB) break; default: - CommLog_Print(WLOG_WARN, "Unexpected fDtrControl value: %" PRIu32 "\n", + CommLog_Print(WLOG_WARN, "Unexpected fDtrControl value: %" PRId32 "\n", lpDCB->fDtrControl); return FALSE; } @@ -700,7 +700,7 @@ BOOL SetCommState(HANDLE hFile, LPDCB lpDCB) break; default: - CommLog_Print(WLOG_WARN, "Unexpected fRtsControl value: %" PRIu32 "\n", + CommLog_Print(WLOG_WARN, "Unexpected fRtsControl value: %" PRId32 "\n", lpDCB->fRtsControl); return FALSE; } @@ -1808,8 +1808,8 @@ static BOOL CommStatusErrorEx(WINPR_COMM* pComm, unsigned long int ctl, const ch if (WLog_IsLevelActive(sLog, level)) { WLog_PrintTextMessage(sLog, level, line, file, fkt, - "%s [0x%08" PRIx32 "] ioctl failed, errno=[%d] %s.", str, ctl, - errno, winpr_strerror(errno, ebuffer, sizeof(ebuffer))); + "%s [0x%08lx] ioctl failed, errno=[%d] %s.", str, ctl, errno, + winpr_strerror(errno, ebuffer, sizeof(ebuffer))); } } diff --git a/winpr/libwinpr/comm/comm_ioctl.c b/winpr/libwinpr/comm/comm_ioctl.c index 979f1e7b8..5e4bd594d 100644 --- a/winpr/libwinpr/comm/comm_ioctl.c +++ b/winpr/libwinpr/comm/comm_ioctl.c @@ -101,7 +101,7 @@ static BOOL s_CommDeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID case SerialDriverUnknown: default: - CommLog_Print(WLOG_DEBUG, "Unknown remote serial driver (%d), using SerCx2.sys", + CommLog_Print(WLOG_DEBUG, "Unknown remote serial driver (%u), using SerCx2.sys", pComm->serverSerialDriverId); pServerSerialDriver = SerCx2Sys_s(); break; diff --git a/winpr/libwinpr/comm/comm_serial_sys.c b/winpr/libwinpr/comm/comm_serial_sys.c index 039234dc2..131cacca9 100644 --- a/winpr/libwinpr/comm/comm_serial_sys.c +++ b/winpr/libwinpr/comm/comm_serial_sys.c @@ -1151,13 +1151,13 @@ static BOOL set_queue_size(WINPR_ATTR_UNUSED WINPR_COMM* pComm, const SERIAL_QUE if (pQueueSize->InSize > N_TTY_BUF_SIZE) CommLog_Print(WLOG_WARN, "Requested an incompatible input buffer size: %" PRIu32 - ", keeping on with a %" PRIu32 " bytes buffer.", + ", keeping on with a %d bytes buffer.", pQueueSize->InSize, N_TTY_BUF_SIZE); if (pQueueSize->OutSize > N_TTY_BUF_SIZE) CommLog_Print(WLOG_WARN, "Requested an incompatible output buffer size: %" PRIu32 - ", keeping on with a %" PRIu32 " bytes buffer.", + ", keeping on with a %d bytes buffer.", pQueueSize->OutSize, N_TTY_BUF_SIZE); SetLastError(ERROR_CANCELLED); diff --git a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c index e3eb088bd..9cfbb5ed5 100644 --- a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c +++ b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c @@ -367,8 +367,7 @@ static void log_(const char* tag, const char* msg, CK_RV rv, CK_ULONG index, CK_ return; WLog_PrintTextMessage(log_cached_ptr, log_level, line, file, fkt, - "%s for slot #%" PRIu32 "(%" PRIu32 "), rv=%s", msg, index, slot, - CK_RV_error_string(rv)); + "%s for slot #%lu(%lu), rv=%s", msg, index, slot, CK_RV_error_string(rv)); } static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKeysState* state) diff --git a/winpr/libwinpr/sspi/sspi.c b/winpr/libwinpr/sspi/sspi.c index d795cb491..01076856f 100644 --- a/winpr/libwinpr/sspi/sspi.c +++ b/winpr/libwinpr/sspi/sspi.c @@ -523,7 +523,7 @@ SECURITY_STATUS SEC_ENTRY sspi_EnumerateSecurityPackagesW(ULONG* pcPackages, status = g_SspiW->EnumerateSecurityPackagesW(pcPackages, ppPackageInfo); WLog_Print(g_Log, WLOG_DEBUG, "EnumerateSecurityPackagesW: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -542,7 +542,7 @@ SECURITY_STATUS SEC_ENTRY sspi_EnumerateSecurityPackagesA(ULONG* pcPackages, status = g_SspiA->EnumerateSecurityPackagesA(pcPackages, ppPackageInfo); WLog_Print(g_Log, WLOG_DEBUG, "EnumerateSecurityPackagesA: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -575,7 +575,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityPackageInfoW(SEC_WCHAR* pszPackageNa status = g_SspiW->QuerySecurityPackageInfoW(pszPackageName, ppPackageInfo); WLog_Print(g_Log, WLOG_DEBUG, "QuerySecurityPackageInfoW: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -594,7 +594,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityPackageInfoA(SEC_CHAR* pszPackageNam status = g_SspiA->QuerySecurityPackageInfoA(pszPackageName, ppPackageInfo); WLog_Print(g_Log, WLOG_DEBUG, "QuerySecurityPackageInfoA: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -619,7 +619,7 @@ SECURITY_STATUS SEC_ENTRY sspi_AcquireCredentialsHandleW( pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); WLog_Print(g_Log, WLOG_DEBUG, "AcquireCredentialsHandleW: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -642,7 +642,7 @@ SECURITY_STATUS SEC_ENTRY sspi_AcquireCredentialsHandleA( pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); WLog_Print(g_Log, WLOG_DEBUG, "AcquireCredentialsHandleA: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -661,7 +661,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ExportSecurityContext(PCtxtHandle phContext, ULON status = g_SspiW->ExportSecurityContext(phContext, fFlags, pPackedContext, pToken); WLog_Print(g_Log, WLOG_DEBUG, "ExportSecurityContext: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -679,7 +679,7 @@ SECURITY_STATUS SEC_ENTRY sspi_FreeCredentialsHandle(PCredHandle phCredential) status = g_SspiW->FreeCredentialsHandle(phCredential); WLog_Print(g_Log, WLOG_DEBUG, "FreeCredentialsHandle: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -699,7 +699,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ImportSecurityContextW(SEC_WCHAR* pszPackage, status = g_SspiW->ImportSecurityContextW(pszPackage, pPackedContext, pToken, phContext); WLog_Print(g_Log, WLOG_DEBUG, "ImportSecurityContextW: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -719,7 +719,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ImportSecurityContextA(SEC_CHAR* pszPackage, status = g_SspiA->ImportSecurityContextA(pszPackage, pPackedContext, pToken, phContext); WLog_Print(g_Log, WLOG_DEBUG, "ImportSecurityContextA: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -738,7 +738,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryCredentialsAttributesW(PCredHandle phCredent status = g_SspiW->QueryCredentialsAttributesW(phCredential, ulAttribute, pBuffer); WLog_Print(g_Log, WLOG_DEBUG, "QueryCredentialsAttributesW: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -757,7 +757,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryCredentialsAttributesA(PCredHandle phCredent status = g_SspiA->QueryCredentialsAttributesA(phCredential, ulAttribute, pBuffer); WLog_Print(g_Log, WLOG_DEBUG, "QueryCredentialsAttributesA: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -784,7 +784,7 @@ SECURITY_STATUS SEC_ENTRY sspi_AcceptSecurityContext(PCredHandle phCredential, g_SspiW->AcceptSecurityContext(phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsTimeStamp); WLog_Print(g_Log, WLOG_DEBUG, "AcceptSecurityContext: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -802,7 +802,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ApplyControlToken(PCtxtHandle phContext, PSecBuff status = g_SspiW->ApplyControlToken(phContext, pInput); WLog_Print(g_Log, WLOG_DEBUG, "ApplyControlToken: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -820,7 +820,7 @@ SECURITY_STATUS SEC_ENTRY sspi_CompleteAuthToken(PCtxtHandle phContext, PSecBuff status = g_SspiW->CompleteAuthToken(phContext, pToken); WLog_Print(g_Log, WLOG_DEBUG, "CompleteAuthToken: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -838,7 +838,7 @@ SECURITY_STATUS SEC_ENTRY sspi_DeleteSecurityContext(PCtxtHandle phContext) status = g_SspiW->DeleteSecurityContext(phContext); WLog_Print(g_Log, WLOG_DEBUG, "DeleteSecurityContext: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -856,7 +856,7 @@ SECURITY_STATUS SEC_ENTRY sspi_FreeContextBuffer(void* pvContextBuffer) status = g_SspiW->FreeContextBuffer(pvContextBuffer); WLog_Print(g_Log, WLOG_DEBUG, "FreeContextBuffer: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -874,7 +874,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ImpersonateSecurityContext(PCtxtHandle phContext) status = g_SspiW->ImpersonateSecurityContext(phContext); WLog_Print(g_Log, WLOG_DEBUG, "ImpersonateSecurityContext: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -897,7 +897,7 @@ SECURITY_STATUS SEC_ENTRY sspi_InitializeSecurityContextW( phCredential, phContext, pszTargetName, fContextReq, Reserved1, TargetDataRep, pInput, Reserved2, phNewContext, pOutput, pfContextAttr, ptsExpiry); WLog_Print(g_Log, WLOG_DEBUG, "InitializeSecurityContextW: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -920,7 +920,7 @@ SECURITY_STATUS SEC_ENTRY sspi_InitializeSecurityContextA( phCredential, phContext, pszTargetName, fContextReq, Reserved1, TargetDataRep, pInput, Reserved2, phNewContext, pOutput, pfContextAttr, ptsExpiry); WLog_Print(g_Log, WLOG_DEBUG, "InitializeSecurityContextA: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -939,7 +939,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryContextAttributesW(PCtxtHandle phContext, UL status = g_SspiW->QueryContextAttributesW(phContext, ulAttribute, pBuffer); WLog_Print(g_Log, WLOG_DEBUG, "QueryContextAttributesW: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -958,7 +958,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryContextAttributesA(PCtxtHandle phContext, UL status = g_SspiA->QueryContextAttributesA(phContext, ulAttribute, pBuffer); WLog_Print(g_Log, WLOG_DEBUG, "QueryContextAttributesA: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -976,7 +976,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityContextToken(PCtxtHandle phContext, status = g_SspiW->QuerySecurityContextToken(phContext, phToken); WLog_Print(g_Log, WLOG_DEBUG, "QuerySecurityContextToken: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -995,7 +995,7 @@ SECURITY_STATUS SEC_ENTRY sspi_SetContextAttributesW(PCtxtHandle phContext, ULON status = g_SspiW->SetContextAttributesW(phContext, ulAttribute, pBuffer, cbBuffer); WLog_Print(g_Log, WLOG_DEBUG, "SetContextAttributesW: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1014,7 +1014,7 @@ SECURITY_STATUS SEC_ENTRY sspi_SetContextAttributesA(PCtxtHandle phContext, ULON status = g_SspiA->SetContextAttributesA(phContext, ulAttribute, pBuffer, cbBuffer); WLog_Print(g_Log, WLOG_DEBUG, "SetContextAttributesA: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1032,7 +1032,7 @@ SECURITY_STATUS SEC_ENTRY sspi_RevertSecurityContext(PCtxtHandle phContext) status = g_SspiW->RevertSecurityContext(phContext); WLog_Print(g_Log, WLOG_DEBUG, "RevertSecurityContext: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1053,7 +1053,7 @@ SECURITY_STATUS SEC_ENTRY sspi_DecryptMessage(PCtxtHandle phContext, PSecBufferD status = g_SspiW->DecryptMessage(phContext, pMessage, MessageSeqNo, pfQOP); WLog_Print(g_Log, WLOG_DEBUG, "DecryptMessage: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1072,7 +1072,7 @@ SECURITY_STATUS SEC_ENTRY sspi_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, status = g_SspiW->EncryptMessage(phContext, fQOP, pMessage, MessageSeqNo); WLog_Print(g_Log, WLOG_DEBUG, "EncryptMessage: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1091,7 +1091,7 @@ SECURITY_STATUS SEC_ENTRY sspi_MakeSignature(PCtxtHandle phContext, ULONG fQOP, status = g_SspiW->MakeSignature(phContext, fQOP, pMessage, MessageSeqNo); WLog_Print(g_Log, WLOG_DEBUG, "MakeSignature: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } @@ -1110,7 +1110,7 @@ SECURITY_STATUS SEC_ENTRY sspi_VerifySignature(PCtxtHandle phContext, PSecBuffer status = g_SspiW->VerifySignature(phContext, pMessage, MessageSeqNo, pfQOP); WLog_Print(g_Log, WLOG_DEBUG, "VerifySignature: %s (0x%08" PRIX32 ")", - GetSecurityStatusString(status), status); + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status)); return status; } diff --git a/winpr/libwinpr/timezone/timezone.c b/winpr/libwinpr/timezone/timezone.c index bd3454374..2166c00c2 100644 --- a/winpr/libwinpr/timezone/timezone.c +++ b/winpr/libwinpr/timezone/timezone.c @@ -616,20 +616,20 @@ static void log_timezone_(const DYNAMIC_TIME_ZONE_INFORMATION* tzif, DWORD resul wLog* log = WLog_Get(TAG); log_print(log, level, file, fkt, line, "DYNAMIC_TIME_ZONE_INFORMATION {"); - log_print(log, level, file, fkt, line, " Bias=%" PRIu32, tzif->Bias); + log_print(log, level, file, fkt, line, " Bias=%" PRId32, tzif->Bias); (void)ConvertWCharNToUtf8(tzif->StandardName, ARRAYSIZE(tzif->StandardName), buffer, ARRAYSIZE(buffer)); log_print(log, level, file, fkt, line, " StandardName=%s", buffer); log_print(log, level, file, fkt, line, " StandardDate=%s", systemtime2str(&tzif->StandardDate, buffer, sizeof(buffer))); - log_print(log, level, file, fkt, line, " StandardBias=%" PRIu32, tzif->StandardBias); + log_print(log, level, file, fkt, line, " StandardBias=%" PRId32, tzif->StandardBias); (void)ConvertWCharNToUtf8(tzif->DaylightName, ARRAYSIZE(tzif->DaylightName), buffer, ARRAYSIZE(buffer)); log_print(log, level, file, fkt, line, " DaylightName=%s", buffer); log_print(log, level, file, fkt, line, " DaylightDate=%s", systemtime2str(&tzif->DaylightDate, buffer, sizeof(buffer))); - log_print(log, level, file, fkt, line, " DaylightBias=%" PRIu32, tzif->DaylightBias); + log_print(log, level, file, fkt, line, " DaylightBias=%" PRId32, tzif->DaylightBias); (void)ConvertWCharNToUtf8(tzif->TimeZoneKeyName, ARRAYSIZE(tzif->TimeZoneKeyName), buffer, ARRAYSIZE(buffer)); log_print(log, level, file, fkt, line, " TimeZoneKeyName=%s", buffer); diff --git a/winpr/libwinpr/utils/print.c b/winpr/libwinpr/utils/print.c index 4ab89edeb..7ecd305c9 100644 --- a/winpr/libwinpr/utils/print.c +++ b/winpr/libwinpr/utils/print.c @@ -70,7 +70,7 @@ void winpr_HexLogDump(wLog* log, UINT32 level, const void* data, size_t length) if (!buffer) { char ebuffer[256] = { 0 }; - WLog_Print(log, WLOG_ERROR, "malloc(%" PRIuz ") failed with [%" PRIuz "] %s", blen, errno, + WLog_Print(log, WLOG_ERROR, "malloc(%" PRIuz ") failed with [%d] %s", blen, errno, winpr_strerror(errno, ebuffer, sizeof(ebuffer))); return; } diff --git a/winpr/libwinpr/utils/stream.c b/winpr/libwinpr/utils/stream.c index 0572c4177..7a43e57e1 100644 --- a/winpr/libwinpr/utils/stream.c +++ b/winpr/libwinpr/utils/stream.c @@ -358,7 +358,7 @@ BOOL Stream_CheckAndLogRequiredCapacityWLogExVa(wLog* log, DWORD level, wStream* (void)vsnprintf(prefix, sizeof(prefix), fmt, args); WLog_Print(log, level, - "[%s] invalid remaining capacity, got %" PRIuz ", require at least %" PRIu64 + "[%s] invalid remaining capacity, got %" PRIuz ", require at least %" PRIuz " [element size=%" PRIuz "]", prefix, actual, nmemb, size); winpr_log_backtrace_ex(log, level, 20);