wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

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

06 Oct '21

Module: wine Branch: master Commit: 2716e20438b3bbd448f65d6d9d7109369f93b540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2716e20438b3bbd448f65d6d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:02:00 2021 +0200 dbghelp: Return SymTagExe when requesting lexical parent of SymTagPublicSymbol 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 4e322ea5364..eaec124c57b 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -775,6 +775,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagBaseType: case SymTagTypedef: case SymTagBaseClass: + case SymTagPublicSymbol: X(DWORD) = symt_ptr2index(module, &module->top->symt); break; default:

1 0

Eric Pouech : dbghelp: Return lexical parent of SymTag(FuncDebugStart|FuncDebugEnd|Label) in SymGetTypeInfo().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: f2fbf59246b6b67ca8a5528f5ebf3688235a7b7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2fbf59246b6b67ca8a5528f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:54 2021 +0200 dbghelp: Return lexical parent of SymTag(FuncDebugStart|FuncDebugEnd|Label) 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index b45e79e9946..4e322ea5364 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -761,6 +761,11 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagThunk: X(DWORD) = symt_ptr2index(module, ((const struct symt_thunk*)type)->container); break; + case SymTagFuncDebugStart: + case SymTagFuncDebugEnd: + case SymTagLabel: + X(DWORD) = symt_ptr2index(module, ((const struct symt_hierarchy_point*)type)->parent); + break; case SymTagUDT: case SymTagEnum: case SymTagFunctionType:

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

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: 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: Expose no children in SymGetTypeInfo() for some SymTags.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: a4ebfe8c7652b81eaea2cf04fa924e6fe1d3dd5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ebfe8c7652b81eaea2cf04… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:30 2021 +0200 dbghelp: Expose no children in SymGetTypeInfo() for some SymTags. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index fc6ae3f7350..709a4bc851b 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -559,6 +559,17 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagFunctionType: v = &((const struct symt_function_signature*)type)->vchildren; break; case SymTagFunction: v = &((const struct symt_function*)type)->vchildren; break; case SymTagBlock: v = &((const struct symt_block*)type)->vchildren; break; + case SymTagPointerType: + case SymTagArrayType: + case SymTagFunctionArgType: + case SymTagThunk: + case SymTagLabel: + case SymTagFuncDebugStart: + case SymTagFuncDebugEnd: + case SymTagTypedef: + case SymTagBaseType: + /* for those, CHILDRENCOUNT returns 0 */ + return tifp->Count == 0; default: FIXME("Unsupported sym-tag %s for find-children\n", symt_get_tag_str(type->tag)); @@ -621,18 +632,25 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagBlock: X(DWORD) = vector_length(&((const struct symt_block*)type)->vchildren); break; - case SymTagPointerType: /* MS does it that way */ - case SymTagArrayType: /* MS does it that way */ - case SymTagThunk: /* MS does it that way */ + /* some SymTag:s return 0 */ + case SymTagPointerType: + case SymTagArrayType: + case SymTagFunctionArgType: + case SymTagThunk: + case SymTagFuncDebugStart: + case SymTagFuncDebugEnd: + case SymTagLabel: + case SymTagTypedef: + case SymTagBaseType: X(DWORD) = 0; break; default: FIXME("Unsupported sym-tag %s for get-children-count\n", symt_get_tag_str(type->tag)); /* fall through */ + /* some others return error */ case SymTagData: case SymTagPublicSymbol: - case SymTagBaseType: return FALSE; } break;

1 0

