- Wine-Devel - list.winehq.org

[PATCH v2 1/5] include: Add windows.foundation.metadata.idl.
by Zhiyi Zhang April 22, 2022

April 22, 2022

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 232996~233000 and 233185. Use nested namespace declarations for patch 1/5. include/Makefile.in | 1 + include/windows.foundation.metadata.idl | 75 +++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 include/windows.foundation.metadata.idl diff --git a/include/Makefile.in b/include/Makefile.in index dff2f341568..b0a1d0e4880 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -786,6 +786,7 @@ SOURCES = \ windows.devices.power.idl \ windows.foundation.collections.idl \ windows.foundation.idl \ + windows.foundation.metadata.idl \ windows.gaming.input.custom.idl \ windows.gaming.input.forcefeedback.idl \ windows.gaming.input.idl \ diff --git a/include/windows.foundation.metadata.idl b/include/windows.foundation.metadata.idl new file mode 100644 index 00000000000..9487737e071 --- /dev/null +++ b/include/windows.foundation.metadata.idl @@ -0,0 +1,75 @@ +/* + * Copyright 2022 Zhiyi Zhang 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.Foundation.Metadata +{ + typedef enum GCPressureAmount GCPressureAmount; + + interface IApiInformationStatics; + + runtimeclass ApiInformation; + + [ + contract(Windows.Foundation.FoundationContract, 1.0) + ] + enum GCPressureAmount + { + Low = 0, + Medium = 1, + High = 2 + }; + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + exclusiveto(Windows.Foundation.Metadata.ApiInformation), + uuid(997439fe-f681-4a11-b416-c13a47e8ba36) + ] + interface IApiInformationStatics : IInspectable + { + HRESULT IsTypePresent([in] HSTRING type_name, [out, retval] boolean *value); + [overload("IsMethodPresent")] HRESULT IsMethodPresent([in] HSTRING type_name, [in] HSTRING method_name, [out, retval] boolean *value); + [overload("IsMethodPresent")] HRESULT IsMethodPresentWithArity([in] HSTRING type_name, [in] HSTRING method_name, [in] UINT32 parameter_count, [out, retval] boolean *value); + HRESULT IsEventPresent([in] HSTRING type_name, [in] HSTRING event_name, [out, retval] boolean *value); + HRESULT IsPropertyPresent([in] HSTRING type_name, [in] HSTRING property_name, [out, retval] boolean *value); + HRESULT IsReadOnlyPropertyPresent([in] HSTRING type_name, [in] HSTRING property_name, [out, retval] boolean *value); + HRESULT IsWriteablePropertyPresent([in] HSTRING type_name, [in] HSTRING property_name, [out, retval] boolean *value); + HRESULT IsEnumNamedValuePresent([in] HSTRING enum_type_name, [in] HSTRING value_name, [out, retval] boolean *value); + [overload("IsApiContractPresent")] HRESULT IsApiContractPresentByMajor([in] HSTRING contract_name, [in] UINT16 major_version, [out, retval] boolean *value); + [overload("IsApiContractPresent")] HRESULT IsApiContractPresentByMajorAndMinor([in] HSTRING contract_name, [in] UINT16 major_version, [in] UINT16 minor_version, [out, retval] boolean *value); + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + marshaling_behavior(agile), + static(Windows.Foundation.Metadata.IApiInformationStatics, Windows.Foundation.FoundationContract, 1.0), + threading(both) + ] + runtimeclass ApiInformation + { + } +} -- 2.32.0

2 1

[PATCH] kernel32: Fix percentage calculation in GetSystemPowerStatus
by Alex Henrie April 22, 2022

April 22, 2022

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/powermgnt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index ca62019b256..ae83de3c523 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -63,7 +63,7 @@ BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS ps) if (bs.BatteryPresent) { - ps->BatteryLifePercent = bs.MaxCapacity ? bs.RemainingCapacity / bs.MaxCapacity : 100; + ps->BatteryLifePercent = bs.MaxCapacity ? 100 * bs.RemainingCapacity / bs.MaxCapacity : 100; ps->BatteryLifeTime = bs.EstimatedTime; if (!bs.Charging && (LONG)bs.Rate < 0) ps->BatteryFullLifeTime = 3600 * bs.MaxCapacity / -(LONG)bs.Rate; -- 2.36.0

2 2

[PATCH vkd3d v2 1/9] vkd3d-shader/hlsl: Do not generate infinities in SM1.
by Giovanni Mascellani April 22, 2022

April 22, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 9 ++++++++- tests/arithmetic-float.shader_test | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 06b957ba..a1551ba1 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "hlsl.h" static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src) @@ -270,12 +272,17 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - if (src2->value[k].f == 0) + if (ctx->profile->major_version >= 4 && src2->value[k].f == 0) { hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, "Floating point division by zero"); } dst->value[k].f = src1->value[k].f / src2->value[k].f; + if (ctx->profile->major_version < 4 && isinf(dst->value[k].f)) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Infinities are not allowed by the shader model."); + } break; case HLSL_TYPE_DOUBLE: diff --git a/tests/arithmetic-float.shader_test b/tests/arithmetic-float.shader_test index f99b9728..6824c3f1 100644 --- a/tests/arithmetic-float.shader_test +++ b/tests/arithmetic-float.shader_test @@ -25,6 +25,7 @@ todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) [require] +% Infinities are not allowed in SM1 shader model >= 4.0 [pixel shader] -- 2.35.2

2 9

[PATCH] include: Add CLSID_MSVPxDecoder declaration.
by Mohamad Al-Jaf April 22, 2022

April 22, 2022

Needed by Chromium-based browsers including CEF. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- include/mfidl.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 7034378f585..e492bf8daf0 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1630,6 +1630,7 @@ cpp_quote("EXTERN_GUID(CLSID_MSMPEGDecoderMFT, 0x2d709e52, 0x123f, 0x49b5, 0x9c, cpp_quote("EXTERN_GUID(CLSID_MSH264DecoderMFT, 0x62ce7e72, 0x4c71, 0x4d20, 0xb1, 0x5d, 0x45, 0x28, 0x31, 0xa8, 0x7d, 0x9d);") cpp_quote("EXTERN_GUID(CLSID_MSH264EncoderMFT, 0x6ca50344, 0x051a, 0x4ded, 0x97, 0x79, 0xa4, 0x33, 0x05, 0x16, 0x5e, 0x35);") cpp_quote("EXTERN_GUID(CLSID_MSH265DecoderMFT, 0x420a51a3, 0xd605, 0x430c, 0xb4, 0xfc, 0x45, 0x27, 0x4f, 0xa6, 0xc5, 0x62);") +cpp_quote("EXTERN_GUID(CLSID_MSVPxDecoder, 0xe3aaf548, 0xc9a4, 0x4c6e, 0x23, 0x4d, 0x5a, 0xda, 0x37, 0x4b, 0x00, 0x00);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") cpp_quote("EXTERN_GUID(CLSID_WMVDecoderMFT, 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34);") -- 2.36.0

2 1

[PATCH v2 1/6] include: Add defines for ID2D1VertexBuffer.
by Ziqing Hui April 21, 2022

April 21, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- include/Makefile.in | 1 + include/d2d1effectauthor.idl | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 include/d2d1effectauthor.idl diff --git a/include/Makefile.in b/include/Makefile.in index dff2f341568..90d451ba5b1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -107,6 +107,7 @@ SOURCES = \ d2d1effects.idl \ d2d1effects_1.idl \ d2d1effects_2.idl \ + d2d1effectauthor.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl new file mode 100644 index 00000000000..4a2d84cfa4b --- /dev/null +++ b/include/d2d1effectauthor.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Ziqing Hui 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 + */ + + import "d2d1_1.idl"; + +[ + object, + uuid(9b8b1336-00a5-4668-92b7-ced5d8bf9b7b), + local, +] +interface ID2D1VertexBuffer : IUnknown +{ + HRESULT Map( + [out] BYTE **data, + [in] UINT32 buffer_size + ); + HRESULT Unmap(); +}; -- 2.25.1

