[ros-diffs] [reactos] 132/179: [WINESYNC] dbghelp: Don't use *_NULL constants.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77888f05a4eba3e4b9167…

commit 77888f05a4eba3e4b9167b7cf1f63d86b5fe1d68
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Fri Sep 11 18:54:56 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Wed Sep 16 10:35:52 2020 +0200

    [WINESYNC] dbghelp: Don't use *_NULL constants.
    
    Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id ee34cf365d34b23669c2ead03b040f09b7fb1e2b by Jacek Caban
<jacek(a)codeweavers.com>
---
 dll/win32/dbghelp/elf_module.c    | 12 ++++++------
 dll/win32/dbghelp/image_private.h |  6 ------
 sdk/tools/winesync/dbghelp.cfg    |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c
index 196ebcaded8..4019bcf7776 100644
--- a/dll/win32/dbghelp/elf_module.c
+++ b/dll/win32/dbghelp/elf_module.c
@@ -1116,8 +1116,8 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const
WCHAR* filename,
                         break;
                     }
                     ptr += sizeof(dyn);
-                } while (dyn.d_tag != DT_NULL);
-                if (dyn.d_tag == DT_NULL) return ret;
+                } while (dyn.d_tag);
+                if (!dyn.d_tag) return ret;
             }
             else
             {
@@ -1138,8 +1138,8 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const
WCHAR* filename,
                         break;
                     }
                     ptr += sizeof(dyn);
-                } while (dyn.d_tag != DT_NULL);
-                if (dyn.d_tag == DT_NULL) return ret;
+                } while (dyn.d_tag);
+                if (!dyn.d_tag) return ret;
             }
         }
         elf_end_find(fmap);
@@ -1311,7 +1311,7 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned
type, ULONG_PTR*
     {
         Elf64_auxv_t auxv;
 
-        while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL)
&& auxv.a_type != AT_NULL)
+        while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL)
&& auxv.a_type)
         {
             if (auxv.a_type == type)
             {
@@ -1325,7 +1325,7 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned
type, ULONG_PTR*
     {
         Elf32_auxv_t auxv;
 
-        while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL)
&& auxv.a_type != AT_NULL)
+        while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL)
&& auxv.a_type)
         {
             if (auxv.a_type == type)
             {
diff --git a/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h
index 37f715b55e7..04885128217 100644
--- a/dll/win32/dbghelp/image_private.h
+++ b/dll/win32/dbghelp/image_private.h
@@ -50,12 +50,6 @@
 
 #define IMAGE_NO_MAP  ((void*)-1)
 
-#ifndef __ELF__
-#ifndef SHT_NULL
-#define SHT_NULL        0
-#endif
-#endif
-
 /* structure holding information while handling an ELF image
  * allows one by one section mapping for memory savings
  */
diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg
index f16ecdcb0df..fee3214cbc1 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: 2534c2a2d22d3c610ffdfbb6b33e0b5176509aa1
+  wine: ee34cf365d34b23669c2ead03b040f09b7fb1e2b