wine-devel October 2021

wine-devel@winehq.org

81 participants
772 discussions

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Introduce a helper for getting numeric types.
by Giovanni Mascellani 21 Oct '21

21 Oct '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 4 ++-- libs/vkd3d-shader/hlsl.h | 28 ++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.y | 28 ++++++++++++---------------- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 9bce6beb..421aaf27 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -560,7 +560,7 @@ struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned i if (!(c = hlsl_alloc(ctx, sizeof(*c)))) return NULL; - init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_UINT], loc); + init_node(&c->node, HLSL_IR_CONSTANT, get_scalar_type(ctx, HLSL_TYPE_UINT), loc); c->value[0].u = n; return c; } @@ -650,7 +650,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned if (!(swizzle = hlsl_alloc(ctx, sizeof(*swizzle)))) return NULL; init_node(&swizzle->node, HLSL_IR_SWIZZLE, - ctx->builtin_types.vector[val->data_type->base_type][components - 1], *loc); + get_vector_type(ctx, val->data_type->base_type, components), *loc); hlsl_src_from_node(&swizzle->val, val); swizzle->swizzle = s; return swizzle; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index e401971e..2e6b1bf7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -629,6 +629,34 @@ static inline void hlsl_release_string_buffer(struct hlsl_ctx *ctx, struct vkd3d vkd3d_string_buffer_release(&ctx->string_buffers, buffer); } +static inline struct hlsl_type *get_scalar_type(const struct hlsl_ctx *ctx, enum hlsl_base_type base_type) +{ + return ctx->builtin_types.scalar[base_type]; +} + +static inline struct hlsl_type *get_vector_type(const struct hlsl_ctx *ctx, enum hlsl_base_type base_type, + unsigned int dimx) +{ + return ctx->builtin_types.vector[base_type][dimx - 1]; +} + +static inline struct hlsl_type *get_matrix_type(const struct hlsl_ctx *ctx, enum hlsl_base_type base_type, + unsigned int dimx, unsigned int dimy) +{ + return ctx->builtin_types.matrix[base_type][dimx - 1][dimy - 1]; +} + +static inline struct hlsl_type *get_numeric_type(const struct hlsl_ctx *ctx, enum hlsl_type_class type, + enum hlsl_base_type base_type, unsigned int dimx, unsigned int dimy) +{ + if (type == HLSL_CLASS_SCALAR) + return get_scalar_type(ctx, base_type); + else if (type == HLSL_CLASS_VECTOR) + return get_vector_type(ctx, base_type, dimx); + else + return get_matrix_type(ctx, base_type, dimx, dimy); +} + const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op); const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); const char *debug_hlsl_writemask(unsigned int writemask); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ae19cd1a..addb9c59 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1021,11 +1021,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type } } - if (type == HLSL_CLASS_SCALAR) - return ctx->builtin_types.scalar[base]; - if (type == HLSL_CLASS_VECTOR) - return ctx->builtin_types.vector[base][dimx - 1]; - return ctx->builtin_types.matrix[base][dimx - 1][dimy - 1]; + return get_numeric_type(ctx, type, base, dimx, dimy); } static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, @@ -1761,7 +1757,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type } if (!(arg = add_implicit_conversion(ctx, params->instrs, arg, - ctx->builtin_types.vector[type->base_type][width - 1], &arg->loc))) + get_vector_type(ctx, type->base_type, width), &arg->loc))) continue; if (!(store = hlsl_new_store(ctx, var, NULL, arg, @@ -1816,9 +1812,9 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl if (params->args_count >= 2) FIXME("Ignoring index and/or offset parameter(s).\n"); - /* -1 for zero-indexing; +1 for the mipmap level */ + /* +1 for the mipmap level */ if (!(coords = add_implicit_conversion(ctx, instrs, params->args[0], - ctx->builtin_types.vector[HLSL_TYPE_INT][sampler_dim - 1 + 1], loc))) + get_vector_type(ctx, HLSL_TYPE_INT, sampler_dim + 1), loc))) return false; if (!(load = hlsl_new_resource_load(ctx, object_type->e.resource_format, HLSL_RESOURCE_LOAD, @@ -2500,7 +2496,7 @@ type: YYABORT; } - $$ = ctx->builtin_types.vector[$3->base_type][$5 - 1]; + $$ = get_vector_type(ctx, $3->base_type, $5); } | KW_MATRIX '<' type ',' C_INTEGER ',' C_INTEGER '>' { @@ -2528,7 +2524,7 @@ type: YYABORT; } - $$ = ctx->builtin_types.matrix[$3->base_type][$7 - 1][$5 - 1]; + $$ = get_matrix_type(ctx, $3->base_type, $7, $5); } | KW_VOID { @@ -2560,7 +2556,7 @@ type: } | texture_type { - $$ = hlsl_new_texture_type(ctx, $1, ctx->builtin_types.vector[HLSL_TYPE_FLOAT][4 - 1]); + $$ = hlsl_new_texture_type(ctx, $1, get_vector_type(ctx, HLSL_TYPE_FLOAT, 4)); } | texture_type '<' type '>' { @@ -2971,7 +2967,7 @@ primary_expr: if (!(c = hlsl_alloc(ctx, sizeof(*c)))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_FLOAT], @1); + init_node(&c->node, HLSL_IR_CONSTANT, get_scalar_type(ctx, HLSL_TYPE_FLOAT), @1); c->value[0].f = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; @@ -2982,7 +2978,7 @@ primary_expr: if (!(c = hlsl_alloc(ctx, sizeof(*c)))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_INT], @1); + init_node(&c->node, HLSL_IR_CONSTANT, get_scalar_type(ctx, HLSL_TYPE_INT), @1); c->value[0].i = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; @@ -2993,7 +2989,7 @@ primary_expr: if (!(c = hlsl_alloc(ctx, sizeof(*c)))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_BOOL], @1); + init_node(&c->node, HLSL_IR_CONSTANT, get_scalar_type(ctx, HLSL_TYPE_BOOL), @1); c->value[0].b = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; @@ -3030,7 +3026,7 @@ primary_expr: struct hlsl_ir_var *var; if (!(var = hlsl_new_synthetic_var(ctx, "<state-block-expr>", - ctx->builtin_types.scalar[HLSL_TYPE_INT], @1))) + get_scalar_type(ctx, HLSL_TYPE_INT), @1))) YYABORT; if (!(load = hlsl_new_var_load(ctx, var, @1))) YYABORT; @@ -3116,7 +3112,7 @@ postfix_expr: YYABORT; } - if (!(cast = hlsl_new_cast(ctx, index, ctx->builtin_types.scalar[HLSL_TYPE_UINT], &index->loc))) + if (!(cast = hlsl_new_cast(ctx, index, get_scalar_type(ctx, HLSL_TYPE_UINT), &index->loc))) { destroy_instr_list($1); YYABORT; -- 2.33.0

