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

[PATCH 1/2] ntdll: Add a test for closing INVALID_HANDLE_VALUE handle.
by Nikolay Sivov 10 Aug '21

10 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 23 +++++++++++++++++++++++ dlls/ntdll/tests/om.c | 16 ++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e729bca87ef..ce7de563d9d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4972,6 +4972,28 @@ static void test_job_list_attribute(HANDLE parent_job) ok(ret, "SetInformationJobObject error %u\n", GetLastError()); } +static void test_CloseHandle(void) +{ + BOOL ret; + + SetLastError(0xdeadbeef); + ret = CloseHandle(INVALID_HANDLE_VALUE); +todo_wine { + ok(ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == 0xdeadbeef, "Unexpected error.\n"); +} + + SetLastError(0); + ret = CloseHandle(UlongToHandle(0xdeadbee1)); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Unexpected error.\n"); + + SetLastError(0); + ret = CloseHandle(0); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Unexpected error.\n"); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -5101,6 +5123,7 @@ START_TEST(process) test_parent_process_attribute(0, NULL); test_handle_list_attribute(FALSE, NULL, NULL); test_dead_process(); + test_CloseHandle(); /* things that can be tested: * lookup: check the way program to be executed is searched diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index af5e014f069..3d518af5f3a 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2944,6 +2944,21 @@ static void test_get_next_thread(void) CloseHandle(thread); } +static void test_close_handle(void) +{ + NTSTATUS status; + + status = NtClose(INVALID_HANDLE_VALUE); +todo_wine + ok(!status, "Unexpected status %#x.\n", status); + + status = NtClose(0); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status); + + status = NtClose(UlongToHandle(0xdeadbee1)); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3020,4 +3035,5 @@ START_TEST(om) test_duplicate_object(); test_object_types(); test_get_next_thread(); + test_close_handle(); } -- 2.30.2

2 4

[PATCH] xmllite: Don't lose terminating character when shrinking buffer
by Eduard Permyakov 10 Aug '21

10 Aug '21

The utf16 buffer is expected to be terminated by a '0' character. Flawed buffer shrinking logic would move the buffer contents but forget about the terminating character, which could cause reading junk past the end of the buffer contents. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/xmllite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a5a75c29887..834c36ae18c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2128,6 +2128,7 @@ static HRESULT reader_parse_reference(xmlreader *reader) memmove(start + 1, ptr + 1, len); buffer->written -= (reader_get_cur(reader) - cur) * sizeof(WCHAR); + *(WCHAR*)(buffer->data + buffer->written) = 0; buffer->cur = cur + 1; *start = ch; @@ -2151,6 +2152,7 @@ static HRESULT reader_parse_reference(xmlreader *reader) memmove(start+1, ptr+1, len); buffer->cur = cur + 1; buffer->written -= (ptr - start) * sizeof(WCHAR); + *(WCHAR*)(buffer->data + buffer->written) = 0; *start = ch; } -- 2.17.1

2 1

[PATCH] kernelbase: Fix an incorrect allocation size.
by Giovanni Mascellani 10 Aug '21

10 Aug '21

Variable nt_privs has type TOKEN_PRIVILEGES*, not TOKEN_GROUPS*. This fixes a crash in the Cyberpunk 2077 launcher. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/kernelbase/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 36196304db3..472076cf7fe 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -667,7 +667,7 @@ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags, if (delete_priv_count) { - if (!(nt_privs = heap_alloc( offsetof( TOKEN_GROUPS, Groups[delete_priv_count] ) ))) goto out; + if (!(nt_privs = heap_alloc( offsetof( TOKEN_PRIVILEGES, Privileges[delete_priv_count] ) ))) goto out; nt_privs->PrivilegeCount = delete_priv_count; memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(*delete_privs) ); } -- 2.32.0

1 0

[PATCH v3 1/5] d3dx10: Partially implement D3DX10CreateEffectFromMemory().
by Matteo Bruni 10 Aug '21

10 Aug '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: use default include handler v3 (Matteo): move the function out of d3dx10_43_main.c, make a few tweaks. dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/compiler.c | 62 +++++++++++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43_main.c | 13 ------- 3 files changed, 63 insertions(+), 13 deletions(-) create mode 100644 dlls/d3dx10_43/compiler.c diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 1108dcb0948..1fae34191ee 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -7,6 +7,7 @@ EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ async.c \ + compiler.c \ d3dx10_43_main.c \ texture.c diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c new file mode 100644 index 00000000000..1ccb0e45a69 --- /dev/null +++ b/dlls/d3dx10_43/compiler.c @@ -0,0 +1,62 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "wine/debug.h" + +#define COBJMACROS + +#include "d3d10_1.h" +#include "d3dx10.h" +#include "d3dcompiler.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + + +HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, + UINT shader_flags, UINT effect_flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, + ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult) +{ + ID3D10Blob *code; + HRESULT hr; + + TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, shader_flags %#x," + "effect_flags %#x, device %p, effect_pool %p, pump %p, effect %p, errors %p, hresult %p.\n", + data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), + shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult); + + if (pump) + FIXME("Asynchronous mode is not supported.\n"); + + if (!include) + include = D3D_COMPILE_STANDARD_FILE_INCLUDE; + + if (FAILED(hr = D3DCompile(data, datasize, filename, defines, include, "main", profile, + shader_flags, effect_flags, &code, errors))) + { + WARN("Effect compilation failed, hr %#x.\n", hr); + return hr; + } + + hr = D3D10CreateEffectFromMemory(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), + effect_flags, device, effect_pool, effect); + ID3D10Blob_Release(code); + + return hr; +} diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 06b00cb0393..2bbfac9c632 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -74,19 +74,6 @@ HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SH return E_NOTIMPL; } -HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, const char *filename, - const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, - UINT fxflags, ID3D10Device *device, ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, - ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult) -{ - FIXME("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " - "device %p, effectpool %p, pump %p, effect %p, errors %p, hresult %p\n", - data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device, - effectpool, pump, effect, errors, hresult); - - return E_NOTIMPL; -} - HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, -- 2.26.3

1 4

[PATCH v5 1/4] msvcrt: Translate file open access pattern hints
by Luke Deller 10 Aug '21

10 Aug '21

Translate access pattern hints supplied to fopen / _open into the corresponding attributes for the lower level CreateFileW call. Signed-off-by: Luke Deller <luke(a)deller.id.au> --- v5: reordered patches so that tests are added after dll changes --- dlls/msvcrt/file.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6e955099090..b0eeaf2a351 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -22,8 +22,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * TODO - * Use the file flag hints O_SEQUENTIAL, O_RANDOM, O_SHORT_LIVED */ #include <direct.h> @@ -1609,8 +1607,12 @@ static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_fl case 'w': break; case 'S': + if (!(*open_flags & _O_RANDOM)) + *open_flags |= _O_SEQUENTIAL; + break; case 'R': - FIXME("ignoring cache optimization flag: %c\n", mode[-1]); + if (!(*open_flags & _O_SEQUENTIAL)) + *open_flags |= _O_RANDOM; break; default: ERR("incorrect mode flag: %c\n", mode[-1]); @@ -2269,6 +2271,13 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm sharing |= FILE_SHARE_DELETE; } + if (oflags & _O_RANDOM) + attrib |= FILE_FLAG_RANDOM_ACCESS; + if (oflags & _O_SEQUENTIAL) + attrib |= FILE_FLAG_SEQUENTIAL_SCAN; + if (oflags & _O_SHORT_LIVED) + attrib |= FILE_ATTRIBUTE_TEMPORARY; + sa.nLength = sizeof( SECURITY_ATTRIBUTES ); sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = !(oflags & _O_NOINHERIT); -- 2.25.1

