system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-01 07:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

kernel32: Adjust data directories in UpdateResource API.

Browse source 
When adding resources to a PE file using the UpdateResource API and
the resource section is not the last section (i.e. we had to move
existing sections), ensure any data directory entries pointing into
moved sections is adjusted.

Signed-off-by: David Collett <david.collett@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
David Collett 2017-11-23 16:02:55 +11:00 committed by Alexandre Julliard
parent 0592537862
commit ea640e1aa7
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/kernel32/resource.c
View file

@ -1435,7 +1435,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates )
{
static const WCHAR prefix[] = { 'r','e','s','u',0 };
WCHAR tempdir[MAX_PATH], tempfile[MAX_PATH];
DWORD section_size;
DWORD i, section_size;
BOOL ret = FALSE;
IMAGE_SECTION_HEADER *sec;
IMAGE_NT_HEADERS32 *nt;
@ -1619,11 +1619,19 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates )
nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress;
nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size;
nt64->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size );
for (i=0; i<nt64->OptionalHeader.NumberOfRvaAndSizes; i++)
if (nt64->OptionalHeader.DataDirectory[i].VirtualAddress > sec->VirtualAddress)
nt64->OptionalHeader.DataDirectory[i].VirtualAddress += rva_delta;
} else {
nt->OptionalHeader.SizeOfImage += rva_delta;
nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress;
nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size;
nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size );
for (i=0; i<nt->OptionalHeader.NumberOfRvaAndSizes; i++)
if (nt->OptionalHeader.DataDirectory[i].VirtualAddress > sec->VirtualAddress)
nt->OptionalHeader.DataDirectory[i].VirtualAddress += rva_delta;
}
}