[PATCH v3 2/7] d3dx9/tests: Fix expected asm test results on version >= 42.

[Matteo Bruni]

From: Matteo Bruni

Fixes: 258056664af17da036510a310c7c50a1c3b0a8b9
---
 dlls/d3dx9_36/tests/asm.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c
index 6bcde249c76..a52f0667013 100644
--- a/dlls/d3dx9_36/tests/asm.c
+++ b/dlls/d3dx9_36/tests/asm.c
@@ -348,13 +348,18 @@ static void assembleshader_test(void)
             hr = D3DXAssembleShaderFromFileA(shader3_vsh_path, NULL, NULL,
                                              D3DXSHADER_SKIPVALIDATION,
                                              &shader, &messages);
-            ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr);
+            if (D3DX_SDK_VERSION < 42)
+                ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr);
+            else
+                todo_wine ok(hr == D3DXERR_INVALIDDATA, "Unexpected hr %#lx.\n", hr);
             if(messages) {
                 trace("D3DXAssembleShaderFromFile path search messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages));
                 ID3DXBuffer_Release(messages);
             }
             if(shader) ID3DXBuffer_Release(shader);
-        } else skip("Couldn't create "include" directory\n");
+        }
+        else
+            skip("Couldn't create "include" directory, error %#lx\n", GetLastError());

delete_file("shader.vsh");
         delete_file("incl.vsh");
@@ -483,13 +488,18 @@ static void d3dxpreprocess_test(void)
             messages = NULL;
             hr = D3DXPreprocessShaderFromFileA(shader3_vsh_path, NULL, NULL,
                                                &shader, &messages);
-            ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr);
+            if (D3DX_SDK_VERSION < 42)
+                ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr);
+            else
+                todo_wine ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr);
             if(messages) {
                 trace("D3DXPreprocessShaderFromFile path search messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages));
                 ID3DXBuffer_Release(messages);
             }
             if(shader) ID3DXBuffer_Release(shader);
-        } else skip("Couldn't create "include" directory\n");
+        }
+        else
+            skip("Couldn't create "include" directory, error %#lx\n", GetLastError());

/* D3DXPreprocessShaderFromFile + #include test */
         shader = NULL;