November 2021 - Wine-Devel - list.winehq.org

[PATCH] mf/tests: Attempt to fix test crashes on some test boxes.
by Nikolay Sivov Nov. 21, 2021

Nov. 21, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index eb681a8b9a7..0d4cb05711a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4498,15 +4498,18 @@ todo_wine { hr = IMFMediaSink_AddStreamSink(sink, 1, NULL, &stream_sink2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = MFGetService((IUnknown *)stream_sink2, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, - (void **)&allocator); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFVideoSampleAllocator_Release(allocator); + if (SUCCEEDED(hr)) + { + hr = MFGetService((IUnknown *)stream_sink2, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, + (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFVideoSampleAllocator_Release(allocator); - hr = IMFMediaSink_RemoveStreamSink(sink, 1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_RemoveStreamSink(sink, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFStreamSink_Release(stream_sink2); + IMFStreamSink_Release(stream_sink2); + } hr = IMFMediaSink_GetCharacteristics(sink, &flags); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.33.0

2 1

[PATCH] ucrtbase/tests: Don't test functions directly when reporting GetLastError()
by André Zwing Nov. 21, 2021

Nov. 21, 2021

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/ucrtbase/tests/thread.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/thread.c b/dlls/ucrtbase/tests/thread.c index 7693304e612..940db8e4dbf 100644 --- a/dlls/ucrtbase/tests/thread.c +++ b/dlls/ucrtbase/tests/thread.c @@ -105,7 +105,8 @@ static void test_thread_library_reference(char *thread_dll, ok(thread_handle != -1 && thread_handle != 0, "Failed to begin thread: %u\n", errno); - ok(FreeLibrary(dll), "Failed to free the library: %u\n", GetLastError()); + ret = FreeLibrary(dll); + ok(ret, "Failed to free the library: %u\n", GetLastError()); ret = WaitForSingleObject(args.confirm_running, 200); ok(ret == WAIT_OBJECT_0, "Event was not signaled, ret: %u, err: %u\n", ret, GetLastError()); @@ -113,7 +114,8 @@ static void test_thread_library_reference(char *thread_dll, ret = WaitForSingleObject(detach_event, 0); ok(ret == WAIT_TIMEOUT, "Thread detach happened unexpectedly signaling an event, ret: %d, err: %u\n", ret, GetLastError()); - ok(SetEvent(args.past_free), "Failed to signal event: %d\n", GetLastError()); + ret = SetEvent(args.past_free); + ok(ret, "Failed to signal event: %d\n", GetLastError()); if (beginthread_method == use_beginthreadex) { -- 2.25.1

1 0

[PATCH v5] kernel32/tests: Add SetCurrentConsoleFontEx tests for the current window size
by Hugh McMaster Nov. 21, 2021

Nov. 21, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in v5: Remove unneeded todo_wine macros dlls/kernel32/tests/console.c | 271 +++++++++++++++++++++++++++++++++- 1 file changed, 269 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8b5abfa2da9..7f546517573 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3554,10 +3554,17 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) static void test_SetCurrentConsoleFontEx(HANDLE std_output) { - CONSOLE_FONT_INFOEX orig_cfix, cfix; + CONSOLE_FONT_INFOEX orig_cfix, cfix, tmp; BOOL ret; HANDLE pipe1, pipe2; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + unsigned int cp, font_family; + WCHAR face_name[] = L"Courier New"; + + font_family = TMPF_VECTOR | TMPF_TRUETYPE | FF_MODERN; + + /* Save current console font information */ + cp = GetConsoleOutputCP(); orig_cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); @@ -3651,17 +3658,277 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) ok(!ret, "got %d, expected 0\n", ret); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + /* Try setting console font information for the current window size */ + SetConsoleOutputCP(CP_UTF8); + + cfix.cbSize = sizeof(cfix); + cfix.nFont = 0; + cfix.dwFontSize.X = 8; + cfix.dwFontSize.Y = 16; + cfix.FontFamily = font_family; + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, face_name); + + tmp.cbSize = sizeof(tmp); + + /* Courier New is available in the console by default from Windows 10 build 1607 */ + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + if (lstrcmpW(tmp.FaceName, face_name)) + { + SetConsoleOutputCP(cp); + skip("%s not available. Skipping SetCurrentConsoleFontEx tests.\n", wine_dbgstr_w(face_name)); + return; + } + + /* Test font size 8x16 */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X || tmp.dwFontSize.X == 9, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 10x20 */ + cfix.dwFontSize.X = 10; + cfix.dwFontSize.Y = 20; + SetLastError(0xdeadbeef); - ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 5x12. We pass in 10x12. */ + cfix.dwFontSize.X = 10; + cfix.dwFontSize.Y = 12; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 10x20. We pass in 0x20. */ + cfix.dwFontSize.X = 0; + cfix.dwFontSize.Y = 20; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == 10, "got %u, expected font width of 10\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 20, "got %u, expected font height of 20\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test invalid font size 7x0 */ + cfix = tmp; + cfix.dwFontSize.X = 7; + cfix.dwFontSize.Y = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 13x24 */ + cfix.dwFontSize.X = 13; + cfix.dwFontSize.Y = 24; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 0x0 */ + cfix.dwFontSize.X = 0; + cfix.dwFontSize.Y = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Reset to font size 8x16 */ + cfix.dwFontSize.X = 8; + cfix.dwFontSize.Y = 16; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X || tmp.dwFontSize.X == 9, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test with no font weight */ + cfix.FontWeight = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X || tmp.dwFontSize.X == 9, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == FW_NORMAL, "got %u, expected %u\n", tmp.FontWeight, FW_NORMAL); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test with invalid font face name */ + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, L"MissingFont"); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X || tmp.dwFontSize.X == 9, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test with no font face name */ + cfix.FaceName[0] = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X || tmp.dwFontSize.X == 9, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + /* Restore original console font parameters */ + SetConsoleOutputCP(cp); + SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); -- 2.33.1

1 0

Wine staging 6.22 release
by Alistair Leslie-Hughes Nov. 20, 2021

Nov. 20, 2021

Binary packages for various distributions will be available from: https://www.winehq.org/download Notes: dwarf4 debug information is now the default for wine-staging. Summary since last release * Rebased to current wine 6.22 (554 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * ntdll: Implement NtAlertThreadByThreadId and NtWaitForAlertByThreadId. * ntdll/tests: Add basic tests for thread-id alert functions. * ntdll: Implement thread-ID alerts using futexes if possible. * ntdll: Implement thread-ID alerts using Mach semaphores on Mac. * ntdll: Reimplement Win32 futexes on top of thread-ID alerts. * ntdll: Reimplement the critical section fast path on top of Win32 futexes. * ntdll: Get rid of the direct futex path for condition variables. * ntdll: Reimplement SRW locks on top of Win32 futexes. Added: * None Updated: * dinput-joy-mappings Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v5 0/6] winedbg(gdbproxy): don't misbehave on module names w/ special characters; modernise
by Jinoh Kang Nov. 20, 2021

Nov. 20, 2021

Changelog: v1 -> v2: address review comments so far v2 -> v3: - Change cover letter subject - Capitalise subject - Split qXfer cache patch into two v3 -> v4: - Fix pointer variable declaration style - Synchronize to prior modified patches. - Refactor the code a bit - Revert to scanf() when parsing Xfer packet lines - Fix indentation - s/buffer_realloc/realloc/g - s/vl_buffer/reply_buffer/g; s/vl_/reply_buffer_/g; s/vlbuf/reply/g - Rewrite reply_buffer_add_uinthex(): convert for loop into while loop - Rewrite reply_buffer_append_xmlstr(): convert for loop into while loop - Split packet_reply_add() into packet_reply_add_data() here - Rewrite packet_reply_add for clarity. - Update Wine version in comment. v4 -> v5: - Fix pointer variable declaration style. - Synchronize to prior modified patches. - Split out XML escaping in a separate patch - Don't realloc/free when emptying - Drop reply_buffer_resize(), merge into reply_buffer_grow() - Remove "more" variables for now - Don't empty the reply buffer twice - Use two sscanf for alternative patterns - Don't always zero-initialise qxfer_object_annex - Use strcpy (I just did what I was told to do) - Use strcmp (I just did what I was told to do) Jinoh Kang (6): winedbg: Refactor out_{buf*,len} of gdb_context into reply_buffer. winedbg: Buffer output of GDB qXfer commands for proper slicing. winedbg: Escape XML special characters in qXfer reply. winedbg: Define table for GDB qXfer command handlers. winedbg: Cache GDB qXfer command result for chunked fetching. winedbg: Implement GDB qXfer object exec-file. programs/winedbg/gdbproxy.c | 601 ++++++++++++++++++++++++------------ 1 file changed, 404 insertions(+), 197 deletions(-) -- 2.31.1

1 6

7.0 release plans
by Alexandre Julliard Nov. 20, 2021

Nov. 20, 2021

Folks, With the end of the year approaching, it's time to start thinking about the code freeze towards Wine 7.0. My plan is to make one more development release (6.23) two weeks from now, and start the code freeze one week after that, with a 7.0-rc1 release on December 10. We'll then have the usual weekly rc releases, until the final 7.0 sometime in the second half of January. This means that if you have things that you'd like to see in 7.0, you still have 3 weeks to get them upstream... -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH v4 0/7] winedbg(gdbproxy): don't misbehave on module names w/ special characters; modernise
by Jinoh Kang Nov. 19, 2021

Nov. 19, 2021

Changelog: v1 -> v2: address review comments so far v2 -> v3: - Change cover letter subject - Capitalise subject - Split qXfer cache patch into two v3 -> v4: - Fix pointer variable declaration style - Synchronize to prior modified patches. - Refactor the code a bit - Revert to scanf() when parsing Xfer packet lines - Fix indentation - s/buffer_realloc/realloc/g - s/vl_buffer/reply_buffer/g; s/vl_/reply_buffer_/g; s/vlbuf/reply/g - Rewrite reply_buffer_add_uinthex(): convert for loop into while loop - Rewrite reply_buffer_append_xmlstr(): convert for loop into while loop - Split packet_reply_add() into packet_reply_add_data() here - Rewrite packet_reply_add for clarity. - Update Wine version in comment. Jinoh Kang (7): winedbg: Replace packet_realloc() with realloc(). winedbg: Use unsigned int for offset/length in GDB qXfer handler. winedbg: Escape special characters in GDB packet reply. winedbg: Buffer and escape output of GDB qXfer commands. winedbg: Define table for GDB qXfer command handlers. winedbg: Cache GDB qXfer command result for chunked fetching. winedbg: Implement GDB qXfer object exec-file. programs/winedbg/gdbproxy.c | 621 ++++++++++++++++++++++++++---------- 1 file changed, 456 insertions(+), 165 deletions(-) -- 2.31.1

3 20

[PATCH 1/2] gdi32/tests: Test whether D3DKMTDestroyDCFromMemory() frees the DC memory.
by Zebediah Figura Nov. 19, 2021

Nov. 19, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/gdi32/tests/bitmap.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 0293d881fd9..a244414660b 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -5686,10 +5686,12 @@ static void test_D3DKMTCreateDCFromMemory( void ) { D3DKMT_DESTROYDCFROMMEMORY destroy_desc; D3DKMT_CREATEDCFROMMEMORY create_desc; + MEMORY_BASIC_INFORMATION memory_info; unsigned int width_bytes; unsigned int i, x, y, z; DWORD expected, colour; BYTE data[12][48]; + void *alloc_data; NTSTATUS status; HGDIOBJ *bitmap; DIBSECTION dib; @@ -5939,6 +5941,39 @@ static void test_D3DKMTCreateDCFromMemory( void ) DeleteObject( SelectObject( bmp_dc, bmp ) ); DeleteDC( bmp_dc ); } + + alloc_data = VirtualAlloc( NULL, 4096, MEM_COMMIT, PAGE_READWRITE ); + ok(!!alloc_data, "Failed to allocate memory, error %u.\n", GetLastError()); + + create_desc.pMemory = alloc_data; + create_desc.Format = D3DDDIFMT_A8R8G8B8; + create_desc.Width = 16; + create_desc.Height = 16; + create_desc.Pitch = 16 * 4; + create_desc.hDeviceDc = CreateCompatibleDC( NULL ); + create_desc.pColorTable = NULL; + + status = pD3DKMTCreateDCFromMemory( &create_desc ); + ok(!status, "Got unexpected status %#x.\n", status); + + size = VirtualQuery( alloc_data, &memory_info, sizeof(memory_info) ); + ok(size == sizeof(memory_info), "Got unexpected size %u.\n", size); + ok(memory_info.State == MEM_COMMIT, "Got state %#x.\n", memory_info.State); + ok(memory_info.Protect == PAGE_READWRITE, "Got protection %#x.\n", memory_info.Protect); + + destroy_desc.hDc = create_desc.hDc; + destroy_desc.hBitmap = create_desc.hBitmap; + + status = pD3DKMTDestroyDCFromMemory( &destroy_desc ); + ok(!status, "Got unexpected status %#x.\n", status); + + size = VirtualQuery( alloc_data, &memory_info, sizeof(memory_info) ); + ok(size == sizeof(memory_info), "Got unexpected size %u.\n", size); + todo_wine ok(memory_info.State == MEM_COMMIT, "Got state %#x.\n", memory_info.State); + todo_wine ok(memory_info.Protect == PAGE_READWRITE, "Got protection %#x.\n", memory_info.Protect); + + ret = VirtualFree( alloc_data, 0, MEM_RELEASE ); + todo_wine ok(ret, "Failed to free memory, error %u.\n", GetLastError()); } START_TEST(bitmap) -- 2.33.0

1 1

[PATCH 1/3] gdiplus: Add pixel conversions to 4bpp indexed.
by Bernhard Kölbl Nov. 19, 2021

Nov. 19, 2021

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/gdiplus/image.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ead76fc4b27..862f7fea111 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -726,6 +726,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_16bppGrayScale, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_16bppGrayScale, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_16bppGrayScale, setpixel_8bppIndexed); case PixelFormat16bppRGB555: @@ -755,6 +757,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_16bppRGB555, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_16bppRGB555, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_16bppRGB555, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -784,6 +788,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_16bppRGB565, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_16bppRGB565, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_16bppRGB565, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -813,6 +819,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_16bppARGB1555, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_16bppARGB1555, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_16bppARGB1555, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -842,6 +850,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_24bppRGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_24bppRGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_24bppRGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -871,6 +881,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_32bppRGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_32bppRGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_32bppRGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -900,6 +912,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_32bppARGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_32bppARGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_32bppARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -928,6 +942,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_32bppPARGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_32bppPARGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_32bppPARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -957,6 +973,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_48bppRGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_48bppRGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_48bppRGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -986,6 +1004,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_64bppARGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_64bppARGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_64bppARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -1015,6 +1035,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_64bppPARGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_64bppPARGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_64bppPARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: -- 2.33.0

2 4

[PATCH 2/2 v2] msvcp_win: Forward to msvcp140.
by Piotr Caban Nov. 19, 2021

Nov. 19, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51415 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp_win/msvcp_win.spec | 6499 ++++++++++++++++----------------- tools/make_specfiles | 4 + 2 files changed, 3253 insertions(+), 3250 deletions(-)

1 0