August 2008 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Replace an #if 0 with if(0) .
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 005e5e868e5077c7cd8d17c90f653e745290f240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=005e5e868e5077c7cd8d17c90… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 13:30:57 2008 -0500 wined3d: Replace an #if 0 with if(0). --- dlls/wined3d/arb_program_shader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 86faaf2..616c12e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -645,15 +645,15 @@ static void gen_color_correction(SHADER_BUFFER *buffer, const char *reg, const c case WINED3DFMT_V16U16: if(GL_SUPPORT(NV_TEXTURE_SHADER) || (GL_SUPPORT(ATI_ENVMAP_BUMPMAP) && fmt == WINED3DFMT_V8U8)) { -#if 0 - /* The 3rd channel returns 1.0 in d3d, but 0.0 in gl. Fix this while we're at it :-) - * disabled until an application that needs it is found because it causes unneeded - * shader recompilation in some game - */ - if(strlen(writemask) >= 4) { - shader_addline(buffer, "MOV %s.%c, %s;\n", reg, one); + if(0) { + /* The 3rd channel returns 1.0 in d3d, but 0.0 in gl. Fix this while we're at it :-) + * disabled until an application that needs it is found because it causes unneeded + * shader recompilation in some game + */ + if(strlen(writemask) >= 4) { + shader_addline(buffer, "MOV %s.%c, %s;\n", reg, writemask[3], one); + } } -#endif } else { /* Correct the sign, but leave the blue as it is - it was loaded correctly already * ARB shaders are a bit picky wrt writemasks and swizzles. If we're free to scale

1 0

Andrew Talbot : jscript: Sign-compare warnings fix.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 8c5c913fc0f8814aae2db2a47f82d40df2e44061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5c913fc0f8814aae2db2a47… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Aug 27 20:53:47 2008 +0100 jscript: Sign-compare warnings fix. --- dlls/jscript/jscript_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index 92999fb..7cb46bf 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -161,7 +161,7 @@ static HRESULT register_inf(BOOL doregister) STRTABLEA strtable; STRENTRYA pse[7]; static CLSID const *clsids[7]; - int i = 0; + unsigned int i = 0; static const WCHAR advpackW[] = {'a','d','v','p','a','c','k','.','d','l','l',0};

1 0

Martin Profittlich : user32: Make RegisterDeviceNotificationW behave likeRegisterDeviceNotificationA.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: b83de4adef5d2308db8042ceb7ed06c87c83f3bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83de4adef5d2308db8042ceb… Author: Martin Profittlich <martin.profittlich(a)gmx.de> Date: Wed Aug 6 22:41:17 2008 +0200 user32: Make RegisterDeviceNotificationW behave likeRegisterDeviceNotificationA. --- dlls/user32/misc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 65176e3..f91be62 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -564,8 +564,9 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, D */ HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecepient, LPVOID pNotificationFilter, DWORD dwFlags) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08x), STUB!\n", hRecepient,pNotificationFilter,dwFlags ); - return 0; + FIXME("(hwnd=%p, filter=%p,flags=0x%08x),\n" + "\treturns a fake device notification handle!\n", hRecepient,pNotificationFilter,dwFlags ); + return (HDEVNOTIFY) 0xcafeaffe; } /***********************************************************************

1 0

