d3drm: Get rid of unsafe_impl_from_IDirect3DRMFrame2().
This commit is contained in:
parent
7367685021
commit
4754a3d605
|
@ -88,7 +88,6 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame
|
||||||
return CONTAINING_RECORD(iface, IDirect3DRMFrameImpl, IDirect3DRMFrame3_iface);
|
return CONTAINING_RECORD(iface, IDirect3DRMFrameImpl, IDirect3DRMFrame3_iface);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface);
|
|
||||||
static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface);
|
static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface);
|
||||||
|
|
||||||
static inline IDirect3DRMLightArrayImpl *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface)
|
static inline IDirect3DRMLightArrayImpl *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface)
|
||||||
|
@ -604,14 +603,19 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddChild(IDirect3DRMFrame2* iface,
|
||||||
LPDIRECT3DRMFRAME child)
|
LPDIRECT3DRMFRAME child)
|
||||||
{
|
{
|
||||||
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface);
|
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface);
|
||||||
IDirect3DRMFrameImpl *frame = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)child);
|
IDirect3DRMFrame3 *frame;
|
||||||
|
HRESULT hr;
|
||||||
|
|
||||||
TRACE("(%p/%p)->(%p)\n", iface, This, child);
|
TRACE("(%p/%p)->(%p)\n", iface, This, child);
|
||||||
|
|
||||||
if (!frame)
|
if (!child)
|
||||||
return D3DRMERR_BADOBJECT;
|
return D3DRMERR_BADOBJECT;
|
||||||
|
hr = IDirect3DRMFrame_QueryInterface(child, &IID_IDirect3DRMFrame3, (void**)&frame);
|
||||||
|
if (hr != S_OK)
|
||||||
|
return D3DRMERR_BADOBJECT;
|
||||||
|
IDirect3DRMFrame_Release(child);
|
||||||
|
|
||||||
return IDirect3DRMFrame3_AddChild(&This->IDirect3DRMFrame3_iface, &frame->IDirect3DRMFrame3_iface);
|
return IDirect3DRMFrame3_AddChild(&This->IDirect3DRMFrame3_iface, frame);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI IDirect3DRMFrame2Impl_AddLight(IDirect3DRMFrame2* iface,
|
static HRESULT WINAPI IDirect3DRMFrame2Impl_AddLight(IDirect3DRMFrame2* iface,
|
||||||
|
@ -928,14 +932,19 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteChild(IDirect3DRMFrame2* iface
|
||||||
LPDIRECT3DRMFRAME frame)
|
LPDIRECT3DRMFRAME frame)
|
||||||
{
|
{
|
||||||
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface);
|
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface);
|
||||||
IDirect3DRMFrameImpl *child = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)frame);
|
IDirect3DRMFrame3 *child;
|
||||||
|
HRESULT hr;
|
||||||
|
|
||||||
TRACE("(%p/%p)->(%p)\n", iface, This, frame);
|
TRACE("(%p/%p)->(%p)\n", iface, This, frame);
|
||||||
|
|
||||||
if (!child)
|
if (!frame)
|
||||||
return D3DRMERR_BADOBJECT;
|
return D3DRMERR_BADOBJECT;
|
||||||
|
hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void**)&child);
|
||||||
|
if (hr != S_OK)
|
||||||
|
return D3DRMERR_BADOBJECT;
|
||||||
|
IDirect3DRMFrame_Release(frame);
|
||||||
|
|
||||||
return IDirect3DRMFrame3_DeleteChild(&This->IDirect3DRMFrame3_iface, &child->IDirect3DRMFrame3_iface);
|
return IDirect3DRMFrame3_DeleteChild(&This->IDirect3DRMFrame3_iface, child);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteLight(IDirect3DRMFrame2* iface,
|
static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteLight(IDirect3DRMFrame2* iface,
|
||||||
|
@ -2650,15 +2659,6 @@ static const struct IDirect3DRMFrame3Vtbl Direct3DRMFrame3_Vtbl =
|
||||||
IDirect3DRMFrame3Impl_GetMaterialOverride
|
IDirect3DRMFrame3Impl_GetMaterialOverride
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface)
|
|
||||||
{
|
|
||||||
if (!iface)
|
|
||||||
return NULL;
|
|
||||||
assert(iface->lpVtbl == &Direct3DRMFrame2_Vtbl);
|
|
||||||
|
|
||||||
return impl_from_IDirect3DRMFrame2(iface);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface)
|
static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface)
|
||||||
{
|
{
|
||||||
if (!iface)
|
if (!iface)
|
||||||
|
|
Loading…
Reference in New Issue