1 5

[PATCH 1/6] include: Add defines for ID2D1VertexBuffer.
by Ziqing Hui April 21, 2022

April 21, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- include/Makefile.in | 1 + include/d2d1effectauthor.idl | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 include/d2d1effectauthor.idl diff --git a/include/Makefile.in b/include/Makefile.in index dff2f341568..90d451ba5b1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -107,6 +107,7 @@ SOURCES = \ d2d1effects.idl \ d2d1effects_1.idl \ d2d1effects_2.idl \ + d2d1effectauthor.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl new file mode 100644 index 00000000000..4a2d84cfa4b --- /dev/null +++ b/include/d2d1effectauthor.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Ziqing Hui 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 + */ + + import "d2d1_1.idl"; + +[ + object, + uuid(9b8b1336-00a5-4668-92b7-ced5d8bf9b7b), + local, +] +interface ID2D1VertexBuffer : IUnknown +{ + HRESULT Map( + [out] BYTE **data, + [in] UINT32 buffer_size + ); + HRESULT Unmap(); +}; -- 2.25.1

1 5

[tools] testbot/web: Simplify generating the Submit page header.
by Francois Gouget April 21, 2022

April 21, 2022

This takes advantage of the fact that all of the @Headers parts are joined with linebreaks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 9292d387b..ca225b615 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -620,14 +620,13 @@ sub GetHeaderText($) } if ($self->{Page} == 2 or $self->{Page} == 4) { - my $HeaderText = "Select the VMs on which you want to run your test."; + push @Headers, "Select the VMs on which you want to run your test."; my $VMs = CreateVMs(); $VMs->AddFilter("Status", ["offline", "maintenance"]); if (!$VMs->IsEmpty()) { - $HeaderText .= "<br>NOTE: Offline VMs and those undergoing maintenance will not be able to run your tests right away."; + push @Headers, "NOTE: Offline VMs and those undergoing maintenance will not be able to run your tests right away."; } - push @Headers, $HeaderText; } if (($self->{Page} == 3 or $self->{Page} == 0) and $self->{Impacts}) { @@ -652,7 +651,7 @@ sub GetHeaderText($) } push @TestExecutables, "$ModuleName: ". join(" ", @TestUnits) if (@TestUnits); } - push @Headers, join("<br>\n", "Here is a list of the test executables impacted by the patch (patched test units, if any, are in italics).", @TestExecutables); + push @Headers, "Here is a list of the test executables impacted by the patch (patched test units, if any, are in italics).", @TestExecutables; } return join("<br>\n", @Headers); -- 2.30.2

