[PATCH v2 1/1] d3dx10_33/tests: Enable tests.

[Matteo Bruni]

From: Matteo Bruni

---
 configure                        | 1 +
 configure.ac                     | 1 +
 dlls/d3dx10_33/Makefile.in       | 1 +
 dlls/d3dx10_33/tests/Makefile.in | 7 +++++++
 dlls/d3dx10_43/tests/d3dx10.c    | 6 ++++++
 5 files changed, 16 insertions(+)
 create mode 100644 dlls/d3dx10_33/tests/Makefile.in

diff --git a/configure b/configure
index 88d09b956d8..8269a6bf7f7 100755
--- a/configure
+++ b/configure
@@ -22300,6 +22300,7 @@ wine_fn_config_makefile dlls/d3dim700 enable_d3dim700
 wine_fn_config_makefile dlls/d3drm enable_d3drm
 wine_fn_config_makefile dlls/d3drm/tests enable_tests
 wine_fn_config_makefile dlls/d3dx10_33 enable_d3dx10_33
+wine_fn_config_makefile dlls/d3dx10_33/tests enable_tests
 wine_fn_config_makefile dlls/d3dx10_34 enable_d3dx10_34
 wine_fn_config_makefile dlls/d3dx10_34/tests enable_tests
 wine_fn_config_makefile dlls/d3dx10_35 enable_d3dx10_35
diff --git a/configure.ac b/configure.ac
index 79a31396866..1e842f33880 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2576,6 +2576,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dim700)
 WINE_CONFIG_MAKEFILE(dlls/d3drm)
 WINE_CONFIG_MAKEFILE(dlls/d3drm/tests)
 WINE_CONFIG_MAKEFILE(dlls/d3dx10_33)
+WINE_CONFIG_MAKEFILE(dlls/d3dx10_33/tests)
 WINE_CONFIG_MAKEFILE(dlls/d3dx10_34)
 WINE_CONFIG_MAKEFILE(dlls/d3dx10_34/tests)
 WINE_CONFIG_MAKEFILE(dlls/d3dx10_35)
diff --git a/dlls/d3dx10_33/Makefile.in b/dlls/d3dx10_33/Makefile.in
index c95a867c685..a37dc028364 100644
--- a/dlls/d3dx10_33/Makefile.in
+++ b/dlls/d3dx10_33/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = d3dx10_33.dll
+IMPORTLIB = d3dx10_33

EXTRADLLFLAGS = -Wb,--prefer-native

diff --git a/dlls/d3dx10_33/tests/Makefile.in b/dlls/d3dx10_33/tests/Makefile.in
new file mode 100644
index 00000000000..e193cccc2c6
--- /dev/null
+++ b/dlls/d3dx10_33/tests/Makefile.in
@@ -0,0 +1,7 @@
+EXTRADEFS = -DD3DX10_SDK_VERSION=33
+TESTDLL = d3dx10_33.dll
+IMPORTS = d3dx10_33 ole32 gdi32
+PARENTSRC = ../../d3dx10_43/tests
+
+SOURCES = \
+	d3dx10.c
diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c
index 75e4b4023d8..d5ebf33bb48 100644
--- a/dlls/d3dx10_43/tests/d3dx10.c
+++ b/dlls/d3dx10_43/tests/d3dx10.c
@@ -3747,6 +3747,12 @@ static void test_font(void)
         return;
     }

+    if (D3DX10_SDK_VERSION == 33)
+    {
+        skip("Font functions are broken in version 33.\n");
+        return;
+    }
+
     ref = get_refcount(device);
     hr = D3DX10CreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET,
             OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font);