wine-commits August 2008

wine-commits@winehq.org

2 participants
839 discussions

Luis C.=?UTF-8?Q?=20Busquets=20P=C3=A9rez=20?=: d3dx9: Avoid assignment in D3DXGetVertexShaderProfile.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: d9d8288508f60d54004f7a4d4b8094d9e02e6e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d8288508f60d54004f7a4d4… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Tue Aug 5 07:09:57 2008 +0200 d3dx9: Avoid assignment in D3DXGetVertexShaderProfile. --- dlls/d3dx9_36/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index a84287f..97109a2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -119,7 +119,7 @@ LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device) return "vs_1_1"; case D3DVS_VERSION(2, 0): if ((caps.VS20Caps.NumTemps>=13) && - (caps.VS20Caps.DynamicFlowControlDepth=24) && + (caps.VS20Caps.DynamicFlowControlDepth==24) && (caps.VS20Caps.Caps&D3DPS20CAPS_PREDICATION)) { return "vs_2_a";

1 0

James Hawkins : advpack: Fix a failing test in win98.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 35e16a2b42b059017b9d7145810a84a77c3b6de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e16a2b42b059017b9d71458… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 4 17:52:47 2008 -0500 advpack: Fix a failing test in win98. --- dlls/advpack/tests/files.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index d018975..9ddd3bc 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -97,6 +97,7 @@ static BOOL check_ini_file_attr(LPSTR filename) static void test_AddDelBackupEntry(void) { + BOOL ret; HRESULT res; CHAR path[MAX_PATH]; CHAR windir[MAX_PATH]; @@ -165,7 +166,10 @@ static void test_AddDelBackupEntry(void) res = pAddDelBackupEntry("one\0three\0", NULL, "basename", AADBE_DEL_ENTRY); SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL); ok(res == S_OK, "Expected S_OK, got %d\n", res); - ok(DeleteFileA(path), "Expected path to exist\n"); + ret = DeleteFileA(path); + ok(ret == TRUE || + broken(ret == FALSE), /* win98 */ + "Expected path to exist\n"); } /* the FCI callbacks */

1 0

Juan Lang : ws2_32: Delay import iphlpapi.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 8c44e25693fa5380d8479eda5d9a135b3936539a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c44e25693fa5380d8479eda5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 4 15:44:27 2008 -0700 ws2_32: Delay import iphlpapi. --- dlls/ws2_32/Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index 1bb424f..9924e2d 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -5,8 +5,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ws2_32.dll IMPORTLIB = ws2_32 -IMPORTS = iphlpapi kernel32 ntdll -DELAYIMPORTS = user32 +IMPORTS = kernel32 ntdll +DELAYIMPORTS = iphlpapi user32 EXTRALIBS = @LIBPOLL@ C_SRCS = \

1 0

Adam Petaccia : gdiplus: Add another test to getregiondata.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 08b0493b9e18e6f3e03c388138121c6e225fa48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b0493b9e18e6f3e03c38813… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Mon Aug 4 13:57:04 2008 -0400 gdiplus: Add another test to getregiondata. --- dlls/gdiplus/tests/region.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index df9e744..0b8ed41 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -401,6 +401,66 @@ static void test_getregiondata(void) expect(Ok, status); status = GdipDeleteRegion(region); expect(Ok, status); + + /* Test for a path with > 4 points, and CombineRegionPath */ + GdipCreatePath(FillModeAlternate, &path); + status = GdipAddPathLine(path, 50, 70.2, 60, 102.8); + expect(Ok, status); + status = GdipAddPathLine(path, 55.4, 122.4, 40.4, 60.2); + expect(Ok, status); + status = GdipAddPathLine(path, 45.6, 20.2, 50, 70.2); + expect(Ok, status); + rect.X = 20; + rect.Y = 25; + rect.Width = 60; + rect.Height = 120; + status = GdipCreateRegionRectI(&rect, &region); + expect(Ok, status); + status = GdipCombineRegionPath(region, path, CombineModeUnion); + expect(Ok, status); + + status = GdipGetRegionDataSize(region, &needed); + expect(Ok, status); + expect(116, needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + expect(Ok, status); + expect(116, needed); + expect_dword(buf, 108); + trace("buf[1] = %08x\n", buf[1]); + expect_magic((DWORD*)(buf + 2)); + expect_dword(buf + 3, 2); + expect_dword(buf + 4, CombineModeUnion); + expect_dword(buf + 5, RGNDATA_RECT); + expect_float(buf + 6, 20); + expect_float(buf + 7, 25); + expect_float(buf + 8, 60); + expect_float(buf + 9, 120); + expect_dword(buf + 10, RGNDATA_PATH); + + expect_dword(buf + 11, 68); + expect_magic((DWORD*)(buf + 12)); + expect_dword(buf + 13, 6); + expect_float(buf + 14, 0x0); + + expect_float(buf + 15, 50); + expect_float(buf + 16, 70.2); + expect_float(buf + 17, 60); + expect_float(buf + 18, 102.8); + expect_float(buf + 19, 55.4); + expect_float(buf + 20, 122.4); + expect_float(buf + 21, 40.4); + expect_float(buf + 22, 60.2); + expect_float(buf + 23, 45.6); + expect_float(buf + 24, 20.2); + expect_float(buf + 25, 50); + expect_float(buf + 26, 70.2); + expect_dword(buf + 27, 0x01010100); + expect_dword(buf + 28, 0x00000101); + + status = GdipDeletePath(path); + expect(Ok, status); + status = GdipDeleteRegion(region); + expect(Ok, status); } START_TEST(region)

