January 2011 - Wine-Commits

Nikolay Sivov : oleaut32/tests: Fix safearray leaks, test return value after array destruction.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: a5582d77cf4831aa7a9bc12262fd074886b7378f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5582d77cf4831aa7a9bc1226… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 23 01:24:06 2011 +0300 oleaut32/tests: Fix safearray leaks, test return value after array destruction. --- dlls/oleaut32/tests/safearray.c | 87 +++++++++++++++++++++++++++----------- dlls/oleaut32/tests/tmarshal.c | 1 + dlls/oleaut32/tests/usrmarshal.c | 32 ++++++++++---- 3 files changed, 86 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5582d77cf4831aa7a9bc…

1 0

Eric Pouech : kernel32: Added missing include to term.c.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 33389354a51865028a1bcddf90d7f27cff3d2775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33389354a51865028a1bcddf9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 22 09:23:43 2011 +0100 kernel32: Added missing include to term.c. --- dlls/kernel32/term.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index a7e18ec..850b792 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -21,6 +21,7 @@ #include "config.h" #include "wine/port.h" +#include <stdarg.h> #ifdef HAVE_NCURSES_H # include <ncurses.h> #elif defined(HAVE_CURSES_H)

1 0

Jacek Caban : urlmon: Fixed key name size and format in open_zone_key.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: c117f218765902019a2d29273a4bd5472c2bc6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c117f218765902019a2d29273… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 22 01:52:47 2011 +0100 urlmon: Fixed key name size and format in open_zone_key. --- dlls/urlmon/sec_mgr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 87b8fda..e3be8fe 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -221,9 +221,9 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) static HRESULT open_zone_key(HKEY parent_key, DWORD zone, HKEY *hkey) { - static const WCHAR wszFormat[] = {'%','s','%','l','d',0}; + static const WCHAR wszFormat[] = {'%','s','%','u',0}; - WCHAR key_name[sizeof(wszZonesKey)/sizeof(WCHAR)+8]; + WCHAR key_name[sizeof(wszZonesKey)/sizeof(WCHAR)+12]; DWORD res; wsprintfW(key_name, wszFormat, wszZonesKey, zone);

1 0

Vincent Povirk : gdiplus: Add a software implementation of line gradient brushes.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 0c17a0b5bbfc2af4d29e35caee1877a8f3d19086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c17a0b5bbfc2af4d29e35cae… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 21 15:48:45 2011 -0600 gdiplus: Add a software implementation of line gradient brushes. --- dlls/gdiplus/graphics.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 284847e..de1e28f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -256,6 +256,15 @@ static ARGB blend_colors(ARGB start, ARGB end, REAL position) { ARGB result=0; ARGB i; + INT a1, a2, a3; + + a1 = (start >> 24) & 0xff; + a2 = (end >> 24) & 0xff; + + a3 = (int)(a1*(1.0f - position)+a2*(position)); + + result |= a3 << 24; + for (i=0xff; i<=0xff0000; i = i << 8) result |= (int)((start&i)*(1.0f - position)+(end&i)*(position))&i; return result; @@ -493,6 +502,7 @@ static INT brush_can_fill_pixels(GpBrush *brush) { case BrushTypeSolidColor: case BrushTypeHatchFill: + case BrushTypeLinearGradient: return 1; default: return 0; @@ -539,6 +549,66 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, return Ok; } + case BrushTypeLinearGradient: + { + GpLineGradient *fill = (GpLineGradient*)brush; + GpPointF draw_points[3], line_points[3]; + GpStatus stat; + static const GpRectF box_1 = { 0.0, 0.0, 1.0, 1.0 }; + GpMatrix *world_to_gradient; /* FIXME: Store this in the brush? */ + int x, y; + + draw_points[0].X = fill_area->X; + draw_points[0].Y = fill_area->Y; + draw_points[1].X = fill_area->X+1; + draw_points[1].Y = fill_area->Y; + draw_points[2].X = fill_area->X; + draw_points[2].Y = fill_area->Y+1; + + /* Transform the points to a co-ordinate space where X is the point's + * position in the gradient, 0.0 being the start point and 1.0 the + * end point. */ + stat = GdipTransformPoints(graphics, CoordinateSpaceWorld, + CoordinateSpaceDevice, draw_points, 3); + + if (stat == Ok) + { + line_points[0] = fill->startpoint; + line_points[1] = fill->endpoint; + line_points[2].X = fill->startpoint.X + (fill->startpoint.Y - fill->endpoint.Y); + line_points[2].Y = fill->startpoint.Y + (fill->endpoint.X - fill->startpoint.X); + + stat = GdipCreateMatrix3(&box_1, line_points, &world_to_gradient); + } + + if (stat == Ok) + { + stat = GdipInvertMatrix(world_to_gradient); + + if (stat == Ok) + stat = GdipTransformMatrixPoints(world_to_gradient, draw_points, 3); + + GdipDeleteMatrix(world_to_gradient); + } + + if (stat == Ok) + { + REAL x_delta = draw_points[1].X - draw_points[0].X; + REAL y_delta = draw_points[2].X - draw_points[0].X; + + for (y=0; y<fill_area->Height; y++) + { + for (x=0; x<fill_area->Width; x++) + { + REAL pos = draw_points[0].X + x * x_delta + y * y_delta; + + argb_pixels[x + y*cdwStride] = blend_line_gradient(fill, pos); + } + } + } + + return stat; + } default: return NotImplemented; }

1 0

Nikolay Sivov : shell32/tests: Fix couple PIDL leaks in tests.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 7ee7f0843bd1760bdc3df9312ccf26efa49b4cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee7f0843bd1760bdc3df9312… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 22 03:43:59 2011 +0300 shell32/tests: Fix couple PIDL leaks in tests. --- dlls/shell32/tests/shlfolder.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f2a1424..ea675b9 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2784,9 +2784,10 @@ static void test_ShellItemCompare(void) hr = IShellFolder_BindToObject(psf_desktop, pidl_cwd, NULL, &IID_IShellFolder, (void**)&psf_current); ok(SUCCEEDED(hr), "BindToObject returned %x\n", hr); IShellFolder_Release(psf_desktop); + ILFree(pidl_cwd); /* Generate ShellItems for the files */ - ZeroMemory(&psi, sizeof(IShellItem*)*9); + memset(&psi, 0, sizeof(psi)); failed = FALSE; for(i = 0; i < 9; i++) { @@ -4443,6 +4444,7 @@ static void test_SHChangeNotify(void) SHChangeNotifyDeregister(notifyID); DestroyWindow(wnd); + ILFree((LPITEMIDLIST)entries[0].pidl); br = RemoveDirectoryA(root_dirA); ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); }

