wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Zhiyi Zhang : comctl32/theme_dialog: Pass the WM_SYSCOLORCHANGE message to the original dialog procedure.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 2de05267d76bf2a388ed7519b502c73f9e89537c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2de05267d76bf2a388ed7519… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:35:28 2021 +0800 comctl32/theme_dialog: Pass the WM_SYSCOLORCHANGE message to the original dialog procedure. Even though themed dialog itself doesn't need to repaint after WM_SYSCOLORCHANGE is received, WM_SYSCOLORCHANGE should be passed to the original dialog procedure DefDlgProcW(), which can then forward WM_SYSCOLORCHANGE to its common controls and call COMCTL32_RefreshSysColors(). Fix wrong property sheet tab background color after winecfg disables theming. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44511 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 12 ++---------- dlls/comctl32/theme_dialog.c | 8 +------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index ccbda7aebeb..eba7858d7b9 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -21,7 +21,6 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> -#include <uxtheme.h> #include "wine/test.h" #include "v6util.h" @@ -40,9 +39,8 @@ static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); -static BOOL (WINAPI *pIsThemeActive)(void); -static HMODULE hComctl32, hUxtheme; +static HMODULE hComctl32; /* For message tests */ enum seq_index @@ -108,9 +106,6 @@ static BOOL init_functions_v6(void) COMCTL32_GET_PROC(412, RemoveWindowSubclass) COMCTL32_GET_PROC(413, DefSubclassProc) - hUxtheme = LoadLibraryA("uxtheme.dll"); - pIsThemeActive = (void *)GetProcAddress(hUxtheme, "IsThemeActive"); - return TRUE; } @@ -630,7 +625,6 @@ static INT_PTR CALLBACK wm_syscolorchange_dlg_proc(HWND hwnd, UINT message, WPAR static void test_WM_SYSCOLORCHANGE(void) { HWND parent, dialog; - BOOL todo; struct { DLGTEMPLATE tmplate; @@ -652,8 +646,7 @@ static void test_WM_SYSCOLORCHANGE(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageW(dialog, WM_SYSCOLORCHANGE, 0, 0); - todo = pIsThemeActive && pIsThemeActive(); - ok_sequence(sequences, CHILD_SEQ_INDEX, wm_syscolorchange_seq, "test dialog WM_SYSCOLORCHANGE", todo); + ok_sequence(sequences, CHILD_SEQ_INDEX, wm_syscolorchange_seq, "test dialog WM_SYSCOLORCHANGE", FALSE); EndDialog(dialog, 0); DestroyWindow(parent); @@ -687,5 +680,4 @@ START_TEST(misc) unload_v6_module(ctx_cookie, hCtx); FreeLibrary(hComctl32); - FreeLibrary(hUxtheme); } diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c index 29007ba5c60..0f7835ae32f 100644 --- a/dlls/comctl32/theme_dialog.c +++ b/dlls/comctl32/theme_dialog.c @@ -63,13 +63,7 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, OpenThemeData( hWnd, themeClass ); InvalidateRect( hWnd, NULL, TRUE ); return 0; - - case WM_SYSCOLORCHANGE: - if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, - * which will do the repaint. */ - break; - + case WM_ERASEBKGND: if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); {

1 0

