November 2021 - Wine-Devel - list.winehq.org

Re: [PATCH vkd3d 5/5] vkd3d-shader/hlsl: Write SM4 sample instructions.

by Zebediah Figura

On 11/9/21 9:01 AM, Matteo Bruni wrote: > On Tue, Nov 9, 2021 at 4:56 AM Zebediah Figura <zfigura(a)codeweavers.com> wrote: >> >> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> >> --- >> libs/vkd3d-shader/hlsl_sm4.c | 56 ++++++++++++++++++++++++++++++++++-- >> 1 file changed, 54 insertions(+), 2 deletions(-) >> >> diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c >> index e597425ae..da31d5ae2 100644 >> --- a/libs/vkd3d-shader/hlsl_sm4.c >> +++ b/libs/vkd3d-shader/hlsl_sm4.c > >> @@ -1227,6 +1236,32 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf >> write_sm4_instruction(buffer, &instr); >> } >> >> +static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, >> + const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, >> + const struct hlsl_deref *resource, const struct hlsl_deref *sampler, const struct hlsl_ir_node *coords) > > Just for my own curiosity: any particular reason for > write_sm4_sample() (and write_sm4_ld()) to take an explicit > resource_type argument? > Shader model 5 or so encodes the resource type into the sample instruction as a modifier, for no apparent reason. Not sure now if I ever did that in a patch.

Nov. 9, 2021

Re: [PATCH vkd3d 3/5] vkd3d-shader/hlsl: Handle samplers in write_sm1_uniform().

by Zebediah Figura

On 11/9/21 10:12 AM, Giovanni Mascellani wrote: > Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> > -- > I don't really know much about SM1, so I wouldn't swear the patch is > correct. But it looks sensible and it doesn't appear to be breaking > totally unrelated things. > > Only thing I would change is to leave "put_u32(buffer, > var->data_type->reg_size / 4)" out of the conditional, since I think I > remember that textures and samplers have register size 4. But it's not a > big deal. I believe they currently have reg_size 0. There's not a meaningful register size for them anyway.

Nov. 9, 2021

Re: [PATCH vkd3d] vkd3d-shader/hlsl: Fix texture reservation trace.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> On 09/11/21 13:54, Matteo Bruni wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl_codegen.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c > index 24b8205c..0bf18c2b 100644 > --- a/libs/vkd3d-shader/hlsl_codegen.c > +++ b/libs/vkd3d-shader/hlsl_codegen.c > @@ -1240,7 +1240,7 @@ static void allocate_textures(struct hlsl_ctx *ctx) > > var->reg.id = var->reg_reservation.index; > var->reg.allocated = true; > - TRACE("Allocated reserved %s to t%u.\n", var->name, index); > + TRACE("Allocated reserved %s to t%u.\n", var->name, var->reg_reservation.index); > } > else if (!var->reg_reservation.type) > { >

Nov. 9, 2021

Re: [PATCH v2 vkd3d] vkd3d-shader/hlsl: Allocate samplers.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> On 09/11/21 14:26, Matteo Bruni wrote: > From: Zebediah Figura <zfigura(a)codeweavers.com> > > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > Now it should actually apply on top of 219117. > > libs/vkd3d-shader/hlsl_codegen.c | 59 ++++++++++++++++++++++++-------- > 1 file changed, 44 insertions(+), 15 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c > index 0bf18c2b..7c0b0f95 100644 > --- a/libs/vkd3d-shader/hlsl_codegen.c > +++ b/libs/vkd3d-shader/hlsl_codegen.c > @@ -1202,60 +1202,88 @@ static void allocate_buffers(struct hlsl_ctx *ctx) > } > } > > -static const struct hlsl_ir_var *get_reserved_texture(struct hlsl_ctx *ctx, uint32_t index) > +static const struct hlsl_ir_var *get_reserved_object(struct hlsl_ctx *ctx, char type, uint32_t index) > { > const struct hlsl_ir_var *var; > > LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) > { > - if (var->last_read && var->reg_reservation.type == 't' && var->reg_reservation.index == index) > + if (var->last_read && var->reg_reservation.type == type && var->reg_reservation.index == index) > return var; > } > return NULL; > } > > -static void allocate_textures(struct hlsl_ctx *ctx) > +static const struct object_type_info > { > + enum hlsl_base_type type; > + char *name; > + char reg_name; > +} > +object_types[] = > +{ > + { HLSL_TYPE_SAMPLER, "sampler", 's' }, > + { HLSL_TYPE_TEXTURE, "texture", 't' }, > +}; > + > +static const struct object_type_info *get_object_type_info(enum hlsl_base_type type) > +{ > + unsigned int i; > + > + for (i = 0; i < ARRAY_SIZE(object_types); ++i) > + if (type == object_types[i].type) > + return &object_types[i]; > + > + WARN("No type info for object type %u.\n", type); > + return NULL; > +} > + > +static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) > +{ > + const struct object_type_info *type_info = get_object_type_info(type); > struct hlsl_ir_var *var; > uint32_t index = 0; > > LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) > { > if (!var->last_read || var->data_type->type != HLSL_CLASS_OBJECT > - || var->data_type->base_type != HLSL_TYPE_TEXTURE) > + || var->data_type->base_type != type) > continue; > > - if (var->reg_reservation.type == 't') > + if (var->reg_reservation.type == type_info->reg_name) > { > - const struct hlsl_ir_var *reserved_texture = get_reserved_texture(ctx, var->reg_reservation.index); > + const struct hlsl_ir_var *reserved_object = get_reserved_object(ctx, type_info->reg_name, > + var->reg_reservation.index); > > - if (reserved_texture && reserved_texture != var) > + if (reserved_object && reserved_object != var) > { > hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, > - "Multiple textures bound to t%u.", var->reg_reservation.index); > - hlsl_note(ctx, reserved_texture->loc, VKD3D_SHADER_LOG_ERROR, > - "Texture '%s' is already bound to t%u.", reserved_texture->name, > + "Multiple %ss bound to %c%u.", type_info->name, type_info->reg_name, > var->reg_reservation.index); > + hlsl_note(ctx, reserved_object->loc, VKD3D_SHADER_LOG_ERROR, > + "Object '%s' is already bound to %c%u.", reserved_object->name, > + type_info->reg_name, var->reg_reservation.index); > } > > var->reg.id = var->reg_reservation.index; > var->reg.allocated = true; > - TRACE("Allocated reserved %s to t%u.\n", var->name, var->reg_reservation.index); > + TRACE("Allocated reserved %s to %c%u.\n", var->name, type_info->reg_name, var->reg_reservation.index); > } > else if (!var->reg_reservation.type) > { > - while (get_reserved_texture(ctx, index)) > + while (get_reserved_object(ctx, type_info->reg_name, index)) > ++index; > > var->reg.id = index; > var->reg.allocated = true; > - TRACE("Allocated %s to t%u.\n", var->name, index); > + TRACE("Allocated %s to %c%u.\n", var->name, type_info->reg_name, index); > ++index; > } > else > { > hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, > - "Textures must be bound to register type 't'."); > + "Object of type '%s' must be bound to register type '%c'.", > + type_info->name, type_info->reg_name); > } > } > } > @@ -1376,9 +1404,10 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun > else > { > allocate_buffers(ctx); > - allocate_textures(ctx); > + allocate_objects(ctx, HLSL_TYPE_TEXTURE); > } > allocate_semantic_registers(ctx); > + allocate_objects(ctx, HLSL_TYPE_SAMPLER); > > if (ctx->result) > return ctx->result; >

