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

[PATCH 06/12] msvcrt: Don't clear x87 status word x86_64 _clearfp.
by Piotr Caban Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 05/12] msvcrt: Don't check x87 status word in x86_64 _statusfp.
by Piotr Caban Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH 04/12] msvcrt: Introduce _setfp_sse helper to access mxcsr register.
by Piotr Caban Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 275 +++++++++++++++++++-------------------------- 1 file changed, 115 insertions(+), 160 deletions(-)

1 0

[PATCH 03/12] msvcrt: Implement fesetenv for arm
by Piotr Caban Aug. 4, 2021

Aug. 4, 2021

From: Martin Storsjö <martin(a)martin.st> Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)

1 0

[PATCH 02/12] msvcrt: Implement fesetenv for arm64
by Piotr Caban Aug. 4, 2021

Aug. 4, 2021

From: Martin Storsjö <martin(a)martin.st> Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-)

1 0

[PATCH] d3d10core/tests: Test 2D texture creation with mutually exclusive sharing modes.
by Nikolay Sivov Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 2014e8edc94..58b5f90fadb 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1976,6 +1976,8 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_RENDER_TARGET, D3D10_RESOURCE_MISC_SHARED | D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX, + FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, -- 2.30.2

3 2

[PATCH] krnl386: Remove unused support for WCB16_REGS_LONG.
by Zebediah Figura Aug. 4, 2021

Aug. 4, 2021

This was introduced in 3a5b7cf105f52c3a2936be09e318c4177454bcc9 as way to expose wine_call_to_16_regs_long(); however, the same commit changed the only user to use WCB16_REGS instead. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/krnl386.exe16/wowthunk.c | 19 ++++--------------- include/wownt32.h | 1 - 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 73d1565c573..5bd9d7aecd4 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -400,7 +400,7 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, memcpy( stack, pArgs, cbArgs ); - if (dwFlags & (WCB16_REGS|WCB16_REGS_LONG)) + if (dwFlags & WCB16_REGS) { CONTEXT *context = (CONTEXT *)pdwRetCode; @@ -420,20 +420,9 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, } /* push return address */ - if (dwFlags & WCB16_REGS_LONG) - { - stack -= sizeof(DWORD); - *((DWORD *)stack) = HIWORD(call16_ret_addr); - stack -= sizeof(DWORD); - *((DWORD *)stack) = LOWORD(call16_ret_addr); - cbArgs += 2 * sizeof(DWORD); - } - else - { - stack -= sizeof(SEGPTR); - *((SEGPTR *)stack) = call16_ret_addr; - cbArgs += sizeof(SEGPTR); - } + stack -= sizeof(SEGPTR); + *((SEGPTR *)stack) = call16_ret_addr; + cbArgs += sizeof(SEGPTR); _EnterWin16Lock(); wine_call_to_16_regs( context, cbArgs, call16_handler ); diff --git a/include/wownt32.h b/include/wownt32.h index 51b1108d1c9..ddfa9b562b7 100644 --- a/include/wownt32.h +++ b/include/wownt32.h @@ -150,7 +150,6 @@ WORD WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE); /* Wine extensions: call register function, context ptr is passed in the return value LPDWORD */ #define WCB16_REGS 2 -#define WCB16_REGS_LONG 4 /* function uses 32-bit lret */ DWORD WINAPI WOWCallback16(DWORD,DWORD); BOOL WINAPI WOWCallback16Ex(DWORD,DWORD,DWORD,LPVOID,LPDWORD); -- 2.32.0

1 0

[PATCH v2 1/3] d2d1/tests: Add failure tests for ID2D1Effect_GetValue().
by Ziqing Hui Aug. 4, 2021

