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 17dc1988..1b883e04 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,15 +1,190 @@ -From 20fe06391437e9afaf34014b182df39e9a617e3b Mon Sep 17 00:00:00 2001 +From 56f22f460659c3b01e50bdb5b10a61c560bce724 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. --- + 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 | 12 ++++++++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) + 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, 32 insertions(+), 20 deletions(-) +diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec +index f182d7e..f07ef54 100644 +--- a/dlls/d3dx9_24/d3dx9_24.spec ++++ b/dlls/d3dx9_24/d3dx9_24.spec +@@ -18,7 +18,7 @@ + @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) + @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) + @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) +-@ stub D3DXComputeNormalMap(ptr ptr ptr long long float) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec +index 300dc1d..691f921 100644 +--- a/dlls/d3dx9_25/d3dx9_25.spec ++++ b/dlls/d3dx9_25/d3dx9_25.spec +@@ -18,7 +18,7 @@ + @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) + @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) + @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) +-@ stub D3DXComputeNormalMap(ptr ptr ptr long long float) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec +index 79e0a0c..151e6f8 100644 +--- a/dlls/d3dx9_26/d3dx9_26.spec ++++ b/dlls/d3dx9_26/d3dx9_26.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec +index 79e0a0c..151e6f8 100644 +--- a/dlls/d3dx9_27/d3dx9_27.spec ++++ b/dlls/d3dx9_27/d3dx9_27.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec +index abbfa94..10f7620 100644 +--- a/dlls/d3dx9_28/d3dx9_28.spec ++++ b/dlls/d3dx9_28/d3dx9_28.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec +index abbfa94..10f7620 100644 +--- a/dlls/d3dx9_29/d3dx9_29.spec ++++ b/dlls/d3dx9_29/d3dx9_29.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec +index 0269caa..65aaeb5 100644 +--- a/dlls/d3dx9_30/d3dx9_30.spec ++++ b/dlls/d3dx9_30/d3dx9_30.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec +index be37e8f..30d84a8 100644 +--- a/dlls/d3dx9_31/d3dx9_31.spec ++++ b/dlls/d3dx9_31/d3dx9_31.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec +index 6d9e244..1ff0f41 100644 +--- a/dlls/d3dx9_32/d3dx9_32.spec ++++ b/dlls/d3dx9_32/d3dx9_32.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec +index 6d9e244..1ff0f41 100644 +--- a/dlls/d3dx9_33/d3dx9_33.spec ++++ b/dlls/d3dx9_33/d3dx9_33.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec +index 6d9e244..1ff0f41 100644 +--- a/dlls/d3dx9_34/d3dx9_34.spec ++++ b/dlls/d3dx9_34/d3dx9_34.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec +index 6d9e244..1ff0f41 100644 +--- a/dlls/d3dx9_35/d3dx9_35.spec ++++ b/dlls/d3dx9_35/d3dx9_35.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec -index 622f2d0..746b8db 100644 +index 2db0152..20571b1 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -22,7 +22,7 @@ @@ -44,6 +219,97 @@ index 3204ea7..b0b9846 100644 * D3DXIntersect (D3DX9_36.@) */ HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *mesh, const D3DXVECTOR3 *ray_pos, const D3DXVECTOR3 *ray_dir, +diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec +index 2db0152..20571b1 100644 +--- a/dlls/d3dx9_37/d3dx9_37.spec ++++ b/dlls/d3dx9_37/d3dx9_37.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec +index 2db0152..20571b1 100644 +--- a/dlls/d3dx9_38/d3dx9_38.spec ++++ b/dlls/d3dx9_38/d3dx9_38.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec +index 2db0152..20571b1 100644 +--- a/dlls/d3dx9_39/d3dx9_39.spec ++++ b/dlls/d3dx9_39/d3dx9_39.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec +index 2db0152..20571b1 100644 +--- a/dlls/d3dx9_40/d3dx9_40.spec ++++ b/dlls/d3dx9_40/d3dx9_40.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec +index 2db0152..20571b1 100644 +--- a/dlls/d3dx9_41/d3dx9_41.spec ++++ b/dlls/d3dx9_41/d3dx9_41.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec +index 9a69e76..0e888d7 100644 +--- a/dlls/d3dx9_42/d3dx9_42.spec ++++ b/dlls/d3dx9_42/d3dx9_42.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) +diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec +index 9a69e76..0e888d7 100644 +--- a/dlls/d3dx9_43/d3dx9_43.spec ++++ b/dlls/d3dx9_43/d3dx9_43.spec +@@ -22,7 +22,7 @@ + @ 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) ++@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) + @ stub D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) -- -2.8.0 +2.9.0 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 index ced28b4d..b3a3f5e5 100644 --- a/patches/d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-D3DXFrameFind-stub.patch +++ b/patches/d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-D3DXFrameFind-stub.patch @@ -1,15 +1,190 @@ -From 381bfb72fa46393989229619d21a2aa93c0a808c Mon Sep 17 00:00:00 2001 +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 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) + 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 4cadb53..9935352 100644 +index 20571b1..2b5035e 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -135,7 +135,7 @@ @@ -38,6 +213,97 @@ index b0b9846..aa98b1a 100644 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.8.0 +2.9.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index f967318e..7fa5dfbc 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -3038,7 +3038,12 @@ fi # | * [#38334] Add stub for D3DXFrameFind # | # | Modified files: -# | * dlls/d3dx9_36/d3dx9_36.spec, dlls/d3dx9_36/mesh.c +# | * dlls/d3dx9_24/d3dx9_24.spec, dlls/d3dx9_25/d3dx9_25.spec, dlls/d3dx9_26/d3dx9_26.spec, dlls/d3dx9_27/d3dx9_27.spec, +# | dlls/d3dx9_28/d3dx9_28.spec, dlls/d3dx9_29/d3dx9_29.spec, dlls/d3dx9_30/d3dx9_30.spec, dlls/d3dx9_31/d3dx9_31.spec, +# | dlls/d3dx9_32/d3dx9_32.spec, dlls/d3dx9_33/d3dx9_33.spec, dlls/d3dx9_34/d3dx9_34.spec, dlls/d3dx9_35/d3dx9_35.spec, +# | dlls/d3dx9_36/d3dx9_36.spec, dlls/d3dx9_36/mesh.c, dlls/d3dx9_37/d3dx9_37.spec, dlls/d3dx9_38/d3dx9_38.spec, +# | dlls/d3dx9_39/d3dx9_39.spec, dlls/d3dx9_40/d3dx9_40.spec, dlls/d3dx9_41/d3dx9_41.spec, dlls/d3dx9_42/d3dx9_42.spec, +# | dlls/d3dx9_43/d3dx9_43.spec # | if test "$enable_d3dx9_36_D3DXStubs" -eq 1; then patch_apply d3dx9_36-D3DXStubs/0001-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch