March 2021 - Wine-Devel - list.winehq.org

[PATCH v2] d2d1: Implement D2D1ConvertColorSpace.
by Giovanni Mascellani March 3, 2021

March 3, 2021

From: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 69 ++++++++++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 91 ++++++++++++++++++++++++++++++++++++++++++ include/d2d1_1.idl | 2 + 4 files changed, 163 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 0ae894109fb..3fa85a93bae 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -3,7 +3,7 @@ @ stdcall D2D1MakeSkewMatrix(float float float float ptr) @ stdcall D2D1IsMatrixInvertible(ptr) @ stdcall D2D1InvertMatrix(ptr) -@ stub D2D1ConvertColorSpace +@ stdcall D2D1ConvertColorSpace(long long ptr) @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext @ stdcall D2D1SinCos(float ptr ptr) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 6b6eab766c7..2e502003576 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -735,6 +735,75 @@ float WINAPI D2D1Vec3Length(float x, float y, float z) return sqrtf(x * x + y * y + z * z); } +/* Formulae taken from IEC 61966-2-1:1999; see also + https://www.khronos.org/registry/OpenGL/extensions/EXT/EXT_texture_sRGB.txt. */ +static float srgb_transfer_function(float x) +{ + if (x <= 0.0f) + return 0.0f; + else if (x >= 1.0f) + return 1.0f; + else if (x <= 0.0031308f) + return 12.92f * x; + else + return 1.055f * powf(x, 1.0f / 2.4f) - 0.055f; +} + +static float srgb_inverse_transfer_function(float x) +{ + if (x <= 0.0f) + return 0.0f; + else if (x >= 1.0f) + return 1.0f; + else if (x <= 0.04045f) + return x / 12.92f; + else + return powf((x + 0.055f) / 1.055f, 2.4f); +} + +D2D1_COLOR_F WINAPI D2D1ConvertColorSpace(D2D1_COLOR_SPACE source_color_space, + D2D1_COLOR_SPACE destination_color_space, const D2D1_COLOR_F *color) +{ + D2D1_COLOR_F ret; + + if (source_color_space == D2D1_COLOR_SPACE_CUSTOM || destination_color_space == D2D1_COLOR_SPACE_CUSTOM) + { + ret.r = 0.0f; + ret.g = 0.0f; + ret.b = 0.0f; + ret.a = 0.0f; + } + else if (source_color_space == destination_color_space) + { + ret = *color; + } + else if (source_color_space == D2D1_COLOR_SPACE_SRGB && destination_color_space == D2D1_COLOR_SPACE_SCRGB) + { + ret.r = srgb_inverse_transfer_function(color->r); + ret.g = srgb_inverse_transfer_function(color->g); + ret.b = srgb_inverse_transfer_function(color->b); + ret.a = color->a; + } + else if (source_color_space == D2D1_COLOR_SPACE_SCRGB && destination_color_space == D2D1_COLOR_SPACE_SRGB) + { + ret.r = srgb_transfer_function(color->r); + ret.g = srgb_transfer_function(color->g); + ret.b = srgb_transfer_function(color->b); + ret.a = color->a; + } + else + { + FIXME("unknown combination source_color_space %#x, destination_color_space %#x!\n", + source_color_space, destination_color_space); + ret.r = 0.0f; + ret.g = 0.0f; + ret.b = 0.0f; + ret.a = 0.0f; + } + + return ret; +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 8d584605819..b23ddaa767c 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -34,6 +34,8 @@ static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, static void (WINAPI *pD2D1SinCos)(float angle, float *s, float *c); static float (WINAPI *pD2D1Tan)(float angle); static float (WINAPI *pD2D1Vec3Length)(float x, float y, float z); +static D2D1_COLOR_F (WINAPI *pD2D1ConvertColorSpace)(D2D1_COLOR_SPACE source_color_space, + D2D1_COLOR_SPACE destination_color_space, const D2D1_COLOR_F *color); static BOOL use_mt = TRUE; @@ -9466,6 +9468,93 @@ static void test_math(BOOL d3d11) } } +static void test_color_space(BOOL d3d11) +{ + D2D1_COLOR_SPACE srcS, dstS; + unsigned i, j; + + static struct { + D2D1_COLOR_F srgb; + D2D1_COLOR_F scrgb; + } + const test_data[] = + { + {{0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, + {{0.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 0.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + /* Samples in the non-linear region. */ + {{0.2f, 0.4f, 0.6f, 0.8f}, {0.0331047624f, 0.132868335f, 0.318546832f, 0.8f}}, + {{0.3f, 0.5f, 0.7f, 0.9f}, {0.0732389688f, 0.214041144f, 0.447988421f, 0.9f}}, + /* Samples in the linear region. */ + {{0.0002f, 0.0004f, 0.0006f, 0.0008f}, {1.54798763e-005f, 3.09597526e-005f, 4.64396289e-005f, 0.0008f}}, + {{0.0003f, 0.0005f, 0.0007f, 0.0009f}, {2.32198145e-005f, 3.86996908e-005f, 5.41795634e-005f, 0.0009f}}, + }; + + if (!pD2D1ConvertColorSpace) + { + win_skip("D2D1ConvertColorSpace not available, skipping test.\n"); + return; + } + + for (srcS = 0; srcS < 3; srcS++) + for (dstS = 0; dstS < 3; dstS++) + for (i = 0; i < ARRAY_SIZE(test_data); i++) + for (j = 0; j < 3; j++) + { + D2D1_COLOR_F src = test_data[i].srgb, dst, expect; + BOOL change_expect = TRUE; + + if (srcS == D2D1_COLOR_SPACE_SCRGB) + src = test_data[i].scrgb; + if (srcS == D2D1_COLOR_SPACE_CUSTOM || dstS == D2D1_COLOR_SPACE_CUSTOM) + { + expect.r = 0.0f; + expect.g = 0.0f; + expect.b = 0.0f; + expect.a = 0.0f; + change_expect = FALSE; + } + else if (srcS == dstS) + expect = src; + else if (dstS == D2D1_COLOR_SPACE_SRGB) + expect = test_data[i].srgb; + else if (dstS == D2D1_COLOR_SPACE_SCRGB) + expect = test_data[i].scrgb; + else + ok(0, "Should not arrive here.\n"); + + /* Test underflowing or overflowing some components. */ + if (j == 1) + { + src.r = -0.5f; + src.a = -0.7f; + if (change_expect) + { + expect.r = srcS == dstS ? src.r : 0.0f; + expect.a = src.a; + } + } + else if (j == 2) + { + src.g = 1.5f; + src.a = 1.7f; + if (change_expect) + { + expect.g = srcS == dstS ? src.g : 1.0f; + expect.a = src.a; + } + } + + dst = pD2D1ConvertColorSpace(srcS, dstS, &src); + ok(compare_float(dst.r, expect.r, 1) && compare_float(dst.g, expect.g, 1) + && compare_float(dst.b, expect.b, 1) && compare_float(dst.a, expect.a, 1), + "Unexpected value {%.8e, %.8e, %.8e, %.8e} -> {%.8e, %.8e, %.8e, %.8e}, " + "expected {%.8e, %.8e, %.8e, %.8e}, while converting %#x -> %#x.\n", + src.r, src.g, src.b, src.a, dst.r, dst.g, dst.b, dst.a, + expect.r, expect.g, expect.b, expect.a, srcS, dstS); + } +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9476,6 +9565,7 @@ START_TEST(d2d1) pD2D1SinCos = (void *)GetProcAddress(d2d1_dll, "D2D1SinCos"); pD2D1Tan = (void *)GetProcAddress(d2d1_dll, "D2D1Tan"); pD2D1Vec3Length = (void *)GetProcAddress(d2d1_dll, "D2D1Vec3Length"); + pD2D1ConvertColorSpace = (void *)GetProcAddress(d2d1_dll, "D2D1ConvertColorSpace"); use_mt = !getenv("WINETEST_NO_MT_D3D"); @@ -9523,6 +9613,7 @@ START_TEST(d2d1) queue_test(test_dpi); queue_test(test_wic_bitmap_format); queue_d3d10_test(test_math); + queue_d3d10_test(test_color_space); run_queued_tests(); } diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1bcadab01d5..1a2ddcb90fb 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -962,3 +962,5 @@ interface ID2D1Multithread : IUnknown [local] void __stdcall D2D1SinCos(float angle, float *s, float *c); [local] float __stdcall D2D1Tan(float angle); [local] float __stdcall D2D1Vec3Length(float x, float y, float z); +[local] D2D1_COLOR_F __stdcall D2D1ConvertColorSpace(D2D1_COLOR_SPACE source_color_space, + D2D1_COLOR_SPACE destination_color_space, const D2D1_COLOR_F *color); -- 2.30.1

1 0

[PATCH] winevulkan: Fix host command_buffers allocation size.
by Rémi Bernon March 3, 2021

March 3, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a7f5462c432..51c2b8e0f5f 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1290,7 +1290,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, memcpy(&submits_host[i], &submits[i], sizeof(*submits_host)); num_command_buffers = submits[i].commandBufferCount; - command_buffers = heap_calloc(num_command_buffers, sizeof(*submits_host)); + command_buffers = heap_calloc(num_command_buffers, sizeof(*command_buffers)); if (!command_buffers) { ERR("Unable to allocate memory for command buffers!\n"); -- 2.30.0

1 0

[PATCH v3] vcruntime140_1: Support two continuation addresses for catchblock.
by Piotr Caban March 3, 2021

March 3, 2021

From: Paul Gofman <pgofman(a)codeweavers.com> MSVC generates that sometimes when there is a goto from catch block. Fixes a crash in Company of Heroes 2. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v3: - abort on unexpected catchblock handler return (instead of jumping to possibly incorrect address) - some minor style changes dlls/vcruntime140_1/except_x86_64.c | 59 ++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 13 deletions(-)

1 0

[PATCH 2/2] ntdll: Use xsave compaction in syscall dispatcher.
by Jacek Caban March 3, 2021

March 3, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 56 +++++++++++++++++++++++++++++++---- tools/winebuild/import.c | 13 +++++++- 2 files changed, 62 insertions(+), 7 deletions(-)

1 0

[PATCH 1/2] ntdll: Fix a typo in SegSs handling in NtSetContextThread.
by Jacek Caban March 3, 2021

March 3, 2021

Spotted by Brendan Shanks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/2] winecoreaudio: Cast enums to ints when printing.
by Huw Davies March 3, 2021

March 3, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index b002189e199..bc153d92511 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1748,7 +1748,7 @@ static DWORD ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout) for (i = 0; i < layout->mNumberChannelDescriptions; ++i) { switch (layout->mChannelDescriptions[i].mChannelLabel) { - default: FIXME("Unhandled channel 0x%x\n", layout->mChannelDescriptions[i].mChannelLabel); break; + default: FIXME("Unhandled channel 0x%x\n", (unsigned int)layout->mChannelDescriptions[i].mChannelLabel); break; case kAudioChannelLabel_Left: mask |= SPEAKER_FRONT_LEFT; break; case kAudioChannelLabel_Mono: case kAudioChannelLabel_Center: mask |= SPEAKER_FRONT_CENTER; break; @@ -1893,12 +1893,13 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, layout); if(sc == noErr){ TRACE("Got channel layout: {tag: 0x%x, bitmap: 0x%x, num_descs: %u}\n", - layout->mChannelLayoutTag, layout->mChannelBitmap, layout->mNumberChannelDescriptions); + (unsigned int)layout->mChannelLayoutTag, (unsigned int)layout->mChannelBitmap, + (unsigned int)layout->mNumberChannelDescriptions); if(layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelDescriptions){ convert_channel_layout(layout, fmt); }else{ - WARN("Haven't implemented support for this layout tag: 0x%x, guessing at layout\n", layout->mChannelLayoutTag); + WARN("Haven't implemented support for this layout tag: 0x%x, guessing at layout\n", (unsigned int)layout->mChannelLayoutTag); fmt->Format.nChannels = 0; } }else{ -- 2.23.0

1 0

[PATCH 1/2] winecoreaudio: Undefine a few more items to prevent macro redefinition warnings.
by Huw Davies March 3, 2021

March 3, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/audiounit.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 5f20b3dcb25..a3c190870ad 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -30,6 +30,23 @@ #undef ULONG #undef HRESULT #undef STDMETHODCALLTYPE +#undef SUCCEEDED +#undef FAILED +#undef IS_ERROR +#undef HRESULT_FACILITY +#undef MAKE_HRESULT +#undef S_OK +#undef S_FALSE +#undef E_UNEXPECTED +#undef E_NOTIMPL +#undef E_OUTOFMEMORY +#undef E_INVALIDARG +#undef E_NOINTERFACE +#undef E_POINTER +#undef E_HANDLE +#undef E_ABORT +#undef E_FAIL +#undef E_ACCESSDENIED #include "coreaudio.h" #include "wine/debug.h" -- 2.23.0

1 0

[PATCH v3] dwrite: Do not segfault when there are no typographic features to return.
by Giovanni Mascellani March 3, 2021

March 3, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/dwrite/shape.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 6428bf6ceb0..abeb7eeac79 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -372,6 +372,12 @@ HRESULT shape_get_typographic_features(struct scriptshaping_context *context, co shape_get_script_lang_index(context, scripts, MS_GPOS_TAG, &script_index, &language_index); opentype_get_typographic_features(&context->cache->gpos, script_index, language_index, &t); + if (t.count == 0) + { + *actual_tagcount = 0; + return S_OK; + } + /* Sort and remove duplicates. */ qsort(t.tags, t.count, sizeof(*t.tags), tag_array_sorting_compare); -- 2.30.1

2 1

[PATCH v2] dwrite: Do not segfault when there are no typographic features to return.
by Giovanni Mascellani March 3, 2021

March 3, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/dwrite/shape.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 6428bf6ceb0..809e66ebedb 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -372,6 +372,14 @@ HRESULT shape_get_typographic_features(struct scriptshaping_context *context, co shape_get_script_lang_index(context, scripts, MS_GPOS_TAG, &script_index, &language_index); opentype_get_typographic_features(&context->cache->gpos, script_index, language_index, &t); + /* Return immediately if there are not features, because the + duplicate removal algorithm doesn't like an empty array. */ + if (t.count == 0) + { + heap_free(t.tags); + return S_OK; + } + /* Sort and remove duplicates. */ qsort(t.tags, t.count, sizeof(*t.tags), tag_array_sorting_compare); -- 2.30.1

2 2

[PATCH] ntdll: Reset YMM state in NtSetContextThread() if that is assumed by the context being set.
by Paul Gofman March 3, 2021

March 3, 2021

Fixes test failure on testbot where compaction is not supported (resetting YMM state if that is implied by the context being set). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 0153f772b6d..9e97fd9e298 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1254,7 +1254,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) xsave->xstate.mask |= XSTATE_MASK_GSSE; memcpy( &xsave->xstate.ymm_high, &xs->YmmContext, sizeof(xsave->xstate.ymm_high) ); } - else if (xs->CompactionMask & XSTATE_MASK_GSSE) + else xsave->xstate.mask &= ~XSTATE_MASK_GSSE; } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index e62e958b4aa..2a030372fb7 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1864,7 +1864,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) xsave->xstate.Mask |= XSTATE_MASK_GSSE; memcpy( &xsave->xstate.YmmContext, &xs->YmmContext, sizeof(xs->YmmContext) ); } - else if (xs->CompactionMask & XSTATE_MASK_GSSE) + else xsave->xstate.Mask &= ~XSTATE_MASK_GSSE; } return STATUS_SUCCESS; -- 2.29.2

2 1