- Wine-Devel - list.winehq.org

[PATCH v2 1/3] win32u/tests: Add tests for NtUserEnumDisplayDevices return value.
by Torge Matthies Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/win32u/tests/win32u.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index a7c2e5ef029..f225a7893d2 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -16,12 +16,47 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS + #include "wine/test.h" #include "winbase.h" #include "ntuser.h" +static void test_NtUserEnumDisplayDevices(void) +{ + NTSTATUS ret; + DISPLAY_DEVICEW info = { sizeof(DISPLAY_DEVICEW) }; + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 ); + todo_wine ok( !ret && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); + todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); + + info.cb = 0; + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 ); + todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); + todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); +} + static void test_NtUserCloseWindowStation(void) { BOOL ret; @@ -67,6 +102,7 @@ START_TEST(win32u) /* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */ GetDesktopWindow(); + test_NtUserEnumDisplayDevices(); /* Must run before test_NtUserCloseWindowStation. */ test_NtUserCloseWindowStation(); test_window_props(); } -- 2.34.1

2 5

[PATCH v2] ntdll/tests: Fix the spelling of a comment.
by Francois Gouget Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/tests/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c index 09b9bcc8497..f381f64dbfe 100644 --- a/dlls/ntdll/tests/thread.c +++ b/dlls/ntdll/tests/thread.c @@ -99,7 +99,7 @@ static void test_dbg_hidden_thread_creation(void) NULL, NULL, PROCESS_PARAMS_FLAG_NORMALIZED ); ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); - /* NtCreateUserProcess() may return STATUS_INVALID_PARAMATER with some unitialized data in create_info. */ + /* NtCreateUserProcess() may return STATUS_INVALID_PARAMETER with some uninitialized data in create_info. */ memset( &create_info, 0, sizeof(create_info) ); create_info.Size = sizeof(create_info); -- 2.30.2

1 0

[PATCH] quartz: Fix a race in IMediaFilter::Pause().
by Akihiro Sagawa Dec. 10, 2021

Dec. 10, 2021

Before finishing async run, graph->stream_start isn't stable. This will cause graph->current_pos to be out of playback duration. Since graph->current_pos is out of the range, the playback will be stopped. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52200 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] d2d1: Create feature level 10.0 device context state objects.
by Henri Verbeet Dec. 10, 2021

Dec. 10, 2021

Commit 8c9354926204242cde714a51e5283bc3aac55837 introduced a feature level 11.0 requirement for Direct2D, but that was unintentional. We want Direct2D to be usable with feature level 10.0 hardware, and don't actually require any feature level 11.0 features. This issue was pointed out by Matteo Bruni. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 2069eeda0fc..e6b6f9efbea 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -3863,7 +3863,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, { 1.0f, -1.0f}, }; static const UINT16 indices[] = {0, 1, 2, 2, 1, 3}; - static const D3D_FEATURE_LEVEL feature_levels = D3D_FEATURE_LEVEL_11_0; + static const D3D_FEATURE_LEVEL feature_levels = D3D_FEATURE_LEVEL_10_0; render_target->ID2D1DeviceContext_iface.lpVtbl = &d2d_device_context_vtbl; render_target->ID2D1GdiInteropRenderTarget_iface.lpVtbl = &d2d_gdi_interop_render_target_vtbl; -- 2.30.2

2 1

[PATCH] d3dx10/tests: Remove crashing tests.
by Nikolay Sivov Dec. 10, 2021

Dec. 10, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51827 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This is crashing with d3dx10_34, it's easier to remove for now. dlls/d3dx10_43/tests/d3dx10.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 55a4d057fdf..89a43355756 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2466,12 +2466,11 @@ todo_wine hr = ID3DX10Font_PreloadCharacters(font, 'a', 'z'); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* Test multiple textures */ - hr = ID3DX10Font_PreloadGlyphs(font, 0, 1000); + /* Test glyphs that are not rendered */ + hr = ID3DX10Font_PreloadGlyphs(font, 0, 5); todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* Test glyphs that are not rendered */ for (glyph = 1; glyph < 4; ++glyph) { srv = (void *)0xdeadbeef; -- 2.33.0

