https://git.reactos.org/?p=reactos.git;a=commitdiff;h=833e54f874962ef648609848a6bd2d39d572ffdd
commit 833e54f874962ef648609848a6bd2d39d572ffdd Author: winesync <[email protected]> AuthorDate: Fri Sep 11 19:00:45 2020 +0200 Commit: Jérôme Gardou <[email protected]> CommitDate: Wed Sep 16 10:35:57 2020 +0200 [WINESYNC] dbghelp: Fix GCC warnings in macho_module.c. Signed-off-by: Jacek Caban <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 9896f1ce33561771989d3117c1536fb472df8558 by Jacek Caban <[email protected]> --- dll/win32/dbghelp/image_private.h | 2 +- dll/win32/dbghelp/macho_module.c | 5 +++-- sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h index 1a5a24bc580..a99c8ca4115 100644 --- a/dll/win32/dbghelp/image_private.h +++ b/dll/win32/dbghelp/image_private.h @@ -132,7 +132,7 @@ struct image_file_map struct image_file_map* dsym; /* the debug symbols file associated with this one */ size_t header_size; /* size of real header in file */ size_t commands_size; - size_t commands_count; + unsigned int commands_count; const struct macho_load_command* load_commands; const struct macho_uuid_command* uuid; diff --git a/dll/win32/dbghelp/macho_module.c b/dll/win32/dbghelp/macho_module.c index 8b32a190d86..3ef65af7c97 100644 --- a/dll/win32/dbghelp/macho_module.c +++ b/dll/win32/dbghelp/macho_module.c @@ -566,7 +566,7 @@ static int macho_enum_load_commands(struct image_file_map *ifm, unsigned cmd, if ((lc = macho_map_load_commands(fmap)) == IMAGE_NO_MAP) return -1; - TRACE("%lu total commands\n", fmap->commands_count); + TRACE("%u total commands\n", fmap->commands_count); for (i = 0; i < fmap->commands_count; i++, lc = macho_next_load_command(lc)) { @@ -1639,7 +1639,7 @@ static BOOL macho_enum_modules_internal(const struct process* pcs, } if (!image_infos.infos64.infoArray) goto done; - TRACE("Process has %u image infos at %p\n", image_infos.infos64.infoArrayCount, (void*)image_infos.infos64.infoArray); + TRACE("Process has %u image infos at %s\n", image_infos.infos64.infoArrayCount, wine_dbgstr_longlong(image_infos.infos64.infoArray)); if (pcs->is_64bit) len = sizeof(info_array->info64); @@ -1751,6 +1751,7 @@ static BOOL macho_enum_modules(struct process* process, enum_modules_cb cb, void TRACE("(%p, %p, %p)\n", process->handle, cb, user); macho_info.flags = MACHO_INFO_NAME; + macho_info.module_name = NULL; ret = macho_enum_modules_internal(process, macho_info.module_name, cb, user); HeapFree(GetProcessHeap(), 0, (char*)macho_info.module_name); return ret; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index ddccc59b537..e5d1d0ed4b4 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: 26f5bfdd4d071a91a38b25c0064ed5ea48993249 + wine: 9896f1ce33561771989d3117c1536fb472df8558