Andrew Talbot : iphlpapi: Sign-compare warning fix.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 8e638e147e4bafb06f022e6882c8c46f258b5955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e638e147e4bafb06f022e688… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Aug 27 20:53:37 2008 +0100 iphlpapi: Sign-compare warning fix. --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 430a943..a2ec4b2 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -632,7 +632,7 @@ DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex) DWORD WINAPI GetAdapterIndex(LPWSTR AdapterName, PULONG IfIndex) { char adapterName[MAX_ADAPTER_NAME]; - int i; + unsigned int i; DWORD ret; TRACE("(AdapterName %p, IfIndex %p)\n", AdapterName, IfIndex);

1 0

Nikolay Sivov : gdiplus: Fix for CombineModeReplace with some tests.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: fb62d06151ab1d52ab0b6e5069d995a6b7ef0929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb62d06151ab1d52ab0b6e506… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Aug 27 23:31:08 2008 +0400 gdiplus: Fix for CombineModeReplace with some tests. --- dlls/gdiplus/region.c | 25 +++++++++++++ dlls/gdiplus/tests/region.c | 82 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 100 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index e97dc62..f1142b7 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -242,6 +242,13 @@ GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *region, GpPath *path, Combin if (stat != Ok) return stat; + /* simply replace region data */ + if(mode == CombineModeReplace){ + delete_element(&region->node); + memcpy(region, path_region, sizeof(GpRegion)); + return Ok; + } + left = GdipAlloc(sizeof(region_element)); if (!left) goto out; @@ -279,6 +286,13 @@ GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, if (stat != Ok) return stat; + /* simply replace region data */ + if(mode == CombineModeReplace){ + delete_element(&region->node); + memcpy(region, rect_region, sizeof(GpRegion)); + return Ok; + } + left = GdipAlloc(sizeof(region_element)); if (!left) goto out; @@ -323,12 +337,23 @@ GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, { region_element *left, *right = NULL; GpStatus stat; + GpRegion *reg2copy; TRACE("%p %p %d\n", region1, region2, mode); if(!(region1 && region2)) return InvalidParameter; + /* simply replace region data */ + if(mode == CombineModeReplace){ + stat = GdipCloneRegion(region2, &reg2copy); + if(stat != Ok) return stat; + + delete_element(&region1->node); + memcpy(region1, reg2copy, sizeof(GpRegion)); + return Ok; + } + left = GdipAlloc(sizeof(region_element)); if (!left) return OutOfMemory; diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 7e6e3b8..63d0086 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -553,10 +553,11 @@ static void test_isempty(void) static void test_combinereplace(void) { GpStatus status; - GpRegion *region; + GpRegion *region, *region2; + GpPath *path; GpRectF rectf; UINT needed; - DWORD buf[10]; + DWORD buf[50]; rectf.X = rectf.Y = 0.0; rectf.Width = rectf.Height = 100.0; @@ -570,15 +571,82 @@ static void test_combinereplace(void) status = GdipGetRegionDataSize(region, &needed); expect(Ok, status); - todo_wine expect(36, needed); + expect(36, needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + expect(Ok, status); + expect(36, needed); + expect_dword(buf, 28); + trace("buf[1] = %08x\n", buf[1]); + expect_magic((DWORD*)(buf + 2)); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, RGNDATA_RECT); + + /* replace with path */ + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + status = GdipAddPathEllipse(path, 0.0, 0.0, 100.0, 250.0); + expect(Ok, status); + status = GdipCombineRegionPath(region, path, CombineModeReplace); + expect(Ok, status); + + status = GdipGetRegionDataSize(region, &needed); + expect(Ok, status); + expect(156, needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + expect(Ok, status); + expect(156, needed); + expect_dword(buf, 148); + trace("buf[1] = %08x\n", buf[1]); + expect_magic((DWORD*)(buf + 2)); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, RGNDATA_PATH); + GdipDeletePath(path); + + /* replace with infinite rect */ + status = GdipCreateRegion(&region2); + expect(Ok, status); + status = GdipCombineRegionRegion(region, region2, CombineModeReplace); + expect(Ok, status); + + status = GdipGetRegionDataSize(region, &needed); + expect(Ok, status); + expect(20, needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + expect(Ok, status); + expect(20, needed); + expect_dword(buf, 12); + trace("buf[1] = %08x\n", buf[1]); + expect_magic((DWORD*)(buf + 2)); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, RGNDATA_INFINITE_RECT); + GdipDeletePath(path); + GdipDeleteRegion(region2); + + /* more complex case : replace with a combined region */ + status = GdipCreateRegionRect(&rectf, &region2); + expect(Ok, status); + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + status = GdipAddPathEllipse(path, 0.0, 0.0, 100.0, 250.0); + expect(Ok, status); + status = GdipCombineRegionPath(region2, path, CombineModeUnion); + expect(Ok, status); + GdipDeletePath(path); + status = GdipCombineRegionRegion(region, region2, CombineModeReplace); + expect(Ok, status); + GdipDeleteRegion(region2); + + status = GdipGetRegionDataSize(region, &needed); + expect(Ok, status); + expect(180, needed); status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); expect(Ok, status); - todo_wine expect(36, needed); - todo_wine expect_dword(buf, 28); + expect(180, needed); + expect_dword(buf, 172); trace("buf[1] = %08x\n", buf[1]); expect_magic((DWORD*)(buf + 2)); - todo_wine expect_dword(buf + 3, 0); - todo_wine expect_dword(buf + 4, RGNDATA_RECT); + expect_dword(buf + 3, 2); + expect_dword(buf + 4, CombineModeUnion); GdipDeleteRegion(region); }

1 0

Nikolay Sivov : gdiplus: Implemented GdipSetClipRegion with basic tests.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 0df5fb50f79f1b9c17a309ba80284c29f7411257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df5fb50f79f1b9c17a309ba8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Aug 27 23:30:59 2008 +0400 gdiplus: Implemented GdipSetClipRegion with basic tests. --- dlls/gdiplus/graphics.c | 13 ++++++++----- dlls/gdiplus/tests/graphics.c | 15 ++++++++++++--- include/gdiplusflat.h | 1 + 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d5b562c..a2ff33f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2737,14 +2737,17 @@ GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics *graphics, INT x, INT y, } GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics *graphics, GpRegion *region, - CombineMode combineMode) + CombineMode mode) { - static int calls; + TRACE("(%p, %p, %d)\n", graphics, region, mode); - if(!(calls++)) - FIXME("not implemented\n"); + if(!graphics || !region) + return InvalidParameter; - return NotImplemented; + if(graphics->busy) + return ObjectBusy; + + return GdipCombineRegionRegion(graphics->clip, region, mode); } GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile *metafile, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index a468de9..e316ab9 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -485,6 +485,7 @@ static void test_Get_Release_DC(void) GpPoint pt[5]; GpRectF rectf[2]; GpRect rect[2]; + GpRegion *clip; INT i; pt[0].X = 10; @@ -523,6 +524,7 @@ static void test_Get_Release_DC(void) GdipCreateRegion(&region); GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); GdipCreatePath(FillModeAlternate, &path); + GdipCreateRegion(&clip); status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); @@ -702,7 +704,8 @@ static void test_Get_Release_DC(void) expect(ObjectBusy, status); status = Ok; status = GdipSetClipRectI(graphics, 0, 0, 10, 10, CombineModeReplace); expect(ObjectBusy, status); status = Ok; - /* GdipSetClipRegion */ + status = GdipSetClipRegion(graphics, clip, CombineModeReplace); + expect(ObjectBusy, status); status = GdipDrawPolygon(graphics, pen, ptf, 5); expect(ObjectBusy, status); status = Ok; status = GdipDrawPolygonI(graphics, pen, pt, 5); @@ -730,6 +733,7 @@ static void test_Get_Release_DC(void) GdipDeleteBrush((GpBrush*)brush); GdipDeleteRegion(region); GdipDeleteMatrix(m); + GdipDeleteRegion(region); ReleaseDC(0, hdc); } @@ -764,7 +768,7 @@ static void test_transformpoints(void) ReleaseDC(0, hdc); } -static void test_getclip(void) +static void test_get_set_clip(void) { GpStatus status; GpGraphics *graphics = NULL; @@ -789,6 +793,11 @@ static void test_getclip(void) status = GdipGetClip(NULL, clip); expect(InvalidParameter, status); + status = GdipSetClipRegion(NULL, NULL, CombineModeReplace); + expect(InvalidParameter, status); + status = GdipSetClipRegion(graphics, NULL, CombineModeReplace); + expect(InvalidParameter, status); + res = FALSE; status = GdipGetClip(graphics, clip); expect(Ok, status); @@ -823,7 +832,7 @@ START_TEST(graphics) test_GdipDrawLinesI(); test_Get_Release_DC(); test_transformpoints(); - test_getclip(); + test_get_set_clip(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 3af0692..ec72087 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -156,6 +156,7 @@ GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics*,GpBrush*,GDIPCONST GpRectF*,I GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics*,GpBrush*,GDIPCONST GpRect*,INT); GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*); GpStatus WINGDIPAPI GdipGetClip(GpGraphics*,GpRegion*); +GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics*,GpRegion*,CombineMode); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetDC(GpGraphics*,HDC*); GpStatus WINGDIPAPI GdipGetImageDimension(GpImage*,REAL*,REAL*);

