From aa9bb78434deaa6c289f8500734d11fdb03f0a52 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 21 Nov 2017 09:51:39 +0100 Subject: [PATCH] Rebase against 53290d2ec483006656987352d53842ffc1852c91. --- ...issing-BCRYPT_CHAIN_MODE-definitions.patch | 26 -- ...d-semi-stub-for-D3DXOptimizeVertices.patch | 52 +-- ...0002-d3dx9_36-Add-D3DXFrameFind-stub.patch | 309 ------------------ ...3dx9_36-tests-Fix-some-test-failures.patch | 25 +- patches/patchinstall.sh | 6 +- 5 files changed, 35 insertions(+), 383 deletions(-) delete mode 100644 patches/bcrypt-Improvements/0001-include-Add-missing-BCRYPT_CHAIN_MODE-definitions.patch delete mode 100644 patches/d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-D3DXFrameFind-stub.patch diff --git a/patches/bcrypt-Improvements/0001-include-Add-missing-BCRYPT_CHAIN_MODE-definitions.patch b/patches/bcrypt-Improvements/0001-include-Add-missing-BCRYPT_CHAIN_MODE-definitions.patch deleted file mode 100644 index 4b1371f5..00000000 --- a/patches/bcrypt-Improvements/0001-include-Add-missing-BCRYPT_CHAIN_MODE-definitions.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1678dc51bead9b84a2670e122c87f70d1c023935 Mon Sep 17 00:00:00 2001 -From: Hans Leidekker -Date: Thu, 17 Aug 2017 18:02:53 +0200 -Subject: include: Add missing BCRYPT_CHAIN_MODE definitions. - ---- - include/bcrypt.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/bcrypt.h b/include/bcrypt.h -index 9e193da5de5..34ffc100d6b 100644 ---- a/include/bcrypt.h -+++ b/include/bcrypt.h -@@ -74,6 +74,9 @@ typedef LONG NTSTATUS; - #define BCRYPT_CHAIN_MODE_NA (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','N','/','A',0} - #define BCRYPT_CHAIN_MODE_CBC (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','B','C',0} - #define BCRYPT_CHAIN_MODE_ECB (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','E','C','B',0} -+#define BCRYPT_CHAIN_MODE_CFB (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','F','B',0} -+#define BCRYPT_CHAIN_MODE_CCM (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','C','M',0} -+#define BCRYPT_CHAIN_MODE_GCM (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','G','C','M',0} - - typedef struct _BCRYPT_ALGORITHM_IDENTIFIER - { --- -2.13.1 - diff --git a/patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch b/patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch index d3e3ced7..e4c8f79b 100644 --- a/patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch +++ b/patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch @@ -1,4 +1,4 @@ -From 9953d63a9b6250e72c618ea12ece1bc281790c6f Mon Sep 17 00:00:00 2001 +From 3eb7b781849135fefeece9ca257ca9673b1545fd Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Sun, 16 Jul 2017 18:13:31 +0200 Subject: d3dx9_36: Add semi-stub for D3DXOptimizeVertices. @@ -29,7 +29,7 @@ Subject: d3dx9_36: Add semi-stub for D3DXOptimizeVertices. 22 files changed, 69 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec -index b524fadf93d..88cbcc30db5 100644 +index 0ca8777efe6..9b52c2bf307 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -226,7 +226,7 @@ @@ -42,7 +42,7 @@ index b524fadf93d..88cbcc30db5 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec -index 9344e44d687..55ee0ab1f4f 100644 +index a5449810a43..fc75dfd9c04 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -226,7 +226,7 @@ @@ -55,7 +55,7 @@ index 9344e44d687..55ee0ab1f4f 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec -index 7a28ca6e7ee..11b64446c8a 100644 +index 9e1200442f4..85d9fc5332e 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -230,7 +230,7 @@ @@ -68,7 +68,7 @@ index 7a28ca6e7ee..11b64446c8a 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec -index 7a28ca6e7ee..11b64446c8a 100644 +index 9e1200442f4..85d9fc5332e 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -230,7 +230,7 @@ @@ -81,7 +81,7 @@ index 7a28ca6e7ee..11b64446c8a 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec -index da49c9e23b5..936c00152b3 100644 +index b316a23baf1..62673ccd7af 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -230,7 +230,7 @@ @@ -94,7 +94,7 @@ index da49c9e23b5..936c00152b3 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec -index da49c9e23b5..936c00152b3 100644 +index b316a23baf1..62673ccd7af 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -230,7 +230,7 @@ @@ -107,7 +107,7 @@ index da49c9e23b5..936c00152b3 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec -index c8648fb984f..a5a972c2dc5 100644 +index e00fa547862..2c7575d88fc 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -230,7 +230,7 @@ @@ -120,7 +120,7 @@ index c8648fb984f..a5a972c2dc5 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec -index 7f881ddaf8e..29b51c1b82f 100644 +index d308939ef67..a41eb3e9af2 100644 --- a/dlls/d3dx9_31/d3dx9_31.spec +++ b/dlls/d3dx9_31/d3dx9_31.spec @@ -227,7 +227,7 @@ @@ -133,7 +133,7 @@ index 7f881ddaf8e..29b51c1b82f 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec -index 2f51ece333d..57112ecc1e4 100644 +index c2292dff396..eab56b3c9ee 100644 --- a/dlls/d3dx9_32/d3dx9_32.spec +++ b/dlls/d3dx9_32/d3dx9_32.spec @@ -227,7 +227,7 @@ @@ -146,7 +146,7 @@ index 2f51ece333d..57112ecc1e4 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec -index 2f51ece333d..57112ecc1e4 100644 +index c2292dff396..eab56b3c9ee 100644 --- a/dlls/d3dx9_33/d3dx9_33.spec +++ b/dlls/d3dx9_33/d3dx9_33.spec @@ -227,7 +227,7 @@ @@ -159,7 +159,7 @@ index 2f51ece333d..57112ecc1e4 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec -index 2f51ece333d..57112ecc1e4 100644 +index c2292dff396..eab56b3c9ee 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -227,7 +227,7 @@ @@ -172,7 +172,7 @@ index 2f51ece333d..57112ecc1e4 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec -index 2f51ece333d..57112ecc1e4 100644 +index c2292dff396..eab56b3c9ee 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.spec @@ -227,7 +227,7 @@ @@ -185,7 +185,7 @@ index 2f51ece333d..57112ecc1e4 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec -index 0408ff9ffd0..83319500063 100644 +index 0fdf4e135e1..6201657d4a5 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -229,7 +229,7 @@ @@ -198,7 +198,7 @@ index 0408ff9ffd0..83319500063 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c -index c26aa7271f0..138d60a20a0 100644 +index 6294ce624fe..12cb7eb7258 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -7184,6 +7184,33 @@ cleanup: @@ -236,7 +236,7 @@ index c26aa7271f0..138d60a20a0 100644 * D3DXOptimizeFaces (D3DX9_36.@) * diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c -index b1ab0aaf594..870285ad6ae 100644 +index f437a83cbd8..c5faae520c9 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -10403,6 +10403,27 @@ cleanup: @@ -267,16 +267,16 @@ index b1ab0aaf594..870285ad6ae 100644 static void test_optimize_faces(void) { HRESULT hr; -@@ -11216,6 +11237,7 @@ START_TEST(mesh) +@@ -11291,6 +11312,7 @@ START_TEST(mesh) test_weld_vertices(); test_clone_mesh(); test_valid_mesh(); + test_optimize_vertices(); test_optimize_faces(); test_compute_normals(); - } + test_D3DXFrameFind(); diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec -index 0408ff9ffd0..83319500063 100644 +index 0fdf4e135e1..6201657d4a5 100644 --- a/dlls/d3dx9_37/d3dx9_37.spec +++ b/dlls/d3dx9_37/d3dx9_37.spec @@ -229,7 +229,7 @@ @@ -289,7 +289,7 @@ index 0408ff9ffd0..83319500063 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec -index 0408ff9ffd0..83319500063 100644 +index 0fdf4e135e1..6201657d4a5 100644 --- a/dlls/d3dx9_38/d3dx9_38.spec +++ b/dlls/d3dx9_38/d3dx9_38.spec @@ -229,7 +229,7 @@ @@ -302,7 +302,7 @@ index 0408ff9ffd0..83319500063 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec -index 0408ff9ffd0..83319500063 100644 +index 0fdf4e135e1..6201657d4a5 100644 --- a/dlls/d3dx9_39/d3dx9_39.spec +++ b/dlls/d3dx9_39/d3dx9_39.spec @@ -229,7 +229,7 @@ @@ -315,7 +315,7 @@ index 0408ff9ffd0..83319500063 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec -index 0408ff9ffd0..83319500063 100644 +index 0fdf4e135e1..6201657d4a5 100644 --- a/dlls/d3dx9_40/d3dx9_40.spec +++ b/dlls/d3dx9_40/d3dx9_40.spec @@ -229,7 +229,7 @@ @@ -328,7 +328,7 @@ index 0408ff9ffd0..83319500063 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec -index 0408ff9ffd0..83319500063 100644 +index 0fdf4e135e1..6201657d4a5 100644 --- a/dlls/d3dx9_41/d3dx9_41.spec +++ b/dlls/d3dx9_41/d3dx9_41.spec @@ -229,7 +229,7 @@ @@ -341,7 +341,7 @@ index 0408ff9ffd0..83319500063 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec -index 23bb40d7b11..b1162de3d73 100644 +index 2f2ac5fd619..7cfc439f84b 100644 --- a/dlls/d3dx9_42/d3dx9_42.spec +++ b/dlls/d3dx9_42/d3dx9_42.spec @@ -222,7 +222,7 @@ @@ -354,7 +354,7 @@ index 23bb40d7b11..b1162de3d73 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec -index 23bb40d7b11..b1162de3d73 100644 +index 2f2ac5fd619..7cfc439f84b 100644 --- a/dlls/d3dx9_43/d3dx9_43.spec +++ b/dlls/d3dx9_43/d3dx9_43.spec @@ -222,7 +222,7 @@ @@ -367,5 +367,5 @@ index 23bb40d7b11..b1162de3d73 100644 @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -- -2.13.1 +2.14.2 diff --git a/patches/d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-D3DXFrameFind-stub.patch b/patches/d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-D3DXFrameFind-stub.patch deleted file mode 100644 index b3a3f5e5..00000000 --- a/patches/d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-D3DXFrameFind-stub.patch +++ /dev/null @@ -1,309 +0,0 @@ -From 3055927f037fea93b5ebd4a38b1f0c70a7be4990 Mon Sep 17 00:00:00 2001 -From: Andrey Gusev -Date: Wed, 1 Apr 2015 20:59:49 +0300 -Subject: d3dx9_36: Add D3DXFrameFind stub. - ---- - 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 | 6 ++++++ - 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, 26 insertions(+), 20 deletions(-) - -diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec -index f07ef54..5d03e3e 100644 ---- a/dlls/d3dx9_24/d3dx9_24.spec -+++ b/dlls/d3dx9_24/d3dx9_24.spec -@@ -131,7 +131,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec -index 691f921..bc64b35 100644 ---- a/dlls/d3dx9_25/d3dx9_25.spec -+++ b/dlls/d3dx9_25/d3dx9_25.spec -@@ -131,7 +131,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec -index 151e6f8..9e7bcc5 100644 ---- a/dlls/d3dx9_26/d3dx9_26.spec -+++ b/dlls/d3dx9_26/d3dx9_26.spec -@@ -135,7 +135,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec -index 151e6f8..9e7bcc5 100644 ---- a/dlls/d3dx9_27/d3dx9_27.spec -+++ b/dlls/d3dx9_27/d3dx9_27.spec -@@ -135,7 +135,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec -index 10f7620..4552e06 100644 ---- a/dlls/d3dx9_28/d3dx9_28.spec -+++ b/dlls/d3dx9_28/d3dx9_28.spec -@@ -135,7 +135,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec -index 10f7620..4552e06 100644 ---- a/dlls/d3dx9_29/d3dx9_29.spec -+++ b/dlls/d3dx9_29/d3dx9_29.spec -@@ -135,7 +135,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec -index 65aaeb5..5ec9060 100644 ---- a/dlls/d3dx9_30/d3dx9_30.spec -+++ b/dlls/d3dx9_30/d3dx9_30.spec -@@ -135,7 +135,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec -index 30d84a8..711581d 100644 ---- a/dlls/d3dx9_31/d3dx9_31.spec -+++ b/dlls/d3dx9_31/d3dx9_31.spec -@@ -134,7 +134,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec -index 1ff0f41..0f083f5 100644 ---- a/dlls/d3dx9_32/d3dx9_32.spec -+++ b/dlls/d3dx9_32/d3dx9_32.spec -@@ -134,7 +134,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec -index 1ff0f41..0f083f5 100644 ---- a/dlls/d3dx9_33/d3dx9_33.spec -+++ b/dlls/d3dx9_33/d3dx9_33.spec -@@ -134,7 +134,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec -index 1ff0f41..0f083f5 100644 ---- a/dlls/d3dx9_34/d3dx9_34.spec -+++ b/dlls/d3dx9_34/d3dx9_34.spec -@@ -134,7 +134,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec -index 1ff0f41..0f083f5 100644 ---- a/dlls/d3dx9_35/d3dx9_35.spec -+++ b/dlls/d3dx9_35/d3dx9_35.spec -@@ -134,7 +134,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec -index 20571b1..2b5035e 100644 ---- a/dlls/d3dx9_36/d3dx9_36.spec -+++ b/dlls/d3dx9_36/d3dx9_36.spec -@@ -135,7 +135,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c -index b0b9846..aa98b1a 100644 ---- a/dlls/d3dx9_36/mesh.c -+++ b/dlls/d3dx9_36/mesh.c -@@ -4046,6 +4046,12 @@ HRESULT WINAPI D3DXFrameDestroy(D3DXFRAME *frame, ID3DXAllocateHierarchy *alloc_ - return D3D_OK; - } - -+D3DXFRAME* WINAPI D3DXFrameFind(const D3DXFRAME *frame_root, const char *name) -+{ -+ FIXME("frame_root %p, name %s stub.\n", frame_root, debugstr_a(name)); -+ return NULL; -+} -+ - HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD options, struct IDirect3DDevice9 *device, - struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, - DWORD *num_materials, struct ID3DXMesh **mesh) -diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec -index 20571b1..2b5035e 100644 ---- a/dlls/d3dx9_37/d3dx9_37.spec -+++ b/dlls/d3dx9_37/d3dx9_37.spec -@@ -135,7 +135,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec -index 20571b1..2b5035e 100644 ---- a/dlls/d3dx9_38/d3dx9_38.spec -+++ b/dlls/d3dx9_38/d3dx9_38.spec -@@ -135,7 +135,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec -index 20571b1..2b5035e 100644 ---- a/dlls/d3dx9_39/d3dx9_39.spec -+++ b/dlls/d3dx9_39/d3dx9_39.spec -@@ -135,7 +135,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec -index 20571b1..2b5035e 100644 ---- a/dlls/d3dx9_40/d3dx9_40.spec -+++ b/dlls/d3dx9_40/d3dx9_40.spec -@@ -135,7 +135,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec -index 20571b1..2b5035e 100644 ---- a/dlls/d3dx9_41/d3dx9_41.spec -+++ b/dlls/d3dx9_41/d3dx9_41.spec -@@ -135,7 +135,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec -index 0e888d7..1cf82a6 100644 ---- a/dlls/d3dx9_42/d3dx9_42.spec -+++ b/dlls/d3dx9_42/d3dx9_42.spec -@@ -133,7 +133,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) -diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec -index 0e888d7..1cf82a6 100644 ---- a/dlls/d3dx9_43/d3dx9_43.spec -+++ b/dlls/d3dx9_43/d3dx9_43.spec -@@ -133,7 +133,7 @@ - @ stub D3DXFrameAppendChild(ptr ptr) - @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) - @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr str) -+@ stdcall D3DXFrameFind(ptr str) - @ stub D3DXFrameNumNamedMatrices(ptr) - @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) - @ stdcall D3DXFresnelTerm(float float) --- -2.9.0 - diff --git a/patches/d3dx9_36-Tests/0001-d3dx9_36-tests-Fix-some-test-failures.patch b/patches/d3dx9_36-Tests/0001-d3dx9_36-tests-Fix-some-test-failures.patch index 14d914fa..d1336d06 100644 --- a/patches/d3dx9_36-Tests/0001-d3dx9_36-tests-Fix-some-test-failures.patch +++ b/patches/d3dx9_36-Tests/0001-d3dx9_36-tests-Fix-some-test-failures.patch @@ -1,17 +1,17 @@ -From 69c020763f71d57ada7d5670883b36add6444039 Mon Sep 17 00:00:00 2001 +From 227e86c26da931222508fab0b175db09ce1b4ce2 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 6 May 2017 01:32:51 +0200 Subject: d3dx9_36/tests: Fix some test failures. --- - dlls/d3dx9_36/tests/math.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + dlls/d3dx9_36/tests/math.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c -index 3843abea9be..d21a229bbbe 100644 +index 0e9853abe38..8bc462c48a4 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c -@@ -232,7 +232,7 @@ static void D3DXColorTest(void) +@@ -244,7 +244,7 @@ static void D3DXColorTest(void) /*_______________D3DXColorLerp________________*/ expected.r = 0.32f; expected.g = 0.69f; expected.b = 0.356f; expected.a = 0.897f; D3DXColorLerp(&got,&color,&color1,scale); @@ -20,16 +20,7 @@ index 3843abea9be..d21a229bbbe 100644 /* Test the NULL case */ funcpointer = D3DXColorLerp(&got,NULL,&color1,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); -@@ -302,7 +302,7 @@ static void D3DXFresnelTest(void) - BOOL equal; - - fresnel = D3DXFresnelTerm(0.5f, 1.5f); -- equal = compare_float(fresnel, 8.91867056e-02f, 1); -+ equal = compare_float(fresnel, 8.91867056e-02f, 2); - ok(equal, "Got unexpected Fresnel term %.8e.\n", fresnel); - } - -@@ -2947,7 +2947,7 @@ static void test_D3DXSHEvalDirectionalLight(void) +@@ -2994,7 +2994,7 @@ static void test_D3DXSHEvalDirectionalLight(void) expected = j + test[l].boffset; else expected = test[l].blue_out[startindex + j]; @@ -38,7 +29,7 @@ index 3843abea9be..d21a229bbbe 100644 ok(equal, "Blue: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", l, order, j, expected, blue_out[j]); } -@@ -3292,7 +3292,7 @@ static void test_D3DXSHMultiply3(void) +@@ -3339,7 +3339,7 @@ static void test_D3DXSHMultiply3(void) D3DXSHMultiply3(c, c, b); for (i = 0; i < ARRAY_SIZE(expected_aliased); ++i) { @@ -48,5 +39,5 @@ index 3843abea9be..d21a229bbbe 100644 } } -- -2.12.2 +2.14.2 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 4c2e542a..1f980adb 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "6864803f1ab70f9f9e90903b13e67da40973d12a" + echo "53290d2ec483006656987352d53842ffc1852c91" } # Show version information @@ -3540,7 +3540,6 @@ fi # | include/bcrypt.h, include/ntstatus.h # | if test "$enable_bcrypt_Improvements" -eq 1; then - patch_apply bcrypt-Improvements/0001-include-Add-missing-BCRYPT_CHAIN_MODE-definitions.patch patch_apply bcrypt-Improvements/0010-bcrypt-tests-Add-test-for-bugs-in-BCryptGetProperty.patch patch_apply bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch patch_apply bcrypt-Improvements/0012-bcrypt-Pass-object-to-get_-alg-hash-_property-instea.patch @@ -3570,7 +3569,6 @@ if test "$enable_bcrypt_Improvements" -eq 1; then patch_apply bcrypt-Improvements/0036-bcrypt-tests-Add-simple-test-for-RSA.patch patch_apply bcrypt-Improvements/0037-bcrypt-Store-full-ECCKEY_BLOB-struct-in-BCryptImport.patch ( - printf '%s\n' '+ { "Hans Leidekker", "include: Add missing BCRYPT_CHAIN_MODE definitions.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "bcrypt/tests: Add test for bugs in BCryptGetProperty.", 1 },'; printf '%s\n' '+ { "Michael Müller", "bcrypt/tests: Add tests for AES GCM mode.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "bcrypt: Pass object to get_{alg,hash}_property instead of alg_id.", 1 },'; @@ -4269,11 +4267,9 @@ fi # | if test "$enable_d3dx9_36_D3DXStubs" -eq 1; then 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 patch_apply d3dx9_36-D3DXStubs/0003-d3dx9-Implement-D3DXComputeTangent.patch ( printf '%s\n' '+ { "Christian Costa", "d3dx9_36: Add stub for D3DXComputeNormalMap.", 1 },'; - printf '%s\n' '+ { "Andrey Gusev", "d3dx9_36: Add D3DXFrameFind stub.", 1 },'; printf '%s\n' '+ { "Alistair Leslie-Hughes", "d3dx9: Implement D3DXComputeTangent.", 1 },'; ) >> "$patchlist" fi