August 2020 - Wine-commits - list.winehq.org

Zebediah Figura : build: Clean widl generated headers if building with widl.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: vkd3d Branch: master Commit: 7a414b1afc29ff907be8de8faf948ed2bee7bbd9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7a414b1afc29ff907be8de8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 6 12:18:58 2020 -0500 build: Clean widl generated headers if building with widl. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index b172517..fc10ba6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -174,6 +174,9 @@ vkd3d_v_widl_ = $(vkd3d_v_widl_(a)AM_DEFAULT_V@) vkd3d_v_widl_0 = @echo " WIDL " $@; vkd3d_v_widl_1 = +if HAVE_WIDL +CLEANFILES += $(widl_headers) +endif EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL

1 0

Alexandre Julliard : Wine release 5.0.2
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: website Branch: master Commit: c1c69dcd6a321698538a5d1930b7b45cdd1bab0d URL: https://source.winehq.org/git/website.git/?a=commit;h=c1c69dcd6a321698538a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 7 17:42:36 2020 +0200 Wine release 5.0.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020080701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2020080701.xml b/news/en/2020080701.xml new file mode 100644 index 00000000..999cb992 --- /dev/null +++ b/news/en/2020080701.xml @@ -0,0 +1,12 @@ +<news> +<date>August 7, 2020</date> +<title>Wine 5.0.2 Released</title> +<body> + The Wine maintenance release 5.0.2 is now available. + <a href="{$root}/announce/5.0.2">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0.2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Zhiyi Zhang : kernelbase: Check NULL canonicalized_len parameter in UrlCanonicalizeW().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 07c2630b48a8164e5cfe238d1d2cccf1f690174a URL: https://source.winehq.org/git/wine.git/?a=commit;h=07c2630b48a8164e5cfe238d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 18 09:52:03 2020 +0800 kernelbase: Check NULL canonicalized_len parameter in UrlCanonicalizeW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49175 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3cbd9cda195be6afc4290202b6676417812e536b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 9b016a882e..e94904723d 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -3544,7 +3544,7 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR TRACE("%s, %p, %p, %#x\n", wine_dbgstr_w(src_url), canonicalized, canonicalized_len, flags); - if (!src_url || !canonicalized || !canonicalized || !*canonicalized_len) + if (!src_url || !canonicalized || !canonicalized_len || !*canonicalized_len) return E_INVALIDARG; if (!*src_url)

1 0

Alistair Leslie-Hughes : shell32: Correct if condition.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 5af9660066d74454922d443fbc8be7def4b2411f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5af9660066d74454922d443f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 20 11:01:42 2020 +1000 shell32: Correct if condition. Spotted by Rafał Mikrut. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49203 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 839f468dce6e716632965d348910e4278bff5a85) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index ff1332087d..63512deb4b 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1838,7 +1838,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView3 *iface, MSG FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%x wp=%x) stub\n",This,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); #endif - if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message>=WM_KEYLAST)) + if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message<=WM_KEYLAST)) { TRACE("-- key=0x04%lx\n",lpmsg->wParam) ; }

1 0