3 16

[PATCH v2 1/2] include: Update struct _LDR_DDAG_NODE definition.
by Paul Gofman 21 Oct '21

21 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- include/winternl.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index f1272518dbb..097dea4601a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3284,18 +3284,13 @@ typedef struct _LDR_DDAG_NODE LIST_ENTRY Modules; LDR_SERVICE_TAG_RECORD *ServiceTagList; ULONG LoadCount; - ULONG ReferenceCount; - ULONG DependencyCount; - union - { - LDRP_CSLIST Dependencies; - SINGLE_LIST_ENTRY RemovalLink; - }; + ULONG LoadWhileUnloadingCount; + ULONG LowestLink; + LDRP_CSLIST Dependencies; LDRP_CSLIST IncomingDependencies; LDR_DDAG_STATE State; SINGLE_LIST_ENTRY CondenseLink; ULONG PreorderNumber; - ULONG LowestLink; } LDR_DDAG_NODE, *PLDR_DDAG_NODE; typedef enum _LDR_DLL_LOAD_REASON -- 2.31.1

1 1

[PATCH 1/2] include: Update struct _LDR_DDAG_NODE definition.
by Paul Gofman 21 Oct '21

21 Oct '21

2 2

[PATCH v2 resend] msxml3: Null check url in parseURL.
by Jefferson Carpenter 21 Oct '21

