November 2017 - Wine-commits

Alexandre Julliard : Release 2.22.
by Alexandre Julliard 24 Nov '17

24 Nov '17

Module: wine Branch: master Commit: c570224aa274e2b5b2bbe8562e8e3a5de73bc98f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c570224aa274e2b5b2bbe8562… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 21:02:46 2017 +0100 Release 2.22. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 468 +++++++++++++++++++++++++++----------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +-- 4 files changed, 215 insertions(+), 276 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c570224aa274e2b5b2bbe…

1 0

Tag wine-2.22 : Alexandre Julliard : Release 2.22
by Alexandre Julliard 24 Nov '17

24 Nov '17

Module: wine Branch: refs/tags/wine-2.22 Tag: 45875d51f5f1ee15c94eadbfacd984e3bc0b912c URL: http://source.winehq.org/git/wine.git/?a=tag;h=45875d51f5f1ee15c94eadbfacd9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 21:02:46 2017 +0100 Release 2.22

1 0

Stanislav Motylkov : rasapi32: Add stub for RasGetConnectionStatistics.
by Alexandre Julliard 24 Nov '17

24 Nov '17

Module: wine Branch: master Commit: 290aec59aa18e0bdd481c9ae36e24a75e1254bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=290aec59aa18e0bdd481c9ae3… Author: Stanislav Motylkov <x86corez(a)gmail.com> Date: Wed Nov 22 22:31:50 2017 +0300 rasapi32: Add stub for RasGetConnectionStatistics. Signed-off-by: Stanislav Motylkov <x86corez(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../ext-ms-win-ras-rasapi32-l1-1-0.spec | 2 +- dlls/rasapi32/rasapi.c | 6 ++++++ dlls/rasapi32/rasapi32.spec | 1 + include/raserror.h | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec b/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec index bb73c8a..f215a57 100644 --- a/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec +++ b/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec @@ -5,7 +5,7 @@ @ stdcall RasEnumEntriesW(wstr wstr ptr ptr ptr) rasapi32.RasEnumEntriesW @ stdcall RasGetAutodialAddressA(str ptr ptr ptr ptr) rasapi32.RasGetAutodialAddressA @ stdcall RasGetAutodialAddressW(wstr ptr ptr ptr ptr) rasapi32.RasGetAutodialAddressW -@ stub RasGetConnectionStatistics +@ stdcall RasGetConnectionStatistics(ptr ptr) rasapi32.RasGetConnectionStatistics @ stdcall RasGetConnectStatusW(ptr ptr) rasapi32.RasGetConnectStatusW @ stub RasGetCredentialsW @ stdcall RasGetEntryDialParamsW(wstr ptr ptr) rasapi32.RasGetEntryDialParamsW diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index b1721c6..791b0da 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -547,3 +547,9 @@ DWORD WINAPI RasGetLinkStatistics(HRASCONN connection, DWORD entry, RAS_STATS *s FIXME("(%p,%u,%p), stub!\n", connection, entry, statistics); return 0; } + +DWORD WINAPI RasGetConnectionStatistics(HRASCONN connection, RAS_STATS *statistics) +{ + FIXME("(%p,%p), stub!\n", connection, statistics); + return ERROR_UNKNOWN; +} diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index 66b21a6..e8a28a8 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -33,6 +33,7 @@ @ stdcall RasGetConnectStatusA(ptr ptr) @ stdcall RasGetConnectStatusW(ptr ptr) @ stub RasGetConnectStatusWow +@ stdcall RasGetConnectionStatistics(ptr ptr) @ stub RasGetCountryInfoA @ stub RasGetCountryInfoW @ stub RasGetCredentialsA diff --git a/include/raserror.h b/include/raserror.h index 1735936..549b424 100644 --- a/include/raserror.h +++ b/include/raserror.h @@ -23,6 +23,7 @@ #define ERROR_BUFFER_TOO_SMALL (RASBASE+3) #define ERROR_BUFFER_INVALID (RASBASE+10) #define ERROR_INVALID_SIZE (RASBASE+32) +#define ERROR_UNKNOWN (RASBASE+35) #define ERROR_STATE_MACHINES_NOT_STARTED (RASBASE+95) #define ERROR_RASMAN_CANNOT_INITIALIZE (RASBASE+111)

1 0

Hans Leidekker : ntdll: Fix size returned from RtlMakeSelfRelativeSD on 64-bit.
by Alexandre Julliard 24 Nov '17

24 Nov '17

Module: wine Branch: master Commit: fdc51fc27835b411b3af976e6011fa7226939fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc51fc27835b411b3af976e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 24 11:32:58 2017 +0100 ntdll: Fix size returned from RtlMakeSelfRelativeSD on 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sec.c | 1 + dlls/ntdll/tests/rtl.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 5c858b5..02fc77d 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -860,6 +860,7 @@ NTSTATUS WINAPI RtlMakeSelfRelativeSD( return STATUS_INVALID_PARAMETER; length = RtlLengthSecurityDescriptor(pAbs); + if (!(pAbs->Control & SE_SELF_RELATIVE)) length -= (sizeof(*pAbs) - sizeof(*pRel)); if (*lpdwBufferLength < length) { *lpdwBufferLength = length; diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7333ab8..2e3a7de 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -99,6 +99,8 @@ static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG); static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); +static NTSTATUS (WINAPI *pRtlMakeSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD); +static NTSTATUS (WINAPI *pRtlAbsoluteToSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -153,6 +155,8 @@ static void InitFunctionPtrs(void) pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx"); pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); + pRtlMakeSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlMakeSelfRelativeSD"); + pRtlAbsoluteToSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlAbsoluteToSelfRelativeSD"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -2209,6 +2213,52 @@ static void test_LdrEnumerateLoadedModules(void) ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); } +static void test_RtlMakeSelfRelativeSD(void) +{ + char buf[sizeof(SECURITY_DESCRIPTOR_RELATIVE) + 4]; + SECURITY_DESCRIPTOR_RELATIVE *sd_rel = (SECURITY_DESCRIPTOR_RELATIVE *)buf; + SECURITY_DESCRIPTOR sd; + NTSTATUS status; + DWORD len; + + if (!pRtlMakeSelfRelativeSD || !pRtlAbsoluteToSelfRelativeSD) + { + win_skip( "RtlMakeSelfRelativeSD/RtlAbsoluteToSelfRelativeSD not available\n" ); + return; + } + + memset( &sd, 0, sizeof(sd) ); + sd.Revision = SECURITY_DESCRIPTOR_REVISION; + + len = 0; + status = pRtlMakeSelfRelativeSD( &sd, NULL, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %08x\n", status ); + ok( len == sizeof(*sd_rel), "got %u\n", len ); + + len += 4; + status = pRtlMakeSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + + len = 0; + status = pRtlAbsoluteToSelfRelativeSD( &sd, NULL, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %08x\n", status ); + ok( len == sizeof(*sd_rel), "got %u\n", len ); + + len += 4; + status = pRtlAbsoluteToSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + + sd.Control = SE_SELF_RELATIVE; + status = pRtlMakeSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + + status = pRtlAbsoluteToSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_BAD_DESCRIPTOR_FORMAT, "got %08x\n", status ); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -2242,4 +2292,5 @@ START_TEST(rtl) test_RtlInitializeCriticalSectionEx(); test_RtlLeaveCriticalSection(); test_LdrEnumerateLoadedModules(); + test_RtlMakeSelfRelativeSD(); }

1 0

Hans Leidekker : advapi32/tests: Add tests for MakeSelfRelativeSD.
by Alexandre Julliard 24 Nov '17

24 Nov '17

Module: wine Branch: master Commit: 84a95032986c925c364952d6d2906310cde02774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a95032986c925c364952d6d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 24 11:32:59 2017 +0100 advapi32/tests: Add tests for MakeSelfRelativeSD. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 48 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e86fe21..51dcf90 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2731,12 +2731,12 @@ static void test_LookupAccountName(void) static void test_security_descriptor(void) { - SECURITY_DESCRIPTOR sd; + SECURITY_DESCRIPTOR sd, *sd_rel, *sd_rel2, *sd_abs; char buf[8192]; - DWORD size; + DWORD size, size_dacl, size_sacl, size_owner, size_group; BOOL isDefault, isPresent, ret; - PACL pacl; - PSID psid; + PACL pacl, dacl, sacl; + PSID psid, owner, group; SetLastError(0xdeadbeef); ret = InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION); @@ -2774,6 +2774,46 @@ static void test_security_descriptor(void) expect_eq(psid, NULL, PSID, "%p"); expect_eq(isDefault, FALSE, BOOL, "%d"); } + + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + "O:SYG:S-1-5-21-93476-23408-4576D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)" + "(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)" + "(AU;NPSA;0x12019f;;;SU)", SDDL_REVISION_1, (void **)&sd_rel, NULL); + ok(ret, "got %u\n", GetLastError()); + + size = 0; + ret = MakeSelfRelativeSD(sd_rel, NULL, &size); + todo_wine ok(!ret && GetLastError() == ERROR_BAD_DESCRIPTOR_FORMAT, "got %u\n", GetLastError()); + + /* convert to absolute form */ + size = size_dacl = size_sacl = size_owner = size_group = 0; + ret = MakeAbsoluteSD(sd_rel, NULL, &size, NULL, &size_dacl, NULL, &size_sacl, NULL, &size_owner, NULL, + &size_group); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + sd_abs = HeapAlloc(GetProcessHeap(), 0, size + size_dacl + size_sacl + size_owner + size_group); + dacl = (PACL)(sd_abs + 1); + sacl = (PACL)((char *)dacl + size_dacl); + owner = (PSID)((char *)sacl + size_sacl); + group = (PSID)((char *)owner + size_owner); + ret = MakeAbsoluteSD(sd_rel, sd_abs, &size, dacl, &size_dacl, sacl, &size_sacl, owner, &size_owner, + group, &size_group); + ok(ret, "got %u\n", GetLastError()); + + size = 0; + ret = MakeSelfRelativeSD(sd_abs, NULL, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(size == 184, "got %u\n", size); + + size += 4; + sd_rel2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = MakeSelfRelativeSD(sd_abs, sd_rel2, &size); + ok(ret, "got %u\n", GetLastError()); + ok(size == 188, "got %u\n", size); + + HeapFree(GetProcessHeap(), 0, sd_abs); + HeapFree(GetProcessHeap(), 0, sd_rel2); + LocalFree(sd_rel); } #define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,0,__LINE__)

