diff --git a/reactos/dll/win32/kernel32/wine/res.c b/reactos/dll/win32/kernel32/wine/res.c index edfcd66d05c..ca1ce238661 100644 --- a/reactos/dll/win32/kernel32/wine/res.c +++ b/reactos/dll/win32/kernel32/wine/res.c @@ -983,7 +983,7 @@ static BOOL enumerate_mapped_resources( QUEUEDUPDATES *updates, Type = resource_dup_string( root, e1 ); - namedir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e1->u2.s3.OffsetToDirectory); + namedir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e1->u2.s2.OffsetToDirectory); for (j = 0; j < namedir->NumberOfNamedEntries + namedir->NumberOfIdEntries; j++) { LPWSTR Name; @@ -992,7 +992,7 @@ static BOOL enumerate_mapped_resources( QUEUEDUPDATES *updates, Name = resource_dup_string( root, e2 ); - langdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e2->u2.s3.OffsetToDirectory); + langdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e2->u2.s2.OffsetToDirectory); for (k = 0; k < langdir->NumberOfNamedEntries + langdir->NumberOfIdEntries; k++) { LANGID Lang; @@ -1252,8 +1252,8 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc root->NumberOfIdEntries++; e1->u1.Id = LOWORD( types->id ); } - e1->u2.s3.OffsetToDirectory = si->names_ofs; - e1->u2.s3.DataIsDirectory = TRUE; + e1->u2.s2.OffsetToDirectory = si->names_ofs; + e1->u2.s2.DataIsDirectory = TRUE; si->types_ofs += sizeof (IMAGE_RESOURCE_DIRECTORY_ENTRY); namedir = (IMAGE_RESOURCE_DIRECTORY*) &base[si->names_ofs]; @@ -1288,8 +1288,8 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc namedir->NumberOfIdEntries++; e2->u1.Id = LOWORD( names->id ); } - e2->u2.s3.OffsetToDirectory = si->langs_ofs; - e2->u2.s3.DataIsDirectory = TRUE; + e2->u2.s2.OffsetToDirectory = si->langs_ofs; + e2->u2.s2.DataIsDirectory = TRUE; si->names_ofs += sizeof (IMAGE_RESOURCE_DIRECTORY_ENTRY); langdir = (IMAGE_RESOURCE_DIRECTORY*) &base[si->langs_ofs]; diff --git a/reactos/dll/win32/version/resource.c b/reactos/dll/win32/version/resource.c index 48a2712e2a0..c135714b0fc 100644 --- a/reactos/dll/win32/version/resource.c +++ b/reactos/dll/win32/version/resource.c @@ -84,7 +84,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DI { pos = (min + max) / 2; if (entry[pos].u1.Id == id) - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s3.OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); if (entry[pos].u1.Id > id) max = pos - 1; else min = pos + 1; } @@ -104,7 +104,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_default( const IMAGE_RESOURCE_ const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->u2.s3.OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->u2.s2.OffsetToDirectory); } diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h index 81342b51f39..685223391bb 100644 --- a/reactos/include/psdk/winnt.h +++ b/reactos/include/psdk/winnt.h @@ -4661,7 +4661,7 @@ typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY { _ANONYMOUS_STRUCT struct { DWORD OffsetToDirectory:31; DWORD DataIsDirectory:1; - } DUMMYSTRUCTNAME3; + } DUMMYSTRUCTNAME2; } DUMMYUNIONNAME2; } IMAGE_RESOURCE_DIRECTORY_ENTRY, *PIMAGE_RESOURCE_DIRECTORY_ENTRY;