2 4

[PATCH 1/2] d2d1: Implement d2d_effect_SetInputCount().
by Ziqing Hui 10 Aug '21

10 Aug '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- This supersedes 211082. Changes: Add a info field to d2d_effect. dlls/d2d1/d2d1_private.h | 10 ++++++++ dlls/d2d1/effect.c | 55 ++++++++++++++++++++++++++-------------- dlls/d2d1/tests/d2d1.c | 2 -- 3 files changed, 46 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 88c712cf51c..e823b2092bf 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -565,12 +565,22 @@ struct d2d_device void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; +struct d2d_effect_info +{ + const CLSID *clsid; + UINT32 default_input_count; + UINT32 min_inputs; + UINT32 max_inputs; +}; + struct d2d_effect { ID2D1Effect ID2D1Effect_iface; ID2D1Image ID2D1Image_iface; LONG refcount; + const struct d2d_effect_info *info; + ID2D1Factory *factory; ID2D1Image **inputs; size_t inputs_size; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 560d87479a9..ef1189ba042 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -20,17 +20,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -struct d2d_effect_info -{ - const CLSID *clsid; - UINT32 default_input_count; -}; - static const struct d2d_effect_info builtin_effects[] = { - {&CLSID_D2D12DAffineTransform, 1}, - {&CLSID_D2D13DPerspectiveTransform, 1}, - {&CLSID_D2D1Composite, 2} + {&CLSID_D2D12DAffineTransform, 1, 1, 1}, + {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, + {&CLSID_D2D1Composite, 2, 1, 0xffffffff} }; static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) @@ -207,9 +201,38 @@ static void STDMETHODCALLTYPE d2d_effect_SetInput(ID2D1Effect *iface, UINT32 ind static HRESULT STDMETHODCALLTYPE d2d_effect_SetInputCount(ID2D1Effect *iface, UINT32 count) { - FIXME("iface %p, count %u stub!\n", iface, count); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, count %u.\n", iface, count); + + if (count < effect->info->min_inputs || count > effect->info->max_inputs) + return E_INVALIDARG; + if (count == effect->input_count) + return S_OK; + + if (count < effect->input_count) + { + for (i = count; i < effect->input_count; ++i) + { + if (effect->inputs[i]) + ID2D1Image_Release(effect->inputs[i]); + } + effect->input_count = count; + return S_OK; + } + + if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, + count, sizeof(*effect->inputs))) + { + ERR("Failed to resize inputs array.\n"); + return E_OUTOFMEMORY; + } + + memset(&effect->inputs[effect->input_count], 0, sizeof(*effect->inputs) * (count - effect->input_count)); + effect->input_count = count; + + return S_OK; } static void STDMETHODCALLTYPE d2d_effect_GetInput(ID2D1Effect *iface, UINT32 index, ID2D1Image **input) @@ -326,15 +349,9 @@ HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const { if (IsEqualGUID(effect_id, builtin_effects[i].clsid)) { - effect->input_count = builtin_effects[i].default_input_count; - - if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, - effect->input_count, sizeof(*effect->inputs))) - return E_OUTOFMEMORY; - memset(effect->inputs, 0, sizeof(*effect->inputs) * effect->input_count); - + effect->info = &builtin_effects[i]; + d2d_effect_SetInputCount(&effect->ID2D1Effect_iface, effect->info->default_input_count); ID2D1Factory_AddRef(effect->factory = factory); - return S_OK; } } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a6f7ac88d0d..f655274754e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9811,10 +9811,8 @@ static void test_effect(BOOL d3d11) winetest_push_context("Input %u", j); hr = ID2D1Effect_SetInputCount(effect, j); if (j < test->min_inputs || j > test->max_inputs) - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); else - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); winetest_pop_context(); } -- 2.25.1