21 Oct '21

Considered adding IVBSAXXMLReader_parseURL to test_saxreader() instead of adding the function test_vb_saxreader() but ran into two problems: 1) ISAXXMLReader sometimes cannot be queried for IVBSAXXMLReader and 2) the EXPECT_REF lines in contentHandler_putDocumentLocator would need to be incremented to account for the additional reference.

1 0

[PATCH v2] msxml3: Null check url in parseURL.
by Jefferson Carpenter 21 Oct '21

21 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51267 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> --- Considered adding IVBSAXXMLReader_parseURL to test_saxreader() instead of adding the function test_vb_saxreader() but ran into two problems: 1) ISAXXMLReader sometimes cannot be queried for IVBSAXXMLReader and 2) the EXPECT_REF lines in contentHandler_putDocumentLocator would need to be incremented to account for the additional reference. --- dlls/msxml3/saxreader.c | 2 ++ dlls/msxml3/tests/saxreader.c | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index c610ffcaccb..eadf8e0c631 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2739,6 +2739,8 @@ static HRESULT internal_parseURL( TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + if (!url) return E_INVALIDARG; + hr = create_moniker_from_url(url, &mon); if(FAILED(hr)) return hr; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ad093af6a12..7fda64f9776 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2325,6 +2325,13 @@ static void test_saxreader(void) WriteFile(file, testXML, sizeof(testXML)-1, &written, NULL); CloseHandle(file); + /* crashes on new versions */ + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader30)) { + hr = ISAXXMLReader_parseURL(reader, NULL); + EXPECT_HR(hr, E_INVALIDARG); + } + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) test_seq = content_handler_test1_alternate; @@ -2561,6 +2568,34 @@ static void test_saxreader(void) free_bstrs(); } +static void test_vb_saxreader(void) +{ + const struct msxmlsupported_data_t *table = reader_support_data; + HRESULT hr; + IVBSAXXMLReader *reader = NULL; + + while (table->clsid) + { + if (!is_clsid_supported(table->clsid, reader_support_data)) + { + table++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IVBSAXXMLReader, (void**)&reader); + EXPECT_HR(hr, S_OK); + + /* crashes on new versions */ + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader30)) { + hr = IVBSAXXMLReader_parseURL(reader, NULL); + EXPECT_HR(hr, E_INVALIDARG); + } + + table++; + } +} + struct saxreader_props_test_t { const char *prop_name; @@ -6019,6 +6054,7 @@ START_TEST(saxreader) get_class_support_data(reader_support_data, &IID_ISAXXMLReader); test_saxreader(); + test_vb_saxreader(); test_saxreader_properties(); test_saxreader_features(); test_saxreader_encoding(); -- 2.26.2

2 1

[PATCH 1/5] winegstreamer: Translate GST_AUDIO_CHANNEL_POSITION_MONO to SPEAKER_FRONT_CENTER.
by Zebediah Figura 21 Oct '21

21 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0c23ae6d351..c3c9051a174 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -159,7 +159,10 @@ static uint32_t wg_channel_position_from_gst(GstAudioChannelPosition position) SPEAKER_TOP_BACK_CENTER, }; - if (position < ARRAY_SIZE(position_map)) + if (position == GST_AUDIO_CHANNEL_POSITION_MONO) + return SPEAKER_FRONT_CENTER; + + if (position >= 0 && position < ARRAY_SIZE(position_map)) return position_map[position]; return 0; } -- 2.33.0

2 5

