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

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedGray4 palette.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: d5cc4021b6ffd4116138eff84eb1d81241b66c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5cc4021b6ffd4116138eff84… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:55:45 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedGray4 palette. --- dlls/windowscodecs/palette.c | 10 ++++++++++ dlls/windowscodecs/tests/palette.c | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 8941fb5..ffd5877 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -117,6 +117,16 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, colors[1] = 0xffffffff; break; + case WICBitmapPaletteTypeFixedGray4: + count = 4; + colors = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WICColor)); + if (!colors) return E_OUTOFMEMORY; + colors[0] = 0xff000000; + colors[1] = 0xff555555; + colors[2] = 0xffaaaaaa; + colors[3] = 0xffffffff; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 7a34be7..1768e1a 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -159,6 +159,8 @@ static void test_predefined_palette(void) } td[] = { { WICBitmapPaletteTypeFixedBW, 1, 1, 2, { 0xff000000, 0xffffffff } }, + { WICBitmapPaletteTypeFixedGray4, 0, 1, 4, + { 0xff000000, 0xff555555, 0xffaaaaaa, 0xffffffff } }, }; IWICImagingFactory *factory; IWICPalette *palette;

1 0

Matteo Bruni : d3dcompiler: Use location information in add_modifier().
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 2b2b8501060e6594424700bf543a99aea50a3704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2b8501060e6594424700bf5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 12 16:01:36 2012 +0200 d3dcompiler: Use location information in add_modifier(). --- dlls/d3dcompiler_43/hlsl.y | 60 ++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index cadcfc9..cf0c7b5 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -146,25 +146,7 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) return TRUE; } -static DWORD add_modifier(DWORD modifiers, DWORD mod) -{ - if (modifiers & mod) - { - hlsl_message("Line %u: modifier '%s' already specified.\n", - hlsl_ctx.line_no, debug_modifiers(mod)); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - return modifiers; - } - if (mod & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) - && modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)) - { - hlsl_message("Line %u: more than one matrix majority keyword.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - return modifiers; - } - return modifiers | mod; -} +static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc); static unsigned int components_count_expr_list(struct list *list) { @@ -691,47 +673,47 @@ var_modifiers: /* Empty */ } | KW_EXTERN var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_EXTERN); + $$ = add_modifier($2, HLSL_STORAGE_EXTERN, &@1); } | KW_NOINTERPOLATION var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_NOINTERPOLATION); + $$ = add_modifier($2, HLSL_STORAGE_NOINTERPOLATION, &@1); } | KW_PRECISE var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_PRECISE); + $$ = add_modifier($2, HLSL_MODIFIER_PRECISE, &@1); } | KW_SHARED var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_SHARED); + $$ = add_modifier($2, HLSL_STORAGE_SHARED, &@1); } | KW_GROUPSHARED var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_GROUPSHARED); + $$ = add_modifier($2, HLSL_STORAGE_GROUPSHARED, &@1); } | KW_STATIC var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_STATIC); + $$ = add_modifier($2, HLSL_STORAGE_STATIC, &@1); } | KW_UNIFORM var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_UNIFORM); + $$ = add_modifier($2, HLSL_STORAGE_UNIFORM, &@1); } | KW_VOLATILE var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_VOLATILE); + $$ = add_modifier($2, HLSL_STORAGE_VOLATILE, &@1); } | KW_CONST var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_CONST); + $$ = add_modifier($2, HLSL_MODIFIER_CONST, &@1); } | KW_ROW_MAJOR var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_ROW_MAJOR); + $$ = add_modifier($2, HLSL_MODIFIER_ROW_MAJOR, &@1); } | KW_COLUMN_MAJOR var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_COLUMN_MAJOR); + $$ = add_modifier($2, HLSL_MODIFIER_COLUMN_MAJOR, &@1); } complex_initializer: initializer_expr @@ -995,6 +977,24 @@ static void set_location(struct source_location *loc, const struct YYLTYPE *l) loc->col = l->first_column; } +static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc) +{ + if (modifiers & mod) + { + hlsl_report_message(hlsl_ctx.source_file, loc->first_line, loc->first_column, HLSL_LEVEL_ERROR, + "modifier '%s' already specified", debug_modifiers(mod)); + return modifiers; + } + if (mod & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) + && modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)) + { + hlsl_report_message(hlsl_ctx.source_file, loc->first_line, loc->first_column, HLSL_LEVEL_ERROR, + "more than one matrix majority keyword"); + return modifiers; + } + return modifiers | mod; +} + struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD minor, const char *entrypoint, char **messages) {

1 0

Matteo Bruni : d3dcompiler: Store (and begin to use) location information for variables.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: a84784e0577c26e0fd7741cde4cdc5809cd927a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84784e0577c26e0fd7741cde… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 12 16:01:35 2012 +0200 d3dcompiler: Store (and begin to use) location information for variables. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 ++ dlls/d3dcompiler_43/hlsl.y | 26 +++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5bb74f0..194ed25 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -820,6 +820,8 @@ struct parse_parameter struct parse_variable_def { struct list entry; + struct source_location loc; + char *name; unsigned int array_size; char *semantic; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index f4afd48..cadcfc9 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -32,6 +32,9 @@ int hlsl_lex(void); struct hlsl_parse_ctx hlsl_ctx; +struct YYLTYPE; +static void set_location(struct source_location *loc, const struct YYLTYPE *l); + void hlsl_message(const char *fmt, ...) { va_list args; @@ -125,9 +128,8 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) | HLSL_STORAGE_GROUPSHARED | HLSL_STORAGE_UNIFORM); if (invalid) { - hlsl_message("Line %u: modifier '%s' invalid for local variables.\n", - hlsl_ctx.line_no, debug_modifiers(invalid)); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(decl->node.loc.file, decl->node.loc.line, decl->node.loc.col, HLSL_LEVEL_ERROR, + "modifier '%s' invalid for local variables", debug_modifiers(invalid)); } } ret = add_declaration(hlsl_ctx.cur_scope, decl, local); @@ -135,9 +137,10 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) { struct hlsl_ir_var *old = get_variable(hlsl_ctx.cur_scope, decl->name); - hlsl_message("Line %u: \"%s\" already declared.\n", hlsl_ctx.line_no, decl->name); - hlsl_message("Line %u: \"%s\" was previously declared here.\n", old->node.loc.line, decl->name); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(decl->node.loc.file, decl->node.loc.line, decl->node.loc.col, HLSL_LEVEL_ERROR, + "\"%s\" already declared", decl->name); + hlsl_report_message(old->node.loc.file, old->node.loc.line, old->node.loc.col, HLSL_LEVEL_NOTE, + "\"%s\" was previously declared here", old->name); return FALSE; } return TRUE; @@ -613,10 +616,10 @@ declaration: var_modifiers type variables_def ';' var->node.data_type = new_array_type($2, v->array_size); else var->node.data_type = $2; + var->node.loc = v->loc; var->name = v->name; var->modifiers = $1; var->semantic = v->semantic; - var->node.loc.line = hlsl_ctx.line_no; if (v->initializer) { FIXME("Variable with an initializer.\n"); @@ -655,6 +658,7 @@ variables_def: variable_def variable_def: any_identifier array semantic { $$ = d3dcompiler_alloc(sizeof(*$$)); + set_location(&$$->loc, &@1); $$->name = $1; $$->array_size = $2; $$->semantic = $3; @@ -663,6 +667,7 @@ variable_def: any_identifier array semantic { TRACE("Declaration with initializer.\n"); $$ = d3dcompiler_alloc(sizeof(*$$)); + set_location(&$$->loc, &@1); $$->name = $1; $$->array_size = $2; $$->semantic = $3; @@ -983,6 +988,13 @@ expr: assignment_expr %% +static void set_location(struct source_location *loc, const struct YYLTYPE *l) +{ + loc->file = hlsl_ctx.source_file; + loc->line = l->first_line; + loc->col = l->first_column; +} + struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD minor, const char *entrypoint, char **messages) {

1 0

Dmitry Timoshkov : windowscodecs: Add a test for palette associated with black&white TIFF image.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: c5820b7910b89c993f94001c277d2734f24d9c5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5820b7910b89c993f94001c2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 19:13:22 2012 +0900 windowscodecs: Add a test for palette associated with black&white TIFF image. --- dlls/windowscodecs/tests/Makefile.in | 3 +- dlls/windowscodecs/tests/tiffformat.c | 163 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/tiffformat.c | 2 +- 3 files changed, 166 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index 048fc29..e70af96 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ info.c \ metadata.c \ palette.c \ - stream.c + stream.c \ + tiffformat.c @MAKE_TEST_RULES@ diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c new file mode 100644 index 0000000..fb57b91 --- /dev/null +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -0,0 +1,163 @@ +/* + * Copyright 2012 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "wincodec.h" +#include "wine/test.h" + +#define IFD_BYTE 1 +#define IFD_ASCII 2 +#define IFD_SHORT 3 +#define IFD_LONG 4 +#define IFD_RATIONAL 5 +#define IFD_SBYTE 6 +#define IFD_UNDEFINED 7 +#define IFD_SSHORT 8 +#define IFD_SLONG 9 +#define IFD_SRATIONAL 10 +#define IFD_FLOAT 11 +#define IFD_DOUBLE 12 + +#include "pshpack2.h" +struct IFD_entry +{ + SHORT id; + SHORT type; + ULONG count; + LONG value; +}; + +struct IFD_rational +{ + LONG numerator; + LONG denominator; +}; + +static const struct tiff_1bpp_data +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[13]; + ULONG next_IFD; + struct IFD_rational res; + BYTE pixel_data[4]; +} tiff_1bpp_data = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_1bpp_data, number_of_entries), + 13, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 1 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 1 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 1 }, /* BITSPERSAMPLE */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ + { 0x106, IFD_SHORT, 1, 1 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_1bpp_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 1 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, + { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ + }, + 0, + { 900, 3 }, + { 0x11, 0x22, 0x33, 0 } +}; +#include "poppack.h" + +static IWICBitmapDecoder *create_decoder(IWICImagingFactory *factory, + const void *image_data, UINT image_size) +{ + HGLOBAL hmem; + BYTE *data; + HRESULT hr; + IWICBitmapDecoder *decoder = NULL; + IStream *stream; + GUID guid; + + hmem = GlobalAlloc(0, image_size); + data = GlobalLock(hmem); + memcpy(data, image_data, image_size); + GlobalUnlock(hmem); + + hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guid); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&guid, &GUID_ContainerFormatTiff), "container format is not TIFF\n"); + + IStream_Release(stream); + + return decoder; +} + +static void test_tiff_palette(void) +{ + HRESULT hr; + IWICImagingFactory *factory; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + if (FAILED(hr)) return; + + decoder = create_decoder(factory, &tiff_1bpp_data, sizeof(tiff_1bpp_data)); + ok(decoder != 0, "Failed to load TIFF image data\n"); + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, + "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %#x\n", hr); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); + IWICImagingFactory_Release(factory); +} + +START_TEST(tiffformat) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_tiff_palette(); + + CoUninitialize(); +} diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 232aa44..19aa441 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -878,7 +878,7 @@ static HRESULT WINAPI TiffFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, if (!ret) { WARN("Couldn't read color map\n"); - return E_FAIL; + return WINCODEC_ERR_PALETTEUNAVAILABLE; } for (i=0; i<color_count; i++)

1 0

Vincent Povirk : gdiplus: Fix memory leak in GdipImageRotateFlip.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 198fb25d17248b23d084b843baff8b0fcb7d5d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=198fb25d17248b23d084b843b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 12 09:17:56 2012 -0500 gdiplus: Fix memory leak in GdipImageRotateFlip. --- dlls/gdiplus/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 233a9eac..9b36280 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1973,6 +1973,7 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) assert(dst->image.type == ImageTypeBitmap); GdipFree(dst->bitmapbits); + GdipFree(dst->own_bits); DeleteDC(dst->hdc); DeleteObject(dst->hbitmap);

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedBW palette. Resend.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: ca9d128ecaaa07ce057af709039e25fcf92ab4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9d128ecaaa07ce057af7090… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:06:29 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedBW palette. Resend. --- dlls/windowscodecs/palette.c | 33 ++++++++++++++- dlls/windowscodecs/tests/palette.c | 74 ++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index ec74d13..8941fb5 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -99,10 +99,37 @@ static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) } static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, - WICBitmapPaletteType ePaletteType, BOOL fAddTransparentColor) + WICBitmapPaletteType type, BOOL add_transparent) { - FIXME("(%p,%u,%i): stub\n", iface, ePaletteType, fAddTransparentColor); - return E_NOTIMPL; + PaletteImpl *This = impl_from_IWICPalette(iface); + WICColor *colors; + UINT count; + + TRACE("(%p,%u,%d)\n", iface, type, add_transparent); + + switch (type) + { + case WICBitmapPaletteTypeFixedBW: + count = 2; + colors = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WICColor)); + if (!colors) return E_OUTOFMEMORY; + colors[0] = 0xff000000; + colors[1] = 0xffffffff; + break; + + default: + FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); + return E_NOTIMPL; + } + + EnterCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, This->colors); + This->colors = colors; + This->count = count; + This->type = type; + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index ee9dfbc..7a34be7 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -148,11 +148,85 @@ static void test_custom_palette(void) IWICImagingFactory_Release(factory); } +static void test_predefined_palette(void) +{ + static struct test_data + { + WICBitmapPaletteType type; + BOOL is_bw, is_gray; + UINT count; + WICColor color[256]; + } td[] = + { + { WICBitmapPaletteTypeFixedBW, 1, 1, 2, { 0xff000000, 0xffffffff } }, + }; + IWICImagingFactory *factory; + IWICPalette *palette; + HRESULT hr; + WICBitmapPaletteType type; + UINT count, i, ret; + BOOL bret; + WICColor color[256]; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "%u: CreatePalette error %#x\n", i, hr); + + hr = IWICPalette_InitializePredefined(palette, td[i].type, FALSE); + ok(hr == S_OK, "%u: InitializePredefined error %#x\n", i, hr); + + bret = -1; + hr = IWICPalette_IsBlackWhite(palette, &bret); + ok(hr == S_OK, "%u: IsBlackWhite error %#x\n", i, hr); + ok(bret == td[i].is_bw || + broken(td[i].type == WICBitmapPaletteTypeFixedBW && bret != td[i].is_bw), /* XP */ + "%u: expected %d, got %d\n",i, td[i].is_bw, bret); + + bret = -1; + hr = IWICPalette_IsGrayscale(palette, &bret); + ok(hr == S_OK, "%u: IsGrayscale error %#x\n", i, hr); + ok(bret == td[i].is_gray, "%u: expected %d, got %d\n", i, td[i].is_gray, bret); + + type = -1; + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "%u: GetType error %#x\n", i, hr); + ok(type == td[i].type, "%u: expected %#x, got %#x\n", i, td[i].type, type); + + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "%u: GetColorCount error %#x\n", i, hr); + ok(count == td[i].count, "%u: expected %u, got %u\n", i, td[i].count, count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "%u: GetColors error %#x\n", i, hr); + ok(ret == count, "%u: expected %u, got %u\n", i, count, ret); + if (ret == td[i].count) + { + UINT j; + for (j = 0; j < count; j++) + { + ok(color[j] == td[i].color[j], "%u:[%u]: expected %#x, got %#x\n", + i, j, td[i].color[j], color[j]); + } + } + + IWICPalette_Release(palette); + } + + IWICImagingFactory_Release(factory); +} + START_TEST(palette) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_custom_palette(); + test_predefined_palette(); CoUninitialize(); }

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone8 palette.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 63cb0cf6d2ff856bf36066c6d970a8072a444c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63cb0cf6d2ff856bf36066c6d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:10:27 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone8 palette. --- dlls/windowscodecs/palette.c | 33 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 27 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 9d3b8ee..9280aa1 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -132,6 +133,33 @@ static WICColor *generate_gray256_palette(UINT *count) return entries; } +static WICColor *generate_halftone8_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 16; + entries = HeapAlloc(GetProcessHeap(), 0, 16 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 8; i++) + { + entries[i] = 0xff000000; + if (i & 1) entries[i] |= 0xff; + if (i & 2) entries[i] |= 0xff00; + if (i & 4) entries[i] |= 0xff0000; + } + + for (i = 8; i < 16; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-8]; + } + return entries; +} + static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, WICBitmapPaletteType type, BOOL add_transparent) { @@ -171,6 +199,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone8: + colors = generate_halftone8_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index ef21307..e92c871 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -175,6 +176,29 @@ static void generate_gray256_palette(DWORD *entries, UINT count) } } +static void generate_halftone8_palette(DWORD *entries, UINT count) +{ + UINT i; + + assert(count == 16); + + for (i = 0; i < 8; i++) + { + entries[i] = 0xff000000; + if (i & 1) entries[i] |= 0xff; + if (i & 2) entries[i] |= 0xff00; + if (i & 4) entries[i] |= 0xff0000; + } + + for (i = 8; i < 16; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-8]; + } +} + static void test_predefined_palette(void) { static struct test_data @@ -190,6 +214,7 @@ static void test_predefined_palette(void) { 0xff000000, 0xff555555, 0xffaaaaaa, 0xffffffff } }, { WICBitmapPaletteTypeFixedGray16, 0, 1, 16, { 0 } }, { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, }; IWICImagingFactory *factory; IWICPalette *palette; @@ -244,6 +269,8 @@ static void test_predefined_palette(void) generate_gray16_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedGray256) generate_gray256_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone8) + generate_halftone8_palette(td[i].color, td[i].count); for (j = 0; j < count; j++) {

1 0

Vincent Povirk : gdiplus: Implement LineJoinMiterClipped and partially implement LineJoinMiter.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: cbfc79aae574e8c162268c50ee501e880d3f60bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbfc79aae574e8c162268c50e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 28 09:06:44 2012 -0500 gdiplus: Implement LineJoinMiterClipped and partially implement LineJoinMiter. --- dlls/gdiplus/graphicspath.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 370bb1f..ac17cc1 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1704,6 +1704,37 @@ static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF * { switch (pen->join) { + case LineJoinMiter: + case LineJoinMiterClipped: + { + if ((p2->X - p1->X) * (p3->Y - p1->Y) > (p2->Y - p1->Y) * (p3->X - p1->X)) + { + float distance = pen->width/2.0; + float length_0 = sqrtf((p2->X-p1->X)*(p2->X-p1->X)+(p2->Y-p1->Y)*(p2->Y-p1->Y)); + float length_1 = sqrtf((p3->X-p2->X)*(p3->X-p2->X)+(p3->Y-p2->Y)*(p3->Y-p2->Y)); + float dx0 = distance * (p2->X - p1->X) / length_0; + float dy0 = distance * (p2->Y - p1->Y) / length_0; + float dx1 = distance * (p3->X - p2->X) / length_1; + float dy1 = distance * (p3->Y - p2->Y) / length_1; + float det = (dy0*dx1 - dx0*dy1); + float dx = (dx0*dx1*(dx0-dx1) + dy0*dy0*dx1 - dy1*dy1*dx0)/det; + float dy = (dy0*dy1*(dy0-dy1) + dx0*dx0*dy1 - dx1*dx1*dy0)/det; + if (dx*dx + dy*dy < pen->miterlimit*pen->miterlimit * distance*distance) + { + *last_point = add_path_list_node(*last_point, p2->X + dx, + p2->Y + dy, PathPointTypeLine); + break; + } + else if (pen->join == LineJoinMiter) + { + static int once; + if (!once++) + FIXME("should add a clipped corner\n"); + } + /* else fall-through */ + } + /* else fall-through */ + } default: case LineJoinBevel: add_bevel_point(p2, p1, pen, 1, last_point); @@ -1838,7 +1869,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if (pen->dashcap != DashCapFlat) FIXME("unimplemented dash cap %d\n", pen->dashcap); - if (pen->join != LineJoinBevel) + if (pen->join == LineJoinRound) FIXME("unimplemented line join %d\n", pen->join); if (pen->dash != DashStyleSolid)

1 0

Vincent Povirk : gdiplus: Accept a transformation matrix in GdipFlattenPath .
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 12f1ed2b3e89ad6fe0fe2dc7c2a0e20caa7a275b URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f1ed2b3e89ad6fe0fe2dc7c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 11 16:10:31 2012 -0500 gdiplus: Accept a transformation matrix in GdipFlattenPath. --- dlls/gdiplus/graphicspath.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index ac17cc1..98d3fe9 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1189,20 +1189,22 @@ GpStatus WINGDIPAPI GdipFlattenPath(GpPath *path, GpMatrix* matrix, REAL flatnes GpPointF pt; INT i = 1; INT startidx = 0; + GpStatus stat; TRACE("(%p, %p, %.2f)\n", path, matrix, flatness); if(!path) return InvalidParameter; - if(matrix){ - WARN("transformation not supported yet!\n"); - return NotImplemented; - } - if(path->pathdata.Count == 0) return Ok; + if(matrix){ + stat = GdipTransformPath(path, matrix); + if (stat != Ok) + return stat; + } + pt = path->pathdata.Points[0]; if(!init_path_list(&list, pt.X, pt.Y)) return OutOfMemory;

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedGray256 palette.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: ca126c069fcbf388acac0326d18ea3fb6343bb12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca126c069fcbf388acac0326d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:09:26 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedGray256 palette. --- dlls/windowscodecs/palette.c | 22 ++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 16 ++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 03f5774a..9d3b8ee 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -115,6 +115,23 @@ static WICColor *generate_gray16_palette(UINT *count) return entries; } +static WICColor *generate_gray256_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 256; + entries = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 256; i++) + { + entries[i] = 0xff000000; + entries[i] |= (i<<16) | (i<<8) | i; + } + return entries; +} + static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, WICBitmapPaletteType type, BOOL add_transparent) { @@ -149,6 +166,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedGray256: + colors = generate_gray256_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index aba8168..ef21307 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -162,6 +162,19 @@ static void generate_gray16_palette(DWORD *entries, UINT count) } } +static void generate_gray256_palette(DWORD *entries, UINT count) +{ + UINT i; + + assert(count == 256); + + for (i = 0; i < 256; i++) + { + entries[i] = 0xff000000; + entries[i] |= (i << 16) | (i << 8) | i; + } +} + static void test_predefined_palette(void) { static struct test_data @@ -176,6 +189,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedGray4, 0, 1, 4, { 0xff000000, 0xff555555, 0xffaaaaaa, 0xffffffff } }, { WICBitmapPaletteTypeFixedGray16, 0, 1, 16, { 0 } }, + { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, }; IWICImagingFactory *factory; IWICPalette *palette; @@ -228,6 +242,8 @@ static void test_predefined_palette(void) if (td[i].type == WICBitmapPaletteTypeFixedGray16) generate_gray16_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedGray256) + generate_gray256_palette(td[i].color, td[i].count); for (j = 0; j < count; j++) {

1 0