2 1

[PATCH 1/2] d3d11: Report D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER.
by Zebediah Figura Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/device.c | 5 +++++ dlls/d3d11/tests/d3d11.c | 9 +++++++-- dlls/wined3d/directx.c | 6 +++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8f70d823247..098dbd449b7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3747,6 +3747,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * flag_mapping[] = { {WINED3D_RTYPE_BUFFER, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_BUFFER}, + {WINED3D_RTYPE_BUFFER, WINED3D_BIND_VERTEX_BUFFER, 0, D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER}, {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D}, @@ -3794,7 +3795,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * wined3d_mutex_unlock(); if (feature_level < D3D_FEATURE_LEVEL_10_0) + { *format_support &= ~D3D11_FORMAT_SUPPORT_BUFFER; + if (format == DXGI_FORMAT_R8G8_UINT || format == DXGI_FORMAT_R16_FLOAT) + *format_support &= ~D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER; + } if (*format_support & (D3D11_FORMAT_SUPPORT_TEXTURE1D | D3D11_FORMAT_SUPPORT_TEXTURE2D | D3D11_FORMAT_SUPPORT_TEXTURE3D)) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f59e9e99f1f..a9373b6c624 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20699,8 +20699,9 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE if (formats[i].fl_required <= feature_level) { - todo_wine ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", - format, feature_name, feature_level, format_support[format]); + todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER) + ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", + format, feature_name, feature_level, format_support[format]); continue; } @@ -34163,6 +34164,10 @@ START_TEST(d3d11) print_adapter_info(); + queue_for_each_feature_level(test_format_support); + run_queued_tests(); + return; + queue_test(test_create_device); queue_for_each_feature_level(test_device_interfaces); queue_test(test_immediate_context); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b2925eb97e9..334a520072d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1821,7 +1821,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, allowed_usage = WINED3DUSAGE_DYNAMIC; allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE - | WINED3D_BIND_UNORDERED_ACCESS; + | WINED3D_BIND_UNORDERED_ACCESS + | WINED3D_BIND_VERTEX_BUFFER; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_BUFFER; break; @@ -1853,6 +1854,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, format_flags |= WINED3DFMT_FLAG_DEPTH_STENCIL; if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS) format_flags |= WINED3DFMT_FLAG_UNORDERED_ACCESS; + if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) + format_flags |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE; + if (usage & WINED3DUSAGE_QUERY_FILTER) format_flags |= WINED3DFMT_FLAG_FILTERING; if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) -- 2.34.1

2 6

[PATCH v2 1/5] winevulkan: Support prefixing function parameters.
by Jacek Caban Dec. 10, 2021

Dec. 10, 2021

To allow them being accessed from a struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: make remaining direct calls more similar to __wine_unix_call dlls/winevulkan/make_vulkan | 59 ++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 27 deletions(-)

7 26

[PATCH v3 4/4] winevulkan: Use __wine_unix_call interface for some Vulkan functions.
by Jacek Caban Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 4 ++-- dlls/winevulkan/make_vulkan | 21 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-)

1 0

[PATCH v3 3/4] winevulkan: Make Vulkan direct Unix calls more similar to __wine_unix_call interface.
by Jacek Caban Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 10 ++--- dlls/winevulkan/make_vulkan | 59 +++++++++++++-------------- dlls/winevulkan/vulkan.c | 70 ++++++++++++++++----------------- dlls/winevulkan/vulkan_loader.h | 7 ++++ 4 files changed, 74 insertions(+), 72 deletions(-)

1 0

[PATCH v3 2/4] winevulkan: Pass Unix call arguments as a struct.
by Jacek Caban Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 31 +++- dlls/winevulkan/make_vulkan | 100 +++++++++---- dlls/winevulkan/vulkan.c | 285 +++++++++++++++++++++++++++--------- 3 files changed, 306 insertions(+), 110 deletions(-)

1 0