October 2021 - Wine-commits

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputEffect_SetParameters tests.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 39763c8bfd728851e42329926fe8189590123f23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39763c8bfd728851e4232992… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:56 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputEffect_SetParameters tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 364 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 364 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39763c8bfd728851e423…

1 0

Rémi Bernon : dinput8/tests: Add more force-feedback effects PID reports and caps.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: e9539722d1537b9fd35cae708f517c360cec9803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9539722d1537b9fd35cae70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:57 2021 +0200 dinput8/tests: Add more force-feedback effects PID reports and caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 227 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 208 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9539722d1537b9fd35c…

1 0

Rémi Bernon : dinput: Add DIDFT_FFACTUATOR flag on PID effect axes.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 1285bbfa43c6db32dba3cafedb3bc3ca99046a85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1285bbfa43c6db32dba3cafe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:58 2021 +0200 dinput: Add DIDFT_FFACTUATOR flag on PID effect axes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 18 ++++++++++++++++++ dlls/dinput8/tests/hid.c | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 1a22c7c8baa..846d4095391 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -255,6 +255,23 @@ static BOOL enum_object( struct hid_joystick *impl, const DIPROPHEADER *filter, return DIENUM_CONTINUE; } +static void check_pid_effect_axis_caps( struct hid_joystick *impl, DIDEVICEOBJECTINSTANCEW *instance ) +{ + struct pid_effect_update *effect_update = &impl->pid_effect_update; + ULONG i; + + for (i = 0; i < effect_update->axis_count; ++i) + { + if (effect_update->axis_caps[i]->usage_page != instance->wUsagePage) continue; + if (effect_update->axis_caps[i]->usage_min > instance->wUsage) continue; + if (effect_update->axis_caps[i]->usage_max >= instance->wUsage) break; + } + + if (i == effect_update->axis_count) return; + instance->dwType |= DIDFT_FFACTUATOR; + instance->dwFlags |= DIDOI_FFACTUATOR; +} + static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD i, DWORD *count ) { if (!seen[i]) instance->dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( i ); @@ -331,6 +348,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = caps->report_id; instance.wCollectionNumber = caps->link_collection; + check_pid_effect_axis_caps( impl, &instance ); ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; value_ofs += sizeof(LONG); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 019e7b7ae87..aad23ad4c61 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -6392,9 +6392,9 @@ static void test_force_feedback_joystick( void ) }; const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] = { - {.type = TRUE, .flags = TRUE}, - {.type = TRUE, .flags = TRUE}, - {.type = TRUE, .flags = TRUE}, + {}, + {}, + {}, {.type = TRUE, .flags = TRUE}, {.type = TRUE, .flags = TRUE}, {},

1 0

Rémi Bernon : dinput: Add DIDFT_FFEFFECTTRIGGER flag on trigger buttons.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 489c62f9ebe114e9abb718351d31fcdf74700d5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=489c62f9ebe114e9abb71835… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:59 2021 +0200 dinput: Add DIDFT_FFEFFECTTRIGGER flag on trigger buttons. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 9 ++++++++- dlls/dinput8/tests/hid.c | 8 ++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 846d4095391..1c7c54e20c9 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -285,7 +285,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, i, j; struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed; DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; - struct hid_value_caps *caps, *caps_end, *nary, *nary_end; + struct hid_value_caps *caps, *caps_end, *nary, *nary_end, *effect_caps; DIDATAFORMAT *format = impl->base.data_format.wine_df; int *offsets = impl->base.data_format.offsets; struct hid_collection_node *node, *node_end; @@ -356,6 +356,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, } } + effect_caps = impl->pid_effect_update.trigger_button_caps; + for (caps = HID_INPUT_VALUE_CAPS( preparsed ), caps_end = caps + preparsed->input_caps_count; caps != caps_end; ++caps) { @@ -372,6 +374,11 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.dwOfs = button_ofs; instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( button++ ); instance.dwFlags = 0; + if (effect_caps && effect_caps->logical_min <= j && effect_caps->logical_max >= j) + { + instance.dwType |= DIDFT_FFEFFECTTRIGGER; + instance.dwFlags |= DIDOI_FFEFFECTTRIGGER; + } instance.wUsagePage = caps->usage_page; instance.wUsage = j; instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index aad23ad4c61..df0a07546fb 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3294,8 +3294,6 @@ static BOOL CALLBACK find_test_device( const DIDEVICEINSTANCEW *devinst, void *c struct check_objects_todos { - BOOL type; - BOOL flags; BOOL dimension; BOOL exponent; }; @@ -3323,9 +3321,7 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar check_member( *obj, *exp, "%u", dwSize ); check_member_guid( *obj, *exp, guidType ); check_member( *obj, *exp, "%#x", dwOfs ); - todo_wine_if( todo->type ) check_member( *obj, *exp, "%#x", dwType ); - todo_wine_if( todo->flags ) check_member( *obj, *exp, "%#x", dwFlags ); if (!localized) todo_wine check_member_wstr( *obj, *exp, tszName ); check_member( *obj, *exp, "%u", dwFFMaxForce ); @@ -6395,8 +6391,8 @@ static void test_force_feedback_joystick( void ) {}, {}, {}, - {.type = TRUE, .flags = TRUE}, - {.type = TRUE, .flags = TRUE}, + {}, + {}, {}, {}, {},

1 0

Rémi Bernon : dinput: Fill the HID joystick object instance exponent and dimension.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 4ce7ae4af16bdf36c9ba82aa12e5e7ddd0b69cf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ce7ae4af16bdf36c9ba82aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:22:00 2021 +0200 dinput: Fill the HID joystick object instance exponent and dimension. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 10 ++++++++++ dlls/dinput8/tests/hid.c | 42 ------------------------------------------ 2 files changed, 10 insertions(+), 42 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 1c7c54e20c9..2ef01ac6ace 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -348,6 +348,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = caps->report_id; instance.wCollectionNumber = caps->link_collection; + instance.dwDimension = caps->units; + instance.wExponent = caps->units_exp; check_pid_effect_axis_caps( impl, &instance ); ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; @@ -384,6 +386,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = caps->report_id; instance.wCollectionNumber = caps->link_collection; + instance.dwDimension = caps->units; + instance.wExponent = caps->units_exp; ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; button_ofs++; @@ -417,6 +421,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = GUID_Unknown; instance.wReportId = nary->report_id; instance.wCollectionNumber = nary->link_collection; + instance.dwDimension = caps->units; + instance.wExponent = caps->units_exp; ret = enum_object( impl, &filter, flags, callback, nary, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; button_ofs++; @@ -434,6 +440,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = GUID_Unknown; instance.wReportId = caps->report_id; instance.wCollectionNumber = caps->link_collection; + instance.dwDimension = caps->units; + instance.wExponent = caps->units_exp; ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; @@ -458,6 +466,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = 0; instance.wCollectionNumber = node->parent; + instance.dwDimension = 0; + instance.wExponent = 0; ret = enum_object( impl, &filter, flags, callback, NULL, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index df0a07546fb..e55adb0aa56 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3292,18 +3292,11 @@ static BOOL CALLBACK find_test_device( const DIDEVICEINSTANCEW *devinst, void *c return DIENUM_CONTINUE; } -struct check_objects_todos -{ - BOOL dimension; - BOOL exponent; -}; - struct check_objects_params { UINT index; UINT expect_count; const DIDEVICEOBJECTINSTANCEW *expect_objs; - const struct check_objects_todos *todo_objs; }; static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *args ) @@ -3311,7 +3304,6 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar static const DIDEVICEOBJECTINSTANCEW unexpected_obj = {0}; struct check_objects_params *params = args; const DIDEVICEOBJECTINSTANCEW *exp = params->expect_objs + params->index; - const struct check_objects_todos *todo = params->todo_objs + params->index; winetest_push_context( "obj[%d]", params->index ); @@ -3330,9 +3322,7 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar check_member( *obj, *exp, "%u", wDesignatorIndex ); check_member( *obj, *exp, "%#04x", wUsagePage ); check_member( *obj, *exp, "%#04x", wUsage ); - todo_wine_if( todo->dimension ) check_member( *obj, *exp, "%#04x", dwDimension ); - todo_wine_if( todo->exponent ) check_member( *obj, *exp, "%#04x", wExponent ); check_member( *obj, *exp, "%u", wReportId ); @@ -3652,14 +3642,12 @@ static void test_simple_joystick(void) .wUsage = HID_USAGE_GENERIC_JOYSTICK, }, }; - const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] = {}; const DIEFFECTINFOW expect_effects[] = {}; struct check_objects_params check_objects_params = { .expect_count = ARRAY_SIZE(expect_objects), .expect_objs = expect_objects, - .todo_objs = objects_todos, }; struct check_effects_params check_effects_params = { @@ -6386,35 +6374,6 @@ static void test_force_feedback_joystick( void ) .wUsage = PID_USAGE_SET_ENVELOPE_REPORT, }, }; - const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] = - { - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {.dimension = TRUE, .exponent = TRUE}, - {.dimension = TRUE, .exponent = TRUE}, - {}, - {}, - {}, - {}, - {.dimension = TRUE, .exponent = TRUE}, - {.dimension = TRUE, .exponent = TRUE}, - }; const DIEFFECTINFOW expect_effects[] = { { @@ -6443,7 +6402,6 @@ static void test_force_feedback_joystick( void ) { .expect_count = ARRAY_SIZE(expect_objects), .expect_objs = expect_objects, - .todo_objs = objects_todos, }; struct check_effects_params check_effects_params = {

1 0

Rémi Bernon : joy.cpl: Acquire the device before starting effect.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 06c824c02a9b6917569e78677099c22048954d66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06c824c02a9b6917569e7867… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:26:41 2021 +0200 joy.cpl: Acquire the device before starting effect. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 57c188a5df1..3c9949b7ef3 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -726,6 +726,9 @@ static void ff_handle_effectchange(HWND hwnd, struct Joystick *joy) if (sel < 0) return; joy->chosen_effect = sel; + IDirectInputDevice8_Unacquire(joy->device); + IDirectInputDevice8_SetCooperativeLevel(joy->device, GetAncestor(hwnd, GA_ROOT), DISCL_BACKGROUND|DISCL_EXCLUSIVE); + IDirectInputDevice8_Acquire(joy->device); } static DWORD WINAPI ff_input_thread(void *param)

1 0

Rémi Bernon : joy.cpl: Pass DIEFF_OBJECTOFFSETS flag to IDirectInputEffect_SetParameters.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 13813894f2e41df4af12657985dc8a99898e7883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13813894f2e41df4af126579… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:26:42 2021 +0200 joy.cpl: Pass DIEFF_OBJECTOFFSETS flag to IDirectInputEffect_SetParameters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3c9949b7ef3..1498021db66 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -809,7 +809,7 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) ZeroMemory(&dieffect, sizeof(dieffect)); dieffect.dwSize = sizeof(dieffect); - dieffect.dwFlags = DIEFF_CARTESIAN; + dieffect.dwFlags = DIEFF_CARTESIAN|DIEFF_OBJECTOFFSETS; dieffect.dwDuration = FF_PLAY_TIME; dieffect.cAxes = 2;

1 0

Eric Pouech : dbghelp: Silence FIXMEs in SymGetTypeInfo().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: dd572227cb7c9473a06bc7e565435daf46441492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd572227cb7c9473a06bc7e5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:36 2021 +0200 dbghelp: Silence FIXMEs in SymGetTypeInfo(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 709a4bc851b..d2721c764cf 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -111,6 +111,10 @@ const char* symt_get_name(const struct symt* sym) case SymTagArrayType: case SymTagPointerType: case SymTagFunctionType: + case SymTagFunctionArgType: + case SymTagBlock: + case SymTagFuncDebugStart: + case SymTagFuncDebugEnd: return NULL; } } @@ -167,6 +171,14 @@ BOOL symt_get_address(const struct symt* type, ULONG64* addr) /* fall through */ case SymTagExe: case SymTagCompiland: + case SymTagFunctionType: + case SymTagFunctionArgType: + case SymTagBaseType: + case SymTagUDT: + case SymTagEnum: + case SymTagTypedef: + case SymTagPointerType: + case SymTagArrayType: return FALSE; } return TRUE; @@ -728,6 +740,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagExe: case SymTagCompiland: case SymTagFunctionType: + case SymTagFunctionArgType: return FALSE; } break; @@ -798,6 +811,20 @@ BOOL symt_get_info(struct module* module, const struct symt* type, default: FIXME("Unsupported sym-tag %s for get-offset\n", symt_get_tag_str(type->tag)); + /* fall through */ + case SymTagExe: + case SymTagCompiland: + case SymTagUDT: + case SymTagFunctionType: + case SymTagFunctionArgType: + case SymTagPointerType: + case SymTagArrayType: + case SymTagBaseType: + case SymTagTypedef: + case SymTagBlock: + case SymTagFuncDebugStart: + case SymTagFuncDebugEnd: + case SymTagLabel: return FALSE; } break; @@ -862,7 +889,14 @@ BOOL symt_get_info(struct module* module, const struct symt* type, /* fall through */ case SymTagPublicSymbol: case SymTagThunk: + case SymTagBlock: + case SymTagFuncDebugStart: + case SymTagFuncDebugEnd: case SymTagLabel: + case SymTagExe: + case SymTagCompiland: + case SymTagUDT: + case SymTagBaseType: return FALSE; } break;

