From 243a9f7b895400aa6020b0df7580126a03caf5f1 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 16 Jun 2016 22:56:56 +0200 Subject: [PATCH] Rebase against 41d01871fef296dc717cf2c4f0bdbb07f5266acd. --- ...36-Add-stub-for-D3DXComputeNormalMap.patch | 280 +----------------- ...0002-d3dx9_36-Add-D3DXFrameFind-stub.patch | 40 +-- patches/gdi32-PS_GEOMETRIC/definition | 1 + patches/patchinstall.sh | 21 +- .../wined3d-CSMT_Main/9999-IfDefined.patch | 8 +- 5 files changed, 33 insertions(+), 317 deletions(-) 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 8196defb..e01e8103 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,206 +1,31 @@ -From 0716f14fd6b059f299494ff53d56ee2325ce1cdf Mon Sep 17 00:00:00 2001 +From 0dd9b5f8cdee5652916ddaa1f1673417229bc15b 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 ++++++++++++ - 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(-) + 2 files changed, 13 insertions(+), 1 deletion(-) -diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec -index 0dcca42..d54c3f4 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) d3dx9_36.D3DXCompileShaderFromResourceW - @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingBox - @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingSphere --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec -index 7975803..699c212 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) d3dx9_36.D3DXCompileShaderFromResourceW - @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingBox - @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingSphere --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec -index 1d7b802..827a3f3 100644 ---- a/dlls/d3dx9_26/d3dx9_26.spec -+++ b/dlls/d3dx9_26/d3dx9_26.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec -index 1d7b802..827a3f3 100644 ---- a/dlls/d3dx9_27/d3dx9_27.spec -+++ b/dlls/d3dx9_27/d3dx9_27.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec -index 083667c..c602d1d 100644 ---- a/dlls/d3dx9_28/d3dx9_28.spec -+++ b/dlls/d3dx9_28/d3dx9_28.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec -index 083667c..c602d1d 100644 ---- a/dlls/d3dx9_29/d3dx9_29.spec -+++ b/dlls/d3dx9_29/d3dx9_29.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec -index eb39c0f..bb28fad 100644 ---- a/dlls/d3dx9_30/d3dx9_30.spec -+++ b/dlls/d3dx9_30/d3dx9_30.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec -index 1667a51..2cfa618 100644 ---- a/dlls/d3dx9_31/d3dx9_31.spec -+++ b/dlls/d3dx9_31/d3dx9_31.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec -index f1c4b62..1889a47 100644 ---- a/dlls/d3dx9_32/d3dx9_32.spec -+++ b/dlls/d3dx9_32/d3dx9_32.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec -index f1c4b62..1889a47 100644 ---- a/dlls/d3dx9_33/d3dx9_33.spec -+++ b/dlls/d3dx9_33/d3dx9_33.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec -index f1c4b62..1889a47 100644 ---- a/dlls/d3dx9_34/d3dx9_34.spec -+++ b/dlls/d3dx9_34/d3dx9_34.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec -index f1c4b62..1889a47 100644 ---- a/dlls/d3dx9_35/d3dx9_35.spec -+++ b/dlls/d3dx9_35/d3dx9_35.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec -index 0c24882b..e3bb568 100644 +index 78b2969..4cadb53 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -22,7 +22,7 @@ @ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) @ stub 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 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/mesh.c b/dlls/d3dx9_36/mesh.c -index 29250cc..2647ace 100644 +index 3204ea7..b0b9846 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c -@@ -7268,6 +7268,18 @@ HRESULT WINAPI D3DXComputeNormals(ID3DXBaseMesh *mesh, const DWORD *adjacency) +@@ -7528,6 +7528,18 @@ HRESULT WINAPI D3DXComputeNormals(struct ID3DXBaseMesh *mesh, const DWORD *adjac } /************************************************************************* @@ -219,97 +44,6 @@ index 29250cc..2647ace 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 324855e..f5508c2 100644 ---- a/dlls/d3dx9_37/d3dx9_37.spec -+++ b/dlls/d3dx9_37/d3dx9_37.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec -index 324855e..f5508c2 100644 ---- a/dlls/d3dx9_38/d3dx9_38.spec -+++ b/dlls/d3dx9_38/d3dx9_38.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec -index 324855e..f5508c2 100644 ---- a/dlls/d3dx9_39/d3dx9_39.spec -+++ b/dlls/d3dx9_39/d3dx9_39.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec -index 324855e..f5508c2 100644 ---- a/dlls/d3dx9_40/d3dx9_40.spec -+++ b/dlls/d3dx9_40/d3dx9_40.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec -index 324855e..f5508c2 100644 ---- a/dlls/d3dx9_41/d3dx9_41.spec -+++ b/dlls/d3dx9_41/d3dx9_41.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec -index 324855e..f5508c2 100644 ---- a/dlls/d3dx9_42/d3dx9_42.spec -+++ b/dlls/d3dx9_42/d3dx9_42.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec -index 9da1640..21d2cb4 100644 ---- a/dlls/d3dx9_43/d3dx9_43.spec -+++ b/dlls/d3dx9_43/d3dx9_43.spec -@@ -22,7 +22,7 @@ - @ stdcall D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerVertexSignal - @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal - @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture --@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap -+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap - @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals - @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent - @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame -- -2.4.5 +2.8.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 6b29a8a4..8294e22d 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 @@ -35,7 +35,7 @@ index d54c3f4..c79e778 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -48,7 +48,7 @@ index 699c212..8244c77 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -61,7 +61,7 @@ index 827a3f3..5b8528b 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -74,7 +74,7 @@ index 827a3f3..5b8528b 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -87,7 +87,7 @@ index c602d1d..c62b334 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -100,7 +100,7 @@ index c602d1d..c62b334 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -113,7 +113,7 @@ index bb28fad..365bd5b 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -126,7 +126,7 @@ index 2cfa618..5133705 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -139,7 +139,7 @@ index 1889a47..b93865b 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -152,7 +152,7 @@ index 1889a47..b93865b 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -165,7 +165,7 @@ index 1889a47..b93865b 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -178,7 +178,7 @@ index 1889a47..b93865b 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -191,7 +191,7 @@ index e3bb568..ea7e74c 100644 @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) --@ stub D3DXFrameFind(ptr ptr) +-@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @@ -221,7 +221,7 @@ index f5508c2..9a5ed88 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -234,7 +234,7 @@ index f5508c2..9a5ed88 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -247,7 +247,7 @@ index f5508c2..9a5ed88 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -260,7 +260,7 @@ index f5508c2..9a5ed88 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -273,7 +273,7 @@ index f5508c2..9a5ed88 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -286,7 +286,7 @@ index f5508c2..9a5ed88 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @@ -299,7 +299,7 @@ index 21d2cb4..122dff4 100644 @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy --@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +-@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices diff --git a/patches/gdi32-PS_GEOMETRIC/definition b/patches/gdi32-PS_GEOMETRIC/definition index dba38a3f..82ee6930 100644 --- a/patches/gdi32-PS_GEOMETRIC/definition +++ b/patches/gdi32-PS_GEOMETRIC/definition @@ -1 +1,2 @@ Fixes: [39172] Scale a geometric pen for the mapping mode used by PATH_StrokePath +Disabled: true diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 222450ff..92e00cc2 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "7cb3b72559745d94e7b7e3a0fbb40426f93d775f" + echo "41d01871fef296dc717cf2c4f0bdbb07f5266acd" } # Show version information @@ -149,7 +149,6 @@ patch_enable_all () enable_fsutil_Stub_Program="$1" enable_gdi32_Lazy_Font_Initialization="$1" enable_gdi32_MultiMonitor="$1" - enable_gdi32_PS_GEOMETRIC="$1" enable_gdi32_Path_Metafile="$1" enable_gdi32_Symbol_Truetype_Font="$1" enable_gdiplus_GdipCreateMetafileFromStream="$1" @@ -629,9 +628,6 @@ patch_enable () gdi32-MultiMonitor) enable_gdi32_MultiMonitor="$2" ;; - gdi32-PS_GEOMETRIC) - enable_gdi32_PS_GEOMETRIC="$2" - ;; gdi32-Path_Metafile) enable_gdi32_Path_Metafile="$2" ;; @@ -3722,21 +3718,6 @@ if test "$enable_gdi32_MultiMonitor" -eq 1; then ) >> "$patchlist" fi -# Patchset gdi32-PS_GEOMETRIC -# | -# | This patchset fixes the following Wine bugs: -# | * [#39172] Scale a geometric pen for the mapping mode used by PATH_StrokePath -# | -# | Modified files: -# | * dlls/gdi32/path.c -# | -if test "$enable_gdi32_PS_GEOMETRIC" -eq 1; then - patch_apply gdi32-PS_GEOMETRIC/0001-gdi32-Scale-a-geometric-pen-for-the-mapping-mode-use.patch - ( - echo '+ { "Dmitry Timoshkov", "gdi32: Scale a geometric pen for the mapping mode used by PATH_StrokePath.", 2 },'; - ) >> "$patchlist" -fi - # Patchset gdi32-Path_Metafile # | # | This patchset fixes the following Wine bugs: diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 6dfdeb12..9c64fde7 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -7059,7 +7059,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c } return refcount; -@@ -193,6 +203,7 @@ +@@ -201,6 +211,7 @@ return refcount; } @@ -7067,7 +7067,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c void wined3d_shader_resource_view_destroy_cs(struct wined3d_shader_resource_view *view) { if (view->object) -@@ -210,6 +221,7 @@ +@@ -218,6 +229,7 @@ HeapFree(GetProcessHeap(), 0, view); } @@ -7075,7 +7075,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view) { ULONG refcount = InterlockedDecrement(&view->refcount); -@@ -218,6 +230,7 @@ +@@ -226,6 +238,7 @@ if (!refcount) { @@ -7083,7 +7083,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c struct wined3d_device *device = view->resource->device; /* Call wined3d_object_destroyed() before releasing the resource, -@@ -225,6 +238,24 @@ +@@ -233,6 +246,24 @@ view->parent_ops->wined3d_object_destroyed(view->parent); wined3d_resource_decref(view->resource); wined3d_cs_emit_shader_resource_view_destroy(device->cs, view);