commctl.h: Correct or improve a few casts

Andrew Talbot Andrew.Talbot at talbotville.com
Sat Oct 7 18:09:12 CDT 2006


Changelog:
    commctl.h: Correct or improve a few casts.

diff -urN a/include/commctrl.h b/include/commctrl.h
--- a/include/commctrl.h	2006-10-05 22:07:57.000000000 +0100
+++ b/include/commctrl.h	2006-10-07 23:33:51.000000000 +0100
@@ -976,21 +976,21 @@
 #define Header_GetItemCount(hwndHD) \
   (INT)SNDMSGA((hwndHD),HDM_GETITEMCOUNT,0,0L)
 #define Header_InsertItemA(hwndHD,i,phdi) \
-  (INT)SNDMSGA((hwndHD),HDM_INSERTITEMA,(WPARAM)(INT)(i),(LPARAM)(const HDITEMA*)(phdi))
+  (INT)SNDMSGA((hwndHD),HDM_INSERTITEMA,(WPARAM)(INT)(i),(LPARAM)(const LPHDITEMA)(phdi))
 #define Header_InsertItemW(hwndHD,i,phdi) \
-  (INT)SNDMSGW((hwndHD),HDM_INSERTITEMW,(WPARAM)(INT)(i),(LPARAM)(const HDITEMW*)(phdi))
+  (INT)SNDMSGW((hwndHD),HDM_INSERTITEMW,(WPARAM)(INT)(i),(LPARAM)(const LPHDITEMW)(phdi))
 #define Header_InsertItem WINELIB_NAME_AW(Header_InsertItem)
 #define Header_DeleteItem(hwndHD,i) \
   (BOOL)SNDMSGA((hwndHD),HDM_DELETEITEM,(WPARAM)(INT)(i),0L)
 #define Header_GetItemA(hwndHD,i,phdi) \
-  (BOOL)SNDMSGA((hwndHD),HDM_GETITEMA,(WPARAM)(INT)(i),(LPARAM)(HDITEMA*)(phdi))
+  (BOOL)SNDMSGA((hwndHD),HDM_GETITEMA,(WPARAM)(INT)(i),(LPARAM)(LPHDITEMA)(phdi))
 #define Header_GetItemW(hwndHD,i,phdi) \
-  (BOOL)SNDMSGW((hwndHD),HDM_GETITEMW,(WPARAM)(INT)(i),(LPARAM)(HDITEMW*)(phdi))
+  (BOOL)SNDMSGW((hwndHD),HDM_GETITEMW,(WPARAM)(INT)(i),(LPARAM)(LPHDITEMW)(phdi))
 #define Header_GetItem WINELIB_NAME_AW(Header_GetItem)
 #define Header_SetItemA(hwndHD,i,phdi) \
-  (BOOL)SNDMSGA((hwndHD),HDM_SETITEMA,(WPARAM)(INT)(i),(LPARAM)(const HDITEMA*)(phdi))
+  (BOOL)SNDMSGA((hwndHD),HDM_SETITEMA,(WPARAM)(INT)(i),(LPARAM)(LPHDITEMA)(phdi))
 #define Header_SetItemW(hwndHD,i,phdi) \
-  (BOOL)SNDMSGW((hwndHD),HDM_SETITEMW,(WPARAM)(INT)(i),(LPARAM)(const HDITEMW*)(phdi))
+  (BOOL)SNDMSGW((hwndHD),HDM_SETITEMW,(WPARAM)(INT)(i),(LPARAM)(LPHDITEMW)(phdi))
 #define Header_SetItem WINELIB_NAME_AW(Header_SetItem)
 #define Header_Layout(hwndHD,playout) \
   (BOOL)SNDMSGA((hwndHD),HDM_LAYOUT,0,(LPARAM)(LPHDLAYOUT)(playout))
@@ -3686,9 +3686,9 @@
 #define ListView_GetNextItem(hwnd,nItem,flags) \
     (INT)SNDMSGA((hwnd),LVM_GETNEXTITEM,(WPARAM)(INT)(nItem),(LPARAM)(MAKELPARAM(flags,0)))
 #define ListView_FindItemA(hwnd,nItem,plvfi) \
-    (INT)SNDMSGA((hwnd),LVM_FINDITEMA,(WPARAM)(INT)(nItem),(LPARAM)(LVFINDINFOA*)(plvfi))
+    (INT)SNDMSGA((hwnd),LVM_FINDITEMA,(WPARAM)(INT)(nItem),(LPARAM)(const LPLVFINDINFOA)(plvfi))
 #define ListView_FindItemW(hwnd,nItem,plvfi) \
