Rebase against acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0

patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch

@@ -1,7 +1,8 @@
-From 73498c6ee55422b032f7a0e3c2329254a810e5d3 Mon Sep 17 00:00:00 2001
+From f462b95015bf3ec86638dfad41ee219b2384f131 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Fri, 19 Dec 2014 22:31:46 +0100
-Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
+Subject: [PATCH] d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add
+ tests.
 
 ---
  dlls/d3dx9_36/effect.c       | 34 ++++++++++++++++++++++---
@@ -9,7 +10,7 @@ Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
  2 files changed, 91 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
-index ce2e5d86e5f..0f2f9cfd2d7 100644
+index 5160f3a..707c52f 100644
 --- a/dlls/d3dx9_36/effect.c
 +++ b/dlls/d3dx9_36/effect.c
 @@ -3984,13 +3984,41 @@ done:
@@ -58,10 +59,10 @@ index ce2e5d86e5f..0f2f9cfd2d7 100644
  
  static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func,
 diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
-index 96b21f0454c..6b81582ab7e 100644
+index ced6c8e..a6fe609 100644
 --- a/dlls/d3dx9_36/tests/effect.c
 +++ b/dlls/d3dx9_36/tests/effect.c
-@@ -7281,6 +7281,65 @@ static void test_effect_null_shader(void)
+@@ -7368,6 +7368,65 @@ if (hr == D3D_OK)
      DestroyWindow(window);
  }
  
@@ -126,8 +127,8 @@ index 96b21f0454c..6b81582ab7e 100644
 +
  START_TEST(effect)
  {
-     HWND wnd;
-@@ -7333,6 +7392,7 @@ START_TEST(effect)
+     IDirect3DDevice9 *device;
+@@ -7396,6 +7455,7 @@ START_TEST(effect)
      test_effect_large_address_aware_flag(device);
      test_effect_get_pass_desc(device);
      test_effect_skip_constants(device);
@@ -136,5 +137,5 @@ index 96b21f0454c..6b81582ab7e 100644
      refcount = IDirect3DDevice9_Release(device);
      ok(!refcount, "Device has %u references left.\n", refcount);
 -- 
-2.14.1
+1.9.1