Nov. 9, 2021

Re: [PATCH vkd3d 5/5] vkd3d-shader/hlsl: Write SM4 sample instructions.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> On 09/11/21 04:39, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl_sm4.c | 56 ++++++++++++++++++++++++++++++++++-- > 1 file changed, 54 insertions(+), 2 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c > index e597425ae..da31d5ae2 100644 > --- a/libs/vkd3d-shader/hlsl_sm4.c > +++ b/libs/vkd3d-shader/hlsl_sm4.c > @@ -749,7 +749,7 @@ struct sm4_instruction > { > struct sm4_register reg; > unsigned int swizzle; > - } srcs[2]; > + } srcs[3]; > unsigned int src_count; > > uint32_t idx[2]; > @@ -761,6 +761,7 @@ static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) > switch (type) > { > case VKD3D_SM4_RT_IMMCONST: > + case VKD3D_SM4_RT_SAMPLER: > return VKD3D_SM4_SWIZZLE_NONE; > > case VKD3D_SM4_RT_CONSTBUFFER: > @@ -790,6 +791,14 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r > reg->idx_count = 1; > *writemask = VKD3DSP_WRITEMASK_ALL; > } > + else if (data_type->type == HLSL_CLASS_OBJECT && data_type->base_type == HLSL_TYPE_SAMPLER) > + { > + reg->type = VKD3D_SM4_RT_SAMPLER; > + reg->dim = VKD3D_SM4_DIMENSION_NONE; > + reg->idx[0] = var->reg.id; > + reg->idx_count = 1; > + *writemask = VKD3DSP_WRITEMASK_ALL; > + } > else > { > unsigned int offset = hlsl_offset_from_deref(deref) + var->buffer_offset; > @@ -1227,6 +1236,32 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf > write_sm4_instruction(buffer, &instr); > } > > +static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, > + const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, > + const struct hlsl_deref *resource, const struct hlsl_deref *sampler, const struct hlsl_ir_node *coords) > +{ > + struct sm4_instruction instr; > + unsigned int writemask; > + > + memset(&instr, 0, sizeof(instr)); > + instr.opcode = VKD3D_SM4_OP_SAMPLE; > + > + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, dst); > + instr.dst_count = 1; > + > + sm4_register_from_node(&instr.srcs[0].reg, &writemask, coords); > + instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); > + > + sm4_register_from_deref(ctx, &instr.srcs[1].reg, &writemask, resource, resource_type); > + instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); > + > + sm4_register_from_deref(ctx, &instr.srcs[2].reg, &writemask, sampler, sampler->var->data_type); > + > + instr.src_count = 3; > + > + write_sm4_instruction(buffer, &instr); > +} > + > static void write_sm4_expr(struct hlsl_ctx *ctx, > struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr) > { > @@ -1497,6 +1532,21 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, > const struct hlsl_type *resource_type = load->resource.var->data_type; > const struct hlsl_ir_node *coords = load->coords.node; > > + if (load->sampler.var) > + { > + const struct hlsl_type *sampler_type = load->sampler.var->data_type; > + > + assert(sampler_type->type == HLSL_CLASS_OBJECT); > + assert(sampler_type->base_type == HLSL_TYPE_SAMPLER); > + assert(sampler_type->sampler_dim == HLSL_SAMPLER_DIM_GENERIC); > + > + if (!load->sampler.var->is_uniform) > + { > + hlsl_fixme(ctx, load->node.loc, "Sample using non-uniform sampler variable."); > + return; > + } > + } > + > if (!load->resource.var->is_uniform) > { > hlsl_fixme(ctx, load->node.loc, "Load from non-uniform resource variable."); > @@ -1510,7 +1560,9 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, > break; > > case HLSL_RESOURCE_SAMPLE: > - hlsl_fixme(ctx, load->node.loc, "Resource sample instruction."); > + if (!load->sampler.var) > + hlsl_fixme(ctx, load->node.loc, "SM4 combined sample expression.\n"); > + write_sm4_sample(ctx, buffer, resource_type, &load->node, &load->resource, &load->sampler, coords); > break; > } > } >

Nov. 9, 2021