1 0

[tools] testbot/web: Tweak the Login and ResetPassword GetInputType() formatting.
by Francois Gouget April 21, 2022

April 21, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Login.pl | 9 +++------ testbot/web/ResetPassword.pl | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 837617d8d..7b9a6ffeb 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -65,12 +65,9 @@ sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; - if ($PropertyDescriptor->GetName() eq "Password") - { - return "password"; - } - - return $self->SUPER::GetInputType($PropertyDescriptor); + my $PropertyName = $PropertyDescriptor->GetName(); + return $PropertyName eq "Password" ? "password" : + $self->SUPER::GetInputType($PropertyDescriptor); } sub GenerateFields($) diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 4f672ea94..081e27f19 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -63,12 +63,9 @@ sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; - if (substr($PropertyDescriptor->GetName(), 0, 8) eq "Password") - { - return "password"; - } - - return $self->SUPER::GetInputType($PropertyDescriptor); + my $PropertyName = substr($PropertyDescriptor->GetName(), 0, 8); + return $PropertyName eq "Password" ? "password" : + $self->SUPER::GetInputType($PropertyDescriptor); } sub GetActions($) -- 2.30.2

1 0

[PATCH v2 0/5] win32u: Improve dibdrv FontSmoothingGamma related code.
by Byeongsik Jeon April 21, 2022

April 21, 2022

