August 2023 - Wine-Commits - list.winehq.org

Jinoh Kang : ws2_32: Avoid relying on linux/ipx.h to define SOL_IPX.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 0deab78dc5ea69245c73d08ac7da52c9cef8313d URL: https://gitlab.winehq.org/wine/wine/-/commit/0deab78dc5ea69245c73d08ac7da52… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jul 27 22:39:50 2023 +0900 ws2_32: Avoid relying on linux/ipx.h to define SOL_IPX. musl libc doesn't supply any definitions for IPX, such as the SOL_IPX macro. However, it still provides linux/ipx.h from Linux uAPI header files if it exists. Linux kernel wouldn't drop linux/ipx.h from uAPI headers until 5.15, although IPX support has already been marked obsolete since 2018. Fix this by not defining HAS_IPX if linux/ipx.h has been included but nothing defines the SOL_IPX macro. Status of IPX support from other libcs are noted below: - bionic: netipx/ipx.h does not exist. linux/ipx.h may or may not exist. Note that sys/socket.h defines SOL_IPX even if linux/ipx.h is missing. - glibc: netipx/ipx.h exists. In this case, Wine assumes IPX support even if the operating system does not support it in runtime. - BSD variants: netipx/ipx.h may or may not exist. linux/ipx.h does not exist. Some BSDs supply SO_DEFAULT_HEADERS instead of SOL_IPX. Fixes: da4e359a700209c840490483f5337a14aa1d448f --- dlls/ws2_32/unixlib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 5cb64aad258..db36f18c7bd 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -75,7 +75,9 @@ # include <linux/types.h> # endif # include <linux/ipx.h> -# define HAS_IPX +# ifdef SOL_IPX +# define HAS_IPX +# endif #endif #ifdef HAVE_LINUX_IRDA_H

1 0

Jinoh Kang : ntdll: Avoid relying on linux/ipx.h to define SOL_IPX.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 14d4a896bd60d722aa6fed9bbedc39cc36036bef URL: https://gitlab.winehq.org/wine/wine/-/commit/14d4a896bd60d722aa6fed9bbedc39… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jul 27 22:39:50 2023 +0900 ntdll: Avoid relying on linux/ipx.h to define SOL_IPX. musl libc doesn't supply any definitions for IPX, such as the SOL_IPX macro. However, it still provides linux/ipx.h from Linux uAPI header files if it exists. Linux kernel wouldn't drop linux/ipx.h from uAPI headers until 5.15, although IPX support has already been marked obsolete since 2018. Fix this by not defining HAS_IPX if linux/ipx.h has been included but nothing defines the SOL_IPX macro. Status of IPX support from other libcs are noted below: - bionic: netipx/ipx.h does not exist. linux/ipx.h may or may not exist. Note that sys/socket.h defines SOL_IPX even if linux/ipx.h is missing. - glibc: netipx/ipx.h exists. In this case, Wine assumes IPX support even if the operating system does not support it in runtime. - BSD variants: netipx/ipx.h may or may not exist. linux/ipx.h does not exist. Some BSDs supply SO_DEFAULT_HEADERS instead of SOL_IPX. Fixes: 954bf9e0505a7368c34047b311d613cff04393a1 --- dlls/ntdll/unix/socket.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 6969f411955..e09bf34b07d 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -54,7 +54,9 @@ # include <linux/types.h> # endif # include <linux/ipx.h> -# define HAS_IPX +# ifdef SOL_IPX +# define HAS_IPX +# endif #endif #ifdef HAVE_LINUX_IRDA_H

1 0