Re: [PATCH vkd3d 4/5] vkd3d-shader/hlsl: Write SM4 sampler declarations.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> On 09/11/21 04:39, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl_sm4.c | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > > diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c > index d48a41d11..e597425ae 100644 > --- a/libs/vkd3d-shader/hlsl_sm4.c > +++ b/libs/vkd3d-shader/hlsl_sm4.c > @@ -974,6 +974,20 @@ static void write_sm4_dcl_constant_buffer(struct vkd3d_bytecode_buffer *buffer, > write_sm4_instruction(buffer, &instr); > } > > +static void write_sm4_dcl_sampler(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_var *var) > +{ > + const struct sm4_instruction instr = > + { > + .opcode = VKD3D_SM4_OP_DCL_SAMPLER, > + > + .dsts[0].reg.type = VKD3D_SM4_RT_SAMPLER, > + .dsts[0].reg.idx = {var->reg.id}, > + .dsts[0].reg.idx_count = 1, > + .dst_count = 1, > + }; > + write_sm4_instruction(buffer, &instr); > +} > + > static void write_sm4_dcl_texture(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_var *var) > { > const struct sm4_instruction instr = > @@ -1647,7 +1661,9 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, > if (!var->reg.allocated || var->data_type->type != HLSL_CLASS_OBJECT) > continue; > > - if (var->data_type->base_type == HLSL_TYPE_TEXTURE) > + if (var->data_type->base_type == HLSL_TYPE_SAMPLER) > + write_sm4_dcl_sampler(&buffer, var); > + else if (var->data_type->base_type == HLSL_TYPE_TEXTURE) > write_sm4_dcl_texture(&buffer, var); > } > >

Nov. 9, 2021

Re: [PATCH vkd3d 3/5] vkd3d-shader/hlsl: Handle samplers in write_sm1_uniform().

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> -- I don't really know much about SM1, so I wouldn't swear the patch is correct. But it looks sensible and it doesn't appear to be breaking totally unrelated things. Only thing I would change is to leave "put_u32(buffer, var->data_type->reg_size / 4)" out of the conditional, since I think I remember that textures and samplers have register size 4. But it's not a big deal. On 09/11/21 04:39, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl_sm1.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c > index c3d27eea1..875f521f7 100644 > --- a/libs/vkd3d-shader/hlsl_sm1.c > +++ b/libs/vkd3d-shader/hlsl_sm1.c > @@ -352,8 +352,18 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe > if (!var->semantic.name && var->reg.allocated) > { > put_u32(buffer, 0); /* name */ > - put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->reg.id)); > - put_u32(buffer, var->data_type->reg_size / 4); > + if (var->data_type->type == HLSL_CLASS_OBJECT > + && (var->data_type->base_type == HLSL_TYPE_SAMPLER > + || var->data_type->base_type == HLSL_TYPE_TEXTURE)) > + { > + put_u32(buffer, vkd3d_make_u32(D3DXRS_SAMPLER, var->reg.id)); > + put_u32(buffer, 1); > + } > + else > + { > + put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->reg.id)); > + put_u32(buffer, var->data_type->reg_size / 4); > + } > put_u32(buffer, 0); /* type */ > put_u32(buffer, 0); /* FIXME: default value */ > } >

Nov. 9, 2021

