- Wine-Devel - list.winehq.org

[PATCH v2 1/2] user32/tests: Test creating a fullscreen window spanning multiple monitors.
by Zhiyi Zhang March 1, 2022

March 1, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 227889 and 227890. Fix a test failure for 2/2. dlls/user32/tests/win.c | 44 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d6087873f21..63c18cd9948 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9126,12 +9126,12 @@ static void test_fullscreen(void) static const DWORD t_ex_style[] = { 0, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW }; + RECT rc, virtual_rect, expected_rect; WNDCLASSA cls; int timeout; HWND hwnd; int i, j; POINT pt; - RECT rc; HMONITOR hmon; LRESULT ret; @@ -9278,6 +9278,48 @@ static void test_fullscreen(void) DestroyWindow(hwnd); UnregisterClassA("fullscreen_class", GetModuleHandleA(NULL)); + + /* Test fullscreen windows spanning multiple monitors */ + if (GetSystemMetrics(SM_CMONITORS) > 1) + { + /* Test windows covering all monitors */ + virtual_rect.left = GetSystemMetrics(SM_XVIRTUALSCREEN); + virtual_rect.top = GetSystemMetrics(SM_YVIRTUALSCREEN); + virtual_rect.right = virtual_rect.left + GetSystemMetrics(SM_CXVIRTUALSCREEN); + virtual_rect.bottom = virtual_rect.top + GetSystemMetrics(SM_CYVIRTUALSCREEN); + + hwnd = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, virtual_rect.left, + virtual_rect.top, virtual_rect.right - virtual_rect.left, + virtual_rect.bottom - virtual_rect.top, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed, error %#x.\n", GetLastError()); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rc, &virtual_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&rc)); + DestroyWindow(hwnd); + + /* Test windows covering one monitor and 1 pixel larger on available sides */ + expected_rect = mi.rcMonitor; + InflateRect(&expected_rect, 1, 1); + IntersectRect(&expected_rect, &expected_rect, &virtual_rect); + hwnd = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, expected_rect.left, + expected_rect.top, expected_rect.right - expected_rect.left, + expected_rect.bottom - expected_rect.top, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed, error %#x.\n", GetLastError()); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rc, &expected_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&expected_rect), wine_dbgstr_rect(&rc)); + DestroyWindow(hwnd); + } + else + { + skip("This test requires at least two monitors.\n"); + } } static BOOL test_thick_child_got_minmax; -- 2.32.0

2 1

[PATCH 2/2] uxtheme: Search parts of any state in IsThemePartDefined().
by Zhiyi Zhang March 1, 2022

March 1, 2022

Tests show that IsThemePartDefined() doesn't use state ID to search parts. If a part of any state is present, the part is considered as defined. For example, disabled state of part EditText of class Edit is present in theme files but there is no default state for part EditText. So IsThemePartDefined(theme, EP_EDITTEXT, 0) failed previously and it should succeed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52581 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 30 ++++++++++++++++++++++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/system.c | 6 +++--- dlls/uxtheme/tests/system.c | 13 +++---------- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 7d3ee72efe8..9e5a79a1c69 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -452,6 +452,36 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST return cur; } +/*********************************************************************** + * MSSTYLES_FindPart + * + * Find a part + * + * PARAMS + * tc Class to search + * iPartId Part ID to find + * + * RETURNS + * The part found, or NULL + */ +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) +{ + PTHEME_PARTSTATE cur = tc->partstate; + + while (cur) + { + if (cur->iPartId == iPartId) + return cur; + + cur = cur->next; + } + + if (tc->overrides) + return MSSTYLES_FindPart(tc->overrides, iPartId); + + return NULL; +} + /*********************************************************************** * MSSTYLES_FindPartState * diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 12292cefae4..67f81315d7a 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -95,6 +95,7 @@ BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPE BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId) DECLSPEC_HIDDEN; PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) DECLSPEC_HIDDEN; UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) DECLSPEC_HIDDEN; +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) DECLSPEC_HIDDEN; PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 8333d6b99ce..908451f0fe8 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -809,9 +809,9 @@ BOOL WINAPI IsThemePartDefined(HTHEME hTheme, int iPartId, int iStateId) SetLastError(E_HANDLE); return FALSE; } - if(MSSTYLES_FindPartState(hTheme, iPartId, iStateId, NULL)) - return TRUE; - return FALSE; + + SetLastError(NO_ERROR); + return !iStateId && MSSTYLES_FindPart(hTheme, iPartId); } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 59631f01fe9..dd118f5ab37 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -300,7 +300,6 @@ static void test_IsThemePartDefined(void) int state; BOOL defined; DWORD error; - BOOL todo; } tests[] = { @@ -311,7 +310,7 @@ static void test_IsThemePartDefined(void) {L"Button", BP_PUSHBUTTON, PBS_NORMAL, FALSE, NO_ERROR}, {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, FALSE, NO_ERROR}, {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, FALSE, NO_ERROR}, - {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR, TRUE}, + {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR}, {L"Edit", EP_EDITTEXT, ETS_NORMAL, FALSE, NO_ERROR}, {L"Edit", EP_EDITTEXT, ETS_FOCUSED, FALSE, NO_ERROR}, }; @@ -337,9 +336,7 @@ static void test_IsThemePartDefined(void) SetLastError(0xdeadbeef); ret = IsThemePartDefined(theme, tests[i].part, tests[i].state); error = GetLastError(); - todo_wine_if(tests[i].todo) ok(ret == tests[i].defined, "Expected %d.\n", tests[i].defined); - todo_wine_if(error == 0xdeadbeef && tests[i].error == NO_ERROR) ok(error == tests[i].error, "Expected %#x, got %#x.\n", tests[i].error, error); if (theme) @@ -589,12 +586,8 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); bTPDefined = IsThemePartDefined(hTheme, 0 , 0); todo_wine - { - ok( bTPDefined == FALSE, "Expected FALSE\n"); - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); - } + ok( bTPDefined == FALSE, "Expected FALSE\n" ); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); DestroyWindow(hWnd); } -- 2.32.0

1 0

[PATCH 1/2] uxtheme/tests: Add IsThemePartDefined() tests.
by Zhiyi Zhang March 1, 2022

March 1, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 75 +++++++++++++++++++++++++++++++++---- 1 file changed, 68 insertions(+), 7 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index c70e6c27361..59631f01fe9 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -277,20 +277,80 @@ static void test_IsThemed(void) { BOOL bThemeActive; BOOL bAppThemed; - BOOL bTPDefined; bThemeActive = IsThemeActive(); trace("Theming is %s\n", (bThemeActive) ? "active" : "inactive"); bAppThemed = IsAppThemed(); trace("Test executable is %s\n", (bAppThemed) ? "themed" : "not themed"); +} - SetLastError(0xdeadbeef); - bTPDefined = IsThemePartDefined(NULL, 0 , 0); - ok( bTPDefined == FALSE, "Expected FALSE\n"); - ok( GetLastError() == E_HANDLE, - "Expected E_HANDLE, got 0x%08x\n", - GetLastError()); +static void test_IsThemePartDefined(void) +{ + BOOL is_theme_active, ret; + HTHEME theme = NULL; + DWORD error; + HWND hwnd; + int i; + + static const struct + { + const WCHAR *class_name; + int part; + int state; + BOOL defined; + DWORD error; + BOOL todo; + } + tests[] = + { + {NULL, 0, 0, FALSE, E_HANDLE}, + {NULL, 0xdeadbeef, 0, FALSE, E_HANDLE}, + {L"Button", 0xdeadbeef, 0, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, 0, TRUE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_NORMAL, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, FALSE, NO_ERROR}, + {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR, TRUE}, + {L"Edit", EP_EDITTEXT, ETS_NORMAL, FALSE, NO_ERROR}, + {L"Edit", EP_EDITTEXT, ETS_FOCUSED, FALSE, NO_ERROR}, + }; + + is_theme_active = IsThemeActive(); + hwnd = CreateWindowA(WC_STATICA, "", WS_POPUP, 0, 0, 1, 1, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %#x.\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (!is_theme_active && tests[i].class_name) + continue; + + winetest_push_context("class %s part %d state %d", wine_dbgstr_w(tests[i].class_name), + tests[i].part, tests[i].state); + + if (tests[i].class_name) + { + theme = OpenThemeData(hwnd, tests[i].class_name); + ok(theme != NULL, "OpenThemeData failed, error %#x.\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ret = IsThemePartDefined(theme, tests[i].part, tests[i].state); + error = GetLastError(); + todo_wine_if(tests[i].todo) + ok(ret == tests[i].defined, "Expected %d.\n", tests[i].defined); + todo_wine_if(error == 0xdeadbeef && tests[i].error == NO_ERROR) + ok(error == tests[i].error, "Expected %#x, got %#x.\n", tests[i].error, error); + + if (theme) + { + CloseThemeData(theme); + theme = NULL; + } + winetest_pop_context(); + } + + DestroyWindow(hwnd); } static void test_GetWindowTheme(void) @@ -2205,6 +2265,7 @@ START_TEST(system) */ test_IsThemed(); + test_IsThemePartDefined(); test_GetWindowTheme(); test_SetWindowTheme(); test_OpenThemeData(); -- 2.32.0

1 0

[PATCH] light.msstyles: Remove Classic Blue variant.
by Zhiyi Zhang March 1, 2022

March 1, 2022

The Classic Blue theme has only system colors and doesn't contain bitmaps. Such classic themes should be stored in a .theme file instead of a .msstyles file. While it looks mostly alright when using the theme, some applications fail to draw elements because they consider theming active as IsThemeActive() returns TRUE but OpenThemeData() fails. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 52 --------------------------------- dlls/light.msstyles/resources.h | 2 -- 2 files changed, 54 deletions(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 4596f0f0458..fc6d196ad0c 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -26,14 +26,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { IDS_COLOR_DISPLAY_NAME_BLUE "Blue" - IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE "Classic Blue" } /* Theme color tooltips */ STRINGTABLE { IDS_COLOR_TOOLTIP_BLUE "Blue" - IDS_COLOR_TOOLTIP_CLASSIC_BLUE "Classic Blue" } /* Theme size display names */ @@ -57,7 +55,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 COLORNAMES { "Blue\0" -"Classic Blue\0" "\0" } @@ -72,7 +69,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 FILERESNAMES { "BLUE_INI\0" -"CLASSIC_BLUE_INI\0" "\0" } @@ -85,54 +81,6 @@ THEMES_INI TEXTFILE } /* Light theme definition */ -/* Classic blue theme, no bitmaps */ -CLASSIC_BLUE_INI TEXTFILE -{ -"[Globals]\r\n" -"EdgeLightColor = 255 255 255\r\n" -"EdgeHighLightColor = 255 255 255\r\n" -"EdgeShadowColor = 189 189 189\r\n" -"EdgeDkShadowColor = 158 158 158\r\n" -"EdgeFillColor = 255 255 255\r\n" - -"\r\n[SysMetrics]\r\n" -"; System colors\r\n" -"Scrollbar = 255 255 255\r\n" -"Background = 37 111 149\r\n" -"ActiveCaption = 50 150 250\r\n" -"InactiveCaption = 245 245 245\r\n" -"Menu = 255 255 255\r\n" -"Window = 255 255 255\r\n" -"WindowFrame = 158 158 158\r\n" -"MenuText = 0 0 0\r\n" -"WindowText = 0 0 0\r\n" -"CaptionText = 0 0 0\r\n" -"ActiveBorder = 255 255 255\r\n" -"InactiveBorder = 255 255 255\r\n" -"AppWorkSpace = 128 128 128\r\n" -"Highlight = 48 150 250\r\n" -"HighlightText = 255 255 255\r\n" -"BtnFace = 245 245 245\r\n" -"BtnShadow = 166 166 166\r\n" -"GrayText = 166 166 166\r\n" -"BtnText = 0 0 0\r\n" -"InactiveCaptionText = 100 100 100\r\n" -"BtnHighlight = 255 255 255\r\n" -"DkShadow3d = 106 106 106\r\n" -"Light3d = 227 227 227\r\n" -"InfoText = 0 0 0\r\n" -"InfoBk = 255 255 255\r\n" -"ButtonAlternateFace = 255 255 255\r\n" -"HotTracking = 224 224 224\r\n" -"GradientActiveCaption = 50 150 250\r\n" -"GradientInactiveCaption = 245 245 245\r\n" -"MenuHilight = 48 150 250\r\n" -"MenuBar = 255 255 255\r\n" - -"\r\n; Flat menus\r\n" -"FlatMenus = true\r\n" -} - /* Blue theme */ BLUE_INI TEXTFILE { diff --git a/dlls/light.msstyles/resources.h b/dlls/light.msstyles/resources.h index c37ef2140f1..8172ce61fa9 100644 --- a/dlls/light.msstyles/resources.h +++ b/dlls/light.msstyles/resources.h @@ -19,8 +19,6 @@ #include <winnt.h> #define IDS_COLOR_DISPLAY_NAME_BLUE 1000 -#define IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE 1001 #define IDS_COLOR_TOOLTIP_BLUE 2000 -#define IDS_COLOR_TOOLTIP_CLASSIC_BLUE 2001 #define IDS_SIZE_DISPLAY_NAME_NORMAL 3000 #define IDS_SIZE_TOOLTIP_NORMAL 4000 -- 2.32.0

1 0

[PATCH] comctl32/tests: Fix a test failure when theming is active.
by Zhiyi Zhang March 1, 2022

March 1, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 0443a36718b..cfcdb44019c 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2359,7 +2359,7 @@ static void test_visual(void) SelectObject(mem_dc2, mem_bitmap2); BitBlt(mem_dc2, 0, 0, width, height, button_dc, 0, 0, SRCCOPY); - todo_wine_if(type == BS_PUSHBOX || (is_theme_active && type == BS_GROUPBOX)) + todo_wine_if(type == BS_PUSHBOX) ok(equal_dc(mem_dc1, mem_dc2, width, height), "Type %#lx: Expected content unchanged.\n", type); DeleteObject(mem_bitmap2); -- 2.32.0

1 0

[PATCH v3] combase: Add RoSetErrorReportingFlags stub
by Alistair Leslie-Hughes March 1, 2022

March 1, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 10 ++++++++++ include/roerrorapi.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c2fafacdea3..b3f4d25b42c 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -312,7 +312,7 @@ @ stub RoReportUnhandledError @ stub RoResolveRestrictedErrorInfoReference @ stub RoRevokeActivationFactories -@ stub RoSetErrorReportingFlags +@ stdcall RoSetErrorReportingFlags(long) @ stub RoTransformError @ stub RoTransformErrorW @ stdcall RoUninitialize() diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 0a17f02b776..d764137e512 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -316,3 +316,13 @@ HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **fac return REGDB_E_CLASSNOTREG; } + +/*********************************************************************** + * RoSetErrorReportingFlags (combase.@) + */ +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags) +{ + FIXME("%x\n", flags); + return S_OK; +} + diff --git a/include/roerrorapi.h b/include/roerrorapi.h index 454e1a6c2e9..de23537fd9b 100644 --- a/include/roerrorapi.h +++ b/include/roerrorapi.h @@ -26,5 +26,6 @@ HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info); BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message); BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception); +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags); #endif /* _ROERROR_H */ -- 2.34.1

