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

Henri Verbeet : d2d1: Implement d2d_factory_CreateRectangleGeometry().
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: 391fda7599fb803048104165a54e35d8e781f07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=391fda7599fb803048104165a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:39 2015 +0200 d2d1: Implement d2d_factory_CreateRectangleGeometry(). --- dlls/d2d1/d2d1_private.h | 29 ++++- dlls/d2d1/factory.c | 20 ++- dlls/d2d1/geometry.c | 324 +++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 332 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=391fda7599fb803048104…

1 0

Nikolay Sivov : dwrite/tests: Fix trimming sign instance leak (Valgrind).
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: a32168bc499e154642a0093755367b5bfb742cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32168bc499e154642a009375… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 11:03:30 2015 +0300 dwrite/tests: Fix trimming sign instance leak (Valgrind). --- dlls/dwrite/tests/layout.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a2150d9..2423f8b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1482,6 +1482,7 @@ static void test_Draw(void) ok_sequence(sequences, RENDERER_ID, draw_single_run_seq, "draw test 10", FALSE); IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(inlineobj); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Dmitry Timoshkov : gdiplus: Move the burden of supporting GIF encoding to the WIC backend.
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: f78a6dd15c85f374a841427d7edce7427e5bbb87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78a6dd15c85f374a841427d7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 15:02:12 2015 +0800 gdiplus: Move the burden of supporting GIF encoding to the WIC backend. --- dlls/gdiplus/image.c | 10 ++++-- dlls/gdiplus/tests/image.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 73f2f74..23c465e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4401,6 +4401,12 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, return encode_image_wic(image, stream, &GUID_ContainerFormatJpeg, params); } +static GpStatus encode_image_gif(GpImage *image, IStream* stream, + GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) +{ + return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params); +} + /***************************************************************************** * GdipSaveImageToStream [GDIPLUS.@] */ @@ -4611,14 +4617,14 @@ static const struct image_codec codecs[NUM_CODECS] = { /* FormatDescription */ gif_format, /* FilenameExtension */ gif_extension, /* MimeType */ gif_mimetype, - /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsEncoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, /* Version */ 1, /* SigCount */ 2, /* SigSize */ 6, /* SigPattern */ gif_sig_pattern, /* SigMask */ gif_sig_mask, }, - NULL, + encode_image_gif, decode_image_gif, select_frame_gif }, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 63fc96e..1335d97 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4544,6 +4544,91 @@ static void test_CloneBitmapArea(void) GdipDisposeImage((GpImage *)bitmap); } +static BOOL get_encoder_clsid(LPCWSTR mime, GUID *format, CLSID *clsid) +{ + GpStatus status; + UINT n_codecs, info_size, i; + ImageCodecInfo *info; + BOOL ret = FALSE; + + status = GdipGetImageEncodersSize(&n_codecs, &info_size); + expect(Ok, status); + + info = GdipAlloc(info_size); + + status = GdipGetImageEncoders(n_codecs, info_size, info); + expect(Ok, status); + + for (i = 0; i < n_codecs; i++) + { + if (!lstrcmpW(info[i].MimeType, mime)) + { + *format = info[i].FormatID; + *clsid = info[i].Clsid; + ret = TRUE; + break; + } + } + + GdipFree(info); + return ret; +} + +static void test_supported_encoders(void) +{ + static const WCHAR bmp_mimetype[] = { 'i', 'm', 'a','g', 'e', '/', 'b', 'm', 'p',0 }; + static const WCHAR jpeg_mimetype[] = { 'i','m','a','g','e','/','j','p','e','g',0 }; + static const WCHAR gif_mimetype[] = { 'i','m','a','g','e','/','g','i','f',0 }; + static const WCHAR tiff_mimetype[] = { 'i','m','a','g','e','/','t','i','f','f',0 }; + static const WCHAR png_mimetype[] = { 'i','m','a','g','e','/','p','n','g',0 }; + static const struct test_data + { + LPCWSTR mime; + const GUID *format; + BOOL todo; + } td[] = + { + { bmp_mimetype, &ImageFormatBMP, FALSE }, + { jpeg_mimetype, &ImageFormatJPEG, FALSE }, + { gif_mimetype, &ImageFormatGIF, TRUE }, + { tiff_mimetype, &ImageFormatTIFF, FALSE }, + { png_mimetype, &ImageFormatPNG, FALSE } + }; + GUID format, clsid; + BOOL ret; + HRESULT hr; + GpStatus status; + GpBitmap *bm; + IStream *stream; + HGLOBAL hmem; + int i; + + status = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat24bppRGB, NULL, &bm); + ok(status == Ok, "GdipCreateBitmapFromScan0 error %d\n", status); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + ret = get_encoder_clsid(td[i].mime, &format, &clsid); + ok(ret, "%s encoder is not in the list\n", wine_dbgstr_w(td[i].mime)); + expect_guid(td[i].format, &format, __LINE__, FALSE); + + hmem = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD, 16); + + hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + + status = GdipSaveImageToStream((GpImage *)bm, stream, &clsid, NULL); + if (td[i].todo) + todo_wine ok(status == Ok, "GdipSaveImageToStream error %d\n", status); + else + ok(status == Ok, "GdipSaveImageToStream error %d\n", status); + + IStream_Release(stream); + } + + GdipDisposeImage((GpImage *)bm); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4556,6 +4641,7 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion(); test_DrawImage_scale();

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_AddLines().
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: a8f45dff604058d419bd6c2e070f65a13a6ddfdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f45dff604058d419bd6c2e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:43 2015 +0200 d2d1: Implement d2d_geometry_sink_AddLines(). --- dlls/d2d1/d2d1_private.h | 7 +- dlls/d2d1/geometry.c | 983 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 135 +++++++ 3 files changed, 1118 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8f45dff604058d419bd6…

