November 2006 - Wine-commits

Mike McCormack : riched20: Don't access memory after freeing it.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: d89c46748fe1601743cce86dc2c371250d4c09de URL: http://source.winehq.org/git/wine.git/?a=commit;h=d89c46748fe1601743cce86dc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 14:26:47 2006 +0900 riched20: Don't access memory after freeing it. --- dlls/riched20/editor.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e8362f1..3cce1cf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1812,18 +1812,20 @@ LRESULT WINAPI RichEditANSIWndProc(HWND LPWSTR wszText = ME_ToUnicode(hWnd, (void *)lParam); size_t len = lstrlenW(wszText); TRACE("EM_REPLACESEL - %s\n", debugstr_w(wszText)); - + ME_GetSelection(editor, &from, &to); style = ME_GetSelectionInsertStyle(editor); ME_InternalDeleteText(editor, from, to-from); ME_InsertTextFromCursor(editor, 0, wszText, len, style); ME_ReleaseStyle(style); - ME_EndToUnicode(hWnd, wszText); /* drop temporary style if line end */ - /* FIXME question: does abc\n mean: put abc, clear temp style, put \n? (would require a change) */ + /* + * FIXME question: does abc\n mean: put abc, + * clear temp style, put \n? (would require a change) + */ if (len>0 && wszText[len-1] == '\n') ME_ClearTempStyle(editor); - + ME_EndToUnicode(hWnd, wszText); ME_CommitUndo(editor); if (!wParam) ME_EmptyUndoStack(editor);

1 0

Mike McCormack : riched20: Fix one more memory leak.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: b7501a3b0cc3a112c202373f08d8910b5252baf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7501a3b0cc3a112c202373f0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 14:27:14 2006 +0900 riched20: Fix one more memory leak. --- dlls/riched20/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 57a304a..fd65252 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -360,7 +360,7 @@ LPWSTR ME_ToUnicode(HWND hWnd, LPVOID ps void ME_EndToUnicode(HWND hWnd, LPVOID psz) { - if (IsWindowUnicode(hWnd)) + if (!IsWindowUnicode(hWnd)) FREE_OBJ(psz); }

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 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: 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: 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: 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: 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: 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

Roderick Colenbrander : wgl: Fix WoW screen flickering.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 1d4effcaa56cb9a8bf94f240a57392b3060ad0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4effcaa56cb9a8bf94f240a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Nov 4 22:23:15 2006 +0100 wgl: Fix WoW screen flickering. --- dlls/gdi32/driver.c | 1 + dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/opengl.c | 29 +++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 29 +++++++++++++++++++++-------- dlls/winex11.drv/winex11.drv.spec | 1 + 5 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 16bde65..f5ff9af 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -199,6 +199,7 @@ #define GET_FUNC(name) driver->funcs.p## GET_FUNC(wglCreateContext); GET_FUNC(wglDeleteContext); GET_FUNC(wglGetProcAddress); + GET_FUNC(wglGetPbufferDCARB); GET_FUNC(wglMakeContextCurrentARB); GET_FUNC(wglMakeCurrent); GET_FUNC(wglShareLists); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index eda9827..1dbae75 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -187,6 +187,7 @@ typedef struct tagDC_FUNCS HGLRC (*pwglCreateContext)(PHYSDEV); BOOL (*pwglDeleteContext)(HGLRC); PROC (*pwglGetProcAddress)(LPCSTR); + HDC (*pwglGetPbufferDCARB)(PHYSDEV, void*); BOOL (*pwglMakeCurrent)(PHYSDEV, HGLRC); BOOL (*pwglMakeContextCurrentARB)(PHYSDEV, PHYSDEV, HGLRC); BOOL (*pwglShareLists)(HGLRC hglrc1, HGLRC hglrc2); diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 03ce10d..d171c3d 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -131,6 +131,33 @@ HDC WINAPI wglGetCurrentDC(void) } /*********************************************************************** + * wglGetPbufferDCARB + */ +static HDC WINAPI wglGetPbufferDCARB(void *pbuffer) +{ + HDC ret = 0; + + /* Create a device context to associate with the pbuffer */ + HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + DC *dc = DC_GetDCPtr(hdc); + + TRACE("(%p)\n", pbuffer); + + if (!dc) return FALSE; + + /* The display driver has to do the rest of the work because + * we need access to lowlevel datatypes which we can't access here + */ + if (!dc->funcs->pwglGetPbufferDCARB) FIXME(" :stub\n"); + else ret = dc->funcs->pwglGetPbufferDCARB(dc->physDev, pbuffer); + + TRACE("(%p), hdc=%p\n", pbuffer, ret); + + GDI_ReleaseObj(hdc); + return ret; +} + +/*********************************************************************** * wglMakeCurrent (OPENGL32.@) */ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) @@ -281,6 +308,8 @@ PROC WINAPI wglGetProcAddress(LPCSTR fun */ if(ret && strcmp(func, "wglMakeContextCurrentARB") == 0) return wglMakeContextCurrentARB; + else if(ret && strcmp(func, "wglGetPbufferDCARB") == 0) + return (PROC)wglGetPbufferDCARB; return ret; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index feec150..fcb39d4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1871,23 +1871,26 @@ static GLboolean WINAPI X11DRV_wglDestro return GL_TRUE; } -/* WGL_ARB_pbuffer: wglGetPbufferDCARB */ -static HDC WINAPI X11DRV_wglGetPbufferDCARB(HPBUFFERARB hPbuffer) +/* WGL_ARB_pbuffer: wglGetPbufferDCARB + * The function wglGetPbufferDCARB returns a device context for a pbuffer. + * Gdi32 implements the part of this function which creates a device context. + * This part associates the physDev with the X drawable of the pbuffer. + */ +HDC X11DRV_wglGetPbufferDCARB(X11DRV_PDEVICE *physDev, HPBUFFERARB hPbuffer) { Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer; - HDC hDC; if (NULL == object) { SetLastError(ERROR_INVALID_HANDLE); return NULL; } - hDC = CreateCompatibleDC(object->hdc); /* The function wglGetPbufferDCARB returns a DC to which the pbuffer can be connected. * We only support one onscreen rendering format (the one from the main visual), so use that. */ - SetPixelFormat(hDC, 1, NULL); - set_drawable(hDC, object->drawable); /* works ?? */ - TRACE("(%p)->(%p)\n", hPbuffer, hDC); - return hDC; + physDev->current_pf = 1; + physDev->drawable = object->drawable; + + TRACE("(%p)->(%p)\n", hPbuffer, physDev->hdc); + return physDev->hdc; } /* WGL_ARB_pbuffer: wglQueryPbufferARB */ @@ -2379,6 +2382,9 @@ static GLboolean WINAPI X11DRV_wglBindTe SetLastError(ERROR_INVALID_HANDLE); return GL_FALSE; } +/* Disable WGL_ARB_render_texture support untill it is implemented properly + * using pbuffers or FBOs */ +#if 0 if (!use_render_texture_ati && 1 == use_render_texture_emulation) { int do_init = 0; GLint prev_binded_tex; @@ -2406,6 +2412,7 @@ static GLboolean WINAPI X11DRV_wglBindTe object->texture = prev_binded_tex; return GL_TRUE; } +#endif if (NULL != pglXBindTexImageARB) { return pglXBindTexImageARB(object->display, object->drawable, iBuffer); } @@ -2834,6 +2841,12 @@ PROC X11DRV_wglGetProcAddress(LPCSTR lps return NULL; } +HDC X11DRV_wglGetPbufferDCARB(X11DRV_PDEVICE *hDevice, HPBUFFERARB hPbuffer) +{ + ERR_(opengl)("No OpenGL support compiled in.\n"); + return NULL; +} + BOOL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* hDrawDev, X11DRV_PDEVICE* hReadDev, HGLRC hglrc) { ERR_(opengl)("No OpenGL support compiled in.\n"); return FALSE; diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index b5b65b4..7d6214e 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -134,6 +134,7 @@ # OpenGL @ cdecl wglCreateContext(ptr) X11DRV_wglCreateContext @ cdecl wglDeleteContext(long) X11DRV_wglDeleteContext @ cdecl wglGetProcAddress(str) X11DRV_wglGetProcAddress +@ cdecl wglGetPbufferDCARB(ptr ptr) X11DRV_wglGetPbufferDCARB @ cdecl wglMakeContextCurrentARB(ptr ptr long) X11DRV_wglMakeContextCurrentARB @ cdecl wglMakeCurrent(ptr long) X11DRV_wglMakeCurrent @ cdecl wglShareLists(long long) X11DRV_wglShareLists

1 0