October 2021 - Wine-commits

Eric Pouech : dbghelp: Don't expose SymTagExe or SymTagCompiland's address nor length in SymGetTypeInfo().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 15d526d81ed2df1c36675b2426bea842150f5afb URL: https://source.winehq.org/git/wine.git/?a=commit;h=15d526d81ed2df1c36675b24… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:00:41 2021 +0200 dbghelp: Don't expose SymTagExe or SymTagCompiland's address nor length 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 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 70719cf6b7c..0baa9d72c32 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -158,11 +158,11 @@ BOOL symt_get_address(const struct symt* type, ULONG64* addr) case SymTagThunk: *addr = ((const struct symt_thunk*)type)->address; break; - case SymTagCompiland: - *addr = ((const struct symt_compiland*)type)->address; - break; default: FIXME("Unsupported sym-tag %s for get-address\n", symt_get_tag_str(type->tag)); + /* fall through */ + case SymTagExe: + case SymTagCompiland: return FALSE; } return TRUE; @@ -689,6 +689,8 @@ BOOL symt_get_info(struct module* module, const struct symt* type, FIXME("Unsupported sym-tag %s for get-length\n", symt_get_tag_str(type->tag)); /* fall through */ + case SymTagExe: + case SymTagCompiland: case SymTagFunctionType: return FALSE; }

1 0

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

06 Oct '21

Module: wine Branch: master Commit: 8e50fea66b04c725e4ed830132bd8ae4f458155d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e50fea66b04c725e4ed8301… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:00:47 2021 +0200 dbghelp: Expose compiland'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 0baa9d72c32..91c334689ce 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -549,6 +549,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, switch (type->tag) { + case SymTagCompiland: v = &((const struct symt_compiland*)type)->vchildren; break; case SymTagUDT: v = &((const struct symt_udt*)type)->vchildren; break; case SymTagEnum: v = &((const struct symt_enum*)type)->vchildren; break; case SymTagFunctionType: v = &((const struct symt_function_signature*)type)->vchildren; break; @@ -594,6 +595,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case TI_GET_CHILDRENCOUNT: switch (type->tag) { + case SymTagCompiland: + X(DWORD) = vector_length(&((const struct symt_compiland*)type)->vchildren); + break; case SymTagUDT: X(DWORD) = vector_length(&((const struct symt_udt*)type)->vchildren); break;

1 0

Eric Pouech : dbghelp: Manage parent/child relationship between SymTagExe and SymTagCompiland.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 24a7de70a62f79f8642d7af248ce26d54fef0cf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a7de70a62f79f8642d7af2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:00:53 2021 +0200 dbghelp: Manage parent/child relationship between SymTagExe and SymTagCompiland. 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/symbol.c | 4 ++++ dlls/dbghelp/type.c | 7 +++++++ 3 files changed, 12 insertions(+) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 0587ce13914..2fc5a7e5eca 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -169,6 +169,7 @@ struct symt_block struct symt_module /* in fact any of .exe, .dll... */ { struct symt symt; /* module */ + struct vector vchildren; /* compilation units */ struct module* module; }; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index e2fde00456a..091ea173305 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -191,6 +191,7 @@ struct symt_module* symt_new_module(struct module* module) { sym->symt.tag = SymTagExe; sym->module = module; + vector_init(&sym->vchildren, sizeof(struct symt*), 8); } return sym; } @@ -199,6 +200,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, ULONG_PTR address, unsigned src_idx) { struct symt_compiland* sym; + struct symt_compiland** p; TRACE_(dbghelp_symt)("Adding compiland symbol %s:%s\n", debugstr_w(module->modulename), source_get(module, src_idx)); @@ -210,6 +212,8 @@ struct symt_compiland* symt_new_compiland(struct module* module, sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); sym->user = NULL; + p = vector_add(&module->top->vchildren, &module->pool); + *p = sym; } return sym; } diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 91c334689ce..ae601c0cda2 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -549,6 +549,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, switch (type->tag) { + case SymTagExe: v = &((const struct symt_module*)type)->vchildren; break; case SymTagCompiland: v = &((const struct symt_compiland*)type)->vchildren; break; case SymTagUDT: v = &((const struct symt_udt*)type)->vchildren; break; case SymTagEnum: v = &((const struct symt_enum*)type)->vchildren; break; @@ -595,6 +596,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case TI_GET_CHILDRENCOUNT: switch (type->tag) { + case SymTagExe: + X(DWORD) = vector_length(&((const struct symt_module*)type)->vchildren); + break; case SymTagCompiland: X(DWORD) = vector_length(&((const struct symt_compiland*)type)->vchildren); break; @@ -703,6 +707,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case TI_GET_LEXICALPARENT: switch (type->tag) { + case SymTagCompiland: + X(DWORD) = symt_ptr2index(module, &((const struct symt_compiland*)type)->container->symt); + break; case SymTagBlock: X(DWORD) = symt_ptr2index(module, ((const struct symt_block*)type)->container); break;

1 0

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

06 Oct '21

Module: wine Branch: master Commit: 4bf83f21ca8407feb854a5fc105a5311e5144cb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bf83f21ca8407feb854a5fc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:00:59 2021 +0200 dbghelp: Silence FIXME when requesting SymTagExe lexical parent 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index ae601c0cda2..69b25bafef0 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -732,6 +732,8 @@ BOOL symt_get_info(struct module* module, const struct symt* type, default: FIXME("Unsupported sym-tag %s for get-lexical-parent\n", symt_get_tag_str(type->tag)); + /* fall through */ + case SymTagExe: return FALSE; } 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

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: 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: 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: 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

Henri Verbeet : vkd3d-shader: Introduce struct vkd3d_shader_parser_ops.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: vkd3d Branch: master Commit: 28316b2694601a49623d9bc7bda3d422739e456c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=28316b2694601a49623d9bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 6 17:11:47 2021 +0200 vkd3d-shader: Introduce struct vkd3d_shader_parser_ops. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 182 ++++++++++++++++--------------- libs/vkd3d-shader/glsl.c | 4 +- libs/vkd3d-shader/trace.c | 6 +- libs/vkd3d-shader/vkd3d_shader_main.c | 18 ++- libs/vkd3d-shader/vkd3d_shader_private.h | 39 +++++-- 5 files changed, 138 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=28316b2694601a49623…

1 0