February 2022 - Wine-Devel - list.winehq.org

[PATCH] include/*: only use long types for cross-compilation
by Eric Pouech Feb. 23, 2022

Feb. 23, 2022

Alexandre: I didn't use __WINE_USE_MSVCRT as it requires to #include some std headers before testing for it. Which isn't the case in windef.h nor winerror.h. So if a translation unit #include one of these two before winnt.h or ntdef.h we get the wrong definitions. So I used WINE_UNIX_LIB for simplificity. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/bcrypt/gnutls.c | 4 ++-- include/ntdef.h | 2 +- include/windef.h | 4 ++-- include/winerror.h | 2 +- include/winnt.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index e1b32be32a4..51ab8bb7d7d 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -688,7 +688,7 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_ if (*pubkey_len < sizeof(*ecc_blob) + size * 2) { - FIXME( "wrong pubkey len %u / %lu\n", *pubkey_len, sizeof(*ecc_blob) + size * 2 ); + FIXME( "wrong pubkey len %u / %zu\n", *pubkey_len, sizeof(*ecc_blob) + size * 2 ); pgnutls_perror( ret ); free( x.data ); free( y.data ); return STATUS_BUFFER_TOO_SMALL; @@ -730,7 +730,7 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit if (*pubkey_len < sizeof(*dsa_blob) + bitlen / 8 * 3) { - FIXME( "wrong pubkey len %u / %lu\n", *pubkey_len, sizeof(*dsa_blob) + bitlen / 8 * 3 ); + FIXME( "wrong pubkey len %u / %zu\n", *pubkey_len, sizeof(*dsa_blob) + bitlen / 8 * 3 ); pgnutls_perror( ret ); free( p.data ); free( q.data ); free( g.data ); free( y.data ); return STATUS_NO_MEMORY; diff --git a/include/ntdef.h b/include/ntdef.h index 92366c3f3bb..790a6ebf70d 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -55,7 +55,7 @@ typedef enum _WAIT_TYPE { #define BASETYPES typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short USHORT, *PUSHORT; -#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) && !defined(WINE_UNIX_LIB) typedef unsigned long ULONG, *PULONG; #else typedef unsigned int ULONG, *PULONG; diff --git a/include/windef.h b/include/windef.h index cb7eb1179c8..d830a7b9fdc 100644 --- a/include/windef.h +++ b/include/windef.h @@ -237,7 +237,7 @@ extern "C" { #define BASETYPES typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short USHORT, *PUSHORT; -#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) && !defined(WINE_UNIX_LIB) typedef unsigned long ULONG, *PULONG; #else typedef unsigned int ULONG, *PULONG; @@ -253,7 +253,7 @@ typedef int INT, *PINT, *LPINT; typedef unsigned int UINT, *PUINT; typedef float FLOAT, *PFLOAT; typedef char *PSZ; -#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) && !defined(WINE_UNIX_LIB) typedef long *LPLONG; typedef unsigned long DWORD, *PDWORD, *LPDWORD; #else diff --git a/include/winerror.h b/include/winerror.h index b63b74a5b18..e068d71cdf9 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -89,7 +89,7 @@ #define __HRESULT_FROM_WIN32(x) ((HRESULT)(x) > 0 ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : (HRESULT)(x) ) #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED -#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) && !defined(WINE_UNIX_LIB) typedef long HRESULT; #else typedef int HRESULT; diff --git a/include/winnt.h b/include/winnt.h index bd64b092369..ef37e402b2a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -467,7 +467,7 @@ typedef VOID *PVOID64; typedef BYTE BOOLEAN, *PBOOLEAN; typedef char CHAR, *PCHAR; typedef short SHORT, *PSHORT; -#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) && !defined(WINE_UNIX_LIB) typedef long LONG, *PLONG; #else typedef int LONG, *PLONG;

1 0

[PATCH] mfplat: Correctly caclulate length of schema
by Alistair Leslie-Hughes Feb. 23, 2022

Feb. 23, 2022

When a url is passed in, for example "http://..." We need to include the : in the scheme string not exclude it. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7991152f7a7..0266bc197c8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -6469,10 +6469,10 @@ static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSch if (ptr == url || *ptr != ':') { url = fileschemeW; - ptr = fileschemeW + ARRAY_SIZE(fileschemeW) - 1; + len = ARRAY_SIZE(fileschemeW); } - - len = ptr - url; + else + len = ptr - url + 1; scheme = malloc((len + 1) * sizeof(WCHAR)); if (!scheme) return E_OUTOFMEMORY; -- 2.34.1

2 1

[v2 PATCH] mfplat: Correctly caclulate url scheme length.
by Nikolay Sivov Feb. 23, 2022

Feb. 23, 2022

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> When a url is passed in, for example "http://..." We need to include the : in the scheme string not exclude it. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: minor change to exclude null terminator from file scheme constant length. dlls/mfplat/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7991152f7a7..cee052defeb 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -6469,10 +6469,11 @@ static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSch if (ptr == url || *ptr != ':') { url = fileschemeW; - ptr = fileschemeW + ARRAY_SIZE(fileschemeW) - 1; + len = ARRAY_SIZE(fileschemeW) - 1; } + else + len = ptr - url + 1; - len = ptr - url; scheme = malloc((len + 1) * sizeof(WCHAR)); if (!scheme) return E_OUTOFMEMORY; -- 2.34.1

1 0

[PATCH 2/2] winex11.drv: Support _NET_WM_FULLSCREEN_MONITORS.
by Zhiyi Zhang Feb. 23, 2022

Feb. 23, 2022

Support _NET_WM_FULLSCREEN_MONITORS for fullscreen windows spanning multiple monitors. This property is used to hint the window managers which monitors a fullscreen window should cover. Window managers make a fullscreen window spanning multiple monitors cover only the primary monitor when this property is absent. Fix Project Cars 2/3 incorrect game window size when the triple-screen mode is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 1 - dlls/winex11.drv/window.c | 38 ++++++++++++++++ dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 81 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrandr.c | 5 +++ 6 files changed, 127 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 63c18cd9948..da2ab5beb0e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9295,7 +9295,6 @@ static void test_fullscreen(void) flush_events(TRUE); GetWindowRect(hwnd, &rc); - todo_wine ok(EqualRect(&rc, &virtual_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 36fb41ac710..b6b3507e88f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -965,6 +965,42 @@ void update_user_time( Time time ) XUnlockDisplay( gdi_display ); } +/* Update _NET_WM_FULLSCREEN_MONITORS when _NET_WM_STATE_FULLSCREEN is set to support fullscreen + * windows spanning multiple monitors */ +static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data ) +{ + long monitors[4] = {0}; + XEvent xev; + + if (!(data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN)) || is_virtual_desktop()) + return; + + /* No need to set _NET_WM_FULLSCREEN_MONITORS when it covers only the primary monitor */ + xinerama_get_fullscreen_monitors( &data->whole_rect, monitors ); + if (monitors[0] == 0 && monitors[1] == 0 && monitors[2] == 0 && monitors[3] == 0) + return; + + if (!data->mapped) + { + XChangeProperty( data->display, data->whole_window, x11drv_atom(_NET_WM_FULLSCREEN_MONITORS), + XA_CARDINAL, 32, PropModeReplace, (unsigned char *)monitors, 4 ); + } + else + { + xev.xclient.type = ClientMessage; + xev.xclient.window = data->whole_window; + xev.xclient.message_type = x11drv_atom(_NET_WM_FULLSCREEN_MONITORS); + xev.xclient.serial = 0; + xev.xclient.display = data->display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + xev.xclient.data.l[4] = 1; + memcpy( xev.xclient.data.l, monitors, sizeof(monitors) ); + XSendEvent( data->display, root_window, False, + SubstructureRedirectMask | SubstructureNotifyMask, &xev ); + } +} + /*********************************************************************** * update_net_wm_states */ @@ -1045,6 +1081,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) } } data->net_wm_state = new_state; + update_net_wm_fullscreen_monitors( data ); } /*********************************************************************** @@ -1137,6 +1174,7 @@ static void map_window( HWND hwnd, DWORD new_style ) data->mapped = TRUE; data->iconic = (new_style & WS_MINIMIZE) != 0; + update_net_wm_fullscreen_monitors( data ); } release_win_data( data ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f389f3e0836..363435a2cf6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -490,6 +490,7 @@ enum x11drv_atoms XATOM__NET_SYSTEM_TRAY_OPCODE, XATOM__NET_SYSTEM_TRAY_S0, XATOM__NET_SYSTEM_TRAY_VISUAL, + XATOM__NET_WM_FULLSCREEN_MONITORS, XATOM__NET_WM_ICON, XATOM__NET_WM_MOVERESIZE, XATOM__NET_WM_NAME, @@ -704,6 +705,7 @@ extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_work_area( const RECT *monitor_rect ) DECLSPEC_HIDDEN; +extern void xinerama_get_fullscreen_monitors( const RECT *rect, long *indices ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; #define DEPTH_COUNT 3 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 32beb84a009..7896afcb780 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -162,6 +162,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_SYSTEM_TRAY_OPCODE", "_NET_SYSTEM_TRAY_S0", "_NET_SYSTEM_TRAY_VISUAL", + "_NET_WM_FULLSCREEN_MONITORS", "_NET_WM_ICON", "_NET_WM_MOVERESIZE", "_NET_WM_NAME", diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index b707574a0ab..568044e4230 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -42,6 +42,14 @@ static MONITORINFOEXW default_monitor = { '\\','\\','.','\\','D','I','S','P','L','A','Y','1',0 } /* szDevice */ }; +static CRITICAL_SECTION xinerama_section; +static CRITICAL_SECTION_DEBUG xinerama_critsect_debug = +{ + 0, 0, &xinerama_section, + {&xinerama_critsect_debug.ProcessLocksList, &xinerama_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": xinerama_section")} +}; +static CRITICAL_SECTION xinerama_section = {&xinerama_critsect_debug, -1, 0, 0, 0, 0}; static MONITORINFOEXW *monitors; static int nb_monitors; @@ -119,6 +127,64 @@ static inline int query_screens(void) #endif /* SONAME_LIBXINERAMA */ +/* Get xinerama monitor indices required for _NET_WM_FULLSCREEN_MONITORS */ +void xinerama_get_fullscreen_monitors( const RECT *rect, long *indices ) +{ + RECT window_rect, intersect_rect, monitor_rect; + POINT offset; + INT i; + + EnterCriticalSection( &xinerama_section ); + if (nb_monitors == 1) + { + memset( indices, 0, sizeof(*indices) * 4 ); + goto done; + } + + /* Convert window rectangle to root coordinates */ + offset = virtual_screen_to_root( rect->left, rect->top ); + window_rect.left = offset.x; + window_rect.top = offset.y; + window_rect.right = window_rect.left + rect->right - rect->left; + window_rect.bottom = window_rect.top + rect->bottom - rect->top; + + /* Compare to xinerama monitor rectangles in root coordinates */ + offset.x = INT_MAX; + offset.y = INT_MAX; + for (i = 0; i < nb_monitors; ++i) + { + offset.x = min( offset.x, monitors[i].rcMonitor.left ); + offset.y = min( offset.y, monitors[i].rcMonitor.top ); + } + + indices[0] = -1; + indices[1] = -1; + indices[2] = -1; + indices[3] = -1; + for (i = 0; i < nb_monitors; ++i) + { + SetRect( &monitor_rect, monitors[i].rcMonitor.left - offset.x, + monitors[i].rcMonitor.top - offset.y, monitors[i].rcMonitor.right - offset.x, + monitors[i].rcMonitor.bottom - offset.y ); + IntersectRect( &intersect_rect, &window_rect, &monitor_rect ); + if (EqualRect( &intersect_rect, &monitor_rect )) + { + if (indices[0] == -1 || monitors[i].rcMonitor.top < monitors[indices[0]].rcMonitor.top) + indices[0] = i; + if (indices[1] == -1 || monitors[i].rcMonitor.bottom > monitors[indices[1]].rcMonitor.bottom) + indices[1] = i; + if (indices[2] == -1 || monitors[i].rcMonitor.left < monitors[indices[2]].rcMonitor.left) + indices[2] = i; + if (indices[3] == -1 || monitors[i].rcMonitor.right > monitors[indices[3]].rcMonitor.right) + indices[3] = i; + } + } + +done: + LeaveCriticalSection( &xinerama_section ); + TRACE( "fullsceen monitors: %ld,%ld,%ld,%ld.\n", indices[0], indices[1], indices[2], indices[3] ); +} + static BOOL xinerama_get_gpus( struct gdi_gpu **new_gpus, int *count ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; @@ -154,9 +220,13 @@ static BOOL xinerama_get_adapters( ULONG_PTR gpu_id, struct gdi_adapter **new_ad return FALSE; /* Being lazy, actual adapter count may be less */ + EnterCriticalSection( &xinerama_section ); adapters = heap_calloc( nb_monitors, sizeof(*adapters) ); if (!adapters) + { + LeaveCriticalSection( &xinerama_section ); return FALSE; + } primary_index = primary_monitor; if (primary_index >= nb_monitors) @@ -201,6 +271,7 @@ static BOOL xinerama_get_adapters( ULONG_PTR gpu_id, struct gdi_adapter **new_ad *new_adapters = adapters; *count = index; + LeaveCriticalSection( &xinerama_section ); return TRUE; } @@ -220,6 +291,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne INT index = 0; INT i; + EnterCriticalSection( &xinerama_section ); + for (i = first; i < nb_monitors; i++) { if (i == first @@ -230,7 +303,10 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne monitor = heap_calloc( monitor_count, sizeof(*monitor) ); if (!monitor) + { + LeaveCriticalSection( &xinerama_section ); return FALSE; + } for (i = first; i < nb_monitors; i++) { @@ -254,6 +330,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne *new_monitors = monitor; *count = monitor_count; + LeaveCriticalSection( &xinerama_section ); return TRUE; } @@ -272,6 +349,8 @@ void xinerama_init( unsigned int width, unsigned int height ) if (is_virtual_desktop()) return; + EnterCriticalSection( &xinerama_section ); + SetRect( &rect, 0, 0, width, height ); if (!query_screens()) { @@ -295,6 +374,8 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + LeaveCriticalSection( &xinerama_section ); + handler.name = "Xinerama"; handler.priority = 100; handler.get_gpus = xinerama_get_gpus; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fb7a4405a1e..71b76bda0fb 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1181,6 +1181,8 @@ static void xrandr14_free_monitors( struct gdi_monitor *monitors, int count ) static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) { + RECT rect; + xrandr14_invalidate_current_mode_cache(); if (hwnd == GetDesktopWindow() && GetWindowThreadProcessId( hwnd, NULL ) == GetCurrentThreadId()) { @@ -1191,6 +1193,9 @@ static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) init_registry_display_settings(); } + /* Update xinerama monitors for xinerama_get_fullscreen_monitors() */ + rect = get_host_primary_monitor_rect(); + xinerama_init( rect.right - rect.left, rect.bottom - rect.top ); return FALSE; } -- 2.32.0

