[PATCH 0/2] MR2810: gdi32 & sti: Use win_skip() for missing APIs.

[Francois Gouget (＠fgouget)]

A missing API is a todo in Wine.

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

[Francois Gouget]

From: Francois Gouget

A missing API is a todo in Wine.
---
 dlls/gdi32/tests/driver.c | 6 +++---
 dlls/gdi32/tests/font.c   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c
index a618b5e51a4..162208c26ca 100644
--- a/dlls/gdi32/tests/driver.c
+++ b/dlls/gdi32/tests/driver.c
@@ -399,7 +399,7 @@ static void test_D3DKMTCheckVidPnExclusiveOwnership(void)

if (!pD3DKMTCheckVidPnExclusiveOwnership || pD3DKMTCheckVidPnExclusiveOwnership(NULL) == STATUS_PROCEDURE_NOT_FOUND)
     {
-        skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n");
+        win_skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n");
         return;
     }

@@ -623,7 +623,7 @@ static void test_D3DKMTSetVidPnSourceOwner(void)

if (!pD3DKMTSetVidPnSourceOwner || pD3DKMTSetVidPnSourceOwner(&set_owner_desc) == STATUS_PROCEDURE_NOT_FOUND)
     {
-        skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n");
+        win_skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n");
         return;
     }

@@ -650,7 +650,7 @@ static void test_D3DKMTCheckOcclusion(void)

if (!pD3DKMTCheckOcclusion || pD3DKMTCheckOcclusion(NULL) == STATUS_PROCEDURE_NOT_FOUND)
     {
-        skip("D3DKMTCheckOcclusion() is unavailable.\n");
+        todo_wine win_skip("D3DKMTCheckOcclusion() is unavailable.\n");
         return;
     }

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 7be8d6f2c66..82cec09e982 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -2750,7 +2750,7 @@ static void test_GdiGetCodePage(void)

if (!pGdiGetCodePage)
     {
-        skip("GdiGetCodePage not available on this platform\n");
+        win_skip("GdiGetCodePage not available on this platform\n");
         return;
     }

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

[Francois Gouget]

From: Francois Gouget

A missing API is a todo in Wine.
---
 dlls/sti/tests/sti.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c
index fdfff62b3f6..e43604a8b67 100644
--- a/dlls/sti/tests/sti.c
+++ b/dlls/sti/tests/sti.c
@@ -116,7 +116,7 @@ static void test_version_flag_versus_aw(void)
             ok(0, "could not create StillImageW, hr = 0x%lX\n", hr);
     }
     else
-        skip("No StiCreateInstance function\n");
+        win_skip("No StiCreateInstance function\n");

if (pStiCreateInstanceA)
     {
@@ -137,7 +137,7 @@ static void test_version_flag_versus_aw(void)
             todo_wine ok(0, "could not create StillImageA, hr = 0x%lX\n", hr);
     }
     else
-        skip("No StiCreateInstanceA function\n");
+        win_skip("No StiCreateInstanceA function\n");

if (pStiCreateInstanceW)
     {
@@ -158,7 +158,7 @@ static void test_version_flag_versus_aw(void)
             ok(0, "could not create StillImageW, hr = 0x%lX\n", hr);
     }
     else
-        skip("No StiCreateInstanceW function\n");
+        win_skip("No StiCreateInstanceW function\n");
 }

static void test_stillimage_aggregation(void)
@@ -225,7 +225,7 @@ static void test_stillimage_aggregation(void)
             IUnknown_Release(pUnknown);
     }
     else
-        skip("No StiCreateInstanceW function\n");
+        win_skip("No StiCreateInstanceW function\n");
 }

static void test_launch_app_registry(void)
@@ -271,7 +271,7 @@ START_TEST(sti)
             FreeLibrary(sti_dll);
         }
         else
-            skip("could not load sti.dll\n");
+            win_skip("could not load sti.dll\n");
         CoUninitialize();
     }
     else

[PATCH 0/2] MR2810: gdi32 & sti: Use win_skip() for missing APIs. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.