November 2011 - Wine-commits

Jacek Caban : mshtml: Fixed ref count leaks.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 92d55a84d674be49bd570d51663967d5e524e15a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d55a84d674be49bd570d516… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 19:26:07 2011 +0100 mshtml: Fixed ref count leaks. --- dlls/mshtml/htmlelem.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9d9fc8d..36103be 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1038,7 +1038,7 @@ static HRESULT WINAPI HTMLElement_put_innerHTML(IHTMLElement *iface, BSTR v) nsAString_InitDepend(&html_str, v); nsres = nsIDOMNSHTMLElement_SetInnerHTML(nselem, &html_str); nsAString_Finish(&html_str); - + nsIDOMNSHTMLElement_Release(nselem); if(NS_FAILED(nsres)) { FIXME("SetInnerHtml failed %08x\n", nsres); return E_FAIL; @@ -1069,6 +1069,7 @@ static HRESULT WINAPI HTMLElement_get_innerHTML(IHTMLElement *iface, BSTR *p) nsAString_Init(&html_str, NULL); nsres = nsIDOMNSHTMLElement_GetInnerHTML(nselem, &html_str); + nsIDOMNSHTMLElement_Release(nselem); if(NS_SUCCEEDED(nsres)) { const PRUnichar *html;

1 0

Austin English : wininet: Add a stub for ShowClientAuthCerts.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 25bc31ac2e8a07ed59bcbc734c79fb7af18a8803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bc31ac2e8a07ed59bcbc734… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 31 11:37:47 2011 -0700 wininet: Add a stub for ShowClientAuthCerts. --- dlls/wininet/internet.c | 6 ++++++ dlls/wininet/wininet.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 020fe2c..43be36d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4385,3 +4385,9 @@ BOOL WINAPI InternetQueryFortezzaStatus(DWORD *a, DWORD_PTR b) FIXME("(%p, %08lx) stub\n", a, b); return 0; } + +DWORD WINAPI ShowClientAuthCerts(HWND parent) +{ + FIXME("%p: stub\n", parent); + return 0; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 2773d4b..1e651b5 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -234,7 +234,7 @@ @ stdcall SetUrlCacheGroupAttributeW(int64 long long ptr ptr) @ stub SetUrlCacheHeaderData @ stub ShowCertificate -@ stub ShowClientAuthCerts +@ stdcall ShowClientAuthCerts(ptr) @ stub ShowSecurityInfo @ stdcall ShowX509EncodedCertificate(ptr ptr long) @ stdcall UnlockUrlCacheEntryFile(str long) UnlockUrlCacheEntryFileA

1 0

Austin English : urlmon: Add some more tests for FindMimeFromData().
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: aa80ce8cf7058e43f93a5a7f5cce6fe143a3982e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa80ce8cf7058e43f93a5a7f5… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 1 22:17:45 2011 -0700 urlmon: Add some more tests for FindMimeFromData(). --- dlls/urlmon/tests/misc.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index d9aebc7..cc69c72 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -733,6 +733,31 @@ static void test_FindMimeFromData(void) ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); + hres = pFindMimeFromData(NULL, url1, NULL, 0, NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, url1, NULL, sizeof(data1), NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, url1, 0, 0, NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, url1, 0, sizeof(data1), NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + hres = pFindMimeFromData(NULL, NULL, NULL, 0, NULL, 0, &mime, 0); ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, excepted E_INVALIDARG\n", hres);

1 0

Claudio Fontana : wined3d: Rename nVidia GTX560 to GTX560TI, add GTX560 with correct device id.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 485571539f5c27a5bd391ae69e436d774f8b9276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485571539f5c27a5bd391ae69… Author: Claudio Fontana <claudio.fontana(a)gmail.com> Date: Thu Nov 3 01:03:37 2011 +0100 wined3d: Rename nVidia GTX560 to GTX560TI, add GTX560 with correct device id. --- dlls/wined3d/directx.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5422a74..0fce621 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1154,7 +1154,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE6, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560TI, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, @@ -1522,7 +1523,8 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl { {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ - {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ + {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ + {"GTX 560", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2a987d5..90a70b4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1404,7 +1404,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, CARD_NVIDIA_GEFORCE_GT555M = 0x04b8, - CARD_NVIDIA_GEFORCE_GTX560 = 0x1200, + CARD_NVIDIA_GEFORCE_GTX560TI = 0x1200, + CARD_NVIDIA_GEFORCE_GTX560 = 0x1201, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080,

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: c872590a42b7e8f747ecbabbafe705ae193d941e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c872590a42b7e8f747ecbabba… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Nov 3 18:13:48 2011 +0100 po: Update Polish translation. --- po/pl.po | 236 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 130 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c872590a42b7e8f747ecb…

1 0

Alexandre Julliard : gdi32: Store internal brush data in separate fields in the brush object.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 20ecd97bee647febca40ab51d96f1847753107ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ecd97bee647febca40ab51d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 20:58:36 2011 +0100 gdi32: Store internal brush data in separate fields in the brush object. --- dlls/gdi32/brush.c | 67 +++++++++++++++++++++------------------------------- 1 files changed, 27 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 45874af..5e811cb 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -34,8 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); /* GDI logical brush object */ typedef struct { - GDIOBJHDR header; - LOGBRUSH logbrush; + GDIOBJHDR header; + LOGBRUSH logbrush; + HBITMAP bitmap; /* bitmap handle for DDB pattern brushes */ + BITMAPINFO *info; /* DIB info for pattern brushes */ + struct gdi_image_bits bits; /* DIB bits for pattern brushes */ + UINT usage; /* color usage for DIB info */ } BRUSHOBJ; #define NB_HATCH_STYLES 6 @@ -77,12 +81,11 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) { BRUSHOBJ * ptr; HBRUSH hbrush; + HGLOBAL hmem = 0; - if (!(ptr = HeapAlloc( GetProcessHeap(), 0, sizeof(*ptr) ))) return 0; + if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) return 0; - ptr->logbrush.lbStyle = brush->lbStyle; - ptr->logbrush.lbColor = brush->lbColor; - ptr->logbrush.lbHatch = brush->lbHatch; + ptr->logbrush = *brush; switch (ptr->logbrush.lbStyle) { @@ -95,31 +98,26 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) ptr->logbrush.lbStyle = BS_PATTERN; /* fall through */ case BS_PATTERN: - ptr->logbrush.lbHatch = (ULONG_PTR)BITMAP_CopyBitmap( (HBITMAP) ptr->logbrush.lbHatch ); + ptr->bitmap = BITMAP_CopyBitmap( (HBITMAP)ptr->logbrush.lbHatch ); + if (!ptr->bitmap) goto error; + ptr->logbrush.lbHatch = (ULONG_PTR)ptr->bitmap; ptr->logbrush.lbColor = 0; - if (!ptr->logbrush.lbHatch) goto error; break; + case BS_DIBPATTERN: + hmem = (HGLOBAL)ptr->logbrush.lbHatch; + if (!(ptr->logbrush.lbHatch = (ULONG_PTR)GlobalLock( hmem ))) goto error; + /* fall through */ case BS_DIBPATTERNPT: + ptr->usage = ptr->logbrush.lbColor; + ptr->info = copy_packed_dib( (BITMAPINFO *)ptr->logbrush.lbHatch, ptr->usage ); + if (hmem) GlobalUnlock( hmem ); + if (!ptr->info) goto error; + ptr->bits.ptr = (char *)ptr->info + bitmap_info_size( ptr->info, ptr->usage ); ptr->logbrush.lbStyle = BS_DIBPATTERN; - ptr->logbrush.lbHatch = (ULONG_PTR)copy_packed_dib( (BITMAPINFO *) ptr->logbrush.lbHatch, - ptr->logbrush.lbColor ); - if (!ptr->logbrush.lbHatch) goto error; + ptr->logbrush.lbHatch = (ULONG_PTR)ptr->info; break; - case BS_DIBPATTERN: - { - BITMAPINFO* bmi; - HGLOBAL h = (HGLOBAL)ptr->logbrush.lbHatch; - - ptr->logbrush.lbStyle = BS_DIBPATTERN; - if (!(bmi = GlobalLock( h ))) goto error; - ptr->logbrush.lbHatch = (ULONG_PTR)copy_packed_dib( bmi, ptr->logbrush.lbColor ); - GlobalUnlock( h ); - if (!ptr->logbrush.lbHatch) goto error; - break; - } - case BS_DIBPATTERN8X8: case BS_MONOPATTERN: case BS_INDEXED: @@ -135,13 +133,8 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) } error: - if (ptr->logbrush.lbHatch) - { - if (ptr->logbrush.lbStyle == BS_PATTERN) - DeleteObject( (HGDIOBJ)ptr->logbrush.lbHatch ); - else if (ptr->logbrush.lbStyle == BS_DIBPATTERN) - HeapFree( GetProcessHeap(), 0, (void *)ptr->logbrush.lbHatch ); - } + if (ptr->bitmap) DeleteObject( ptr->bitmap ); + HeapFree( GetProcessHeap(), 0, ptr->info ); HeapFree( GetProcessHeap(), 0, ptr ); return 0; } @@ -411,15 +404,9 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ) BRUSHOBJ *brush = free_gdi_handle( handle ); if (!brush) return FALSE; - switch(brush->logbrush.lbStyle) - { - case BS_PATTERN: - DeleteObject( (HGDIOBJ)brush->logbrush.lbHatch ); - break; - case BS_DIBPATTERN: - HeapFree( GetProcessHeap(), 0, (void *)brush->logbrush.lbHatch ); - break; - } + if (brush->bits.free) brush->bits.free( &brush->bits ); + if (brush->bitmap) DeleteObject( brush->bitmap ); + HeapFree( GetProcessHeap(), 0, brush->info ); return HeapFree( GetProcessHeap(), 0, brush ); }

1 0

Alexandre Julliard : gdi32: Pass the full brush contents in the SelectBrush driver entry point.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 24ac8c66bb494a11dca121fa31ddd3e9bd52d3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ac8c66bb494a11dca121fa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 21:17:15 2011 +0100 gdi32: Pass the full brush contents in the SelectBrush driver entry point. --- dlls/gdi32/brush.c | 6 +++++- dlls/gdi32/dibdrv/dibdrv.h | 3 ++- dlls/gdi32/dibdrv/objects.c | 5 +++-- dlls/gdi32/driver.c | 3 ++- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 ++- dlls/gdi32/enhmfdrv/objects.c | 3 ++- dlls/gdi32/mfdrv/metafiledrv.h | 3 ++- dlls/gdi32/mfdrv/objects.c | 3 ++- dlls/wineps.drv/brush.c | 3 ++- dlls/wineps.drv/psdrv.h | 4 ++-- dlls/winex11.drv/brush.c | 3 ++- dlls/winex11.drv/x11drv.h | 3 ++- include/wine/gdi_driver.h | 4 ++-- 13 files changed, 30 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24ac8c66bb494a11dca12…

1 0

Alexandre Julliard : gdi32: Don't free bitmap bits when changing the owner, we may still have pointers to them.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 8277ac3f7cb670c8c2bc64310f3d384089a765ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8277ac3f7cb670c8c2bc64310… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 12:49:46 2011 +0100 gdi32: Don't free bitmap bits when changing the owner, we may still have pointers to them. --- dlls/gdi32/bitmap.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8aea89c..a158735 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -574,8 +574,6 @@ static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) get_ddb_bitmapinfo( bmp, info ); SetDIBits( 0, hbitmap, 0, bmp->bitmap.bmHeight, bmp->bitmap.bmBits, info, DIB_RGB_COLORS ); - HeapFree( GetProcessHeap(), 0, bmp->bitmap.bmBits ); - bmp->bitmap.bmBits = NULL; } /***********************************************************************

1 0

Alexandre Julliard : gdi32: Retrieve the bits of a pattern brush when it' s selected into a different type of DC.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 457c9650dee21afa4bf858d9f5721e04da394590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=457c9650dee21afa4bf858d9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 11:11:14 2011 +0100 gdi32: Retrieve the bits of a pattern brush when it's selected into a different type of DC. --- dlls/gdi32/brush.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/dib.c | 2 +- dlls/gdi32/gdi_private.h | 5 ++- 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 822f907..59d0bed 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -58,6 +58,38 @@ static const struct gdi_obj_funcs brush_funcs = }; +/* fetch the contents of the brush bitmap and cache them in the brush object */ +static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) +{ + const struct gdi_dc_funcs *funcs = get_bitmap_funcs( bmp ); + struct gdi_image_bits bits; + struct bitblt_coords src; + BITMAPINFO *info; + + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) + return FALSE; + + src.visrect.left = src.x = 0; + src.visrect.top = src.y = 0; + src.visrect.right = src.width = bmp->bitmap.bmWidth; + src.visrect.bottom = src.height = bmp->bitmap.bmHeight; + if (funcs->pGetImage( NULL, brush->bitmap, info, &bits, &src )) + { + HeapFree( GetProcessHeap(), 0, info ); + return FALSE; + } + + if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) fill_default_color_table( info ); + + /* release the unneeded space */ + HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, info, + bitmap_info_size( info, DIB_RGB_COLORS )); + brush->info = info; + brush->bits = bits; + brush->usage = DIB_RGB_COLORS; + return TRUE; +} + /*********************************************************************** * CreateBrushIndirect (GDI32.@) * @@ -366,10 +398,17 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); HBITMAP bitmap = brush->bitmap; - BITMAPINFO *info = brush->info; - void *bits = brush->bits.ptr; - UINT usage = brush->usage; + BITMAPINFO *info; + void *bits; + UINT usage; + if (bitmap && !brush->info) + { + BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); + /* fetch the bitmap bits if we are selecting into a different type of DC */ + if (bmp && bmp->funcs != physdev->funcs) store_bitmap_bits( brush, bmp ); + GDI_ReleaseObj( bitmap ); + } if (brush->logbrush.lbStyle == BS_PATTERN) { PHYSDEV pattern_dev = physdev; @@ -381,6 +420,9 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, pattern_dev ); } + info = brush->info; + bits = brush->bits.ptr; + usage = brush->usage; GDI_inc_ref_count( handle ); GDI_ReleaseObj( handle ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index b9f9f3b..bc9564a 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1058,7 +1058,7 @@ static void copy_color_info(BITMAPINFO *dst, const BITMAPINFO *src, UINT colorus } } -static void fill_default_color_table( BITMAPINFO *info ) +void fill_default_color_table( BITMAPINFO *info ) { int i; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ddeb0bd..0c73a9d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -229,8 +229,6 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* bitmap.c */ -extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; -extern BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) DECLSPEC_HIDDEN; extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN; @@ -258,6 +256,9 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; +extern void fill_default_color_table( BITMAPINFO *info ) DECLSPEC_HIDDEN; +extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; +extern BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) DECLSPEC_HIDDEN; extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, const BITMAPINFO *dst_info, void *dst_bits, BOOL add_alpha ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add support for pattern brushes in the DIB driver.
by Alexandre Julliard 03 Nov '11