1 0

Adam Petaccia : gdiplus: Implement GdipCombineRegionPath.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 93eae5e83f867f6c455b27bc3a2e5261f1c144d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93eae5e83f867f6c455b27bc3… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Mon Aug 4 13:56:59 2008 -0400 gdiplus: Implement GdipCombineRegionPath. --- dlls/gdiplus/region.c | 34 ++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/region.c | 1 - 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index b66cbb4..11b5aa6 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -252,8 +252,38 @@ GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *region, GpRegion **clone) GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *region, GpPath *path, CombineMode mode) { - FIXME("(%p %p %d): stub\n", region, path, mode); - return NotImplemented; + GpRegion *path_region; + region_element *left, *right = NULL; + GpStatus stat; + + TRACE("%p %p %d\n", region, path, mode); + + if (!(region && path)) + return InvalidParameter; + + stat = GdipCreateRegionPath(path, &path_region); + if (stat != Ok) + return stat; + + left = GdipAlloc(sizeof(region_element)); + if (!left) + goto out; + *left = region->node; + + stat = clone_element(&path_region->node, &right); + if (stat != Ok) + goto out; + + fuse_region(region, left, right, mode); + + GdipDeleteRegion(path_region); + return Ok; + +out: + GdipFree(left); + delete_element(right); + GdipDeleteRegion(path_region); + return stat; } GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 77b1e3b..df9e744 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -70,7 +70,6 @@ static void test_getregiondata(void) status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); expect(20, needed); -todo_wine status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); expect(20, needed);

1 0

Adam Petaccia : gdiplus: Implement GdipCombineRegionRegion.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 2a445d0ebd5d8d3673513afc0e342925df7d2cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a445d0ebd5d8d3673513afc0… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Mon Aug 4 13:56:56 2008 -0400 gdiplus: Implement GdipCombineRegionRegion. --- dlls/gdiplus/region.c | 31 +++++++++++++++++++++++++++---- dlls/gdiplus/tests/region.c | 9 --------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index d07ed38..b66cbb4 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -311,11 +311,34 @@ GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *region, return GdipCombineRegionRect(region, &rectf, mode); } -GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, GpRegion *region2, - CombineMode mode) +GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, + GpRegion *region2, CombineMode mode) { - FIXME("(%p %p %d): stub\n", region1, region2, mode); - return NotImplemented; + region_element *left, *right; + GpStatus stat; + + TRACE("%p %p %d\n", region1, region2, mode); + + if(!(region1 && region2)) + return InvalidParameter; + + left = GdipAlloc(sizeof(region_element)); + if (!left) + return OutOfMemory; + + *left = region1->node; + stat = clone_element(&region2->node, &right); + if (stat != Ok) + { + GdipFree(left); + delete_element(right); + return OutOfMemory; + } + + fuse_region(region1, left, right, mode); + region1->header.num_children += region2->header.num_children; + + return Ok; } GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **region) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index d1e65d6..77b1e3b 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -160,7 +160,6 @@ todo_wine ok(status == Ok, "status %08x\n", status); status = GdipCombineRegionRegion(region, region2, CombineModeComplement); -todo_wine ok(status == Ok, "status %08x\n", status); rect.X = 400; @@ -172,22 +171,15 @@ todo_wine status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); -todo_wine expect(156, needed); status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); -todo_wine -{ expect(156, needed); expect_dword(buf, 148); -} trace("buf[1] = %08x\n", buf[1]); expect_magic((DWORD*)(buf + 2)); -todo_wine expect_dword(buf + 3, 10); expect_dword(buf + 4, CombineModeExclude); -todo_wine -{ expect_dword(buf + 5, CombineModeComplement); expect_dword(buf + 6, CombineModeXor); expect_dword(buf + 7, CombineModeIntersect); @@ -222,7 +214,6 @@ todo_wine expect_float(buf + 36, 500.0); expect_float(buf + 37, 22.0); expect_float(buf + 38, 55.0); -} status = GdipDeleteRegion(region2); ok(status == Ok, "status %08x\n", status);

