October 2021 - Wine-devel - list.winehq.org

[PATCH 0/6] Allow using external static libraries for PE dependencies
by Zebediah Figura 20 Oct '21

20 Oct '21

It's not actually clear if the ZLIB_PE_CFLAGS and ZLIB_PE_LIBS introduced in 2929aa3c74 were meant for this purpose, given the number of ways in which they're broken. Nevertheless, it would be really quite nice to have, so this series aims to provide that. After these patches I'm able to compile wine using distribution static libraries, with the following configure flags: configure ZLIB_PE_CFLAGS="$(x86_64-w64-mingw32-pkg-config --cflags zlib)" ZLIB_PE_LIBS="-Wl,-Bstatic $(x86_64-w64-mingw32-pkg-config --static --libs zlib) -Wl,-Bdynamic" PNG_PE_CFLAGS="$(x86_64-w64-mingw32-pkg-config --cflags libpng16)" PNG_PE_LIBS="-Wl,-Bstatic $(x86_64-w64-mingw32-pkg-config --static --libs libpng16) -lmingwex -lmingw32 -Wl,-Bdynamic" Patches 5-6 are necessary to allow static linking of libpng16. Patch 4 is probably desirable on its own anyway. This is also a first step to actually acquiescing to what distributions have asked for. After this I intend to submit patches to: * allow automatic detection of distribution packages via MinGW pkg-config, which is pretty well standardized; * allow the use of dynamic libraries using the approach demonstrated in [1]. [1] https://www.winehq.org/pipermail/wine-devel/2021-September/195543.html Zebediah Figura (6): makefiles: Allow using external system headers in PE libraries. winegcc: Allow explicit static and dynamic linking. makefiles: Allow using *_PE_LIBS to specify linker flags to external static libraries. include: Add DECLSPEC_RETURNS_TWICE. ucrtbase: Export _setjmp() from the import library. ucrtbase: Export atexit() from the import library. aclocal.m4 | 5 ++++- configure.ac | 2 +- dlls/cabinet/Makefile.in | 3 ++- dlls/dbghelp/Makefile.in | 3 ++- dlls/opcservices/Makefile.in | 3 ++- dlls/ucrtbase/Makefile.in | 2 ++ dlls/ucrtbase/atexit.c | 31 +++++++++++++++++++++++++++++++ dlls/ucrtbase/setjmp.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/Makefile.in | 3 ++- dlls/windowscodecs/Makefile.in | 3 ++- dlls/wininet/Makefile.in | 3 ++- include/msvcrt/corecrt.h | 18 ++++++++++++++++++ include/msvcrt/setjmp.h | 8 ++------ include/wine/exception.h | 4 ++-- include/wine/unixlib.h | 4 ++-- include/winnt.h | 8 ++++++++ tools/makedep.c | 14 ++------------ tools/winegcc/winegcc.c | 16 ++++++++++++---- 18 files changed, 128 insertions(+), 34 deletions(-) create mode 100644 dlls/ucrtbase/atexit.c create mode 100644 dlls/ucrtbase/setjmp.c -- 2.33.0

4 14

[PATCH v2 1/2] winebus.sys: Treat udev actions other than "remove" as "add".
by Rémi Bernon 20 Oct '21

20 Oct '21

From: Simon McVittie <smcv(a)collabora.com> As per https://github.com/systemd/systemd/blob/v247-rc1/NEWS#L5 there are more kernel uevent types than just "add" and "remove", and we should be treating everything other than "remove" as being potentially an "add". To cope with this, try_add_device() now checks whether the same device was already added. If so, we ignore it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix compilation when HAVE_SYS_INOTIFY_H is not defined. dlls/winebus.sys/bus_udev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1cad63f0275..59bb2564def 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1411,16 +1411,14 @@ static void process_monitor_event(struct udev_monitor *monitor) if (!action) WARN("No action received\n"); - else if (strcmp(action, "add") == 0) + else if (strcmp(action, "remove")) udev_add_device(dev); - else if (strcmp(action, "remove") == 0) + else { impl = find_device_from_udev(dev); if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); else WARN("failed to find device for udev device %p\n", dev); } - else - WARN("Unhandled action %s\n", debugstr_a(action)); udev_device_unref(dev); } -- 2.33.0

1 1

[PATCH] user32: Change the position and size of layered windows before flushing their surfaces.
by Zhiyi Zhang 20 Oct '21

20 Oct '21

