https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5a6c6419faeef50ae294…
commit a5a6c6419faeef50ae294afa1056e94b3408fa25
Author: Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Sat Feb 24 12:05:12 2018 +0100
Commit: Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Sat Feb 24 14:17:58 2018 +0100
[IMAGEHLP_WINETEST] Un-mark a ROS-diff that's been committed upstream.
---
modules/rostests/winetests/imagehlp/image.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/modules/rostests/winetests/imagehlp/image.c
b/modules/rostests/winetests/imagehlp/image.c
index f16ba5e146..65f59700e3 100644
--- a/modules/rostests/winetests/imagehlp/image.c
+++ b/modules/rostests/winetests/imagehlp/image.c
@@ -56,11 +56,7 @@ struct Imports {
} ibn;
char dllname[0x10];
};
-#ifdef __REACTOS__
#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks))
-#else
-#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks[0]))
-#endif
static struct _PeImage {
IMAGE_DOS_HEADER dos_header;
@@ -223,12 +219,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},
-#ifdef __REACTOS__
{FIELD_OFFSET(struct Imports, thunks)-
(FIELD_OFFSET(struct Imports, descriptors)+FIELD_OFFSET(IMAGE_IMPORT_DESCRIPTOR,
Name)),
-#else
- {FIELD_OFFSET(struct Imports, thunks)-FIELD_OFFSET(struct Imports,
descriptors[0].Name),
-#endif
&bin.idata_section.descriptors[0].Name},
{FILE_TOTAL-FILE_IDATA-FIELD_OFFSET(struct Imports, ibn),
&bin.idata_section.ibn}