January 2022 - Wine-Commits

Zhiyi Zhang : uxtheme/tests: Add EnableThemeDialogTexture() tests.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 6f139defeeb4bc7dc0621da9f565bc7562369079 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f139defeeb4bc7dc0621da9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jan 21 15:47:30 2022 +0800 uxtheme/tests: Add EnableThemeDialogTexture() tests. These tests show that DefDlgProcA/W() are hooked to implemented dialog theming, using a pattern brush created from the tab body part. For dialogs that need theming, EnableThemeDialogTexture(ETDT_USETABTEXTURE) or EnableThemeDialogTexture(ETDT_USEAEROWIZARDTABTEXTURE) is called for the dialog. And then static or button controls in comctl32 v6 call EnableThemeDialogTexture(ETDT_ENABLE) to activate it. A WM_ERASEBKGND is also needed to activate dialog theming. test_WM_CTLCOLORSTATIC() in dlls/comctl32/tests/static.c doesn't send this message after EnableThemeDialogTexture() calls, which misdirected me to think that DefDlgProcA/W() are not hooked. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 658 ++++++++++++++++++++++++++++++++++++++++++++ dlls/uxtheme/tests/v6util.h | 131 +++++++++ 2 files changed, 789 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f139defeeb4bc7dc062…

1 0

