#1399 Definition of IMAGE_NT_HEADERS structs

[Pasi Ruokola]

Win32api version 3.14

IMAGE_NT_HEADERS32 and IMAGE_NT_HEADERS64 structs are not defined correctly in winnt.h:

typedef struct _IMAGE_NT_HEADERS {
DWORD Signature;
IMAGE_FILE_HEADER FileHeader;
IMAGE_OPTIONAL_HEADER OptionalHeader;
} IMAGE_NT_HEADERS32,*PIMAGE_NT_HEADERS32;
typedef struct _IMAGE_NT_HEADERS64 {
DWORD Signature;
IMAGE_FILE_HEADER FileHeader;
IMAGE_OPTIONAL_HEADER OptionalHeader;
} IMAGE_NT_HEADERS64,*PIMAGE_NT_HEADERS64;

In these structs IMAGE_OPTIONAL_HEADER should be defined with the corresponding 32 / 64 version of the struct.
Otherwise e.g. code with this sizeof (IMAGE_NT_HEADERS64) may fail.

Here's the corrent definitions:

typedef struct _IMAGE_NT_HEADERS {
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_HEADER64 OptionalHeader;
} IMAGE_NT_HEADERS64,*PIMAGE_NT_HEADERS64;

[Chris Sutcliffe]

Thank you for the report, I've committed a fix to CVS.