diff --git a/README.md b/README.md
index 5d3fd94e..f76256e8 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ for more details.*
 * Add stub fltmgr.sys (filter manager driver) ([Wine Bug #23583](https://bugs.winehq.org/show_bug.cgi?id=23583))
 * Add stub for D3DXComputeNormalMap
 * Add stub for D3DXFrameFind ([Wine Bug #38334](https://bugs.winehq.org/show_bug.cgi?id=38334))
-* Add stub for D3DXTessellateNPatches
+* ~~Add stub for D3DXTessellateNPatches~~
 * Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
 * Add stub for gdiplus.GdipCreateEffect ([Wine Bug #32163](https://bugs.winehq.org/show_bug.cgi?id=32163))
 * Add stub for ntoskrnl.ExAcquireResourceExclusiveLite
@@ -105,7 +105,7 @@ for more details.*
 * CPU-Z fails to start because GetLogicalProcessorInformationEx returns FALSE
 * Calculate msvcrt exponential math operations with higher precision ([Wine Bug #37149](https://bugs.winehq.org/show_bug.cgi?id=37149))
 * Check architecture before trying to load libraries ([Wine Bug #38021](https://bugs.winehq.org/show_bug.cgi?id=38021))
-* Create HKLM\Software\Microsoft\Cryptography\MachineGuid registry key ([Wine Bug #38508](https://bugs.winehq.org/show_bug.cgi?id=38508))
+* ~~Create HKLM\Software\Microsoft\Cryptography\MachineGuid registry key~~ ([Wine Bug #38508](https://bugs.winehq.org/show_bug.cgi?id=38508))
 * Create stub files for system32/drivers/etc/{services,hosts,networks,protocol} ([Wine Bug #12076](https://bugs.winehq.org/show_bug.cgi?id=12076))
 * CreateProcess does not prioritize the working directory over the system search path ([Wine Bug #23934](https://bugs.winehq.org/show_bug.cgi?id=23934))
 * D3DCompileShader should filter specific warning messages ([Wine Bug #33770](https://bugs.winehq.org/show_bug.cgi?id=33770))
@@ -204,7 +204,7 @@ for more details.*
 * Make it possible to change media center / tablet pc status ([Wine Bug #18732](https://bugs.winehq.org/show_bug.cgi?id=18732))
 * MediaCoder needs CUDA for video encoding ([Wine Bug #37664](https://bugs.winehq.org/show_bug.cgi?id=37664))
 * Multiple applications need EnumDisplayDevicesW implementation ([Wine Bug #34978](https://bugs.winehq.org/show_bug.cgi?id=34978))
-* Multiple applications needs better NtQueryInformationJobObject stub
+* ~~Multiple applications needs better NtQueryInformationJobObject stub~~
 * Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](https://bugs.winehq.org/show_bug.cgi?id=7115))
 * Only send WM_DROPFILES when OLE dnd fails ([Wine Bug #29081](https://bugs.winehq.org/show_bug.cgi?id=29081))
 * Other Pipelight-specific enhancements
@@ -236,7 +236,7 @@ for more details.*
 * Support for BindImageEx ([Wine Bug #3591](https://bugs.winehq.org/show_bug.cgi?id=3591))
 * Support for CSMT (command stream) to increase graphic performance ([Wine Bug #11674](https://bugs.winehq.org/show_bug.cgi?id=11674))
 * Support for CUDA GPU video decoding
-* Support for D3DXComputeNormals ([Wine Bug #26379](https://bugs.winehq.org/show_bug.cgi?id=26379))
+* ~~Support for D3DXComputeNormals~~ ([Wine Bug #26379](https://bugs.winehq.org/show_bug.cgi?id=26379))
 * Support for D3DXGetShaderInputSemantics ([Wine Bug #22682](https://bugs.winehq.org/show_bug.cgi?id=22682))
 * Support for DDS file format in D3DXSaveTextureToFileInMemory ([Wine Bug #26898](https://bugs.winehq.org/show_bug.cgi?id=26898))
 * Support for DOS hidden/system file attributes ([Wine Bug #9158](https://bugs.winehq.org/show_bug.cgi?id=9158))
diff --git a/debian/changelog b/debian/changelog
index 998450e0..2a679888 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,13 @@ wine-staging (1.7.49) UNRELEASED; urgency=low
     (accepted upstream).
   * Removed patch to fix security cookie handling for UPX compressed executables
     (accepted upstream).
+  * Removed patch to force creation of MachineGuid registry key during creation
+    of Wineprefix (accepted upstream).
+  * Removed patch to add stub for D3DXComputeNormals (fixed upstream).
+  * Removed patch to add stub for D3DXTessellateNPatches (accepted upstream).
+  * Removed patch to improve stub for NtQueryInformationJobObject (accepted
+    upstream).
+  * Removed patch to avoid OpenCL deprecation warnings (accepted upstream).
  -- Sebastian Lackner <sebastian@fds-team.de>  Wed, 29 Jul 2015 22:52:46 +0200
 
 wine-staging (1.7.48) unstable; urgency=low
diff --git a/patches/d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch b/patches/d3dx9_36-D3DXStubs/0001-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch
similarity index 100%
rename from patches/d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch
rename to patches/d3dx9_36-D3DXStubs/0001-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch
diff --git a/patches/d3dx9_36-D3DXStubs/0001-d3dx9_36-Implement-D3DXComputeNormals.patch b/patches/d3dx9_36-D3DXStubs/0001-d3dx9_36-Implement-D3DXComputeNormals.patch
deleted file mode 100644
index ade77b6c..00000000
--- a/patches/d3dx9_36-D3DXStubs/0001-d3dx9_36-Implement-D3DXComputeNormals.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From eddb306156f3f71f93bea0efe268ef5bdc95db7f Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Wed, 31 Dec 2014 18:22:26 +0100
-Subject: d3dx9_36: Implement D3DXComputeNormals.
-
----
- dlls/d3dx9_36/d3dx9_36.spec |  2 +-
- dlls/d3dx9_36/mesh.c        | 12 ++++++++++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
-index 575d0ca..0c24882b 100644
---- a/dlls/d3dx9_36/d3dx9_36.spec
-+++ b/dlls/d3dx9_36/d3dx9_36.spec
-@@ -23,7 +23,7 @@
- @ 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 long)
--@ stub D3DXComputeNormals(ptr ptr)
-+@ stdcall D3DXComputeNormals(ptr ptr)
- @ stub D3DXComputeTangent(ptr long long long long ptr)
- @ stub D3DXComputeTangentFrame(ptr long)
- @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr)
-diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
-index 4aeac26..29250cc 100644
---- a/dlls/d3dx9_36/mesh.c
-+++ b/dlls/d3dx9_36/mesh.c
-@@ -7256,6 +7256,18 @@ HRESULT WINAPI D3DXComputeTangentFrameEx(ID3DXMesh *mesh, DWORD texture_in_seman
- }
- 
- /*************************************************************************
-+ * D3DXComputeNormals    (D3DX9_36.@)
-+ */
-+HRESULT WINAPI D3DXComputeNormals(ID3DXBaseMesh *mesh, const DWORD *adjacency)
-+{
-+    TRACE("mesh %p, adjacency %p.\n", mesh, adjacency);
-+
-+    return D3DXComputeTangentFrameEx((ID3DXMesh *)mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0,
-+                                     D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS,
-+                                     adjacency, -1.01f, -0.01f, -1.01f, NULL, NULL);
-+}
-+
-+/*************************************************************************
-  * D3DXIntersect    (D3DX9_36.@)
-  */
- HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *mesh, const D3DXVECTOR3 *ray_pos, const D3DXVECTOR3 *ray_dir,
--- 
-2.4.5
-
diff --git a/patches/d3dx9_36-D3DXStubs/0003-d3dx9_36-Add-D3DXFrameFind-stub.patch b/patches/d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-D3DXFrameFind-stub.patch
similarity index 100%
rename from patches/d3dx9_36-D3DXStubs/0003-d3dx9_36-Add-D3DXFrameFind-stub.patch
rename to patches/d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-D3DXFrameFind-stub.patch
diff --git a/patches/d3dx9_36-D3DXStubs/0004-d3dx9_36-Add-D3DXTessellateNPatches-stub.-try-2.patch b/patches/d3dx9_36-D3DXStubs/0004-d3dx9_36-Add-D3DXTessellateNPatches-stub.-try-2.patch
deleted file mode 100644
index 3bc52a05..00000000
--- a/patches/d3dx9_36-D3DXStubs/0004-d3dx9_36-Add-D3DXTessellateNPatches-stub.-try-2.patch
+++ /dev/null
@@ -1,309 +0,0 @@
-From b00b47a38266dfa4a96767015478a9284cf2a0cf Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 28 Jul 2015 19:28:49 +1000
-Subject: d3dx9_36: Add D3DXTessellateNPatches stub. (try 2)
-
----
- dlls/d3dx9_24/d3dx9_24.spec | 2 +-
- dlls/d3dx9_25/d3dx9_25.spec | 2 +-
- dlls/d3dx9_26/d3dx9_26.spec | 2 +-
- dlls/d3dx9_27/d3dx9_27.spec | 2 +-
- dlls/d3dx9_28/d3dx9_28.spec | 2 +-
- dlls/d3dx9_29/d3dx9_29.spec | 2 +-
- dlls/d3dx9_30/d3dx9_30.spec | 2 +-
- dlls/d3dx9_31/d3dx9_31.spec | 2 +-
- dlls/d3dx9_32/d3dx9_32.spec | 2 +-
- dlls/d3dx9_33/d3dx9_33.spec | 2 +-
- dlls/d3dx9_34/d3dx9_34.spec | 2 +-
- dlls/d3dx9_35/d3dx9_35.spec | 2 +-
- dlls/d3dx9_36/d3dx9_36.spec | 2 +-
- dlls/d3dx9_36/mesh.c        | 9 +++++++++
- dlls/d3dx9_37/d3dx9_37.spec | 2 +-
- dlls/d3dx9_38/d3dx9_38.spec | 2 +-
- dlls/d3dx9_39/d3dx9_39.spec | 2 +-
- dlls/d3dx9_40/d3dx9_40.spec | 2 +-
- dlls/d3dx9_41/d3dx9_41.spec | 2 +-
- dlls/d3dx9_42/d3dx9_42.spec | 2 +-
- dlls/d3dx9_43/d3dx9_43.spec | 2 +-
- 21 files changed, 29 insertions(+), 20 deletions(-)
-
-diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
-index c79e778..3249685 100644
---- a/dlls/d3dx9_24/d3dx9_24.spec
-+++ b/dlls/d3dx9_24/d3dx9_24.spec
-@@ -280,7 +280,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
-index 8244c77..f901a99 100644
---- a/dlls/d3dx9_25/d3dx9_25.spec
-+++ b/dlls/d3dx9_25/d3dx9_25.spec
-@@ -280,7 +280,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec
-index 5b8528b..e6a2196 100644
---- a/dlls/d3dx9_26/d3dx9_26.spec
-+++ b/dlls/d3dx9_26/d3dx9_26.spec
-@@ -284,7 +284,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec
-index 5b8528b..e6a2196 100644
---- a/dlls/d3dx9_27/d3dx9_27.spec
-+++ b/dlls/d3dx9_27/d3dx9_27.spec
-@@ -284,7 +284,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec
-index c62b334..b1ae88e 100644
---- a/dlls/d3dx9_28/d3dx9_28.spec
-+++ b/dlls/d3dx9_28/d3dx9_28.spec
-@@ -289,7 +289,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec
-index c62b334..b1ae88e 100644
---- a/dlls/d3dx9_29/d3dx9_29.spec
-+++ b/dlls/d3dx9_29/d3dx9_29.spec
-@@ -289,7 +289,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec
-index 365bd5b..c2035e2 100644
---- a/dlls/d3dx9_30/d3dx9_30.spec
-+++ b/dlls/d3dx9_30/d3dx9_30.spec
-@@ -289,7 +289,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec
-index 5133705..0c5976e 100644
---- a/dlls/d3dx9_31/d3dx9_31.spec
-+++ b/dlls/d3dx9_31/d3dx9_31.spec
-@@ -286,7 +286,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec
-index b93865b..35cb0b6 100644
---- a/dlls/d3dx9_32/d3dx9_32.spec
-+++ b/dlls/d3dx9_32/d3dx9_32.spec
-@@ -291,7 +291,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec
-index b93865b..35cb0b6 100644
---- a/dlls/d3dx9_33/d3dx9_33.spec
-+++ b/dlls/d3dx9_33/d3dx9_33.spec
-@@ -291,7 +291,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec
-index b93865b..35cb0b6 100644
---- a/dlls/d3dx9_34/d3dx9_34.spec
-+++ b/dlls/d3dx9_34/d3dx9_34.spec
-@@ -291,7 +291,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec
-index b93865b..35cb0b6 100644
---- a/dlls/d3dx9_35/d3dx9_35.spec
-+++ b/dlls/d3dx9_35/d3dx9_35.spec
-@@ -291,7 +291,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
-index ea7e74c..3b8da67 100644
---- a/dlls/d3dx9_36/d3dx9_36.spec
-+++ b/dlls/d3dx9_36/d3dx9_36.spec
-@@ -293,7 +293,7 @@
- @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr)
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr)
- @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)
--@ stub D3DXTessellateNPatches(ptr ptr long long ptr ptr)
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr)
- @ stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr)
- @ stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr)
- @ stub D3DXTriPatchSize(ptr ptr ptr)
-diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
-index 02931c7..4e3a49e 100644
---- a/dlls/d3dx9_36/mesh.c
-+++ b/dlls/d3dx9_36/mesh.c
-@@ -7296,3 +7296,12 @@ HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *mesh, const D3DXVECTOR3 *ray_pos, co
- 
-     return E_NOTIMPL;
- }
-+
-+HRESULT WINAPI D3DXTessellateNPatches(ID3DXMesh *mesh, const DWORD *adjacency_in, float num_segs,
-+        BOOL quadratic_normals, ID3DXMesh **mesh_out, ID3DXBuffer **adjacency_out)
-+{
-+    FIXME("mesh %p, adjacency_in %p, num_segs %f, quadratic_normals %d, mesh_out %p, adjacency_out %p stub.\n",
-+            mesh, adjacency_in, num_segs, quadratic_normals, mesh_out, adjacency_out);
-+
-+    return E_NOTIMPL;
-+}
-diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec
-index 9a5ed88..33ea299 100644
---- a/dlls/d3dx9_37/d3dx9_37.spec
-+++ b/dlls/d3dx9_37/d3dx9_37.spec
-@@ -293,7 +293,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec
-index 9a5ed88..33ea299 100644
---- a/dlls/d3dx9_38/d3dx9_38.spec
-+++ b/dlls/d3dx9_38/d3dx9_38.spec
-@@ -293,7 +293,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec
-index 9a5ed88..33ea299 100644
---- a/dlls/d3dx9_39/d3dx9_39.spec
-+++ b/dlls/d3dx9_39/d3dx9_39.spec
-@@ -293,7 +293,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec
-index 9a5ed88..33ea299 100644
---- a/dlls/d3dx9_40/d3dx9_40.spec
-+++ b/dlls/d3dx9_40/d3dx9_40.spec
-@@ -293,7 +293,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec
-index 9a5ed88..33ea299 100644
---- a/dlls/d3dx9_41/d3dx9_41.spec
-+++ b/dlls/d3dx9_41/d3dx9_41.spec
-@@ -293,7 +293,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec
-index 9a5ed88..33ea299 100644
---- a/dlls/d3dx9_42/d3dx9_42.spec
-+++ b/dlls/d3dx9_42/d3dx9_42.spec
-@@ -293,7 +293,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
-diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec
-index 122dff4..1a3cbea 100644
---- a/dlls/d3dx9_43/d3dx9_43.spec
-+++ b/dlls/d3dx9_43/d3dx9_43.spec
-@@ -286,7 +286,7 @@
- @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh
- @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe
- @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh
--@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches
-+@ stdcall D3DXTessellateNPatches(ptr ptr float long ptr ptr) d3dx9_36.D3DXTessellateNPatches
- @ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch
- @ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch
- @ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize
--- 
-2.4.5
-
diff --git a/patches/d3dx9_36-D3DXStubs/definition b/patches/d3dx9_36-D3DXStubs/definition
index b4e97fec..d1e871bf 100644
--- a/patches/d3dx9_36-D3DXStubs/definition
+++ b/patches/d3dx9_36-D3DXStubs/definition
@@ -1,7 +1,7 @@
 # Fixes: [31984] Add stub for D3DXComputeTangentFrameEx
 # Fixes: Add stub for D3DXIntersect
-Fixes: [26379] Support for D3DXComputeNormals
+# Fixes: [26379] Support for D3DXComputeNormals
 Fixes: Add stub for D3DXComputeNormalMap
 Fixes: [38334] Add stub for D3DXFrameFind
-Fixes: Add stub for D3DXTessellateNPatches
+# Fixes: Add stub for D3DXTessellateNPatches
 Category: stable
diff --git a/patches/d3dx9_36-Dummy_Skininfo/0002-d3dx9_36-tests-Add-initial-tests-for-dummy-skininfo-.patch b/patches/d3dx9_36-Dummy_Skininfo/0002-d3dx9_36-tests-Add-initial-tests-for-dummy-skininfo-.patch
index dc3dd0af..4ee25616 100644
--- a/patches/d3dx9_36-Dummy_Skininfo/0002-d3dx9_36-tests-Add-initial-tests-for-dummy-skininfo-.patch
+++ b/patches/d3dx9_36-Dummy_Skininfo/0002-d3dx9_36-tests-Add-initial-tests-for-dummy-skininfo-.patch
@@ -1,4 +1,4 @@
-From f54e1b037a6d3ecb97623d930e71d14d1309ba2f Mon Sep 17 00:00:00 2001
+From 2c16649c78bb8d3751b3fb8ac52c497380d1918b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 28 Jul 2015 17:34:40 +0200
 Subject: d3dx9_36/tests: Add initial tests for dummy skininfo interface.
@@ -8,7 +8,7 @@ Subject: d3dx9_36/tests: Add initial tests for dummy skininfo interface.
  1 file changed, 127 insertions(+)
 
 diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
-index dac0f60..62e7113 100644
+index 0243a61..7f86d89 100644
 --- a/dlls/d3dx9_36/tests/mesh.c
 +++ b/dlls/d3dx9_36/tests/mesh.c
 @@ -25,6 +25,9 @@
@@ -21,8 +21,8 @@ index dac0f60..62e7113 100644
  
  #ifndef NAN
  /* From wine/port.h */
-@@ -2433,6 +2436,129 @@ cleanup:
-     if (wnd) DestroyWindow(wnd);
+@@ -2374,6 +2377,129 @@ static void D3DXLoadMeshTest(void)
+     free_test_context(test_context);
  }
  
 +static ID3DXFileData *get_mesh_data(const char *memory, SIZE_T length)
@@ -151,7 +151,7 @@ index dac0f60..62e7113 100644
  static BOOL compute_box(struct mesh *mesh, float width, float height, float depth)
  {
      unsigned int i, face;
-@@ -10613,6 +10739,7 @@ START_TEST(mesh)
+@@ -10955,6 +11081,7 @@ START_TEST(mesh)
      D3DXCreateMeshTest();
      D3DXCreateMeshFVFTest();
      D3DXLoadMeshTest();
@@ -160,5 +160,5 @@ index dac0f60..62e7113 100644
      D3DXCreatePolygonTest();
      D3DXCreateSphereTest();
 -- 
-2.4.5
+2.5.0
 
diff --git a/patches/ntdll-JobObjects/0001-ntdll-Improve-stub-for-NtQueryInformationJobObject.patch b/patches/ntdll-JobObjects/0001-ntdll-Improve-stub-for-NtQueryInformationJobObject.patch
deleted file mode 100644
index d32aa004..00000000
--- a/patches/ntdll-JobObjects/0001-ntdll-Improve-stub-for-NtQueryInformationJobObject.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From bd3dde0e7077535723fc12ec0e0c16e2e4f91cd9 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Fri, 31 Jul 2015 06:56:04 +0200
-Subject: ntdll: Improve stub for NtQueryInformationJobObject.
-
----
- dlls/ntdll/sync.c | 34 +++++++++++++++++++++++++++++++++-
- 1 file changed, 33 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
-index 04c6de30..b0329ab 100644
---- a/dlls/ntdll/sync.c
-+++ b/dlls/ntdll/sync.c
-@@ -636,7 +636,39 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c
-                                              ULONG len, PULONG ret_len )
- {
-     FIXME( "stub: %p %u %p %u %p\n", handle, class, info, len, ret_len );
--    return STATUS_NOT_IMPLEMENTED;
-+
-+    if (class >= MaxJobObjectInfoClass)
-+        return STATUS_INVALID_PARAMETER;
-+
-+    switch (class)
-+    {
-+    case JobObjectExtendedLimitInformation:
-+        {
-+            JOBOBJECT_EXTENDED_LIMIT_INFORMATION *extended_limit;
-+            if (len < sizeof(*extended_limit))
-+                return STATUS_INFO_LENGTH_MISMATCH;
-+
-+            extended_limit = (JOBOBJECT_EXTENDED_LIMIT_INFORMATION *)info;
-+            memset(extended_limit, 0, sizeof(*extended_limit));
-+            if (ret_len) *ret_len = sizeof(*extended_limit);
-+            return STATUS_SUCCESS;
-+        }
-+
-+    case JobObjectBasicLimitInformation:
-+        {
-+            JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit;
-+            if (len < sizeof(*basic_limit))
-+                return STATUS_INFO_LENGTH_MISMATCH;
-+
-+            basic_limit = (JOBOBJECT_BASIC_LIMIT_INFORMATION *)info;
-+            memset(basic_limit, 0, sizeof(*basic_limit));
-+            if (ret_len) *ret_len = sizeof(*basic_limit);
-+            return STATUS_SUCCESS;
-+        }
-+
-+    default:
-+        return STATUS_NOT_IMPLEMENTED;
-+    }
- }
- 
- /******************************************************************************
--- 
-2.5.0
-
diff --git a/patches/ntdll-JobObjects/0002-kernel32-tests-Add-basic-tests-for-QueryInformationJ.patch b/patches/ntdll-JobObjects/0002-kernel32-tests-Add-basic-tests-for-QueryInformationJ.patch
deleted file mode 100644
index 355f2104..00000000
--- a/patches/ntdll-JobObjects/0002-kernel32-tests-Add-basic-tests-for-QueryInformationJ.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From b3fa2403b0179adbed187dc1cf7e044beb8d620a Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Fri, 31 Jul 2015 06:58:14 +0200
-Subject: kernel32/tests: Add basic tests for QueryInformationJobObject with
- JobObject*LimitInformation info class.
-
----
- dlls/kernel32/tests/process.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
-index 9f62e13..113ec35 100644
---- a/dlls/kernel32/tests/process.c
-+++ b/dlls/kernel32/tests/process.c
-@@ -2304,6 +2304,8 @@ static void test_QueryInformationJobObject(void)
- {
-     char buf[FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[5])];
-     PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf;
-+    JOBOBJECT_EXTENDED_LIMIT_INFORMATION ext_limit_info;
-+    JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit_info = &ext_limit_info.BasicLimitInformation;
-     DWORD dwret, ret_len;
-     PROCESS_INFORMATION pi[2];
-     HANDLE job;
-@@ -2374,6 +2376,34 @@ static void test_QueryInformationJobObject(void)
-         }
-     }
- 
-+    /* test JobObjectBasicLimitInformation */
-+    ret = pQueryInformationJobObject(job, JobObjectBasicLimitInformation, basic_limit_info,
-+                                     sizeof(*basic_limit_info) - 1, &ret_len);
-+    ok(!ret, "QueryInformationJobObject expected failure\n");
-+    expect_eq_d(ERROR_BAD_LENGTH, GetLastError());
-+
-+    ret_len = 0xdeadbeef;
-+    memset(basic_limit_info, 0x11, sizeof(*basic_limit_info));
-+    ret = pQueryInformationJobObject(job, JobObjectBasicLimitInformation, basic_limit_info,
-+                                     sizeof(*basic_limit_info), &ret_len);
-+    ok(ret, "QueryInformationJobObject error %u\n", GetLastError());
-+    ok(ret_len == sizeof(*basic_limit_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len);
-+    expect_eq_d(0, basic_limit_info->LimitFlags);
-+
-+    /* test JobObjectExtendedLimitInformation */
-+    ret = pQueryInformationJobObject(job, JobObjectExtendedLimitInformation, &ext_limit_info,
-+                                     sizeof(ext_limit_info) - 1, &ret_len);
-+    ok(!ret, "QueryInformationJobObject expected failure\n");
-+    expect_eq_d(ERROR_BAD_LENGTH, GetLastError());
-+
-+    ret_len = 0xdeadbeef;
-+    memset(&ext_limit_info, 0x11, sizeof(ext_limit_info));
-+    ret = pQueryInformationJobObject(job, JobObjectExtendedLimitInformation, &ext_limit_info,
-+                                     sizeof(ext_limit_info), &ret_len);
-+    ok(ret, "QueryInformationJobObject error %u\n", GetLastError());
-+    ok(ret_len == sizeof(ext_limit_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len);
-+    expect_eq_d(0, basic_limit_info->LimitFlags);
-+
-     TerminateProcess(pi[0].hProcess, 0);
-     CloseHandle(pi[0].hProcess);
-     CloseHandle(pi[0].hThread);
--- 
-2.5.0
-
diff --git a/patches/ntdll-JobObjects/definition b/patches/ntdll-JobObjects/definition
deleted file mode 100644
index c1d308eb..00000000
--- a/patches/ntdll-JobObjects/definition
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: Multiple applications needs better NtQueryInformationJobObject stub
diff --git a/patches/opencl-Silence_Deprecation_Warning/0001-opencl-Silence-deprecation-warning-for-various-OpenC.patch b/patches/opencl-Silence_Deprecation_Warning/0001-opencl-Silence-deprecation-warning-for-various-OpenC.patch
deleted file mode 100644
index 568ab343..00000000
--- a/patches/opencl-Silence_Deprecation_Warning/0001-opencl-Silence-deprecation-warning-for-various-OpenC.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 987688e2ad1576c9a31311e745c0161274a46f15 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Fri, 31 Jul 2015 05:42:05 +0200
-Subject: opencl: Silence deprecation warning for various OpenCL functions.
-
----
- dlls/opencl/Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dlls/opencl/Makefile.in b/dlls/opencl/Makefile.in
-index 1f6e76c..3523d0a 100644
---- a/dlls/opencl/Makefile.in
-+++ b/dlls/opencl/Makefile.in
-@@ -1,5 +1,6 @@
- MODULE    = opencl.dll
- EXTRALIBS = $(OPENCL_LIBS)
-+EXTRADEFS = -Wno-deprecated-declarations
- 
- C_SRCS = \
- 	opencl.c
--- 
-2.5.0
-
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 25f2cded..89ff8b23 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -55,7 +55,7 @@ version()
 	echo "Copyright (C) 2014-2015 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"
-	echo "  commit 571462c633edbcc5dd6f2f8e56470470f27b0b07"
+	echo "  commit b3fe96a0a9748c71a24fe0393fd964f0fb2f4ff4"
 	echo ""
 }
 
@@ -168,7 +168,6 @@ patch_enable_all ()
 	enable_ntdll_FreeBSD_Directory="$1"
 	enable_ntdll_Heap_FreeLists="$1"
 	enable_ntdll_Hide_Wine_Exports="$1"
-	enable_ntdll_JobObjects="$1"
 	enable_ntdll_Junction_Points="$1"
 	enable_ntdll_Loader_Machine_Type="$1"
 	enable_ntdll_NtQueryEaFile="$1"
@@ -189,7 +188,6 @@ patch_enable_all ()
 	enable_nvcuvid_CUDA_Video_Support="$1"
 	enable_nvencodeapi_Video_Encoder="$1"
 	enable_openal32_EFX_Extension="$1"
-	enable_opencl_Silence_Deprecation_Warning="$1"
 	enable_opengl32_Revert_Disable_Ext="$1"
 	enable_quartz_MediaSeeking_Positions="$1"
 	enable_rasapi32_RasEnumDevicesA="$1"
@@ -281,7 +279,6 @@ patch_enable_all ()
 	enable_winmm_Delay_Import_Depends="$1"
 	enable_winscard_SCardListReaders="$1"
 	enable_winsta_WinStationEnumerateW="$1"
-	enable_wintrust_MachineGuid="$1"
 	enable_wpcap_Dynamic_Linking="$1"
 	enable_ws2_32_APC_Performance="$1"
 	enable_ws2_32_Connect_Time="$1"
@@ -584,9 +581,6 @@ patch_enable ()
 		ntdll-Hide_Wine_Exports)
 			enable_ntdll_Hide_Wine_Exports="$2"
 			;;
-		ntdll-JobObjects)
-			enable_ntdll_JobObjects="$2"
-			;;
 		ntdll-Junction_Points)
 			enable_ntdll_Junction_Points="$2"
 			;;
@@ -647,9 +641,6 @@ patch_enable ()
 		openal32-EFX_Extension)
 			enable_openal32_EFX_Extension="$2"
 			;;
-		opencl-Silence_Deprecation_Warning)
-			enable_opencl_Silence_Deprecation_Warning="$2"
-			;;
 		opengl32-Revert_Disable_Ext)
 			enable_opengl32_Revert_Disable_Ext="$2"
 			;;
@@ -923,9 +914,6 @@ patch_enable ()
 		winsta-WinStationEnumerateW)
 			enable_winsta_WinStationEnumerateW="$2"
 			;;
-		wintrust-MachineGuid)
-			enable_wintrust_MachineGuid="$2"
-			;;
 		wpcap-Dynamic_Linking)
 			enable_wpcap_Dynamic_Linking="$2"
 			;;
@@ -2301,7 +2289,6 @@ fi
 # Patchset d3dx9_36-D3DXStubs
 # |
 # | This patchset fixes the following Wine bugs:
-# |   *	[#26379] Support for D3DXComputeNormals
 # |   *	[#38334] Add stub for D3DXFrameFind
 # |
 # | Modified files:
@@ -2313,15 +2300,11 @@ fi
 # | 	dlls/d3dx9_43/d3dx9_43.spec
 # |
 if test "$enable_d3dx9_36_D3DXStubs" -eq 1; then
-	patch_apply d3dx9_36-D3DXStubs/0001-d3dx9_36-Implement-D3DXComputeNormals.patch
-	patch_apply d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch
-	patch_apply d3dx9_36-D3DXStubs/0003-d3dx9_36-Add-D3DXFrameFind-stub.patch
-	patch_apply d3dx9_36-D3DXStubs/0004-d3dx9_36-Add-D3DXTessellateNPatches-stub.-try-2.patch
+	patch_apply d3dx9_36-D3DXStubs/0001-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch
+	patch_apply d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-D3DXFrameFind-stub.patch
 	(
-		echo '+    { "Christian Costa", "d3dx9_36: Implement D3DXComputeNormals.", 1 },';
 		echo '+    { "Christian Costa", "d3dx9_36: Add stub for D3DXComputeNormalMap.", 1 },';
 		echo '+    { "Andrey Gusev", "d3dx9_36: Add D3DXFrameFind stub.", 1 },';
-		echo '+    { "Alistair Leslie-Hughes", "d3dx9_36: Add D3DXTessellateNPatches stub.", 2 },';
 	) >> "$patchlist"
 fi
 
@@ -3603,20 +3586,6 @@ if test "$enable_ntdll_Hide_Wine_Exports" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset ntdll-JobObjects
-# |
-# | Modified files:
-# |   *	dlls/kernel32/tests/process.c, dlls/ntdll/sync.c
-# |
-if test "$enable_ntdll_JobObjects" -eq 1; then
-	patch_apply ntdll-JobObjects/0001-ntdll-Improve-stub-for-NtQueryInformationJobObject.patch
-	patch_apply ntdll-JobObjects/0002-kernel32-tests-Add-basic-tests-for-QueryInformationJ.patch
-	(
-		echo '+    { "Sebastian Lackner", "ntdll: Improve stub for NtQueryInformationJobObject.", 1 },';
-		echo '+    { "Sebastian Lackner", "kernel32/tests: Add basic tests for QueryInformationJobObject with JobObject*LimitInformation info class.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset ntdll-NtQueryEaFile
 # |
 # | Modified files:
@@ -3979,18 +3948,6 @@ if test "$enable_openal32_EFX_Extension" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset opencl-Silence_Deprecation_Warning
-# |
-# | Modified files:
-# |   *	dlls/opencl/Makefile.in
-# |
-if test "$enable_opencl_Silence_Deprecation_Warning" -eq 1; then
-	patch_apply opencl-Silence_Deprecation_Warning/0001-opencl-Silence-deprecation-warning-for-various-OpenC.patch
-	(
-		echo '+    { "Sebastian Lackner", "opencl: Silence deprecation warning for various OpenCL functions.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset opengl32-Revert_Disable_Ext
 # |
 # | This patchset fixes the following Wine bugs:
@@ -4903,30 +4860,6 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset wined3d-UnhandledBlendFactor
-# |
-# | Modified files:
-# |   *	dlls/wined3d/state.c
-# |
-if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then
-	patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch
-	(
-		echo '+    { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },';
-	) >> "$patchlist"
-fi
-
-# Patchset wined3d-resource_check_usage
-# |
-# | Modified files:
-# |   *	dlls/wined3d/resource.c
-# |
-if test "$enable_wined3d_resource_check_usage" -eq 1; then
-	patch_apply wined3d-resource_check_usage/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch
-	(
-		echo '+    { "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME.", 2 },';
-	) >> "$patchlist"
-fi
-
 # Patchset wined3d-wined3d_swapchain_present
 # |
 # | Modified files:
@@ -5014,6 +4947,30 @@ if test "$enable_wined3d_Revert_PixelFormat" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset wined3d-UnhandledBlendFactor
+# |
+# | Modified files:
+# |   *	dlls/wined3d/state.c
+# |
+if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then
+	patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch
+	(
+		echo '+    { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },';
+	) >> "$patchlist"
+fi
+
+# Patchset wined3d-resource_check_usage
+# |
+# | Modified files:
+# |   *	dlls/wined3d/resource.c
+# |
+if test "$enable_wined3d_resource_check_usage" -eq 1; then
+	patch_apply wined3d-resource_check_usage/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch
+	(
+		echo '+    { "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME.", 2 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wined3d-CSMT_Main
 # |
 # | This patchset fixes the following Wine bugs:
@@ -5725,21 +5682,6 @@ if test "$enable_winsta_WinStationEnumerateW" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset wintrust-MachineGuid
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#38508] Create HKLM\Software\Microsoft\Cryptography\MachineGuid registry key
-# |
-# | Modified files:
-# |   *	dlls/wintrust/register.c
-# |
-if test "$enable_wintrust_MachineGuid" -eq 1; then
-	patch_apply wintrust-MachineGuid/0001-wintrust-Create-a-dummy-context-to-force-creation-of.patch
-	(
-		echo '+    { "Sebastian Lackner", "wintrust: Create a dummy context to force creation of MachineGuid registry key.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset wpcap-Dynamic_Linking
 # |
 # | Modified files:
diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
index 84360500..0a4e5c22 100644
--- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch
+++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
@@ -6081,7 +6081,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
  
      texture->resource.format = format;
      texture->resource.multisample_type = multisample_type;
-@@ -779,6 +815,7 @@
+@@ -791,6 +827,7 @@
  static void texture2d_sub_resource_load(struct wined3d_resource *sub_resource,
          struct wined3d_context *context, BOOL srgb)
  {
@@ -6089,7 +6089,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
      surface_load(surface_from_resource(sub_resource), context, srgb);
  }
  
-@@ -793,6 +830,19 @@
+@@ -805,6 +842,19 @@
      wined3d_resource_load_location(&surface->resource, context, surface->resource.map_binding);
      context_release(context);
      wined3d_resource_invalidate_location(&surface->resource, ~surface->resource.map_binding);
@@ -6109,7 +6109,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
  }
  
  static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource)
-@@ -804,12 +854,25 @@
+@@ -816,12 +866,25 @@
  
  static void texture2d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location)
  {
@@ -6135,7 +6135,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
  }
  
  static void texture2d_sub_resource_upload_data(struct wined3d_resource *sub_resource,
-@@ -888,6 +951,7 @@
+@@ -900,6 +963,7 @@
  
          if (gl_info->supported[APPLE_CLIENT_STORAGE])
          {
@@ -6143,7 +6143,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
              if (surface->flags & (SFLAG_NONPOW2)
                      || texture->flags & WINED3D_TEXTURE_CONVERTED)
              {
-@@ -896,12 +960,26 @@
+@@ -908,12 +972,26 @@
                   * WINED3D_TEXTURE_CONVERTED: The conversion destination memory is freed after loading the surface
                   * heap_memory == NULL: Not defined in the extension. Seems to disable client storage effectively
                   */
@@ -6170,7 +6170,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
                  surface->flags |= SFLAG_CLIENT;
                  mem = surface->resource.heap_memory;
  
-@@ -971,6 +1049,7 @@
+@@ -983,6 +1061,7 @@
      wined3d_texture_unload_gl_texture(texture);
  }
  
@@ -6178,7 +6178,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
  static void wined3d_texture_load_location_invalidated(struct wined3d_resource *resource, DWORD location)
  {
      ERR("Should not be called on textures.\n");
-@@ -990,6 +1069,13 @@
+@@ -1002,6 +1081,13 @@
      wined3d_texture_unload,
      wined3d_texture_load_location_invalidated,
      wined3d_texture_load_location,
@@ -6192,7 +6192,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
  };
  
  static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc,
-@@ -1006,7 +1092,9 @@
+@@ -1018,7 +1104,9 @@
      if (WINED3DFMT_UNKNOWN >= desc->format)
      {
          WARN("(%p) : Texture cannot be created with a format of WINED3DFMT_UNKNOWN.\n", texture);
@@ -6202,7 +6202,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
          return WINED3DERR_INVALIDCALL;
      }
  
-@@ -1016,6 +1104,7 @@
+@@ -1028,6 +1116,7 @@
          if (!gl_info->supported[SGIS_GENERATE_MIPMAP])
          {
              WARN("No mipmap generation support, returning D3DERR_INVALIDCALL.\n");
@@ -6210,7 +6210,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
              HeapFree(GetProcessHeap(), 0, texture);
              return WINED3DERR_INVALIDCALL;
          }
-@@ -1024,6 +1113,14 @@
+@@ -1036,6 +1125,14 @@
          {
              WARN("WINED3DUSAGE_AUTOGENMIPMAP is set, and level count != 1, returning D3DERR_INVALIDCALL.\n");
              HeapFree(GetProcessHeap(), 0, texture);
@@ -6225,7 +6225,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
              return WINED3DERR_INVALIDCALL;
          }
      }
-@@ -1044,7 +1141,9 @@
+@@ -1056,7 +1153,9 @@
              else
              {
                  WARN("Attempted to create a NPOT cube texture (edge length %u) without GL support.\n", desc->width);
@@ -6235,7 +6235,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
                  return WINED3DERR_INVALIDCALL;
              }
          }
-@@ -1054,7 +1153,9 @@
+@@ -1066,7 +1165,9 @@
              surface_flags, device, parent, parent_ops, &texture_resource_ops)))
      {
          WARN("Failed to initialize texture, returning %#x\n", hr);
@@ -6245,7 +6245,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
          return hr;
      }
  
-@@ -1117,7 +1218,9 @@
+@@ -1129,7 +1230,9 @@
      if (WINED3DFMT_UNKNOWN >= desc->format)
      {
          WARN("(%p) : Texture cannot be created with a format of WINED3DFMT_UNKNOWN.\n", texture);
@@ -6255,7 +6255,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
          return WINED3DERR_INVALIDCALL;
      }
  
-@@ -1148,7 +1251,9 @@
+@@ -1160,7 +1263,9 @@
                  else
                  {
                      WARN("Attempted to create a mipmapped NPOT texture without unconditional NPOT support.\n");
@@ -6265,7 +6265,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
                      return WINED3DERR_INVALIDCALL;
                  }
              }
-@@ -1161,6 +1266,7 @@
+@@ -1173,6 +1278,7 @@
          if (!gl_info->supported[SGIS_GENERATE_MIPMAP])
          {
              WARN("No mipmap generation support, returning WINED3DERR_INVALIDCALL.\n");
@@ -6273,7 +6273,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
              HeapFree(GetProcessHeap(), 0, texture);
              return WINED3DERR_INVALIDCALL;
          }
-@@ -1169,6 +1275,14 @@
+@@ -1181,6 +1287,14 @@
          {
              WARN("WINED3DUSAGE_AUTOGENMIPMAP is set, and level count != 1, returning WINED3DERR_INVALIDCALL.\n");
              HeapFree(GetProcessHeap(), 0, texture);
@@ -6288,7 +6288,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
              return WINED3DERR_INVALIDCALL;
          }
      }
-@@ -1177,7 +1291,9 @@
+@@ -1189,7 +1303,9 @@
              surface_flags, device, parent, parent_ops, &texture_resource_ops)))
      {
          WARN("Failed to initialize texture, returning %#x.\n", hr);
@@ -6298,7 +6298,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
          return hr;
      }
  
-@@ -1263,12 +1379,25 @@
+@@ -1275,12 +1391,25 @@
  
  static void texture3d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location)
  {
@@ -6324,7 +6324,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
  }
  
  static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_resource,
-@@ -1278,7 +1407,11 @@
+@@ -1290,7 +1419,11 @@
      struct wined3d_const_bo_address addr;
      unsigned int row_pitch, slice_pitch;
  
@@ -6336,7 +6336,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
      if (row_pitch != data->row_pitch || slice_pitch != data->slice_pitch)
          FIXME("Ignoring row/slice pitch (%u/%u).\n", data->row_pitch, data->slice_pitch);
  
-@@ -1303,7 +1436,11 @@
+@@ -1315,7 +1448,11 @@
          void *mem = NULL;
  
          if (gl_info->supported[APPLE_CLIENT_STORAGE] && !format->convert
@@ -6348,7 +6348,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
          {
              TRACE("Enabling GL_UNPACK_CLIENT_STORAGE_APPLE for volume %p\n", volume);
              gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
-@@ -1350,6 +1487,7 @@
+@@ -1362,6 +1499,7 @@
      if (WINED3DFMT_UNKNOWN >= desc->format)
      {
          WARN("(%p) : Texture cannot be created with a format of WINED3DFMT_UNKNOWN.\n", texture);
@@ -6356,7 +6356,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
          HeapFree(GetProcessHeap(), 0, texture);
          return WINED3DERR_INVALIDCALL;
      }
-@@ -1358,6 +1496,14 @@
+@@ -1370,6 +1508,14 @@
      {
          WARN("(%p) : Texture cannot be created - no volume texture support.\n", texture);
          HeapFree(GetProcessHeap(), 0, texture);
@@ -6371,7 +6371,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
          return WINED3DERR_INVALIDCALL;
      }
  
-@@ -1367,6 +1513,7 @@
+@@ -1379,6 +1525,7 @@
          if (!gl_info->supported[SGIS_GENERATE_MIPMAP])
          {
              WARN("No mipmap generation support, returning D3DERR_INVALIDCALL.\n");
@@ -6379,7 +6379,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
              HeapFree(GetProcessHeap(), 0, texture);
              return WINED3DERR_INVALIDCALL;
          }
-@@ -1375,6 +1522,14 @@
+@@ -1387,6 +1534,14 @@
          {
              WARN("WINED3DUSAGE_AUTOGENMIPMAP is set, and level count != 1, returning D3DERR_INVALIDCALL.\n");
              HeapFree(GetProcessHeap(), 0, texture);
@@ -6394,7 +6394,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
              return WINED3DERR_INVALIDCALL;
          }
      }
-@@ -1402,7 +1557,9 @@
+@@ -1414,7 +1569,9 @@
              {
                  WARN("Attempted to create a NPOT volume texture (%u, %u, %u) without GL support.\n",
                          desc->width, desc->height, desc->depth);
@@ -6404,7 +6404,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
                  return WINED3DERR_INVALIDCALL;
              }
          }
-@@ -1412,7 +1569,9 @@
+@@ -1424,7 +1581,9 @@
              0, device, parent, parent_ops, &texture_resource_ops)))
      {
          WARN("Failed to initialize texture, returning %#x.\n", hr);
@@ -6414,7 +6414,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
          return hr;
      }
  
-@@ -1489,6 +1648,9 @@
+@@ -1501,6 +1660,9 @@
      if (FAILED(hr))
      {
          WARN("Failed to initialize texture, returning %#x.\n", hr);
@@ -9791,7 +9791,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
  };
  
  static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device,
-@@ -1201,7 +1409,9 @@
+@@ -1207,7 +1415,9 @@
          return hr;
      }
      buffer->buffer_type_hint = bind_hint;
@@ -9801,7 +9801,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
  
      TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage,
              debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory, buffer);
-@@ -1217,6 +1427,7 @@
+@@ -1223,6 +1433,7 @@
  
      dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE];
  
@@ -9809,7 +9809,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
      /* Observations show that draw_strided_slow is faster on dynamic VBs than converting +
       * drawStridedFast (half-life 2 and others).
       *
-@@ -1224,6 +1435,15 @@
+@@ -1230,6 +1441,15 @@
       * show that draw_strided_slow is faster than converting + uploading + drawStridedFast.
       * Therefore do not create a VBO for WINED3DUSAGE_DYNAMIC buffers.
       */
@@ -9825,7 +9825,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
      if (!gl_info->supported[ARB_VERTEX_BUFFER_OBJECT])
      {
          TRACE("Not creating a vbo because GL_ARB_vertex_buffer is not supported\n");
-@@ -1269,9 +1489,11 @@
+@@ -1275,9 +1495,11 @@
      }
      buffer->maps_size = 1;
  
@@ -9837,7 +9837,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
      return WINED3D_OK;
  }
  
-@@ -1377,6 +1599,7 @@
+@@ -1384,6 +1606,7 @@
  
      return WINED3D_OK;
  }
@@ -9845,7 +9845,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
  
  void buffer_swap_mem(struct wined3d_buffer *buffer, BYTE *mem)
  {
-@@ -1384,3 +1607,4 @@
+@@ -1391,3 +1614,4 @@
      buffer->resource.heap_memory = mem;
      buffer->flags |= WINED3D_BUFFER_DISCARD;
  }
diff --git a/patches/wintrust-MachineGuid/0001-wintrust-Create-a-dummy-context-to-force-creation-of.patch b/patches/wintrust-MachineGuid/0001-wintrust-Create-a-dummy-context-to-force-creation-of.patch
deleted file mode 100644
index 79c71fea..00000000
--- a/patches/wintrust-MachineGuid/0001-wintrust-Create-a-dummy-context-to-force-creation-of.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8c028847d81f5dbd4ffc7f56e21b9a4141eef89e Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Fri, 31 Jul 2015 05:43:45 +0200
-Subject: wintrust: Create a dummy context to force creation of MachineGuid
- registry key.
-
----
- dlls/wintrust/register.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c
-index 9981fbc..0dbb99c 100644
---- a/dlls/wintrust/register.c
-+++ b/dlls/wintrust/register.c
-@@ -960,6 +960,8 @@ HRESULT WINAPI DllRegisterServer(void)
-     HRESULT CryptRegisterRes = S_OK;
-     HRESULT TrustProviderRes = S_OK;
-     HRESULT SIPAddProviderRes = S_OK;
-+    HCRYPTPROV crypt_provider;
-+    BOOL ret;
- 
-     TRACE("\n");
- 
-@@ -1077,6 +1079,12 @@ add_trust_providers:
-      * a trust provider without a diagnostic policy).
-      */
- 
-+    /* Acquire a dummy context to ensure that the MachineGuid registry key
-+     * is created immediately after the creation of a new Wineprefix. */
-+    ret = CryptAcquireContextW(&crypt_provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT);
-+    if (ret) CryptReleaseContext(crypt_provider, 0);
-+    else ERR("Failed to acquire cryptographic context: %u\n", GetLastError());
-+
-     /* If CryptRegisterRes is not S_OK it will always overrule the return value. */
-     if (CryptRegisterRes != S_OK)
-         return CryptRegisterRes;
--- 
-2.5.0
-
diff --git a/patches/wintrust-MachineGuid/definition b/patches/wintrust-MachineGuid/definition
deleted file mode 100644
index 7f5ef0df..00000000
--- a/patches/wintrust-MachineGuid/definition
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: [38508] Create HKLM\Software\Microsoft\Cryptography\MachineGuid registry key