1 0

Nikolay Sivov : oleaut32: Unmarshalled safearray is always unlocked.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 95416ff9042401bfd2ab97e0edb48fe058db77ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=95416ff9042401bfd2ab97e0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 23 01:33:50 2011 +0300 oleaut32: Unmarshalled safearray is always unlocked. --- dlls/oleaut32/tests/usrmarshal.c | 4 ++-- dlls/oleaut32/usrmarshal.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 2d71ad2..8504d1a 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -269,7 +269,7 @@ static void test_marshal_LPSAFEARRAY(void) SafeArrayGetVartype(lpsa, &vt); SafeArrayGetVartype(lpsa2, &vt2); ok(vt == vt2, "vts differ %x %x\n", vt, vt2); - todo_wine ok(lpsa2->cLocks == 0, "got lock count %u, expected 0\n", lpsa2->cLocks); + ok(lpsa2->cLocks == 0, "got lock count %u, expected 0\n", lpsa2->cLocks); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); } @@ -316,7 +316,7 @@ static void test_marshal_LPSAFEARRAY(void) SafeArrayGetVartype(lpsa, &vt); SafeArrayGetVartype(lpsa2, &vt2); ok(vt == vt2, "vts differ %x %x\n", vt, vt2); - todo_wine ok(lpsa2->cLocks == 0, "got lock count %u, expected 0\n", lpsa2->cLocks); + ok(lpsa2->cLocks == 0, "got lock count %u, expected 0\n", lpsa2->cLocks); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); } diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 4884c66..002c2b7 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1085,7 +1085,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B (*ppsa)->fFeatures |= (wiresa->fFeatures & ~(FADF_AUTOSETFLAGS)); /* FIXME: there should be a limit on how large wiresa->cbElements can be */ (*ppsa)->cbElements = elem_mem_size(wiresa, sftype); - (*ppsa)->cLocks = LOWORD(wiresa->cLocks); + (*ppsa)->cLocks = 0; /* SafeArrayCreateEx allocates the data for us, but * SafeArrayAllocDescriptor doesn't */

