https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0136b3a9511b035f9183d087b8a9126783fa89c4
commit 0136b3a9511b035f9183d087b8a9126783fa89c4 Author: Jérôme Gardou <[email protected]> AuthorDate: Fri Sep 11 15:45:54 2020 +0200 Commit: Jérôme Gardou <[email protected]> CommitDate: Wed Sep 16 10:35:37 2020 +0200 Revert "[DBGHELP] use correct record in codeview_snarf_public." This reverts commit e3447d02c1d7c8fe39d17614b00ad2a768439001. This will be applied later through the winesync script --- dll/win32/dbghelp/msc.c | 16 ++++++++-------- sdk/include/reactos/wine/mscvpdb.h | 10 ---------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c index ad01d0fa482..6003bc34017 100644 --- a/dll/win32/dbghelp/msc.c +++ b/dll/win32/dbghelp/msc.c @@ -2067,20 +2067,20 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY switch (sym->generic.id) { - case S_PUB_V1: + case S_PUB_V1: /* FIXME is this really a 'data_v1' structure ?? */ if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, - terminate_string(&sym->public_v1.p_name), - codeview_get_address(msc_dbg, sym->public_v1.segment, sym->public_v1.offset), 1); + terminate_string(&sym->data_v1.p_name), + codeview_get_address(msc_dbg, sym->data_v1.segment, sym->data_v1.offset), 1); } break; - case S_PUB_V2: + case S_PUB_V2: /* FIXME is this really a 'data_v2' structure ?? */ if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, - terminate_string(&sym->public_v2.p_name), - codeview_get_address(msc_dbg, sym->public_v2.segment, sym->public_v2.offset), 1); + terminate_string(&sym->data_v2.p_name), + codeview_get_address(msc_dbg, sym->data_v2.segment, sym->data_v2.offset), 1); } break; @@ -2088,8 +2088,8 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, - sym->public_v3.name, - codeview_get_address(msc_dbg, sym->public_v3.segment, sym->public_v3.offset), 1); + sym->data_v3.name, + codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset), 1); } break; case S_PUB_FUNC1_V3: diff --git a/sdk/include/reactos/wine/mscvpdb.h b/sdk/include/reactos/wine/mscvpdb.h index f11f4065de8..744c17faba4 100644 --- a/sdk/include/reactos/wine/mscvpdb.h +++ b/sdk/include/reactos/wine/mscvpdb.h @@ -1350,16 +1350,6 @@ union codeview_symbol char name[1]; } proc_v3; - struct - { - short int len; - short int id; - unsigned int offset; - unsigned short segment; - unsigned short symtype; - struct p_string p_name; - } public_v1; - struct { short int len;
