Christian Costa : d3drm: Attach mesh to the parent frame if any.
Alexandre Julliard
julliard at winehq.org
Wed May 16 14:22:42 CDT 2012
Module: wine
Branch: master
Commit: 3447f172301b0a709272eae1ae5ffd90613d65f4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3447f172301b0a709272eae1ae5ffd90613d65f4
Author: Christian Costa <titan.costa at gmail.com>
Date: Tue May 15 08:08:48 2012 +0200
d3drm: Attach mesh to the parent frame if any.
---
dlls/d3drm/d3drm.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index b014369..ba666dc 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -1298,7 +1298,7 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI
{
LPDIRECT3DRMMESHBUILDER3 meshbuilder;
- FIXME("Load mesh data and notify application\n");
+ TRACE("Load mesh data and notify application\n");
hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder);
if (SUCCEEDED(hr))
@@ -1312,7 +1312,9 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI
if (SUCCEEDED(hr))
{
/* Only top level objects are notified */
- if (!parent_frame)
+ if (parent_frame)
+ IDirect3DRMFrame3_AddVisual(parent_frame, (IUnknown*)meshbuilder);
+ else
LoadProc(object, GUIDs[i], ArgLP);
}
IDirect3DRMObject_Release(object);
More information about the wine-cvs
mailing list