- Wine-Devel - list.winehq.org

[tools] winetest/build-patterns: Show Potentially obsolete bugs.
by Francois Gouget May 19, 2021

May 19, 2021

Bugs related to a test that has no failure are likely to be out of date, except if they are related to memory issues. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 52 +++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index aacbb5217..e3174b231 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1200,16 +1200,29 @@ sub write_pattern($$$) print $html "<div class='testtext'>$test->{desc}</div>\n" if (defined $test->{desc}); - print $html "<div class='test'>\n"; - write_newmodes_line($html, $test) if (%{$test->{newmodes}}); + my $has_pattern; + if (%{$test->{newmodes}}) + { + $has_pattern = 1; + print $html "<div class='test'>\n"; + write_newmodes_line($html, $test); + } foreach my $reportdir (@sortedreports) { next if (!$pagereports->{$reportdir}); next if (!$test->{testreports}->{$reportdir}->{failed}); + if (!$has_pattern) + { + $has_pattern = 1; + print $html "<div class='test'>\n"; + } write_pattern_line($html, $test, $reportdir); } - write_commits($html, $test) if (%{$test->{commits}}); - print $html "</div>\n"; + if ($has_pattern) + { + write_commits($html, $test) if (%{$test->{commits}}); + print $html "</div>\n"; + } } sub write_patterns_list($$$$) @@ -1290,12 +1303,20 @@ EOF old => {title => "Old failures", desc => "look like they are fixed: they had no failure in the most recent $patternbuilds builds but that may also just be a lucky streak.", testnames => []}, + oldbugs => {title => "Potentially obsolete bugs", + desc => "have related bugs but no failure whatsoever. Maybe the bugs can be closed.", + testnames => []}, + membugs => {title => "Memory bugs", + desc => "have no failures but have potential memory bugs (leaks, overflow, uninitialized data, etc). These may be out of date or may cause failures later on.", + testnames => []}, + ); foreach my $testname (sort keys %tests) { my $test = $tests{$testname}; $test->{colors} = {}; $test->{commits} = {}; + $test->{newmodes} = {}; # The regression commits may only impact the results in Wine. # Add them even if only reporting on the Windows results. @@ -1343,10 +1364,26 @@ EOF $test->{colors}->{$status} = undef; } } - next if ($last == -1); # no report had a pattern of interest next if ($testname eq "0"); + if ($last == -1 and !$subpage) + { + # This test has no failure but maybe it has bugs? + my $listid; + foreach my $bug (@{$test->{bugs}}) + { + if ($bug->{desc} =~ /(?:invalid (?:read|write)|leak|uninitialized|use after free|valgrind)/) + { + $listid ||= "membugs"; + } + else + { + $listid = "oldbugs"; + } + } + push @{$lists{$listid}->{testnames}}, $testname if ($listid); + } + next if ($last == -1); # no report had a pattern of interest - $test->{newmodes} = {}; foreach my $status (keys %$newfailures) { next if ($oldfailures->{$status}); @@ -1399,7 +1436,8 @@ EOF <p>The patterns are grouped according to the likelyhood that they contain new failures:</p> <ul>"; - my @listids = ("summary", "recent", "newmode", "regular", "old"); + my @listids = ("summary", "recent", "newmode", "regular", "old", + "oldbugs", "membugs"); my ($prevunit, $nolist) = ("", 1); foreach my $listid (@listids) { -- 2.20.1

1 0

[PATCH v2 1/2] user32/tests: Wait for parent window thread before checking window.
by Rémi Bernon May 18, 2021

May 18, 2021

This test is failing from time to time. Making sure the parent thread has terminated before continuing triggers the underlying race condition, and makes the test to always fail. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 205961-205963 v2: * Wait for thread handle to be set before waiting on it in the test. * Don't check window thread state, TERMINATED threads will have detached all their windows already. dlls/user32/tests/msg.c | 52 +++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 13e085dfacc..462053a951d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8791,7 +8791,10 @@ static void test_paint_messages(void) struct wnd_event { HWND hwnd; + HWND child_hwnd; + HANDLE child; HANDLE grand_child; + HANDLE ready_event; HANDLE start_event; HANDLE stop_event; }; @@ -8822,42 +8825,48 @@ static DWORD CALLBACK create_grand_child_thread( void *param ) { struct wnd_event *wnd_event = param; HWND hchild; - MSG msg; + DWORD ret; hchild = CreateWindowExA(0, "TestWindowClass", "Test child", - WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL); + WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->child_hwnd, 0, 0, NULL); ok (hchild != 0, "Failed to create child window\n"); flush_events(); flush_sequence(); + + /* wait for wnd_event->child to be set */ + ret = WaitForSingleObject( wnd_event->ready_event, 1000 ); + ok( !ret, "WaitForSingleObject failed %x\n", ret ); SetEvent( wnd_event->start_event ); - for (;;) - { - MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_ALLINPUT); - if (!IsWindow( hchild )) break; /* will be destroyed when parent thread exits */ - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - } + /* wait for parent window thread to exit */ + ret = WaitForSingleObject( wnd_event->child, 1000 ); + ok( !ret, "WaitForSingleObject returned %x, error: %u\n", ret, GetLastError() ); + ok( IsWindow( hchild ), "Child window already destroyed\n" ); + flush_events(); + todo_wine ok( !IsWindow( hchild ), "Child window not destroyed\n" ); + return 0; } static DWORD CALLBACK create_child_thread( void *param ) { struct wnd_event *wnd_event = param; - struct wnd_event child_event; DWORD ret, tid; MSG msg; - child_event.hwnd = CreateWindowExA(0, "TestWindowClass", "Test child", - WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL); - ok (child_event.hwnd != 0, "Failed to create child window\n"); - SetFocus( child_event.hwnd ); + wnd_event->child_hwnd = CreateWindowExA( 0, "TestWindowClass", "Test child", WS_CHILD | WS_VISIBLE, + 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL ); + ok( wnd_event->child_hwnd != 0, "Failed to create child windows\n" ); + SetFocus( wnd_event->child_hwnd ); + + wnd_event->grand_child = CreateThread( NULL, 0, create_grand_child_thread, wnd_event, 0, &tid ); + ok( wnd_event->grand_child != 0, "CreateThread failed, error %u\n", GetLastError() ); + flush_events(); flush_sequence(); - child_event.start_event = wnd_event->start_event; - wnd_event->grand_child = CreateThread(NULL, 0, create_grand_child_thread, &child_event, 0, &tid); for (;;) { - DWORD ret = MsgWaitForMultipleObjects(1, &child_event.start_event, FALSE, 1000, QS_SENDMESSAGE); + DWORD ret = MsgWaitForMultipleObjects(1, &wnd_event->start_event, FALSE, 1000, QS_SENDMESSAGE); if (ret != 1) break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } @@ -8997,9 +9006,11 @@ static void test_interthread_messages(void) flush_events(); flush_sequence(); log_all_parent_messages++; + wnd_event.ready_event = CreateEventA( NULL, TRUE, FALSE, NULL ); wnd_event.start_event = CreateEventA( NULL, TRUE, FALSE, NULL ); wnd_event.stop_event = CreateEventA( NULL, TRUE, FALSE, NULL ); - hThread = CreateThread( NULL, 0, create_child_thread, &wnd_event, 0, &tid ); + wnd_event.child = CreateThread( NULL, 0, create_child_thread, &wnd_event, 0, &tid ); + SetEvent( wnd_event.ready_event ); for (;;) { ret = MsgWaitForMultipleObjects(1, &wnd_event.start_event, FALSE, 1000, QS_SENDMESSAGE); @@ -9009,9 +9020,9 @@ static void test_interthread_messages(void) ok( !ret, "MsgWaitForMultipleObjects failed %x\n", ret ); /* now wait for the thread without processing messages; this shouldn't deadlock */ SetEvent( wnd_event.stop_event ); - ret = WaitForSingleObject( hThread, 5000 ); + ret = WaitForSingleObject( wnd_event.child, 5000 ); ok( !ret, "WaitForSingleObject failed %x\n", ret ); - CloseHandle( hThread ); + CloseHandle( wnd_event.child ); ret = WaitForSingleObject( wnd_event.grand_child, 5000 ); ok( !ret, "WaitForSingleObject failed %x\n", ret ); @@ -9019,8 +9030,9 @@ static void test_interthread_messages(void) CloseHandle( wnd_event.start_event ); CloseHandle( wnd_event.stop_event ); + CloseHandle( wnd_event.ready_event ); flush_events(); - ok_sequence(WmExitThreadSeq, "destroy child on thread exit", FALSE); + ok_sequence( WmExitThreadSeq, "destroy child on thread exit", TRUE ); log_all_parent_messages--; DestroyWindow( wnd_event.hwnd ); -- 2.31.0

2 3

[RFC PATCH 1/5] user32/tests: Add window surface tests.
by Giovanni Mascellani May 18, 2021

May 18, 2021

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/win.c | 686 ++++++++++++++++++++++++++++++++++ 2 files changed, 687 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index dd101d69f3c..5b058b7d914 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 hid +IMPORTS = user32 gdi32 advapi32 hid dwmapi C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a37afd2dc5e..6f9c566a651 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -31,6 +31,7 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "dwmapi.h" #include "wine/test.h" @@ -12004,6 +12005,689 @@ static void test_cancel_mode(void) DestroyWindow(hwnd2); } +/* The window manager is not willing to fully honor window position + requests. For instance, Mutter does not allow windows to overlap + the top bar. For such WMs, we cannot reliably do + check_screen_surface tests, because we captured a different + background to compare with. */ +BOOL composition_broken_wm = FALSE; + +#define capture_surface(hdc, x, y, width, height, surface, surface_size) capture_surface_(__LINE__, hdc, x, y, width, height, surface, surface_size) +static SIZE_T capture_surface_(int line, HDC hdc, int x, int y, int width, int height, DWORD *surface, SIZE_T surface_size) +{ + BITMAPINFOHEADER info; + HBITMAP bmp_obj; + SIZE_T data_size; + BITMAP bmp; + DWORD count; + BOOL ret; + HDC hdc_dst; + + hdc_dst = CreateCompatibleDC(hdc); + ok_(__FILE__, line)(hdc_dst != 0, "CreateCompatibleDC failed, last error %u\n", GetLastError()); + bmp_obj = CreateCompatibleBitmap(hdc, width, height); + ok_(__FILE__, line)(bmp_obj != 0, "CreateCompatibleBitmap failed, last error %u\n", GetLastError()); + +#ifndef CAPTUREBLT +#define CAPTUREBLT 0x40000000 +#endif + + SelectObject(hdc_dst, bmp_obj); + ret = BitBlt(hdc_dst, 0, 0, width, height, hdc, x, y, SRCCOPY | CAPTUREBLT); + ok_(__FILE__, line)(ret, "BitBlt failed, last error %u\n", GetLastError()); + count = GetObjectW(bmp_obj, sizeof(BITMAP), &bmp); + ok_(__FILE__, line)(count == sizeof(BITMAP), "GetObjectW failed, last error %u\n", GetLastError()); + + info.biSize = sizeof(BITMAPINFOHEADER); + info.biWidth = bmp.bmWidth; + info.biHeight = bmp.bmHeight; + info.biPlanes = 1; + info.biBitCount = 32; + info.biCompression = BI_RGB; + info.biSizeImage = 0; + info.biXPelsPerMeter = 0; + info.biYPelsPerMeter = 0; + info.biClrUsed = 0; + info.biClrImportant = 0; + + data_size = ((bmp.bmWidth * info.biBitCount + 31) / 32) * 4 * bmp.bmHeight; + ok_(__FILE__, line)( data_size == surface_size, "Got %Iu bytes, expected %Iu\n", data_size, surface_size ); + count = GetDIBits(hdc_dst, bmp_obj, 0, bmp.bmHeight, surface, (BITMAPINFO*)&info, DIB_RGB_COLORS); + ok_(__FILE__, line)(count == bmp.bmHeight, "GetDIBits failed, last error %u\n", GetLastError()); + + DeleteObject(bmp_obj); + DeleteDC(hdc_dst); + +#if 0 + { + BITMAPFILEHEADER header; + HANDLE file; + + header.bfType = 0x4d42; + header.bfSize = sizeof(header) + sizeof(info) + data_size; + header.bfOffBits = sizeof(header) + sizeof(info); + + file = CreateFileW(L"surface.bmp", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed, error %u\n", GetLastError()); + ret = WriteFile(file, &header, sizeof(header), &count, NULL); + ok(ret && count == sizeof(header), "WriteFile failed, error %u\n", GetLastError()); + ret = WriteFile(file, &info, sizeof(info), &count, NULL); + ok(ret && count == sizeof(info), "WriteFile failed, error %u\n", GetLastError()); + ret = WriteFile(file, surface, data_size, &count, NULL); + ok(ret && count == data_size, "WriteFile failed, error %u\n", GetLastError()); + CloseHandle(file); + } +#endif + + return data_size; +} + +static void dump_surface(int line, const DWORD *surface, SIZE_T surface_size, const char *prefix) +{ + int i, pos; + char buf[1024]; + + if (surface_size / 4 > 16) + return; + pos = sprintf(buf, "%s", prefix); + for (i = 0; i < surface_size / 4; i++) + pos += sprintf(buf + pos, " %08x", surface[i]); + trace_(__FILE__, line)("%s\n", buf); +} + +#define capture_screen_surface(hwnd, surface, surface_size) capture_screen_surface_(__LINE__, hwnd, surface, surface_size) +static SIZE_T capture_screen_surface_(int line, HWND hwnd, DWORD *surface, SIZE_T surface_size) +{ + SIZE_T data_size, i; + RECT rect, rect_win; + HDC hdc; + + GetWindowRect(hwnd, &rect_win); + GetClientRect(hwnd, &rect); + OffsetRect(&rect, -rect.left, -rect.top); + + hdc = GetDC(NULL); + ok_(__FILE__, line)(hdc != 0, "GetDC failed, last error %u\n", GetLastError()); + if (DwmFlush() == E_NOTIMPL) flush_events( TRUE ); + data_size = capture_surface_(line, hdc, rect_win.left, rect_win.top, rect.right, rect.bottom, surface, surface_size); + ReleaseDC(NULL, hdc); + + for (i = data_size / 4; i != 0; i--) surface[i - 1] &= 0xffffff; + return data_size; +} + +#define check_screen_surface(hwnd, expect, expect_size, todo) check_screen_surface_(__LINE__, hwnd, expect, expect_size, todo) +static void check_screen_surface_(int line, HWND hwnd, const DWORD *expect, SIZE_T expect_size, BOOL todo) +{ + SIZE_T data_size; + DWORD *data; + + if (composition_broken_wm) + return; + + data = malloc(expect_size); + ok_(__FILE__, line)(data != NULL, "Failed to allocate %Iu bytes\n", expect_size); + data_size = capture_screen_surface_(line, hwnd, data, expect_size); + if (data_size != expect_size) + { + todo_wine_if(todo) + ok_(__FILE__, line)(0, "Unexpected screen surface size %Iu, expected %Iu", data_size, expect_size); + } + else if (memcmp( data, expect, data_size )) + { + todo_wine_if(todo) + ok_(__FILE__, line)(0, "Unexpected screen surface data\n"); + dump_surface(line, expect, expect_size, "expected:"); + dump_surface(line, data, data_size, "got: "); + } + else if (todo) + trace_(__FILE__, line)("Got expected screen surface data\n"); + free(data); +} + +#define capture_client_surface(hwnd, surface, surface_size) capture_client_surface_(__LINE__, hwnd, surface, surface_size) +static SIZE_T capture_client_surface_(int line, HWND hwnd, DWORD *surface, SIZE_T surface_size) +{ + SIZE_T data_size; + RECT rect; + HDC hdc; + + GetClientRect(hwnd, &rect); + OffsetRect(&rect, -rect.left, -rect.top); + + hdc = GetDC(hwnd); + ok_(__FILE__, line)(hdc != 0, "GetDC failed, last error %u\n", GetLastError()); + data_size = capture_surface_(line, hdc, 0, 0, rect.right, rect.bottom, surface, surface_size); + ReleaseDC(hwnd, hdc); + + return data_size; +} + +#define check_client_surface(hwnd, expect, expect_size, todo) check_client_surface_(__LINE__, hwnd, expect, expect_size, todo) +static void check_client_surface_(int line, HWND hwnd, const DWORD *expect, SIZE_T expect_size, BOOL todo) +{ + SIZE_T data_size; + DWORD *data; + + data = malloc(expect_size); + ok_(__FILE__, line)(data != NULL, "Failed to allocate %Iu bytes\n", expect_size); + data_size = capture_client_surface_(line, hwnd, data, expect_size); + if (data_size != expect_size) + { + todo_wine_if(todo) + ok_(__FILE__, line)(0, "Unexpected client surface size %Iu, expected %Iu", data_size, expect_size); + } + else if (memcmp( data, expect, data_size )) + { + todo_wine_if(todo) + ok_(__FILE__, line)(0, "Unexpected client surface data\n"); + dump_surface(line, expect, expect_size, "expected:"); + dump_surface(line, data, data_size, "got: "); + } + else if (todo) + trace_(__FILE__, line)("Got expected client surface data\n"); + free(data); +} + +static void paint_client_rect(HWND hwnd, COLORREF color) +{ + HDC hdc = GetDC(hwnd); + HPEN pen = CreatePen(PS_SOLID, 0, color); + HBRUSH brush = CreateSolidBrush(color); + RECT rect; + GetClientRect(hwnd, &rect); + + SelectObject(hdc, pen); + SelectObject(hdc, brush); + Rectangle(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top); + DeleteObject(brush); + DeleteObject(pen); + DeleteDC(hdc); +} + +LRESULT WINAPI test_surface_composition_winproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_ERASEBKGND: return 0; + case WM_NCPAINT: + case WM_PAINT: + { + BeginPaint(hwnd, NULL); + EndPaint(hwnd, NULL); + return 0; + } + default: + return DefWindowProcW(hwnd, msg, wparam, lparam); + } +} + +static void test_surface_composition(void) +{ +#define COLOR1 0x00ff0000 +#define COLOR2 0x0000ffff +#define BGRA2RGB(x) RGB((x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff) + static const DWORD minimized_surface[] = + { + 0x00000000 + }; + static const DWORD hidden_surface[] = + { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + }; + static const DWORD partial_surface[] = + { + 0x00000000, 0x00000000, COLOR1, COLOR1, + 0x00000000, 0x00000000, COLOR1, COLOR1, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + }; + static const DWORD painted_surface[] = + { + COLOR1, COLOR1, COLOR1, COLOR1, + COLOR1, COLOR1, COLOR1, COLOR1, + COLOR1, COLOR1, COLOR1, COLOR1, + COLOR1, COLOR1, COLOR1, COLOR1, + }; + static const DWORD painted_child_surface[] = { + COLOR1, COLOR1, COLOR1, COLOR1, + COLOR1, COLOR2, COLOR2, COLOR1, + COLOR1, COLOR2, COLOR2, COLOR1, + COLOR1, COLOR1, COLOR1, COLOR1, + }; + + DWORD screen_surface[ARRAY_SIZE(painted_surface)]; + DWORD layered_const_surface[ARRAY_SIZE(painted_surface)]; + DWORD layered_child_surface[ARRAY_SIZE(painted_child_surface)]; + DWORD layered_child_const_surface[ARRAY_SIZE(painted_child_surface)]; + DWORD layered_child_alpha_surface[ARRAY_SIZE(painted_child_surface)]; + + BLENDFUNCTION blend_cst_alpha = { AC_SRC_OVER, 0, 0x7f, 0 }; + BLENDFUNCTION blend_src_alpha = { AC_SRC_OVER, 0, 0xff, AC_SRC_ALPHA }; + WNDCLASSEXW wc; + BITMAPINFO info; + HBITMAP bmp_obj; + HRESULT hres; + SIZE_T i; + DWORD *data; + HWND hwnd, hwnd_child; + RECT rect; + BOOL ret; + HDC hdc_dst, hdc_src; + + wc.cbSize = sizeof(WNDCLASSEXW); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = test_surface_composition_winproc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleW(NULL); + wc.hIcon = 0; + wc.hCursor = 0; + wc.hbrBackground = 0; + wc.lpszMenuName = NULL; + wc.lpszClassName = L"surface"; + wc.hIconSm = 0; + RegisterClassExW(&wc); + + + hres = DwmFlush(); + todo_wine ok(hres == S_OK || broken(hres == DWM_E_COMPOSITIONDISABLED), "DwmFlush returned %#x\n", hres); + if (hres == DWM_E_COMPOSITIONDISABLED) + { + win_skip("Cannot reliably capture screen surfaces, skipping tests\n"); + return; + } + + hwnd = CreateWindowW(L"surface", L"", WS_POPUP, 0, 0, 4, 4, NULL, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + flush_events( TRUE ); + + capture_screen_surface(hwnd, screen_surface, sizeof(screen_surface)); + + for (i = 0; i < ARRAY_SIZE(painted_surface); i++) + { + BYTE sr = (screen_surface[i] >> 16) & 0xff, dr = (painted_surface[i] >> 16) & 0xff; + BYTE sg = (screen_surface[i] >> 8) & 0xff, dg = (painted_surface[i] >> 8) & 0xff; + BYTE sb = (screen_surface[i] >> 0) & 0xff, db = (painted_surface[i] >> 0) & 0xff; + BYTE da = 0x7f; + dr = min(max((sr * (0xff - da) + dr * da + 0x7f) / 0xff, 0), 0xff); + dg = min(max((sg * (0xff - da) + dg * da + 0x7f) / 0xff, 0), 0xff); + db = min(max((sb * (0xff - da) + db * da + 0x7f) / 0xff, 0), 0xff); + layered_const_surface[i] = BGRA2RGB(RGB(dr, dg, db)); + } + + memcpy(layered_child_surface, screen_surface, sizeof(screen_surface)); + for (i = 0; i < ARRAY_SIZE(painted_child_surface); i++) + { + if (painted_child_surface[i] == painted_surface[i]) + layered_child_surface[i] = painted_surface[i]; + } + + for (i = 0; i < ARRAY_SIZE(painted_child_surface); i++) + { + BYTE sr = (screen_surface[i] >> 16) & 0xff, dr = (painted_child_surface[i] >> 16) & 0xff; + BYTE sg = (screen_surface[i] >> 8) & 0xff, dg = (painted_child_surface[i] >> 8) & 0xff; + BYTE sb = (screen_surface[i] >> 0) & 0xff, db = (painted_child_surface[i] >> 0) & 0xff; + BYTE da = 0x7f; + dr = min(max((sr * (0xff - da) + dr * da + 0x7f) / 0xff, 0), 0xff); + dg = min(max((sg * (0xff - da) + dg * da + 0x7f) / 0xff, 0), 0xff); + db = min(max((sb * (0xff - da) + db * da + 0x7f) / 0xff, 0), 0xff); + layered_child_const_surface[i] = BGRA2RGB(RGB(dr, dg, db)); + } + + for (i = 0; i < ARRAY_SIZE(painted_child_surface); i++) + { + BYTE sr = (screen_surface[i] >> 16) & 0xff, dr = (painted_child_surface[i] >> 16) & 0xff; + BYTE sg = (screen_surface[i] >> 8) & 0xff, dg = (painted_child_surface[i] >> 8) & 0xff; + BYTE sb = (screen_surface[i] >> 0) & 0xff, db = (painted_child_surface[i] >> 0) & 0xff; + BYTE sa = painted_child_surface[i] == COLOR2 ? 0xff : 0x00; + dr = min(max((sr * (0xff - sa) + dr * 0xff + 0x7f) / 0xff, 0), 0xff); + dg = min(max((sg * (0xff - sa) + dg * 0xff + 0x7f) / 0xff, 0), 0xff); + db = min(max((sb * (0xff - sa) + db * 0xff + 0x7f) / 0xff, 0), 0xff); + layered_child_alpha_surface[i] = BGRA2RGB(RGB(dr, dg, db)); + } + + + ShowWindow(hwnd, SW_SHOW); + flush_events( TRUE ); + GetWindowRect(hwnd, &rect); + if (rect.left != 0 || rect.top != 0) + { + skip("window manager does not honor requested position\n"); + composition_broken_wm = TRUE; + } + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + ShowWindow(hwnd, SW_HIDE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), FALSE); + check_screen_surface(hwnd, screen_surface, sizeof(screen_surface), FALSE); + + ShowWindow(hwnd, SW_SHOW); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + ShowWindow(hwnd, SW_MINIMIZE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, minimized_surface, sizeof(minimized_surface), FALSE); + check_screen_surface(hwnd, minimized_surface, sizeof(minimized_surface), FALSE); + + ShowWindow(hwnd, SW_RESTORE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + SetWindowPos(hwnd, 0, -100, -100, 0, 0, SWP_NOSIZE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), TRUE); + check_screen_surface(hwnd, hidden_surface, sizeof(hidden_surface), FALSE); + + SetWindowPos(hwnd, 0, -2, -2, 0, 0, SWP_NOSIZE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, partial_surface, sizeof(partial_surface), TRUE); + + SetWindowPos(hwnd, 0, 0, 0, 0, 0, SWP_NOSIZE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + hwnd_child = CreateWindowW(L"surface", L"", WS_CHILD | WS_VISIBLE, 1, 1, 2, 2, hwnd, NULL, NULL, NULL); + ok(hwnd_child != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + + flush_events( TRUE ); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | WS_CLIPCHILDREN); + + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + + DestroyWindow(hwnd_child); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + + DestroyWindow(hwnd); + + + /* WS_EX_LAYERED */ + + hwnd = CreateWindowW(L"surface", L"", WS_POPUP | WS_VISIBLE, 0, 0, 4, 4, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + flush_events( TRUE ); + + SetWindowLongW(hwnd, GWL_EXSTYLE, GetWindowLongW(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + ShowWindow(hwnd, SW_HIDE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), TRUE); + check_screen_surface(hwnd, screen_surface, sizeof(screen_surface), FALSE); + + ShowWindow(hwnd, SW_SHOW); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), TRUE); + + hwnd_child = CreateWindowW(L"surface", L"", WS_CHILD | WS_VISIBLE, 1, 1, 2, 2, hwnd, NULL, NULL, NULL); + ok(hwnd_child != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + + flush_events( TRUE ); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), TRUE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), TRUE); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), TRUE); + + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | WS_CLIPCHILDREN); + + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), TRUE); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), TRUE); + + DestroyWindow(hwnd_child); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), TRUE); + + DestroyWindow(hwnd); + + + /* SetLayeredWindowAttributes / LWA_ALPHA */ + + hwnd = CreateWindowW(L"surface", L"", WS_POPUP, 0, 0, 4, 4, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + + SetWindowLongW(hwnd, GWL_EXSTYLE, GetWindowLongW(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, screen_surface, sizeof(screen_surface), FALSE); + + ShowWindow(hwnd, SW_SHOW); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, screen_surface, sizeof(screen_surface), FALSE); + + ret = SetLayeredWindowAttributes(hwnd, 0, 0x7f, LWA_ALPHA); + ok(ret, "SetLayeredWindowAttributes failed, last error %u\n", GetLastError()); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, layered_const_surface, sizeof(layered_const_surface), TRUE); + + hwnd_child = CreateWindowW(L"surface", L"", WS_CHILD | WS_VISIBLE, 1, 1, 2, 2, hwnd, NULL, NULL, NULL); + ok(hwnd_child != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + + flush_events( TRUE ); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, layered_const_surface, sizeof(layered_const_surface), TRUE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_const_surface, sizeof(layered_child_const_surface), TRUE); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, layered_const_surface, sizeof(layered_const_surface), TRUE); + + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | WS_CLIPCHILDREN); + + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_const_surface, sizeof(layered_child_const_surface), TRUE); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_const_surface, sizeof(layered_child_const_surface), TRUE); + + DestroyWindow(hwnd_child); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_const_surface, sizeof(layered_child_const_surface), TRUE); + + DestroyWindow(hwnd); + + + /* SetLayeredWindowAttributes / LWA_COLORKEY */ + + hwnd = CreateWindowW(L"surface", L"", WS_POPUP, 0, 0, 4, 4, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + + SetWindowLongW(hwnd, GWL_EXSTYLE, GetWindowLongW(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED); + ret = SetLayeredWindowAttributes(hwnd, BGRA2RGB(COLOR2), 0, LWA_COLORKEY); + ok(ret, "SetLayeredWindowAttributes failed, last error %u\n", GetLastError()); + ShowWindow(hwnd, SW_SHOW); + flush_events( TRUE ); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + hwnd_child = CreateWindowW(L"surface", L"", WS_CHILD | WS_VISIBLE, 1, 1, 2, 2, hwnd, NULL, NULL, NULL); + ok(hwnd_child != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + flush_events( TRUE ); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_surface, sizeof(layered_child_surface), FALSE); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | WS_CLIPCHILDREN); + + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_surface, sizeof(layered_child_surface), FALSE); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_surface, sizeof(layered_child_surface), FALSE); + + DestroyWindow(hwnd_child); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_surface, sizeof(layered_child_surface), FALSE); + + GetClientRect(hwnd, &rect); + OffsetRect(&rect, -rect.left, -rect.top); + + memset(&info, 0, sizeof(info)); + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = rect.right; + info.bmiHeader.biHeight = rect.bottom; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + info.bmiHeader.biSizeImage = rect.right * rect.bottom * 4; + + hdc_dst = GetDC(hwnd); + ok(hdc_dst != 0, "GetDC failed, last error %u\n", GetLastError()); + hdc_src = CreateCompatibleDC(hdc_dst); + ok(hdc_src != 0, "CreateCompatibleDC failed, last error %u\n", GetLastError()); + bmp_obj = CreateDIBSection(hdc_src, &info, DIB_RGB_COLORS, (void **)&data, NULL, 0x0); + ok(bmp_obj != 0, "CreateBitmap failed, last error %u\n", GetLastError()); + SelectObject(hdc_src, bmp_obj); + ret = BitBlt(hdc_src, 0, 0, rect.right, rect.bottom, hdc_dst, 0, 0, SRCCOPY); + ok(ret, "BitBlt failed, last error %u\n", GetLastError()); + ReleaseDC(hwnd, hdc_dst); + + for (i = rect.bottom * rect.right; i != 0; i--) + if (data[i - 1] == COLOR2) data[i - 1] |= 0xff000000; + + DestroyWindow(hwnd); + + + /* UpdateLayeredWindow */ + + hdc_dst = GetDC(NULL); + hwnd = CreateWindowW(L"surface", L"", WS_POPUP, 0, 0, 4, 4, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + + SetWindowLongW(hwnd, GWL_EXSTYLE, GetWindowLongW(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, screen_surface, sizeof(screen_surface), FALSE); + + ret = UpdateLayeredWindow(hwnd, hdc_dst, NULL, (SIZE *)&rect.right, hdc_src, (POINT *)&rect.left, 0, NULL, ULW_OPAQUE); + ok(ret, "UpdateLayeredWindow failed, last error %u\n", GetLastError()); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, screen_surface, sizeof(screen_surface), FALSE); + + ShowWindow(hwnd, SW_SHOW); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), TRUE); + + ret = UpdateLayeredWindow(hwnd, hdc_dst, NULL, (SIZE *)&rect.right, hdc_src, (POINT *)&rect.left, BGRA2RGB(COLOR2), NULL, ULW_COLORKEY); + ok(ret, "UpdateLayeredWindow failed, last error %u\n", GetLastError()); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, layered_child_surface, sizeof(layered_child_surface), TRUE); + + ret = UpdateLayeredWindow(hwnd, hdc_dst, NULL, (SIZE *)&rect.right, hdc_src, (POINT *)&rect.left, 0, &blend_cst_alpha, ULW_ALPHA); + ok(ret, "UpdateLayeredWindow failed, last error %u\n", GetLastError()); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, layered_child_const_surface, sizeof(layered_child_const_surface), TRUE); + + ret = UpdateLayeredWindow(hwnd, hdc_dst, NULL, (SIZE *)&rect.right, hdc_src, (POINT *)&rect.left, 0, &blend_src_alpha, ULW_ALPHA); + ok(ret, "UpdateLayeredWindow failed, last error %u\n", GetLastError()); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, layered_child_alpha_surface, sizeof(layered_child_alpha_surface), TRUE); + + DeleteObject(bmp_obj); + DeleteDC(hdc_src); + ReleaseDC(NULL, hdc_dst); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, layered_child_alpha_surface, sizeof(layered_child_alpha_surface), TRUE); + + hwnd_child = CreateWindowW(L"surface", L"", WS_CHILD | WS_VISIBLE, 1, 1, 2, 2, hwnd, NULL, NULL, NULL); + ok(hwnd_child != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + flush_events( TRUE ); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, layered_child_alpha_surface, sizeof(layered_child_alpha_surface), TRUE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, layered_child_alpha_surface, sizeof(layered_child_alpha_surface), TRUE); + + DestroyWindow(hwnd_child); + DestroyWindow(hwnd); + + + UnregisterClassW(L"surface", NULL); + +#undef BGRA2RGB +#undef COLOR1 +#undef COLOR2 +} + START_TEST(win) { char **argv; @@ -12178,6 +12862,8 @@ START_TEST(win) DestroyWindow(hwndMain2); DestroyWindow(hwndMain); + test_surface_composition(); + /* Make sure that following tests are executed last, under Windows they * tend to break the tests which are sensitive to z-order and activation * state of hwndMain and hwndMain2 windows. -- 2.31.1

2 9

[PATCH 5/5] winepulse: Move pulse_set_event_handle to unix lib.
by Jacek Caban May 18, 2021

May 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 19 +++---------------- dlls/winepulse.drv/pulse.c | 19 +++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 23 insertions(+), 16 deletions(-)

2 1

[PATCH 4/5] winepulse: Move release_render_buffer to unix lib.
by Jacek Caban May 18, 2021

May 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 61 ++------------------------------ dlls/winepulse.drv/pulse.c | 66 +++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 2 ++ 3 files changed, 71 insertions(+), 58 deletions(-)

2 1

[PATCH 3/5] winepulse: Move pulse_get_render_buffer to unix lib.
by Jacek Caban May 18, 2021

May 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 47 ++------------------------ dlls/winepulse.drv/pulse.c | 62 +++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 66 insertions(+), 44 deletions(-)

2 1

[PATCH 2/5] winepulse: Move pulse_reset to unix lib.
by Jacek Caban May 18, 2021

May 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 55 ++---------------------------- dlls/winepulse.drv/pulse.c | 63 +++++++++++++++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 2 +- 3 files changed, 65 insertions(+), 55 deletions(-)

2 1

[PATCH 1/5] winepulse: Move pulse_start to unix lib.
by Jacek Caban May 18, 2021

May 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 51 +++++++------------------------- dlls/winepulse.drv/pulse.c | 55 +++++++++++++++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 2 +- 3 files changed, 64 insertions(+), 44 deletions(-)

2 1

[PATCH 1/3] winevulkan: Specify which structures to ignore in STRUCT_CHAIN_CONVERSIONS.
by Derek Lesho May 18, 2021

May 18, 2021

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index cc79b0a58cd..7f76d328fc8 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -256,10 +256,11 @@ FUNCTION_OVERRIDES = { "vkDebugMarkerSetObjectTagEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, } -STRUCT_CHAIN_CONVERSIONS = [ - "VkDeviceCreateInfo", - "VkInstanceCreateInfo", -] +STRUCT_CHAIN_CONVERSIONS = { + # Ignore to not confuse host loader. + "VkDeviceCreateInfo": ["VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO"], + "VkInstanceCreateInfo": ["VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO"], +} class Direction(Enum): @@ -2417,9 +2418,10 @@ class FreeFunction(object): class StructChainConversionFunction(object): - def __init__(self, direction, struct): + def __init__(self, direction, struct, ignores): self.direction = direction self.struct = struct + self.ignores = ignores self.type = struct.name self.name = "convert_{0}_struct_chain".format(self.type) @@ -2444,9 +2446,8 @@ class StructChainConversionFunction(object): body += " switch (in_header->sType)\n" body += " {\n" - # Ignore to not confuse host loader. - body += " case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO:\n" - body += " case VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO:\n" + for i in self.ignores: + body += " case {0}:\n".format(i) body += " break;\n\n" for e in self.struct.struct_extensions: @@ -2455,6 +2456,9 @@ class StructChainConversionFunction(object): stype = next(x for x in e.members if x.name == "sType") + if stype.values in self.ignores: + continue + body += " case {0}:\n".format(stype.values) body += " {\n" @@ -2604,7 +2608,7 @@ class VkGenerator(object): for struct in self.registry.structs: if struct.name in STRUCT_CHAIN_CONVERSIONS: - self.struct_chain_conversions.append(StructChainConversionFunction(Direction.INPUT, struct)) + self.struct_chain_conversions.append(StructChainConversionFunction(Direction.INPUT, struct, STRUCT_CHAIN_CONVERSIONS[struct.name])) self.struct_chain_conversions.append(FreeStructChainFunction(struct)) # Once we decide to support pNext chains conversion everywhere, move this under get_conversions for e in struct.struct_extensions: -- 2.31.1

3 15

[PATCH vkd3d 1/5] vkd3d-shader: Mark all declared non-static global variables as HLSL_STORAGE_UNIFORM.
by Zebediah Figura May 18, 2021

May 18, 2021

Fixes: 549be35c0aff6aa78f1dc9a08df89ce8de16db2c Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 6 ++++++ libs/vkd3d-shader/hlsl_codegen.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2c9fe551..bcb1c207 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1427,6 +1427,12 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Variable '%s' is declared as both \"uniform\" and \"static\".", var->name); + /* Mark it as uniform. We need to do this here since synthetic + * variables also get put in the global scope, but shouldn't be + * considered uniforms, and we have no way of telling otherwise. */ + if (!(modifiers & HLSL_STORAGE_STATIC)) + var->modifiers |= HLSL_STORAGE_UNIFORM; + if ((func = hlsl_get_func_decl(ctx, var->name))) { hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 0dfbfb9f..716824ae 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1757,7 +1757,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun { if (var->data_type->type == HLSL_CLASS_OBJECT) list_add_tail(&ctx->extern_vars, &var->extern_entry); - else if (!(var->modifiers & HLSL_STORAGE_STATIC)) + else if (var->modifiers & HLSL_STORAGE_UNIFORM) prepend_uniform_copy(ctx, entry_func->body, var); } -- 2.31.1

3 14