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

Sven Baars : ntdll: Fix a memory leak in fork_and_exec.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 8ddf9bd717f6f7cd65ed1e8038c527fa9073830d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ddf9bd717f6f7cd65ed1e80… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Apr 18 22:06:48 2020 +0200 ntdll: Fix a memory leak in fork_and_exec. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1cfaf1425a965d54331a2cc4906cad9fb56b8a56) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index cb8f942ed3..82faef3212 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1555,6 +1555,7 @@ static NTSTATUS fork_and_exec( UNICODE_STRING *path, const RTL_USER_PROCESS_PARA if (stdout_fd != -1) close( stdout_fd ); RtlFreeHeap( GetProcessHeap(), 0, argv ); RtlFreeHeap( GetProcessHeap(), 0, envp ); + RtlFreeHeap( GetProcessHeap(), 0, unixdir ); RtlFreeAnsiString( &unix_name ); return status; }

1 0

Zhiyi Zhang : setupapi: Fix a registry key handle leak.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 617b3b0c3364af02a7a0d3a11263968d26f25107 URL: https://source.winehq.org/git/wine.git/?a=commit;h=617b3b0c3364af02a7a0d3a1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Apr 17 21:51:01 2020 +0800 setupapi: Fix a registry key handle leak. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e570c2fe591ee2680bd18ef31e9d657f3d0f389b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/devinst.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index e561fcd996..f3546e6d96 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4224,6 +4224,7 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ { value_size = prop_buff_size; ls = RegQueryValueExW(hkey, NULL, NULL, &value_type, prop_buff, &value_size); + RegCloseKey(hkey); } switch (ls)

1 0

Brendan Shanks : vulkan-1: Set FILEVERSION to fix official Vulkan loader installer.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: a2279ac9997eeaf4ee00936a3047ebd1aa9f8443 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2279ac9997eeaf4ee00936a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Mar 20 17:28:31 2020 -0700 vulkan-1: Set FILEVERSION to fix official Vulkan loader installer. Red Dead Redemption 2 requires and installs the official Vulkan loader, but the installer requires vulkan-1.dll's FILEVERSION to be lower than what it's installing. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1e41a38c3b45332f2202caecc04f1c93bdeeb020) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vulkan-1/version.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/vulkan-1/version.rc b/dlls/vulkan-1/version.rc index ec75462ddf..93cf661525 100644 --- a/dlls/vulkan-1/version.rc +++ b/dlls/vulkan-1/version.rc @@ -20,6 +20,7 @@ #define WINE_FILEDESCRIPTION_STR "Wine Vulkan Loader" #define WINE_FILENAME_STR "vulkan-1.dll" +#define WINE_FILEVERSION 1,0,0,0 /* Set to 1.0.0 so the official Vulkan runtime installer will replace this file */ #define WINE_FILEVERSION_STR PACKAGE_VERSION #define WINE_PRODUCTVERSION_STR PACKAGE_VERSION #define WINE_PRODUCTNAME_STR "Wine Vulkan"

1 0

Zebediah Figura : ntoskrnl.exe: Protect relocated pages one at a time.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

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

Martin Storsjo : ntdll: Properly return errors when failing to unwind.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

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

Paul Gofman : d3d11: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

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

Brendan Shanks : dinput: Fix crash in dump_DIEFFECT() when rglDirection is unexpectedly NULL.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

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

Tag wine-5.0.2 : Alexandre Julliard : Release 5.0.2
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: refs/tags/wine-5.0.2 Tag: 4b97c1d9b58c6d99948b91073640848bd75fd2e5 URL: https://source.winehq.org/git/wine.git/?a=tag;h=4b97c1d9b58c6d99948b9107364… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 7 17:40:53 2020 +0200 Release 5.0.2

1 0

Michael Stefaniuc : Release 5.0.2.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 736b5569449b3e991371dc6f2882ecbb1ac027cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=736b5569449b3e991371dc6f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 26 22:38:29 2020 +0200 Release 5.0.2. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 374 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +-- 4 files changed, 196 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=736b5569449b3e991371…

1 0

Alexandre Julliard : urlmon/tests: Update winehq.org's IP address.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: c803ee8c7c08c42222298d0cbfab367f7ca0f019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c803ee8c7c08c42222298d0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 22:34:00 2020 +0200 urlmon/tests: Update winehq.org's IP address. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ef9d05d9c2e62d31f59d1ad649856031b47a625b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/url.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index cfa29248d6..6dd47732dd 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -157,10 +157,9 @@ static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; -static const WCHAR wszWineHQSite[] = - {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; -static const WCHAR wszWineHQIP[] = - {'4','.','1','5','.','1','8','4','.','7','7',0}; +#define WINEHQ_IP "4.4.81.124" +static const WCHAR wszWineHQSite[] = L"www.winehq.org"; +static const WCHAR wszWineHQIP[] = L"" WINEHQ_IP; static const CHAR wszIndexHtmlA[] = "index.html"; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0}; static const CHAR dwl_htmlA[] = "dwl.html"; @@ -2870,7 +2869,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = "its:test.chm::/blank.html"; break; case HTTPS_TEST: - url_a = (flags & BINDTEST_INVALID_CN) ? "https://4.15.184.77/favicon.ico" : "https://test.winehq.org/tests/hello.html"; + url_a = (flags & BINDTEST_INVALID_CN) ? "https://" WINEHQ_IP "/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: url_a = "ftp://ftp.winehq.org/welcome%2emsg";

1 0