From e3688c2f9aef7b6e48aab5391db77af263ef9211 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Sat, 7 Jan 2012 21:39:14 +0300 Subject: [PATCH] comctl32: Remove redundant parameter from a helper. --- dlls/comctl32/toolbar.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fa67eb816ef..bd35533c425 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -329,9 +329,9 @@ TOOLBAR_ButtonHasString(const TBUTTON_INFO *btnPtr) * function should be null. */ static void -TOOLBAR_CheckStyle (const TOOLBAR_INFO *infoPtr, DWORD dwStyle) +TOOLBAR_CheckStyle (const TOOLBAR_INFO *infoPtr) { - if (dwStyle & TBSTYLE_REGISTERDROP) + if (infoPtr->dwStyle & TBSTYLE_REGISTERDROP) FIXME("[%p] TBSTYLE_REGISTERDROP not implemented\n", infoPtr->hwndSelf); } @@ -5166,7 +5166,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) OpenThemeData (hwnd, themeClass); - TOOLBAR_CheckStyle (infoPtr, infoPtr->dwStyle); + TOOLBAR_CheckStyle (infoPtr); return 0; } @@ -6368,11 +6368,10 @@ TOOLBAR_StyleChanged (TOOLBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpSty else infoPtr->dwDTFlags = DT_CENTER | DT_END_ELLIPSIS; - TOOLBAR_CheckStyle (infoPtr, lpStyle->styleNew); - TRACE("new style 0x%08x\n", lpStyle->styleNew); infoPtr->dwStyle = lpStyle->styleNew; + TOOLBAR_CheckStyle (infoPtr); if ((dwOldStyle ^ lpStyle->styleNew) & (TBSTYLE_WRAPABLE | CCS_VERT)) TOOLBAR_LayoutToolbar(infoPtr); -- 2.11.4.GIT