Rebase against a9a6948b7944dccca6831914ea40e5c9aa5929bc.

[winspool.drv-SetPrinterW] Removed patch to add stub for winspool.SetPrinterW level 8 (fixed upstream).
2025-09-12 18:50:20 -07:00 · 2016-07-03 22:48:37 +02:00
parent 0792e994bd
commit d8862cbbfd
7 changed files with 271 additions and 116 deletions
--- a/patches/d3dx9_25-ID3DXEffect/0001-d3dx9_-Adjust-ID3DXEffect-interface-based-on-DLL-ver.patch
+++ b/patches/d3dx9_25-ID3DXEffect/0001-d3dx9_-Adjust-ID3DXEffect-interface-based-on-DLL-ver.patch
@@ -1,4 +1,4 @@
-From d1229f450e5b7f7cdda6654010c520dc79f7951a Mon Sep 17 00:00:00 2001
+From 4008ff706b5b5358e02e7a092085701ad4d286ec 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_*: Adjust ID3DXEffect interface based on DLL version.
@@ -14,10 +14,19 @@ Subject: d3dx9_*: Adjust ID3DXEffect interface based on DLL version.
 dlls/d3dx9_31/Makefile.in |  1 +
 dlls/d3dx9_32/Makefile.in |  1 +
 dlls/d3dx9_33/Makefile.in |  1 +
+ dlls/d3dx9_34/Makefile.in |  1 +
+ dlls/d3dx9_35/Makefile.in |  1 +
 dlls/d3dx9_36/Makefile.in |  1 +
 dlls/d3dx9_36/effect.c    |  8 ++++++++
+ dlls/d3dx9_37/Makefile.in |  1 +
+ dlls/d3dx9_38/Makefile.in |  1 +
+ dlls/d3dx9_39/Makefile.in |  1 +
+ dlls/d3dx9_40/Makefile.in |  1 +
+ dlls/d3dx9_41/Makefile.in |  1 +
+ dlls/d3dx9_42/Makefile.in |  1 +
+ dlls/d3dx9_43/Makefile.in |  1 +
 include/d3dx9effect.h     | 12 ++++++++++++
- 13 files changed, 31 insertions(+)
+ 22 files changed, 40 insertions(+)

 diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
 index 71dee7f..7464bd1 100644
@@ -128,6 +137,28 @@ index 44bd991..c9b6587 100644
 +EXTRADEFS = -D_D3DX9_VER=33
 PARENTSRC = ../d3dx9_36
 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in
+index 4ba14c2..822f621 100644
+--- a/dlls/d3dx9_34/Makefile.in
+++ b/dlls/d3dx9_34/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_34.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=34
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in
+index ee527d5..3c8df66 100644
+--- a/dlls/d3dx9_35/Makefile.in
+++ b/dlls/d3dx9_35/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_35.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=35
+ PARENTSRC = ../d3dx9_36
+ 
 C_SRCS = \
 diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
 index 83f7d1c..24ce09d 100644
@@ -142,7 +173,7 @@ index 83f7d1c..24ce09d 100644
 C_SRCS = \
 	animation.c \
 diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
-index fd8d59e..5b140fe 100644
+index 42f5aea..5281e8e 100644
 --- a/dlls/d3dx9_36/effect.c
 +++ b/dlls/d3dx9_36/effect.c
@@ -3888,6 +3888,7 @@ static HRESULT WINAPI ID3DXEffectImpl_ApplyParameterBlock(ID3DXEffect* iface, D3
@@ -191,6 +222,83 @@ index fd8d59e..5b140fe 100644
 };
 
 static inline struct ID3DXEffectCompilerImpl *impl_from_ID3DXEffectCompiler(ID3DXEffectCompiler *iface)
+diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in
+index 61528a3..672878f 100644
+--- a/dlls/d3dx9_37/Makefile.in
+++ b/dlls/d3dx9_37/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_37.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=37
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in
+index cb1507c..0b537c6 100644
+--- a/dlls/d3dx9_38/Makefile.in
+++ b/dlls/d3dx9_38/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_38.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=38
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in
+index e372816..58d88f7 100644
+--- a/dlls/d3dx9_39/Makefile.in
+++ b/dlls/d3dx9_39/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_39.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=39
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in
+index b6c4dcd..a4417b5 100644
+--- a/dlls/d3dx9_40/Makefile.in
+++ b/dlls/d3dx9_40/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_40.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=40
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in
+index 9aa91a9..0463175 100644
+--- a/dlls/d3dx9_41/Makefile.in
+++ b/dlls/d3dx9_41/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_41.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=41
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in
+index a5cc60e..309324f 100644
+--- a/dlls/d3dx9_42/Makefile.in
+++ b/dlls/d3dx9_42/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_42.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=42
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in
+index cb78707..9c1a87d 100644
+--- a/dlls/d3dx9_43/Makefile.in
+++ b/dlls/d3dx9_43/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_43.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=43
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
 diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h
 index 3f527ed..b8259e4 100644
 --- a/include/d3dx9effect.h