May 2012 - Wine-Commits - list.winehq.org

Alexandre Julliard : oleaut32/tests: Fix handle sign extension on 64-bit.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 4b9a55852345edb4c925c0f5223d076c7ee378aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9a55852345edb4c925c0f52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 10:29:28 2012 +0200 oleaut32/tests: Fix handle sign extension on 64-bit. --- dlls/oleaut32/tests/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index a70f0b7..353334c 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -979,7 +979,7 @@ static void test_load_save_bmp(void) hr = IPicture_get_Handle(pic, &handle); ok(hr == S_OK,"get_Handle error %#8x\n", hr); - ok(UIntToPtr(handle) == desc.u.bmp.hbitmap, "get_Handle returned wrong handle %#x\n", handle); + ok(IntToPtr(handle) == desc.u.bmp.hbitmap, "get_Handle returned wrong handle %#x\n", handle); hmem = GlobalAlloc(GMEM_ZEROINIT, 4096); hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream);

1 0

Dmitry Timoshkov : include: Add some ids for IFD metadata support.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 02dff390ee2541a98c5e4a21ee4641836b0a25eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=02dff390ee2541a98c5e4a21e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 25 19:13:44 2012 +0900 include: Add some ids for IFD metadata support. --- include/wincodecsdk.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index a3af55a..5cca0a5 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -37,11 +37,13 @@ typedef enum WICMetadataCreationOptions { cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatIfd, 0x537396c6,0x2d8a,0x4bb6,0x9b,0xf8,0x2f,0x0a,0x8e,0x2a,0x3a,0xdf);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a,0xb6,0x70,0x89,0xe5,0xfa,0xb6,0xfd,0xa7);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72,0xa7,0x44,0x07,0x62,0xd2,0x68,0x56,0x83);") +cpp_quote("DEFINE_GUID(CLSID_WICIfdMetadataReader, 0x8f914656,0x9d0a,0x4eb2,0x90,0x19,0x0b,0xf9,0x6d,0x8a,0x9e,0xe6);") [ object,

1 0

Oleksij Rempel : krnl386: Set 11-bit for fixed drive.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 3a8eae3191a71b8783e1215701d667beb1738850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8eae3191a71b8783e121570… Author: Oleksij Rempel <bug-track(a)fisher-privat.net> Date: Fri May 25 10:58:50 2012 +0200 krnl386: Set 11-bit for fixed drive. --- dlls/krnl386.exe16/int21.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 14dbdfe..f25194b 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -2495,6 +2495,10 @@ static void INT21_Ioctl_Block( CONTEXT *context ) /* CDROM should be set to remote. If it set the app will * call int2f to check if it cdrom or remote drive. */ SET_DX( context, (1<<12) ); + else if (drivetype == DRIVE_FIXED) + /* This should define if drive support 0x0d, 0x0f and 0x08 + * requests. The local fixed drive should do. */ + SET_DX( context, (1<<11) ); else SET_DX( context, 0 ); /* FIXME: use driver attr here */ break;

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipIsEmptyRegion.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: a7d14b0d2cbbc6efe954ed2949c012fb92495279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d14b0d2cbbc6efe954ed294… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 21 17:53:13 2012 +0900 gdiplus: Reimplement GdipIsEmptyRegion. --- dlls/gdiplus/region.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 485c3a3..e77a79b 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -399,6 +399,8 @@ GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **region) if(!*region) return OutOfMemory; + TRACE("=> %p\n", *region); + return init_region(*region, RegionDataInfiniteRect); } @@ -680,6 +682,7 @@ GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, if(!hrgn){ rect->X = rect->Y = -(REAL)(1 << 22); rect->Width = rect->Height = (REAL)(1 << 23); + TRACE("%p => infinite\n", region); return Ok; } @@ -688,6 +691,7 @@ GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, rect->Y = r.top; rect->Width = r.right - r.left; rect->Height = r.bottom - r.top; + TRACE("%p => %s\n", region, debugstr_rectf(rect)); } else status = GenericError; @@ -1080,12 +1084,19 @@ GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *region, GpGraphics *graphics, HR GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *region, GpGraphics *graphics, BOOL *res) { + GpStatus status; + GpRectF rect; + TRACE("(%p, %p, %p)\n", region, graphics, res); if(!region || !graphics || !res) return InvalidParameter; - *res = (region->node.type == RegionDataEmptyRect); + status = GdipGetRegionBounds(region, graphics, &rect); + if (status != Ok) return status; + + *res = rect.Width == 0.0 && rect.Height == 0.0; + TRACE("=> %d\n", *res); return Ok; }