-    (INT)SNDMSGW((hwnd),LVM_FINDITEMW,(WPARAM)(INT)(nItem),(LPARAM)(LVFINDINFOW*)(plvfi))
+    (INT)SNDMSGW((hwnd),LVM_FINDITEMW,(WPARAM)(INT)(nItem),(LPARAM)(const LPLVFINDINFOW)(plvfi))
 #define ListView_FindItem WINELIB_NAME_AW(ListView_FindItem)
 
 #define ListView_Arrange(hwnd,code) \
@@ -3700,9 +3700,9 @@
 	((prc) ? (((RECT*)(prc))->left = (code),(LPARAM)(RECT \
 	*)(prc)) : (LPARAM)(RECT*)NULL))
 #define ListView_SetItemA(hwnd,pitem) \
-    (INT)SNDMSGA((hwnd),LVM_SETITEMA,0,(LPARAM)(const LVITEMA *)(pitem))
+    (INT)SNDMSGA((hwnd),LVM_SETITEMA,0,(LPARAM)(const LPLVITEMA)(pitem))
 #define ListView_SetItemW(hwnd,pitem) \
-    (INT)SNDMSGW((hwnd),LVM_SETITEMW,0,(LPARAM)(const LVITEMW *)(pitem))
+    (INT)SNDMSGW((hwnd),LVM_SETITEMW,0,(LPARAM)(const LPLVITEMW)(pitem))
 #define ListView_SetItem WINELIB_NAME_AW(ListView_SetItem)
 #define ListView_SetItemState(hwnd,i,data,dataMask) \
 { LVITEMA _LVi; _LVi.state = data; _LVi.stateMask = dataMask;\
@@ -3739,27 +3739,27 @@
 #define ListView_GetBkColor(hwnd)  \
     (COLORREF)SNDMSGA((hwnd), LVM_GETBKCOLOR, 0, 0)
 #define ListView_GetItemA(hwnd,pitem) \
-    (BOOL)SNDMSGA((hwnd),LVM_GETITEMA,0,(LPARAM)(LVITEMA *)(pitem))
+    (BOOL)SNDMSGA((hwnd),LVM_GETITEMA,0,(LPARAM)(LPLVITEMA)(pitem))
 #define ListView_GetItemW(hwnd,pitem) \
-    (BOOL)SNDMSGW((hwnd),LVM_GETITEMW,0,(LPARAM)(LVITEMW *)(pitem))
+    (BOOL)SNDMSGW((hwnd),LVM_GETITEMW,0,(LPARAM)(LPLVITEMW)(pitem))
 #define ListView_GetItem WINELIB_NAME_AW(ListView_GetItem)
 
 #define ListView_HitTest(hwnd,pinfo) \
     (INT)SNDMSGA((hwnd),LVM_HITTEST,0,(LPARAM)(LPLVHITTESTINFO)(pinfo))
 
 #define ListView_InsertItemA(hwnd,pitem) \
-    (INT)SNDMSGA((hwnd),LVM_INSERTITEMA,0,(LPARAM)(const LVITEMA *)(pitem))
+    (INT)SNDMSGA((hwnd),LVM_INSERTITEMA,0,(LPARAM)(const LPLVITEMA)(pitem))
 #define ListView_InsertItemW(hwnd,pitem) \
-    (INT)SNDMSGW((hwnd),LVM_INSERTITEMW,0,(LPARAM)(const LVITEMW *)(pitem))
+    (INT)SNDMSGW((hwnd),LVM_INSERTITEMW,0,(LPARAM)(const LPLVITEMW)(pitem))
 #define ListView_InsertItem WINELIB_NAME_AW(ListView_InsertItem)
 
 #define ListView_DeleteAllItems(hwnd) \
     (BOOL)SNDMSGA((hwnd),LVM_DELETEALLITEMS,0,0L)
 
 #define ListView_InsertColumnA(hwnd,iCol,pcol) \
-    (INT)SNDMSGA((hwnd),LVM_INSERTCOLUMNA,(WPARAM)(INT)(iCol),(LPARAM)(const LVCOLUMNA *)(pcol))
+    (INT)SNDMSGA((hwnd),LVM_INSERTCOLUMNA,(WPARAM)(INT)(iCol),(LPARAM)(const LPLVCOLUMNA)(pcol))
 #define ListView_InsertColumnW(hwnd,iCol,pcol) \
-    (INT)SNDMSGW((hwnd),LVM_INSERTCOLUMNW,(WPARAM)(INT)(iCol),(LPARAM)(const LVCOLUMNW *)(pcol))
+    (INT)SNDMSGW((hwnd),LVM_INSERTCOLUMNW,(WPARAM)(INT)(iCol),(LPARAM)(const LPLVCOLUMNW)(pcol))
 #define ListView_InsertColumn WINELIB_NAME_AW(ListView_InsertColumn)
 
 #define ListView_SortItems(hwndLV,_pfnCompare,_lPrm) \
@@ -3796,10 +3796,10 @@
 { POINT ptNewPos; ptNewPos.x = (x1); ptNewPos.y = (y1); SNDMSGA((hwnd), LVM_SETITEMPOSITION32, (WPARAM)(int)(n), (LPARAM)&ptNewPos); }
 #define ListView_SetItemTextA(hwndLV, i, _iSubItem, _pszText) \
 { LVITEMA _LVi; _LVi.iSubItem = _iSubItem; _LVi.pszText = _pszText;\
-  SNDMSGA(hwndLV, LVM_SETITEMTEXTA, (WPARAM)i, (LPARAM) (LVITEMA*)&_LVi);}
+  SNDMSGA(hwndLV, LVM_SETITEMTEXTA, (WPARAM)i, (LPARAM) (LPLVITEMA)&_LVi);}
 #define ListView_SetItemTextW(hwndLV, i, _iSubItem, _pszText) \
 { LVITEMW _LVi; _LVi.iSubItem = _iSubItem; _LVi.pszText = _pszText;\
-  SNDMSGW(hwndLV, LVM_SETITEMTEXTW, (WPARAM)i, (LPARAM) (LVITEMW*)& _LVi);}
+  SNDMSGW(hwndLV, LVM_SETITEMTEXTW, (WPARAM)i, (LPARAM) (LPLVITEMW)& _LVi);}
 #define ListView_SetItemText WINELIB_NAME_AW(ListView_SetItemText)
 
 #define ListView_DeleteItem(hwndLV, i) \
