September 2019 - Wine-devel

Wine staging 4.16 release
by Alistair Leslie-Hughes 14 Sep '19

14 Sep '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.16 (820 patches are applied to wine vanilla) A new registry option 'multiply_special', values from 0 to 2, for D3D has been added, which is to work around games that have issues with some INF operations. Affected Games - Final Fantasy XIV - The Witcher 2 - Orcs Must Die! - Need for Speed Shift 2 - Darkness II - Giana Sisters: Twisted Dreams - SpinTires - Resident Evil 4 - Alan Wake. Please see bug 34266 for more information about the INF issue. Upstreamed (Either directly from staging or fixed with a similar patch). * ntdll: Implement RtlIpv4StringToAddress(Ex)W * ntdll: Implement RtlIpv4StringToAddress(Ex)A * setupapi: Create registry keys for display devices and display drivers. * setupapi: Handle the case that a full driver path is passed to SetupDiGetClassDevs. * setupapi: Also create HardwareId registry key for display devices. Added: * [34266] wined3d: Add a setting to workaround 0 * inf problem in shader models 1-3. * [47757] mfplat: Add MFGetConfigurationDWORD stub. Updated: * directmanipulation-new-dll Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v2] configure: Also try /usr/lib32/pkgconfig/ for the 32-bit PKG_CONFIG_PATH.
by Zebediah Figura 13 Sep '19

13 Sep '19

As 20d41d9e2, but some distributions (e.g. Manjaro, and probably Arch in general) use this path instead. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a3410e458e3..afad1972e37 100755 --- a/configure +++ b/configure @@ -5596,7 +5596,7 @@ $as_echo "$wine_cv_cc_m32" >&6; } notice_platform="32-bit " TARGETFLAGS="-m32" - PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} + PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} with_unwind=${with_unwind:-no} diff --git a/configure.ac b/configure.ac index 133e1ee1c58..c6f0a625586 100644 --- a/configure.ac +++ b/configure.ac @@ -159,7 +159,7 @@ case $host in host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") - PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} + PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} with_unwind=${with_unwind:-no} -- 2.23.0

1 0

[PATCH] configure: Also try /usr/lib32/pkgconfig/ for the 32-bit PKG_CONFIG_PATH.
by Zebediah Figura 13 Sep '19

13 Sep '19

As 20d41d9e2, but some distributions (e.g. Manjaro, and probably Arch in general) use this path instead. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index a3410e458e3..afad1972e37 100755 --- a/configure +++ b/configure @@ -5596,7 +5596,7 @@ $as_echo "$wine_cv_cc_m32" >&6; } notice_platform="32-bit " TARGETFLAGS="-m32" - PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} + PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} with_unwind=${with_unwind:-no} -- 2.23.0

1 0

[PATCH] testbot: Export BatchQuote() from the Utils module.
by Francois Gouget 13 Sep '19

13 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I forgot to export BatchQuote() which broke WineRunTask.pl, but fortunately only for the full WineTest-suite case which is why I missed the issue. Once the patch has been applied I can manually restart the impacted jobs. testbot/lib/WineTestBot/Utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 97fb1292a..711917c7a 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -31,7 +31,7 @@ our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir DurationToString BuildEMailRecipient IsValidFileName BuildTag SanitizeTag LocaleName NotifyAdministrator - ShQuote ShArgv2Cmd); + BatchQuote ShQuote ShArgv2Cmd); use Fcntl; -- 2.20.1

1 0

[PATCH 4/4] winex11.drv: Handle XRandR display device changes.
by Zhiyi Zhang 13 Sep '19

13 Sep '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fd3bfd8b87..c07fe703be 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ static int primary_crtc; #endif #ifdef HAVE_XRRGETPROVIDERREDOURCES +MAKE_FUNCPTR(XRRSelectInput) MAKE_FUNCPTR(XRRGetOutputPrimary) MAKE_FUNCPTR(XRRGetProviderResources) MAKE_FUNCPTR(XRRFreeProviderResources) @@ -119,6 +120,7 @@ static int load_xrandr(void) #endif #ifdef HAVE_XRRGETPROVIDERREDOURCES + LOAD_FUNCPTR(XRRSelectInput) LOAD_FUNCPTR(XRRGetOutputPrimary) LOAD_FUNCPTR(XRRGetProviderResources) LOAD_FUNCPTR(XRRFreeProviderResources) @@ -963,6 +965,12 @@ static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) heap_free( monitors ); } +static BOOL xrandr14_device_change_event( HWND hwnd, XEvent *event ) +{ + X11DRV_DisplayDevices_Init( TRUE ); + return TRUE; +} + #endif void X11DRV_XRandR_Init(void) @@ -1010,6 +1018,15 @@ void X11DRV_XRandR_Init(void) handler.pGetMonitors = xrandr14_get_monitors; handler.pFreeMonitors = xrandr14_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); + + pXRRSelectInput( thread_init_display(), root_window, + RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask); + X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_event, + "XRandR CrtcChange" ); + X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_event, + "XRandR OutputChange" ); + X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_event, + "XRandR ProviderChange" ); } #endif } -- 2.23.0

