diff --git a/channels/audin/client/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c index b1edb8242..09da5f76c 100644 --- a/channels/audin/client/alsa/audin_alsa.c +++ b/channels/audin/client/alsa/audin_alsa.c @@ -350,7 +350,7 @@ static UINT audin_alsa_parse_addin_args(AudinALSADevice* device, const ADDIN_ARG int status = 0; DWORD flags = 0; const COMMAND_LINE_ARGUMENT_A* arg = NULL; - AudinALSADevice* alsa = (AudinALSADevice*)device; + AudinALSADevice* alsa = device; COMMAND_LINE_ARGUMENT_A audin_alsa_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "audio device name" }, { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; diff --git a/channels/audin/client/oss/audin_oss.c b/channels/audin/client/oss/audin_oss.c index 52ffd7bce..fadff6c7d 100644 --- a/channels/audin/client/oss/audin_oss.c +++ b/channels/audin/client/oss/audin_oss.c @@ -386,7 +386,7 @@ static UINT audin_oss_parse_addin_args(AudinOSSDevice* device, const ADDIN_ARGV* char* eptr = NULL; DWORD flags = 0; const COMMAND_LINE_ARGUMENT_A* arg = NULL; - AudinOSSDevice* oss = (AudinOSSDevice*)device; + AudinOSSDevice* oss = device; COMMAND_LINE_ARGUMENT_A audin_oss_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "audio device name" }, { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; diff --git a/channels/audin/client/pulse/audin_pulse.c b/channels/audin/client/pulse/audin_pulse.c index 0e330ad91..f1f1c0cb6 100644 --- a/channels/audin/client/pulse/audin_pulse.c +++ b/channels/audin/client/pulse/audin_pulse.c @@ -455,7 +455,7 @@ static UINT audin_pulse_parse_addin_args(AudinPulseDevice* device, const ADDIN_A int status = 0; DWORD flags = 0; const COMMAND_LINE_ARGUMENT_A* arg = NULL; - AudinPulseDevice* pulse = (AudinPulseDevice*)device; + AudinPulseDevice* pulse = device; COMMAND_LINE_ARGUMENT_A audin_pulse_args[] = { { "dev", COMMAND_LINE_VALUE_REQUIRED, "", NULL, NULL, -1, NULL, "audio device name" }, { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } }; diff --git a/channels/client/addin.c b/channels/client/addin.c index 56dcf106b..b1028b882 100644 --- a/channels/client/addin.c +++ b/channels/client/addin.c @@ -48,7 +48,7 @@ static void* freerdp_channels_find_static_entry_in_table(const STATIC_ENTRY_TABL const char* identifier) { size_t index = 0; - const STATIC_ENTRY* pEntry = (const STATIC_ENTRY*)&table->table[index++]; + const STATIC_ENTRY* pEntry = &table->table[index++]; while (pEntry->entry != NULL) { @@ -57,7 +57,7 @@ static void* freerdp_channels_find_static_entry_in_table(const STATIC_ENTRY_TABL return (void*)pEntry->entry; } - pEntry = (const STATIC_ENTRY*)&table->table[index++]; + pEntry = &table->table[index++]; } return NULL; diff --git a/channels/disp/server/disp_main.c b/channels/disp/server/disp_main.c index 8fd7fa64e..931d8a317 100644 --- a/channels/disp/server/disp_main.c +++ b/channels/disp/server/disp_main.c @@ -412,8 +412,8 @@ static UINT disp_server_open(DispServerContext* context) priv->SessionId = (DWORD)*pSessionId; WTSFreeMemory(pSessionId); - priv->disp_channel = (HANDLE)WTSVirtualChannelOpenEx(priv->SessionId, DISP_DVC_CHANNEL_NAME, - WTS_CHANNEL_OPTION_DYNAMIC); + priv->disp_channel = + WTSVirtualChannelOpenEx(priv->SessionId, DISP_DVC_CHANNEL_NAME, WTS_CHANNEL_OPTION_DYNAMIC); if (!priv->disp_channel) { diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c index d3795eb45..e454e895d 100644 --- a/channels/drdynvc/client/drdynvc_main.c +++ b/channels/drdynvc/client/drdynvc_main.c @@ -1371,7 +1371,7 @@ static UINT drdynvc_process_close_request(drdynvcPlugin* drdynvc, int Sp, int cb "process_close_request: Sp=%d cbChId=%d, ChannelId=%" PRIu32 "", Sp, cbChId, ChannelId); - channel = (DVCMAN_CHANNEL*)dvcman_get_channel_by_id(drdynvc->channel_mgr, ChannelId, TRUE); + channel = dvcman_get_channel_by_id(drdynvc->channel_mgr, ChannelId, TRUE); if (!channel) { WLog_Print(drdynvc->log, WLOG_ERROR, "dvcman_close_request channel %" PRIu32 " not present", diff --git a/channels/rail/server/rail_main.c b/channels/rail/server/rail_main.c index 50896465c..70327cc7d 100644 --- a/channels/rail/server/rail_main.c +++ b/channels/rail/server/rail_main.c @@ -1469,7 +1469,7 @@ out_close: static BOOL rail_server_stop(RailServerContext* context) { - RailServerPrivate* priv = (RailServerPrivate*)context->priv; + RailServerPrivate* priv = context->priv; if (priv->thread) { diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index b435d266d..96c033c31 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -1249,7 +1249,7 @@ static UINT rdpdr_send_client_announce_reply(rdpdrPlugin* rdpdr) Stream_Write_UINT16(s, PAKID_CORE_CLIENTID_CONFIRM); /* PacketId (2 bytes) */ Stream_Write_UINT16(s, rdpdr->clientVersionMajor); Stream_Write_UINT16(s, rdpdr->clientVersionMinor); - Stream_Write_UINT32(s, (UINT32)rdpdr->clientID); + Stream_Write_UINT32(s, rdpdr->clientID); return rdpdr_send(rdpdr, s); } @@ -1296,7 +1296,7 @@ static UINT rdpdr_send_client_name_request(rdpdrPlugin* rdpdr) Stream_Write_UINT32(s, 0); /* codePage, must be set to zero */ Stream_Write_UINT32(s, (UINT32)computerNameLenW); /* computerNameLen, including null terminator */ - Stream_Write(s, computerNameW, (size_t)computerNameLenW); + Stream_Write(s, computerNameW, computerNameLenW); free(computerNameW); return rdpdr_send(rdpdr, s); } @@ -1859,7 +1859,7 @@ static UINT rdpdr_process_receive(rdpdrPlugin* rdpdr, wStream* s) UINT rdpdr_send(rdpdrPlugin* rdpdr, wStream* s) { UINT status = 0; - rdpdrPlugin* plugin = (rdpdrPlugin*)rdpdr; + rdpdrPlugin* plugin = rdpdr; if (!s) { diff --git a/channels/rdpgfx/client/rdpgfx_main.c b/channels/rdpgfx/client/rdpgfx_main.c index d44a5a396..9610d0444 100644 --- a/channels/rdpgfx/client/rdpgfx_main.c +++ b/channels/rdpgfx/client/rdpgfx_main.c @@ -80,7 +80,7 @@ static void evict_cache_slots(RdpgfxClientContext* context, UINT16 MaxCacheSlots if (CacheSlots[index]) { RDPGFX_EVICT_CACHE_ENTRY_PDU pdu = { 0 }; - pdu.cacheSlot = (UINT16)index + 1; + pdu.cacheSlot = index + 1; if (context && context->EvictCacheEntry) { @@ -743,7 +743,7 @@ static UINT rdpgfx_save_persistent_cache(RDPGFX_PLUGIN* gfx) { if (gfx->CacheSlots[idx]) { - UINT16 cacheSlot = (UINT16)idx; + UINT16 cacheSlot = idx; if (context->ExportCacheEntry(context, cacheSlot, &cacheEntry) != CHANNEL_RC_OK) continue; diff --git a/channels/rdpgfx/server/rdpgfx_main.c b/channels/rdpgfx/server/rdpgfx_main.c index c9e49fa8c..534c5577c 100644 --- a/channels/rdpgfx/server/rdpgfx_main.c +++ b/channels/rdpgfx/server/rdpgfx_main.c @@ -1526,7 +1526,7 @@ static DWORD WINAPI rdpgfx_server_thread_func(LPVOID arg) static BOOL rdpgfx_server_open(RdpgfxServerContext* context) { WINPR_ASSERT(context); - RdpgfxServerPrivate* priv = (RdpgfxServerPrivate*)context->priv; + RdpgfxServerPrivate* priv = context->priv; void* buffer = NULL; WINPR_ASSERT(priv); @@ -1625,7 +1625,7 @@ BOOL rdpgfx_server_close(RdpgfxServerContext* context) { WINPR_ASSERT(context); - RdpgfxServerPrivate* priv = (RdpgfxServerPrivate*)context->priv; + RdpgfxServerPrivate* priv = context->priv; WINPR_ASSERT(priv); if (priv->ownThread && priv->thread) diff --git a/channels/rdpsnd/server/rdpsnd_main.c b/channels/rdpsnd/server/rdpsnd_main.c index f840e4cdf..f1b8fcfbb 100644 --- a/channels/rdpsnd/server/rdpsnd_main.c +++ b/channels/rdpsnd/server/rdpsnd_main.c @@ -862,8 +862,8 @@ static UINT rdpsnd_server_start(RdpsndServerContext* context) { priv->SessionId = (DWORD)*pSessionId; WTSFreeMemory(pSessionId); - priv->ChannelHandle = (HANDLE)WTSVirtualChannelOpenEx( - priv->SessionId, RDPSND_DVC_CHANNEL_NAME, WTS_CHANNEL_OPTION_DYNAMIC); + priv->ChannelHandle = WTSVirtualChannelOpenEx(priv->SessionId, RDPSND_DVC_CHANNEL_NAME, + WTS_CHANNEL_OPTION_DYNAMIC); if (!priv->ChannelHandle) { WLog_ERR(TAG, "Open audio dynamic virtual channel (%s) failed!", diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c index 40e69520e..97209130c 100644 --- a/channels/tsmf/client/tsmf_media.c +++ b/channels/tsmf/client/tsmf_media.c @@ -583,10 +583,9 @@ static BOOL tsmf_sample_playback(TSMF_SAMPLE* sample) if (temp_stream->major_type == TSMF_MAJOR_TYPE_AUDIO) { - UINT64 video_time = - (UINT64)stream->decoder->GetRunningTime(stream->decoder); + UINT64 video_time = stream->decoder->GetRunningTime(stream->decoder); UINT64 audio_time = - (UINT64)temp_stream->decoder->GetRunningTime(temp_stream->decoder); + temp_stream->decoder->GetRunningTime(temp_stream->decoder); UINT64 max_adjust = VIDEO_ADJUST_MAX; if (video_time < audio_time) diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c index 7d6019ecd..131eed0c9 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.c +++ b/channels/urbdrc/client/libusb/libusb_udevice.c @@ -1446,7 +1446,7 @@ static int libusb_udev_cancel_transfer_request(IUDEVICE* idev, UINT32 RequestId) if (transfer) { - URBDRC_PLUGIN* urbdrc = (URBDRC_PLUGIN*)pdev->urbdrc; + URBDRC_PLUGIN* urbdrc = pdev->urbdrc; rc = func_cancel_xact_request(urbdrc, transfer); } diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c index d52c3074b..707e85c36 100644 --- a/channels/urbdrc/client/libusb/libusb_udevman.c +++ b/channels/urbdrc/client/libusb/libusb_udevman.c @@ -152,7 +152,7 @@ static size_t udevman_register_udevice(IUDEVMAN* idevman, BYTE bus_number, BYTE return 0; urbdrc = (URBDRC_PLUGIN*)idevman->plugin; - pdev = (IUDEVICE*)udevman_get_udevice_by_addr(idevman, bus_number, dev_number); + pdev = udevman_get_udevice_by_addr(idevman, bus_number, dev_number); if (pdev != NULL) return 0; diff --git a/channels/urbdrc/client/urbdrc_main.c b/channels/urbdrc/client/urbdrc_main.c index 6d868b25e..ca8ca375d 100644 --- a/channels/urbdrc/client/urbdrc_main.c +++ b/channels/urbdrc/client/urbdrc_main.c @@ -577,7 +577,7 @@ static UINT urbdrc_on_data_received(IWTSVirtualChannelCallback* pChannelCallback if (urbdrc->udevman == NULL) return error; - udevman = (IUDEVMAN*)urbdrc->udevman; + udevman = urbdrc->udevman; if (!Stream_CheckAndLogRequiredLength(TAG, data, 12)) return ERROR_INVALID_DATA; diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c index 007aef426..637f9cb2c 100644 --- a/client/X11/xf_cliprdr.c +++ b/client/X11/xf_cliprdr.c @@ -2239,7 +2239,7 @@ xf_cliprdr_server_format_data_response(CliprdrClientContext* context, DEBUG_CLIPRDR("requested format 0x%08" PRIx32 " [%s] {local 0x%08" PRIx32 "} [%s]", format->formatToRequest, ClipboardGetFormatIdString(format->formatToRequest), format->localFormat, format->formatName); - SrcSize = (UINT32)size; + SrcSize = size; DEBUG_CLIPRDR("srcFormatId: %u, dstFormatId: %u", srcFormatId, dstFormatId); diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c index ac91a6472..521e06a97 100644 --- a/client/X11/xf_event.c +++ b/client/X11/xf_event.c @@ -956,8 +956,8 @@ static BOOL xf_event_PropertyNotify(xfContext* xfc, const XPropertyEvent* event, * when the window has been minimized, maximized, restored locally * ie. not using the buttons on the rail window itself */ - if ((((Atom)event->atom == xfc->_NET_WM_STATE) && (event->state != PropertyDelete)) || - (((Atom)event->atom == xfc->WM_STATE) && (event->state != PropertyDelete))) + if (((event->atom == xfc->_NET_WM_STATE) && (event->state != PropertyDelete)) || + ((event->atom == xfc->WM_STATE) && (event->state != PropertyDelete))) { BOOL status = FALSE; BOOL minimized = FALSE; @@ -975,7 +975,7 @@ static BOOL xf_event_PropertyNotify(xfContext* xfc, const XPropertyEvent* event, return TRUE; } - if ((Atom)event->atom == xfc->_NET_WM_STATE) + if (event->atom == xfc->_NET_WM_STATE) { status = xf_GetWindowProperty(xfc, event->window, xfc->_NET_WM_STATE, 12, &nitems, &bytes, &prop); @@ -1010,7 +1010,7 @@ static BOOL xf_event_PropertyNotify(xfContext* xfc, const XPropertyEvent* event, } } - if ((Atom)event->atom == xfc->WM_STATE) + if (event->atom == xfc->WM_STATE) { status = xf_GetWindowProperty(xfc, event->window, xfc->WM_STATE, 1, &nitems, &bytes, &prop); diff --git a/client/X11/xf_monitor.c b/client/X11/xf_monitor.c index d872a4cbd..ac20cb1ae 100644 --- a/client/X11/xf_monitor.c +++ b/client/X11/xf_monitor.c @@ -391,7 +391,7 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight) { MONITOR_ATTRIBUTES* attrs = NULL; - if (!xf_is_monitor_id_active(xfc, (UINT32)i)) + if (!xf_is_monitor_id_active(xfc, i)) continue; if (!vscreen->monitors) @@ -437,7 +437,7 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight) #endif - if ((UINT32)i == nr) + if (i == nr) { monitor->is_primary = TRUE; if (!freerdp_settings_set_uint32(settings, FreeRDP_MonitorLocalShiftX, monitor->x)) diff --git a/client/common/cmdline.c b/client/common/cmdline.c index feb4a69f3..701cd9380 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -862,7 +862,7 @@ BOOL freerdp_client_add_static_channel(rdpSettings* settings, size_t count, cons if (freerdp_static_channel_collection_find(settings, params[0])) return TRUE; - _args = freerdp_addin_argv_new(count, (const char**)params); + _args = freerdp_addin_argv_new(count, params); if (!_args) return FALSE; diff --git a/client/common/file.c b/client/common/file.c index 1d544bd93..130a8cb3a 100644 --- a/client/common/file.c +++ b/client/common/file.c @@ -1371,7 +1371,7 @@ BOOL freerdp_client_write_rdp_file(const rdpFile* file, const char* name, BOOL u return FALSE; buffer = (char*)calloc((size_t)(size + 1), sizeof(char)); - if (freerdp_client_write_rdp_file_buffer(file, buffer, (size_t)size + 1) != size) + if (freerdp_client_write_rdp_file_buffer(file, buffer, size + 1) != size) { WLog_ERR(TAG, "freerdp_client_write_rdp_file: error writing to output buffer"); free(buffer); @@ -1408,7 +1408,7 @@ BOOL freerdp_client_write_rdp_file(const rdpFile* file, const char* name, BOOL u } else { - if (fwrite(buffer, 1, (size_t)size, fp) != (size_t)size) + if (fwrite(buffer, 1, size, fp) != size) { free(buffer); (void)fclose(fp); diff --git a/libfreerdp/cache/glyph.c b/libfreerdp/cache/glyph.c index ad394a9bc..c21e2dd89 100644 --- a/libfreerdp/cache/glyph.c +++ b/libfreerdp/cache/glyph.c @@ -644,9 +644,6 @@ const void* glyph_cache_fragment_get(rdpGlyphCache* glyphCache, UINT32 index, UI BOOL glyph_cache_fragment_put(rdpGlyphCache* glyphCache, UINT32 index, UINT32 size, const void* fragment) { - void* prevFragment = NULL; - void* copy = NULL; - WINPR_ASSERT(glyphCache); WINPR_ASSERT(glyphCache->fragCache.entries); @@ -656,7 +653,10 @@ BOOL glyph_cache_fragment_put(rdpGlyphCache* glyphCache, UINT32 index, UINT32 si return FALSE; } - copy = malloc(size); + if (size == 0) + return FALSE; + + void* copy = malloc(size); if (!copy) return FALSE; @@ -664,7 +664,8 @@ BOOL glyph_cache_fragment_put(rdpGlyphCache* glyphCache, UINT32 index, UINT32 si WLog_Print(glyphCache->log, WLOG_DEBUG, "GlyphCacheFragmentPut: index: %" PRIu32 " size: %" PRIu32 "", index, size); CopyMemory(copy, fragment, size); - prevFragment = glyphCache->fragCache.entries[index].fragment; + + void* prevFragment = glyphCache->fragCache.entries[index].fragment; glyphCache->fragCache.entries[index].fragment = copy; glyphCache->fragCache.entries[index].size = size; free(prevFragment); diff --git a/libfreerdp/codec/dsp.c b/libfreerdp/codec/dsp.c index b32f8aa6b..b3aa3d1ee 100644 --- a/libfreerdp/codec/dsp.c +++ b/libfreerdp/codec/dsp.c @@ -150,17 +150,14 @@ static BOOL freerdp_dsp_channel_mix(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context, const AUDIO_FORMAT* WINPR_RESTRICT srcFormat, const BYTE** WINPR_RESTRICT data, size_t* WINPR_RESTRICT length) { - UINT32 bpp; - size_t samples; - if (!context || !data || !length) return FALSE; if (srcFormat->wFormatTag != WAVE_FORMAT_PCM) return FALSE; - bpp = srcFormat->wBitsPerSample > 8 ? 2 : 1; - samples = size / bpp / srcFormat->nChannels; + const UINT32 bpp = srcFormat->wBitsPerSample > 8 ? 2 : 1; + const size_t samples = size / bpp / srcFormat->nChannels; if (context->common.format.nChannels == srcFormat->nChannels) { @@ -324,10 +321,8 @@ static const INT16 ima_step_size_table[] = { static UINT16 dsp_decode_ima_adpcm_sample(ADPCM* WINPR_RESTRICT adpcm, unsigned int channel, BYTE sample) { - INT32 ss; - INT32 d; - ss = ima_step_size_table[adpcm->ima.last_step[channel]]; - d = (ss >> 3); + const INT32 ss = ima_step_size_table[adpcm->ima.last_step[channel]]; + INT32 d = (ss >> 3); if (sample & 1) d += (ss >> 2); @@ -363,10 +358,7 @@ static BOOL freerdp_dsp_decode_ima_adpcm(FREERDP_DSP_CONTEXT* WINPR_RESTRICT con const BYTE* WINPR_RESTRICT src, size_t size, wStream* WINPR_RESTRICT out) { - BYTE sample; - UINT16 decoded; size_t out_size = size * 4; - UINT32 channel; const UINT32 block_size = context->common.format.nBlockAlign; const UINT32 channels = context->common.format.nChannels; @@ -401,15 +393,21 @@ static BOOL freerdp_dsp_decode_ima_adpcm(FREERDP_DSP_CONTEXT* WINPR_RESTRICT con { BYTE* dst = Stream_Pointer(out); - channel = (i < 4 ? 0 : 1); - sample = ((*src) & 0x0f); - decoded = dsp_decode_ima_adpcm_sample(&context->adpcm, channel, sample); - dst[((i & 3) << 3) + (channel << 1)] = (decoded & 0xFF); - dst[((i & 3) << 3) + (channel << 1) + 1] = (decoded >> 8); - sample = ((*src) >> 4); - decoded = dsp_decode_ima_adpcm_sample(&context->adpcm, channel, sample); - dst[((i & 3) << 3) + (channel << 1) + 4] = (decoded & 0xFF); - dst[((i & 3) << 3) + (channel << 1) + 5] = (decoded >> 8); + const int channel = (i < 4 ? 0 : 1); + { + const BYTE sample = ((*src) & 0x0f); + const UINT16 decoded = + dsp_decode_ima_adpcm_sample(&context->adpcm, channel, sample); + dst[((i & 3) << 3) + (channel << 1)] = (decoded & 0xFF); + dst[((i & 3) << 3) + (channel << 1) + 1] = (decoded >> 8); + } + { + const BYTE sample = ((*src) >> 4); + const UINT16 decoded = + dsp_decode_ima_adpcm_sample(&context->adpcm, channel, sample); + dst[((i & 3) << 3) + (channel << 1) + 4] = (decoded & 0xFF); + dst[((i & 3) << 3) + (channel << 1) + 5] = (decoded >> 8); + } src++; } @@ -423,14 +421,18 @@ static BOOL freerdp_dsp_decode_ima_adpcm(FREERDP_DSP_CONTEXT* WINPR_RESTRICT con if (!Stream_SafeSeek(out, 4)) return FALSE; - sample = ((*src) & 0x0f); - decoded = dsp_decode_ima_adpcm_sample(&context->adpcm, 0, sample); - *dst++ = (decoded & 0xFF); - *dst++ = (decoded >> 8); - sample = ((*src) >> 4); - decoded = dsp_decode_ima_adpcm_sample(&context->adpcm, 0, sample); - *dst++ = (decoded & 0xFF); - *dst++ = (decoded >> 8); + { + const BYTE sample = ((*src) & 0x0f); + const UINT16 decoded = dsp_decode_ima_adpcm_sample(&context->adpcm, 0, sample); + *dst++ = (decoded & 0xFF); + *dst++ = (decoded >> 8); + } + { + const BYTE sample = ((*src) >> 4); + const UINT16 decoded = dsp_decode_ima_adpcm_sample(&context->adpcm, 0, sample); + *dst++ = (decoded & 0xFF); + *dst++ = (decoded >> 8); + } src++; size--; } @@ -744,15 +746,11 @@ static const struct static BYTE dsp_encode_ima_adpcm_sample(ADPCM* WINPR_RESTRICT adpcm, int channel, INT16 sample) { - INT32 e; - INT32 d; - INT32 ss; - BYTE enc; - INT32 diff; - ss = ima_step_size_table[adpcm->ima.last_step[channel]]; - d = e = sample - adpcm->ima.last_sample[channel]; - diff = ss >> 3; - enc = 0; + INT32 ss = ima_step_size_table[adpcm->ima.last_step[channel]]; + INT32 e = sample - adpcm->ima.last_sample[channel]; + INT32 d = e; + INT32 diff = ss >> 3; + BYTE enc = 0; if (e < 0) { @@ -809,16 +807,12 @@ static BOOL freerdp_dsp_encode_ima_adpcm(FREERDP_DSP_CONTEXT* WINPR_RESTRICT con const BYTE* WINPR_RESTRICT src, size_t size, wStream* WINPR_RESTRICT out) { - INT16 sample; - BYTE encoded; - size_t align; - if (!Stream_EnsureRemainingCapacity(out, size)) return FALSE; if (!Stream_EnsureRemainingCapacity(context->common.buffer, size + 64)) return FALSE; - align = (context->common.format.nChannels > 1) ? 32 : 4; + const size_t align = (context->common.format.nChannels > 1) ? 32 : 4; while (size >= align) { @@ -848,9 +842,9 @@ static BOOL freerdp_dsp_encode_ima_adpcm(FREERDP_DSP_CONTEXT* WINPR_RESTRICT con for (size_t i = 0; i < 16; i++) { - sample = (INT16)(((UINT16)(*src)) | (((UINT16)(*(src + 1))) << 8)); + const INT16 sample = (INT16)(((UINT16)(*src)) | (((UINT16)(*(src + 1))) << 8)); src += 2; - encoded = dsp_encode_ima_adpcm_sample(&context->adpcm, i % 2, sample); + const BYTE encoded = dsp_encode_ima_adpcm_sample(&context->adpcm, i % 2, sample); dst[ima_stereo_encode_map[i].byte_num] |= encoded << ima_stereo_encode_map[i].byte_shift; } @@ -861,9 +855,9 @@ static BOOL freerdp_dsp_encode_ima_adpcm(FREERDP_DSP_CONTEXT* WINPR_RESTRICT con } else { - sample = (INT16)(((UINT16)(*src)) | (((UINT16)(*(src + 1))) << 8)); + INT16 sample = (INT16)(((UINT16)(*src)) | (((UINT16)(*(src + 1))) << 8)); src += 2; - encoded = dsp_encode_ima_adpcm_sample(&context->adpcm, 0, sample); + BYTE encoded = dsp_encode_ima_adpcm_sample(&context->adpcm, 0, sample); sample = (INT16)(((UINT16)(*src)) | (((UINT16)(*(src + 1))) << 8)); src += 2; encoded |= dsp_encode_ima_adpcm_sample(&context->adpcm, 0, sample) << 4; @@ -898,12 +892,11 @@ static const INT32 ms_adpcm_coeffs2[7] = { 0, -256, 0, 64, 0, -208, -232 }; static INLINE INT16 freerdp_dsp_decode_ms_adpcm_sample(ADPCM* WINPR_RESTRICT adpcm, BYTE sample, int channel) { - INT8 nibble; - INT32 presample; - nibble = (sample & 0x08 ? (INT8)sample - 16 : (INT8)sample); - presample = ((adpcm->ms.sample1[channel] * ms_adpcm_coeffs1[adpcm->ms.predictor[channel]]) + - (adpcm->ms.sample2[channel] * ms_adpcm_coeffs2[adpcm->ms.predictor[channel]])) / - 256; + const INT8 nibble = (sample & 0x08 ? (INT8)sample - 16 : (INT8)sample); + INT32 presample = + ((adpcm->ms.sample1[channel] * ms_adpcm_coeffs1[adpcm->ms.predictor[channel]]) + + (adpcm->ms.sample2[channel] * ms_adpcm_coeffs2[adpcm->ms.predictor[channel]])) / + 256; presample += nibble * adpcm->ms.delta[channel]; if (presample > 32767) @@ -925,7 +918,6 @@ static BOOL freerdp_dsp_decode_ms_adpcm(FREERDP_DSP_CONTEXT* WINPR_RESTRICT cont const BYTE* WINPR_RESTRICT src, size_t size, wStream* WINPR_RESTRICT out) { - BYTE sample; const size_t out_size = size * 4; const UINT32 channels = context->common.format.nChannels; const UINT32 block_size = context->common.format.nBlockAlign; @@ -976,22 +968,26 @@ static BOOL freerdp_dsp_decode_ms_adpcm(FREERDP_DSP_CONTEXT* WINPR_RESTRICT cont if (channels > 1) { - sample = *src++; - size--; - Stream_Write_INT16(out, - freerdp_dsp_decode_ms_adpcm_sample(&context->adpcm, sample >> 4, 0)); - Stream_Write_INT16( - out, freerdp_dsp_decode_ms_adpcm_sample(&context->adpcm, sample & 0x0F, 1)); - sample = *src++; - size--; - Stream_Write_INT16(out, - freerdp_dsp_decode_ms_adpcm_sample(&context->adpcm, sample >> 4, 0)); - Stream_Write_INT16( - out, freerdp_dsp_decode_ms_adpcm_sample(&context->adpcm, sample & 0x0F, 1)); + { + const BYTE sample = *src++; + size--; + Stream_Write_INT16( + out, freerdp_dsp_decode_ms_adpcm_sample(&context->adpcm, sample >> 4, 0)); + Stream_Write_INT16( + out, freerdp_dsp_decode_ms_adpcm_sample(&context->adpcm, sample & 0x0F, 1)); + } + { + const BYTE sample = *src++; + size--; + Stream_Write_INT16( + out, freerdp_dsp_decode_ms_adpcm_sample(&context->adpcm, sample >> 4, 0)); + Stream_Write_INT16( + out, freerdp_dsp_decode_ms_adpcm_sample(&context->adpcm, sample & 0x0F, 1)); + } } else { - sample = *src++; + const BYTE sample = *src++; size--; Stream_Write_INT16(out, freerdp_dsp_decode_ms_adpcm_sample(&context->adpcm, sample >> 4, 0)); @@ -1006,12 +1002,11 @@ static BOOL freerdp_dsp_decode_ms_adpcm(FREERDP_DSP_CONTEXT* WINPR_RESTRICT cont static BYTE freerdp_dsp_encode_ms_adpcm_sample(ADPCM* WINPR_RESTRICT adpcm, INT32 sample, int channel) { - INT32 presample; - INT32 errordelta; - presample = ((adpcm->ms.sample1[channel] * ms_adpcm_coeffs1[adpcm->ms.predictor[channel]]) + - (adpcm->ms.sample2[channel] * ms_adpcm_coeffs2[adpcm->ms.predictor[channel]])) / - 256; - errordelta = (sample - presample) / adpcm->ms.delta[channel]; + INT32 presample = + ((adpcm->ms.sample1[channel] * ms_adpcm_coeffs1[adpcm->ms.predictor[channel]]) + + (adpcm->ms.sample2[channel] * ms_adpcm_coeffs2[adpcm->ms.predictor[channel]])) / + 256; + INT32 errordelta = (sample - presample) / adpcm->ms.delta[channel]; if ((sample - presample) % adpcm->ms.delta[channel] > adpcm->ms.delta[channel] / 2) errordelta++; @@ -1043,14 +1038,12 @@ static BOOL freerdp_dsp_encode_ms_adpcm(FREERDP_DSP_CONTEXT* WINPR_RESTRICT cont const BYTE* WINPR_RESTRICT src, size_t size, wStream* WINPR_RESTRICT out) { - size_t start; - INT32 sample; const size_t step = 8 + ((context->common.format.nChannels > 1) ? 4 : 0); if (!Stream_EnsureRemainingCapacity(out, size)) return FALSE; - start = Stream_GetPosition(out); + const size_t start = Stream_GetPosition(out); if (context->adpcm.ms.delta[0] < 16) context->adpcm.ms.delta[0] = 16; @@ -1060,7 +1053,6 @@ static BOOL freerdp_dsp_encode_ms_adpcm(FREERDP_DSP_CONTEXT* WINPR_RESTRICT cont while (size >= step) { - BYTE val; if ((Stream_GetPosition(out) - start) % context->common.format.nBlockAlign == 0) { if (context->common.format.nChannels > 1) @@ -1101,17 +1093,22 @@ static BOOL freerdp_dsp_encode_ms_adpcm(FREERDP_DSP_CONTEXT* WINPR_RESTRICT cont } } - sample = read_int16(src); - src += 2; - Stream_Write_UINT8( - out, (freerdp_dsp_encode_ms_adpcm_sample(&context->adpcm, sample, 0) << 4) & 0xFF); - sample = read_int16(src); - src += 2; + { + const INT16 sample = read_int16(src); + src += 2; + Stream_Write_UINT8( + out, (freerdp_dsp_encode_ms_adpcm_sample(&context->adpcm, sample, 0) << 4) & 0xFF); + } + { + const INT16 sample = read_int16(src); + src += 2; - Stream_Read_UINT8(out, val); - val += freerdp_dsp_encode_ms_adpcm_sample(&context->adpcm, sample, - context->common.format.nChannels > 1 ? 1 : 0); - Stream_Write_UINT8(out, val); + BYTE val = 0; + Stream_Read_UINT8(out, val); + val += freerdp_dsp_encode_ms_adpcm_sample(&context->adpcm, sample, + context->common.format.nChannels > 1 ? 1 : 0); + Stream_Write_UINT8(out, val); + } size -= 4; } @@ -1252,14 +1249,12 @@ BOOL freerdp_dsp_encode(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context, #if defined(WITH_DSP_FFMPEG) return freerdp_dsp_ffmpeg_encode(context, srcFormat, data, length, out); #else - const BYTE* resampleData; - size_t resampleLength; - AUDIO_FORMAT format; - if (!context || !context->common.encoder || !srcFormat || !data || !out) return FALSE; - format = *srcFormat; + AUDIO_FORMAT format = *srcFormat; + const BYTE* resampleData = NULL; + size_t resampleLength = 0; if (!freerdp_dsp_channel_mix(context, data, length, srcFormat, &resampleData, &resampleLength)) return FALSE; diff --git a/libfreerdp/codec/ncrush.c b/libfreerdp/codec/ncrush.c index bd04884bf..15332eefe 100644 --- a/libfreerdp/codec/ncrush.c +++ b/libfreerdp/codec/ncrush.c @@ -2942,7 +2942,7 @@ static int ncrush_generate_tables(NCRUSH_CONTEXT* context) for (int j = 0; j < 1 << LOMBitsLUT[i]; j++) { size_t l = (cnt++) + 2ull; - context->HuffTableLOM[l] = (int)i; + context->HuffTableLOM[l] = i; } } diff --git a/libfreerdp/codec/planar.c b/libfreerdp/codec/planar.c index 663c62da5..e2df14045 100644 --- a/libfreerdp/codec/planar.c +++ b/libfreerdp/codec/planar.c @@ -388,7 +388,7 @@ static INLINE INT32 planar_decompress_plane_rle(const BYTE* WINPR_RESTRICT pSrcD for (INT32 y = beg; y != end; y += inc) { - BYTE* dstp = &pDstData[((nYDst + y) * (INT32)nDstStep) + (nXDst * 4) + nChannel]; + BYTE* dstp = &pDstData[((nYDst + y) * nDstStep) + (nXDst * 4) + nChannel]; pixel = 0; currentScanline = dstp; @@ -515,7 +515,7 @@ static INLINE INT32 planar_set_plane(BYTE bValue, BYTE* pDstData, INT32 nDstStep for (INT32 y = beg; y != end; y += inc) { - BYTE* dstp = &pDstData[((nYDst + y) * (INT32)nDstStep) + (nXDst * 4) + nChannel]; + BYTE* dstp = &pDstData[((nYDst + y) * nDstStep) + (nXDst * 4) + nChannel]; for (INT32 x = 0; x < (INT32)nWidth; ++x) { @@ -1130,7 +1130,7 @@ static INLINE BOOL freerdp_split_color_planes(BITMAP_PLANAR_CONTEXT* WINPR_RESTR UINT32 k = 0; for (UINT32 i = 0; i < height; i++) { - const BYTE* pixel = &data[1ULL * scanline * (UINT32)i]; + const BYTE* pixel = &data[1ULL * scanline * i]; for (UINT32 j = 0; j < width; j++) { @@ -1222,7 +1222,7 @@ static INLINE UINT32 freerdp_bitmap_planar_write_rle_bytes(const BYTE* WINPR_RES outBufferSize--; *pOutput = controlByte; pOutput++; - nBytesToWrite = (int)(controlByte >> 4); + nBytesToWrite = (controlByte >> 4); if (nBytesToWrite) { diff --git a/libfreerdp/codec/progressive.c b/libfreerdp/codec/progressive.c index 9442157b3..94dc8f6f7 100644 --- a/libfreerdp/codec/progressive.c +++ b/libfreerdp/codec/progressive.c @@ -1022,18 +1022,18 @@ progressive_decompress_tile_first(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progressiv progressive_rfx_quant_add(quantCr, quantProgCr, &shiftCr); progressive_rfx_quant_lsub(&shiftCr, 1); /* -6 + 5 = -1 */ - pSign[0] = (INT16*)((BYTE*)(&tile->sign[((8192 + 32) * 0) + 16])); /* Y/R buffer */ - pSign[1] = (INT16*)((BYTE*)(&tile->sign[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ - pSign[2] = (INT16*)((BYTE*)(&tile->sign[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ + pSign[0] = (INT16*)((&tile->sign[((8192 + 32) * 0) + 16])); /* Y/R buffer */ + pSign[1] = (INT16*)((&tile->sign[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ + pSign[2] = (INT16*)((&tile->sign[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ - pCurrent[0] = (INT16*)((BYTE*)(&tile->current[((8192 + 32) * 0) + 16])); /* Y/R buffer */ - pCurrent[1] = (INT16*)((BYTE*)(&tile->current[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ - pCurrent[2] = (INT16*)((BYTE*)(&tile->current[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ + pCurrent[0] = (INT16*)((&tile->current[((8192 + 32) * 0) + 16])); /* Y/R buffer */ + pCurrent[1] = (INT16*)((&tile->current[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ + pCurrent[2] = (INT16*)((&tile->current[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ pBuffer = (BYTE*)BufferPool_Take(progressive->bufferPool, -1); - pSrcDst[0] = (INT16*)((BYTE*)(&pBuffer[((8192 + 32) * 0) + 16])); /* Y/R buffer */ - pSrcDst[1] = (INT16*)((BYTE*)(&pBuffer[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ - pSrcDst[2] = (INT16*)((BYTE*)(&pBuffer[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ + pSrcDst[0] = (INT16*)((&pBuffer[((8192 + 32) * 0) + 16])); /* Y/R buffer */ + pSrcDst[1] = (INT16*)((&pBuffer[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ + pSrcDst[2] = (INT16*)((&pBuffer[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ rc = progressive_rfx_decode_component(progressive, &shiftY, tile->yData, tile->yLen, pSrcDst[0], pCurrent[0], pSign[0], diff, sub, extrapolate); /* Y */ @@ -1457,18 +1457,18 @@ progressive_decompress_tile_upgrade(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progress tile->cbProgQuant = *quantProgCb; tile->crProgQuant = *quantProgCr; - pSign[0] = (INT16*)((BYTE*)(&tile->sign[((8192 + 32) * 0) + 16])); /* Y/R buffer */ - pSign[1] = (INT16*)((BYTE*)(&tile->sign[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ - pSign[2] = (INT16*)((BYTE*)(&tile->sign[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ + pSign[0] = (INT16*)((&tile->sign[((8192 + 32) * 0) + 16])); /* Y/R buffer */ + pSign[1] = (INT16*)((&tile->sign[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ + pSign[2] = (INT16*)((&tile->sign[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ - pCurrent[0] = (INT16*)((BYTE*)(&tile->current[((8192 + 32) * 0) + 16])); /* Y/R buffer */ - pCurrent[1] = (INT16*)((BYTE*)(&tile->current[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ - pCurrent[2] = (INT16*)((BYTE*)(&tile->current[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ + pCurrent[0] = (INT16*)((&tile->current[((8192 + 32) * 0) + 16])); /* Y/R buffer */ + pCurrent[1] = (INT16*)((&tile->current[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ + pCurrent[2] = (INT16*)((&tile->current[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ pBuffer = (BYTE*)BufferPool_Take(progressive->bufferPool, -1); - pSrcDst[0] = (INT16*)((BYTE*)(&pBuffer[((8192 + 32) * 0) + 16])); /* Y/R buffer */ - pSrcDst[1] = (INT16*)((BYTE*)(&pBuffer[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ - pSrcDst[2] = (INT16*)((BYTE*)(&pBuffer[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ + pSrcDst[0] = (INT16*)((&pBuffer[((8192 + 32) * 0) + 16])); /* Y/R buffer */ + pSrcDst[1] = (INT16*)((&pBuffer[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ + pSrcDst[2] = (INT16*)((&pBuffer[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ status = progressive_rfx_upgrade_component(progressive, &shiftY, quantProgY, &yNumBits, pSrcDst[0], pCurrent[0], pSign[0], tile->ySrlData, diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c index 3717f9225..e57161ff3 100644 --- a/libfreerdp/codec/rfx.c +++ b/libfreerdp/codec/rfx.c @@ -1638,8 +1638,8 @@ RFX_MESSAGE* rfx_encode_message(RFX_CONTEXT* WINPR_RESTRICT context, const RFX_RECT* WINPR_RESTRICT rects, size_t numRects, const BYTE* WINPR_RESTRICT data, UINT32 w, UINT32 h, size_t s) { - const UINT32 width = (UINT32)w; - const UINT32 height = (UINT32)h; + const UINT32 width = w; + const UINT32 height = h; const UINT32 scanline = (UINT32)s; RFX_MESSAGE* message = NULL; PTP_WORK* workObject = NULL; @@ -1791,9 +1791,9 @@ RFX_MESSAGE* rfx_encode_message(RFX_CONTEXT* WINPR_RESTRICT context, if (!(tile->YCbCrData = (BYTE*)BufferPool_Take(context->priv->BufferPool, -1))) goto skip_encoding_loop; - tile->YData = (BYTE*)&(tile->YCbCrData[((8192 + 32) * 0) + 16]); - tile->CbData = (BYTE*)&(tile->YCbCrData[((8192 + 32) * 1) + 16]); - tile->CrData = (BYTE*)&(tile->YCbCrData[((8192 + 32) * 2) + 16]); + tile->YData = &(tile->YCbCrData[((8192 + 32) * 0) + 16]); + tile->CbData = &(tile->YCbCrData[((8192 + 32) * 1) + 16]); + tile->CrData = &(tile->YCbCrData[((8192 + 32) * 2) + 16]); if (!rfx_ensure_tiles(message, 1)) goto skip_encoding_loop; diff --git a/libfreerdp/codec/rfx_decode.c b/libfreerdp/codec/rfx_decode.c index 5c5fbcf74..998ca97be 100644 --- a/libfreerdp/codec/rfx_decode.c +++ b/libfreerdp/codec/rfx_decode.c @@ -83,9 +83,9 @@ BOOL rfx_decode_rgb(RFX_CONTEXT* WINPR_RESTRICT context, const RFX_TILE* WINPR_R cb_quants = context->quants + (10ULL * tile->quantIdxCb); cr_quants = context->quants + (10ULL * tile->quantIdxCr); pBuffer = (BYTE*)BufferPool_Take(context->priv->BufferPool, -1); - pSrcDst[0] = (INT16*)((BYTE*)(&pBuffer[((8192ULL + 32ULL) * 0ULL) + 16ULL])); /* y_r_buffer */ - pSrcDst[1] = (INT16*)((BYTE*)(&pBuffer[((8192ULL + 32ULL) * 1ULL) + 16ULL])); /* cb_g_buffer */ - pSrcDst[2] = (INT16*)((BYTE*)(&pBuffer[((8192ULL + 32ULL) * 2ULL) + 16ULL])); /* cr_b_buffer */ + pSrcDst[0] = (INT16*)((&pBuffer[((8192ULL + 32ULL) * 0ULL) + 16ULL])); /* y_r_buffer */ + pSrcDst[1] = (INT16*)((&pBuffer[((8192ULL + 32ULL) * 1ULL) + 16ULL])); /* cb_g_buffer */ + pSrcDst[2] = (INT16*)((&pBuffer[((8192ULL + 32ULL) * 2ULL) + 16ULL])); /* cr_b_buffer */ rfx_decode_component(context, y_quants, tile->YData, tile->YLen, pSrcDst[0]); /* YData */ rfx_decode_component(context, cb_quants, tile->CbData, tile->CbLen, pSrcDst[1]); /* CbData */ rfx_decode_component(context, cr_quants, tile->CrData, tile->CrLen, pSrcDst[2]); /* CrData */ diff --git a/libfreerdp/codec/rfx_encode.c b/libfreerdp/codec/rfx_encode.c index 9d509458a..59a7b9f34 100644 --- a/libfreerdp/codec/rfx_encode.c +++ b/libfreerdp/codec/rfx_encode.c @@ -283,9 +283,9 @@ void rfx_encode_rgb(RFX_CONTEXT* WINPR_RESTRICT context, RFX_TILE* WINPR_RESTRIC YQuant = context->quants + (10ULL * tile->quantIdxY); CbQuant = context->quants + (10ULL * tile->quantIdxCb); CrQuant = context->quants + (10ULL * tile->quantIdxCr); - pSrcDst[0] = (INT16*)((BYTE*)(&pBuffer[((8192ULL + 32ULL) * 0ULL) + 16ULL])); /* y_r_buffer */ - pSrcDst[1] = (INT16*)((BYTE*)(&pBuffer[((8192ULL + 32ULL) * 1ULL) + 16ULL])); /* cb_g_buffer */ - pSrcDst[2] = (INT16*)((BYTE*)(&pBuffer[((8192ULL + 32ULL) * 2ULL) + 16ULL])); /* cr_b_buffer */ + pSrcDst[0] = (INT16*)((&pBuffer[((8192ULL + 32ULL) * 0ULL) + 16ULL])); /* y_r_buffer */ + pSrcDst[1] = (INT16*)((&pBuffer[((8192ULL + 32ULL) * 1ULL) + 16ULL])); /* cb_g_buffer */ + pSrcDst[2] = (INT16*)((&pBuffer[((8192ULL + 32ULL) * 2ULL) + 16ULL])); /* cr_b_buffer */ PROFILER_ENTER(context->priv->prof_rfx_encode_rgb) PROFILER_ENTER(context->priv->prof_rfx_encode_format_rgb) rfx_encode_format_rgb(tile->data, tile->width, tile->height, tile->scanline, diff --git a/libfreerdp/common/addin.c b/libfreerdp/common/addin.c index d4c7208cc..bd56ac962 100644 --- a/libfreerdp/common/addin.c +++ b/libfreerdp/common/addin.c @@ -225,8 +225,7 @@ PVIRTUALCHANNELENTRY freerdp_load_dynamic_addin(LPCSTR pszFileName, LPCSTR pszPa CopyMemory(pszFilePath, pszAddinInstallPath, cchAddinInstallPath); pszFilePath[cchAddinInstallPath] = '\0'; - const HRESULT hr = - NativePathCchAppendA((LPSTR)pszFilePath, cchFilePath + 1, pszRelativeFilePath); + const HRESULT hr = NativePathCchAppendA(pszFilePath, cchFilePath + 1, pszRelativeFilePath); if (FAILED(hr)) goto fail; } diff --git a/libfreerdp/common/assistance.c b/libfreerdp/common/assistance.c index 0f43286fd..c83021d51 100644 --- a/libfreerdp/common/assistance.c +++ b/libfreerdp/common/assistance.c @@ -78,7 +78,7 @@ struct rdp_assistance_file static const char* strrstr(const char* haystack, size_t len, const char* needle) { if (*needle == '\0') - return (const char*)haystack; + return haystack; char* result = NULL; for (;;) @@ -960,8 +960,8 @@ static BOOL freerdp_assistance_decrypt2(rdpAssistanceFile* file) goto fail; cbOut = cbFinal = 0; - cbIn = (size_t)file->EncryptedLHTicketLength; - pbIn = (BYTE*)file->EncryptedLHTicket; + cbIn = file->EncryptedLHTicketLength; + pbIn = file->EncryptedLHTicket; pbOut = (BYTE*)calloc(1, cbIn + WINPR_AES_BLOCK_SIZE + 2); if (!pbOut) diff --git a/libfreerdp/common/settings.c b/libfreerdp/common/settings.c index d8a438183..ef79a1c73 100644 --- a/libfreerdp/common/settings.c +++ b/libfreerdp/common/settings.c @@ -272,7 +272,7 @@ RDPDR_DEVICE* freerdp_device_collection_find(rdpSettings* settings, const char* WINPR_ASSERT(name); for (UINT32 index = 0; index < settings->DeviceCount; index++) { - device = (RDPDR_DEVICE*)settings->DeviceArray[index]; + device = settings->DeviceArray[index]; if (!device->Name) continue; @@ -291,7 +291,7 @@ RDPDR_DEVICE* freerdp_device_collection_find_type(rdpSettings* settings, UINT32 for (UINT32 index = 0; index < settings->DeviceCount; index++) { - device = (RDPDR_DEVICE*)settings->DeviceArray[index]; + device = settings->DeviceArray[index]; if (device->Type == type) return device; diff --git a/libfreerdp/core/gateway/rdg.c b/libfreerdp/core/gateway/rdg.c index d63ed71e7..17d9f59b7 100644 --- a/libfreerdp/core/gateway/rdg.c +++ b/libfreerdp/core/gateway/rdg.c @@ -531,7 +531,7 @@ static BOOL rdg_send_tunnel_request(rdpRdg* rdg) if (PAACookie) { Stream_Write_UINT16(s, (UINT16)PAACookieLen * sizeof(WCHAR)); /* PAA cookie string length */ - Stream_Write_UTF16_String(s, PAACookie, (size_t)PAACookieLen); + Stream_Write_UTF16_String(s, PAACookie, PAACookieLen); } Stream_SealLength(s); @@ -578,7 +578,7 @@ static BOOL rdg_send_tunnel_authorization(rdpRdg* rdg) Stream_Write_UINT32(s, packetSize); /* PacketLength (4 bytes) */ Stream_Write_UINT16(s, 0); /* FieldsPresent (2 bytes) */ Stream_Write_UINT16(s, (UINT16)clientNameLen * sizeof(WCHAR)); /* Client name string length */ - Stream_Write_UTF16_String(s, clientName, (size_t)clientNameLen); + Stream_Write_UTF16_String(s, clientName, clientNameLen); Stream_SealLength(s); status = rdg_write_packet(rdg, s); Stream_Free(s, TRUE); @@ -622,7 +622,7 @@ static BOOL rdg_send_channel_create(rdpRdg* rdg) (UINT16)rdg->context->settings->ServerPort); /* Resource port (2 bytes) */ Stream_Write_UINT16(s, 3); /* Protocol number (2 bytes) */ Stream_Write_UINT16(s, (UINT16)serverNameLen * sizeof(WCHAR)); - Stream_Write_UTF16_String(s, serverName, (size_t)serverNameLen); + Stream_Write_UTF16_String(s, serverName, serverNameLen); Stream_SealLength(s); status = rdg_write_packet(rdg, s); fail: @@ -1678,7 +1678,7 @@ static int rdg_write_websocket_data_packet(rdpRdg* rdg, const BYTE* buf, int isi /* mask as much as possible with 32bit access */ for (streamPos = 0; streamPos + 4 <= isize; streamPos += 4) { - uint32_t masked = *((const uint32_t*)((const BYTE*)buf + streamPos)) ^ maskingKey; + uint32_t masked = *((const uint32_t*)(buf + streamPos)) ^ maskingKey; Stream_Write_UINT32(sWS, masked); } @@ -1686,7 +1686,7 @@ static int rdg_write_websocket_data_packet(rdpRdg* rdg, const BYTE* buf, int isi for (; streamPos < isize; streamPos++) { BYTE* partialMask = (BYTE*)(&maskingKey) + streamPos % 4; - BYTE masked = *((const BYTE*)((const BYTE*)buf + streamPos)) ^ *partialMask; + BYTE masked = *((buf + streamPos)) ^ *partialMask; Stream_Write_UINT8(sWS, masked); } diff --git a/libfreerdp/core/gateway/rpc_client.c b/libfreerdp/core/gateway/rpc_client.c index 6fd93bb60..953425190 100644 --- a/libfreerdp/core/gateway/rpc_client.c +++ b/libfreerdp/core/gateway/rpc_client.c @@ -478,8 +478,7 @@ static int rpc_client_recv_fragment(rdpRpc* rpc, wStream* fragment) if (Stream_Length(fragment) < StubOffset + StubLength) goto fail; Stream_SetPosition(fragment, StubOffset); - rpc_client_receive_pipe_write(rpc->client, Stream_ConstPointer(fragment), - (size_t)StubLength); + rpc_client_receive_pipe_write(rpc->client, Stream_ConstPointer(fragment), StubLength); rpc->StubFragCount++; if (response->alloc_hint == StubLength) diff --git a/libfreerdp/core/gateway/websocket.c b/libfreerdp/core/gateway/websocket.c index 554e67c34..cbd991342 100644 --- a/libfreerdp/core/gateway/websocket.c +++ b/libfreerdp/core/gateway/websocket.c @@ -184,7 +184,7 @@ int websocket_write(BIO* bio, const BYTE* buf, int isize, WEBSOCKET_OPCODE opcod /* mask as much as possible with 32bit access */ for (streamPos = 0; streamPos + 4 <= isize; streamPos += 4) { - uint32_t masked = *((const uint32_t*)((const BYTE*)buf + streamPos)) ^ maskingKey; + uint32_t masked = *((const uint32_t*)(buf + streamPos)) ^ maskingKey; Stream_Write_UINT32(sWS, masked); } @@ -192,7 +192,7 @@ int websocket_write(BIO* bio, const BYTE* buf, int isize, WEBSOCKET_OPCODE opcod for (; streamPos < isize; streamPos++) { BYTE* partialMask = (BYTE*)(&maskingKey) + streamPos % 4; - BYTE masked = *((const BYTE*)((const BYTE*)buf + streamPos)) ^ *partialMask; + BYTE masked = *((buf + streamPos)) ^ *partialMask; Stream_Write_UINT8(sWS, masked); } diff --git a/libfreerdp/core/input.c b/libfreerdp/core/input.c index 45dc05481..a7497544f 100644 --- a/libfreerdp/core/input.c +++ b/libfreerdp/core/input.c @@ -382,7 +382,7 @@ static BOOL input_send_fastpath_keyboard_event(rdpInput* input, UINT16 flags, UI return FALSE; WINPR_ASSERT(code <= UINT8_MAX); - Stream_Write_UINT8(s, (UINT8)code); /* keyCode (1 byte) */ + Stream_Write_UINT8(s, code); /* keyCode (1 byte) */ return fastpath_send_input_pdu(rdp->fastpath, s); } diff --git a/libfreerdp/core/server.c b/libfreerdp/core/server.c index e675e0a11..664ea4de3 100644 --- a/libfreerdp/core/server.c +++ b/libfreerdp/core/server.c @@ -440,8 +440,8 @@ static BOOL WTSProcessChannelData(rdpPeerChannel* channel, UINT16 channelId, con size_t s, UINT32 flags, size_t t) { BOOL ret = TRUE; - const size_t size = (size_t)s; - const size_t totalSize = (size_t)t; + const size_t size = s; + const size_t totalSize = t; WINPR_ASSERT(channel); WINPR_ASSERT(channel->vcm); diff --git a/libfreerdp/core/test/TestSettings.c b/libfreerdp/core/test/TestSettings.c index 08754e29b..fa46d3ccc 100644 --- a/libfreerdp/core/test/TestSettings.c +++ b/libfreerdp/core/test/TestSettings.c @@ -333,7 +333,7 @@ static BOOL print_negative(char* buffer, size_t size, INT64 value, INT64 min) (void)_snprintf(buffer, size, "%" PRId32, (INT32)value); return FALSE; case INT64_MIN: - (void)_snprintf(buffer, size, "%" PRId64, (INT64)value); + (void)_snprintf(buffer, size, "%" PRId64, value); return FALSE; default: (void)_snprintf(buffer, size, "too small a number"); @@ -358,7 +358,7 @@ static BOOL print_xpositive(char* buffer, size_t size, INT64 value, INT64 max) (void)_snprintf(buffer, size, "%" PRIx32, (INT32)value); return FALSE; case INT64_MAX: - (void)_snprintf(buffer, size, "%" PRIx64, (INT64)value); + (void)_snprintf(buffer, size, "%" PRIx64, value); return FALSE; default: (void)_snprintf(buffer, size, "too small a number"); diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c index 705be74a2..adbbd6cd2 100644 --- a/libfreerdp/crypto/crypto.c +++ b/libfreerdp/crypto/crypto.c @@ -55,15 +55,15 @@ static SSIZE_T crypto_rsa_common(const BYTE* input, size_t length, UINT32 key_le if (!input || !modulus || !exponent || !output) return -1; - if ((size_t)exponent_size > INT_MAX / 2) + if (exponent_size > INT_MAX / 2) return -1; if (key_length >= INT_MAX / 2 - exponent_size) return -1; bufferSize = 2ULL * key_length + exponent_size; - if ((size_t)length > bufferSize) - bufferSize = (size_t)length; + if (length > bufferSize) + bufferSize = length; input_reverse = (BYTE*)calloc(bufferSize, 1); @@ -218,7 +218,7 @@ char* crypto_read_pem(const char* WINPR_RESTRICT filename, size_t* WINPR_RESTRIC goto fail; if (plength) - *plength = (size_t)strnlen(pem, size); + *plength = strnlen(pem, size); (void)fclose(fp); return pem; diff --git a/libfreerdp/crypto/x509_utils.c b/libfreerdp/crypto/x509_utils.c index 48ed48a3a..355fd6ec4 100644 --- a/libfreerdp/crypto/x509_utils.c +++ b/libfreerdp/crypto/x509_utils.c @@ -377,7 +377,7 @@ static char* object_string(ASN1_TYPE* object) return 0; } - result = (char*)_strdup((char*)utf8String); + result = _strdup((char*)utf8String); OPENSSL_free(utf8String); return result; } diff --git a/libfreerdp/gdi/gfx.c b/libfreerdp/gdi/gfx.c index ef0148278..575043369 100644 --- a/libfreerdp/gdi/gfx.c +++ b/libfreerdp/gdi/gfx.c @@ -624,7 +624,7 @@ static UINT gdi_SurfaceCommand_AVC420(rdpGdi* gdi, RdpgfxClientContext* context, for (UINT32 i = 0; i < meta->numRegionRects; i++) { region16_union_rect(&(surface->invalidRegion), &(surface->invalidRegion), - (RECTANGLE_16*)&(meta->regionRects[i])); + &(meta->regionRects[i])); } status = IFCALLRESULT(CHANNEL_RC_OK, context->UpdateSurfaceArea, context, surface->surfaceId, diff --git a/libfreerdp/primitives/prim_copy.c b/libfreerdp/primitives/prim_copy.c index 9494cc7e4..4b9a2a265 100644 --- a/libfreerdp/primitives/prim_copy.c +++ b/libfreerdp/primitives/prim_copy.c @@ -102,8 +102,8 @@ static pstatus_t general_copy_8u(const BYTE* pSrc, BYTE* pDst, INT32 len) static pstatus_t general_copy_8u_AC4r(const BYTE* pSrc, INT32 srcStep, BYTE* pDst, INT32 dstStep, INT32 width, INT32 height) { - const BYTE* src = (const BYTE*)pSrc; - BYTE* dst = (BYTE*)pDst; + const BYTE* src = pSrc; + BYTE* dst = pDst; int rowbytes = width * sizeof(UINT32); if ((width == 0) || (height == 0)) diff --git a/libfreerdp/primitives/prim_set.c b/libfreerdp/primitives/prim_set.c index 3735e4836..15df29e33 100644 --- a/libfreerdp/primitives/prim_set.c +++ b/libfreerdp/primitives/prim_set.c @@ -41,7 +41,7 @@ static pstatus_t general_zero(void* pDst, size_t len) /* ========================================================================= */ static pstatus_t general_set_32s(INT32 val, INT32* pDst, UINT32 len) { - INT32* dptr = (INT32*)pDst; + INT32* dptr = pDst; size_t span = 0; size_t remaining = 0; primitives_t* prims = NULL; @@ -78,7 +78,7 @@ static pstatus_t general_set_32s(INT32 val, INT32* pDst, UINT32 len) /* ------------------------------------------------------------------------- */ static pstatus_t general_set_32u(UINT32 val, UINT32* pDst, UINT32 len) { - UINT32* dptr = (UINT32*)pDst; + UINT32* dptr = pDst; size_t span = 0; size_t remaining = 0; primitives_t* prims = NULL; diff --git a/libfreerdp/primitives/prim_shift.c b/libfreerdp/primitives/prim_shift.c index 9af34fde0..7e42e4dfd 100644 --- a/libfreerdp/primitives/prim_shift.c +++ b/libfreerdp/primitives/prim_shift.c @@ -78,7 +78,7 @@ static INLINE pstatus_t general_lShiftC_16u(const UINT16* pSrc, UINT32 val, UINT return -1; while (len--) - *pDst++ = (INT16)((UINT16)*pSrc++ << val); + *pDst++ = (INT16)(*pSrc++ << val); return PRIMITIVES_SUCCESS; } diff --git a/libfreerdp/primitives/sse/prim_YCoCg_ssse3.c b/libfreerdp/primitives/sse/prim_YCoCg_ssse3.c index fb739f66f..f7c3d4acf 100644 --- a/libfreerdp/primitives/sse/prim_YCoCg_ssse3.c +++ b/libfreerdp/primitives/sse/prim_YCoCg_ssse3.c @@ -41,7 +41,7 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_invert(const BYTE* WINPR_RESTRICT pSr UINT8 shift, BOOL withAlpha) { const BYTE* sptr = pSrc; - BYTE* dptr = (BYTE*)pDst; + BYTE* dptr = pDst; int sRowBump = srcStep - width * sizeof(UINT32); int dRowBump = dstStep - width * sizeof(UINT32); /* Shift left by "shift" and divide by two is the same as shift @@ -227,7 +227,7 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_no_invert(const BYTE* WINPR_RESTRICT UINT32 height, UINT8 shift, BOOL withAlpha) { const BYTE* sptr = pSrc; - BYTE* dptr = (BYTE*)pDst; + BYTE* dptr = pDst; int sRowBump = srcStep - width * sizeof(UINT32); int dRowBump = dstStep - width * sizeof(UINT32); /* Shift left by "shift" and divide by two is the same as shift diff --git a/libfreerdp/primitives/sse/prim_add_sse3.c b/libfreerdp/primitives/sse/prim_add_sse3.c index e235aee8c..dc85e1ed2 100644 --- a/libfreerdp/primitives/sse/prim_add_sse3.c +++ b/libfreerdp/primitives/sse/prim_add_sse3.c @@ -39,15 +39,13 @@ static pstatus_t sse3_add_16s_inplace(INT16* WINPR_RESTRICT pSrcDst1, INT16* WINPR_RESTRICT pSrcDst2, UINT32 len) { const int shifts = 2; - UINT32 offBeatMask; INT16* dptr1 = pSrcDst1; INT16* dptr2 = pSrcDst2; - size_t count; if (len < 16) /* pointless if too small */ return generic->add_16s_inplace(pSrcDst1, pSrcDst2, len); - offBeatMask = (1 << (shifts - 1)) - 1; + UINT32 offBeatMask = (1 << (shifts - 1)) - 1; if ((ULONG_PTR)pSrcDst1 & offBeatMask) { /* Incrementing the pointer skips over 16-byte boundary. */ @@ -65,7 +63,7 @@ static pstatus_t sse3_add_16s_inplace(INT16* WINPR_RESTRICT pSrcDst1, dptr2 += add; } /* Use 4 128-bit SSE registers. */ - count = len >> (7 - shifts); + size_t count = len >> (7 - shifts); len -= count << (7 - shifts); if (((const ULONG_PTR)dptr1 & 0x0f) || ((const ULONG_PTR)dptr2 & 0x0f)) { diff --git a/libfreerdp/primitives/sse/prim_colors_sse2.c b/libfreerdp/primitives/sse/prim_colors_sse2.c index 32a569588..d638336ae 100644 --- a/libfreerdp/primitives/sse/prim_colors_sse2.c +++ b/libfreerdp/primitives/sse/prim_colors_sse2.c @@ -214,9 +214,9 @@ sse2_yCbCrToRGB_16s8u_P3AC4R_BGRX(const INT16* const WINPR_RESTRICT pSrc[3], UIN const __m128i g_cr = _mm_set1_epi16(-11698); /* -0.714 << 14 */ const __m128i b_cb = _mm_set1_epi16(28999); /* 1.770 << 14 */ const __m128i c4096 = _mm_set1_epi16(4096); - const INT16* y_buf = (const INT16*)pSrc[0]; - const INT16* cb_buf = (const INT16*)pSrc[1]; - const INT16* cr_buf = (const INT16*)pSrc[2]; + const INT16* y_buf = pSrc[0]; + const INT16* cb_buf = pSrc[1]; + const INT16* cr_buf = pSrc[2]; const UINT32 pad = roi->width % 16; const UINT32 step = sizeof(__m128i) / sizeof(INT16); const UINT32 imax = (roi->width - pad) * sizeof(INT16) / sizeof(__m128i); @@ -412,9 +412,9 @@ sse2_yCbCrToRGB_16s8u_P3AC4R_RGBX(const INT16* const WINPR_RESTRICT pSrc[3], UIN const __m128i g_cr = _mm_set1_epi16(-11698); /* -0.714 << 14 */ const __m128i b_cb = _mm_set1_epi16(28999); /* 1.770 << 14 */ const __m128i c4096 = _mm_set1_epi16(4096); - const INT16* y_buf = (const INT16*)pSrc[0]; - const INT16* cb_buf = (const INT16*)pSrc[1]; - const INT16* cr_buf = (const INT16*)pSrc[2]; + const INT16* y_buf = pSrc[0]; + const INT16* cb_buf = pSrc[1]; + const INT16* cr_buf = pSrc[2]; const UINT32 pad = roi->width % 16; const UINT32 step = sizeof(__m128i) / sizeof(INT16); const UINT32 imax = (roi->width - pad) * sizeof(INT16) / sizeof(__m128i); @@ -779,7 +779,7 @@ static pstatus_t sse2_RGBToRGB_16s8u_P3AC4R_BGRX( BYTE* out = NULL; UINT32 srcbump = 0; UINT32 dstbump = 0; - out = (BYTE*)pDst; + out = pDst; srcbump = (srcStep - (roi->width * sizeof(UINT16))) / sizeof(UINT16); dstbump = (dstStep - (roi->width * sizeof(UINT32))); @@ -890,7 +890,7 @@ static pstatus_t sse2_RGBToRGB_16s8u_P3AC4R_RGBX( BYTE* out = NULL; UINT32 srcbump = 0; UINT32 dstbump = 0; - out = (BYTE*)pDst; + out = pDst; srcbump = (srcStep - (roi->width * sizeof(UINT16))) / sizeof(UINT16); dstbump = (dstStep - (roi->width * sizeof(UINT32))); @@ -1001,7 +1001,7 @@ static pstatus_t sse2_RGBToRGB_16s8u_P3AC4R_XBGR( BYTE* out = NULL; UINT32 srcbump = 0; UINT32 dstbump = 0; - out = (BYTE*)pDst; + out = pDst; srcbump = (srcStep - (roi->width * sizeof(UINT16))) / sizeof(UINT16); dstbump = (dstStep - (roi->width * sizeof(UINT32))); @@ -1112,7 +1112,7 @@ static pstatus_t sse2_RGBToRGB_16s8u_P3AC4R_XRGB( BYTE* out = NULL; UINT32 srcbump = 0; UINT32 dstbump = 0; - out = (BYTE*)pDst; + out = pDst; srcbump = (srcStep - (roi->width * sizeof(UINT16))) / sizeof(UINT16); dstbump = (dstStep - (roi->width * sizeof(UINT32))); diff --git a/libfreerdp/primitives/sse/prim_set_sse2.c b/libfreerdp/primitives/sse/prim_set_sse2.c index cdc483097..c15298320 100644 --- a/libfreerdp/primitives/sse/prim_set_sse2.c +++ b/libfreerdp/primitives/sse/prim_set_sse2.c @@ -41,7 +41,7 @@ static pstatus_t sse2_set_8u(BYTE val, BYTE* WINPR_RESTRICT pDst, UINT32 len) return generic->set_8u(val, pDst, len); byte = val; - dptr = (BYTE*)pDst; + dptr = pDst; /* Seek 16-byte alignment. */ while ((ULONG_PTR)dptr & 0x0f) @@ -116,7 +116,7 @@ static pstatus_t sse2_set_8u(BYTE val, BYTE* WINPR_RESTRICT pDst, UINT32 len) static pstatus_t sse2_set_32u(UINT32 val, UINT32* WINPR_RESTRICT pDst, UINT32 len) { const primitives_t* prim = primitives_get_generic(); - UINT32* dptr = (UINT32*)pDst; + UINT32* dptr = pDst; __m128i xmm0; size_t count = 0; diff --git a/libfreerdp/primitives/sse/prim_shift_sse3.c b/libfreerdp/primitives/sse/prim_shift_sse3.c index 342311282..6b12a29e3 100644 --- a/libfreerdp/primitives/sse/prim_shift_sse3.c +++ b/libfreerdp/primitives/sse/prim_shift_sse3.c @@ -46,7 +46,6 @@ SSE3_SCD_ROUTINE(sse2_rShiftC_16u, UINT16, generic->rShiftC_16u, _mm_srli_epi16, static pstatus_t sse2_lShiftC_16s_inplace(INT16* WINPR_RESTRICT pSrcDst, UINT32 val, UINT32 len) { const INT32 shifts = 2; - int count; if (val == 0) return PRIMITIVES_SUCCESS; if (val >= 16) @@ -73,7 +72,7 @@ static pstatus_t sse2_lShiftC_16s_inplace(INT16* WINPR_RESTRICT pSrcDst, UINT32 } /* Use 8 128-bit SSE registers. */ - count = len >> (8 - shifts); + int count = len >> (8 - shifts); len -= count << (8 - shifts); while (count--) diff --git a/libfreerdp/primitives/sse/prim_sign_ssse3.c b/libfreerdp/primitives/sse/prim_sign_ssse3.c index 6b2fde664..ed0d856f7 100644 --- a/libfreerdp/primitives/sse/prim_sign_ssse3.c +++ b/libfreerdp/primitives/sse/prim_sign_ssse3.c @@ -33,8 +33,8 @@ static primitives_t* generic = NULL; static pstatus_t ssse3_sign_16s(const INT16* WINPR_RESTRICT pSrc, INT16* WINPR_RESTRICT pDst, UINT32 len) { - const INT16* sptr = (const INT16*)pSrc; - INT16* dptr = (INT16*)pDst; + const INT16* sptr = pSrc; + INT16* dptr = pDst; size_t count = 0; if (len < 16) diff --git a/libfreerdp/utils/smartcard_call.c b/libfreerdp/utils/smartcard_call.c index 4bad47e9e..a598b8a0a 100644 --- a/libfreerdp/utils/smartcard_call.c +++ b/libfreerdp/utils/smartcard_call.c @@ -1492,7 +1492,7 @@ static LONG smartcard_LocateCardsByATRA_Call(scard_call_context* smartcard, wStr for (UINT32 i = 0; i < call->cReaders; i++) { - states[i].szReader = (LPSTR)call->rgReaderStates[i].szReader; + states[i].szReader = call->rgReaderStates[i].szReader; states[i].dwCurrentState = call->rgReaderStates[i].dwCurrentState; states[i].dwEventState = call->rgReaderStates[i].dwEventState; states[i].cbAtr = call->rgReaderStates[i].cbAtr; diff --git a/server/Sample/sfreerdp.c b/server/Sample/sfreerdp.c index defae1451..f7851ed08 100644 --- a/server/Sample/sfreerdp.c +++ b/server/Sample/sfreerdp.c @@ -104,7 +104,7 @@ static void test_peer_context_free(freerdp_peer* client, rdpContext* ctx) rdpsnd_server_context_free(context->rdpsnd); encomsp_server_context_free(context->encomsp); - WTSCloseServer((HANDLE)context->vcm); + WTSCloseServer(context->vcm); } } diff --git a/server/proxy/pf_context.c b/server/proxy/pf_context.c index 8c6b107c4..0ee86a402 100644 --- a/server/proxy/pf_context.c +++ b/server/proxy/pf_context.c @@ -207,7 +207,7 @@ void client_to_proxy_context_free(freerdp_peer* client, rdpContext* ctx) HashTable_Free(context->channelsByBackId); if (context->vcm && (context->vcm != INVALID_HANDLE_VALUE)) - WTSCloseServer((HANDLE)context->vcm); + WTSCloseServer(context->vcm); context->vcm = NULL; } diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c index 96fdcad81..1e2213198 100644 --- a/server/shadow/shadow_client.c +++ b/server/shadow/shadow_client.c @@ -204,7 +204,7 @@ static void shadow_client_context_free(freerdp_peer* peer, rdpContext* context) /* Clear queued messages and free resource */ MessageQueue_Free(client->MsgQueue); - WTSCloseServer((HANDLE)client->vcm); + WTSCloseServer(client->vcm); region16_uninit(&(client->invalidRegion)); DeleteCriticalSection(&(client->lock)); diff --git a/winpr/libwinpr/clipboard/clipboard.c b/winpr/libwinpr/clipboard/clipboard.c index 9d17fbcc4..04f9733ac 100644 --- a/winpr/libwinpr/clipboard/clipboard.c +++ b/winpr/libwinpr/clipboard/clipboard.c @@ -162,7 +162,7 @@ BOOL ClipboardEmpty(wClipboard* clipboard) if (clipboard->data) { - free((void*)clipboard->data); + free(clipboard->data); clipboard->data = NULL; } @@ -449,7 +449,7 @@ void* ClipboardGetData(wClipboard* clipboard, UINT32 formatId, UINT32* pSize) return NULL; SrcSize = clipboard->size; - pSrcData = (void*)clipboard->data; + pSrcData = clipboard->data; if (formatId == format->formatId) { @@ -490,7 +490,7 @@ BOOL ClipboardSetData(wClipboard* clipboard, UINT32 formatId, const void* data, if (!format) return FALSE; - free((void*)clipboard->data); + free(clipboard->data); clipboard->data = malloc(size); if (!clipboard->data) @@ -587,7 +587,7 @@ void ClipboardDestroy(wClipboard* clipboard) ClipboardUninitFormats(clipboard); - free((void*)clipboard->data); + free(clipboard->data); clipboard->data = NULL; clipboard->size = 0; clipboard->numFormats = 0; @@ -675,7 +675,7 @@ char* parse_uri_to_local_file(const char* uri, size_t uri_len) if (is_dos_drive(&uri[prefixLen + 1], uri_len - prefixLen - 1)) { // Dos and Windows file URI - localName = (const char*)(uri + prefixLen + 1); + localName = (uri + prefixLen + 1); localLen = uri_len - prefixLen - 1; } else diff --git a/winpr/libwinpr/crt/string.c b/winpr/libwinpr/crt/string.c index 93721a68c..c4a196f36 100644 --- a/winpr/libwinpr/crt/string.c +++ b/winpr/libwinpr/crt/string.c @@ -309,7 +309,7 @@ int _wcsncmp(const WCHAR* string1, const WCHAR* string2, size_t count) size_t _wcslen(const WCHAR* str) { - const WCHAR* p = (const WCHAR*)str; + const WCHAR* p = str; WINPR_ASSERT(p); @@ -364,7 +364,7 @@ WCHAR* _wcschr(const WCHAR* str, WCHAR value) const WCHAR* cc; WCHAR* c; } cnv; - const WCHAR* p = (const WCHAR*)str; + const WCHAR* p = str; while (*p && (*p != value)) p++; diff --git a/winpr/libwinpr/crt/unicode.c b/winpr/libwinpr/crt/unicode.c index 123a488e9..2e0d4d4e8 100644 --- a/winpr/libwinpr/crt/unicode.c +++ b/winpr/libwinpr/crt/unicode.c @@ -405,8 +405,8 @@ SSIZE_T ConvertWCharNToUtf8(const WCHAR* wstr, size_t wlen, char* str, size_t le isNullTerminated = TRUE; iwlen++; } - const int rc = WideCharToMultiByte(CP_UTF8, 0, wstr, (int)iwlen, str, (int)MIN(INT32_MAX, len), - NULL, NULL); + const int rc = + WideCharToMultiByte(CP_UTF8, 0, wstr, (int)iwlen, str, MIN(INT32_MAX, len), NULL, NULL); if ((rc <= 0) || ((len > 0) && ((size_t)rc > len))) return -1; else if (!isNullTerminated) @@ -437,7 +437,7 @@ SSIZE_T ConvertMszWCharNToUtf8(const WCHAR* wstr, size_t wlen, char* str, size_t } const int iwlen = MIN(INT32_MAX, len); - const int rc = WideCharToMultiByte(CP_UTF8, 0, wstr, (int)wlen, str, (int)iwlen, NULL, NULL); + const int rc = WideCharToMultiByte(CP_UTF8, 0, wstr, (int)wlen, str, iwlen, NULL, NULL); if ((rc <= 0) || ((len > 0) && (rc > iwlen))) return -1; @@ -478,7 +478,7 @@ SSIZE_T ConvertUtf8NToWChar(const char* str, size_t len, WCHAR* wstr, size_t wle } const int iwlen = MIN(INT32_MAX, wlen); - const int rc = MultiByteToWideChar(CP_UTF8, 0, str, (int)ilen, wstr, (int)iwlen); + const int rc = MultiByteToWideChar(CP_UTF8, 0, str, (int)ilen, wstr, iwlen); if ((rc <= 0) || ((wlen > 0) && (rc > iwlen))) return -1; if (!isNullTerminated) @@ -509,7 +509,7 @@ SSIZE_T ConvertMszUtf8NToWChar(const char* str, size_t len, WCHAR* wstr, size_t } const int iwlen = MIN(INT32_MAX, wlen); - const int rc = MultiByteToWideChar(CP_UTF8, 0, str, (int)len, wstr, (int)iwlen); + const int rc = MultiByteToWideChar(CP_UTF8, 0, str, (int)len, wstr, iwlen); if ((rc <= 0) || ((wlen > 0) && (rc > iwlen))) return -1; diff --git a/winpr/libwinpr/crypto/cipher.c b/winpr/libwinpr/crypto/cipher.c index 45eca79f7..e6aed7c7c 100644 --- a/winpr/libwinpr/crypto/cipher.c +++ b/winpr/libwinpr/crypto/cipher.c @@ -627,7 +627,7 @@ int winpr_Cipher_BytesToKey(int cipher, WINPR_MD_TYPE md, const void* salt, cons #if defined(WITH_OPENSSL) const EVP_MD* evp_md = NULL; const EVP_CIPHER* evp_cipher = NULL; - evp_md = winpr_openssl_get_evp_md((WINPR_MD_TYPE)md); + evp_md = winpr_openssl_get_evp_md(md); evp_cipher = winpr_openssl_get_evp_cipher(cipher); return EVP_BytesToKey(evp_cipher, evp_md, salt, data, datal, count, key, iv); #elif defined(WITH_MBEDTLS) diff --git a/winpr/libwinpr/file/file.c b/winpr/libwinpr/file/file.c index 07e7eb6f1..7c134dcaa 100644 --- a/winpr/libwinpr/file/file.c +++ b/winpr/libwinpr/file/file.c @@ -371,13 +371,13 @@ static BOOL FileGetFileInformationByHandle(HANDLE hFile, #else ft = STAT_TIME_TO_FILETIME(st.st_ctime); #endif - lpFileInformation->ftCreationTime.dwHighDateTime = ((UINT64)ft) >> 32ULL; + lpFileInformation->ftCreationTime.dwHighDateTime = (ft) >> 32ULL; lpFileInformation->ftCreationTime.dwLowDateTime = ft & 0xFFFFFFFF; ft = STAT_TIME_TO_FILETIME(st.st_mtime); - lpFileInformation->ftLastWriteTime.dwHighDateTime = ((UINT64)ft) >> 32ULL; + lpFileInformation->ftLastWriteTime.dwHighDateTime = (ft) >> 32ULL; lpFileInformation->ftLastWriteTime.dwLowDateTime = ft & 0xFFFFFFFF; ft = STAT_TIME_TO_FILETIME(st.st_atime); - lpFileInformation->ftLastAccessTime.dwHighDateTime = ((UINT64)ft) >> 32ULL; + lpFileInformation->ftLastAccessTime.dwHighDateTime = (ft) >> 32ULL; lpFileInformation->ftLastAccessTime.dwLowDateTime = ft & 0xFFFFFFFF; lpFileInformation->nFileSizeHigh = ((UINT64)st.st_size) >> 32ULL; lpFileInformation->nFileSizeLow = st.st_size & 0xFFFFFFFF; diff --git a/winpr/libwinpr/file/generic.c b/winpr/libwinpr/file/generic.c index b690edcc2..1b14ec1d1 100644 --- a/winpr/libwinpr/file/generic.c +++ b/winpr/libwinpr/file/generic.c @@ -978,13 +978,13 @@ static BOOL FindDataFromStat(const char* path, const struct stat* fileStat, #else ft = STAT_TIME_TO_FILETIME(fileStat->st_ctime); #endif - lpFindFileData->ftCreationTime.dwHighDateTime = ((UINT64)ft) >> 32ULL; + lpFindFileData->ftCreationTime.dwHighDateTime = (ft) >> 32ULL; lpFindFileData->ftCreationTime.dwLowDateTime = ft & 0xFFFFFFFF; ft = STAT_TIME_TO_FILETIME(fileStat->st_mtime); - lpFindFileData->ftLastWriteTime.dwHighDateTime = ((UINT64)ft) >> 32ULL; + lpFindFileData->ftLastWriteTime.dwHighDateTime = (ft) >> 32ULL; lpFindFileData->ftLastWriteTime.dwLowDateTime = ft & 0xFFFFFFFF; ft = STAT_TIME_TO_FILETIME(fileStat->st_atime); - lpFindFileData->ftLastAccessTime.dwHighDateTime = ((UINT64)ft) >> 32ULL; + lpFindFileData->ftLastAccessTime.dwHighDateTime = (ft) >> 32ULL; lpFindFileData->ftLastAccessTime.dwLowDateTime = ft & 0xFFFFFFFF; lpFindFileData->nFileSizeHigh = ((UINT64)fileStat->st_size) >> 32ULL; lpFindFileData->nFileSizeLow = fileStat->st_size & 0xFFFFFFFF; diff --git a/winpr/libwinpr/file/namedPipeClient.c b/winpr/libwinpr/file/namedPipeClient.c index 56a411336..f0331abc0 100644 --- a/winpr/libwinpr/file/namedPipeClient.c +++ b/winpr/libwinpr/file/namedPipeClient.c @@ -204,9 +204,9 @@ static HANDLE NamedPipeClientCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAcces if (status != 0) { close(pNamedPipe->clientfd); - free((char*)pNamedPipe->name); - free((char*)pNamedPipe->lpFileName); - free((char*)pNamedPipe->lpFilePath); + free(pNamedPipe->name); + free(pNamedPipe->lpFileName); + free(pNamedPipe->lpFilePath); free(pNamedPipe); return INVALID_HANDLE_VALUE; } @@ -282,7 +282,7 @@ char* GetNamedPipeUnixDomainSocketFilePathA(LPCSTR lpName) char* lpFilePath = NULL; lpPipePath = GetNamedPipeUnixDomainSocketBaseFilePathA(); lpFileName = GetNamedPipeNameWithoutPrefixA(lpName); - lpFilePath = GetCombinedPath(lpPipePath, (char*)lpFileName); + lpFilePath = GetCombinedPath(lpPipePath, lpFileName); free(lpPipePath); free(lpFileName); return lpFilePath; diff --git a/winpr/libwinpr/io/device.c b/winpr/libwinpr/io/device.c index 0643acdff..b8aabfc0d 100644 --- a/winpr/libwinpr/io/device.c +++ b/winpr/libwinpr/io/device.c @@ -109,7 +109,7 @@ static char* GetDeviceFileUnixDomainSocketFilePathA(LPCSTR lpName) return NULL; } - lpFilePath = GetCombinedPath(lpPipePath, (char*)lpFileName); + lpFilePath = GetCombinedPath(lpPipePath, lpFileName); free(lpPipePath); free(lpFileName); return lpFilePath; diff --git a/winpr/libwinpr/ncrypt/ncrypt.c b/winpr/libwinpr/ncrypt/ncrypt.c index 38efc563c..ba3a2b69d 100644 --- a/winpr/libwinpr/ncrypt/ncrypt.c +++ b/winpr/libwinpr/ncrypt/ncrypt.c @@ -240,7 +240,7 @@ SECURITY_STATUS NCryptGetProperty(NCRYPT_HANDLE hObject, LPCWSTR pszProperty, PB SECURITY_STATUS NCryptFreeObject(NCRYPT_HANDLE hObject) { NCryptBaseHandle* base = NULL; - SECURITY_STATUS ret = checkNCryptHandle((NCRYPT_HANDLE)hObject, WINPR_NCRYPT_INVALID); + SECURITY_STATUS ret = checkNCryptHandle(hObject, WINPR_NCRYPT_INVALID); if (ret != ERROR_SUCCESS) return ret; diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c index 02887ecfd..9a850ab83 100644 --- a/winpr/libwinpr/smartcard/smartcard_pcsc.c +++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c @@ -2104,10 +2104,10 @@ static LONG WINAPI PCSC_SCardState(SCARDHANDLE hCard, LPDWORD pdwState, LPDWORD if (mszReaderNames) PCSC_SCardFreeMemory_Internal(hContext, mszReaderNames); - *pdwState = (DWORD)pcsc_dwState; - *pdwProtocol = PCSC_ConvertProtocolsToWinSCard((DWORD)pcsc_dwProtocol); + *pdwState = pcsc_dwState; + *pdwProtocol = PCSC_ConvertProtocolsToWinSCard(pcsc_dwProtocol); if (pcbAtrLen) - *pcbAtrLen = (DWORD)pcsc_cbAtrLen; + *pcbAtrLen = pcsc_cbAtrLen; return PCSC_MapErrorCodeToWinSCard(status); } diff --git a/winpr/libwinpr/sspi/NTLM/ntlm.c b/winpr/libwinpr/sspi/NTLM/ntlm.c index bc91b49f1..4e4c98ee8 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm.c @@ -1087,7 +1087,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, ULON { Data_Write_UINT32(&value, SeqNo); winpr_HMAC_Update(hmac, (void*)&value, 4); - winpr_HMAC_Update(hmac, (void*)data, length); + winpr_HMAC_Update(hmac, data, length); winpr_HMAC_Final(hmac, digest, WINPR_MD5_DIGEST_LENGTH); winpr_HMAC_Free(hmac); } @@ -1186,7 +1186,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle phContext, PSec { Data_Write_UINT32(&value, SeqNo); winpr_HMAC_Update(hmac, (void*)&value, 4); - winpr_HMAC_Update(hmac, (void*)data_buffer->pvBuffer, data_buffer->cbBuffer); + winpr_HMAC_Update(hmac, data_buffer->pvBuffer, data_buffer->cbBuffer); winpr_HMAC_Final(hmac, digest, WINPR_MD5_DIGEST_LENGTH); winpr_HMAC_Free(hmac); } diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_compute.c b/winpr/libwinpr/sspi/NTLM/ntlm_compute.c index 4daffd425..12777abb7 100644 --- a/winpr/libwinpr/sspi/NTLM/ntlm_compute.c +++ b/winpr/libwinpr/sspi/NTLM/ntlm_compute.c @@ -308,7 +308,7 @@ static BOOL ntlm_fetch_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) NTOWFv2FromHashW(entry->NtHash, (LPWSTR)credentials->identity.User, credentials->identity.UserLength * sizeof(WCHAR), (LPWSTR)credentials->identity.Domain, - credentials->identity.DomainLength * sizeof(WCHAR), (BYTE*)hash); + credentials->identity.DomainLength * sizeof(WCHAR), hash); rc = TRUE; @@ -450,7 +450,7 @@ static BOOL ntlm_compute_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) { NTOWFv2FromHashW(context->NtlmHash, (LPWSTR)credentials->identity.User, credentials->identity.UserLength * 2, (LPWSTR)credentials->identity.Domain, - credentials->identity.DomainLength * 2, (BYTE*)hash); + credentials->identity.DomainLength * 2, hash); } else if (credentials->identity.PasswordLength > SSPI_CREDENTIALS_HASH_LENGTH_OFFSET) { @@ -460,14 +460,14 @@ static BOOL ntlm_compute_ntlm_v2_hash(NTLM_CONTEXT* context, BYTE* hash) NTOWFv2FromHashW(context->NtlmHash, (LPWSTR)credentials->identity.User, credentials->identity.UserLength * 2, (LPWSTR)credentials->identity.Domain, - credentials->identity.DomainLength * 2, (BYTE*)hash); + credentials->identity.DomainLength * 2, hash); } else if (credentials->identity.Password) { NTOWFv2W((LPWSTR)credentials->identity.Password, credentials->identity.PasswordLength * 2, (LPWSTR)credentials->identity.User, credentials->identity.UserLength * 2, (LPWSTR)credentials->identity.Domain, credentials->identity.DomainLength * 2, - (BYTE*)hash); + hash); } else if (context->HashCallback) { @@ -531,7 +531,7 @@ BOOL ntlm_compute_lm_v2_response(NTLM_CONTEXT* context) response = (BYTE*)context->LmChallengeResponse.pvBuffer; /* Compute the HMAC-MD5 hash of the resulting value using the NTLMv2 hash as the key */ winpr_HMAC(WINPR_MD_MD5, (void*)context->NtlmV2Hash, WINPR_MD5_DIGEST_LENGTH, (BYTE*)value, - WINPR_MD5_DIGEST_LENGTH, (BYTE*)response, WINPR_MD5_DIGEST_LENGTH); + WINPR_MD5_DIGEST_LENGTH, response, WINPR_MD5_DIGEST_LENGTH); /* Concatenate the resulting HMAC-MD5 hash and the client challenge, giving us the LMv2 response * (24 bytes) */ CopyMemory(&response[16], context->ClientChallenge, 8); diff --git a/winpr/libwinpr/sspi/sspi_winpr.c b/winpr/libwinpr/sspi/sspi_winpr.c index 197865003..cd18f362e 100644 --- a/winpr/libwinpr/sspi/sspi_winpr.c +++ b/winpr/libwinpr/sspi/sspi_winpr.c @@ -993,8 +993,7 @@ static const SecurityFunctionTableA* sspi_GetSecurityFunctionTableAByNameA(const { if (strcmp(Name, SecurityFunctionTableA_NAME_LIST[index].Name) == 0) { - return (const SecurityFunctionTableA*)SecurityFunctionTableA_NAME_LIST[index] - .SecurityFunctionTable; + return SecurityFunctionTableA_NAME_LIST[index].SecurityFunctionTable; } } @@ -1009,8 +1008,7 @@ static const SecurityFunctionTableW* sspi_GetSecurityFunctionTableWByNameW(const { if (_wcscmp(Name, SecurityFunctionTableW_NAME_LIST[index].Name) == 0) { - return (const SecurityFunctionTableW*)SecurityFunctionTableW_NAME_LIST[index] - .SecurityFunctionTable; + return SecurityFunctionTableW_NAME_LIST[index].SecurityFunctionTable; } } diff --git a/winpr/libwinpr/sspi/test/TestNTLM.c b/winpr/libwinpr/sspi/test/TestNTLM.c index 9c3a79404..8489d8ddf 100644 --- a/winpr/libwinpr/sspi/test/TestNTLM.c +++ b/winpr/libwinpr/sspi/test/TestNTLM.c @@ -545,7 +545,7 @@ static BOOL test_default(void) if (!DynamicTest) { pSecBuffer->cbBuffer = sizeof(TEST_NTLM_NEGOTIATE) - 1; - pSecBuffer->pvBuffer = (void*)malloc(pSecBuffer->cbBuffer); + pSecBuffer->pvBuffer = malloc(pSecBuffer->cbBuffer); if (!pSecBuffer->pvBuffer) { @@ -604,7 +604,7 @@ static BOOL test_default(void) { SecPkgContext_AuthNtlmMessage AuthNtlmMessage = { 0 }; pSecBuffer->cbBuffer = sizeof(TEST_NTLM_CHALLENGE) - 1; - pSecBuffer->pvBuffer = (void*)malloc(pSecBuffer->cbBuffer); + pSecBuffer->pvBuffer = malloc(pSecBuffer->cbBuffer); if (!pSecBuffer->pvBuffer) { @@ -644,7 +644,7 @@ static BOOL test_default(void) if (!DynamicTest) { pSecBuffer->cbBuffer = sizeof(TEST_NTLM_AUTHENTICATE) - 1; - pSecBuffer->pvBuffer = (void*)malloc(pSecBuffer->cbBuffer); + pSecBuffer->pvBuffer = malloc(pSecBuffer->cbBuffer); if (!pSecBuffer->pvBuffer) { diff --git a/winpr/libwinpr/synch/test/TestSynchCritical.c b/winpr/libwinpr/synch/test/TestSynchCritical.c index 9d56356ef..d78e01cf7 100644 --- a/winpr/libwinpr/synch/test/TestSynchCritical.c +++ b/winpr/libwinpr/synch/test/TestSynchCritical.c @@ -193,7 +193,7 @@ static DWORD WINAPI TestSynchCritical_Main(LPVOID arg) critical.RecursionCount, i); goto fail; } - if (critical.OwningThread != (HANDLE)(i ? hMainThread : NULL)) + if (critical.OwningThread != (i ? hMainThread : NULL)) { printf("CriticalSection failure: Could not verify section ownership (loop index=%d).\n", i); diff --git a/winpr/libwinpr/thread/argv.c b/winpr/libwinpr/thread/argv.c index 3eedc411a..090d60dd7 100644 --- a/winpr/libwinpr/thread/argv.c +++ b/winpr/libwinpr/thread/argv.c @@ -201,7 +201,7 @@ LPSTR* CommandLineToArgvA(LPCSTR lpCmdLine, int* pNumArgs) } pArgs = (LPSTR*)buffer; - pOutput = (char*)&buffer[maxNumArgs * (sizeof(char*))]; + pOutput = &buffer[maxNumArgs * (sizeof(char*))]; p = (const char*)lpCmdLine; while (p < lpCmdLine + cmdLineLength) diff --git a/winpr/libwinpr/utils/asn1/asn1.c b/winpr/libwinpr/utils/asn1/asn1.c index 0121859c4..3525b8d9a 100644 --- a/winpr/libwinpr/utils/asn1/asn1.c +++ b/winpr/libwinpr/utils/asn1/asn1.c @@ -1099,8 +1099,7 @@ size_t WinPrAsn1DecReadOID(WinPrAsn1Decoder* dec, WinPrAsn1_OID* target, BOOL al size_t WinPrAsn1DecReadOctetString(WinPrAsn1Decoder* dec, WinPrAsn1_OctetString* target, BOOL allocate) { - return WinPrAsn1DecReadMemoryChunkLike(dec, ER_TAG_OCTET_STRING, (WinPrAsn1_OctetString*)target, - allocate); + return WinPrAsn1DecReadMemoryChunkLike(dec, ER_TAG_OCTET_STRING, target, allocate); } size_t WinPrAsn1DecReadIA5String(WinPrAsn1Decoder* dec, WinPrAsn1_IA5STRING* target) diff --git a/winpr/libwinpr/utils/test/TestArrayList.c b/winpr/libwinpr/utils/test/TestArrayList.c index 069394cbc..d102b7529 100644 --- a/winpr/libwinpr/utils/test/TestArrayList.c +++ b/winpr/libwinpr/utils/test/TestArrayList.c @@ -6,7 +6,7 @@ int TestArrayList(int argc, char* argv[]) { int count = 0; - int rc = 0; + SSIZE_T rc = 0; size_t val = 0; wArrayList* arrayList = NULL; const size_t elemsToInsert = 10; @@ -65,7 +65,7 @@ int TestArrayList(int argc, char* argv[]) } } - rc = ArrayList_IndexOf(arrayList, (void*)(size_t)elemsToInsert, -1, -1); + rc = ArrayList_IndexOf(arrayList, (void*)elemsToInsert, -1, -1); printf("ArrayList index: %d\n", rc); if (rc != -1) return -1; diff --git a/winpr/libwinpr/utils/test/TestQueue.c b/winpr/libwinpr/utils/test/TestQueue.c index 9c65af5f4..5f0c5955e 100644 --- a/winpr/libwinpr/utils/test/TestQueue.c +++ b/winpr/libwinpr/utils/test/TestQueue.c @@ -18,7 +18,7 @@ int TestQueue(int argc, char* argv[]) for (size_t index = 1; index <= 10; index++) { - Queue_Enqueue(queue, (void*)(size_t)index); + Queue_Enqueue(queue, (void*)index); } count = Queue_Count(queue); diff --git a/winpr/libwinpr/utils/unwind/debug.c b/winpr/libwinpr/utils/unwind/debug.c index 663f7be00..b5c8d0911 100644 --- a/winpr/libwinpr/utils/unwind/debug.c +++ b/winpr/libwinpr/utils/unwind/debug.c @@ -104,7 +104,7 @@ static _Unwind_Reason_Code unwind_backtrace_callback(struct _Unwind_Context* con { unwind_info_t* info = &ctx->info[ctx->pos++]; info->pc = _Unwind_GetIP(context); - info->langSpecificData = (void*)_Unwind_GetLanguageSpecificData(context); + info->langSpecificData = _Unwind_GetLanguageSpecificData(context); } return _URC_NO_REASON; diff --git a/winpr/libwinpr/utils/wlog/Appender.c b/winpr/libwinpr/utils/wlog/Appender.c index 3dbb7fa31..7b99f5ef7 100644 --- a/winpr/libwinpr/utils/wlog/Appender.c +++ b/winpr/libwinpr/utils/wlog/Appender.c @@ -123,7 +123,7 @@ static wLogAppender* WLog_Appender_New(wLog* log, DWORD logAppenderType) break; #endif case WLOG_APPENDER_UDP: - appender = (wLogAppender*)WLog_UdpAppender_New(log); + appender = WLog_UdpAppender_New(log); break; default: (void)fprintf(stderr, "%s: unknown handler type %" PRIu32 "\n", __func__, @@ -133,7 +133,7 @@ static wLogAppender* WLog_Appender_New(wLog* log, DWORD logAppenderType) } if (!appender) - appender = (wLogAppender*)WLog_ConsoleAppender_New(log); + appender = WLog_ConsoleAppender_New(log); if (!appender) return NULL; diff --git a/winpr/libwinpr/utils/wlog/Layout.c b/winpr/libwinpr/utils/wlog/Layout.c index faf97c072..d9bf8ae5e 100644 --- a/winpr/libwinpr/utils/wlog/Layout.c +++ b/winpr/libwinpr/utils/wlog/Layout.c @@ -247,7 +247,7 @@ BOOL WLog_Layout_GetMessagePrefix(wLog* log, wLogLayout* layout, wLogMessage* me &recurse }, /* function */ { ENTRY("%hr"), ENTRY("%02u"), NULL, (void*)(size_t)localTime.wHour, NULL, &recurse }, /* hours */ - { ENTRY("%ln"), ENTRY("%" PRIuz), NULL, (void*)(size_t)message->LineNumber, NULL, + { ENTRY("%ln"), ENTRY("%" PRIuz), NULL, (void*)message->LineNumber, NULL, &recurse }, /* line number */ { ENTRY("%lv"), ENTRY("%s"), NULL, (void*)WLOG_LEVELS[message->Level], NULL, &recurse }, /* log level */ diff --git a/winpr/libwinpr/winsock/winsock.c b/winpr/libwinpr/winsock/winsock.c index 3ac8e5081..c8b974d56 100644 --- a/winpr/libwinpr/winsock/winsock.c +++ b/winpr/libwinpr/winsock/winsock.c @@ -1007,7 +1007,7 @@ SOCKET _accept(SOCKET s, struct sockaddr* addr, int* addrlen) int fd = (int)s; socklen_t s_addrlen = (socklen_t)*addrlen; status = accept(fd, addr, &s_addrlen); - *addrlen = (socklen_t)s_addrlen; + *addrlen = (int)s_addrlen; return status; } @@ -1094,7 +1094,7 @@ int _getsockopt(SOCKET s, int level, int optname, char* optval, int* optlen) int fd = (int)s; socklen_t s_optlen = (socklen_t)*optlen; status = getsockopt(fd, level, optname, (void*)optval, &s_optlen); - *optlen = (socklen_t)s_optlen; + *optlen = (int)s_optlen; return status; } diff --git a/winpr/tools/makecert/makecert.c b/winpr/tools/makecert/makecert.c index e6fe0c759..a94e98697 100644 --- a/winpr/tools/makecert/makecert.c +++ b/winpr/tools/makecert/makecert.c @@ -111,7 +111,7 @@ static char* makecert_read_str(BIO* bio, size_t* pOffset) if (status <= 0) break; - offset += (size_t)readBytes; + offset += readBytes; } if (status < 0)