1 0

Alexandre Julliard : gdi32: Check that the bitmap depth matches the DC when selecting it.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 294faf5ef37d9131408e1dd48b6f3bd23d0ee1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=294faf5ef37d9131408e1dd48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 11:19:36 2012 +0200 gdi32: Check that the bitmap depth matches the DC when selecting it. --- dlls/gdi32/bitmap.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index b46521a..1a0e6bb 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -507,6 +507,15 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) goto done; } + if (bitmap->dib.dsBm.bmBitsPixel != 1 && + bitmap->dib.dsBm.bmBitsPixel != GetDeviceCaps( hdc, BITSPIXEL )) + { + WARN( "Wrong format bitmap %u bpp\n", bitmap->dib.dsBm.bmBitsPixel ); + GDI_ReleaseObj( handle ); + ret = 0; + goto done; + } + if (dc->dibdrv) old_physdev = pop_dc_driver( dc, dc->dibdrv ); physdev = GET_DC_PHYSDEV( dc, pSelectBitmap );

1 0

Alexandre Julliard : gdi32: Remove the CopyBitmap driver entry point.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: fdc4682e31d4ad2c54b8cc99a2f69d912a9480d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc4682e31d4ad2c54b8cc99a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 21:30:22 2012 +0200 gdi32: Remove the CopyBitmap driver entry point. --- dlls/gdi32/bitmap.c | 21 --------------------- dlls/gdi32/brush.c | 1 - dlls/gdi32/dibdrv/dc.c | 9 --------- dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/freetype.c | 1 - dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/gdi32/path.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/bitmap.c | 37 ------------------------------------- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/opengl.c | 1 - dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xrender.c | 9 --------- include/wine/gdi_driver.h | 4 +--- 16 files changed, 1 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdc4682e31d4ad2c54b8c…

1 0

