On Mon, 2 Feb 2009, Francois Gouget wrote: >> /* case RB_SETCOLORSCHEME: */ >> /* case RB_SETPALETTE: */ >> -/* return REBAR_GetPalette (infoPtr, wParam, lParam); */ >> >> case RB_SETPARENT: > Once the commented out return has been removed it looks like > RB_SETCOLORSCHEME and RB_SETPALETTE are meant to fall through to > RB_SETPARENT, which does not seem right... > > So I'd leave a comment there, maybe /* return ...; */.
That is a very fair point, thanks for raising this Francois! Let me adjust my patch accordingly. Gerald ChangeLog: Simplify. Index: dlls/comctl32/rebar.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/rebar.c,v retrieving revision 1.166 diff -u -3 -p -r1.166 rebar.c --- dlls/comctl32/rebar.c 21 Nov 2008 12:56:20 -0000 1.166 +++ dlls/comctl32/rebar.c 3 Feb 2009 00:08:59 -0000 @@ -2255,7 +2255,7 @@ REBAR_GetBkColor (const REBAR_INFO *info static LRESULT -REBAR_GetPalette (const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +REBAR_GetPalette () { FIXME("empty stub!\n"); @@ -3557,7 +3557,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, /* case RB_GETDROPTARGET: */ case RB_GETPALETTE: - return REBAR_GetPalette (infoPtr, wParam, lParam); + return REBAR_GetPalette (); case RB_GETRECT: return REBAR_GetRect (infoPtr, wParam, lParam); @@ -3618,7 +3618,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, /* case RB_SETCOLORSCHEME: */ /* case RB_SETPALETTE: */ -/* return REBAR_GetPalette (infoPtr, wParam, lParam); */ +/* return REBAR_GetPalette (); */ case RB_SETPARENT: return REBAR_SetParent (infoPtr, wParam);