From d8862cbbfdc447d2266c21d5fd1945ca649a6e97 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 3 Jul 2016 22:48:37 +0200 Subject: [PATCH] Rebase against a9a6948b7944dccca6831914ea40e5c9aa5929bc. [winspool.drv-SetPrinterW] Removed patch to add stub for winspool.SetPrinterW level 8 (fixed upstream). --- ...3DXEffect-interface-based-on-DLL-ver.patch | 114 +++++++++++++++++- ...36-Add-stub-for-D3DXComputeNormalMap.patch | 6 +- .../0001-d3dx9_36-Add-dxtn-support.patch | 112 ++++++++++++++++- patches/patchinstall.sh | 33 ++--- .../wined3d-CSMT_Main/9999-IfDefined.patch | 76 ++++++------ ...spool.drv-Add-case-8-for-SetPrinterW.patch | 45 ------- patches/winspool.drv-SetPrinterW/definition | 1 - 7 files changed, 271 insertions(+), 116 deletions(-) delete mode 100644 patches/winspool.drv-SetPrinterW/0001-winspool.drv-Add-case-8-for-SetPrinterW.patch delete mode 100644 patches/winspool.drv-SetPrinterW/definition diff --git 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 index e54223ef..cbb451d6 100644 --- 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 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 diff --git a/patches/d3dx9_36-D3DXStubs/0001-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch b/patches/d3dx9_36-D3DXStubs/0001-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch index e01e8103..17dc1988 100644 --- a/patches/d3dx9_36-D3DXStubs/0001-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch +++ b/patches/d3dx9_36-D3DXStubs/0001-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch @@ -1,4 +1,4 @@ -From 0dd9b5f8cdee5652916ddaa1f1673417229bc15b Mon Sep 17 00:00:00 2001 +From 20fe06391437e9afaf34014b182df39e9a617e3b Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Wed, 31 Dec 2014 18:45:24 +0100 Subject: d3dx9_36: Add stub for D3DXComputeNormalMap. @@ -9,11 +9,11 @@ Subject: d3dx9_36: Add stub for D3DXComputeNormalMap. 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec -index 78b2969..4cadb53 100644 +index 622f2d0..746b8db 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -22,7 +22,7 @@ - @ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) + @ stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) @ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) -@ stub D3DXComputeNormalMap(ptr ptr ptr long long float) diff --git a/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch index 759e8e41..c01e1b90 100644 --- 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 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 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 5517e476..f70143af 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "af6f8ca4136ad937f8743494a8d3cea0b52d71cf" + echo "a9a6948b7944dccca6831914ea40e5c9aa5929bc" } # Show version information @@ -391,7 +391,6 @@ patch_enable_all () enable_wininet_ParseX509EncodedCertificateForListBoxEntry="$1" enable_winmm_Delay_Import_Depends="$1" enable_winmm_mciSendCommandA="$1" - enable_winspool_drv_SetPrinterW="$1" enable_wintrust_WinVerifyTrust="$1" enable_wmic_Query_Path="$1" enable_wpcap_Dynamic_Linking="$1" @@ -1352,9 +1351,6 @@ patch_enable () winmm-mciSendCommandA) enable_winmm_mciSendCommandA="$2" ;; - winspool.drv-SetPrinterW) - enable_winspool_drv_SetPrinterW="$2" - ;; wintrust-WinVerifyTrust) enable_wintrust_WinVerifyTrust="$2" ;; @@ -2892,8 +2888,10 @@ fi # | Modified files: # | * dlls/d3dx9_24/Makefile.in, dlls/d3dx9_25/Makefile.in, dlls/d3dx9_26/Makefile.in, dlls/d3dx9_27/Makefile.in, # | dlls/d3dx9_28/Makefile.in, dlls/d3dx9_29/Makefile.in, dlls/d3dx9_30/Makefile.in, dlls/d3dx9_31/Makefile.in, -# | dlls/d3dx9_32/Makefile.in, dlls/d3dx9_33/Makefile.in, dlls/d3dx9_36/Makefile.in, dlls/d3dx9_36/effect.c, -# | include/d3dx9effect.h +# | dlls/d3dx9_32/Makefile.in, dlls/d3dx9_33/Makefile.in, dlls/d3dx9_34/Makefile.in, dlls/d3dx9_35/Makefile.in, +# | dlls/d3dx9_36/Makefile.in, dlls/d3dx9_36/effect.c, dlls/d3dx9_37/Makefile.in, dlls/d3dx9_38/Makefile.in, +# | dlls/d3dx9_39/Makefile.in, dlls/d3dx9_40/Makefile.in, dlls/d3dx9_41/Makefile.in, dlls/d3dx9_42/Makefile.in, +# | dlls/d3dx9_43/Makefile.in, include/d3dx9effect.h # | if test "$enable_d3dx9_25_ID3DXEffect" -eq 1; then patch_apply d3dx9_25-ID3DXEffect/0001-d3dx9_-Adjust-ID3DXEffect-interface-based-on-DLL-ver.patch @@ -3065,8 +3063,10 @@ fi # | Modified files: # | * dlls/d3dx9_24/Makefile.in, dlls/d3dx9_25/Makefile.in, dlls/d3dx9_26/Makefile.in, dlls/d3dx9_27/Makefile.in, # | dlls/d3dx9_28/Makefile.in, dlls/d3dx9_29/Makefile.in, dlls/d3dx9_30/Makefile.in, dlls/d3dx9_31/Makefile.in, -# | dlls/d3dx9_32/Makefile.in, dlls/d3dx9_33/Makefile.in, dlls/d3dx9_36/Makefile.in, dlls/d3dx9_36/surface.c, -# | dlls/d3dx9_36/tests/surface.c +# | dlls/d3dx9_32/Makefile.in, dlls/d3dx9_33/Makefile.in, dlls/d3dx9_34/Makefile.in, dlls/d3dx9_35/Makefile.in, +# | dlls/d3dx9_36/Makefile.in, dlls/d3dx9_36/surface.c, dlls/d3dx9_36/tests/surface.c, dlls/d3dx9_37/Makefile.in, +# | dlls/d3dx9_38/Makefile.in, dlls/d3dx9_39/Makefile.in, dlls/d3dx9_40/Makefile.in, dlls/d3dx9_41/Makefile.in, +# | dlls/d3dx9_42/Makefile.in, dlls/d3dx9_43/Makefile.in # | if test "$enable_d3dx9_36_DXTn" -eq 1; then patch_apply d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch @@ -7949,21 +7949,6 @@ if test "$enable_winmm_mciSendCommandA" -eq 1; then ) >> "$patchlist" fi -# Patchset winspool.drv-SetPrinterW -# | -# | This patchset fixes the following Wine bugs: -# | * [#24645] Add stub for winspool.SetPrinterW level 8 -# | -# | Modified files: -# | * dlls/winspool.drv/info.c -# | -if test "$enable_winspool_drv_SetPrinterW" -eq 1; then - patch_apply winspool.drv-SetPrinterW/0001-winspool.drv-Add-case-8-for-SetPrinterW.patch - ( - echo '+ { "Jarkko Korpi", "winspool.drv Add case 8 for SetPrinterW.", 1 },'; - ) >> "$patchlist" -fi - # Patchset wintrust-WinVerifyTrust # | # | Modified files: diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 815fb6b0..e0cacc2b 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -19,7 +19,7 @@ diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c -@@ -1339,7 +1339,11 @@ static void color_fill_test(void) +@@ -1336,7 +1336,11 @@ static void color_fill_test(void) * result on Wine. * {D3DFMT_YUY2, "D3DFMT_YUY2", BLOCKS, 0}, * {D3DFMT_UYVY, "D3DFMT_UYVY", BLOCKS, 0}, */ @@ -31,7 +31,7 @@ diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c /* Vendor-specific formats like ATI2N are a non-issue here since they're not * supported as offscreen plain surfaces and do not support D3DUSAGE_RENDERTARGET * when created as texture. */ -@@ -17618,7 +17622,11 @@ static void add_dirty_rect_test(void) +@@ -17615,7 +17619,11 @@ static void add_dirty_rect_test(void) fill_surface(surface_managed, 0x0000ff00, D3DLOCK_NO_DIRTY_UPDATE); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); @@ -5389,7 +5389,7 @@ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c context_release(context); SetRectEmpty(&swapchain->front_buffer_update); } -@@ -704,8 +771,12 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai +@@ -702,8 +769,12 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai } static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, @@ -5402,7 +5402,7 @@ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c { struct wined3d_surface *front, *back; HBITMAP bitmap; -@@ -816,6 +887,7 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s +@@ -814,6 +885,7 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s *quality = 0; } @@ -5410,7 +5410,7 @@ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c HRESULT swapchain_create_context_cs(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { const struct wined3d_adapter *adapter = device->adapter; -@@ -879,6 +951,7 @@ HRESULT swapchain_create_context_cs(struct wined3d_device *device, struct wined3 +@@ -877,6 +949,7 @@ HRESULT swapchain_create_context_cs(struct wined3d_device *device, struct wined3 return WINED3D_OK; } @@ -5418,7 +5418,7 @@ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { -@@ -996,9 +1069,67 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 +@@ -994,9 +1067,67 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 if (!(device->wined3d->flags & WINED3D_NO3D)) { @@ -5486,7 +5486,7 @@ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c } if (swapchain->desc.backbuffer_count > 0) -@@ -1324,7 +1455,9 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha +@@ -1322,7 +1453,9 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha enum wined3d_multisample_type multisample_type, unsigned int multisample_quality) { BOOL update_desc = FALSE; @@ -5496,7 +5496,7 @@ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c TRACE("swapchain %p, buffer_count %u, width %u, height %u, format %s, " "multisample_type %#x, multisample_quality %#x.\n", -@@ -1336,9 +1469,11 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha +@@ -1334,9 +1467,11 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha if (buffer_count && buffer_count != swapchain->desc.backbuffer_count) FIXME("Cannot change the back buffer count yet.\n"); @@ -6738,7 +6738,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; -@@ -2314,7 +2341,11 @@ struct wined3d_stream_state +@@ -2317,7 +2344,11 @@ struct wined3d_stream_state struct wined3d_state { DWORD flags; @@ -6750,7 +6750,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[MAX_STREAM_OUT]; -@@ -2360,6 +2391,7 @@ struct wined3d_state +@@ -2363,6 +2394,7 @@ struct wined3d_state DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; }; @@ -6758,7 +6758,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_gl_bo { GLuint name; -@@ -2368,6 +2400,7 @@ struct wined3d_gl_bo +@@ -2371,6 +2403,7 @@ struct wined3d_gl_bo UINT size; }; @@ -6766,7 +6766,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h #define WINED3D_UNMAPPED_STAGE ~0U /* Multithreaded flag. Removed from the public header to signal that -@@ -2420,11 +2453,23 @@ struct wined3d_device +@@ -2423,11 +2456,23 @@ struct wined3d_device struct wined3d_rendertarget_view *back_buffer_view; struct wined3d_swapchain **swapchains; UINT swapchain_count; @@ -6790,7 +6790,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* For rendering to a texture using glCopyTexImage */ GLuint depth_blt_texture; -@@ -2472,6 +2517,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL +@@ -2475,6 +2520,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -6798,7 +6798,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) DECLSPEC_HIDDEN; void device_exec_update_texture(struct wined3d_context *context, struct wined3d_texture *src_texture, -@@ -2483,6 +2529,11 @@ void wined3d_device_release_bo(struct wined3d_device *device, struct wined3d_gl_ +@@ -2486,6 +2532,11 @@ void wined3d_device_release_bo(struct wined3d_device *device, struct wined3d_gl_ void device_create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_delete_opengl_contexts_cs(struct wined3d_device *device, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -6810,7 +6810,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state) { -@@ -2526,9 +2577,14 @@ struct wined3d_resource +@@ -2529,9 +2580,14 @@ struct wined3d_resource UINT depth; UINT size; DWORD priority; @@ -6825,7 +6825,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void *parent; const struct wined3d_parent_ops *parent_ops; -@@ -2554,7 +2610,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * +@@ -2557,7 +2613,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -6835,7 +6835,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; -@@ -2562,6 +2620,7 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_H +@@ -2565,6 +2623,7 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_H DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -6843,7 +6843,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h static inline void wined3d_resource_inc_fence(struct wined3d_resource *resource) { InterlockedIncrement(&resource->access_fence); -@@ -2577,6 +2636,7 @@ static inline void wined3d_resource_wait_fence(struct wined3d_resource *resource +@@ -2580,6 +2639,7 @@ static inline void wined3d_resource_wait_fence(struct wined3d_resource *resource while(InterlockedCompareExchange(&resource->access_fence, 0, 0)); } @@ -6851,7 +6851,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 -@@ -2634,7 +2694,9 @@ struct wined3d_texture +@@ -2637,7 +2697,9 @@ struct wined3d_texture DWORD flags; GLenum target; DWORD update_map_binding; @@ -6861,7 +6861,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h GLuint rb_multisample; GLuint rb_resolved; -@@ -2672,8 +2734,12 @@ struct wined3d_texture +@@ -2675,8 +2737,12 @@ struct wined3d_texture unsigned int map_count; DWORD locations; @@ -6874,7 +6874,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h } sub_resources[1]; }; -@@ -2724,6 +2790,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, +@@ -2727,6 +2793,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; @@ -6882,7 +6882,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_texture_changed(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_gl_bo *swap_buffer, void *swap_heap_memory) DECLSPEC_HIDDEN; -@@ -2733,6 +2800,13 @@ void wined3d_texture_get_dc_cs(struct wined3d_texture *texture, unsigned int sub +@@ -2736,6 +2803,13 @@ void wined3d_texture_get_dc_cs(struct wined3d_texture *texture, unsigned int sub GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD locations, BOOL map) DECLSPEC_HIDDEN; @@ -6896,7 +6896,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_invalidate_location(struct wined3d_texture *texture, -@@ -2743,6 +2817,7 @@ void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size +@@ -2746,6 +2820,7 @@ void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size const struct wined3d_gl_info *gl_info, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; @@ -6904,7 +6904,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h BOOL wined3d_texture_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); void *wined3d_texture_map_internal(struct wined3d_texture *texture, unsigned int sub_resource_idx, -@@ -2758,6 +2833,15 @@ void wined3d_texture_unmap_bo_address(const struct wined3d_bo_address *data, +@@ -2761,6 +2836,15 @@ void wined3d_texture_unmap_bo_address(const struct wined3d_bo_address *data, const struct wined3d_gl_info *gl_info, GLenum binding) DECLSPEC_HIDDEN; void wined3d_texture_unmap_internal(struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; @@ -6920,7 +6920,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; -@@ -2875,7 +2959,11 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru +@@ -2878,7 +2962,11 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; @@ -6932,7 +6932,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, -@@ -2886,9 +2974,11 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P +@@ -2889,9 +2977,11 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; @@ -6944,7 +6944,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -@@ -2903,10 +2993,12 @@ struct wined3d_sampler +@@ -2906,10 +2996,12 @@ struct wined3d_sampler GLuint name; }; @@ -6957,7 +6957,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_vertex_declaration_element { const struct wined3d_format *format; -@@ -3002,6 +3094,7 @@ struct wined3d_stateblock +@@ -3005,6 +3097,7 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -6965,7 +6965,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HRESULT state_init(struct wined3d_state *state, const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; -@@ -3052,6 +3145,44 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) DECLSPEC_HID +@@ -3055,6 +3148,44 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) DECLSPEC_HID void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_switch_onscreen_ds(struct wined3d_cs *cs, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; @@ -7010,7 +7010,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; -@@ -3102,6 +3233,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform +@@ -3105,6 +3236,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; @@ -7018,7 +7018,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_cs_emit_set_consts_f(struct wined3d_cs *cs, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants, enum wined3d_shader_type type) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_consts_b(struct wined3d_cs *cs, unsigned int start_idx, -@@ -3159,6 +3291,14 @@ HRESULT wined3d_cs_emit_create_swapchain_context(struct wined3d_cs *cs, +@@ -3162,6 +3294,14 @@ HRESULT wined3d_cs_emit_create_swapchain_context(struct wined3d_cs *cs, void wined3d_cs_emit_delete_opengl_contexts(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_cs_emit_update_swap_interval(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -7033,7 +7033,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d -@@ -3173,8 +3313,12 @@ enum query_state { +@@ -3176,8 +3316,12 @@ enum query_state { struct wined3d_query_ops { HRESULT (*query_get_data)(struct wined3d_query *query, void *data, DWORD data_size, DWORD flags); @@ -7046,7 +7046,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; struct wined3d_query -@@ -3188,9 +3332,11 @@ struct wined3d_query +@@ -3191,9 +3335,11 @@ struct wined3d_query enum wined3d_query_type type; DWORD data_size; void *extendedData; @@ -7058,7 +7058,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; /* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other -@@ -3218,7 +3364,9 @@ struct wined3d_buffer +@@ -3221,7 +3367,9 @@ struct wined3d_buffer GLenum buffer_object_usage; GLenum buffer_type_hint; DWORD flags; @@ -7068,7 +7068,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void *map_ptr; struct wined3d_map_range *maps; -@@ -3243,6 +3391,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co +@@ -3246,6 +3394,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -7076,7 +7076,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, -@@ -3251,6 +3400,13 @@ void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, unsigned int offs +@@ -3254,6 +3403,13 @@ void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, unsigned int offs void buffer_swap_mem(struct wined3d_buffer *buffer, BYTE *mem) DECLSPEC_HIDDEN; void buffer_create_buffer_object(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; @@ -7090,7 +7090,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_rendertarget_view { -@@ -3312,8 +3468,12 @@ struct wined3d_unordered_access_view +@@ -3315,8 +3471,12 @@ struct wined3d_unordered_access_view struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, @@ -7103,7 +7103,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swapchain); }; -@@ -3349,8 +3509,10 @@ struct wined3d_swapchain +@@ -3352,8 +3512,10 @@ struct wined3d_swapchain void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; diff --git a/patches/winspool.drv-SetPrinterW/0001-winspool.drv-Add-case-8-for-SetPrinterW.patch b/patches/winspool.drv-SetPrinterW/0001-winspool.drv-Add-case-8-for-SetPrinterW.patch deleted file mode 100644 index 66d699d8..00000000 --- a/patches/winspool.drv-SetPrinterW/0001-winspool.drv-Add-case-8-for-SetPrinterW.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2ba7980e47f0c593a17f13e73a19dec6fa4f8955 Mon Sep 17 00:00:00 2001 -From: Jarkko Korpi -Date: Mon, 24 Aug 2015 21:44:20 +0300 -Subject: winspool.drv Add case 8 for SetPrinterW. - ---- - dlls/winspool.drv/info.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c -index ca2c34d..e39509d 100644 ---- a/dlls/winspool.drv/info.c -+++ b/dlls/winspool.drv/info.c -@@ -3452,6 +3452,14 @@ static void set_printer_2( HKEY key, const PRINTER_INFO_2W *pi ) - set_reg_DWORD( key, UntilTimeW, pi->UntilTime ); - } - -+static BOOL set_printer_8( HKEY key, const PRINTER_INFO_8W *pi ) -+{ -+ if (!pi->pDevMode) return FALSE; -+ -+ set_reg_devmode( key, Default_DevModeW, pi->pDevMode ); -+ return TRUE; -+} -+ - static BOOL set_printer_9( HKEY key, const PRINTER_INFO_9W *pi ) - { - if (!pi->pDevMode) return FALSE; -@@ -3484,7 +3492,12 @@ BOOL WINAPI SetPrinterW( HANDLE printer, DWORD level, LPBYTE data, DWORD command - ret = TRUE; - break; - } -- -+ case 8: -+ { -+ PRINTER_INFO_8W *pi = (PRINTER_INFO_8W *)data; -+ ret = set_printer_8( key, pi ); -+ break; -+ } - case 9: - { - PRINTER_INFO_9W *pi = (PRINTER_INFO_9W *)data; --- -2.5.0 - diff --git a/patches/winspool.drv-SetPrinterW/definition b/patches/winspool.drv-SetPrinterW/definition deleted file mode 100644 index d7796222..00000000 --- a/patches/winspool.drv-SetPrinterW/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [24645] Add stub for winspool.SetPrinterW level 8