Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 44/179: [WINESYNC] Add missing mapping for msvcpdb.h

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d3d1febadc9ff40aa83a… commit 8d3d1febadc9ff40aa83a4545a387cdb38c54f13 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 15:52:29 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:38 2020 +0200 [WINESYNC] Add missing mapping for msvcpdb.h --- sdk/tools/winesync/dbghelp.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 7db4de0cbb1..9778ba52557 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -2,5 +2,6 @@ directories: dlls/dbghelp: dll/win32/dbghelp files: include/dbghelp.h: sdk/include/psdk/dbghelp.h + include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: wine: f333c4a210e25bbb8af2adeeae0dbe006354519b

4 years, 3 months

[reactos] 43/179: Revert "[DBGHELP] search for debugfiles in modulepath too."

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4721594d40b241554a32… commit e4721594d40b241554a32fc715ec268fd29207e0 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 15:51:26 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:37 2020 +0200 Revert "[DBGHELP] search for debugfiles in modulepath too." This reverts commit 183294a12e6a1b832ec994399e5efd602ba2b81f. This will be applied through the winesync script --- dll/win32/dbghelp/dbghelp_private.h | 6 +++--- dll/win32/dbghelp/msc.c | 4 ++-- dll/win32/dbghelp/path.c | 35 +++-------------------------------- dll/win32/dbghelp/pe_module.c | 2 +- 4 files changed, 9 insertions(+), 38 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index 759aaa93c98..e0c4801584f 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -688,9 +688,9 @@ extern BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip, union ctx *context, struct pdb_cmd_pair *cpair) DECLSPEC_HIDDEN; /* path.c */ -extern BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, - PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2, - PSTR buffer, BOOL* is_unmatched) DECLSPEC_HIDDEN; +extern BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, + const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer, + BOOL* is_unmatched) DECLSPEC_HIDDEN; /* pe_module.c */ extern BOOL pe_load_nt_header(HANDLE hProc, DWORD64 base, IMAGE_NT_HEADERS* nth) DECLSPEC_HIDDEN; diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c index 6003bc34017..0508e120bd8 100644 --- a/dll/win32/dbghelp/msc.c +++ b/dll/win32/dbghelp/msc.c @@ -2450,11 +2450,11 @@ static HANDLE map_pdb_file(const struct process* pcs, switch (lookup->kind) { case PDB_JG: - ret = path_find_symbol_file(pcs, module, lookup->filename, NULL, lookup->timestamp, + ret = path_find_symbol_file(pcs, lookup->filename, NULL, lookup->timestamp, lookup->age, dbg_file_path, &module->module.PdbUnmatched); break; case PDB_DS: - ret = path_find_symbol_file(pcs, module, lookup->filename, &lookup->guid, 0, + ret = path_find_symbol_file(pcs, lookup->filename, &lookup->guid, 0, lookup->age, dbg_file_path, &module->module.PdbUnmatched); break; } diff --git a/dll/win32/dbghelp/path.c b/dll/win32/dbghelp/path.c index f8f268d8e9a..8c74426eec3 100644 --- a/dll/win32/dbghelp/path.c +++ b/dll/win32/dbghelp/path.c @@ -49,17 +49,6 @@ static inline const WCHAR* file_nameW(const WCHAR* str) return p + 1; } -static inline void file_pathW(const WCHAR* srcFileNameW, - WCHAR* dstFilePathW) -{ - int len; - - for (len = strlenW(srcFileNameW) - 1; (len > 0) && (!is_sepW(srcFileNameW[len])); len--); - - strncpyW(dstFilePathW, srcFileNameW, len); - dstFilePathW[len] = L'\0'; -} - /****************************************************************** * FindDebugInfoFile (DBGHELP.@) * @@ -623,9 +612,9 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) return mf->matched == 2; } -BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, - PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2, - PSTR buffer, BOOL* is_unmatched) +BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, + const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer, + BOOL* is_unmatched) { struct module_find mf; WCHAR full_pathW[MAX_PATH]; @@ -654,24 +643,6 @@ BOOL path_find_symbol_file(const struct process* pcs, const struct module* modul return TRUE; } - /* FIXME: Use Environment-Variables (see MS docs) - _NT_SYMBOL_PATH and _NT_ALT_SYMBOL_PATH - FIXME: Implement "Standard Path Elements" (Path) ... (see MS docs) - do a search for (every?) path-element like this ... - <path> - <path>\dll - <path>\symbols\dll - (dll may be exe, or sys depending on the file extension) */ - - /* 2. check module-path */ - file_pathW(module->module.LoadedImageName, tmp); - if (do_searchW(filename, tmp, FALSE, module_find_cb, &mf)) - { - WideCharToMultiByte(CP_ACP, 0, tmp, -1, buffer, MAX_PATH, NULL, NULL); - return TRUE; - } - - /* 3. check search-path */ while (searchPath) { ptr = strchrW(searchPath, ';'); diff --git a/dll/win32/dbghelp/pe_module.c b/dll/win32/dbghelp/pe_module.c index 4b9eac4f032..376a780653b 100644 --- a/dll/win32/dbghelp/pe_module.c +++ b/dll/win32/dbghelp/pe_module.c @@ -560,7 +560,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, TRACE("Processing DBG file %s\n", debugstr_a(dbg_name)); - if (path_find_symbol_file(pcs, module, dbg_name, NULL, timestamp, 0, tmp, &module->module.DbgUnmatched) && + if (path_find_symbol_file(pcs, dbg_name, NULL, timestamp, 0, tmp, &module->module.DbgUnmatched) && (hFile = CreateFileA(tmp, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE && ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != 0) &&

4 years, 3 months

[reactos] 42/179: Revert "[DBGHELP] use correct record in codeview_snarf_public."

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0136b3a9511b035f9183d… commit 0136b3a9511b035f9183d087b8a9126783fa89c4 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 15:45:54 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> 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;

4 years, 3 months

[reactos] 41/179: Revert "[DBGHELP] Add SYMFLAG_- and SYMTYPE_-defines."

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4421abdb591e57692f447… commit 4421abdb591e57692f44776cc563752a4da946d5 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 15:45:18 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:36 2020 +0200 Revert "[DBGHELP] Add SYMFLAG_- and SYMTYPE_-defines." This reverts commit 9466a005e9c324940de1e5f927dee8c1349c1d3a. This will be applied later through the winesync script --- dll/win32/dbghelp/compat.h | 7 ------- sdk/include/psdk/dbghelp.h | 7 ------- sdk/include/reactos/wine/mscvpdb.h | 7 ------- 3 files changed, 21 deletions(-) diff --git a/dll/win32/dbghelp/compat.h b/dll/win32/dbghelp/compat.h index 4917889ca1c..76ea07df7fc 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -736,13 +736,6 @@ typedef VOID IMAGEHLP_CONTEXT, *PIMAGEHLP_CONTEXT; #define SYMFLAG_THUNK 0x00002000 #define SYMFLAG_TLSREL 0x00004000 #define SYMFLAG_SLOT 0x00008000 -#define SYMFLAG_ILREL 0x00010000 -#define SYMFLAG_METADATA 0x00020000 -#define SYMFLAG_CLR_TOKEN 0x00040000 -#define SYMFLAG_NULL 0x00080000 -#define SYMFLAG_FUNC_NO_RETURN 0x00100000 -#define SYMFLAG_SYNTHETIC_ZEROBASE 0x00200000 -#define SYMFLAG_PUBLIC_CODE 0x00400000 #define UNDNAME_COMPLETE (0x0000) #define UNDNAME_NAME_ONLY (0x1000) typedef struct _TI_FINDCHILDREN_PARAMS diff --git a/sdk/include/psdk/dbghelp.h b/sdk/include/psdk/dbghelp.h index aa0cdff1c69..183e09686aa 100644 --- a/sdk/include/psdk/dbghelp.h +++ b/sdk/include/psdk/dbghelp.h @@ -1110,13 +1110,6 @@ BOOL WINAPI SymUnloadModule64(_In_ HANDLE, _In_ DWORD64); #define SYMFLAG_THUNK 0x00002000 #define SYMFLAG_TLSREL 0x00004000 #define SYMFLAG_SLOT 0x00008000 -#define SYMFLAG_ILREL 0x00010000 -#define SYMFLAG_METADATA 0x00020000 -#define SYMFLAG_CLR_TOKEN 0x00040000 -#define SYMFLAG_NULL 0x00080000 -#define SYMFLAG_FUNC_NO_RETURN 0x00100000 -#define SYMFLAG_SYNTHETIC_ZEROBASE 0x00200000 -#define SYMFLAG_PUBLIC_CODE 0x00400000 #define MAX_SYM_NAME 2000 diff --git a/sdk/include/reactos/wine/mscvpdb.h b/sdk/include/reactos/wine/mscvpdb.h index af521ffe56f..f11f4065de8 100644 --- a/sdk/include/reactos/wine/mscvpdb.h +++ b/sdk/include/reactos/wine/mscvpdb.h @@ -1229,13 +1229,6 @@ union codeview_fieldtype #define LF_COMPLEX128 0x800f #define LF_VARSTRING 0x8010 -/* symtype e.g. for public_vx.symtype */ -#define SYMTYPE_NONE 0x0000 -#define SYMTYPE_CODE 0x0001 -#define SYMTYPE_FUNCTION 0x0002 -#define SYMTYPE_MANAGED 0x0004 -#define SYMTYPE_MSIL 0x0008 - /* ======================================== * * Symbol information * ======================================== */

4 years, 3 months

[reactos] 40/179: Revert "[DBGHELP] set correct values in symt_fill_sym_info (SYMBOL_INFO)."

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52fe27663259e901c7ac8… commit 52fe27663259e901c7ac8630fe23b7f76afebd4f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 15:44:49 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:36 2020 +0200 Revert "[DBGHELP] set correct values in symt_fill_sym_info (SYMBOL_INFO)." This reverts commit 6175044aed2858637a6d07aa2be1e8d2252fe9db. This will be applied later through the winesync script --- dll/win32/dbghelp/dbghelp_private.h | 5 +---- dll/win32/dbghelp/msc.c | 5 +---- dll/win32/dbghelp/pe_module.c | 13 ++++++------- dll/win32/dbghelp/rsym.c | 2 +- dll/win32/dbghelp/symbol.c | 13 +++---------- 5 files changed, 12 insertions(+), 26 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index bdfca1d2934..759aaa93c98 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -244,7 +244,6 @@ struct symt_public struct symt symt; struct hash_table_elt hash_elt; struct symt* container; /* compiland */ - BOOL is_function; unsigned long address; unsigned long size; }; @@ -756,9 +755,7 @@ extern struct symt_public* symt_new_public(struct module* module, struct symt_compiland* parent, const char* typename, - BOOL is_function, - unsigned long address, - unsigned size) DECLSPEC_HIDDEN; + unsigned long address, unsigned size) DECLSPEC_HIDDEN; extern struct symt_data* symt_new_global_variable(struct module* module, struct symt_compiland* parent, diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c index 768ed93f889..ad01d0fa482 100644 --- a/dll/win32/dbghelp/msc.c +++ b/dll/win32/dbghelp/msc.c @@ -2072,7 +2072,6 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY { symt_new_public(msc_dbg->module, compiland, terminate_string(&sym->public_v1.p_name), - sym->public_v1.symtype == SYMTYPE_FUNCTION, codeview_get_address(msc_dbg, sym->public_v1.segment, sym->public_v1.offset), 1); } break; @@ -2081,7 +2080,6 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY { symt_new_public(msc_dbg->module, compiland, terminate_string(&sym->public_v2.p_name), - sym->public_v3.symtype == SYMTYPE_FUNCTION, codeview_get_address(msc_dbg, sym->public_v2.segment, sym->public_v2.offset), 1); } break; @@ -2091,7 +2089,6 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY { symt_new_public(msc_dbg->module, compiland, sym->public_v3.name, - sym->public_v3.symtype == SYMTYPE_FUNCTION, codeview_get_address(msc_dbg, sym->public_v3.segment, sym->public_v3.offset), 1); } break; @@ -2888,7 +2885,7 @@ static BOOL pdb_process_file(const struct process* pcs, if (ret) { struct pdb_module_info* pdb_info = msc_dbg->module->format_info[DFI_PDB]->u.pdb_info; - msc_dbg->module->module.SymType = SymPdb; + msc_dbg->module->module.SymType = SymCv; if (pdb_info->pdb_files[0].kind == PDB_JG) msc_dbg->module->module.PdbSig = pdb_info->pdb_files[0].u.jg.timestamp; else diff --git a/dll/win32/dbghelp/pe_module.c b/dll/win32/dbghelp/pe_module.c index 8e48fd8bbda..4b9eac4f032 100644 --- a/dll/win32/dbghelp/pe_module.c +++ b/dll/win32/dbghelp/pe_module.c @@ -444,9 +444,9 @@ static BOOL pe_load_coff_symbol_table(struct module* module) source_new(module, NULL, lastfilename)); if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) - symt_new_public(module, compiland, name, FALSE, + symt_new_public(module, compiland, name, module->module.BaseOfImage + sect[isym->SectionNumber - 1].VirtualAddress + - isym->Value, + isym->Value, 1); } naux = isym->NumberOfAuxSymbols + 1; @@ -674,11 +674,11 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* #if 0 /* Add start of DLL (better use the (yet unimplemented) Exe SymTag for this) */ /* FIXME: module.ModuleName isn't correctly set yet if it's passed in SymLoadModule */ - symt_new_public(module, NULL, module->module.ModuleName, FALSE, base, 1); + symt_new_public(module, NULL, module->module.ModuleName, base, 1); #endif /* Add entry point */ - symt_new_public(module, NULL, "EntryPoint", FALSE, + symt_new_public(module, NULL, "EntryPoint", base + nth->OptionalHeader.AddressOfEntryPoint, 1); #if 0 /* FIXME: we'd better store addresses linked to sections rather than @@ -689,7 +689,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* ((char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++) { - symt_new_public(module, NULL, section->Name, FALSE, + symt_new_public(module, NULL, section->Name, RtlImageRvaToVa(nth, mapping, section->VirtualAddress, NULL), 1); } #endif @@ -715,7 +715,6 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* if (!names[i]) continue; symt_new_public(module, NULL, RtlImageRvaToVa(nth, mapping, names[i], NULL), - FALSE, base + functions[ordinals[i]], 1); } @@ -727,7 +726,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* if ((ordinals[j] == i) && names[j]) break; if (j < exports->NumberOfNames) continue; snprintf(buffer, sizeof(buffer), "%d", i + exports->Base); - symt_new_public(module, NULL, buffer, FALSE, base + (DWORD)functions[i], 1); + symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1); } } } diff --git a/dll/win32/dbghelp/rsym.c b/dll/win32/dbghelp/rsym.c index de4b3150852..9b7bf4ee1d7 100644 --- a/dll/win32/dbghelp/rsym.c +++ b/dll/win32/dbghelp/rsym.c @@ -125,7 +125,7 @@ BOOL rsym_parse(struct module* module, unsigned long load_offset, if (use_raw_address(SymbolName)) Address = Entry->Address; - symt_new_public(module, NULL, SymbolName, FALSE, Address, Size); + symt_new_public(module, NULL, SymbolName, Address, Size); } else { diff --git a/dll/win32/dbghelp/symbol.c b/dll/win32/dbghelp/symbol.c index 38d2a5b7291..2a0710b658d 100644 --- a/dll/win32/dbghelp/symbol.c +++ b/dll/win32/dbghelp/symbol.c @@ -226,7 +226,6 @@ struct symt_compiland* symt_new_compiland(struct module* module, struct symt_public* symt_new_public(struct module* module, struct symt_compiland* compiland, const char* name, - BOOL is_function, unsigned long address, unsigned size) { struct symt_public* sym; @@ -242,7 +241,6 @@ struct symt_public* symt_new_public(struct module* module, sym->symt.tag = SymTagPublicSymbol; sym->hash_elt.name = pool_strdup(&module->pool, name); sym->container = compiland ? &compiland->symt : NULL; - sym->is_function = is_function; sym->address = address; sym->size = size; symt_add_module_ht(module, (struct symt_ht*)sym); @@ -699,16 +697,11 @@ static void symt_fill_sym_info(struct module_pair* pair, } break; case SymTagPublicSymbol: - { - const struct symt_public* pub = (const struct symt_public*)sym; - if (pub->is_function) - sym_info->Flags |= SYMFLAG_PUBLIC_CODE; - else - sym_info->Flags |= SYMFLAG_EXPORT; - symt_get_address(sym, &sym_info->Address); - } + sym_info->Flags |= SYMFLAG_EXPORT; + symt_get_address(sym, &sym_info->Address); break; case SymTagFunction: + sym_info->Flags |= SYMFLAG_FUNCTION; symt_get_address(sym, &sym_info->Address); break; case SymTagThunk:

4 years, 3 months

[reactos] 39/179: Revert "[DBGHELP] Set LastError for SymGetModuleBase-calls to ERROR_MOD_NOT_FOUND."

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92cf32b433e162298a1c8… commit 92cf32b433e162298a1c831352b11a68930eeabc Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 15:40:47 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:36 2020 +0200 Revert "[DBGHELP] Set LastError for SymGetModuleBase-calls to ERROR_MOD_NOT_FOUND." This reverts commit b2bcd8afdd6c47b4a403db4b75272a21dc93c904. It will be applied later through winesync script --- dll/win32/dbghelp/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/dbghelp/module.c b/dll/win32/dbghelp/module.c index 8a47c152c25..0c3cdda3d65 100644 --- a/dll/win32/dbghelp/module.c +++ b/dll/win32/dbghelp/module.c @@ -455,7 +455,7 @@ struct module* module_find_by_addr(const struct process* pcs, DWORD64 addr, return module; } } - SetLastError(ERROR_MOD_NOT_FOUND); + SetLastError(ERROR_INVALID_ADDRESS); return module; }

4 years, 3 months

[reactos] 38/179: Revert "[DBGHELP] SymFromAddr: Handle 2 or more symbols at the same address correct."

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=555f98267c516fd21f2da… commit 555f98267c516fd21f2da98f022f6a1590aec022 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 15:40:24 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:36 2020 +0200 Revert "[DBGHELP] SymFromAddr: Handle 2 or more symbols at the same address correct." This reverts commit 0263151f3c49446f76af53f9648109de3653c0b9. It will be applied later through winesync script --- dll/win32/dbghelp/symbol.c | 58 ++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 40 deletions(-) diff --git a/dll/win32/dbghelp/symbol.c b/dll/win32/dbghelp/symbol.c index 15a0a9c378b..38d2a5b7291 100644 --- a/dll/win32/dbghelp/symbol.c +++ b/dll/win32/dbghelp/symbol.c @@ -874,33 +874,6 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON *size = 0x1000; /* arbitrary value */ } -/* neede by symt_find_nearest */ -int symt_get_best_at(struct module* module, int idx_sorttab) -{ - ULONG64 ref_addr; - int idx_sorttab_orig = idx_sorttab; - if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol) - { - symt_get_address(&module->addr_sorttab[idx_sorttab]->symt, &ref_addr); - while (idx_sorttab > 0 && - module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol && - !cmp_sorttab_addr(module, idx_sorttab - 1, ref_addr)) - idx_sorttab--; - if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol) - { - idx_sorttab = idx_sorttab_orig; - while (idx_sorttab < module->num_sorttab - 1 && - module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol && - !cmp_sorttab_addr(module, idx_sorttab + 1, ref_addr)) - idx_sorttab++; - } - /* if no better symbol fond restore original */ - if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol) - idx_sorttab = idx_sorttab_orig; - } - return idx_sorttab; -} - /* assume addr is in module */ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) { @@ -919,12 +892,7 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) high = module->num_sorttab; symt_get_address(&module->addr_sorttab[0]->symt, &ref_addr); - if (addr <= ref_addr) - { - low = symt_get_best_at(module, 0); - return module->addr_sorttab[low]; - } - + if (addr < ref_addr) return NULL; if (high) { symt_get_address(&module->addr_sorttab[high - 1]->symt, &ref_addr); @@ -947,13 +915,23 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) /* If found symbol is a public symbol, check if there are any other entries that * might also have the same address, but would get better information */ - low = symt_get_best_at(module, low); - + if (module->addr_sorttab[low]->symt.tag == SymTagPublicSymbol) + { + symt_get_address(&module->addr_sorttab[low]->symt, &ref_addr); + if (low > 0 && + module->addr_sorttab[low - 1]->symt.tag != SymTagPublicSymbol && + !cmp_sorttab_addr(module, low - 1, ref_addr)) + low--; + else if (low < module->num_sorttab - 1 && + module->addr_sorttab[low + 1]->symt.tag != SymTagPublicSymbol && + !cmp_sorttab_addr(module, low + 1, ref_addr)) + low++; + } /* finally check that we fit into the found symbol */ - //symt_get_address(&module->addr_sorttab[low]->symt, &ref_addr); - //if (addr < ref_addr) return NULL; - //symt_get_length(module, &module->addr_sorttab[low]->symt, &ref_size); - //if (addr >= ref_addr + ref_size) return NULL; + symt_get_address(&module->addr_sorttab[low]->symt, &ref_addr); + if (addr < ref_addr) return NULL; + symt_get_length(module, &module->addr_sorttab[low]->symt, &ref_size); + if (addr >= ref_addr + ref_size) return NULL; return module->addr_sorttab[low]; } @@ -1282,7 +1260,7 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); if (Displacement) - *Displacement = (Address >= Symbol->Address) ? (Address - Symbol->Address) : (DWORD64)-1; + *Displacement = Address - Symbol->Address; return TRUE; }