Zhiyi Zhang : comctl32/test: Test that WM_SYSCOLORCHANGE should always be passed to the dialog procedure.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 00e1664b0b23e01eccfa63c001e71dd5801882a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e1664b0b23e01eccfa63c0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:35:18 2021 +0800 comctl32/test: Test that WM_SYSCOLORCHANGE should always be passed to the dialog procedure. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 59 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 15ff3b2d099..ccbda7aebeb 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> +#include <uxtheme.h> #include "wine/test.h" #include "v6util.h" @@ -39,8 +40,9 @@ static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); +static BOOL (WINAPI *pIsThemeActive)(void); -static HMODULE hComctl32 = 0; +static HMODULE hComctl32, hUxtheme; /* For message tests */ enum seq_index @@ -106,6 +108,9 @@ static BOOL init_functions_v6(void) COMCTL32_GET_PROC(412, RemoveWindowSubclass) COMCTL32_GET_PROC(413, DefSubclassProc) + hUxtheme = LoadLibraryA("uxtheme.dll"); + pIsThemeActive = (void *)GetProcAddress(hUxtheme, "IsThemeActive"); + return TRUE; } @@ -604,6 +609,56 @@ static void test_WM_THEMECHANGED(void) DestroyWindow(parent); } +static const struct message wm_syscolorchange_seq[] = +{ + {WM_SYSCOLORCHANGE, sent | wparam | lparam}, + {0}, +}; + +static INT_PTR CALLBACK wm_syscolorchange_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct message msg = {0}; + + msg.message = message; + msg.flags = sent | wparam | lparam; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, CHILD_SEQ_INDEX, &msg); + return FALSE; +} + +static void test_WM_SYSCOLORCHANGE(void) +{ + HWND parent, dialog; + BOOL todo; + struct + { + DLGTEMPLATE tmplate; + WORD menu; + WORD class; + WORD title; + } temp = {{0}}; + + parent = CreateWindowExA(0, WC_STATICA, "parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, + 200, 200, 0, 0, 0, NULL); + ok(!!parent, "CreateWindowExA failed, error %d\n", GetLastError()); + + temp.tmplate.style = WS_CHILD | WS_VISIBLE; + temp.tmplate.cx = 50; + temp.tmplate.cy = 50; + dialog = CreateDialogIndirectParamA(NULL, &temp.tmplate, parent, wm_syscolorchange_dlg_proc, 0); + ok(!!dialog, "CreateDialogIndirectParamA failed, error %d\n", GetLastError()); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + SendMessageW(dialog, WM_SYSCOLORCHANGE, 0, 0); + todo = pIsThemeActive && pIsThemeActive(); + ok_sequence(sequences, CHILD_SEQ_INDEX, wm_syscolorchange_seq, "test dialog WM_SYSCOLORCHANGE", todo); + + EndDialog(dialog, 0); + DestroyWindow(parent); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -628,7 +683,9 @@ START_TEST(misc) test_builtin_classes(); test_LoadIconWithScaleDown(); test_WM_THEMECHANGED(); + test_WM_SYSCOLORCHANGE(); unload_v6_module(ctx_cookie, hCtx); FreeLibrary(hComctl32); + FreeLibrary(hUxtheme); }

1 0

Zhiyi Zhang : comctl32/theming: Register themed dialog and scrollbar even when theming is not active.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 277daa7ea7e8a953a2f726ce9354af82ab4635da URL: https://source.winehq.org/git/wine.git/?a=commit;h=277daa7ea7e8a953a2f726ce… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:35:08 2021 +0800 comctl32/theming: Register themed dialog and scrollbar even when theming is not active. So that we can turn on theming in runtime. Otherwise, themed dialog and scrollbar are not enabled even if a theme is made active in winecfg if theming is disabled at start. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44511 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 2 +- dlls/comctl32/theming.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 4b0c1f9a4d0..15ff3b2d099 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -580,7 +580,7 @@ static void test_WM_THEMECHANGED(void) {TRACKBAR_CLASSA, wm_themechanged_paint_seq}, {WC_TREEVIEWA, wm_themechanged_paint_erase_seq, 1, {0x1128}}, {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq}, - {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}, TRUE}, + {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}}, }; parent = CreateWindowExA(0, WC_STATICA, "parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index ed7bb0a5b33..8078e661b76 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -26,7 +26,6 @@ #include "wingdi.h" #include "winuser.h" #include "comctl32.h" -#include "uxtheme.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(theming); @@ -96,8 +95,6 @@ void THEMING_Initialize (void) { unsigned int i; - if (!IsThemeActive()) return; - atSubclassProp = GlobalAddAtomW (L"CC32ThemingSubCl"); atRefDataProp = GlobalAddAtomW (L"CC32ThemingData");

1 0

Zhiyi Zhang : comctl32: Repaint after the WM_THEMECHANGED message is received.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 6576d461b8b6e02e0306929fc86defec65922ed9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6576d461b8b6e02e0306929f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:35:01 2021 +0800 comctl32: Repaint after the WM_THEMECHANGED message is received. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 1 + dlls/comctl32/combo.c | 1 + dlls/comctl32/datetime.c | 1 + dlls/comctl32/edit.c | 1 + dlls/comctl32/header.c | 2 +- dlls/comctl32/ipaddress.c | 1 + dlls/comctl32/listbox.c | 1 + dlls/comctl32/listview.c | 1 + dlls/comctl32/monthcal.c | 1 + dlls/comctl32/pager.c | 9 +++++++++ dlls/comctl32/progress.c | 2 +- dlls/comctl32/static.c | 4 ++++ dlls/comctl32/status.c | 1 + dlls/comctl32/tab.c | 1 + dlls/comctl32/tests/misc.c | 36 ++++++++++++++++++------------------ dlls/comctl32/theme_scrollbar.c | 1 + dlls/comctl32/toolbar.c | 1 + dlls/comctl32/trackbar.c | 1 + dlls/comctl32/treeview.c | 1 + dlls/comctl32/updown.c | 2 +- 20 files changed, 48 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6576d461b8b6e02e0306…

