- Wine-Devel - list.winehq.org

[PATCH 2/2] ntdll: Treat INVALID_HANDLE_VALUE as success in CloseHandle.
by Daniel Lehman March 16, 2022

March 16, 2022

2 2

[PATCH v2 1/6] winedbg: memory_get_string(_indirect) should take a const src address.
by Brendan Shanks March 16, 2022

March 16, 2022

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/winedbg/debugger.h | 6 ++++-- programs/winedbg/memory.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 0cc2f8b7a6c..d275182c4f9 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -402,8 +402,10 @@ extern void memory_examine(const struct dbg_lvalue *lvalue, int coun extern void* memory_to_linear_addr(const ADDRESS64* address); extern BOOL memory_get_current_pc(ADDRESS64* address); extern BOOL memory_get_current_stack(ADDRESS64* address); -extern BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee, BOOL unicode, char* buffer, int size); -extern BOOL memory_get_string_indirect(struct dbg_process* pcs, void* addr, BOOL unicode, WCHAR* buffer, int size); +extern BOOL memory_get_string(struct dbg_process* pcs, const void* addr, BOOL in_debuggee, BOOL unicode, + char* buffer, int size); +extern BOOL memory_get_string_indirect(struct dbg_process* pcs, const void* addr, BOOL unicode, + WCHAR* buffer, int size); extern BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len); extern void memory_disassemble(const struct dbg_lvalue*, const struct dbg_lvalue*, int instruction_count); extern BOOL memory_disasm_one_insn(ADDRESS64* addr); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index faa5ac9ddcb..7fe3d342b33 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -371,7 +371,7 @@ BOOL memory_store_float(const struct dbg_lvalue* lvalue, double *ret) return memory_write_value(lvalue, size, ret); } -BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee, +BOOL memory_get_string(struct dbg_process* pcs, const void* addr, BOOL in_debuggee, BOOL unicode, char* buffer, int size) { SIZE_T sz; @@ -402,7 +402,7 @@ BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee, return TRUE; } -BOOL memory_get_string_indirect(struct dbg_process* pcs, void* addr, BOOL unicode, WCHAR* buffer, int size) +BOOL memory_get_string_indirect(struct dbg_process* pcs, const void* addr, BOOL unicode, WCHAR* buffer, int size) { void* ad = 0; SIZE_T sz; -- 2.34.1

1 5

[PATCH v3 1/2] user32/tests: Test that ShowWindow(SW_SHOWMINIMIZED) shouldn't make a window visible.
by Zhiyi Zhang March 16, 2022

March 16, 2022

This bug can be triggered on Mutter because it unminimizes windows when handling map requests. Also see https://gitlab.gnome.org/GNOME/mutter/-/blob/main/src/x11/events.c#L1525 for how map requests are handled. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Supersede 227676~227677. Fix test failures. dlls/user32/tests/win.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cfcec5cc78f..f47fcd2fe65 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7420,7 +7420,9 @@ static void test_ShowWindow(void) RECT rcMain, rc, rcMinimized, rcClient, rcEmpty, rcMaximized, rcResized, rcNonClient, rcBroken; LPARAM ret; MONITORINFO mon_info; - unsigned int i; + unsigned int i, timeout = 0; + COLORREF color; + HDC hdc; DWORD test_style[] = { @@ -7693,6 +7695,30 @@ static void test_ShowWindow(void) flush_events(TRUE); + /* Test SW_SHOWMINIMIZED shouldn't restore windows from minimized state */ + SetWindowPos(hwndMain, 0, 100, 100, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + hwnd = CreateWindowA("static", "test", WS_POPUP, 100, 100, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + ShowWindow(hwnd, SW_SHOWMINIMIZED); + flush_events(TRUE); + + hdc = GetDC(0); + color = GetPixel(hdc, 150, 150); + /* Desktop pixels may take a while to update */ + while (color != 0xffffff && timeout < 1000) + { + Sleep(100); + timeout += 100; + color = GetPixel(hdc, 150, 150); + } + /* The window rectangle of hwndMain is (100, 100, 300, 300). If the window manager unminimizes + * hwnd, hwnd will end up obscuring hwndMain. Mutter is such a window manager that unminimizes + * windows when handling map requests and thus can demonstrate this bug */ + todo_wine_if(color != 0xffffff) + ok(color == 0xffffff, "Expected color %#x, got %#x.\n", 0xffffff, color); + ReleaseDC(0, hdc); + DestroyWindow(hwnd); + /* test maximize and restore windows without setting WS_CAPTION */ for (i = 0; i < ARRAY_SIZE(test_style); ++i) -- 2.32.0

3 2

[PATCH 1/5] windows.media.speech: Implement ISpeechRecognitionConstraint isEnabled.
by Bernhard Kölbl March 16, 2022

March 16, 2022

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/listconstraint.c | 14 ++++++++++---- dlls/windows.media.speech/tests/speech.c | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index 33fe9d4ae51..d641902f4bc 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -34,6 +34,8 @@ struct list_constraint ISpeechRecognitionListConstraint ISpeechRecognitionListConstraint_iface; ISpeechRecognitionConstraint ISpeechRecognitionConstraint_iface; LONG ref; + + BOOLEAN enabled; }; /* @@ -142,14 +144,18 @@ DEFINE_IINSPECTABLE(constraint, ISpeechRecognitionConstraint, struct list_constr static HRESULT WINAPI constraint_get_IsEnabled( ISpeechRecognitionConstraint *iface, BOOLEAN *value ) { - FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + struct list_constraint *impl = impl_from_ISpeechRecognitionConstraint(iface); + TRACE("iface %p, value %p.\n", iface, value); + *value = impl->enabled; + return S_OK; } static HRESULT WINAPI constraint_put_IsEnabled( ISpeechRecognitionConstraint *iface, BOOLEAN value ) { - FIXME("iface %p, value %u stub!\n", iface, value); - return E_NOTIMPL; + struct list_constraint *impl = impl_from_ISpeechRecognitionConstraint(iface); + TRACE("iface %p, value %u.\n", iface, value); + impl->enabled = value; + return S_OK; } static HRESULT WINAPI constraint_get_Tag( ISpeechRecognitionConstraint *iface, HSTRING *value ) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index a88b8aae3d2..66869a164d2 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -797,13 +797,13 @@ static void test_SpeechRecognitionListConstraint(void) hr = WindowsDeleteString(tag_out); todo_wine ok(hr == S_OK, "WindowsDeleteString failed, hr %#lx.\n", hr); +skip_tests: hr = ISpeechRecognitionConstraint_put_IsEnabled(constraint, TRUE); - todo_wine ok(hr == S_OK, "ISpeechRecognitionConstraint_put_IsEnabled failed, hr %#lx.\n", hr); + ok(hr == S_OK, "ISpeechRecognitionConstraint_put_IsEnabled failed, hr %#lx.\n", hr); hr = ISpeechRecognitionConstraint_get_IsEnabled(constraint, &enabled); - todo_wine ok(hr == S_OK, "ISpeechRecognitionConstraint_get_IsEnabled failed, hr %#lx.\n", hr); - todo_wine ok(enabled, "ListConstraint didn't get enabled.\n"); + ok(hr == S_OK, "ISpeechRecognitionConstraint_get_IsEnabled failed, hr %#lx.\n", hr); + ok(enabled, "ListConstraint didn't get enabled.\n"); -skip_tests: ref = ISpeechRecognitionConstraint_Release(constraint); ok(ref == 1, "Got unexpected ref %lu.\n", ref); -- 2.35.1

2 9

[PATCH 6/7] win32u: Move NtUserKillTimer implementation from user32.
by Jacek Caban March 16, 2022

March 16, 2022

3 2

[PATCH 7/7] win32u: Move KillSystemTimer implementation from user32.
by Jacek Caban March 16, 2022

March 16, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 12 +----------- dlls/win32u/message.c | 16 ++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 ++ include/ntuser.h | 1 + 5 files changed, 21 insertions(+), 11 deletions(-)

2 1

[PATCH 5/7] win32u: Move NtUserSetSystemTimer implementation from user32.
by Jacek Caban March 16, 2022

March 16, 2022

2 1

[PATCH 4/7] win32u: Move NtUserSetTimer implementation from user32.
by Jacek Caban March 16, 2022

March 16, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 35 +---------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/message.c | 32 ++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 11 +++++++++++ include/ntuser.h | 1 + 8 files changed, 49 insertions(+), 36 deletions(-)

3 2

[PATCH 3/7] win32u: Move __wine_set_pixel_format implementation from user32.
by Jacek Caban March 16, 2022

March 16, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 39 +-------------------------------------- dlls/win32u/window.c | 18 ++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 20 insertions(+), 38 deletions(-)

2 1

[PATCH 2/7] win32u: Move NtUsetSetWindowLong implementation from user32.
by Jacek Caban March 16, 2022

March 16, 2022

2 1