April 2020 - Wine-Commits - list.winehq.org

Zhiyi Zhang : wined3d: Correct a comment in wined3d_check_device_type().
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: b6968ab59dddd9c056d49effc60559065f34a5f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6968ab59dddd9c056d49eff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 21 21:36:43 2020 +0800 wined3d: Correct a comment in wined3d_check_device_type(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 42e1578561..b65f13e775 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1755,7 +1755,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, debug_d3dformat(backbuffer_format), windowed); /* The task of this function is to check whether a certain display / backbuffer format - * combination is available on the given adapter. In fullscreen mode microsoft specified + * combination is available on the given output. In fullscreen mode microsoft specified * that the display format shouldn't provide alpha and that ignoring alpha the backbuffer * and display format should match exactly. * In windowed mode format conversion can occur and this depends on the driver. */

1 0

Dmitry Timoshkov : windowscodecs: Add support for 16bps RGBA format to TIFF decoder.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 3b9560c6f363433c47b08a4df940a6f86ab3aaab URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b9560c6f363433c47b08a4d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:02:21 2020 +0800 windowscodecs: Add support for 16bps RGBA format to TIFF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 33d3a3c992..3d43c967d9 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1186,6 +1186,36 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT HeapFree(GetProcessHeap(), 0, srcdata); } + /* 16bps RGBA */ + else if (This->decode_info.source_bpp == 16 && This->decode_info.samples == 4 && This->decode_info.bpp == 32) + { + BYTE *srcdata, *src, *dst; + DWORD x, y, count, width_bytes = (This->decode_info.tile_width * 12 + 7) / 8; + + count = width_bytes * This->decode_info.tile_height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, count); + if (!srcdata) return E_OUTOFMEMORY; + memcpy(srcdata, This->cached_tile, count); + + for (y = 0; y < This->decode_info.tile_height; y++) + { + src = srcdata + y * width_bytes; + dst = This->cached_tile + y * This->decode_info.tile_width * 4; + + for (x = 0; x < This->decode_info.tile_width; x++) + { + dst[0] = ((src[1] & 0xf0) >> 4) * 17; /* B */ + dst[1] = (src[0] & 0x0f) * 17; /* G */ + dst[2] = ((src[0] & 0xf0) >> 4) * 17; /* R */ + dst[3] = (src[1] & 0x0f) * 17; /* A */ + src += 2; + dst += 4; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + } /* 8bpp grayscale with extra alpha */ else if (This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32) {

1 0

Dmitry Timoshkov : windowscodecs: Add support for 128bppRGBAFloat format to TIFF decoder.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 462c650ea4cb5d28e4926f133c09360181e4c0b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=462c650ea4cb5d28e4926f13… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:02:01 2020 +0800 windowscodecs: Add support for 128bppRGBAFloat format to TIFF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 18 ++++++++++++++++++ dlls/windowscodecs/tiffformat.c | 12 ++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index c15daf2022..d8147c0e15 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1236,6 +1236,7 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat64bppRGBA, &GUID_WICPixelFormat64bppPRGBA, + &GUID_WICPixelFormat128bppRGBAFloat, NULL }; @@ -1766,6 +1767,11 @@ static BYTE const channel_mask_16bit4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, static BYTE const channel_mask_32bit[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; +static BYTE const channel_mask_128bit1[] = { 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; +static BYTE const channel_mask_128bit2[] = { 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; +static BYTE const channel_mask_128bit3[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00 }; +static BYTE const channel_mask_128bit4[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff }; + static BYTE const channel_mask_5bit[] = { 0x1f, 0x00 }; static BYTE const channel_mask_5bit2[] = { 0xe0, 0x03 }; static BYTE const channel_mask_5bit3[] = { 0x00, 0x7c }; @@ -1783,6 +1789,7 @@ static BYTE const * const channel_masks_16bit[] = { channel_mask_16bit, channel_mask_16bit2, channel_mask_16bit3, channel_mask_16bit4}; static BYTE const * const channel_masks_32bit[] = { channel_mask_32bit }; +static BYTE const * const channel_masks_128bit[] = { channel_mask_128bit1, channel_mask_128bit2, channel_mask_128bit3, channel_mask_128bit4 }; static BYTE const * const channel_masks_BGRA5551[] = { channel_mask_5bit, channel_mask_5bit2, channel_mask_5bit3, channel_mask_5bit4 }; @@ -2066,6 +2073,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 0 }, + { &GUID_WICPixelFormat128bppRGBAFloat, + "The Wine Project", + "128bpp RGBAFloat", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 128, /* bitsperpixel */ + 4, /* channel count */ + channel_masks_128bit, + WICPixelFormatNumericRepresentationFloat, + 1 + }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 7354781eed..984acabfbf 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -464,9 +464,17 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } break; + case 32: + if (samples != 4) + { + FIXME("unhandled 32bpp RGB sample count %u\n", samples); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } + decode_info->format = &GUID_WICPixelFormat128bppRGBAFloat; + break; default: - FIXME("unhandled RGB bit count %u\n", bps); - return E_FAIL; + WARN("unhandled RGB bit count %u\n", bps); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; } break; case 3: /* RGB Palette */

1 0

Ziqing Hui : windowscodecs/tests: Add tests for global properties of DdsDecoder.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: f74797d3da4daab1f427055180422879a1b89416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f74797d3da4daab1f4270551… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Apr 20 11:59:37 2020 +0800 windowscodecs/tests: Add tests for global properties of DdsDecoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 8569d0e291..de109b8299 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -142,6 +142,55 @@ static void test_dds_decoder_initialize(void) } } +static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) +{ + HRESULT hr; + IWICPalette *pallette = NULL; + IWICMetadataQueryReader *metadata_reader = NULL; + IWICBitmapSource *preview = NULL, *thumnail = NULL; + IWICColorContext *color_context = NULL; + UINT count; + + hr = IWICImagingFactory_CreatePalette(factory, &pallette); + ok (hr == S_OK, "CreatePalette failed, hr=%x\n", hr); + if (hr == S_OK) { + todo_wine { + hr = IWICBitmapDecoder_CopyPalette(decoder, pallette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); + hr = IWICBitmapDecoder_CopyPalette(decoder, NULL); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); + }; + } + + todo_wine { + hr = IWICBitmapDecoder_GetMetadataQueryReader(decoder, &metadata_reader); + ok (hr == S_OK, "Expected hr=S_OK, got %x\n", hr); + hr = IWICBitmapDecoder_GetMetadataQueryReader(decoder, NULL); + ok (hr == E_INVALIDARG, "Expected hr=E_INVALIDARG, got %x\n", hr); + + hr = IWICBitmapDecoder_GetPreview(decoder, &preview); + ok (hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "Expected hr=WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + hr = IWICBitmapDecoder_GetPreview(decoder, NULL); + ok (hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "Expected hr=WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + + hr = IWICBitmapDecoder_GetColorContexts(decoder, 1, &color_context, &count); + ok (hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "Expected hr=WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + hr = IWICBitmapDecoder_GetColorContexts(decoder, 1, NULL, NULL); + ok (hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "Expected hr=WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + + hr = IWICBitmapDecoder_GetThumbnail(decoder, &thumnail); + ok (hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "Expected hr=WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); + hr = IWICBitmapDecoder_GetThumbnail(decoder, NULL); + ok (hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "Expected hr=WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); + }; + + if (pallette) IWICPalette_Release(pallette); + if (metadata_reader) IWICMetadataQueryReader_Release(metadata_reader); + if (preview) IWICBitmapSource_Release(preview); + if (color_context) IWICColorContext_Release(color_context); + if (thumnail) IWICBitmapSource_Release(thumnail); +} + static void test_dds_decoder(void) { HRESULT hr; @@ -158,6 +207,7 @@ static void test_dds_decoder(void) if (FAILED(hr)) goto end; test_dds_decoder_initialize(); + test_dds_decoder_global_properties(decoder); end: if (decoder) IWICBitmapDecoder_Release(decoder);

1 0

Piotr Caban : ucrtbase: Change ptd fields offsets to match with native.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 9b94e4c80580325e62097ed6c08cc37c28575470 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b94e4c80580325e62097ed6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 21 13:11:56 2020 +0200 ucrtbase: Change ptd fields offsets to match with native. Makes it possible to use native vcruntime140_1.dll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 3 +-- dlls/msvcrt/msvcrt.h | 5 ++--- dlls/ucrtbase/tests/misc.c | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index eb0970f4c1..630b56f8a6 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -1139,8 +1139,7 @@ struct __thread_data { void* terminate_handler; void* unexpected_handler; void* se_translator; - void *unk6[3]; - int unk7; + void *unk6; EXCEPTION_RECORD *exc_record; }; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 244df7d23c..a45b82a944 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -285,9 +285,8 @@ struct __thread_data { int unk5[1]; MSVCRT_terminate_function terminate_handler; MSVCRT_unexpected_function unexpected_handler; - MSVCRT__se_translator_function se_translator; - void *unk6[3]; - int unk7; + MSVCRT__se_translator_function se_translator; /* preserve offset to exc_record and processing_throw */ + void *unk6; EXCEPTION_RECORD *exc_record; CONTEXT *ctx_record; int processing_throw; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index dfbe0256ca..eb0c79be2b 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -100,12 +100,17 @@ typedef struct { const wchar_t *locnameW; } __lc_time_data; +typedef void (__cdecl *_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); + static LONGLONG crt_init_end; _ACRTIMP int __cdecl _o__initialize_onexit_table(_onexit_table_t *table); _ACRTIMP int __cdecl _o__register_onexit_function(_onexit_table_t *table, _onexit_t func); _ACRTIMP int __cdecl _o__execute_onexit_table(_onexit_table_t *table); _ACRTIMP void *__cdecl _o_malloc(size_t); +_se_translator_function __cdecl _set_se_translator(_se_translator_function func); +void** __cdecl __current_exception(void); +int* __cdecl __processing_throw(void); static void test__initialize_onexit_table(void) { @@ -1297,6 +1302,26 @@ static void test_clock(void) c, expect_min - thresh, expect_min + max_load_delay); } +static void __cdecl se_translator(unsigned int u, EXCEPTION_POINTERS *ep) +{ +} + +static void test_thread_storage(void) +{ + void **current_exception; + void *processing_throw; + + _set_se_translator(se_translator); + current_exception = __current_exception(); + processing_throw = __processing_throw(); + + ok(current_exception+2 == processing_throw, + "current_exception = %p, processing_throw = %p\n", + current_exception, processing_throw); + ok(current_exception[-2] == se_translator, + "can't find se_translator in thread storage\n"); +} + START_TEST(misc) { int arg_c; @@ -1335,4 +1360,5 @@ START_TEST(misc) test__stat32(); test__o_malloc(); test_clock(); + test_thread_storage(); }

1 0

Dmitry Timoshkov : windowscodecs: Add support for 4bps RGBA format to TIFF decoder.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 0cd8502b493e7a93df7aad08bc2fdfe3fd73b5cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cd8502b493e7a93df7aad08… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:02:15 2020 +0800 windowscodecs: Add support for 4bps RGBA format to TIFF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index b0c422a440..33d3a3c992 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1147,6 +1147,45 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT HeapFree(GetProcessHeap(), 0, srcdata); } + /* 4bps RGBA */ + else if (This->decode_info.source_bpp == 4 && This->decode_info.samples == 4 && This->decode_info.bpp == 32) + { + BYTE *srcdata, *src, *dst; + DWORD x, y, count, width_bytes = (This->decode_info.tile_width * 3 + 7) / 8; + + count = width_bytes * This->decode_info.tile_height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, count); + if (!srcdata) return E_OUTOFMEMORY; + memcpy(srcdata, This->cached_tile, count); + + for (y = 0; y < This->decode_info.tile_height; y++) + { + src = srcdata + y * width_bytes; + dst = This->cached_tile + y * This->decode_info.tile_width * 4; + + /* 1 source byte expands to 2 BGRA samples */ + + for (x = 0; x < This->decode_info.tile_width; x += 2) + { + dst[0] = (src[0] & 0x20) ? 0xff : 0; /* B */ + dst[1] = (src[0] & 0x40) ? 0xff : 0; /* G */ + dst[2] = (src[0] & 0x80) ? 0xff : 0; /* R */ + dst[3] = (src[0] & 0x10) ? 0xff : 0; /* A */ + if (x + 1 < This->decode_info.tile_width) + { + dst[4] = (src[0] & 0x02) ? 0xff : 0; /* B */ + dst[5] = (src[0] & 0x04) ? 0xff : 0; /* G */ + dst[6] = (src[0] & 0x08) ? 0xff : 0; /* R */ + dst[7] = (src[0] & 0x01) ? 0xff : 0; /* A */ + } + src++; + dst += 8; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + } /* 8bpp grayscale with extra alpha */ else if (This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32) {

1 0

Dmitry Timoshkov : windowscodecs: Add support for 3bps RGB format to TIFF decoder.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: a1fb3bb4da947e720d921d605e0776a311b2c431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1fb3bb4da947e720d921d60… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:02:08 2020 +0800 windowscodecs: Add support for 3bps RGB format to TIFF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 78 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 646bcf3822..d6773d22f2 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -407,8 +407,6 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } break; case 2: /* RGB */ - decode_info->bpp = bps * samples; - if (samples == 4) { ret = pTIFFGetField(tiff, TIFFTAG_EXTRASAMPLES, &extra_sample_count, &extra_samples); @@ -425,8 +423,11 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } + decode_info->bpp = max(bps, 8) * samples; + decode_info->source_bpp = bps * samples; switch(bps) { + case 1: case 8: decode_info->reverse_bgr = 1; if (samples == 3) @@ -1039,8 +1040,79 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT if (ret == -1) return E_FAIL; + /* 3bps RGB */ + if (This->decode_info.source_bpp == 3 && This->decode_info.samples == 3 && This->decode_info.bpp == 24) + { + BYTE *srcdata, *src, *dst; + DWORD x, y, count, width_bytes = (This->decode_info.tile_width * 3 + 7) / 8; + + count = width_bytes * This->decode_info.tile_height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, count); + if (!srcdata) return E_OUTOFMEMORY; + memcpy(srcdata, This->cached_tile, count); + + for (y = 0; y < This->decode_info.tile_height; y++) + { + src = srcdata + y * width_bytes; + dst = This->cached_tile + y * This->decode_info.tile_width * 3; + + for (x = 0; x < This->decode_info.tile_width; x += 8) + { + dst[2] = (src[0] & 0x80) ? 0xff : 0; /* R */ + dst[1] = (src[0] & 0x40) ? 0xff : 0; /* G */ + dst[0] = (src[0] & 0x20) ? 0xff : 0; /* B */ + if (x + 1 < This->decode_info.tile_width) + { + dst[5] = (src[0] & 0x10) ? 0xff : 0; /* R */ + dst[4] = (src[0] & 0x08) ? 0xff : 0; /* G */ + dst[3] = (src[0] & 0x04) ? 0xff : 0; /* B */ + } + if (x + 2 < This->decode_info.tile_width) + { + dst[8] = (src[0] & 0x02) ? 0xff : 0; /* R */ + dst[7] = (src[0] & 0x01) ? 0xff : 0; /* G */ + dst[6] = (src[1] & 0x80) ? 0xff : 0; /* B */ + } + if (x + 3 < This->decode_info.tile_width) + { + dst[11] = (src[1] & 0x40) ? 0xff : 0; /* R */ + dst[10] = (src[1] & 0x20) ? 0xff : 0; /* G */ + dst[9] = (src[1] & 0x10) ? 0xff : 0; /* B */ + } + if (x + 4 < This->decode_info.tile_width) + { + dst[14] = (src[1] & 0x08) ? 0xff : 0; /* R */ + dst[13] = (src[1] & 0x04) ? 0xff : 0; /* G */ + dst[12] = (src[1] & 0x02) ? 0xff : 0; /* B */ + } + if (x + 5 < This->decode_info.tile_width) + { + dst[17] = (src[1] & 0x01) ? 0xff : 0; /* R */ + dst[16] = (src[2] & 0x80) ? 0xff : 0; /* G */ + dst[15] = (src[2] & 0x40) ? 0xff : 0; /* B */ + } + if (x + 6 < This->decode_info.tile_width) + { + dst[20] = (src[2] & 0x20) ? 0xff : 0; /* R */ + dst[19] = (src[2] & 0x10) ? 0xff : 0; /* G */ + dst[18] = (src[2] & 0x08) ? 0xff : 0; /* B */ + } + if (x + 7 < This->decode_info.tile_width) + { + dst[23] = (src[2] & 0x04) ? 0xff : 0; /* R */ + dst[22] = (src[2] & 0x02) ? 0xff : 0; /* G */ + dst[21] = (src[2] & 0x01) ? 0xff : 0; /* B */ + } + src += 3; + dst += 24; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + } /* 8bpp grayscale with extra alpha */ - if (This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32) + else if (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;

1 0

Dmitry Timoshkov : windowscodecs: Add support for 32bppCMYK and 64bppCMYK formats to TIFF decoder.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 948e5dffcd55fc52fe07188dc454806fd77fd857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=948e5dffcd55fc52fe07188d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 12:02:06 2020 +0800 windowscodecs: Add support for 32bppCMYK and 64bppCMYK formats to TIFF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 13 +++++++++++++ dlls/windowscodecs/tiffformat.c | 25 ++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index d8147c0e15..3329c2d811 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1236,6 +1236,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat64bppRGBA, &GUID_WICPixelFormat64bppPRGBA, + &GUID_WICPixelFormat32bppCMYK, + &GUID_WICPixelFormat64bppCMYK, &GUID_WICPixelFormat128bppRGBAFloat, NULL }; @@ -2073,6 +2075,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 0 }, + { &GUID_WICPixelFormat64bppCMYK, + "The Wine Project", + "64bpp CMYK", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 64, /* bitsperpixel */ + 4, /* channel count */ + channel_masks_16bit, + WICPixelFormatNumericRepresentationUnsignedInteger, + 0 + }, { &GUID_WICPixelFormat128bppRGBAFloat, "The Wine Project", "128bpp RGBAFloat", diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 984acabfbf..646bcf3822 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -505,8 +505,31 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_NOTIMPL; } break; + + case 5: /* Separated */ + if (samples != 4) + { + FIXME("unhandled Separated sample count %u\n", samples); + return E_FAIL; + } + + decode_info->bpp = bps * samples; + switch(bps) + { + case 8: + decode_info->format = &GUID_WICPixelFormat32bppCMYK; + break; + case 16: + decode_info->format = &GUID_WICPixelFormat64bppCMYK; + break; + + default: + WARN("unhandled Separated bit count %u\n", bps); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } + break; + case 4: /* Transparency mask */ - case 5: /* CMYK */ case 6: /* YCbCr */ case 8: /* CIELab */ default:

1 0

Ziqing Hui : windowscodecs/tests: Avoid using SUCCEEDED() and FAILED() in ddsformat.c.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: b34d4bdcb80fefa9bf49a93a0b1592ae2efeb5e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b34d4bdcb80fefa9bf49a93a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Apr 20 12:00:18 2020 +0800 windowscodecs/tests: Avoid using SUCCEEDED() and FAILED() in ddsformat.c. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 0d8e728abc..ddb20e7b63 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -45,12 +45,12 @@ static IWICStream *create_stream(const void *image_data, UINT image_size) IWICStream *stream = NULL; hr = IWICImagingFactory_CreateStream(factory, &stream); - ok(SUCCEEDED(hr), "CreateStream failed, hr=%x\n", hr); - if (FAILED(hr)) goto fail; + ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); + if (hr != S_OK) goto fail; hr = IWICStream_InitializeFromMemory(stream, (BYTE *)image_data, image_size); - ok(SUCCEEDED(hr), "InitializeFromMemory failed, hr=%x\n", hr); - if (FAILED(hr)) goto fail; + ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); + if (hr != S_OK) goto fail; return stream; @@ -67,14 +67,14 @@ static IWICBitmapDecoder *create_decoder(void) hr = CoCreateInstance(&CLSID_WICDdsDecoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void **)&decoder); - if (FAILED(hr)) { + if (hr != S_OK) { win_skip("Dds decoder is not supported\n"); return NULL; } memset(&guidresult, 0, sizeof(guidresult)); hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); - ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(hr == S_OK, "GetContainerFormat failed, hr=%x\n", hr); ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatDds), "Unexpected container format\n"); return decoder; @@ -86,7 +86,7 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)stream, WICDecodeMetadataCacheOnDemand); if (index == -1) { - ok(SUCCEEDED(hr), "Decoder Initialize failed, hr=%x\n", hr); + ok(hr == S_OK, "Decoder Initialize failed, hr=%x\n", hr); } else { ok(hr == expected, "%d: Expected hr=%x, got %x\n", index, expected, hr); } @@ -200,7 +200,7 @@ static void test_dds_decoder(void) if (!decoder) goto end; hr = init_decoder(decoder, stream, S_OK, -1); - if (FAILED(hr)) goto end; + if (hr != S_OK) goto end; test_dds_decoder_initialize(); test_dds_decoder_global_properties(decoder); @@ -217,8 +217,8 @@ START_TEST(ddsformat) hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void **)&factory); - ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); - if (FAILED(hr)) goto end; + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (hr != S_OK) goto end; test_dds_decoder();