1 0

Zhiyi Zhang : comctl32/tests: Test that WM_THEMECHANGED should invalidate client area.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: a9eaf7a7da2bbca5e2c69481f9a5c14e738144fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9eaf7a7da2bbca5e2c69481… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:34:51 2021 +0800 comctl32/tests: Test that WM_THEMECHANGED should invalidate client area. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 206 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 205 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index a3ba2028873..f4fcb300bb2 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -24,6 +24,7 @@ #include "wine/test.h" #include "v6util.h" +#include "msg.h" static PVOID (WINAPI * pAlloc)(LONG); static PVOID (WINAPI * pReAlloc)(PVOID, LONG); @@ -35,8 +36,21 @@ static BOOL (WINAPI * pStr_SetPtrA)(LPSTR, LPCSTR); static INT (WINAPI * pStr_GetPtrW)(LPCWSTR, LPWSTR, INT); static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); +static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); +static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); +static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); + static HMODULE hComctl32 = 0; +/* For message tests */ +enum seq_index +{ + CHILD_SEQ_INDEX, + NUM_MSG_SEQUENCES +}; + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + static char testicon_data[] = { 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, @@ -79,6 +93,40 @@ static BOOL InitFunctionPtrs(void) return TRUE; } +static BOOL init_functions_v6(void) +{ + hComctl32 = LoadLibraryA("comctl32.dll"); + if (!hComctl32) + { + trace("Could not load comctl32.dll version 6\n"); + return FALSE; + } + + COMCTL32_GET_PROC(410, SetWindowSubclass) + COMCTL32_GET_PROC(412, RemoveWindowSubclass) + COMCTL32_GET_PROC(413, DefSubclassProc) + + return TRUE; +} + +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + static void test_GetPtrAW(void) { if (pStr_GetPtrA) @@ -406,6 +454,156 @@ static void test_comctl32_classes(BOOL v6) check_class("SysLink", v6, CS_GLOBALCLASS, 0, FALSE); } +struct wm_themechanged_test +{ + const char *class; + const struct message *expected_msg; + int ignored_msg_count; + DWORD ignored_msgs[16]; + BOOL todo; +}; + +static BOOL ignore_message(UINT msg) +{ + /* these are always ignored */ + return (msg >= 0xc000 || + msg == WM_GETICON || + msg == WM_GETOBJECT || + msg == WM_TIMECHANGE || + msg == WM_DISPLAYCHANGE || + msg == WM_DEVICECHANGE || + msg == WM_DWMNCRENDERINGCHANGED || + msg == WM_WININICHANGE || + msg == WM_CHILDACTIVATE); +} + +static LRESULT CALLBACK test_wm_themechanged_proc(HWND hwnd, UINT message, WPARAM wParam, + LPARAM lParam, UINT_PTR id, DWORD_PTR ref_data) +{ + const struct wm_themechanged_test *test = (const struct wm_themechanged_test *)ref_data; + static int defwndproc_counter = 0; + struct message msg = {0}; + LRESULT ret; + int i; + + if (ignore_message(message)) + return pDefSubclassProc(hwnd, message, wParam, lParam); + + /* Extra messages to be ignored for a test case */ + for (i = 0; i < test->ignored_msg_count; ++i) + { + if (message == test->ignored_msgs[i]) + return pDefSubclassProc(hwnd, message, wParam, lParam); + } + + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, CHILD_SEQ_INDEX, &msg); + + if (message == WM_NCDESTROY) + pRemoveWindowSubclass(hwnd, test_wm_themechanged_proc, 0); + + ++defwndproc_counter; + ret = pDefSubclassProc(hwnd, message, wParam, lParam); + --defwndproc_counter; + + return ret; +} + +static HWND create_control(const char *class, DWORD style, HWND parent, DWORD_PTR data) +{ + HWND hwnd; + + if (parent) + style |= WS_CHILD; + hwnd = CreateWindowExA(0, class, "test", style, 0, 0, 50, 20, parent, 0, 0, NULL); + ok(!!hwnd, "Failed to create %s style %#x parent %p\n", class, style, parent); + pSetWindowSubclass(hwnd, test_wm_themechanged_proc, 0, data); + return hwnd; +} + +static const struct message wm_themechanged_paint_erase_seq[] = +{ + {WM_THEMECHANGED, sent | wparam | lparam}, + {WM_PAINT, sent | wparam | lparam}, + {WM_ERASEBKGND, sent | defwinproc}, + {0}, +}; + +static const struct message wm_themechanged_paint_seq[] = +{ + {WM_THEMECHANGED, sent | wparam | lparam}, + {WM_PAINT, sent | wparam | lparam}, + {0}, +}; + +static const struct message wm_themechanged_no_paint_seq[] = +{ + {WM_THEMECHANGED, sent | wparam | lparam}, + {0}, +}; + +static void test_WM_THEMECHANGED(void) +{ + HWND parent, child; + char buffer[64]; + int i; + + static const struct wm_themechanged_test tests[] = + { + {ANIMATE_CLASSA, wm_themechanged_no_paint_seq}, + {WC_BUTTONA, wm_themechanged_paint_erase_seq, 2, {WM_GETTEXT, WM_GETTEXTLENGTH}, TRUE}, + {WC_COMBOBOXA, wm_themechanged_paint_erase_seq, 1, {WM_CTLCOLOREDIT}, TRUE}, + {WC_COMBOBOXEXA, wm_themechanged_no_paint_seq}, + {DATETIMEPICK_CLASSA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_EDITA, wm_themechanged_paint_erase_seq, 7, {WM_GETTEXTLENGTH, WM_GETFONT, EM_GETSEL, EM_GETRECT, EM_CHARFROMPOS, EM_LINEFROMCHAR, EM_POSFROMCHAR}, TRUE}, + {WC_HEADERA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {HOTKEY_CLASSA, wm_themechanged_no_paint_seq}, + {WC_IPADDRESSA, wm_themechanged_paint_erase_seq, 1, {WM_CTLCOLOREDIT}, TRUE}, + {WC_LISTBOXA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_LISTVIEWA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {MONTHCAL_CLASSA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_NATIVEFONTCTLA, wm_themechanged_no_paint_seq}, + {WC_PAGESCROLLERA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {PROGRESS_CLASSA, wm_themechanged_paint_erase_seq, 3, {WM_STYLECHANGING, WM_STYLECHANGED, WM_NCPAINT}, TRUE}, + {REBARCLASSNAMEA, wm_themechanged_no_paint_seq, 1, {WM_WINDOWPOSCHANGING}}, + {WC_STATICA, wm_themechanged_paint_erase_seq, 2, {WM_GETTEXT, WM_GETTEXTLENGTH}, TRUE}, + {STATUSCLASSNAMEA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {"SysLink", wm_themechanged_no_paint_seq}, + {WC_TABCONTROLA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {TOOLBARCLASSNAMEA, wm_themechanged_paint_erase_seq, 1, {WM_WINDOWPOSCHANGING}, TRUE}, + {TOOLTIPS_CLASSA, wm_themechanged_no_paint_seq}, + {TRACKBAR_CLASSA, wm_themechanged_paint_seq, 0, {0}, TRUE}, + {WC_TREEVIEWA, wm_themechanged_paint_erase_seq, 1, {0x1128}, TRUE}, + {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}, TRUE}, + }; + + parent = CreateWindowExA(0, WC_STATICA, "parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, + 200, 200, 0, 0, 0, NULL); + ok(!!parent, "Failed to create parent window\n"); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + child = create_control(tests[i].class, WS_VISIBLE, parent, (DWORD_PTR)&tests[i]); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + SendMessageW(child, WM_THEMECHANGED, 0, 0); + flush_events(); + + sprintf(buffer, "Test %d class %s WM_THEMECHANGED", i, tests[i].class); + ok_sequence(sequences, CHILD_SEQ_INDEX, tests[i].expected_msg, buffer, tests[i].todo); + DestroyWindow(child); + } + + DestroyWindow(parent); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -416,15 +614,21 @@ START_TEST(misc) test_GetPtrAW(); test_Alloc(); - test_comctl32_classes(FALSE); + FreeLibrary(hComctl32); + if (!load_v6_module(&ctx_cookie, &hCtx)) return; + if(!init_functions_v6()) + return; + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); test_comctl32_classes(TRUE); test_builtin_classes(); test_LoadIconWithScaleDown(); + test_WM_THEMECHANGED(); unload_v6_module(ctx_cookie, hCtx); + FreeLibrary(hComctl32); }

