March 2022 - Wine-devel - list.winehq.org

[PATCH] wined3d: Try to load winevulkan.dll instead of vulkan-1.dll.
by Zebediah Figura 14 Mar '22

14 Mar '22

The Khronos Vulkan loader calls into dxgi, which results in infinite recursion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52640 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 391225b03a7..44ea5201799 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -210,7 +210,8 @@ static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; - if (!(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll"))) + if (!(vk_info->vulkan_lib = LoadLibraryA("winevulkan.dll")) + && !(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll"))) { WARN("Failed to load vulkan-1.dll.\n"); return FALSE; -- 2.35.1

2 1

[PATCH] d2d1/tests: Actually test the return of ID2D1TransformedGeometry_GetBounds
by Michael Stefaniuc 14 Mar '22

14 Mar '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3ade9634069..9db27b13ec9 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4163,7 +4163,7 @@ static void test_rectangle_geometry(BOOL d3d11) hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)geometry, &matrix, &transformed_geometry); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID2D1TransformedGeometry_GetBounds(transformed_geometry, NULL, &rect); + hr = ID2D1TransformedGeometry_GetBounds(transformed_geometry, NULL, &rect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_rect(&rect, -7.85640717e+01f, 1.79903809e+02f, 1.07179594e+01f, 2.73205078e+02f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", @@ -4184,7 +4184,7 @@ static void test_rectangle_geometry(BOOL d3d11) set_matrix_identity(&matrix); rotate_matrix(&matrix, M_PI / -3.0f); scale_matrix(&matrix, 0.25f, 0.2f); - ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + hr = ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_rect(&rect, 30.0f, 20.0f, 40.0f, 40.0f, 2); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", @@ -4198,7 +4198,7 @@ static void test_rectangle_geometry(BOOL d3d11) set_matrix_identity(&matrix); scale_matrix(&matrix, 2.0f, 0.0f); - ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + hr = ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_rect(&rect, -1.57128143e+02f, 0.00000000e+00f, 2.14359188e+01f, 0.00000000e+00f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", @@ -4212,7 +4212,7 @@ static void test_rectangle_geometry(BOOL d3d11) set_matrix_identity(&matrix); scale_matrix(&matrix, 0.0f, 0.5f); - ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + hr = ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_rect(&rect, 0.00000000e+00f, 8.99519043e+01f, 0.00000000e+00, 1.36602539e+02f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", -- 2.34.1

2 1

[PATCH vkd3d] vkd3d-shader/sm4: Recognise the msad opcode.
by Henri Verbeet 14 Mar '22

14 Mar '22

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Use "vkd3d-shader/sm4" for changes to the shader model 4 parser. "vkd3d-shader/dxbc" is used for the container format. libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1ab71ca4..17be2306 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -837,6 +837,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_DDIV, VKD3DSIH_DDIV, "d", "dd"}, {VKD3D_SM5_OP_DFMA, VKD3DSIH_DFMA, "d", "ddd"}, {VKD3D_SM5_OP_DRCP, VKD3DSIH_DRCP, "d", "d"}, + {VKD3D_SM5_OP_MSAD, VKD3DSIH_MSAD, "u", "uuu"}, {VKD3D_SM5_OP_DTOI, VKD3DSIH_DTOI, "i", "d"}, {VKD3D_SM5_OP_DTOU, VKD3DSIH_DTOU, "u", "d"}, {VKD3D_SM5_OP_ITOD, VKD3DSIH_ITOD, "d", "i"}, diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index 62bb4d12..fd388c81 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -350,6 +350,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DDIV = 0xd2, VKD3D_SM5_OP_DFMA = 0xd3, VKD3D_SM5_OP_DRCP = 0xd4, + VKD3D_SM5_OP_MSAD = 0xd5, VKD3D_SM5_OP_DTOI = 0xd6, VKD3D_SM5_OP_DTOU = 0xd7, VKD3D_SM5_OP_ITOD = 0xd8, diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index c292c847..6c30edc9 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -225,6 +225,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_MOV ] = "mov", [VKD3DSIH_MOVA ] = "mova", [VKD3DSIH_MOVC ] = "movc", + [VKD3DSIH_MSAD ] = "msad", [VKD3DSIH_MUL ] = "mul", [VKD3DSIH_NE ] = "ne", [VKD3DSIH_NOP ] = "nop", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 01e090cc..21f23709 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -328,6 +328,7 @@ enum vkd3d_shader_opcode VKD3DSIH_MOV, VKD3DSIH_MOVA, VKD3DSIH_MOVC, + VKD3DSIH_MSAD, VKD3DSIH_MUL, VKD3DSIH_NE, VKD3DSIH_NOP, -- 2.20.1