1 0

Alasdair Sinclair : ntdll: Add missing WINAPI to RtlDecompressFragment.
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: 241b3928b114ad7be99f9a8808172c7e4b0d6928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=241b3928b114ad7be99f9a880… Author: Alasdair Sinclair <alasdairsinc(a)gmail.com> Date: Tue Jul 14 01:40:15 2015 +0000 ntdll: Add missing WINAPI to RtlDecompressFragment. --- dlls/ntdll/rtl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 4aef1ee..d20a098 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1489,7 +1489,7 @@ out: /****************************************************************************** * RtlDecompressFragment [NTDLL.@] */ -NTSTATUS RtlDecompressFragment(USHORT format, PUCHAR uncompressed, ULONG uncompressed_size, +NTSTATUS WINAPI RtlDecompressFragment(USHORT format, PUCHAR uncompressed, ULONG uncompressed_size, PUCHAR compressed, ULONG compressed_size, ULONG offset, PULONG final_size, PVOID workspace) {

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_FillGeometry().
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: b92a05c84ed92f8ebe618991315f95af3189a47b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92a05c84ed92f8ebe6189913… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:42 2015 +0200 d2d1: Implement d2d_d3d_render_target_FillGeometry(). --- dlls/d2d1/d2d1_private.h | 2 + dlls/d2d1/geometry.c | 9 +++ dlls/d2d1/render_target.c | 190 ++++++++++++++++++++++++++++------------------ 3 files changed, 126 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b92a05c84ed92f8ebe618…

1 0

Erich E. Hoover : ntdll: Only set the security cookie if it has not already been set.
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: e9d7cf99ada80ea8345c301481c63a24780f2b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d7cf99ada80ea8345c30148… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Fri Jul 10 14:52:33 2015 -0600 ntdll: Only set the security cookie if it has not already been set. --- dlls/ntdll/virtual.c | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 410e060..ff947da 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -61,6 +61,12 @@ WINE_DECLARE_DEBUG_CHANNEL(module); #define MAP_NORESERVE 0 #endif +#ifdef _WIN64 +#define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232) +#endif +#define DEFAULT_SECURITY_COOKIE_32 0xbb40e64e +#define DEFAULT_SECURITY_COOKIE_16 (DEFAULT_SECURITY_COOKIE_32 >> 16) + /* File view */ struct file_view { @@ -1053,6 +1059,36 @@ static NTSTATUS stat_mapping_file( struct file_view *view, struct stat *st ) return status; } +/*********************************************************************** + * set_security_cookie + * + * Create a random security cookie for buffer overflow protection. Make + * sure it does not accidentally match the default cookie value. + */ +static void set_security_cookie(ULONG_PTR *cookie) +{ + static ULONG seed; + + if (!cookie) return; + if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId(); + while (1) + { + if (*cookie == DEFAULT_SECURITY_COOKIE_16) + *cookie = RtlRandom( &seed ) >> 16; /* leave the high word clear */ + else if (*cookie == DEFAULT_SECURITY_COOKIE_32) + *cookie = RtlRandom( &seed ); +#ifdef DEFAULT_SECURITY_COOKIE_64 + else if (*cookie == DEFAULT_SECURITY_COOKIE_64) + { + *cookie = RtlRandom( &seed ); + /* fill up, but keep the highest word clear */ + *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16; + } +#endif + else + break; + } +} /*********************************************************************** * map_image @@ -1285,18 +1321,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); if (loadcfg && loadcfg_size >= sizeof(*loadcfg)) - { - static ULONG seed; - ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie; - - if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId(); - if (cookie) - { - *cookie = RtlRandom( &seed ); - if (sizeof(ULONG_PTR) > sizeof(ULONG)) /* fill up, but keep the highest word clear */ - *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16; - } - } + set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie); /* set the image protections */

1 0

Jarkko Korpi : widl: Increase buffer size in typegen.c.
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: abf4d5910fc69fe193e541aa0163dc76eb5a9def URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf4d5910fc69fe193e541aa0… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Fri Jul 10 18:49:44 2015 +0300 widl: Increase buffer size in typegen.c. --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4bb4cc4..045a5b7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1142,7 +1142,7 @@ static unsigned char get_func_oi2_flags( const var_t *func ) static unsigned int write_new_procformatstring_type(FILE *file, int indent, const var_t *var, int is_return, unsigned int *stack_offset) { - char buffer[64]; + char buffer[128]; unsigned int stack_size, typestring_offset; unsigned short flags; unsigned char fc = get_parameter_fc( var, is_return, &flags, &stack_size, &typestring_offset );

1 0

Dmitry Timoshkov : include: Add support for NtCurrentTeb and PSDK compiler in 64-bit mode.
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: 770e15eef1aee5f9cf0096be92c3d95623b260aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=770e15eef1aee5f9cf0096be9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 14:17:10 2015 +0800 include: Add support for NtCurrentTeb and PSDK compiler in 64-bit mode. --- include/winnt.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 68a33f3..a1116bd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2335,6 +2335,12 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) __asm__(".byte 0x65\n\tmovq (0x30),%0" : "=r" (teb)); return teb; } +#elif defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(__readgsqword) +static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) +{ + return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); +} #else extern struct _TEB * WINAPI NtCurrentTeb(void); #endif

1 0

Dmitry Timoshkov : windowscodecs: Add support for 8bpp grayscale TIFF with 8bpp alpha.
by Alexandre Julliard July 14, 2015

July 14, 2015

Module: wine Branch: master Commit: d57b87c0f3d129e0d1baf8a848ad4f4ad8165219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57b87c0f3d129e0d1baf8a84… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 14:46:41 2015 +0800 windowscodecs: Add support for 8bpp grayscale TIFF with 8bpp alpha. --- dlls/windowscodecs/tests/tiffformat.c | 103 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tiffformat.c | 66 ++++++++++++++++++++-- 2 files changed, 164 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index cc1951e..d07caa3 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -92,6 +92,48 @@ static const struct tiff_1bpp_data { 900, 3 }, { 0x11, 0x22, 0x33, 0 } }; + +static const struct tiff_8bpp_alpha +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[15]; + ULONG next_IFD; + struct IFD_rational res; + BYTE pixel_data[8]; +} tiff_8bpp_alpha = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_8bpp_alpha, number_of_entries), + 15, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 2 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 2 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 2, MAKELONG(8, 8) }, /* 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_8bpp_alpha, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 2 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 2 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 8 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) }, + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) }, + { 0x11c, IFD_SHORT, 1, 1 }, /* PLANARCONFIGURATION */ + { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ + { 0x152, IFD_SHORT, 1, 1 } /* EXTRASAMPLES: 1 - Associated alpha with pre-multiplied color */ + }, + 0, + { 96, 1 }, + { 0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88 } +}; #include "poppack.h" static IWICImagingFactory *factory; @@ -264,6 +306,66 @@ todo_wine IStream_Release(stream); } +static void test_tiff_8bpp_alpha(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + UINT frame_count, width, height, i; + double dpi_x, dpi_y; + IWICPalette *palette; + GUID format; + WICRect rc; + BYTE data[16]; + static const BYTE expected_data[16] = { 0x11,0x11,0x11,0x22,0x33,0x33,0x33,0x44, + 0x55,0x55,0x55,0x66,0x77,0x77,0x77,0x88 }; + + decoder = create_decoder(&tiff_8bpp_alpha, sizeof(tiff_8bpp_alpha)); + ok(decoder != 0, "Failed to load TIFF image data\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + ok(hr == S_OK, "GetFrameCount error %#x\n", hr); + ok(frame_count == 1, "expected 1, got %u\n", frame_count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); + ok(hr == S_OK, "GetSize error %#x\n", hr); + ok(width == 2, "expected 2, got %u\n", width); + ok(height == 2, "expected 2, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(frame, &dpi_x, &dpi_y); + ok(hr == S_OK, "GetResolution error %#x\n", hr); + ok(dpi_x == 96.0, "expected 96.0, got %f\n", dpi_x); + ok(dpi_y == 96.0, "expected 96.0, got %f\n", dpi_y); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppPBGRA), + "got wrong format %s\n", wine_dbgstr_guid(&format)); + + 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); + + rc.X = 0; + rc.Y = 0; + rc.Width = 2; + rc.Height = 2; + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rc, 8, sizeof(data), data); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + + for (i = 0; i < sizeof(data); i++) + ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); + + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + START_TEST(tiffformat) { HRESULT hr; @@ -277,6 +379,7 @@ START_TEST(tiffformat) test_tiff_palette(); test_QueryCapability(); + test_tiff_8bpp_alpha(); IWICImagingFactory_Release(factory); CoUninitialize(); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 7f987de..51e940f 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -236,7 +236,7 @@ typedef struct { const WICPixelFormatGUID *format; int bps; int samples; - int bpp; + int bpp, source_bpp; int planar; int indexed; int reverse_bgr; @@ -326,23 +326,63 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->invert_grayscale = 1; /* fall through */ case 1: /* BlackIsZero */ - if (samples != 1) + if (samples == 2) + { + ret = pTIFFGetField(tiff, TIFFTAG_EXTRASAMPLES, &extra_sample_count, &extra_samples); + if (!ret) + { + extra_sample_count = 1; + extra_sample = 0; + extra_samples = &extra_sample; + } + } + else if (samples != 1) { - FIXME("unhandled grayscale sample count %u\n", samples); + FIXME("unhandled %dbpp sample count %u\n", bps, samples); return E_FAIL; } - decode_info->bpp = bps; + decode_info->bpp = bps * samples; + decode_info->source_bpp = decode_info->bpp; switch (bps) { case 1: + if (samples != 1) + { + FIXME("unhandled 1bpp sample count %u\n", samples); + return E_FAIL; + } decode_info->format = &GUID_WICPixelFormatBlackWhite; break; case 4: + if (samples != 1) + { + FIXME("unhandled 4bpp grayscale sample count %u\n", samples); + return E_FAIL; + } decode_info->format = &GUID_WICPixelFormat4bppGray; break; case 8: - decode_info->format = &GUID_WICPixelFormat8bppGray; + if (samples == 1) + decode_info->format = &GUID_WICPixelFormat8bppGray; + else + { + decode_info->bpp = 32; + + switch(extra_samples[0]) + { + case 1: /* Associated (pre-multiplied) alpha data */ + decode_info->format = &GUID_WICPixelFormat32bppPBGRA; + break; + case 0: /* Unspecified data */ + case 2: /* Unassociated alpha data */ + decode_info->format = &GUID_WICPixelFormat32bppBGRA; + break; + default: + FIXME("unhandled extra sample type %u\n", extra_samples[0]); + return E_FAIL; + } + } break; default: FIXME("unhandled greyscale bit count %u\n", bps); @@ -943,6 +983,22 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT hr = E_FAIL; } + /* 8bpp grayscale with extra alpha */ + if (hr == S_OK && This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32) + { + BYTE *src; + DWORD *dst, count = This->decode_info.tile_width * This->decode_info.tile_height; + + src = This->cached_tile + This->decode_info.tile_width * This->decode_info.tile_height * 2 - 2; + dst = (DWORD *)(This->cached_tile + This->decode_info.tile_size - 4); + + while (count--) + { + *dst-- = src[0] | (src[0] << 8) | (src[0] << 16) | (src[1] << 24); + src -= 2; + } + } + if (hr == S_OK && This->decode_info.reverse_bgr) { if (This->decode_info.bps == 8)

1 0