1 0

Francois Gouget : winetest/build-patterns: Add TestBot-specific failure pattern pages.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: tools Branch: master Commit: d895deb83cefc8da6d17f7971eb7051f70de0c7d URL: https://source.winehq.org/git/tools.git/?a=commit;h=d895deb83cefc8da6d17f79… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 28 11:26:18 2021 +0200 winetest/build-patterns: Add TestBot-specific failure pattern pages. One page only shows the failure patterns of the Windows TestBot machines, and another just the Wine TestBot machines. This also cleanly separates the Windows and Wine failure modes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 4 ++-- winetest/build-patterns | 48 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 6a3356a..e69ea1f 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -220,7 +220,7 @@ foreach my $build (readdir(DIR)) { if ($build !~ /^[0-9a-f]{40}$/) { - if ($build !~ /^(?:\.\.?|(?:errors|index|patterns)\.html|tests)$/) + if ($build !~ /^(?:\.\.?|(?:errors|index|patterns.*)\.html|tests)$/) { error("'data/$build' is not a valid build directory\n"); } @@ -430,7 +430,7 @@ print OUT <<"EOF"; <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> -<div class="navbar"><a href="patterns.html">failure patterns</a></div> +<div class="navbar">Failure patterns: <a href="patterns.html">all</a> | <a href="patterns-tb-win.html">testbot windows</a> | <a href="patterns-tb-wine.html">testbot wine</a></div> <div class="main"> <h2>Wine test runs</h2> EOF diff --git a/winetest/build-patterns b/winetest/build-patterns index 9dc2581..e87fabc 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -168,6 +168,8 @@ Actions: Generated files: \$workdir/data/patterns.html + \$workdir/data/patterns-tb-win.html + \$workdir/data/patterns-tb-wine.html Exit: 0 - success @@ -206,7 +208,7 @@ foreach my $build (readdir(DIR)) { if ($build !~ /^[0-9a-f]{40}$/) { - if ($build !~ /^(?:\.\.?|(?:errors|index|patterns)\.html|tests)$/) + if ($build !~ /^(?:\.\.?|(?:errors|index|patterns.*)\.html|tests)$/) { error("'data/$build' is not a valid build directory\n"); } @@ -521,9 +523,9 @@ sub get_status_html($$) return ("?", "", "unknown status $status", "report", ""); } -sub write_patterns_list($$) +sub write_patterns_list($$$$) { - my ($html, $testnames) = @_; + my ($html, $pagereports, $mainpage, $testnames) = @_; for my $i (0..@$testnames-1) { @@ -532,6 +534,7 @@ sub write_patterns_list($$) print $html "<div class='testfile' id='$testname'>\n"; print $html "<div class='updownbar'><a href='tests/$testname.html'>$testname</a>"; + print $html " <small>(<a href='$mainpage#$testname'>see all results</a></small>)" if ($mainpage); print $html "<div class='ralign'>"; my $href = $i ? $testnames->[$i-1] : ""; @@ -546,6 +549,7 @@ sub write_patterns_list($$) print $html "<div class='test'>\n"; foreach my $reportdir (@sortedreports) { + next if (!$pagereports->{$reportdir}); my $testreport = $test->{testreports}->{$reportdir}; next if (!$testreport->{failed}); print $html "<div class='pattern'>"; @@ -644,11 +648,11 @@ sub write_patterns_list($$) } } -sub write_patterns_page($) +sub write_patterns_page($$$) { - my ($title) = (@_); + my ($pagereports, $subpage, $title) = (@_); - my $filename = "data/patterns.html"; + my $filename = "data/patterns$subpage.html"; open(my $html, ">", "$filename.new") or die "could not open '$filename.new' for writing: $!"; print $html <<"EOF"; @@ -661,7 +665,7 @@ sub write_patterns_page($) <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> -<div class="navbar"><a href="..">index</a></div> +<div class="navbar"><a href="..">index</a> | Failure patterns: <a href="patterns.html">all</a> | <a href="patterns-tb-win.html">testbot windows</a> | <a href="patterns-tb-wine.html">testbot wine</a></div> <div class="main"> EOF @@ -672,8 +676,9 @@ EOF { my $test = $tests{$testname}; my $addtest; - foreach my $testreport (values %{$test->{testreports}}) + foreach my $reportdir (keys %$pagereports) { + my $testreport = $test->{testreports}->{$reportdir}; next if (!$testreport->{failed}); $addtest = 1; @@ -687,8 +692,9 @@ EOF push @$testnames, $testname if ($addtest); } + my $mainpage = $subpage ? "patterns.html" : ""; print $html "<h2>$title</h2>\n"; - write_patterns_list($html, $testnames); + write_patterns_list($html, $pagereports, $mainpage, $testnames); print $html "</div></body></html>\n"; close($html); @@ -699,6 +705,28 @@ EOF } } -write_patterns_page("Test failure patterns"); +write_patterns_page(\%reports, "", "All test patterns"); + +my %tbreports; +foreach my $report (values %reports) +{ + next if ($report->{tag} !~ /^newtb-/); # ignore non-TestBot reports + if ($report->{is_rerun}) + { + # Skip reruns because they are infrequent and thus usually do not + # meaningfully contribute to the patterns. + # They can still be checked on the 'all reports' page. + next; + } + # Windows and Wine have different failure modes so put them on separate + # pages. + my $page = ($report->{platform} =~ /^(?:linux|mac|bsd|solaris|wine)$/) ? "wine" : "win"; + $tbreports{$page}->{$report->{dir}} = 1; +} + +write_patterns_page($tbreports{win}, "-tb-win", + "Windows test patterns (TestBot only)"); +write_patterns_page($tbreports{wine}, "-tb-wine", + "Wine test patterns (TestBot only)"); exit 0;