1 0

[PATCH vkd3d v2] tests: Use only one heap for textures in the d3d12 shader runner.
by Zebediah Figura 14 Mar '22

14 Mar '22

The d3d12 specification forbids simultaneously binding more than one heap of a given type. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Tested with 227604; I can reproduce the error without this patch applied and can confirm this patch fixes it. v2: Fix the crosstest build. tests/shader_runner.c | 2 +- tests/shader_runner.h | 3 +++ tests/shader_runner_d3d12.c | 24 ++++++++++++++++++------ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 1808a581b..8cfdf052c 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -61,7 +61,7 @@ typedef int HRESULT; #include "vkd3d_test.h" #include "shader_runner.h" -static void VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2) fatal_error(const char *format, ...) +void fatal_error(const char *format, ...) { va_list args; diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 822a863f1..6958191d9 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -21,6 +21,7 @@ #include "vkd3d_d3dcommon.h" #include "vkd3d_d3d12.h" #include "vkd3d_dxgiformat.h" +#include "vkd3d_common.h" #include "utils.h" enum shader_model @@ -89,6 +90,8 @@ struct shader_runner_ops void (*probe_vec4)(struct shader_context *context, const RECT *rect, const struct vec4 *v, unsigned int ulps); }; +void fatal_error(const char *format, ...) VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2); + void run_shader_tests(struct shader_context *context, int argc, char **argv, const struct shader_runner_ops *ops); #ifdef _WIN32 diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 00bb9e414..571efeacd 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -29,7 +29,6 @@ struct d3d12_texture struct texture t; D3D12_DESCRIPTOR_RANGE descriptor_range; - ID3D12DescriptorHeap *heap; ID3D12Resource *resource; unsigned int root_index; }; @@ -44,6 +43,8 @@ struct d3d12_shader_context struct shader_context c; struct test_context test_context; + + ID3D12DescriptorHeap *heap; }; static struct d3d12_shader_context *d3d12_shader_context(struct shader_context *c) @@ -77,6 +78,8 @@ static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_m return blob; } +#define MAX_RESOURCE_DESCRIPTORS 256 + static struct texture *d3d12_runner_create_texture(struct shader_context *c, const struct texture_params *params) { struct d3d12_shader_context *context = d3d12_shader_context(c); @@ -85,11 +88,17 @@ static struct texture *d3d12_runner_create_texture(struct shader_context *c, con D3D12_SUBRESOURCE_DATA resource_data; struct d3d12_texture *texture; + if (!context->heap) + context->heap = create_gpu_descriptor_heap(device, + D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS); + + if (params->slot >= MAX_RESOURCE_DESCRIPTORS) + fatal_error("Resource slot %u is too high; please increase MAX_RESOURCE_DESCRIPTORS.\n", params->slot); + texture = calloc(1, sizeof(*texture)); texture->t.slot = params->slot; - texture->heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); texture->resource = create_default_texture(device, params->width, params->height, params->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); resource_data.pData = params->data; @@ -99,7 +108,7 @@ static struct texture *d3d12_runner_create_texture(struct shader_context *c, con transition_resource_state(test_context->list, texture->resource, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); ID3D12Device_CreateShaderResourceView(device, texture->resource, - NULL, get_cpu_descriptor_handle(test_context, texture->heap, 0)); + NULL, get_cpu_descriptor_handle(test_context, context->heap, params->slot)); return &texture->t; } @@ -108,7 +117,6 @@ static void d3d12_runner_destroy_texture(struct shader_context *c, struct textur { struct d3d12_texture *texture = d3d12_texture(t); - ID3D12DescriptorHeap_Release(texture->heap); ID3D12Resource_Release(texture->resource); free(texture); } @@ -214,7 +222,7 @@ static void d3d12_runner_draw_quad(struct shader_context *c) struct d3d12_texture *texture = d3d12_texture(context->c.textures[i]); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, texture->root_index, - get_gpu_descriptor_handle(test_context, texture->heap, 0)); + get_gpu_descriptor_handle(test_context, context->heap, texture->t.slot)); } ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &test_context->rtv, false, NULL); @@ -266,12 +274,16 @@ void run_shader_tests_d3d12(int argc, char **argv) .no_root_signature = true, .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, }; - struct d3d12_shader_context context; + struct d3d12_shader_context context = {0}; parse_args(argc, argv); enable_d3d12_debug_layer(argc, argv); init_adapter_info(); init_test_context(&context.test_context, &desc); + run_shader_tests(&context.c, argc, argv, &d3d12_runner_ops); + + if (context.heap) + ID3D12DescriptorHeap_Release(context.heap); destroy_test_context(&context.test_context); } -- 2.35.1