1 0

Nikolay Sivov : gdiplus: Added test shows that CombineModeReplace actually replaces data.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: b8711acb15f1446672e834abc1e4878654752598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8711acb15f1446672e834abc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Aug 27 23:31:03 2008 +0400 gdiplus: Added test shows that CombineModeReplace actually replaces data. --- dlls/gdiplus/tests/region.c | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 550730a..7e6e3b8 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -35,10 +35,7 @@ #define expect_magic(value) ok(*value == RGNDATA_MAGIC || *value == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *value) -static inline void expect_dword(DWORD *value, DWORD expected) -{ - ok(*value == expected, "expected %08x got %08x\n", expected, *value); -} +#define expect_dword(value, expected) ok(*(value) == expected, "expected %08x got %08x\n", expected, *(value)) static inline void expect_float(DWORD *value, FLOAT expected) { @@ -553,6 +550,39 @@ static void test_isempty(void) ReleaseDC(0, hdc); } +static void test_combinereplace(void) +{ + GpStatus status; + GpRegion *region; + GpRectF rectf; + UINT needed; + DWORD buf[10]; + + rectf.X = rectf.Y = 0.0; + rectf.Width = rectf.Height = 100.0; + + status = GdipCreateRegionRect(&rectf, &region); + expect(Ok, status); + + /* replace with the same rectangle */ + status = GdipCombineRegionRect(region, &rectf,CombineModeReplace); + expect(Ok, status); + + status = GdipGetRegionDataSize(region, &needed); + expect(Ok, status); + todo_wine expect(36, needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + expect(Ok, status); + todo_wine expect(36, needed); + todo_wine expect_dword(buf, 28); + trace("buf[1] = %08x\n", buf[1]); + expect_magic((DWORD*)(buf + 2)); + todo_wine expect_dword(buf + 3, 0); + todo_wine expect_dword(buf + 4, RGNDATA_RECT); + + GdipDeleteRegion(region); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -568,6 +598,7 @@ START_TEST(region) test_getregiondata(); test_isinfinite(); test_isempty(); + test_combinereplace(); GdiplusShutdown(gdiplusToken);

