wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Fabian Maurer : comctl32/listview: Avoid duplicate LVN_ENDLABELEDIT notifications on focus change.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: f6bd24fda69929b257bfad88c88165ade29327b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6bd24fda69929b257bfad88… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Aug 26 23:27:26 2018 +0300 comctl32/listview: Avoid duplicate LVN_ENDLABELEDIT notifications on focus change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 10 ++++-- dlls/comctl32/tests/listview.c | 78 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d463607..777b40f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -214,6 +214,7 @@ typedef struct tagDELAYED_ITEM_EDIT enum notification_mask { NOTIFY_MASK_ITEM_CHANGE = 0x1, + NOTIFY_MASK_END_LABEL_EDIT = 0x2, NOTIFY_MASK_UNMASK_ALL = 0xffffffff }; @@ -5922,9 +5923,13 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL dispInfo.item.pszText = same ? NULL : pszText; dispInfo.item.cchTextMax = textlenT(dispInfo.item.pszText, isW); + infoPtr->notify_mask &= ~NOTIFY_MASK_END_LABEL_EDIT; + /* Do we need to update the Item Text */ res = notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW); + infoPtr->notify_mask |= NOTIFY_MASK_END_LABEL_EDIT; + infoPtr->nEditLabelItem = -1; infoPtr->hwndEdit = 0; @@ -11914,8 +11919,9 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP } case EN_KILLFOCUS: { - LISTVIEW_CancelEditLabel(infoPtr); - break; + if (infoPtr->notify_mask & NOTIFY_MASK_END_LABEL_EDIT) + LISTVIEW_CancelEditLabel(infoPtr); + break; } default: diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c118f02..6a7842b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -75,6 +75,8 @@ static BOOL g_disp_A_to_W; static NMLVDISPINFOA g_editbox_disp_info; /* when this is set focus will be tested on LVN_DELETEITEM */ static BOOL g_focus_test_LVN_DELETEITEM; +/* Whether to send WM_KILLFOCUS to the edit control during LVN_ENDLABELEDIT */ +static BOOL g_WM_KILLFOCUS_on_LVN_ENDLABELEDIT; static HWND subclass_editbox(HWND hwndListview); @@ -445,6 +447,25 @@ static const struct message parent_list_cd_seq[] = { { 0 } }; +static const struct message listview_end_label_edit[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ENDLABELEDITA }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING}, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|optional, 0, 0, NM_CUSTOMDRAW }, /* XP */ + { WM_NOTIFY, sent|id, 0, 0, NM_SETFOCUS }, + { 0 } +}; + +static const struct message listview_end_label_edit_kill_focus[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ENDLABELEDITA }, + { WM_COMMAND, sent|id|optional, 0, 0, EN_KILLFOCUS }, /* todo: not sent by wine yet */ + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|optional, 0, 0, NM_CUSTOMDRAW }, /* XP */ + { WM_NOTIFY, sent|id, 0, 0, NM_SETFOCUS }, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -457,6 +478,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP msg.wParam = wParam; msg.lParam = lParam; if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + if (message == WM_COMMAND) msg.id = HIWORD(wParam); /* log system messages, except for painting */ if (message < WM_USER && @@ -510,6 +532,9 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP ok(IsWindow(edit), "expected valid edit control handle\n"); ok((GetWindowLongA(edit, GWL_STYLE) & ES_MULTILINE) == 0, "edit is multiline\n"); + if (g_WM_KILLFOCUS_on_LVN_ENDLABELEDIT) + SendMessageA(edit, WM_KILLFOCUS, 0, 0); + return TRUE; } case LVN_BEGINSCROLL: @@ -6322,6 +6347,57 @@ static void test_LVSCW_AUTOSIZE(void) DestroyWindow(hwnd); } +static void test_LVN_ENDLABELEDIT(void) +{ + WCHAR text[] = {'l','a','l','a',0}; + HWND hwnd, hwndedit; + LVITEMW item = {0}; + DWORD ret; + + hwnd = create_listview_control(LVS_REPORT | LVS_EDITLABELS); + + insert_column(hwnd, 0); + + item.mask = LVIF_TEXT; + item.pszText = text; + SendMessageW(hwnd, LVM_INSERTITEMW, 0, (LPARAM)&item); + + /* Test normal editing */ + SetFocus(hwnd); + hwndedit = (HWND)SendMessageW(hwnd, LVM_EDITLABELW, 0, 0); + ok(hwndedit != NULL, "Failed to get edit control.\n"); + + ret = SendMessageA(hwndedit, WM_SETTEXT, 0, (LPARAM)"test"); + ok(ret, "Failed to set edit text.\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageA(hwndedit, WM_KEYDOWN, VK_RETURN, 0); + ok_sequence(sequences, PARENT_SEQ_INDEX, listview_end_label_edit, "Label edit", FALSE); + + /* Test editing with kill focus */ + SetFocus(hwnd); + hwndedit = (HWND)SendMessageW(hwnd, LVM_EDITLABELW, 0, 0); + ok(hwndedit != NULL, "Failed to get edit control.\n"); + + ret = SendMessageA(hwndedit, WM_SETTEXT, 0, (LPARAM)"test2"); + ok(ret, "Failed to set edit text.\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + g_WM_KILLFOCUS_on_LVN_ENDLABELEDIT = TRUE; + ret = SendMessageA(hwndedit, WM_KEYDOWN, VK_RETURN, 0); + g_WM_KILLFOCUS_on_LVN_ENDLABELEDIT = FALSE; + + ok_sequence(sequences, PARENT_SEQ_INDEX, listview_end_label_edit_kill_focus, + "Label edit, kill focus", FALSE); + ok(GetFocus() == hwnd, "Unexpected focused window.\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + DestroyWindow(hwnd); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6383,6 +6459,7 @@ START_TEST(listview) test_callback_mask(); test_state_image(); test_LVSCW_AUTOSIZE(); + test_LVN_ENDLABELEDIT(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -6425,6 +6502,7 @@ START_TEST(listview) test_oneclickactivate(); test_state_image(); test_LVSCW_AUTOSIZE(); + test_LVN_ENDLABELEDIT(); unload_v6_module(ctx_cookie, hCtx);

1 0

Fabian Maurer : comctl32/listview: Use mask to disable change notifications.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: d8dd281652ab5728e84140ede18b604e4b06f0d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8dd281652ab5728e84140ed… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Aug 26 23:27:25 2018 +0300 comctl32/listview: Use mask to disable change notifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 200bf93..d463607 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -211,6 +211,12 @@ typedef struct tagDELAYED_ITEM_EDIT INT iItem; } DELAYED_ITEM_EDIT; +enum notification_mask +{ + NOTIFY_MASK_ITEM_CHANGE = 0x1, + NOTIFY_MASK_UNMASK_ALL = 0xffffffff +}; + typedef struct tagLISTVIEW_INFO { /* control window */ @@ -225,7 +231,7 @@ typedef struct tagLISTVIEW_INFO /* notification window */ SHORT notifyFormat; HWND hwndNotify; - BOOL bDoChangeNotify; /* send change notification messages? */ + DWORD notify_mask; UINT uCallbackMask; /* tooltips */ @@ -3507,13 +3513,13 @@ Parameters: */ static void LISTVIEW_ShiftFocus(LISTVIEW_INFO *infoPtr, INT focus, INT item, INT direction) { - BOOL old_change = infoPtr->bDoChangeNotify; + DWORD old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; focus = shift_item(infoPtr, focus, item, direction); if (focus != infoPtr->nFocusedItem) LISTVIEW_SetItemFocus(infoPtr, focus); - infoPtr->bDoChangeNotify = old_change; + infoPtr->notify_mask |= old_mask; } /** @@ -3556,8 +3562,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) INT nLast = max(infoPtr->nSelectionMark, nItem); HWND hwndSelf = infoPtr->hwndSelf; NMLVODSTATECHANGE nmlv; + DWORD old_mask; LVITEMW item; - BOOL bOldChange; INT i; /* Temporarily disable change notification @@ -3565,8 +3571,9 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) * only one LVN_ODSTATECHANGED notification. * See MSDN documentation for LVN_ITEMCHANGED. */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; if (nFirst == -1) nFirst = nItem; @@ -3585,7 +3592,7 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf)) return FALSE; - infoPtr->bDoChangeNotify = bOldChange; + infoPtr->notify_mask |= old_mask; return TRUE; } @@ -3604,9 +3611,9 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) { RANGES selection; + DWORD old_mask; LVITEMW item; ITERATOR i; - BOOL bOldChange; if (!(selection = ranges_create(100))) return; @@ -3656,8 +3663,9 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* disable per item notifications on LVS_OWNERDATA style FIXME: single LVN_ODSTATECHANGED should be used */ - bOldChange = infoPtr->bDoChangeNotify; - if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; + old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; + if (infoPtr->dwStyle & LVS_OWNERDATA) + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; LISTVIEW_DeselectAllSkipItems(infoPtr, selection); @@ -3668,8 +3676,7 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) /* this will also destroy the selection */ iterator_destroy(&i); - infoPtr->bDoChangeNotify = bOldChange; - + infoPtr->notify_mask |= old_mask; LISTVIEW_SetItemFocus(infoPtr, nItem); } @@ -4257,7 +4264,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications are enabled. Even 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->bDoChangeNotify) + if (lpItem && !isNew && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4350,7 +4357,8 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; - if (infoPtr->bDoChangeNotify) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); + if (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE) + notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); return TRUE; } @@ -8973,7 +8981,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE if (nItem == -1) { UINT oldstate = 0; - BOOL notify; + DWORD old_mask; /* special case optimization for recurring attempt to deselect all */ if (lvItem.state == 0 && lvItem.stateMask == LVIS_SELECTED && !LISTVIEW_GetSelectedCount(infoPtr)) @@ -8986,10 +8994,10 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE /* focus all isn't allowed */ if (lvItem.state & lvItem.stateMask & LVIS_FOCUSED) return FALSE; - notify = infoPtr->bDoChangeNotify; + old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; if (infoPtr->dwStyle & LVS_OWNERDATA) { - infoPtr->bDoChangeNotify = FALSE; + infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; if (!(lvItem.state & LVIS_SELECTED) && LISTVIEW_GetSelectedCount(infoPtr)) oldstate |= LVIS_SELECTED; if (infoPtr->nFocusedItem != -1) oldstate |= LVIS_FOCUSED; @@ -9003,7 +9011,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE { NMLISTVIEW nmlv; - infoPtr->bDoChangeNotify = notify; + infoPtr->notify_mask |= old_mask; nmlv.iItem = -1; nmlv.iSubItem = 0; @@ -9484,7 +9492,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->nHotItem = -1; infoPtr->redraw = TRUE; infoPtr->bNoItemMetrics = TRUE; - infoPtr->bDoChangeNotify = TRUE; + infoPtr->notify_mask = NOTIFY_MASK_UNMASK_ALL; infoPtr->autoSpacing = TRUE; infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON);

1 0

Gijs Vermeulen : ntdll/tests: Add Nt[WaitFor|Release] KeyedEvent test with NULL handle.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 7de2754cc613a53cdf99d5ad28c9b44a32e97e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7de2754cc613a53cdf99d5ad… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Aug 26 21:25:36 2018 +0200 ntdll/tests: Add Nt[WaitFor|Release]KeyedEvent test with NULL handle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44620 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 52b4a83..c2b40cb 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1677,6 +1677,13 @@ static void test_keyed_events(void) status = pNtReleaseKeyedEvent( handle, NULL, 0, &timeout ); ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + status = pNtWaitForKeyedEvent( NULL, (void *)8, 0, &timeout ); + todo_wine ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( NULL, (void *)8, 0, &timeout ); + todo_wine ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + "NtReleaseKeyedEvent %x\n", status ); + status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout );

1 0

Zhiyi Zhang : comctl32/pager: Support WM_NOTIFYFORMAT message.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 069eb68bf9f3b0285b4459774e7585313a67b422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=069eb68bf9f3b0285b445977… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 24 22:04:49 2018 +0800 comctl32/pager: Support WM_NOTIFYFORMAT message. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 25 +++++++++++++++++++++++++ dlls/comctl32/tests/pager.c | 8 ++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index fe68515..de63cad 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -71,6 +71,7 @@ typedef struct HWND hwndSelf; /* handle of the control wnd */ HWND hwndChild; /* handle of the contained wnd */ HWND hwndNotify; /* handle of the parent wnd */ + BOOL bUnicode; /* send notifications in Unicode */ DWORD dwStyle; /* styles for this control */ COLORREF clrBk; /* background color */ INT nBorder; /* border size for the control */ @@ -555,6 +556,7 @@ static LRESULT PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) { PAGER_INFO *infoPtr; + INT ret; /* allocate memory for info structure */ infoPtr = heap_alloc_zero (sizeof(*infoPtr)); @@ -581,6 +583,9 @@ PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) if (infoPtr->dwStyle & PGS_DRAGNDROP) FIXME("[%p] Drag and Drop style is not implemented yet.\n", infoPtr->hwndSelf); + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); + infoPtr->bUnicode = (ret == NFR_UNICODE); + return 0; } @@ -998,6 +1003,23 @@ PAGER_StyleChanged(PAGER_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lp return 0; } +static LRESULT PAGER_NotifyFormat(PAGER_INFO *infoPtr, INT command) +{ + INT ret; + switch (command) + { + case NF_REQUERY: + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); + infoPtr->bUnicode = (ret == NFR_UNICODE); + return ret; + case NF_QUERY: + /* Pager always wants Unicode notifications from children */ + return NFR_UNICODE; + default: + return 0; + } +} + static LRESULT WINAPI PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1089,6 +1111,9 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_TIMER: return PAGER_Timer (infoPtr, (INT)wParam); + case WM_NOTIFYFORMAT: + return PAGER_NotifyFormat (infoPtr, lParam); + case WM_NOTIFY: case WM_COMMAND: return SendMessageW (infoPtr->hwndNotify, uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index f2ac8b2..a1f6683 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -392,8 +392,8 @@ static void test_wm_notifyformat(void) /* Test parent */ notify_query_received = FALSE; ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent, NF_REQUERY); - todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); - todo_wine ok(notify_query_received, "Didn't receive notify\n"); + ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + ok(notify_query_received, "Didn't receive notify\n"); /* Send NF_QUERY directly to parent */ notify_query_received = FALSE; @@ -404,8 +404,8 @@ static void test_wm_notifyformat(void) /* Pager send notifications to its parent regardless of wParam */ notify_query_received = FALSE; ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent_wnd, NF_REQUERY); - todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); - todo_wine ok(notify_query_received, "Didn't receive notify\n"); + ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + ok(notify_query_received, "Didn't receive notify\n"); /* Pager always wants Unicode notifications from children */ ret = SendMessageW(child, WM_NOTIFYFORMAT, (WPARAM)pager, NF_REQUERY);