2 1

[PATCH 1/3] winhttp: Fix filling TIMEVAL in netconn_create().
by Paul Gofman 14 Mar '22

14 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 229700: no changes, resent to avoid conflicts with the next patches. dlls/winhttp/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 19fafb25804..09ed5e222d1 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -229,7 +229,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock if (ret == WSAEWOULDBLOCK || ret == WSAEINPROGRESS) { FD_SET set; - TIMEVAL timeval = { 0, timeout * 1000 }; + TIMEVAL timeval = { timeout / 1000, (timeout % 1000) * 1000 }; int res; FD_ZERO( &set ); -- 2.35.1

1 2

[PATCH v2 1/5] windows.media.speech: Add IAgileObject to SpeechRecognizer.
by Rémi Bernon 14 Mar '22

14 Mar '22

From: Bernhard Kölbl <besentv(a)gmail.com> Also make some style improvements. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Added a couple of missing spaces on if/for stmts in PATCH 3. dlls/windows.media.speech/recognizer.c | 15 ++++++++------- dlls/windows.media.speech/tests/speech.c | 19 ++++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index e5510d7677b..490493850c8 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -56,19 +56,20 @@ static HRESULT WINAPI recognizer_QueryInterface( ISpeechRecognizer *iface, REFII if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || IsEqualGUID(iid, &IID_ISpeechRecognizer)) { IInspectable_AddRef((*out = &impl->ISpeechRecognizer_iface)); return S_OK; } - if(IsEqualGUID(iid, &IID_IClosable)) + if (IsEqualGUID(iid, &IID_IClosable)) { IInspectable_AddRef((*out = &impl->IClosable_iface)); return S_OK; } - if(IsEqualGUID(iid, &IID_ISpeechRecognizer2)) + if (IsEqualGUID(iid, &IID_ISpeechRecognizer2)) { IInspectable_AddRef((*out = &impl->ISpeechRecognizer2_iface)); return S_OK; @@ -94,7 +95,7 @@ static ULONG WINAPI recognizer_Release( ISpeechRecognizer *iface ) ULONG ref = InterlockedDecrement(&impl->ref); TRACE("iface %p, ref %lu.\n", iface, ref); - if(!ref) + if (!ref) free(impl); return ref; @@ -403,7 +404,7 @@ static HRESULT WINAPI activation_factory_GetTrustLevel( IActivationFactory *ifac static HRESULT WINAPI activation_factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { struct recognizer_statics *impl = impl_from_IActivationFactory(iface); - TRACE("iface %p, instance %p\n", iface, instance); + TRACE("iface %p, instance %p.\n", iface, instance); return ISpeechRecognizerFactory_Create(&impl->ISpeechRecognizerFactory_iface, NULL, (ISpeechRecognizer **)instance); } @@ -441,15 +442,15 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface return E_OUTOFMEMORY; } - if(language) - FIXME("ILanguage parameter unused. Stub!\n"); + if (language) + FIXME("language parameter unused. Stub!\n"); impl->ISpeechRecognizer_iface.lpVtbl = &speech_recognizer_vtbl; impl->IClosable_iface.lpVtbl = &closable_vtbl; impl->ISpeechRecognizer2_iface.lpVtbl = &speech_recognizer2_vtbl; impl->ref = 1; - TRACE("created SpeechRecognizer %p\n", impl); + TRACE("created SpeechRecognizer %p.\n", impl); *speechrecognizer = &impl->ISpeechRecognizer_iface; return S_OK; diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 9e4f031a55f..ce89bd3f78a 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -38,6 +38,8 @@ #include "wine/test.h" +#define SPERR_WINRT_INTERNAL_ERROR 0x800455a0 + HRESULT WINAPI (*pDllGetActivationFactory)(HSTRING, IActivationFactory **); static inline LONG get_ref(IUnknown *obj) @@ -148,7 +150,7 @@ static void test_ActivationFactory(void) hdll = LoadLibraryW(L"windows.media.speech.dll"); - if(hdll) + if (hdll) { pDllGetActivationFactory = (void *)GetProcAddress(hdll, "DllGetActivationFactory"); ok(!!pDllGetActivationFactory, "DllGetActivationFactory not found.\n"); @@ -364,7 +366,7 @@ static void test_SpeechRecognizer(void) hr = RoGetActivationFactory(hstr, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#lx.\n", hr); - if(hr == REGDB_E_CLASSNOTREG) /* Win 8 and 8.1 */ + if (hr == REGDB_E_CLASSNOTREG) /* Win 8 and 8.1 */ { win_skip("SpeechRecognizer activation factory not available!\n"); goto done; @@ -379,7 +381,7 @@ static void test_SpeechRecognizer(void) hr = ISpeechRecognizerStatics_get_SystemSpeechLanguage(sr_statics, &language); todo_wine ok(hr == S_OK, "ISpeechRecognizerStatics_SystemSpeechLanguage failed, hr %#lx.\n", hr); - if(hr == S_OK) + if (hr == S_OK) { hr = ILanguage_get_LanguageTag(language, &hstr_lang); ok(hr == S_OK, "ILanguage_get_LanguageTag failed, hr %#lx.\n", hr); @@ -395,7 +397,7 @@ static void test_SpeechRecognizer(void) hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechRecognizerStatics2, (void **)&sr_statics2); ok(hr == S_OK || broken(hr == E_NOINTERFACE), "IActivationFactory_QueryInterface IID_ISpeechRecognizerStatics2 failed, hr %#lx.\n", hr); - if(hr == S_OK) /* SpeechRecognizerStatics2 not implemented on Win10 1507 */ + if (hr == S_OK) /* SpeechRecognizerStatics2 not implemented on Win10 1507 */ { ref = ISpeechRecognizerStatics2_Release(sr_statics2); ok(ref == 3, "Got unexpected ref %lu.\n", ref); @@ -408,10 +410,13 @@ static void test_SpeechRecognizer(void) ok(ref == 1, "Got unexpected ref %lu.\n", ref); hr = RoActivateInstance(hstr, &inspectable); - ok(hr == S_OK || broken(hr == 0x800455a0), "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(hr == SPERR_WINRT_INTERNAL_ERROR), "Got unexpected hr %#lx.\n", hr); - if(hr == S_OK) + if (hr == S_OK) { + check_refcount(inspectable, 1); + check_interface(factory, &IID_IAgileObject, TRUE); + hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechRecognizer, (void **)&recognizer); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -433,7 +438,7 @@ static void test_SpeechRecognizer(void) ref = IInspectable_Release(inspectable); ok(!ref, "Got unexpected ref %lu.\n", ref); } - else if(hr == 0x800455a0) /* Not sure what this hr is... Probably if a language pack is not installed. */ + else if (hr == SPERR_WINRT_INTERNAL_ERROR) /* Not sure when this triggers. Probably if a language pack is not installed. */ { win_skip("Could not init SpeechRecognizer with default language!\n"); } -- 2.35.1

1 4

[PATCH 1/3] dinput/tests: Test IIterator_IInspectable_MoveNext returned values.
by Rémi Bernon 14 Mar '22

14 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/hotplug.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index a2072ca16de..8a27f16932f 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -961,6 +961,8 @@ static void test_windows_gaming_input(void) EventRegistrationToken controller_removed_token; IVectorView_RawGameController *controller_view; EventRegistrationToken controller_added_token; + IIterable_RawGameController *iterable; + IIterator_RawGameController *iterator; IRawGameControllerStatics *statics; HANDLE hwnd, thread, stop_event; IInspectable *tmp_inspectable; @@ -968,7 +970,8 @@ static void test_windows_gaming_input(void) HSTRING str; UINT32 size; HRESULT hr; - DWORD ret; + DWORD res; + BOOL ret; MSG msg; if (!load_combase_functions()) return; @@ -1080,6 +1083,28 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_Size returned %#lx\n", hr ); ok( size == 1, "got size %u\n", size ); + hr = IVectorView_RawGameController_QueryInterface( controller_view, &IID_IIterable_RawGameController, + (void **)&iterable ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + hr = IIterable_RawGameController_First( iterable, &iterator ); + ok( hr == S_OK, "First returned %#lx\n", hr ); + IIterable_RawGameController_Release( iterable ); + + hr = IIterator_RawGameController_get_HasCurrent( iterator, &ret ); + ok( hr == S_OK, "First returned %#lx\n", hr ); + ok( ret == TRUE, "got HasCurrent %u\n", ret ); + hr = IIterator_RawGameController_MoveNext( iterator, &ret ); + ok( hr == S_OK, "First returned %#lx\n", hr ); + todo_wine + ok( ret == FALSE, "got MoveNext %u\n", ret ); + hr = IIterator_RawGameController_get_HasCurrent( iterator, &ret ); + ok( hr == S_OK, "First returned %#lx\n", hr ); + ok( ret == FALSE, "got MoveNext %u\n", ret ); + hr = IIterator_RawGameController_MoveNext( iterator, &ret ); + ok( hr == S_OK, "First returned %#lx\n", hr ); + ok( ret == FALSE, "got MoveNext %u\n", ret ); + IIterator_RawGameController_Release( iterator ); + IVectorView_RawGameController_Release( controller_view ); hr = IRawGameControllerStatics_get_RawGameControllers( statics, &controller_view ); ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); @@ -1112,9 +1137,9 @@ static void test_windows_gaming_input(void) thread = CreateThread( NULL, 0, dinput_test_device_thread, stop_event, 0, NULL ); ok( !!thread, "CreateThread failed, error %lu\n", GetLastError() ); wait_for_events( 1, &controller_added.event, INFINITE ); - ret = wait_for_events( 1, &custom_factory.added_event, 500 ); + res = wait_for_events( 1, &custom_factory.added_event, 500 ); todo_wine - ok( !ret, "wait_for_events returned %#lx\n", ret ); + ok( !res, "wait_for_events returned %#lx\n", res ); hr = IRawGameControllerStatics_get_RawGameControllers( statics, &controller_view ); ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); hr = IVectorView_RawGameController_GetAt( controller_view, 0, &raw_controller ); @@ -1159,9 +1184,9 @@ next: IGameController_Release( game_controller ); IRawGameController_Release( raw_controller ); SetEvent( stop_event ); - ret = wait_for_events( 1, &custom_factory.removed_event, 500 ); + res = wait_for_events( 1, &custom_factory.removed_event, 500 ); todo_wine - ok( !ret, "wait_for_events returned %#lx\n", ret ); + ok( !res, "wait_for_events returned %#lx\n", res ); wait_for_events( 1, &controller_removed.event, INFINITE ); hr = IRawGameControllerStatics_remove_RawGameControllerAdded( statics, controller_added_token ); -- 2.35.1

2 3

[PATCH 1/3] winebus.sys: Declare multiple HID simple haptics controller collections.
by Rémi Bernon 14 Mar '22

14 Mar '22

Instead of having the waveforms combined. This better matches what Windows.Gaming.Input and Windows.Devices.Haptics are exposing, with one SimpleHapticsController for each motor. This will also simplify the declaration of left/right trigger motors. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/hid.c | 89 +++++++++++++++++++++++++++++++-- dlls/winebus.sys/unix_private.h | 12 +++++ 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 3e83a05cdf6..46336716a70 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -337,6 +337,11 @@ struct hid_haptics_waveform BYTE manual_trigger; BYTE repeat_count; }; +struct hid_haptics_intensity +{ + UINT16 rumble_intensity; + UINT16 buzz_intensity; +}; #include "poppack.h" BOOL hid_device_add_haptics(struct unix_device *iface) @@ -344,7 +349,8 @@ BOOL hid_device_add_haptics(struct unix_device *iface) struct hid_report_descriptor *desc = &iface->hid_report_descriptor; const BYTE haptics_features_report = ++desc->next_report_id[HidP_Feature]; const BYTE haptics_waveform_report = ++desc->next_report_id[HidP_Output]; - const BYTE haptics_template[] = + const BYTE haptics_intensity_report = ++desc->next_report_id[HidP_Output]; + const BYTE waveforms_template[] = { USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), USAGE(1, HID_USAGE_HAPTICS_SIMPLE_CONTROLLER), @@ -404,16 +410,75 @@ BOOL hid_device_add_haptics(struct unix_device *iface) OUTPUT(1, Data|Var|Abs), END_COLLECTION, }; + const BYTE haptics_template[] = + { + USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), + USAGE(1, HID_USAGE_HAPTICS_SIMPLE_CONTROLLER), + COLLECTION(1, Logical), + REPORT_ID(1, haptics_features_report), + + USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), + COLLECTION(1, NamedArray), + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|3), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs|Null), + END_COLLECTION, + + USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), + COLLECTION(1, NamedArray), + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|3), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs|Null), + END_COLLECTION, + + USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME), + UNIT(2, 0x1001), /* seconds */ + UNIT_EXPONENT(1, -3), /* 10^-3 */ + LOGICAL_MINIMUM(4, 0x00000000), + LOGICAL_MAXIMUM(4, 0x7fffffff), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs), + /* reset global items */ + UNIT(1, 0), /* None */ + UNIT_EXPONENT(1, 0), + + REPORT_ID(1, haptics_intensity_report), + USAGE(1, HID_USAGE_HAPTICS_INTENSITY), + LOGICAL_MINIMUM(4, 0x00000000), + LOGICAL_MAXIMUM(4, 0x0000ffff), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + }; iface->hid_haptics.features_report = haptics_features_report; iface->hid_haptics.waveform_report = haptics_waveform_report; + iface->hid_haptics.intensity_report = haptics_intensity_report; iface->hid_haptics.features.waveform_list[0] = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; iface->hid_haptics.features.waveform_list[1] = HID_USAGE_HAPTICS_WAVEFORM_BUZZ; iface->hid_haptics.features.duration_list[0] = 0; iface->hid_haptics.features.duration_list[1] = 0; iface->hid_haptics.features.waveform_cutoff_time_ms = 1000; + iface->hid_haptics.features.rumble.waveform = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; + iface->hid_haptics.features.rumble.duration = 0; + iface->hid_haptics.features.rumble.cutoff_time_ms = 1000; + iface->hid_haptics.features.buzz.waveform = HID_USAGE_HAPTICS_WAVEFORM_BUZZ; + iface->hid_haptics.features.buzz.duration = 0; + iface->hid_haptics.features.buzz.cutoff_time_ms = 1000; - return hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template)); + if (!hid_report_descriptor_append(desc, waveforms_template, sizeof(waveforms_template))) + return FALSE; + + if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) + return FALSE; + if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) + return FALSE; + + return TRUE; } #include "pshpack1.h" @@ -1072,7 +1137,23 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC struct hid_physical *physical = &iface->hid_physical; struct hid_haptics *haptics = &iface->hid_haptics; - if (packet->reportId == haptics->waveform_report) + if (packet->reportId == haptics->intensity_report) + { + struct hid_haptics_intensity *report = (struct hid_haptics_intensity *)(packet->reportBuffer + 1); + ULONG duration_ms; + + io->Information = sizeof(*report) + 1; + assert(packet->reportBufferLen == io->Information); + + if (!report->rumble_intensity && !report->buzz_intensity) + io->Status = iface->hid_vtbl->haptics_stop(iface); + else + { + duration_ms = min(haptics->features.rumble.cutoff_time_ms, haptics->features.buzz.cutoff_time_ms); + io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, report->rumble_intensity, report->buzz_intensity); + } + } + else if (packet->reportId == haptics->waveform_report) { struct hid_haptics_waveform *report = (struct hid_haptics_waveform *)(packet->reportBuffer + 1); UINT16 *rumble_intensity = haptics->waveform_intensity + HAPTICS_WAVEFORM_RUMBLE_ORDINAL; @@ -1307,6 +1388,8 @@ static void hid_device_set_feature_report(struct unix_device *iface, HID_XFER_PA assert(packet->reportBufferLen == io->Information); haptics->features.waveform_cutoff_time_ms = features->waveform_cutoff_time_ms; + haptics->features.rumble.cutoff_time_ms = features->rumble.cutoff_time_ms; + haptics->features.buzz.cutoff_time_ms = features->buzz.cutoff_time_ms; io->Status = STATUS_SUCCESS; } else diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 553631e40fb..081e57dc53d 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -138,12 +138,23 @@ enum haptics_waveform_ordinal HAPTICS_WAVEFORM_LAST_ORDINAL = HAPTICS_WAVEFORM_BUZZ_ORDINAL, }; +#include "pshpack1.h" +struct hid_haptics_feature +{ + WORD waveform; + WORD duration; + UINT cutoff_time_ms; +}; + struct hid_haptics_features { WORD waveform_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; WORD duration_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; UINT waveform_cutoff_time_ms; + struct hid_haptics_feature rumble; + struct hid_haptics_feature buzz; }; +#include "poppack.h" struct hid_haptics { @@ -151,6 +162,7 @@ struct hid_haptics UINT16 waveform_intensity[HAPTICS_WAVEFORM_LAST_ORDINAL + 1]; BYTE features_report; BYTE waveform_report; + BYTE intensity_report; }; /* must match the order and number of usages in the -- 2.35.1

1 2

[PATCH 1/5] windows.media.speech: Add IAgileObject to SpeechRecognizer.
by Bernhard Kölbl 13 Mar '22

13 Mar '22

Also make some style improvements. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/recognizer.c | 15 ++++++++------- dlls/windows.media.speech/tests/speech.c | 19 ++++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index e5510d7677b..490493850c8 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -56,19 +56,20 @@ static HRESULT WINAPI recognizer_QueryInterface( ISpeechRecognizer *iface, REFII if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || IsEqualGUID(iid, &IID_ISpeechRecognizer)) { IInspectable_AddRef((*out = &impl->ISpeechRecognizer_iface)); return S_OK; } - if(IsEqualGUID(iid, &IID_IClosable)) + if (IsEqualGUID(iid, &IID_IClosable)) { IInspectable_AddRef((*out = &impl->IClosable_iface)); return S_OK; } - if(IsEqualGUID(iid, &IID_ISpeechRecognizer2)) + if (IsEqualGUID(iid, &IID_ISpeechRecognizer2)) { IInspectable_AddRef((*out = &impl->ISpeechRecognizer2_iface)); return S_OK; @@ -94,7 +95,7 @@ static ULONG WINAPI recognizer_Release( ISpeechRecognizer *iface ) ULONG ref = InterlockedDecrement(&impl->ref); TRACE("iface %p, ref %lu.\n", iface, ref); - if(!ref) + if (!ref) free(impl); return ref; @@ -403,7 +404,7 @@ static HRESULT WINAPI activation_factory_GetTrustLevel( IActivationFactory *ifac static HRESULT WINAPI activation_factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { struct recognizer_statics *impl = impl_from_IActivationFactory(iface); - TRACE("iface %p, instance %p\n", iface, instance); + TRACE("iface %p, instance %p.\n", iface, instance); return ISpeechRecognizerFactory_Create(&impl->ISpeechRecognizerFactory_iface, NULL, (ISpeechRecognizer **)instance); } @@ -441,15 +442,15 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface return E_OUTOFMEMORY; } - if(language) - FIXME("ILanguage parameter unused. Stub!\n"); + if (language) + FIXME("language parameter unused. Stub!\n"); impl->ISpeechRecognizer_iface.lpVtbl = &speech_recognizer_vtbl; impl->IClosable_iface.lpVtbl = &closable_vtbl; impl->ISpeechRecognizer2_iface.lpVtbl = &speech_recognizer2_vtbl; impl->ref = 1; - TRACE("created SpeechRecognizer %p\n", impl); + TRACE("created SpeechRecognizer %p.\n", impl); *speechrecognizer = &impl->ISpeechRecognizer_iface; return S_OK; diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 9e4f031a55f..ce89bd3f78a 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -38,6 +38,8 @@ #include "wine/test.h" +#define SPERR_WINRT_INTERNAL_ERROR 0x800455a0 + HRESULT WINAPI (*pDllGetActivationFactory)(HSTRING, IActivationFactory **); static inline LONG get_ref(IUnknown *obj) @@ -148,7 +150,7 @@ static void test_ActivationFactory(void) hdll = LoadLibraryW(L"windows.media.speech.dll"); - if(hdll) + if (hdll) { pDllGetActivationFactory = (void *)GetProcAddress(hdll, "DllGetActivationFactory"); ok(!!pDllGetActivationFactory, "DllGetActivationFactory not found.\n"); @@ -364,7 +366,7 @@ static void test_SpeechRecognizer(void) hr = RoGetActivationFactory(hstr, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#lx.\n", hr); - if(hr == REGDB_E_CLASSNOTREG) /* Win 8 and 8.1 */ + if (hr == REGDB_E_CLASSNOTREG) /* Win 8 and 8.1 */ { win_skip("SpeechRecognizer activation factory not available!\n"); goto done; @@ -379,7 +381,7 @@ static void test_SpeechRecognizer(void) hr = ISpeechRecognizerStatics_get_SystemSpeechLanguage(sr_statics, &language); todo_wine ok(hr == S_OK, "ISpeechRecognizerStatics_SystemSpeechLanguage failed, hr %#lx.\n", hr); - if(hr == S_OK) + if (hr == S_OK) { hr = ILanguage_get_LanguageTag(language, &hstr_lang); ok(hr == S_OK, "ILanguage_get_LanguageTag failed, hr %#lx.\n", hr); @@ -395,7 +397,7 @@ static void test_SpeechRecognizer(void) hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechRecognizerStatics2, (void **)&sr_statics2); ok(hr == S_OK || broken(hr == E_NOINTERFACE), "IActivationFactory_QueryInterface IID_ISpeechRecognizerStatics2 failed, hr %#lx.\n", hr); - if(hr == S_OK) /* SpeechRecognizerStatics2 not implemented on Win10 1507 */ + if (hr == S_OK) /* SpeechRecognizerStatics2 not implemented on Win10 1507 */ { ref = ISpeechRecognizerStatics2_Release(sr_statics2); ok(ref == 3, "Got unexpected ref %lu.\n", ref); @@ -408,10 +410,13 @@ static void test_SpeechRecognizer(void) ok(ref == 1, "Got unexpected ref %lu.\n", ref); hr = RoActivateInstance(hstr, &inspectable); - ok(hr == S_OK || broken(hr == 0x800455a0), "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(hr == SPERR_WINRT_INTERNAL_ERROR), "Got unexpected hr %#lx.\n", hr); - if(hr == S_OK) + if (hr == S_OK) { + check_refcount(inspectable, 1); + check_interface(factory, &IID_IAgileObject, TRUE); + hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechRecognizer, (void **)&recognizer); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -433,7 +438,7 @@ static void test_SpeechRecognizer(void) ref = IInspectable_Release(inspectable); ok(!ref, "Got unexpected ref %lu.\n", ref); } - else if(hr == 0x800455a0) /* Not sure what this hr is... Probably if a language pack is not installed. */ + else if (hr == SPERR_WINRT_INTERNAL_ERROR) /* Not sure when this triggers. Probably if a language pack is not installed. */ { win_skip("Could not init SpeechRecognizer with default language!\n"); } -- 2.35.1

1 4

[PATCH 3/7] comctl32/tests: add more static control tests
by Rafał Harabień 13 Mar '22

13 Mar '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 0038cadd7d2..7a072fcbbec 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -82,10 +82,29 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { HWND hStatic = create_static(style); - RECT r1 = {20, 20, 30, 30}; + RECT r1 = {20, 20, 30, 30}, rcClient; int exp; + LONG exstyle; flush_events(); + trace("Testing style 0x%x\n", style); + + exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); + if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) + todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + else + ok(exstyle == 0, "expected 0, got %d\n", exstyle); + + GetClientRect(hStatic, &rcClient); + if (style == SS_ETCHEDVERT) + todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + else + ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); + if (style == SS_ETCHEDHORZ) + todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + else + ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); + g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ InvalidateRect(hMainWnd, NULL, FALSE); @@ -406,14 +425,20 @@ START_TEST(static) ShowWindow(hMainWnd, SW_SHOW); test_updates(0, 0); - test_updates(SS_SIMPLE, 0); test_updates(SS_ICON, 0); - test_updates(SS_BITMAP, 0); - test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_BLACKRECT, TODO_COUNT); test_updates(SS_WHITERECT, TODO_COUNT); + test_updates(SS_BLACKFRAME, TODO_COUNT); + test_updates(SS_WHITEFRAME, TODO_COUNT); + test_updates(SS_USERITEM, TODO_COUNT); + test_updates(SS_SIMPLE, 0); + test_updates(SS_OWNERDRAW, 0); + test_updates(SS_BITMAP, 0); + test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); + test_updates(SS_ETCHEDFRAME, TODO_COUNT); + test_updates(SS_SUNKEN, 0); test_set_text(); test_set_image(); test_STM_SETIMAGE(); -- 2.25.1

2 1