[PATCH 1/5] ddraw: Get rid of a couple of redundant else-statements.
Henri Verbeet
hverbeet at codeweavers.com
Thu Mar 29 18:08:34 CDT 2012
---
dlls/ddraw/surface.c | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index cca17ab..bf36825 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -150,44 +150,50 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
TRACE("(%p) returning IDirectDrawSurface7 interface at %p\n", This, *obj);
return S_OK;
}
- else if (IsEqualGUID(riid, &IID_IDirectDrawSurface4))
+
+ if (IsEqualGUID(riid, &IID_IDirectDrawSurface4))
{
IDirectDrawSurface4_AddRef(&This->IDirectDrawSurface4_iface);
*obj = &This->IDirectDrawSurface4_iface;
TRACE("(%p) returning IDirectDrawSurface4 interface at %p\n", This, *obj);
return S_OK;
}
- else if (IsEqualGUID(riid, &IID_IDirectDrawSurface3))
+
+ if (IsEqualGUID(riid, &IID_IDirectDrawSurface3))
{
IDirectDrawSurface3_AddRef(&This->IDirectDrawSurface3_iface);
*obj = &This->IDirectDrawSurface3_iface;
TRACE("(%p) returning IDirectDrawSurface3 interface at %p\n", This, *obj);
return S_OK;
}
- else if (IsEqualGUID(riid, &IID_IDirectDrawSurface2))
+
+ if (IsEqualGUID(riid, &IID_IDirectDrawSurface2))
{
IDirectDrawSurface2_AddRef(&This->IDirectDrawSurface2_iface);
*obj = &This->IDirectDrawSurface2_iface;
TRACE("(%p) returning IDirectDrawSurface2 interface at %p\n", This, *obj);
return S_OK;
}
- else if (IsEqualGUID(riid, &IID_IDirectDrawSurface))
+
+ if (IsEqualGUID(riid, &IID_IDirectDrawSurface))
{
IDirectDrawSurface_AddRef(&This->IDirectDrawSurface_iface);
*obj = &This->IDirectDrawSurface_iface;
TRACE("(%p) returning IDirectDrawSurface interface at %p\n", This, *obj);
return S_OK;
}
- else if( IsEqualGUID(riid, &IID_IDirectDrawGammaControl) )
+
+ if (IsEqualGUID(riid, &IID_IDirectDrawGammaControl))
{
IDirectDrawGammaControl_AddRef(&This->IDirectDrawGammaControl_iface);
*obj = &This->IDirectDrawGammaControl_iface;
TRACE("(%p) returning IDirectDrawGammaControl interface at %p\n", This, *obj);
return S_OK;
}
- else if( IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D) ||
- IsEqualGUID(riid, &IID_IDirect3DHALDevice)||
- IsEqualGUID(riid, &IID_IDirect3DRGBDevice) )
+
+ if (IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D)
+ || IsEqualGUID(riid, &IID_IDirect3DHALDevice)
+ || IsEqualGUID(riid, &IID_IDirect3DRGBDevice))
{
IDirect3DDevice7 *d3d;
IDirect3DDeviceImpl *device_impl;
@@ -208,8 +214,9 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
WARN("Unable to create a IDirect3DDevice instance, returning E_NOINTERFACE\n");
return E_NOINTERFACE;
}
- else if (IsEqualGUID( &IID_IDirect3DTexture, riid ) ||
- IsEqualGUID( &IID_IDirect3DTexture2, riid ))
+
+ if (IsEqualGUID( &IID_IDirect3DTexture2, riid)
+ || IsEqualGUID(&IID_IDirect3DTexture, riid))
{
if (IsEqualGUID( &IID_IDirect3DTexture, riid ))
{
--
1.7.3.4
More information about the wine-patches
mailing list