December 2009 - Wine-commits

André Hentschel : dbghelp: Implement literal dwarf opcodes.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 255a1ebaadfb8795ab76ebd0360708973bb825cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=255a1ebaadfb8795ab76ebd03… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 20 17:27:35 2009 +0100 dbghelp: Implement literal dwarf opcodes. --- dlls/dbghelp/dwarf.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 16ea011..d9e52d3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -684,6 +684,15 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, op = dwarf2_parse_byte(ctx); switch (op) { + case DW_OP_lit0: case DW_OP_lit1: case DW_OP_lit2: case DW_OP_lit3: + case DW_OP_lit4: case DW_OP_lit5: case DW_OP_lit6: case DW_OP_lit7: + case DW_OP_lit8: case DW_OP_lit9: case DW_OP_lit10: case DW_OP_lit11: + case DW_OP_lit12: case DW_OP_lit13: case DW_OP_lit14: case DW_OP_lit15: + case DW_OP_lit16: case DW_OP_lit17: case DW_OP_lit18: case DW_OP_lit19: + case DW_OP_lit20: case DW_OP_lit21: case DW_OP_lit22: case DW_OP_lit23: + case DW_OP_lit24: case DW_OP_lit25: case DW_OP_lit26: case DW_OP_lit27: + case DW_OP_lit28: case DW_OP_lit29: case DW_OP_lit30: case DW_OP_lit31: + stack[++stk] = op - DW_OP_lit0; break; case DW_OP_addr: stack[++stk] = dwarf2_parse_addr(ctx); break; case DW_OP_const1u: stack[++stk] = dwarf2_parse_byte(ctx); break; case DW_OP_const1s: stack[++stk] = (long)(signed char)dwarf2_parse_byte(ctx); break;

1 0

André Hentschel : include: Do not separate control names.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 738e94506ed1ed1320864f8fff701bf0702229ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=738e94506ed1ed1320864f8ff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 20 15:35:01 2009 +0100 include: Do not separate control names. --- include/commctrl.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index b88d694..27bd745 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5159,7 +5159,7 @@ static const WCHAR WC_EDITW[] = { 'E','d','i','t',0 }; #define WC_EDIT WINELIB_NAME_AW(WC_EDIT) /************************************************************************** - * List box control + * Listbox control */ #define WC_LISTBOXA "ListBox" @@ -5173,7 +5173,7 @@ static const WCHAR WC_LISTBOXW[] = { 'L','i','s','t','B','o','x',0 }; #define WC_LISTBOX WINELIB_NAME_AW(WC_LISTBOX) /************************************************************************** - * Scroll bar control + * Scrollbar control */ #define WC_SCROLLBARA "ScrollBar"

1 0

Nikolay Sivov : comctl32/rebar: Use DPA to manage bands data.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 1e74d5992c9b5eb52bf52e9593df058c57c7ce96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e74d5992c9b5eb52bf52e959… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 19 13:04:35 2009 +0300 comctl32/rebar: Use DPA to manage bands data. --- dlls/comctl32/rebar.c | 225 +++++++++++++++++++++++-------------------------- 1 files changed, 104 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e74d5992c9b5eb52bf52…

1 0

Nikolay Sivov : comctl32/rebar: Move parameter cast to winproc.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: b6abcb2f86779c9c9a8b0cd27d91e480aedbdb6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6abcb2f86779c9c9a8b0cd27… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 19 13:52:25 2009 +0300 comctl32/rebar: Move parameter cast to winproc. --- dlls/comctl32/rebar.c | 287 ++++++++++++++++++++++--------------------------- 1 files changed, 127 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6abcb2f86779c9c9a8b0…

1 0

Vincent Povirk : gdiplus: Add traces for values of newly-created linecaps.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: d5fffdd0c41b7b2364be849e3cb6e5b312752b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5fffdd0c41b7b2364be849e3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:00:39 2009 -0600 gdiplus: Add traces for values of newly-created linecaps. --- dlls/gdiplus/customlinecap.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 5658e69..e8ad968 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -57,6 +57,8 @@ GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap* from, * sizeof(PointF)); memcpy((*to)->pathdata.Types, from->pathdata.Types, from->pathdata.Count); + TRACE("<-- %p\n", *to); + return Ok; } @@ -105,6 +107,8 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath* fillPath, GpPath* strokePath (*customCap)->join = LineJoinMiter; (*customCap)->scale = 1.0; + TRACE("<-- %p\n", *customCap); + return Ok; }

