Rebase against 8d0d1e563ca7697902df9c285ff13ce648697537.

patches/d3dx9_25-ID3DXEffect/0001-d3dx9_25-Add-an-interface-wrapper-for-different-vers.patch

@@ -1,4 +1,4 @@
-From f6cede1ccb8f108b155b52211f1f1555f0c6935a Mon Sep 17 00:00:00 2001
+From 4a59723740ee7f599520d75ce8a019504629091d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 14 Mar 2015 04:48:38 +0100
 Subject: d3dx9_25: Add an interface wrapper for different version of
@@ -8,8 +8,7 @@ Subject: d3dx9_25: Add an interface wrapper for different version of
  dlls/d3dx9_25/Makefile.in   |    5 +-
  dlls/d3dx9_25/d3dx9_25.spec |   22 +-
  dlls/d3dx9_25/effect.c      | 1282 +++++++++++++++++++++++++++++++++++++++++++
- include/d3dx9effect.h       |    2 +
- 4 files changed, 1298 insertions(+), 13 deletions(-)
+ 3 files changed, 1296 insertions(+), 13 deletions(-)
  create mode 100644 dlls/d3dx9_25/effect.c
 
 diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
@@ -28,7 +27,7 @@ index a41cbc2..79e1c6b 100644
  
  RC_SRCS = version.rc
 diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
-index c328108..515be27 100644
+index 7f18290..d342265 100644
 --- a/dlls/d3dx9_25/d3dx9_25.spec
 +++ b/dlls/d3dx9_25/d3dx9_25.spec
 @@ -43,21 +43,21 @@
@@ -1360,19 +1359,6 @@ index 0000000..8867bb3
 +
 +    return D3DXDisassembleEffect(object->effect, enable_color_code, disassembly);
 +}
-diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h
-index 25d1fd2..3f527ed 100644
---- a/include/d3dx9effect.h
-+++ b/include/d3dx9effect.h
-@@ -425,6 +425,8 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WC
-         ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors);
- #define D3DXCreateEffectCompilerFromResource WINELIB_NAME_AW(D3DXCreateEffectCompilerFromResource)
- 
-+HRESULT WINAPI D3DXDisassembleEffect(ID3DXEffect *effect, BOOL enable_color_code, ID3DXBuffer **disassembly);
-+
- #ifdef __cplusplus
- }
- #endif
 -- 
-2.3.2
+2.6.4