2 2

[PATCH 1/2] user32/tests: Test creating a fullscreen window spanning multiple monitors.
by Zhiyi Zhang Feb. 23, 2022

Feb. 23, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 44 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d6087873f21..63c18cd9948 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9126,12 +9126,12 @@ static void test_fullscreen(void) static const DWORD t_ex_style[] = { 0, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW }; + RECT rc, virtual_rect, expected_rect; WNDCLASSA cls; int timeout; HWND hwnd; int i, j; POINT pt; - RECT rc; HMONITOR hmon; LRESULT ret; @@ -9278,6 +9278,48 @@ static void test_fullscreen(void) DestroyWindow(hwnd); UnregisterClassA("fullscreen_class", GetModuleHandleA(NULL)); + + /* Test fullscreen windows spanning multiple monitors */ + if (GetSystemMetrics(SM_CMONITORS) > 1) + { + /* Test windows covering all monitors */ + virtual_rect.left = GetSystemMetrics(SM_XVIRTUALSCREEN); + virtual_rect.top = GetSystemMetrics(SM_YVIRTUALSCREEN); + virtual_rect.right = virtual_rect.left + GetSystemMetrics(SM_CXVIRTUALSCREEN); + virtual_rect.bottom = virtual_rect.top + GetSystemMetrics(SM_CYVIRTUALSCREEN); + + hwnd = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, virtual_rect.left, + virtual_rect.top, virtual_rect.right - virtual_rect.left, + virtual_rect.bottom - virtual_rect.top, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed, error %#x.\n", GetLastError()); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rc, &virtual_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&rc)); + DestroyWindow(hwnd); + + /* Test windows covering one monitor and 1 pixel larger on available sides */ + expected_rect = mi.rcMonitor; + InflateRect(&expected_rect, 1, 1); + IntersectRect(&expected_rect, &expected_rect, &virtual_rect); + hwnd = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, expected_rect.left, + expected_rect.top, expected_rect.right - expected_rect.left, + expected_rect.bottom - expected_rect.top, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed, error %#x.\n", GetLastError()); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rc, &expected_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&expected_rect), wine_dbgstr_rect(&rc)); + DestroyWindow(hwnd); + } + else + { + skip("This test requires at least two monitors.\n"); + } } static BOOL test_thick_child_got_minmax; -- 2.32.0

2 1

[PATCH 1/4] mf/tests: Add some H264 decoder GetInputStreamInfo tests.
by Rémi Bernon Feb. 23, 2022

Feb. 23, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 080ec457799..0bc6adf83bf 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6307,10 +6307,11 @@ static void test_h264_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_H264}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; + MFT_INPUT_STREAM_INFO input_info; IMFMediaType *media_type; IMFTransform *transform; + ULONG flags, i, ret; GUID class_id; - ULONG i, ret; HRESULT hr; hr = CoInitialize(NULL); @@ -6340,6 +6341,22 @@ static void test_h264_decoder(void) /* check available input types */ + flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&input_info, 0xcd, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + todo_wine + ok(hr == S_OK, "GetInputStreamInfo returned %#x\n", hr); + todo_wine + ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); + todo_wine + ok(input_info.dwFlags == flags, "got dwFlags %#x\n", input_info.dwFlags); + todo_wine + ok(input_info.cbSize == 0x1000, "got cbSize %u\n", input_info.cbSize); + todo_wine + ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#x\n", input_info.cbMaxLookahead); + todo_wine + ok(input_info.cbAlignment == 0, "got cbAlignment %#x\n", input_info.cbAlignment); + i = -1; while (SUCCEEDED(hr = IMFTransform_GetInputAvailableType(transform, 0, ++i, &media_type))) { @@ -6426,6 +6443,22 @@ static void test_h264_decoder(void) todo_wine ok(ret == 1, "Release returned %u\n", ret); + flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&input_info, 0xcd, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + todo_wine + ok(hr == S_OK, "GetInputStreamInfo returned %#x\n", hr); + todo_wine + ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); + todo_wine + ok(input_info.dwFlags == flags, "got dwFlags %#x\n", input_info.dwFlags); + todo_wine + ok(input_info.cbSize == 0x1000, "got cbSize %u\n", input_info.cbSize); + todo_wine + ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#x\n", input_info.cbMaxLookahead); + todo_wine + ok(input_info.cbAlignment == 0, "got cbAlignment %#x\n", input_info.cbAlignment); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret); -- 2.34.1