1 0

Francois Gouget : winetest/build-patterns: Use color gradients for the failures.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: tools Branch: master Commit: fb6a47743a4fed412f88318b7a1e24d7d9e11944 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fb6a47743a4fed412f88318… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 28 11:25:30 2021 +0200 winetest/build-patterns: Use color gradients for the failures. This makes it possible to identify when the failure count changes, such as when a patch adds two new failures to a test that already had five, or when the failure count depending on the test configuration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 116 ++++++++++++++++++++++++++++++++++++++---------- winetest/report.css | 4 +- 2 files changed, 93 insertions(+), 27 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index f470c26..9dc2581 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -247,6 +247,9 @@ my %reports; # - name # The uniquely identifying test name in the form 'module:unit'. # +# - colors +# A hashtable of colors indexed by failure count. +# # - testreports # A hashtable mapping report directory names to objects storing the results # for that test and report combination. Each testreport object has the @@ -421,44 +424,101 @@ foreach my $testname (keys %tests) } +# +# Compute color gradients +# + +sub color2html($) +{ + my ($c) = @_; + return sprintf "#%02x%02x%02x", $c->[0], $c->[1], $c->[2]; +} + +sub blend($$$) +{ + my ($p, $start, $end) = @_; + my $r = [int($start->[0] * (1 - $p) + $end->[0] * $p + 0.5), + int($start->[1] * (1 - $p) + $end->[1] * $p + 0.5), + int($start->[2] * (1 - $p) + $end->[2] * $p + 0.5)]; + return $r; +} + +my @keycolors = ([0, 255, 255], # cyan + [0, 255, 0], # green + [255, 255, 0], # yellow + [255, 0, 0], # red +); + +# Use colors to differentiate the set values. Each unique value is assigned +# a color (in HTML format) picked along a series of gradients passing by the +# colors defined in @keycolors. +sub compute_set_colors($) +{ + my ($set) = @_; + my @values = sort { $a <=> $b } keys %$set; + my $count = @values; + if ($count == 1) + { + $set->{$values[0]} = color2html($keycolors[0]); + } + else + { + my $k = 0; + my ($start, $end) = (-1, 0); + for (0..$count-1) + { + while (!$end or $_ > $end) + { + $k++; + $start = $end; + $end = ($count-1) * $k / (@keycolors-1); + } + $set->{$values[$_]} = color2html(blend(($_-$start)/($end-$start), + $keycolors[$k-1], + $keycolors[$k])); + } + } +} + + # # Write the failure patterns page for the given set of reports # my %status2html = ( # Dll information status values - # <status> => [ <symbol>, <class-char>, <title>, <link> ] - "missing" => ["n", "n", "not run for an unknown reason", "report"], - "missingdll" => ["m", "m", "missing dll", "version"], - "missingentrypoint" => ["e", "e", "missing entry point", "version"], - "missingordinal" => ["o", "o", "missing ordinal", "version"], - "missingsxs" => ["v", "v", "missing side-by-side dll version", "version"], - "stub" => ["u", "u", "stub Windows dll", "version"], - "native" => ["N", "N", "native Windows dll", "version"], - "loaderror258" => ["I", "I", "timed out while getting the test list", "version"], + # <status> => [ <symbol>, <class-char>, <title>, <link>, <attrs> ] + "missing" => ["n", "n", "not run for an unknown reason", "report", ""], + "missingdll" => ["m", "m", "missing dll", "version", ""], + "missingentrypoint" => ["e", "e", "missing entry point", "version", ""], + "missingordinal" => ["o", "o", "missing ordinal", "version", ""], + "missingsxs" => ["v", "v", "missing side-by-side dll version", "version", ""], + "stub" => ["u", "u", "stub Windows dll", "version", ""], + "native" => ["N", "N", "native Windows dll", "version", ""], + "loaderror258" => ["I", "I", "timed out while getting the test list", "version", ""], # Other status values - "skipped" => ["-", "s", "skipped by user request", ""], - "crash" => ["C", "C", "crash", "t"], - "258" => ["T", "T", "timeout", "t"], + "skipped" => ["-", "s", "skipped by user request", "", ""], + "crash" => ["C", "C", "crash", "t", ""], + "258" => ["T", "T", "timeout", "t", ""], ); -# Returns a tuple containing the symbol, CSS class, title and link type -# for the specified status. -sub get_status_html($) +# Returns a tuple containing the symbol, CSS class, title, link type and +# HTML attributes for the specified status. +sub get_status_html($$) { - my ($status) = @_; + my ($status, $failcolors) = @_; return @{$status2html{$status}} if ($status2html{$status}); if ($status =~ /^[0-9]+$/) { - return ("F", "F", "$status failures", "t"); + return ("F", "F", "$status failures", "t", " style='background-color: $failcolors->{$status}'"); } if ($status =~ /^loaderror(.*)$/) { - return ("L", "L", "got error $1 while getting the test list", "version"); + return ("L", "L", "got error $1 while getting the test list", "version", ""); } - return ("?", "", "unknown status $status", "report"); + return ("?", "", "unknown status $status", "report", ""); } sub write_patterns_list($$) @@ -481,6 +541,8 @@ sub write_patterns_list($$) print $html "</div></div>\n"; + compute_set_colors($test->{colors}); + print $html "<div class='test'>\n"; foreach my $reportdir (@sortedreports) { @@ -519,7 +581,7 @@ sub write_patterns_list($$) } else { - ($symbol, $class, $title, my $link) = get_status_html($status); + ($symbol, $class, $title, my $link, $attrs) = get_status_html($status, $test->{colors}); if ($link eq "t") { $tag = "a"; @@ -606,17 +668,23 @@ EOF # Build a list of test units that will appear on this page so we can # link them to each other. my $testnames = []; - unit: foreach my $testname (sort keys %tests) + foreach my $testname (sort keys %tests) { my $test = $tests{$testname}; + my $addtest; foreach my $testreport (values %{$test->{testreports}}) { - if ($testreport->{failed}) + next if (!$testreport->{failed}); + $addtest = 1; + + foreach my $status (values %{$testreport->{status}}) { - push @$testnames, $testname; - next unit; + next if ($status !~ /^[0-9]+$/); + next if ($status eq "258"); # timeouts have their own color + $test->{colors}->{$status} = undef; } } + push @$testnames, $testname if ($addtest); } print $html "<h2>$title</h2>\n"; diff --git a/winetest/report.css b/winetest/report.css index cca1ba9..2cc4663 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -89,9 +89,7 @@ div.pattern :hover { color: black; text-decoration: underline; } .patC { /* crash */ background-color: #ff5555; } -.patF { /* failure(s) */ - background-color: #ff0000; -} +/* .patF failure(s) */ /* .patn not run for an unknown reason */ /* .patm missing dll */ .pate { /* missing entrypoint */

