[PATCH] d3dx9_36: Set compilation_errors to NULL when no error encountered + tests. (try 2)
Christian Costa
titan.costa at gmail.com
Thu Jun 13 02:00:50 CDT 2013
Fixes bug 26598.
With review and improvement of Rico Schuller.
Try 2:
- Set compilation_erros to NULL before params check and add test for checking compilation_errors with invalid params.
---
dlls/d3dx9_36/effect.c | 3 +++
dlls/d3dx9_36/tests/effect.c | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 1924c07..8ab1067 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -5768,6 +5768,9 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s
FIXME("(%p, %p, %u, %p, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include,
skip_constants, flags, pool, effect, compilation_errors);
+ if (compilation_errors)
+ *compilation_errors = NULL;
+
if (!device || !srcdata)
return D3DERR_INVALIDCALL;
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index 7f238be..c67e863 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -2662,6 +2662,26 @@ static void test_effect_variable_names(IDirect3DDevice9 *device)
ok(!count, "Release failed %u\n", count);
}
+static void test_effect_compilation_errors(IDirect3DDevice9 *device)
+{
+ ID3DXEffect *effect;
+ ID3DXBuffer *compilation_errors;
+ HRESULT hr;
+
+ /* Test binary effect */
+ compilation_errors = (ID3DXBuffer*)0xdeadbeef;
+ hr = D3DXCreateEffect(NULL, NULL, 0, NULL, NULL, 0, NULL, NULL, &compilation_errors);
+ ok(hr == D3DERR_INVALIDCALL, "D3DXCreateEffect failed, got %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
+ ok(!compilation_errors, "Returned %p\n", compilation_errors);
+
+ compilation_errors = (ID3DXBuffer*)0xdeadbeef;
+ hr = D3DXCreateEffect(device, test_effect_variable_names_blob,
+ sizeof(test_effect_variable_names_blob), NULL, NULL, 0, NULL, &effect, &compilation_errors);
+ ok(hr == D3D_OK, "D3DXCreateEffect failed, got %#x, expected %#x\n", hr, D3D_OK);
+ ok(!compilation_errors, "Returned %p\n", compilation_errors);
+ effect->lpVtbl->Release(effect);
+}
+
START_TEST(effect)
{
HWND wnd;
@@ -2698,6 +2718,7 @@ START_TEST(effect)
test_create_effect_compiler();
test_effect_parameter_value(device);
test_effect_variable_names(device);
+ test_effect_compilation_errors(device);
count = IDirect3DDevice9_Release(device);
ok(count == 0, "The device was not properly freed: refcount %u\n", count);
More information about the wine-patches
mailing list