From 43eae6029f45b86f5d4447911b55c66bc4192e28 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Thu, 15 Feb 2024 13:10:45 +0100 Subject: [PATCH] [clang-tidy] fix various review warnings --- client/Windows/wf_gdi.c | 2 +- libfreerdp/codec/color.c | 4 ++-- libfreerdp/primitives/test/TestPrimitivesColors.c | 2 +- libfreerdp/primitives/test/TestPrimitivesYCoCg.c | 2 +- server/Windows/wf_info.c | 2 +- winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c | 3 ++- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/client/Windows/wf_gdi.c b/client/Windows/wf_gdi.c index bf7cbebd9..0723846ae 100644 --- a/client/Windows/wf_gdi.c +++ b/client/Windows/wf_gdi.c @@ -135,7 +135,7 @@ static BYTE* wf_glyph_convert(wfContext* wfc, int width, int height, const BYTE* for (int indexy = 0; indexy < height; indexy++) { - BYTE* dst = cdata + indexy * dst_bytes_per_row; + BYTE* dst = &cdata[1ull * indexy * dst_bytes_per_row]; for (int indexx = 0; indexx < dst_bytes_per_row; indexx++) { diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c index b113fb065..186d477c8 100644 --- a/libfreerdp/codec/color.c +++ b/libfreerdp/codec/color.c @@ -59,7 +59,7 @@ BYTE* freerdp_glyph_convert(UINT32 width, UINT32 height, const BYTE* data) for (UINT32 y = 0; y < height; y++) { - const BYTE* srcp = data + (y * scanline); + const BYTE* srcp = &data[1ull * y * scanline]; for (UINT32 x = 0; x < width; x++) { @@ -767,7 +767,7 @@ static BOOL freerdp_image_copy_overlap(BYTE* pDstData, DWORD DstFormat, UINT32 n /* Copy up */ else if (nYDst > nYSrc) { - for (INT32 y = nHeight - 1; y >= 0; y--) + for (INT32 y = (INT32)nHeight - 1; y >= 0; y--) { const BYTE* srcLine = &pSrcData[(y + nYSrc) * nSrcStep * srcVMultiplier + srcVOffset]; diff --git a/libfreerdp/primitives/test/TestPrimitivesColors.c b/libfreerdp/primitives/test/TestPrimitivesColors.c index 1b98916b4..c297b4fe1 100644 --- a/libfreerdp/primitives/test/TestPrimitivesColors.c +++ b/libfreerdp/primitives/test/TestPrimitivesColors.c @@ -81,7 +81,7 @@ static BOOL test_RGBToRGB_16s8u_P3AC4R_func(prim_size_t roi, DWORD DstFormat) if (memcmp(out1, out2, dstStride * roi.height) != 0) { - for (UINT64 i = 0; i < roi.width * roi.height; ++i) + for (UINT64 i = 0; i < 1ull * roi.width * roi.height; ++i) { const UINT32 o1 = FreeRDPReadColor(out1 + 4 * i, DstFormat); const UINT32 o2 = FreeRDPReadColor(out2 + 4 * i, DstFormat); diff --git a/libfreerdp/primitives/test/TestPrimitivesYCoCg.c b/libfreerdp/primitives/test/TestPrimitivesYCoCg.c index 11d05a81e..318aec6a4 100644 --- a/libfreerdp/primitives/test/TestPrimitivesYCoCg.c +++ b/libfreerdp/primitives/test/TestPrimitivesYCoCg.c @@ -69,7 +69,7 @@ static BOOL test_YCoCgRToRGB_8u_AC4R_func(UINT32 width, UINT32 height) if (memcmp(out_c, out_sse, dstStride * height) != 0) { - for (size_t i = 0; i < width * height; ++i) + for (size_t i = 0; i < 1ull * width * height; ++i) { const UINT32 c = FreeRDPReadColor(out_c + 4 * i, format); const UINT32 sse = FreeRDPReadColor(out_sse + 4 * i, format); diff --git a/server/Windows/wf_info.c b/server/Windows/wf_info.c index 8a96814e7..7ec754bce 100644 --- a/server/Windows/wf_info.c +++ b/server/Windows/wf_info.c @@ -310,7 +310,7 @@ void wf_info_find_invalid_region(wfInfo* wfi) GETCHANGESBUF* buf; buf = (GETCHANGESBUF*)wfi->changeBuffer; - for (int i = wfi->lastUpdate; i != wfi->nextUpdate; i = (i + 1) % MAXCHANGES_BUF) + for (ULONG i = wfi->lastUpdate; i != wfi->nextUpdate; i = (i + 1) % MAXCHANGES_BUF) { LPRECT lpR = &buf->buffer->pointrect[i].rect; diff --git a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c index 8415d64de..d43b5880c 100644 --- a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c +++ b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c @@ -428,7 +428,8 @@ static void cpulist_parse(CpuList* list, const char* line, int line_len) */ while (p < end && *p != '\n') { - int start_value, end_value; + int start_value = 0; + int end_value = 0; /* Find the end of current item, and put it into 'q' */ q = memchr(p, ',', end - p);