ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Use proper helpers for iface calls.

This commit is contained in:
Jacek Caban 2012-08-27 12:27:48 +02:00 committed by Alexandre Julliard
parent 1524cc2ab7
commit 4551135f7a
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ddraw/material.c
View File

@ -75,7 +75,7 @@ static HRESULT WINAPI d3d_material3_QueryInterface(IDirect3DMaterial3 *iface, RE
if (IsEqualGUID(&IID_IUnknown, riid)) if (IsEqualGUID(&IID_IUnknown, riid))
{ {
IUnknown_AddRef(iface); IDirect3DMaterial3_AddRef(iface);
*obp = iface; *obp = iface;
TRACE(" Creating IUnknown interface at %p.\n", *obp); TRACE(" Creating IUnknown interface at %p.\n", *obp);
return S_OK; return S_OK;

20
dlls/ddraw/surface.c
View File

@ -5440,13 +5440,13 @@ struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 *
if (!iface) return NULL; if (!iface) return NULL;
if (iface->lpVtbl != &ddraw_surface7_vtbl) if (iface->lpVtbl != &ddraw_surface7_vtbl)
{ {
HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface7, (void **)&iface); HRESULT hr = IDirectDrawSurface7_QueryInterface(iface, &IID_IDirectDrawSurface7, (void **)&iface);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Object %p doesn't expose interface IDirectDrawSurface7.\n", iface); WARN("Object %p doesn't expose interface IDirectDrawSurface7.\n", iface);
return NULL; return NULL;
} }
IUnknown_Release(iface); IDirectDrawSurface7_Release(iface);
} }
return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface7_iface); return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface7_iface);
} }
@ -5456,13 +5456,13 @@ struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *
if (!iface) return NULL; if (!iface) return NULL;
if (iface->lpVtbl != &ddraw_surface4_vtbl) if (iface->lpVtbl != &ddraw_surface4_vtbl)
{ {
HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface4, (void **)&iface); HRESULT hr = IDirectDrawSurface4_QueryInterface(iface, &IID_IDirectDrawSurface4, (void **)&iface);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Object %p doesn't expose interface IDirectDrawSurface4.\n", iface); WARN("Object %p doesn't expose interface IDirectDrawSurface4.\n", iface);
return NULL; return NULL;
} }
IUnknown_Release(iface); IDirectDrawSurface4_Release(iface);
} }
return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface4_iface); return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface4_iface);
} }
@ -5472,13 +5472,13 @@ static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSur
if (!iface) return NULL; if (!iface) return NULL;
if (iface->lpVtbl != &ddraw_surface3_vtbl) if (iface->lpVtbl != &ddraw_surface3_vtbl)
{ {
HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface3, (void **)&iface); HRESULT hr = IDirectDrawSurface3_QueryInterface(iface, &IID_IDirectDrawSurface3, (void **)&iface);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Object %p doesn't expose interface IDirectDrawSurface3.\n", iface); WARN("Object %p doesn't expose interface IDirectDrawSurface3.\n", iface);
return NULL; return NULL;
} }
IUnknown_Release(iface); IDirectDrawSurface3_Release(iface);
} }
return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface3_iface); return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface3_iface);
} }
@ -5488,13 +5488,13 @@ static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSur
if (!iface) return NULL; if (!iface) return NULL;
if (iface->lpVtbl != &ddraw_surface2_vtbl) if (iface->lpVtbl != &ddraw_surface2_vtbl)
{ {
HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface2, (void **)&iface); HRESULT hr = IDirectDrawSurface2_QueryInterface(iface, &IID_IDirectDrawSurface2, (void **)&iface);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Object %p doesn't expose interface IDirectDrawSurface2.\n", iface); WARN("Object %p doesn't expose interface IDirectDrawSurface2.\n", iface);
return NULL; return NULL;
} }
IUnknown_Release(iface); IDirectDrawSurface2_Release(iface);
} }
return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface2_iface); return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface2_iface);
} }
@ -5504,13 +5504,13 @@ struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface *if
if (!iface) return NULL; if (!iface) return NULL;
if (iface->lpVtbl != &ddraw_surface1_vtbl) if (iface->lpVtbl != &ddraw_surface1_vtbl)
{ {
HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface, (void **)&iface); HRESULT hr = IDirectDrawSurface_QueryInterface(iface, &IID_IDirectDrawSurface, (void **)&iface);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Object %p doesn't expose interface IDirectDrawSurface.\n", iface); WARN("Object %p doesn't expose interface IDirectDrawSurface.\n", iface);
return NULL; return NULL;
} }
IUnknown_Release(iface); IDirectDrawSurface_Release(iface);
} }
return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface_iface); return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface_iface);
} }

6
dlls/ddraw/vertexbuffer.c
View File

@ -66,21 +66,21 @@ static HRESULT WINAPI d3d_vertex_buffer7_QueryInterface(IDirect3DVertexBuffer7 *
if ( IsEqualGUID( &IID_IUnknown, riid ) ) if ( IsEqualGUID( &IID_IUnknown, riid ) )
{ {
IUnknown_AddRef(iface); IDirect3DVertexBuffer7_AddRef(iface);
*obj = iface; *obj = iface;
TRACE(" Creating IUnknown interface at %p.\n", *obj); TRACE(" Creating IUnknown interface at %p.\n", *obj);
return S_OK; return S_OK;
} }
if ( IsEqualGUID( &IID_IDirect3DVertexBuffer, riid ) ) if ( IsEqualGUID( &IID_IDirect3DVertexBuffer, riid ) )
{ {
IUnknown_AddRef(iface); IDirect3DVertexBuffer7_AddRef(iface);
*obj = &buffer->IDirect3DVertexBuffer_iface; *obj = &buffer->IDirect3DVertexBuffer_iface;
TRACE(" Creating IDirect3DVertexBuffer interface %p\n", *obj); TRACE(" Creating IDirect3DVertexBuffer interface %p\n", *obj);
return S_OK; return S_OK;
} }
if ( IsEqualGUID( &IID_IDirect3DVertexBuffer7, riid ) ) if ( IsEqualGUID( &IID_IDirect3DVertexBuffer7, riid ) )
{ {
IUnknown_AddRef(iface); IDirect3DVertexBuffer7_AddRef(iface);
*obj = iface; *obj = iface;
TRACE(" Creating IDirect3DVertexBuffer7 interface %p\n", *obj); TRACE(" Creating IDirect3DVertexBuffer7 interface %p\n", *obj);
return S_OK; return S_OK;