Alistair Leslie-Hughes : d3dx11_43/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: f8aca5271807bb1db853d8c3bb78f8d69d690364 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8aca5271807bb1db853d8c3bb78f8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 1 18:02:42 2023 +1000 d3dx11_43/tests: Add a trailing '\n' to ok() calls. --- dlls/d3dx11_43/tests/d3dx11.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index 47451e7fff2..c35f12bf836 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -770,50 +770,50 @@ static void test_D3DX11GetImageInfoFromMemory(void) } hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL, &info, NULL); - ok(hr == S_OK, "Got unexpected hr %#lx.", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp) + 5, NULL, &info, NULL); /* too large size */ - ok(hr == S_OK, "Got unexpected hr %#lx.", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(noimage, sizeof(noimage), NULL, NULL, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(noimage, sizeof(noimage), NULL, &info, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp) - 1, NULL, &info, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(bmp_1bpp + 1, sizeof(bmp_1bpp) - 1, NULL, &info, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, 0, NULL, &info, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, 0, NULL, NULL, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, &info, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, NULL, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, &info, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(NULL, 4, NULL, NULL, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(NULL, 4, NULL, &info, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(NULL, 0, NULL, NULL, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* test BMP support */ hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL, &info, NULL); - ok(hr == S_OK, "Got unexpected hr %#lx.", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(info.Width == 1, "Unexpected width %u.\n", info.Width); ok(info.Height == 1, "Unexpected height %u.\n", info.Height); ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); @@ -825,7 +825,7 @@ static void test_D3DX11GetImageInfoFromMemory(void) ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat); hr = D3DX11GetImageInfoFromMemory(bmp_2bpp, sizeof(bmp_2bpp), NULL, &info, NULL); - ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DX11GetImageInfoFromMemory(bmp_4bpp, sizeof(bmp_4bpp), NULL, &info, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Paul Gofman : d3d11/tests: Add basic tests for keyed mutexes.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: e195aafe54dfa19fa361deedf8d0ba30cc79ad56 URL: https://gitlab.winehq.org/wine/wine/-/commit/e195aafe54dfa19fa361deedf8d0ba… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 24 13:58:01 2023 -0600 d3d11/tests: Add basic tests for keyed mutexes. --- dlls/d3d11/tests/d3d11.c | 170 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 61b83fc7cc4..9a907d907bb 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34937,6 +34937,7 @@ static void test_shared_resource(D3D_FEATURE_LEVEL feature_level) }; static const unsigned int sharing_type_flags = D3D11_RESOURCE_MISC_SHARED | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX; struct device_desc device_desc = { 0 }; + IDXGIKeyedMutex *keyed_mutex; ID3D11Texture2D *tex, *tex2; D3D11_TEXTURE2D_DESC desc; ID3D11Device1 *device1; @@ -34983,6 +34984,7 @@ static void test_shared_resource(D3D_FEATURE_LEVEL feature_level) tex = NULL; res = NULL; res1 = NULL; + keyed_mutex = NULL; desc.MiscFlags = tests[test]; nthandle = desc.MiscFlags & D3D11_RESOURCE_MISC_SHARED_NTHANDLE; @@ -35008,6 +35010,13 @@ static void test_shared_resource(D3D_FEATURE_LEVEL feature_level) if (FAILED(hr)) goto test_done; + keyed_mutex = NULL; + hr = ID3D11Texture2D_QueryInterface(tex, &IID_IDXGIKeyedMutex, (void **)&keyed_mutex); + if (desc.MiscFlags & D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX) + todo_wine ok(hr == S_OK, "got %#lx.\n", hr); + else + ok(hr == E_NOINTERFACE, "got %#lx.\n", hr); + hr = ID3D11Texture2D_QueryInterface(tex, &IID_IDXGIResource, (void **)&res); ok(hr == S_OK, "got %#lx.\n", hr); hr = ID3D11Texture2D_QueryInterface(tex, &IID_IDXGIResource1, (void **)&res1); @@ -35085,6 +35094,8 @@ static void test_shared_resource(D3D_FEATURE_LEVEL feature_level) ok(!bret && GetLastError() == ERROR_INVALID_HANDLE, "got bret %d, err %lu.\n", bret, GetLastError()); test_done: + if (keyed_mutex) + IDXGIKeyedMutex_Release(keyed_mutex); if (tex) IDXGIResource_Release(res); if (res) @@ -35100,6 +35111,164 @@ test_done: ok(!ref, "got %ld.\n", ref); } +static void test_keyed_mutex(void) +{ + IDXGIKeyedMutex *keyed_mutex, *keyed_mutex2; + ID3D11Device *device, *device2; + ID3D11Texture2D *tex, *tex2; + D3D11_TEXTURE2D_DESC desc; + IDXGIObject *obj1, *obj2; + IDXGIResource *res; + HANDLE handle; + HRESULT hr; + ULONG ref; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + memset(&desc, 0, sizeof(desc)); + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Width = 256; + desc.Height = 256; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.SampleDesc.Count = 1; + desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + desc.MiscFlags = D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &tex); + ok(hr == S_OK || broken(hr == E_OUTOFMEMORY) /* software device before Win8 */, "got %#lx.\n", hr); + if (FAILED(hr)) + { + skip("Shared resources are not supported.\n"); + ID3D11Device_Release(device); + return; + } + + hr = ID3D11Texture2D_QueryInterface(tex, &IID_IDXGIKeyedMutex, (void **)&keyed_mutex); + todo_wine ok(hr == S_OK, "got %#lx.\n", hr); + if (FAILED(hr)) + { + ID3D11Texture2D_Release(tex); + ID3D11Device_Release(device); + return; + } + hr = IDXGIKeyedMutex_QueryInterface(keyed_mutex, &IID_IDXGIObject, (void **)&obj1); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = ID3D11Texture2D_QueryInterface(tex, &IID_IDXGIResource, (void **)&res); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IDXGIResource_QueryInterface(res, &IID_IDXGIObject, (void **)&obj2); + ok(hr == S_OK, "got %#lx.\n", hr); + + ok(obj1 == obj2, "got %p, %p.\n", obj1, obj2); + + IDXGIObject_Release(obj1); + IDXGIObject_Release(obj2); + IDXGIResource_Release(res); + + /* Releasing not aquired mutex. */ + hr = IDXGIKeyedMutex_ReleaseSync(keyed_mutex, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_ReleaseSync(keyed_mutex, 1); + ok(hr == DXGI_ERROR_INVALID_CALL, "got %#lx.\n", hr); + + /* Initial key which mutex can be acquired with is 0. */ + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex, 1, 0); + ok(hr == WAIT_TIMEOUT, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex, 0, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + + /* Attempt to acquire a mutex once again on the same device fails. */ + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex, 0, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex, 1, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "got %#lx.\n", hr); + + /* May release to any value. */ + hr = IDXGIKeyedMutex_ReleaseSync(keyed_mutex, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex, 0, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_ReleaseSync(keyed_mutex, 1); + ok(hr == S_OK, "got %#lx.\n", hr); + + /* Acquire with the last release value succeeds. */ + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex, 0, 0); + ok(hr == WAIT_TIMEOUT, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex, 2, 0); + ok(hr == WAIT_TIMEOUT, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex, 1, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_ReleaseSync(keyed_mutex, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex, 0, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + + device2 = create_device(NULL); + ok(!!device2, "got NULL.\n"); + + hr = ID3D11Texture2D_QueryInterface(tex, &IID_IDXGIResource, (void **)&res); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IDXGIResource_GetSharedHandle(res, &handle); + ok(hr == S_OK, "got %#lx.\n", hr); + IDXGIResource_Release(res); + + hr = ID3D11Device_OpenSharedResource(device2, handle, &IID_ID3D11Texture2D, (void **)&tex2); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = ID3D11Texture2D_QueryInterface(tex2, &IID_IDXGIKeyedMutex, (void **)&keyed_mutex2); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex, 0, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "got %#lx.\n", hr); + /* Trying to acquire locked mutex on the other device. */ + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex2, 0, 0); + ok(hr == WAIT_TIMEOUT, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex2, 1, 0); + ok(hr == WAIT_TIMEOUT, "got %#lx.\n", hr); + + /* Trying to release locked on the other device. */ + hr = IDXGIKeyedMutex_ReleaseSync(keyed_mutex2, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_ReleaseSync(keyed_mutex2, 1); + ok(hr == DXGI_ERROR_INVALID_CALL, "got %#lx.\n", hr); + + /* Almost supposed usage (but using the same key to release and acquire). */ + hr = IDXGIKeyedMutex_ReleaseSync(keyed_mutex, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex2, 0, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_ReleaseSync(keyed_mutex2, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex, 0, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + + IDXGIKeyedMutex_Release(keyed_mutex); + ID3D11Texture2D_Release(tex); + ref = ID3D11Device_Release(device); + ok(!ref, "got %ld.\n", ref); + + /* Device closed while holding mutex. Now keyed mutex is broken and acquire will only return + * WAIT_ABANDONED, as the docs suggest, the only way out is recreating the shared resource. */ + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex2, 0, 0); + ok(hr == WAIT_ABANDONED, "got %#lx.\n", hr); + /* Try twice, just in case. */ + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex2, 0, 0); + ok(hr == WAIT_ABANDONED, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_ReleaseSync(keyed_mutex2, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_ReleaseSync(keyed_mutex2, 1); + ok(hr == DXGI_ERROR_INVALID_CALL, "got %#lx.\n", hr); + hr = IDXGIKeyedMutex_AcquireSync(keyed_mutex2, 0, 0); + ok(hr == WAIT_ABANDONED, "got %#lx.\n", hr); + + IDXGIKeyedMutex_Release(keyed_mutex2); + ID3D11Texture2D_Release(tex2); + ref = ID3D11Device_Release(device2); + ok(!ref, "got %ld.\n", ref); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -35295,6 +35464,7 @@ START_TEST(d3d11) queue_test(test_vertex_formats); queue_test(test_dxgi_resources); queue_for_each_feature_level(test_shared_resource); + queue_test(test_keyed_mutex); run_queued_tests();

1 0

Jeff Smith : gdiplus/tests: Use compare_uint() in compare_float() instead of abs().
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 0b34786097aa6ddad0acd72a75f62acb1d59ad35 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b34786097aa6ddad0acd72a75f62a… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Aug 2 22:25:20 2023 -0500 gdiplus/tests: Use compare_uint() in compare_float() instead of abs(). The result of abs(INT_MIN) is INT_MIN, which breaks the ulps comparison. --- dlls/gdiplus/tests/customlinecap.c | 12 ++++++++---- dlls/gdiplus/tests/matrix.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 6aecf1c7dc4..a8bb5cf371b 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -26,6 +26,13 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) #define expectf(expected, got) ok(got == expected, "Expected %.2f, got %.2f\n", expected, got) +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -36,10 +43,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static void test_constructor_destructor(void) diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index dea08c13120..7f515d0a60c 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -28,6 +28,13 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) #define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -38,10 +45,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return FALSE; - - return TRUE; + return compare_uint(x, y, ulps); } static void test_constructor_destructor(void)

1 0

Zebediah Figura : wined3d: Move struct wined3d_rendertarget_info to wined3d_gl.h.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 0057357ffd147498c34159f0dd3cc4a438badfe2 URL: https://gitlab.winehq.org/wine/wine/-/commit/0057357ffd147498c34159f0dd3cc4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 15:59:20 2023 -0600 wined3d: Move struct wined3d_rendertarget_info to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 16 +--------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index fcd9e73b2ad..ba8dc68aaad 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -550,4 +550,18 @@ struct wined3d_pipeline_statistics_query BOOL started; }; +struct wined3d_gl_view +{ + GLenum target; + GLuint name; +}; + +struct wined3d_rendertarget_info +{ + struct wined3d_gl_view gl_view; + struct wined3d_resource *resource; + unsigned int sub_resource_idx; + unsigned int layer_count; +}; + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f5dc9b4ec11..d5b2cc0e020 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1882,29 +1882,15 @@ struct wined3d_query bool poll_in_cs; }; -#include "wined3d_gl.h" - #define WINED3D_QUERY_POOL_SIZE 256 -struct wined3d_gl_view -{ - GLenum target; - GLuint name; -}; - struct wined3d_range { unsigned int offset; unsigned int size; }; -struct wined3d_rendertarget_info -{ - struct wined3d_gl_view gl_view; - struct wined3d_resource *resource; - unsigned int sub_resource_idx; - unsigned int layer_count; -}; +#include "wined3d_gl.h" struct wined3d_fb_state {

1 0

Zebediah Figura : wined3d: Move struct wined3d_query_gl to wined3d_gl.h.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: ca954a05712aabf1cd1cff84bcb058c8b50aa651 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca954a05712aabf1cd1cff84bcb058… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 15:57:29 2023 -0600 wined3d: Move struct wined3d_query_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 85 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 91 ++---------------------------------------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8bc3e9eb6a3..fcd9e73b2ad 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -465,4 +465,89 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence *fence, struct wined3d_device *device, uint32_t flags); +HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); +void wined3d_query_gl_destroy_buffer_object(struct wined3d_context_gl *context_gl, struct wined3d_query *query); + +struct wined3d_event_query +{ + struct wined3d_query query; + + struct wined3d_fence fence; + BOOL signalled; +}; + +struct wined3d_occlusion_query +{ + struct wined3d_query query; + + struct list entry; + GLuint id; + struct wined3d_context_gl *context_gl; + uint64_t samples; + BOOL started; +}; + +struct wined3d_timestamp_query +{ + struct wined3d_query query; + + struct list entry; + GLuint id; + struct wined3d_context_gl *context_gl; + uint64_t timestamp; +}; + +union wined3d_gl_so_statistics_query +{ + GLuint id[2]; + struct + { + GLuint written; + GLuint generated; + } query; +}; + +struct wined3d_so_statistics_query +{ + struct wined3d_query query; + + struct list entry; + union wined3d_gl_so_statistics_query u; + struct wined3d_context_gl *context_gl; + unsigned int stream_idx; + struct wined3d_query_data_so_statistics statistics; + BOOL started; +}; + +union wined3d_gl_pipeline_statistics_query +{ + GLuint id[11]; + struct + { + GLuint vertices; + GLuint primitives; + GLuint vertex_shader; + GLuint tess_control_shader; + GLuint tess_eval_shader; + GLuint geometry_shader; + GLuint geometry_primitives; + GLuint fragment_shader; + GLuint compute_shader; + GLuint clipping_input; + GLuint clipping_output; + } query; +}; + +struct wined3d_pipeline_statistics_query +{ + struct wined3d_query query; + + struct list entry; + union wined3d_gl_pipeline_statistics_query u; + struct wined3d_context_gl *context_gl; + struct wined3d_query_data_pipeline_statistics statistics; + BOOL started; +}; + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7596db2a2a5..f5dc9b4ec11 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1843,8 +1843,6 @@ enum fogsource { FOGSOURCE_COORD, }; -#include "wined3d_gl.h" - /* Direct3D terminology with little modifications. We do not have an issued * state because only the driver knows about it, but we have a created state * because D3D allows GetData() on a created query, but OpenGL doesn't. */ @@ -1878,96 +1876,13 @@ struct wined3d_query LONG counter_main, counter_retrieved; struct list poll_list_entry; - GLuint buffer_object; + /* FIXME: This is GL-specific. */ + unsigned int buffer_object; UINT64 *map_ptr; bool poll_in_cs; }; -HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, - const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) DECLSPEC_HIDDEN; -void wined3d_query_gl_destroy_buffer_object(struct wined3d_context_gl *context_gl, - struct wined3d_query *query) DECLSPEC_HIDDEN; - -struct wined3d_event_query -{ - struct wined3d_query query; - - struct wined3d_fence fence; - BOOL signalled; -}; - -struct wined3d_occlusion_query -{ - struct wined3d_query query; - - struct list entry; - GLuint id; - struct wined3d_context_gl *context_gl; - UINT64 samples; - BOOL started; -}; - -struct wined3d_timestamp_query -{ - struct wined3d_query query; - - struct list entry; - GLuint id; - struct wined3d_context_gl *context_gl; - UINT64 timestamp; -}; - -union wined3d_gl_so_statistics_query -{ - GLuint id[2]; - struct - { - GLuint written; - GLuint generated; - } query; -}; - -struct wined3d_so_statistics_query -{ - struct wined3d_query query; - - struct list entry; - union wined3d_gl_so_statistics_query u; - struct wined3d_context_gl *context_gl; - unsigned int stream_idx; - struct wined3d_query_data_so_statistics statistics; - BOOL started; -}; - -union wined3d_gl_pipeline_statistics_query -{ - GLuint id[11]; - struct - { - GLuint vertices; - GLuint primitives; - GLuint vertex_shader; - GLuint tess_control_shader; - GLuint tess_eval_shader; - GLuint geometry_shader; - GLuint geometry_primitives; - GLuint fragment_shader; - GLuint compute_shader; - GLuint clipping_input; - GLuint clipping_output; - } query; -}; - -struct wined3d_pipeline_statistics_query -{ - struct wined3d_query query; - - struct list entry; - union wined3d_gl_pipeline_statistics_query u; - struct wined3d_context_gl *context_gl; - struct wined3d_query_data_pipeline_statistics statistics; - BOOL started; -}; +#include "wined3d_gl.h" #define WINED3D_QUERY_POOL_SIZE 256

1 0

Zebediah Figura : wined3d: Move struct wined3d_fence to wined3d_gl.h.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 0f1679f379bca4aeb61a4946b22f4de8b1509f72 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f1679f379bca4aeb61a4946b22f4d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 15:43:32 2023 -0600 wined3d: Move struct wined3d_fence to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 29 +++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 32 +------------------------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 390e3164ea5..8bc3e9eb6a3 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -436,4 +436,33 @@ static inline GLuint wined3d_bo_gl_id(struct wined3d_bo *bo) return bo ? wined3d_bo_gl(bo)->id : 0; } +union wined3d_gl_fence_object +{ + GLuint id; + GLsync sync; +}; + +enum wined3d_fence_result +{ + WINED3D_FENCE_OK, + WINED3D_FENCE_WAITING, + WINED3D_FENCE_NOT_STARTED, + WINED3D_FENCE_WRONG_THREAD, + WINED3D_FENCE_ERROR, +}; + +struct wined3d_fence +{ + struct list entry; + union wined3d_gl_fence_object object; + struct wined3d_context_gl *context_gl; +}; + +HRESULT wined3d_fence_create(struct wined3d_device *device, struct wined3d_fence **fence); +void wined3d_fence_destroy(struct wined3d_fence *fence); +void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *device); +enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, struct wined3d_device *device); +enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence *fence, + struct wined3d_device *device, uint32_t flags); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a3bccb569b..7596db2a2a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1611,8 +1611,6 @@ struct wined3d_bo bool coherent; }; -#include "wined3d_gl.h" - struct wined3d_bo_user { struct list entry; @@ -1845,35 +1843,7 @@ enum fogsource { FOGSOURCE_COORD, }; -union wined3d_gl_fence_object -{ - GLuint id; - GLsync sync; -}; - -enum wined3d_fence_result -{ - WINED3D_FENCE_OK, - WINED3D_FENCE_WAITING, - WINED3D_FENCE_NOT_STARTED, - WINED3D_FENCE_WRONG_THREAD, - WINED3D_FENCE_ERROR, -}; - -struct wined3d_fence -{ - struct list entry; - union wined3d_gl_fence_object object; - struct wined3d_context_gl *context_gl; -}; - -HRESULT wined3d_fence_create(struct wined3d_device *device, struct wined3d_fence **fence) DECLSPEC_HIDDEN; -void wined3d_fence_destroy(struct wined3d_fence *fence) DECLSPEC_HIDDEN; -void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *device) DECLSPEC_HIDDEN; -enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, - struct wined3d_device *device) DECLSPEC_HIDDEN; -enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence *fence, - struct wined3d_device *device, uint32_t flags) DECLSPEC_HIDDEN; +#include "wined3d_gl.h" /* Direct3D terminology with little modifications. We do not have an issued * state because only the driver knows about it, but we have a created state

