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

Martin Storsjo : ntdll: Pass a nonnull handler_data when continuing after a collided unwind on arm64.
by Alexandre Julliard 07 Aug '20

07 Aug '20

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

Brendan Shanks : vulkan-1: Set FILEVERSION to fix official Vulkan loader installer.
by Alexandre Julliard 07 Aug '20

07 Aug '20

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

Zhiyi Zhang : setupapi: Fix a registry key handle leak.
by Alexandre Julliard 07 Aug '20

07 Aug '20

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

Sven Baars : setupapi: Fix a memory leak (Valgrind).
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: e393f2d3ee37b5ea5c0c7b4c8a1a479223bb9437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e393f2d3ee37b5ea5c0c7b4c… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Apr 17 20:20:09 2020 +0200 setupapi: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 75e878346a61945c893ff989a3b0e4e4b1c6daf4) 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 f3546e6d96..b2bdc4b4d9 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -734,6 +734,7 @@ static void delete_device(struct device *device) RegCloseKey(device->key); heap_free(device->instanceId); + heap_free(device->drivers); LIST_FOR_EACH_ENTRY_SAFE(iface, next, &device->interfaces, struct device_iface, entry)

1 0

Sven Baars : kernelbase: Fix a string leak in CreateProcessInternal (Valgrind).
by Alexandre Julliard 07 Aug '20

07 Aug '20

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

Sven Baars : ntdll: Fix a memory leak in fork_and_exec.
by Alexandre Julliard 07 Aug '20

07 Aug '20

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

Zebediah Figura : ntdll: Avoid leaking the previous environment in RtlSetCurrentEnvironment().
by Alexandre Julliard 07 Aug '20

07 Aug '20

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

Sven Baars : setupapi: Only copy driver info if SetupDiEnumDriverInfoW succeeded (Valgrind).
by Alexandre Julliard 07 Aug '20

07 Aug '20

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

Sven Baars : setupapi: Make sure the class name is always set on success in SetupDiGetINFClassW (Valgrind).
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: d5d6d71e426fda1dafd312d6628d2717fef2187e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5d6d71e426fda1dafd312d6… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Apr 17 20:20:12 2020 +0200 setupapi: Make sure the class name is always set on success in SetupDiGetINFClassW (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dcc6a143e96ce7b500af2746834943ec346fe6b6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/devinst.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 8969abd8ee..ddff3367f3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4161,7 +4161,11 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, have_name = 0 < dret; if (dret >= MAX_PATH -1) FIXME("buffer might be too small\n"); - if (have_guid && !have_name) FIXME("class name lookup via guid not implemented\n"); + if (have_guid && !have_name) + { + class_name[0] = '\0'; + FIXME("class name lookup via guid not implemented\n"); + } if (have_name) {

1 0

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

07 Aug '20

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