December 2011 - Wine-commits

Francois Gouget : include: Add some D3D import and include directives.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 5cb365bac0807b2f656a199a748d945b9aa27849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb365bac0807b2f656a199a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 30 09:31:53 2011 +0100 include: Add some D3D import and include directives. --- include/d3d10.idl | 4 +++- include/d3d10_1.idl | 2 ++ include/d3d11.idl | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index 51b92bd..ac98942 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -1592,7 +1592,9 @@ interface ID3D10Multithread : IUnknown BOOL GetMultithreadProtected(); } +cpp_quote("#ifndef D3D10_IGNORE_SDK_LAYERS") +cpp_quote("/* FIXME: # include <d3d10sdklayers.h> */") +cpp_quote("#endif") cpp_quote("#include \"d3d10misc.h\"") cpp_quote("#include \"d3d10shader.h\"") cpp_quote("#include \"d3d10effect.h\"") -/* TODO: Include "d310sdklayers.h" as soon as it exists */ diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl index 5724b63..11c52b4 100644 --- a/include/d3d10_1.idl +++ b/include/d3d10_1.idl @@ -20,6 +20,8 @@ import "oaidl.idl"; import "ocidl.idl"; import "d3d10.idl"; +cpp_quote("#include <d3d10_1shader.h>") + typedef enum D3D10_FEATURE_LEVEL1 { diff --git a/include/d3d11.idl b/include/d3d11.idl index 5959010..80b929c 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -21,6 +21,16 @@ import "ocidl.idl"; import "dxgi.idl"; import "d3dcommon.idl"; +cpp_quote("#include <d3d10_1.h>") +cpp_quote("#ifndef D3D11_IGNORE_SDK_LAYERS") +cpp_quote("/* FIXME: # include <d3d11sdklayers.h> */") +cpp_quote("#endif") +cpp_quote("#include <d3d10misc.h>") +cpp_quote("#include <d3d10shader.h>") +cpp_quote("#include <d3d10effect.h>") +cpp_quote("#include <d3d10_1shader.h>") + + typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION; typedef D3D_PRIMITIVE D3D11_PRIMITIVE;

1 0

Francois Gouget : include: wincodecsdk.idl should import wtypes.idl.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 51cbb4780a4fa0fcb5566d36226ae5b62ec29c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cbb4780a4fa0fcb5566d362… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 30 09:32:06 2011 +0100 include: wincodecsdk.idl should import wtypes.idl. --- include/wincodecsdk.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index e32971c..dec9488 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "wtypes.idl"; import "wincodec.idl"; typedef enum WICPersistOptions {

1 0

Alexandre Julliard : gdi32: Define a structure to make the brush state independent from the physdev.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 4e03247427dc23af776d9a14652bf338cc27e5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e03247427dc23af776d9a146… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 10:17:37 2011 +0100 gdi32: Define a structure to make the brush state independent from the physdev. --- dlls/gdi32/dibdrv/bitblt.c | 4 +- dlls/gdi32/dibdrv/dc.c | 6 +- dlls/gdi32/dibdrv/dibdrv.h | 31 +++++--- dlls/gdi32/dibdrv/graphics.c | 6 +- dlls/gdi32/dibdrv/objects.c | 175 +++++++++++++++++++++--------------------- 5 files changed, 116 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e03247427dc23af776d9…

1 0

Alexandre Julliard : gdi32: Implement brushed pens.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 488bf107a9623c94442a96b515a2b1e853c3c7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=488bf107a9623c94442a96b51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 10:38:18 2011 +0100 gdi32: Implement brushed pens. --- dlls/gdi32/dibdrv/dc.c | 8 +- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 276 ++++++++++++++++++++----------------------- 3 files changed, 137 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=488bf107a9623c94442a9…

1 0

Alexandre Julliard : gdi32: Don' t bother computing interior regions when the brush is null.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 2c9c9f78fb02abb1dd28ddf7a0d100d4a34e00e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9c9f78fb02abb1dd28ddf7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 12:53:19 2011 +0100 gdi32: Don't bother computing interior regions when the brush is null. --- dlls/gdi32/dibdrv/graphics.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 26d3d58..d14148e 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -527,9 +527,9 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD dibdrv_physdev *pdev = get_dibdrv_pdev(dev); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyPolygon ); DWORD total, i, pos; - BOOL ret = FALSE; + BOOL ret = TRUE; POINT *points; - HRGN outline = 0, interior; + HRGN outline = 0, interior = 0; if (defer_pen( pdev )) return next->funcs->pPolyPolygon( next, pt, counts, polygons ); @@ -544,15 +544,22 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD memcpy( points, pt, total * sizeof(*pt) ); LPtoDP( dev->hdc, points, total ); - if (!(interior = CreatePolyPolygonRgn( points, counts, polygons, GetPolyFillMode( dev->hdc )))) + if (pdev->brush.style != BS_NULL && + !(interior = CreatePolyPolygonRgn( points, counts, polygons, GetPolyFillMode( dev->hdc )))) { HeapFree( GetProcessHeap(), 0, points ); return FALSE; } + if (pdev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 ); + /* if not using a region, paint the interior first so the outline can overlap it */ - if (!pdev->pen_uses_region || !(outline = CreateRectRgn( 0, 0, 0, 0 ))) + if (interior && !outline) + { ret = brush_region( pdev, interior ); + DeleteObject( interior ); + interior = 0; + } for (i = pos = 0; i < polygons; i++) { @@ -561,14 +568,17 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD pos += counts[i]; } - if (outline) + if (interior) { CombineRgn( interior, interior, outline, RGN_DIFF ); - ret = pen_region( pdev, outline ) && brush_region( pdev, interior ); + ret = brush_region( pdev, interior ); + DeleteObject( interior ); + } + if (outline) + { + if (ret) ret = pen_region( pdev, outline ); DeleteObject( outline ); } - - DeleteObject( interior ); HeapFree( GetProcessHeap(), 0, points ); return ret; } @@ -687,12 +697,16 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) if (outline) { - HRGN interior = CreateRectRgnIndirect( &rect ); + if (pdev->brush.style != BS_NULL) + { + HRGN interior = CreateRectRgnIndirect( &rect ); - CombineRgn( interior, interior, outline, RGN_DIFF ); - ret = pen_region( pdev, outline ) && brush_region( pdev, interior ); + CombineRgn( interior, interior, outline, RGN_DIFF ); + brush_region( pdev, interior ); + DeleteObject( interior ); + } + ret = pen_region( pdev, outline ); DeleteObject( outline ); - DeleteObject( interior ); } else {

1 0

Alexandre Julliard : user32/tests: Remove a crashing test.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: f6ccb2c498f79099d1291d3c706944f846c7e530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ccb2c498f79099d1291d3c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 10:17:00 2011 +0100 user32/tests: Remove a crashing test. --- dlls/user32/tests/msg.c | 27 --------------------------- 1 files changed, 0 insertions(+), 27 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bde0023..1a02e02 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8134,12 +8134,6 @@ static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime) { } -static VOID CALLBACK tfunc_crash(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime) -{ - /* Crash on purpose */ - *(volatile int *)0 = 2; -} - #define TIMER_ID 0x19 static DWORD WINAPI timer_thread_proc(LPVOID x) @@ -8161,7 +8155,6 @@ static void test_timers(void) { struct timer_info info; DWORD id; - MSG msg; info.hWnd = CreateWindow ("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW , @@ -8184,26 +8177,6 @@ static void test_timers(void) ok( KillTimer(info.hWnd, TIMER_ID), "KillTimer failed\n"); ok(DestroyWindow(info.hWnd), "failed to destroy window\n"); - - /* Test timer callback with crash */ - SetLastError(0xdeadbeef); - info.hWnd = CreateWindowW(testWindowClassW, NULL, - WS_OVERLAPPEDWINDOW , - CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, - NULL, NULL, 0); - if ((!info.hWnd && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) || /* Win9x/Me */ - (!pGetMenuInfo)) /* Win95/NT4 */ - { - win_skip("Test would crash on Win9x/WinMe/NT4\n"); - DestroyWindow(info.hWnd); - return; - } - info.id = SetTimer(info.hWnd, TIMER_ID, 0, tfunc_crash); - ok(info.id, "SetTimer failed\n"); - Sleep(150); - while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); - - ok(DestroyWindow(info.hWnd), "failed to destroy window\n"); } static int count = 0;