Alexandre Julliard : gdi32: Always use the DIB engine for monochrome bitmap rendering.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: b81a7d976e3c3de36a01401d125871d3014e6c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81a7d976e3c3de36a01401d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 11:47:46 2012 +0200 gdi32: Always use the DIB engine for monochrome bitmap rendering. --- dlls/gdi32/bitmap.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 1a0e6bb..cc6a409 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -518,8 +518,13 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) if (dc->dibdrv) old_physdev = pop_dc_driver( dc, dc->dibdrv ); - physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); - createdev = GET_DC_PHYSDEV( dc, pCreateBitmap ); + if (bitmap->dib.dsBm.bmBitsPixel > 1) + { + physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); + createdev = GET_DC_PHYSDEV( dc, pCreateBitmap ); + } + else physdev = createdev = &dc->nulldrv; /* force use of the DIB engine for 1-bpp */ + if (physdev->funcs == &null_driver) { physdev = dc->dibdrv;

1 0

Alexandre Julliard : gdi32/tests: Add tests for color mappings in monochrome bitmaps.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 8761bb29ea4f58b5db07190a2cd423d11876d53d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8761bb29ea4f58b5db07190a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 17 22:22:46 2012 +0200 gdi32/tests: Add tests for color mappings in monochrome bitmaps. --- dlls/gdi32/tests/bitmap.c | 128 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 119 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d28b74f..2abf237 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -339,16 +339,18 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ok(ret == 0, "%d != 0\n", ret); } -#define test_color(hdc, color, exp) \ -{ \ - COLORREF c; \ - c = SetPixel(hdc, 0, 0, color); \ - ok(c == exp, "SetPixel failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ - c = GetPixel(hdc, 0, 0); \ - ok(c == exp, "GetPixel failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ - c = GetNearestColor(hdc, color); \ - ok(c == exp, "GetNearestColor failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ +static void _test_color( int line, HDC hdc, COLORREF color, COLORREF exp ) +{ + COLORREF c; + c = SetPixel(hdc, 0, 0, color); + ok_(__FILE__, line)(c == exp, "SetPixel failed: got 0x%06x expected 0x%06x\n", c, exp); + c = GetPixel(hdc, 0, 0); + ok_(__FILE__, line)(c == exp, "GetPixel failed: got 0x%06x expected 0x%06x\n", c, exp); + c = GetNearestColor(hdc, color); + ok_(__FILE__, line)(c == exp, "GetNearestColor failed: got 0x%06x expected 0x%06x\n", c, exp); } +#define test_color(hdc, color, exp) _test_color( __LINE__, hdc, color, exp ) + static void test_dib_bits_access( HBITMAP hdib, void *bits ) { @@ -1514,6 +1516,113 @@ static void test_bitmap(void) DeleteDC(hdc); } +static COLORREF get_nearest( int r, int g, int b ) +{ + return (r*r + g*g + b*b < (255-r)*(255-r) + (255-g)*(255-g) + (255-b)*(255-b)) ? 0x000000 : 0xffffff; +} + +static int is_black_pen( COLORREF fg, COLORREF bg, int r, int g, int b ) +{ + if (fg == 0 || bg == 0xffffff) return RGB(r,g,b) != 0xffffff && RGB(r,g,b) != bg; + return RGB(r,g,b) == 0x000000 || RGB(r,g,b) == bg; +} + +static void test_bitmap_colors( HDC hdc, COLORREF fg, COLORREF bg, int r, int g, int b ) +{ + static const WORD pattern_bits[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; + WORD bits[16]; + COLORREF res; + HBRUSH old_brush; + HPEN old_pen; + HBITMAP pattern; + + res = SetPixel( hdc, 0, 0, RGB(r,g,b) ); + ok( res == get_nearest( r, g, b ), + "wrong result %06x for %02x,%02x,%02x fg %06x bg %06x\n", res, r, g, b, fg, bg ); + res = GetPixel( hdc, 0, 0 ); + ok( res == get_nearest( r, g, b ), + "wrong result %06x for %02x,%02x,%02x fg %06x bg %06x\n", res, r, g, b, fg, bg ); + res = GetNearestColor( hdc, RGB(r,g,b) ); + ok( res == get_nearest( r, g, b ), + "wrong result %06x for %02x,%02x,%02x fg %06x bg %06x\n", res, r, g, b, fg, bg ); + + /* solid pen */ + old_pen = SelectObject( hdc, CreatePen( PS_SOLID, 1, RGB(r,g,b) )); + MoveToEx( hdc, 0, 0, NULL ); + LineTo( hdc, 16, 0 ); + res = GetPixel( hdc, 0, 0 ); + ok( res == (is_black_pen( fg, bg, r, g, b ) ? 0 : 0xffffff), + "wrong result %06x for %02x,%02x,%02x fg %06x bg %06x\n", res, r, g, b, fg, bg ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == (is_black_pen( fg, bg, r, g, b ) ? 0x00 : 0xffff), + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + DeleteObject( SelectObject( hdc, old_pen )); + + /* mono DDB pattern brush */ + pattern = CreateBitmap( 16, 8, 1, 1, pattern_bits ); + old_brush = SelectObject( hdc, CreatePatternBrush( pattern )); + PatBlt( hdc, 0, 0, 16, 16, PATCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0x5555, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + DeleteObject( SelectObject( hdc, old_brush )); + DeleteObject( pattern ); +} + +static void test_mono_bitmap(void) +{ + static const COLORREF colors[][2] = + { + { RGB(0x00,0x00,0x00), RGB(0xff,0xff,0xff) }, + { RGB(0xff,0xff,0xff), RGB(0x00,0x00,0x00) }, + { RGB(0x00,0x00,0x00), RGB(0xff,0xff,0xfe) }, + { RGB(0x00,0x01,0x00), RGB(0xff,0xff,0xff) }, + { RGB(0x00,0x00,0x00), RGB(0x80,0x80,0x80) }, + { RGB(0x80,0x80,0x80), RGB(0xff,0xff,0xff) }, + { RGB(0x30,0x40,0x50), RGB(0x60,0x70,0x80) }, + { RGB(0xa0,0xa0,0xa0), RGB(0x20,0x30,0x10) }, + { PALETTEINDEX(0), PALETTEINDEX(255) }, + { PALETTEINDEX(1), PALETTEINDEX(2) }, + }; + + HBITMAP hbmp; + HDC hdc; + DWORD col; + int i, r, g, b; + + hdc = CreateCompatibleDC(0); + assert(hdc != 0); + + hbmp = CreateBitmap(16, 16, 1, 1, NULL); + assert(hbmp != NULL); + + SelectObject( hdc, hbmp ); + + for (col = 0; col < sizeof(colors) / sizeof(colors[0]); col++) + { + SetTextColor( hdc, colors[col][0] ); + SetBkColor( hdc, colors[col][1] ); + + for (i = 0; i < 256; i++) + { + HPALETTE pal = GetCurrentObject( hdc, OBJ_PAL ); + PALETTEENTRY ent; + + if (!GetPaletteEntries( pal, i, 1, &ent )) GetPaletteEntries( pal, 0, 1, &ent ); + test_color( hdc, PALETTEINDEX(i), get_nearest( ent.peRed, ent.peGreen, ent.peBlue )); + test_color( hdc, DIBINDEX(i), (i == 1) ? 0xffffff : 0x000000 ); + } + + for (r = 0; r < 256; r += 15) + for (g = 0; g < 256; g += 15) + for (b = 0; b < 256; b += 15) + test_bitmap_colors( hdc, colors[col][0], colors[col][1], r, g, b ); + } + + DeleteDC(hdc); + DeleteObject(hbmp); +} + static void test_bmBits(void) { BYTE bits[4]; @@ -5386,6 +5495,7 @@ START_TEST(bitmap) test_dib_formats(); test_mono_dibsection(); test_bitmap(); + test_mono_bitmap(); test_bmBits(); test_GetDIBits_selected_DIB(1); test_GetDIBits_selected_DIB(4);