3 4

[PATCH vkd3d 1/3] vkd3d: Introduce a helper function to append descriptor set layouts to the layout array.
by Conor McCarthy 10 Aug '21

10 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/state.c | 68 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5ab0af83..97bb3a55 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -514,10 +514,51 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat struct vkd3d_descriptor_set_context { VkDescriptorSetLayoutBinding *current_binding; + VkDescriptorSetLayoutBinding *first_binding; unsigned int descriptor_index; uint32_t descriptor_binding; }; +static bool vkd3d_validate_descriptor_set_count(struct d3d12_device *device, unsigned int set_count) +{ + uint32_t max_count = min(VKD3D_MAX_DESCRIPTOR_SETS, device->vk_info.device_limits.maxBoundDescriptorSets); + + if (set_count > max_count) + { + ERR("Required descriptor set count exceeds maximum allowed count of %u.\n", max_count); + return false; + } + + return true; +} + +static HRESULT vkd3d_create_descriptor_set_layout(struct d3d12_device *device, + VkDescriptorSetLayoutCreateFlags flags, unsigned int binding_count, + const VkDescriptorSetLayoutBinding *bindings, VkDescriptorSetLayout *set_layout); + +static HRESULT d3d12_root_signature_append_descriptor_set_layout(struct d3d12_root_signature *root_signature, + struct vkd3d_descriptor_set_context *context, VkDescriptorSetLayoutCreateFlags flags) +{ + HRESULT hr; + + if (!context->descriptor_binding) + return S_OK; + + if (!vkd3d_validate_descriptor_set_count(root_signature->device, root_signature->vk_set_count + 1)) + return E_INVALIDARG; + + if (FAILED(hr = vkd3d_create_descriptor_set_layout(root_signature->device, + flags, context->descriptor_binding, context->first_binding, + &root_signature->vk_set_layouts[root_signature->vk_set_count]))) + return hr; + ++root_signature->vk_set_count; + + context->current_binding = context->first_binding; + context->descriptor_binding = 0; + + return S_OK; +} + static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature *root_signature, enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_space, unsigned int register_idx, bool buffer_descriptor, enum vkd3d_shader_visibility shader_visibility, @@ -906,6 +947,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->descriptor_mapping = NULL; root_signature->static_sampler_count = 0; root_signature->static_samplers = NULL; + root_signature->device = device; if (desc->Flags & ~(D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT)) @@ -942,22 +984,18 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (!(binding_desc = vkd3d_calloc(info.binding_count, sizeof(*binding_desc)))) goto fail; + context.first_binding = binding_desc; context.current_binding = binding_desc; if (FAILED(hr = d3d12_root_signature_init_root_descriptors(root_signature, desc, &context))) goto fail; /* We use KHR_push_descriptor for root descriptor parameters. */ - if (vk_info->KHR_push_descriptor && context.descriptor_binding) + if (vk_info->KHR_push_descriptor) { - if (FAILED(hr = vkd3d_create_descriptor_set_layout(device, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR, - context.descriptor_binding, binding_desc, &root_signature->vk_set_layouts[0]))) + if (FAILED(hr = d3d12_root_signature_append_descriptor_set_layout(root_signature, + &context, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR))) goto fail; - ++root_signature->vk_set_count; - - context.current_binding = binding_desc; - context.descriptor_binding = 0; } if (FAILED(hr = d3d12_root_signature_init_push_constants(root_signature, desc, @@ -969,14 +1007,10 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa goto fail; root_signature->main_set = root_signature->vk_set_count; - if (context.descriptor_binding) - { - if (FAILED(hr = vkd3d_create_descriptor_set_layout(device, - 0, context.descriptor_binding, binding_desc, - &root_signature->vk_set_layouts[root_signature->vk_set_count]))) - goto fail; - ++root_signature->vk_set_count; - } + + if (FAILED(hr = d3d12_root_signature_append_descriptor_set_layout(root_signature, &context, 0))) + goto fail; + vkd3d_free(binding_desc); binding_desc = NULL; @@ -988,7 +1022,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (FAILED(hr = vkd3d_private_store_init(&root_signature->private_store))) goto fail; - d3d12_device_add_ref(root_signature->device = device); + d3d12_device_add_ref(device); return S_OK; -- 2.32.0

2 5

[PATCH 1/3] xinput1_3: Create a new background update thread.
by Rémi Bernon 10 Aug '21

10 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/main.c | 53 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index ae2670ba306..63f125ae528 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -119,6 +119,8 @@ static struct xinput_controller controllers[XUSER_MAX_COUNT] = }; static DWORD last_check = 0; +static HANDLE stop_event; +static HANDLE done_event; static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) { @@ -294,8 +296,12 @@ failed: return FALSE; } +static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void **context ); + static void HID_find_gamepads(void) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -308,6 +314,8 @@ static void HID_find_gamepads(void) GUID guid; int i; + InitOnceExecuteOnce(&init_once, start_update_thread_once, NULL, NULL); + idx = GetTickCount(); if ((idx - last_check) < 2000) return; @@ -383,9 +391,16 @@ static void controller_destroy(struct xinput_controller *controller) LeaveCriticalSection(&controller->crit); } -static void HID_destroy_gamepads(void) +static void stop_update_thread(void) { int i; + + SetEvent(stop_event); + WaitForSingleObject(done_event, INFINITE); + + CloseHandle(stop_event); + CloseHandle(done_event); + for (i = 0; i < XUSER_MAX_COUNT; i++) controller_destroy(&controllers[i]); } @@ -523,6 +538,40 @@ static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE memcpy(state, &controller->state, sizeof(*state)); } +static DWORD WINAPI hid_update_thread_proc(void *param) +{ + HANDLE events[1]; + DWORD count, ret; + + do + { + count = 0; + events[count++] = stop_event; + } + while ((ret = WaitForMultipleObjectsEx( count, events, FALSE, INFINITE, TRUE )) < count - 1); + + if (ret != count - 1) ERR("update thread exited unexpectedly, ret %u\n", ret); + SetEvent(done_event); + return ret; +} + +static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void **context ) +{ + HANDLE thread; + + stop_event = CreateEventA(NULL, FALSE, FALSE, NULL); + if (!stop_event) ERR("failed to create stop event, error %u\n", GetLastError()); + + done_event = CreateEventA(NULL, FALSE, FALSE, NULL); + if (!done_event) ERR("failed to create stop event, error %u\n", GetLastError()); + + thread = CreateThread(NULL, 0, hid_update_thread_proc, NULL, 0, NULL); + if (!thread) ERR("failed to create update thread, error %u\n", GetLastError()); + CloseHandle(thread); + + return TRUE; +} + static BOOL controller_lock(struct xinput_controller *controller) { if (!controller->device) return FALSE; @@ -552,7 +601,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: if (reserved) break; - HID_destroy_gamepads(); + stop_update_thread(); break; } return TRUE; -- 2.32.0