Eric Pouech : dbghelp: SymTagFunctionArgType's lexical parent is module, not SymTagFunctionType.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: dbcc714cef29d0d52dac9cd3b767e05ff1bd310d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbcc714cef29d0d52dac9cd3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:24 2021 +0200 dbghelp: SymTagFunctionArgType's lexical parent is module, not SymTagFunctionType. (as any other type) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/type.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 2fc5a7e5eca..474e76d52b6 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -294,7 +294,6 @@ struct symt_function_arg_type { struct symt symt; struct symt* arg_type; - struct symt* container; }; struct symt_pointer diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 221dbe68f42..fc6ae3f7350 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -411,7 +411,6 @@ BOOL symt_add_function_signature_parameter(struct module* module, if (!arg) return FALSE; arg->symt.tag = SymTagFunctionArgType; arg->arg_type = param; - arg->container = &sig_type->symt; p = vector_add(&sig_type->vchildren, &module->pool); if (!p) return FALSE; /* FIXME we leak arg */ *p = &arg->symt; @@ -733,11 +732,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagThunk: X(DWORD) = symt_ptr2index(module, ((const struct symt_thunk*)type)->container); break; - case SymTagFunctionArgType: - X(DWORD) = symt_ptr2index(module, ((const struct symt_function_arg_type*)type)->container); - break; case SymTagUDT: case SymTagEnum: + case SymTagFunctionArgType: X(DWORD) = symt_ptr2index(module, &module->top->symt); break; default:

1 0

Eric Pouech : dbghelp: Update SymGetTypeInfo() requests and SymTagEnum to latest dbghelp definitions.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: f376dfd1fd3392a281954c1e8723f501b0d798af URL: https://source.winehq.org/git/wine.git/?a=commit;h=f376dfd1fd3392a281954c1e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:17 2021 +0200 dbghelp: Update SymGetTypeInfo() requests and SymTagEnum to latest dbghelp definitions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 1 + include/cvconst.h | 1 + include/dbghelp.h | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index b9d90b000d7..221dbe68f42 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -83,6 +83,7 @@ static const char* symt_get_tag_str(DWORD tag) case SymTagExport: return "SymTagExport"; case SymTagHeapAllocationSite: return "SymTagHeapAllocationSite"; case SymTagCoffGroup: return "SymTagCoffGroup"; + case SymTagInlinee: return "SymTagInlinee"; default: return "---"; } } diff --git a/include/cvconst.h b/include/cvconst.h index f90c61a57fa..82929dda772 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -66,6 +66,7 @@ enum SymTagEnum SymTagExport, SymTagHeapAllocationSite, SymTagCoffGroup, + SymTagInlinee, SymTagMax }; diff --git a/include/dbghelp.h b/include/dbghelp.h index bf235c7f97a..75dfd76b327 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1071,6 +1071,15 @@ typedef enum _IMAGEHLP_SYMBOL_TYPE_INFO TI_GET_UDTKIND, TI_IS_EQUIV_TO, TI_GET_CALLING_CONVENTION, + TI_IS_CLOSE_EQUIV_TO, + TI_GTIEX_REQS_VALID, + TI_GET_VIRTUALBASEOFFSET, + TI_GET_VIRTUALBASEDISPINDEX, + TI_GET_IS_REFERENCE, + TI_GET_INDIRECTVIRTUALBASECLASS, + TI_GET_VIRTUALBASETABLETYPE, + TI_GET_OBJECTPOINTERTYPE, + IMAGEHLP_SYMBOL_TYPE_INFO_MAX } IMAGEHLP_SYMBOL_TYPE_INFO; #define IMAGEHLP_GET_TYPE_INFO_UNCACHED 0x00000001

1 0

Eric Pouech : dbghelp: Expose SymTagBlock's address and size in SymGetTypeInfo().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 11d8338f7ab36135f20c61164c225c8938f2b7c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11d8338f7ab36135f20c6116… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:11 2021 +0200 dbghelp: Expose SymTagBlock's address and 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index e7c180f32d7..b9d90b000d7 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -141,6 +141,9 @@ BOOL symt_get_address(const struct symt* type, ULONG64* addr) default: return FALSE; } break; + case SymTagBlock: + *addr = ((const struct symt_block*)type)->address; + break; case SymTagFunction: *addr = ((const struct symt_function*)type)->address; break; @@ -664,6 +667,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagFunction: X(DWORD64) = ((const struct symt_function*)type)->size; break; + case SymTagBlock: + X(DWORD64) = ((const struct symt_block*)type)->size; + break; case SymTagPointerType: X(DWORD64) = ((const struct symt_pointer*)type)->size; break;

1 0

Eric Pouech : dbghelp: Expose SymTagBlock's children in SymGetTypeInfo().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 4540d4f4924e1c143073afecd550401771bd9918 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4540d4f4924e1c143073afec… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:01:05 2021 +0200 dbghelp: Expose SymTagBlock's children 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, 4 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 69b25bafef0..e7c180f32d7 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -555,6 +555,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagEnum: v = &((const struct symt_enum*)type)->vchildren; break; case SymTagFunctionType: v = &((const struct symt_function_signature*)type)->vchildren; break; case SymTagFunction: v = &((const struct symt_function*)type)->vchildren; break; + case SymTagBlock: v = &((const struct symt_block*)type)->vchildren; break; default: FIXME("Unsupported sym-tag %s for find-children\n", symt_get_tag_str(type->tag)); @@ -614,6 +615,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagFunction: X(DWORD) = vector_length(&((const struct symt_function*)type)->vchildren); break; + case SymTagBlock: + X(DWORD) = vector_length(&((const struct symt_block*)type)->vchildren); + break; case SymTagPointerType: /* MS does it that way */ case SymTagArrayType: /* MS does it that way */ case SymTagThunk: /* MS does it that way */

1 0

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-commits October 2021