From 8d0e6718ae85e12b0576b69d50bfcd39b6708886 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 16 May 2015 10:24:11 +0000
Subject: [PATCH] [IMAGEHLP_WINETEST] Add to and fix MSVC build. By Mark
 Jansen.

svn path=/trunk/; revision=67765
---
 rostests/winetests/CMakeLists.txt   |  4 +---
 rostests/winetests/imagehlp/image.c | 13 +++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/rostests/winetests/CMakeLists.txt b/rostests/winetests/CMakeLists.txt
index e5c61b76e99..d6da88189b5 100644
--- a/rostests/winetests/CMakeLists.txt
+++ b/rostests/winetests/CMakeLists.txt
@@ -32,9 +32,7 @@ add_subdirectory(gdi32)
 add_subdirectory(gdiplus)
 add_subdirectory(hlink)
 add_subdirectory(icmp)
-if(NOT MSVC)
-    add_subdirectory(imagehlp) # FIXME: msvc build.
-endif()
+add_subdirectory(imagehlp)
 add_subdirectory(imm32)
 add_subdirectory(inetcomm)
 add_subdirectory(inetmib1)
diff --git a/rostests/winetests/imagehlp/image.c b/rostests/winetests/imagehlp/image.c
index 4a19c169e88..471ae5ed09f 100644
--- a/rostests/winetests/imagehlp/image.c
+++ b/rostests/winetests/imagehlp/image.c
@@ -56,7 +56,7 @@ struct Imports {
     } ibn;
     char dllname[0x10];
 };
-#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks[0]))
+#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks))
 
 static struct _PeImage {
     IMAGE_DOS_HEADER dos_header;
@@ -70,9 +70,9 @@ static struct _PeImage {
     char __alignment3[FILE_TOTAL-FILE_IDATA-sizeof(struct Imports)];
 } bin = {
     /* dos header */
-    {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, 0, 0, {}, FILE_PE_START},
+    {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0}, 0, 0, {0}, FILE_PE_START},
     /* alignment before PE header */
-    {},
+    {0},
     /* nt headers */
     {IMAGE_NT_SIGNATURE,
         /* basic headers - 3 sections, no symbols, EXE file */
@@ -99,7 +99,7 @@ static struct _PeImage {
             0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE}
     },
     /* alignment before first section */
-    {},
+    {0},
     /* .text section */
     {
         0x31, 0xC0, /* xor eax, eax */
@@ -122,7 +122,7 @@ static struct _PeImage {
         "KERNEL32.DLL"
     },
     /* final alignment */
-    {}
+    {0}
 };
 #include <poppack.h>
 
@@ -222,7 +222,8 @@ static const struct expected_blob b1[] = {
     {FILE_IDATA-FILE_TEXT, &bin.text_section},
     {sizeof(bin.idata_section.descriptors[0].u.OriginalFirstThunk),
         &bin.idata_section.descriptors[0].u.OriginalFirstThunk},
-    {FIELD_OFFSET(struct Imports, thunks)-FIELD_OFFSET(struct Imports, descriptors[0].Name),
+    {FIELD_OFFSET(struct Imports, thunks)-
+        (FIELD_OFFSET(struct Imports, descriptors)+FIELD_OFFSET(IMAGE_IMPORT_DESCRIPTOR, Name)),
         &bin.idata_section.descriptors[0].Name},
     {FILE_TOTAL-FILE_IDATA-FIELD_OFFSET(struct Imports, ibn),
         &bin.idata_section.ibn}