Zebediah Figura : server: Allocate enough space for the backslash in dup_nt_name() (Valgrind).
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 7b32a327f898cb2a8225669a2b945f0f606bf19e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b32a327f898cb2a8225669a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 20 16:12:32 2022 -0600 server: Allocate enough space for the backslash in dup_nt_name() (Valgrind). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/fd.c b/server/fd.c index c9a21186722..1b4b98b0e76 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1867,7 +1867,7 @@ static WCHAR *dup_nt_name( struct fd *root, struct unicode_str name, data_size_t name.str++; name.len -= sizeof(WCHAR); } - if ((ret = malloc( retlen + name.len + 1 ))) + if ((ret = malloc( retlen + name.len + sizeof(WCHAR) ))) { memcpy( ret, root->nt_name, root->nt_namelen ); if (name.len && name.str[0] != '\\' &&

1 0

Zhiyi Zhang : comctl32/tests: Remove WM_CTLCOLORSTATIC tests for static controls.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 2390371f0fece0a1bb083c034157b97cfe89eb54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2390371f0fece0a1bb083c03… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jan 21 15:47:38 2022 +0800 comctl32/tests: Remove WM_CTLCOLORSTATIC tests for static controls. These tests are covered by test_EnableThemeDialogTexture() in uxtheme/tests/system.c. These tests are also misleading because a WM_ERASEBKGND message is needed to actually activate dialog theming. Without the message, they give the impression that EnableThemeDialogTexture() does nothing and DefDlgProcA/W() are not hooked. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/static.c | 120 ------------------------------------------- 1 file changed, 120 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 529396b3f0d..40a337b97b0 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -27,7 +27,6 @@ #include "winuser.h" #include "commctrl.h" #include "resources.h" -#include "uxtheme.h" #include "wine/test.h" @@ -40,10 +39,6 @@ static HWND hMainWnd; static int g_nReceivedColorStatic; -static HRESULT (WINAPI *pEnableThemeDialogTexture)(HWND, DWORD); -static HTHEME (WINAPI *pGetWindowTheme)(HWND); -static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); - /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -382,118 +377,6 @@ static void test_STM_SETIMAGE(void) DeleteEnhMetaFile(emf); } -static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) -{ - static HWND child; - - switch (msg) - { - case WM_INITDIALOG: - child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 1, 2, 50, 50, hwnd, - (HMENU)100, 0, NULL); - ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); - return FALSE; - - case WM_CLOSE: - DestroyWindow(child); - return TRUE; - - default: - return FALSE; - } -} - -static void test_WM_CTLCOLORSTATIC(void) -{ - HWND parent, dialog, child; - COLORREF color, old_color; - HDC child_hdc, dialog_hdc; - int mode, old_mode; - HBRUSH brush; - HRESULT hr; - POINT org; - BOOL ret; - - struct - { - DLGTEMPLATE tmplate; - WORD menu; - WORD class; - WORD title; - } temp = {{0}}; - - parent = CreateWindowA(WC_STATICA, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, - NULL); - ok(parent != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); - - temp.tmplate.style = WS_CHILD | WS_VISIBLE; - temp.tmplate.cx = 80; - temp.tmplate.cy = 80; - dialog = CreateDialogIndirectParamA(NULL, &temp.tmplate, parent, test_WM_CTLCOLORSTATIC_proc, 0); - ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %d.\n", GetLastError()); - child = GetDlgItem(dialog, 100); - ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); - - dialog_hdc = GetDC(dialog); - child_hdc = GetDC(child); - PatBlt(dialog_hdc, 0, 0, 80, 80, BLACKNESS); - - old_mode = SetBkMode(child_hdc, OPAQUE); - ok(old_mode != 0, "SetBkMode failed.\n"); - old_color = SetBkColor(child_hdc, 0xaa5511); - ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); - - ret = pIsThemeDialogTextureEnabled(dialog); - ok(ret, "Expected theme dialog texture supported.\n"); - ok(pGetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); - - brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", - GetSysColorBrush(COLOR_BTNFACE), brush); - color = SetBkColor(child_hdc, old_color); - ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", - GetSysColor(COLOR_BTNFACE), color); - mode = SetBkMode(child_hdc, old_mode); - ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); - color = GetPixel(dialog_hdc, 40, 40); - ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); - - /* Test that EnableThemeDialogTexture() doesn't make WM_CTLCOLORSTATIC return a different brush */ - hr = pEnableThemeDialogTexture(dialog, ETDT_DISABLE); - ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); - ret = pIsThemeDialogTextureEnabled(dialog); - ok(!ret, "Expected theme dialog texture disabled.\n"); - hr = pEnableThemeDialogTexture(dialog, ETDT_ENABLETAB); - ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); - ret = pIsThemeDialogTextureEnabled(dialog); - ok(ret, "Expected theme dialog texture enabled.\n"); - - brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", - GetSysColorBrush(COLOR_BTNFACE), brush); - - /* Test that WM_CTLCOLORSTATIC doesn't change brush origin */ - ret = GetBrushOrgEx(child_hdc, &org); - ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); - ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); - - ReleaseDC(child, child_hdc); - ReleaseDC(dialog, dialog_hdc); - EndDialog(dialog, 0); - DestroyWindow(parent); -} - -static void init_functions(void) -{ - HMODULE uxtheme = LoadLibraryA("uxtheme.dll"); - -#define X(f) p##f = (void *)GetProcAddress(uxtheme, #f); - X(EnableThemeDialogTexture) - X(GetWindowTheme) - X(IsThemeDialogTextureEnabled) -#undef X -} - START_TEST(static) { static const char classname[] = "testclass"; @@ -504,8 +387,6 @@ START_TEST(static) if (!load_v6_module(&ctx_cookie, &hCtx)) return; - init_functions(); - wndclass.cbSize = sizeof(wndclass); wndclass.style = CS_HREDRAW | CS_VREDRAW; wndclass.lpfnWndProc = WndProc; @@ -536,7 +417,6 @@ START_TEST(static) test_set_text(); test_set_image(); test_STM_SETIMAGE(); - test_WM_CTLCOLORSTATIC(); DestroyWindow(hMainWnd);

1 0

Zhiyi Zhang : uxtheme: Make IsThemeDialogTextureEnabled() return TRUE for all valid flags without ETDT_DISABLE.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 85de3a4e16d8ef860f754acdc0930e902b591ac4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85de3a4e16d8ef860f754acd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jan 21 15:48:01 2022 +0800 uxtheme: Make IsThemeDialogTextureEnabled() return TRUE for all valid flags without ETDT_DISABLE. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 7 ++----- dlls/uxtheme/tests/system.c | 17 ++++++----------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index a7942b03f97..b6e5f0230e5 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -69,14 +69,11 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) BOOL WINAPI IsThemeDialogTextureEnabled(HWND hwnd) { DWORD dwDialogTextureFlags; + TRACE("(%p)\n", hwnd); dwDialogTextureFlags = HandleToUlong( GetPropW( hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled) )); - if (dwDialogTextureFlags == 0) - /* Means EnableThemeDialogTexture wasn't called for this dialog */ - return TRUE; - - return (dwDialogTextureFlags & ETDT_ENABLE) && !(dwDialogTextureFlags & ETDT_DISABLE); + return dwDialogTextureFlags && !(dwDialogTextureFlags & ETDT_DISABLE); } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 03e435eb463..93994fa8364 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1649,12 +1649,12 @@ static void test_EnableThemeDialogTexture(void) } invalid_flag_tests[] = { - {0, FALSE}, + {0, FALSE, TRUE}, {ETDT_DISABLE | ETDT_ENABLE, FALSE}, {ETDT_ENABLETAB | ETDT_ENABLEAEROWIZARDTAB, TRUE}, - {ETDT_USETABTEXTURE | ETDT_USEAEROWIZARDTABTEXTURE, TRUE, TRUE}, + {ETDT_USETABTEXTURE | ETDT_USEAEROWIZARDTABTEXTURE, TRUE}, {ETDT_VALIDBITS, FALSE}, - {~ETDT_VALIDBITS, FALSE}, + {~ETDT_VALIDBITS, FALSE, TRUE}, {~ETDT_VALIDBITS | ETDT_DISABLE, FALSE} }; @@ -1746,7 +1746,6 @@ static void test_EnableThemeDialogTexture(void) /* Test dialog texture is disabled by default. EnableThemeDialogTexture() needs to be called */ ret = IsThemeDialogTextureEnabled(dialog); - todo_wine ok(!ret, "Expected theme dialog texture disabled.\n"); ok(GetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); @@ -2021,7 +2020,7 @@ static void test_EnableThemeDialogTexture(void) "EnableThemeDialogTexture first flag", FALSE); ret = IsThemeDialogTextureEnabled(dialog); /* Non-zero flags without ETDT_DISABLE enables dialog texture */ - todo_wine_if(flags[i] == ETDT_USETABTEXTURE || flags[i] == ETDT_USEAEROWIZARDTABTEXTURE) + todo_wine_if(flags[i] == 0) ok(ret == (!(flags[i] & ETDT_DISABLE) && flags[i]), "Wrong dialog texture status.\n"); child = GetDlgItem(dialog, 100); @@ -2044,10 +2043,9 @@ static void test_EnableThemeDialogTexture(void) ret = IsThemeDialogTextureEnabled(dialog); /* If the flag is zero, it will have previous dialog texture status */ if (flags[j]) - todo_wine_if(flags[j] == ETDT_USETABTEXTURE || flags[j] == ETDT_USEAEROWIZARDTABTEXTURE) ok(ret == !(flags[j] & ETDT_DISABLE), "Wrong dialog texture status.\n"); else - todo_wine_if((!(flags[i] & ETDT_DISABLE) && flags[i])) + todo_wine_if(!flags[i] || flags[i] == ETDT_DISABLE || flags[i] == (ETDT_DISABLE | ETDT_ENABLE)) ok(ret == (!(flags[i] & ETDT_DISABLE) && flags[i]), "Wrong dialog texture status.\n"); lr = SendMessageA(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); ok(lr != 0, "WM_ERASEBKGND failed.\n"); @@ -2159,12 +2157,12 @@ static void test_EnableThemeDialogTexture(void) 0, 0, NULL); ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); ret = IsThemeDialogTextureEnabled(hwnd); - todo_wine ok(!ret, "Wrong dialog texture status.\n"); child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, 0, 0, NULL); ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); ret = IsThemeDialogTextureEnabled(hwnd); + todo_wine ok(ret, "Wrong dialog texture status.\n"); /* Test that if you move the child control to another window, it doesn't enables tab texture for @@ -2173,18 +2171,15 @@ static void test_EnableThemeDialogTexture(void) 0, 0, NULL); ok(hwnd2 != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); ret = IsThemeDialogTextureEnabled(hwnd2); - todo_wine ok(!ret, "Wrong dialog texture status.\n"); SetParent(child, hwnd2); ok(GetParent(child) == hwnd2, "Wrong parent.\n"); ret = IsThemeDialogTextureEnabled(hwnd2); - todo_wine ok(!ret, "Wrong dialog texture status.\n"); InvalidateRect(child, NULL, TRUE); flush_events(); ret = IsThemeDialogTextureEnabled(hwnd2); - todo_wine ok(!ret, "Wrong dialog texture status.\n"); DestroyWindow(hwnd2);

1 0

Giovanni Mascellani : mfmediaengine: Add a IMFMediaEngineEx stub.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 598325385b393c43cffc35fe14bf39191d684d1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=598325385b393c43cffc35fe… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 21 10:30:35 2022 +0300 mfmediaengine: Add a IMFMediaEngineEx stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 496 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 398 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=598325385b393c43cffc…

1 0

Alexandre Julliard : makefiles: Add a maintainer-clean target.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 363d078f46d87696ed6024bc8e2c22f457623771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=363d078f46d87696ed6024bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 11:48:20 2022 +0100 makefiles: Add a maintainer-clean target. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 +++- configure.ac | 4 +++- tools/makedep.c | 19 ++++++++++++++----- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 9a7a24b1f69..b6d22f896ea 100755 --- a/configure +++ b/configure @@ -22832,7 +22832,9 @@ fi wine_fn_append_rule "distclean:: clean - rm -rf autom4te.cache" + rm -rf autom4te.cache +maintainer-clean:: + rm -f configure include/config.h.in" wine_fn_append_rule "dlls/ntdll/unix/version.c: dummy diff --git a/configure.ac b/configure.ac index 275fba3771c..0b1a53f3ff9 100644 --- a/configure.ac +++ b/configure.ac @@ -3796,7 +3796,9 @@ dnl Rules for cleaning WINE_APPEND_RULE( [distclean:: clean - rm -rf autom4te.cache]) + rm -rf autom4te.cache +maintainer-clean:: + rm -f configure include/config.h.in]) dnl Rules for generated source files diff --git a/tools/makedep.c b/tools/makedep.c index 03181c7d60b..5a286c3c343 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -208,6 +208,7 @@ struct makefile struct strarray test_files; struct strarray clean_files; struct strarray distclean_files; + struct strarray maintainerclean_files; struct strarray uninstall_files; struct strarray object_files; struct strarray crossobj_files; @@ -2583,7 +2584,7 @@ static void output_uninstall_rules( struct makefile *make ) /******************************************************************* * output_po_files */ -static void output_po_files( const struct makefile *make ) +static void output_po_files( struct makefile *make ) { const char *po_dir = src_dir_path( make, "po" ); unsigned int i; @@ -2595,7 +2596,7 @@ static void output_po_files( const struct makefile *make ) output( ": %s/wine.pot\n", po_dir ); output( "\t%smsgmerge --previous -q $@ %s/wine.pot | msgattrib --no-obsolete -o $@.new && mv $@.new $@\n", cmd_prefix( "MSG" ), po_dir ); - output( "po:" ); + output( "po/all:" ); for (i = 0; i < linguas.count; i++) output_filename( strmake( "%s/%s.po", po_dir, linguas.str[i] )); output( "\n" ); @@ -2606,6 +2607,7 @@ static void output_po_files( const struct makefile *make ) output( "\t%smsgcat -o $@", cmd_prefix( "MSG" )); output_filenames( make->pot_files ); output( "\n" ); + strarray_add( &make->maintainerclean_files, strmake( "%s/wine.pot", po_dir )); } @@ -2817,6 +2819,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, output( "\t%s%s -script %s %s $@\n", cmd_prefix( "GEN" ), fontforge, root_src_dir_path( "fonts/genttf.ff" ), source->filename ); if (!(source->file->flags & FLAG_SFD_FONTS)) strarray_add( &make->font_files, ttf_obj ); + strarray_add( &make->maintainerclean_files, ttf_obj ); } if (source->file->flags & FLAG_INSTALL) { @@ -2852,7 +2855,7 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, static const char * const images[] = { "bmp", "cur", "ico", NULL }; unsigned int i; - if (convert && rsvg && icotool && !make->src_dir) + if (convert && rsvg && icotool) { for (i = 0; images[i]; i++) if (find_include_file( make, strmake( "%s.%s", obj, images[i] ))) break; @@ -2863,6 +2866,7 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, output( "\t%sCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", cmd_prefix( "GEN" ), convert, icotool, rsvg, root_src_dir_path( "tools/buildimage" ), source->filename ); + strarray_add( &make->maintainerclean_files, strmake( "%s.%s", obj, images[i] )); } } } @@ -3566,12 +3570,14 @@ static void output_subdirs( struct makefile *make ) strarray_addall_uniq( &dependencies, submakes[i]->dependencies ); strarray_addall_path( &clean_files, submakes[i]->obj_dir, submakes[i]->clean_files ); strarray_addall_path( &distclean_files, submakes[i]->obj_dir, submakes[i]->distclean_files ); + strarray_addall_path( &make->maintainerclean_files, submakes[i]->obj_dir, submakes[i]->maintainerclean_files ); strarray_addall_path( &testclean_files, submakes[i]->obj_dir, submakes[i]->ok_files ); strarray_addall_path( &make->pot_files, submakes[i]->obj_dir, submakes[i]->pot_files ); if (submakes[i]->disabled) continue; strarray_addall_path( &all_targets, submakes[i]->obj_dir, submakes[i]->all_targets ); + strarray_addall_path( &all_targets, submakes[i]->obj_dir, submakes[i]->font_files ); if (!strcmp( submakes[i]->obj_dir, "tools" ) || !strncmp( submakes[i]->obj_dir, "tools/", 6 )) strarray_add( &tooldeps_deps, obj_dir_path( submakes[i], "all" )); if (submakes[i]->testdll) @@ -3620,14 +3626,19 @@ static void output_subdirs( struct makefile *make ) strarray_add_uniq( &make->phony_targets, "check" ); strarray_add_uniq( &make->phony_targets, "test" ); + if (get_expanded_make_variable( make, "GETTEXTPO_LIBS" )) output_po_files( make ); + output( "clean::\n"); output_rm_filenames( clean_files ); output( "testclean::\n"); output_rm_filenames( testclean_files ); output( "distclean::\n"); output_rm_filenames( distclean_files ); + output( "maintainer-clean::\n"); + output_rm_filenames( make->maintainerclean_files ); strarray_add_uniq( &make->phony_targets, "distclean" ); strarray_add_uniq( &make->phony_targets, "testclean" ); + strarray_add_uniq( &make->phony_targets, "maintainer-clean" ); if (tooldeps_deps.count) { @@ -3637,8 +3648,6 @@ static void output_subdirs( struct makefile *make ) strarray_add_uniq( &make->phony_targets, "__tooldeps__" ); } - if (get_expanded_make_variable( make, "GETTEXTPO_LIBS" )) output_po_files( make ); - if (make->phony_targets.count) { output( ".PHONY:" );

1 0

Alexandre Julliard : makefiles: Add dependencies for files generated in maintainer mode.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 3c0a2fa5a6e9eaef5aebbbd0080cf7f478a49864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c0a2fa5a6e9eaef5aebbbd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 09:50:45 2022 +0100 makefiles: Add dependencies for files generated in maintainer mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index e7a71cb85d2..03181c7d60b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1386,6 +1386,13 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ /* check for generated files */ if ((file = open_local_generated_file( make, pFile, ".tab.h", ".y" ))) return file; if ((file = open_local_generated_file( make, pFile, ".h", ".idl" ))) return file; + if (fontforge && (file = open_local_generated_file( make, pFile, ".ttf", ".sfd" ))) return file; + if (convert && rsvg && icotool) + { + if ((file = open_local_generated_file( make, pFile, ".bmp", ".svg" ))) return file; + if ((file = open_local_generated_file( make, pFile, ".cur", ".svg" ))) return file; + if ((file = open_local_generated_file( make, pFile, ".ico", ".svg" ))) return file; + } /* check for extra targets */ if (strarray_exists( &make->extra_targets, pFile->name ))

1 0

Conor McCarthy : vkd3d: Use the resource's stored format in d3d12_command_list_CopyTextureRegion().
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: vkd3d Branch: master Commit: 8e30a7750e36a294a0693f5121769f1350e2109c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8e30a7750e36a294a0693f5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 21 22:45:28 2022 +1000 vkd3d: Use the resource's stored format in d3d12_command_list_CopyTextureRegion(). Signed-off-by: Conor McCarthy <cmccarthy(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 | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 73ba226..2cf1eba 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3562,18 +3562,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic assert(d3d12_resource_is_texture(dst_resource)); assert(d3d12_resource_is_texture(src_resource)); - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &dst_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", dst_resource->desc.Format); - return; - } - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &src_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", src_resource->desc.Format); - return; - } + dst_format = dst_resource->format; + src_format = src_resource->format; if ((dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) && (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT))

1 0

Conor McCarthy : vkd3d: Handle plane slice for texture views.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: vkd3d Branch: master Commit: 5d627d6c64aace9e084cb359d0d2171ba45b7953 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5d627d6c64aace9e084cb35… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 21 22:45:29 2022 +1000 vkd3d: Handle plane slice for texture views. vk_image_aspect_flags_from_d3d12_plane_slice() is based on a vkd3d-proton implementation by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 42 +++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 9905015..19a163b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2454,6 +2454,7 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, desc->miplevel_count = 1; desc->layer_idx = 0; desc->layer_count = d3d12_resource_desc_get_layer_count(&resource->desc); + desc->vk_image_aspect = desc->format->vk_aspect_mask; switch (resource->desc.Dimension) { @@ -2537,7 +2538,7 @@ bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, vkd3d_set_view_swizzle_for_format(&view_desc.components, format, desc->allowed_swizzle); if (desc->allowed_swizzle) vk_component_mapping_compose(&view_desc.components, &desc->components); - view_desc.subresourceRange.aspectMask = format->vk_aspect_mask; + view_desc.subresourceRange.aspectMask = desc->vk_image_aspect; view_desc.subresourceRange.baseMipLevel = desc->miplevel_idx; view_desc.subresourceRange.levelCount = desc->miplevel_count; view_desc.subresourceRange.baseArrayLayer = desc->layer_idx; @@ -2705,6 +2706,27 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, descriptor->u.view = view; } +static VkImageAspectFlags vk_image_aspect_flags_from_d3d12_plane_slice(const struct vkd3d_format *format, + unsigned int plane_slice) +{ + VkImageAspectFlags aspect_flags = format->vk_aspect_mask; + unsigned int i; + + /* For all formats we currently handle, the n-th aspect bit in Vulkan, if the lowest bit set is + * n = 0, corresponds to the n-th plane in D3D12, so clear the lowest bit for each slice skipped. */ + for (i = 0; i < plane_slice; i++) + aspect_flags &= aspect_flags - 1; + + if (!aspect_flags) + { + WARN("Invalid plane slice %u for format %#x.\n", plane_slice, format->vk_format); + aspect_flags = format->vk_aspect_mask; + } + + /* The selected slice is now the lowest bit in the aspect flags, so clear the others. */ + return aspect_flags & -aspect_flags; +} + void d3d12_desc_create_srv(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) @@ -2747,7 +2769,8 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.miplevel_idx = desc->u.Texture2D.MostDetailedMip; vkd3d_desc.miplevel_count = desc->u.Texture2D.MipLevels; if (desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + vkd3d_desc.vk_image_aspect = vk_image_aspect_flags_from_d3d12_plane_slice(resource->format, + desc->u.Texture2D.PlaneSlice); if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; @@ -2758,7 +2781,8 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_desc.vk_image_aspect = vk_image_aspect_flags_from_d3d12_plane_slice(resource->format, + desc->u.Texture2DArray.PlaneSlice); if (desc->u.Texture2DArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); @@ -2955,7 +2979,8 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, case D3D12_UAV_DIMENSION_TEXTURE2D: vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; if (desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + vkd3d_desc.vk_image_aspect = vk_image_aspect_flags_from_d3d12_plane_slice(resource->format, + desc->u.Texture2D.PlaneSlice); break; case D3D12_UAV_DIMENSION_TEXTURE2DARRAY: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; @@ -2963,7 +2988,8 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_desc.vk_image_aspect = vk_image_aspect_flags_from_d3d12_plane_slice(resource->format, + desc->u.Texture2DArray.PlaneSlice); vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_UAV_DIMENSION_TEXTURE3D: @@ -3206,7 +3232,8 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev case D3D12_RTV_DIMENSION_TEXTURE2D: vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; if (desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + vkd3d_desc.vk_image_aspect = vk_image_aspect_flags_from_d3d12_plane_slice(resource->format, + desc->u.Texture2D.PlaneSlice); break; case D3D12_RTV_DIMENSION_TEXTURE2DARRAY: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; @@ -3214,7 +3241,8 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_desc.vk_image_aspect = vk_image_aspect_flags_from_d3d12_plane_slice(resource->format, + desc->u.Texture2DArray.PlaneSlice); vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_RTV_DIMENSION_TEXTURE2DMS: diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index b630b6d..136b020 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -536,6 +536,7 @@ struct vkd3d_texture_view_desc unsigned int miplevel_count; unsigned int layer_idx; unsigned int layer_count; + VkImageAspectFlags vk_image_aspect; VkComponentMapping components; bool allowed_swizzle; };

1 0

Henri Verbeet : wined3d: Properly compare integers in wined3d_so_desc_compare().
by Alexandre Julliard Jan. 20, 2022

Jan. 20, 2022

Module: wine Branch: master Commit: d8781586753eee1bb795b1d5ece8002c2c586129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8781586753eee1bb795b1d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 20 17:30:57 2022 +0100 wined3d: Properly compare integers in wined3d_so_desc_compare(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 93c738ad955..71b5aaa5742 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5733,11 +5733,11 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * unsigned int i; int ret; - if ((ret = (k->element_count - desc->element_count))) + if ((ret = wined3d_uint32_compare(k->element_count, desc->element_count))) return ret; - if ((ret = (k->buffer_stride_count - desc->buffer_stride_count))) + if ((ret = wined3d_uint32_compare(k->buffer_stride_count, desc->buffer_stride_count))) return ret; - if ((ret = (k->rasterizer_stream_idx - desc->rasterizer_stream_idx))) + if ((ret = wined3d_uint32_compare(k->rasterizer_stream_idx, desc->rasterizer_stream_idx))) return ret; for (i = 0; i < k->element_count; ++i) @@ -5745,25 +5745,25 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * const struct wined3d_stream_output_element *b = &desc->elements[i]; const struct wined3d_stream_output_element *a = &k->elements[i]; - if ((ret = (a->stream_idx - b->stream_idx))) + if ((ret = wined3d_uint32_compare(a->stream_idx, b->stream_idx))) return ret; if ((ret = (!a->semantic_name - !b->semantic_name))) return ret; if (a->semantic_name && (ret = strcmp(a->semantic_name, b->semantic_name))) return ret; - if ((ret = (a->semantic_idx - b->semantic_idx))) + if ((ret = wined3d_uint32_compare(a->semantic_idx, b->semantic_idx))) return ret; - if ((ret = (a->component_idx - b->component_idx))) + if ((ret = wined3d_uint32_compare(a->component_idx, b->component_idx))) return ret; - if ((ret = (a->component_count - b->component_count))) + if ((ret = wined3d_uint32_compare(a->component_count, b->component_count))) return ret; - if ((ret = (a->output_slot - b->output_slot))) + if ((ret = wined3d_uint32_compare(a->output_slot, b->output_slot))) return ret; } for (i = 0; i < k->buffer_stride_count; ++i) { - if ((ret = (k->buffer_strides[i] - desc->buffer_strides[i]))) + if ((ret = wined3d_uint32_compare(k->buffer_strides[i], desc->buffer_strides[i]))) return ret; }

1 0