When UpdateLayeredWindow() is called to paint a window and update its size, USER_Driver->pUpdateLayeredWindow() needs to be called after the window position and size are updated. Otherwise, UpdateLayeredWindow() may flush the painted content to a smaller window and then enlarge it, losing the painted result. Fix Word 2016 window frame corruption after restoring from maximized state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/win.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e07b7d39e4b..4d0240f21a8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4134,10 +4134,8 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF TRACE( "window %p win %s client %s\n", hwnd, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(&client_rect) ); - if (!USER_Driver->pUpdateLayeredWindow( hwnd, info, &window_rect )) return FALSE; - set_window_pos( hwnd, 0, flags, &window_rect, &client_rect, NULL ); - return TRUE; + return USER_Driver->pUpdateLayeredWindow( hwnd, info, &window_rect ); } -- 2.32.0

2 1

[PATCH] winex11.drv: Maintain a backing store for layered windows.
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Copy the window content to a pixmap and set it as the background because the X server may discard the window content at any time, even when the backing store attribute is set to TRUE when creating a X11 window. Layered windows don't get repainted in X11DRV_Expose() like normal windows do and their content should always be kept. The window surface may be recreated when handling position and changes. So for most of the time, there is only one backing store for a window with this patch. It's possible that the we can reuse window surfaces but it's a much bigger change and risk breaking things. Fix Word 2016 frame window corruption after it's moved off-screen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/window.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7ec2639e309..c639b9d06d2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2706,6 +2706,9 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO HDC hdc = 0; HBITMAP dib; BOOL ret = FALSE; + int width, height; + Pixmap pixmap; + GC gc; if (!(data = get_win_data( hwnd ))) return FALSE; @@ -2726,11 +2729,15 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO else set_surface_color_key( surface, color_key ); if (surface) window_surface_add_ref( surface ); - release_win_data( data ); - if (!surface) return FALSE; + if (!surface) + { + release_win_data( data ); + return FALSE; + } if (!info->hdcSrc) { + release_win_data( data ); window_surface_release( surface ); return TRUE; } @@ -2767,7 +2774,24 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO surface->funcs->unlock( surface ); surface->funcs->flush( surface ); + /* Copy the window content to a pixmap and set it as the background because the X server may + * discard the window content at any time, even when the backing store attribute is set to TRUE + * when creating a X11 window. Layered windows don't get repainted in X11DRV_Expose() like + * normal windows do and their content should always be kept. */ + width = data->whole_rect.right - data->whole_rect.left; + height = data->whole_rect.bottom - data->whole_rect.top; + if (width > 0 && height > 0) + { + pixmap = XCreatePixmap( data->display, data->whole_window, width, height, 32 ); + gc = XCreateGC( data->display, pixmap, 0, NULL ); + XCopyArea( data->display, data->whole_window, pixmap, gc, 0, 0, width, height, 0, 0 ); + XFreeGC( data->display, gc ); + XSetWindowBackgroundPixmap( data->display, data->whole_window, pixmap ); + XFreePixmap( data->display, pixmap ); + } + done: + release_win_data( data ); window_surface_release( surface ); if (hdc) DeleteDC( hdc ); if (dib) DeleteObject( dib ); -- 2.32.0

1 0

[PATCH 6/6] winefile: Set size before calling RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

The value in size may be invalid if previous RegQueryValueExW() calls failed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winefile/winefile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index fa78237cccf..8ad785b924a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1220,20 +1220,22 @@ static windowOptions load_registry_settings(void) RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hKey ); - size = sizeof(DWORD); - + size = sizeof(opts.start_x); if( RegQueryValueExW( hKey, reg_start_x, NULL, &type, (LPBYTE) &opts.start_x, &size ) != ERROR_SUCCESS ) opts.start_x = CW_USEDEFAULT; + size = sizeof(opts.start_y); if( RegQueryValueExW( hKey, reg_start_y, NULL, &type, (LPBYTE) &opts.start_y, &size ) != ERROR_SUCCESS ) opts.start_y = CW_USEDEFAULT; + size = sizeof(opts.width); if( RegQueryValueExW( hKey, reg_width, NULL, &type, (LPBYTE) &opts.width, &size ) != ERROR_SUCCESS ) opts.width = CW_USEDEFAULT; + size = sizeof(opts.height); if( RegQueryValueExW( hKey, reg_height, NULL, &type, (LPBYTE) &opts.height, &size ) != ERROR_SUCCESS ) opts.height = CW_USEDEFAULT; -- 2.32.0

1 0

