Rob Shearman : comctl32: Rename the dwStyle and dwOldStyle variables in LISTVIEW_SetExtendedListViewStyle to more accurately reflect their purpose .
Alexandre Julliard
julliard at winehq.org
Mon Feb 25 06:50:59 CST 2008
Module: wine
Branch: master
Commit: 7f33e95ca7afc9792b232626e1d29361e8404153
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f33e95ca7afc9792b232626e1d29361e8404153
Author: Rob Shearman <rob at codeweavers.com>
Date: Fri Feb 22 19:17:13 2008 +0000
comctl32: Rename the dwStyle and dwOldStyle variables in LISTVIEW_SetExtendedListViewStyle to more accurately reflect their purpose.
This also fixes local variable shadowing in the function, which should
be avoided for purposes of code readability.
---
dlls/comctl32/listview.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 006991f..9f4bd7b 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -6985,17 +6985,17 @@ static HIMAGELIST LISTVIEW_CreateCheckBoxIL(const LISTVIEW_INFO *infoPtr)
* SUCCESS : previous style
* FAILURE : 0
*/
-static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwMask, DWORD dwStyle)
+static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwMask, DWORD dwExStyle)
{
- DWORD dwOldStyle = infoPtr->dwLvExStyle;
+ DWORD dwOldExStyle = infoPtr->dwLvExStyle;
/* set new style */
if (dwMask)
- infoPtr->dwLvExStyle = (dwOldStyle & ~dwMask) | (dwStyle & dwMask);
+ infoPtr->dwLvExStyle = (dwOldExStyle & ~dwMask) | (dwExStyle & dwMask);
else
- infoPtr->dwLvExStyle = dwStyle;
+ infoPtr->dwLvExStyle = dwExStyle;
- if((infoPtr->dwLvExStyle ^ dwOldStyle) & LVS_EX_CHECKBOXES)
+ if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_CHECKBOXES)
{
HIMAGELIST himl = 0;
if(infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES)
@@ -7011,7 +7011,7 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM
LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl);
}
- if((infoPtr->dwLvExStyle ^ dwOldStyle) & LVS_EX_HEADERDRAGDROP)
+ if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_HEADERDRAGDROP)
{
DWORD dwStyle = GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE);
if (infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP)
@@ -7021,7 +7021,7 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM
SetWindowLongW(infoPtr->hwndHeader, GWL_STYLE, dwStyle);
}
- return dwOldStyle;
+ return dwOldExStyle;
}
/***
More information about the wine-cvs
mailing list