Nikolay Sivov : ddraw/tests: Add another invalid arguments test for surface QI.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 030803b422197c7953894e91458c8247ac3633bb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=030803b422197c7953894e91458c8247ac3633bb

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Jan  5 18:50:40 2018 +0300

ddraw/tests: Add another invalid arguments test for surface QI.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ddraw/tests/ddraw1.c   |  1 +
 dlls/ddraw/tests/ddraw2.c   |  1 +
 dlls/ddraw/tests/ddraw4.c   |  1 +
 dlls/ddraw/tests/ddraw7.c   |  1 +
 dlls/ddraw/tests/dsurface.c | 28 ----------------------------
 5 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 9a872f8..d416cf5 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -1963,6 +1963,7 @@ static void test_surface_qi(void)
         {&IID_IDirectDrawPalette,       NULL,                           E_INVALIDARG },
         {&IID_IDirectDrawClipper,       NULL,                           E_INVALIDARG },
         {&IID_IUnknown,                 &IID_IDirectDrawSurface,        S_OK         },
+        {NULL,                          NULL,                           E_INVALIDARG },
     };
 
     IDirectDrawSurface *surface;
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index dc74c69..2186c31 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -2083,6 +2083,7 @@ static void test_surface_qi(void)
         {&IID_IDirectDrawPalette,       NULL,                           E_INVALIDARG },
         {&IID_IDirectDrawClipper,       NULL,                           E_INVALIDARG },
         {&IID_IUnknown,                 &IID_IDirectDrawSurface,        S_OK         },
+        {NULL,                          NULL,                           E_INVALIDARG },
     };
 
     IDirectDrawSurface *surface;
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index aeac118..4c1bd78 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -2233,6 +2233,7 @@ static void test_surface_qi(void)
         {&IID_IDirectDrawPalette,       NULL,                           E_INVALIDARG },
         {&IID_IDirectDrawClipper,       NULL,                           E_INVALIDARG },
         {&IID_IUnknown,                 &IID_IDirectDrawSurface,        S_OK         },
+        {NULL,                          NULL,                           E_INVALIDARG },
     };
 
     IDirectDrawSurface4 *surface;
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index ce4117b..d7355cf 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -1970,6 +1970,7 @@ static void test_surface_qi(void)
         {&IID_IDirectDrawPalette,       NULL,                           E_NOINTERFACE},
         {&IID_IDirectDrawClipper,       NULL,                           E_NOINTERFACE},
         {&IID_IUnknown,                 &IID_IDirectDrawSurface,        S_OK         },
+        {NULL,                          NULL,                           E_INVALIDARG },
     };
 
     IDirectDrawSurface7 *surface;
diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c
index 9e02295..90e7fcf 100644
--- a/dlls/ddraw/tests/dsurface.c
+++ b/dlls/ddraw/tests/dsurface.c
@@ -61,33 +61,6 @@ static void ReleaseDirectDraw(void)
     }
 }
 
-static void QueryInterface(void)
-{
-    IDirectDrawSurface *dsurface;
-    DDSURFACEDESC surface;
-    void *object;
-    HRESULT ret;
-
-    /* Create a surface */
-    ZeroMemory(&surface, sizeof(surface));
-    surface.dwSize = sizeof(surface);
-    surface.dwFlags = DDSD_WIDTH | DDSD_HEIGHT;
-    surface.dwHeight = 10;
-    surface.dwWidth = 10;
-    ret = IDirectDraw_CreateSurface(lpDD, &surface, &dsurface, NULL);
-    if(ret != DD_OK)
-    {
-        ok(FALSE, "IDirectDraw::CreateSurface failed with error %x\n", ret);
-        return;
-    }
-
-    /* Call IUnknown::QueryInterface */
-    ret = IDirectDrawSurface_QueryInterface(dsurface, 0, &object);
-    ok(ret == DDERR_INVALIDPARAMS, "IDirectDrawSurface::QueryInterface returned %x\n", ret);
-
-    IDirectDrawSurface_Release(dsurface);
-}
-
 /* The following tests test which interface is returned by IDirectDrawSurfaceX::GetDDInterface.
  * It uses refcounts to test that and compares the interface addresses. Partially fits here, and
  * partially in the refcount test
@@ -2632,7 +2605,6 @@ START_TEST(dsurface)
         return;
     }
 
-    QueryInterface();
     GetDDInterface_1();
     GetDDInterface_2();
     GetDDInterface_4();