1 0

Alexandre Julliard : gdi32/tests: Get rid of Win9x compatibility in the pen tests.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 5a67227078f6694c591526a6b3405f97e22b6d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a67227078f6694c591526a6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 12:41:35 2011 +0100 gdi32/tests: Get rid of Win9x compatibility in the pen tests. --- dlls/gdi32/tests/pen.c | 50 ++++++++++------------------------------------- 1 files changed, 11 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 3a198a1..9b62669 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -98,19 +98,9 @@ static void test_logpen(void) size = GetObject(hpen, sizeof(lp), &lp); ok(size == sizeof(lp), "GetObject returned %d, error %d\n", size, GetLastError()); - if (pen[i].style == PS_USERSTYLE || pen[i].style == PS_ALTERNATE) - { - if (lp.lopnStyle == pen[i].style) - { - win_skip("Skipping PS_USERSTYLE and PS_ALTERNATE tests on Win9x\n"); - continue; - } - } ok(lp.lopnStyle == pen[i].ret_style, "expected %u, got %u\n", pen[i].ret_style, lp.lopnStyle); ok(lp.lopnWidth.x == pen[i].ret_width, "expected %u, got %d\n", pen[i].ret_width, lp.lopnWidth.x); - ok(lp.lopnWidth.y == 0 || - broken(lp.lopnWidth.y == 0xb), /* Win9x */ - "expected 0, got %d\n", lp.lopnWidth.y); + ok(lp.lopnWidth.y == 0, "expected 0, got %d\n", lp.lopnWidth.y); ok(lp.lopnColor == pen[i].ret_color, "expected %08x, got %08x\n", pen[i].ret_color, lp.lopnColor); DeleteObject(hpen); @@ -131,9 +121,7 @@ static void test_logpen(void) memset(&lp, 0xb0, sizeof(lp)); SetLastError(0xdeadbeef); size = GetObject(hpen, sizeof(lp.lopnStyle), &lp); - ok(!size || - broken(size == sizeof(lp.lopnStyle)), /* Win9x */ - "GetObject should fail: size %d, error %d\n", size, GetLastError()); + ok(!size, "GetObject should fail: size %d, error %d\n", size, GetLastError()); /* see how larger buffer sizes are handled */ memset(&lp, 0xb0, sizeof(lp)); @@ -251,17 +239,12 @@ static void test_logpen(void) break; case PS_USERSTYLE: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) + sizeof(user_style) || - broken(size == 0 && GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); break; default: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) || - broken(size == sizeof(LOGPEN)) || /* Win9x */ - broken(pen[i].style == PS_ALTERNATE && - size == 0 && - GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); break; } @@ -270,9 +253,7 @@ static void test_logpen(void) memset(&elp, 0xb0, sizeof(elp)); SetLastError(0xdeadbeef); size = GetObject(hpen, sizeof(elp.elpPenStyle), &elp); - ok(!size || - broken(size == sizeof(elp.elpPenStyle)), /* Win9x */ - "GetObject should fail: size %d, error %d\n", size, GetLastError()); + ok(!size, "GetObject should fail: size %d, error %d\n", size, GetLastError()); /* see how larger buffer sizes are handled */ memset(elp_buffer, 0xb0, sizeof(elp_buffer)); @@ -301,7 +282,7 @@ static void test_logpen(void) break; case PS_USERSTYLE: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) + sizeof(user_style), + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 2, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -310,11 +291,7 @@ static void test_logpen(void) break; default: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) || - broken(size == sizeof(LOGPEN)) || /* Win9x */ - broken(pen[i].style == PS_ALTERNATE && - size == 0 && - GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 0, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -372,12 +349,12 @@ test_geometric_pens: break; case PS_USERSTYLE: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) + sizeof(user_style), + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); break; default: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry), + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); break; } @@ -432,7 +409,7 @@ test_geometric_pens: ok(!size /*&& GetLastError() == ERROR_INVALID_PARAMETER*/, "GetObject should fail: size %d, error %d\n", size, GetLastError()); size = GetObject(hpen, sizeof(elp_buffer), elp_buffer); - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) + sizeof(user_style), + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 2, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -441,7 +418,7 @@ test_geometric_pens: break; default: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry), + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 0, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -547,11 +524,6 @@ static void test_ps_userstyle(void) pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 3, NULL); ok(pen == 0, "ExtCreatePen should fail\n"); - if (pen == 0 && GetLastError() == 0xdeadbeef) - { - win_skip("Looks like 9x, skipping PS_USERSTYLE tests\n"); - return; - } expect(ERROR_INVALID_PARAMETER, GetLastError()); DeleteObject(pen); SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : gdi32: Add a structure to store all the extra information needed for a pattern brush .
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 8bf48557ef7ed0191e1bbd4a495a6fefc2457d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf48557ef7ed0191e1bbd4a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 16:17:44 2011 +0100 gdi32: Add a structure to store all the extra information needed for a pattern brush. --- dlls/gdi32/brush.c | 142 ++++++++++++++++++++++++---------------------- dlls/gdi32/gdi_private.h | 10 +++ 2 files changed, 85 insertions(+), 67 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 384ef12..5dc7dfe 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -36,10 +36,7 @@ typedef struct { 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 */ + struct brush_pattern pattern; } BRUSHOBJ; #define NB_HATCH_STYLES 6 @@ -58,8 +55,8 @@ 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 ) +/* fetch the contents of the brush bitmap and cache them in the brush pattern */ +static BOOL store_bitmap_bits( struct brush_pattern *brush, BITMAPOBJ *bmp ) { const struct gdi_dc_funcs *funcs = get_bitmap_funcs( bmp ); struct gdi_image_bits bits; @@ -88,7 +85,7 @@ static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) return TRUE; } -static BOOL copy_bitmap( BRUSHOBJ *brush, HBITMAP bitmap ) +static BOOL copy_bitmap( struct brush_pattern *brush, HBITMAP bitmap ) { BITMAPINFO *info; BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); @@ -140,6 +137,58 @@ done: return brush->info != NULL; } +BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) +{ + HGLOBAL hmem = 0; + + pattern->bitmap = 0; + pattern->info = NULL; + pattern->bits.free = NULL; + + switch (brush->lbStyle) + { + case BS_SOLID: + case BS_HOLLOW: + case BS_HATCHED: + return TRUE; + + case BS_PATTERN8X8: + brush->lbStyle = BS_PATTERN; + /* fall through */ + case BS_PATTERN: + brush->lbColor = 0; + return copy_bitmap( pattern, (HBITMAP)brush->lbHatch ); + + case BS_DIBPATTERN: + hmem = (HGLOBAL)brush->lbHatch; + if (!(brush->lbHatch = (ULONG_PTR)GlobalLock( hmem ))) return FALSE; + /* fall through */ + case BS_DIBPATTERNPT: + pattern->usage = brush->lbColor; + pattern->info = copy_packed_dib( (BITMAPINFO *)brush->lbHatch, pattern->usage ); + if (hmem) GlobalUnlock( hmem ); + if (!pattern->info) return FALSE; + pattern->bits.ptr = (char *)pattern->info + get_dib_info_size( pattern->info, pattern->usage ); + brush->lbStyle = BS_DIBPATTERN; + brush->lbColor = 0; + return TRUE; + + case BS_DIBPATTERN8X8: + case BS_MONOPATTERN: + case BS_INDEXED: + default: + WARN( "invalid brush style %u\n", brush->lbStyle ); + return FALSE; + } +} + +void free_brush_pattern( struct brush_pattern *pattern ) +{ + if (pattern->bits.free) pattern->bits.free( &pattern->bits ); + if (pattern->bitmap) DeleteObject( pattern->bitmap ); + HeapFree( GetProcessHeap(), 0, pattern->info ); +} + BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) { BRUSHOBJ *brush; @@ -147,23 +196,23 @@ BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT * if (!(brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) return FALSE; - if (!brush->info) + if (!brush->pattern.info) { - BITMAPOBJ *bmp = GDI_GetObjPtr( brush->bitmap, OBJ_BITMAP ); + BITMAPOBJ *bmp = GDI_GetObjPtr( brush->pattern.bitmap, OBJ_BITMAP ); if (bmp) { - store_bitmap_bits( brush, bmp ); - GDI_ReleaseObj( brush->bitmap ); + store_bitmap_bits( &brush->pattern, bmp ); + GDI_ReleaseObj( brush->pattern.bitmap ); } } - if (brush->info) + if (brush->pattern.info) { - memcpy( info, brush->info, get_dib_info_size( brush->info, brush->usage )); + memcpy( info, brush->pattern.info, get_dib_info_size( brush->pattern.info, brush->pattern.usage )); if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) fill_default_color_table( info ); - *bits = brush->bits.ptr; - *usage = brush->usage; + *bits = brush->pattern.bits.ptr; + *usage = brush->pattern.usage; ret = TRUE; } GDI_ReleaseObj( handle ); @@ -194,58 +243,19 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) { BRUSHOBJ * ptr; HBRUSH hbrush; - HGLOBAL hmem = 0; - if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) return 0; + if (!(ptr = HeapAlloc( GetProcessHeap(), 0, sizeof(*ptr) ))) return 0; ptr->logbrush = *brush; - switch (ptr->logbrush.lbStyle) - { - case BS_SOLID: - case BS_HOLLOW: - case BS_HATCHED: - break; - - case BS_PATTERN8X8: - ptr->logbrush.lbStyle = BS_PATTERN; - /* fall through */ - case BS_PATTERN: - if (!copy_bitmap( ptr, (HBITMAP)ptr->logbrush.lbHatch )) goto error; - ptr->logbrush.lbColor = 0; - 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 + get_dib_info_size( ptr->info, ptr->usage ); - ptr->logbrush.lbStyle = BS_DIBPATTERN; - ptr->logbrush.lbColor = 0; - break; - - case BS_DIBPATTERN8X8: - case BS_MONOPATTERN: - case BS_INDEXED: - default: - WARN( "invalid brush style %u\n", ptr->logbrush.lbStyle ); - goto error; - } - - if ((hbrush = alloc_gdi_handle( &ptr->header, OBJ_BRUSH, &brush_funcs ))) + if (store_brush_pattern( &ptr->logbrush, &ptr->pattern ) && + (hbrush = alloc_gdi_handle( &ptr->header, OBJ_BRUSH, &brush_funcs ))) { TRACE("%p\n", hbrush); return hbrush; } - error: - if (ptr->bitmap) DeleteObject( ptr->bitmap ); - HeapFree( GetProcessHeap(), 0, ptr->info ); + free_brush_pattern( &ptr->pattern ); HeapFree( GetProcessHeap(), 0, ptr ); return 0; } @@ -476,22 +486,22 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) if ((brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); - HBITMAP bitmap = brush->bitmap; + HBITMAP bitmap = brush->pattern.bitmap; BITMAPINFO *info; void *bits; UINT usage; - if (bitmap && !brush->info) + if (bitmap && !brush->pattern.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 ); + if (bmp && bmp->funcs != physdev->funcs) store_bitmap_bits( &brush->pattern, bmp ); GDI_ReleaseObj( bitmap ); } - info = brush->info; - bits = brush->bits.ptr; - usage = brush->usage; + info = brush->pattern.info; + bits = brush->pattern.bits.ptr; + usage = brush->pattern.usage; GDI_inc_ref_count( handle ); GDI_ReleaseObj( handle ); @@ -519,9 +529,7 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ) BRUSHOBJ *brush = free_gdi_handle( handle ); if (!brush) return FALSE; - if (brush->bits.free) brush->bits.free( &brush->bits ); - if (brush->bitmap) DeleteObject( brush->bitmap ); - HeapFree( GetProcessHeap(), 0, brush->info ); + free_brush_pattern( &brush->pattern ); return HeapFree( GetProcessHeap(), 0, brush ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c9822fe..daf3447 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -182,6 +182,14 @@ typedef struct tagBITMAPOBJ RGBQUAD *color_table; /* DIB color table if <= 8bpp (always 1 << bpp in size) */ } BITMAPOBJ; +struct brush_pattern +{ + HBITMAP bitmap; /* bitmap handle for DDB patterns */ + BITMAPINFO *info; /* DIB info */ + struct gdi_image_bits bits; /* DIB bits */ + UINT usage; /* color usage for DIB info */ +}; + /* bidi.c */ /* Wine_GCPW Flags */ @@ -208,6 +216,8 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* brush.c */ +extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; +extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; /* clipping.c */