1 0

Eric Pouech : dbghelp: Return error when requesting SymTagLabel's size in SymGetTypeInfo().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: f3107eb095bfb7d26f0c92237dc98a21448387e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3107eb095bfb7d26f0c9223… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:42 2021 +0200 dbghelp: Return error when requesting SymTagLabel's size in SymGetTypeInfo(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index d2721c764cf..320af023135 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -730,9 +730,6 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagThunk: X(DWORD64) = ((const struct symt_thunk*)type)->size; break; - case SymTagLabel: - X(DWORD64) = 0; - break; default: FIXME("Unsupported sym-tag %s for get-length\n", symt_get_tag_str(type->tag)); @@ -741,6 +738,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagCompiland: case SymTagFunctionType: case SymTagFunctionArgType: + case SymTagLabel: return FALSE; } break;

1 0

Eric Pouech : dbghelp: Return SymTagExe when requesting lexical parent of types in SymGetTypeInfo().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 507a3ef304243fef934932a821b027fe8d210c04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=507a3ef304243fef934932a8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:48 2021 +0200 dbghelp: Return SymTagExe when requesting lexical parent of types in SymGetTypeInfo(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 320af023135..b45e79e9946 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -763,7 +763,13 @@ BOOL symt_get_info(struct module* module, const struct symt* type, break; case SymTagUDT: case SymTagEnum: + case SymTagFunctionType: case SymTagFunctionArgType: + case SymTagPointerType: + case SymTagArrayType: + case SymTagBaseType: + case SymTagTypedef: + case SymTagBaseClass: X(DWORD) = symt_ptr2index(module, &module->top->symt); break; default:

1 0