diff --git a/README.md b/README.md index 8c5c8705..fcd0486b 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,9 @@ Wine. All those differences are also documented on the Included bug fixes and improvements ----------------------------------- -**Bug fixes and features included in the next upcoming release [5]:** +**Bug fixes and features included in the next upcoming release [6]:** +* Add stub for D3DXFrameFind ([Wine Bug #38334](https://bugs.winehq.org/show_bug.cgi?id=38334)) * Add stub for d3d11.D3D11CreateDeviceAndSwapChain ([Wine Bug #33153](https://bugs.winehq.org/show_bug.cgi?id=33153)) * Fix check for texture levels in wined3d_device_update_texture ([Wine Bug #38048](https://bugs.winehq.org/show_bug.cgi?id=38048)) * Fix regression caused by blacklisting supported OpenGL extensions ([Wine Bug #38480](https://bugs.winehq.org/show_bug.cgi?id=38480)) diff --git a/debian/changelog b/debian/changelog index 5001c81d..7ab9087a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ wine-staging (1.7.42) UNRELEASED; urgency=low * Added patch to ignore garbage after decoding gif lines. * Added patch to fix various issues related to advapi32.LookupAccountSidA. * Added patch with stub for d3d11.D3D11CreateDeviceAndSwapChain. + * Added patch with stub for D3DXFrameFind. * Removed patch to avoid crash when trying to bind mshtml event scripts to window (fixed upstream). * Removed patch for stub of ntdll.WinSqmIsOptedIn (fixed upstream). * Removed patch to fix issues with invalid console handles for new processes (accepted upstream). diff --git a/patches/d3dx9_36-D3DXStubs/0005-d3dx9_36-Add-D3DXFrameFind-stub.patch b/patches/d3dx9_36-D3DXStubs/0005-d3dx9_36-Add-D3DXFrameFind-stub.patch new file mode 100644 index 00000000..b502b915 --- /dev/null +++ b/patches/d3dx9_36-D3DXStubs/0005-d3dx9_36-Add-D3DXFrameFind-stub.patch @@ -0,0 +1,309 @@ +From 6befe7a7b9230a78055fd539d3016c335b6d10ac 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 d54c3f4..c79e778 100644 +--- a/dlls/d3dx9_24/d3dx9_24.spec ++++ b/dlls/d3dx9_24/d3dx9_24.spec +@@ -131,7 +131,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec +index 699c212..8244c77 100644 +--- a/dlls/d3dx9_25/d3dx9_25.spec ++++ b/dlls/d3dx9_25/d3dx9_25.spec +@@ -131,7 +131,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec +index 827a3f3..5b8528b 100644 +--- a/dlls/d3dx9_26/d3dx9_26.spec ++++ b/dlls/d3dx9_26/d3dx9_26.spec +@@ -135,7 +135,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec +index 827a3f3..5b8528b 100644 +--- a/dlls/d3dx9_27/d3dx9_27.spec ++++ b/dlls/d3dx9_27/d3dx9_27.spec +@@ -135,7 +135,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec +index c602d1d..c62b334 100644 +--- a/dlls/d3dx9_28/d3dx9_28.spec ++++ b/dlls/d3dx9_28/d3dx9_28.spec +@@ -135,7 +135,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec +index c602d1d..c62b334 100644 +--- a/dlls/d3dx9_29/d3dx9_29.spec ++++ b/dlls/d3dx9_29/d3dx9_29.spec +@@ -135,7 +135,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec +index bb28fad..365bd5b 100644 +--- a/dlls/d3dx9_30/d3dx9_30.spec ++++ b/dlls/d3dx9_30/d3dx9_30.spec +@@ -135,7 +135,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec +index 2cfa618..5133705 100644 +--- a/dlls/d3dx9_31/d3dx9_31.spec ++++ b/dlls/d3dx9_31/d3dx9_31.spec +@@ -134,7 +134,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec +index 1889a47..b93865b 100644 +--- a/dlls/d3dx9_32/d3dx9_32.spec ++++ b/dlls/d3dx9_32/d3dx9_32.spec +@@ -134,7 +134,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec +index 1889a47..b93865b 100644 +--- a/dlls/d3dx9_33/d3dx9_33.spec ++++ b/dlls/d3dx9_33/d3dx9_33.spec +@@ -134,7 +134,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec +index 1889a47..b93865b 100644 +--- a/dlls/d3dx9_34/d3dx9_34.spec ++++ b/dlls/d3dx9_34/d3dx9_34.spec +@@ -134,7 +134,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec +index 1889a47..b93865b 100644 +--- a/dlls/d3dx9_35/d3dx9_35.spec ++++ b/dlls/d3dx9_35/d3dx9_35.spec +@@ -134,7 +134,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec +index e3bb568..ea7e74c 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 ptr) ++@ 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 d643b15..e09c240 100644 +--- a/dlls/d3dx9_36/mesh.c ++++ b/dlls/d3dx9_36/mesh.c +@@ -4044,6 +4044,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 f5508c2..9a5ed88 100644 +--- a/dlls/d3dx9_37/d3dx9_37.spec ++++ b/dlls/d3dx9_37/d3dx9_37.spec +@@ -135,7 +135,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec +index f5508c2..9a5ed88 100644 +--- a/dlls/d3dx9_38/d3dx9_38.spec ++++ b/dlls/d3dx9_38/d3dx9_38.spec +@@ -135,7 +135,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec +index f5508c2..9a5ed88 100644 +--- a/dlls/d3dx9_39/d3dx9_39.spec ++++ b/dlls/d3dx9_39/d3dx9_39.spec +@@ -135,7 +135,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec +index f5508c2..9a5ed88 100644 +--- a/dlls/d3dx9_40/d3dx9_40.spec ++++ b/dlls/d3dx9_40/d3dx9_40.spec +@@ -135,7 +135,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec +index f5508c2..9a5ed88 100644 +--- a/dlls/d3dx9_41/d3dx9_41.spec ++++ b/dlls/d3dx9_41/d3dx9_41.spec +@@ -135,7 +135,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec +index f5508c2..9a5ed88 100644 +--- a/dlls/d3dx9_42/d3dx9_42.spec ++++ b/dlls/d3dx9_42/d3dx9_42.spec +@@ -135,7 +135,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec +index 21d2cb4..122dff4 100644 +--- a/dlls/d3dx9_43/d3dx9_43.spec ++++ b/dlls/d3dx9_43/d3dx9_43.spec +@@ -133,7 +133,7 @@ + @ 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 D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices + @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices + @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm +-- +2.3.5 + diff --git a/patches/d3dx9_36-D3DXStubs/definition b/patches/d3dx9_36-D3DXStubs/definition index ea83ca4b..73334bb3 100644 --- a/patches/d3dx9_36-D3DXStubs/definition +++ b/patches/d3dx9_36-D3DXStubs/definition @@ -2,4 +2,5 @@ Fixes: [31984] Add stub for D3DXComputeTangentFrameEx Fixes: Add stub for D3DXIntersect Fixes: [26379] Support for D3DXComputeNormals Fixes: Add stub for D3DXComputeNormalMap +Fixes: [38334] Add stub for D3DXFrameFind Category: stable diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 79abc462..dde4f48b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -1879,6 +1879,7 @@ fi # | This patchset fixes the following Wine bugs: # | * [#31984] Add stub for D3DXComputeTangentFrameEx # | * [#26379] Support for D3DXComputeNormals +# | * [#38334] Add stub for D3DXFrameFind # | # | Modified files: # | * dlls/d3dx9_24/d3dx9_24.spec, dlls/d3dx9_25/d3dx9_25.spec, dlls/d3dx9_26/d3dx9_26.spec, dlls/d3dx9_27/d3dx9_27.spec, @@ -1893,11 +1894,13 @@ if test "$enable_d3dx9_36_D3DXStubs" -eq 1; then patch_apply d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-stub-for-D3DXIntersect.patch patch_apply d3dx9_36-D3DXStubs/0003-d3dx9_36-Implement-D3DXComputeNormals.patch patch_apply d3dx9_36-D3DXStubs/0004-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch + patch_apply d3dx9_36-D3DXStubs/0005-d3dx9_36-Add-D3DXFrameFind-stub.patch ( echo '+ { "Christian Costa", "d3dx9_36: Add stub for D3DXComputeTangentFrameEx.", 1 },'; echo '+ { "Christian Costa", "d3dx9_36: Add stub for D3DXIntersect.", 1 },'; echo '+ { "Christian Costa", "d3dx9_36: Implement D3DXComputeNormals.", 1 },'; echo '+ { "Christian Costa", "d3dx9_36: Add stub for D3DXComputeNormalMap.", 1 },'; + echo '+ { "Andrey Gusev", "d3dx9_36: Add D3DXFrameFind stub.", 1 },'; ) >> "$patchlist" fi