gdi32/tests: Avoid a D3DKMTOpenAdapterFromHdc() crash on Windows 10 >= 2004.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32/tests: Avoid a D3DKMTOpenAdapterFromHdc() crash on Windows 10 >= 2004.
dd51cd8d · Francois Gouget · Alexandre Julliard · 34155d09 · dd51cd8d
Commit dd51cd8d authored Nov 09, 2020 by Francois Gouget Committed by Alexandre Julliard Nov 10, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

driver.c dlls/gdi32/tests/driver.c +9 -4

No files found.
--- a/dlls/gdi32/tests/driver.c
+++ b/dlls/gdi32/tests/driver.c
@@ -105,18 +105,23 @@ static void test_D3DKMTOpenAdapterFromHdc(void)
    HDC hdc;
    DWORD i;
-    if (!pD3DKMTOpenAdapterFromHdc || pD3DKMTOpenAdapterFromHdc(NULL) == STATUS_PROCEDURE_NOT_FOUND)
+    if (!pD3DKMTOpenAdapterFromHdc)
    {
-        win_skip("D3DKMTOpenAdapterFromHdc() is unavailable.\n");
+        win_skip("D3DKMTOpenAdapterFromHdc() is missing.\n");
        return;
    }
    /* Invalid parameters */
-    status = pD3DKMTOpenAdapterFromHdc(NULL);
+    /* Passing a NULL pointer crashes on Windows 10 >= 2004 */
-    todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status);
+    if (0) status = pD3DKMTOpenAdapterFromHdc(NULL);
    memset(&open_adapter_hdc_desc, 0, sizeof(open_adapter_hdc_desc));
    status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc);
+    if (status == STATUS_PROCEDURE_NOT_FOUND)
+    {
+        win_skip("D3DKMTOpenAdapterFromHdc() is not supported.\n");
+        return;
+    }
    todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status);
    /* Open adapter */