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

[Francois Gouget]

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
 dlls/gdi32/tests/driver.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c
index 8276c1c4bee..d07426ce57d 100644
--- a/dlls/gdi32/tests/driver.c
+++ b/dlls/gdi32/tests/driver.c
@@ -105,18 +105,22 @@ 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);
-    todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status);
+    /* Passing a NULL pointer crashes on Windows 10 >= 2004 */
 
     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 */
-- 
2.20.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=81626

Your paranoid android.


=== w10pro64 (64 bit report) ===

gdi32:
driver.c:648: Test failed: Got unexpected return code 0xc01e0006.

=== w10pro64_ar (64 bit report) ===

gdi32:
driver.c:648: Test failed: Got unexpected return code 0xc01e0006.

[Francois Gouget]

On Mon, 9 Nov 2020, Marvin wrote:
[...]
> === w10pro64 (64 bit report) ===
>
> gdi32:
> driver.c:648: Test failed: Got unexpected return code 0xc01e0006.
>
> === w10pro64_ar (64 bit report) ===
>
> gdi32:
> driver.c:648: Test failed: Got unexpected return code 0xc01e0006.

These are the usual failures that were hidden by the crash.


-- 
Francois Gouget <fgouget(a)codeweavers.com>