1 2

[PATCH] xinput1_3/tests: Add some HID report tests.
by Rémi Bernon 10 Aug '21

10 Aug '21

This adds tests to validate the bogus HID devices exposed native XInput driver. Interactive tests are also included to validate the HID report values, and more specifically the weird combined triggers, which is currently not implemented correctly in Wine. Some third-party libraries, such as SDL, are known to rely on this bogus HID devices and hardcode the expected report structure. This has been tested on Windows 10 with XBox 360 controllers as well as Xbox One S controllers. The latter are detected as 045e:02ea on Linux, but as 045e:02ff on Windows for some reason, and their descriptor seems a little bit different. Their exposed HID device also doesn't seem to work at all and ReadFile never succeeds, so the interactive tests are skipped for these devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/tests/Makefile.in | 2 +- dlls/xinput1_3/tests/xinput.c | 516 +++++++++++++++++++++++++++++++ 2 files changed, 517 insertions(+), 1 deletion(-) diff --git a/dlls/xinput1_3/tests/Makefile.in b/dlls/xinput1_3/tests/Makefile.in index 718b47f21ba..260a8a634e4 100644 --- a/dlls/xinput1_3/tests/Makefile.in +++ b/dlls/xinput1_3/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = xinput1_3.dll -IMPORTS = user32 +IMPORTS = user32 hid setupapi C_SRCS = \ xinput.c diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index a6e2107446c..41769e23ec9 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -20,7 +20,12 @@ #include <windows.h> #include <stdio.h> +#include "winioctl.h" #include "xinput.h" +#include "shlwapi.h" +#include "setupapi.h" +#include "ddk/hidsdi.h" +#include "ddk/hidclass.h" #include "wine/test.h" static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*); @@ -278,6 +283,516 @@ static void test_get_batteryinformation(void) ok(result == ERROR_BAD_ARGUMENTS, "XInputGetBatteryInformation returned (%d)\n", result); } +#define check_member_(file, line, val, exp, fmt, member) \ + ok_(file, line)((val).member == (exp).member, \ + "got " #member " " fmt ", expected " fmt "\n", \ + (val).member, (exp).member) +#define check_member(val, exp, fmt, member) check_member_(__FILE__, __LINE__, val, exp, fmt, member) + +static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA preparsed, + HIDD_ATTRIBUTES *attrs, HIDP_CAPS *hid_caps) +{ + const HIDP_CAPS expect_hid_caps = + { + .Usage = HID_USAGE_GENERIC_GAMEPAD, + .UsagePage = HID_USAGE_PAGE_GENERIC, + .InputReportByteLength = + attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff ? 16 : + 15, + .OutputReportByteLength = 0, + .FeatureReportByteLength = 0, + .NumberLinkCollectionNodes = 4, + .NumberInputButtonCaps = 1, + .NumberInputValueCaps = 6, + .NumberInputDataIndices = + attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff ? 22 : + 16, + .NumberFeatureButtonCaps = 0, + .NumberFeatureValueCaps = 0, + .NumberFeatureDataIndices = 0, + }; + const HIDP_BUTTON_CAPS expect_button_caps[] = + { + { + .UsagePage = HID_USAGE_PAGE_BUTTON, + .BitField = 2, + .LinkUsage = HID_USAGE_GENERIC_GAMEPAD, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .IsRange = TRUE, + .IsAbsolute = TRUE, + .Range.UsageMin = 0x01, + .Range.UsageMax = + attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff ? 0x10 : + 0x0a, + .Range.DataIndexMin = 5, + .Range.DataIndexMax = + attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff ? 20 : + 14, + }, + }; + const HIDP_VALUE_CAPS expect_value_caps[] = + { + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .BitField = 2, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, + .IsAbsolute = TRUE, + .BitSize = 16, + .ReportCount = 1, + .LogicalMax = -1, + .PhysicalMax = -1, + .NotRange.Usage = HID_USAGE_GENERIC_Y, + .NotRange.DataIndex = 0, + }, + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .BitField = 2, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, + .IsAbsolute = TRUE, + .BitSize = 16, + .ReportCount = 1, + .LogicalMax = -1, + .PhysicalMax = -1, + .NotRange.Usage = HID_USAGE_GENERIC_X, + .NotRange.DataIndex = 1, + }, + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .BitField = 2, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 2, + .IsAbsolute = TRUE, + .BitSize = 16, + .ReportCount = 1, + .LogicalMax = -1, + .PhysicalMax = -1, + .NotRange.Usage = HID_USAGE_GENERIC_RY, + .NotRange.DataIndex = 2, + }, + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .BitField = 2, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 2, + .IsAbsolute = TRUE, + .BitSize = 16, + .ReportCount = 1, + .LogicalMax = -1, + .PhysicalMax = -1, + .NotRange.Usage = HID_USAGE_GENERIC_RX, + .NotRange.DataIndex = 3, + }, + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .BitField = 2, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 3, + .IsAbsolute = TRUE, + .BitSize = 16, + .ReportCount = 1, + .LogicalMax = -1, + .PhysicalMax = -1, + .NotRange.Usage = HID_USAGE_GENERIC_Z, + .NotRange.DataIndex = 4, + }, + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .BitField = 66, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkUsage = HID_USAGE_GENERIC_GAMEPAD, + .IsAbsolute = TRUE, + .HasNull = TRUE, + .BitSize = 4, + .Units = 14, + .ReportCount = 1, + .LogicalMin = 1, + .LogicalMax = 8, + .PhysicalMin = 0x0000, + .PhysicalMax = 0x103b, + .NotRange.Usage = HID_USAGE_GENERIC_HATSWITCH, + .NotRange.DataIndex = + attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff ? 21 : + 15, + }, + }; + static const HIDP_LINK_COLLECTION_NODE expect_collections[] = + { + { + .LinkUsage = HID_USAGE_GENERIC_GAMEPAD, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .CollectionType = 1, + .NumberOfChildren = 3, + .FirstChild = 3, + }, + { .LinkUsagePage = HID_USAGE_PAGE_GENERIC, .NextSibling = 0, }, + { .LinkUsagePage = HID_USAGE_PAGE_GENERIC, .NextSibling = 1, }, + { .LinkUsagePage = HID_USAGE_PAGE_GENERIC, .NextSibling = 2, }, + }; + + HIDP_LINK_COLLECTION_NODE collections[16]; + HIDP_BUTTON_CAPS button_caps[16]; + HIDP_VALUE_CAPS value_caps[16]; + XINPUT_CAPABILITIES xi_caps; + char buffer[200] = {0}; + ULONG length, value; + XINPUT_STATE state; + USAGE usages[15]; + NTSTATUS status; + USHORT count; + DWORD i, res; + BOOL ret; + + res = pXInputGetCapabilities(index, 0, &xi_caps); + ok(res == ERROR_SUCCESS, "XInputGetCapabilities %d returned %u\n", index, res); + + res = pXInputGetState(index, &state); + ok(res == ERROR_SUCCESS, "XInputGetState %d returned %u\n", index, res); + + ok(hid_caps->UsagePage == HID_USAGE_PAGE_GENERIC, "unexpected usage page %04x\n", hid_caps->UsagePage); + ok(hid_caps->Usage == HID_USAGE_GENERIC_GAMEPAD, "unexpected usage %04x\n", hid_caps->Usage); + + check_member(*hid_caps, expect_hid_caps, "%04x", Usage); + check_member(*hid_caps, expect_hid_caps, "%04x", UsagePage); + todo_wine + check_member(*hid_caps, expect_hid_caps, "%d", InputReportByteLength); + todo_wine_if(xi_caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + check_member(*hid_caps, expect_hid_caps, "%d", OutputReportByteLength); + check_member(*hid_caps, expect_hid_caps, "%d", FeatureReportByteLength); + todo_wine + check_member(*hid_caps, expect_hid_caps, "%d", NumberLinkCollectionNodes); + check_member(*hid_caps, expect_hid_caps, "%d", NumberInputButtonCaps); + todo_wine + check_member(*hid_caps, expect_hid_caps, "%d", NumberInputValueCaps); + todo_wine + check_member(*hid_caps, expect_hid_caps, "%d", NumberInputDataIndices); + check_member(*hid_caps, expect_hid_caps, "%d", NumberOutputButtonCaps); + todo_wine_if(xi_caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + check_member(*hid_caps, expect_hid_caps, "%d", NumberOutputValueCaps); + todo_wine_if(xi_caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + check_member(*hid_caps, expect_hid_caps, "%d", NumberOutputDataIndices); + check_member(*hid_caps, expect_hid_caps, "%d", NumberFeatureButtonCaps); + check_member(*hid_caps, expect_hid_caps, "%d", NumberFeatureValueCaps); + check_member(*hid_caps, expect_hid_caps, "%d", NumberFeatureDataIndices); + + length = hid_caps->NumberLinkCollectionNodes; + status = HidP_GetLinkCollectionNodes(collections, &length, preparsed); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetLinkCollectionNodes returned %#x\n", status); + todo_wine + ok(length == ARRAY_SIZE(expect_collections), "got %d collections\n", length); + + for (i = 0; i < min(length, ARRAY_SIZE(expect_collections)); ++i) + { + winetest_push_context("collections[%d]", i); + todo_wine_if(i == 1) + check_member(collections[i], expect_collections[i], "%04x", LinkUsage); + check_member(collections[i], expect_collections[i], "%04x", LinkUsagePage); + check_member(collections[i], expect_collections[i], "%d", Parent); + todo_wine_if(i == 0) + check_member(collections[i], expect_collections[i], "%d", NumberOfChildren); + check_member(collections[i], expect_collections[i], "%d", NextSibling); + todo_wine_if(i == 0) + check_member(collections[i], expect_collections[i], "%d", FirstChild); + check_member(collections[i], expect_collections[i], "%d", CollectionType); + check_member(collections[i], expect_collections[i], "%d", IsAlias); + winetest_pop_context(); + } + + count = hid_caps->NumberInputButtonCaps; + status = HidP_GetButtonCaps(HidP_Input, button_caps, &count, preparsed); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetButtonCaps returned %#x\n", status); + ok(count == ARRAY_SIZE(expect_button_caps), "got %d button caps\n", count); + + for (i = 0; i < ARRAY_SIZE(expect_button_caps); ++i) + { + winetest_push_context("button_caps[%d]", i); + check_member(button_caps[i], expect_button_caps[i], "%04x", UsagePage); + check_member(button_caps[i], expect_button_caps[i], "%d", ReportID); + check_member(button_caps[i], expect_button_caps[i], "%d", IsAlias); + check_member(button_caps[i], expect_button_caps[i], "%d", BitField); + todo_wine + check_member(button_caps[i], expect_button_caps[i], "%d", LinkCollection); + todo_wine + check_member(button_caps[i], expect_button_caps[i], "%04x", LinkUsage); + check_member(button_caps[i], expect_button_caps[i], "%04x", LinkUsagePage); + check_member(button_caps[i], expect_button_caps[i], "%d", IsRange); + check_member(button_caps[i], expect_button_caps[i], "%d", IsStringRange); + check_member(button_caps[i], expect_button_caps[i], "%d", IsDesignatorRange); + check_member(button_caps[i], expect_button_caps[i], "%d", IsAbsolute); + + if (!button_caps[i].IsRange && !expect_button_caps[i].IsRange) + { + check_member(button_caps[i], expect_button_caps[i], "%04x", NotRange.Usage); + check_member(button_caps[i], expect_button_caps[i], "%d", NotRange.DataIndex); + } + else if (button_caps[i].IsRange && expect_button_caps[i].IsRange) + { + check_member(button_caps[i], expect_button_caps[i], "%04x", Range.UsageMin); + todo_wine + check_member(button_caps[i], expect_button_caps[i], "%04x", Range.UsageMax); + todo_wine + check_member(button_caps[i], expect_button_caps[i], "%d", Range.DataIndexMin); + todo_wine + check_member(button_caps[i], expect_button_caps[i], "%d", Range.DataIndexMax); + } + + if (!button_caps[i].IsRange && !expect_button_caps[i].IsRange) + check_member(button_caps[i], expect_button_caps[i], "%d", NotRange.StringIndex); + else if (button_caps[i].IsStringRange && expect_button_caps[i].IsStringRange) + { + check_member(button_caps[i], expect_button_caps[i], "%d", Range.StringMin); + check_member(button_caps[i], expect_button_caps[i], "%d", Range.StringMax); + } + + if (!button_caps[i].IsDesignatorRange && !expect_button_caps[i].IsDesignatorRange) + check_member(button_caps[i], expect_button_caps[i], "%d", NotRange.DesignatorIndex); + else if (button_caps[i].IsDesignatorRange && expect_button_caps[i].IsDesignatorRange) + { + check_member(button_caps[i], expect_button_caps[i], "%d", Range.DesignatorMin); + check_member(button_caps[i], expect_button_caps[i], "%d", Range.DesignatorMax); + } + winetest_pop_context(); + } + + count = hid_caps->NumberInputValueCaps; + status = HidP_GetValueCaps(HidP_Input, value_caps, &count, preparsed); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetValueCaps returned %#x\n", status); + todo_wine + ok(count == ARRAY_SIZE(expect_value_caps), "got %d value caps\n", count); + + for (i = 0; i < min(count, ARRAY_SIZE(expect_value_caps)); ++i) + { + winetest_push_context("value_caps[%d]", i); + check_member(value_caps[i], expect_value_caps[i], "%04x", UsagePage); + check_member(value_caps[i], expect_value_caps[i], "%d", ReportID); + check_member(value_caps[i], expect_value_caps[i], "%d", IsAlias); + todo_wine_if(i == 5) + check_member(value_caps[i], expect_value_caps[i], "%d", BitField); + todo_wine_if(i >= 2) + check_member(value_caps[i], expect_value_caps[i], "%d", LinkCollection); + todo_wine + check_member(value_caps[i], expect_value_caps[i], "%d", LinkUsage); + check_member(value_caps[i], expect_value_caps[i], "%d", LinkUsagePage); + check_member(value_caps[i], expect_value_caps[i], "%d", IsRange); + check_member(value_caps[i], expect_value_caps[i], "%d", IsStringRange); + check_member(value_caps[i], expect_value_caps[i], "%d", IsDesignatorRange); + check_member(value_caps[i], expect_value_caps[i], "%d", IsAbsolute); + + todo_wine_if(i == 5) + check_member(value_caps[i], expect_value_caps[i], "%d", HasNull); + todo_wine_if(i == 5) + check_member(value_caps[i], expect_value_caps[i], "%d", BitSize); + check_member(value_caps[i], expect_value_caps[i], "%d", ReportCount); + check_member(value_caps[i], expect_value_caps[i], "%d", UnitsExp); + todo_wine_if(i == 5) + check_member(value_caps[i], expect_value_caps[i], "%d", Units); + todo_wine_if(i == 5) + check_member(value_caps[i], expect_value_caps[i], "%d", LogicalMin); + todo_wine + check_member(value_caps[i], expect_value_caps[i], "%d", LogicalMax); + check_member(value_caps[i], expect_value_caps[i], "%d", PhysicalMin); + todo_wine + check_member(value_caps[i], expect_value_caps[i], "%d", PhysicalMax); + + if (!value_caps[i].IsRange && !expect_value_caps[i].IsRange) + { + todo_wine + check_member(value_caps[i], expect_value_caps[i], "%04x", NotRange.Usage); + todo_wine_if(i == 5) + check_member(value_caps[i], expect_value_caps[i], "%d", NotRange.DataIndex); + } + else if (value_caps[i].IsRange && expect_value_caps[i].IsRange) + { + check_member(value_caps[i], expect_value_caps[i], "%04x", Range.UsageMin); + check_member(value_caps[i], expect_value_caps[i], "%04x", Range.UsageMax); + check_member(value_caps[i], expect_value_caps[i], "%d", Range.DataIndexMin); + check_member(value_caps[i], expect_value_caps[i], "%d", Range.DataIndexMax); + } + + if (!value_caps[i].IsRange && !expect_value_caps[i].IsRange) + check_member(value_caps[i], expect_value_caps[i], "%d", NotRange.StringIndex); + else if (value_caps[i].IsStringRange && expect_value_caps[i].IsStringRange) + { + check_member(value_caps[i], expect_value_caps[i], "%d", Range.StringMin); + check_member(value_caps[i], expect_value_caps[i], "%d", Range.StringMax); + } + + if (!value_caps[i].IsDesignatorRange && !expect_value_caps[i].IsDesignatorRange) + check_member(value_caps[i], expect_value_caps[i], "%d", NotRange.DesignatorIndex); + else if (value_caps[i].IsDesignatorRange && expect_value_caps[i].IsDesignatorRange) + { + check_member(value_caps[i], expect_value_caps[i], "%d", Range.DesignatorMin); + check_member(value_caps[i], expect_value_caps[i], "%d", Range.DesignatorMax); + } + winetest_pop_context(); + } + + status = HidP_InitializeReportForID(HidP_Input, 0, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); + + SetLastError(0xdeadbeef); + memset(buffer, 0, sizeof(buffer)); + ret = HidD_GetInputReport(device, buffer, hid_caps->InputReportByteLength); + todo_wine + ok(!ret, "HidD_GetInputReport succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_GetInputReport returned error %u\n", GetLastError()); + + if (!winetest_interactive) skip("skipping interactive tests\n"); + /* ReadFile on Xbox One For Windows controller seems to never succeed */ + else if (attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff) skip("skipping interactive tests (Xbox One For Windows)\n"); + else + { + trace("press A button on gamepad %d\n", index); + + SetLastError(0xdeadbeef); + memset(buffer, 0, sizeof(buffer)); + length = hid_caps->InputReportByteLength; + ret = ReadFile(device, buffer, hid_caps->InputReportByteLength, &length, NULL); + ok(ret, "ReadFile failed, last error %u\n", GetLastError()); + ok(length == hid_caps->InputReportByteLength, "ReadFile returned length %u\n", length); + + res = pXInputGetState(index, &state); + ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); + ok(state.Gamepad.wButtons & XINPUT_GAMEPAD_A, "unexpected button state %#x\n", state.Gamepad.wButtons); + + length = ARRAY_SIZE(usages); + status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &length, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); + ok(length == 1, "got length %u\n", length); + ok(usages[0] == 1, "got usages[0] %u\n", usages[0]); + + trace("release A on gamepad %d\n", index); + + SetLastError(0xdeadbeef); + memset(buffer, 0, sizeof(buffer)); + length = hid_caps->InputReportByteLength; + ret = ReadFile(device, buffer, hid_caps->InputReportByteLength, &length, NULL); + ok(ret, "ReadFile failed, last error %u\n", GetLastError()); + ok(length == hid_caps->InputReportByteLength, "ReadFile returned length %u\n", length); + + res = pXInputGetState(index, &state); + ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); + ok(!state.Gamepad.wButtons, "unexpected button state %#x\n", state.Gamepad.wButtons); + + length = ARRAY_SIZE(usages); + status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &length, preparsed, buffer, hid_caps->InputReportByteLength); + todo_wine + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); + ok(length == 0, "got length %u\n", length); + + trace("press both LT and RT on gamepad %d\n", index); + + do + { + SetLastError(0xdeadbeef); + memset(buffer, 0, sizeof(buffer)); + length = hid_caps->InputReportByteLength; + ret = ReadFile(device, buffer, hid_caps->InputReportByteLength, &length, NULL); + ok(ret, "ReadFile failed, last error %u\n", GetLastError()); + ok(length == hid_caps->InputReportByteLength, "ReadFile returned length %u\n", length); + + res = pXInputGetState(index, &state); + ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); + + value = 0; + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); + ok(value == state.Gamepad.sThumbLX + 32768, "got LX value %d\n", value); + value = 0; + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); + ok(value == 32767 - state.Gamepad.sThumbLY, "got LY value %d\n", value); + value = 0; + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); + ok(value == state.Gamepad.sThumbRX + 32768, "got LX value %d\n", value); + value = 0; + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); + ok(value == 32767 - state.Gamepad.sThumbRY, "got LY value %d\n", value); + value = 0; + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, preparsed, buffer, hid_caps->InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); + todo_wine + ok(value == 32768 + (state.Gamepad.bLeftTrigger - state.Gamepad.bRightTrigger) * 128, "got Z value %d (RT %d, LT %d)\n", + value, state.Gamepad.bRightTrigger, state.Gamepad.bLeftTrigger); + value = 0; + status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, preparsed, buffer, hid_caps->InputReportByteLength); + todo_wine + ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetUsageValue returned %#x\n", status); + } while (ret && (state.Gamepad.bRightTrigger != 255 || state.Gamepad.bLeftTrigger != 255)); + } +} + +static BOOL try_open_hid_device(const WCHAR *path, HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, + HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps) +{ + PHIDP_PREPARSED_DATA preparsed_data = NULL; + HANDLE device_file; + + device_file = CreateFileW(path, FILE_READ_ACCESS | FILE_WRITE_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (device_file == INVALID_HANDLE_VALUE) return FALSE; + + if (!HidD_GetPreparsedData(device_file, &preparsed_data)) goto failed; + if (!HidD_GetAttributes(device_file, attrs)) goto failed; + if (HidP_GetCaps(preparsed_data, caps) != HIDP_STATUS_SUCCESS) goto failed; + + *device = device_file; + *preparsed = preparsed_data; + return TRUE; + +failed: + CloseHandle(device_file); + HidD_FreePreparsedData(preparsed_data); + return FALSE; +} + +static void test_hid_reports(void) +{ + static const WCHAR prefix[] = L"\\\\?\\HID#VID_0000&PID_0000"; + char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (void *)buffer; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVINFO_DATA devinfo = {sizeof(devinfo)}; + PHIDP_PREPARSED_DATA preparsed; + HIDD_ATTRIBUTES attrs; + HIDP_CAPS caps; + HDEVINFO set; + HANDLE device; + UINT32 i = 0, cnt = 0; + GUID hid; + + HidD_GetHidGuid(&hid); + + set = SetupDiGetClassDevsW(&hid, NULL, NULL, DIGCF_DEVICEINTERFACE); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed, error %u\n", GetLastError()); + + while (SetupDiEnumDeviceInterfaces(set, NULL, &hid, i++, &iface)) + { + detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + if (!SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, sizeof(buffer), NULL, &devinfo)) + continue; + + if (!try_open_hid_device(detail->DevicePath, &device, &preparsed, &attrs, &caps)) + continue; + + if (wcslen(detail->DevicePath) <= wcslen(prefix) || + wcsnicmp(detail->DevicePath + wcslen(prefix), L"&IG_", 4 )) + continue; + + trace("found xinput HID device %s\n", wine_dbgstr_w(detail->DevicePath)); + check_hid_caps(cnt++, device, preparsed, &attrs, &caps); + + CloseHandle(device); + HidD_FreePreparsedData(preparsed); + } + + SetupDiDestroyDeviceInfoList(set); +} + START_TEST(xinput) { struct @@ -320,6 +835,7 @@ START_TEST(xinput) if (!pXInputGetStateEx) pXInputGetStateEx = pXInputGetStateEx_Ordinal; + test_hid_reports(); test_set_state(); test_get_state(); test_get_capabilities(); -- 2.32.0

