Eric Pouech : gdiplus/tests: Get rid of some GCC11 warnings (-Warray-bounds).
Alexandre Julliard
julliard at winehq.org
Wed Feb 16 15:30:22 CST 2022
Module: wine
Branch: master
Commit: aa9d1bd130fb8d30522e2a5b82d325d00b06d77a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa9d1bd130fb8d30522e2a5b82d325d00b06d77a
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Mon Feb 14 10:28:12 2022 +0100
gdiplus/tests: Get rid of some GCC11 warnings (-Warray-bounds).
don't pretend using a BITMAPINFO when only a BITMAPINFOHEADER is used
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Esme Povirk <esme at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gdiplus/tests/graphics.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c
index 690efa8ac1e..c8c31ce258b 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -1313,21 +1313,20 @@ static void test_GdipDrawImagePointsRect(void)
GpGraphics *graphics = NULL;
GpPointF ptf[4];
GpBitmap *bm = NULL;
- BYTE rbmi[sizeof(BITMAPINFOHEADER)];
BYTE buff[400];
- BITMAPINFO *bmi = (BITMAPINFO*)rbmi;
+ BITMAPINFOHEADER bmihdr;
HDC hdc = GetDC( hwnd );
if (!hdc)
return;
- memset(rbmi, 0, sizeof(rbmi));
- bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
- bmi->bmiHeader.biWidth = 10;
- bmi->bmiHeader.biHeight = 10;
- bmi->bmiHeader.biPlanes = 1;
- bmi->bmiHeader.biBitCount = 32;
- bmi->bmiHeader.biCompression = BI_RGB;
- status = GdipCreateBitmapFromGdiDib(bmi, buff, &bm);
+ memset(&bmihdr, 0, sizeof(bmihdr));
+ bmihdr.biSize = sizeof(BITMAPINFOHEADER);
+ bmihdr.biWidth = 10;
+ bmihdr.biHeight = 10;
+ bmihdr.biPlanes = 1;
+ bmihdr.biBitCount = 32;
+ bmihdr.biCompression = BI_RGB;
+ status = GdipCreateBitmapFromGdiDib((BITMAPINFO*)&bmihdr, buff, &bm);
expect(Ok, status);
ok(NULL != bm, "Expected bitmap to be initialized\n");
status = GdipCreateFromHDC(hdc, &graphics);
More information about the wine-cvs
mailing list