comctl32: Replace inline static with static inline
Andrew Talbot
Andrew.Talbot at talbotville.com
Sat Mar 17 05:16:06 CDT 2007
Changelog:
comctl32: Replace inline static with static inline.
diff -urN a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
--- a/dlls/comctl32/comboex.c 2007-03-08 17:37:16.000000000 +0000
+++ b/dlls/comctl32/comboex.c 2007-03-17 10:09:27.000000000 +0000
@@ -135,17 +135,17 @@
static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr);
typedef INT (WINAPI *cmp_func_t)(LPCWSTR, LPCWSTR);
-inline static BOOL is_textW(LPCWSTR str)
+static inline BOOL is_textW(LPCWSTR str)
{
return str && str != LPSTR_TEXTCALLBACKW;
}
-inline static BOOL is_textA(LPCSTR str)
+static inline BOOL is_textA(LPCSTR str)
{
return str && str != LPSTR_TEXTCALLBACKA;
}
-inline static LPCSTR debugstr_txt(LPCWSTR str)
+static inline LPCSTR debugstr_txt(LPCWSTR str)
{
if (str == LPSTR_TEXTCALLBACKW) return "(callback)";
return debugstr_w(str);
@@ -174,13 +174,13 @@
}
-inline static CBE_ITEMDATA *get_item_data(COMBOEX_INFO *infoPtr, INT index)
+static inline CBE_ITEMDATA *get_item_data(COMBOEX_INFO *infoPtr, INT index)
{
return (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, CB_GETITEMDATA,
(WPARAM)index, 0);
}
-inline static cmp_func_t get_cmp_func(COMBOEX_INFO *infoPtr)
+static inline cmp_func_t get_cmp_func(COMBOEX_INFO *infoPtr)
{
return infoPtr->dwExtStyle & CBES_EX_CASESENSITIVE ? lstrcmpW : lstrcmpiW;
}
@@ -601,7 +601,7 @@
}
-inline static BOOL COMBOEX_HasEditChanged (COMBOEX_INFO *infoPtr)
+static inline BOOL COMBOEX_HasEditChanged (COMBOEX_INFO *infoPtr)
{
return COMBOEX_HasEdit(infoPtr) &&
(infoPtr->flags & WCBE_EDITHASCHANGED) == WCBE_EDITHASCHANGED;
diff -urN a/dlls/comctl32/header.c b/dlls/comctl32/header.c
--- a/dlls/comctl32/header.c 2007-03-08 17:37:16.000000000 +0000
+++ b/dlls/comctl32/header.c 2007-03-17 10:09:27.000000000 +0000
@@ -161,7 +161,7 @@
}
}
-inline static LRESULT
+static inline LRESULT
HEADER_IndexToOrder (HWND hwnd, INT iItem)
{
HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd);
@@ -1178,7 +1178,7 @@
}
-inline static LRESULT
+static inline LRESULT
HEADER_GetItemCount (HWND hwnd)
{
HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd);
@@ -1239,7 +1239,7 @@
return TRUE;
}
-inline static LRESULT
+static inline LRESULT
HEADER_GetUnicodeFormat (HWND hwnd)
{
HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd);
@@ -1432,7 +1432,7 @@
return TRUE;
}
-inline static LRESULT
+static inline LRESULT
HEADER_SetUnicodeFormat (HWND hwnd, WPARAM wParam)
{
HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd);
diff -urN a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c
--- a/dlls/comctl32/hotkey.c 2006-10-20 18:07:57.000000000 +0100
+++ b/dlls/comctl32/hotkey.c 2007-03-17 10:09:27.000000000 +0000
@@ -274,7 +274,7 @@
}
-inline static LRESULT
+static inline LRESULT
HOTKEY_GetFont (HOTKEY_INFO *infoPtr)
{
return (LRESULT)infoPtr->hFont;
@@ -402,7 +402,7 @@
}
-inline static LRESULT
+static inline LRESULT
HOTKEY_NCCreate (HWND hwnd, LPCREATESTRUCTW lpcs)
{
HOTKEY_INFO *infoPtr;
diff -urN a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
--- a/dlls/comctl32/rebar.c 2007-03-13 17:26:10.000000000 +0000
+++ b/dlls/comctl32/rebar.c 2007-03-17 10:09:27.000000000 +0000
@@ -1978,7 +1978,7 @@
}
-inline static LRESULT
+static inline LRESULT
REBAR_GetBandCount (REBAR_INFO *infoPtr)
{
TRACE("band count %u!\n", infoPtr->uNumBands);
@@ -2102,7 +2102,7 @@
}
-inline static LRESULT
+static inline LRESULT
REBAR_GetBkColor (REBAR_INFO *infoPtr)
{
COLORREF clr = infoPtr->clrBk;
@@ -2152,7 +2152,7 @@
}
-inline static LRESULT
+static inline LRESULT
REBAR_GetRowCount (REBAR_INFO *infoPtr)
{
TRACE("%u\n", infoPtr->uNumRows);
@@ -2183,7 +2183,7 @@
}
-inline static LRESULT
+static inline LRESULT
REBAR_GetTextColor (REBAR_INFO *infoPtr)
{
TRACE("text color 0x%06x!\n", infoPtr->clrText);
@@ -2192,14 +2192,14 @@
}
-inline static LRESULT
+static inline LRESULT
REBAR_GetToolTips (REBAR_INFO *infoPtr)
{
return (LRESULT)infoPtr->hwndToolTip;
}
-inline static LRESULT
+static inline LRESULT
REBAR_GetUnicodeFormat (REBAR_INFO *infoPtr)
{
TRACE("%s hwnd=%p\n",
@@ -2209,7 +2209,7 @@
}
-inline static LRESULT
+static inline LRESULT
REBAR_GetVersion (REBAR_INFO *infoPtr)
{
TRACE("version %d\n", infoPtr->iVersion);
@@ -2619,7 +2619,7 @@
/* << REBAR_SetTooltips >> */
-inline static LRESULT
+static inline LRESULT
REBAR_SetUnicodeFormat (REBAR_INFO *infoPtr, WPARAM wParam)
{
BOOL bTemp = infoPtr->bUnicode;
@@ -2999,7 +2999,7 @@
}
-inline static LRESULT
+static inline LRESULT
REBAR_NCCalcSize (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
HTHEME theme;
@@ -3283,7 +3283,7 @@
}
-inline static LRESULT
+static inline LRESULT
REBAR_SetRedraw (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
/*****************************************************
*
diff -urN a/dlls/comctl32/status.c b/dlls/comctl32/status.c
--- a/dlls/comctl32/status.c 2007-03-08 17:37:16.000000000 +0000
+++ b/dlls/comctl32/status.c 2007-03-17 10:09:27.000000000 +0000
@@ -828,7 +828,7 @@
}
-inline static LRESULT
+static inline LRESULT
STATUSBAR_SetUnicodeFormat (STATUS_INFO *infoPtr, BOOL bUnicode)
{
BOOL bOld = infoPtr->bUnicode;
diff -urN a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
--- a/dlls/comctl32/toolbar.c 2007-03-08 17:37:16.000000000 +0000
+++ b/dlls/comctl32/toolbar.c 2007-03-17 10:09:27.000000000 +0000
@@ -256,7 +256,7 @@
static LRESULT
TOOLBAR_NotifyFormat(TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam);
-inline static int default_top_margin(TOOLBAR_INFO *infoPtr)
+static inline int default_top_margin(TOOLBAR_INFO *infoPtr)
{
return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER);
}
@@ -3519,7 +3519,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLBAR_GetExtendedStyle (HWND hwnd)
{
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
@@ -3739,7 +3739,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLBAR_GetVersion (HWND hwnd)
{
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
@@ -3774,7 +3774,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLBAR_HitTest (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
return TOOLBAR_InternalHitTest (hwnd, (LPPOINT)lParam);
@@ -4045,7 +4045,7 @@
/* fixes up an index of a button affected by a move */
-inline static void TOOLBAR_MoveFixupIndex(INT* pIndex, INT nIndex, INT nMoveIndex, BOOL bMoveUp)
+static inline void TOOLBAR_MoveFixupIndex(INT* pIndex, INT nIndex, INT nMoveIndex, BOOL bMoveUp)
{
if (bMoveUp)
{
@@ -5058,7 +5058,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLBAR_SetToolTips (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
@@ -6078,7 +6078,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLBAR_NCActivate (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
/* if (wndPtr->dwStyle & CCS_NODIVIDER) */
@@ -6088,7 +6088,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLBAR_NCCalcSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
if (!(GetWindowLongW(hwnd, GWL_STYLE) & CCS_NODIVIDER))
@@ -6336,7 +6336,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLBAR_Notify (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
diff -urN a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
--- a/dlls/comctl32/tooltips.c 2006-11-21 19:18:02.000000000 +0000
+++ b/dlls/comctl32/tooltips.c 2007-03-17 10:09:27.000000000 +0000
@@ -174,7 +174,7 @@
TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uId, DWORD_PTR dwRef);
-inline static UINT_PTR
+static inline UINT_PTR
TOOLTIPS_GetTitleIconIndex(HICON hIcon)
{
UINT i;
@@ -1484,7 +1484,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLTIPS_GetMaxTipWidth (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
@@ -1540,7 +1540,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLTIPS_GetTipBkColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
@@ -1548,7 +1548,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLTIPS_GetTipTextColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
@@ -1556,7 +1556,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLTIPS_GetToolCount (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
@@ -1756,7 +1756,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLTIPS_Pop (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
@@ -1889,7 +1889,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLTIPS_SetMaxTipWidth (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
@@ -1901,7 +1901,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLTIPS_SetTipBkColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
@@ -1912,7 +1912,7 @@
}
-inline static LRESULT
+static inline LRESULT
TOOLTIPS_SetTipTextColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
diff -urN a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
--- a/dlls/comctl32/trackbar.c 2007-03-16 17:18:51.000000000 +0000
+++ b/dlls/comctl32/trackbar.c 2007-03-17 10:09:27.000000000 +0000
@@ -237,7 +237,7 @@
return 0;
}
-inline static void
+static inline void
TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr)
{
if (infoPtr->lPos == infoPtr->lRangeMax) return;
@@ -249,7 +249,7 @@
}
-inline static void
+static inline void
TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr)
{
if (infoPtr->lPos == infoPtr->lRangeMin) return;
@@ -260,7 +260,7 @@
notify_with_scroll (infoPtr, TB_PAGEUP);
}
-inline static void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr)
+static inline void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr)
{
if (infoPtr->lPos == infoPtr->lRangeMin) return;
infoPtr->lPos -= infoPtr->lLineSize;
@@ -269,7 +269,7 @@
notify_with_scroll (infoPtr, TB_LINEUP);
}
-inline static void TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr)
+static inline void TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr)
{
if (infoPtr->lPos == infoPtr->lRangeMax) return;
infoPtr->lPos += infoPtr->lLineSize;
@@ -374,7 +374,7 @@
}
}
-inline static void
+static inline void
TRACKBAR_UpdateThumb (TRACKBAR_INFO *infoPtr)
{
TRACKBAR_CalcThumb(infoPtr, infoPtr->lPos, &infoPtr->rcThumb);
@@ -404,7 +404,7 @@
TRACKBAR_InvalidateThumb (infoPtr, newPos);
}
-inline static BOOL
+static inline BOOL
TRACKBAR_HasSelection (TRACKBAR_INFO *infoPtr)
{
return infoPtr->lSelMin != infoPtr->lSelMax;
@@ -757,7 +757,7 @@
}
-inline static void
+static inline void
TRACKBAR_ActivateToolTip (TRACKBAR_INFO *infoPtr, BOOL fShow)
{
TTTOOLINFOW ti;
@@ -1022,7 +1022,7 @@
}
-inline static LRESULT
+static inline LRESULT
TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc)
{
if (lprc == NULL) return 0;
@@ -1036,7 +1036,7 @@
}
-inline static LONG
+static inline LONG
TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr)
{
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS)
@@ -1061,7 +1061,7 @@
}
-inline static LONG
+static inline LONG
TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic)
{
if ((iTic < 0) || (iTic >= infoPtr->uNumTics) || !infoPtr->tics)
@@ -1072,7 +1072,7 @@
}
-inline static LONG
+static inline LONG
TRACKBAR_GetTicPos (TRACKBAR_INFO *infoPtr, INT iTic)
{
LONG range, width, pos, tic;
@@ -1114,7 +1114,7 @@
}
-inline static LONG
+static inline LONG
TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize)
{
LONG lTemp = infoPtr->lLineSize;
@@ -1125,7 +1125,7 @@
}
-inline static LONG
+static inline LONG
TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize)
{
LONG lTemp = infoPtr->lPageSize;
@@ -1136,7 +1136,7 @@
}
-inline static LRESULT
+static inline LRESULT
TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition)
{
LONG oldPos = infoPtr->lPos;
@@ -1155,7 +1155,7 @@
}
-inline static LRESULT
+static inline LRESULT
TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange)
{
infoPtr->lRangeMin = (SHORT)LOWORD(lRange);
@@ -1180,7 +1180,7 @@
}
-inline static LRESULT
+static inline LRESULT
TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax)
{
infoPtr->lRangeMax = lMax;
@@ -1198,7 +1198,7 @@
}
-inline static LRESULT
+static inline LRESULT
TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin)
{
infoPtr->lRangeMin = lMin;
@@ -1216,7 +1216,7 @@
}
-inline static LRESULT
+static inline LRESULT
TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel)
{
if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)){
@@ -1240,7 +1240,7 @@
}
-inline static LRESULT
+static inline LRESULT
TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd)
{
if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)){
@@ -1260,7 +1260,7 @@
}
-inline static LRESULT
+static inline LRESULT
TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart)
{
if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)){
@@ -1280,7 +1280,7 @@
}
-inline static LRESULT
+static inline LRESULT
TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength)
{
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_FIXEDLENGTH) {
@@ -1293,7 +1293,7 @@
}
-inline static LRESULT
+static inline LRESULT
TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos)
{
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS)
@@ -1320,7 +1320,7 @@
}
-inline static LRESULT
+static inline LRESULT
TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq)
{
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) {
@@ -1333,7 +1333,7 @@
}
-inline static INT
+static inline INT
TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation)
{
INT fTemp = infoPtr->fLocation;
@@ -1344,7 +1344,7 @@
}
-inline static LRESULT
+static inline LRESULT
TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT)
{
infoPtr->hwndToolTip = hwndTT;
@@ -1353,7 +1353,7 @@
}
-inline static BOOL
+static inline BOOL
TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode)
{
BOOL bTemp = infoPtr->bUnicode;
@@ -1712,7 +1712,7 @@
}
-inline static BOOL
+static inline BOOL
TRACKBAR_KeyUp (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData)
{
switch (nVirtKey) {
More information about the wine-patches
mailing list