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

wined3d: Remove some redundant returns.

Browse Source
This commit is contained in:
Henri Verbeet 2009-12-29 17:10:20 +01:00 committed by Alexandre Julliard
parent 67cba48782
commit ea2f7a2739
5 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/wined3d/buffer.c
View File

@ -134,8 +134,6 @@ fail:
if (This->buffer_object) GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object)); if (This->buffer_object) GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object));
This->buffer_object = 0; This->buffer_object = 0;
LEAVE_GL(); LEAVE_GL();
return;
} }
static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This, static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This,
@ -936,7 +934,6 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface)
end: end:
context_release(context); context_release(context);
return;
} }
static WINED3DRESOURCETYPE STDMETHODCALLTYPE buffer_GetType(IWineD3DBuffer *iface) static WINED3DRESOURCETYPE STDMETHODCALLTYPE buffer_GetType(IWineD3DBuffer *iface)

15
dlls/wined3d/device.c
View File

@ -1297,14 +1297,9 @@ static void IWineD3DDeviceImpl_LoadLogo(IWineD3DDeviceImpl *This, const char *fi
IWineD3DDevice_ColorFill((IWineD3DDevice *) This, This->logo_surface, NULL, 0xffffffff); IWineD3DDevice_ColorFill((IWineD3DDevice *) This, This->logo_surface, NULL, 0xffffffff);
} }
out: out:
if(dcb) { if (dcb) DeleteDC(dcb);
DeleteDC(dcb); if (hbm) DeleteObject(hbm);
}
if(hbm) {
DeleteObject(hbm);
}
return;
} }
/* Context activation is done by the caller. */ /* Context activation is done by the caller. */
@ -1809,8 +1804,6 @@ static void WINAPI IWineD3DDeviceImpl_SetMultithreaded(IWineD3DDevice *iface) {
/*For now just store the flag(needed in case of ddraw) */ /*For now just store the flag(needed in case of ddraw) */
This->createParms.BehaviorFlags |= WINED3DCREATE_MULTITHREADED; This->createParms.BehaviorFlags |= WINED3DCREATE_MULTITHREADED;
return;
} }
static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain,
@ -6631,7 +6624,6 @@ static void WINAPI IWineD3DDeviceImpl_SetGammaRamp(IWineD3DDevice * iface, UINT
IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, pRamp); IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, pRamp);
IWineD3DSwapChain_Release(swapchain); IWineD3DSwapChain_Release(swapchain);
} }
return;
} }
static void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT iSwapChain, WINED3DGAMMARAMP* pRamp) { static void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT iSwapChain, WINED3DGAMMARAMP* pRamp) {
@ -6643,7 +6635,6 @@ static void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT i
IWineD3DSwapChain_GetGammaRamp(swapchain, pRamp); IWineD3DSwapChain_GetGammaRamp(swapchain, pRamp);
IWineD3DSwapChain_Release(swapchain); IWineD3DSwapChain_Release(swapchain);
} }
return;
} }

4
dlls/wined3d/state.c
View File

@ -4473,8 +4473,6 @@ static inline void drawPrimitiveTraceDataLocations(const struct wined3d_stream_i
TRACE_STRIDED((dataLocations), WINED3D_FFP_TEXCOORD5); TRACE_STRIDED((dataLocations), WINED3D_FFP_TEXCOORD5);
TRACE_STRIDED((dataLocations), WINED3D_FFP_TEXCOORD6); TRACE_STRIDED((dataLocations), WINED3D_FFP_TEXCOORD6);
TRACE_STRIDED((dataLocations), WINED3D_FFP_TEXCOORD7); TRACE_STRIDED((dataLocations), WINED3D_FFP_TEXCOORD7);
return;
} }
static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context)
@ -4878,8 +4876,6 @@ static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3
glEnable(GL_LIGHT0 + Index); glEnable(GL_LIGHT0 + Index);
checkGLcall("glEnable(GL_LIGHT0 + Index)"); checkGLcall("glEnable(GL_LIGHT0 + Index)");
} }
return;
} }
static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context)

4
dlls/wined3d/surface.c
View File

@ -809,7 +809,6 @@ void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb)
if (context) context_release(context); if (context) context_release(context);
} }
return;
} }
static void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { static void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) {
@ -928,8 +927,6 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) {
} }
context_release(context); context_release(context);
return;
} }
/* ****************************************************** /* ******************************************************
@ -2757,7 +2754,6 @@ static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL
if (context) context_release(context); if (context) context_release(context);
} }
return;
} }
#include <errno.h> #include <errno.h>

1
dlls/wined3d/surface_base.c
View File

@ -1866,7 +1866,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DL
void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb) { void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb) {
ERR("Should not be called on base texture\n"); ERR("Should not be called on base texture\n");
return;
} }
/* TODO: think about moving this down to resource? */ /* TODO: think about moving this down to resource? */