comctl32: avoid using ZeroMemory()
Austin English
austinenglish at gmail.com
Mon May 2 10:53:03 CDT 2011
On Mon, May 2, 2011 at 10:52, Austin English <austinenglish at gmail.com> wrote:
> Avoids a Clang bug:
> http://bugs.winehq.org/show_bug.cgi?id=26754
>
> --
> -Austin
>
--
-Austin
-------------- next part --------------
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 66cd03d..eb5fa2c 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -903,18 +903,23 @@ ImageList_InternalDragDraw (HDC hdc, INT x, INT y)
{
IMAGELISTDRAWPARAMS imldp;
- ZeroMemory (&imldp, sizeof(imldp));
imldp.cbSize = sizeof(imldp);
imldp.himl = InternalDrag.himl;
imldp.i = 0;
imldp.hdcDst = hdc,
imldp.x = x;
imldp.y = y;
+ imldp.cx = 0;
+ imldp.cy = 0;
+ imldp.xBitmap = 0;
+ imldp.yBitmap = 0;
imldp.rgbBk = CLR_DEFAULT;
imldp.rgbFg = CLR_DEFAULT;
imldp.fStyle = ILD_NORMAL;
+ imldp.dwRop = 0;
imldp.fState = ILS_ALPHA;
imldp.Frame = 192;
+ imldp.crEffect = 0;
ImageList_DrawIndirect (&imldp);
}
@@ -1137,7 +1142,6 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y,
{
IMAGELISTDRAWPARAMS imldp;
- ZeroMemory (&imldp, sizeof(imldp));
imldp.cbSize = sizeof(imldp);
imldp.himl = himl;
imldp.i = i;
@@ -1146,9 +1150,15 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y,
imldp.y = y;
imldp.cx = dx;
imldp.cy = dy;
+ imldp.xBitmap = 0;
+ imldp.yBitmap = 0;
imldp.rgbBk = rgbBk;
imldp.rgbFg = rgbFg;
imldp.fStyle = fStyle;
+ imldp.dwRop = 0;
+ imldp.fState = 0;
+ imldp.Frame = 0;
+ imldp.crEffect = 0;
return ImageList_DrawIndirect (&imldp);
}
More information about the wine-patches
mailing list