1 0

Francois Gouget : winetest/build-index: Link the test unit pages to the failure patterns.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: tools Branch: master Commit: 940756efbf128034638e41e4b14e1842ab0c6012 URL: https://source.winehq.org/git/tools.git/?a=commit;h=940756efbf128034638e41e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 28 11:20:45 2021 +0200 winetest/build-index: Link the test unit pages to the failure patterns. Only for the test units that have failures in any of the buids / platforms since there is no pattern in case of success. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/winetest/build-index b/winetest/build-index index 7eacb87..6a3356a 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -259,6 +259,7 @@ foreach my $build (@too_old) # my %alltests = (); +my %haspattern = (); foreach my $build (@builds) { @@ -268,6 +269,10 @@ foreach my $build (@builds) chomp; my ($test, $group, $cell) = split / +/, $_, 3; $alltests{$test}->{$build->{name}}->{$group} = $cell; + if (!$haspattern{$test} and $cell =~ /result (?:fail|mixed)/) + { + $haspattern{$test} = 1; + } } close SUM; } @@ -294,6 +299,8 @@ foreach my $test (keys %alltests) { my $filename = "data/tests/$test.html"; open OUT, ">", "$filename.new" or die "could not open '$filename.new' for writing: $!"; + + my $title_link = $haspattern{$test} ? " | <a href=\"/data/patterns.html#$test\">failure patterns</a>" : ""; print OUT <<EOF; <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> @@ -312,7 +319,7 @@ EOF | <a href="..">index</a> </div> <div class="main"> -<h2>$test test runs</h2> +<h2>$test test runs$title_link</h2> <table class="report"> <thead> <tr><th class="test">Build</th><th class="test">Date</th>

