wine-commits November 2006

wine-commits@winehq.org

3 participants
792 discussions

Mike McCormack : comctl32: Switch to a Nx4 tiling.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: dfb41b35c47c0217eb08fa643484ae8c55f2b333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb41b35c47c0217eb08fa643… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 18:02:39 2006 +0900 comctl32: Switch to a Nx4 tiling. --- dlls/comctl32/imagelist.c | 47 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 20da02f..843654a 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -84,28 +84,59 @@ static inline BOOL is_valid(HIMAGELIST h return himl && himl->magic == IMAGELIST_MAGIC; } +/* + * An imagelist with N images is tiled like this: + * + * N/4 -> + * + * 4 048C.. + * 159D.. + * | 26AE.N + * V 37BF. + */ + +#define TILE_COUNT 4 + +static inline UINT imagelist_width( UINT count ) +{ + return ((count + TILE_COUNT - 1)/TILE_COUNT); +} + static inline void imagelist_point_from_index( HIMAGELIST himl, UINT index, LPPOINT pt ) { - pt->x = index * himl->cx; - pt->y = 0; + pt->x = (index/TILE_COUNT) * himl->cx; + pt->y = (index%TILE_COUNT) * himl->cy; } static inline void imagelist_get_bitmap_size( HIMAGELIST himl, UINT count, UINT cy, SIZE *sz ) { - sz->cx = count * himl->cx; - sz->cy = cy; + sz->cx = imagelist_width( count ) * himl->cx; + sz->cy = cy*TILE_COUNT; } +/* + * imagelist_copy_images() + * + * Copies a block of count images from offset src in the list to offset dest. + * Images are copied a row at at time. Assumes hdcSrc and hdcDest are different. + */ static inline void imagelist_copy_images( HIMAGELIST himl, HDC hdcSrc, HDC hdcDest, UINT src, UINT count, UINT dest ) { POINT ptSrc, ptDest; SIZE sz; + UINT i; - imagelist_point_from_index( himl, src, &ptSrc ); - imagelist_point_from_index( himl, dest, &ptDest ); - imagelist_get_bitmap_size( himl, count, himl->cy, &sz ); - BitBlt (hdcDest, ptSrc.x, ptSrc.y, sz.cx, sz.cy, hdcSrc, ptDest.x, ptDest.y, SRCCOPY); + for ( i=0; i<TILE_COUNT; i++ ) + { + imagelist_point_from_index( himl, src+i, &ptSrc ); + imagelist_point_from_index( himl, dest+i, &ptDest ); + sz.cx = himl->cx * imagelist_width( count - i ); + sz.cy = himl->cy; + + BitBlt( hdcDest, ptDest.x, ptDest.y, sz.cx, sz.cy, + hdcSrc, ptSrc.x, ptSrc.y, SRCCOPY ); + } } /*************************************************************************

1 0