[PATCH 5/6] winecfg: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winecfg/drive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index bee5be3af34..b4b4239c003 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -140,7 +140,7 @@ static DWORD get_drive_type( char letter ) else { WCHAR buffer[80]; - DWORD size = ARRAY_SIZE(buffer); + DWORD size = sizeof(buffer); if (!RegQueryValueExW( hKey, driveValue, NULL, NULL, (LPBYTE)buffer, &size )) { -- 2.32.0

1 0

[PATCH 4/6] cmd: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/cmd/builtins.c | 5 +++-- programs/cmd/wcmdmain.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a55ce6e0244..d0a954d90fa 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4763,7 +4763,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { WCHAR *newValue; LONG rc = ERROR_SUCCESS; WCHAR keyValue[MAXSTRING]; - DWORD valueLen = MAXSTRING; + DWORD valueLen; HKEY readKey; /* See if parameter includes '=' */ @@ -4803,7 +4803,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { if (RegOpenKeyExW(key, subkey, 0, accessOptions, &readKey) == ERROR_SUCCESS) { - valueLen = ARRAY_SIZE(keyValue); + valueLen = sizeof(keyValue); rc = RegQueryValueExW(readKey, NULL, NULL, NULL, (LPBYTE)keyValue, &valueLen); WCMD_output_asis(keyName); WCMD_output_asis(L"="); @@ -4836,6 +4836,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { if (RegOpenKeyExW(key, subkey, 0, accessOptions, &readKey) == ERROR_SUCCESS) { + valueLen = sizeof(keyValue); rc = RegQueryValueExW(readKey, NULL, NULL, NULL, (LPBYTE)keyValue, &valueLen); WCMD_output_asis(args); WCMD_output_asis(L"="); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8c6ed1c057c..4ed1c96a9c2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2700,7 +2700,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) size = sizeof(DWORD); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)&value, &size); } else if (type == REG_SZ) { - size = ARRAY_SIZE(strvalue); + size = sizeof(strvalue); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)strvalue, &size); value = wcstoul(strvalue, NULL, 10); } @@ -2719,7 +2719,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) size = sizeof(DWORD); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)&value, &size); } else if (type == REG_SZ) { - size = ARRAY_SIZE(strvalue); + size = sizeof(strvalue); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)strvalue, &size); value = wcstoul(strvalue, NULL, 10); } -- 2.32.0

1 0

[PATCH 3/6] winex11.drv: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 57091522078..7f03f94db90 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -434,7 +434,7 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) if (lr) continue; - length = ARRAY_SIZE(device_instance); + length = sizeof(device_instance); lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); if (lr || lstrcmpiW(device_instance, instance)) { -- 2.32.0

1 0

[PATCH 2/6] winemac.drv: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 4a3b1ff39cb..99c852d7ffe 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1475,7 +1475,7 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) if (lr) continue; - length = ARRAY_SIZE(device_instance); + length = sizeof(device_instance); lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); if (lr || lstrcmpiW(device_instance, instance)) { -- 2.32.0

1 0

[PATCH 1/6] uxtheme: Pass size in bytes to RegQueryValueExW().
by Zhiyi Zhang 20 Oct '21

20 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 18b93435e4c..628bd9bfdc4 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -85,7 +85,7 @@ static BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg) static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, LPVOID pvData) { - DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH, dwExpDataLen; + DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH * sizeof(WCHAR), dwExpDataLen; TRACE("(hkey=%p,%s,%p)\n", hKey, debugstr_w(lpszValue), pvData); @@ -147,7 +147,7 @@ static void UXTHEME_LoadTheme(void) /* Get current theme configuration */ if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { TRACE("Loading theme config\n"); - buffsize = ARRAY_SIZE(tmp); + buffsize = sizeof(tmp); if (!RegQueryValueExW(hKey, L"ThemeActive", NULL, NULL, (BYTE*)tmp, &buffsize)) { bThemeActive = (tmp[0] != '0'); } @@ -155,10 +155,10 @@ static void UXTHEME_LoadTheme(void) bThemeActive = FALSE; TRACE("Failed to get ThemeActive: %d\n", GetLastError()); } - buffsize = ARRAY_SIZE(szCurrentColor); + buffsize = sizeof(szCurrentColor); if (RegQueryValueExW(hKey, L"ColorName", NULL, NULL, (BYTE*)szCurrentColor, &buffsize)) szCurrentColor[0] = '\0'; - buffsize = ARRAY_SIZE(szCurrentSize); + buffsize = sizeof(szCurrentSize); if (RegQueryValueExW(hKey, L"SizeName", NULL, NULL, (BYTE*)szCurrentSize, &buffsize)) szCurrentSize[0] = '\0'; if (query_reg_path (hKey, L"DllName", szCurrentTheme)) -- 2.32.0

1 0