Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32/WINE] Sync res.c with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-04-11 12:36:44 +01:00
parent 8d2519218f
commit 6d262f1ee4
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dll/win32/kernel32/wine/res.c
View file

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

2
media/doc/README.WINE
View file

@ -274,7 +274,7 @@ kernel32 -
reactos/dll/win32/kernel32/wine/comm.c # Synced in r52754 reactos/dll/win32/kernel32/wine/comm.c # Synced in r52754
reactos/dll/win32/kernel32/wine/lzexpand.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/wine/lzexpand.c # Synced to WineStaging-3.3
reactos/dll/win32/kernel32/wine/profile.c # Synced to WineStaging-3.3 reactos/dll/win32/kernel32/wine/profile.c # Synced to WineStaging-3.3
reactos/dll/win32/kernel32/wine/res.c # Partially synced to WineStaging-1.7.55 reactos/dll/win32/kernel32/wine/res.c # Partially synced to WineStaging-3.3
reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced to WineStaging-1.7.55 reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced to WineStaging-1.7.55
reactos/dll/win32/kernel32/winnls/string/chartype.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/chartype.c # Synced in r52754
reactos/dll/win32/kernel32/winnls/string/collation.c # Synced to WineStaging-1.7.55 reactos/dll/win32/kernel32/winnls/string/collation.c # Synced to WineStaging-1.7.55