@@ -4015,19 +4015,19 @@
 #define TabCtrl_GetItemCount(hwnd) \
     (int)SNDMSGA((hwnd), TCM_GETITEMCOUNT, 0, 0L)
 #define TabCtrl_GetItemA(hwnd, iItem, pitem) \
-    (BOOL)SNDMSGA((hwnd), TCM_GETITEMA, (WPARAM)(int)iItem, (LPARAM)(TCITEMA *)(pitem))
+    (BOOL)SNDMSGA((hwnd), TCM_GETITEMA, (WPARAM)(int)iItem, (LPARAM)(LPTCITEMA)(pitem))
 #define TabCtrl_GetItemW(hwnd, iItem, pitem) \
-    (BOOL)SNDMSGW((hwnd), TCM_GETITEMW, (WPARAM)(int)iItem, (LPARAM)(TCITEMW *)(pitem))
+    (BOOL)SNDMSGW((hwnd), TCM_GETITEMW, (WPARAM)(int)iItem, (LPARAM)(LPTCITEMW)(pitem))
 #define TabCtrl_GetItem WINELIB_NAME_AW(TabCtrl_GetItem)
 #define TabCtrl_SetItemA(hwnd, iItem, pitem) \
-    (BOOL)SNDMSGA((hwnd), TCM_SETITEMA, (WPARAM)(int)iItem, (LPARAM)(TCITEMA *)(pitem))
+    (BOOL)SNDMSGA((hwnd), TCM_SETITEMA, (WPARAM)(int)iItem, (LPARAM)(LPTCITEMA)(pitem))
 #define TabCtrl_SetItemW(hwnd, iItem, pitem) \
-    (BOOL)SNDMSGW((hwnd), TCM_SETITEMW, (WPARAM)(int)iItem, (LPARAM)(TCITEMW *)(pitem))
+    (BOOL)SNDMSGW((hwnd), TCM_SETITEMW, (WPARAM)(int)iItem, (LPARAM)(LPTCITEMW)(pitem))
 #define TabCtrl_SetItem WINELIB_NAME_AW(TabCtrl_SetItem)
 #define TabCtrl_InsertItemA(hwnd, iItem, pitem)   \
-    (int)SNDMSGA((hwnd), TCM_INSERTITEMA, (WPARAM)(int)iItem, (LPARAM)(const TCITEMA *)(pitem))
+    (int)SNDMSGA((hwnd), TCM_INSERTITEMA, (WPARAM)(int)iItem, (LPARAM)(const LPTCITEMA)(pitem))
 #define TabCtrl_InsertItemW(hwnd, iItem, pitem)   \
-    (int)SNDMSGW((hwnd), TCM_INSERTITEMW, (WPARAM)(int)iItem, (LPARAM)(const TCITEMW *)(pitem))
+    (int)SNDMSGW((hwnd), TCM_INSERTITEMW, (WPARAM)(int)iItem, (LPARAM)(const LPTCITEMW)(pitem))
 #define TabCtrl_InsertItem WINELIB_NAME_AW(TabCtrl_InsertItem)
 #define TabCtrl_DeleteItem(hwnd, i) \
     (BOOL)SNDMSGA((hwnd), TCM_DELETEITEM, (WPARAM)(int)(i), 0L)



More information about the wine-patches mailing list