- Wine-Devel - list.winehq.org

[PATCH] atlthunk/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov Feb. 22, 2022

Feb. 22, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/atlthunk/tests/Makefile.in | 1 - dlls/atlthunk/tests/atlthunk.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/atlthunk/tests/Makefile.in b/dlls/atlthunk/tests/Makefile.in index 1927af38900..9da3a9696ad 100644 --- a/dlls/atlthunk/tests/Makefile.in +++ b/dlls/atlthunk/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = atlthunk.dll IMPORTS = atlthunk diff --git a/dlls/atlthunk/tests/atlthunk.c b/dlls/atlthunk/tests/atlthunk.c index b316ae1eae1..ca719e0836a 100644 --- a/dlls/atlthunk/tests/atlthunk.c +++ b/dlls/atlthunk/tests/atlthunk.c @@ -23,8 +23,8 @@ static LRESULT WINAPI test_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { ok(msg == 1, "msg = %u\n", msg); - ok(wparam == 2, "wparam = %lu\n", wparam); - ok(lparam == 3, "lparam = %lu\n", lparam); + ok(wparam == 2, "wparam = %Id\n", wparam); + ok(lparam == 3, "lparam = %Id\n", lparam); return (LRESULT)hwnd | 0x1000; } @@ -49,7 +49,7 @@ static void test_thunk_proc(void) ok(thunk_proc != NULL, "thunk_proc = NULL\n"); res = thunk_proc((HWND)0x1234, 1, 2, 3); - ok(res == (i | 0x1000), "res = %lu\n", res); + ok(res == (i | 0x1000), "res = %Iu\n", res); } for(i=0; i < ARRAY_SIZE(thunks); i++) -- 2.34.1

1 0

[PATCH] browseui/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov Feb. 22, 2022

