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_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch
+++ b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch
@@ -1,4 +1,4 @@
-From 94ca9bf354be47b2fe57689a4a1479d1d53255b2 Mon Sep 17 00:00:00 2001
+From 499d0a3ccd24ffb60e5fe58dd054b71de1f3121f Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sat, 1 Nov 2014 13:08:05 +0100
 Subject: d3dx9_36: Add dxtn support.
@@ -14,10 +14,19 @@ Subject: d3dx9_36: Add dxtn support.
 dlls/d3dx9_31/Makefile.in     |   2 +-
 dlls/d3dx9_32/Makefile.in     |   2 +-
 dlls/d3dx9_33/Makefile.in     |   2 +-
+ dlls/d3dx9_34/Makefile.in     |   2 +-
+ dlls/d3dx9_35/Makefile.in     |   2 +-
 dlls/d3dx9_36/Makefile.in     |   2 +-
 dlls/d3dx9_36/surface.c       | 103 +++++++++++++++++++++++++++++++++++++++---
 dlls/d3dx9_36/tests/surface.c |   8 ++--
- 13 files changed, 111 insertions(+), 22 deletions(-)
+ dlls/d3dx9_37/Makefile.in     |   2 +-
+ dlls/d3dx9_38/Makefile.in     |   2 +-
+ dlls/d3dx9_39/Makefile.in     |   2 +-
+ dlls/d3dx9_40/Makefile.in     |   2 +-
+ dlls/d3dx9_41/Makefile.in     |   2 +-
+ dlls/d3dx9_42/Makefile.in     |   2 +-
+ dlls/d3dx9_43/Makefile.in     |   2 +-
+ 22 files changed, 120 insertions(+), 31 deletions(-)

 diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
 index 7464bd1..bca7d82 100644
@@ -129,6 +138,28 @@ index c9b6587..ecf1b15 100644
 EXTRADEFS = -D_D3DX9_VER=33
 PARENTSRC = ../d3dx9_36
 
+diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in
+index 822f621..2dcd721 100644
+--- a/dlls/d3dx9_34/Makefile.in
+++ b/dlls/d3dx9_34/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_34.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=34
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in
+index 3c8df66..8c90f16 100644
+--- a/dlls/d3dx9_35/Makefile.in
+++ b/dlls/d3dx9_35/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_35.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=35
+ PARENTSRC = ../d3dx9_36
+ 
 diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
 index 24ce09d..6b78518 100644
 --- a/dlls/d3dx9_36/Makefile.in
@@ -332,6 +363,83 @@ index f2855e8..2be48df 100644
 
             check_release((IUnknown*)newsurf, 1);
             check_release((IUnknown*)tex, 0);
+diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in
+index 672878f..9eecd32 100644
+--- a/dlls/d3dx9_37/Makefile.in
+++ b/dlls/d3dx9_37/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_37.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=37
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in
+index 0b537c6..6bb7bac 100644
+--- a/dlls/d3dx9_38/Makefile.in
+++ b/dlls/d3dx9_38/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_38.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=38
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in
+index 58d88f7..5d03e18 100644
+--- a/dlls/d3dx9_39/Makefile.in
+++ b/dlls/d3dx9_39/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_39.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=39
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in
+index a4417b5..8982d4e 100644
+--- a/dlls/d3dx9_40/Makefile.in
+++ b/dlls/d3dx9_40/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_40.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=40
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in
+index 0463175..e9f3d65 100644
+--- a/dlls/d3dx9_41/Makefile.in
+++ b/dlls/d3dx9_41/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_41.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=41
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in
+index 309324f..a55736d 100644
+--- a/dlls/d3dx9_42/Makefile.in
+++ b/dlls/d3dx9_42/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_42.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=42
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in
+index 9c1a87d..c2e787c 100644
+--- a/dlls/d3dx9_43/Makefile.in
+++ b/dlls/d3dx9_43/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_43.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=43
+ PARENTSRC = ../d3dx9_36
+ 
 -- 
 2.8.0