https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e225d76e5110aab948cb1...
commit 5e225d76e5110aab948cb139b0a1d486f3b8a38a Author: winesync ros-dev@reactos.org AuthorDate: Fri Sep 11 16:48:51 2020 +0200 Commit: Jérôme Gardou jerome.gardou@reactos.org CommitDate: Wed Sep 16 10:35:42 2020 +0200
[WINESYNC] dbghelp: Return NULL instead of IMAGE_NO_MAP when PE file mapping fails.
A NULL test is always applied to the return value from pe_map_full(), but IMAGE_NO_MAP is not NULL, it is ((void*)-1).
Signed-off-by: Conor McCarthy cmccarthy@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id 9d3687ad324f866c835c4b73922f859a30e47aee by Conor McCarthy cmccarthy@codeweavers.com --- dll/win32/dbghelp/pe_module.c | 2 +- sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dll/win32/dbghelp/pe_module.c b/dll/win32/dbghelp/pe_module.c index 89d82d930e9..f458b8aa516 100644 --- a/dll/win32/dbghelp/pe_module.c +++ b/dll/win32/dbghelp/pe_module.c @@ -55,7 +55,7 @@ static void* pe_map_full(struct image_file_map* fmap, IMAGE_NT_HEADERS** nth) fmap->u.pe.full_count++; return fmap->u.pe.full_map; } - return IMAGE_NO_MAP; + return NULL; }
static void pe_unmap_full(struct image_file_map* fmap) diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 4eeac48bfa8..f4c28007880 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: a91b0faefd801d44063c8d9289dbc69de985f8b6 + wine: 9d3687ad324f866c835c4b73922f859a30e47aee