1 0

Nikolay Sivov : gdiplus: Move some TRACE() higher in region.c.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 26cb843130d5db009d12598c6978b8f7e9916b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26cb843130d5db009d12598c6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Aug 27 23:30:51 2008 +0400 gdiplus: Move some TRACE() higher in region.c. --- dlls/gdiplus/region.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index addc2d2..5f40dfe 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -350,11 +350,11 @@ GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **region) { + TRACE("%p\n", region); + if(!region) return InvalidParameter; - TRACE("%p\n", region); - *region = GdipAlloc(sizeof(GpRegion)); if(!*region) return OutOfMemory; @@ -692,10 +692,11 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, { INT filled = 0; + TRACE("%p, %p, %d, %p\n", region, buffer, size, needed); + if (!(region && buffer && size)) return InvalidParameter; - TRACE("%p, %p, %d, %p\n", region, buffer, size, needed); memcpy(buffer, &region->header, sizeof(region->header)); filled += sizeof(region->header) / sizeof(DWORD); /* With few exceptions, everything written is DWORD aligned, @@ -710,11 +711,11 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *region, UINT *needed) { + TRACE("%p, %p\n", region, needed); + if (!(region && needed)) return InvalidParameter; - TRACE("%p, %p\n", region, needed); - /* header.size doesn't count header.size and header.checksum */ *needed = region->header.size + sizeof(DWORD) * 2; @@ -779,11 +780,11 @@ GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *region) { GpStatus stat; + TRACE("%p\n", region); + if (!region) return InvalidParameter; - TRACE("%p\n", region); - delete_element(&region->node); stat = init_region(region, RegionDataInfiniteRect);

1 0

Nikolay Sivov : gdiplus: Implemented GdipIsEmptyRegion with tests.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: fb57a6637836c0f435d3b4224b95a4a3f2581874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb57a6637836c0f435d3b4224… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Aug 27 23:30:55 2008 +0400 gdiplus: Implemented GdipIsEmptyRegion with tests. --- dlls/gdiplus/region.c | 9 ++++++- dlls/gdiplus/tests/region.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 5f40dfe..e97dc62 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -735,9 +735,14 @@ GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *region, GpGraphics *graphics, HR GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *region, GpGraphics *graphics, BOOL *res) { - FIXME("(%p, %p, %p): stub\n", region, graphics, res); + TRACE("(%p, %p, %p)\n", region, graphics, res); - return NotImplemented; + if(!region || !graphics || !res) + return InvalidParameter; + + *res = (region->node.type == RegionDataEmptyRect); + + return Ok; } GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *region, GpRegion *region2, GpGraphics *graphics, diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index b207f3f..550730a 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -506,6 +506,50 @@ static void test_isinfinite(void) GdipDeleteMatrix(m); GdipDeleteRegion(region); + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); +} + +static void test_isempty(void) +{ + GpStatus status; + GpRegion *region; + GpGraphics *graphics = NULL; + HDC hdc = GetDC(0); + BOOL res; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + GdipCreateRegion(&region); + + /* NULL arguments */ + status = GdipIsEmptyRegion(NULL, NULL, NULL); + expect(InvalidParameter, status); + status = GdipIsEmptyRegion(region, NULL, NULL); + expect(InvalidParameter, status); + status = GdipIsEmptyRegion(NULL, graphics, NULL); + expect(InvalidParameter, status); + status = GdipIsEmptyRegion(NULL, NULL, &res); + expect(InvalidParameter, status); + status = GdipIsEmptyRegion(region, NULL, &res); + expect(InvalidParameter, status); + + /* default is infinite */ + res = TRUE; + status = GdipIsEmptyRegion(region, graphics, &res); + expect(Ok, status); + expect(FALSE, res); + + status = GdipSetEmpty(region); + expect(Ok, status); + + res = FALSE; + status = GdipIsEmptyRegion(region, graphics, &res); + expect(Ok, status); + expect(TRUE, res); + + GdipDeleteRegion(region); + GdipDeleteGraphics(graphics); ReleaseDC(0, hdc); } @@ -523,6 +567,7 @@ START_TEST(region) test_getregiondata(); test_isinfinite(); + test_isempty(); GdiplusShutdown(gdiplusToken);

