d3dx10/tests: Disable a PreloadGlyphs test for d3dx10_34.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51827Signed-off-by: Sven Baars <sbaars@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx10/tests: Disable a PreloadGlyphs test for d3dx10_34.
07cb8ef5 · Sven Baars · Alexandre Julliard · f391e9cf · 07cb8ef5 · 07cb8ef5
Commit 07cb8ef5 authored May 07, 2022 by Sven Baars Committed by Alexandre Julliard May 18, 2022
11 changed files
--- a/dlls/d3dx10_34/tests/Makefile.in
+++ b/dlls/d3dx10_34/tests/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES
+EXTRADEFS = -DD3DX10_SDK_VERSION=34 -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_34.dll
 IMPORTS = d3dx10_34 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests

--- a/dlls/d3dx10_35/tests/Makefile.in
+++ b/dlls/d3dx10_35/tests/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES
+EXTRADEFS = -DD3DX10_SDK_VERSION=35 -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_35.dll
 IMPORTS = d3dx10_35 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests

--- a/dlls/d3dx10_36/tests/Makefile.in
+++ b/dlls/d3dx10_36/tests/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES
+EXTRADEFS = -DD3DX10_SDK_VERSION=36 -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_36.dll
 IMPORTS = d3dx10_36 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests

--- a/dlls/d3dx10_37/tests/Makefile.in
+++ b/dlls/d3dx10_37/tests/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES
+EXTRADEFS = -DD3DX10_SDK_VERSION=37 -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_37.dll
 IMPORTS = d3dx10_37 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests

--- a/dlls/d3dx10_38/tests/Makefile.in
+++ b/dlls/d3dx10_38/tests/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES
+EXTRADEFS = -DD3DX10_SDK_VERSION=38 -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_38.dll
 IMPORTS = d3dx10_38 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests

--- a/dlls/d3dx10_39/tests/Makefile.in
+++ b/dlls/d3dx10_39/tests/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES
+EXTRADEFS = -DD3DX10_SDK_VERSION=39 -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_39.dll
 IMPORTS = d3dx10_39 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests

--- a/dlls/d3dx10_40/tests/Makefile.in
+++ b/dlls/d3dx10_40/tests/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES
+EXTRADEFS = -DD3DX10_SDK_VERSION=40 -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_40.dll
 IMPORTS = d3dx10_40 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests

--- a/dlls/d3dx10_41/tests/Makefile.in
+++ b/dlls/d3dx10_41/tests/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES
+EXTRADEFS = -DD3DX10_SDK_VERSION=41 -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_41.dll
 IMPORTS = d3dx10_41 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests

--- a/dlls/d3dx10_42/tests/Makefile.in
+++ b/dlls/d3dx10_42/tests/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES
+EXTRADEFS = -DD3DX10_SDK_VERSION=42 -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_42.dll
 IMPORTS = d3dx10_42 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests

--- a/dlls/d3dx10_43/tests/Makefile.in
+++ b/dlls/d3dx10_43/tests/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES
+EXTRADEFS = -DD3DX10_SDK_VERSION=43 -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_43.dll
 IMPORTS = d3dx10 ole32 gdi32

--- a/dlls/d3dx10_43/tests/d3dx10.c
+++ b/dlls/d3dx10_43/tests/d3dx10.c
@@ -2466,11 +2466,15 @@ static void test_font(void)
    hr = ID3DX10Font_PreloadCharacters(font, 'a', 'z');
    ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
-    /* Test glyphs that are not rendered */
+#if D3DX10_SDK_VERSION > 34
-    hr = ID3DX10Font_PreloadGlyphs(font, 0, 5);
+    /* Test multiple textures.
+     * Native d3dx10_34.dll shows signs of memory corruption in this call. */
+    hr = ID3DX10Font_PreloadGlyphs(font, 0, 1000);
    todo_wine
    ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+#endif
+    /* Test glyphs that are not rendered */
    for (glyph = 1; glyph < 4; ++glyph)
    {
        srv = (void *)0xdeadbeef;