Re: [PATCH v4 vkd3d 1/5] vkd3d-shader/hlsl: Avoid hard-coding array sizes in hlsl_type_to_string().

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> -- Might be the third time I sign off on this patch... :-P On 09/11/21 04:39, Zebediah Figura wrote: > From: Joshua Ashton <joshua(a)froggi.es> > > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c > index c71eac3f1..1eee4278a 100644 > --- a/libs/vkd3d-shader/hlsl.c > +++ b/libs/vkd3d-shader/hlsl.c > @@ -854,14 +854,14 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru > { > struct vkd3d_string_buffer *string; > > - static const char base_types[HLSL_TYPE_LAST_SCALAR + 1][7] = > - { > - "float", > - "half", > - "double", > - "int", > - "uint", > - "bool", > + static const char *const base_types[] = > + { > + [HLSL_TYPE_FLOAT] = "float", > + [HLSL_TYPE_HALF] = "half", > + [HLSL_TYPE_DOUBLE] = "double", > + [HLSL_TYPE_INT] = "int", > + [HLSL_TYPE_UINT] = "uint", > + [HLSL_TYPE_BOOL] = "bool", > }; > > if (!(string = hlsl_get_string_buffer(ctx))) > @@ -915,7 +915,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru > > case HLSL_CLASS_OBJECT: > { > - static const char dimensions[5][HLSL_SAMPLER_DIM_MAX + 1] = > + static const char *const dimensions[] = > { > [HLSL_SAMPLER_DIM_1D] = "1D", > [HLSL_SAMPLER_DIM_2D] = "2D", >

Nov. 9, 2021

[PATCH 3/3] dinput8/tests: Add older dinput HID force-feedback tests.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/Makefile.in | 2 +- dlls/dinput8/tests/hid.c | 359 ++++++++++++++++++++++++--------- 2 files changed, 261 insertions(+), 100 deletions(-) diff --git a/dlls/dinput8/tests/Makefile.in b/dlls/dinput8/tests/Makefile.in index 579cf3d2f4b..18624b9d523 100644 --- a/dlls/dinput8/tests/Makefile.in +++ b/dlls/dinput8/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dinput8.dll -IMPORTS = dinput8 ole32 user32 hid advapi32 uuid crypt32 newdev setupapi wintrust +IMPORTS = dinput8 dinput ole32 user32 hid advapi32 uuid crypt32 newdev setupapi wintrust driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 57fc7272369..62a2256d19d 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3321,18 +3321,37 @@ static BOOL CALLBACK find_test_device( const DIDEVICEINSTANCEW *devinst, void *c return DIENUM_CONTINUE; } +struct check_objects_todos +{ + BOOL type; + BOOL guid; + BOOL usage; +}; + struct check_objects_params { + DWORD version; UINT index; UINT expect_count; const DIDEVICEOBJECTINSTANCEW *expect_objs; + const struct check_objects_todos *todo_objs; + BOOL todo_extra; }; static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *args ) { static const DIDEVICEOBJECTINSTANCEW unexpected_obj = {0}; + static const struct check_objects_todos todo_none = {0}; struct check_objects_params *params = args; const DIDEVICEOBJECTINSTANCEW *exp = params->expect_objs + params->index; + const struct check_objects_todos *todo; + + if (!params->todo_objs) todo = &todo_none; + else todo = params->todo_objs + params->index; + + todo_wine_if( params->todo_extra && params->index >= params->expect_count ) + ok( params->index < params->expect_count, "unexpected extra object\n" ); + if (params->index >= params->expect_count) return DIENUM_STOP; winetest_push_context( "obj[%d]", params->index ); @@ -3340,8 +3359,11 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar if (params->index >= params->expect_count) exp = &unexpected_obj; check_member( *obj, *exp, "%u", dwSize ); + todo_wine_if( todo->guid ) check_member_guid( *obj, *exp, guidType ); + todo_wine_if( params->version < 0x700 && (obj->dwType & DIDFT_BUTTON) ) check_member( *obj, *exp, "%#x", dwOfs ); + todo_wine_if( todo->type ) check_member( *obj, *exp, "%#x", dwType ); check_member( *obj, *exp, "%#x", dwFlags ); if (!localized) todo_wine check_member_wstr( *obj, *exp, tszName ); @@ -3350,6 +3372,7 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar check_member( *obj, *exp, "%u", wCollectionNumber ); check_member( *obj, *exp, "%u", wDesignatorIndex ); check_member( *obj, *exp, "%#04x", wUsagePage ); + todo_wine_if( todo->usage ) check_member( *obj, *exp, "%#04x", wUsage ); check_member( *obj, *exp, "%#04x", dwDimension ); check_member( *obj, *exp, "%#04x", wExponent ); @@ -3709,6 +3732,7 @@ static void test_simple_joystick(void) struct check_objects_params check_objects_params = { + .version = DIRECTINPUT_VERSION, .expect_count = ARRAY_SIZE(expect_objects), .expect_objs = expect_objects, }; @@ -5303,7 +5327,7 @@ static BOOL test_device_types(void) return success; } -static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) +static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWORD version ) { struct hid_expect expect_download[] = { @@ -5326,7 +5350,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 11, - .report_buf = {0x03,0x01,0x01,0x08,0x01,0x00,0x06,0x00,0x01,0x55,0xd5}, + .report_buf = {0x03,0x01,0x01,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, }, /* start command when DIEP_START is set */ { @@ -5395,9 +5419,9 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) .report_buf = {1, 0x01}, }; static const DWORD expect_axes_init[2] = {0}; - static const DIEFFECT expect_desc_init = + const DIEFFECT expect_desc_init = { - .dwSize = sizeof(DIEFFECT), + .dwSize = version >= 0x700 ? sizeof(DIEFFECT_DX6) : sizeof(DIEFFECT_DX5), .dwTriggerButton = -1, .rgdwAxes = (void *)expect_axes_init, }; @@ -5428,9 +5452,9 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) .dwPhase = 3000, .dwPeriod = 4000, }; - static const DIEFFECT expect_desc = + const DIEFFECT expect_desc = { - .dwSize = sizeof(DIEFFECT), + .dwSize = version >= 0x700 ? sizeof(DIEFFECT_DX6) : sizeof(DIEFFECT_DX5), .dwFlags = DIEFF_SPHERICAL | DIEFF_OBJECTIDS, .dwDuration = 1000, .dwSamplePeriod = 2000, @@ -5474,19 +5498,30 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) ok( hr == DI_OK, "EnumCreatedEffectObjects returned %#x\n", hr ); ok( check_params.count == 1, "got count %u, expected 1\n", check_params.count ); - hr = IDirectInputEffect_Initialize( effect, NULL, DIRECTINPUT_VERSION, &GUID_Sine ); + hr = IDirectInputEffect_Initialize( effect, NULL, version, &GUID_Sine ); ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr ); + hr = IDirectInputEffect_Initialize( effect, instance, 0x800 - (version - 0x700), &GUID_Sine ); + if (version == 0x800) + { + todo_wine + ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); + } + else + { + todo_wine + ok( hr == DIERR_OLDDIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); + } hr = IDirectInputEffect_Initialize( effect, instance, 0, &GUID_Sine ); todo_wine ok( hr == DIERR_NOTINITIALIZED, "Initialize returned %#x\n", hr ); - hr = IDirectInputEffect_Initialize( effect, instance, DIRECTINPUT_VERSION, NULL ); + hr = IDirectInputEffect_Initialize( effect, instance, version, NULL ); ok( hr == E_POINTER, "Initialize returned %#x\n", hr ); - hr = IDirectInputEffect_Initialize( effect, instance, DIRECTINPUT_VERSION, &GUID_NULL ); + hr = IDirectInputEffect_Initialize( effect, instance, version, &GUID_NULL ); ok( hr == DIERR_DEVICENOTREG, "Initialize returned %#x\n", hr ); - hr = IDirectInputEffect_Initialize( effect, instance, DIRECTINPUT_VERSION, &GUID_Sine ); + hr = IDirectInputEffect_Initialize( effect, instance, version, &GUID_Sine ); ok( hr == DI_OK, "Initialize returned %#x\n", hr ); - hr = IDirectInputEffect_Initialize( effect, instance, DIRECTINPUT_VERSION, &GUID_Square ); + hr = IDirectInputEffect_Initialize( effect, instance, version, &GUID_Square ); ok( hr == DI_OK, "Initialize returned %#x\n", hr ); hr = IDirectInputEffect_GetEffectGuid( effect, NULL ); @@ -5502,7 +5537,15 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); hr = IDirectInputEffect_GetParameters( effect, &desc, 0 ); ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); - desc.dwSize = sizeof(DIEFFECT); + desc.dwSize = sizeof(DIEFFECT_DX5) + 2; + hr = IDirectInputEffect_GetParameters( effect, &desc, 0 ); + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + desc.dwSize = sizeof(DIEFFECT_DX5); + hr = IDirectInputEffect_GetParameters( effect, &desc, 0 ); + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_STARTDELAY ); + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + desc.dwSize = sizeof(DIEFFECT_DX6); hr = IDirectInputEffect_GetParameters( effect, &desc, 0 ); ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); @@ -5522,18 +5565,20 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); check_member( desc, expect_desc_init, "%u", dwDuration ); memset( &desc, 0xcd, sizeof(desc) ); - desc.dwSize = sizeof(DIEFFECT); + desc.dwSize = version >= 0x700 ? sizeof(DIEFFECT_DX6) : sizeof(DIEFFECT_DX5); desc.dwFlags = 0; - flags = DIEP_GAIN | DIEP_SAMPLEPERIOD | DIEP_STARTDELAY | DIEP_TRIGGERREPEATINTERVAL; + desc.dwStartDelay = 0xdeadbeef; + flags = DIEP_GAIN | DIEP_SAMPLEPERIOD | DIEP_TRIGGERREPEATINTERVAL | (version >= 0x700 ? DIEP_STARTDELAY : 0); hr = IDirectInputEffect_GetParameters( effect, &desc, flags ); ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); check_member( desc, expect_desc_init, "%u", dwSamplePeriod ); check_member( desc, expect_desc_init, "%u", dwGain ); - check_member( desc, expect_desc_init, "%u", dwStartDelay ); + if (version >= 0x700) check_member( desc, expect_desc_init, "%u", dwStartDelay ); + else ok( desc.dwStartDelay == 0xdeadbeef, "got dwStartDelay %#x\n", desc.dwStartDelay ); check_member( desc, expect_desc_init, "%u", dwTriggerRepeatInterval ); memset( &desc, 0xcd, sizeof(desc) ); - desc.dwSize = sizeof(DIEFFECT); + desc.dwSize = version >= 0x700 ? sizeof(DIEFFECT_DX6) : sizeof(DIEFFECT_DX5); desc.dwFlags = 0; desc.lpEnvelope = NULL; hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ENVELOPE ); @@ -5552,7 +5597,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) desc.lpEnvelope = NULL; desc.cbTypeSpecificParams = 0; desc.lpvTypeSpecificParams = NULL; - hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ALLPARAMS ); + hr = IDirectInputEffect_GetParameters( effect, &desc, version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5 ); ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_TRIGGERBUTTON ); ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); @@ -5606,7 +5651,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) desc.lpEnvelope = &envelope; desc.cbTypeSpecificParams = sizeof(periodic); desc.lpvTypeSpecificParams = &periodic; - hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ALLPARAMS ); + hr = IDirectInputEffect_GetParameters( effect, &desc, version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5 ); ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); check_member( desc, expect_desc_init, "%u", dwDuration ); check_member( desc, expect_desc_init, "%u", dwSamplePeriod ); @@ -5621,7 +5666,8 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) check_member( desc, expect_desc_init, "%p", lpEnvelope ); todo_wine check_member( desc, expect_desc_init, "%u", cbTypeSpecificParams ); - check_member( desc, expect_desc_init, "%u", dwStartDelay ); + if (version >= 0x700) check_member( desc, expect_desc_init, "%u", dwStartDelay ); + else ok( desc.dwStartDelay == 0xcdcdcdcd, "got dwStartDelay %#x\n", desc.dwStartDelay ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Unacquire( device ); @@ -5644,7 +5690,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) memset( &desc, 0, sizeof(desc) ); hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_NODOWNLOAD ); ok( hr == DIERR_INVALIDPARAM, "SetParameters returned %#x\n", hr ); - desc.dwSize = sizeof(DIEFFECT); + desc.dwSize = version >= 0x700 ? sizeof(DIEFFECT_DX6) : sizeof(DIEFFECT_DX5); hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_NODOWNLOAD ); ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); @@ -5681,12 +5727,13 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) hr = IDirectInputEffect_Unload( effect ); ok( hr == DI_NOEFFECT, "Unload returned %#x\n", hr ); - hr = IDirectInputEffect_SetParameters( effect, &expect_desc, - DIEP_GAIN | DIEP_SAMPLEPERIOD | DIEP_STARTDELAY | - DIEP_TRIGGERREPEATINTERVAL | DIEP_NODOWNLOAD ); + flags = DIEP_GAIN | DIEP_SAMPLEPERIOD | DIEP_TRIGGERREPEATINTERVAL | DIEP_NODOWNLOAD; + if (version >= 0x700) flags |= DIEP_STARTDELAY; + hr = IDirectInputEffect_SetParameters( effect, &expect_desc, flags ); ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); desc.dwDuration = 0; - flags = DIEP_DURATION | DIEP_GAIN | DIEP_SAMPLEPERIOD | DIEP_STARTDELAY | DIEP_TRIGGERREPEATINTERVAL; + flags = DIEP_DURATION | DIEP_GAIN | DIEP_SAMPLEPERIOD | DIEP_TRIGGERREPEATINTERVAL; + if (version >= 0x700) flags |= DIEP_STARTDELAY; hr = IDirectInputEffect_GetParameters( effect, &desc, flags ); ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); check_member( desc, expect_desc, "%u", dwDuration ); @@ -5698,7 +5745,8 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) check_member( desc, expect_desc_init, "%p", rglDirection ); check_member( desc, expect_desc_init, "%p", lpEnvelope ); check_member( desc, expect_desc_init, "%u", cbTypeSpecificParams ); - check_member( desc, expect_desc, "%u", dwStartDelay ); + if (version >= 0x700) check_member( desc, expect_desc, "%u", dwStartDelay ); + else ok( desc.dwStartDelay == 0, "got dwStartDelay %#x\n", desc.dwStartDelay ); hr = IDirectInputEffect_Download( effect ); ok( hr == DIERR_INCOMPLETEEFFECT, "Download returned %#x\n", hr ); @@ -5737,7 +5785,8 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) desc.lpEnvelope = NULL; desc.cbTypeSpecificParams = 0; desc.lpvTypeSpecificParams = NULL; - hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_ALLPARAMS | DIEP_NODOWNLOAD ); + flags = version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5; + hr = IDirectInputEffect_SetParameters( effect, &desc, flags | DIEP_NODOWNLOAD ); ok( hr == DIERR_INVALIDPARAM, "SetParameters returned %#x\n", hr ); hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_TRIGGERBUTTON | DIEP_NODOWNLOAD ); ok( hr == DIERR_INVALIDPARAM, "SetParameters returned %#x\n", hr ); @@ -5989,7 +6038,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) ok( ref == 0, "Release returned %d\n", ref ); } -static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file ) +static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file, DWORD version ) { struct hid_expect expect_create[] = { @@ -6012,7 +6061,7 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file ) .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 11, - .report_buf = {0x03,0x01,0x03,0x08,0x01,0x00,0x06,0x00,0x01,0x55,0x00}, + .report_buf = {0x03,0x01,0x03,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0x00}, }, }; struct hid_expect expect_create_1[] = @@ -6029,7 +6078,7 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file ) .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 11, - .report_buf = {0x03,0x01,0x03,0x08,0x01,0x00,0x06,0x00,0x01,0x00,0x00}, + .report_buf = {0x03,0x01,0x03,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x00,0x00}, }, }; struct hid_expect expect_create_2[] = @@ -6046,7 +6095,7 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file ) .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 11, - .report_buf = {0x03,0x01,0x03,0x08,0x01,0x00,0x06,0x00,0x01,0x55,0x00}, + .report_buf = {0x03,0x01,0x03,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0x00}, }, }; struct hid_expect expect_destroy = @@ -6101,9 +6150,9 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file ) .lDeadBand = -12000, }, }; - static const DIEFFECT expect_desc = + const DIEFFECT expect_desc = { - .dwSize = sizeof(DIEFFECT), + .dwSize = version >= 0x700 ? sizeof(DIEFFECT_DX6) : sizeof(DIEFFECT_DX5), .dwFlags = DIEFF_SPHERICAL | DIEFF_OBJECTIDS, .dwDuration = 1000, .dwSamplePeriod = 2000, @@ -6127,7 +6176,7 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file ) DWORD axes[4] = {0}; DIEFFECT desc = { - .dwSize = sizeof(DIEFFECT), + .dwSize = version >= 0x700 ? sizeof(DIEFFECT_DX6) : sizeof(DIEFFECT_DX5), .dwFlags = DIEFF_SPHERICAL | DIEFF_OBJECTIDS, .cAxes = 4, .rgdwAxes = axes, @@ -6155,7 +6204,7 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file ) ok( IsEqualGUID( &guid, &GUID_Spring ), "got guid %s, expected %s\n", debugstr_guid( &guid ), debugstr_guid( &GUID_Spring ) ); - hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ALLPARAMS ); + hr = IDirectInputEffect_GetParameters( effect, &desc, version >= 0x700 ? DIEP_ALLPARAMS : DIEP_ALLPARAMS_DX5 ); ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); check_member( desc, expect_desc, "%u", dwDuration ); check_member( desc, expect_desc, "%u", dwSamplePeriod ); @@ -6168,7 +6217,8 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file ) check_member( desc, expect_desc, "%d", rglDirection[0] ); check_member( desc, expect_desc, "%d", rglDirection[1] ); check_member( desc, expect_desc, "%u", cbTypeSpecificParams ); - check_member( desc, expect_desc, "%u", dwStartDelay ); + if (version >= 0x700) check_member( desc, expect_desc, "%u", dwStartDelay ); + else ok( desc.dwStartDelay == 0, "got dwStartDelay %#x\n", desc.dwStartDelay ); check_member( envelope, expect_envelope, "%u", dwAttackLevel ); check_member( envelope, expect_envelope, "%u", dwAttackTime ); check_member( envelope, expect_envelope, "%u", dwFadeLevel ); @@ -6222,7 +6272,7 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file ) set_hid_expect( file, NULL, 0 ); } -static void test_force_feedback_joystick( void ) +static void test_force_feedback_joystick(DWORD version) { #include "psh_hid_macros.h" const unsigned char report_descriptor[] = { @@ -6550,12 +6600,13 @@ static void test_force_feedback_joystick( void ) { .InputReportByteLength = 5, }; - static const DIDEVCAPS expect_caps = + const DIDEVCAPS expect_caps = { .dwSize = sizeof(DIDEVCAPS), .dwFlags = DIDC_FORCEFEEDBACK | DIDC_ATTACHED | DIDC_EMULATED | DIDC_STARTDELAY | DIDC_FFFADE | DIDC_FFATTACK | DIDC_DEADBAND | DIDC_SATURATION, - .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK + : DIDEVTYPE_HID | (DIDEVTYPEJOYSTICK_UNKNOWN << 8) | DIDEVTYPE_JOYSTICK, .dwAxes = 3, .dwButtons = 2, .dwFFSamplePeriod = 1000000, @@ -6576,13 +6627,76 @@ static void test_force_feedback_joystick( void ) .dwSize = sizeof(DIDEVICEINSTANCEW), .guidInstance = expect_guid_product, .guidProduct = expect_guid_product, - .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK + : DIDEVTYPE_HID | (DIDEVTYPEJOYSTICK_UNKNOWN << 8) | DIDEVTYPE_JOYSTICK, .tszInstanceName = L"Wine test root driver", .tszProductName = L"Wine test root driver", .guidFFDriver = IID_IDirectInputPIDDriver, .wUsagePage = HID_USAGE_PAGE_GENERIC, .wUsage = HID_USAGE_GENERIC_JOYSTICK, }; + const DIDEVICEOBJECTINSTANCEW expect_objects_5[] = + { + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_XAxis, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(0)|DIDFT_FFACTUATOR, + .dwFlags = DIDOI_ASPECTPOSITION|DIDOI_FFACTUATOR, + .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)|DIDFT_FFACTUATOR, + .dwFlags = DIDOI_ASPECTPOSITION|DIDOI_FFACTUATOR, + .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)|DIDFT_FFACTUATOR, + .dwFlags = DIDOI_ASPECTPOSITION|DIDOI_FFACTUATOR, + .tszName = L"Z Axis", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Z, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = 0x30, + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(0)|DIDFT_FFEFFECTTRIGGER, + .dwFlags = DIDOI_FFEFFECTTRIGGER, + .tszName = L"Button 0", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_BUTTON, + .wUsage = 0x1, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = 0x31, + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(1)|DIDFT_FFEFFECTTRIGGER, + .dwFlags = DIDOI_FFEFFECTTRIGGER, + .tszName = L"Button 1", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_BUTTON, + .wUsage = 0x2, + .wReportId = 1, + }, + }; const DIDEVICEOBJECTINSTANCEW expect_objects[] = { { @@ -6623,7 +6737,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Button, - .dwOfs = 0x64, + .dwOfs = version >= 0x800 ? 0x64 : 0x10, .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(0)|DIDFT_FFEFFECTTRIGGER, .dwFlags = DIDOI_FFEFFECTTRIGGER, .tszName = L"Button 0", @@ -6635,7 +6749,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Button, - .dwOfs = 0x65, + .dwOfs = version >= 0x800 ? 0x65 : 0x11, .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(1)|DIDFT_FFEFFECTTRIGGER, .dwFlags = DIDOI_FFEFFECTTRIGGER, .tszName = L"Button 1", @@ -6647,7 +6761,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x6c, + .dwOfs = version >= 0x800 ? 0x6c : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(12)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"DC Device Reset", @@ -6659,7 +6773,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x10, + .dwOfs = version >= 0x800 ? 0x10 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(13)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Effect Block Index", @@ -6671,7 +6785,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x6d, + .dwOfs = version >= 0x800 ? 0x6d : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(14)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Op Effect Start", @@ -6683,7 +6797,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x6e, + .dwOfs = version >= 0x800 ? 0x6e : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(15)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Op Effect Start Solo", @@ -6695,7 +6809,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x6f, + .dwOfs = version >= 0x800 ? 0x6f : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(16)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Op Effect Stop", @@ -6707,7 +6821,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x14, + .dwOfs = version >= 0x800 ? 0x14 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(17)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Loop Count", @@ -6719,7 +6833,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x18, + .dwOfs = version >= 0x800 ? 0x18 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(18)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Effect Block Index", @@ -6731,7 +6845,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x70, + .dwOfs = version >= 0x800 ? 0x70 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(19)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"ET Square", @@ -6743,7 +6857,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x71, + .dwOfs = version >= 0x800 ? 0x71 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(20)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"ET Sine", @@ -6755,7 +6869,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x72, + .dwOfs = version >= 0x800 ? 0x72 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(21)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"ET Spring", @@ -6767,7 +6881,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x73, + .dwOfs = version >= 0x800 ? 0x73 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(22)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Z Axis", @@ -6779,7 +6893,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x74, + .dwOfs = version >= 0x800 ? 0x74 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(23)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Y Axis", @@ -6791,7 +6905,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x75, + .dwOfs = version >= 0x800 ? 0x75 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(24)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"X Axis", @@ -6803,7 +6917,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x76, + .dwOfs = version >= 0x800 ? 0x76 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(25)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Direction Enable", @@ -6815,7 +6929,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x1c, + .dwOfs = version >= 0x800 ? 0x1c : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(26)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Start Delay", @@ -6829,7 +6943,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x20, + .dwOfs = version >= 0x800 ? 0x20 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(27)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Duration", @@ -6843,7 +6957,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x24, + .dwOfs = version >= 0x800 ? 0x24 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(28)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Trigger Button", @@ -6855,7 +6969,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x28, + .dwOfs = version >= 0x800 ? 0x28 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(29)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Unknown 29", @@ -6868,7 +6982,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x2c, + .dwOfs = version >= 0x800 ? 0x2c : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(30)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Unknown 30", @@ -6881,7 +6995,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x30, + .dwOfs = version >= 0x800 ? 0x30 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(31)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Magnitude", @@ -6893,7 +7007,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x34, + .dwOfs = version >= 0x800 ? 0x34 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(32)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Fade Level", @@ -6905,7 +7019,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x38, + .dwOfs = version >= 0x800 ? 0x38 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(33)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Attack Level", @@ -6917,7 +7031,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x3c, + .dwOfs = version >= 0x800 ? 0x3c : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(34)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Fade Time", @@ -6931,7 +7045,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x40, + .dwOfs = version >= 0x800 ? 0x40 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(35)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Attack Time", @@ -6945,7 +7059,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x44, + .dwOfs = version >= 0x800 ? 0x44 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(36)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Unknown 36", @@ -6957,7 +7071,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x48, + .dwOfs = version >= 0x800 ? 0x48 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(37)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Unknown 37", @@ -6969,7 +7083,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x4c, + .dwOfs = version >= 0x800 ? 0x4c : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(38)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"CP Offset", @@ -6981,7 +7095,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x50, + .dwOfs = version >= 0x800 ? 0x50 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(39)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Negative Coefficient", @@ -6993,7 +7107,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x54, + .dwOfs = version >= 0x800 ? 0x54 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(40)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Positive Coefficient", @@ -7005,7 +7119,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x58, + .dwOfs = version >= 0x800 ? 0x58 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(41)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Negative Saturation", @@ -7017,7 +7131,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x5c, + .dwOfs = version >= 0x800 ? 0x5c : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(42)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Positive Saturation", @@ -7029,7 +7143,7 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x60, + .dwOfs = version >= 0x800 ? 0x60 : 0, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(43)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Dead Band", @@ -7199,10 +7313,19 @@ static void test_force_feedback_joystick( void ) } }; + struct check_objects_todos todo_objects_5[ARRAY_SIZE(expect_objects_5)] = + { + {.guid = TRUE, .type = TRUE, .usage = TRUE}, + {0}, + {.guid = TRUE, .type = TRUE, .usage = TRUE}, + }; struct check_objects_params check_objects_params = { - .expect_count = ARRAY_SIZE(expect_objects), - .expect_objs = expect_objects, + .version = version, + .expect_count = version < 0x700 ? ARRAY_SIZE(expect_objects_5) : ARRAY_SIZE(expect_objects), + .expect_objs = version < 0x700 ? expect_objects_5 : expect_objects, + .todo_objs = version < 0x700 ? todo_objects_5 : NULL, + .todo_extra = version < 0x700 ? TRUE : FALSE, }; struct check_effects_params check_effects_params = { @@ -7234,13 +7357,16 @@ static void test_force_feedback_joystick( void ) IDirectInputDevice8W *device; DIEFFESCAPE escape = {0}; DIDEVCAPS caps = {0}; - IDirectInput8W *di; - char buffer[1024]; + IDirectInput8W *di8; + IDirectInputW *di; ULONG res, ref; + char buffer[1024]; HANDLE file; HRESULT hr; HWND hwnd; + winetest_push_context("version %#x", version); + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); SetCurrentDirectoryW( tempdir ); @@ -7248,24 +7374,59 @@ static void test_force_feedback_joystick( void ) cleanup_registry_keys(); if (!dinput_driver_start( report_descriptor, sizeof(report_descriptor), &hid_caps )) goto done; - hr = DirectInput8Create( instance, DIRECTINPUT_VERSION, &IID_IDirectInput8W, (void **)&di, NULL ); - if (FAILED(hr)) + if (version >= 0x800) { - win_skip( "DirectInput8Create returned %#x\n", hr ); - goto done; - } + hr = DirectInput8Create( instance, version, &IID_IDirectInput8W, (void **)&di8, NULL ); + if (FAILED(hr)) + { + win_skip( "DirectInput8Create returned %#x\n", hr ); + goto done; + } - hr = IDirectInput8_EnumDevices( di, DI8DEVCLASS_ALL, find_test_device, &devinst, DIEDFL_ALLDEVICES ); - ok( hr == DI_OK, "EnumDevices returned: %#x\n", hr ); - if (!IsEqualGUID( &devinst.guidProduct, &expect_guid_product )) + hr = IDirectInput8_EnumDevices( di8, DI8DEVCLASS_ALL, find_test_device, &devinst, DIEDFL_ALLDEVICES ); + ok( hr == DI_OK, "EnumDevices returned: %#x\n", hr ); + if (!IsEqualGUID( &devinst.guidProduct, &expect_guid_product )) + { + win_skip( "device not found, skipping tests\n" ); + ref = IDirectInput8_Release( di8 ); + ok( ref == 0, "Release returned %d\n", ref ); + goto done; + } + + hr = IDirectInput8_CreateDevice( di8, &expect_guid_product, &device, NULL ); + ok( hr == DI_OK, "CreateDevice returned %#x\n", hr ); + + ref = IDirectInput8_Release( di8 ); + todo_wine + ok( ref == 0, "Release returned %d\n", ref ); + } + else { - win_skip( "device not found, skipping tests\n" ); - IDirectInput8_Release( di ); - goto done; - } + hr = DirectInputCreateEx( instance, version, &IID_IDirectInput2W, (void **)&di, NULL ); + if (FAILED(hr)) + { + win_skip( "DirectInputCreateEx returned %#x\n", hr ); + goto done; + } - hr = IDirectInput8_CreateDevice( di, &expect_guid_product, &device, NULL ); - ok( hr == DI_OK, "CreateDevice returned %#x\n", hr ); + hr = IDirectInput_EnumDevices( di, 0, find_test_device, &devinst, DIEDFL_ALLDEVICES ); + ok( hr == DI_OK, "EnumDevices returned: %#x\n", hr ); + if (!IsEqualGUID( &devinst.guidProduct, &expect_guid_product )) + { + win_skip( "device not found, skipping tests\n" ); + + ref = IDirectInput_Release( di ); + ok( ref == 0, "Release returned %d\n", ref ); + goto done; + } + + hr = IDirectInput_CreateDevice( di, &expect_guid_product, (IDirectInputDeviceW **)&device, NULL ); + ok( hr == DI_OK, "CreateDevice returned %#x\n", hr ); + + ref = IDirectInput_Release( di ); + todo_wine + ok( ref == 0, "Release returned %d\n", ref ); + } hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); ok( hr == DI_OK, "GetDeviceInfo returned %#x\n", hr ); @@ -7435,11 +7596,11 @@ static void test_force_feedback_joystick( void ) objdata.dwData = 0x80; res = 1; hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), &objdata, &res, 0 ); - todo_wine - ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); + if (version < 0x800) ok( hr == DI_OK, "SendDeviceData returned %#x\n", hr ); + else todo_wine ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); - test_periodic_effect( device, file ); - test_condition_effect( device, file ); + test_periodic_effect( device, file, version ); + test_condition_effect( device, file, version ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Unacquire( device ); @@ -7452,13 +7613,11 @@ static void test_force_feedback_joystick( void ) DestroyWindow( hwnd ); CloseHandle( file ); - ref = IDirectInput8_Release( di ); - ok( ref == 0, "Release returned %d\n", ref ); - done: pnp_driver_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); + winetest_pop_context(); } START_TEST( hid ) @@ -7504,7 +7663,9 @@ START_TEST( hid ) if (test_device_types()) { test_simple_joystick(); - test_force_feedback_joystick(); + test_force_feedback_joystick(0x500); + test_force_feedback_joystick(0x700); + test_force_feedback_joystick(0x800); } CoUninitialize(); -- 2.33.1

Nov. 9, 2021

[PATCH 2/3] dinput: Improve object dwOfs values for dinput version <= 0x700.

by Rémi Bernon

It's not completely correct yet as dinput version 0x500 and probably below enumerate objects following the default data format instead of a device specific one. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index b061fe30bcd..dfaf6ae83ff 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -400,11 +400,15 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; struct hid_value_caps *caps, *caps_end, *nary, *nary_end, *effect_caps; struct hid_collection_node *node, *node_end; + WORD version = impl->base.dinput->dwVersion; BOOL ret, seen_axis[6] = {0}; button_ofs += impl->caps.NumberInputValueCaps * sizeof(LONG); - button_ofs += impl->caps.NumberOutputValueCaps * sizeof(LONG); - button_ofs += impl->caps.NumberFeatureValueCaps * sizeof(LONG); + if (version >= 0x800) + { + button_ofs += impl->caps.NumberOutputValueCaps * sizeof(LONG); + button_ofs += impl->caps.NumberFeatureValueCaps * sizeof(LONG); + } for (caps = HID_INPUT_VALUE_CAPS( preparsed ), caps_end = caps + preparsed->input_caps_count; caps != caps_end; ++caps) @@ -545,7 +549,9 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, for (nary = caps; nary != nary_end; nary--) { - instance.dwOfs = button_ofs; + if (version < 0x800) instance.dwOfs = 0; + else instance.dwOfs = button_ofs; + instance.dwType = DIDFT_NODATA | DIDFT_MAKEINSTANCE( object++ ) | DIDFT_OUTPUT; instance.dwFlags = 0x80008000; instance.wUsagePage = nary->usage_page; @@ -562,7 +568,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, } else for (j = caps->usage_min; j <= caps->usage_max; ++j) { - if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) instance.dwOfs = button_ofs; + if (version < 0x800) instance.dwOfs = 0; + else if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) instance.dwOfs = button_ofs; else instance.dwOfs = value_ofs; instance.dwType = DIDFT_NODATA | DIDFT_MAKEINSTANCE( object++ ) | DIDFT_OUTPUT; -- 2.33.1

Nov. 9, 2021