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

[PATCH 2/9] windowscodecs: Add support for 128bppRGBAFloat format to TIFF decoder.
by Dmitry Timoshkov 21 Apr '20

21 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 */ -- 2.25.2

2 1

[PATCH 1/9] windowscodecs: Add support for 16bppGray and 32bppGrayFloat formats to TIFF decoder.
by Dmitry Timoshkov 21 Apr '20

21 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/regsvr.c | 2 ++ dlls/windowscodecs/tiffformat.c | 22 ++++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 2c053bc5e4..c15daf2022 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1223,6 +1223,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat16bppGray, + &GUID_WICPixelFormat32bppGrayFloat, &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index a4c441e706..7354781eed 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -319,6 +319,8 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } decode_info->planar = planar; + TRACE("planar %u, photometric %u, samples %u, bps %u\n", planar, photometric, samples, bps); + switch(photometric) { case 0: /* WhiteIsZero */ @@ -383,9 +385,25 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } } break; + case 16: + if (samples != 1) + { + FIXME("unhandled 16bpp grayscale sample count %u\n", samples); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } + decode_info->format = &GUID_WICPixelFormat16bppGray; + break; + case 32: + if (samples != 1) + { + FIXME("unhandled 32bpp grayscale sample count %u\n", samples); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } + decode_info->format = &GUID_WICPixelFormat32bppGrayFloat; + break; default: - FIXME("unhandled greyscale bit count %u\n", bps); - return E_FAIL; + WARN("unhandled greyscale bit count %u\n", bps); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; } break; case 2: /* RGB */ -- 2.25.2

2 1

[PATCH] jscript/tests: Fix some function-to-string failure message typos.
by Jeff Smith 21 Apr '20

21 Apr '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/jscript/tests/api.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d4aa7f4383..df6ff785d0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2303,11 +2303,11 @@ ok(Math.floor(Math.SQRT1_2*100) === 70, "modified Math.SQRT1_2 = " + Math.SQRT1_ ok(isNaN.toString() === "\nfunction isNaN() {\n [native code]\n}\n", "isNaN.toString = '" + isNaN.toString() + "'"); ok(Array.toString() === "\nfunction Array() {\n [native code]\n}\n", - "isNaN.toString = '" + Array.toString() + "'"); + "Array.toString = '" + Array.toString() + "'"); ok(Function.toString() === "\nfunction Function() {\n [native code]\n}\n", - "isNaN.toString = '" + Function.toString() + "'"); + "Function.toString = '" + Function.toString() + "'"); ok(Function.prototype.toString() === "\nfunction prototype() {\n [native code]\n}\n", - "isNaN.toString = '" + Function.prototype.toString() + "'"); + "Function.prototype.toString = '" + Function.prototype.toString() + "'"); ok("".substr.toString() === "\nfunction substr() {\n [native code]\n}\n", "''.substr.toString = '" + "".substr.toString() + "'"); -- 2.23.0

2 1

[PATCH v4 2/3] include/winuser.h: define the undocumented RT_FILE resource type
by Damjan Jovanovic 21 Apr '20

21 Apr '20

On https://docs.microsoft.com/en-us/previous-versions//aa767740(v=vs.85) the only mentioned resource types are RT_HTML and RT_FILE. RT_FILE is completely undocumented and doesn't appear in any headers, but by a process of elimination, the 2110 magic number used in https://www.codeproject.com/Articles/435/How-to-use-the-res-protocol-in-Dev… and tested in later tests in this patch series, must be RT_FILE. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- include/winuser.h | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH v4 1/3] mshtml: for res:// URLs, numeric resource type ids don't need a leading '#'
by Damjan Jovanovic 21 Apr '20

21 Apr '20

Numeric resource type ids are either specified as the number with MAKEINTRESOURCEW(), or as a string prefixed by '#'. But mshtml's res:// protocol also allows the resource type id to be a numeric string without the '#' prefix. Try 4 uses !*endpoint to check for success in wcstol() instead of endpoint == s+lstrlenW(s). Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/mshtml/protocol.c | 27 +++++++++++++++++++-------- dlls/mshtml/tests/protocol.c | 7 +++++++ 2 files changed, 26 insertions(+), 8 deletions(-)

1 0

[PATCH] jscript: Support null this in Function.prototype.bind.
by Jacek Caban 21 Apr '20

21 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 13 +++++++++---- dlls/mshtml/tests/es5.js | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-)

1 0

[PATCH v3 3/3] windowscodecs/tests: Avoid using SUCCEEDED() and FAILED() in ddsformat.c
by Ziqing Hui 21 Apr '20

21 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

2 1

[PATCH v3 2/3] windowscodecs: Implement global property functions for DdsDecoder.
by Ziqing Hui 21 Apr '20

21 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 20 +++++++++++--------- dlls/windowscodecs/tests/ddsformat.c | 6 +----- 2 files changed, 12 insertions(+), 14 deletions(-)

2 1

[PATCH v3 1/3] windowscodecs/tests: Add tests for global properties of DdsDecoder.
by Ziqing Hui 21 Apr '20

21 Apr '20

v3: Release objects that the tests create. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 50 ++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)

2 1

[PATCH 1/5] mf: Release presentation clock on SAR shutdown.
by Nikolay Sivov 21 Apr '20

21 Apr '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/sar.c | 30 +++++++++++++++++------------- dlls/mf/tests/mf.c | 2 ++ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 80cfd94952..ed59075fc2 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -282,6 +282,21 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, return hr; } +static void audio_renderer_set_presentation_clock(struct audio_renderer *renderer, IMFPresentationClock *clock) +{ + if (renderer->clock) + { + IMFPresentationClock_RemoveClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); + IMFPresentationClock_Release(renderer->clock); + } + renderer->clock = clock; + if (renderer->clock) + { + IMFPresentationClock_AddRef(renderer->clock); + IMFPresentationClock_AddClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); + } +} + static HRESULT WINAPI audio_renderer_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -294,19 +309,7 @@ static HRESULT WINAPI audio_renderer_sink_SetPresentationClock(IMFMediaSink *ifa if (renderer->is_shut_down) hr = MF_E_SHUTDOWN; else - { - if (renderer->clock) - { - IMFPresentationClock_RemoveClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); - IMFPresentationClock_Release(renderer->clock); - } - renderer->clock = clock; - if (renderer->clock) - { - IMFPresentationClock_AddRef(renderer->clock); - IMFPresentationClock_AddClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); - } - } + audio_renderer_set_presentation_clock(renderer, clock); LeaveCriticalSection(&renderer->cs); @@ -353,6 +356,7 @@ static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface) renderer->is_shut_down = TRUE; IMFMediaEventQueue_Shutdown(renderer->event_queue); IMFMediaEventQueue_Shutdown(renderer->stream_event_queue); + audio_renderer_set_presentation_clock(renderer, NULL); LeaveCriticalSection(&renderer->cs); return S_OK; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 511c6a8eb9..b7229b4f71 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2970,8 +2970,10 @@ todo_wine IUnknown_Release(unk); /* Shutdown */ + EXPECT_REF(present_clock, 2); hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + EXPECT_REF(present_clock, 1); hr = IMFMediaSink_Shutdown(sink); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); -- 2.26.1

2 10