1 0

Juan Lang : crypt32: Don't ignore errors when encoding items in an array.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 2d02ec7488bf1fb08e05a59afd369a39efbe2f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d02ec7488bf1fb08e05a59af… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 27 11:02:13 2008 -0700 crypt32: Don't ignore errors when encoding items in an array. --- dlls/crypt32/encode.c | 118 ++++++++++++++++++++++++++---------------------- 1 files changed, 64 insertions(+), 54 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 0bcdad8..addd718 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -578,27 +578,31 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLEntries(DWORD dwCertEncodingType, if (ret) dataLen += size; } - CRYPT_EncodeLen(dataLen, NULL, &lenBytes); - bytesNeeded = 1 + lenBytes + dataLen; - if (!pbEncoded) - *pcbEncoded = bytesNeeded; - else + if (ret) { - if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, - pcbEncoded, bytesNeeded))) + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + dataLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else { - if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) - pbEncoded = *(BYTE **)pbEncoded; - *pbEncoded++ = ASN_SEQUENCEOF; - CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); - pbEncoded += lenBytes; - for (i = 0; i < cCRLEntry; i++) + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, + pcbEncoded, bytesNeeded))) { - DWORD size = dataLen; + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < cCRLEntry; i++) + { + DWORD size = dataLen; - ret = CRYPT_AsnEncodeCRLEntry(&rgCRLEntry[i], pbEncoded, &size); - pbEncoded += size; - dataLen -= size; + ret = CRYPT_AsnEncodeCRLEntry(&rgCRLEntry[i], pbEncoded, + &size); + pbEncoded += size; + dataLen -= size; + } } } } @@ -731,28 +735,31 @@ static BOOL WINAPI CRYPT_AsnEncodeExtensions(DWORD dwCertEncodingType, if (ret) dataLen += size; } - CRYPT_EncodeLen(dataLen, NULL, &lenBytes); - bytesNeeded = 1 + lenBytes + dataLen; - if (!pbEncoded) - *pcbEncoded = bytesNeeded; - else + if (ret) { - if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, - pcbEncoded, bytesNeeded))) + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + dataLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else { - if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) - pbEncoded = *(BYTE **)pbEncoded; - *pbEncoded++ = ASN_SEQUENCEOF; - CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); - pbEncoded += lenBytes; - for (i = 0; i < exts->cExtension; i++) + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) { - DWORD size = dataLen; + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < exts->cExtension; i++) + { + DWORD size = dataLen; - ret = CRYPT_AsnEncodeExtension(&exts->rgExtension[i], - pbEncoded, &size); - pbEncoded += size; - dataLen -= size; + ret = CRYPT_AsnEncodeExtension(&exts->rgExtension[i], + pbEncoded, &size); + pbEncoded += size; + dataLen -= size; + } } } } @@ -1459,29 +1466,32 @@ static BOOL WINAPI CRYPT_AsnEncodeSMIMECapabilities(DWORD dwCertEncodingType, if (ret) dataLen += size; } - CRYPT_EncodeLen(dataLen, NULL, &lenBytes); - bytesNeeded = 1 + lenBytes + dataLen; - if (!pbEncoded) - *pcbEncoded = bytesNeeded; - else + if (ret) { - if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, - pcbEncoded, bytesNeeded))) + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + dataLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else { - if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) - pbEncoded = *(BYTE **)pbEncoded; - *pbEncoded++ = ASN_SEQUENCEOF; - CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); - pbEncoded += lenBytes; - for (i = 0; i < capabilities->cCapability; i++) + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) { - DWORD size = dataLen; + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < capabilities->cCapability; i++) + { + DWORD size = dataLen; - ret = CRYPT_AsnEncodeSMIMECapability(dwCertEncodingType, - NULL, &capabilities->rgCapability[i], 0, NULL, pbEncoded, - &size); - pbEncoded += size; - dataLen -= size; + ret = CRYPT_AsnEncodeSMIMECapability(dwCertEncodingType, + NULL, &capabilities->rgCapability[i], 0, NULL, + pbEncoded, &size); + pbEncoded += size; + dataLen -= size; + } } } }

1 0