From b075ce0ecd0a142a2ee79fcad0e45027b9d7a87b Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Tue, 24 Aug 2010 22:20:33 +0000 Subject: [PATCH] 2010-08-24 Chris Sutcliffe * include/winnt.h (IMAGE_NT_HEADERS32, IMAGE_NT_HEADERS64): Correct definition. Thank you to Pasi Ruokola for reporting the issue. --- winsup/w32api/ChangeLog | 7 +++++++ winsup/w32api/include/winnt.h | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 6ea220551..51ca6b808 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +2010-08-24 Chris Sutcliffe + + * include/winnt.h (IMAGE_NT_HEADERS32, IMAGE_NT_HEADERS64): Correct + definition. + + Thank you to Pasi Ruokola for reporting the issue. + 2010-08-24 Chris Sutcliffe * include/exdisp.h (get_RegisterAsBrowser): Fix typo. diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index e38c5ccad..94fcd3231 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -3046,14 +3046,14 @@ typedef struct _IMAGE_OS2_HEADER { #pragma pack(pop) #pragma pack(push,4) typedef struct _IMAGE_NT_HEADERS { - DWORD Signature; - IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER OptionalHeader; +DWORD Signature; +IMAGE_FILE_HEADER FileHeader; +IMAGE_OPTIONAL_HEADER32 OptionalHeader; } IMAGE_NT_HEADERS32,*PIMAGE_NT_HEADERS32; typedef struct _IMAGE_NT_HEADERS64 { - DWORD Signature; - IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER OptionalHeader; +DWORD Signature; +IMAGE_FILE_HEADER FileHeader; +IMAGE_OPTIONAL_HEADER64 OptionalHeader; } IMAGE_NT_HEADERS64,*PIMAGE_NT_HEADERS64; #ifdef _WIN64 typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS;