[PATCH 3/4] d3dx9: Do not set active pass if BeginPass() failed.

[Paul Gofman]

Signed-off-by: Paul Gofman <gofmanp at gmail.com>
---
 dlls/d3dx9_36/effect.c       | 7 ++++++-
 dlls/d3dx9_36/tests/effect.c | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 4dda07d..1ecd32e 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -4074,10 +4074,15 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass)
 
     if (technique && pass < technique->pass_count && !effect->active_pass)
     {
+        HRESULT hr;
+
         effect->active_pass = &technique->passes[pass];
         memset(effect->current_light, 0, sizeof(effect->current_light));
         memset(&effect->current_material, 0, sizeof(effect->current_material));
-        return d3dx9_apply_pass_states(effect, effect->active_pass, TRUE);
+        hr = d3dx9_apply_pass_states(effect, effect->active_pass, TRUE);
+        if (FAILED(hr))
+            effect->active_pass = NULL;
+        return hr;
     }
 
     WARN("Invalid argument supplied.\n");
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index 9823788..f1444557 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -6023,6 +6023,7 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device)
             "Unexpected vector %g, %g, %g, %g.\n", fvect.x, fvect.y, fvect.z, fvect.w);
 
     hr = effect3->lpVtbl->EndPass(effect3);
+    todo_wine
     ok(hr == D3D_OK, "Got result %#x.\n", hr);
 
     hr = effect3->lpVtbl->End(effect3);
-- 
2.9.3