Feb. 22, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/browseui/tests/Makefile.in | 1 - dlls/browseui/tests/autocomplete.c | 85 +++++++++++++++--------------- dlls/browseui/tests/progressdlg.c | 15 +++--- 3 files changed, 50 insertions(+), 51 deletions(-) diff --git a/dlls/browseui/tests/Makefile.in b/dlls/browseui/tests/Makefile.in index 61c86018ab2..70de3ab4785 100644 --- a/dlls/browseui/tests/Makefile.in +++ b/dlls/browseui/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = browseui.dll IMPORTS = ole32 diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index 5ff274da729..ff1033fc6ff 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -34,7 +34,7 @@ { \ HRESULT res = (exp); \ if (res != S_OK) \ - ok(FALSE, #exp " failed: %x\n", res); \ + ok(FALSE, #exp " failed: %#lx\n", res); \ } static LPWSTR strdup_AtoW(LPCSTR str) @@ -86,7 +86,7 @@ static TestACL *TestACL_Constructor(int limit, const char **strings) static ULONG STDMETHODCALLTYPE TestACL_AddRef(IEnumString *iface) { TestACL *This = impl_from_IEnumString(iface); - trace("ACL(%p): addref (%d)\n", This, This->ref+1); + trace("ACL(%p): addref (%ld)\n", This, This->ref+1); return InterlockedIncrement(&This->ref); } @@ -96,7 +96,7 @@ static ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface) ULONG res; res = InterlockedDecrement(&This->ref); - trace("ACL(%p): release (%d)\n", This, res); + trace("ACL(%p): release (%ld)\n", This, res); return res; } @@ -129,7 +129,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LP TestACL *This = impl_from_IEnumString(iface); ULONG i; - trace("ACL(%p): read %d item(s)\n", This, celt); + trace("ACL(%p): read %ld item(s)\n", This, celt); for (i = 0; i < celt; i++) { if (This->pos >= This->limit) @@ -215,14 +215,11 @@ IACListVtbl TestACL_ACListVtbl = #define expect_str(obj, str) \ { \ ole_ok(IEnumString_Next(obj, 1, &wstr, &i)); \ - ok(i == 1, "Expected i == 1, got %d\n", i); \ + ok(i == 1, "Expected i == 1, got %ld\n", i); \ ok(str[0] == wstr[0], "String mismatch\n"); \ CoTaskMemFree(wstr); \ } -#define expect_end(obj) \ - ok(IEnumString_Next(obj, 1, &wstr, &i) == S_FALSE, "Unexpected return from Next\n"); - static void test_ACLMulti(void) { const char *strings1[] = {"a", "c", "e"}; @@ -236,122 +233,124 @@ static void test_ACLMulti(void) IObjMgr *mgr; LPWSTR wstr; LPWSTR wstrtab[15]; + ULONG ref, i; LPVOID tmp; - ULONG ref; - UINT i; hr = CoCreateInstance(&CLSID_ACLMulti, NULL, CLSCTX_INPROC, &IID_IEnumString, (void**)&obj); - ok(hr == S_OK, "failed to create ACLMulti instance, 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr != S_OK) return; hr = IEnumString_QueryInterface(obj, &IID_IACList, (void**)&acl); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumString_QueryInterface(obj, &IID_IACList2, &tmp); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = IEnumString_QueryInterface(obj, &IID_IObjMgr, (void**)&mgr); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumString_QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk); if (hr == E_NOINTERFACE) todo_wine win_skip("IEnumACString is not supported, skipping tests\n"); else { - ok(hr == S_OK, "QueryInterface(IID_IEnumACString) failed: %x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (unk != NULL) IEnumACString_Release(unk); } i = -1; hr = IEnumString_Next(obj, 1, (LPOLESTR *)&tmp, &i); - ok(hr == S_FALSE, "got 0x%08x\n", hr); - ok(i == 0, "Unexpected fetched value %d\n", i); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); + ok(i == 0, "Unexpected fetched value %ld\n", i); hr = IEnumString_Next(obj, 44, (LPOLESTR *)&tmp, &i); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IEnumString_Skip(obj, 1); - ok(hr == E_NOTIMPL, "got 0x%08x\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IEnumString_Clone(obj, (IEnumString **)&tmp); - ok(hr == E_OUTOFMEMORY, "got 0x%08x\n", hr); + ok(hr == E_OUTOFMEMORY, "Unexpected hr %#lx.\n", hr); hr = IACList_Expand(acl, exp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); acl1 = TestACL_Constructor(3, strings1); acl2 = TestACL_Constructor(3, strings2); hr = IObjMgr_Append(mgr, (IUnknown *)&acl1->IACList_iface); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IObjMgr_Append(mgr, (IUnknown *)&acl2->IACList_iface); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IObjMgr_Append(mgr, NULL); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); expect_str(obj, "a"); expect_str(obj, "c"); expect_str(obj, "e"); expect_str(obj, "a"); expect_str(obj, "b"); expect_str(obj, "d"); - expect_end(obj); + hr = IEnumString_Next(obj, 1, &wstr, &i); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IEnumString_Reset(obj); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(acl1->pos == 0, "acl1 not reset\n"); ok(acl2->pos == 0, "acl2 not reset\n"); hr = IACList_Expand(acl, exp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(acl1->expcount == 1, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 1 /* Vista */, "expcount - expected 0 or 1, got %d\n", acl2->expcount); hr = IEnumString_Next(obj, 15, wstrtab, &i); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(i == 1, "Expected i == 1, got %d\n", i); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(i == 1, "Expected i == 1, got %ld\n", i); CoTaskMemFree(wstrtab[0]); hr = IEnumString_Next(obj, 15, wstrtab, &i); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CoTaskMemFree(wstrtab[0]); hr = IEnumString_Next(obj, 15, wstrtab, &i); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CoTaskMemFree(wstrtab[0]); hr = IEnumString_Next(obj, 15, wstrtab, &i); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CoTaskMemFree(wstrtab[0]); hr = IACList_Expand(acl, exp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(acl1->expcount == 2, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 2 /* Vista */, "expcount - expected 0 or 2, got %d\n", acl2->expcount); acl1->expret = S_FALSE; hr = IACList_Expand(acl, exp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(acl1->expcount == 3, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 1 /* XP */ || acl2->expcount == 3 /* Vista */, "expcount - expected 0 or 3, got %d\n", acl2->expcount); acl1->expret = E_NOTIMPL; hr = IACList_Expand(acl, exp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(acl1->expcount == 4, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 2 /* XP */ || acl2->expcount == 4 /* Vista */, "expcount - expected 0 or 4, got %d\n", acl2->expcount); acl2->expret = E_OUTOFMEMORY; hr = IACList_Expand(acl, exp); - ok(hr == E_OUTOFMEMORY, "got 0x%08x\n", hr); + ok(hr == E_OUTOFMEMORY, "Unexpected hr %#lx.\n", hr); acl2->expret = E_FAIL; hr = IACList_Expand(acl, exp); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); hr = IObjMgr_Remove(mgr, (IUnknown *)&acl1->IACList_iface); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(acl1->ref == 1, "acl1 not released\n"); - expect_end(obj); + hr = IEnumString_Next(obj, 1, &wstr, &i); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); IEnumString_Reset(obj); expect_str(obj, "a"); expect_str(obj, "b"); expect_str(obj, "d"); - expect_end(obj); + hr = IEnumString_Next(obj, 1, &wstr, &i); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); IEnumString_Release(obj); IACList_Release(acl); @@ -371,13 +370,13 @@ static void test_ACListISF(void) HRESULT hr; hr = CoCreateInstance(&CLSID_ACListISF, NULL, CLSCTX_INPROC, &IID_IACList, (void**)&list); - ok(hr == S_OK, "failed to create ACListISF instance, 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IACList_QueryInterface(list, &IID_IEnumString, (void**)&enumstring); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumString_QueryInterface(enumstring, &IID_IACList, (void**)&list2); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(list == list2, "got %p, %p\n", list, list2); IACList_Release(list2); diff --git a/dlls/browseui/tests/progressdlg.c b/dlls/browseui/tests/progressdlg.c index 22037141d60..c8dec007ff1 100644 --- a/dlls/browseui/tests/progressdlg.c +++ b/dlls/browseui/tests/progressdlg.c @@ -33,26 +33,27 @@ static void test_IProgressDialog_QueryInterface(void) IUnknown *unk; HRESULT hr; - hr = CoCreateInstance(&CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, &IID_IProgressDialog, (void*)&dlg); - if (FAILED(hr)) { - win_skip("CoCreateInstance for IProgressDialog returned 0x%x\n", hr); + hr = CoCreateInstance(&CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, &IID_IProgressDialog, (void **)&dlg); + if (FAILED(hr)) + { + win_skip("ProgressDialog is not supported, hr %#lx.\n", hr); return; } hr = IProgressDialog_QueryInterface(dlg, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IProgressDialog_QueryInterface(dlg, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { IUnknown_Release(unk); } hr = IProgressDialog_QueryInterface(dlg, &IID_IOleWindow, (void**)&olewindow); - ok(hr == S_OK, "QueryInterface (IOleWindow) returned 0x%x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { hr = IOleWindow_QueryInterface(olewindow, &IID_IProgressDialog, (void**)&dlg2); - ok(hr == S_OK, "QueryInterface (IProgressDialog) returned 0x%x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { IProgressDialog_Release(dlg2); } -- 2.34.1

1 0

[PATCH 1/2] user32/tests: Test clicking taskbar icons of minimized windows.
by Zhiyi Zhang Feb. 22, 2022

Feb. 22, 2022

When a minimized window doesn't handle WM_SYSCOMMAND SC_RESTORE messages, the window should remain minimized when its taskbar icon gets clicked. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 77 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f0e0d0fba76..3c4cb084d8e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18735,6 +18735,82 @@ static void test_button_style(void) } } +static BOOL sc_restore_received; + +static LRESULT CALLBACK test_taskbar_msg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_SYSCOMMAND && wp == SC_RESTORE) + { + sc_restore_received = TRUE; + return 0; + } + + return DefWindowProcA(hwnd, msg, wp, lp); +} + +static void test_taskbar_messages(void) +{ + HWND hwnd, background; + int timeout = 0; + COLORREF color; + WNDCLASSA cls; + HDC hdc; + + if (!winetest_interactive) + return; + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = DefWindowProcA; + cls.hInstance = GetModuleHandleA(NULL); + cls.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszClassName = "test_taskbar_background_class"; + RegisterClassA(&cls); + + cls.lpfnWndProc = test_taskbar_msg_proc; + cls.hbrBackground = GetStockObject(GRAY_BRUSH); + cls.lpszClassName = "test_taskbar_class"; + RegisterClassA(&cls); + + background = CreateWindowA("test_taskbar_background_class", "background", WS_POPUP | WS_VISIBLE, + 100, 100, 200, 200, NULL, NULL, NULL, NULL); + ok(background != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + hwnd = CreateWindowA("test_taskbar_class", "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(); + + trace("Click the taskbar icon of the test window within 5 seconds.\n"); + while (!sc_restore_received && timeout < 5000) + { + flush_events(); + timeout += 200; + } + ok(timeout < 5000 && sc_restore_received, "Didn't receive clicks on the taskbar icon.\n"); + + /* Desktop pixels may take a while to update */ + timeout = 0; + hdc = GetDC(0); + color = GetPixel(hdc, 150, 150); + while (color != 0xffffff && timeout < 1000) + { + flush_events(); + timeout += 200; + color = GetPixel(hdc, 150, 150); + } + /* The background window rectangle is (100, 100, 200, 200). If hwnd gets unminimized, it will + * end up obscuring the background window. */ + todo_wine_if(color != 0xffffff) + ok(color == 0xffffff, "Expected color %#x, got %#x.\n", 0xffffff, color); + + ReleaseDC(0, hdc); + DestroyWindow(hwnd); + DestroyWindow(background); + UnregisterClassA("test_taskbar_class", GetModuleHandleA(NULL)); + UnregisterClassA("test_taskbar_background_class", GetModuleHandleA(NULL)); +} + START_TEST(msg) { char **test_argv; @@ -18860,6 +18936,7 @@ START_TEST(msg) test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); test_DoubleSetCapture(); + test_taskbar_messages(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */ -- 2.32.0

2 1

[v2 PATCH 1/2] comctl32/listview: Send change notifications when inserting (LVIS_SELECTED|LVIS_FOCUSED) items.
by Nikolay Sivov Feb. 22, 2022

Feb. 22, 2022

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 22 +++++++++++++--------- dlls/comctl32/tests/listview.c | 6 +++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cd7fec28e27..d8abd8236eb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4200,6 +4200,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL LVITEMW item; /* stateMask is ignored for LVM_INSERTITEM */ UINT stateMask = isNew ? ~0 : lpLVItem->stateMask; + BOOL send_change_notification; TRACE("()\n"); @@ -4260,11 +4261,16 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; - /* Send LVN_ITEMCHANGING notification, if the item is not being inserted + /* Send change notification if the item is not being inserted, or inserted (selected|focused), and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications - are enabled. Even nothing really changed we still need to send this, + are enabled. Even if nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if (lpItem && !isNew && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) + + send_change_notification = !isNew; + send_change_notification |= (uChanged & LVIF_STATE) && (lpLVItem->state & (LVIS_FOCUSED | LVIS_SELECTED)); + send_change_notification &= !!(infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE); + + if (lpItem && send_change_notification) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4352,13 +4358,11 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL } } - /* if we're inserting the item, we're done */ - if (isNew) return TRUE; - - /* send LVN_ITEMCHANGED notification */ - if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; - if (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE) + if (send_change_notification) + { + if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); + } return TRUE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4c2dd534dbd..92e11685331 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6023,7 +6023,7 @@ static void test_LVM_INSERTITEM(void) if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) { sprintf(buf, "%d: insert focused", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, insert_item[i].mask != LVIF_STATE); } else { @@ -6060,7 +6060,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 0, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); @@ -6073,7 +6073,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 1, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); -- 2.34.1