[PATCH] xslt: Build with LIBXSLT_STATIC, fix building with clang in MSVC mode
by Martin Storsjö 21 Oct '21

21 Oct '21

This avoids unnecessarily embedding dllexport directives in all the object files. This also fixes building with clang in MSVC mode, as the MSVC definition of XSLTPUBVAR in xsltexports.h is lacking 'extern' when doing dllexport. (This probably used to work before compilers defaulted to -fcommon.) This fixes duplicate symbols like these: lld-link: error: duplicate symbol: xsltGenericError >>> defined at ../src/libs/xslt/libxslt/xsltutils.h:140 >>> libxslt.cross.a(documents.cross.o) >>> defined at ../src/libs/xslt/libxslt/xsltutils.h:140 >>> libxslt.cross.a(extensions.cross.o) Signed-off-by: Martin Storsjö <martin(a)martin.st> --- configure.ac | 2 +- libs/xslt/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3f1d50a4dfc..62af43220ce 100644 --- a/configure.ac +++ b/configure.ac @@ -1060,7 +1060,7 @@ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff") WINE_EXTLIB_FLAGS(XML2, libxml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") -WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt") +WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") dnl **** Check for pthread **** diff --git a/libs/xslt/Makefile.in b/libs/xslt/Makefile.in index 3550010ce31..b620710c5af 100644 --- a/libs/xslt/Makefile.in +++ b/libs/xslt/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libxslt.a -EXTRAINCL = $(XML2_PE_CFLAGS) +EXTRAINCL = $(XML2_PE_CFLAGS) $(XSLT_PE_CFLAGS) C_SRCS = \ libxslt/attributes.c \ -- 2.25.1

1 0

[PATCH v2] winebus.sys: Map SDL joystick axes the same way as UDEV evdev.
by Rémi Bernon 21 Oct '21

21 Oct '21

And increase the arbitrary absolute axis count limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 217916 v2: Only resending this single patch to fix relative_usages index which should be 2 * i, as SDL balls are two axes combined together. In any case, SDL linux backend may only ever report one ball at the moment. dlls/winebus.sys/bus_sdl.c | 64 +++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 403c4821f24..fe3a960649c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -227,33 +227,47 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) { - static const USAGE joystick_usages[] = + static const USAGE_AND_PAGE absolute_usages[] = { - HID_USAGE_GENERIC_X, - HID_USAGE_GENERIC_Y, - HID_USAGE_GENERIC_Z, - HID_USAGE_GENERIC_RX, - HID_USAGE_GENERIC_RY, - HID_USAGE_GENERIC_RZ, - HID_USAGE_GENERIC_SLIDER, - HID_USAGE_GENERIC_DIAL, - HID_USAGE_GENERIC_WHEEL + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_THROTTLE}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_RUDDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_ACCELERATOR}, + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_BRAKE}, + }; + static const USAGE_AND_PAGE relative_usages[] = + { + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, }; struct sdl_device *impl = impl_from_unix_device(iface); int i, button_count, axis_count, ball_count, hat_count; axis_count = pSDL_JoystickNumAxes(impl->sdl_joystick); - if (axis_count > 6) + if (axis_count > ARRAY_SIZE(absolute_usages)) { - FIXME("Clamping joystick to 6 axis\n"); - axis_count = 6; + FIXME("More than %zu absolute axes found, ignoring.\n", ARRAY_SIZE(absolute_usages)); + axis_count = ARRAY_SIZE(absolute_usages); } ball_count = pSDL_JoystickNumBalls(impl->sdl_joystick); - if (axis_count + ball_count * 2 > ARRAY_SIZE(joystick_usages)) + if (ball_count > ARRAY_SIZE(relative_usages) / 2) { - FIXME("Capping ball + axis at 9\n"); - ball_count = (ARRAY_SIZE(joystick_usages) - axis_count) / 2; + FIXME("More than %zu relative axes found, ignoring.\n", ARRAY_SIZE(relative_usages)); + ball_count = ARRAY_SIZE(relative_usages) / 2; } hat_count = pSDL_JoystickNumHats(impl->sdl_joystick); @@ -265,13 +279,19 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) if (!hid_device_begin_input_report(iface)) return STATUS_NO_MEMORY; - if (axis_count && !hid_device_add_axes(iface, axis_count, HID_USAGE_PAGE_GENERIC, - joystick_usages, FALSE, -32768, 32767)) - return STATUS_NO_MEMORY; + for (i = 0; i < axis_count; i++) + { + if (!hid_device_add_axes(iface, 1, absolute_usages[i].UsagePage, + &absolute_usages[i].Usage, FALSE, -32768, 32767)) + return STATUS_NO_MEMORY; + } - if (ball_count && !hid_device_add_axes(iface, ball_count * 2, HID_USAGE_PAGE_GENERIC, - &joystick_usages[axis_count], TRUE, INT32_MIN, INT32_MAX)) - return STATUS_NO_MEMORY; + for (i = 0; i < ball_count; i++) + { + if (!hid_device_add_axes(iface, 2, relative_usages[2 * i].UsagePage, + &relative_usages[2 * i].Usage, TRUE, INT32_MIN, INT32_MAX)) + return STATUS_NO_MEMORY; + } if (hat_count && !hid_device_add_hatswitch(iface, hat_count)) return STATUS_NO_MEMORY; -- 2.33.0