1 0

Alexandre Julliard : gdi32: Add sanity checks for brush hatch styles.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: ee89ce29821834ade66d14e89428aade8d06076f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee89ce29821834ade66d14e89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 11:02:57 2011 +0100 gdi32: Add sanity checks for brush hatch styles. --- dlls/gdi32/brush.c | 8 ++++++++ dlls/gdi32/tests/brush.c | 37 +++++++++++++++++++++++++++++++++++++ include/wingdi.h | 1 + 3 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 5dc7dfe..eda80a3 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -149,7 +149,15 @@ BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) { case BS_SOLID: case BS_HOLLOW: + return TRUE; + case BS_HATCHED: + if (brush->lbHatch > HS_DIAGCROSS) + { + if (brush->lbHatch >= HS_API_MAX) return FALSE; + brush->lbStyle = BS_SOLID; + brush->lbHatch = 0; + } return TRUE; case BS_PATTERN8X8: diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index b11d21c..76e158d 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -79,6 +79,42 @@ static void test_solidbrush(void) } } +static void test_hatch_brush(void) +{ + int i, size; + HBRUSH brush; + LOGBRUSH lb; + + for (i = 0; i < 20; i++) + { + SetLastError( 0xdeadbeef ); + brush = CreateHatchBrush( i, RGB(12,34,56) ); + if (i < HS_API_MAX) + { + ok( brush != 0, "%u: CreateHatchBrush failed err %u\n", i, GetLastError() ); + size = GetObject( brush, sizeof(lb), &lb ); + ok( size == sizeof(lb), "wrong size %u\n", size ); + ok( lb.lbColor == RGB(12,34,56), "wrong color %08x\n", lb.lbColor ); + if (i <= HS_DIAGCROSS) + { + ok( lb.lbStyle == BS_HATCHED, "wrong style %u\n", lb.lbStyle ); + ok( lb.lbHatch == i, "wrong hatch %lu/%u\n", lb.lbHatch, i ); + } + else + { + ok( lb.lbStyle == BS_SOLID, "wrong style %u\n", lb.lbStyle ); + ok( lb.lbHatch == 0, "wrong hatch %lu\n", lb.lbHatch ); + } + DeleteObject( brush ); + } + else + { + ok( !brush, "%u: CreateHatchBrush succeeded\n", i ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + } + } +} + static void test_pattern_brush(void) { char buffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD) + 32 * 32 / 8]; @@ -310,6 +346,7 @@ static void test_palette_brush(void) START_TEST(brush) { test_solidbrush(); + test_hatch_brush(); test_pattern_brush(); test_palette_brush(); } diff --git a/include/wingdi.h b/include/wingdi.h index ab91409..2f9fa08 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -526,6 +526,7 @@ typedef LOGBRUSH PATTERN, *PPATTERN, *LPPATTERN; #define HS_BDIAGONAL 3 #define HS_CROSS 4 #define HS_DIAGCROSS 5 +#define HS_API_MAX 12 /* Fonts */

1 0

Alexandre Julliard : gdi32: Store the pattern brush information for geometric pens.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: a1fdd5856f62bb5c9b3efe9d5ca287c0c0858bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1fdd5856f62bb5c9b3efe9d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 16:18:07 2011 +0100 gdi32: Store the pattern brush information for geometric pens. --- dlls/gdi32/pen.c | 72 +++++++++++----------------- dlls/gdi32/tests/pen.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1fdd5856f62bb5c9b3ef…

1 0