diff --git a/patches/d3dx9_36-D3DXDisassembleShader/0003-d3dx9_36-Add-stub-for-D3DXFillCubeTextureTX.patch b/patches/d3dx9_36-D3DXDisassembleShader/0003-d3dx9_36-Add-stub-for-D3DXFillCubeTextureTX.patch index c581c645..43d9e379 100644 --- a/patches/d3dx9_36-D3DXDisassembleShader/0003-d3dx9_36-Add-stub-for-D3DXFillCubeTextureTX.patch +++ b/patches/d3dx9_36-D3DXDisassembleShader/0003-d3dx9_36-Add-stub-for-D3DXFillCubeTextureTX.patch @@ -1,15 +1,190 @@ -From 69f8c78d512db8203eeaf3a89d8750173d4266a5 Mon Sep 17 00:00:00 2001 +From 49076031703fa90ccaf5fe20bed5b000ff470a91 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Sat, 13 Feb 2016 15:27:46 +0100 Subject: d3dx9_36: Add stub for D3DXFillCubeTextureTX. --- + 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/shader.c | 10 ++++++++++ - 2 files changed, 11 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, 30 insertions(+), 20 deletions(-) +diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec +index f182d7e..70710d2 100644 +--- a/dlls/d3dx9_24/d3dx9_24.spec ++++ b/dlls/d3dx9_24/d3dx9_24.spec +@@ -119,7 +119,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec +index 300dc1d..aff943b 100644 +--- a/dlls/d3dx9_25/d3dx9_25.spec ++++ b/dlls/d3dx9_25/d3dx9_25.spec +@@ -119,7 +119,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec +index 79e0a0c..28aafdf 100644 +--- a/dlls/d3dx9_26/d3dx9_26.spec ++++ b/dlls/d3dx9_26/d3dx9_26.spec +@@ -123,7 +123,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec +index 79e0a0c..28aafdf 100644 +--- a/dlls/d3dx9_27/d3dx9_27.spec ++++ b/dlls/d3dx9_27/d3dx9_27.spec +@@ -123,7 +123,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec +index abbfa94..3e2a6a5 100644 +--- a/dlls/d3dx9_28/d3dx9_28.spec ++++ b/dlls/d3dx9_28/d3dx9_28.spec +@@ -123,7 +123,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec +index abbfa94..3e2a6a5 100644 +--- a/dlls/d3dx9_29/d3dx9_29.spec ++++ b/dlls/d3dx9_29/d3dx9_29.spec +@@ -123,7 +123,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec +index 0269caa..f131737 100644 +--- a/dlls/d3dx9_30/d3dx9_30.spec ++++ b/dlls/d3dx9_30/d3dx9_30.spec +@@ -123,7 +123,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec +index be37e8f..cb5f68c 100644 +--- a/dlls/d3dx9_31/d3dx9_31.spec ++++ b/dlls/d3dx9_31/d3dx9_31.spec +@@ -122,7 +122,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec +index 6d9e244..882058f 100644 +--- a/dlls/d3dx9_32/d3dx9_32.spec ++++ b/dlls/d3dx9_32/d3dx9_32.spec +@@ -122,7 +122,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec +index 6d9e244..882058f 100644 +--- a/dlls/d3dx9_33/d3dx9_33.spec ++++ b/dlls/d3dx9_33/d3dx9_33.spec +@@ -122,7 +122,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec +index 6d9e244..882058f 100644 +--- a/dlls/d3dx9_34/d3dx9_34.spec ++++ b/dlls/d3dx9_34/d3dx9_34.spec +@@ -122,7 +122,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec +index 6d9e244..882058f 100644 +--- a/dlls/d3dx9_35/d3dx9_35.spec ++++ b/dlls/d3dx9_35/d3dx9_35.spec +@@ -122,7 +122,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec -index 28f1a26..97d35d9 100644 +index 2db0152..88f1b4b 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -123,7 +123,7 @@ @@ -22,10 +197,10 @@ index 28f1a26..97d35d9 100644 @ stub D3DXFillTextureTX(ptr ptr) @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c -index 8a9cbf2..f964c2d 100644 +index 4dbecb1..5e03098 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c -@@ -2564,3 +2564,13 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader +@@ -2413,3 +2413,13 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader return D3D_OK; } @@ -39,6 +214,97 @@ index 8a9cbf2..f964c2d 100644 + + return D3D_OK; +} +diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec +index 2db0152..88f1b4b 100644 +--- a/dlls/d3dx9_37/d3dx9_37.spec ++++ b/dlls/d3dx9_37/d3dx9_37.spec +@@ -123,7 +123,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec +index 2db0152..88f1b4b 100644 +--- a/dlls/d3dx9_38/d3dx9_38.spec ++++ b/dlls/d3dx9_38/d3dx9_38.spec +@@ -123,7 +123,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec +index 2db0152..88f1b4b 100644 +--- a/dlls/d3dx9_39/d3dx9_39.spec ++++ b/dlls/d3dx9_39/d3dx9_39.spec +@@ -123,7 +123,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec +index 2db0152..88f1b4b 100644 +--- a/dlls/d3dx9_40/d3dx9_40.spec ++++ b/dlls/d3dx9_40/d3dx9_40.spec +@@ -123,7 +123,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec +index 2db0152..88f1b4b 100644 +--- a/dlls/d3dx9_41/d3dx9_41.spec ++++ b/dlls/d3dx9_41/d3dx9_41.spec +@@ -123,7 +123,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec +index 9a69e76..e996089 100644 +--- a/dlls/d3dx9_42/d3dx9_42.spec ++++ b/dlls/d3dx9_42/d3dx9_42.spec +@@ -121,7 +121,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) +diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec +index 9a69e76..e996089 100644 +--- a/dlls/d3dx9_43/d3dx9_43.spec ++++ b/dlls/d3dx9_43/d3dx9_43.spec +@@ -121,7 +121,7 @@ + @ stdcall D3DXDisassembleShader(ptr long str ptr) + @ stdcall D3DXFileCreate(ptr) + @ stdcall D3DXFillCubeTexture(ptr ptr ptr) +-@ stub D3DXFillCubeTextureTX(ptr ptr) ++@ stdcall D3DXFillCubeTextureTX(ptr ptr) + @ stdcall D3DXFillTexture(ptr ptr ptr) + @ stub D3DXFillTextureTX(ptr ptr) + @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) -- -2.7.1 +2.9.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 4cd0dc01..f967318e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -3012,7 +3012,12 @@ fi # | * d3dx9_36-GetShaderSemantics # | # | Modified files: -# | * dlls/d3dx9_36/d3dx9_36.spec, dlls/d3dx9_36/shader.c, dlls/d3dx9_36/tests/shader.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/shader.c, dlls/d3dx9_36/tests/shader.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_D3DXDisassembleShader" -eq 1; then patch_apply d3dx9_36-D3DXDisassembleShader/0003-d3dx9_36-Add-stub-for-D3DXFillCubeTextureTX.patch