1 0

Vincent Povirk : gdiplus: Factor the matrix creation code out of GdipTransformPoints.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 6acffba564193a73e65b013de3499883c26d8d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6acffba564193a73e65b013de… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 21 12:59:33 2011 -0600 gdiplus: Factor the matrix creation code out of GdipTransformPoints. --- dlls/gdiplus/graphics.c | 57 ++++++++++++++++++++++++++++------------------ 1 files changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a17cbef..c196ab8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -147,6 +147,9 @@ static void restore_dc(GpGraphics *graphics, INT state) RestoreDC(graphics->hdc, state); } +static GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, + GpCoordinateSpace src_space, GpMatrix **matrix); + /* This helper applies all the changes that the points listed in ptf need in * order to be drawn on the device context. In the end, this should include at * least: @@ -4909,25 +4912,13 @@ GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) return Ok; } -GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace dst_space, - GpCoordinateSpace src_space, GpPointF *points, INT count) +static GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, + GpCoordinateSpace src_space, GpMatrix **matrix) { - GpMatrix *matrix; - GpStatus stat; + GpStatus stat = GdipCreateMatrix(matrix); REAL unitscale; - if(!graphics || !points || count <= 0) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - TRACE("(%p, %d, %d, %p, %d)\n", graphics, dst_space, src_space, points, count); - - if (src_space == dst_space) return Ok; - - stat = GdipCreateMatrix(&matrix); - if (stat == Ok) + if (dst_space != src_space && stat == Ok) { unitscale = convert_unit(graphics_res(graphics), graphics->unit); @@ -4938,12 +4929,12 @@ GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace switch (src_space) { case CoordinateSpaceWorld: - GdipMultiplyMatrix(matrix, graphics->worldtrans, MatrixOrderAppend); + GdipMultiplyMatrix(*matrix, graphics->worldtrans, MatrixOrderAppend); break; case CoordinateSpacePage: break; case CoordinateSpaceDevice: - GdipScaleMatrix(matrix, 1.0/unitscale, 1.0/unitscale, MatrixOrderAppend); + GdipScaleMatrix(*matrix, 1.0/unitscale, 1.0/unitscale, MatrixOrderAppend); break; } @@ -4958,7 +4949,7 @@ GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace { stat = GdipInvertMatrix(inverted_transform); if (stat == Ok) - GdipMultiplyMatrix(matrix, inverted_transform, MatrixOrderAppend); + GdipMultiplyMatrix(*matrix, inverted_transform, MatrixOrderAppend); GdipDeleteMatrix(inverted_transform); } break; @@ -4966,12 +4957,34 @@ GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace case CoordinateSpacePage: break; case CoordinateSpaceDevice: - GdipScaleMatrix(matrix, unitscale, unitscale, MatrixOrderAppend); + GdipScaleMatrix(*matrix, unitscale, unitscale, MatrixOrderAppend); break; } + } + return stat; +} - if (stat == Ok) - stat = GdipTransformMatrixPoints(matrix, points, count); +GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace dst_space, + GpCoordinateSpace src_space, GpPointF *points, INT count) +{ + GpMatrix *matrix; + GpStatus stat; + + if(!graphics || !points || count <= 0) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + TRACE("(%p, %d, %d, %p, %d)\n", graphics, dst_space, src_space, points, count); + + if (src_space == dst_space) return Ok; + + stat = get_graphics_transform(graphics, dst_space, src_space, &matrix); + + if (stat == Ok) + { + stat = GdipTransformMatrixPoints(matrix, points, count); GdipDeleteMatrix(matrix); }

1 0

Vincent Povirk : gdiplus: Add a software implementation of hatch brushes.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: b7e664bc5c18d36aa8decbc97e6cecdfdabc4d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e664bc5c18d36aa8decbc97… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 21 13:44:04 2011 -0600 gdiplus: Add a software implementation of hatch brushes. --- dlls/gdiplus/brush.c | 11 +++++++++++ dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 27 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 61ec6a3..480d0a3 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -219,6 +219,17 @@ static const char HatchBrushes[][8] = { { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff }, /* HatchStyleDarkHorizontal */ }; +GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) +{ + if (hatchstyle < sizeof(HatchBrushes) / sizeof(HatchBrushes[0])) + { + *result = HatchBrushes[hatchstyle]; + return Ok; + } + else + return NotImplemented; +} + /****************************************************************************** * GdipCreateHatchBrush [GDIPLUS.@] */ diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index b78e459..7665714 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -65,6 +65,8 @@ extern GpStatus trace_path(GpGraphics *graphics, GpPath *path); typedef struct region_element region_element; extern void delete_element(region_element *element); +extern GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result); + static inline INT roundr(REAL x) { return (INT) floorf(x + 0.5); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7759685..284847e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -492,6 +492,7 @@ static INT brush_can_fill_pixels(GpBrush *brush) switch (brush->bt) { case BrushTypeSolidColor: + case BrushTypeHatchFill: return 1; default: return 0; @@ -512,6 +513,32 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, argb_pixels[x + y*cdwStride] = fill->color; return Ok; } + case BrushTypeHatchFill: + { + int x, y; + GpHatch *fill = (GpHatch*)brush; + const char *hatch_data; + + if (get_hatch_data(fill->hatchstyle, &hatch_data) != Ok) + return NotImplemented; + + for (x=0; x<fill_area->Width; x++) + for (y=0; y<fill_area->Height; y++) + { + int hx, hy; + + /* FIXME: Account for the rendering origin */ + hx = (x + fill_area->X) % 8; + hy = (y + fill_area->Y) % 8; + + if ((hatch_data[7-hy] & (0x80 >> hx)) != 0) + argb_pixels[x + y*cdwStride] = fill->forecol; + else + argb_pixels[x + y*cdwStride] = fill->backcol; + } + + return Ok; + } default: return NotImplemented; }