1 0

Zhiyi Zhang : comctl32/tests: Add WM_NOTIFYFORMAT tests for pager.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 4be93106cd446539faae881e5a81b8844a930888 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4be93106cd446539faae881e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 24 22:04:35 2018 +0800 comctl32/tests: Add WM_NOTIFYFORMAT tests for pager. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index fa505dc..f2ac8b2 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -28,6 +28,8 @@ #define PAGER_SEQ_INDEX 0 static HWND parent_wnd, child1_wnd, child2_wnd; +static INT notify_format; +static BOOL notify_query_received; #define CHILD1_ID 1 #define CHILD2_ID 2 @@ -330,6 +332,93 @@ static void test_pager(void) DestroyWindow( pager ); } +static LRESULT WINAPI test_notifyformat_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_NOTIFYFORMAT: + if (lParam == NF_QUERY) + { + notify_query_received = TRUE; + return notify_format; + } + else if (lParam == NF_REQUERY) + return SendMessageA(GetParent(hwnd), WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY); + else + return 0; + default: + return notify_format == NFR_UNICODE ? DefWindowProcW(hwnd, message, wParam, lParam) + : DefWindowProcA(hwnd, message, wParam, lParam); + } +} + +static BOOL register_notifyformat_class(void) +{ + static const WCHAR class_w[] = {'P', 'a', 'g', 'e', 'r', ' ', 'n', 'o', 't', 'i', 'f', 'y', 'f', + 'o', 'r', 'm', 'a', 't', ' ', 'c', 'l', 'a', 's', 's', 0}; + WNDCLASSW cls = {0}; + + cls.lpfnWndProc = test_notifyformat_proc; + cls.hInstance = GetModuleHandleW(NULL); + cls.lpszClassName = class_w; + return RegisterClassW(&cls); +} + +static void test_wm_notifyformat(void) +{ + static const WCHAR class_w[] = {'P', 'a', 'g', 'e', 'r', ' ', 'n', 'o', 't', 'i', 'f', 'y', 'f', + 'o', 'r', 'm', 'a', 't', ' ', 'c', 'l', 'a', 's', 's', 0}; + static const WCHAR parent_w[] = {'p', 'a', 'r', 'e', 'n', 't', 0}; + static const WCHAR pager_w[] = {'p', 'a', 'g', 'e', 'r', 0}; + static const WCHAR child_w[] = {'c', 'h', 'i', 'l', 'd', 0}; + static const INT formats[] = {NFR_UNICODE, NFR_ANSI}; + HWND parent, pager, child; + LRESULT ret; + INT i; + + ok(register_notifyformat_class(), "Register test class failed, error 0x%08x\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(formats); i++) + { + notify_format = formats[i]; + parent = CreateWindowW(class_w, parent_w, WS_OVERLAPPED, 0, 0, 100, 100, 0, 0, GetModuleHandleW(0), 0); + ok(parent != NULL, "CreateWindow failed\n"); + pager = CreateWindowW(WC_PAGESCROLLERW, pager_w, WS_CHILD, 0, 0, 100, 100, parent, 0, GetModuleHandleW(0), 0); + ok(pager != NULL, "CreateWindow failed\n"); + child = CreateWindowW(class_w, child_w, WS_CHILD, 0, 0, 100, 100, pager, 0, GetModuleHandleW(0), 0); + ok(child != NULL, "CreateWindow failed\n"); + SendMessageW(pager, PGM_SETCHILD, 0, (LPARAM)child); + + /* Test parent */ + notify_query_received = FALSE; + ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent, NF_REQUERY); + todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + todo_wine ok(notify_query_received, "Didn't receive notify\n"); + + /* Send NF_QUERY directly to parent */ + notify_query_received = FALSE; + ret = SendMessageW(parent, WM_NOTIFYFORMAT, (WPARAM)pager, NF_QUERY); + ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + ok(notify_query_received, "Didn't receive notify\n"); + + /* Pager send notifications to its parent regardless of wParam */ + notify_query_received = FALSE; + ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent_wnd, NF_REQUERY); + todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + todo_wine ok(notify_query_received, "Didn't receive notify\n"); + + /* Pager always wants Unicode notifications from children */ + ret = SendMessageW(child, WM_NOTIFYFORMAT, (WPARAM)pager, NF_REQUERY); + ok(ret == NFR_UNICODE, "Expect %d, got %ld\n", NFR_UNICODE, ret); + ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)child, NF_QUERY); + ok(ret == NFR_UNICODE, "Expect %d, got %ld\n", NFR_UNICODE, ret); + + DestroyWindow(parent); + } + + UnregisterClassW(class_w, GetModuleHandleW(NULL)); +} + static void init_functions(void) { HMODULE mod = LoadLibraryA("comctl32.dll"); @@ -357,6 +446,7 @@ START_TEST(pager) ok(parent_wnd != NULL, "Failed to create parent window!\n"); test_pager(); + test_wm_notifyformat(); DestroyWindow(parent_wnd); }

