From cf1d00bb08ffd2f5ea565f2a5f0d8eb5695d3677 Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Sun, 9 Jan 2005 16:42:53 +0000 Subject: [PATCH] Removed excessive statement (break after return or goto, not useful break, not needed vars...) --- dlls/comctl32/comboex.c | 2 -- dlls/comctl32/datetime.c | 1 - dlls/comctl32/flatsb.c | 1 - dlls/comctl32/header.c | 1 - dlls/comctl32/listview.c | 1 - dlls/comctl32/monthcal.c | 1 - dlls/comctl32/nativefont.c | 1 - dlls/comctl32/pager.c | 2 -- dlls/comctl32/propsheet.c | 2 -- dlls/comctl32/rebar.c | 1 - dlls/comctl32/smoothscroll.c | 2 -- dlls/comctl32/status.c | 1 - dlls/comctl32/tab.c | 2 -- dlls/comctl32/toolbar.c | 1 - dlls/comctl32/tooltips.c | 5 ----- dlls/comctl32/trackbar.c | 1 - dlls/comctl32/treeview.c | 1 - dlls/commdlg/colordlg.c | 5 ++--- dlls/d3d8/cubetexture.c | 6 ++---- dlls/d3d8/texture.c | 6 ++---- dlls/d3d8/utils.c | 2 -- dlls/d3d9/cubetexture.c | 6 +++--- dlls/d3d9/texture.c | 6 ++---- dlls/d3d9/volumetexture.c | 6 ++---- dlls/dbghelp/type.c | 1 - dlls/ddraw/mesa.c | 2 -- dlls/dmband/band.c | 1 - dlls/dmcompos/chordmap.c | 1 - dlls/dmime/audiopath.c | 1 - dlls/dmime/graph.c | 1 - dlls/dmime/performance.c | 2 -- dlls/dmloader/container.c | 1 - dlls/dmscript/script.c | 1 - dlls/dmstyle/style.c | 1 - dlls/dmusic/collection.c | 1 - dlls/dsound/capture.c | 2 -- dlls/dsound/propset.c | 2 -- dlls/dswave/dswave.c | 2 -- dlls/mapi32/prop.c | 1 - dlls/mapi32/tests/prop.c | 1 - dlls/msacm/imaadp32/imaadp32.c | 1 - dlls/msacm/msadp32/msadp32.c | 1 - dlls/msacm/msg711/msg711.c | 1 - dlls/msacm/pcmconverter.c | 3 +-- dlls/msacm/winemp3/mpegl3.c | 1 - dlls/msrle32/msrle32.c | 1 - dlls/ole32/ftmarshal.c | 2 -- dlls/oleaut32/olepicture.c | 1 - dlls/oleaut32/tmarshal.c | 1 - dlls/oleaut32/varformat.c | 5 ----- dlls/oleaut32/variant.c | 22 +++++++++++----------- dlls/quartz/systemclock.c | 1 - dlls/rsaenh/rsaenh.c | 1 - dlls/shdocvw/shdocvw_main.c | 1 - dlls/shell32/shlview.c | 2 -- dlls/shlwapi/string.c | 1 - dlls/winaspi/winaspi16.c | 1 - dlls/wineps/bitmap.c | 1 - dlls/wineps/driver.c | 2 -- dlls/wineps/escape.c | 1 - dlls/x11drv/wintab.c | 4 +--- dlls/x11drv/xfont.c | 1 - 62 files changed, 26 insertions(+), 113 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 94b5a82679..12ce608718 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1840,7 +1840,6 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return CallWindowProcW (infoPtr->prevEditWndProc, hwnd, uMsg, wParam, lParam); } - return 0; } @@ -2243,7 +2242,6 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ERR("unknown msg %04x wp=%08x lp=%08lx\n",uMsg,wParam,lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } - return 0; } diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 2b2d0ab75f..80cdb826d0 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1085,7 +1085,6 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } - return 0; } diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c index 9fd0913c71..d68f7b19d9 100644 --- a/dlls/comctl32/flatsb.c +++ b/dlls/comctl32/flatsb.c @@ -261,7 +261,6 @@ FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) uMsg, wParam, lParam); return DefWindowProcA (hwnd, uMsg, wParam, lParam); } - return 0; } diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 743725c760..c71bb6afed 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1831,7 +1831,6 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) msg, wParam, lParam ); return DefWindowProcA (hwnd, msg, wParam, lParam); } - return 0; } diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0cb7636e69..b5e40eb4ac 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9293,7 +9293,6 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return DefWindowProcW(hwnd, uMsg, wParam, lParam); } - return 0; } /*** diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index f1130aedb3..8f6e551e1d 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2016,7 +2016,6 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ERR( "unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcA(hwnd, uMsg, wParam, lParam); } - return 0; } diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c index 86d1e79fa9..4695e7fb8a 100644 --- a/dlls/comctl32/nativefont.c +++ b/dlls/comctl32/nativefont.c @@ -106,7 +106,6 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } - return 0; } diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 8c267b7dbb..f8519e00c4 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -1368,8 +1368,6 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: return DefWindowProcW (hwnd, uMsg, wParam, lParam); } - - return 0; } diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index c49672fc97..f4ebef74ee 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3690,6 +3690,4 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: return FALSE; } - - return FALSE; } diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 069734ea6f..82062c6db9 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -4696,7 +4696,6 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) uMsg, wParam, lParam); return DefWindowProcA (hwnd, uMsg, wParam, lParam); } - return 0; } diff --git a/dlls/comctl32/smoothscroll.c b/dlls/comctl32/smoothscroll.c index d1074029bc..f70c664f45 100644 --- a/dlls/comctl32/smoothscroll.c +++ b/dlls/comctl32/smoothscroll.c @@ -72,7 +72,6 @@ BOOL WINAPI SmoothScrollWindow( SMOOTHSCROLLSTRUCT *smooth ) { LPRECT lpupdaterect = smooth->lpupdaterect; HRGN hrgnupdate = smooth->hrgnupdate; RECT tmprect; - BOOL ret = TRUE; DWORD flags = smooth->flags; if (smooth->dwSize!=sizeof(SMOOTHSCROLLSTRUCT)) @@ -129,5 +128,4 @@ BOOL WINAPI SmoothScrollWindow( SMOOTHSCROLLSTRUCT *smooth ) { smooth->lpcliprect,hrgnupdate,lpupdaterect, flags & 0xffff ); - return ret; } diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 67c9298ece..b41288c954 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1250,7 +1250,6 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) msg, wParam, lParam); return DefWindowProcW (hwnd, msg, wParam, lParam); } - return 0; } diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 53cd401f72..0165497101 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -3270,8 +3270,6 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam); } - - return 0; } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2172c8519d..d1dff0cdfd 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -7097,7 +7097,6 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } - return 0; } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index b31f71917e..b93329ec06 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1400,8 +1400,6 @@ TOOLTIPS_GetCurrentToolA (HWND hwnd, WPARAM wParam, LPARAM lParam) } else return (infoPtr->nCurrentTool != -1); - - return FALSE; } @@ -1438,8 +1436,6 @@ TOOLTIPS_GetCurrentToolW (HWND hwnd, WPARAM wParam, LPARAM lParam) } else return (infoPtr->nCurrentTool != -1); - - return FALSE; } @@ -2802,7 +2798,6 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } - return 0; } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index afd0442817..23ed9091e4 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1810,7 +1810,6 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } - return 0; } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 0f15c41a27..ab983d4c09 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5497,7 +5497,6 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) def: return DefWindowProcA(hwnd, uMsg, wParam, lParam); } - return 0; } diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c index 4490da11e7..6144ead2ea 100644 --- a/dlls/commdlg/colordlg.c +++ b/dlls/commdlg/colordlg.c @@ -1057,11 +1057,10 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, */ LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ) { - HDC hdc; PAINTSTRUCT ps; LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); - hdc = BeginPaint(hDlg, &ps); + BeginPaint(hDlg, &ps); /* we have to paint dialog children except text and buttons */ CC_PaintPredefColorArray(hDlg, 6, 8); CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors); @@ -1072,7 +1071,7 @@ LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ) CC_PaintColorGraph(hDlg); EndPaint(hDlg, &ps); - return TRUE; + return TRUE; } /*********************************************************************** diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 04ad395fea..fb6afed67a 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -224,11 +224,9 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(LPDIRECT3DCUBETEXT if (Level < This->levels) { TRACE("(%p) level (%d)\n", This, Level); return IDirect3DSurface8Impl_GetDesc((LPDIRECT3DSURFACE8) This->surfaces[0][Level], pDesc); - } else { - FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->levels); - return D3DERR_INVALIDCALL; } - return D3D_OK; + FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->levels); + return D3DERR_INVALIDCALL; } HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, UINT Level, IDirect3DSurface8** ppCubeMapSurface) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index a19169d657..89731d3902 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -182,11 +182,9 @@ HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(LPDIRECT3DTEXTURE8 ifa if (Level < This->levels) { TRACE("(%p) Level (%d)\n", This, Level); return IDirect3DSurface8Impl_GetDesc((LPDIRECT3DSURFACE8) This->surfaces[Level], pDesc); - } else { - FIXME("Levels seems too high?!!\n"); - return D3DERR_INVALIDCALL; } - return D3D_OK; + FIXME("Levels seems too high?!!\n"); + return D3DERR_INVALIDCALL; } HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE8 iface, UINT Level, IDirect3DSurface8** ppSurfaceLevel) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; diff --git a/dlls/d3d8/utils.c b/dlls/d3d8/utils.c index 92f854bd10..8bde498839 100644 --- a/dlls/d3d8/utils.c +++ b/dlls/d3d8/utils.c @@ -286,7 +286,6 @@ const char* debug_d3dtexturestate(DWORD state) { case 12: /* Note D3DTSS are not consecutive, so skip these */ return "unused"; - break; default: FIXME("Unrecognized %lu texture state!\n", state); return "unrecognized"; @@ -1336,7 +1335,6 @@ void set_tex_op(LPDIRECT3DDEVICE8 iface, BOOL isAlpha, int Stage, D3DTEXTUREOP o */ LEAVE_GL(); return; - break; } } diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 984c3a123f..355eee46e5 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -150,10 +150,10 @@ HRESULT WINAPI IDirect3DCubeTexture9Impl_GetLevelDesc(LPDIRECT3DCUBETEXTURE9 ifa if (Level < This->levels) { TRACE("(%p) level (%d)\n", This, Level); return IDirect3DSurface9Impl_GetDesc((LPDIRECT3DSURFACE9) This->surfaces[0][Level], pDesc); - } else { - FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->levels); - return D3DERR_INVALIDCALL; } + FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->levels); + return D3DERR_INVALIDCALL; + return D3D_OK; } diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index ad7b9aa9d3..80eb5ca0af 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -149,11 +149,9 @@ HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(LPDIRECT3DTEXTURE9 iface, UINT if (Level < This->levels) { TRACE("(%p) Level (%d)\n", This, Level); return IDirect3DSurface9Impl_GetDesc((LPDIRECT3DSURFACE9) This->surfaces[Level], pDesc); - } else { - FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->levels); - return D3DERR_INVALIDCALL; } - return D3D_OK; + FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->levels); + return D3DERR_INVALIDCALL; } HRESULT WINAPI IDirect3DTexture9Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE9 iface, UINT Level, IDirect3DSurface9** ppSurfaceLevel) { diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 56c150685b..9ece78531c 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -148,11 +148,9 @@ HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetLevelDesc(LPDIRECT3DVOLUMETEXTURE9 if (Level < This->levels) { TRACE("(%p) Level (%d)\n", This, Level); return IDirect3DVolume9Impl_GetDesc((LPDIRECT3DVOLUME9) This->volumes[Level], pDesc); - } else { - FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->levels); - return D3DERR_INVALIDCALL; } - return D3D_OK; + FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->levels); + return D3DERR_INVALIDCALL; } HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetVolumeLevel(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level, IDirect3DVolume9** ppVolumeLevel) { diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 6c9fd2ed48..2abd3a4e42 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -590,7 +590,6 @@ BOOL symt_get_info(const struct symt* type, IMAGEHLP_SYMBOL_TYPE_INFO req, break; case SymTagTypedef: return symt_get_info(((const struct symt_typedef*)type)->type, TI_GET_LENGTH, pInfo); - break; case SymTagThunk: X(DWORD) = ((const struct symt_thunk*)type)->size; break; diff --git a/dlls/ddraw/mesa.c b/dlls/ddraw/mesa.c index f4f5e3324a..ef447eb41b 100644 --- a/dlls/ddraw/mesa.c +++ b/dlls/ddraw/mesa.c @@ -668,7 +668,6 @@ HRESULT upload_surface_to_tex_memory_init(IDirectDrawSurfaceImpl *surf_ptr, GLui default: FIXME("FourCC Not supported\n"); return DD_OK; - break; } if (GL_extensions.s3tc_compressed_texture) { @@ -971,7 +970,6 @@ HRESULT upload_surface_to_tex_memory(RECT *rect, DWORD xoffset, DWORD yoffset, v default: FIXME("Not supported\n"); return DD_OK; - break; } if (GL_extensions.s3tc_compressed_texture) { diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index c9c5f3d250..6613eeb6f0 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -301,7 +301,6 @@ HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_ParseDescriptor (LPDIRECT } TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); - break; } else { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 6b140335ae..7510fa739a 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -292,7 +292,6 @@ HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_ParseDescriptor (LPDI } TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); - break; } else { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 0ade545ef3..15c3e46d61 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -402,7 +402,6 @@ HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_ParseDescriptor (LPD } TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); - break; } else { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index b4e7cd908a..0aed58d7ff 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -368,7 +368,6 @@ HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicObject_ParseDescriptor (LPDIREC } TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); - break; } else { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 1fa5e565b9..13fa0364cf 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -120,7 +120,6 @@ outrefresh: case WM_QUIT: case PROCESSMSG_EXIT: goto outofthread; - break; case PROCESSMSG_START: break; case PROCESSMSG_ADD: @@ -837,7 +836,6 @@ HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath (LPDIRECTMUS HeapFree(GetProcessHeap(), 0, default_path); *ppNewPath = NULL; return E_INVALIDARG; - break; } /* FIXME: Should we create one secondary buffer for each PChannel? */ diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 0a006c426c..7899165aad 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -375,7 +375,6 @@ HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_ParseDescriptor (LPD } TRACE_(dmfile)(": StreamCount[0] = 0x%08lX < StreamSize[0] = 0x%08lX\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); - break; } else { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 6b4da3ac9d..aeaa245418 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -365,7 +365,6 @@ HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor (LPDIRE } TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); - break; } else { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 2fb738559d..7bc2882325 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -369,7 +369,6 @@ HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_ParseDescriptor (LPDIRE } TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); - break; } else { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 7193939e72..8297a88502 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -349,7 +349,6 @@ HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor (LP } TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); - break; } else { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 576abb0f15..ecc92280b2 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1716,8 +1716,6 @@ DirectSoundFullDuplexCreate( WARN("IDirectSoundFullDuplexImpl_Initialize failed\n"); return hres; } - - return DSERR_GENERIC; } static HRESULT WINAPI diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index d912898af6..cd420869bc 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -615,7 +615,6 @@ static HRESULT WINAPI DSPROPERTY_DescriptionA( WARN("waveInMessage failed\n"); return E_PROP_ID_UNSUPPORTED; } - break; } } } else { @@ -771,7 +770,6 @@ static HRESULT WINAPI DSPROPERTY_DescriptionW( WARN("waveInMessage failed\n"); return E_PROP_ID_UNSUPPORTED; } - break; } } } else { diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index df6fe3f48d..1e5cb3597a 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -484,7 +484,6 @@ HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_ParseDescriptor (LPDIRECT } TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); - break; } else { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; @@ -667,7 +666,6 @@ HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_Load (LPPERSISTSTREAM iface, } TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); - break; } else { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index c9f0cf18f5..665c01b3cd 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -268,7 +268,6 @@ ULONG WINAPI UlPropSize(LPSPropValue lpProp) break; case PT_BINARY: ulRet = lpProp->Value.bin.cb; break; - break; case PT_OBJECT: default: ulRet = 0u; break; diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 43c6369c2d..d72d7612ed 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -740,7 +740,6 @@ static void test_ScCountProps(void) pv.Value.MVft.lpft = (FILETIME*)iid; exp = 3 * sizeof(CY) + sizeof(pv); break; - break; case PT_MV_STRING8: pv.Value.MVszA.cValues = 3; pv.Value.MVszA.lppszA = buffa; diff --git a/dlls/msacm/imaadp32/imaadp32.c b/dlls/msacm/imaadp32/imaadp32.c index a4a3535d13..929a86d79b 100644 --- a/dlls/msacm/imaadp32/imaadp32.c +++ b/dlls/msacm/imaadp32/imaadp32.c @@ -934,5 +934,4 @@ LRESULT CALLBACK ADPCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg, default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } - return 0; } diff --git a/dlls/msacm/msadp32/msadp32.c b/dlls/msacm/msadp32/msadp32.c index bf17154537..1fff8c8c06 100644 --- a/dlls/msacm/msadp32/msadp32.c +++ b/dlls/msacm/msadp32/msadp32.c @@ -777,5 +777,4 @@ LRESULT CALLBACK ADPCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg, default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } - return 0; } diff --git a/dlls/msacm/msg711/msg711.c b/dlls/msacm/msg711/msg711.c index e219af093b..a49f90f038 100644 --- a/dlls/msacm/msg711/msg711.c +++ b/dlls/msacm/msg711/msg711.c @@ -1161,5 +1161,4 @@ LRESULT CALLBACK G711_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg, default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } - return 0; } diff --git a/dlls/msacm/pcmconverter.c b/dlls/msacm/pcmconverter.c index 4678f49ace..277f209ba9 100644 --- a/dlls/msacm/pcmconverter.c +++ b/dlls/msacm/pcmconverter.c @@ -794,8 +794,8 @@ static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (dwQuery) { case ACM_FORMATDETAILSF_FORMAT: if (PCM_GetFormatIndex(afd->pwfx) == 0xFFFFFFFF) { - return ACMERR_NOTPOSSIBLE; WARN("not possible\n"); + return ACMERR_NOTPOSSIBLE; } break; case ACM_FORMATDETAILSF_INDEX: @@ -1084,5 +1084,4 @@ LRESULT CALLBACK PCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg, default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } - return 0; } diff --git a/dlls/msacm/winemp3/mpegl3.c b/dlls/msacm/winemp3/mpegl3.c index c710a01db1..daf45dc123 100644 --- a/dlls/msacm/winemp3/mpegl3.c +++ b/dlls/msacm/winemp3/mpegl3.c @@ -606,5 +606,4 @@ LRESULT CALLBACK MPEG3_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg, default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } - return 0; } diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5bbf888d23..11c8ce58fb 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1849,7 +1849,6 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWORD dwDrvID, HDRVR hDrv, UINT uMsg, break; case ICM_SETQUALITY: return SetQuality(pi, *(LPLONG)lParam1); - break; case ICM_COMPRESS_GET_FORMAT: return CompressGetFormat(pi, (LPCBITMAPINFOHEADER)lParam1, (LPBITMAPINFOHEADER)lParam2); diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index ee5f9a4839..ae67a9afc0 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -156,8 +156,6 @@ HRESULT WINAPI FTMarshalImpl_GetMarshalSizeMax (LPMARSHAL iface, REFIID riid, vo hres = IMarshal_GetMarshalSizeMax (pMarshal, riid, pv, dwDestContext, pvDestContext, mshlflags, pSize); IMarshal_Release (pMarshal); return hres; - - return S_OK; } HRESULT WINAPI FTMarshalImpl_MarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid, void *pv, diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index cb3931f716..f3dc75cd88 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1172,7 +1172,6 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { FIXME("Trying to load GIF, but no support for libgif/libungif compiled in.\n"); return E_FAIL; #endif - break; } case 0xd8ff: { /* JPEG */ #ifdef HAVE_JPEGLIB_H diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index aa4db91493..f5de3858d1 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1156,7 +1156,6 @@ _get_funcdesc( } i++; } - return E_FAIL; } static DWORD diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 4319dbc7fa..43e086b15a 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1310,12 +1310,10 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, case FMT_NUM_YES_NO: boolFlag = VAR_BOOLYESNO; goto VARIANT_FormatNumber_Bool; - break; case FMT_NUM_ON_OFF: boolFlag = VAR_BOOLONOFF; goto VARIANT_FormatNumber_Bool; - break; case FMT_NUM_TRUE_FALSE: boolFlag = VAR_LOCALBOOL; @@ -1452,7 +1450,6 @@ VARIANT_FormatNumber_Bool: ERR("Unknown token 0x%02x!\n", *pToken); hRes = E_INVALIDARG; goto VARIANT_FormatNumber_Exit; - break; } if (localeValue) { @@ -1762,7 +1759,6 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, ERR("Unknown token 0x%02x!\n", *pToken); hRes = E_INVALIDARG; goto VARIANT_FormatDate_Exit; - break; } if (localeValue) { @@ -1916,7 +1912,6 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat, ERR("Unknown token 0x%02x!\n", *pToken); hRes = E_INVALIDARG; goto VARIANT_FormatString_Exit; - break; } pToken++; } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index fbac3cb59a..a6a1c184df 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -764,24 +764,24 @@ static inline size_t VARIANT_DataSize(const VARIANT* pv) switch (V_TYPE(pv)) { case VT_I1: - case VT_UI1: return sizeof(BYTE); break; + case VT_UI1: return sizeof(BYTE); case VT_I2: - case VT_UI2: return sizeof(SHORT); break; + case VT_UI2: return sizeof(SHORT); case VT_INT: case VT_UINT: case VT_I4: - case VT_UI4: return sizeof(LONG); break; + case VT_UI4: return sizeof(LONG); case VT_I8: - case VT_UI8: return sizeof(LONGLONG); break; - case VT_R4: return sizeof(float); break; - case VT_R8: return sizeof(double); break; - case VT_DATE: return sizeof(DATE); break; - case VT_BOOL: return sizeof(VARIANT_BOOL); break; + case VT_UI8: return sizeof(LONGLONG); + case VT_R4: return sizeof(float); + case VT_R8: return sizeof(double); + case VT_DATE: return sizeof(DATE); + case VT_BOOL: return sizeof(VARIANT_BOOL); case VT_DISPATCH: case VT_UNKNOWN: - case VT_BSTR: return sizeof(void*); break; - case VT_CY: return sizeof(CY); break; - case VT_ERROR: return sizeof(SCODE); break; + case VT_BSTR: return sizeof(void*); + case VT_CY: return sizeof(CY); + case VT_ERROR: return sizeof(SCODE); } TRACE("Shouldn't be called for vt %s%s!\n", debugstr_VT(pv), debugstr_VF(pv)); return 0; diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 03d4f8935d..37dd286114 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -149,7 +149,6 @@ outrefresh: case WM_QUIT: case ADVISE_EXIT: goto outofthread; - break; case ADVISE_ADD_SINGLESHOT: case ADVISE_ADD_PERIODIC: /** set timeout to 0 to do a rescan now */ diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 7813d7c5ff..549aa9a385 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2358,7 +2358,6 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, SetLastError(NTE_BAD_TYPE); return FALSE; } - return FALSE; } /****************************************************************************** diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index f0db509030..5bd2a697d7 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -414,7 +414,6 @@ static BOOL SHDOCVW_TryLoadMozillaControl() SHDOCVW_TryDownloadMozillaControl(); bTried = TRUE; } - return TRUE; } /************************************************************************* diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 8a20d2bb85..f844edbabf 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1380,7 +1380,6 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn } return TRUE; } - break; case LVN_ENDLABELEDITA: { @@ -1411,7 +1410,6 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn } return FALSE; } - break; case LVN_KEYDOWN: { diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 8550a122dc..d059b22fba 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2565,7 +2565,6 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, lpDstStr[*lpiLen] = '\0'; return *lpiLen; } - break; default: break; } diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c index 3a4f182746..19b387290a 100644 --- a/dlls/winaspi/winaspi16.c +++ b/dlls/winaspi/winaspi16.c @@ -424,7 +424,6 @@ adapter name */ break; case SC_EXEC_SCSI_CMD: return ASPI_ExecScsiCmd((DWORD)ptrSRB, mode); - break; case SC_RESET_DEV: FIXME("Not implemented SC_RESET_DEV\n"); break; diff --git a/dlls/wineps/bitmap.c b/dlls/wineps/bitmap.c index 85a6118e04..5662d31269 100644 --- a/dlls/wineps/bitmap.c +++ b/dlls/wineps/bitmap.c @@ -146,7 +146,6 @@ static BOOL PSDRV_WriteImageHeader(PSDRV_PDEVICE *physDev, const BITMAPINFO *inf default: FIXME("Not implemented yet\n"); return FALSE; - break; } PSDRV_WriteImage(physDev, info->bmiHeader.biBitCount, xDst, yDst, diff --git a/dlls/wineps/driver.c b/dlls/wineps/driver.c index ce237c68b3..e3f8189873 100644 --- a/dlls/wineps/driver.c +++ b/dlls/wineps/driver.c @@ -278,11 +278,9 @@ INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM memcpy(di->pi->Devmode, di->dlgdm, sizeof(PSDRV_DEVMODEA)); SetWindowLongA(hwnd, DWL_MSGRESULT, PSNRET_NOERROR); return TRUE; - break; default: return FALSE; - break; } break; } diff --git a/dlls/wineps/escape.c b/dlls/wineps/escape.c index 9da9fd343b..6c2c59eee7 100644 --- a/dlls/wineps/escape.c +++ b/dlls/wineps/escape.c @@ -298,7 +298,6 @@ INT PSDRV_ExtEscape( PSDRV_PDEVICE *physDev, INT nEscape, INT cbInput, LPCVOID i FIXME("Unknown CLIP_TO_PATH mode %d\n", mode); return 0; } - return 0; } default: FIXME("Unimplemented code 0x%x\n", nEscape); diff --git a/dlls/x11drv/wintab.c b/dlls/x11drv/wintab.c index bef356ff88..e0827b79f6 100644 --- a/dlls/x11drv/wintab.c +++ b/dlls/x11drv/wintab.c @@ -780,10 +780,8 @@ UINT X11DRV_WTInfoA(UINT wCategory, UINT nIndex, LPVOID lpOutput) if (gNumCursors>0) { FIXME("Return proper size\n"); - return 200; + rc = 200; } - else - return 0; break; case WTI_INTERFACE: switch (nIndex) diff --git a/dlls/x11drv/xfont.c b/dlls/x11drv/xfont.c index 1418937ebc..81b8dcc812 100644 --- a/dlls/x11drv/xfont.c +++ b/dlls/x11drv/xfont.c @@ -1743,7 +1743,6 @@ static LPCSTR XFONT_UnAlias(char* font) TRACE("found alias '%s'->%s'\n", font, fa->faTypeFace ); strcpy(font, fa->faTypeFace); return fa->faAlias; - break; } } return NULL;