1 0

[PATCH] include: Fix IRequestDictionary IID
by Andrew Boyarshin 10 Aug '21

10 Aug '21

IRequestDictionary had the wrong UUID specified (IResponse one). Found by using MIDL instead of WIDL to compile Wine headers: duplicated IID caused compilation error in MIDL. Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> --- dlls/msxml3/tests/domdoc.c | 2 +- include/asptlb.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df30104a1560..a7890d56f71f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13170,7 +13170,7 @@ static HRESULT WINAPI transformdest_QueryInterface(IUnknown *iface, REFIID riid, IsEqualIID(riid, &IID_IServiceProvider) || IsEqualIID(riid, &IID_IStream) || IsEqualIID(riid, &IID_ISequentialStream) || - IsEqualIID(riid, &IID_IRequestDictionary); + IsEqualIID(riid, &IID_IResponse); todo_wine_if(IsEqualIID(riid, &IID_IXMLDOMDocument)) ok(known_iid, "Unexpected riid %s\n", wine_dbgstr_guid(riid)); diff --git a/include/asptlb.idl b/include/asptlb.idl index b38bc5d1fe9c..07f250702dd6 100644 --- a/include/asptlb.idl +++ b/include/asptlb.idl @@ -23,7 +23,7 @@ import "oaidl.idl"; [ object, dual, - uuid(D97A6DA0-A864-11cf-83BE-00A0C90C2BD8) + uuid(D97A6DA0-A85F-11DF-83AE-00A0C90C2BD8) ] interface IRequestDictionary : IDispatch { -- 2.32.0.windows.1

2 1