1 1

[PATCH 2/2] winex11.drv: Restore iconic state if a window doesn't want to be restored.
by Zhiyi Zhang Feb. 22, 2022

Feb. 22, 2022

Fix Excel 2007 and 2010 showing small black windows after clicking their taskbar icons when opening multiple documents in one instance. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 1 - dlls/winex11.drv/event.c | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3c4cb084d8e..f2a9c2c2f4a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18801,7 +18801,6 @@ static void test_taskbar_messages(void) } /* The background window rectangle is (100, 100, 200, 200). If hwnd gets unminimized, it will * end up obscuring the background window. */ - todo_wine_if(color != 0xffffff) ok(color == 0xffffff, "Expected color %#x, got %#x.\n", 0xffffff, color); ReleaseDC(0, hdc); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 170111e9c28..0e963f6e399 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1314,6 +1314,12 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat if ((style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE)) SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + /* The window doesn't want to unminimize, restore iconic state */ + if (GetWindowLongW( data->hwnd, GWL_STYLE ) & WS_MINIMIZE) + { + data->iconic = TRUE; + XIconifyWindow( data->display, data->whole_window, data->vis.screen ); + } return; } TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); -- 2.32.0

1 0

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

Feb. 22, 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> --- dlls/user32/tests/win.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d6087873f21..dcd84d0202d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7413,7 +7413,7 @@ static void test_set_window_style(void) UnregisterClassA(cls.lpszClassName, cls.hInstance); } -static void test_ShowWindow(void) +static void test_ShowWindow(HWND hwnd_main) { HWND hwnd; DWORD style; @@ -7421,6 +7421,9 @@ static void test_ShowWindow(void) LPARAM ret; MONITORINFO mon_info; unsigned int i; + int timeout = 0; + COLORREF color; + HDC hdc; DWORD test_style[] = { @@ -7693,6 +7696,29 @@ static void test_ShowWindow(void) flush_events(TRUE); + /* Test SW_SHOWMINIMIZED shouldn't restore windows from minimized state */ + 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, 200, 200). 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) @@ -13132,7 +13158,7 @@ START_TEST(win) test_csparentdc(); test_SetWindowLong(); test_set_window_style(); - test_ShowWindow(); + test_ShowWindow(hwndMain); test_ShowWindow_owned(hwndMain); test_ShowWindow_child(hwndMain); test_ShowWindow_mdichild(hwndMain); -- 2.32.0