--- v2: [PATCH 5/5] ~0u -> 0xffffff "if (glyph_ptr[x] == ~0u) { dst_ptr[x] = text_pixel; continue; }" I realized that this line is not working. I'm sorry that didn't review it more carefully. I got 10% additional performance improvement, so re-tested the entire test. --- After commit 649dd12, I propose some improvements related to the dibdrv FontSmoothingGamma code. Using pre-computed value and Removing branches in the inline function can provide some performance improvements. CrystalMark2004R7 GDI Text Bench result(5times average) [1][2]: - OLD : 6673 (100%) pre 649dd12 - CURRENT : 5584 ( 84%) with gamma == 1000 - CURRENT : 4989 ( 75%) with gamma != 1000 - PATCH v2 1/5: 5125 ( 77%) - PATCH v2 2/5: 5528 ( 83%) - PATCH v2 5/5: 6772 (101%) Please, Note that OLD and CURRENT(gamma == 1000) doesn't have FontSmoothingGamma ability. These improvements allow to change the gamma default value to 1400(MS GDI32 default value), while reducing performance losses. [1] If the dibdrv glyph caching code is turned off, the CrystalMark result value is reduced by 10 times! With the dibdrv glyph cache ON, the performance factors in the pre-caching phase are hidden. This indicates that dibdrv::draw_glyph() performance is the dominant factor of the CrystalMark result value. The result does not represent GDI32 text engine performance in all situations, but it can be referred to in the current situation. [2] CrystalMark apply different weights to the result value calculation depending on the fontsmoothing type. And current Wine does not synchronize the xrdb resource values and the SystemParametersInfo() results. Therefore, required some attention in the configuration of the test environment and the result analysis. I tested it under the conditions below: $ xrdb -remove $ winetricks fontsmooth=rgb Byeong-Sik Jeon (5): win32u: Remove gamma == 1000 special case code. win32u: Use pre-calculated decoded_text value. win32u: Remove the gamma value calibration code. win32u: Set the default gamma value to 1400. win32u: Remove the branches in blend_color_gamma(). dlls/win32u/dibdrv/primitives.c | 74 +++++++++++++++++---------------- dlls/win32u/font.c | 13 ++---- dlls/win32u/freetype.c | 4 +- 3 files changed, 43 insertions(+), 48 deletions(-) -- 2.36.0

1 5

[PATCH 1/4] dinput/tests: Add tests for joystick with many axes and units.
by Rémi Bernon April 21, 2022

April 21, 2022