1 0

Vincent Povirk : gdiplus: Add traces for values of newly-created font objects.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 2d8fb9ade3a766290cb8e797af69a272e5976554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8fb9ade3a766290cb8e797a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:04:56 2009 -0600 gdiplus: Add traces for values of newly-created font objects. --- dlls/gdiplus/font.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 89498bc..fda5428 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -158,6 +158,8 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, (*font)->height = tmw->ntmSizeEM; (*font)->line_spacing = tmw->tmAscent + tmw->tmDescent + tmw->tmExternalLeading; + TRACE("<-- %p\n", *font); + return Ok; } @@ -205,6 +207,8 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, SelectObject(hdc, oldfont); DeleteObject(hfont); + TRACE("<-- %p\n", *font); + return Ok; } @@ -583,6 +587,8 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, *FontFamily = ffamily; + TRACE("<-- %p\n", ffamily); + return Ok; } @@ -611,6 +617,8 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily* FontFamily, GpFontFamily** (*clonedFontFamily)->tmw = FontFamily->tmw; lstrcpyW((*clonedFontFamily)->FamilyName, FontFamily->FamilyName); + TRACE("<-- %p\n", *clonedFontFamily); + return Ok; } @@ -845,6 +853,9 @@ GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection** fontCollecti (*fontCollection)->FontFamilies = NULL; (*fontCollection)->count = 0; (*fontCollection)->allocated = 0; + + TRACE("<-- %p\n", *fontCollection); + return Ok; }

1 0

Vincent Povirk : gdiplus: Add trace for values of new graphics and image objects.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: f8ca372459b2700dac452f3a3b06a7d6a14a5962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ca372459b2700dac452f3a3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:09:45 2009 -0600 gdiplus: Add trace for values of new graphics and image objects. --- dlls/gdiplus/graphics.c | 4 ++++ dlls/gdiplus/image.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b1092b7..5ab544d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1162,6 +1162,8 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra list_init(&(*graphics)->containers); (*graphics)->contid = 0; + TRACE("<-- %p\n", *graphics); + return Ok; } @@ -1271,6 +1273,8 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, if(delete) DeleteMetaFile(hwmf); + TRACE("<-- %p\n", *metafile); + return Ok; err: diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3dbe4da..9858f33 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1282,6 +1282,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, } } + TRACE("<-- %p\n", *bitmap); + return Ok; } @@ -1976,6 +1978,8 @@ static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid (*image)->palette_size = 0; (*image)->palette_entries = NULL; + TRACE("<-- %p\n", *image); + return Ok; }

1 0

Vincent Povirk : gdiplus: Allocate a new ImageAttributes object in GdipCloneImageAttributes.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 149c44eb4c4d390d1d84625137dd06dfd7a5b1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=149c44eb4c4d390d1d8462513… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:18:49 2009 -0600 gdiplus: Allocate a new ImageAttributes object in GdipCloneImageAttributes. --- dlls/gdiplus/imageattributes.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 8f49c67..a52c297 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -30,14 +30,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imageattr, GpImageAttributes **cloneImageattr) { + GpStatus stat; + TRACE("(%p, %p)\n", imageattr, cloneImageattr); if(!imageattr || !cloneImageattr) return InvalidParameter; - **cloneImageattr = *imageattr; + stat = GdipCreateImageAttributes(cloneImageattr); - return Ok; + if (stat == Ok) + **cloneImageattr = *imageattr; + + return stat; } GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr)

1 0

