Christian Costa : d3drm: Texture callback cannot be passed directly. Texture object argument is different so disable it for now.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 549f8796dd0ad40afb2375f6484c46209d333539
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=549f8796dd0ad40afb2375f648...

Author: Christian Costa 
Date:   Fri Mar 16 08:16:02 2012 +0100

d3drm: Texture callback cannot be passed directly. Texture object argument is different so disable it for now.

---

dlls/d3drm/meshbuilder.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index 1641a5c..6f5451b 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -440,8 +440,11 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Load(IDirect3DRMMeshBuilder2*

TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg);

+    if (cb)
+        FIXME("Texture callback is not yet supported\n");
+
     return IDirect3DRMMeshBuilder3_Load(&This->IDirect3DRMMeshBuilder3_iface, filename, name,
-                                        loadflags, (D3DRMLOADTEXTURE3CALLBACK)cb, arg);
+                                        loadflags, NULL, arg);
 }

static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Save(IDirect3DRMMeshBuilder2* iface,