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

Zebediah Figura : build: Clean widl generated headers if building with widl.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

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 Aug. 7, 2020

Aug. 7, 2020

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

Andrew Eikum : winebus.sys: Don't return too early if SDL initialization succeeds.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 4246ff4b16694bab815573c6ff33103711a15bcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4246ff4b16694bab815573c6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 21 09:19:12 2020 -0600 winebus.sys: Don't return too early if SDL initialization succeeds. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6cb3d0fb3778f660546e581787b1734e2b1d2955) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 8bba968202..2388033ced 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -559,7 +559,10 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) if (check_bus_option(&SDL_enabled, 1)) { if (sdl_driver_init() == STATUS_SUCCESS) - return STATUS_SUCCESS; + { + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + } } udev_driver_init(); iohid_driver_init();

1 0

Sven Baars : kernelbase: Fix a string leak in CreateProcessInternal (Valgrind).
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 3e0050f840e8f78826c9ffe5d3231b5075fbb6f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e0050f840e8f78826c9ffe5… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Apr 18 22:06:46 2020 +0200 kernelbase: Fix a string leak in CreateProcessInternal (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a202ecd457d7b13a0534398ca0227e78ad77f7b0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 3cd2934c20..4694be0306 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -182,10 +182,12 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename &cmdlineW, envW, &titleW, &desktopW, NULL, &runtimeW, PROCESS_PARAMS_FLAG_NORMALIZED )) { + RtlFreeUnicodeString( &newdirW ); RtlReleasePath( load_path ); if (envW != env) RtlFreeHeap( GetProcessHeap(), 0, envW ); return NULL; } + RtlFreeUnicodeString( &newdirW ); RtlReleasePath( load_path ); if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1;

1 0

Martin Storsjo : ntdll: Pass a nonnull handler_data when continuing after a collided unwind on arm64.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 6ff71b41275e63071c509c6a56573839b45d9d83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ff71b41275e63071c509c6a… Author: Martin Storsjo <martin(a)martin.st> Date: Mon May 18 15:16:28 2020 +0300 ntdll: Pass a nonnull handler_data when continuing after a collided unwind on arm64. This fixes crashes when handling GNU/mingw style SEH based C++ exceptions on arm64; in these cases unwind_full_data ended up where it tries to write handler_rva + 1 to *handler_data. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 93ecc54ae560a3677dfa78ca0f5448d7aef0cbd9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index d131160a76..614451d148 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1857,7 +1857,8 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.ContextRecord = context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, - &new_context, NULL, &frame, NULL ); + &new_context, &dispatch.HandlerData, &frame, + NULL ); rec->ExceptionFlags |= EH_COLLIDED_UNWIND; goto unwind_done; } @@ -1880,7 +1881,8 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.ContextRecord = context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, - &new_context, NULL, &frame, NULL ); + &new_context, &dispatch.HandlerData, + &frame, NULL ); rec->ExceptionFlags |= EH_COLLIDED_UNWIND; goto unwind_done; }

1 0

Zebediah Figura : ntoskrnl.exe: Protect the two relocated pages independently.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

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

Alistair Leslie-Hughes : shell32: Correct if condition.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

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

Alexandre Julliard : secur32/tests: Update for new WineHQ certificate.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: b96ba1f645f759d331a451cc2d1db547ebb94c85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b96ba1f645f759d331a451cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 19:23:31 2020 +0200 secur32/tests: Update for new WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 16254af818095216e10aee4d9032a8def3ac3344) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 217dbe8dfa..315133659f 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -564,7 +564,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 4, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Sven Baars : setupapi: Only copy driver info if SetupDiEnumDriverInfoW succeeded (Valgrind).
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 20285f03434584536e9453f42e6407abb3524158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20285f03434584536e9453f4… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Apr 17 20:20:11 2020 +0200 setupapi: Only copy driver info if SetupDiEnumDriverInfoW succeeded (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b08974900f5855f548ab36b43049bec158bd7a2d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/devinst.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b2bdc4b4d9..8969abd8ee 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4642,7 +4642,8 @@ BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat driver_dataW.cbSize = sizeof(driver_dataW); ret = SetupDiEnumDriverInfoW(devinfo, device_data, type, index, &driver_dataW); - driver_data_wtoa(driver_data, &driver_dataW); + if (ret) driver_data_wtoa(driver_data, &driver_dataW); + return ret; }

1 0

Zebediah Figura : ntdll: Avoid leaking the previous environment in RtlSetCurrentEnvironment().
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 04d635555a259112e6e0fcb3a6715941f18140f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d635555a259112e6e0fcb3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 09:40:27 2020 -0500 ntdll: Avoid leaking the previous environment in RtlSetCurrentEnvironment(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e012bd5811784d953d576a4591c7be14234c92b9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/env.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index c5175080c4..d7010cf8b7 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -973,14 +973,21 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, */ void WINAPI RtlSetCurrentEnvironment(PWSTR new_env, PWSTR* old_env) { + WCHAR *prev; + TRACE("(%p %p)\n", new_env, old_env); RtlAcquirePebLock(); - if (old_env) *old_env = NtCurrentTeb()->Peb->ProcessParameters->Environment; + prev = NtCurrentTeb()->Peb->ProcessParameters->Environment; NtCurrentTeb()->Peb->ProcessParameters->Environment = new_env; RtlReleasePebLock(); + + if (old_env) + *old_env = prev; + else + RtlDestroyEnvironment( prev ); }

1 0