Brendan Shanks : dinput: Fix crash in dump_DIEFFECT() when rglDirection is unexpectedly NULL.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 0ee6ca739ee6f6ea2777a861ed372dd5e26bd6e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ee6ca739ee6f6ea2777a861… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Mar 24 17:13:36 2020 -0700 dinput: Fix crash in dump_DIEFFECT() when rglDirection is unexpectedly NULL. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f925becd4af104b196440442c50858ea88d3cf17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 01611b0e44..19dd9ad736 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -207,7 +207,7 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) TRACE(" - dwTriggerButton: %d\n", eff->dwTriggerButton); TRACE(" - dwTriggerRepeatInterval: %d\n", eff->dwTriggerRepeatInterval); TRACE(" - rglDirection: %p\n", eff->rglDirection); - if (dwFlags & DIEP_DIRECTION) { + if (dwFlags & DIEP_DIRECTION && eff->rglDirection) { TRACE(" "); for (i = 0; i < eff->cAxes; ++i) TRACE("%d ", eff->rglDirection[i]);

1 0

Paul Gofman : d3d11: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 1992dcb5d5df890bc0d082a548bb97e946da530d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1992dcb5d5df890bc0d082a5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 25 21:28:07 2020 +0300 d3d11: Use stricmp() instead of _strnicmp(..., -1). Fixes Epic Games Launcher crash with native ucrtbase.dll. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fa990afbbc4ac09f06be847d35e47389364acf98) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d11/inputlayout.c | 2 +- dlls/d3d11/shader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 9bee927a7b..e27984212b 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -30,7 +30,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { - if (!_strnicmp(e[i].semantic_name, semantic_name, -1) && e[i].semantic_idx == semantic_idx + if (!stricmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx && e[i].stream_idx == stream_idx) return &e[i]; } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 6bec79740b..d51d8e4e60 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1024,7 +1024,7 @@ static HRESULT validate_stream_output_entries(const D3D11_SO_DECLARATION_ENTRY * continue; if (e1->Stream == e2->Stream - && !_strnicmp(e1->SemanticName, e2->SemanticName, -1) + && !stricmp(e1->SemanticName, e2->SemanticName) && e1->SemanticIndex == e2->SemanticIndex && e1->StartComponent < e2->StartComponent + e2->ComponentCount && e1->StartComponent + e1->ComponentCount > e2->StartComponent)

1 0

Martin Storsjo : ntdll: Properly return errors when failing to unwind.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 46a8d39edc2f0e7b276accc2a9adcf969e4c2325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a8d39edc2f0e7b276accc2… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Apr 10 00:42:21 2020 +0300 ntdll: Properly return errors when failing to unwind. If libunwind is unavailable, make libunwind_virtual_unwind return an error. Likewise if there was no PE exception info and we didn't try unwinding using libunwind, we need to return an error when realizing we were unable to unwind, instead of just warning and returning success. This fixes hangs/infinite loops on crashes when unwinding fails. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ea9f47a767c20cdda3d912708b789314f09f8e28) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 6d72938809..d131160a76 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -597,8 +597,10 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX context->u.s.X24, context->u.s.X25, context->u.s.X26, context->u.s.X27 ); TRACE(" x28=%016lx fp=%016lx lr=%016lx sp=%016lx\n", context->u.s.X28, context->u.s.Fp, context->u.s.Lr, context->Sp ); -#endif return STATUS_SUCCESS; +#else + return STATUS_INVALID_DISPOSITION; +#endif } @@ -645,7 +647,11 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX return STATUS_SUCCESS; } } - else WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); + else + { + WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); + return STATUS_INVALID_DISPOSITION; + } dispatch->EstablisherFrame = context->u.s.Fp; dispatch->LanguageHandler = NULL;

1 0

Brendan Shanks : dinput: Fix crash in dump_DIEFFECT() when lpvTypeSpecificParams is unexpectedly NULL.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 997f5e63044650db9d6871d19dbc9949b779ce0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=997f5e63044650db9d6871d1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 23 22:31:12 2020 -0700 dinput: Fix crash in dump_DIEFFECT() when lpvTypeSpecificParams is unexpectedly NULL. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cf40880c69a3095c0c7f0e8a30b72e53ccbb5648) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 19dd9ad736..2eab4d3a33 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -241,34 +241,42 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) if (type == DIEFT_CONSTANTFORCE) { if (eff->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) { WARN("Effect claims to be a constant force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DICONSTANTFORCE(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_PERIODIC) { if (eff->cbTypeSpecificParams != sizeof(DIPERIODIC)) { WARN("Effect claims to be a periodic force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DIPERIODIC(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_RAMPFORCE) { if (eff->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) { WARN("Effect claims to be a ramp force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DIRAMPFORCE(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_CONDITION) { - if (eff->cbTypeSpecificParams == sizeof(DICONDITION)) { + if (eff->cbTypeSpecificParams == sizeof(DICONDITION) && eff->lpvTypeSpecificParams) { _dump_DICONDITION(eff->lpvTypeSpecificParams); - } else if (eff->cbTypeSpecificParams == 2 * sizeof(DICONDITION)) { + } else if (eff->cbTypeSpecificParams == 2 * sizeof(DICONDITION) && eff->lpvTypeSpecificParams) { DICONDITION *condition = eff->lpvTypeSpecificParams; _dump_DICONDITION(&condition[0]); _dump_DICONDITION(&condition[1]); } else { - WARN("Effect claims to be a condition but the type-specific params are the wrong size!\n"); + WARN("Effect claims to be a condition but the type-specific params are the wrong size or NULL!\n"); } } else if (type == DIEFT_CUSTOMFORCE) { if (eff->cbTypeSpecificParams != sizeof(DICUSTOMFORCE)) { WARN("Effect claims to be a custom force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DICUSTOMFORCE(eff->lpvTypeSpecificParams); }

1 0

Zebediah Figura : ntoskrnl.exe: Protect relocated pages one at a time.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 44032115df6e3668217bc98d1b7078a34b09a609 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44032115df6e3668217bc98d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 2 20:55:54 2020 -0500 ntoskrnl.exe: Protect relocated pages one at a time. Blindwrite 7's ezplay.sys has sections which are consecutive in memory but not page aligned. Thus changing the protection to PROT_READWRITE one section at a time has the effect that old_prot for all sections but the first is set to PROT_READWRITE (actually, PROT_WRITECOPY), causing us to restore the wrong protection and the driver to crash in its entry point. To fix this, protect and unprotect one page at a time while processing it, i.e. essentially revert 6c0a8c359. To avoid reintroducing bug 28254, protect two pages at a time instead of just one. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 22dfb0df10b44d1c21b3d04b59312670c2318431) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 36637331c1..f6b27d8c2f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3378,16 +3378,13 @@ static inline void *get_rva( HMODULE module, DWORD va ) return (void *)((char *)module + va); } -/* Copied from ntdll with checks for page alignment and characteristics removed */ -static NTSTATUS perform_relocations( void *module, SIZE_T len ) +static NTSTATUS perform_relocations( void *module, SIZE_T len, ULONG page_size ) { IMAGE_NT_HEADERS *nt; char *base; IMAGE_BASE_RELOCATION *rel, *end; const IMAGE_DATA_DIRECTORY *relocs; - const IMAGE_SECTION_HEADER *sec; INT_PTR delta; - ULONG protect_old[96], i; nt = RtlImageNtHeader( module ); base = (char *)nt->OptionalHeader.ImageBase; @@ -3406,19 +3403,6 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) if (!relocs->Size) return STATUS_SUCCESS; if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; - if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) - return STATUS_INVALID_IMAGE_FORMAT; - - sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + - nt->FileHeader.SizeOfOptionalHeader); - for (i = 0; i < nt->FileHeader.NumberOfSections; i++) - { - void *addr = get_rva( module, sec[i].VirtualAddress ); - SIZE_T size = sec[i].SizeOfRawData; - NtProtectVirtualMemory( NtCurrentProcess(), &addr, - &size, PAGE_READWRITE, &protect_old[i] ); - } - TRACE( "relocating from %p-%p to %p-%p\n", base, base + len, module, (char *)module + len ); @@ -3428,25 +3412,24 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) while (rel < end - 1 && rel->SizeOfBlock) { + void *page = get_rva( module, rel->VirtualAddress ); + DWORD old_prot; + if (rel->VirtualAddress >= len) { WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); return STATUS_ACCESS_VIOLATION; } - rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), - (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + + /* Relocation entries may hang over the end of the page, so we need to + * protect two pages. */ + VirtualProtect( page, page_size * 2, PAGE_READWRITE, &old_prot ); + rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); + VirtualProtect( page, page_size * 2, old_prot, &old_prot ); if (!rel) return STATUS_INVALID_IMAGE_FORMAT; } - for (i = 0; i < nt->FileHeader.NumberOfSections; i++) - { - void *addr = get_rva( module, sec[i].VirtualAddress ); - SIZE_T size = sec[i].SizeOfRawData; - NtProtectVirtualMemory( NtCurrentProcess(), &addr, - &size, protect_old[i], &protect_old[i] ); - } - return STATUS_SUCCESS; } @@ -3475,7 +3458,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - status = perform_relocations(module, nt->OptionalHeader.SizeOfImage); + status = perform_relocations( module, nt->OptionalHeader.SizeOfImage, info.PageSize ); if (status != STATUS_SUCCESS) goto error;

1 0

Zebediah Figura : ntoskrnl.exe: Protect the two relocated pages independently.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 02d156580efef9035baac2b702ce999759329248 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d156580efef9035baac2b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 22 09:52:56 2020 -0500 ntoskrnl.exe: Protect the two relocated pages independently. They may have different protection flags. This fixes a regression introduced by 22dfb0df10b44d1c21b3d04b59312670c2318431. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49198 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c750ae6b9dc85fd2173e40a07204388988b64532) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f6b27d8c2f..25ace4f1a3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3412,8 +3412,8 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len, ULONG page_size ) while (rel < end - 1 && rel->SizeOfBlock) { - void *page = get_rva( module, rel->VirtualAddress ); - DWORD old_prot; + char *page = get_rva( module, rel->VirtualAddress ); + DWORD old_prot1, old_prot2; if (rel->VirtualAddress >= len) { @@ -3423,10 +3423,12 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len, ULONG page_size ) /* Relocation entries may hang over the end of the page, so we need to * protect two pages. */ - VirtualProtect( page, page_size * 2, PAGE_READWRITE, &old_prot ); + VirtualProtect( page, page_size, PAGE_READWRITE, &old_prot1 ); + VirtualProtect( page + page_size, page_size, PAGE_READWRITE, &old_prot2 ); rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); - VirtualProtect( page, page_size * 2, old_prot, &old_prot ); + VirtualProtect( page, page_size, old_prot1, &old_prot1 ); + VirtualProtect( page + page_size, page_size, old_prot2, &old_prot2 ); if (!rel) return STATUS_INVALID_IMAGE_FORMAT; }

1 0