1 0

[PATCH 0/4] Fix LVN_ODSTATECHANGED handling.
by Angelo Haller Feb. 22, 2022

Feb. 22, 2022

From: Angelo Haller <angelo(a)szanni.org> Warning: I have had access to the Windows Research Kernel (WRK) 1.2 ~10 years ago. These changes are regarding comctrl32 which is NOT part of the WRK. As outlined in https://wiki.winehq.org/Developer_FAQ this should therefore satisfy the requirement of ONLY submitting patches to components I have NOT had access to. Angelo Haller (4): comctl32/listview: Move LVN_ODSTATECHANGED notification to function. comctl32/listview: Send LVN_ODSTATECHANGED only for virtual lists. comctl32/listview: Send LVN_ODSTATECHANGED notification. comctl32/listview: Send LVN_ODSTATECHANGED only for true ranges. dlls/comctl32/listview.c | 59 ++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 12 deletions(-) Signed-off-by: Angelo Haller <angelo(a)szanni.org> -- 2.35.1

2 9

[PATCH 1/4] quartz/tests: Reset sink event counters when initializing the stream.
by Zebediah Figura Feb. 22, 2022

Feb. 22, 2022

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Should hopefully fix some intermittent test failures caused by receiving EOS events inside of test_filter_state(). dlls/quartz/tests/avisplit.c | 13 +++++++++++-- dlls/quartz/tests/mpegsplit.c | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 06c2f5fed3c..f295c074d5a 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -836,10 +836,21 @@ static void testfilter_destroy(struct strmbase_filter *iface) strmbase_filter_cleanup(&filter->filter); } +static HRESULT testfilter_init_stream(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + filter->new_segment_count = 0; + filter->eos_count = 0; + filter->sample_count = 0; + return S_OK; +} + static const struct strmbase_filter_ops testfilter_ops = { .filter_get_pin = testfilter_get_pin, .filter_destroy = testfilter_destroy, + .filter_init_stream = testfilter_init_stream, }; static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -1689,7 +1700,6 @@ static void test_streaming(void) ok(WaitForSingleObject(testsink.eos_event, 100) == WAIT_TIMEOUT, "Got more than one EOS.\n"); ok(testsink.sample_count, "Expected at least one sample.\n"); - testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); @@ -1716,7 +1726,6 @@ static void test_streaming(void) ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); - testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 0809c5f861f..5a9efe84551 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1125,10 +1125,21 @@ static void testfilter_destroy(struct strmbase_filter *iface) CloseHandle(filter->eos_event); } +static HRESULT testfilter_init_stream(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + filter->new_segment_count = 0; + filter->eos_count = 0; + filter->sample_count = 0; + return S_OK; +} + static const struct strmbase_filter_ops testfilter_ops = { .filter_get_pin = testfilter_get_pin, .filter_destroy = testfilter_destroy, + .filter_init_stream = testfilter_init_stream, }; static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -1842,7 +1853,6 @@ static void test_streaming(void) ok(WaitForSingleObject(testsink.eos_event, 100) == WAIT_TIMEOUT, "Got more than one EOS.\n"); ok(testsink.sample_count, "Expected at least one sample.\n"); - testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); @@ -1869,7 +1879,6 @@ static void test_streaming(void) ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); - testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); -- 2.35.1