Vincent Povirk : gdiplus: Add a test for GdipSetImageAttributesColorMatrix.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 70bdc43c20a01d01920c1e397c2e9a26829f76bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=70bdc43c20a01d01920c1e397… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 17:38:40 2009 -0600 gdiplus: Add a test for GdipSetImageAttributesColorMatrix. --- dlls/gdiplus/tests/image.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 522e5de..14a4b1b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1092,6 +1092,109 @@ static void test_palette(void) GdipDisposeImage((GpImage*)bitmap); } +static void test_colormatrix(void) +{ + GpStatus stat; + ColorMatrix colormatrix, graymatrix; + GpImageAttributes *imageattr; + const ColorMatrix identity = {{ + {1.0,0.0,0.0,0.0,0.0}, + {0.0,1.0,0.0,0.0,0.0}, + {0.0,0.0,1.0,0.0,0.0}, + {0.0,0.0,0.0,1.0,0.0}, + {0.0,0.0,0.0,0.0,1.0}}}; + const ColorMatrix double_red = {{ + {2.0,0.0,0.0,0.0,0.0}, + {0.0,1.0,0.0,0.0,0.0}, + {0.0,0.0,1.0,0.0,0.0}, + {0.0,0.0,0.0,1.0,0.0}, + {0.0,0.0,0.0,0.0,1.0}}}; + GpBitmap *bitmap1, *bitmap2; + GpGraphics *graphics; + ARGB color; + + colormatrix = identity; + graymatrix = identity; + + stat = GdipSetImageAttributesColorMatrix(NULL, ColorAdjustTypeDefault, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); + expect(InvalidParameter, stat); + + stat = GdipCreateImageAttributes(&imageattr); + expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, NULL, NULL, ColorMatrixFlagsDefault); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsSkipGrays); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsAltGray); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsAltGray); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, &graymatrix, 3); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeCount, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeAny, + TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + FALSE, NULL, NULL, ColorMatrixFlagsDefault); + todo_wine expect(Ok, stat); + + /* Drawing a bitmap transforms the colors */ + colormatrix = double_red; + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); + todo_wine expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap1); + expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap2); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 0, 0, 0xff40ffff); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap2, &graphics); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,1,1, 0,0,1,1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + todo_wine expect(0xff80ffff, color); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap1); + GdipDisposeImage((GpImage*)bitmap2); + GdipDisposeImageAttributes(imageattr); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1120,6 +1223,7 @@ START_TEST(image) test_createhbitmap(); test_getsetpixel(); test_palette(); + test_colormatrix(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Implement GdipSetImageAttributesColorMatrix.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 0c9991c583a0694502121eefb2c91289a6719dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9991c583a0694502121eefb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 17:42:18 2009 -0600 gdiplus: Implement GdipSetImageAttributesColorMatrix. --- dlls/gdiplus/gdiplus_private.h | 8 ++++++++ dlls/gdiplus/imageattributes.c | 27 ++++++++++++++++++++++----- dlls/gdiplus/tests/image.c | 18 +++++++++--------- 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0ceeb6e..9a357c8 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -249,9 +249,17 @@ struct color_key{ ARGB high; }; +struct color_matrix{ + BOOL enabled; + ColorMatrixFlags flags; + ColorMatrix colormatrix; + ColorMatrix graymatrix; +}; + struct GpImageAttributes{ WrapMode wrap; struct color_key colorkeys[ColorAdjustTypeCount]; + struct color_matrix colormatrices[ColorAdjustTypeCount]; }; struct GpFont{ diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index a52c297..6bfd23e 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -89,15 +89,32 @@ GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes *imageat ColorAdjustType type, BOOL enableFlag, GDIPCONST ColorMatrix* colorMatrix, GDIPCONST ColorMatrix* grayMatrix, ColorMatrixFlags flags) { - static int calls; + TRACE("(%p,%u,%i,%p,%p,%u)\n", imageattr, type, enableFlag, colorMatrix, + grayMatrix, flags); - if(!imageattr || !colorMatrix || !grayMatrix) + if(!imageattr || type >= ColorAdjustTypeCount || flags > ColorMatrixFlagsAltGray) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if (enableFlag) + { + if (!colorMatrix) + return InvalidParameter; - return NotImplemented; + if (flags == ColorMatrixFlagsAltGray) + { + if (!grayMatrix) + return InvalidParameter; + + imageattr->colormatrices[type].graymatrix = *grayMatrix; + } + + imageattr->colormatrices[type].colormatrix = *colorMatrix; + imageattr->colormatrices[type].flags = flags; + } + + imageattr->colormatrices[type].enabled = enableFlag; + + return Ok; } GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes *imageAttr, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 14a4b1b..e090de9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1125,7 +1125,7 @@ static void test_colormatrix(void) stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, NULL, NULL, ColorMatrixFlagsDefault); @@ -1133,11 +1133,11 @@ static void test_colormatrix(void) stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, NULL, ColorMatrixFlagsSkipGrays); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, NULL, ColorMatrixFlagsAltGray); @@ -1145,29 +1145,29 @@ static void test_colormatrix(void) stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsAltGray); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, &graymatrix, 3); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeCount, TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeAny, TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, FALSE, NULL, NULL, ColorMatrixFlagsDefault); - todo_wine expect(Ok, stat); + expect(Ok, stat); /* Drawing a bitmap transforms the colors */ colormatrix = double_red; stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap1); expect(Ok, stat);

1 0