comctl32: more cast-qual warnings fixes (1 of 2)
Andrew Talbot
Andrew.Talbot at talbotville.com
Sat Oct 21 09:38:56 CDT 2006
Changelog:
comctl32: cast-qual warnings fix.
diff -urN a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
--- a/dlls/comctl32/listview.c 2006-10-20 18:07:57.000000000 +0100
+++ b/dlls/comctl32/listview.c 2006-10-21 10:34:26.000000000 +0100
@@ -421,7 +421,7 @@
static void LISTVIEW_GetOrigin(LISTVIEW_INFO *, LPPOINT);
static BOOL LISTVIEW_GetViewRect(LISTVIEW_INFO *, LPRECT);
static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *, INT);
-static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *, const LVITEMW *, BOOL);
+static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *, const LPLVITEMW, BOOL);
static void LISTVIEW_UpdateScroll(LISTVIEW_INFO *);
static void LISTVIEW_SetSelection(LISTVIEW_INFO *, INT);
static void LISTVIEW_UpdateSize(LISTVIEW_INFO *);
@@ -3567,7 +3567,7 @@
* SUCCESS : TRUE
* FAILURE : FALSE
*/
-static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL isW)
+static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *infoPtr, const LPLVITEMW lpLVItem, BOOL isW)
{
UINT uView = infoPtr->dwStyle & LVS_TYPEMASK;
HWND hwndSelf = infoPtr->hwndSelf;
@@ -3583,7 +3583,7 @@
if ((lpLVItem->mask & LVIF_TEXT) && is_textW(lpLVItem->pszText))
{
pszText = lpLVItem->pszText;
- ((LVITEMW *)lpLVItem)->pszText = textdupTtoW(lpLVItem->pszText, isW);
+ lpLVItem->pszText = textdupTtoW(lpLVItem->pszText, isW);
}
/* actually set the fields */
@@ -3610,7 +3610,7 @@
if (pszText)
{
textfreeT(lpLVItem->pszText, isW);
- ((LVITEMW *)lpLVItem)->pszText = pszText;
+ lpLVItem->pszText = pszText;
}
return bResult;
@@ -3699,7 +3699,7 @@
{
UINT uFormat, uView = infoPtr->dwStyle & LVS_TYPEMASK;
WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' };
- static const WCHAR szCallback[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 };
+ static WCHAR szCallback[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 };
DWORD cdsubitemmode = CDRF_DODEFAULT;
RECT* lprcFocus, rcSelect, rcBox, rcState, rcIcon, rcLabel;
NMLVCUSTOMDRAW nmlvcd;
@@ -3723,7 +3723,7 @@
if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE;
if (nSubItem > 0 && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT))
lvItem.state = LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED);
- if (lvItem.pszText == LPSTR_TEXTCALLBACKW) lvItem.pszText = (LPWSTR)szCallback;
+ if (lvItem.pszText == LPSTR_TEXTCALLBACKW) lvItem.pszText = szCallback;
TRACE(" lvItem=%s\n", debuglvitem_t(&lvItem, TRUE));
/* now check if we need to update the focus rectangle */
@@ -4951,12 +4951,17 @@
{
BOOL hasText = lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL);
LVFINDINFOW fiw;
+ LPWSTR psz_copy;
INT res;
memcpy(&fiw, lpFindInfo, sizeof(fiw));
- if (hasText) fiw.psz = textdupTtoW((LPCWSTR)lpFindInfo->psz, FALSE);
+ if (hasText)
+ {
+ psz_copy = textdupTtoW((LPCWSTR)lpFindInfo->psz, FALSE);
+ fiw.psz = psz_copy;
+ }
res = LISTVIEW_FindItemW(infoPtr, nStart, &fiw);
- if (hasText) textfreeT((LPWSTR)fiw.psz, FALSE);
+ if (hasText) textfreeT(psz_copy, FALSE);
return res;
}
More information about the wine-patches
mailing list