2 7

[PATCH v3 1/9] kernel32: Implement CreateBoundaryDescriptorA.
by Mohamad Al-Jaf Feb. 23, 2022

Feb. 23, 2022

Needed for IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Use static sized buffer for name. - Create new security file in kernel32. This function doesn't seem like it belongs in kernel_main and I didn't want to make a new file just for one function so I added all the relevant boundary descriptor functions. --- dlls/kernel32/Makefile.in | 1 + dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/security.c | 42 +++++++++++++++++++++++++++++++++++++ include/namespaceapi.h | 2 ++ 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 dlls/kernel32/security.c diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 7e68a950b71..bda8d03e90c 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -23,6 +23,7 @@ C_SRCS = \ process.c \ profile.c \ resource.c \ + security.c \ sync.c \ tape.c \ thread.c \ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7db82db375d..e040fedab08 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -266,7 +266,7 @@ @ stdcall CopyLZFile(long long) LZCopy @ stdcall CreateActCtxA(ptr) @ stdcall -import CreateActCtxW(ptr) -# @ stub CreateBoundaryDescriptorA +@ stdcall CreateBoundaryDescriptorA(str long) @ stdcall -import CreateBoundaryDescriptorW(wstr long) @ stdcall -import CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall -import CreateDirectoryA(str ptr) diff --git a/dlls/kernel32/security.c b/dlls/kernel32/security.c new file mode 100644 index 00000000000..ec8a348e1a2 --- /dev/null +++ b/dlls/kernel32/security.c @@ -0,0 +1,42 @@ +/* + * Kernel32 security functions + * + * Copyright (C) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" + +/****************************************************************************** + * CreateBoundaryDescriptorA (KERNEL32.@) + */ +HANDLE WINAPI CreateBoundaryDescriptorA( LPCSTR name, ULONG flags ) +{ + WCHAR buffer[MAX_PATH]; + + if (!name) return CreateBoundaryDescriptorW( NULL, flags ); + + if (!MultiByteToWideChar( CP_ACP, 0, name, -1, buffer, MAX_PATH )) + { + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + return 0; + } + return CreateBoundaryDescriptorW( buffer, flags ); +} diff --git a/include/namespaceapi.h b/include/namespaceapi.h index 9446806f82e..f219a2a7488 100644 --- a/include/namespaceapi.h +++ b/include/namespaceapi.h @@ -27,7 +27,9 @@ extern "C" { WINBASEAPI BOOL WINAPI AddSIDToBoundaryDescriptor(HANDLE*,PSID); WINBASEAPI BOOLEAN WINAPI ClosePrivateNamespace(HANDLE,ULONG); +WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorA(LPCSTR,ULONG); WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorW(LPCWSTR,ULONG); +#define CreateBoundaryDescriptor WINELIB_NAME_AW(CreateBoundaryDescriptor) WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); WINBASEAPI void WINAPI DeleteBoundaryDescriptor(HANDLE); WINBASEAPI HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); -- 2.35.1