2 2

ntdll: Check __WINE_PE_BUILD instead of compiler macros.
by Saulius Krasuckas March 1, 2022

March 1, 2022

Fixes compilation on Cygwin, undeclared identifiers: _alldiv, _allmul, _allrem, _aulldiv, _aullrem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52607 Signed-off-by: Saulius Krasuckas <saulius2(a)ar-fi.lt> --- dlls/ntdll/large_int.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index 20ffd646a3e..b38074158c8 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -520,7 +520,7 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString( #ifdef __i386__ /* those builtin functions use stdcall calling convention, but compilers reference them without stdcall declarations */ -#if defined(__MINGW32__) || defined(_MSC_VER) +#ifdef __WINE_PE_BUILD LONGLONG WINAPI _alldiv( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_alldiv")); LONGLONG WINAPI _allmul( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_allmul")); LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_allrem")); -- 2.34.1

2 3

[PATCH 1/6] dinput/tests: Make combase.dll dependency optional.
by Rémi Bernon Feb. 28, 2022

Feb. 28, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/Makefile.in | 2 +- dlls/dinput/tests/hotplug.c | 42 +++++++++++++++++++++++------- dlls/dinput/tests/joystick8.c | 49 +++++++++++++++++++++++++++-------- 3 files changed, 71 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index d32092ca03b..5ba0e5be4d7 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dinput.dll -IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm combase +IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 49cc5423807..4dc635932ab 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -47,6 +47,31 @@ #define WIDL_using_Windows_Gaming_Input #include "windows.gaming.input.h" +#define MAKE_FUNC(f) static typeof(f) *p ## f +MAKE_FUNC( RoGetActivationFactory ); +MAKE_FUNC( RoInitialize ); +MAKE_FUNC( WindowsCreateString ); +MAKE_FUNC( WindowsDeleteString ); +#undef MAKE_FUNC + +static BOOL load_combase_functions(void) +{ + HMODULE combase = GetModuleHandleW( L"combase.dll" ); + +#define LOAD_FUNC(m, f) if (!(p ## f = (void *)GetProcAddress( m, #f ))) goto failed; + LOAD_FUNC( combase, RoGetActivationFactory ); + LOAD_FUNC( combase, RoInitialize ); + LOAD_FUNC( combase, WindowsCreateString ); + LOAD_FUNC( combase, WindowsDeleteString ); +#undef LOAD_FUNC + + return TRUE; + +failed: + win_skip("Failed to load combase.dll functions, skipping tests\n"); + return FALSE; +} + static BOOL test_input_lost( DWORD version ) { #include "psh_hid_macros.h" @@ -529,20 +554,20 @@ static void test_windows_gaming_input(void) HRESULT hr; MSG msg; - hr = RoInitialize( RO_INIT_MULTITHREADED ); + if (!load_combase_functions()) return; + + hr = pRoInitialize( RO_INIT_MULTITHREADED ); ok( hr == RPC_E_CHANGED_MODE, "RoInitialize failed, hr %#lx\n", hr ); - hr = WindowsCreateString( class_name, wcslen( class_name ), &str ); + hr = pWindowsCreateString( class_name, wcslen( class_name ), &str ); ok( hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr ); - - hr = RoGetActivationFactory( str, &IID_IRawGameControllerStatics, (void **)&statics ); + hr = pRoGetActivationFactory( str, &IID_IRawGameControllerStatics, (void **)&statics ); ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "RoGetActivationFactory failed, hr %#lx\n", hr ); - WindowsDeleteString( str ); + pWindowsDeleteString( str ); if (hr == REGDB_E_CLASSNOTREG) { win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( class_name ) ); - RoUninitialize(); return; } @@ -551,7 +576,7 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "add_RawGameControllerAdded returned %#lx\n", hr ); todo_wine ok( controller_added_token.value, "got token %I64u\n", controller_added_token.value ); - if (!controller_added_token.value) goto done; + if (!controller_added_token.value) return; hr = IRawGameControllerStatics_add_RawGameControllerRemoved( statics, &controller_removed.IEventHandler_RawGameController_iface, &controller_removed_token ); @@ -642,9 +667,6 @@ static void test_windows_gaming_input(void) DestroyWindow( hwnd ); UnregisterClassW( class.lpszClassName, class.hInstance ); - -done: - RoUninitialize(); } START_TEST( hotplug ) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index f01bed08030..e65e3ca9970 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -46,6 +46,33 @@ #define WIDL_using_Windows_Gaming_Input #include "windows.gaming.input.h" +#define MAKE_FUNC(f) static typeof(f) *p ## f +MAKE_FUNC( RoGetActivationFactory ); +MAKE_FUNC( RoInitialize ); +MAKE_FUNC( WindowsCreateString ); +MAKE_FUNC( WindowsDeleteString ); +MAKE_FUNC( WindowsGetStringRawBuffer ); +#undef MAKE_FUNC + +static BOOL load_combase_functions(void) +{ + HMODULE combase = GetModuleHandleW( L"combase.dll" ); + +#define LOAD_FUNC(m, f) if (!(p ## f = (void *)GetProcAddress( m, #f ))) goto failed; + LOAD_FUNC( combase, RoGetActivationFactory ); + LOAD_FUNC( combase, RoInitialize ); + LOAD_FUNC( combase, WindowsCreateString ); + LOAD_FUNC( combase, WindowsDeleteString ); + LOAD_FUNC( combase, WindowsGetStringRawBuffer ); +#undef LOAD_FUNC + + return TRUE; + +failed: + win_skip("Failed to load combase.dll functions, skipping tests\n"); + return FALSE; +} + struct check_objects_todos { BOOL type; @@ -3214,9 +3241,9 @@ static void check_runtimeclass_( int line, IInspectable *inspectable, const WCHA hr = IInspectable_GetRuntimeClassName( inspectable, &str ); ok_ (__FILE__, line)( hr == S_OK, "GetRuntimeClassName returned %#lx\n", hr ); - buffer = WindowsGetStringRawBuffer( str, &length ); + buffer = pWindowsGetStringRawBuffer( str, &length ); ok_ (__FILE__, line)( !wcscmp( buffer, class_name ), "got class name %s\n", debugstr_w(buffer) ); - WindowsDeleteString( str ); + pWindowsDeleteString( str ); } static void test_windows_gaming_input(void) @@ -3284,20 +3311,22 @@ static void test_windows_gaming_input(void) HSTRING str; HRESULT hr; + if (!load_combase_functions()) return; + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); SetCurrentDirectoryW( tempdir ); cleanup_registry_keys(); - hr = RoInitialize( RO_INIT_MULTITHREADED ); + hr = pRoInitialize( RO_INIT_MULTITHREADED ); ok( hr == RPC_E_CHANGED_MODE, "RoInitialize returned %#lx\n", hr ); - hr = WindowsCreateString( controller_class_name, wcslen( controller_class_name ), &str ); + hr = pWindowsCreateString( controller_class_name, wcslen( controller_class_name ), &str ); ok( hr == S_OK, "WindowsCreateString returned %#lx\n", hr ); - hr = RoGetActivationFactory( str, &IID_IRawGameControllerStatics, (void **)&controller_statics ); + hr = pRoGetActivationFactory( str, &IID_IRawGameControllerStatics, (void **)&controller_statics ); ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "RoGetActivationFactory returned %#lx\n", hr ); - WindowsDeleteString( str ); + pWindowsDeleteString( str ); if (hr == REGDB_E_CLASSNOTREG) { @@ -3336,11 +3365,11 @@ static void test_windows_gaming_input(void) /* HID gamepads aren't exposed as WGI gamepads on Windows */ - hr = WindowsCreateString( gamepad_class_name, wcslen( gamepad_class_name ), &str ); + hr = pWindowsCreateString( gamepad_class_name, wcslen( gamepad_class_name ), &str ); ok( hr == S_OK, "WindowsCreateString returned %#lx\n", hr ); - hr = RoGetActivationFactory( str, &IID_IGamepadStatics, (void **)&gamepad_statics ); + hr = pRoGetActivationFactory( str, &IID_IGamepadStatics, (void **)&gamepad_statics ); ok( hr == S_OK, "RoGetActivationFactory returned %#lx\n", hr ); - WindowsDeleteString( str ); + pWindowsDeleteString( str ); hr = IGamepadStatics_get_Gamepads( gamepad_statics, &gamepads_view ); ok( hr == S_OK, "get_Gamepads returned %#lx\n", hr ); hr = IVectorView_Gamepad_get_Size( gamepads_view, &size ); @@ -3384,8 +3413,6 @@ done: pnp_driver_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); - - RoUninitialize(); } START_TEST( joystick8 ) -- 2.34.1

2 7

[PATCH] mscoree: Add an override option for skipping the AppDomain search path.
by Esme Povirk Feb. 28, 2022

Feb. 28, 2022

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- This allows for skipping dll's shipped with an application. Combined with the Gac=n option this can force a specific library to be loaded from Wine Mono's GAC. This also requires a Wine Mono change to function: https://github.com/madewokherd/mono/pull/30 The use case for this is applications that ship with broken dll's for which Wine Mono has a replacement. These dll's were generally copied from .NET Framework (which probably isn't technically allowed), and depend on impelmentation details. dlls/mscoree/metahost.c | 36 +++++++++++++++++++++++++++++++--- dlls/mscoree/mscoree_private.h | 2 ++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 8e28ad2f8db..c72f510c8ac 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -130,10 +130,12 @@ MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); +static void (CDECL *wine_mono_install_assembly_preload_hook)(WineMonoAssemblyPreLoadFunc func, void *user_data); static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +static MonoAssembly* CDECL wine_mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, int *search_path, void *user_data); static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof); @@ -249,6 +251,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_OPT_MONO_FUNCTION(mono_set_crash_chaining, set_crash_chaining_dummy); LOAD_OPT_MONO_FUNCTION(mono_trace_set_print_handler, set_print_handler_dummy); LOAD_OPT_MONO_FUNCTION(mono_trace_set_printerr_handler, set_print_handler_dummy); + LOAD_OPT_MONO_FUNCTION(wine_mono_install_assembly_preload_hook, NULL); #undef LOAD_OPT_MONO_FUNCTION @@ -279,7 +282,10 @@ static HRESULT load_mono(LPCWSTR mono_path) mono_config_parse(NULL); - mono_install_assembly_preload_hook(mono_assembly_preload_hook_fn, NULL); + if (wine_mono_install_assembly_preload_hook) + wine_mono_install_assembly_preload_hook(wine_mono_assembly_preload_hook_fn, NULL); + else + mono_install_assembly_preload_hook(mono_assembly_preload_hook_fn, NULL); aot_size = GetEnvironmentVariableA("WINE_MONO_AOT", aot_setting, sizeof(aot_setting)); @@ -1366,6 +1372,9 @@ HRESULT CLRMetaHostPolicy_CreateInstance(REFIID riid, void **ppobj) * WINE_MONO_OVERRIDES=*,Gac=n * Never search the GAC for libraries. * + * WINE_MONO_OVERRIDES=*,PrivatePath=n + * Never search the AppDomain search path for libraries. + * * WINE_MONO_OVERRIDES=Microsoft.Xna.Framework,Gac=n * Never search the GAC for Microsoft.Xna.Framework * @@ -1377,7 +1386,8 @@ HRESULT CLRMetaHostPolicy_CreateInstance(REFIID riid, void **ppobj) /* assembly search override flags */ #define ASSEMBLY_SEARCH_GAC 1 #define ASSEMBLY_SEARCH_UNDEFINED 2 -#define ASSEMBLY_SEARCH_DEFAULT ASSEMBLY_SEARCH_GAC +#define ASSEMBLY_SEARCH_PRIVATEPATH 4 +#define ASSEMBLY_SEARCH_DEFAULT (ASSEMBLY_SEARCH_GAC|ASSEMBLY_SEARCH_PRIVATEPATH) typedef struct override_entry { char *name; @@ -1426,6 +1436,14 @@ static void parse_override_entry(override_entry *entry, const char *string, int entry->flags &= ~ASSEMBLY_SEARCH_GAC; } break; + case 11: + if (!_strnicmp(string, "privatepath", 11)) { + if (IS_OPTION_TRUE(*value)) + entry->flags |= ASSEMBLY_SEARCH_PRIVATEPATH; + else if (IS_OPTION_FALSE(*value)) + entry->flags &= ~ASSEMBLY_SEARCH_PRIVATEPATH; + } + break; default: break; } @@ -1688,6 +1706,12 @@ static MonoAssembly* mono_assembly_try_load(WCHAR *path) } static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +{ + int dummy; + return wine_mono_assembly_preload_hook_fn(aname, assemblies_path, &dummy, user_data); +} + +static MonoAssembly* CDECL wine_mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, int *halt_search, void *user_data) { HRESULT hr; MonoAssembly *result=NULL; @@ -1720,7 +1744,7 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname if (!stringname || !assemblyname) return NULL; search_flags = get_assembly_search_flags(aname); - if (private_path) + if (private_path && (search_flags & ASSEMBLY_SEARCH_PRIVATEPATH) != 0) { stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, assemblyname, -1, NULL, 0); stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR)); @@ -1798,6 +1822,12 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname else TRACE("skipping Windows GAC search due to override setting\n"); + if ((search_flags & ASSEMBLY_SEARCH_PRIVATEPATH) == 0) + { + TRACE("skipping AppDomain search path due to override setting\n"); + *halt_search = 1; + } + done: HeapFree(GetProcessHeap(), 0, cultureW); mono_free(stringname); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 67b37482c5a..8f3441cd84e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -143,6 +143,8 @@ typedef enum { typedef MonoAssembly* (CDECL *MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +typedef MonoAssembly* (CDECL *WineMonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, int *halt_search, void *user_data); + typedef void (CDECL *MonoProfileFunc)(MonoProfiler *prof); typedef void (CDECL *MonoPrintCallback) (const char *string, INT is_stdout); -- 2.30.2

1 0

[PATCH vkd3d 1/5] tests: Add some simple tests for HLSL function calls.
by Zebediah Figura Feb. 28, 2022

Feb. 28, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-function.shader_test | 166 ++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+) create mode 100644 tests/hlsl-function.shader_test diff --git a/Makefile.am b/Makefile.am index 491537f6..dd5966ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,6 +65,7 @@ vkd3d_shader_tests = \ tests/hlsl-cross.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ + tests/hlsl-function.shader_test \ tests/hlsl-function-overload.shader_test \ tests/hlsl-gather-offset.shader_test \ tests/hlsl-gather.shader_test \ @@ -316,6 +317,7 @@ XFAIL_TESTS = \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ + tests/hlsl-function.shader_test \ tests/hlsl-function-overload.shader_test \ tests/hlsl-gather.shader_test \ tests/hlsl-intrinsic-override.shader_test \ diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test new file mode 100644 index 00000000..af254fb3 --- /dev/null +++ b/tests/hlsl-function.shader_test @@ -0,0 +1,166 @@ +[pixel shader fail] + +float4 func(); + +float4 main() : sv_target +{ + return func(); +} + +% It's legal to call an undefined function in unused code, though. + +[pixel shader] + +float4 func(); + +float4 unused() +{ + return func(); +} + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] + +void func(inout float o) +{ + o += 0.1; +} + +float4 main() : sv_target +{ + float x = 0; + func(x + 1); + return 0; +} + +[pixel shader fail] + +void func(inout float2 o) +{ + o += 0.1; +} + +float4 main() : sv_target +{ + float2 x = 0; + func(x.yy); + return 0; +} + +[pixel shader fail] + +void func(out float o) +{ + o = 0.1; +} + +float4 main() : sv_target +{ + const float x = 0; + func(x); + return x; +} + +[pixel shader fail] + +void func(inout float o) +{ +} + +float4 main() : sv_target +{ + const float x = 0; + func(x); + return x; +} + +[pixel shader fail] + +void func() +{ +} + +float4 main() : sv_target +{ + return func(); +} + +[pixel shader fail] + +% Returning a void expression from a void function is legal in C, but not in HLSL. + +void foo() +{ +} + +void bar() +{ + return foo(); +} + +float4 main() : sv_target +{ + bar(); + return 0; +} + +[pixel shader fail] + +float4 main() : sv_target +{ + func(); + return 0; +} + +void func() +{ +} + +[pixel shader] + +float func(in float a, out float b, inout float c) +{ + c -= 0.2; + b = a * 2; + return a + 0.2; +} + +float4 main() : sv_target +{ + float x[2], ret; + + x[0] = 0.1; + x[1] = 0.9; + ret = func(0.3, x[0], x[1]); + + return float4(ret, x[0], x[1], 0); +} + +[test] +draw quad +probe all rgba (0.5, 0.6, 0.7, 0) + +[pixel shader] + +void func(in float a, inout float2 b) +{ + b.y += 0.1; + b *= a; +} + +float4 main() : sv_target +{ + float3 q = float3(0.1, 0.2, 0.3); + + func(3.0, q.zx); + func(0.5, q.yz); + return float4(q, 0); +} + +[test] +draw quad +probe all rgba (0.6, 0.1, 0.5, 0) -- 2.34.1

5 22