1 0

Ziqing Hui : windowscodecs: Implement global property functions for DdsDecoder.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: f634aa28364da8d0315f9262d7f67fc48f8b2686 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f634aa28364da8d0315f9262… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Apr 20 12:00:03 2020 +0800 windowscodecs: Implement global property functions for DdsDecoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 20 +++++++++++--------- dlls/windowscodecs/tests/ddsformat.c | 6 +----- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index ac832e2116..a5036f23d6 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -208,15 +208,17 @@ static HRESULT WINAPI DdsDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, static HRESULT WINAPI DdsDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub.\n", iface, pIPalette); + TRACE("(%p,%p)\n", iface, pIPalette); - return E_NOTIMPL; + return WINCODEC_ERR_PALETTEUNAVAILABLE; } static HRESULT WINAPI DdsDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub.\n", iface, ppIMetadataQueryReader); + if (!ppIMetadataQueryReader) return E_INVALIDARG; + + FIXME("(%p,%p)\n", iface, ppIMetadataQueryReader); return E_NOTIMPL; } @@ -224,25 +226,25 @@ static HRESULT WINAPI DdsDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface static HRESULT WINAPI DdsDecoder_GetPreview(IWICBitmapDecoder *iface, IWICBitmapSource **ppIBitmapSource) { - FIXME("(%p,%p): stub.\n", iface, ppIBitmapSource); + TRACE("(%p,%p)\n", iface, ppIBitmapSource); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI DdsDecoder_GetColorContexts(IWICBitmapDecoder *iface, UINT cCount, IWICColorContext **ppDdslorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p): stub.\n", iface, cCount, ppDdslorContexts, pcActualCount); + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppDdslorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI DdsDecoder_GetThumbnail(IWICBitmapDecoder *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p): stub.\n", iface, ppIThumbnail); + TRACE("(%p,%p)\n", iface, ppIThumbnail); - return E_NOTIMPL; + return WINCODEC_ERR_CODECNOTHUMBNAIL; } static HRESULT WINAPI DdsDecoder_GetFrameCount(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index de109b8299..0d8e728abc 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -154,17 +154,14 @@ static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) hr = IWICImagingFactory_CreatePalette(factory, &pallette); ok (hr == S_OK, "CreatePalette failed, hr=%x\n", hr); if (hr == S_OK) { - todo_wine { hr = IWICBitmapDecoder_CopyPalette(decoder, pallette); ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); hr = IWICBitmapDecoder_CopyPalette(decoder, NULL); ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); - }; } - todo_wine { hr = IWICBitmapDecoder_GetMetadataQueryReader(decoder, &metadata_reader); - ok (hr == S_OK, "Expected hr=S_OK, got %x\n", hr); + todo_wine ok (hr == S_OK, "Expected hr=S_OK, got %x\n", hr); hr = IWICBitmapDecoder_GetMetadataQueryReader(decoder, NULL); ok (hr == E_INVALIDARG, "Expected hr=E_INVALIDARG, got %x\n", hr); @@ -182,7 +179,6 @@ static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) ok (hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "Expected hr=WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); hr = IWICBitmapDecoder_GetThumbnail(decoder, NULL); ok (hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "Expected hr=WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); - }; if (pallette) IWICPalette_Release(pallette); if (metadata_reader) IWICMetadataQueryReader_Release(metadata_reader);

1 0