03 Nov '11

Module: wine Branch: master Commit: 37b56554a6b8777465d30d3175ff5683194ce604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b56554a6b8777465d30d317… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 11:24:07 2011 +0100 gdi32: Add support for pattern brushes in the DIB driver. --- dlls/gdi32/dibdrv/dc.c | 25 +++---------- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 85 ++++++++++++++++++++++++------------------- 3 files changed, 55 insertions(+), 57 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 41e996c..5a7d011 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -161,25 +161,18 @@ BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_f return TRUE; } -BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage, HPALETTE palette) +BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HPALETTE palette) { - DWORD *masks = NULL; + DWORD *masks = (bi->bmiHeader.biCompression == BI_BITFIELDS) ? (DWORD *)bi->bmiColors : NULL; RGBQUAD *color_table = NULL, pal_table[256]; - BYTE *ptr = (BYTE*)bi + bi->biSize; - int num_colors = get_dib_num_of_colors( (const BITMAPINFO *)bi ); - - if(bi->biCompression == BI_BITFIELDS) - { - masks = (DWORD *)ptr; - ptr += 3 * sizeof(DWORD); - } + int num_colors = get_dib_num_of_colors( bi ); if(num_colors) { if(usage == DIB_PAL_COLORS) { PALETTEENTRY entries[256]; - const WORD *index = (const WORD*) ptr; + const WORD *index = (const WORD *)bi->bmiColors; UINT i, count = GetPaletteEntries( palette, 0, num_colors, entries ); for (i = 0; i < num_colors; i++, index++) { @@ -190,16 +183,10 @@ BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD u pal_table[i].rgbReserved = 0; } color_table = pal_table; - ptr += num_colors * sizeof(WORD); - } - else - { - color_table = (RGBQUAD*)ptr; - ptr += num_colors * sizeof(*color_table); } + else color_table = (RGBQUAD *)bi->bmiColors; } - - return init_dib_info(dib, bi, masks, color_table, num_colors, ptr, private_color_table); + return init_dib_info(dib, &bi->bmiHeader, masks, color_table, num_colors, bits, private_color_table); } BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index b810e75..0650e08 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -195,7 +195,7 @@ extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, RGBQUAD *color_table, int color_table_size, void *bits, enum dib_info_flags flags) DECLSPEC_HIDDEN; -extern BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage, HPALETTE pal) DECLSPEC_HIDDEN; +extern BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HPALETTE pal) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 233fa8e..3418dc8 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1345,6 +1345,53 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, TRACE("(%p, %p)\n", dev, hbrush); + if (bitmap || info) /* pattern brush */ + { + dib_info orig_dib; + HPALETTE pal = (usage == DIB_PAL_COLORS) ? GetCurrentObject(dev->hdc, OBJ_PAL) : NULL; + RECT rect; + BOOL ret; + + if (!info) + { + BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); + + if (!bmp) return 0; + ret = init_dib_info_from_bitmapobj( &orig_dib, bmp, 0 ); + GDI_ReleaseObj( bitmap ); + } + else ret = init_dib_info_from_brush( &orig_dib, info, bits, usage, pal ); + + if (!ret) return 0; + + if (usage == DIB_PAL_COLORS) FIXME( "DIB_PAL_COLORS brush not handled correctly\n"); + + free_pattern_brush( pdev ); + copy_dib_color_info(&pdev->brush_dib, &pdev->dib); + + pdev->brush_dib.height = orig_dib.height; + pdev->brush_dib.width = orig_dib.width; + pdev->brush_dib.stride = get_dib_stride( pdev->brush_dib.width, pdev->brush_dib.bit_count ); + + pdev->brush_dib.bits.param = NULL; + pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, + pdev->brush_dib.height * pdev->brush_dib.stride ); + pdev->brush_dib.bits.is_copy = TRUE; + pdev->brush_dib.bits.free = free_heap_bits; + + rect.left = rect.top = 0; + rect.right = orig_dib.width; + rect.bottom = orig_dib.height; + + pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &orig_dib, &rect); + pdev->brush_rects = pattern_brush; + pdev->brush_style = BS_DIBPATTERN; + pdev->defer &= ~DEFER_BRUSH; + free_dib_info(&orig_dib); + + return next->funcs->pSelectBrush( next, hbrush, bitmap, info, bits, usage ); + } + if (!GetObjectW( hbrush, sizeof(logbrush), &logbrush )) return 0; if (hbrush == GetStockObject( DC_BRUSH )) @@ -1371,42 +1418,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, pdev->defer &= ~DEFER_BRUSH; break; - case BS_DIBPATTERN: - { - BITMAPINFOHEADER *bi = (BITMAPINFOHEADER *)logbrush.lbHatch; - dib_info orig_dib; - WORD usage = LOWORD(logbrush.lbColor); - HPALETTE pal = (usage == DIB_PAL_COLORS) ? GetCurrentObject(dev->hdc, OBJ_PAL) : NULL; - RECT rect; - - if(init_dib_info_from_packed(&orig_dib, bi, usage, pal)) - { - copy_dib_color_info(&pdev->brush_dib, &pdev->dib); - - pdev->brush_dib.height = orig_dib.height; - pdev->brush_dib.width = orig_dib.width; - pdev->brush_dib.stride = get_dib_stride( pdev->brush_dib.width, pdev->brush_dib.bit_count ); - - pdev->brush_dib.bits.param = NULL; - pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, - pdev->brush_dib.height * pdev->brush_dib.stride ); - pdev->brush_dib.bits.is_copy = TRUE; - pdev->brush_dib.bits.free = free_heap_bits; - - rect.left = rect.top = 0; - rect.right = orig_dib.width; - rect.bottom = orig_dib.height; - - pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &orig_dib, &rect); - pdev->brush_rects = pattern_brush; - pdev->defer &= ~DEFER_BRUSH; - free_dib_info(&orig_dib); - } - break; - } - case BS_HATCHED: - { if(logbrush.lbHatch > HS_DIAGCROSS) return 0; pdev->brush_hatch = logbrush.lbHatch; pdev->brush_colorref = logbrush.lbColor; @@ -1415,10 +1427,9 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, pdev->brush_rects = pattern_brush; pdev->defer &= ~DEFER_BRUSH; break; - } default: - break; + return 0; } return next->funcs->pSelectBrush( next, hbrush, bitmap, info, bits, usage );

1 0