1 0

Alexandre Julliard : packaging: Add Ubuntu 21.04.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: tools Branch: master Commit: 4b729b58c9913c568cd0900b4fc9d41d3cf97644 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4b729b58c9913c568cd0900… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 22:14:36 2021 +0200 packaging: Add Ubuntu 21.04. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ++++ packaging/obs/obs-sync | 3 ++- packaging/obs/rsync-filter | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 299a524..4f8757b 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -34,4 +34,8 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ + clean https://download.opensuse.org/repositories/Emulators:/Wine:/Debian diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index d7405f1..4ab9f4b 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -180,7 +180,7 @@ publish_files () cd $basedir -distros="32 33 buster bullseye bionic focal groovy" +distros="32 33 buster bullseye bionic focal groovy hirsute" dry_run= while [ $# -ge 1 ] @@ -221,6 +221,7 @@ do bionic) add_deb ubuntu bionic xUbuntu_18.04 ;; focal) add_deb ubuntu focal xUbuntu_20.04 ;; groovy) add_deb ubuntu groovy xUbuntu_20.10 ;; + hirsute) add_deb ubuntu hirsute xUbuntu_21.04 ;; *) echo "Unknown distro $i"; exit 1 ;; esac done diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index b9eec32..823558e 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -17,6 +17,7 @@ + /ubuntu/dists/bionic + /ubuntu/dists/focal + /ubuntu/dists/groovy ++ /ubuntu/dists/hirsute - /ubuntu/dists/* - /ubuntu/*

