diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c index 9dca2f72a..1dd6d2b31 100644 --- a/channels/ainput/server/ainput_main.c +++ b/channels/ainput/server/ainput_main.c @@ -476,7 +476,7 @@ static UINT ainput_process_message(ainput_server* ainput) if (BytesReturned != ActualBytesReturned) { - WLog_ERR(TAG, "WTSVirtualChannelRead size mismatch %" PRId32 ", expected %" PRId32, + WLog_ERR(TAG, "WTSVirtualChannelRead size mismatch %" PRIu32 ", expected %" PRIu32, ActualBytesReturned, BytesReturned); goto out; } @@ -576,7 +576,7 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) break; default: - WLog_ERR(TAG, "AINPUT channel is in invalid state %d", ainput->state); + WLog_ERR(TAG, "AINPUT channel is in invalid state %u", ainput->state); break; } diff --git a/channels/client/addin.c b/channels/client/addin.c index a1fdd55b8..3e8a6c3e7 100644 --- a/channels/client/addin.c +++ b/channels/client/addin.c @@ -696,10 +696,7 @@ UINT channel_client_post_message(void* MsgsHandle, LPVOID pData, UINT32 dataLeng { if (Stream_Capacity(data_in) != Stream_GetPosition(data_in)) { - char msg[128]; - (void)_snprintf(msg, 127, "%s_plugin_process_received: read error", - internals->channel_name); - WLog_ERR(TAG, msg); + WLog_ERR(TAG, "%s_plugin_process_received: read error", internals->channel_name); return ERROR_INTERNAL_ERROR; } diff --git a/channels/cliprdr/cliprdr_common.c b/channels/cliprdr/cliprdr_common.c index e83d81bed..1909ab963 100644 --- a/channels/cliprdr/cliprdr_common.c +++ b/channels/cliprdr/cliprdr_common.c @@ -101,7 +101,7 @@ static BOOL cliprdr_validate_file_contents_request(const CLIPRDR_FILE_CONTENTS_R { if (request->cbRequested != sizeof(UINT64)) { - WLog_ERR(TAG, "cbRequested must be %" PRIu32 ", got %" PRIu32 "", sizeof(UINT64), + WLog_ERR(TAG, "cbRequested must be %" PRIuz ", got %" PRIu32 "", sizeof(UINT64), request->cbRequested); return FALSE; } diff --git a/channels/disp/server/disp_main.c b/channels/disp/server/disp_main.c index 45cd82359..71741a250 100644 --- a/channels/disp/server/disp_main.c +++ b/channels/disp/server/disp_main.c @@ -139,8 +139,8 @@ static UINT disp_recv_display_control_monitor_layout_pdu(wStream* s, DispServerC if (pdu.MonitorLayoutSize != DISPLAY_CONTROL_MONITOR_LAYOUT_SIZE) { - WLog_ERR(TAG, "MonitorLayoutSize is set to %" PRIu32 ". expected %" PRIu32 "", - pdu.MonitorLayoutSize, DISPLAY_CONTROL_MONITOR_LAYOUT_SIZE); + WLog_ERR(TAG, "MonitorLayoutSize is set to %" PRIu32 ". expected %d", pdu.MonitorLayoutSize, + DISPLAY_CONTROL_MONITOR_LAYOUT_SIZE); return ERROR_INVALID_DATA; } diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c index c3c74e892..78dde80ee 100644 --- a/channels/drdynvc/client/drdynvc_main.c +++ b/channels/drdynvc/client/drdynvc_main.c @@ -452,7 +452,9 @@ static void check_open_close_receive(DVCMAN_CHANNEL* channel) WINPR_ASSERT(cb); if (!cb->OnOpen || !cb->OnClose || !cb->OnDataReceived) WLog_VRB(TAG, "{%s:%" PRIu32 "} OnOpen=%p, OnClose=%p, OnDataReceived=%p", name, id, - cb->OnOpen, cb->OnClose, cb->OnDataReceived); + WINPR_CXX_COMPAT_CAST(const void*, cb->OnOpen), + WINPR_CXX_COMPAT_CAST(const void*, cb->OnClose), + WINPR_CXX_COMPAT_CAST(const void*, cb->OnDataReceived)); } static UINT dvcman_call_on_receive(DVCMAN_CHANNEL* channel, wStream* data) diff --git a/channels/drive/client/drive_file.c b/channels/drive/client/drive_file.c index 695993550..45d3c181c 100644 --- a/channels/drive/client/drive_file.c +++ b/channels/drive/client/drive_file.c @@ -660,7 +660,7 @@ static BOOL drive_file_set_basic_information(DRIVE_FILE* file, UINT32 Length, wS char fullpath[MAX_PATH] = { 0 }; (void)ConvertWCharToUtf8(file->fullpath, fullpath, sizeof(fullpath) - 1); - WLog_ERR(TAG, "Unable to set file time %s (%" PRId32 ")", fullpath, GetLastError()); + WLog_ERR(TAG, "Unable to set file time %s (%" PRIu32 ")", fullpath, GetLastError()); return FALSE; } @@ -735,7 +735,7 @@ static BOOL drive_file_set_alloc_information(DRIVE_FILE* file, UINT32 Length, wS { char fullpath[MAX_PATH] = { 0 }; (void)ConvertWCharToUtf8(file->fullpath, fullpath, sizeof(fullpath)); - WLog_ERR(TAG, "Unable to truncate %s to %" PRId64 " (%" PRId32 ")", fullpath, size, + WLog_ERR(TAG, "Unable to truncate %s to %" PRId64 " (%" PRIu32 ")", fullpath, size, GetLastError()); return FALSE; } @@ -746,7 +746,7 @@ static BOOL drive_file_set_alloc_information(DRIVE_FILE* file, UINT32 Length, wS { char fullpath[MAX_PATH] = { 0 }; (void)ConvertWCharToUtf8(file->fullpath, fullpath, sizeof(fullpath)); - WLog_ERR(TAG, "Unable to truncate %s to %" PRId64 " (%" PRId32 ")", fullpath, size, + WLog_ERR(TAG, "Unable to truncate %s to %" PRId64 " (%" PRIu32 ")", fullpath, size, GetLastError()); return FALSE; } @@ -757,7 +757,7 @@ static BOOL drive_file_set_alloc_information(DRIVE_FILE* file, UINT32 Length, wS { char fullpath[MAX_PATH] = { 0 }; (void)ConvertWCharToUtf8(file->fullpath, fullpath, sizeof(fullpath)); - WLog_ERR(TAG, "Unable to truncate %s to %" PRId64 " (%" PRId32 ")", fullpath, size, + WLog_ERR(TAG, "Unable to truncate %s to %" PRId64 " (%" PRIu32 ")", fullpath, size, GetLastError()); return FALSE; } diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c index 13188fbc6..9758846c8 100644 --- a/channels/drive/client/drive_main.c +++ b/channels/drive/client/drive_main.c @@ -942,8 +942,10 @@ static UINT drive_register_drive_path(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, if (!pEntryPoints || !name || !path) { - WLog_ERR(TAG, "[%s] Invalid parameters: pEntryPoints=%p, name=%p, path=%p", pEntryPoints, - name, path); + WLog_ERR(TAG, "Invalid parameters: pEntryPoints=%p, name=%p, path=%p", + WINPR_CXX_COMPAT_CAST(const void*, pEntryPoints), + WINPR_CXX_COMPAT_CAST(const void*, name), + WINPR_CXX_COMPAT_CAST(const void*, path)); return ERROR_INVALID_PARAMETER; } diff --git a/channels/gfxredir/server/gfxredir_main.c b/channels/gfxredir/server/gfxredir_main.c index bb02b01bd..4baf40ad0 100644 --- a/channels/gfxredir/server/gfxredir_main.c +++ b/channels/gfxredir/server/gfxredir_main.c @@ -177,7 +177,7 @@ static UINT gfxredir_server_receive_pdu(GfxRedirServerContext* context, wStream* if (end != (beg + header.length)) { - WLog_ERR(TAG, "Unexpected GFXREDIR pdu end: Actual: %d, Expected: %" PRIu32 "", end, + WLog_ERR(TAG, "Unexpected GFXREDIR pdu end: Actual: %" PRIuz ", Expected: %" PRIuz "", end, (beg + header.length)); Stream_SetPosition(s, (beg + header.length)); } diff --git a/channels/location/client/location_main.c b/channels/location/client/location_main.c index 33ce7dc08..d5cd9c588 100644 --- a/channels/location/client/location_main.c +++ b/channels/location/client/location_main.c @@ -210,7 +210,7 @@ static UINT location_on_data_received(IWTSVirtualChannelCallback* pChannelCallba } return location_send_client_ready_pdu(callback); default: - WLog_WARN(TAG, "invalid pduType=%s"); + WLog_WARN(TAG, "invalid pduType=%" PRIu16, pduType); return ERROR_INVALID_DATA; } } @@ -229,8 +229,9 @@ static UINT location_send_base_location3d(IWTSVirtualChannel* channel, WLog_DBG(TAG, "latitude=%lf, longitude=%lf, altitude=%" PRId32 ", speed=%lf, heading=%lf, haccuracy=%lf, source=%" PRIu8, - pdu->latitude, pdu->longitude, pdu->altitude, pdu->speed, pdu->heading, - pdu->horizontalAccuracy, *pdu->source); + pdu->latitude, pdu->longitude, pdu->altitude, pdu->speed ? *pdu->speed : FP_NAN, + pdu->heading ? *pdu->heading : FP_NAN, + pdu->horizontalAccuracy ? *pdu->horizontalAccuracy : FP_NAN, *pdu->source); else WLog_DBG(TAG, "latitude=%lf, longitude=%lf, altitude=%" PRId32, pdu->latitude, pdu->longitude, pdu->altitude); @@ -271,7 +272,8 @@ static UINT location_send_location2d_delta(IWTSVirtualChannel* channel, if (ext) WLog_DBG(TAG, "latitude=%lf, longitude=%lf, speed=%lf, heading=%lf", pdu->latitudeDelta, - pdu->longitudeDelta, pdu->speedDelta, pdu->headingDelta); + pdu->longitudeDelta, pdu->speedDelta ? *pdu->speedDelta : FP_NAN, + pdu->headingDelta ? *pdu->headingDelta : FP_NAN); else WLog_DBG(TAG, "latitude=%lf, longitude=%lf", pdu->latitudeDelta, pdu->longitudeDelta); @@ -307,8 +309,9 @@ static UINT location_send_location3d_delta(IWTSVirtualChannel* channel, if (ext) WLog_DBG(TAG, "latitude=%lf, longitude=%lf, altitude=%" PRId32 ", speed=%lf, heading=%lf", - pdu->latitudeDelta, pdu->longitudeDelta, pdu->altitudeDelta, pdu->speedDelta, - pdu->headingDelta); + pdu->latitudeDelta, pdu->longitudeDelta, pdu->altitudeDelta, + pdu->speedDelta ? *pdu->speedDelta : FP_NAN, + pdu->headingDelta ? *pdu->headingDelta : FP_NAN); else WLog_DBG(TAG, "latitude=%lf, longitude=%lf, altitude=%" PRId32, pdu->latitudeDelta, pdu->longitudeDelta, pdu->altitudeDelta); diff --git a/channels/rdpdr/client/devman.c b/channels/rdpdr/client/devman.c index df48292be..00dbada93 100644 --- a/channels/rdpdr/client/devman.c +++ b/channels/rdpdr/client/devman.c @@ -131,7 +131,7 @@ DEVICE* devman_get_device_by_id(DEVMAN* devman, UINT32 id) if (!devman) { - WLog_ERR(TAG, "device manager=%p", devman); + WLog_ERR(TAG, "device manager=%p", WINPR_CXX_COMPAT_CAST(const void*, devman)); return NULL; } diff --git a/channels/rdpear/client/rdpear_main.c b/channels/rdpear/client/rdpear_main.c index 2145c2432..cff382701 100644 --- a/channels/rdpear/client/rdpear_main.c +++ b/channels/rdpear/client/rdpear_main.c @@ -536,8 +536,8 @@ static BOOL rdpear_kerb_CreateApReqAuthenticator(RDPEAR_PLUGIN* rdpear, NdrConte if (len > MAX_KEYTAB_NAME_LEN) { WLog_ERR(TAG, - "Invalid ClientName length %" PRIuz - ", limited to %u characters. ClientName: (%s)", + "Invalid ClientName length %d, limited to %" PRIuz + " characters. ClientName: (%s)", MAX_KEYTAB_NAME_LEN, len, cur->data); goto out; } @@ -550,7 +550,7 @@ static BOOL rdpear_kerb_CreateApReqAuthenticator(RDPEAR_PLUGIN* rdpear, NdrConte const size_t len = strnlen(client.realm.data, MAX_KEYTAB_NAME_LEN + 1); if (len > MAX_KEYTAB_NAME_LEN) { - WLog_ERR(TAG, "Invalid realm length %" PRIuz ", limited to %u characters. Realm: (%s)", + WLog_ERR(TAG, "Invalid realm length %d, limited to %" PRIuz " characters. Realm: (%s)", MAX_KEYTAB_NAME_LEN, len, client.realm.data); goto out; } diff --git a/channels/rdpecam/client/camera_device_enum_main.c b/channels/rdpecam/client/camera_device_enum_main.c index 4c8f061af..240a160e4 100644 --- a/channels/rdpecam/client/camera_device_enum_main.c +++ b/channels/rdpecam/client/camera_device_enum_main.c @@ -87,7 +87,7 @@ UINT ecam_channel_write(WINPR_ATTR_UNUSED CameraPlugin* ecam, GENERIC_CHANNEL_CA Stream_SealLength(out); WINPR_ASSERT(Stream_Length(out) <= UINT32_MAX); - WLog_DBG(TAG, "ChannelId=%d, MessageId=0x%02" PRIx8 ", Length=%d", + WLog_DBG(TAG, "ChannelId=%" PRIu32 ", MessageId=0x%02" PRIx8 ", Length=%" PRIuz, hchannel->channel_mgr->GetChannelId(hchannel->channel), msg, Stream_Length(out)); const UINT error = hchannel->channel->Write(hchannel->channel, (ULONG)Stream_Length(out), @@ -231,7 +231,7 @@ static UINT ecam_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, Stream_Read_UINT8(data, version); Stream_Read_UINT8(data, messageId); - WLog_DBG(TAG, "ChannelId=%d, MessageId=0x%02" PRIx8 ", Version=%d", + WLog_DBG(TAG, "ChannelId=%" PRIu32 ", MessageId=0x%02" PRIx8 ", Version=%d", hchannel->channel_mgr->GetChannelId(hchannel->channel), messageId, version); switch (messageId) diff --git a/channels/rdpecam/client/camera_device_main.c b/channels/rdpecam/client/camera_device_main.c index d2ecf66f8..db53246f0 100644 --- a/channels/rdpecam/client/camera_device_main.c +++ b/channels/rdpecam/client/camera_device_main.c @@ -79,7 +79,7 @@ static void ecam_dev_print_media_type(CAM_MEDIA_TYPE_DESCRIPTION* mediaType) { WINPR_ASSERT(mediaType); - WLog_DBG(TAG, "Format: %d, width: %d, height: %d, fps: %d, flags: %d", mediaType->Format, + WLog_DBG(TAG, "Format: %u, width: %u, height: %u, fps: %u, flags: %u", mediaType->Format, mediaType->Width, mediaType->Height, mediaType->FrameRateNumerator, mediaType->Flags); } @@ -299,7 +299,7 @@ static UINT ecam_dev_process_start_streams_request(CameraDevice* dev, if (streamIndex >= ECAM_DEVICE_MAX_STREAMS) { - WLog_ERR(TAG, "Incorrect streamIndex %" PRIuz, streamIndex); + WLog_ERR(TAG, "Incorrect streamIndex %" PRIu8, streamIndex); ecam_channel_send_error_response(dev->ecam, hchannel, CAM_ERROR_CODE_InvalidStreamNumber); return ERROR_INVALID_INDEX; } @@ -712,7 +712,7 @@ static UINT ecam_dev_on_data_received(IWTSVirtualChannelCallback* pChannelCallba Stream_Read_UINT8(data, version); Stream_Read_UINT8(data, messageId); - WLog_DBG(TAG, "ChannelId=%d, MessageId=0x%02" PRIx8 ", Version=%d", + WLog_DBG(TAG, "ChannelId=%" PRIu32 ", MessageId=0x%02" PRIx8 ", Version=%d", hchannel->channel_mgr->GetChannelId(hchannel->channel), messageId, version); switch (messageId) diff --git a/channels/rdpecam/client/encoding.c b/channels/rdpecam/client/encoding.c index 520a8d5a8..c5535fd7f 100644 --- a/channels/rdpecam/client/encoding.c +++ b/channels/rdpecam/client/encoding.c @@ -215,7 +215,7 @@ static enum AVPixelFormat ecamToAVPixFormat(CAM_MEDIA_FORMAT ecamFormat) case CAM_MEDIA_FORMAT_RGB32: return AV_PIX_FMT_RGB32; default: - WLog_ERR(TAG, "Unsupported ecamFormat %d", ecamFormat); + WLog_ERR(TAG, "Unsupported ecamFormat %u", ecamFormat); return AV_PIX_FMT_NONE; } } @@ -568,7 +568,7 @@ BOOL ecam_encoder_context_init(CameraDeviceStream* stream) return ecam_encoder_context_init_h264(stream); default: - WLog_ERR(TAG, "Unsupported output format %d", format); + WLog_ERR(TAG, "Unsupported output format %u", format); return FALSE; } } @@ -607,7 +607,7 @@ BOOL ecam_encoder_compress(CameraDeviceStream* stream, const BYTE* srcData, size case CAM_MEDIA_FORMAT_H264: return ecam_encoder_compress_h264(stream, srcData, srcSize, ppDstData, pDstSize); default: - WLog_ERR(TAG, "Unsupported output format %d", format); + WLog_ERR(TAG, "Unsupported output format %u", format); return FALSE; } } diff --git a/channels/rdpecam/client/v4l/camera_v4l.c b/channels/rdpecam/client/v4l/camera_v4l.c index e604f6468..7be6998bb 100644 --- a/channels/rdpecam/client/v4l/camera_v4l.c +++ b/channels/rdpecam/client/v4l/camera_v4l.c @@ -92,7 +92,7 @@ static UINT32 ecamToV4L2PixFormat(CAM_MEDIA_FORMAT ecamFormat) case CAM_MEDIA_FORMAT_RGB32: return V4L2_PIX_FMT_RGB32; default: - WLog_ERR(TAG, "Unsupported CAM_MEDIA_FORMAT %d", ecamFormat); + WLog_ERR(TAG, "Unsupported CAM_MEDIA_FORMAT %u", ecamFormat); return 0; } } @@ -279,7 +279,7 @@ static INT16 cam_v4l_get_media_type_descriptions(ICamHal* ihal, const char* devi if (nTypes == maxMediaTypes) { - WLog_ERR(TAG, "Media types reached buffer maximum %" PRIu32 "", maxMediaTypes); + WLog_ERR(TAG, "Media types reached buffer maximum %" PRIuz "", maxMediaTypes); goto error; } } @@ -375,7 +375,7 @@ static size_t cam_v4l_stream_alloc_buffers(CamV4lStream* stream) if (ioctl(stream->fd, VIDIOC_REQBUFS, &rbuffer) < 0 || rbuffer.count == 0) { char buffer[64] = { 0 }; - WLog_ERR(TAG, "Failure in VIDIOC_REQBUFS, errno %s [%d], count %d", + WLog_ERR(TAG, "Failure in VIDIOC_REQBUFS, errno %s [%d], count %u", winpr_strerror(errno, buffer, sizeof(buffer)), errno, rbuffer.count); return 0; } @@ -420,7 +420,7 @@ static size_t cam_v4l_stream_alloc_buffers(CamV4lStream* stream) stream->buffers[i].length = vbuffer.length; - WLog_DBG(TAG, "Buffer %d mapped, size: %d", i, vbuffer.length); + WLog_DBG(TAG, "Buffer %u mapped, size: %u", i, vbuffer.length); if (ioctl(stream->fd, VIDIOC_QBUF, &vbuffer) < 0) { diff --git a/channels/rdpei/server/rdpei_main.c b/channels/rdpei/server/rdpei_main.c index b04d40838..b07686615 100644 --- a/channels/rdpei/server/rdpei_main.c +++ b/channels/rdpei/server/rdpei_main.c @@ -744,7 +744,7 @@ UINT rdpei_server_handle_messages(RdpeiServerContext* context) case EVENTID_CS_READY: if (priv->automataState != STATE_WAITING_CLIENT_READY) { - WLog_ERR(TAG, "not expecting a CS_READY packet in this state(%d)", + WLog_ERR(TAG, "not expecting a CS_READY packet in this state(%u)", priv->automataState); return ERROR_INVALID_STATE; } @@ -800,7 +800,7 @@ UINT rdpei_server_send_sc_ready(RdpeiServerContext* context, UINT32 version, UIN if (priv->automataState != STATE_INITIAL) { - WLog_ERR(TAG, "called from unexpected state %d", priv->automataState); + WLog_ERR(TAG, "called from unexpected state %u", priv->automataState); return ERROR_INVALID_STATE; } @@ -853,7 +853,7 @@ UINT rdpei_server_suspend(RdpeiServerContext* context) case STATE_WAITING_FRAME: break; default: - WLog_ERR(TAG, "called from unexpected state %d", priv->automataState); + WLog_ERR(TAG, "called from unexpected state %u", priv->automataState); return ERROR_INVALID_STATE; } @@ -899,7 +899,7 @@ UINT rdpei_server_resume(RdpeiServerContext* context) case STATE_SUSPENDED: break; default: - WLog_ERR(TAG, "called from unexpected state %d", priv->automataState); + WLog_ERR(TAG, "called from unexpected state %u", priv->automataState); return ERROR_INVALID_STATE; } diff --git a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c index 142065228..1cdd6021b 100644 --- a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c +++ b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c @@ -440,7 +440,7 @@ static UINT rdpsnd_alsa_play(rdpsndDevicePlugin* device, const BYTE* data, size_ if (status < 0) { - WLog_ERR(TAG, "status: %d\n", status); + WLog_ERR(TAG, "status: %ld\n", status); rdpsnd_alsa_close(device); rdpsnd_alsa_open(device, NULL, alsa->latency); break; diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index f32b4e5e6..a12a586d4 100644 --- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c +++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c @@ -65,7 +65,7 @@ static BOOL rdpsnd_check_pulse(rdpsndPulsePlugin* pulse, BOOL haveStream) if (!pulse->context) { - WLog_WARN(TAG, "pulse->context=%p", pulse->context); + WLog_WARN(TAG, "pulse->context=%p", WINPR_CXX_COMPAT_CAST(const void*, pulse->context)); rc = FALSE; } @@ -73,14 +73,14 @@ static BOOL rdpsnd_check_pulse(rdpsndPulsePlugin* pulse, BOOL haveStream) { if (!pulse->stream) { - WLog_WARN(TAG, "pulse->stream=%p", pulse->stream); + WLog_WARN(TAG, "pulse->stream=%p", WINPR_CXX_COMPAT_CAST(const void*, pulse->stream)); rc = FALSE; } } if (!pulse->mainloop) { - WLog_WARN(TAG, "pulse->mainloop=%p", pulse->mainloop); + WLog_WARN(TAG, "pulse->mainloop=%p", WINPR_CXX_COMPAT_CAST(const void*, pulse->mainloop)); rc = FALSE; } @@ -584,7 +584,7 @@ static BOOL rdpsnd_pulse_set_volume(rdpsndDevicePlugin* device, UINT32 value) if (!rdpsnd_check_pulse(pulse, TRUE)) { - WLog_WARN(TAG, "%s called before pulse backend was initialized"); + WLog_WARN(TAG, "called before pulse backend was initialized"); return FALSE; } diff --git a/channels/remdesk/client/remdesk_main.c b/channels/remdesk/client/remdesk_main.c index 4127c789e..a6559e88a 100644 --- a/channels/remdesk/client/remdesk_main.c +++ b/channels/remdesk/client/remdesk_main.c @@ -155,9 +155,6 @@ static UINT remdesk_recv_ctl_server_announce_pdu(WINPR_ATTR_UNUSED remdeskPlugin static UINT remdesk_recv_ctl_version_info_pdu(remdeskPlugin* remdesk, wStream* s, WINPR_ATTR_UNUSED REMDESK_CHANNEL_HEADER* header) { - UINT32 versionMajor = 0; - UINT32 versionMinor = 0; - WINPR_ASSERT(remdesk); WINPR_ASSERT(s); WINPR_ASSERT(header); @@ -165,12 +162,12 @@ static UINT remdesk_recv_ctl_version_info_pdu(remdeskPlugin* remdesk, wStream* s if (!Stream_CheckAndLogRequiredLength(TAG, s, 8)) return ERROR_INVALID_DATA; - Stream_Read_UINT32(s, versionMajor); /* versionMajor (4 bytes) */ - Stream_Read_UINT32(s, versionMinor); /* versionMinor (4 bytes) */ + const UINT32 versionMajor = Stream_Get_UINT32(s); /* versionMajor (4 bytes) */ + const UINT32 versionMinor = Stream_Get_UINT32(s); /* versionMinor (4 bytes) */ if ((versionMajor != 1) || (versionMinor > 2) || (versionMinor == 0)) { - WLog_ERR(TAG, "Unsupported protocol version %" PRId32 ".%" PRId32, versionMajor, + WLog_ERR(TAG, "Unsupported protocol version %" PRIu32 ".%" PRIu32, versionMajor, versionMinor); } diff --git a/channels/smartcard/client/smartcard_main.c b/channels/smartcard/client/smartcard_main.c index 76e6d7bf3..088614810 100644 --- a/channels/smartcard/client/smartcard_main.c +++ b/channels/smartcard/client/smartcard_main.c @@ -133,7 +133,7 @@ static DWORD WINAPI smartcard_context_thread(LPVOID arg) { element->irp->Discard(element->irp); smartcard_operation_free(&element->operation, TRUE); - WLog_ERR(TAG, "smartcard_irp_device_control_call failed with error %" PRIu32 "", + WLog_ERR(TAG, "smartcard_irp_device_control_call failed with error %" PRId32 "", status); break; } diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c index 15398fb83..235d15f15 100644 --- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c @@ -635,7 +635,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_format(ITSMFDecoder* decoder) return RDP_PIXFMT_I420; default: - WLog_ERR(TAG, "unsupported pixel format %u", mdecoder->codec_context->pix_fmt); + WLog_ERR(TAG, "unsupported pixel format %d", mdecoder->codec_context->pix_fmt); return (UINT32)-1; } } diff --git a/channels/tsmf/client/tsmf_codec.c b/channels/tsmf/client/tsmf_codec.c index 68d06a43d..9483d7d50 100644 --- a/channels/tsmf/client/tsmf_codec.c +++ b/channels/tsmf/client/tsmf_codec.c @@ -480,7 +480,7 @@ static BOOL tsmf_read_format_type(TS_AM_MEDIA_TYPE* mediatype, wStream* s, UINT3 break; default: - WLog_INFO(TAG, "unhandled format type 0x%x", mediatype->FormatType); + WLog_INFO(TAG, "unhandled format type 0x%08x", (unsigned)mediatype->FormatType); break; } return TRUE; diff --git a/channels/tsmf/client/tsmf_ifman.c b/channels/tsmf/client/tsmf_ifman.c index 6fcb82b72..17d11a8e4 100644 --- a/channels/tsmf/client/tsmf_ifman.c +++ b/channels/tsmf/client/tsmf_ifman.c @@ -332,10 +332,6 @@ static float tsmf_stream_read_float(wStream* s) UINT tsmf_ifman_set_source_video_rect(TSMF_IFMAN* ifman) { UINT status = CHANNEL_RC_OK; - float Left = NAN; - float Top = NAN; - float Right = NAN; - float Bottom = NAN; TSMF_PRESENTATION* presentation = NULL; DEBUG_TSMF(""); @@ -352,10 +348,10 @@ UINT tsmf_ifman_set_source_video_rect(TSMF_IFMAN* ifman) else { #ifdef WITH_DEBUG_TSMF - Left = tsmf_stream_read_float(ifman->input); /* Left (4 bytes) */ - Top = tsmf_stream_read_float(ifman->input); /* Top (4 bytes) */ - Right = tsmf_stream_read_float(ifman->input); /* Right (4 bytes) */ - Bottom = tsmf_stream_read_float(ifman->input); /* Bottom (4 bytes) */ + const float Left = tsmf_stream_read_float(ifman->input); /* Left (4 bytes) */ + const float Top = tsmf_stream_read_float(ifman->input); /* Top (4 bytes) */ + const float Right = tsmf_stream_read_float(ifman->input); /* Right (4 bytes) */ + const float Bottom = tsmf_stream_read_float(ifman->input); /* Bottom (4 bytes) */ DEBUG_TSMF("SetSourceVideoRect: Left: %f Top: %f Right: %f Bottom: %f", Left, Top, Right, Bottom); #endif diff --git a/channels/tsmf/client/tsmf_main.c b/channels/tsmf/client/tsmf_main.c index 05151434a..1b64051b6 100644 --- a/channels/tsmf/client/tsmf_main.c +++ b/channels/tsmf/client/tsmf_main.c @@ -65,7 +65,7 @@ BOOL tsmf_send_eos_response(IWTSVirtualChannelCallback* pChannelCallback, UINT32 if (status) { - WLog_ERR(TAG, "response error %d", status); + WLog_ERR(TAG, "response error %" PRId32, WINPR_CXX_COMPAT_CAST(int32_t, status)); } Stream_Free(s, TRUE); @@ -100,19 +100,21 @@ BOOL tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, UINT32 mess if (!callback->channel || !callback->channel->Write) { - WLog_ERR(TAG, "callback=%p, channel=%p, write=%p", callback, - (callback ? callback->channel : NULL), - (callback && callback->channel ? callback->channel->Write : NULL)); + WLog_ERR(TAG, "callback=%p, channel=%p, write=%p", + WINPR_CXX_COMPAT_CAST(const void*, callback), + WINPR_CXX_COMPAT_CAST(const void*, callback ? callback->channel : NULL), + WINPR_CXX_COMPAT_CAST( + const void*, callback && callback->channel ? callback->channel->Write : NULL)); } else { - WINPR_ASSERT(pos <= UINT32_MAX); - status = callback->channel->Write(callback->channel, (UINT32)pos, Stream_Buffer(s), NULL); + status = callback->channel->Write( + callback->channel, WINPR_ASSERTING_INT_CAST(uint32_t, pos), Stream_Buffer(s), NULL); } if (status) { - WLog_ERR(TAG, "response error %d", status); + WLog_ERR(TAG, "response error %" PRId32, WINPR_CXX_COMPAT_CAST(int32_t, status)); } Stream_Free(s, TRUE); diff --git a/channels/urbdrc/client/data_transfer.c b/channels/urbdrc/client/data_transfer.c index 762fe0d31..af4b9fb5f 100644 --- a/channels/urbdrc/client/data_transfer.c +++ b/channels/urbdrc/client/data_transfer.c @@ -1672,7 +1672,7 @@ static UINT urbdrc_process_transfer_request(IUDEVICE* pdev, GENERIC_CHANNEL_CALL ? "2.2.6.7 Transfer In Request (TRANSFER_IN_REQUEST)" : "2.2.6.8 Transfer Out Request (TRANSFER_OUT_REQUEST)"; WLog_ERR(TAG, - "[MS-RDPEUSB] 2.2.9.1.1 TS_URB_HEADER::Size 0x04" PRIx16 + "[MS-RDPEUSB] 2.2.9.1.1 TS_URB_HEADER::Size 0x%04" PRIx16 " != %s::CbTsUrb 0x%08" PRIx32, Size, section, CbTsUrb); return ERROR_INVALID_DATA; diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c index aa5639f09..6c2376f74 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.c +++ b/channels/urbdrc/client/libusb/libusb_udevice.c @@ -359,7 +359,7 @@ static void LIBUSB_CALL func_bulk_transfer_cb(struct libusb_transfer* transfer) user_data = (ASYNC_TRANSFER_USER_DATA*)transfer->user_data; if (!user_data) { - WLog_ERR(TAG, "[%s]: Invalid transfer->user_data!"); + WLog_ERR(TAG, "Invalid transfer->user_data!"); return; } list = user_data->queue; diff --git a/channels/video/client/video_main.c b/channels/video/client/video_main.c index dba7063bf..0a32f05a5 100644 --- a/channels/video/client/video_main.c +++ b/channels/video/client/video_main.c @@ -937,7 +937,7 @@ static UINT video_VideoData(VideoClientContext* context, const TSMM_VIDEO_DATA* } // NOLINTNEXTLINE(clang-analyzer-unix.Malloc): Queue_Enqueue owns frame - WLog_DBG(TAG, "scheduling frame in %" PRIu32 " ms", (frame->publishTime - startTime)); + WLog_DBG(TAG, "scheduling frame in %" PRIu64 " ms", (frame->publishTime - startTime)); } } diff --git a/client/SDL/SDL2/sdl_freerdp.cpp b/client/SDL/SDL2/sdl_freerdp.cpp index 31a9867af..f0b08176f 100644 --- a/client/SDL/SDL2/sdl_freerdp.cpp +++ b/client/SDL/SDL2/sdl_freerdp.cpp @@ -969,7 +969,7 @@ static int sdl_run(SdlContext* sdl) { auto r = window->second.rect(); auto id = window->second.id(); - WLog_DBG(SDL_TAG, "%lu: %dx%d-%dx%d", id, r.x, r.y, r.w, r.h); + WLog_DBG(SDL_TAG, "%u: %dx%d-%dx%d", id, r.x, r.y, r.w, r.h); } } break; diff --git a/client/SDL/SDL2/sdl_monitor.cpp b/client/SDL/SDL2/sdl_monitor.cpp index b2c57546a..46c842a92 100644 --- a/client/SDL/SDL2/sdl_monitor.cpp +++ b/client/SDL/SDL2/sdl_monitor.cpp @@ -334,9 +334,8 @@ BOOL sdl_detect_monitors(SdlContext* sdl, UINT32* pMaxWidth, UINT32* pMaxHeight) /* There were more IDs supplied than there are monitors */ if (nr > static_cast(numDisplays)) { - WLog_ERR(TAG, - "Found %" PRIu32 " monitor IDs, but only have %" PRIu32 " monitors connected", - nr, numDisplays); + WLog_ERR(TAG, "Found %" PRIu32 " monitor IDs, but only have %d monitors connected", nr, + numDisplays); return FALSE; } diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c index d65a27d2e..6391540ae 100644 --- a/client/X11/xf_client.c +++ b/client/X11/xf_client.c @@ -304,7 +304,7 @@ void xf_draw_screen_(xfContext* xfc, int x, int y, int w, int h, const char* fkt { if (!xfc) { - WLog_DBG(TAG, "called from [%s] xfc=%p", fkt, xfc); + WLog_DBG(TAG, "called from [%s] xfc=%p", fkt, WINPR_CXX_COMPAT_CAST(const void*, xfc)); return; } @@ -316,7 +316,7 @@ void xf_draw_screen_(xfContext* xfc, int x, int y, int w, int h, const char* fkt if (!xfc->window) { - WLog_WARN(TAG, "invalid xfc->window=%p", xfc->window); + WLog_WARN(TAG, "invalid xfc->window=%p", WINPR_CXX_COMPAT_CAST(const void*, xfc->window)); return; } @@ -1045,7 +1045,8 @@ static void xf_get_x11_button_map(xfContext* xfc, unsigned char* x11_map) /* otherwise leave unchanged. */ if (ptr_dev) { - WLog_DBG(TAG, "Pointer device: %d", ptr_dev->device_id); + WLog_DBG(TAG, "Pointer device: %" PRIu32, + WINPR_CXX_COMPAT_CAST(uint32_t, ptr_dev->device_id)); XGetDeviceButtonMapping(xfc->display, ptr_dev, x11_map, NUM_BUTTONS_MAPPED); XCloseDevice(xfc->display, ptr_dev); } diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c index 88c3ee798..39b082e2f 100644 --- a/client/X11/xf_cliprdr.c +++ b/client/X11/xf_cliprdr.c @@ -1443,7 +1443,8 @@ static xfCachedData* convert_data_from_existing_raw_data(xfClipboard* clipboard, if (!success) { WLog_WARN(TAG, "Failed to set clipboard data (formatId: %u, data: %p, data_length: %u)", - srcFormatId, cached_raw_data->data, cached_raw_data->data_length); + srcFormatId, WINPR_CXX_COMPAT_CAST(const void*, cached_raw_data->data), + cached_raw_data->data_length); ClipboardUnlock(clipboard->system); return NULL; } @@ -1578,7 +1579,7 @@ static BOOL xf_cliprdr_process_selection_request(xfClipboard* clipboard, cached_data = HashTable_GetItemValue(clipboard->cachedRawData, format_to_cache_slot(formatId)); - DEBUG_CLIPRDR("hasCachedData: %u, rawTransfer: %u", cached_data ? 1 : 0, rawTransfer); + DEBUG_CLIPRDR("hasCachedData: %u, rawTransfer: %d", cached_data ? 1u : 0u, rawTransfer); if (!cached_data && !rawTransfer) { @@ -1591,7 +1592,7 @@ static BOOL xf_cliprdr_process_selection_request(xfClipboard* clipboard, cached_raw_data = HashTable_GetItemValue(clipboard->cachedRawData, (void*)(UINT_PTR)srcFormatId); - DEBUG_CLIPRDR("hasCachedRawData: %u, rawDataLength: %u", cached_raw_data ? 1 : 0, + DEBUG_CLIPRDR("hasCachedRawData: %u, rawDataLength: %u", cached_raw_data ? 1u : 0u, cached_raw_data ? cached_raw_data->data_length : 0); if (cached_raw_data && cached_raw_data->data_length != 0) @@ -1599,7 +1600,7 @@ static BOOL xf_cliprdr_process_selection_request(xfClipboard* clipboard, clipboard, cached_raw_data, srcFormatId, nullTerminated, dstFormatId); } - DEBUG_CLIPRDR("hasCachedData: %u", cached_data ? 1 : 0); + DEBUG_CLIPRDR("hasCachedData: %u", cached_data ? 1u : 0u); if (cached_data) { @@ -2010,7 +2011,8 @@ static UINT xf_cliprdr_server_format_list(CliprdrClientContext* context, if (!(clipboard->serverFormats = (CLIPRDR_FORMAT*)calloc(clipboard->numServerFormats, sizeof(CLIPRDR_FORMAT)))) { - WLog_ERR(TAG, "failed to allocate %d CLIPRDR_FORMAT structs", clipboard->numServerFormats); + WLog_ERR(TAG, "failed to allocate %" PRIu32 " CLIPRDR_FORMAT structs", + clipboard->numServerFormats); ret = CHANNEL_RC_NO_MEMORY; goto out; } diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c index 0e35ae0d7..df95a22b5 100644 --- a/client/X11/xf_graphics.c +++ b/client/X11/xf_graphics.c @@ -130,7 +130,7 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, rdpPointer* const UINT32 xTargetSize = MAX(1, (UINT32)lround(1.0 * pointer->width * xscale)); const UINT32 yTargetSize = MAX(1, (UINT32)lround(1.0 * pointer->height * yscale)); - WLog_DBG(TAG, "scaled: %" PRIu32 "x%" PRIu32 ", desktop: %" PRIu32 "x%" PRIu32, + WLog_DBG(TAG, "scaled: %" PRId32 "x%" PRId32 ", desktop: %" PRIu32 "x%" PRIu32, xfc->scaledWidth, xfc->scaledHeight, freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth), freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight)); @@ -323,13 +323,13 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) rc = TRUE; fail: - WLog_DBG(TAG, "%p", rc ? pointer : NULL); + WLog_DBG(TAG, "%p", WINPR_CXX_COMPAT_CAST(const void*, rc ? pointer : NULL)); return rc; } static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer) { - WLog_DBG(TAG, "%p", pointer); + WLog_DBG(TAG, "%p", WINPR_CXX_COMPAT_CAST(const void*, pointer)); #ifdef WITH_XCURSOR xfContext* xfc = (xfContext*)context; @@ -356,7 +356,7 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer) static BOOL xf_Pointer_Set(rdpContext* context, rdpPointer* pointer) { - WLog_DBG(TAG, "%p", pointer); + WLog_DBG(TAG, "%p", WINPR_CXX_COMPAT_CAST(const void*, pointer)); #ifdef WITH_XCURSOR xfContext* xfc = (xfContext*)context; Window handle = xf_Pointer_get_window(xfc); @@ -378,7 +378,7 @@ static BOOL xf_Pointer_Set(rdpContext* context, rdpPointer* pointer) } else { - WLog_WARN(TAG, "handle=%ld", handle); + WLog_WARN(TAG, "handle=%lu", handle); } xfc->isCursorHidden = false; #endif diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c index a3a2caf10..9bffa66c5 100644 --- a/client/X11/xf_window.c +++ b/client/X11/xf_window.c @@ -1502,7 +1502,7 @@ UINT xf_AppUpdateWindowFromSurface(xfContext* xfc, gdiGfxSurface* surface) { WLog_WARN(TAG, "Failed create a XImage[%" PRIu32 "x%" PRIu32 ", scanline=%" PRIu32 - ", bpp=%" PRIu32 "] for window id=0x%08" PRIx64, + ", bpp=%" PRId32 "] for window id=0x%08" PRIx64, surface->width, surface->height, surface->scanline, xfc->depth, surface->windowId); goto fail; diff --git a/client/common/client.c b/client/common/client.c index 3aca0b5dc..947a1a9bc 100644 --- a/client/common/client.c +++ b/client/common/client.c @@ -1215,7 +1215,7 @@ BOOL client_cli_get_access_token(freerdp* instance, AccessTokenType tokenType, c rc = client_cli_get_avd_access_token(instance, token); break; default: - WLog_ERR(TAG, "Unexpected value for AccessTokenType [%" PRIuz "], aborting", tokenType); + WLog_ERR(TAG, "Unexpected value for AccessTokenType [%u], aborting", tokenType); break; } @@ -2048,7 +2048,7 @@ BOOL freerdp_client_handle_touch(rdpClientContext* cctx, UINT32 flags, INT32 fin case FREERDP_TOUCH_MOTION: return freerdp_handle_touch_motion(cctx, &contact); default: - WLog_WARN(TAG, "Unhandled FreeRDPTouchEventType %d, ignoring", flags); + WLog_WARN(TAG, "Unhandled FreeRDPTouchEventType %" PRIu32 ", ignoring", flags); return FALSE; } } diff --git a/client/common/cmdline.c b/client/common/cmdline.c index b8bccdc37..430c90b7d 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -5845,7 +5845,7 @@ static BOOL args_from_env(const char* name, int* aargc, char** aargv[], const ch goto cleanup; if (rc == 0) { - WLog_ERR(TAG, "%s - environment variable '%s' is empty", arg); + WLog_ERR(TAG, "environment variable '%s' is empty", arg); goto cleanup; } } diff --git a/libfreerdp/cache/glyph.c b/libfreerdp/cache/glyph.c index 61367f865..34c46e0f6 100644 --- a/libfreerdp/cache/glyph.c +++ b/libfreerdp/cache/glyph.c @@ -58,7 +58,7 @@ static UINT32 update_glyph_offset(const BYTE* data, size_t length, UINT32 index, offset |= ((UINT32)data[index++]) << 8; } else - WLog_WARN(TAG, "[%s] glyph index out of bound %" PRIu32 " [max %" PRIuz "]", index, + WLog_WARN(TAG, "glyph index out of bound %" PRIu32 " [max %" PRIuz "]", index, length); } diff --git a/libfreerdp/codec/clear.c b/libfreerdp/codec/clear.c index f9aa4f000..9112d492a 100644 --- a/libfreerdp/codec/clear.c +++ b/libfreerdp/codec/clear.c @@ -259,8 +259,7 @@ static BOOL clear_decompress_subcode_rlex(wStream* WINPR_RESTRICT s, UINT32 bitm if ((pixelIndex + runLengthFactor) > pixelCount) { WLog_ERR(TAG, - "pixelIndex %" PRIu32 " + runLengthFactor %" PRIu32 " > pixelCount %" PRIu32 - "", + "pixelIndex %" PRIuz " + runLengthFactor %" PRIu32 " > pixelCount %" PRIu32 "", pixelIndex, runLengthFactor, pixelCount); return FALSE; } @@ -285,7 +284,7 @@ static BOOL clear_decompress_subcode_rlex(wStream* WINPR_RESTRICT s, UINT32 bitm if ((pixelIndex + (suiteDepth + 1)) > pixelCount) { WLog_ERR(TAG, - "pixelIndex %" PRIu32 " + suiteDepth %" PRIu8 " + 1 > pixelCount %" PRIu32 "", + "pixelIndex %" PRIuz " + suiteDepth %" PRIu8 " + 1 > pixelCount %" PRIu32 "", pixelIndex, suiteDepth, pixelCount); return FALSE; } @@ -319,7 +318,7 @@ static BOOL clear_decompress_subcode_rlex(wStream* WINPR_RESTRICT s, UINT32 bitm if (pixelIndex != pixelCount) { - WLog_ERR(TAG, "pixelIndex %" PRIdz " != pixelCount %" PRIu32 "", pixelIndex, pixelCount); + WLog_ERR(TAG, "pixelIndex %" PRIuz " != pixelCount %" PRIu32 "", pixelIndex, pixelCount); return FALSE; } @@ -342,7 +341,7 @@ static BOOL clear_resize_buffer(CLEAR_CONTEXT* WINPR_RESTRICT clear, UINT32 widt if (!tmp) { - WLog_ERR(TAG, "clear->TempBuffer winpr_aligned_recalloc failed for %" PRIu32 " bytes", + WLog_ERR(TAG, "clear->TempBuffer winpr_aligned_recalloc failed for %" PRIu64 " bytes", size); return FALSE; } @@ -711,7 +710,7 @@ static BOOL clear_decompress_bands_data(CLEAR_CONTEXT* WINPR_RESTRICT clear, { WLog_ERR(TAG, "clear->ShortVBarStorageCursor %" PRIu32 - " >= CLEARCODEC_VBAR_SHORT_SIZE (%" PRIu32 ")", + " >= CLEARCODEC_VBAR_SHORT_SIZE (%" PRId32 ")", clear->ShortVBarStorageCursor, CLEARCODEC_VBAR_SHORT_SIZE); return FALSE; } @@ -773,7 +772,7 @@ static BOOL clear_decompress_bands_data(CLEAR_CONTEXT* WINPR_RESTRICT clear, if (clear->VBarStorageCursor >= CLEARCODEC_VBAR_SIZE) { WLog_ERR(TAG, - "clear->VBarStorageCursor %" PRIu32 " >= CLEARCODEC_VBAR_SIZE %" PRIu32 + "clear->VBarStorageCursor %" PRIu32 " >= CLEARCODEC_VBAR_SIZE %" PRId32 "", clear->VBarStorageCursor, CLEARCODEC_VBAR_SIZE); return FALSE; diff --git a/libfreerdp/codec/include/bitmap.h b/libfreerdp/codec/include/bitmap.h index 6573933dd..0df344d90 100644 --- a/libfreerdp/codec/include/bitmap.h +++ b/libfreerdp/codec/include/bitmap.h @@ -37,7 +37,7 @@ static inline BYTE* WRITEFGBGIMAGE(BYTE* WINPR_RESTRICT pbDest, if (cBits > 8) { - WLog_ERR(TAG, "cBits %d > 8", cBits); + WLog_ERR(TAG, "cBits %" PRIu32 " > 8", cBits); return NULL; } @@ -71,7 +71,7 @@ static inline BYTE* WRITEFIRSTLINEFGBGIMAGE(BYTE* WINPR_RESTRICT pbDest, if (cBits > 8) { - WLog_ERR(TAG, "cBits %d > 8", cBits); + WLog_ERR(TAG, "cBits %" PRIu32 " > 8", cBits); return NULL; } @@ -122,8 +122,9 @@ static inline BOOL RLEDECOMPRESS(const BYTE* WINPR_RESTRICT pbSrcBuffer, UINT32 if (!pbSrcBuffer || !pbDestBuffer) { - WLog_ERR(TAG, "Invalid arguments: pbSrcBuffer=%p, pbDestBuffer=%p", pbSrcBuffer, - pbDestBuffer); + WLog_ERR(TAG, "Invalid arguments: pbSrcBuffer=%p, pbDestBuffer=%p", + WINPR_CXX_COMPAT_CAST(const void*, pbSrcBuffer), + WINPR_CXX_COMPAT_CAST(const void*, pbDestBuffer)); return FALSE; } @@ -442,7 +443,9 @@ static inline BOOL RLEDECOMPRESS(const BYTE* WINPR_RESTRICT pbSrcBuffer, UINT32 default: WLog_ERR(TAG, "invalid code 0x%08" PRIx32 ", pbSrcBuffer=%p, pbSrc=%p, pbEnd=%p", - code, pbSrcBuffer, pbSrc, pbEnd); + code, WINPR_CXX_COMPAT_CAST(const void*, pbSrcBuffer), + WINPR_CXX_COMPAT_CAST(const void*, pbSrc), + WINPR_CXX_COMPAT_CAST(const void*, pbEnd)); return FALSE; } } diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c index 06e2b7b58..686eccbb2 100644 --- a/libfreerdp/codec/interleaved.c +++ b/libfreerdp/codec/interleaved.c @@ -387,7 +387,8 @@ static inline BOOL ensure_capacity_(const BYTE* start, const BYTE* end, size_t s WLog_ERR(TAG, "[%s:%" PRIuz "] failed: start=%p <= end=%p, available=%" PRIuz " >= size=%" PRIuz " * base=%" PRIuz, - fkt, line, start, end, available, size, base); + fkt, line, WINPR_CXX_COMPAT_CAST(const void*, start), + WINPR_CXX_COMPAT_CAST(const void*, end), available, size, base); return res; } @@ -540,8 +541,10 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleav if (!interleaved || !pSrcData || !pDstData) { - WLog_ERR(TAG, "invalid arguments: interleaved=%p, pSrcData=%p, pDstData=%p", interleaved, - pSrcData, pDstData); + WLog_ERR(TAG, "invalid arguments: interleaved=%p, pSrcData=%p, pDstData=%p", + WINPR_CXX_COMPAT_CAST(const void*, interleaved), + WINPR_CXX_COMPAT_CAST(const void*, pSrcData), + WINPR_CXX_COMPAT_CAST(const void*, pDstData)); return FALSE; } @@ -583,7 +586,8 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleav if (!interleaved->TempBuffer) { - WLog_ERR(TAG, "interleaved->TempBuffer=%p", interleaved->TempBuffer); + WLog_ERR(TAG, "interleaved->TempBuffer=%p", + WINPR_CXX_COMPAT_CAST(const void*, interleaved->TempBuffer)); return FALSE; } diff --git a/libfreerdp/codec/planar.c b/libfreerdp/codec/planar.c index 94a640a55..23e8e0ed0 100644 --- a/libfreerdp/codec/planar.c +++ b/libfreerdp/codec/planar.c @@ -226,7 +226,7 @@ static inline INT32 planar_skip_plane_rle(const BYTE* WINPR_RESTRICT pSrcData, U if (used > SrcSize) { - WLog_ERR(TAG, "planar plane used %" PRIu32 " exceeds SrcSize %" PRIu32, used, + WLog_ERR(TAG, "planar plane used %" PRIu32 " exceeds SrcSize %" PRId32, used, INT32_MAX); return -1; } @@ -835,8 +835,9 @@ BOOL freerdp_bitmap_decompress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT plan if ((planes[2] + rawSizes[2]) > &pSrcData[SrcSize]) { - WLog_ERR(TAG, "plane size mismatch %p + %" PRIu32 " > %p", planes[2], rawSizes[2], - &pSrcData[SrcSize]); + WLog_ERR(TAG, "plane size mismatch %p + %" PRIu32 " > %p", + WINPR_CXX_COMPAT_CAST(const void*, planes[2]), rawSizes[2], + WINPR_CXX_COMPAT_CAST(const void*, &pSrcData[SrcSize])); return FALSE; } } @@ -844,7 +845,7 @@ BOOL freerdp_bitmap_decompress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT plan { if ((SrcSize - diff) < base) { - WLog_ERR(TAG, "plane size mismatch %" PRIu32 " < %" PRIu32, SrcSize - diff, base); + WLog_ERR(TAG, "plane size mismatch %" PRIuz " < %" PRIu32, SrcSize - diff, base); return FALSE; } @@ -854,8 +855,9 @@ BOOL freerdp_bitmap_decompress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT plan if ((planes[2] + rawSizes[2]) > &pSrcData[SrcSize]) { - WLog_ERR(TAG, "plane size mismatch %p + %" PRIu32 " > %p", planes[2], rawSizes[2], - &pSrcData[SrcSize]); + WLog_ERR(TAG, "plane size mismatch %p + %" PRIu32 " > %p", + WINPR_CXX_COMPAT_CAST(const void*, planes[2]), rawSizes[2], + WINPR_CXX_COMPAT_CAST(const void*, &pSrcData[SrcSize])); return FALSE; } } diff --git a/libfreerdp/common/assistance.c b/libfreerdp/common/assistance.c index 4ddd12024..9c09f5c30 100644 --- a/libfreerdp/common/assistance.c +++ b/libfreerdp/common/assistance.c @@ -1047,7 +1047,7 @@ static int freerdp_assistance_parse_uploadinfo(rdpAssistanceFile* file, char* up if (strnlen(uploadinfo, uploadinfosize) == uploadinfosize) { - WLog_WARN(TAG, "UPLOADINFOR string is not '\0' terminated"); + WLog_WARN(TAG, "UPLOADINFOR string is not '\\0' terminated"); return -1; } @@ -1199,14 +1199,15 @@ int freerdp_assistance_parse_file_buffer(rdpAssistanceFile* file, const char* cb if (!cbuffer || (size == 0)) { - WLog_WARN(TAG, "no data supplied [%p, %" PRIuz "]", cbuffer, size); + WLog_WARN(TAG, "no data supplied [%p, %" PRIuz "]", + WINPR_CXX_COMPAT_CAST(const void*, cbuffer), size); return -1; } char* abuffer = strndup(cbuffer, size); const size_t len = strnlen(cbuffer, size); if (len == size) - WLog_WARN(TAG, "Input data not '\0' terminated"); + WLog_WARN(TAG, "Input data not '\\0' terminated"); if (!abuffer) return -1; diff --git a/libfreerdp/common/settings.c b/libfreerdp/common/settings.c index b239120fd..97d423f33 100644 --- a/libfreerdp/common/settings.c +++ b/libfreerdp/common/settings.c @@ -1550,8 +1550,7 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke case FreeRDP_ChannelDefArray: if ((len > 0) && (len < CHANNEL_MAX_COUNT)) WLog_WARN(TAG, - "FreeRDP_ChannelDefArray::len expected to be >= %" PRIu32 - ", but have %" PRIu32, + "FreeRDP_ChannelDefArray::len expected to be >= %d, but have %" PRIuz, CHANNEL_MAX_COUNT, len); return freerdp_settings_set_pointer_len_(settings, FreeRDP_ChannelDefArray, FreeRDP_ChannelDefArraySize, data, len, @@ -1648,7 +1647,7 @@ BOOL freerdp_settings_set_pointer_len(rdpSettings* settings, FreeRDP_Settings_Ke freerdp_settings_set_pointer(settings, id, NULL); } else - WLog_WARN(TAG, "Invalid id %" PRIuz, id); + WLog_WARN(TAG, "Invalid id %d", id); return FALSE; } } @@ -1805,12 +1804,12 @@ void* freerdp_settings_get_pointer_array_writable(const rdpSettings* settings, WINPR_ASSERT(settings->ReceivedCapabilityDataSizes); return &settings->ReceivedCapabilityDataSizes[offset]; default: - WLog_WARN(TAG, "Invalid id %s [%" PRIuz "]", freerdp_settings_get_name_for_key(id), id); + WLog_WARN(TAG, "Invalid id %s [%d]", freerdp_settings_get_name_for_key(id), id); return NULL; } fail: - WLog_WARN(TAG, "Invalid offset for %s [%" PRIuz "]: size=%" PRIuz ", offset=%" PRIuz, + WLog_WARN(TAG, "Invalid offset for %s [%d]: size=%" PRIuz ", offset=%" PRIuz, freerdp_settings_get_name_for_key(id), id, max, offset); return NULL; } @@ -1992,7 +1991,7 @@ BOOL freerdp_settings_set_pointer_array(rdpSettings* settings, FreeRDP_Settings_ settings->ReceivedCapabilityDataSizes[offset] = *(const uint32_t*)data; return TRUE; default: - WLog_WARN(TAG, "Invalid id %s [%" PRIuz "]", freerdp_settings_get_name_for_key(id), id); + WLog_WARN(TAG, "Invalid id %s [%d]", freerdp_settings_get_name_for_key(id), id); return FALSE; } diff --git a/libfreerdp/common/settings_getters.c b/libfreerdp/common/settings_getters.c index 5a5ba0969..102fda28f 100644 --- a/libfreerdp/common/settings_getters.c +++ b/libfreerdp/common/settings_getters.c @@ -644,8 +644,7 @@ BOOL freerdp_settings_get_bool(WINPR_ATTR_UNUSED const rdpSettings* settings, return settings->Workarea; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return FALSE; @@ -1449,8 +1448,7 @@ BOOL freerdp_settings_set_bool(WINPR_ATTR_UNUSED rdpSettings* settings, break; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -1504,8 +1502,7 @@ UINT16 freerdp_settings_get_uint16(WINPR_ATTR_UNUSED const rdpSettings* settings return settings->TextANSICodePage; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return 0; @@ -1581,8 +1578,7 @@ BOOL freerdp_settings_set_uint16(WINPR_ATTR_UNUSED rdpSettings* settings, break; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -1597,8 +1593,7 @@ INT16 freerdp_settings_get_int16(WINPR_ATTR_UNUSED const rdpSettings* settings, switch (id) { default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return 0; @@ -1622,8 +1617,7 @@ BOOL freerdp_settings_set_int16(WINPR_ATTR_UNUSED rdpSettings* settings, switch (id) { default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -2020,8 +2014,7 @@ UINT32 freerdp_settings_get_uint32(WINPR_ATTR_UNUSED const rdpSettings* settings #endif default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return 0; @@ -2553,8 +2546,7 @@ BOOL freerdp_settings_set_uint32(WINPR_ATTR_UNUSED rdpSettings* settings, #endif default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -2581,8 +2573,7 @@ INT32 freerdp_settings_get_int32(WINPR_ATTR_UNUSED const rdpSettings* settings, return settings->YPan; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return 0; @@ -2622,8 +2613,7 @@ BOOL freerdp_settings_set_int32(WINPR_ATTR_UNUSED rdpSettings* settings, break; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -2644,8 +2634,7 @@ UINT64 freerdp_settings_get_uint64(WINPR_ATTR_UNUSED const rdpSettings* settings return settings->ParentWindowId; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return 0; @@ -2677,8 +2666,7 @@ BOOL freerdp_settings_set_uint64(WINPR_ATTR_UNUSED rdpSettings* settings, break; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -2693,8 +2681,7 @@ INT64 freerdp_settings_get_int64(WINPR_ATTR_UNUSED const rdpSettings* settings, switch (id) { default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return 0; @@ -2718,8 +2705,7 @@ BOOL freerdp_settings_set_int64(WINPR_ATTR_UNUSED rdpSettings* settings, switch (id) { default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -3052,8 +3038,7 @@ const char* freerdp_settings_get_string(WINPR_ATTR_UNUSED const rdpSettings* set return settings->WmClass; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return NULL; @@ -3385,8 +3370,7 @@ char* freerdp_settings_get_string_writable(rdpSettings* settings, FreeRDP_Settin return settings->WmClass; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return NULL; @@ -3729,8 +3713,7 @@ BOOL freerdp_settings_set_string_(WINPR_ATTR_UNUSED rdpSettings* settings, return update_string_(&settings->WmClass, cnv.c, len); default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -4095,8 +4078,7 @@ BOOL freerdp_settings_set_string_copy_(WINPR_ATTR_UNUSED rdpSettings* settings, return update_string_copy_(&settings->WmClass, cnv.cc, len, cleanup); default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } @@ -4203,8 +4185,7 @@ void* freerdp_settings_get_pointer_writable(rdpSettings* settings, FreeRDP_Setti return settings->instance; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); WINPR_ASSERT(FALSE); return NULL; @@ -4351,8 +4332,7 @@ BOOL freerdp_settings_set_pointer(WINPR_ATTR_UNUSED rdpSettings* settings, break; default: - WLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, - freerdp_settings_get_name_for_key(id), + WLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id)); return FALSE; } diff --git a/libfreerdp/core/activation.c b/libfreerdp/core/activation.c index d931644cc..97563c492 100644 --- a/libfreerdp/core/activation.c +++ b/libfreerdp/core/activation.c @@ -58,7 +58,7 @@ static BOOL rdp_recv_sync_pdu(rdpRdp* rdp, wStream* s, const char* what) if (msgType != SYNCMSGTYPE_SYNC) { WLog_WARN(TAG, "%s: Invalid messageType=0x%04" PRIx16 ", expected 0x%04" PRIx16, what, - msgType, SYNCMSGTYPE_SYNC); + msgType, WINPR_CXX_COMPAT_CAST(uint16_t, SYNCMSGTYPE_SYNC)); return FALSE; } Stream_Read_UINT16(s, targetUser); diff --git a/libfreerdp/core/channels.c b/libfreerdp/core/channels.c index ac9571026..f6e86ff19 100644 --- a/libfreerdp/core/channels.c +++ b/libfreerdp/core/channels.c @@ -121,7 +121,7 @@ BOOL freerdp_channel_process(freerdp* instance, wStream* s, UINT16 channelId, si if (packetLength < 8) { - WLog_ERR(TAG, "Header length %" PRIdz " bytes promised, none available", packetLength); + WLog_ERR(TAG, "Header length %" PRIuz " bytes promised, none available", packetLength); return FALSE; } packetLength -= 8; @@ -139,7 +139,7 @@ BOOL freerdp_channel_process(freerdp* instance, wStream* s, UINT16 channelId, si chunkLength = Stream_GetRemainingLength(s); if (packetLength != chunkLength) { - WLog_ERR(TAG, "Header length %" PRIdz " != actual length %" PRIdz, packetLength, + WLog_ERR(TAG, "Header length %" PRIuz " != actual length %" PRIuz, packetLength, chunkLength); return FALSE; } diff --git a/libfreerdp/core/childsession.c b/libfreerdp/core/childsession.c index dbfb24515..47799228d 100644 --- a/libfreerdp/core/childsession.c +++ b/libfreerdp/core/childsession.c @@ -58,7 +58,7 @@ static int transport_bio_named_write(BIO* bio, const char* buf, int size) BIO_clear_flags(bio, BIO_FLAGS_WRITE); DWORD written = 0; - UINT64 start = GetTickCount64(); + const UINT64 start = GetTickCount64(); BOOL ret = WriteFile(ptr->hFile, buf, WINPR_ASSERTING_INT_CAST(uint32_t, size), &written, NULL); // winpr_HexDump(TAG, WLOG_DEBUG, buf, size); @@ -68,7 +68,8 @@ static int transport_bio_named_write(BIO* bio, const char* buf, int size) return 0; } - WLog_VRB(TAG, "(%d)=%d written=%d duration=%d", size, ret, written, GetTickCount64() - start); + WLog_VRB(TAG, "(%d)=%d written=%" PRIu32 " duration=%" PRIu64, size, ret, written, + GetTickCount64() - start); if (written == 0) { @@ -493,7 +494,8 @@ static BOOL createChildSessionTransport(HANDLE* pFile) HRESULT hStatus = createChildSessionFn(pipePath, 0x80); if (!SUCCEEDED(hStatus)) { - WLog_ERR(TAG, "error 0x%x when creating childSessionTransport", hStatus); + WLog_ERR(TAG, "error 0x%08x when creating childSessionTransport", + WINPR_CXX_COMPAT_CAST(unsigned, hStatus)); goto out; } } diff --git a/libfreerdp/core/client.c b/libfreerdp/core/client.c index b01c36bb2..510008a63 100644 --- a/libfreerdp/core/client.c +++ b/libfreerdp/core/client.c @@ -529,8 +529,9 @@ BOOL freerdp_channels_data(freerdp* instance, UINT16 channelId, const BYTE* cdat data.pcb = cdata; if (!instance || !data.pcb) { - WLog_ERR(TAG, "(%p, %" PRIu16 ", %p, 0x%08x): Invalid arguments", instance, channelId, - data.pcb, flags); + WLog_ERR(TAG, "(%p, %" PRIu16 ", %p, 0x%08x): Invalid arguments", + WINPR_CXX_COMPAT_CAST(const void*, instance), channelId, + WINPR_CXX_COMPAT_CAST(const void*, data.pcb), flags); return FALSE; } @@ -802,7 +803,8 @@ BOOL freerdp_client_channel_register(rdpChannels* channels, HANDLE handle, if (!channels || (handle == INVALID_HANDLE_VALUE) || !fkt) { WLog_ERR(TAG, "Invalid function arguments (channels=%p, handle=%p, fkt=%p, userdata=%p", - channels, handle, fkt, userdata); + WINPR_CXX_COMPAT_CAST(const void*, channels), handle, + WINPR_CXX_COMPAT_CAST(const void*, fkt), userdata); return FALSE; } @@ -814,7 +816,8 @@ BOOL freerdp_client_channel_unregister(rdpChannels* channels, HANDLE handle) { if (!channels || (handle == INVALID_HANDLE_VALUE)) { - WLog_ERR(TAG, "Invalid function arguments (channels=%p, handle=%p", channels, handle); + WLog_ERR(TAG, "Invalid function arguments (channels=%p, handle=%p", + WINPR_CXX_COMPAT_CAST(const void*, channels), handle); return FALSE; } diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c index b06bb09f2..657556cb4 100644 --- a/libfreerdp/core/connection.c +++ b/libfreerdp/core/connection.c @@ -1066,7 +1066,7 @@ BOOL rdp_client_connect_mcs_channel_join_confirm(rdpRdp* rdp, wStream* s) { if (channelId != MCS_GLOBAL_CHANNEL_ID) { - WLog_ERR(TAG, "expected uglobalser channel id %" PRIu16 ", but received %" PRIu16, + WLog_ERR(TAG, "expected uglobalser channel id %d, but received %" PRIu16, MCS_GLOBAL_CHANNEL_ID, channelId); return FALSE; } @@ -1119,7 +1119,7 @@ BOOL rdp_client_connect_mcs_channel_join_confirm(rdpRdp* rdp, wStream* s) if (cur->ChannelId != channelId) { - WLog_ERR(TAG, "expected channel id %" PRIu16 ", but received %" PRIu16, + WLog_ERR(TAG, "expected channel id %d, but received %" PRIu16, MCS_GLOBAL_CHANNEL_ID, channelId); return FALSE; } @@ -1252,7 +1252,7 @@ state_run_t rdp_client_connect_license(rdpRdp* rdp, wStream* s) } if (channelId != MCS_GLOBAL_CHANNEL_ID) - WLog_WARN(TAG, "unexpected message for channel %u, expected %u", channelId, + WLog_WARN(TAG, "unexpected message for channel %u, expected %d", channelId, MCS_GLOBAL_CHANNEL_ID); if ((securityFlags & SEC_LICENSE_PKT) == 0) diff --git a/libfreerdp/core/credssp_auth.c b/libfreerdp/core/credssp_auth.c index afb8ba11e..e9afe92ad 100644 --- a/libfreerdp/core/credssp_auth.c +++ b/libfreerdp/core/credssp_auth.c @@ -94,6 +94,33 @@ static BOOL parseKerberosDeltat(const char* value, INT32* dest, const char* mess static BOOL credssp_auth_setup_identity(rdpCredsspAuth* auth); static SecurityFunctionTable* auth_resolve_sspi_table(const rdpSettings* settings); +#define log_status(status, level, ...) \ + log_status_((status), (level), __FILE__, __func__, __LINE__, __VA_ARGS__) + +WINPR_ATTR_FORMAT_ARG(6, 7) +static BOOL log_status_(SECURITY_STATUS status, DWORD level, const char* file, const char* fkt, + size_t line, WINPR_FORMAT_ARG const char* what, ...) +{ + static wLog* log = NULL; + if (!log) + log = WLog_Get(TAG); + + if (WLog_IsLevelActive(log, level)) + { + char fwhat[128] = { 0 }; + va_list ap; + va_start(ap, what); + (void)vsnprintf(fwhat, sizeof(fwhat) - 1, what, ap); + va_end(ap); + + WLog_PrintTextMessage(log, level, line, file, fkt, "%s status %s [0x%08" PRIx32 "]", fwhat, + GetSecurityStatusString(status), + WINPR_CXX_COMPAT_CAST(uint32_t, status)); + } + + return FALSE; +} + static BOOL credssp_auth_update_name_cache(rdpCredsspAuth* auth, TCHAR* name) { WINPR_ASSERT(auth); @@ -140,11 +167,8 @@ BOOL credssp_auth_init(rdpCredsspAuth* auth, TCHAR* pkg_name, SecPkgContext_Bind WINPR_ASSERT(auth->table->QuerySecurityPackageInfo); const SECURITY_STATUS status = auth->table->QuerySecurityPackageInfo(pkg_name, &auth->info); if (status != SEC_E_OK) - { - WLog_ERR(TAG, "QuerySecurityPackageInfo (%s) failed with %s [0x%08X]", - credssp_auth_pkg_name(auth), GetSecurityStatusString(status), status); - return FALSE; - } + return log_status(status, WLOG_ERROR, "QuerySecurityPackageInfo (%s)", + credssp_auth_pkg_name(auth)); if (!credssp_auth_update_name_cache(auth, auth->info->Name)) return FALSE; @@ -298,11 +322,7 @@ BOOL credssp_auth_setup_client(rdpCredsspAuth* auth, const char* target_service, pAuthData, NULL, NULL, &auth->credentials, NULL); if (status != SEC_E_OK) - { - WLog_ERR(TAG, "AcquireCredentialsHandleA failed with %s [0x%08X]", - GetSecurityStatusString(status), status); - return FALSE; - } + return log_status(status, WLOG_ERROR, "AcquireCredentialsHandleA"); if (!credssp_auth_client_init_cred_attributes(auth)) { @@ -338,11 +358,7 @@ BOOL credssp_auth_setup_server(rdpCredsspAuth* auth) auth->table->AcquireCredentialsHandle(NULL, auth->info->Name, SECPKG_CRED_INBOUND, NULL, pAuthData, NULL, NULL, &auth->credentials, NULL); if (status != SEC_E_OK) - { - WLog_ERR(TAG, "AcquireCredentialsHandleA failed with %s [0x%08X]", - GetSecurityStatusString(status), status); - return FALSE; - } + return log_status(status, WLOG_ERROR, "AcquireCredentialsHandleA"); auth->state = AUTH_STATE_CREDS; WLog_DBG(TAG, "Acquired server credentials"); @@ -470,9 +486,8 @@ int credssp_auth_authenticate(rdpCredsspAuth* auth) WINPR_ASSERT(auth->table->QueryContextAttributes); status = auth->table->QueryContextAttributes(&auth->context, SECPKG_ATTR_SIZES, &auth->sizes); - WLog_DBG(TAG, "QueryContextAttributes returned %s [0x%08" PRIx32 "]", - GetSecurityStatusString(status), status); - WLog_DBG(TAG, "Context sizes: cbMaxSignature=%d, cbSecurityTrailer=%d", + (void)log_status(status, WLOG_DEBUG, "QueryContextAttributes"); + WLog_DBG(TAG, "Context sizes: cbMaxSignature=%" PRIu32 ", cbSecurityTrailer=%" PRIu32 "", auth->sizes.cbMaxSignature, auth->sizes.cbSecurityTrailer); return 1; @@ -486,9 +501,8 @@ int credssp_auth_authenticate(rdpCredsspAuth* auth) } else { - WLog_ERR(TAG, "%s failed with %s [0x%08X]", - auth->server ? "AcceptSecurityContext" : "InitializeSecurityContext", - GetSecurityStatusString(status), status); + (void)log_status(status, WLOG_ERROR, + auth->server ? "AcceptSecurityContext" : "InitializeSecurityContext"); auth->sspi_error = status; return -1; } @@ -536,10 +550,8 @@ BOOL credssp_auth_encrypt(rdpCredsspAuth* auth, const SecBuffer* plaintext, SecB status = auth->table->EncryptMessage(&auth->context, 0, &buffer_desc, sequence); if (status != SEC_E_OK) { - WLog_ERR(TAG, "EncryptMessage failed with %s [0x%08X]", GetSecurityStatusString(status), - status); free(buf); - return FALSE; + return log_status(status, WLOG_ERROR, "EncryptMessage"); } if (buffers[0].cbBuffer < auth->sizes.cbSecurityTrailer) @@ -605,8 +617,8 @@ BOOL credssp_auth_decrypt(rdpCredsspAuth* auth, const SecBuffer* ciphertext, Sec auth->table->DecryptMessage(&auth->context, &buffer_desc, sequence, &fqop); if (status != SEC_E_OK) { - WLog_ERR(TAG, "DecryptMessage failed with %s [0x%08X]", GetSecurityStatusString(status), - status); + WLog_ERR(TAG, "DecryptMessage failed with %s [0x%08" PRIx32 "]", + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(uint32_t, status)); sspi_SecBufferFree(&buffers[1]); return FALSE; } @@ -625,8 +637,8 @@ BOOL credssp_auth_impersonate(rdpCredsspAuth* auth) if (status != SEC_E_OK) { - WLog_ERR(TAG, "ImpersonateSecurityContext failed with %s [0x%08X]", - GetSecurityStatusString(status), status); + WLog_ERR(TAG, "ImpersonateSecurityContext failed with %s [0x%08" PRIx32 "]", + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(uint32_t, status)); return FALSE; } @@ -642,8 +654,8 @@ BOOL credssp_auth_revert_to_self(rdpCredsspAuth* auth) if (status != SEC_E_OK) { - WLog_ERR(TAG, "RevertSecurityContext failed with %s [0x%08X]", - GetSecurityStatusString(status), status); + WLog_ERR(TAG, "RevertSecurityContext failed with %s [0x%08" PRIx32 "]", + GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(uint32_t, status)); return FALSE; } diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c index bb4390042..082ce472d 100644 --- a/libfreerdp/core/freerdp.c +++ b/libfreerdp/core/freerdp.c @@ -66,7 +66,8 @@ static void sig_abort_connect(int signum, const char* signame, void* ctx) { rdpContext* context = (rdpContext*)ctx; - WLog_INFO(TAG, "Signal %s [%d], terminating session %p", signame, signum, context); + WLog_INFO(TAG, "Signal %s [%d], terminating session %p", signame, signum, + WINPR_CXX_COMPAT_CAST(const void*, context)); if (context) freerdp_abort_connect_context(context); } diff --git a/libfreerdp/core/gateway/http.c b/libfreerdp/core/gateway/http.c index e7237fb51..a76e474f5 100644 --- a/libfreerdp/core/gateway/http.c +++ b/libfreerdp/core/gateway/http.c @@ -1236,7 +1236,7 @@ static SSIZE_T http_response_recv_line(rdpTls* tls, HttpResponse* response) continue; else if (position > RESPONSE_SIZE_LIMIT) { - WLog_ERR(TAG, "Request header too large! (%" PRIdz " bytes) Aborting!", bodyLength); + WLog_ERR(TAG, "Request header too large! (%" PRIuz " bytes) Aborting!", bodyLength); goto out_error; } @@ -1321,7 +1321,7 @@ static BOOL http_response_recv_body(rdpTls* tls, HttpResponse* response, BOOL re if (response->BodyLength > RESPONSE_SIZE_LIMIT) { - WLog_ERR(TAG, "Request body too large! (%" PRIdz " bytes) Aborting!", + WLog_ERR(TAG, "Request body too large! (%" PRIuz " bytes) Aborting!", response->BodyLength); goto out_error; } @@ -1451,7 +1451,7 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength) if (bodyLength > RESPONSE_SIZE_LIMIT) { - WLog_ERR(TAG, "Expected request body too large! (%" PRIdz " bytes) Aborting!", + WLog_ERR(TAG, "Expected request body too large! (%" PRIuz " bytes) Aborting!", bodyLength); goto out_error; } diff --git a/libfreerdp/core/info.c b/libfreerdp/core/info.c index 30408085f..0b17b75d9 100644 --- a/libfreerdp/core/info.c +++ b/libfreerdp/core/info.c @@ -37,8 +37,8 @@ #define TAG FREERDP_TAG("core.info") -#define logonInfoV2Size (2 + 4 + 4 + 4 + 4) -#define logonInfoV2ReservedSize 558 +#define logonInfoV2Size (2u + 4u + 4u + 4u + 4u) +#define logonInfoV2ReservedSize 558u #define logonInfoV2TotalSize (logonInfoV2Size + logonInfoV2ReservedSize) static const char* INFO_TYPE_LOGON_STRINGS[4] = { "Logon Info V1", "Logon Info V2", @@ -436,7 +436,7 @@ static BOOL rdp_read_extended_info_packet(rdpRdp* rdp, wStream* s) { WLog_WARN(TAG, "[MS-RDPBCGR] 2.2.1.11.1.1.1 Extended Info Packet " - "(TS_EXTENDED_INFO_PACKET)::dynamicDaylightTimeDisabled value %" PRIu16 + "(TS_EXTENDED_INFO_PACKET)::dynamicDaylightTimeDisabled value %d" " not allowed in [0,1]", settings->DynamicDaylightTimeDisabled); return FALSE; @@ -1067,7 +1067,7 @@ static BOOL rdp_info_read_string(const char* what, wStream* s, size_t size, size if (((size % sizeof(WCHAR)) != 0) || (size > max)) { - WLog_ERR(TAG, "protocol error: invalid %s value: %" PRIu32 "", what, size); + WLog_ERR(TAG, "protocol error: invalid %s value: %" PRIuz "", what, size); return FALSE; } @@ -1148,7 +1148,7 @@ static BOOL rdp_recv_logon_info_v2(rdpRdp* rdp, wStream* s, logon_info* info) Stream_Read_UINT16(s, Version); /* Version (2 bytes) */ if (Version != SAVE_SESSION_PDU_VERSION_ONE) { - WLog_WARN(TAG, "LogonInfoV2::Version expected %" PRIu16 " bytes, got %" PRIu16, + WLog_WARN(TAG, "LogonInfoV2::Version expected %d bytes, got %" PRIu16, SAVE_SESSION_PDU_VERSION_ONE, Version); return FALSE; } @@ -1209,7 +1209,7 @@ static BOOL rdp_recv_logon_info_v2(rdpRdp* rdp, wStream* s, logon_info* info) } if (warn) { - WLog_WARN(TAG, "unexpected padding of %" PRIuz " bytes, data not '\0'", rem); + WLog_WARN(TAG, "unexpected padding of %" PRIuz " bytes, data not '\\0'", rem); winpr_HexDump(TAG, WLOG_TRACE, str, rem); } diff --git a/libfreerdp/core/listener.c b/libfreerdp/core/listener.c index c769a9a90..516e51046 100644 --- a/libfreerdp/core/listener.c +++ b/libfreerdp/core/listener.c @@ -90,7 +90,7 @@ static BOOL freerdp_listener_open_from_vsock(WINPR_ATTR_UNUSED freerdp_listener* else { char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "could not extract port from '%s', value=%ul, error=%s", bind_address, + WLog_ERR(TAG, "could not extract port from '%s', value=%lu, error=%s", bind_address, val, winpr_strerror(errno, ebuffer, sizeof(ebuffer))); close(sockfd); return FALSE; @@ -100,7 +100,7 @@ static BOOL freerdp_listener_open_from_vsock(WINPR_ATTR_UNUSED freerdp_listener* if (bind(sockfd, (struct sockaddr*)&addr, sizeof(struct sockaddr_vm)) == -1) { char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "Error binding vsock at cid %d port %d: %s", addr.svm_cid, port, + WLog_ERR(TAG, "Error binding vsock at cid %u port %d: %s", addr.svm_cid, port, winpr_strerror(errno, ebuffer, sizeof(ebuffer))); close(sockfd); return FALSE; @@ -109,7 +109,7 @@ static BOOL freerdp_listener_open_from_vsock(WINPR_ATTR_UNUSED freerdp_listener* if (listen(sockfd, 10) == -1) { char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "Error listening to socket at cid %d port %d: %s", addr.svm_cid, port, + WLog_ERR(TAG, "Error listening to socket at cid %u port %d: %s", addr.svm_cid, port, winpr_strerror(errno, ebuffer, sizeof(ebuffer))); close(sockfd); return FALSE; diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c index c51ec0549..95e71bc4d 100644 --- a/libfreerdp/core/nla.c +++ b/libfreerdp/core/nla.c @@ -1515,7 +1515,7 @@ static BOOL nla_read_ts_credentials(rdpNla* nla, SecBuffer* data) break; } default: - WLog_DBG(TAG, "TSCredentials type " PRIu32 " not supported for now", credType); + WLog_DBG(TAG, "TSCredentials type %d not supported for now", credType); ret = FALSE; break; } @@ -2026,7 +2026,7 @@ BOOL nla_send(rdpNla* nla) if (nla->errorCode && nla->peerVersion >= 3 && nla->peerVersion != 5) { WLog_DBG(TAG, " ----->> error code %s 0x%08" PRIx32, NtStatus2Tag(nla->errorCode), - nla->errorCode); + WINPR_CXX_COMPAT_CAST(uint32_t, nla->errorCode)); if (!WinPrAsn1EncContextualInteger( enc, 4, WINPR_ASSERTING_INT_CAST(WinPrAsn1_INTEGER, nla->errorCode))) goto fail; @@ -2153,7 +2153,7 @@ static int nla_decode_ts_request(rdpNla* nla, wStream* s) return -1; nla->errorCode = val; WLog_DBG(TAG, " <<----- error code %s 0x%08" PRIx32, NtStatus2Tag(nla->errorCode), - nla->errorCode); + WINPR_CXX_COMPAT_CAST(uint32_t, nla->errorCode)); break; case 5: WLog_DBG(TAG, " <<----- client nonce"); @@ -2243,8 +2243,9 @@ int nla_recv_pdu(rdpNla* nla, wStream* s) break; default: - WLog_ERR(TAG, "SPNEGO failed with NTSTATUS: %s [0x%08" PRIX32 "]", - NtStatus2Tag(nla->errorCode), nla->errorCode); + WLog_ERR(TAG, "SPNEGO failed with NTSTATUS: %s [0x%08" PRIx32 "]", + NtStatus2Tag(nla->errorCode), + WINPR_CXX_COMPAT_CAST(uint32_t, nla->errorCode)); code = FREERDP_ERROR_AUTHENTICATION_FAILED; break; } diff --git a/libfreerdp/core/peer.c b/libfreerdp/core/peer.c index cd456b9c7..cedf38149 100644 --- a/libfreerdp/core/peer.c +++ b/libfreerdp/core/peer.c @@ -493,7 +493,7 @@ static state_run_t peer_recv_tpkt_pdu(freerdp_peer* client, wStream* s) case PDU_TYPE_FLOW_TEST: if (!Stream_SafeSeek(s, remain)) { - WLog_WARN(TAG, "Short PDU, need %" PRIuz " bytes, got %" PRIuz, remain, + WLog_WARN(TAG, "Short PDU, need %" PRIu16 " bytes, got %" PRIuz, remain, Stream_GetRemainingLength(s)); return STATE_RUN_FAILED; } @@ -759,7 +759,7 @@ static state_run_t rdp_peer_handle_state_active(freerdp_peer* client) } if (!client->connected) { - WLog_ERR(TAG, "PostConnect for peer %p failed", client); + WLog_ERR(TAG, "PostConnect for peer %p failed", WINPR_CXX_COMPAT_CAST(const void*, client)); ret = STATE_RUN_FAILED; } else if (!client->activated) @@ -774,7 +774,8 @@ static state_run_t rdp_peer_handle_state_active(freerdp_peer* client) if (!activated) { - WLog_ERR(TAG, "Activate for peer %p failed", client); + WLog_ERR(TAG, "Activate for peer %p failed", + WINPR_CXX_COMPAT_CAST(const void*, client)); ret = STATE_RUN_FAILED; } else @@ -1148,7 +1149,8 @@ static state_run_t peer_recv_callback_internal(WINPR_ATTR_UNUSED rdpTransport* t case CONNECTION_STATE_FINALIZATION_CLIENT_GRANTED_CONTROL: case CONNECTION_STATE_FINALIZATION_CLIENT_FONT_MAP: default: - WLog_ERR(TAG, "%s state %d", rdp_get_state_string(rdp), rdp_get_state(rdp)); + WLog_ERR(TAG, "%s state %" PRId32, rdp_get_state_string(rdp), + WINPR_CXX_COMPAT_CAST(int32_t, rdp_get_state(rdp))); break; } diff --git a/libfreerdp/core/proxy.c b/libfreerdp/core/proxy.c index aed92324a..873fad43e 100644 --- a/libfreerdp/core/proxy.c +++ b/libfreerdp/core/proxy.c @@ -306,7 +306,7 @@ static BOOL check_no_proxy(rdpSettings* settings, const char* no_proxy) if (currentlen > 0) { - WLog_DBG(TAG, "%s => %s (%" PRIdz ")", settings->ServerHostname, current, currentlen); + WLog_DBG(TAG, "%s => %s (%" PRIuz ")", settings->ServerHostname, current, currentlen); if (no_proxy_match_host(current, settings->ServerHostname)) result = TRUE; @@ -813,8 +813,9 @@ static BOOL socks_proxy_userpass(rdpContext* context, BIO* bufferedBio, const ch if (!proxyUsername || !proxyPassword) { - WLog_ERR(TAG, "%s invalid username (%p) or password (%p)", logprefix, proxyUsername, - proxyPassword); + WLog_ERR(TAG, "%s invalid username (%p) or password (%p)", logprefix, + WINPR_CXX_COMPAT_CAST(const void*, proxyUsername), + WINPR_CXX_COMPAT_CAST(const void*, proxyPassword)); return FALSE; } @@ -896,7 +897,7 @@ static BOOL socks_proxy_connect(rdpContext* context, BIO* bufferedBio, const cha if (status != iwriteLen) { - WLog_ERR(TAG, "SOCKS proxy: failed to write AUTH METHOD request", logprefix); + WLog_ERR(TAG, "%s SOCKS proxy: failed to write AUTH METHOD request", logprefix); return FALSE; } } @@ -968,7 +969,7 @@ static BOOL socks_proxy_connect(rdpContext* context, BIO* bufferedBio, const cha if ((status < 0) || (status != ioffset)) { - WLog_ERR(TAG, "SOCKS proxy: failed to write CONN REQ", logprefix); + WLog_ERR(TAG, "%s SOCKS proxy: failed to write CONN REQ", logprefix); return FALSE; } } diff --git a/libfreerdp/core/redirection.c b/libfreerdp/core/redirection.c index 353dc0894..ddd65c323 100644 --- a/libfreerdp/core/redirection.c +++ b/libfreerdp/core/redirection.c @@ -385,13 +385,14 @@ BOOL rdp_redirection_read_target_cert(rdpCertificate** ptargetCertificate, const else { WLog_ERR(TAG, - "TargetCertificate data in unknown encoding %" PRIu32 " detected!"); + "TargetCertificate data in unknown encoding %" PRIu32 " detected!", + encoding); } break; default: /* ignore unknown fields */ WLog_VRB(TAG, "Unknown TargetCertificate field type %" PRIu32 ", encoding %" PRIu32 - " of length %" PRIu32, + " of length %" PRIuz, type, encoding, plength); break; } @@ -781,7 +782,7 @@ static state_run_t rdp_recv_server_redirection_pdu(rdpRdp* rdp, wStream* s) /* Ensure the text password is '\0' terminated */ if (_wcsnlen((const WCHAR*)redirection->Password, charLen) == charLen) { - WLog_ERR(TAG, "LB_PASSWORD: missing '\0' termination"); + WLog_ERR(TAG, "LB_PASSWORD: missing '\\0' termination"); return STATE_RUN_FAILED; } } diff --git a/libfreerdp/core/security.c b/libfreerdp/core/security.c index cd6e26af7..67986e5ab 100644 --- a/libfreerdp/core/security.c +++ b/libfreerdp/core/security.c @@ -831,7 +831,8 @@ BOOL security_encrypt(BYTE* data, size_t length, rdpRdp* rdp) WINPR_ASSERT(rdp); if (!rdp->rc4_encrypt_key) { - WLog_ERR(TAG, "rdp->rc4_encrypt_key=%p", rdp->rc4_encrypt_key); + WLog_ERR(TAG, "rdp->rc4_encrypt_key=%p", + WINPR_CXX_COMPAT_CAST(const void*, rdp->rc4_encrypt_key)); goto fail; } @@ -863,7 +864,8 @@ BOOL security_decrypt(BYTE* data, size_t length, rdpRdp* rdp) if (!rdp->rc4_decrypt_key) { - WLog_ERR(TAG, "rdp->rc4_decrypt_key=%p", rdp->rc4_decrypt_key); + WLog_ERR(TAG, "rdp->rc4_decrypt_key=%p", + WINPR_CXX_COMPAT_CAST(const void*, rdp->rc4_decrypt_key)); goto fail; } @@ -945,7 +947,8 @@ BOOL security_fips_decrypt(BYTE* data, size_t length, rdpRdp* rdp) if (!rdp || !rdp->fips_decrypt) { - WLog_ERR(TAG, "rdp=%p, rdp->fips_decrypt=%p", rdp, rdp ? rdp->fips_decrypt : NULL); + WLog_ERR(TAG, "rdp=%p, rdp->fips_decrypt=%p", WINPR_CXX_COMPAT_CAST(const void*, rdp), + WINPR_CXX_COMPAT_CAST(const void*, rdp ? rdp->fips_decrypt : NULL)); return FALSE; } diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c index c4f31b41f..ea1d986dc 100644 --- a/libfreerdp/core/settings.c +++ b/libfreerdp/core/settings.c @@ -263,7 +263,7 @@ static void settings_client_load_hkey_local_machine(rdpSettings* settings) settings_reg_query_word_val(hKey, numentries, &cache.cacheEntries); settings_reg_query_word_val(hKey, maxsize, &cache.cacheMaximumCellSize); if (!freerdp_settings_set_pointer_array(settings, FreeRDP_GlyphCache, x, &cache)) - WLog_WARN(TAG, "Failed to store GlyphCache %" PRIuz, x); + WLog_WARN(TAG, "Failed to store GlyphCache %u", x); } { GLYPH_CACHE_DEFINITION cache = { 0 }; diff --git a/libfreerdp/core/smartcardlogon.c b/libfreerdp/core/smartcardlogon.c index cb65422e4..953783bc6 100644 --- a/libfreerdp/core/smartcardlogon.c +++ b/libfreerdp/core/smartcardlogon.c @@ -418,9 +418,9 @@ static BOOL list_provider_keys(WINPR_ATTR_UNUSED const rdpSettings* settings, if (status != ERROR_SUCCESS) { WLog_DBG(TAG, - "unable to NCryptOpenKey(dwLegacyKeySpec=0x%" PRIx32 " dwFlags=0x%" PRIx32 + "unable to NCryptOpenKey(dwLegacyKeySpec=0x%08" PRIx32 " dwFlags=0x%08" PRIx32 "), status=%s, skipping", - status, keyName->dwLegacyKeySpec, keyName->dwFlags, + keyName->dwLegacyKeySpec, keyName->dwFlags, winpr_NCryptSecurityStatusError(status)); goto endofloop; } @@ -493,8 +493,8 @@ static BOOL list_provider_keys(WINPR_ATTR_UNUSED const rdpSettings* settings, if (status != ERROR_SUCCESS) { /* can happen that key don't have certificates */ - WLog_DBG(TAG, "unable to retrieve certificate property len, status=0x%lx, skipping", - status); + WLog_DBG(TAG, "unable to retrieve certificate property len, status=%s, skipping", + winpr_NCryptSecurityStatusError(status)); goto endofloop; } diff --git a/libfreerdp/core/surface.c b/libfreerdp/core/surface.c index 3a2830c8b..6447815a5 100644 --- a/libfreerdp/core/surface.c +++ b/libfreerdp/core/surface.c @@ -169,10 +169,10 @@ static BOOL update_recv_surfcmd_frame_marker(rdpUpdate* update, wStream* s) Stream_Read_UINT16(s, marker.frameAction); if (!Stream_CheckAndLogRequiredLength(TAG, s, 4)) WLog_WARN(TAG, - "[SERVER-BUG]: got %" PRIuz ", expected %" PRIuz + "[SERVER-BUG]: got %" PRIuz ", expected %u" " bytes. [MS-RDPBCGR] 2.2.9.2.3 Frame Marker Command (TS_FRAME_MARKER) is " "missing frameId, ignoring", - Stream_GetRemainingLength(s), 4); + Stream_GetRemainingLength(s), 4u); else Stream_Read_UINT32(s, marker.frameId); WLog_Print(up->log, WLOG_DEBUG, "SurfaceFrameMarker: action: %s (%" PRIu32 ") id: %" PRIu32 "", @@ -305,12 +305,15 @@ BOOL update_write_surfcmd_surface_bits(wStream* s, const SURFACE_BITS_COMMAND* c case CMDTYPE_STREAM_SURFACE_BITS: break; default: + { + const UINT16 defaultCmdType = CMDTYPE_STREAM_SURFACE_BITS; WLog_WARN(TAG, "SURFACE_BITS_COMMAND->cmdType 0x%04" PRIx16 " not allowed, correcting to 0x%04" PRIx16, - cmdType, CMDTYPE_STREAM_SURFACE_BITS); - cmdType = CMDTYPE_STREAM_SURFACE_BITS; - break; + cmdType, defaultCmdType); + cmdType = defaultCmdType; + } + break; } Stream_Write_UINT16(s, WINPR_ASSERTING_INT_CAST(uint16_t, cmdType)); diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c index 1043e71b3..1ce138c6b 100644 --- a/libfreerdp/core/tcp.c +++ b/libfreerdp/core/tcp.c @@ -361,7 +361,8 @@ static int transport_bio_simple_init(BIO* bio, SOCKET socket, int shutdown) /* WSAEventSelect automatically sets the socket in non-blocking mode */ if (WSAEventSelect(ptr->socket, ptr->hEvent, FD_READ | FD_ACCEPT | FD_CLOSE)) { - WLog_ERR(TAG, "WSAEventSelect returned 0x%08X", WSAGetLastError()); + WLog_ERR(TAG, "WSAEventSelect returned 0x%08x", + WINPR_CXX_COMPAT_CAST(unsigned, WSAGetLastError())); return 0; } @@ -865,7 +866,7 @@ static BOOL freerdp_tcp_connect_timeout(rdpContext* context, int sockfd, struct if (optval != 0) { char ebuffer[256] = { 0 }; - WLog_DBG(TAG, "connect failed with error: %s [%" PRIu32 "]", + WLog_DBG(TAG, "connect failed with error: %s [%" PRId32 "]", winpr_strerror(optval, ebuffer, sizeof(ebuffer)), optval); goto fail; } @@ -1175,7 +1176,7 @@ static int freerdp_vsock_connect(rdpContext* context, const char* hostname, int if (sockfd < 0) { char buffer[256] = { 0 }; - WLog_WARN(TAG, "socket(AF_VSOCK, SOCK_STREAM, 0) failed with %s [%d]", + WLog_WARN(TAG, "socket(AF_VSOCK, SOCK_STREAM, 0) failed with %s", winpr_strerror(errno, buffer, sizeof(buffer))); freerdp_set_last_error_if_not(context, FREERDP_ERROR_CONNECT_FAILED); return -1; @@ -1192,7 +1193,7 @@ static int freerdp_vsock_connect(rdpContext* context, const char* hostname, int if (errno || (val > UINT32_MAX)) { char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "could not extract port from '%s', value=%ul, error=%s", hostname, val, + WLog_ERR(TAG, "could not extract port from '%s', value=%lu, error=%s", hostname, val, winpr_strerror(errno, ebuffer, sizeof(ebuffer))); close(sockfd); return -1; @@ -1557,7 +1558,7 @@ rdpTransportLayer* freerdp_tcp_connect_layer(rdpContext* context, const char* ho /* WSAEventSelect automatically sets the socket in non-blocking mode */ if (WSAEventSelect((SOCKET)sockfd, tcpLayer->hEvent, FD_READ | FD_ACCEPT | FD_CLOSE)) { - WLog_ERR(TAG, "WSAEventSelect returned 0x%08X", WSAGetLastError()); + WLog_ERR(TAG, "WSAEventSelect returned 0x%08x", (unsigned)WSAGetLastError()); goto fail; } diff --git a/libfreerdp/core/tpdu.c b/libfreerdp/core/tpdu.c index f6f051bd1..21c2bd93d 100644 --- a/libfreerdp/core/tpdu.c +++ b/libfreerdp/core/tpdu.c @@ -255,8 +255,9 @@ BOOL tpdu_read_data(wStream* s, UINT16* LI, UINT16 tpktlength) if (code != X224_TPDU_DATA) { - WLog_ERR(TAG, "tpdu got code 0x%02" PRIx8 " expected X224_TPDU_DATA [0x%02x]", code, - X224_TPDU_DATA); + const BYTE dCode = X224_TPDU_DATA; + WLog_ERR(TAG, "tpdu got code 0x%02" PRIx8 " expected X224_TPDU_DATA [0x%02" PRIx8 "]", code, + dCode); return FALSE; } diff --git a/libfreerdp/crypto/ber.c b/libfreerdp/crypto/ber.c index 044b91ba4..9dd73496d 100644 --- a/libfreerdp/crypto/ber.c +++ b/libfreerdp/crypto/ber.c @@ -251,8 +251,7 @@ BOOL ber_read_contextual_tag(wStream* s, BYTE tag, size_t* length, BOOL pc) if (Stream_GetRemainingLength(s) < 1) { - WLog_VRB(TAG, "short data, got %" PRIuz ", expected %" PRIuz, Stream_GetRemainingLength(s), - 1); + WLog_VRB(TAG, "short data, got %" PRIuz ", expected %u", Stream_GetRemainingLength(s), 1u); return FALSE; } @@ -333,7 +332,7 @@ BOOL ber_read_enumerated(wStream* s, BYTE* enumerated, BYTE count) if (length != 1) { - WLog_WARN(TAG, "short data, got %" PRIuz ", expected %" PRIuz, length, 1); + WLog_WARN(TAG, "short data, got %" PRIuz ", expected %u", length, 1u); return FALSE; } if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) @@ -549,7 +548,7 @@ BOOL ber_read_BOOL(wStream* s, BOOL* value) if (length != 1) { - WLog_WARN(TAG, "short data, got %" PRIuz ", expected %" PRIuz, length, 1); + WLog_WARN(TAG, "short data, got %" PRIuz ", expected %u", length, 1u); return FALSE; } if (!Stream_CheckAndLogRequiredLength(TAG, s, 1)) diff --git a/libfreerdp/crypto/cert_common.c b/libfreerdp/crypto/cert_common.c index 6a23c1761..7a79b5f10 100644 --- a/libfreerdp/crypto/cert_common.c +++ b/libfreerdp/crypto/cert_common.c @@ -175,12 +175,13 @@ BOOL cert_info_read_exponent(rdpCertInfo* info, size_t size, wStream* s) return FALSE; if (size > 4) { - WLog_ERR(TAG, "exponent size %" PRIuz " exceeds limit of %" PRIu32, size, 4); + WLog_ERR(TAG, "exponent size %" PRIuz " exceeds limit of %" PRIu32, size, 4u); return FALSE; } if (!info->Modulus || (info->ModulusLength == 0)) { - WLog_ERR(TAG, "invalid modulus=%p [%" PRIu32 "]", info->Modulus, info->ModulusLength); + WLog_ERR(TAG, "invalid modulus=%p [%" PRIu32 "]", + WINPR_CXX_COMPAT_CAST(const void*, info->Modulus), info->ModulusLength); return FALSE; } Stream_Read(s, &info->exponent[4 - size], size); diff --git a/libfreerdp/crypto/certificate.c b/libfreerdp/crypto/certificate.c index 9b7048044..ebbfc8f42 100644 --- a/libfreerdp/crypto/certificate.c +++ b/libfreerdp/crypto/certificate.c @@ -555,7 +555,8 @@ static BOOL update_x509_from_info(rdpCertificate* cert) if (!mod || !e) { - WLog_ERR(TAG, "failure: mod=%p, e=%p", mod, e); + WLog_ERR(TAG, "failure: mod=%p, e=%p", WINPR_CXX_COMPAT_CAST(const void*, mod), + WINPR_CXX_COMPAT_CAST(const void*, e)); goto fail; } @@ -702,8 +703,8 @@ static BOOL certificate_process_server_public_key(rdpCertificate* cert, wStream* } if (datalen != (bitlen / 8ull) - 1ull) { - WLog_ERR(TAG, "Invalid RSA key datalen %" PRIu32 ", expected %" PRIu32, datalen, - (bitlen / 8ull) - 1ull); + WLog_ERR(TAG, "Invalid RSA key datalen %" PRIu32 ", expected %llu", datalen, + (1ull * bitlen / 8ull) - 1ull); return FALSE; } info->ModulusLength = keylen - 8; @@ -1462,12 +1463,13 @@ char* freerdp_certificate_get_fingerprint_by_hash_ex(const rdpCertificate* cert, char* fp_buffer = NULL; if (!cert || !cert->x509) { - WLog_ERR(TAG, "Invalid certificate [%p, %p]", cert, cert ? cert->x509 : NULL); + WLog_ERR(TAG, "Invalid certificate [%p, %p]", WINPR_CXX_COMPAT_CAST(const void*, cert), + WINPR_CXX_COMPAT_CAST(const void*, cert ? cert->x509 : NULL)); return NULL; } if (!hash) { - WLog_ERR(TAG, "Invalid certificate hash %p", hash); + WLog_ERR(TAG, "Invalid certificate hash %p", WINPR_CXX_COMPAT_CAST(const void*, hash)); return NULL; } fp = x509_utils_get_hash(cert->x509, hash, &fp_len); diff --git a/libfreerdp/crypto/per.c b/libfreerdp/crypto/per.c index 2e2e56eec..e122a8e60 100644 --- a/libfreerdp/crypto/per.c +++ b/libfreerdp/crypto/per.c @@ -313,8 +313,7 @@ BOOL per_read_integer16(wStream* s, UINT16* integer, UINT16 min) if (*integer > UINT16_MAX - min) { - WLog_WARN(TAG, "PER uint16 invalid value %" PRIu16 " > %" PRIu16, *integer, - UINT16_MAX - min); + WLog_WARN(TAG, "PER uint16 invalid value %" PRIu16 " > %d", *integer, UINT16_MAX - min); return FALSE; } @@ -489,7 +488,7 @@ BOOL per_read_octet_string(wStream* s, const BYTE* oct_str, UINT16 length, UINT1 if (mlength + min != length) { - WLog_ERR(TAG, "length mismatch: %" PRIu16 "!= %" PRIu16, mlength + min, length); + WLog_ERR(TAG, "length mismatch: %d!= %" PRIu16, mlength + min, length); return FALSE; } diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c index d17af11a3..2f3db93ff 100644 --- a/libfreerdp/crypto/tls.c +++ b/libfreerdp/crypto/tls.c @@ -363,7 +363,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr) BIO_clear_retry_flags(bio); status = BIO_ctrl(ssl_wbio, cmd, num, ptr); if (status != 1) - WLog_DBG(TAG, "BIO_ctrl returned %d", status); + WLog_DBG(TAG, "BIO_ctrl returned %ld", status); BIO_copy_next_retry(bio); status = 1; break; @@ -795,13 +795,13 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method, int op UINT16 version = freerdp_settings_get_uint16(settings, FreeRDP_TLSMinVersion); if (!SSL_CTX_set_min_proto_version(tls->ctx, version)) { - WLog_ERR(TAG, "SSL_CTX_set_min_proto_version %s failed", version); + WLog_ERR(TAG, "SSL_CTX_set_min_proto_version %" PRIu16 " failed", version); return FALSE; } version = freerdp_settings_get_uint16(settings, FreeRDP_TLSMaxVersion); if (!SSL_CTX_set_max_proto_version(tls->ctx, version)) { - WLog_ERR(TAG, "SSL_CTX_set_max_proto_version %s failed", version); + WLog_ERR(TAG, "SSL_CTX_set_max_proto_version %" PRIu16 " failed", version); return FALSE; } #endif diff --git a/libfreerdp/crypto/x509_utils.c b/libfreerdp/crypto/x509_utils.c index a322b67d0..579ffc993 100644 --- a/libfreerdp/crypto/x509_utils.c +++ b/libfreerdp/crypto/x509_utils.c @@ -49,14 +49,16 @@ BYTE* x509_utils_get_hash(const X509* xcert, const char* hash, size_t* length) } if (!xcert || !length) { - WLog_ERR(TAG, "Invalid arguments: xcert=%p, length=%p", xcert, length); + WLog_ERR(TAG, "Invalid arguments: xcert=%p, length=%p", + WINPR_CXX_COMPAT_CAST(const void*, xcert), + WINPR_CXX_COMPAT_CAST(const void*, length)); return NULL; } fp = calloc(fp_len + 1, sizeof(BYTE)); if (!fp) { - WLog_ERR(TAG, "could not allocate %" PRIuz " bytes", fp_len); + WLog_ERR(TAG, "could not allocate %" PRIu32 " bytes", fp_len); return NULL; } @@ -106,7 +108,7 @@ char* x509_utils_get_subject(const X509* xcert) char* subject = NULL; if (!xcert) { - WLog_ERR(TAG, "Invalid certificate %p", xcert); + WLog_ERR(TAG, "Invalid certificate %p", WINPR_CXX_COMPAT_CAST(const void*, xcert)); return NULL; } subject = crypto_print_name(X509_get_subject_name(xcert)); @@ -560,7 +562,7 @@ char* x509_utils_get_issuer(const X509* xcert) char* issuer = NULL; if (!xcert) { - WLog_ERR(TAG, "Invalid certificate %p", xcert); + WLog_ERR(TAG, "Invalid certificate %p", WINPR_CXX_COMPAT_CAST(const void*, xcert)); return NULL; } issuer = crypto_print_name(X509_get_issuer_name(xcert)); diff --git a/libfreerdp/emu/scard/smartcard_virtual_gids.c b/libfreerdp/emu/scard/smartcard_virtual_gids.c index 6f2ec6cd5..7acd491bd 100644 --- a/libfreerdp/emu/scard/smartcard_virtual_gids.c +++ b/libfreerdp/emu/scard/smartcard_virtual_gids.c @@ -1492,8 +1492,10 @@ BOOL vgids_init(vgidsContext* ctx, const char* cert, const char* privateKey, con /* Check params */ if (!cert || !privateKey || !pin) { - WLog_DBG(TAG, "Passed invalid NULL argument: cert=%p, privateKey=%p, pin=%p", cert, - privateKey, pin); + WLog_DBG(TAG, "Passed invalid NULL argument: cert=%p, privateKey=%p, pin=%p", + WINPR_CXX_COMPAT_CAST(const void*, cert), + WINPR_CXX_COMPAT_CAST(const void*, privateKey), + WINPR_CXX_COMPAT_CAST(const void*, pin)); goto init_failed; } diff --git a/libfreerdp/gdi/gdi.c b/libfreerdp/gdi/gdi.c index 770fa038d..283e9eea5 100644 --- a/libfreerdp/gdi/gdi.c +++ b/libfreerdp/gdi/gdi.c @@ -488,8 +488,10 @@ BOOL gdi_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bitmapUpdate) WLog_ERR(TAG, "Invalid arguments: context=%p, bitmapUpdate=%p, context->gdi=%p, " "context->codecs=%p", - context, bitmapUpdate, context ? context->gdi : NULL, - context ? context->codecs : NULL); + WINPR_CXX_COMPAT_CAST(const void*, context), + WINPR_CXX_COMPAT_CAST(const void*, bitmapUpdate), + WINPR_CXX_COMPAT_CAST(const void*, context ? context->gdi : NULL), + WINPR_CXX_COMPAT_CAST(const void*, context ? context->codecs : NULL)); return FALSE; } diff --git a/libfreerdp/gdi/gdi.h b/libfreerdp/gdi/gdi.h index 4c0ffa628..c8753a857 100644 --- a/libfreerdp/gdi/gdi.h +++ b/libfreerdp/gdi/gdi.h @@ -45,8 +45,8 @@ static inline BYTE* gdi_get_bitmap_pointer(HGDI_DC hdcBmp, INT32 x, INT32 y) else { WLog_ERR(FREERDP_TAG("gdi"), - "gdi_get_bitmap_pointer: requesting invalid pointer: (%" PRIu32 ",%" PRIu32 - ") in %" PRIu32 "x%" PRIu32 "", + "gdi_get_bitmap_pointer: requesting invalid pointer: (%" PRId32 ",%" PRId32 + ") in %" PRId32 "x%" PRId32 "", x, y, hBmp->width, hBmp->height); return 0; } diff --git a/libfreerdp/primitives/primitives.c b/libfreerdp/primitives/primitives.c index b19cb53b9..bfeab7d57 100644 --- a/libfreerdp/primitives/primitives.c +++ b/libfreerdp/primitives/primitives.c @@ -344,7 +344,7 @@ BOOL primitives_init(primitives_t* p, primitive_hints hints) return TRUE; #endif default: - WLog_ERR(TAG, "unknown hint %d", hints); + WLog_ERR(TAG, "unknown hint %u", hints); return FALSE; } } diff --git a/libfreerdp/utils/encoded_types.c b/libfreerdp/utils/encoded_types.c index f419dd09a..ce635ab01 100644 --- a/libfreerdp/utils/encoded_types.c +++ b/libfreerdp/utils/encoded_types.c @@ -377,7 +377,7 @@ BOOL freerdp_write_four_byte_float(wStream* s, double value) } else { - WLog_ERR(TAG, "Invalid byte count for value %ld", value); + WLog_ERR(TAG, "Invalid byte count for value %lf", value); return FALSE; } diff --git a/server/Sample/sf_audin.c b/server/Sample/sf_audin.c index 02d3f4bc8..796e926d7 100644 --- a/server/Sample/sf_audin.c +++ b/server/Sample/sf_audin.c @@ -42,7 +42,7 @@ static UINT sf_peer_audin_data(WINPR_ATTR_UNUSED audin_server_context* audin, WINPR_ASSERT(data); WLog_WARN(TAG, "not implemented"); - WLog_DBG(TAG, "receive %" PRIdz " bytes.", Stream_Length(data->Data)); + WLog_DBG(TAG, "receive %" PRIuz " bytes.", Stream_Length(data->Data)); return CHANNEL_RC_OK; } diff --git a/server/proxy/modules/demo/demo.cpp b/server/proxy/modules/demo/demo.cpp index 75a71a007..aada444c3 100644 --- a/server/proxy/modules/demo/demo.cpp +++ b/server/proxy/modules/demo/demo.cpp @@ -278,7 +278,7 @@ static BOOL demo_mouse_event([[maybe_unused]] proxyPlugin* plugin, WINPR_ASSERT(pdata); WINPR_ASSERT(event_data); - WLog_INFO(TAG, "called %p", event_data); + WLog_INFO(TAG, "called %p", WINPR_CXX_COMPAT_CAST(const void*, event_data)); return TRUE; } @@ -291,7 +291,7 @@ static BOOL demo_mouse_ex_event([[maybe_unused]] proxyPlugin* plugin, WINPR_ASSERT(pdata); WINPR_ASSERT(event_data); - WLog_INFO(TAG, "called %p", event_data); + WLog_INFO(TAG, "called %p", WINPR_CXX_COMPAT_CAST(const void*, event_data)); return TRUE; } @@ -349,7 +349,7 @@ static BOOL demo_server_fetch_target_addr([[maybe_unused]] proxyPlugin* plugin, WINPR_ASSERT(pdata); WINPR_ASSERT(event_data); - WLog_INFO(TAG, "called %p", event_data); + WLog_INFO(TAG, "called %p", WINPR_CXX_COMPAT_CAST(const void*, event_data)); return TRUE; } @@ -376,7 +376,7 @@ static BOOL demo_dyn_channel_intercept_list([[maybe_unused]] proxyPlugin* plugin WINPR_ASSERT(pdata); WINPR_ASSERT(data); - WLog_INFO(TAG, "%s: %p", __func__, data); + WLog_INFO(TAG, "%s: %p", __func__, WINPR_CXX_COMPAT_CAST(const void*, data)); return TRUE; } @@ -390,7 +390,7 @@ static BOOL demo_static_channel_intercept_list([[maybe_unused]] proxyPlugin* plu WINPR_ASSERT(pdata); WINPR_ASSERT(data); - WLog_INFO(TAG, "%s: %p", __func__, data); + WLog_INFO(TAG, "%s: %p", __func__, WINPR_CXX_COMPAT_CAST(const void*, data)); return TRUE; } @@ -404,7 +404,7 @@ static BOOL demo_dyn_channel_intercept([[maybe_unused]] proxyPlugin* plugin, WINPR_ASSERT(pdata); WINPR_ASSERT(data); - WLog_INFO(TAG, "%s: %p", __func__, data); + WLog_INFO(TAG, "%s: %p", __func__, WINPR_CXX_COMPAT_CAST(const void*, data)); return TRUE; } diff --git a/server/proxy/pf_config.c b/server/proxy/pf_config.c index 1416ed9de..1a5bc14d9 100644 --- a/server/proxy/pf_config.c +++ b/server/proxy/pf_config.c @@ -378,7 +378,8 @@ static char* pf_config_decode_base64(const char* data, const char* name, size_t* char* decoded = NULL; if (!data) { - WLog_ERR(TAG, "Invalid base64 data [%p] for %s", data, name); + WLog_ERR(TAG, "Invalid base64 data [%p] for %s", WINPR_CXX_COMPAT_CAST(const void*, data), + name); return NULL; } diff --git a/server/proxy/pf_modules.c b/server/proxy/pf_modules.c index aee04cbab..a0876c6e2 100644 --- a/server/proxy/pf_modules.c +++ b/server/proxy/pf_modules.c @@ -357,7 +357,7 @@ static BOOL pf_modules_set_plugin_data(WINPR_ATTR_UNUSED proxyPluginsManager* mg if (!HashTable_Insert(pdata->modules_info, ccharconv.cp, data)) { - WLog_ERR(TAG, "[%s]: HashTable_Insert failed!"); + WLog_ERR(TAG, "HashTable_Insert failed!"); return FALSE; } diff --git a/server/proxy/pf_server.c b/server/proxy/pf_server.c index 8832f67d8..6f9645ae4 100644 --- a/server/proxy/pf_server.c +++ b/server/proxy/pf_server.c @@ -197,7 +197,7 @@ static BOOL pf_server_get_target_info(rdpContext* context, rdpSettings* settings return freerdp_settings_set_uint32(settings, FreeRDP_ServerPort, ev.target_port); } default: - PROXY_LOG_ERR(TAG, ps, "unknown target fetch method: %d", ev.fetch_method); + PROXY_LOG_ERR(TAG, ps, "unknown target fetch method: %u", ev.fetch_method); return FALSE; } diff --git a/server/shadow/shadow_input.c b/server/shadow/shadow_input.c index 4308ad300..7a47310a4 100644 --- a/server/shadow/shadow_input.c +++ b/server/shadow/shadow_input.c @@ -126,7 +126,7 @@ static BOOL shadow_input_rel_mouse_event(rdpInput* input, UINT16 flags, INT16 xD PTR_FLAGS_BUTTON3 | PTR_XFLAGS_BUTTON1 | PTR_XFLAGS_BUTTON2; if ((flags & mask) != 0) { - WLog_WARN(TAG, "Unknown flags 0x%04" PRIx16, flags & ~mask); + WLog_WARN(TAG, "Unknown flags 0x%04x", WINPR_CXX_COMPAT_CAST(unsigned, flags & ~mask)); } if (!client->mayInteract) return TRUE; diff --git a/server/shadow/shadow_server.c b/server/shadow/shadow_server.c index 6a9e4816f..a8fa73cf4 100644 --- a/server/shadow/shadow_server.c +++ b/server/shadow/shadow_server.c @@ -591,9 +591,10 @@ int shadow_server_parse_command_line(rdpShadowServer* server, int argc, char** a const MONITOR_DEF* monitor = &monitors[index]; const INT64 width = monitor->right - monitor->left + 1; const INT64 height = monitor->bottom - monitor->top + 1; - WLog_INFO(TAG, " %s [%d] %" PRId64 "x%" PRId64 "\t+%" PRId32 "+%" PRId32 "", - (monitor->flags == 1) ? "*" : " ", index, width, height, monitor->left, - monitor->top); + WLog_INFO( + TAG, " %s [%" PRIu32 "] %" PRId64 "x%" PRId64 "\t+%" PRId32 "+%" PRId32 "", + (monitor->flags == 1) ? "*" : " ", index, width, height, monitor->left, + monitor->top); } status = COMMAND_LINE_STATUS_PRINT; diff --git a/tools/update-settings-tests b/tools/update-settings-tests index dcf96d8f5..5ec44de4a 100755 --- a/tools/update-settings-tests +++ b/tools/update-settings-tests @@ -109,7 +109,7 @@ def write_getter_body(f, values, ret, keys, isPointer, compat_values, typestr, e write_getter_case(f, val, cast, typestr) f.write('#endif\n') f.write('\t\tdefault:\n') - f.write('\t\t\tWLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n') + f.write('\t\t\tWLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n') f.write('\t\t\tWINPR_ASSERT(FALSE);\n') f.write('\t\t\treturn ' + ret + ';\n') f.write('\t}\n') @@ -226,7 +226,7 @@ def write_setter(f, entry_dict, entry_type, entry_name, postfix, compat_dict): write_setter_case(f, val, postfix, isPointer, cast) f.write('#endif\n') f.write('\t\tdefault:\n') - f.write('\t\t\tWLog_ERR(TAG, "Invalid key index %" PRIuz " [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n') + f.write('\t\t\tWLog_ERR(TAG, "Invalid key index %d [%s|%s]", id, freerdp_settings_get_name_for_key(id), freerdp_settings_get_type_name_for_key(id));\n') f.write('\t\t\treturn FALSE;\n') f.write('\t}\n') f.write('\treturn TRUE;\n') diff --git a/winpr/include/winpr/wlog.h b/winpr/include/winpr/wlog.h index 61afed879..5912da78e 100644 --- a/winpr/include/winpr/wlog.h +++ b/winpr/include/winpr/wlog.h @@ -30,6 +30,7 @@ extern "C" #include +#include #include #include #include @@ -261,8 +262,10 @@ extern "C" } \ } while (0) + WINPR_ATTR_FORMAT_ARG(6, 7) static inline void WLog_Print_dbg_tag(const char* WINPR_RESTRICT tag, DWORD log_level, - size_t line, const char* file, const char* fkt, ...) + size_t line, const char* file, const char* fkt, + WINPR_FORMAT_ARG const char* fmt, ...) { static wLog* log_cached_ptr = NULL; if (!log_cached_ptr) @@ -271,8 +274,8 @@ extern "C" if (WLog_IsLevelActive(log_cached_ptr, log_level)) { va_list ap; - va_start(ap, fkt); - WLog_PrintMessageVA(log_cached_ptr, WLOG_MESSAGE_TEXT, log_level, line, file, fkt, ap); + va_start(ap, fmt); + WLog_PrintTextMessageVA(log_cached_ptr, log_level, line, file, fkt, fmt, ap); va_end(ap); } } diff --git a/winpr/libwinpr/clipboard/clipboard.c b/winpr/libwinpr/clipboard/clipboard.c index ea6c0e05b..51a7823ec 100644 --- a/winpr/libwinpr/clipboard/clipboard.c +++ b/winpr/libwinpr/clipboard/clipboard.c @@ -438,7 +438,9 @@ void* ClipboardGetData(wClipboard* clipboard, UINT32 formatId, UINT32* pSize) if (!clipboard || !pSize) { - WLog_ERR(TAG, "Invalid parameters clipboard=%p, pSize=%p", clipboard, pSize); + WLog_ERR(TAG, "Invalid parameters clipboard=%p, pSize=%p", + WINPR_CXX_COMPAT_CAST(const void*, clipboard), + WINPR_CXX_COMPAT_CAST(const void*, pSize)); return NULL; } @@ -654,7 +656,7 @@ char* parse_uri_to_local_file(const char* uri, size_t uri_len) WINPR_ASSERT(uri || (uri_len == 0)); - WLog_VRB(TAG, "processing URI: %.*s", uri_len, uri); + WLog_VRB(TAG, "processing URI: %.*s", WINPR_ASSERTING_INT_CAST(int, uri_len), uri); if ((uri_len <= prefixLen) || strncmp(uri, prefix, prefixLen) != 0) { diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c index b58164186..147d99b4b 100644 --- a/winpr/libwinpr/clipboard/synthetic_file.c +++ b/winpr/libwinpr/clipboard/synthetic_file.c @@ -158,7 +158,9 @@ static WCHAR* convert_local_name_component_to_remote(wClipboard* clipboard, cons */ if (!delegate->IsFileNameComponentValid(remote_name)) { - WLog_ERR(TAG, "invalid file name component: %s", local_name); + char name[MAX_PATH] = { 0 }; + ConvertWCharToUtf8(local_name, name, sizeof(name) - 1); + WLog_ERR(TAG, "invalid file name component: %s", name); goto error; } @@ -422,7 +424,7 @@ static BOOL process_uri_list(wClipboard* clipboard, const char* data, size_t len WINPR_ASSERT(clipboard); WINPR_ASSERT(data); - WLog_VRB(TAG, "processing URI list:\n%.*s", length, data); + WLog_VRB(TAG, "processing URI list:\n%.*s", WINPR_ASSERTING_INT_CAST(int, length), data); ArrayList_Clear(clipboard->localFiles); /* @@ -1040,10 +1042,10 @@ UINT synthetic_file_read_close(struct synthetic_file* file, BOOL force) file_get_size(file, &size); if ((file->offset < 0) || ((UINT64)file->offset >= size) || force) { - WLog_VRB(TAG, "close file %d", file->fd); + WLog_VRB(TAG, "close file %p", file->fd); if (!CloseHandle(file->fd)) { - WLog_WARN(TAG, "failed to close fd %d: %" PRIu32, file->fd, GetLastError()); + WLog_WARN(TAG, "failed to close fd %p: %" PRIu32, file->fd, GetLastError()); } file->fd = INVALID_HANDLE_VALUE; @@ -1071,17 +1073,21 @@ static UINT file_get_range(struct synthetic_file* file, UINT64 offset, UINT32 si FILE_ATTRIBUTE_NORMAL, NULL); if (INVALID_HANDLE_VALUE == file->fd) { + char name[MAX_PATH] = { 0 }; + ConvertWCharToUtf8(file->local_name, name, sizeof(name) - 1); error = GetLastError(); - WLog_ERR(TAG, "failed to open file %s: 0x%08" PRIx32, file->local_name, error); + WLog_ERR(TAG, "failed to open file %s: 0x%08" PRIx32, name, error); return error; } if (!GetFileInformationByHandle(file->fd, &FileInfo)) { + char name[MAX_PATH] = { 0 }; + ConvertWCharToUtf8(file->local_name, name, sizeof(name) - 1); (void)CloseHandle(file->fd); file->fd = INVALID_HANDLE_VALUE; error = GetLastError(); - WLog_ERR(TAG, "Get file [%s] information fail: 0x%08" PRIx32, file->local_name, error); + WLog_ERR(TAG, "Get file [%s] information fail: 0x%08" PRIx32, name, error); return error; } @@ -1115,7 +1121,7 @@ static UINT file_get_range(struct synthetic_file* file, UINT64 offset, UINT32 si if (file->offset != (INT64)offset) { - WLog_DBG(TAG, "file %d force seeking to %" PRIu64 ", current %" PRIu64, file->fd, + WLog_DBG(TAG, "file %p force seeking to %" PRIu64 ", current %" PRId64, file->fd, offset, file->offset); dwHigh = offset >> 32; @@ -1144,7 +1150,7 @@ static UINT file_get_range(struct synthetic_file* file, UINT64 offset, UINT32 si *actual_data = buffer; file->offset += *actual_size; - WLog_VRB(TAG, "file %d actual read %" PRIu32 " bytes (offset %" PRIu64 ")", file->fd, + WLog_VRB(TAG, "file %p actual read %" PRIu32 " bytes (offset %" PRId64 ")", file->fd, *actual_size, file->offset); } while (0); diff --git a/winpr/libwinpr/crt/unicode_icu.c b/winpr/libwinpr/crt/unicode_icu.c index e134a9ed9..1a00bb4a7 100644 --- a/winpr/libwinpr/crt/unicode_icu.c +++ b/winpr/libwinpr/crt/unicode_icu.c @@ -122,11 +122,11 @@ int int_MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr, break; default: WLog_WARN(TAG, "unexpected ICU error code %s [0x%08" PRIx32 "]", u_errorName(error), - error); + WINPR_CXX_COMPAT_CAST(unsigned, error)); if (U_FAILURE(error)) { WLog_ERR(TAG, "unexpected ICU error code %s [0x%08" PRIx32 "] is fatal", - u_errorName(error), error); + u_errorName(error), WINPR_CXX_COMPAT_CAST(unsigned, error)); cchWideChar = 0; SetLastError(ERROR_NO_UNICODE_TRANSLATION); } @@ -217,11 +217,11 @@ int int_WideCharToMultiByte(UINT CodePage, WINPR_ATTR_UNUSED DWORD dwFlags, LPCW break; default: WLog_WARN(TAG, "unexpected ICU error code %s [0x%08" PRIx32 "]", u_errorName(error), - error); + WINPR_CXX_COMPAT_CAST(unsigned, error)); if (U_FAILURE(error)) { WLog_ERR(TAG, "unexpected ICU error code %s [0x%08" PRIx32 "] is fatal", - u_errorName(error), error); + u_errorName(error), WINPR_CXX_COMPAT_CAST(unsigned, error)); cbMultiByte = 0; SetLastError(ERROR_NO_UNICODE_TRANSLATION); } diff --git a/winpr/libwinpr/file/file.c b/winpr/libwinpr/file/file.c index 7fc3da5e9..112dc43a6 100644 --- a/winpr/libwinpr/file/file.c +++ b/winpr/libwinpr/file/file.c @@ -110,6 +110,32 @@ static BOOL FileCloseHandle(HANDLE handle) return FileCloseHandleInt(handle, FALSE); } +#define log_error(fkt, file) log_error_((fkt), (file), __FILE__, __func__, __LINE__) +static BOOL log_error_(const char* name, const WINPR_FILE* pFile, const char* file, const char* fkt, + size_t line) +{ + char ebuffer[256] = { 0 }; + + WINPR_ASSERT(name); + WINPR_ASSERT(pFile); + WINPR_ASSERT(file); + WINPR_ASSERT(fkt); + + const DWORD level = WLOG_ERROR; + static wLog* log = NULL; + if (!log) + log = WLog_Get(TAG); + + if (WLog_IsLevelActive(log, level)) + { + WLog_PrintTextMessage(log, level, line, file, fkt, "%s %s failed with %s [0x08%x]", name, + pFile->lpFileName, winpr_strerror(errno, ebuffer, sizeof(ebuffer)), + WINPR_CXX_COMPAT_CAST(unsigned, errno)); + } + SetLastError(map_posix_err(errno)); + return FALSE; +} + static BOOL FileSetEndOfFile(HANDLE hFile) { WINPR_FILE* pFile = (WINPR_FILE*)hFile; @@ -122,13 +148,7 @@ static BOOL FileSetEndOfFile(HANDLE hFile) return FALSE; if (ftruncate(fileno(pFile->fp), (off_t)size) < 0) - { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "ftruncate %s failed with %s [0x%08X]", pFile->lpFileName, - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); - SetLastError(map_posix_err(errno)); - return FALSE; - } + return log_error("ftruncate", pFile); return TRUE; } @@ -171,10 +191,7 @@ static DWORD FileSetFilePointer(HANDLE hFile, LONG lDistanceToMove, if (_fseeki64(pFile->fp, offset, whence)) { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "_fseeki64(%s) failed with %s [0x%08X]", pFile->lpFileName, - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); - SetLastError(map_posix_err(errno)); + (void)log_error("_fseeki64", pFile); return INVALID_SET_FILE_POINTER; } @@ -206,13 +223,7 @@ static BOOL FileSetFilePointerEx(HANDLE hFile, LARGE_INTEGER liDistanceToMove, } if (_fseeki64(pFile->fp, liDistanceToMove.QuadPart, whence)) - { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "_fseeki64(%s) failed with %s [0x%08X]", pFile->lpFileName, - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); - SetLastError(map_posix_err(errno)); - return FALSE; - } + return log_error("_fseeki64", pFile); if (lpNewFilePointer) lpNewFilePointer->QuadPart = _ftelli64(pFile->fp); @@ -306,19 +317,13 @@ static DWORD FileGetFileSize(HANDLE Object, LPDWORD lpFileSizeHigh) if (cur < 0) { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "_ftelli64(%s) failed with %s [0x%08X]", file->lpFileName, - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); - SetLastError(map_posix_err(errno)); + (void)log_error("_ftelli64", file); return INVALID_FILE_SIZE; } if (_fseeki64(file->fp, 0, SEEK_END) != 0) { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "_fseeki64(%s) failed with %s [0x%08X]", file->lpFileName, - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); - SetLastError(map_posix_err(errno)); + (void)log_error("_fseeki64", file); return INVALID_FILE_SIZE; } @@ -326,19 +331,13 @@ static DWORD FileGetFileSize(HANDLE Object, LPDWORD lpFileSizeHigh) if (size < 0) { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "_ftelli64(%s) failed with %s [0x%08X]", file->lpFileName, - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); - SetLastError(map_posix_err(errno)); + (void)log_error("_ftelli64", file); return INVALID_FILE_SIZE; } if (_fseeki64(file->fp, cur, SEEK_SET) != 0) { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "_ftelli64(%s) failed with %s [0x%08X]", file->lpFileName, - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); - SetLastError(map_posix_err(errno)); + (void)log_error("_fseeki64", file); return INVALID_FILE_SIZE; } @@ -388,13 +387,7 @@ static BOOL FileGetFileInformationByHandle(HANDLE hFile, return FALSE; if (fstat(fileno(pFile->fp), &st) == -1) - { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "fstat failed with %s [%#08X]", errno, - winpr_strerror(errno, ebuffer, sizeof(ebuffer))); - SetLastError(map_posix_err(errno)); - return FALSE; - } + return log_error("fstat", pFile); lpFileInformation->dwFileAttributes = 0; @@ -502,13 +495,7 @@ static BOOL FileLockFileEx(HANDLE hFile, DWORD dwFlags, WINPR_ATTR_UNUSED DWORD lock |= LOCK_NB; if (flock(fileno(pFile->fp), lock) < 0) - { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "flock failed with %s [0x%08X]", - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); - SetLastError(map_posix_err(errno)); - return FALSE; - } + return log_error("flock", pFile); #endif pFile->bLocked = TRUE; @@ -541,23 +528,11 @@ static BOOL FileUnlockFile(HANDLE hFile, WINPR_ATTR_UNUSED DWORD dwFileOffsetLow lock.l_whence = SEEK_SET; lock.l_type = F_UNLCK; if (fcntl(fileno(pFile->fp), F_GETLK, &lock) == -1) - { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "F_UNLCK on %s failed with %s [0x%08X]", pFile->lpFileName, - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); - SetLastError(map_posix_err(errno)); - return FALSE; - } + return log_error("F_GETLK", pFile); #else if (flock(fileno(pFile->fp), LOCK_UN) < 0) - { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "flock(LOCK_UN) %s failed with %s [0x%08X]", pFile->lpFileName, - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); - SetLastError(map_posix_err(errno)); - return FALSE; - } + return log_error("flock", pFile); #endif return TRUE; @@ -595,22 +570,10 @@ static BOOL FileUnlockFileEx(HANDLE hFile, WINPR_ATTR_UNUSED DWORD dwReserved, lock.l_whence = SEEK_SET; lock.l_type = F_UNLCK; if (fcntl(fileno(pFile->fp), F_GETLK, &lock) == -1) - { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "F_UNLCK on %s failed with %s [0x%08X]", pFile->lpFileName, - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); - SetLastError(map_posix_err(errno)); - return FALSE; - } + return log_error("F_GETLK", pFile); #else if (flock(fileno(pFile->fp), LOCK_UN) < 0) - { - char ebuffer[256] = { 0 }; - WLog_ERR(TAG, "flock(LOCK_UN) %s failed with %s [0x%08X]", pFile->lpFileName, - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); - SetLastError(map_posix_err(errno)); - return FALSE; - } + return log_error("flock", pFile); #endif return TRUE; @@ -1023,13 +986,10 @@ static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dw if (flock(fileno(pFile->fp), lock) < 0) #endif { - char ebuffer[256] = { 0 }; #ifdef __sun - WLog_ERR(TAG, "F_SETLKW failed with %s [0x%08X]", - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); + (void)log_error("F_SETLKW", pFile); #else - WLog_ERR(TAG, "flock failed with %s [0x%08X]", - winpr_strerror(errno, ebuffer, sizeof(ebuffer)), errno); + (void)log_error("flock", pFile); #endif SetLastError(map_posix_err(errno)); diff --git a/winpr/libwinpr/ncrypt/ncrypt.c b/winpr/libwinpr/ncrypt/ncrypt.c index 467837295..a39a96e77 100644 --- a/winpr/libwinpr/ncrypt/ncrypt.c +++ b/winpr/libwinpr/ncrypt/ncrypt.c @@ -36,7 +36,7 @@ SECURITY_STATUS checkNCryptHandle(NCRYPT_HANDLE handle, NCryptHandleType matchTy { if (!handle) { - WLog_VRB(TAG, "invalid handle '%p'", handle); + WLog_VRB(TAG, "invalid handle '%p'", WINPR_CXX_COMPAT_CAST(const void*, handle)); return ERROR_INVALID_PARAMETER; } @@ -49,7 +49,8 @@ SECURITY_STATUS checkNCryptHandle(NCRYPT_HANDLE handle, NCryptHandleType matchTy memcpy(magic1, base->magic, ARRAYSIZE(NCRYPT_MAGIC)); memcpy(magic2, NCRYPT_MAGIC, ARRAYSIZE(NCRYPT_MAGIC)); - WLog_VRB(TAG, "handle '%p' invalid magic '%s' instead of '%s'", base, magic1, magic2); + WLog_VRB(TAG, "handle '%p' invalid magic '%s' instead of '%s'", + WINPR_CXX_COMPAT_CAST(const void*, base), magic1, magic2); return ERROR_INVALID_PARAMETER; } @@ -59,13 +60,17 @@ SECURITY_STATUS checkNCryptHandle(NCRYPT_HANDLE handle, NCryptHandleType matchTy case WINPR_NCRYPT_KEY: break; default: - WLog_VRB(TAG, "handle '%p' invalid type %d", base, base->type); + WLog_VRB(TAG, "handle '%p' invalid type %d", WINPR_CXX_COMPAT_CAST(const void*, base), + WINPR_CXX_COMPAT_CAST(int32_t, base->type)); return ERROR_INVALID_PARAMETER; } if ((matchType != WINPR_NCRYPT_INVALID) && (base->type != matchType)) { - WLog_VRB(TAG, "handle '%p' invalid type %d, expected %d", base, base->type, matchType); + WLog_VRB(TAG, "handle '%p' invalid type %d, expected %d", + WINPR_CXX_COMPAT_CAST(const void*, base), + WINPR_CXX_COMPAT_CAST(int32_t, base->type), + WINPR_CXX_COMPAT_CAST(int32_t, matchType)); return ERROR_INVALID_PARAMETER; } return ERROR_SUCCESS; diff --git a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c index 37da1ca3a..55a3cf076 100644 --- a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c +++ b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c @@ -121,8 +121,7 @@ static SECURITY_STATUS NCryptP11StorageProvider_dtor(NCRYPT_HANDLE handle) if (provider->p11 && provider->p11->C_Finalize) rv = provider->p11->C_Finalize(NULL); if (rv != CKR_OK) - WLog_WARN(TAG, "C_Finalize failed with %s [0x%08" PRIx32 "]", CK_RV_error_string(rv), - rv); + WLog_WARN(TAG, "C_Finalize failed with %s [0x%08lx]", CK_RV_error_string(rv), rv); free(provider->modulePath); @@ -233,12 +232,12 @@ static CK_RV object_load_attributes(NCryptP11ProviderHandle* provider, CK_SESSIO rv = provider->p11->C_GetAttributeValue(session, object, attributes, count); if (rv != CKR_OK) - WLog_WARN(TAG, "C_GetAttributeValue failed with %s [0x%08" PRIx32 "]", + WLog_WARN(TAG, "C_GetAttributeValue failed with %s [0x%08lx]", CK_RV_error_string(rv), rv); break; default: - WLog_WARN(TAG, "C_GetAttributeValue failed with %s [0x%08" PRIx32 "]", - CK_RV_error_string(rv), rv); + WLog_WARN(TAG, "C_GetAttributeValue failed with %s [0x%08lx]", CK_RV_error_string(rv), + rv); return rv; } @@ -248,8 +247,7 @@ static CK_RV object_load_attributes(NCryptP11ProviderHandle* provider, CK_SESSIO case CKR_ATTRIBUTE_TYPE_INVALID: case CKR_BUFFER_TOO_SMALL: WLog_ERR(TAG, - "C_GetAttributeValue failed with %s [0x%08" PRIx32 - "] even after buffer allocation", + "C_GetAttributeValue failed with %s [0x%08lx] even after buffer allocation", CK_RV_error_string(rv), rv); break; default: @@ -384,7 +382,7 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe CK_FUNCTION_LIST_PTR p11 = provider->p11; WINPR_ASSERT(p11); - WLog_DBG(TAG, "checking %" PRIu32 " slots for valid keys...", state->nslots); + WLog_DBG(TAG, "checking %lx slots for valid keys...", state->nslots); state->nKeys = 0; for (CK_ULONG i = 0; i < state->nslots; i++) { @@ -401,15 +399,14 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe } fix_padded_string((char*)slotInfo.slotDescription, sizeof(slotInfo.slotDescription)); - WLog_DBG(TAG, "collecting keys for slot #%" PRIu32 "(%" PRIu32 ") descr='%s' flags=0x%x", i, + WLog_DBG(TAG, "collecting keys for slot #%lx(%lu) descr='%s' flags=0x%lx", i, state->slots[i], slotInfo.slotDescription, slotInfo.flags); /* this is a safety guard as we're supposed to have listed only readers with tokens in them */ if (!(slotInfo.flags & CKF_TOKEN_PRESENT)) { - WLog_INFO(TAG, "token not present for slot #%" PRIu32 "(%" PRIu32 ")", i, - state->slots[i]); + WLog_INFO(TAG, "token not present for slot #%lu(%lu)", i, state->slots[i]); continue; } @@ -420,16 +417,16 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe else { fix_padded_string((char*)tokenInfo.label, sizeof(tokenInfo.label)); - WLog_DBG(TAG, "token, label='%s' flags=0x%x", tokenInfo.label, tokenInfo.flags); + WLog_DBG(TAG, "token, label='%s' flags=0x%lx", tokenInfo.label, tokenInfo.flags); } WINPR_ASSERT(p11->C_OpenSession); rv = p11->C_OpenSession(state->slots[i], CKF_SERIAL_SESSION, NULL, NULL, &session); if (rv != CKR_OK) { - WLog_ERR(TAG, - "unable to openSession for slot #%" PRIu32 "(%" PRIu32 "), session=%p rv=%s", - i, state->slots[i], session, CK_RV_error_string(rv)); + WLog_ERR(TAG, "unable to openSession for slot #%lu(%lu), session=%p rv=%s", i, + state->slots[i], WINPR_CXX_COMPAT_CAST(const void*, session), + CK_RV_error_string(rv)); continue; } @@ -453,7 +450,7 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe goto cleanup_FindObjects; } - WLog_DBG(TAG, "slot has %d objects", nslotObjects); + WLog_DBG(TAG, "slot has %lu objects", nslotObjects); for (CK_ULONG j = 0; j < nslotObjects; j++) { NCryptKeyEnum* key = &state->keys[state->nKeys]; @@ -732,8 +729,7 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p { free(state); /* TODO: perhaps convert rv to NTE_*** errors */ - WLog_WARN(TAG, "C_GetSlotList failed with %s [0x%08" PRIx32 "]", CK_RV_error_string(rv), - rv); + WLog_WARN(TAG, "C_GetSlotList failed with %s [0x%08lx]", CK_RV_error_string(rv), rv); return NTE_FAIL; } @@ -745,8 +741,7 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p { free(state); /* TODO: perhaps convert rv to NTE_*** errors */ - WLog_WARN(TAG, "C_GetSlotList failed with %s [0x%08" PRIx32 "]", CK_RV_error_string(rv), - rv); + WLog_WARN(TAG, "C_GetSlotList failed with %s [0x%08lx]", CK_RV_error_string(rv), rv); return NTE_FAIL; } @@ -785,7 +780,7 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p WINPR_ASSERT(provider->p11->C_CloseSession); rv = provider->p11->C_CloseSession(currentSession); if (rv != CKR_OK) - WLog_WARN(TAG, "C_CloseSession failed with %s [0x%08" PRIx32 "]", + WLog_WARN(TAG, "C_CloseSession failed with %s [0x%08lx]", CK_RV_error_string(rv), rv); currentSession = (CK_SESSION_HANDLE)NULL; } @@ -795,7 +790,7 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p ¤tSession); if (rv != CKR_OK) { - WLog_ERR(TAG, "C_OpenSession failed with %s [0x%08" PRIx32 "] for slot %d", + WLog_ERR(TAG, "C_OpenSession failed with %s [0x%08lx] for slot %lu", CK_RV_error_string(rv), rv, key->slotId); continue; } @@ -808,7 +803,7 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p ARRAYSIZE(certificateFilter)); if (rv != CKR_OK) { - WLog_ERR(TAG, "C_FindObjectsInit failed with %s [0x%08" PRIx32 "] for slot %d", + WLog_ERR(TAG, "C_FindObjectsInit failed with %s [0x%08lx] for slot %lu", CK_RV_error_string(rv), rv, key->slotId); continue; } @@ -817,7 +812,7 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p rv = provider->p11->C_FindObjects(currentSession, &certObject, 1, &ncertObjects); if (rv != CKR_OK) { - WLog_ERR(TAG, "C_FindObjects failed with %s [0x%08" PRIx32 "] for slot %d", + WLog_ERR(TAG, "C_FindObjects failed with %s [0x%08lx] for slot %lu", CK_RV_error_string(rv), rv, currentSlot); goto cleanup_FindObjects; } @@ -851,8 +846,8 @@ static SECURITY_STATUS NCryptP11EnumKeys(NCRYPT_PROV_HANDLE hProvider, LPCWSTR p WINPR_ASSERT(provider->p11->C_FindObjectsFinal); rv = provider->p11->C_FindObjectsFinal(currentSession); if (rv != CKR_OK) - WLog_ERR(TAG, "C_FindObjectsFinal failed with %s [0x%08" PRIx32 "]", - CK_RV_error_string(rv), rv); + WLog_ERR(TAG, "C_FindObjectsFinal failed with %s [0x%08lx]", CK_RV_error_string(rv), + rv); if (keyName) { @@ -1076,7 +1071,7 @@ static SECURITY_STATUS NCryptP11KeyGetProperties(NCryptP11KeyHandle* keyHandle, rv = provider->p11->C_OpenSession(keyHandle->slotId, CKF_SERIAL_SESSION, NULL, NULL, &session); if (rv != CKR_OK) { - WLog_ERR(TAG, "error opening session on slot %d", keyHandle->slotId); + WLog_ERR(TAG, "error opening session on slot %lu", keyHandle->slotId); return NTE_FAIL; } @@ -1084,7 +1079,7 @@ static SECURITY_STATUS NCryptP11KeyGetProperties(NCryptP11KeyHandle* keyHandle, rv = provider->p11->C_FindObjectsInit(session, objectFilter, objectFilterLen); if (rv != CKR_OK) { - WLog_ERR(TAG, "unable to initiate search for slot %d", keyHandle->slotId); + WLog_ERR(TAG, "unable to initiate search for slot %lu", keyHandle->slotId); goto out; } @@ -1092,7 +1087,7 @@ static SECURITY_STATUS NCryptP11KeyGetProperties(NCryptP11KeyHandle* keyHandle, rv = provider->p11->C_FindObjects(session, &objectHandle, 1, &objectCount); if (rv != CKR_OK) { - WLog_ERR(TAG, "unable to findObjects for slot %d", keyHandle->slotId); + WLog_ERR(TAG, "unable to findObjects for slot %lu", keyHandle->slotId); goto out_final; } if (!objectCount) @@ -1180,14 +1175,14 @@ out_final: rv = provider->p11->C_FindObjectsFinal(session); if (rv != CKR_OK) { - WLog_ERR(TAG, "error in C_FindObjectsFinal() for slot %d", keyHandle->slotId); + WLog_ERR(TAG, "error in C_FindObjectsFinal() for slot %lu", keyHandle->slotId); } out: WINPR_ASSERT(provider->p11->C_CloseSession); rv = provider->p11->C_CloseSession(session); if (rv != CKR_OK) { - WLog_ERR(TAG, "error in C_CloseSession() for slot %d", keyHandle->slotId); + WLog_ERR(TAG, "error in C_CloseSession() for slot %lu", keyHandle->slotId); } return ret; } diff --git a/winpr/libwinpr/path/shell.c b/winpr/libwinpr/path/shell.c index 3287b68c1..501549786 100644 --- a/winpr/libwinpr/path/shell.c +++ b/winpr/libwinpr/path/shell.c @@ -389,7 +389,7 @@ char* GetKnownPath(eKnownPathTypes id) if (!path) WLog_WARN(TAG, "Path %s is %p", GetKnownPathIdString(WINPR_ASSERTING_INT_CAST(int, id)), - path); + WINPR_CXX_COMPAT_CAST(const void*, path)); return path; } diff --git a/winpr/libwinpr/pipe/pipe.c b/winpr/libwinpr/pipe/pipe.c index f8392b18e..8c463aab2 100644 --- a/winpr/libwinpr/pipe/pipe.c +++ b/winpr/libwinpr/pipe/pipe.c @@ -294,7 +294,7 @@ BOOL NamedPipeRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, /* Overlapped I/O */ if (!lpOverlapped) { - WLog_ERR(TAG, "%s requires lpOverlapped != NULL as FILE_FLAG_OVERLAPPED is set"); + WLog_ERR(TAG, "requires lpOverlapped != NULL as FILE_FLAG_OVERLAPPED is set"); SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } diff --git a/winpr/libwinpr/rpc/rpc.c b/winpr/libwinpr/rpc/rpc.c index a11335e57..5dbd89e78 100644 --- a/winpr/libwinpr/rpc/rpc.c +++ b/winpr/libwinpr/rpc/rpc.c @@ -781,7 +781,7 @@ RPC_STATUS RpcBindingServerFromClient(WINPR_ATTR_UNUSED RPC_BINDING_HANDLE Clien void RpcRaiseException(RPC_STATUS exception) { - WLog_ERR(TAG, "RpcRaiseException: 0x%08luX", exception); + WLog_ERR(TAG, "RpcRaiseException: 0x%08lx", WINPR_CXX_COMPAT_CAST(unsigned long, exception)); // NOLINTNEXTLINE(concurrency-mt-unsafe) exit((int)exception); } diff --git a/winpr/libwinpr/smartcard/smartcard.c b/winpr/libwinpr/smartcard/smartcard.c index fcd18f580..67806ac95 100644 --- a/winpr/libwinpr/smartcard/smartcard.c +++ b/winpr/libwinpr/smartcard/smartcard.c @@ -44,34 +44,37 @@ static const SCardApiFunctionTable* g_SCardApi = NULL; #define xstr(s) str(s) #define str(s) #s -#define SCARDAPI_STUB_CALL_LONG(_name, ...) \ - InitOnceExecuteOnce(&g_Initialized, InitializeSCardApiStubs, NULL, NULL); \ - if (!g_SCardApi || !g_SCardApi->pfn##_name) \ - { \ - WLog_DBG(TAG, "Missing function pointer g_SCardApi=%p->" xstr(pfn##_name) "=%p", \ - g_SCardApi, g_SCardApi ? g_SCardApi->pfn##_name : NULL); \ - return SCARD_E_NO_SERVICE; \ - } \ +#define SCARDAPI_STUB_CALL_LONG(_name, ...) \ + InitOnceExecuteOnce(&g_Initialized, InitializeSCardApiStubs, NULL, NULL); \ + if (!g_SCardApi || !g_SCardApi->pfn##_name) \ + { \ + WLog_DBG(TAG, "Missing function pointer g_SCardApi=%p->" xstr(pfn##_name) "=%p", \ + WINPR_CXX_COMPAT_CAST(const void*, g_SCardApi), \ + WINPR_CXX_COMPAT_CAST(const void*, g_SCardApi ? g_SCardApi->pfn##_name : NULL)); \ + return SCARD_E_NO_SERVICE; \ + } \ return g_SCardApi->pfn##_name(__VA_ARGS__) -#define SCARDAPI_STUB_CALL_HANDLE(_name) \ - InitOnceExecuteOnce(&g_Initialized, InitializeSCardApiStubs, NULL, NULL); \ - if (!g_SCardApi || !g_SCardApi->pfn##_name) \ - { \ - WLog_DBG(TAG, "Missing function pointer g_SCardApi=%p->" xstr(pfn##_name) "=%p", \ - g_SCardApi, g_SCardApi ? g_SCardApi->pfn##_name : NULL); \ - return NULL; \ - } \ +#define SCARDAPI_STUB_CALL_HANDLE(_name) \ + InitOnceExecuteOnce(&g_Initialized, InitializeSCardApiStubs, NULL, NULL); \ + if (!g_SCardApi || !g_SCardApi->pfn##_name) \ + { \ + WLog_DBG(TAG, "Missing function pointer g_SCardApi=%p->" xstr(pfn##_name) "=%p", \ + WINPR_CXX_COMPAT_CAST(const void*, g_SCardApi), \ + WINPR_CXX_COMPAT_CAST(const void*, g_SCardApi ? g_SCardApi->pfn##_name : NULL)); \ + return NULL; \ + } \ return g_SCardApi->pfn##_name() -#define SCARDAPI_STUB_CALL_VOID(_name) \ - InitOnceExecuteOnce(&g_Initialized, InitializeSCardApiStubs, NULL, NULL); \ - if (!g_SCardApi || !g_SCardApi->pfn##_name) \ - { \ - WLog_DBG(TAG, "Missing function pointer g_SCardApi=%p->" xstr(pfn##_name) "=%p", \ - g_SCardApi, g_SCardApi ? g_SCardApi->pfn##_name : NULL); \ - return; \ - } \ +#define SCARDAPI_STUB_CALL_VOID(_name) \ + InitOnceExecuteOnce(&g_Initialized, InitializeSCardApiStubs, NULL, NULL); \ + if (!g_SCardApi || !g_SCardApi->pfn##_name) \ + { \ + WLog_DBG(TAG, "Missing function pointer g_SCardApi=%p->" xstr(pfn##_name) "=%p", \ + WINPR_CXX_COMPAT_CAST(const void*, g_SCardApi), \ + WINPR_CXX_COMPAT_CAST(const void*, g_SCardApi ? g_SCardApi->pfn##_name : NULL)); \ + return; \ + } \ g_SCardApi->pfn##_name() /** diff --git a/winpr/libwinpr/sspi/Negotiate/negotiate.c b/winpr/libwinpr/sspi/Negotiate/negotiate.c index a63fc8002..53c6987f6 100644 --- a/winpr/libwinpr/sspi/Negotiate/negotiate.c +++ b/winpr/libwinpr/sspi/Negotiate/negotiate.c @@ -404,7 +404,7 @@ static BOOL negotiate_write_neg_token(PSecBuffer output_buffer, NegToken* token) { if (!WinPrAsn1EncContextualRawContent(enc, 0, &mechTypes)) goto cleanup; - WLog_DBG(TAG, "\tmechTypes [0] (%li bytes)", token->mechTypes.cbBuffer); + WLog_DBG(TAG, "\tmechTypes [0] (%" PRIu32 " bytes)", token->mechTypes.cbBuffer); } /* negState [0] ENUMERATED */ else if (token->negState != NOSTATE) @@ -427,7 +427,7 @@ static BOOL negotiate_write_neg_token(PSecBuffer output_buffer, NegToken* token) { if (WinPrAsn1EncContextualOctetString(enc, 2, &mechToken) == 0) goto cleanup; - WLog_DBG(TAG, "\tmechToken [2] (%li bytes)", token->mechToken.cbBuffer); + WLog_DBG(TAG, "\tmechToken [2] (%" PRIu32 " bytes)", token->mechToken.cbBuffer); } /* mechListMIC [3] OCTET STRING */ @@ -435,7 +435,7 @@ static BOOL negotiate_write_neg_token(PSecBuffer output_buffer, NegToken* token) { if (WinPrAsn1EncContextualOctetString(enc, 3, &mechListMic) == 0) goto cleanup; - WLog_DBG(TAG, "\tmechListMIC [3] (%li bytes)", token->mic.cbBuffer); + WLog_DBG(TAG, "\tmechListMIC [3] (%" PRIu32 " bytes)", token->mic.cbBuffer); } /* NegTokenInit or NegTokenResp */ @@ -533,7 +533,7 @@ static BOOL negotiate_read_neg_token(PSecBuffer input, NegToken* token) return FALSE; token->mechTypes.cbBuffer = (UINT32)mlen; token->mechTypes.pvBuffer = Stream_Buffer(&s); - WLog_DBG(TAG, "\tmechTypes [0] (%li bytes)", token->mechTypes.cbBuffer); + WLog_DBG(TAG, "\tmechTypes [0] (%" PRIu32 " bytes)", token->mechTypes.cbBuffer); } else { @@ -564,7 +564,7 @@ static BOOL negotiate_read_neg_token(PSecBuffer input, NegToken* token) /* reqFlags [1] ContextFlags BIT STRING (ignored) */ if (!WinPrAsn1DecPeekTagAndLen(&dec2, &tag, &len) || (tag != ER_TAG_BIT_STRING)) return FALSE; - WLog_DBG(TAG, "\treqFlags [1] (%li bytes)", len); + WLog_DBG(TAG, "\treqFlags [1] (%" PRIuz " bytes)", len); } else { @@ -584,7 +584,7 @@ static BOOL negotiate_read_neg_token(PSecBuffer input, NegToken* token) token->mechToken.cbBuffer = (UINT32)octet_string.len; token->mechToken.pvBuffer = octet_string.data; token->mechToken.BufferType = SECBUFFER_TOKEN; - WLog_DBG(TAG, "\tmechToken [2] (%li bytes)", octet_string.len); + WLog_DBG(TAG, "\tmechToken [2] (%" PRIuz " bytes)", octet_string.len); break; case 3: /* mechListMic [3] OCTET STRING */ @@ -595,7 +595,7 @@ static BOOL negotiate_read_neg_token(PSecBuffer input, NegToken* token) token->mic.cbBuffer = (UINT32)octet_string.len; token->mic.pvBuffer = octet_string.data; token->mic.BufferType = SECBUFFER_TOKEN; - WLog_DBG(TAG, "\tmechListMIC [3] (%li bytes)", octet_string.len); + WLog_DBG(TAG, "\tmechListMIC [3] (%" PRIuz " bytes)", octet_string.len); break; default: WLog_ERR(TAG, "unknown contextual item %d", contextual); diff --git a/winpr/libwinpr/sspi/sspi_winpr.c b/winpr/libwinpr/sspi/sspi_winpr.c index 4e559d3c6..99e321ded 100644 --- a/winpr/libwinpr/sspi/sspi_winpr.c +++ b/winpr/libwinpr/sspi/sspi_winpr.c @@ -1246,6 +1246,27 @@ void FreeContextBuffer_QuerySecurityPackageInfo(void* contextBuffer) free(pPackageInfo); } +#define log_status(what, status) log_status_((what), (status), __FILE__, __func__, __LINE__) +static SECURITY_STATUS log_status_(const char* what, SECURITY_STATUS status, const char* file, + const char* fkt, size_t line) +{ + if (IsSecurityStatusError(status)) + { + const DWORD level = WLOG_WARN; + static wLog* log = NULL; + if (!log) + log = WLog_Get(TAG); + + if (WLog_IsLevelActive(log, level)) + { + WLog_PrintTextMessage(log, level, line, file, fkt, "%s status %s [0x%08" PRIx32 "]", + what, GetSecurityStatusString(status), + WINPR_CXX_COMPAT_CAST(uint32_t, status)); + } + } + return status; +} + /* Credential Management */ static SECURITY_STATUS SEC_ENTRY winpr_AcquireCredentialsHandleW( @@ -1268,14 +1289,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_AcquireCredentialsHandleW( status = table->AcquireCredentialsHandleW(pszPrincipal, pszPackage, fCredentialUse, pvLogonID, pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "AcquireCredentialsHandleW status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("AcquireCredentialsHandleW", status); } static SECURITY_STATUS SEC_ENTRY winpr_AcquireCredentialsHandleA( @@ -1298,14 +1312,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_AcquireCredentialsHandleA( status = table->AcquireCredentialsHandleA(pszPrincipal, pszPackage, fCredentialUse, pvLogonID, pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "AcquireCredentialsHandleA status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("AcquireCredentialsHandleA", status); } static SECURITY_STATUS SEC_ENTRY winpr_ExportSecurityContext(PCtxtHandle phContext, ULONG fFlags, @@ -1332,14 +1339,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_ExportSecurityContext(PCtxtHandle phConte } status = table->ExportSecurityContext(phContext, fFlags, pPackedContext, pToken); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "ExportSecurityContext status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("ExportSecurityContext", status); } static SECURITY_STATUS SEC_ENTRY winpr_FreeCredentialsHandle(PCredHandle phCredential) @@ -1364,14 +1364,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_FreeCredentialsHandle(PCredHandle phCrede } status = table->FreeCredentialsHandle(phCredential); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "FreeCredentialsHandle status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("FreeCredentialsHandle", status); } static SECURITY_STATUS SEC_ENTRY winpr_ImportSecurityContextW(SEC_WCHAR* pszPackage, @@ -1398,14 +1391,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_ImportSecurityContextW(SEC_WCHAR* pszPack } status = table->ImportSecurityContextW(pszPackage, pPackedContext, pToken, phContext); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "ImportSecurityContextW status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("ImportSecurityContextW", status); } static SECURITY_STATUS SEC_ENTRY winpr_ImportSecurityContextA(SEC_CHAR* pszPackage, @@ -1432,14 +1418,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_ImportSecurityContextA(SEC_CHAR* pszPacka } status = table->ImportSecurityContextA(pszPackage, pPackedContext, pToken, phContext); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "ImportSecurityContextA status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("ImportSecurityContextA", status); } static SECURITY_STATUS SEC_ENTRY winpr_QueryCredentialsAttributesW(PCredHandle phCredential, @@ -1465,14 +1444,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_QueryCredentialsAttributesW(PCredHandle p } status = table->QueryCredentialsAttributesW(phCredential, ulAttribute, pBuffer); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "QueryCredentialsAttributesW status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("QueryCredentialsAttributesW", status); } static SECURITY_STATUS SEC_ENTRY winpr_QueryCredentialsAttributesA(PCredHandle phCredential, @@ -1498,14 +1470,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_QueryCredentialsAttributesA(PCredHandle p } status = table->QueryCredentialsAttributesA(phCredential, ulAttribute, pBuffer); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "QueryCredentialsAttributesA status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("QueryCredentialsAttributesA", status); } static SECURITY_STATUS SEC_ENTRY winpr_SetCredentialsAttributesW(PCredHandle phCredential, @@ -1532,14 +1497,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetCredentialsAttributesW(PCredHandle phC } status = table->SetCredentialsAttributesW(phCredential, ulAttribute, pBuffer, cbBuffer); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "SetCredentialsAttributesW status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("SetCredentialsAttributesW", status); } static SECURITY_STATUS SEC_ENTRY winpr_SetCredentialsAttributesA(PCredHandle phCredential, @@ -1566,14 +1524,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetCredentialsAttributesA(PCredHandle phC } status = table->SetCredentialsAttributesA(phCredential, ulAttribute, pBuffer, cbBuffer); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "SetCredentialsAttributesA status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("SetCredentialsAttributesA", status); } /* Context Management */ @@ -1605,14 +1556,7 @@ winpr_AcceptSecurityContext(PCredHandle phCredential, PCtxtHandle phContext, PSe status = table->AcceptSecurityContext(phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsTimeStamp); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "AcceptSecurityContext status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("AcceptSecurityContext", status); } static SECURITY_STATUS SEC_ENTRY winpr_ApplyControlToken(PCtxtHandle phContext, @@ -1638,14 +1582,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_ApplyControlToken(PCtxtHandle phContext, } status = table->ApplyControlToken(phContext, pInput); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "ApplyControlToken status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("ApplyControlToken", status); } static SECURITY_STATUS SEC_ENTRY winpr_CompleteAuthToken(PCtxtHandle phContext, @@ -1671,14 +1608,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_CompleteAuthToken(PCtxtHandle phContext, } status = table->CompleteAuthToken(phContext, pToken); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "CompleteAuthToken status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("CompleteAuthToken", status); } static SECURITY_STATUS SEC_ENTRY winpr_DeleteSecurityContext(PCtxtHandle phContext) @@ -1700,14 +1630,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_DeleteSecurityContext(PCtxtHandle phConte } const SECURITY_STATUS status = table->DeleteSecurityContext(phContext); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "DeleteSecurityContext status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("DeleteSecurityContext", status); } static SECURITY_STATUS SEC_ENTRY winpr_FreeContextBuffer(void* pvContextBuffer) @@ -1741,14 +1664,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_ImpersonateSecurityContext(PCtxtHandle ph } status = table->ImpersonateSecurityContext(phContext); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "ImpersonateSecurityContext status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("ImpersonateSecurityContext", status); } static SECURITY_STATUS SEC_ENTRY winpr_InitializeSecurityContextW( @@ -1778,14 +1694,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_InitializeSecurityContextW( status = table->InitializeSecurityContextW(phCredential, phContext, pszTargetName, fContextReq, Reserved1, TargetDataRep, pInput, Reserved2, phNewContext, pOutput, pfContextAttr, ptsExpiry); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "InitializeSecurityContextW status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("InitializeSecurityContextW", status); } static SECURITY_STATUS SEC_ENTRY winpr_InitializeSecurityContextA( @@ -1816,13 +1725,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_InitializeSecurityContextA( Reserved1, TargetDataRep, pInput, Reserved2, phNewContext, pOutput, pfContextAttr, ptsExpiry); - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "InitializeSecurityContextA status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("InitializeSecurityContextA", status); } static SECURITY_STATUS SEC_ENTRY winpr_QueryContextAttributesW(PCtxtHandle phContext, @@ -1848,14 +1751,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_QueryContextAttributesW(PCtxtHandle phCon } status = table->QueryContextAttributesW(phContext, ulAttribute, pBuffer); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "QueryContextAttributesW status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("QueryContextAttributesW", status); } static SECURITY_STATUS SEC_ENTRY winpr_QueryContextAttributesA(PCtxtHandle phContext, @@ -1881,14 +1777,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_QueryContextAttributesA(PCtxtHandle phCon } status = table->QueryContextAttributesA(phContext, ulAttribute, pBuffer); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "QueryContextAttributesA status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("QueryContextAttributesA", status); } static SECURITY_STATUS SEC_ENTRY winpr_QuerySecurityContextToken(PCtxtHandle phContext, @@ -1914,14 +1803,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_QuerySecurityContextToken(PCtxtHandle phC } status = table->QuerySecurityContextToken(phContext, phToken); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "QuerySecurityContextToken status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("QuerySecurityContextToken", status); } static SECURITY_STATUS SEC_ENTRY winpr_SetContextAttributesW(PCtxtHandle phContext, @@ -1948,14 +1830,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetContextAttributesW(PCtxtHandle phConte } status = table->SetContextAttributesW(phContext, ulAttribute, pBuffer, cbBuffer); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "SetContextAttributesW status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("SetContextAttributesW", status); } static SECURITY_STATUS SEC_ENTRY winpr_SetContextAttributesA(PCtxtHandle phContext, @@ -1982,14 +1857,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_SetContextAttributesA(PCtxtHandle phConte } status = table->SetContextAttributesA(phContext, ulAttribute, pBuffer, cbBuffer); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "SetContextAttributesA status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("SetContextAttributesA", status); } static SECURITY_STATUS SEC_ENTRY winpr_RevertSecurityContext(PCtxtHandle phContext) @@ -2015,13 +1883,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_RevertSecurityContext(PCtxtHandle phConte status = table->RevertSecurityContext(phContext); - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "RevertSecurityContext status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("RevertSecurityContext", status); } /* Message Support */ @@ -2051,13 +1913,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_DecryptMessage(PCtxtHandle phContext, status = table->DecryptMessage(phContext, pMessage, MessageSeqNo, pfQOP); - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "DecryptMessage status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("DecryptMessage", status); } static SECURITY_STATUS SEC_ENTRY winpr_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, @@ -2083,28 +1939,19 @@ static SECURITY_STATUS SEC_ENTRY winpr_EncryptMessage(PCtxtHandle phContext, ULO } status = table->EncryptMessage(phContext, fQOP, pMessage, MessageSeqNo); - - if (status != SEC_E_OK) - { - WLog_ERR(TAG, "EncryptMessage status %s [0x%08" PRIX32 "]", GetSecurityStatusString(status), - status); - } - - return status; + return log_status("EncryptMessage", status); } static SECURITY_STATUS SEC_ENTRY winpr_MakeSignature(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { - char* Name = NULL; SECURITY_STATUS status = 0; - const SecurityFunctionTableA* table = NULL; - Name = (char*)sspi_SecureHandleGetUpperPointer(phContext); + const char* Name = (const char*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) return SEC_E_SECPKG_NOT_FOUND; - table = sspi_GetSecurityFunctionTableAByNameA(Name); + const SecurityFunctionTableA* table = sspi_GetSecurityFunctionTableAByNameA(Name); if (!table) return SEC_E_SECPKG_NOT_FOUND; @@ -2116,29 +1963,21 @@ static SECURITY_STATUS SEC_ENTRY winpr_MakeSignature(PCtxtHandle phContext, ULON } status = table->MakeSignature(phContext, fQOP, pMessage, MessageSeqNo); - - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "MakeSignature status %s [0x%08" PRIX32 "]", GetSecurityStatusString(status), - status); - } - - return status; + return log_status("MakeSignature", status); } static SECURITY_STATUS SEC_ENTRY winpr_VerifySignature(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { - char* Name = NULL; SECURITY_STATUS status = 0; - const SecurityFunctionTableA* table = NULL; - Name = (char*)sspi_SecureHandleGetUpperPointer(phContext); + + const char* Name = (const char*)sspi_SecureHandleGetUpperPointer(phContext); if (!Name) return SEC_E_SECPKG_NOT_FOUND; - table = sspi_GetSecurityFunctionTableAByNameA(Name); + const SecurityFunctionTableA* table = sspi_GetSecurityFunctionTableAByNameA(Name); if (!table) return SEC_E_SECPKG_NOT_FOUND; @@ -2151,13 +1990,7 @@ static SECURITY_STATUS SEC_ENTRY winpr_VerifySignature(PCtxtHandle phContext, status = table->VerifySignature(phContext, pMessage, MessageSeqNo, pfQOP); - if (IsSecurityStatusError(status)) - { - WLog_WARN(TAG, "VerifySignature status %s [0x%08" PRIX32 "]", - GetSecurityStatusString(status), status); - } - - return status; + return log_status("VerifySignature", status); } static SecurityFunctionTableA winpr_SecurityFunctionTableA = { diff --git a/winpr/libwinpr/synch/event.c b/winpr/libwinpr/synch/event.c index 7f896018e..f925a3c6b 100644 --- a/winpr/libwinpr/synch/event.c +++ b/winpr/libwinpr/synch/event.c @@ -332,8 +332,11 @@ HANDLE CreateEventExW(LPSECURITY_ATTRIBUTES lpEventAttributes, LPCWSTR lpName, D manual = TRUE; if (dwDesiredAccess != 0) - WLog_WARN(TAG, "[%s] does not support dwDesiredAccess 0x%08" PRIx32, lpName, - dwDesiredAccess); + { + char name[MAX_PATH] = { 0 }; + ConvertWCharToUtf8(lpName, name, sizeof(name) - 1); + WLog_WARN(TAG, "[%s] does not support dwDesiredAccess 0x%08" PRIx32, name, dwDesiredAccess); + } return CreateEventW(lpEventAttributes, manual, initial, lpName); } diff --git a/winpr/libwinpr/synch/mutex.c b/winpr/libwinpr/synch/mutex.c index 6a85db676..91e4081ea 100644 --- a/winpr/libwinpr/synch/mutex.c +++ b/winpr/libwinpr/synch/mutex.c @@ -188,8 +188,11 @@ HANDLE CreateMutexExW(LPSECURITY_ATTRIBUTES lpMutexAttributes, LPCWSTR lpName, D /* TODO: support access modes */ if (dwDesiredAccess != 0) - WLog_WARN(TAG, "[%s] does not support dwDesiredAccess 0x%08" PRIx32, lpName, - dwDesiredAccess); + { + char name[MAX_PATH] = { 0 }; + ConvertWCharToUtf8(lpName, name, sizeof(name)); + WLog_WARN(TAG, "[%s] does not support dwDesiredAccess 0x%08" PRIx32, name, dwDesiredAccess); + } if (dwFlags & CREATE_MUTEX_INITIAL_OWNER) initial = TRUE; diff --git a/winpr/libwinpr/synch/pollset.c b/winpr/libwinpr/synch/pollset.c index 725f6905c..72222dac5 100644 --- a/winpr/libwinpr/synch/pollset.c +++ b/winpr/libwinpr/synch/pollset.c @@ -228,7 +228,7 @@ BOOL pollset_isSignaled(WINPR_POLL_SET* set, size_t idx) if (idx > set->fillIndex) { - WLog_ERR(TAG, "index=%d out of pollset(fillIndex=%" PRIuz ")", idx, set->fillIndex); + WLog_ERR(TAG, "index=%" PRIuz " out of pollset(fillIndex=%" PRIuz ")", idx, set->fillIndex); return FALSE; } @@ -255,7 +255,7 @@ BOOL pollset_isReadSignaled(WINPR_POLL_SET* set, size_t idx) if (idx > set->fillIndex) { - WLog_ERR(TAG, "index=%d out of pollset(fillIndex=%" PRIuz ")", idx, set->fillIndex); + WLog_ERR(TAG, "index=%" PRIuz " out of pollset(fillIndex=%" PRIuz ")", idx, set->fillIndex); return FALSE; } @@ -276,7 +276,7 @@ BOOL pollset_isWriteSignaled(WINPR_POLL_SET* set, size_t idx) if (idx > set->fillIndex) { - WLog_ERR(TAG, "index=%d out of pollset(fillIndex=%" PRIuz ")", idx, set->fillIndex); + WLog_ERR(TAG, "index=%" PRIuz " out of pollset(fillIndex=%" PRIuz ")", idx, set->fillIndex); return FALSE; } diff --git a/winpr/libwinpr/synch/wait.c b/winpr/libwinpr/synch/wait.c index 48b226b95..d18709c67 100644 --- a/winpr/libwinpr/synch/wait.c +++ b/winpr/libwinpr/synch/wait.c @@ -343,7 +343,7 @@ DWORD WaitForMultipleObjectsEx(DWORD nCount, const HANDLE* lpHandles, BOOL bWait if (!pollset_init(&pollset, nCount + extraFds)) { - WLog_ERR(TAG, "unable to initialize pollset for nCount=%" PRIu32 " extraCount=%" PRIu32 "", + WLog_ERR(TAG, "unable to initialize pollset for nCount=%" PRIu32 " extraCount=%" PRIuz "", nCount, extraFds); return WAIT_FAILED; } diff --git a/winpr/libwinpr/thread/thread.c b/winpr/libwinpr/thread/thread.c index 5323078f3..1214d41f3 100644 --- a/winpr/libwinpr/thread/thread.c +++ b/winpr/libwinpr/thread/thread.c @@ -529,7 +529,8 @@ static void* thread_launcher(void* arg) if (!TlsSetValue(currentThreadTlsIndex, thread)) { - WLog_ERR(TAG, "thread %d, unable to set current thread value", pthread_self()); + WLog_ERR(TAG, "thread %" PRIu64 ", unable to set current thread value", + WINPR_CXX_COMPAT_CAST(uint64_t, pthread_self())); goto exit; } diff --git a/winpr/libwinpr/utils/image.c b/winpr/libwinpr/utils/image.c index e1fe87c7f..20f6a34f7 100644 --- a/winpr/libwinpr/utils/image.c +++ b/winpr/libwinpr/utils/image.c @@ -181,14 +181,14 @@ BOOL readBitmapInfoHeader(wStream* s, WINPR_BITMAP_INFO_HEADER* bi, size_t* poff if (bi->biSizeImage == 0) { - WLog_ERR(TAG, "invalid biSizeImage %" PRIuz, bi->biSizeImage); + WLog_ERR(TAG, "invalid biSizeImage %" PRIu32, bi->biSizeImage); return FALSE; } const size_t pos = Stream_GetPosition(s) - start; if (bi->biSize < pos) { - WLog_ERR(TAG, "invalid biSize %" PRIuz " < (actual) offset %" PRIuz, bi->biSize, pos); + WLog_ERR(TAG, "invalid biSize %" PRIu32 " < (actual) offset %" PRIuz, bi->biSize, pos); return FALSE; } @@ -440,7 +440,7 @@ static int winpr_image_bitmap_read_buffer(wImage* image, const BYTE* buffer, siz const size_t expect = bf.bfOffBits; if (pos != expect) { - WLog_WARN(TAG, "pos=%" PRIuz ", expected %" PRIuz ", offset=" PRIuz, pos, expect, + WLog_WARN(TAG, "pos=%" PRIuz ", expected %" PRIuz ", offset=%" PRIuz, pos, expect, bmpoffset); goto fail; }