Mike McCormack : comctl32: Remove a Nx1 assuption in ImageList_AddMasked().
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 6772873396dfe5f0b124c9b63c00e18fe3804037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6772873396dfe5f0b124c9b63… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 17:59:19 2006 +0900 comctl32: Remove a Nx1 assuption in ImageList_AddMasked(). --- dlls/comctl32/imagelist.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 3f8b49f..20da02f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -300,7 +300,7 @@ INT WINAPI ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) { HDC hdcMask, hdcBitmap; - INT nIndex, nImageCount, nMaskXOffset=0; + INT nIndex, nImageCount; BITMAP bmp; HBITMAP hOldBitmap; HBITMAP hMaskBitmap=0; @@ -331,7 +331,6 @@ ImageList_AddMasked (HIMAGELIST himl, HB if(himl->hbmMask) { hdcMask = himl->hdcMask; - nMaskXOffset = nIndex * himl->cx; imagelist_point_from_index( himl, nIndex, &pt ); } else @@ -343,7 +342,6 @@ ImageList_AddMasked (HIMAGELIST himl, HB hdcMask = CreateCompatibleDC(0); hMaskBitmap = CreateBitmap(bmp.bmWidth, bmp.bmHeight, 1, 1, NULL); SelectObject(hdcMask, hMaskBitmap); - nMaskXOffset = 0; imagelist_point_from_index( himl, 0, &pt ); } /* create monochrome image to the mask bitmap */ @@ -370,7 +368,7 @@ ImageList_AddMasked (HIMAGELIST himl, HB BitBlt(hdcBitmap, 0, 0, bmp.bmWidth, bmp.bmHeight, hdcMask, - nMaskXOffset, 0, + pt.x, pt.y, 0x220326); /* NOTSRCAND */ /* Copy result to the imagelist */

1 0

Mike McCormack : comctl32: Check if GetObject fails on bitmaps passed to us .
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 49df0467b12567da86155b8e9e7a7d337fbc6ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49df0467b12567da86155b8e9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 17:12:35 2006 +0900 comctl32: Check if GetObject fails on bitmaps passed to us. --- dlls/comctl32/imagelist.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index e8654e1..3f8b49f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -212,7 +212,9 @@ ImageList_Add (HIMAGELIST himl, HBITMAP if (!is_valid(himl)) return -1; - GetObjectA (hbmImage, sizeof(BITMAP), (LPVOID)&bmp); + if (!GetObjectW(hbmImage, sizeof(BITMAP), (LPVOID)&bmp)) + return -1; + nImageCount = bmp.bmWidth / himl->cx; IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); @@ -309,7 +311,7 @@ ImageList_AddMasked (HIMAGELIST himl, HB if (!is_valid(himl)) return -1; - if (!GetObjectA (hBitmap, sizeof(BITMAP), &bmp)) + if (!GetObjectW(hBitmap, sizeof(BITMAP), &bmp)) return -1; if (himl->cx > 0) @@ -2218,8 +2220,10 @@ ImageList_Replace (HIMAGELIST himl, INT return FALSE; } + if (!GetObjectW(hbmImage, sizeof(BITMAP), (LPVOID)&bmp)) + return FALSE; + hdcImage = CreateCompatibleDC (0); - GetObjectA (hbmImage, sizeof(BITMAP), (LPVOID)&bmp); /* Replace Image */ hOldBitmap = SelectObject (hdcImage, hbmImage); @@ -2691,7 +2695,7 @@ _write_bitmap(HBITMAP hBitmap, LPSTREAM { LPBITMAPFILEHEADER bmfh; LPBITMAPINFOHEADER bmih; - LPBYTE data, lpBits, lpBitsOrg; + LPBYTE data = NULL, lpBits = NULL, lpBitsOrg = NULL; BITMAP bm; INT bitCount, sizeImage, offBits, totalSize; INT nwidth, nheight, nsizeImage, icount; @@ -2700,7 +2704,8 @@ _write_bitmap(HBITMAP hBitmap, LPSTREAM xdc = GetDC(0); - GetObjectA(hBitmap, sizeof(BITMAP), (LPVOID)&bm); + if (!GetObjectW(hBitmap, sizeof(BITMAP), (LPVOID)&bm)) + goto failed; /* XXX is this always correct? */ icount = bm.bmWidth / cx;

1 0

Mike McCormack : comctl32: Fix Nx1 assumptions when adding multiple bitmaps with ImageList_Add.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 6a9209da8fd92cd06fe8942a3ac0a3f0ead1860b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9209da8fd92cd06fe8942a3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 17:12:18 2006 +0900 comctl32: Fix Nx1 assumptions when adding multiple bitmaps with ImageList_Add. --- dlls/comctl32/imagelist.c | 40 +++++++++++++++++----------------------- 1 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index b82863e..e8654e1 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -202,10 +202,10 @@ IMAGELIST_InternalExpandBitmaps (HIMAGEL INT WINAPI ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask) { - HDC hdcBitmap; - INT nFirstIndex, nImageCount; + HDC hdcBitmap, hdcTemp; + INT nFirstIndex, nImageCount, i; BITMAP bmp; - HBITMAP hOldBitmap; + HBITMAP hOldBitmap, hOldBitmapTemp; POINT pt; TRACE("himl=%p hbmimage=%p hbmmask=%p\n", himl, hbmImage, hbmMask); @@ -217,41 +217,35 @@ ImageList_Add (HIMAGELIST himl, HBITMAP IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); - imagelist_point_from_index( himl, himl->cCurImage, &pt ); - hdcBitmap = CreateCompatibleDC(0); hOldBitmap = SelectObject(hdcBitmap, hbmImage); - /* Copy result to the imagelist - */ - BitBlt (himl->hdcImage, pt.x, pt.y, bmp.bmWidth, bmp.bmHeight, - hdcBitmap, 0, 0, SRCCOPY); - - if(himl->hbmMask) + for (i=0; i<nImageCount; i++) { - HDC hdcTemp; - HBITMAP hOldBitmapTemp; + imagelist_point_from_index( himl, himl->cCurImage + i, &pt ); + + /* Copy result to the imagelist + */ + BitBlt( himl->hdcImage, pt.x, pt.y, himl->cx, bmp.bmHeight, + hdcBitmap, i*himl->cx, 0, SRCCOPY ); + + if (!himl->hbmMask) + continue; hdcTemp = CreateCompatibleDC(0); hOldBitmapTemp = SelectObject(hdcTemp, hbmMask); - BitBlt (himl->hdcMask, - pt.x, pt.y, bmp.bmWidth, bmp.bmHeight, - hdcTemp, - 0, 0, - SRCCOPY); + BitBlt( himl->hdcMask, pt.x, pt.y, himl->cx, bmp.bmHeight, + hdcTemp, i*himl->cx, 0, SRCCOPY ); SelectObject(hdcTemp, hOldBitmapTemp); DeleteDC(hdcTemp); /* Remove the background from the image */ - BitBlt (himl->hdcImage, - pt.x, pt.y, bmp.bmWidth, bmp.bmHeight, - himl->hdcMask, - pt.x, pt.y, - 0x220326); /* NOTSRCAND */ + BitBlt( himl->hdcImage, pt.x, pt.y, himl->cx, bmp.bmHeight, + himl->hdcMask, pt.x, pt.y, 0x220326 ); /* NOTSRCAND */ } SelectObject(hdcBitmap, hOldBitmap);

1 0

Mike McCormack : comctl32: Fix an Nx1 in ImageList_DrawIndirect().
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: ba73cac96171d7d0d425d151bc3c3d9ad0ac537c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba73cac96171d7d0d425d151b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 17:11:34 2006 +0900 comctl32: Fix an Nx1 in ImageList_DrawIndirect(). --- dlls/comctl32/imagelist.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 8ebc326..b82863e 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1209,7 +1209,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR BitBlt(hBlendMaskDC, 0, 0, cx, cy, hMaskListDC, pt.x, pt.y, 0x220326); /* NOTSRCAND */ BitBlt(hBlendMaskDC, 0, 0, cx, cy, hBlendMaskDC, 0, 0, NOTSRCCOPY); } - + /* now apply blend to the current image given the BlendMask */ if (clrBlend == CLR_DEFAULT) clrBlend = GetSysColor (COLOR_HIGHLIGHT); else if (clrBlend == CLR_NONE) clrBlend = GetTextColor (pimldp->hdcDst); @@ -1224,10 +1224,12 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR if ( (nOvlIdx >= 1) && (nOvlIdx <= MAX_OVERLAYIMAGE)) { nOvlIdx = himl->nOvlIdx[nOvlIdx - 1]; if ((nOvlIdx >= 0) && (nOvlIdx < himl->cCurImage)) { - const INT ox = himl->cx * nOvlIdx + pimldp->xBitmap; + POINT ptOvl; + imagelist_point_from_index( himl, nOvlIdx, &ptOvl ); + ptOvl.x += pimldp->xBitmap; if (himl->hbmMask && !(fStyle & ILD_IMAGE)) - BitBlt (hImageDC, 0, 0, cx, cy, hMaskListDC, ox, pt.x, SRCAND); - BitBlt (hImageDC, 0, 0, cx, cy, hImageListDC, ox, pt.y, SRCPAINT); + BitBlt (hImageDC, 0, 0, cx, cy, hMaskListDC, ptOvl.x, ptOvl.y, SRCAND); + BitBlt (hImageDC, 0, 0, cx, cy, hImageListDC, ptOvl.x, ptOvl.y, SRCPAINT); } } @@ -1239,7 +1241,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR if (fStyle & ILD_PRESERVEALPHA) FIXME("ILD_PRESERVEALPHA: unimplemented!\n"); if (fStyle & ILD_SCALE) FIXME("ILD_SCALE: unimplemented!\n"); if (fStyle & ILD_DPISCALE) FIXME("ILD_DPISCALE: unimplemented!\n"); - + /* now copy the image to the screen */ dwRop = SRCCOPY; if (himl->hbmMask && bIsTransparent ) { @@ -1254,7 +1256,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, dwRop); bResult = TRUE; -end: +end: /* cleanup the mess */ SetBkColor(hImageDC, oldImageBk); SetTextColor(hImageDC, oldImageFg);

1 0

Mike McCormack : comctl32: Remove another Nx1 assumption from ImageList_Remove().
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 4e5f56a8e09014b3709cbf4f3951793e26aa3b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e5f56a8e09014b3709cbf4f3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 17:10:54 2006 +0900 comctl32: Remove another Nx1 assumption from ImageList_Remove(). --- dlls/comctl32/imagelist.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 99c83be..8ebc326 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2073,7 +2073,8 @@ ImageList_Remove (HIMAGELIST himl, INT i { HBITMAP hbmNewImage, hbmNewMask; HDC hdcBmp; - INT cxNew, nCount; + INT nCount; + SIZE sz; TRACE("(himl=%p i=%d)\n", himl, i); @@ -2106,7 +2107,6 @@ ImageList_Remove (HIMAGELIST himl, INT i himl->hbmImage = hbmNewImage; if (himl->hbmMask) { - SIZE sz; imagelist_get_bitmap_size(himl, himl->cMaxImage, himl->cy, &sz); hbmNewMask = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); @@ -2121,7 +2121,6 @@ ImageList_Remove (HIMAGELIST himl, INT i /* create new bitmap(s) */ nCount = (himl->cCurImage + himl->cGrow - 1); - cxNew = nCount * himl->cx; TRACE(" - Number of images: %d / %d (Old/New)\n", himl->cCurImage, himl->cCurImage - 1); @@ -2130,8 +2129,9 @@ ImageList_Remove (HIMAGELIST himl, INT i hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, nCount, himl->cy); + imagelist_get_bitmap_size(himl, nCount, himl->cy, &sz ); if (himl->hbmMask) - hbmNewMask = CreateBitmap (cxNew, himl->cy, 1, 1, NULL); + hbmNewMask = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); else hbmNewMask = 0; /* Just to keep compiler happy! */

1 0

Mike McCormack : comctl32: Remove Nx1 assumptions in ImageList_Merge.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: ca6be70819746a10e80af48c9b13d39e90633705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca6be70819746a10e80af48c9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 17:10:09 2006 +0900 comctl32: Remove Nx1 assumptions in ImageList_Merge. --- dlls/comctl32/imagelist.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 3db07e5..99c83be 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1773,7 +1773,7 @@ ImageList_Merge (HIMAGELIST himl1, INT i HIMAGELIST himlDst = NULL; INT cxDst, cyDst; INT xOff1, yOff1, xOff2, yOff2; - INT nX1, nX2; + POINT pt1, pt2; TRACE("(himl1=%p i1=%d himl2=%p i2=%d dx=%d dy=%d)\n", himl1, i1, himl2, i2, dx, dy); @@ -1817,25 +1817,25 @@ ImageList_Merge (HIMAGELIST himl1, INT i if (himlDst) { - nX1 = i1 * himl1->cx; - nX2 = i2 * himl2->cx; + imagelist_point_from_index( himl1, i1, &pt1 ); + imagelist_point_from_index( himl1, i2, &pt2 ); /* copy image */ BitBlt (himlDst->hdcImage, 0, 0, cxDst, cyDst, himl1->hdcImage, 0, 0, BLACKNESS); if (i1 >= 0 && i1 < himl1->cCurImage) - BitBlt (himlDst->hdcImage, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcImage, nX1, 0, SRCCOPY); + BitBlt (himlDst->hdcImage, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcImage, pt1.x, pt1.y, SRCCOPY); if (i2 >= 0 && i2 < himl2->cCurImage) { - BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , nX2, 0, SRCAND); - BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, nX2, 0, SRCPAINT); + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , pt2.x, pt2.y, SRCAND); + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCPAINT); } /* copy mask */ BitBlt (himlDst->hdcMask, 0, 0, cxDst, cyDst, himl1->hdcMask, 0, 0, WHITENESS); if (i1 >= 0 && i1 < himl1->cCurImage) - BitBlt (himlDst->hdcMask, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcMask, nX1, 0, SRCCOPY); + BitBlt (himlDst->hdcMask, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcMask, pt1.x, pt1.y, SRCCOPY); if (i2 >= 0 && i2 < himl2->cCurImage) - BitBlt (himlDst->hdcMask, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask, nX2, 0, SRCAND); + BitBlt (himlDst->hdcMask, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask, pt2.x, pt2.y, SRCAND); himlDst->cCurImage = 1; }

1 0

Mike McCormack : comctl32: Remove Nx1 assumptions in ImageList_GetIcon().
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 9cd86dddf1af73cc9255cf63dc0cf928e336f731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd86dddf1af73cc9255cf63d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 17:09:47 2006 +0900 comctl32: Remove Nx1 assumptions in ImageList_GetIcon(). --- dlls/comctl32/imagelist.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 91dc7a5..3db07e5 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1441,6 +1441,7 @@ ImageList_GetIcon (HIMAGELIST himl, INT HICON hIcon; HBITMAP hOldDstBitmap; HDC hdcDst; + POINT pt; TRACE("%p %d %d\n", himl, i, fStyle); if (!is_valid(himl) || (i < 0) || (i >= himl->cCurImage)) return NULL; @@ -1456,12 +1457,14 @@ ImageList_GetIcon (HIMAGELIST himl, INT hdcDst = CreateCompatibleDC(0); + imagelist_point_from_index( himl, i, &pt ); + /* draw mask*/ ii.hbmMask = CreateBitmap (himl->cx, himl->cy, 1, 1, NULL); hOldDstBitmap = SelectObject (hdcDst, ii.hbmMask); if (himl->hbmMask) { BitBlt (hdcDst, 0, 0, himl->cx, himl->cy, - himl->hdcMask, i * himl->cx, 0, SRCCOPY); + himl->hdcMask, pt.x, pt.y, SRCCOPY); } else PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS); @@ -1469,7 +1472,7 @@ ImageList_GetIcon (HIMAGELIST himl, INT /* draw image*/ SelectObject (hdcDst, ii.hbmColor); BitBlt (hdcDst, 0, 0, himl->cx, himl->cy, - himl->hdcImage, i * himl->cx, 0, SRCCOPY); + himl->hdcImage, pt.x, pt.y, SRCCOPY); /* * CreateIconIndirect requires us to deselect the bitmaps from

1 0

Mike McCormack : comctl32: Use imagelist_copy_images() in ImageList_SetImageCount().
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 1328ca572b0a8ca7df702490b9e66c3c59e54df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1328ca572b0a8ca7df702490b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 17:09:29 2006 +0900 comctl32: Use imagelist_copy_images() in ImageList_SetImageCount(). --- dlls/comctl32/imagelist.c | 31 +++++++++---------------------- 1 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 58eac98..91dc7a5 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2613,17 +2613,10 @@ ImageList_SetImageCount (HIMAGELIST himl if (hbmNewBitmap != 0) { SelectObject (hdcBitmap, hbmNewBitmap); + imagelist_copy_images( himl, himl->hdcImage, hdcBitmap, 0, nCopyCount, 0 ); + + /* FIXME: delete 'empty' image space? */ - /* copy images */ - BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy, - himl->hdcImage, 0, 0, SRCCOPY); -#if 0 - /* delete 'empty' image space */ - SetBkColor (hdcBitmap, RGB(255, 255, 255)); - SetTextColor (hdcBitmap, RGB(0, 0, 0)); - PatBlt (hdcBitmap, nCopyCount * himl->cx, 0, - (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS); -#endif SelectObject (himl->hdcImage, hbmNewBitmap); DeleteObject (himl->hbmImage); himl->hbmImage = hbmNewBitmap; @@ -2633,22 +2626,16 @@ #endif if (himl->hbmMask) { - hbmNewBitmap = CreateBitmap (nNewCount * himl->cx, himl->cy, - 1, 1, NULL); + SIZE sz; + imagelist_get_bitmap_size( himl, nNewCount, himl->cy, &sz ); + hbmNewBitmap = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); if (hbmNewBitmap != 0) { SelectObject (hdcBitmap, hbmNewBitmap); + imagelist_copy_images( himl, himl->hdcMask, hdcBitmap, 0, nCopyCount, 0 ); + + /* FIXME: delete 'empty' image space? */ - /* copy images */ - BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy, - himl->hdcMask, 0, 0, SRCCOPY); -#if 0 - /* delete 'empty' image space */ - SetBkColor (hdcBitmap, RGB(255, 255, 255)); - SetTextColor (hdcBitmap, RGB(0, 0, 0)); - PatBlt (hdcBitmap, nCopyCount * himl->cx, 0, - (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS); -#endif SelectObject (himl->hdcMask, hbmNewBitmap); DeleteObject (himl->hbmMask); himl->hbmMask = hbmNewBitmap;

1 0

Mike McCormack : comctl32: Create a helper function to copy a block of images.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 7370fc0e700740bdbf2add987fdfc3150c7b00c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7370fc0e700740bdbf2add987… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 14:04:50 2006 +0900 comctl32: Create a helper function to copy a block of images. --- dlls/comctl32/imagelist.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 5113054..58eac98 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -96,6 +96,18 @@ static inline void imagelist_get_bitmap_ sz->cy = cy; } +static inline void imagelist_copy_images( HIMAGELIST himl, HDC hdcSrc, HDC hdcDest, + UINT src, UINT count, UINT dest ) +{ + POINT ptSrc, ptDest; + SIZE sz; + + imagelist_point_from_index( himl, src, &ptSrc ); + imagelist_point_from_index( himl, dest, &ptDest ); + imagelist_get_bitmap_size( himl, count, himl->cy, &sz ); + BitBlt (hdcDest, ptSrc.x, ptSrc.y, sz.cx, sz.cy, hdcSrc, ptDest.x, ptDest.y, SRCCOPY); +} + /************************************************************************* * IMAGELIST_InternalExpandBitmaps [Internal] * @@ -2124,32 +2136,29 @@ ImageList_Remove (HIMAGELIST himl, INT i /* copy all images and masks prior to the "removed" image */ if (i > 0) { - SIZE sz; - TRACE("Pre image copy: Copy %d images\n", i); SelectObject (hdcBmp, hbmNewImage); - imagelist_get_bitmap_size( himl, i, himl->cy, &sz ); - BitBlt (hdcBmp, 0, 0, sz.cx, sz.cy, himl->hdcImage, 0, 0, SRCCOPY); + imagelist_copy_images( himl, himl->hdcImage, hdcBmp, 0, i, 0 ); if (himl->hbmMask) { SelectObject (hdcBmp, hbmNewMask); - BitBlt (hdcBmp, 0, 0, sz.cx, sz.cy, himl->hdcMask, 0, 0, SRCCOPY); + imagelist_copy_images( himl, himl->hdcMask, hdcBmp, 0, i, 0 ); } } /* copy all images and masks behind the removed image */ if (i < himl->cCurImage - 1) { TRACE("Post image copy!\n"); + SelectObject (hdcBmp, hbmNewImage); - BitBlt (hdcBmp, i * himl->cx, 0, (himl->cCurImage - i - 1) * himl->cx, - himl->cy, himl->hdcImage, (i + 1) * himl->cx, 0, SRCCOPY); + imagelist_copy_images( himl, himl->hdcImage, hdcBmp, i, + (himl->cCurImage - i - 1), i + 1 ); if (himl->hbmMask) { SelectObject (hdcBmp, hbmNewMask); - BitBlt (hdcBmp, i * himl->cx, 0, - (himl->cCurImage - i - 1) * himl->cx, - himl->cy, himl->hdcMask, (i + 1) * himl->cx, 0, SRCCOPY); + imagelist_copy_images( himl, himl->hdcMask, hdcBmp, i, + (himl->cCurImage - i - 1), i + 1 ); } }

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2006