Module: wine Branch: master Commit: 4a53e89c113b3beee3a9067acf131f025e646cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a53e89c113b3beee3a9067acf...
Author: Christian Costa titan.costa@gmail.com Date: Thu May 10 07:52:20 2012 +0200
d3drm: Move some unsafe_impl_from_* call to where variables are declared.
---
dlls/d3drm/frame.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index b3d2f60..60e8966 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -224,12 +224,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddChild(IDirect3DRMFrame2* iface, LPDIRECT3DRMFRAME child) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - IDirect3DRMFrameImpl *frame; + IDirect3DRMFrameImpl *frame = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)child);
TRACE("(%p/%p)->(%p)\n", iface, This, child);
- frame = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)child); - if (!frame) return D3DRMERR_BADOBJECT;
@@ -524,12 +522,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteChild(IDirect3DRMFrame2* iface LPDIRECT3DRMFRAME frame) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - IDirect3DRMFrameImpl *child; + IDirect3DRMFrameImpl *child = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)frame);
TRACE("(%p/%p)->(%p)\n", iface, This, frame);
- child = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)frame); - if (!child) return D3DRMERR_BADOBJECT;