4 years, 3 months

[reactos] 37/179: [WINESYNC] dbghelp: Turn variable 'code' into a static constant.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f243e096242f5ef75e7ef… commit f243e096242f5ef75e7effca34c879a0aa3a49a9 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 14:34:32 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:36 2020 +0200 [WINESYNC] dbghelp: Turn variable 'code' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id f333c4a210e25bbb8af2adeeae0dbe006354519b by Alex Henrie <alexhenrie24(a)gmail.com> --- dll/win32/dbghelp/minidump.c | 2 +- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/dbghelp/minidump.c b/dll/win32/dbghelp/minidump.c index 1a5dca9de67..975bb45c9a4 100644 --- a/dll/win32/dbghelp/minidump.c +++ b/dll/win32/dbghelp/minidump.c @@ -670,7 +670,7 @@ static unsigned dump_system_info(struct dump_context* dc) /* write Wine specific system information just behind the structure, and before any string */ if (wine_extra) { - char code[] = {'W','I','N','E'}; + static const char code[] = {'W','I','N','E'}; WriteFile(dc->hFile, code, 4, &written, NULL); /* number of sub-info, so that we can extend structure if needed */ diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 32a81e26bee..7db4de0cbb1 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: 86805c3d4b78e69e675e72f57a21254d3d580ddd + wine: f333c4a210e25bbb8af2adeeae0dbe006354519b

4 years, 3 months

[reactos] 36/179: [WINESYNC] dbghelp/dwarf: Use debugstr_a() to trace external strings.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bba2a6162b4b88103c1e6… commit bba2a6162b4b88103c1e62562cb454fcf7a6aee3 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 14:31:29 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:35 2020 +0200 [WINESYNC] dbghelp/dwarf: Use debugstr_a() to trace external strings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 86805c3d4b78e69e675e72f57a21254d3d580ddd by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/dbghelp/dwarf.c | 36 ++++++++++++++++++------------------ sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dll/win32/dbghelp/dwarf.c b/dll/win32/dbghelp/dwarf.c index 9eda159e882..1c227d5f23d 100644 --- a/dll/win32/dbghelp/dwarf.c +++ b/dll/win32/dbghelp/dwarf.c @@ -575,7 +575,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, case DW_FORM_string: attr->u.string = (const char *)data; - TRACE("string<%s>\n", attr->u.string); + TRACE("string<%s>\n", debugstr_a(attr->u.string)); break; case DW_FORM_strp: @@ -583,7 +583,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, unsigned long offset = dwarf2_get_u4(data); attr->u.string = (const char*)ctx->sections[section_string].address + offset; } - TRACE("strp<%s>\n", attr->u.string); + TRACE("strp<%s>\n", debugstr_a(attr->u.string)); break; case DW_FORM_block: @@ -1624,7 +1624,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, struct attribute ext; TRACE("found parameter %s (kind=%d, offset=%ld, reg=%d) at %s\n", - name.u.string, loc.kind, loc.offset, loc.reg, + debugstr_a(name.u.string), loc.kind, loc.offset, loc.reg, dwarf2_debug_ctx(subpgm->ctx)); switch (loc.kind) @@ -1659,8 +1659,8 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, else if (dwarf2_find_attribute(subpgm->ctx, di, DW_AT_const_value, &value)) { VARIANT v; - if (subpgm->func) WARN("Unsupported constant %s in function\n", name.u.string); - if (is_pmt) FIXME("Unsupported constant (parameter) %s in function\n", name.u.string); + if (subpgm->func) WARN("Unsupported constant %s in function\n", debugstr_a(name.u.string)); + if (is_pmt) FIXME("Unsupported constant (parameter) %s in function\n", debugstr_a(name.u.string)); switch (value.form) { case DW_FORM_data1: @@ -1710,7 +1710,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, default: FIXME("Unsupported form for const value %s (%lx)\n", - name.u.string, value.form); + debugstr_a(name.u.string), value.form); v.n1.n2.vt = VT_EMPTY; } di->symt = &symt_new_constant(subpgm->ctx->module, subpgm->ctx->compiland, @@ -1729,7 +1729,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, } else { - WARN("dropping global variable %s which has been optimized away\n", name.u.string); + WARN("dropping global variable %s which has been optimized away\n", debugstr_a(name.u.string)); } } if (is_pmt && subpgm->func && subpgm->func->type) @@ -1944,7 +1944,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, } if (!dwarf2_read_range(ctx, di, &low_pc, &high_pc)) { - WARN("cannot get range for %s\n", name.u.string); + WARN("cannot get range for %s\n", debugstr_a(name.u.string)); return NULL; } /* As functions (defined as inline assembly) get debug info with dwarf @@ -2186,7 +2186,7 @@ static void dwarf2_set_line_number(struct module* module, unsigned long address, if (!file || !(psrc = vector_at(v, file - 1))) return; TRACE("%s %lx %s %u\n", - debugstr_w(module->module.ModuleName), address, source_get(module, *psrc), line); + debugstr_w(module->module.ModuleName), address, debugstr_a(source_get(module, *psrc)), line); if (!(symt = symt_find_nearest(module, address)) || symt->symt.tag != SymTagFunction) return; func = (struct symt_function*)symt; @@ -2247,7 +2247,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, { const char* rel = (const char*)traverse.data; unsigned rellen = strlen(rel); - TRACE("Got include %s\n", rel); + TRACE("Got include %s\n", debugstr_a(rel)); traverse.data += rellen + 1; p = vector_add(&dirs, &ctx->pool); @@ -2281,7 +2281,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, mod_time = dwarf2_leb128_as_unsigned(&traverse); length = dwarf2_leb128_as_unsigned(&traverse); dir = *(const char**)vector_at(&dirs, dir_index); - TRACE("Got file %s/%s (%u,%lu)\n", dir, name, mod_time, length); + TRACE("Got file %s/%s (%u,%lu)\n", debugstr_a(dir), debugstr_a(name), mod_time, length); psrc = vector_add(&files, &ctx->pool); *psrc = source_new(ctx->module, dir, name); } @@ -2352,7 +2352,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, address = ctx->load_offset + dwarf2_parse_addr(&traverse); break; case DW_LNE_define_file: - FIXME("not handled define file %s\n", traverse.data); + FIXME("not handled define file %s\n", debugstr_a((char *)traverse.data)); traverse.data += strlen((const char *)traverse.data) + 1; dwarf2_leb128_as_unsigned(&traverse); dwarf2_leb128_as_unsigned(&traverse); @@ -2545,7 +2545,7 @@ static enum location_error loc_compute_frame(struct process* pcs, *frame = *pframe; break; case loc_dwarf2_location_list: - WARN("Searching loclist for %s\n", func->hash_elt.name); + WARN("Searching loclist for %s\n", debugstr_a(func->hash_elt.name)); if (!dwarf2_lookup_loclist(modfmt, modfmt->u.dwarf2_info->debug_loc.address + pframe->offset, ip, &lctx)) @@ -2691,7 +2691,7 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* info->state.cfa_rule = RULE_CFA_OFFSET; end = NULL; - TRACE("\tparsing augmentation %s\n", augmentation); + TRACE("\tparsing augmentation %s\n", debugstr_a(augmentation)); if (*augmentation) do { switch (*augmentation) @@ -3348,7 +3348,7 @@ static void dwarf2_location_compute(struct process* pcs, if (!func->container || func->container->tag != SymTagCompiland) { - WARN("We'd expect function %s's container to exist and be a compiland\n", func->hash_elt.name); + WARN("We'd expect function %s's container to exist and be a compiland\n", debugstr_a(func->hash_elt.name)); err = loc_err_internal; } else @@ -3423,7 +3423,7 @@ static inline BOOL dwarf2_init_zsection(dwarf2_section_t* section, if (sz <= 12 || memcmp(sect, "ZLIB", 4)) { - ERR("invalid compressed section %s\n", zsectname); + ERR("invalid compressed section %s\n", debugstr_a(zsectname)); goto out; } @@ -3448,7 +3448,7 @@ static inline BOOL dwarf2_init_zsection(dwarf2_section_t* section, res = inflateInit(&z); if (res != Z_OK) { - FIXME("inflateInit failed with %i / %s\n", res, z.msg); + FIXME("inflateInit failed with %i / %s\n", res, debugstr_a(z.msg)); goto out_free; } @@ -3460,7 +3460,7 @@ static inline BOOL dwarf2_init_zsection(dwarf2_section_t* section, if (res != Z_STREAM_END) { - FIXME("Decompression failed with %i / %s\n", res, z.msg); + FIXME("Decompression failed with %i / %s\n", res, debugstr_a(z.msg)); goto out_end; } diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 6350d526bd5..32a81e26bee 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: b3717a92d11c84819ce934da39bc8f9c85582c9a + wine: 86805c3d4b78e69e675e72f57a21254d3d580ddd

4 years, 3 months

[reactos] 35/179: [WINESYNC] dbghelp: Fix memory leak in SymInitializeW() (Coverity).

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7187f092a1f9facfead9… commit f7187f092a1f9facfead91795b638beec1d3af2d Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 14:31:29 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:35:35 2020 +0200 [WINESYNC] dbghelp: Fix memory leak in SymInitializeW() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id b3717a92d11c84819ce934da39bc8f9c85582c9a by Józef Kucia <jkucia(a)codeweavers.com> --- dll/win32/dbghelp/dbghelp.c | 13 +++++++------ sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp.c b/dll/win32/dbghelp/dbghelp.c index 732309567a9..1c540cb74f4 100644 --- a/dll/win32/dbghelp/dbghelp.c +++ b/dll/win32/dbghelp/dbghelp.c @@ -312,7 +312,8 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP TRACE("(%p %s %u)\n", hProcess, debugstr_w(UserSearchPath), fInvadeProcess); - if (process_find_by_handle(hProcess)){ + if (process_find_by_handle(hProcess)) + { WARN("the symbols for this process have already been initialized!\n"); /* MSDN says to only call this function once unless SymCleanup() has been called since the last call. @@ -321,15 +322,15 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP return TRUE; } - pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs)); - if (!pcs) return FALSE; - - pcs->handle = hProcess; - IsWow64Process(GetCurrentProcess(), &wow64); if (!IsWow64Process(hProcess, &child_wow64)) return FALSE; + + pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs)); + if (!pcs) return FALSE; + + pcs->handle = hProcess; pcs->is_64bit = (sizeof(void *) == 8 || wow64) && !child_wow64; if (UserSearchPath) diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 088fac7999f..6350d526bd5 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -3,4 +3,4 @@ directories: files: include/dbghelp.h: sdk/include/psdk/dbghelp.h tags: - wine: ca9b1d0077874c94715cd2ceeff114853151ed2d + wine: b3717a92d11c84819ce934da39bc8f9c85582c9a

4 years, 3 months

← Newer
1
...
21
22
23
24
25
26
27
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2020