1 0

Zhiyi Zhang : comctl32/tests: Remove pager skip check.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: b200fac42d7bc4ac9da3d6056e60d50dc5efdf15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b200fac42d7bc4ac9da3d605… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 24 22:04:20 2018 +0800 comctl32/tests: Remove pager skip check. Pager should be available on all VMs(XP+) on TestBot. So there's no need to check for the availability of pager control. Add calling InitCommonControls() so that pager control can be correctly initialized on XP. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 0da396c..fa505dc 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -32,6 +32,7 @@ static HWND parent_wnd, child1_wnd, child2_wnd; #define CHILD1_ID 1 #define CHILD2_ID 2 +static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -257,11 +258,7 @@ static void test_pager(void) RECT rect, rect2; pager = create_pager_control( PGS_HORZ ); - if (!pager) - { - win_skip( "Pager control not supported\n" ); - return; - } + ok(pager != NULL, "Fail to create pager\n"); register_child_wnd_class(); @@ -333,11 +330,26 @@ static void test_pager(void) DestroyWindow( pager ); } -START_TEST(pager) +static void init_functions(void) { - HMODULE mod = GetModuleHandleA("comctl32.dll"); + HMODULE mod = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(mod, #f); + X(InitCommonControlsEx); +#undef X pSetWindowSubclass = (void*)GetProcAddress(mod, (LPSTR)410); +} + +START_TEST(pager) +{ + INITCOMMONCONTROLSEX iccex; + + init_functions(); + + iccex.dwSize = sizeof(iccex); + iccex.dwICC = ICC_PAGESCROLLER_CLASS; + pInitCommonControlsEx(&iccex); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); @@ -345,4 +357,6 @@ START_TEST(pager) ok(parent_wnd != NULL, "Failed to create parent window!\n"); test_pager(); + + DestroyWindow(parent_wnd); }