1 0

Vincent Povirk : gdiplus: Factor out the gdi32 code of GdipFillRegion.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: b689e63a86bf3986c3d0d06ad17dee3e9111dcf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b689e63a86bf3986c3d0d06ad… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 21 11:33:52 2011 -0600 gdiplus: Factor out the gdi32 code of GdipFillRegion. --- dlls/gdiplus/graphics.c | 47 ++++++++++++++++++++++++++++++----------------- 1 files changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e85a8ba..a17cbef 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3282,30 +3282,16 @@ GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics *graphics, GpBrush *brush, GD return ret; } -/***************************************************************************** - * GdipFillRegion [GDIPLUS.@] - */ -GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, - GpRegion* region) +static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush, + GpRegion* region) { INT save_state; GpStatus status; HRGN hrgn; RECT rc; - TRACE("(%p, %p, %p)\n", graphics, brush, region); - - if (!(graphics && brush && region)) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } + return NotImplemented; status = GdipGetRegionHRgn(region, graphics, &hrgn); if(status != Ok) @@ -3332,6 +3318,33 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, return Ok; } +/***************************************************************************** + * GdipFillRegion [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, + GpRegion* region) +{ + GpStatus stat; + + TRACE("(%p, %p, %p)\n", graphics, brush, region); + + if (!(graphics && brush && region)) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + stat = GDI32_GdipFillRegion(graphics, brush, region); + + if (stat == NotImplemented) + { + FIXME("partially implemented\n"); + stat = Ok; + } + + return stat; +} + GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) { TRACE("(%p,%u)\n", graphics, intention);

1 0

Vincent Povirk : gdiplus: Add a software implementation of GdipFillRegion.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 60cd4773423dffcd1afa381e584386c919f8d603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60cd4773423dffcd1afa381e5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 21 13:00:34 2011 -0600 gdiplus: Add a software implementation of GdipFillRegion. --- dlls/gdiplus/graphics.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c196ab8..7759685 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -487,6 +487,36 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) } } +static INT brush_can_fill_pixels(GpBrush *brush) +{ + switch (brush->bt) + { + case BrushTypeSolidColor: + return 1; + default: + return 0; + } +} + +static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, + DWORD *argb_pixels, GpRect *fill_area, UINT cdwStride) +{ + switch (brush->bt) + { + case BrushTypeSolidColor: + { + int x, y; + GpSolidFill *fill = (GpSolidFill*)brush; + for (x=0; x<fill_area->Width; x++) + for (y=0; y<fill_area->Height; y++) + argb_pixels[x + y*cdwStride] = fill->color; + return Ok; + } + default: + return NotImplemented; + } +} + /* GdipDrawPie/GdipFillPie helper function */ static void draw_pie(GpGraphics *graphics, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) @@ -3321,13 +3351,122 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush, return Ok; } +static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, + GpRegion* region) +{ + GpStatus stat; + GpRegion *temp_region; + GpMatrix *world_to_device, *identity; + GpRectF graphics_bounds; + UINT scans_count, i; + INT dummy; + GpRect *scans; + DWORD *pixel_data; + + if (!brush_can_fill_pixels(brush)) + return NotImplemented; + + stat = get_graphics_bounds(graphics, &graphics_bounds); + + if (stat == Ok) + stat = GdipCloneRegion(region, &temp_region); + + if (stat == Ok) + { + stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + CoordinateSpaceWorld, &world_to_device); + + if (stat == Ok) + { + stat = GdipTransformRegion(temp_region, world_to_device); + + GdipDeleteMatrix(world_to_device); + } + + if (stat == Ok) + stat = GdipCombineRegionRect(temp_region, &graphics_bounds, CombineModeIntersect); + + if (stat == Ok) + stat = GdipCreateMatrix(&identity); + + if (stat == Ok) + { + stat = GdipGetRegionScansCount(temp_region, &scans_count, identity); + + if (stat == Ok && scans_count != 0) + { + scans = GdipAlloc(sizeof(*scans) * scans_count); + if (!scans) + stat = OutOfMemory; + + if (stat == Ok) + { + stat = GdipGetRegionScansI(temp_region, scans, &dummy, identity); + + if (stat != Ok) + GdipFree(scans); + } + } + + GdipDeleteMatrix(identity); + } + + GdipDeleteRegion(temp_region); + } + + if (stat == Ok && scans_count == 0) + return Ok; + + if (stat == Ok) + { + UINT max_size=0; + + for (i=0; i<scans_count; i++) + { + UINT size = scans[i].Width * scans[i].Height; + + if (size > max_size) + max_size = size; + } + + pixel_data = GdipAlloc(sizeof(*pixel_data) * max_size); + if (!pixel_data) + stat = OutOfMemory; + + if (stat == Ok) + { + for (i=0; i<scans_count; i++) + { + stat = brush_fill_pixels(graphics, brush, pixel_data, &scans[i], + scans[i].Width); + + if (stat == Ok) + { + stat = alpha_blend_pixels(graphics, scans[i].X, scans[i].Y, + (BYTE*)pixel_data, scans[i].Width, scans[i].Height, + scans[i].Width * 4); + } + + if (stat != Ok) + break; + } + + GdipFree(pixel_data); + } + + GdipFree(scans); + } + + return stat; +} + /***************************************************************************** * GdipFillRegion [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, GpRegion* region) { - GpStatus stat; + GpStatus stat = NotImplemented; TRACE("(%p, %p, %p)\n", graphics, brush, region); @@ -3337,11 +3476,18 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, if(graphics->busy) return ObjectBusy; - stat = GDI32_GdipFillRegion(graphics, brush, region); + if (!graphics->image) + stat = GDI32_GdipFillRegion(graphics, brush, region); + + if (stat == NotImplemented) + stat = SOFTWARE_GdipFillRegion(graphics, brush, region); + + if (stat == NotImplemented && graphics->image) + stat = GDI32_GdipFillRegion(graphics, brush, region); if (stat == NotImplemented) { - FIXME("partially implemented\n"); + FIXME("not implemented for brushtype %i\n", brush->bt); stat = Ok; }

1 0