Aug. 4, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 72487692abf..629bbd65523 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9680,13 +9680,14 @@ static void test_mt_factory(BOOL d3d11) static void test_effect(BOOL d3d11) { - unsigned int i, min_inputs, max_inputs; + unsigned int i, min_inputs, max_inputs, str_size; D2D1_BUFFER_PRECISION precision; ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; ID2D1Factory1 *factory; ID2D1Effect *effect; + BYTE buffer[64]; BOOL cached; CLSID clsid; HRESULT hr; @@ -9735,6 +9736,33 @@ static void test_effect(BOOL d3d11) todo_wine { + hr = ID2D1Effect_GetValue(effect, 0xdeadbeef, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + str_size = (wcslen((WCHAR *)buffer) + 1) * sizeof(WCHAR); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size - 1); + ok(hr == D2DERR_INSUFFICIENT_BUFFER, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, 0xdeadbeef, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_UNKNOWN, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_VECTOR4, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_VECTOR4, buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); -- 2.25.1

3 10

[PATCH] ntdll/tests: Account for some timer resolution rounding.
by Francois Gouget Aug. 4, 2021

Aug. 4, 2021

With some time source drivers the requested timer resolution is rounded to the nearest value supported by the hardware, and that is then reported by NtSetTimerResolution(). So adjust the timer tests to allow close values, including outside the max-min range! Make sure the values given to NtQueryTimerResolution() are well outside the range of what it could return. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should fix the failures on cw-gtx560 and cw-rx460 in all Windows versions. --- dlls/ntdll/tests/time.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index f75b159f441..4b378d02e23 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -216,18 +216,20 @@ static void test_RtlQueryPerformanceCounter(void) } #endif +#define TIMER_LEEWAY 10 #define CHECK_CURRENT_TIMER(expected) \ do { \ ok(status == STATUS_SUCCESS, "NtSetTimerResolution failed %x\n", status); \ - ok(cur2 == (expected), "expected new timer resolution %u, got %u\n", (expected), cur2); \ - min2 = min + 10; \ + ok(cur2 == (expected) || broken(abs((expected) - cur2) <= TIMER_LEEWAY), "expected new timer resolution %u, got %u\n", (expected), cur2); \ + set = cur2; \ + min2 = min + 20000; \ cur2 = min2 + 1; \ max2 = cur2 + 1; \ status = NtQueryTimerResolution(&min2, &max2, &cur2); \ ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed %x\n", status); \ ok(min2 == min, "NtQueryTimerResolution() expected min=%u, got %u\n", min, min2); \ ok(max2 == max, "NtQueryTimerResolution() expected max=%u, got %u\n", max, max2); \ - ok(cur2 == expected, "NtQueryTimerResolution() expected timer resolution %u, got %u\n", (expected), cur2); \ + ok(cur2 == set, "NtQueryTimerResolution() expected timer resolution %u, got %u\n", set, cur2); \ } while (0) static void test_TimerResolution(void) @@ -252,7 +254,8 @@ static void test_TimerResolution(void) ok(min == 156250 /* 1/64s HPET */ || min == 156001 /* RTC */, "unexpected minimum timer resolution %u\n", min); ok(0 < max, "invalid maximum timer resolution, should be 0 < %u\n", max); - ok(max <= cur && cur <= min, "invalid timer resolutions, should be %u <= %u <= %u\n", max, cur, min); + ok(max <= cur || broken(max - TIMER_LEEWAY <= cur), "invalid timer resolutions, should be %u <= %u\n", max, cur); + ok(cur <= min || broken(cur <= min + TIMER_LEEWAY), "invalid timer resolutions, should be %u <= %u\n", cur, min); status = NtSetTimerResolution(0, FALSE, NULL); ok(status == STATUS_ACCESS_VIOLATION, "NtSetTimerResolution(,,NULL) success\n"); @@ -261,7 +264,7 @@ static void test_TimerResolution(void) status = NtSetTimerResolution(cur - 1, TRUE, NULL); ok(status == STATUS_ACCESS_VIOLATION, "NtSetTimerResolution() failed %x\n", status); - min2 = min + 1; + min2 = min + 10000; cur2 = min2 + 1; max2 = cur2 + 1; status = NtQueryTimerResolution(&min2, &max2, &cur2); @@ -311,7 +314,7 @@ static void test_TimerResolution(void) set = max < cur ? cur - 1 : max; status = NtSetTimerResolution(set, TRUE, &cur2); ok(status == STATUS_SUCCESS, "NtSetTimerResolution() failed %x\n", status); - ok(cur2 <= set, "expected new timer resolution %u <= %u\n", cur2, set); + ok(cur2 <= set || broken(cur2 <= set + TIMER_LEEWAY), "expected new timer resolution %u <= %u\n", cur2, set); trace("timer resolution: %u(max) <= %u(cur) <= %u(prev) <= %u(min)\n", max, cur2, cur, min); cur2 = 7654321; -- 2.20.1

1 0

[PATCH 9/9] gdi32: Use ntgdi name for SetVirtualResolution.
by Jacek Caban Aug. 4, 2021

Aug. 4, 2021

2 1