1 0

Adam Petaccia : gdiplus: Implement GdipCombineRegionRectI.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 5bc8ddd86c08c1e52b562a77ece943c02cba6d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc8ddd86c08c1e52b562a77e… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Mon Aug 4 13:56:53 2008 -0400 gdiplus: Implement GdipCombineRegionRectI. --- dlls/gdiplus/region.c | 19 +++++++++++++++---- dlls/gdiplus/tests/region.c | 18 +++--------------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 14fd967..d07ed38 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -293,11 +293,22 @@ out: return stat; } -GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *region, GDIPCONST GpRect *rect, - CombineMode mode) +GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *region, + GDIPCONST GpRect *rect, CombineMode mode) { - FIXME("(%p %p %d): stub\n", region, rect, mode); - return NotImplemented; + GpRectF rectf; + + TRACE("%p %p %d\n", region, rect, mode); + + if (!rect) + return InvalidParameter; + + rectf.X = (REAL)rect->X; + rectf.Y = (REAL)rect->Y; + rectf.Height = (REAL)rect->Height; + rectf.Width = (REAL)rect->Width; + + return GdipCombineRegionRect(region, &rectf, mode); } GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, GpRegion *region2, diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 738c86d..d1e65d6 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -137,8 +137,6 @@ todo_wine rect.Y = 30; rect.Width = 10; rect.Height = 20; -todo_wine -{ status = GdipCombineRegionRectI(region, &rect, CombineModeIntersect); ok(status == Ok, "status %08x\n", status); rect.X = 100; @@ -147,7 +145,6 @@ todo_wine rect.Height = 50; status = GdipCombineRegionRectI(region, &rect, CombineModeXor); ok(status == Ok, "status %08x\n", status); -} rect.X = 200; rect.Y = 100; @@ -159,12 +156,11 @@ todo_wine rect.Y = 10; rect.Width = 40; rect.Height = 66; -todo_wine -{ status = GdipCombineRegionRectI(region2, &rect, CombineModeUnion); ok(status == Ok, "status %08x\n", status); status = GdipCombineRegionRegion(region, region2, CombineModeComplement); +todo_wine ok(status == Ok, "status %08x\n", status); rect.X = 400; @@ -174,7 +170,6 @@ todo_wine status = GdipCombineRegionRectI(region, &rect, CombineModeExclude); ok(status == Ok, "status %08x\n", status); -} status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); todo_wine @@ -189,9 +184,10 @@ todo_wine trace("buf[1] = %08x\n", buf[1]); expect_magic((DWORD*)(buf + 2)); todo_wine -{ expect_dword(buf + 3, 10); expect_dword(buf + 4, CombineModeExclude); +todo_wine +{ expect_dword(buf + 5, CombineModeComplement); expect_dword(buf + 6, CombineModeXor); expect_dword(buf + 7, CombineModeIntersect); @@ -272,23 +268,16 @@ todo_wine rect.Width = 10; rect.Height = 20; status = GdipCombineRegionRectI(region, &rect, CombineModeIntersect); -todo_wine ok(status == Ok, "status %08x\n", status); status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); -todo_wine expect(96, needed); status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); -todo_wine -{ expect(96, needed); expect_dword(buf, 88); trace("buf[1] = %08x\n", buf[1]); -} expect_magic((DWORD*)(buf + 2)); -todo_wine -{ expect_dword(buf + 3, 2); expect_dword(buf + 4, CombineModeIntersect); expect_dword(buf + 5, RGNDATA_PATH); @@ -310,7 +299,6 @@ todo_wine expect_float(buf + 21, 30.0); expect_float(buf + 22, 10.0); expect_float(buf + 23, 20.0); -} status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status);

