[PATCH v2 0/2] MR2809: user32/tests: Use win_skip() for missing APIs.

[Francois Gouget (＠fgouget)]

A missing API is a todo in Wine.

--
  v2: 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

[PATCH v2 1/2] user32/tests: Use win_skip() for missing APIs.

[Francois Gouget]

From: Francois Gouget

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..9f3ad44eed2 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 = 1;                                   \
     }

+    ret = 0;
     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

[PATCH v2 2/2] uxtheme/tests: Use win_skip() for missing APIs.

[Francois Gouget]

From: Francois Gouget

A missing API is a todo in Wine.
---
 dlls/uxtheme/tests/system.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index f8253c6a983..1461f33fe15 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -176,14 +176,15 @@ static BOOL set_primary_monitor_effective_dpi(unsigned int primary_dpi)
 #define CHECK_FUNC(func)                       \
     if (!p##func)                              \
     {                                          \
-        skip("%s() is unavailable.\n", #func); \
-        return FALSE;                          \
+        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

[Francois Gouget (＠fgouget)]

On Mon May 15 07:27:23 2023 +0000, Zhiyi Zhang wrote:
> Looks good to me. A bit of style nitpick though. Please keep the
> backslashes aligned.

v2: Reindent the CHECK_FUNC() macro backslashes to keep them aligned.

[Zhiyi Zhang (＠zhiyi)]

On Tue May 16 02:16:21 2023 +0000, Francois Gouget wrote:
> v2: Reindent the CHECK_FUNC() macro backslashes to keep them aligned.

Hi, Francois. Please do the for the uxtheme tests as well.