Checking that only a few axes get really mapped to the slider axes, and that we shouldn't use HID_USAGE_SIMULATION_RUDDER if there's already an Rz mapped axis. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/joystick8.c | 572 ++++++++++++++++++++++++++++++++++ 1 file changed, 572 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 597846d9f57..32d03a603c3 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -2621,6 +2621,577 @@ static BOOL test_device_types( DWORD version ) return success; } +static void test_many_axes_joystick(void) +{ +#include "psh_hid_macros.h" + static const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Report), + REPORT_ID(1, 1), + + USAGE(1, HID_USAGE_GENERIC_DIAL), + USAGE(1, HID_USAGE_GENERIC_SLIDER), + USAGE(4, (HID_USAGE_PAGE_SIMULATION<<16)|HID_USAGE_SIMULATION_RUDDER), + USAGE(4, (HID_USAGE_PAGE_SIMULATION<<16)|HID_USAGE_SIMULATION_THROTTLE), + USAGE(1, HID_USAGE_GENERIC_RZ), + USAGE(1, HID_USAGE_GENERIC_RY), + USAGE(1, HID_USAGE_GENERIC_RX), + USAGE(1, HID_USAGE_GENERIC_Z), + USAGE(1, HID_USAGE_GENERIC_Y), + USAGE(1, HID_USAGE_GENERIC_X), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 10), + INPUT(1, Data|Var|Abs), + + USAGE(1, HID_USAGE_GENERIC_Z), + USAGE(1, HID_USAGE_GENERIC_Y), + USAGE(1, HID_USAGE_GENERIC_X), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 0x7f), + UNIT(4, 0xf011), /* cm * s^-1 */ + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 3), + INPUT(1, Data|Var|Abs), + + USAGE(1, HID_USAGE_GENERIC_Z), + USAGE(1, HID_USAGE_GENERIC_Y), + USAGE(1, HID_USAGE_GENERIC_X), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 0x7f), + UNIT(4, 0xe011), /* cm * s^-2 */ + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 3), + INPUT(1, Data|Var|Abs), + + USAGE(1, HID_USAGE_GENERIC_Z), + USAGE(1, HID_USAGE_GENERIC_Y), + USAGE(1, HID_USAGE_GENERIC_X), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 0x7f), + UNIT(4, 0xe111), /* g * cm * s^-2 */ + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 3), + INPUT(1, Data|Var|Abs), + UNIT(1, 0), /* None */ + END_COLLECTION, + END_COLLECTION, + }; +#undef REPORT_ID_OR_USAGE_PAGE +#include "pop_hid_macros.h" + + struct hid_device_desc desc = + { + .use_report_id = TRUE, + .caps = { .InputReportByteLength = 20 }, + .attributes = default_attributes, + }; + const DIDEVCAPS expect_caps = + { + .dwSize = sizeof(DIDEVCAPS), + .dwFlags = DIDC_ATTACHED | DIDC_EMULATED, + .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPE1STPERSON_LIMITED << 8) | DI8DEVTYPE_1STPERSON, + .dwAxes = 19, + }; + const DIDEVICEINSTANCEW expect_devinst = + { + .dwSize = sizeof(DIDEVICEINSTANCEW), + .guidInstance = expect_guid_product, + .guidProduct = expect_guid_product, + .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPE1STPERSON_LIMITED << 8) | DI8DEVTYPE_1STPERSON, + .tszInstanceName = L"Wine Test", + .tszProductName = L"Wine Test", + .guidFFDriver = GUID_NULL, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_JOYSTICK, + }; + const DIDEVICEOBJECTINSTANCEW expect_objects[] = + { + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_XAxis, + .dwOfs = 0, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(0), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"X Axis", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_X, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_YAxis, + .dwOfs = 0x4, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(1), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Y Axis", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Y, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_ZAxis, + .dwOfs = 0x8, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(2), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Z Axis", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Z, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_RxAxis, + .dwOfs = 0xc, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(3), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"X Rotation", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_RX, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_RyAxis, + .dwOfs = 0x10, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(4), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Y Rotation", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_RY, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_RzAxis, + .dwOfs = 0x14, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(5), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Z Rotation", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_RZ, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Slider, + .dwOfs = 0x18, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(6), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Throttle", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_THROTTLE, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_RzAxis, + .dwOfs = 0x1c, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(7), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Rudder", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_RUDDER, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Slider, + .dwOfs = 0x20, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(8), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Slider", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_SLIDER, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Slider, + .dwOfs = 0x24, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(9), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Dial", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_DIAL, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_XAxis, + .dwOfs = 0x28, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(10), + .dwFlags = DIDOI_ASPECTVELOCITY, + .tszName = L"X Axis", + .wCollectionNumber = 1, + .dwDimension = 0xf011, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_X, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_YAxis, + .dwOfs = 0x2c, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(11), + .dwFlags = DIDOI_ASPECTVELOCITY, + .tszName = L"Y Axis", + .wCollectionNumber = 1, + .dwDimension = 0xf011, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Y, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_ZAxis, + .dwOfs = 0x30, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(12), + .dwFlags = DIDOI_ASPECTVELOCITY, + .tszName = L"Z Axis", + .wCollectionNumber = 1, + .dwDimension = 0xf011, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Z, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_XAxis, + .dwOfs = 0x34, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(13), + .dwFlags = DIDOI_ASPECTACCEL, + .tszName = L"X Axis", + .wCollectionNumber = 1, + .dwDimension = 0xe011, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_X, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_YAxis, + .dwOfs = 0x38, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(14), + .dwFlags = DIDOI_ASPECTACCEL, + .tszName = L"Y Axis", + .wCollectionNumber = 1, + .dwDimension = 0xe011, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Y, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_ZAxis, + .dwOfs = 0x3c, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(15), + .dwFlags = DIDOI_ASPECTACCEL, + .tszName = L"Z Axis", + .wCollectionNumber = 1, + .dwDimension = 0xe011, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Z, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_XAxis, + .dwOfs = 0x40, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(16), + .dwFlags = DIDOI_ASPECTFORCE, + .tszName = L"X Axis", + .wCollectionNumber = 1, + .dwDimension = 0xe111, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_X, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_YAxis, + .dwOfs = 0x44, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(17), + .dwFlags = DIDOI_ASPECTFORCE, + .tszName = L"Y Axis", + .wCollectionNumber = 1, + .dwDimension = 0xe111, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Y, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_ZAxis, + .dwOfs = 0x48, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(18), + .dwFlags = DIDOI_ASPECTFORCE, + .tszName = L"Z Axis", + .wCollectionNumber = 1, + .dwDimension = 0xe111, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Z, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwType = DIDFT_COLLECTION|DIDFT_NODATA|DIDFT_MAKEINSTANCE(0), + .tszName = L"Collection 0 - Joystick", + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_JOYSTICK, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwType = DIDFT_COLLECTION|DIDFT_NODATA|DIDFT_MAKEINSTANCE(1), + .tszName = L"Collection 1 - Joystick", + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_JOYSTICK, + }, + }; + struct check_objects_todos todo_objects[ARRAY_SIZE(expect_objects)] = + { + {0}, + {0}, + {0}, + {0}, + {0}, + {0}, + {0}, + {0}, + {.name = TRUE}, + {.name = TRUE, .guid = TRUE}, + {.flags = TRUE}, + {.flags = TRUE}, + {.flags = TRUE}, + {.flags = TRUE}, + {.flags = TRUE}, + {.flags = TRUE}, + {.flags = TRUE}, + {.flags = TRUE}, + {.flags = TRUE}, + }; + struct check_objects_params check_objects_params = + { + .version = DIRECTINPUT_VERSION, + .expect_count = ARRAY_SIZE(expect_objects), + .expect_objs = expect_objects, + .todo_objs = todo_objects, + }; + + DIDEVICEOBJECTINSTANCEW objinst = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; + DIDEVICEINSTANCEW devinst = {0}; + IDirectInputDevice8W *device; + DIDEVCAPS caps = {0}; + HRESULT hr; + ULONG ref; + + cleanup_registry_keys(); + + desc.report_descriptor_len = sizeof(report_desc); + memcpy( desc.report_descriptor_buf, report_desc, sizeof(report_desc) ); + fill_context( __LINE__, desc.context, ARRAY_SIZE(desc.context) ); + + if (!hid_device_start( &desc )) goto done; + if (FAILED(hr = dinput_test_create_device( DIRECTINPUT_VERSION, &devinst, &device ))) goto done; + + check_dinput_devices( DIRECTINPUT_VERSION, &devinst ); + + memset( &devinst, 0, sizeof(devinst) ); + devinst.dwSize = sizeof(DIDEVICEINSTANCEW); + hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); + ok( hr == DI_OK, "GetDeviceInfo returned %#lx\n", hr ); + check_member( devinst, expect_devinst, "%lu", dwSize ); + todo_wine + check_member_guid( devinst, expect_devinst, guidInstance ); + check_member_guid( devinst, expect_devinst, guidProduct ); + todo_wine + check_member( devinst, expect_devinst, "%#lx", dwDevType ); + check_member_wstr( devinst, expect_devinst, tszInstanceName ); + check_member_wstr( devinst, expect_devinst, tszProductName ); + check_member_guid( devinst, expect_devinst, guidFFDriver ); + check_member( devinst, expect_devinst, "%04x", wUsagePage ); + check_member( devinst, expect_devinst, "%04x", wUsage ); + + hr = IDirectInputDevice8_GetCapabilities( device, NULL ); + ok( hr == E_POINTER, "GetCapabilities returned %#lx\n", hr ); + hr = IDirectInputDevice8_GetCapabilities( device, &caps ); + ok( hr == DIERR_INVALIDPARAM, "GetCapabilities returned %#lx\n", hr ); + caps.dwSize = sizeof(DIDEVCAPS); + hr = IDirectInputDevice8_GetCapabilities( device, &caps ); + ok( hr == DI_OK, "GetCapabilities returned %#lx\n", hr ); + check_member( caps, expect_caps, "%lu", dwSize ); + check_member( caps, expect_caps, "%#lx", dwFlags ); + todo_wine + check_member( caps, expect_caps, "%#lx", dwDevType ); + check_member( caps, expect_caps, "%lu", dwAxes ); + check_member( caps, expect_caps, "%lu", dwButtons ); + check_member( caps, expect_caps, "%lu", dwPOVs ); + check_member( caps, expect_caps, "%lu", dwFFSamplePeriod ); + check_member( caps, expect_caps, "%lu", dwFFMinTimeResolution ); + check_member( caps, expect_caps, "%lu", dwFirmwareRevision ); + check_member( caps, expect_caps, "%lu", dwHardwareRevision ); + check_member( caps, expect_caps, "%lu", dwFFDriverVersion ); + + hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); + ok( hr == DI_OK, "EnumObjects returned %#lx\n", hr ); + ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", + check_objects_params.expect_count - check_objects_params.index ); + + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "SetDataFormat returned: %#lx\n", hr ); + + hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, DIJOFS_RZ, DIPH_BYOFFSET ); + ok( hr == DI_OK, "GetObjectInfo returned: %#lx\n", hr ); + + check_member( objinst, expect_objects[5], "%lu", dwSize ); + check_member_guid( objinst, expect_objects[5], guidType ); + check_member( objinst, expect_objects[5], "%#lx", dwOfs ); + check_member( objinst, expect_objects[5], "%#lx", dwType ); + check_member( objinst, expect_objects[5], "%#lx", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_objects[5], tszName ); + check_member( objinst, expect_objects[5], "%lu", dwFFMaxForce ); + check_member( objinst, expect_objects[5], "%lu", dwFFForceResolution ); + check_member( objinst, expect_objects[5], "%u", wCollectionNumber ); + check_member( objinst, expect_objects[5], "%u", wDesignatorIndex ); + check_member( objinst, expect_objects[5], "%#04x", wUsagePage ); + check_member( objinst, expect_objects[5], "%#04x", wUsage ); + check_member( objinst, expect_objects[5], "%#lx", dwDimension ); + check_member( objinst, expect_objects[5], "%#04x", wExponent ); + check_member( objinst, expect_objects[5], "%u", wReportId ); + + hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, offsetof(DIJOYSTATE2, rglSlider[0]), DIPH_BYOFFSET ); + ok( hr == DI_OK, "GetObjectInfo returned: %#lx\n", hr ); + + check_member( objinst, expect_objects[6], "%lu", dwSize ); + check_member_guid( objinst, expect_objects[6], guidType ); + check_member( objinst, expect_objects[6], "%#lx", dwOfs ); + check_member( objinst, expect_objects[6], "%#lx", dwType ); + check_member( objinst, expect_objects[6], "%#lx", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_objects[6], tszName ); + check_member( objinst, expect_objects[6], "%lu", dwFFMaxForce ); + check_member( objinst, expect_objects[6], "%lu", dwFFForceResolution ); + check_member( objinst, expect_objects[6], "%u", wCollectionNumber ); + check_member( objinst, expect_objects[6], "%u", wDesignatorIndex ); + check_member( objinst, expect_objects[6], "%#04x", wUsagePage ); + check_member( objinst, expect_objects[6], "%#04x", wUsage ); + check_member( objinst, expect_objects[6], "%#lx", dwDimension ); + check_member( objinst, expect_objects[6], "%#04x", wExponent ); + check_member( objinst, expect_objects[6], "%u", wReportId ); + + hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, offsetof(DIJOYSTATE2, rglSlider[1]), DIPH_BYOFFSET ); + ok( hr == DI_OK, "GetObjectInfo returned: %#lx\n", hr ); + + check_member( objinst, expect_objects[8], "%lu", dwSize ); + check_member_guid( objinst, expect_objects[8], guidType ); + check_member( objinst, expect_objects[8], "%#lx", dwOfs ); + check_member( objinst, expect_objects[8], "%#lx", dwType ); + check_member( objinst, expect_objects[8], "%#lx", dwFlags ); + if (!localized) todo_wine check_member_wstr( objinst, expect_objects[8], tszName ); + check_member( objinst, expect_objects[8], "%lu", dwFFMaxForce ); + check_member( objinst, expect_objects[8], "%lu", dwFFForceResolution ); + check_member( objinst, expect_objects[8], "%u", wCollectionNumber ); + check_member( objinst, expect_objects[8], "%u", wDesignatorIndex ); + check_member( objinst, expect_objects[8], "%#04x", wUsagePage ); + check_member( objinst, expect_objects[8], "%#04x", wUsage ); + check_member( objinst, expect_objects[8], "%#lx", dwDimension ); + check_member( objinst, expect_objects[8], "%#04x", wExponent ); + check_member( objinst, expect_objects[8], "%u", wReportId ); + + hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, offsetof(DIJOYSTATE2, lVX), DIPH_BYOFFSET ); + ok( hr == DI_OK, "GetObjectInfo returned: %#lx\n", hr ); + + check_member( objinst, expect_objects[10], "%lu", dwSize ); + check_member_guid( objinst, expect_objects[10], guidType ); + check_member( objinst, expect_objects[10], "%#lx", dwOfs ); + check_member( objinst, expect_objects[10], "%#lx", dwType ); + todo_wine + check_member( objinst, expect_objects[10], "%#lx", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_objects[10], tszName ); + check_member( objinst, expect_objects[10], "%lu", dwFFMaxForce ); + check_member( objinst, expect_objects[10], "%lu", dwFFForceResolution ); + check_member( objinst, expect_objects[10], "%u", wCollectionNumber ); + check_member( objinst, expect_objects[10], "%u", wDesignatorIndex ); + check_member( objinst, expect_objects[10], "%#04x", wUsagePage ); + check_member( objinst, expect_objects[10], "%#04x", wUsage ); + check_member( objinst, expect_objects[10], "%#lx", dwDimension ); + check_member( objinst, expect_objects[10], "%#04x", wExponent ); + check_member( objinst, expect_objects[10], "%u", wReportId ); + + hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, offsetof(DIJOYSTATE2, lAX), DIPH_BYOFFSET ); + ok( hr == DI_OK, "GetObjectInfo returned: %#lx\n", hr ); + + check_member( objinst, expect_objects[13], "%lu", dwSize ); + check_member_guid( objinst, expect_objects[13], guidType ); + check_member( objinst, expect_objects[13], "%#lx", dwOfs ); + check_member( objinst, expect_objects[13], "%#lx", dwType ); + todo_wine + check_member( objinst, expect_objects[13], "%#lx", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_objects[13], tszName ); + check_member( objinst, expect_objects[13], "%lu", dwFFMaxForce ); + check_member( objinst, expect_objects[13], "%lu", dwFFForceResolution ); + check_member( objinst, expect_objects[13], "%u", wCollectionNumber ); + check_member( objinst, expect_objects[13], "%u", wDesignatorIndex ); + check_member( objinst, expect_objects[13], "%#04x", wUsagePage ); + check_member( objinst, expect_objects[13], "%#04x", wUsage ); + check_member( objinst, expect_objects[13], "%#lx", dwDimension ); + check_member( objinst, expect_objects[13], "%#04x", wExponent ); + check_member( objinst, expect_objects[13], "%u", wReportId ); + + hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, offsetof(DIJOYSTATE2, lFX), DIPH_BYOFFSET ); + ok( hr == DI_OK, "GetObjectInfo returned: %#lx\n", hr ); + + check_member( objinst, expect_objects[16], "%lu", dwSize ); + check_member_guid( objinst, expect_objects[16], guidType ); + check_member( objinst, expect_objects[16], "%#lx", dwOfs ); + check_member( objinst, expect_objects[16], "%#lx", dwType ); + todo_wine + check_member( objinst, expect_objects[16], "%#lx", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_objects[16], tszName ); + check_member( objinst, expect_objects[16], "%lu", dwFFMaxForce ); + check_member( objinst, expect_objects[16], "%lu", dwFFForceResolution ); + check_member( objinst, expect_objects[16], "%u", wCollectionNumber ); + check_member( objinst, expect_objects[16], "%u", wDesignatorIndex ); + check_member( objinst, expect_objects[16], "%#04x", wUsagePage ); + check_member( objinst, expect_objects[16], "%#04x", wUsage ); + check_member( objinst, expect_objects[16], "%#lx", dwDimension ); + check_member( objinst, expect_objects[16], "%#04x", wExponent ); + check_member( objinst, expect_objects[16], "%u", wReportId ); + + ref = IDirectInputDevice8_Release( device ); + ok( ref == 0, "Release returned %ld\n", ref ); + +done: + hid_device_stop( &desc ); + cleanup_registry_keys(); + winetest_pop_context(); +} + static void test_driving_wheel_axes(void) { #include "psh_hid_macros.h" @@ -3488,6 +4059,7 @@ START_TEST( joystick8 ) test_simple_joystick( 0x700 ); test_simple_joystick( 0x800 ); + test_many_axes_joystick(); test_driving_wheel_axes(); test_windows_gaming_input(); } -- 2.35.1

2 4