1 0

Adam Petaccia : gdiplus: Implement GdipCombineRegionRect.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 4090aa43b5639e2229d5d79ec0911fa98083e3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4090aa43b5639e2229d5d79ec… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Mon Aug 4 13:56:49 2008 -0400 gdiplus: Implement GdipCombineRegionRect. --- dlls/gdiplus/region.c | 52 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 26b166e..14fd967 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -205,6 +205,20 @@ clone_out: return stat; } +/* Common code for CombineRegion* + * All the caller has to do is get its format into an element + */ +static inline void fuse_region(GpRegion* region, region_element* left, + region_element* right, const CombineMode mode) +{ + region->node.type = mode; + region->node.elementdata.combine.left = left; + region->node.elementdata.combine.right = right; + + region->header.size = sizeheader_size + get_element_size(&region->node); + region->header.num_children += 2; +} + /***************************************************************************** * GdipCloneRegion [GDIPLUS.@] * @@ -242,11 +256,41 @@ GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *region, GpPath *path, Combin return NotImplemented; } -GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, GDIPCONST GpRectF *rect, - CombineMode mode) +GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, + GDIPCONST GpRectF *rect, CombineMode mode) { - FIXME("(%p %p %d): stub\n", region, rect, mode); - return NotImplemented; + GpRegion *rect_region; + region_element *left, *right = NULL; + GpStatus stat; + + TRACE("%p %p %d\n", region, rect, mode); + + if (!(region && rect)) + return InvalidParameter; + + stat = GdipCreateRegionRect(rect, &rect_region); + if (stat != Ok) + return stat; + + left = GdipAlloc(sizeof(region_element)); + if (!left) + goto out; + memcpy(left, &region->node, sizeof(region_element)); + + stat = clone_element(&rect_region->node, &right); + if (stat != Ok) + goto out; + + fuse_region(region, left, right, mode); + + GdipDeleteRegion(rect_region); + return Ok; + +out: + GdipFree(left); + delete_element(right); + GdipDeleteRegion(rect_region); + return stat; } GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *region, GDIPCONST GpRect *rect,

1 0

Adam Petaccia : gdiplus: Implement GdipCloneRegion.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 40456271d3c61a622c67e183ffadb0e6cb29cfa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40456271d3c61a622c67e183f… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Mon Aug 4 13:56:45 2008 -0400 gdiplus: Implement GdipCloneRegion. --- dlls/gdiplus/region.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index fb658fd..26b166e 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -162,15 +162,78 @@ static inline void delete_element(region_element* element) } } +static inline GpStatus clone_element(const region_element* element, + region_element** element2) +{ + GpStatus stat; + + *element2 = GdipAlloc(sizeof(region_element)); + if (!*element2) + return OutOfMemory; + + (*element2)->type = element->type; + + switch (element->type) + { + case RegionDataRect: + (*element2)->elementdata.rect = element->elementdata.rect; + break; + case RegionDataEmptyRect: + case RegionDataInfiniteRect: + break; + case RegionDataPath: + (*element2)->elementdata.pathdata.pathheader = element->elementdata.pathdata.pathheader; + stat = GdipClonePath(element->elementdata.pathdata.path, + &(*element2)->elementdata.pathdata.path); + if (stat != Ok) goto clone_out; + break; + default: + stat = clone_element(element->elementdata.combine.left, + &(*element2)->elementdata.combine.left); + if (stat != Ok) goto clone_out; + stat = clone_element(element->elementdata.combine.right, + &(*element2)->elementdata.combine.right); + if (stat != Ok) goto clone_out; + break; + } + + return Ok; + +clone_out: + delete_element(*element2); + *element2 = NULL; + return stat; +} + /***************************************************************************** * GdipCloneRegion [GDIPLUS.@] + * + * Creates a deep copy of the region + * + * PARAMS + * region [I] source region + * clone [O] resulting clone + * + * RETURNS + * SUCCESS: Ok + * FAILURE: InvalidParameter or OutOfMemory */ GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *region, GpRegion **clone) { - FIXME("(%p %p): stub\n", region, clone); + region_element *element; - *clone = NULL; - return NotImplemented; + TRACE("%p %p\n", region, clone); + + if (!(region && clone)) + return InvalidParameter; + + *clone = GdipAlloc(sizeof(GpRegion)); + if (!*clone) + return OutOfMemory; + element = &(*clone)->node; + + (*clone)->header = region->header; + return clone_element(&region->node, &element); } GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *region, GpPath *path, CombineMode mode)

