reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 20:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d3drm: Make IDirect3DRMx_CreateFrame() more forgiving about the parent frame.

Browse Source
This commit is contained in:
Michael Stefaniuc 2012-06-30 01:13:56 +02:00 committed by Alexandre Julliard
parent 65f686c8cd
commit 9e183990f2
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/d3drm/frame.c
View File

@ -2671,6 +2671,7 @@ static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3D
HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_iface)
{
IDirect3DRMFrameImpl* object;
HRESULT hr;
TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), parent, ret_iface);
@ -2687,18 +2688,18 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa
memcpy(&object->transform[0][0], &identity[0][0], sizeof(D3DRMMATRIX4D));
if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3))
if (parent)
{
if (parent)
IDirect3DRMFrame3_AddChild((IDirect3DRMFrame3*)parent, &object->IDirect3DRMFrame3_iface);
*ret_iface = (IUnknown*)&object->IDirect3DRMFrame3_iface;
}
else
{
if (parent)
IDirect3DRMFrame2_AddChild((IDirect3DRMFrame2*)parent, (IDirect3DRMFrame*)&object->IDirect3DRMFrame2_iface);
*ret_iface = (IUnknown*)&object->IDirect3DRMFrame2_iface;
IDirect3DRMFrame3 *p;
hr = IDirect3DRMFrame_QueryInterface(parent, &IID_IDirect3DRMFrame3, (void**)&p);
if (hr != S_OK)
return hr;
IDirect3DRMFrame_Release(parent);
IDirect3DRMFrame3_AddChild(p, &object->IDirect3DRMFrame3_iface);
}
hr = IDirect3DRMFrame3_QueryInterface(&object->IDirect3DRMFrame3_iface, riid, (void**)ret_iface);
IDirect3DRMFrame3_Release(&object->IDirect3DRMFrame3_iface);
return S_OK;
}