1 3

[PATCH 1/5] winegstreamer: Remove \n at the end of GST log messages.
by Rémi Bernon Feb. 22, 2022

Feb. 22, 2022

GStreamer already adds one. 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> --- dlls/winegstreamer/wg_format.c | 4 ++-- dlls/winegstreamer/wg_parser.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 40b9acfefff..fc50fad6d12 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -327,12 +327,12 @@ static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t if (bit < ARRAY_SIZE(position_map)) positions[i] = position_map[bit]; else - GST_WARNING("Invalid channel mask %#x.\n", orig_mask); + GST_WARNING("Invalid channel mask %#x.", orig_mask); mask &= ~(1 << bit); } else { - GST_WARNING("Incomplete channel mask %#x.\n", orig_mask); + GST_WARNING("Incomplete channel mask %#x.", orig_mask); } } } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5a2e970a4dd..37da2d1e1c4 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1443,7 +1443,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1472,7 +1472,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1493,7 +1493,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1503,7 +1503,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1527,7 +1527,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1538,7 +1538,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1566,7 +1566,7 @@ static void init_gstreamer_once(void) GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); - GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n", + GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.", gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); } @@ -1604,7 +1604,7 @@ static NTSTATUS wg_parser_create(void *args) parser->init_gst = init_funcs[params->type]; parser->unlimited_buffering = params->unlimited_buffering; - GST_DEBUG("Created winegstreamer parser %p.\n", parser); + GST_DEBUG("Created winegstreamer parser %p.", parser); params->parser = parser; return S_OK; } -- 2.34.1