1 6

[PATCH] krnl386.exe: fix VxD filename format checks in __wine_vxd_open()
by Damjan Jovanovic Feb. 23, 2022

Feb. 23, 2022

__wine_vxd_open() has several bugs. If filenameW doesn't end in ".vxd", it is wrongly allowed to be over 8 characters long. If it does end in ".vxd", then a maximum length filename, eg. "12345678.vxd", always gets misdetected as being too long, as: "lstrlenW( filenameW ) >= ARRAY_SIZE(name) - 4" becomes 12 >= 12. Rather do the checks for maximum filename length when we detect the filename format. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/krnl386.exe16/vxd.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)

1 0

[PATCH] ntdll: Fix the spelling of a comment.
by Mohamad Al-Jaf Feb. 23, 2022

Feb. 23, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/ntdll/sec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index eccfc82ce8c..ba11000564e 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -438,7 +438,7 @@ NTSTATUS WINAPI RtlCreateSecurityDescriptor( /************************************************************************** * RtlCopySecurityDescriptor [NTDLL.@] * - * Copies an absolute or sefl-relative SECURITY_DESCRIPTOR. + * Copies an absolute or self-relative SECURITY_DESCRIPTOR. * * PARAMS * pSourceSD [O] SD to copy from. -- 2.35.1

2 1

[PATCH 1/3] winegstreamer: Introduce new wg_transform struct.
by Rémi Bernon Feb. 22, 2022

Feb. 22, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This would serve a simpler purpose than the full-fledged wg_parser, and be used by synchronous transforms only (at least there's no thread on the Wine side), which simply work on the push then pull loop model. The wg_transform name is chosen to be generic and possibly cover both decoder and encoders (and possibly converters), but maybe it's better to keep it specific for now and only design it for decoders. This would simplify the format question in the next patch. dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 3 ++ dlls/winegstreamer/main.c | 14 +++++++ dlls/winegstreamer/unix_private.h | 31 ++++++++++++++ dlls/winegstreamer/unixlib.h | 8 ++++ dlls/winegstreamer/wg_parser.c | 20 +++++++-- dlls/winegstreamer/wg_transform.c | 69 +++++++++++++++++++++++++++++++ dlls/winegstreamer/wma_decoder.c | 20 +++++++++ 8 files changed, 162 insertions(+), 4 deletions(-) create mode 100644 dlls/winegstreamer/unix_private.h create mode 100644 dlls/winegstreamer/wg_transform.c diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index c53e914e246..52295418f0f 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ mfplat.c \ quartz_parser.c \ wg_parser.c \ + wg_transform.c \ wm_asyncreader.c \ wm_reader.c \ wm_syncreader.c \ diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 222bce3b2c7..df82b229143 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -96,6 +96,9 @@ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream) DECLSPEC void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) DECLSPEC_HIDDEN; +struct wg_transform *wg_transform_create(void) DECLSPEC_HIDDEN; +void wg_transform_destroy(struct wg_transform *transform) DECLSPEC_HIDDEN; + unsigned int wg_format_get_max_size(const struct wg_format *format); HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 260dd208e2f..f23fa3abcdf 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -254,6 +254,20 @@ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, __wine_unix_call(unix_handle, unix_wg_parser_stream_seek, &params); } +struct wg_transform *wg_transform_create(void) +{ + struct wg_transform_create_params params = {0}; + + if (__wine_unix_call(unix_handle, unix_wg_transform_create, &params)) + return NULL; + return params.transform; +} + +void wg_transform_destroy(struct wg_transform *transform) +{ + __wine_unix_call(unix_handle, unix_wg_transform_destroy, transform); +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h new file mode 100644 index 00000000000..375d33e7728 --- /dev/null +++ b/dlls/winegstreamer/unix_private.h @@ -0,0 +1,31 @@ +/* + * winegstreamer Unix library interface + * + * Copyright 2020-2021 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINEGSTREAMER_UNIX_PRIVATE_H +#define __WINE_WINEGSTREAMER_UNIX_PRIVATE_H + +#include "unixlib.h" + +extern bool init_gstreamer(void) DECLSPEC_HIDDEN; + +extern NTSTATUS wg_transform_create(void *args) DECLSPEC_HIDDEN; +extern NTSTATUS wg_transform_destroy(void *args) DECLSPEC_HIDDEN; + +#endif /* __WINE_WINEGSTREAMER_UNIX_PRIVATE_H */ diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 82bb534b938..c8b98da3a64 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -217,6 +217,11 @@ struct wg_parser_stream_seek_params DWORD start_flags, stop_flags; }; +struct wg_transform_create_params +{ + struct wg_transform *transform; +}; + enum unix_funcs { unix_wg_parser_create, @@ -245,6 +250,9 @@ enum unix_funcs unix_wg_parser_stream_get_duration, unix_wg_parser_stream_seek, + + unix_wg_transform_create, + unix_wg_transform_destroy, }; #endif /* __WINE_WINEGSTREAMER_UNIXLIB_H */ diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 013566b25e9..ac8c5a2b95c 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -37,7 +37,7 @@ #include "winternl.h" #include "dshow.h" -#include "unixlib.h" +#include "unix_private.h" typedef enum { @@ -51,7 +51,7 @@ typedef enum * debug logging instead of Wine debug logging. In order to be safe we forbid * any use of Wine debug logging in this entire file. */ -GST_DEBUG_CATEGORY_STATIC(wine); +GST_DEBUG_CATEGORY(wine); #define GST_CAT_DEFAULT wine typedef BOOL (*init_gst_cb)(struct wg_parser *parser); @@ -1963,6 +1963,16 @@ static void init_gstreamer_once(void) gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); } +bool init_gstreamer(void) +{ + static pthread_once_t init_once = PTHREAD_ONCE_INIT; + + if (pthread_once(&init_once, init_gstreamer_once)) + return false; + + return true; +} + static NTSTATUS wg_parser_create(void *args) { static const init_gst_cb init_funcs[] = @@ -1973,11 +1983,10 @@ static NTSTATUS wg_parser_create(void *args) [WG_PARSER_WAVPARSE] = wave_parser_init_gst, }; - static pthread_once_t once = PTHREAD_ONCE_INIT; struct wg_parser_create_params *params = args; struct wg_parser *parser; - if (pthread_once(&once, init_gstreamer_once)) + if (!init_gstreamer()) return E_FAIL; if (!(parser = calloc(1, sizeof(*parser)))) @@ -2044,4 +2053,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_parser_stream_get_duration), X(wg_parser_stream_seek), + + X(wg_transform_create), + X(wg_transform_destroy), }; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c new file mode 100644 index 00000000000..822740da0d7 --- /dev/null +++ b/dlls/winegstreamer/wg_transform.c @@ -0,0 +1,69 @@ +/* + * GStreamer transform backend + * + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#include <gst/gst.h> +#include <gst/video/video.h> +#include <gst/audio/audio.h> + +#include "winternl.h" +#include "dshow.h" + +#include "unix_private.h" + +GST_DEBUG_CATEGORY_EXTERN(wine); +#define GST_CAT_DEFAULT wine + +struct wg_transform +{ +}; + +NTSTATUS wg_transform_destroy(void *args) +{ + struct wg_transform *transform = args; + + free(transform); + return S_OK; +} + +NTSTATUS wg_transform_create(void *args) +{ + struct wg_transform_create_params *params = args; + struct wg_transform *transform; + + if (!init_gstreamer()) + return E_FAIL; + + if (!(transform = calloc(1, sizeof(*transform)))) + return E_OUTOFMEMORY; + + GST_INFO("Created winegstreamer transform %p.", transform); + params->transform = transform; + return S_OK; +} diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 78316059052..3b051230a9e 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -53,6 +53,8 @@ struct wma_decoder LONG refcount; IMFMediaType *input_type; IMFMediaType *output_type; + + struct wg_transform *wg_transform; }; static inline struct wma_decoder *impl_from_IUnknown(IUnknown *iface) @@ -60,6 +62,19 @@ static inline struct wma_decoder *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct wma_decoder, IUnknown_inner); } +static HRESULT try_create_wg_transform(struct wma_decoder *decoder) +{ + if (decoder->wg_transform) + wg_transform_destroy(decoder->wg_transform); + + decoder->wg_transform = wg_transform_create(); + if (decoder->wg_transform) + return S_OK; + + WARN("Failed to create wg_transform.\n"); + return E_FAIL; +} + static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID iid, void **out) { struct wma_decoder *decoder = impl_from_IUnknown(iface); @@ -104,6 +119,8 @@ static ULONG WINAPI unknown_Release(IUnknown *iface) if (!refcount) { + if (decoder->wg_transform) + wg_transform_destroy(decoder->wg_transform); if (decoder->input_type) IMFMediaType_Release(decoder->input_type); if (decoder->output_type) @@ -438,6 +455,9 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)decoder->output_type))) goto failed; + if (FAILED(hr = try_create_wg_transform(decoder))) + goto failed; + return S_OK; failed: -- 2.34.1

3 8