2 1

[PATCH 2/4] winex11.drv: Add virtual desktop display device handler.
by Zhiyi Zhang 13 Sep '19

13 Sep '19

The virtual desktop display device handler is actually the Xinerama handler, but with a much higher priority. So that it will be preferred in virtual desktop mode when other display device handlers are introduced, e.g., the XRandR handler. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xinerama.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 370d34e9cd..8e08221343 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -304,6 +304,7 @@ void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; + BOOL desktop_mode = FALSE; int i; RECT rect; @@ -318,6 +319,7 @@ void xinerama_init( unsigned int width, unsigned int height ) query_desktop_work_area( &default_monitor.rcWork ); nb_monitors = 1; monitors = &default_monitor; + desktop_mode = TRUE; } primary = get_primary(); @@ -334,8 +336,8 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } - handler.name = "Xinerama"; - handler.priority = 100; + handler.name = desktop_mode ? "Desktop" : "Xinerama"; + handler.priority = desktop_mode ? 1000 : 100; handler.pGetGpus = xinerama_get_gpus; handler.pGetAdapters = xinerama_get_adapters; handler.pGetMonitors = xinerama_get_monitors; -- 2.23.0

2 1

[PATCH 1/4] winex11.drv: Initialize display devices before getting primary desktop rectangle.
by Zhiyi Zhang 13 Sep '19

13 Sep '19

Otherwise, the retrieved primary desktop might be from the last explorer instance if we launch new explorer instances before wine server fully shuts down. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index ecbcd6b381..fed8dd32e9 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -147,15 +147,18 @@ static LONG X11DRV_desktop_SetCurrentMode(int mode) */ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) { - RECT primary_rect = get_primary_monitor_rect(); + RECT primary_rect; root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ - max_width = primary_rect.right - primary_rect.left; - max_height = primary_rect.bottom - primary_rect.top; + xinerama_init( width, height ); X11DRV_DisplayDevices_Init( TRUE ); + primary_rect = get_primary_monitor_rect(); + max_width = primary_rect.right - primary_rect.left; + max_height = primary_rect.bottom - primary_rect.top; + /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", X11DRV_desktop_GetCurrentMode, -- 2.23.0

2 1

[PATCH 1/2] gdi32/tests: Fix a test failure on Win10 1809.
by Zhiyi Zhang 13 Sep '19

13 Sep '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 2d9ef1dd88..3e23ce4020 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -816,7 +816,7 @@ static void test_DeleteDC(void) ok(ret, "UnregisterClassA failed\n"); ret = GetObjectType(hdc_test); - ok(!ret, "GetObjectType should fail for a deleted DC\n"); + ok(!ret || broken(ret) /* win10 1809 */, "GetObjectType should fail for a deleted DC\n"); /* CS_OWNDC */ memset(&cls, 0, sizeof(cls)); -- 2.23.0

2 1

[PATCH] vkd3d-shader: Enable DemoteToHelperInvocation capability
by Philip Rebohle 13 Sep '19

13 Sep '19

Fixes validation errors complaining about invalid shader modules. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0fb499e..fe8935c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6510,6 +6510,7 @@ static void vkd3d_dxbc_compiler_emit_kill(struct vkd3d_dxbc_compiler *compiler, if (vkd3d_dxbc_compiler_is_target_extension_supported(compiler, VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION)) { + vkd3d_spirv_enable_capability(builder, SpvCapabilityDemoteToHelperInvocationEXT); vkd3d_spirv_build_op_demote_to_helper_invocation(builder); vkd3d_spirv_build_op_branch(builder, merge_block_id); } -- 2.23.0

2 1

[PATCH 1/2] configure: Fix argument type of unw_step().
by Huw Davies 13 Sep '19

13 Sep '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index dfa6b6ac9c..49676f073b 100644 --- a/configure.ac +++ b/configure.ac @@ -1697,7 +1697,7 @@ then [AC_CACHE_CHECK([for unw_step],wine_cv_have_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY #include <libunwind.h>]], - [[unw_context_t context; unw_step( &context );]])], + [[unw_cursor_t cursor; unw_step( &cursor );]])], [wine_cv_have_unw_step="yes"],[wine_cv_have_unw_step="no"])]) if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" then @@ -1706,7 +1706,7 @@ then AC_CACHE_CHECK([for unw_step in libunwind],wine_cv_have_libunwind_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY #include <libunwind.h>]], - [[unw_context_t context; unw_step( &context );]])], + [[unw_cursor_t cursor; unw_step( &cursor );]])], [wine_cv_have_libunwind_unw_step="yes"], [wine_cv_have_libunwind_unw_step="no"])]) LIBS=$save_libs -- 2.23.0

3 3