1 0

[PATCH 1/4] winebus.sys: Prefer USAGE_AND_PAGE over BYTE arrays.
by Rémi Bernon 21 Oct '21

21 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 133 +++++++++++++++++------------------- 1 file changed, 63 insertions(+), 70 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index c7125520c33..f0651a8e529 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -141,15 +141,63 @@ static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_dev #ifdef HAS_PROPER_INPUT_HEADER -#define HID_REL_MAX (REL_MISC+1) -#define HID_ABS_MAX (ABS_VOLUME+1) +static const USAGE_AND_PAGE absolute_usages[] = +{ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, /* ABS_X */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, /* ABS_Y */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, /* ABS_Z */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, /* ABS_RX */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, /* ABS_RY */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, /* ABS_RZ */ + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_THROTTLE}, /* ABS_THROTTLE */ + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_RUDDER}, /* ABS_RUDDER */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, /* ABS_WHEEL */ + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_ACCELERATOR}, /* ABS_GAS */ + {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_BRAKE}, /* ABS_BRAKE */ + {0}, + {0}, + {0}, + {0}, + {0}, + {0}, /* ABS_HAT0X */ + {0}, /* ABS_HAT0Y */ + {0}, /* ABS_HAT1X */ + {0}, /* ABS_HAT1Y */ + {0}, /* ABS_HAT2X */ + {0}, /* ABS_HAT2Y */ + {0}, /* ABS_HAT3X */ + {0}, /* ABS_HAT3Y */ + {.UsagePage = HID_USAGE_PAGE_DIGITIZER, .Usage = HID_USAGE_DIGITIZER_TIP_PRESSURE}, /* ABS_PRESSURE */ + {0}, /* ABS_DISTANCE */ + {.UsagePage = HID_USAGE_PAGE_DIGITIZER, .Usage = HID_USAGE_DIGITIZER_X_TILT}, /* ABS_TILT_X */ + {.UsagePage = HID_USAGE_PAGE_DIGITIZER, .Usage = HID_USAGE_DIGITIZER_Y_TILT}, /* ABS_TILT_Y */ + {0}, /* ABS_TOOL_WIDTH */ + {0}, + {0}, + {0}, + {.UsagePage = HID_USAGE_PAGE_CONSUMER, .Usage = HID_USAGE_CONSUMER_VOLUME}, /* ABS_VOLUME */ +}; + +static const USAGE_AND_PAGE relative_usages[] = +{ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, /* REL_X */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, /* REL_Y */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, /* REL_Z */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, /* REL_RX */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, /* REL_RY */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, /* REL_RZ */ + {0}, /* REL_HWHEEL */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, /* REL_DIAL */ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, /* REL_WHEEL */ + {0}, /* REL_MISC */ +}; struct lnxev_device { struct base_device base; - BYTE abs_map[HID_ABS_MAX]; - BYTE rel_map[HID_REL_MAX]; + BYTE abs_map[ARRAY_SIZE(absolute_usages)]; + BYTE rel_map[ARRAY_SIZE(relative_usages)]; BYTE hat_map[8]; BYTE button_map[KEY_MAX]; @@ -459,58 +507,6 @@ static struct base_device *find_device_from_syspath(const char *path) return NULL; } -static const BYTE ABS_TO_HID_MAP[][2] = { - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /*ABS_X*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /*ABS_Y*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Z}, /*ABS_Z*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RX}, /*ABS_RX*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RY}, /*ABS_RY*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RZ}, /*ABS_RZ*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_THROTTLE}, /*ABS_THROTTLE*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_RUDDER}, /*ABS_RUDDER*/ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELERATOR}, /*ABS_GAS*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_BRAKE}, /*ABS_BRAKE*/ - {0,0}, - {0,0}, - {0,0}, - {0,0}, - {0,0}, - {0,0}, /*ABS_HAT0X*/ - {0,0}, /*ABS_HAT0Y*/ - {0,0}, /*ABS_HAT1X*/ - {0,0}, /*ABS_HAT1Y*/ - {0,0}, /*ABS_HAT2X*/ - {0,0}, /*ABS_HAT2Y*/ - {0,0}, /*ABS_HAT3X*/ - {0,0}, /*ABS_HAT3Y*/ - {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TIP_PRESSURE}, /*ABS_PRESSURE*/ - {0, 0}, /*ABS_DISTANCE*/ - {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_X_TILT}, /*ABS_TILT_X*/ - {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_Y_TILT}, /*ABS_TILT_Y*/ - {0, 0}, /*ABS_TOOL_WIDTH*/ - {0, 0}, - {0, 0}, - {0, 0}, - {HID_USAGE_PAGE_CONSUMER, HID_USAGE_CONSUMER_VOLUME} /*ABS_VOLUME*/ -}; -C_ASSERT(ARRAY_SIZE(ABS_TO_HID_MAP) == HID_ABS_MAX); -#define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) - -static const BYTE REL_TO_HID_MAP[][2] = { - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /* REL_X */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /* REL_Y */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Z}, /* REL_Z */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RX}, /* REL_RX */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RY}, /* REL_RY */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RZ}, /* REL_RZ */ - {0, 0}, /* REL_HWHEEL */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_DIAL}, /* REL_DIAL */ - {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /* REL_WHEEL */ - {0, 0} /* REL_MISC */ -}; -#define TOP_REL_PAGE (HID_USAGE_PAGE_CONSUMER+1) - #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) static const BYTE* what_am_I(struct udev_device *dev) @@ -584,17 +580,17 @@ static INT count_abs_axis(int device_fd) return 0; } - for (i = 0; i < HID_ABS_MAX; i++) + for (i = 0; i < ARRAY_SIZE(absolute_usages); i++) if (test_bit(absbits, i) && - (ABS_TO_HID_MAP[i][1] >= HID_USAGE_GENERIC_X && - ABS_TO_HID_MAP[i][1] <= HID_USAGE_GENERIC_WHEEL)) + (absolute_usages[i].Usage >= HID_USAGE_GENERIC_X && + absolute_usages[i].Usage <= HID_USAGE_GENERIC_WHEEL)) abs_count++; return abs_count; } static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_device *dev) { - struct input_absinfo abs_info[HID_ABS_MAX]; + struct input_absinfo abs_info[ARRAY_SIZE(absolute_usages)]; BYTE absbits[(ABS_MAX+7)/8]; BYTE relbits[(REL_MAX+7)/8]; BYTE ffbits[(FF_MAX+7)/8]; @@ -629,14 +625,12 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d return STATUS_NO_MEMORY; abs_count = 0; - for (i = 0; i < HID_ABS_MAX; i++) + for (i = 0; i < ARRAY_SIZE(absolute_usages); i++) { + usage = absolute_usages[i]; if (!test_bit(absbits, i)) continue; ioctl(impl->base.device_fd, EVIOCGABS(i), abs_info + i); - - if (!(usage.UsagePage = ABS_TO_HID_MAP[i][0])) continue; - if (!(usage.Usage = ABS_TO_HID_MAP[i][1])) continue; - + if (!usage.UsagePage || !usage.Usage) continue; if (!hid_device_add_axes(iface, 1, usage.UsagePage, &usage.Usage, FALSE, LE_DWORD(abs_info[i].minimum), LE_DWORD(abs_info[i].maximum))) return STATUS_NO_MEMORY; @@ -645,12 +639,11 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d } rel_count = 0; - for (i = 0; i < HID_REL_MAX; i++) + for (i = 0; i < ARRAY_SIZE(relative_usages); i++) { + usage = relative_usages[i]; if (!test_bit(relbits, i)) continue; - if (!(usage.UsagePage = REL_TO_HID_MAP[i][0])) continue; - if (!(usage.Usage = REL_TO_HID_MAP[i][1])) continue; - + if (!usage.UsagePage || !usage.Usage) continue; if (!hid_device_add_axes(iface, 1, usage.UsagePage, &usage.Usage, TRUE, INT32_MIN, INT32_MAX)) return STATUS_NO_MEMORY; @@ -719,7 +712,7 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d return STATUS_NO_MEMORY; /* Initialize axis in the report */ - for (i = 0; i < HID_ABS_MAX; i++) + for (i = 0; i < ARRAY_SIZE(absolute_usages); i++) { if (!test_bit(absbits, i)) continue; if (i < ABS_HAT0X || i > ABS_HAT3Y) -- 2.33.0

