[PATCH v3 0/2] MR2809: user32/tests: Use win_skip() for missing APIs.
A missing API is a todo in Wine. -- v3: uxtheme/tests: Use win_skip() for missing APIs. user32/tests: Use win_skip() for missing APIs. https://gitlab.winehq.org/wine/wine/-/merge_requests/2809
From: Francois Gouget <fgouget(a)codeweavers.com> A missing API is a todo in Wine. --- dlls/user32/tests/monitor.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 6b7f7b44b15..429a55eb277 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2065,19 +2065,21 @@ static void test_DisplayConfigSetDeviceInfo(void) HKEY key; LONG ret; -#define CHECK_FUNC(func) \ - if (!p##func) \ - { \ - skip("%s() is unavailable.\n", #func); \ - return; \ +#define CHECK_FUNC(func) \ + if (!p##func) \ + { \ + win_skip("%s() is unavailable.\n", #func); \ + ret = TRUE; \ } + ret = FALSE; CHECK_FUNC(D3DKMTCloseAdapter) CHECK_FUNC(D3DKMTOpenAdapterFromGdiDisplayName) CHECK_FUNC(DisplayConfigGetDeviceInfo) - CHECK_FUNC(DisplayConfigSetDeviceInfo) + todo_wine CHECK_FUNC(DisplayConfigSetDeviceInfo) CHECK_FUNC(GetDpiForMonitorInternal) CHECK_FUNC(SetThreadDpiAwarenessContext) + if (ret) return; #undef CHECK_FUNC -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2809
From: Francois Gouget <fgouget(a)codeweavers.com> A missing API is a todo in Wine. --- dlls/uxtheme/tests/system.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index f8253c6a983..2e769625dab 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -173,17 +173,18 @@ static BOOL set_primary_monitor_effective_dpi(unsigned int primary_dpi) BOOL ret = FALSE; LONG error; -#define CHECK_FUNC(func) \ - if (!p##func) \ - { \ - skip("%s() is unavailable.\n", #func); \ - return FALSE; \ +#define CHECK_FUNC(func) \ + if (!p##func) \ + { \ + win_skip("%s() is unavailable.\n", #func); \ + ret = TRUE; \ } CHECK_FUNC(D3DKMTCloseAdapter) CHECK_FUNC(D3DKMTOpenAdapterFromGdiDisplayName) CHECK_FUNC(DisplayConfigGetDeviceInfo) - CHECK_FUNC(DisplayConfigSetDeviceInfo) + todo_wine CHECK_FUNC(DisplayConfigSetDeviceInfo) + if (ret) return FALSE; #undef CHECK_FUNC -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2809
On Mon Jul 3 10:04:11 2023 +0000, Zhiyi Zhang wrote:
Hi, Francois. Please do the same for the uxtheme tests as well. v3: Fix the CHECK_FUNC() indentation in uxtheme:system too.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2809#note_39386
This merge request was approved by Zhiyi Zhang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2809
participants (3)
-
Francois Gouget -
Francois Gouget (@fgouget) -
Zhiyi Zhang (@zhiyi)