Matteo Bruni : d3dcompiler/tests: Add d3dcompiler_47 tests.

[Alexandre Julliard]

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

Author: Matteo Bruni <mbruni(a)codeweavers.com>
Date:   Tue Nov 12 20:37:32 2019 +0100

d3dcompiler/tests: Add d3dcompiler_47 tests.

Share the code with the existing d3dcompiler_43 tests.

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 configure                              |  1 +
 configure.ac                           |  1 +
 dlls/d3dcompiler_43/tests/reflection.c | 44 +++++++++++++++++++++++-----------
 dlls/d3dcompiler_47/tests/Makefile.in  | 10 ++++++++
 4 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index ad0b149b7d..e40850201b 100755
--- a/configure
+++ b/configure
@@ -20255,6 +20255,7 @@ wine_fn_config_makefile dlls/d3dcompiler_43 enable_d3dcompiler_43
 wine_fn_config_makefile dlls/d3dcompiler_43/tests enable_tests
 wine_fn_config_makefile dlls/d3dcompiler_46 enable_d3dcompiler_46
 wine_fn_config_makefile dlls/d3dcompiler_47 enable_d3dcompiler_47
+wine_fn_config_makefile dlls/d3dcompiler_47/tests enable_tests
 wine_fn_config_makefile dlls/d3dim enable_d3dim
 wine_fn_config_makefile dlls/d3drm enable_d3drm
 wine_fn_config_makefile dlls/d3drm/tests enable_tests
diff --git a/configure.ac b/configure.ac
index 4f651efbd5..c7768db9f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3131,6 +3131,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_43)
 WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_43/tests)
 WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_46)
 WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47)
+WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47/tests)
 WINE_CONFIG_MAKEFILE(dlls/d3dim)
 WINE_CONFIG_MAKEFILE(dlls/d3drm)
 WINE_CONFIG_MAKEFILE(dlls/d3drm/tests)
diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c
index 1b9d2d418d..8e48d4d402 100644
--- a/dlls/d3dcompiler_43/tests/reflection.c
+++ b/dlls/d3dcompiler_43/tests/reflection.c
@@ -75,11 +75,11 @@ static DWORD test_reflection_blob[] = {
 
 static void test_reflection_references(void)
 {
-    HRESULT hr;
-    ULONG count;
     ID3D11ShaderReflection *ref11, *ref11_test;
-    ID3D10ShaderReflection *ref10;
     ID3D10ShaderReflection1 *ref10_1;
+    ID3D10ShaderReflection *ref10;
+    HRESULT hr, expected;
+    ULONG count;
 
     hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11);
     ok(hr == S_OK, "D3DReflect failed, got %x, expected %x\n", hr, S_OK);
@@ -100,11 +100,16 @@ static void test_reflection_references(void)
     ok(count == 0, "Release failed %u\n", count);
 
     /* check invalid cases */
+#if D3D_COMPILER_VERSION >= 46
+    expected = E_INVALIDARG;
+#else
+    expected = E_NOINTERFACE;
+#endif
     hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection, (void **)&ref10);
-    ok(hr == E_NOINTERFACE, "D3DReflect failed, got %x, expected %x\n", hr, E_NOINTERFACE);
+    ok(hr == expected, "D3DReflect failed, got %x, expected %x\n", hr, expected);
 
     hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1);
-    ok(hr == E_NOINTERFACE, "D3DReflect failed, got %x, expected %x\n", hr, E_NOINTERFACE);
+    ok(hr == expected, "D3DReflect failed, got %x, expected %x\n", hr, expected);
 
     hr = pD3DReflect(NULL, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1);
     ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL);
@@ -116,20 +121,25 @@ static void test_reflection_references(void)
     hr = pD3DReflect(test_reflection_blob, 31, &IID_ID3D10ShaderReflection1, (void **)&ref10_1);
     ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL);
 
+#if D3D_COMPILER_VERSION >= 46
+    expected = D3DERR_INVALIDCALL;
+#else
+    expected = E_FAIL;
+#endif
     hr = pD3DReflect(test_reflection_blob,  32, &IID_ID3D10ShaderReflection1, (void **)&ref10_1);
-    ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL);
+    ok(hr == expected, "Got %x, expected %x.\n", hr, expected);
 
     hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D10ShaderReflection1, (void **)&ref10_1);
-    ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL);
+    ok(hr == expected, "Got %x, expected %x.\n", hr, expected);
 
     hr = pD3DReflect(test_reflection_blob,  31, &IID_ID3D11ShaderReflection, (void **)&ref11);
-    ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL);
+    ok(hr == D3DERR_INVALIDCALL, "Got %x, expected %x.\n", hr, D3DERR_INVALIDCALL);
 
     hr = pD3DReflect(test_reflection_blob,  32, &IID_ID3D11ShaderReflection, (void **)&ref11);
-    ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL);
+    ok(hr == expected, "Got %x, expected %x.\n", hr, expected);
 
     hr = pD3DReflect(test_reflection_blob,  test_reflection_blob[6]-1, &IID_ID3D11ShaderReflection, (void **)&ref11);
-    ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL);
+    ok(hr == expected, "Got %x, expected %x.\n", hr, expected);
 }
 
 /*
@@ -1509,11 +1519,17 @@ static void test_reflection_constant_buffer(void)
     ok(count == 0, "Release failed %u\n", count);
 }
 
-static BOOL load_d3dcompiler(void)
+static BOOL load_d3dreflect(void)
 {
+#if D3D_COMPILER_VERSION == 47
+    static const char filename[] = "d3dcompiler_47.dll";
+#else
+    static const char filename[] = "d3dcompiler_43.dll";
+#endif
     HMODULE module;
 
-    if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE;
+    if (!(module = LoadLibraryA(filename)))
+        return FALSE;
 
     pD3DReflect = (void*)GetProcAddress(module, "D3DReflect");
     return TRUE;
@@ -1521,9 +1537,9 @@ static BOOL load_d3dcompiler(void)
 
 START_TEST(reflection)
 {
-    if (!load_d3dcompiler())
+    if (!load_d3dreflect())
     {
-        win_skip("Could not load d3dcompiler_43.dll\n");
+        win_skip("Could not load DLL.\n");
         return;
     }
 
diff --git a/dlls/d3dcompiler_47/tests/Makefile.in b/dlls/d3dcompiler_47/tests/Makefile.in
new file mode 100644
index 0000000000..a4e3798bed
--- /dev/null
+++ b/dlls/d3dcompiler_47/tests/Makefile.in
@@ -0,0 +1,10 @@
+TESTDLL   = d3dcompiler_47.dll
+IMPORTS   = d3d9 d3dx9 user32
+EXTRADEFS = -DD3D_COMPILER_VERSION=47
+PARENTSRC = ../../d3dcompiler_43/tests
+
+C_SRCS = \
+	asm.c \
+	blob.c \
+	hlsl.c \
+	reflection.c