1 0

Józef Kucia : vkd3d-shader: Downgrade FIXME() about unhandled instruction modifiers to WARN().
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: vkd3d Branch: master Commit: bca28c79eceae04c2a9018dedc7f492819bdec5d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bca28c79eceae04c2a9018d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 27 17:27:38 2018 +0200 vkd3d-shader: Downgrade FIXME() about unhandled instruction modifiers to WARN(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1309b7e..3be3ca9 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1622,7 +1622,7 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh if (modifier & ~recognized_bits) { - FIXME("Unhandled modifier 0x%08x.\n", modifier); + WARN("Unhandled modifier 0x%08x.\n", modifier); } else {

1 0

Józef Kucia : tests: Implement readback for 3D textures.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: vkd3d Branch: master Commit: b9d42358a40ac5e28575bc4b47f81a6046c09eea URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b9d42358a40ac5e28575bc4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 27 17:27:36 2018 +0200 tests: Implement readback for 3D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 194 ++++++++++++++++++++++------------------------- tests/vkd3d_d3d12_test.h | 61 ++++++++++----- 2 files changed, 132 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=b9d42358a40ac5e2857…

1 0

Józef Kucia : vkd3d: Rename vkd3d_queue_gpu_fence() to vkd3d_enqueue_gpu_fence().
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: vkd3d Branch: master Commit: c4c3634bc468f51839d225ee633b7cc7f0838159 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c4c3634bc468f51839d225e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 27 17:27:35 2018 +0200 vkd3d: Rename vkd3d_queue_gpu_fence() to vkd3d_enqueue_gpu_fence(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7aa1695..16c6135 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -78,7 +78,7 @@ static void vkd3d_queue_release(struct vkd3d_queue *queue) } /* Fence worker thread */ -static HRESULT vkd3d_queue_gpu_fence(struct vkd3d_fence_worker *worker, +static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, VkFence vk_fence, ID3D12Fence *fence, UINT64 value) { int rc; @@ -4486,7 +4486,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * return hresult_from_vk_result(vr); } - return vkd3d_queue_gpu_fence(&device->fence_worker, vk_fence, fence, value); + return vkd3d_enqueue_gpu_fence(&device->fence_worker, vk_fence, fence, value); } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *iface,

1 0

Józef Kucia : vkd3d: Add FIXME() for ignored SampleDesc.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: vkd3d Branch: master Commit: e43141b68e5b12ac603f4ae3c3702386fa18be8a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e43141b68e5b12ac603f4ae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 27 17:27:34 2018 +0200 vkd3d: Add FIXME() for ignored SampleDesc. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5e401fd..446e1a6 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2180,6 +2180,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ds_desc_from_d3d12(&graphics->ds_desc, &desc->DepthStencilState); + if (desc->SampleDesc.Count != 1) + FIXME("Ignoring sample desc %u, %u.\n", desc->SampleDesc.Count, desc->SampleDesc.Quality); + graphics->root_signature = root_signature; state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS;

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018