1 3

[PATCH 1/6] dinput: Replace stub EnumEffects with generic implementation.
by Rémi Bernon 21 Oct '21

21 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 73 ++++++++++++++++++++++++++++++++++---- dlls/dinput/joystick_hid.c | 73 +------------------------------------- 2 files changed, 67 insertions(+), 79 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8858bfa26bb..e5713f4713d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1661,14 +1661,73 @@ HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface return DIERR_UNSUPPORTED; } -HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( - LPDIRECTINPUTDEVICE8W iface, - LPDIENUMEFFECTSCALLBACKW lpCallback, - LPVOID lpvRef, - DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *context, DWORD type ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p,%p,0x%08x): stub!\n", This, lpCallback, lpvRef, dwFlags); + DIEFFECTINFOW info = {.dwSize = sizeof(info)}; + HRESULT hr; + + TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + type = DIEFT_GETTYPE( type ); + + if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_PERIODIC) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_CONDITION) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } return DI_OK; } diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 766e022ebe0..91b6020d1f1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -838,77 +838,6 @@ failed: return hr; } -static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, - void *context, DWORD type ) -{ - DIEFFECTINFOW info = {.dwSize = sizeof(info)}; - HRESULT hr; - - TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); - - if (!callback) return DIERR_INVALIDPARAM; - - type = DIEFT_GETTYPE( type ); - - if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_PERIODIC) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_CONDITION) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - return DI_OK; -} - static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ) { @@ -1155,7 +1084,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_Initialize, /*** IDirectInputDevice2 methods ***/ hid_joystick_CreateEffect, - hid_joystick_EnumEffects, + IDirectInputDevice2WImpl_EnumEffects, hid_joystick_GetEffectInfo, hid_joystick_GetForceFeedbackState, hid_joystick_SendForceFeedbackCommand, -- 2.33.0

1 5

← Newer
1
...
20
21
22
23
24
25
26
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel October 2021