include: Make IMAGE_COR20_HEADER declaration compatible with PSDK headers.

This commit is contained in:
Thomas Faber 2012-06-17 15:51:56 +02:00 committed by Alexandre Julliard
parent a6510b3fbc
commit bb95b706cb
3 changed files with 6 additions and 3 deletions

View File

@ -412,7 +412,7 @@ static struct _tagASSEMBLY
5, /* MinorRuntimeVersion */ 5, /* MinorRuntimeVersion */
{ 0x2188, 0x1B4 }, /* MetaData */ { 0x2188, 0x1B4 }, /* MetaData */
COMIMAGE_FLAGS_ILONLY | COMIMAGE_FLAGS_STRONGNAMESIGNED, /* Flags */ COMIMAGE_FLAGS_ILONLY | COMIMAGE_FLAGS_STRONGNAMESIGNED, /* Flags */
0, /* EntryPointToken */ { 0 }, /* EntryPointToken */
{ 0x20D0, 0xB8 }, /* Resources */ { 0x20D0, 0xB8 }, /* Resources */
{ 0x2050, 0x80 }, /* StrongNameSignature */ { 0x2050, 0x80 }, /* StrongNameSignature */
{ 0 }, /* CodeManagerTable */ { 0 }, /* CodeManagerTable */

View File

@ -3429,7 +3429,10 @@ typedef struct IMAGE_COR20_HEADER
IMAGE_DATA_DIRECTORY MetaData; IMAGE_DATA_DIRECTORY MetaData;
DWORD Flags; DWORD Flags;
union {
DWORD EntryPointToken; DWORD EntryPointToken;
DWORD EntryPointRVA;
} DUMMYUNIONNAME;
IMAGE_DATA_DIRECTORY Resources; IMAGE_DATA_DIRECTORY Resources;
IMAGE_DATA_DIRECTORY StrongNameSignature; IMAGE_DATA_DIRECTORY StrongNameSignature;

View File

@ -966,7 +966,7 @@ static void dump_dir_clr_header(void)
print_dword( "Header Size", dir->cb ); print_dword( "Header Size", dir->cb );
print_ver( "Required runtime version", dir->MajorRuntimeVersion, dir->MinorRuntimeVersion ); print_ver( "Required runtime version", dir->MajorRuntimeVersion, dir->MinorRuntimeVersion );
print_clrflags( "Flags", dir->Flags ); print_clrflags( "Flags", dir->Flags );
print_dword( "EntryPointToken", dir->EntryPointToken ); print_dword( "EntryPointToken", dir->u.EntryPointToken );
printf("\n"); printf("\n");
printf( "CLR Data Directory\n" ); printf( "CLR Data Directory\n" );
print_clrdirectory( "MetaData", &dir->MetaData ); print_clrdirectory( "MetaData", &dir->MetaData );