1 0

Adam Petaccia : gdiplus: Implement GdipCreateRegionRectI.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: cf3d4928bd51028ecd633a45f0250c76420d78e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3d4928bd51028ecd633a45f… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Mon Aug 4 13:56:41 2008 -0400 gdiplus: Implement GdipCreateRegionRectI. --- dlls/gdiplus/region.c | 15 +++++++++++---- dlls/gdiplus/tests/region.c | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 64ac9a5..fb658fd 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -358,12 +358,19 @@ GpStatus WINGDIPAPI GdipCreateRegionRect(GDIPCONST GpRectF *rect, return Ok; } -GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *rect, GpRegion **region) +GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *rect, + GpRegion **region) { - FIXME("(%p, %p): stub\n", rect, region); + GpRectF rectf; - *region = NULL; - return NotImplemented; + TRACE("%p, %p\n", rect, region); + + rectf.X = (REAL)rect->X; + rectf.Y = (REAL)rect->Y; + rectf.Width = (REAL)rect->Width; + rectf.Height = (REAL)rect->Height; + + return GdipCreateRegionRect(&rectf, region); } GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRegion **region) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 17a4ba4..738c86d 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -115,8 +115,6 @@ todo_wine rect.Y = 20; rect.Width = 100; rect.Height = 200; -todo_wine -{ status = GdipCreateRegionRectI(&rect, &region); ok(status == Ok, "status %08x\n", status); status = GdipGetRegionDataSize(region, &needed); @@ -127,11 +125,8 @@ todo_wine expect(36, needed); expect_dword(buf, 28); trace("buf[1] = %08x\n", buf[1]); -} expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); -todo_wine -{ expect_dword(buf + 4, RGNDATA_RECT); expect_float(buf + 5, 10.0); expect_float(buf + 6, 20.0); @@ -142,6 +137,8 @@ todo_wine rect.Y = 30; rect.Width = 10; rect.Height = 20; +todo_wine +{ status = GdipCombineRegionRectI(region, &rect, CombineModeIntersect); ok(status == Ok, "status %08x\n", status); rect.X = 100; @@ -150,6 +147,7 @@ todo_wine rect.Height = 50; status = GdipCombineRegionRectI(region, &rect, CombineModeXor); ok(status == Ok, "status %08x\n", status); +} rect.X = 200; rect.Y = 100; @@ -161,6 +159,8 @@ todo_wine rect.Y = 10; rect.Width = 40; rect.Height = 66; +todo_wine +{ status = GdipCombineRegionRectI(region2, &rect, CombineModeUnion); ok(status == Ok, "status %08x\n", status); @@ -172,18 +172,21 @@ todo_wine rect.Width = 22; rect.Height = 55; status = GdipCombineRegionRectI(region, &rect, CombineModeExclude); -todo_wine ok(status == Ok, "status %08x\n", status); +} status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); +todo_wine expect(156, needed); status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); +todo_wine +{ expect(156, needed); expect_dword(buf, 148); - trace("buf[1] = %08x\n", buf[1]); } + trace("buf[1] = %08x\n", buf[1]); expect_magic((DWORD*)(buf + 2)); todo_wine { @@ -223,12 +226,12 @@ todo_wine expect_float(buf + 36, 500.0); expect_float(buf + 37, 22.0); expect_float(buf + 38, 55.0); +} status = GdipDeleteRegion(region2); ok(status == Ok, "status %08x\n", status); status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); -} /* Try some paths */

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2008