2 7

[PATCH 4/4] dmusic: Forward GetFormat() to the corresponding synth & sink methods
by Michael Stefaniuc Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 59 ++++++++++---------------------------- dlls/dmusic/tests/dmusic.c | 21 ++++++++++++++ 2 files changed, 36 insertions(+), 44 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index d593d739a9e..8549c62c4b1 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -510,50 +510,21 @@ static HRESULT WINAPI synth_port_SetDirectSound(IDirectMusicPort *iface, IDirect return S_OK; } -static HRESULT WINAPI synth_port_GetFormat(IDirectMusicPort *iface, WAVEFORMATEX *pWaveFormatEx, - DWORD *pdwWaveFormatExSize, DWORD *pdwBufferSize) -{ - struct synth_port *This = synth_from_IDirectMusicPort(iface); - WAVEFORMATEX format; - FIXME("(%p, %p, %p, %p): stub\n", This, pWaveFormatEx, pdwWaveFormatExSize, pdwBufferSize); - - if (pWaveFormatEx == NULL) - { - if (pdwWaveFormatExSize) - *pdwWaveFormatExSize = sizeof(format); - else - return E_POINTER; - } - else - { - if (pdwWaveFormatExSize == NULL) - return E_POINTER; - - /* Just fill this in with something that will not crash Direct Sound for now. */ - /* It won't be used anyway until Performances are completed */ - format.wFormatTag = WAVE_FORMAT_PCM; - format.nChannels = 2; /* This->params.dwAudioChannels; */ - format.nSamplesPerSec = 44100; /* This->params.dwSampleRate; */ - format.wBitsPerSample = 16; /* FIXME: check this */ - format.nBlockAlign = (format.wBitsPerSample * format.nChannels) / 8; - format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign; - format.cbSize = 0; - - if (*pdwWaveFormatExSize >= sizeof(format)) - { - CopyMemory(pWaveFormatEx, &format, min(sizeof(format), *pdwWaveFormatExSize)); - *pdwWaveFormatExSize = sizeof(format); /* FIXME check if this is set */ - } - else - return E_POINTER; /* FIXME find right error */ - } - - if (pdwBufferSize) - *pdwBufferSize = 44100 * 2 * 2; - else - return E_POINTER; - - return S_OK; +static HRESULT WINAPI synth_port_GetFormat(IDirectMusicPort *iface, WAVEFORMATEX *format, + DWORD *fmtsize, DWORD *bufsize) +{ + struct synth_port *This = synth_from_IDirectMusicPort(iface); + HRESULT hr; + + TRACE("(%p, %p, %p, %p)\n", This, format, fmtsize, bufsize); + + if (FAILED(hr = IDirectMusicSynth_GetFormat(This->synth, format, fmtsize))) + return hr; + + if (bufsize) + hr = IDirectMusicSynthSink_GetDesiredBufferSize(This->synth_sink, bufsize); + + return hr; } static const IDirectMusicPortVtbl synth_port_vtbl = { diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index d8fc6affd9b..37b517fe0ca 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -877,6 +877,9 @@ static void test_synthport(void) IDirectMusicPort *port; DMUS_BUFFERDESC desc; DMUS_PORTCAPS caps; + WAVEFORMATEX fmt; + DWORD fmtsize, bufsize; + HRESULT hr; port = create_synth_port(&dmusic); @@ -922,6 +925,24 @@ static void test_synthport(void) ok(caps.dwEffectFlags == DMUS_EFFECT_REVERB, "Unexpected dwEffectFlags returned: %#lx\n", caps.dwEffectFlags); trace("Port wszDescription: %s\n", wine_dbgstr_w(caps.wszDescription)); + /* GetFormat */ + hr = IDirectMusicPort_GetFormat(port, NULL, NULL, NULL); + ok(hr == E_POINTER, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicPort_GetFormat(port, NULL, &fmtsize, NULL); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(fmtsize == sizeof(fmt), "format size; %ld\n", fmtsize); + fmtsize = 0; + hr = IDirectMusicPort_GetFormat(port, &fmt, &fmtsize, NULL); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(fmtsize == sizeof(fmt), "format size; %ld\n", fmtsize); + hr = IDirectMusicPort_GetFormat(port, NULL, NULL, &bufsize); + ok(hr == E_POINTER, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicPort_GetFormat(port, NULL, &fmtsize, &bufsize); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicPort_GetFormat(port, &fmt, &fmtsize, &bufsize); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(bufsize == fmt.nSamplesPerSec * fmt.nChannels * 4, "buffer size: %ld\n", bufsize); + IDirectMusicPort_Release(port); IDirectMusic_Release(dmusic); } -- 2.34.1

1 0