January 2018 - Wine-commits

Nikolay Sivov : comctl32/tests: Use public macro for ListView class name.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: de4f1783b327aee4e61de091c6649418535772f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de4f1783b327aee4e61de091… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 29 14:20:38 2018 +0300 comctl32/tests: Use public macro for ListView class name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ea7ad56..c6e3127 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -889,7 +889,7 @@ static void test_images(void) r = pImageList_Add(himl, hbmp, 0); ok(r == 0, "should be zero\n"); - hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_OWNERDRAWFIXED, + hwnd = CreateWindowExA(0, WC_LISTVIEWA, "foo", LVS_OWNERDRAWFIXED, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); @@ -952,7 +952,7 @@ static void test_checkboxes(void) text2[] = "Text2", text3[] = "Text3"; - hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_REPORT, + hwnd = CreateWindowExA(0, WC_LISTVIEWA, "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); @@ -1179,7 +1179,7 @@ static void test_items(void) LVITEMA item; DWORD r; - hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_REPORT, + hwnd = CreateWindowExA(0, WC_LISTVIEWA, "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); @@ -1436,7 +1436,7 @@ static void test_columns(void) CHAR buff[5]; DWORD rc; - hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_LIST, + hwnd = CreateWindowExA(0, WC_LISTVIEWA, "foo", LVS_LIST, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); @@ -1451,7 +1451,7 @@ static void test_columns(void) DestroyWindow(hwnd); - hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_REPORT, + hwnd = CreateWindowExA(0, WC_LISTVIEWA, "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); @@ -1610,7 +1610,7 @@ static void test_create(BOOL is_version_6) DestroyWindow(hList); /* header isn't created on LVS_ICON and LVS_LIST styles */ - hList = CreateWindowA("SysListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); + hList = CreateWindowA(WC_LISTVIEWA, "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); TEST_NO_HEADER(hList); /* insert column */ @@ -1625,7 +1625,7 @@ static void test_create(BOOL is_version_6) ok(!(style & HDS_HIDDEN), "Not expected HDS_HIDDEN\n"); DestroyWindow(hList); - hList = CreateWindowA("SysListView32", "Test", WS_VISIBLE|LVS_LIST, 0, 0, 100, 100, NULL, NULL, + hList = CreateWindowA(WC_LISTVIEWA, "Test", WS_VISIBLE|LVS_LIST, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); TEST_NO_HEADER(hList); /* insert column */ @@ -1638,7 +1638,7 @@ static void test_create(BOOL is_version_6) DestroyWindow(hList); /* try to switch LVS_ICON -> LVS_REPORT and back LVS_ICON -> LVS_REPORT */ - hList = CreateWindowA("SysListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, + hList = CreateWindowA(WC_LISTVIEWA, "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); ret = SetWindowLongPtrA(hList, GWL_STYLE, GetWindowLongPtrA(hList, GWL_STYLE) | LVS_REPORT); ok(ret & WS_VISIBLE, "Style wrong, should have WS_VISIBLE\n"); @@ -1649,7 +1649,7 @@ static void test_create(BOOL is_version_6) DestroyWindow(hList); /* try to switch LVS_LIST -> LVS_REPORT and back LVS_LIST -> LVS_REPORT */ - hList = CreateWindowA("SysListView32", "Test", WS_VISIBLE|LVS_LIST, 0, 0, 100, 100, NULL, NULL, + hList = CreateWindowA(WC_LISTVIEWA, "Test", WS_VISIBLE|LVS_LIST, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); ret = SetWindowLongPtrA(hList, GWL_STYLE, (GetWindowLongPtrA(hList, GWL_STYLE) & ~LVS_LIST) | LVS_REPORT); @@ -1661,7 +1661,7 @@ static void test_create(BOOL is_version_6) DestroyWindow(hList); /* LVS_REPORT without WS_VISIBLE */ - hList = CreateWindowA("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); todo_wine_if(is_version_6) @@ -1677,7 +1677,7 @@ todo_wine_if(is_version_6) DestroyWindow(hList); /* LVS_REPORT without WS_VISIBLE, try to show it */ - hList = CreateWindowA("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); todo_wine_if(is_version_6) TEST_NO_HEADER2(hList, is_version_6); @@ -1687,7 +1687,7 @@ todo_wine_if(is_version_6) DestroyWindow(hList); /* LVS_REPORT with LVS_NOCOLUMNHEADER */ - hList = CreateWindowA("SysListView32", "Test", LVS_REPORT|LVS_NOCOLUMNHEADER|WS_VISIBLE, + hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT|LVS_NOCOLUMNHEADER|WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); TEST_HEADER_EXPECTED(hList); hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); @@ -1696,7 +1696,7 @@ todo_wine_if(is_version_6) DestroyWindow(hList); /* setting LVS_EX_HEADERDRAGDROP creates header */ - hList = CreateWindowA("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); todo_wine_if(is_version_6) TEST_NO_HEADER2(hList, is_version_6); @@ -1706,7 +1706,7 @@ todo_wine_if(is_version_6) DestroyWindow(hList); /* setting LVS_EX_GRIDLINES creates header */ - hList = CreateWindowA("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); todo_wine_if(is_version_6) TEST_NO_HEADER2(hList, is_version_6); @@ -1716,7 +1716,7 @@ todo_wine_if(is_version_6) DestroyWindow(hList); /* setting LVS_EX_FULLROWSELECT creates header */ - hList = CreateWindowA("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); todo_wine_if(is_version_6) TEST_NO_HEADER2(hList, is_version_6); @@ -1732,7 +1732,7 @@ todo_wine_if(is_version_6) DestroyWindow(hList); /* requesting header info with LVM_GETSUBITEMRECT doesn't create it */ - hList = CreateWindowA("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + hList = CreateWindowA(WC_LISTVIEWA, "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); todo_wine_if(is_version_6) TEST_NO_HEADER2(hList, is_version_6); @@ -2834,7 +2834,7 @@ static void test_subitem_rect(void) DestroyWindow(hwnd); /* try it for non LVS_REPORT style */ - hwnd = CreateWindowA("SysListView32", "Test", LVS_ICON, 0, 0, 100, 100, NULL, NULL, + hwnd = CreateWindowA(WC_LISTVIEWA, "Test", LVS_ICON, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); SetRect(&rect, LVIR_BOUNDS, 1, -10, -10); r = SendMessageA(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); @@ -4201,7 +4201,7 @@ static void test_editbox(void) ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "edit box WM_COMMAND (EN_SETFOCUS), no edit created", FALSE); /* same thing but with valid window */ - hwndedit = CreateWindowA("Edit", "Test edit", WS_VISIBLE | WS_CHILD, 0, 0, 20, + hwndedit = CreateWindowA(WC_EDITA, "Test edit", WS_VISIBLE | WS_CHILD, 0, 0, 20, 10, hwnd, (HMENU)1, (HINSTANCE)GetWindowLongPtrA(hwnd, GWLP_HINSTANCE), 0); flush_sequences(sequences, NUM_MSG_SEQUENCES); r = SendMessageA(hwnd, WM_COMMAND, MAKEWPARAM(0, EN_SETFOCUS), (LPARAM)hwndedit); @@ -5975,7 +5975,7 @@ static void test_oneclickactivate(void) INT r; POINT orig_pos; - hwnd = CreateWindowExA(0, "SysListView32", "foo", WS_VISIBLE|WS_CHILD|LVS_LIST, + hwnd = CreateWindowExA(0, WC_LISTVIEWA, "foo", WS_VISIBLE|WS_CHILD|LVS_LIST, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); r = SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_ONECLICKACTIVATE);

1 0

Nikolay Sivov : comctl32/tests: Run Header format mask tests on version 6.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: 69694d4976b6f22f64830ca8de8340c94929617d URL: https://source.winehq.org/git/wine.git/?a=commit;h=69694d4976b6f22f64830ca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 29 14:20:39 2018 +0300 comctl32/tests: Run Header format mask tests on version 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/header.c | 111 ++++++++++++++++++++++++++----------------- 1 file changed, 67 insertions(+), 44 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 31610f0..7ea8051 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -535,58 +535,79 @@ static HWND create_custom_header_control(HWND hParent, BOOL preloadHeaderItems) return childHandle; } -static void check_auto_format(void) +static void header_item_getback(HWND hwnd, UINT mask, HDITEMA *item) { - HDITEMA hdiCreate; - HDITEMA hdiRead; - static CHAR text[] = "Test"; - ZeroMemory(&hdiCreate, sizeof(HDITEMA)); + int ret; - /* Windows implicitly sets some format bits in INSERTITEM */ + ret = SendMessageA(hwnd, HDM_INSERTITEMA, 0, (LPARAM)item); + ok(ret != -1, "Failed to add header item.\n"); - /* HDF_STRING is automatically set and cleared for no text */ - hdiCreate.mask = HDI_TEXT|HDI_WIDTH|HDI_FORMAT; - hdiCreate.pszText = text; - hdiCreate.cxy = 100; - hdiCreate.fmt=HDF_CENTER; - addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); - ok(hdiRead.fmt == (HDF_STRING|HDF_CENTER), "HDF_STRING not set automatically (fmt=%x)\n", hdiRead.fmt); + memset(item, 0, sizeof(*item)); + item->mask = mask; - hdiCreate.mask = HDI_WIDTH|HDI_FORMAT; - hdiCreate.pszText = text; - hdiCreate.fmt = HDF_CENTER|HDF_STRING; - addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); - ok(hdiRead.fmt == (HDF_CENTER), "HDF_STRING should be automatically cleared (fmt=%x)\n", hdiRead.fmt); + ret = SendMessageA(hwnd, HDM_GETITEMA, 0, (LPARAM)item); + ok(ret != 0, "Failed to get item data.\n"); + ret = SendMessageA(hwnd, HDM_DELETEITEM, 0, 0); + ok(ret != 0, "Failed to delete item.\n"); +} - /* HDF_BITMAP is automatically set and cleared for a NULL bitmap or no bitmap */ - hdiCreate.mask = HDI_BITMAP|HDI_WIDTH|HDI_FORMAT; - hdiCreate.hbm = CreateBitmap(16, 16, 1, 8, NULL); - hdiCreate.fmt = HDF_CENTER; - addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); - ok(hdiRead.fmt == (HDF_BITMAP|HDF_CENTER), "HDF_BITMAP not set automatically (fmt=%x)\n", hdiRead.fmt); - DeleteObject(hdiCreate.hbm); +static void test_item_auto_format(HWND parent) +{ + static char text[] = "Test"; + HDITEMA item; + HBITMAP hbm; + HWND hwnd; - hdiCreate.hbm = NULL; - hdiCreate.fmt = HDF_CENTER|HDF_BITMAP; - addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); - ok(hdiRead.fmt == HDF_CENTER, "HDF_BITMAP not cleared automatically for NULL bitmap (fmt=%x)\n", hdiRead.fmt); + hwnd = create_custom_header_control(parent, FALSE); - hdiCreate.mask = HDI_WIDTH|HDI_FORMAT; - hdiCreate.fmt = HDF_CENTER|HDF_BITMAP; - addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); - ok(hdiRead.fmt == HDF_CENTER, "HDF_BITMAP not cleared automatically for no bitmap (fmt=%x)\n", hdiRead.fmt); + /* Windows implicitly sets some format bits in INSERTITEM */ + + /* HDF_STRING is automatically set and cleared for no text */ + item.mask = HDI_TEXT | HDI_WIDTH | HDI_FORMAT; + item.pszText = text; + item.cxy = 100; + item.fmt = HDF_CENTER; + header_item_getback(hwnd, HDI_FORMAT, &item); + ok(item.fmt == (HDF_STRING | HDF_CENTER), "Unexpected item format mask %#x.\n", item.fmt); + + item.mask = HDI_WIDTH | HDI_FORMAT; + item.pszText = text; + item.fmt = HDF_CENTER | HDF_STRING; + header_item_getback(hwnd, HDI_FORMAT, &item); + ok(item.fmt == HDF_CENTER, "Unexpected item format mask %#x.\n", item.fmt); + + /* HDF_BITMAP is automatically set and cleared for a NULL bitmap or no bitmap */ + item.mask = HDI_BITMAP | HDI_WIDTH | HDI_FORMAT; + item.hbm = hbm = CreateBitmap(16, 16, 1, 8, NULL); + item.fmt = HDF_CENTER; + header_item_getback(hwnd, HDI_FORMAT, &item); + ok(item.fmt == (HDF_BITMAP | HDF_CENTER), "Unexpected item format mask %#x.\n", item.fmt); + DeleteObject(hbm); + + item.mask = HDI_BITMAP | HDI_WIDTH | HDI_FORMAT; + item.hbm = NULL; + item.fmt = HDF_CENTER | HDF_BITMAP; + header_item_getback(hwnd, HDI_FORMAT, &item); + ok(item.fmt == HDF_CENTER, "Unexpected item format mask %#x.\n", item.fmt); + + item.mask = HDI_WIDTH | HDI_FORMAT; + item.fmt = HDF_CENTER | HDF_BITMAP; + header_item_getback(hwnd, HDI_FORMAT, &item); + ok(item.fmt == HDF_CENTER, "Unexpected item format mask %#x.\n", item.fmt); /* HDF_IMAGE is automatically set but not cleared */ - hdiCreate.mask = HDI_IMAGE|HDI_WIDTH|HDI_FORMAT; - hdiCreate.iImage = 17; - addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); - ok(hdiRead.fmt == (HDF_IMAGE|HDF_CENTER), "HDF_IMAGE not set automatically (fmt=%x)\n", hdiRead.fmt); + item.mask = HDI_IMAGE | HDI_WIDTH | HDI_FORMAT; + item.iImage = 17; + header_item_getback(hwnd, HDI_FORMAT, &item); + ok(item.fmt == (HDF_IMAGE | HDF_CENTER), "Unexpected item format mask %#x.\n", item.fmt); - hdiCreate.mask = HDI_WIDTH|HDI_FORMAT; - hdiCreate.fmt = HDF_CENTER|HDF_IMAGE; - hdiCreate.iImage = 0; - addReadDelItem(hWndHeader, &hdiCreate, HDI_FORMAT, &hdiRead); - ok(hdiRead.fmt == (HDF_CENTER|HDF_IMAGE), "HDF_IMAGE shouldn't be cleared automatically (fmt=%x)\n", hdiRead.fmt); + item.mask = HDI_WIDTH | HDI_FORMAT; + item.fmt = HDF_CENTER | HDF_IMAGE; + item.iImage = 0; + header_item_getback(hwnd, HDI_FORMAT, &item); + ok(item.fmt == (HDF_CENTER | HDF_IMAGE), "Unexpected item format mask %#x.\n", item.fmt); + + DestroyWindow(hwnd); } static void check_auto_fields(void) @@ -768,7 +789,6 @@ static void test_header_control (void) /* unexpected notifies cleared by notifies_received in setItem */ delItem(hWndHeader, 0); - check_auto_format(); TEST_GET_ITEMCOUNT(6); check_auto_fields(); TEST_GET_ITEMCOUNT(6); @@ -1820,18 +1840,20 @@ START_TEST(header) HANDLE hCtx; init_functions(); + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); if (!init()) return; test_header_control(); + test_item_auto_format(hHeaderParentWnd); test_header_order(); test_hdm_orderarray(); test_customdraw(); DestroyWindow(hHeaderParentWnd); - init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + flush_sequences(sequences, NUM_MSG_SEQUENCES); parent_hwnd = create_custom_parent_window(); ok_sequence(sequences, PARENT_SEQ_INDEX, create_parent_wnd_seq, "create parent windows", FALSE); @@ -1857,6 +1879,7 @@ START_TEST(header) /* comctl32 version 6 tests start here */ test_hdf_fixedwidth(parent_hwnd); test_hds_nosizing(parent_hwnd); + test_item_auto_format(parent_hwnd); unload_v6_module(ctx_cookie, hCtx);

1 0

Nikolay Sivov : comctl32/tests: Add more tests for tab focus.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: 72186db5fe5ac509d5404b73a5c6590d6fbbca00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72186db5fe5ac509d5404b73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 29 14:20:40 2018 +0300 comctl32/tests: Add more tests for tab focus. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tab.c | 70 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index a54dbb5..d3e0e0c 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -215,6 +215,11 @@ static const struct message selchange_parent_seq[] = { { 0 } }; +static const struct message setfocus_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TCN_FOCUSCHANGE }, + { 0 } +}; + static HWND create_tabcontrol (DWORD style, DWORD mask) { @@ -593,7 +598,7 @@ static void test_width(void) static void test_curfocus(void) { const INT nTabs = 5; - INT focusIndex; + INT ret; HWND hTab; hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, nTabs); @@ -602,24 +607,63 @@ static void test_curfocus(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Testing CurFocus with largest appropriate value */ - SendMessageA(hTab, TCM_SETCURFOCUS, nTabs - 1, 0); - focusIndex = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); - expect(nTabs-1, focusIndex); + ret = SendMessageA(hTab, TCM_SETCURFOCUS, nTabs - 1, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == nTabs - 1, "Unexpected focus index %d.\n", ret); /* Testing CurFocus with negative value */ - SendMessageA(hTab, TCM_SETCURFOCUS, -10, 0); - focusIndex = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); - expect(-1, focusIndex); + ret = SendMessageA(hTab, TCM_SETCURFOCUS, -10, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == -1, "Unexpected focus index %d.\n", ret); /* Testing CurFocus with value larger than number of tabs */ - focusIndex = SendMessageA(hTab, TCM_SETCURSEL, 1, 0); - expect(-1, focusIndex); + ret = SendMessageA(hTab, TCM_SETCURSEL, 1, 0); + ok(ret == -1, "Unexpected focus index %d.\n", ret); - SendMessageA(hTab, TCM_SETCURFOCUS, nTabs + 1, 0); - focusIndex = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); - expect(1, focusIndex); + ret = SendMessageA(hTab, TCM_SETCURFOCUS, nTabs + 1, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == 1, "Unexpected focus index %d.\n", ret); + + ok_sequence(sequences, TAB_SEQ_INDEX, getset_cur_focus_seq, "Set focused tab sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "Set focused tab parent sequence", TRUE); + + DestroyWindow(hTab); + + /* TCS_BUTTONS */ + hTab = createFilledTabControl(parent_wnd, TCS_BUTTONS, TCIF_TEXT|TCIF_IMAGE, nTabs); + ok(hTab != NULL, "Failed to create tab control\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* Testing CurFocus with largest appropriate value */ + ret = SendMessageA(hTab, TCM_SETCURFOCUS, nTabs - 1, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == nTabs - 1, "Unexpected focus index %d.\n", ret); + + /* Testing CurFocus with negative value */ + ret = SendMessageA(hTab, TCM_SETCURFOCUS, -10, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); +todo_wine + ok(ret == nTabs - 1, "Unexpected focus index %d.\n", ret); + + /* Testing CurFocus with value larger than number of tabs */ + ret = SendMessageA(hTab, TCM_SETCURSEL, 1, 0); +todo_wine + ok(ret == 0, "Unexpected focus index %d.\n", ret); + + ret = SendMessageA(hTab, TCM_SETCURFOCUS, nTabs + 1, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); +todo_wine + ok(ret == nTabs - 1, "Unexpected focus index %d.\n", ret); - ok_sequence(sequences, TAB_SEQ_INDEX, getset_cur_focus_seq, "Getset curFoc test sequence", FALSE); + ok_sequence(sequences, TAB_SEQ_INDEX, getset_cur_focus_seq, "TCS_BUTTONS: set focused tab sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, setfocus_parent_seq, "TCS_BUTTONS: set focused tab parent sequence", TRUE); DestroyWindow(hTab); }

1 0

Nikolay Sivov : comctl32/tests: Run some DateTime tests on version 6 too.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: 988003cb7419a65bc84364878217eb19084df5a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=988003cb7419a65bc8436487… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 29 14:20:41 2018 +0300 comctl32/tests: Run some DateTime tests on version 6 too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/datetime.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 4036e9d..7742dc5 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -22,6 +22,7 @@ #include "wine/test.h" #include "msg.h" +#include "v6util.h" #define expect(EXPECTED, GOT) ok((GOT)==(EXPECTED), "Expected %d, got %ld\n", (EXPECTED), (GOT)) @@ -791,6 +792,8 @@ static void init_functions(void) START_TEST(datetime) { INITCOMMONCONTROLSEX iccex; + ULONG_PTR cookie; + HANDLE ctxt; init_functions(); @@ -810,4 +813,16 @@ START_TEST(datetime) test_dtm_set_and_get_systemtime_with_limits(); test_wm_set_get_text(); test_dts_shownone(); + + if (!load_v6_module(&cookie, &ctxt)) + return; + + test_dtm_set_format(); + test_dtm_set_and_get_mccolor(); + test_dtm_set_and_get_mcfont(); + test_dtm_get_monthcal(); + test_wm_set_get_text(); + test_dts_shownone(); + + unload_v6_module(cookie, ctxt); }

1 0

Nikolay Sivov : comctl32/tests: Run DPA tests on version 6.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: d01306d1ee85b978afffe45879933af5aa122e09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d01306d1ee85b978afffe458… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 29 14:20:42 2018 +0300 comctl32/tests: Run DPA tests on version 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/dpa.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index c795c14..39f6b46 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -30,6 +30,7 @@ #include "objidl.h" #include "wine/test.h" +#include "v6util.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) @@ -737,6 +738,9 @@ if (0) { START_TEST(dpa) { + ULONG_PTR cookie; + HANDLE ctxt; + init_functions(); test_dpa(); @@ -745,4 +749,18 @@ START_TEST(dpa) test_DPA_DestroyCallback(); test_DPA_LoadStream(); test_DPA_SaveStream(); + + if (!load_v6_module(&cookie, &ctxt)) + return; + + init_functions(); + + test_dpa(); + test_DPA_Merge(); + test_DPA_EnumCallback(); + test_DPA_DestroyCallback(); + test_DPA_LoadStream(); + test_DPA_SaveStream(); + + unload_v6_module(cookie, ctxt); }

1 0

Henri Verbeet : wined3d: Introduce WINED3D_RESOURCE_ACCESS_MAP.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: 798504700b9a6122740d243fc51478b37b82cfae URL: https://source.winehq.org/git/wine.git/?a=commit;h=798504700b9a6122740d243f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 21:28:22 2018 +0330 wined3d: Introduce WINED3D_RESOURCE_ACCESS_MAP. In order to distinguish between resources that exist purely in CPU memory and resources that exist in GPU memory but can be mapped. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 8 ++++---- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 7 ++++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index dcaa072..7817f85 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -36,11 +36,11 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool) return WINED3D_RESOURCE_ACCESS_GPU; case WINED3D_POOL_MANAGED: - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU; + return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; case WINED3D_POOL_SCRATCH: case WINED3D_POOL_SYSTEM_MEM: - return WINED3D_RESOURCE_ACCESS_CPU; + return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; default: FIXME("Unhandled pool %#x.\n", pool); @@ -191,9 +191,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->multisample_quality = multisample_quality; resource->usage = usage; resource->pool = pool; - resource->access_flags = resource_access_from_pool(pool); + resource->access = resource_access_from_pool(pool); if (usage & WINED3DUSAGE_DYNAMIC) - resource->access_flags |= WINED3D_RESOURCE_ACCESS_CPU; + resource->access |= WINED3D_RESOURCE_ACCESS_MAP; resource->width = width; resource->height = height; resource->depth = depth; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4dc739c..36d46ad 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -33,7 +33,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { return texture->resource.pool == WINED3D_POOL_DEFAULT - && texture->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU + && texture->resource.access & WINED3D_RESOURCE_ACCESS_MAP && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !texture->resource.format->conv_byte_count && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED)); @@ -243,9 +243,9 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, if (WARN_ON(d3d)) { DWORD required_access = wined3d_resource_access_from_location(location); - if ((texture->resource.access_flags & required_access) != required_access) + if ((texture->resource.access & required_access) != required_access) WARN("Operation requires %#x access, but texture only has %#x.\n", - required_access, texture->resource.access_flags); + required_access, texture->resource.access); } if (current & WINED3D_LOCATION_DISCARDED) @@ -369,7 +369,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc } wined3d_resource_update_draw_binding(&texture->resource); if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) || desc->format == WINED3DFMT_D16_LOCKABLE) - texture->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; + texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP; texture->texture_ops = texture_ops; @@ -1874,7 +1874,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour return WINED3DERR_INVALIDCALL; } - if (!(resource->access_flags & WINED3D_RESOURCE_ACCESS_CPU)) + if (!(resource->access & WINED3D_RESOURCE_ACCESS_MAP)) { WARN("Trying to map unmappable texture.\n"); if (resource->type != WINED3D_RTYPE_TEXTURE_2D) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f68b0a..082c1ec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2961,8 +2961,9 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta return context->isStateDirty[idx] & (1u << shift); } -#define WINED3D_RESOURCE_ACCESS_GPU 0x1 -#define WINED3D_RESOURCE_ACCESS_CPU 0x2 +#define WINED3D_RESOURCE_ACCESS_GPU 0x1u +#define WINED3D_RESOURCE_ACCESS_CPU 0x2u +#define WINED3D_RESOURCE_ACCESS_MAP 0x4u struct wined3d_resource_ops { @@ -2990,7 +2991,7 @@ struct wined3d_resource UINT multisample_quality; DWORD usage; enum wined3d_pool pool; - DWORD access_flags; + unsigned int access; WORD draw_binding; WORD map_binding; UINT width;

1 0

Henri Verbeet : wined3d: Get rid of WINED3D_POOL_SCRATCH.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: 2abf1dd3238de2be3405472d40169603a3776b15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2abf1dd3238de2be3405472d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 21:28:23 2018 +0330 wined3d: Get rid of WINED3D_POOL_SCRATCH. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 38 +++++++++++++++++++++++++++++--------- dlls/d3d8/d3d8_private.h | 12 ++++++++++++ dlls/d3d8/device.c | 6 ++++++ dlls/d3d8/surface.c | 4 ++-- dlls/d3d8/texture.c | 30 ++++++++++++++++++++++++------ dlls/d3d8/volume.c | 4 ++-- dlls/d3d9/buffer.c | 40 ++++++++++++++++++++++++++++++---------- dlls/d3d9/d3d9_private.h | 12 ++++++++++++ dlls/d3d9/device.c | 6 ++++++ dlls/d3d9/surface.c | 4 ++-- dlls/d3d9/texture.c | 30 ++++++++++++++++++++++++------ dlls/d3d9/volume.c | 4 ++-- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/resource.c | 10 ++++++++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 2 +- 19 files changed, 169 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2abf1dd3238de2be3405…

1 0

Henri Verbeet : wined3d: Use the resource access flags in arbfp_blit_supported().
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: a3b6f8ceb9a225966ae1b7685fc6beab4da22c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b6f8ceb9a225966ae1b768… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 21:28:24 2018 +0330 wined3d: Use the resource access flags in arbfp_blit_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 11141b6..a8c4abb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7695,15 +7695,16 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } -static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, - enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3d_context *context, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; enum complex_fixup src_fixup; BOOL decompress; - if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (!context->gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) @@ -7717,7 +7718,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: - if (!d3d_info->shader_color_key) + if (!context->d3d_info->shader_color_key) { /* The conversion modifies the alpha channel so the color key might no longer match. */ TRACE("Color keying not supported with converted textures.\n"); @@ -7734,7 +7735,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); - if (!decompress && (dst_pool == WINED3D_POOL_SYSTEM_MEM || src_pool == WINED3D_POOL_SYSTEM_MEM)) + if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE; src_fixup = get_complex_fixup(src_format->color_fixup); @@ -7800,9 +7801,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl struct wined3d_blitter *next; RECT s, d; - if (!arbfp_blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, op, - src_texture->resource.pool, src_texture->resource.format, src_location, - dst_texture->resource.pool, dst_texture->resource.format, dst_location)) + if (!arbfp_blit_supported(op, context, &src_texture->resource, src_location, + &dst_texture->resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location,

1 0

Henri Verbeet : wined3d: Use the resource access flags in fbo_blitter_supported().
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: 36f20ec5d13b8f379886e2e66c4cb8aa9be1826f URL: https://source.winehq.org/git/wine.git/?a=commit;h=36f20ec5d13b8f379886e2e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 21:28:25 2018 +0330 wined3d: Use the resource access flags in fbo_blitter_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4e5940a..fb28117 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -484,25 +484,28 @@ static void surface_blt_fbo(const struct wined3d_device *device, context_restore(context, restore_rt); } -static BOOL fbo_blitter_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, - DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl_info *gl_info, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; + if ((wined3d_settings.offscreen_rendering_mode != ORM_FBO) || !gl_info->fbo_ops.glBlitFramebuffer) return FALSE; /* Source and/or destination need to be on the GL side */ - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + if (!(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE; switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT: if (!((src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (src_usage & WINED3DUSAGE_RENDERTARGET))) + || (src_resource->usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; if (!((dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (dst_usage & WINED3DUSAGE_RENDERTARGET))) + || (dst_resource->usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; if ((src_format->id != dst_format->id || dst_location == WINED3D_LOCATION_DRAWABLE) && (!is_identity_fixup(src_format->color_fixup) || !is_identity_fixup(dst_format->color_fixup))) @@ -2229,11 +2232,9 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) - && fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - texture->resource.usage, texture->resource.pool, - texture->resource.format, WINED3D_LOCATION_TEXTURE_RGB, - texture->resource.usage, texture->resource.pool, - texture->resource.format, WINED3D_LOCATION_TEXTURE_SRGB)) + && fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, + &texture->resource, WINED3D_LOCATION_TEXTURE_RGB, + &texture->resource, WINED3D_LOCATION_TEXTURE_SRGB)) { if (srgb) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, @@ -2252,9 +2253,8 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - if (fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - texture->resource.usage, texture->resource.pool, texture->resource.format, src_location, - texture->resource.usage, texture->resource.pool, texture->resource.format, dst_location)) + if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, + &texture->resource, src_location, &texture->resource, dst_location)) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, &src_rect, surface, dst_location, &src_rect); @@ -2470,9 +2470,8 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit blit_op = WINED3D_BLIT_OP_COLOR_BLIT; } - if (!fbo_blitter_supported(&device->adapter->gl_info, blit_op, - src_resource->usage, src_resource->pool, src_resource->format, src_location, - src_resource->usage, dst_resource->pool, dst_resource->format, dst_location)) + if (!fbo_blitter_supported(blit_op, context->gl_info, + src_resource, src_location, dst_resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location,

1 0

Henri Verbeet : wined3d: Use the resource access flags in ffp_blit_supported().
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: b7496ebacc300bed45d8449bab3815617bb1d383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7496ebacc300bed45d8449b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 21:28:26 2018 +0330 wined3d: Use the resource access flags in ffp_blit_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fb28117..520f88c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2664,18 +2664,19 @@ static void ffp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ HeapFree(GetProcessHeap(), 0, blitter); } -static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, - DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3d_context *context, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; BOOL decompress; decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); - if (!decompress && (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM)) + if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) { - TRACE("Source or destination is in system memory.\n"); + TRACE("Source or destination resource is not GPU accessible.\n"); return FALSE; } @@ -2690,14 +2691,14 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: - if (d3d_info->shader_color_key) + if (context->d3d_info->shader_color_key) { TRACE("Color keying requires converted textures.\n"); return FALSE; } case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (!context->gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) return FALSE; if (TRACE_ON(d3d)) @@ -2722,7 +2723,7 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, } } - if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) + if (!(dst_resource->usage & WINED3DUSAGE_RENDERTARGET)) { TRACE("Can only blit to render targets.\n"); return FALSE; @@ -2821,9 +2822,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit dst_resource = &dst_texture->resource; device = dst_resource->device; - if (!ffp_blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, op, - src_resource->usage, src_resource->pool, src_resource->format, src_location, - dst_resource->usage, dst_resource->pool, dst_resource->format, dst_location)) + if (!ffp_blit_supported(op, context, src_resource, src_location, dst_resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location,

1 0