1 0

Jan Sikorski : d3d10core/tests: Add a test for unbound input streams.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 4ccf7498aac20b2b0afa2118f8d919718e5fcbbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ccf7498aac20b2b0afa2118… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Apr 27 21:23:20 2021 +0200 d3d10core/tests: Add a test for unbound input streams. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 86 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 927d79d90e9..ccddb401aed 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18822,6 +18822,91 @@ static void test_dual_source_blend(void) release_test_context(&test_context); } +static void test_unbound_streams(void) +{ + struct d3d10core_test_context test_context; + ID3D10PixelShader *ps; + ID3D10Device *device; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct vs_ps + { + float4 position : SV_POSITION; + float4 color : COLOR0; + }; + + vs_ps vs_main(float4 position : POSITION, float4 color : COLOR0) + { + vs_ps result; + result.position = position; + result.color = color; + result.color.w = 1.0; + return result; + } +#endif + 0x43425844, 0x4a9efaec, 0xe2c6cdf5, 0x15dd28a7, 0xae68e320, 0x00000001, 0x00000154, 0x00000003, + 0x0000002c, 0x0000007c, 0x000000d0, 0x4e475349, 0x00000048, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x0000070f, 0x49534f50, 0x4e4f4954, 0x4c4f4300, 0xab00524f, 0x4e47534f, + 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x505f5653, + 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x0000007c, 0x00010040, 0x0000001f, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101072, 0x00000001, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, + 0x00101e46, 0x00000000, 0x05000036, 0x00102072, 0x00000001, 0x00101246, 0x00000001, 0x05000036, + 0x00102082, 0x00000001, 0x00004001, 0x3f800000, 0x0100003e, + }; + + static const DWORD ps_code[] = + { +#if 0 + float4 ps_main(vs_ps input) : SV_TARGET + { + return input.color; + } +#endif + 0x43425844, 0xe2087fa6, 0xa35fbd95, 0x8e585b3f, 0x67890f54, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + + static const float white[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &test_context.input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + ID3D10Device_PSSetShader(device, ps); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_quad_vs(&test_context, vs_code, sizeof(vs_code)); + check_texture_color(test_context.backbuffer, 0xff000000, 1); + + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -18946,6 +19031,7 @@ START_TEST(d3d10core) queue_test(test_color_mask); queue_test(test_independent_blend); queue_test(test_dual_source_blend); + queue_test(test_unbound_streams); run_queued_tests();

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
87
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 April 2021