1 0

Dmitry Timoshkov : gdiplus: Return correct status code if GdipAlloc fails.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 4060716dc4ca5d0468afb46a5f35083b7fe9669c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4060716dc4ca5d0468afb46a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 13:48:30 2012 +0900 gdiplus: Return correct status code if GdipAlloc fails. --- dlls/gdiplus/region.c | 52 ++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index e77a79b..fdc5dc3 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -254,20 +254,20 @@ GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *region, GpPath *path, Combin } 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; + if (left) + { + *left = region->node; + stat = clone_element(&path_region->node, &right); + if (stat == Ok) + { + fuse_region(region, left, right, mode); + GdipDeleteRegion(path_region); + return Ok; + } + } + else + stat = OutOfMemory; -out: GdipFree(left); GdipDeleteRegion(path_region); return stat; @@ -301,20 +301,20 @@ GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, } 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; + if (left) + { + memcpy(left, &region->node, sizeof(region_element)); + stat = clone_element(&rect_region->node, &right); + if (stat == Ok) + { + fuse_region(region, left, right, mode); + GdipDeleteRegion(rect_region); + return Ok; + } + } + else + stat = OutOfMemory; -out: GdipFree(left); GdipDeleteRegion(rect_region); return stat;

1 0

Dmitry Timoshkov : gdiplus: Avoid needless gotos.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: a33d34b83eba88d4ec10acdcc19db89e85d3c47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33d34b83eba88d4ec10acdcc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 13:49:02 2012 +0900 gdiplus: Avoid needless gotos. --- dlls/gdiplus/region.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index fdc5dc3..2da3857 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -151,15 +151,15 @@ static inline GpStatus clone_element(const region_element* element, { case RegionDataRect: (*element2)->elementdata.rect = element->elementdata.rect; - break; + return Ok; case RegionDataEmptyRect: case RegionDataInfiniteRect: - break; + return Ok; 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; + if (stat == Ok) return Ok; break; default: (*element2)->elementdata.combine.left = NULL; @@ -167,16 +167,15 @@ static inline GpStatus clone_element(const region_element* element, 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; + if (stat == Ok) + { + stat = clone_element(element->elementdata.combine.right, + &(*element2)->elementdata.combine.right); + if (stat == Ok) return Ok; + } break; } - return Ok; - -clone_out: delete_element(*element2); *element2 = NULL; return stat;

1 0