1 0

Hans Leidekker : advapi32: Fix size returned from ConvertStringSecurityDescriptorToSecurityDescriptor on 64-bit.
by Alexandre Julliard 24 Nov '17

24 Nov '17

Module: wine Branch: master Commit: 5bc2e83c7ab550e27b2659fb3614db754054f636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc2e83c7ab550e27b2659fb3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 24 11:33:00 2017 +0100 advapi32: Fix size returned from ConvertStringSecurityDescriptorToSecurityDescriptor on 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 7281e01..f0c133e 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4652,7 +4652,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( LPBYTE lpNext = NULL; DWORD len; - *cBytes = sizeof(SECURITY_DESCRIPTOR); + *cBytes = sizeof(SECURITY_DESCRIPTOR_RELATIVE); tok = heap_alloc( (lstrlenW(StringSecurityDescriptor) + 1) * sizeof(WCHAR));

1 0

Francois Gouget : testbot: Don' t check idle and off VMs on the Engine shutdown.
by Alexandre Julliard 24 Nov '17

24 Nov '17

Module: tools Branch: master Commit: cef9778f92efcff5c08ddfadb4a128db9203eea5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cef9778f92efcff5c08ddfad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 24 09:59:13 2017 +0100 testbot: Don't check idle and off VMs on the Engine shutdown. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 598d2bd..ad492f6 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -96,9 +96,9 @@ In all other cases the VM is powered off and marked as such. =back =cut -sub Cleanup(;$$) +sub Cleanup($;$$) { - my ($KillTasks, $KillVMs) = @_; + my ($Starting, $KillTasks, $KillVMs) = @_; # Verify that the running tasks are still alive and requeue them if not. # Ignore the Job and Step status fields because they may be a bit out of date. @@ -128,7 +128,7 @@ sub Cleanup(;$$) } elsif ($KillTasks) { - # We will kill the Task's process so requeue the Task. + # We will kill the child process so requeue the Task. $Requeue = 1; } else @@ -193,7 +193,7 @@ sub Cleanup(;$$) } # else let the process finish its work } - else + elsif ($Starting) { if ($VM->Status eq "idle") { @@ -241,7 +241,7 @@ sub HandleShutdown($$) return "0Invalid KillVMs shutdown parameter\n"; } - Cleanup($KillTasks, $KillVMs); + Cleanup(0, $KillTasks, $KillVMs); $RunEngine = 0; LogMsg "Waiting for the last clients to disconnect...\n"; @@ -715,7 +715,7 @@ sub main() LogMsg "Capping MaxRevertsWhileRunningVMs to MaxRevertingVMs ($MaxRevertsWhileRunningVMs)\n"; } $MaxVMsWhenIdle ||= $MaxActiveVMs; - Cleanup(); + Cleanup(1); # Check for patches that arrived while the server was off. HandleWinePatchMLSubmission();

1 0

Francois Gouget : testbot: Fix the $Tunnel configuration setting prefix.
by Alexandre Julliard 24 Nov '17

24 Nov '17

Module: tools Branch: master Commit: c9ccc6cd895aa33004f761fb9d796678370e8a4b URL: http://source.winehq.org/git/tools.git/?a=commit;h=c9ccc6cd895aa33004f761fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 24 09:59:32 2017 +0100 testbot: Fix the $Tunnel configuration setting prefix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 1b1a62e..6ac6b44 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -90,7 +90,7 @@ $WineTestBot::Config::AgentPort = undef; # - If set to an SSH URI, then tunneling is performed using these parameters. # - Any other setting disables SSH tunneling. In particular to disable # tunneling for SSH VirtURIs it is recommended to set this to 'never'. -$Tunnel = undef; +$WineTestBot::Config::Tunnel = undef; # If set this specifies the SSH tunnel parameters to be used for the # TestAgent connection. This is mostly useful for parameters that cannot be

1 0

Francois Gouget : testbot: Improve the $VM::GetHost() documentation.
by Alexandre Julliard 24 Nov '17

24 Nov '17

Module: tools Branch: master Commit: 011f01d4a353c8779fc83432a3452660d8b7b922 URL: http://source.winehq.org/git/tools.git/?a=commit;h=011f01d4a353c8779fc83432… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 24 10:00:04 2017 +0100 testbot: Improve the $VM::GetHost() documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 7bd6d64..b931342 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -179,7 +179,9 @@ sub GetHost($) { my ($self) = @_; - # The URI is of the form protocol://user(a)hostname/hypervisor-specific-data + # VirtURI is of the form proto://user(a)hostname:port/hypervisor-specific-data + # This returns the 'hostname:port' part. Note that the port can be used to + # tunnel connections to different VM hosts and thus must be included. return $1 if ($self->VirtURI =~ m%^[^:]+://(?:[^/@]*@)?([^/]+)/%); return "localhost"; }

1 0

David Collett : kernel32: Adjust data directories in UpdateResource API.
by Alexandre Julliard 24 Nov '17

24 Nov '17

Module: wine Branch: master Commit: ea640e1aa7033a694eb8474c8cb69ecbbc160671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea640e1aa7033a694eb8474c8… Author: David Collett <david.collett(a)gmail.com> Date: Thu Nov 23 16:02:55 2017 +1100 kernel32: Adjust data directories in UpdateResource API. 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(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/resource.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index c88c921..73f3cca 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -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; } }

1 0