1 0

Zebediah Figura : wined3d: Move struct wined3d_bo_gl to wined3d_gl.h.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: 2ace2166a18f5ed13b94dfb49560d70e9d67d2a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ace2166a18f5ed13b94dfb49560d7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 15:39:49 2023 -0600 wined3d: Move struct wined3d_bo_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 28 +--------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f4130c72d30..390e3164ea5 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -410,4 +410,30 @@ static inline bool wined3d_fence_supported(const struct wined3d_gl_info *gl_info #define checkGLcall(A) do {} while(0) #endif +struct wined3d_bo_gl +{ + struct wined3d_bo b; + + GLuint id; + + struct wined3d_allocator_block *memory; + + GLsizeiptr size; + GLenum binding; + GLenum usage; + + GLbitfield flags; + uint64_t command_fence_id; +}; + +static inline struct wined3d_bo_gl *wined3d_bo_gl(struct wined3d_bo *bo) +{ + return CONTAINING_RECORD(bo, struct wined3d_bo_gl, b); +} + +static inline GLuint wined3d_bo_gl_id(struct wined3d_bo *bo) +{ + return bo ? wined3d_bo_gl(bo)->id : 0; +} + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2c8f4035bd..acec4044f01 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -144,8 +144,6 @@ enum wined3d_ffp_emit_idx WINED3D_FFP_EMIT_COUNT, }; -#include "wined3d_gl.h" - /* Texture format fixups */ enum fixup_channel_source @@ -1613,31 +1611,7 @@ struct wined3d_bo bool coherent; }; -struct wined3d_bo_gl -{ - struct wined3d_bo b; - - GLuint id; - - struct wined3d_allocator_block *memory; - - GLsizeiptr size; - GLenum binding; - GLenum usage; - - GLbitfield flags; - uint64_t command_fence_id; -}; - -static inline struct wined3d_bo_gl *wined3d_bo_gl(struct wined3d_bo *bo) -{ - return CONTAINING_RECORD(bo, struct wined3d_bo_gl, b); -} - -static inline GLuint wined3d_bo_gl_id(struct wined3d_bo *bo) -{ - return bo ? wined3d_bo_gl(bo)->id : 0; -} +#include "wined3d_gl.h" struct wined3d_bo_user {

1 0

Zebediah Figura : wined3d: Avoid using GL-specific types in struct wined3d_stream_info.
by Alexandre Julliard Aug. 8, 2023

Aug. 8, 2023

Module: wine Branch: master Commit: a9cd6112dc3657033c23363e3334099f6c5b6161 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9cd6112dc3657033c23363e333409… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 15:43:18 2023 -0600 wined3d: Avoid using GL-specific types in struct wined3d_stream_info. --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index acec4044f01..1a3bccb569b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1640,7 +1640,7 @@ struct wined3d_stream_info_element { const struct wined3d_format *format; struct wined3d_bo_address data; - GLsizei stride; + unsigned int stride; unsigned int stream_idx; unsigned int divisor; bool instanced;

1 0