comctl32: Remove superfluous pointer casts.

dlls/comctl32/animate.c

@@ -121,7 +121,7 @@ static BOOL ANIMATE_LoadResW(ANIMATE_INFO *infoPtr, HINSTANCE hInst, LPCWSTR lpN
 
     memset(&mminfo, 0, sizeof(mminfo));
     mminfo.fccIOProc = FOURCC_MEM;
-    mminfo.pchBuffer = (LPSTR)lpAvi;
+    mminfo.pchBuffer = lpAvi;
     mminfo.cchBuffer = SizeofResource(hInst, hrsrc);
     infoPtr->hMMio = mmioOpenW(NULL, &mminfo, MMIO_READ);
     if (!infoPtr->hMMio) 
@@ -391,7 +391,7 @@ static LRESULT ANIMATE_Timer(ANIMATE_INFO *infoPtr)
 
 static DWORD CALLBACK ANIMATE_AnimationThread(LPVOID ptr_)
 {
-    ANIMATE_INFO *infoPtr = (ANIMATE_INFO *)ptr_;
+    ANIMATE_INFO *infoPtr = ptr_;
     HANDLE event;
     DWORD timeout;
 
@@ -472,7 +472,7 @@ static LRESULT ANIMATE_Play(ANIMATE_INFO *infoPtr, UINT cRepeat, WORD wFrom, WOR
 	TRACE("Using an animation thread\n");
         infoPtr->hStopEvent = CreateEventW( NULL, TRUE, FALSE, NULL );
         infoPtr->hThread = CreateThread(0, 0, ANIMATE_AnimationThread,
-                                        (LPVOID)infoPtr, 0, &infoPtr->threadId);
+                                        infoPtr, 0, &infoPtr->threadId);
         if(!infoPtr->hThread) return FALSE;
 
     }

dlls/comctl32/comctl32undoc.c

@@ -339,7 +339,7 @@ static void MRU_SaveChanged ( LPWINEMRULIST mp )
  */
 void WINAPI FreeMRUList (HANDLE hMRUList)
 {
-    LPWINEMRULIST mp = (LPWINEMRULIST)hMRUList;
+    LPWINEMRULIST mp = hMRUList;
     UINT i;
 
     TRACE("(%p)\n", hMRUList);
@@ -380,7 +380,7 @@ void WINAPI FreeMRUList (HANDLE hMRUList)
 INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData,
                         LPINT lpRegNum)
 {
-    const WINEMRULIST *mp = (LPWINEMRULIST)hList;
+    const WINEMRULIST *mp = hList;
     INT ret;
     UINT i;
     LPSTR dataA = NULL;
@@ -454,7 +454,7 @@ INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData,
  */
 INT WINAPI AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData)
 {
-    LPWINEMRULIST mp = (LPWINEMRULIST)hList;
+    LPWINEMRULIST mp = hList;
     LPWINEMRUITEM witem;
     INT i, replace;
 
@@ -718,7 +718,7 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp)
 	  mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags,
 	  mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey),
 	  mp->extview.lpfnCompare, mp->cursize);
-    return (HANDLE)mp;
+    return mp;
 }
 
 /**************************************************************************
@@ -830,7 +830,7 @@ HANDLE WINAPI CreateMRUListA (const CREATEMRULISTA *lpcml)
 INT WINAPI EnumMRUListW (HANDLE hList, INT nItemPos, LPVOID lpBuffer,
                          DWORD nBufferSize)
 {
-    const WINEMRULIST *mp = (LPWINEMRULIST) hList;
+    const WINEMRULIST *mp = hList;
     const WINEMRUITEM *witem;
     INT desired, datasize;
 
@@ -855,7 +855,7 @@ INT WINAPI EnumMRUListW (HANDLE hList, INT nItemPos, LPVOID lpBuffer,
 INT WINAPI EnumMRUListA (HANDLE hList, INT nItemPos, LPVOID lpBuffer,
                          DWORD nBufferSize)
 {
-    const WINEMRULIST *mp = (LPWINEMRULIST) hList;
+    const WINEMRULIST *mp = hList;
     LPWINEMRUITEM witem;
     INT desired, datasize;
     DWORD lenA;

dlls/comctl32/commctrl.c

@@ -869,7 +869,7 @@ CreateMappedBitmap (HINSTANCE hInstance, INT_PTR idBitmap, UINT wFlags,
 	internalColorMap[2].to = GetSysColor (COLOR_BTNFACE);
 	internalColorMap[3].to = GetSysColor (COLOR_BTNHIGHLIGHT);
 	iMaps = 4;
-	sysColorMap = (LPCOLORMAP)internalColorMap;
+	sysColorMap = internalColorMap;
     }
 
     hRsrc = FindResourceW (hInstance, (LPWSTR)idBitmap, (LPWSTR)RT_BITMAP);
@@ -1125,7 +1125,7 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
          ERR ("Failed to allocate our Subclassing stack\n");
          return FALSE;
       }
-      SetPropW (hWnd, COMCTL32_wSubclass, (HANDLE)stack);
+      SetPropW (hWnd, COMCTL32_wSubclass, stack);
 
       /* set window procedure to our own and save the current one */
       if (IsWindowUnicode (hWnd))

dlls/comctl32/header.c

@@ -405,7 +405,7 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT iItem, BOOL bHotTrack, LRESULT lCDFlags
 	}
 
 	if ((phdi->fmt & HDF_BITMAP) && (phdi->hbm)) {
-	    GetObjectW (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp);
+            GetObjectW (phdi->hbm, sizeof(BITMAP), &bmp);
 	    bw = bmp.bmWidth + 2 * infoPtr->iMargin;
 	    if (!iw) {
 		x = &bx;
@@ -903,7 +903,7 @@ HEADER_PrepareCallbackItems(HWND hwnd, INT iItem, INT reqMask)
         if (mask & HDI_TEXT)
             pvBuffer = Alloc(MAX_HEADER_TEXT_LEN * sizeof(CHAR));
     }
-    dispInfo.pszText      = (LPWSTR)pvBuffer;
+    dispInfo.pszText      = pvBuffer;
     dispInfo.cchTextMax   = (pvBuffer!=NULL?MAX_HEADER_TEXT_LEN:0);
     dispInfo.iItem        = iItem;
     dispInfo.mask         = mask;
@@ -923,7 +923,7 @@ HEADER_PrepareCallbackItems(HWND hwnd, INT iItem, INT reqMask)
     {
         if (infoPtr->nNotifyFormat == NFR_UNICODE)
         {
-            lpItem->pszText = (LPWSTR)pvBuffer;
+            lpItem->pszText = pvBuffer;
 
             /* the user might have used his own buffer */
             if (dispInfo.pszText != lpItem->pszText)

dlls/comctl32/imagelist.c

@@ -243,7 +243,7 @@ ImageList_Add (HIMAGELIST himl,	HBITMAP hbmImage, HBITMAP hbmMask)
     if (!is_valid(himl))
         return -1;
 
-    if (!GetObjectW(hbmImage, sizeof(BITMAP), (LPVOID)&bmp))
+    if (!GetObjectW(hbmImage, sizeof(BITMAP), &bmp))
         return -1;
 
     nImageCount = bmp.bmWidth / himl->cx;
@@ -1730,14 +1730,14 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow,
             DeleteObject (handle);
             return NULL;
         }
-        ImageList_AddMasked (himl, (HBITMAP)handle, clrMask);
+        ImageList_AddMasked (himl, handle, clrMask);
     }
     else if ((uType == IMAGE_ICON) || (uType == IMAGE_CURSOR)) {
         ICONINFO ii;
         BITMAP bmp;
 
         GetIconInfo (handle, &ii);
-        GetObjectW (ii.hbmColor, sizeof(BITMAP), (LPVOID)&bmp);
+        GetObjectW (ii.hbmColor, sizeof(BITMAP), &bmp);
         himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
         if (!himl) {
@@ -2196,7 +2196,7 @@ ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage,
         return FALSE;
     }
 
-    if (!GetObjectW(hbmImage, sizeof(BITMAP), (LPVOID)&bmp))
+    if (!GetObjectW(hbmImage, sizeof(BITMAP), &bmp))
         return FALSE;
 
     hdcImage = CreateCompatibleDC (0);
@@ -2291,7 +2291,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon)
         return -1;
     }
 
-    ret = GetObjectW (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp);
+    ret = GetObjectW (ii.hbmMask, sizeof(BITMAP), &bmp);
     if (!ret) {
         ERR("couldn't get mask bitmap info\n");
         if (ii.hbmColor)
@@ -2686,7 +2686,7 @@ _write_bitmap(HBITMAP hBitmap, LPSTREAM pstm)
     HDC xdc;
     BOOL result = FALSE;
 
-    if (!GetObjectW(hBitmap, sizeof(BITMAP), (LPVOID)&bm))
+    if (!GetObjectW(hBitmap, sizeof(BITMAP), &bm))
         return FALSE;
 
     bitCount = bm.bmBitsPixel == 1 ? 1 : 24;

dlls/comctl32/listview.c

@@ -1373,7 +1373,7 @@ static inline COLUMN_INFO * LISTVIEW_GetColumnInfo(const LISTVIEW_INFO *infoPtr,
 
     if (nSubItem == 0 && DPA_GetPtrCount(infoPtr->hdpaColumns) == 0) return &mainItem;
     assert (nSubItem >= 0 && nSubItem < DPA_GetPtrCount(infoPtr->hdpaColumns));
-    return (COLUMN_INFO *)DPA_GetPtr(infoPtr->hdpaColumns, nSubItem);
+    return DPA_GetPtr(infoPtr->hdpaColumns, nSubItem);
 }
 	
 static inline void LISTVIEW_GetHeaderRect(const LISTVIEW_INFO *infoPtr, INT nSubItem, LPRECT lprc)
@@ -2584,8 +2584,8 @@ static INT CALLBACK ranges_cmp(LPVOID range1, LPVOID range2, LPARAM flags)
 	cmp = 1;
     else 
 	cmp = 0;
-    
-    TRACE("range1=%s, range2=%s, cmp=%d\n", debugrange((RANGE*)range1), debugrange((RANGE*)range2), cmp);
+
+    TRACE("range1=%s, range2=%s, cmp=%d\n", debugrange(range1), debugrange(range2), cmp);
 
     return cmp;
 }
@@ -6473,8 +6473,8 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht,
 */
 static INT WINAPI LISTVIEW_InsertCompare(  LPVOID first, LPVOID second,  LPARAM lParam)
 {
-    ITEM_INFO* lv_first = DPA_GetPtr( (HDPA)first, 0 );
-    ITEM_INFO* lv_second = DPA_GetPtr( (HDPA)second, 0 );
+    ITEM_INFO* lv_first = DPA_GetPtr( first, 0 );
+    ITEM_INFO* lv_second = DPA_GetPtr( second, 0 );
     INT cmpv = textcmpWT(lv_first->hdr.pszText, lv_second->hdr.pszText, TRUE); 
 
     /* if we're sorting descending, negate the return value */
@@ -7755,8 +7755,8 @@ static BOOL LISTVIEW_SetUnicodeFormat( LISTVIEW_INFO *infoPtr, BOOL fUnicode)
 static INT WINAPI LISTVIEW_CallBackCompare(LPVOID first, LPVOID second, LPARAM lParam)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)lParam;
-  ITEM_INFO* lv_first = DPA_GetPtr( (HDPA)first, 0 );
-  ITEM_INFO* lv_second = DPA_GetPtr( (HDPA)second, 0 );
+  ITEM_INFO* lv_first = DPA_GetPtr( first, 0 );
+  ITEM_INFO* lv_second = DPA_GetPtr( second, 0 );
 
   /* Forward the call to the client defined callback */
   return (infoPtr->pfnCompare)( lv_first->lParam , lv_second->lParam, infoPtr->lParamSort );

dlls/comctl32/propsheet.c

@@ -673,19 +673,15 @@ static INT_PTR PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
   if( psInfo->unicode )
   {
     ret = (INT_PTR)CreateDialogIndirectParamW(psInfo->ppshheader.hInstance,
-                                          (LPDLGTEMPLATEW) temp,
-                                          psInfo->ppshheader.hwndParent,
-                                          PROPSHEET_DialogProc,
-                                          (LPARAM)psInfo);
+                                          temp, psInfo->ppshheader.hwndParent,
+                                          PROPSHEET_DialogProc, (LPARAM)psInfo);
     if ( !ret ) ret = -1;
   }
   else
   {
     ret = (INT_PTR)CreateDialogIndirectParamA(psInfo->ppshheader.hInstance,
-                                          (LPDLGTEMPLATEA) temp,
-                                          psInfo->ppshheader.hwndParent,
-                                          PROPSHEET_DialogProc,
-                                          (LPARAM)psInfo);
+                                          temp, psInfo->ppshheader.hwndParent,
+                                          PROPSHEET_DialogProc, (LPARAM)psInfo);
     if ( !ret ) ret = -1;
   }
 
@@ -2724,7 +2720,7 @@ static void PROPSHEET_CleanUp(HWND hwndDlg)
   Free(psInfo->strPropertiesFor);
   ImageList_Destroy(psInfo->hImageList);
 
-  GlobalFree((HGLOBAL)psInfo);
+  GlobalFree(psInfo);
 }
 
 static INT do_loop(const PropSheetInfo *psInfo)
@@ -3236,7 +3232,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam)
 	MapWindowPoints(hwndLineHeader, hwnd, (LPPOINT) &r, 2);
 	SetRect(&rzone, 0, 0, r.right + 1, r.top - 1);
 
-	GetObjectW(psInfo->ppshheader.u5.hbmHeader, sizeof(BITMAP), (LPVOID)&bm);		
+	GetObjectW(psInfo->ppshheader.u5.hbmHeader, sizeof(BITMAP), &bm);
 
  	if (psInfo->ppshheader.dwFlags & PSH_WIZARD97_OLD)
  	{
@@ -3344,7 +3340,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam)
 	hbr = GetSysColorBrush(COLOR_WINDOW);
 	FillRect(hdc, &rzone, hbr);
 
-	GetObjectW(psInfo->ppshheader.u4.hbmWatermark, sizeof(BITMAP), (LPVOID)&bm);
+	GetObjectW(psInfo->ppshheader.u4.hbmWatermark, sizeof(BITMAP), &bm);
 	hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u4.hbmWatermark);
 
         /* The watermark is truncated to a width of 164 pixels */
@@ -3399,7 +3395,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
       /* Using PropSheetInfoStr to store extra data doesn't match the native
        * common control: native uses TCM_[GS]ETITEM
        */
-      SetPropW(hwnd, PropSheetInfoStr, (HANDLE)psInfo);
+      SetPropW(hwnd, PropSheetInfoStr, psInfo);
 
       /*
        * psInfo->hwnd is not being used by WINE code - it exists

dlls/comctl32/tests/rebar.c

@@ -512,7 +512,7 @@ static void dump_client(HWND hRebar)
     RECT r;
     BOOL notify;
     GetWindowRect(hRebar, &r);
-    MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2);
+    MapWindowPoints(HWND_DESKTOP, hMainWnd, &r, 2);
     if (height_change_notify_rect.top != -1)
     {
         RECT rcClient;

dlls/comctl32/toolbar.c

@@ -3207,9 +3207,7 @@ TOOLBAR_Customize (HWND hwnd)
 	return FALSE;
 
     ret = DialogBoxIndirectParamW ((HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE),
-                                   (LPCDLGTEMPLATEW)template,
-                                   hwnd,
-                                   TOOLBAR_CustomizeDialogProc,
+                                   template, hwnd, TOOLBAR_CustomizeDialogProc,
                                    (LPARAM)&custInfo);
 
     /* send TBN_ENDADJUST notification */
@@ -7169,7 +7167,7 @@ static BOOL TOOLBAR_GetButtonInfo(const TOOLBAR_INFO *infoPtr, NMTOOLBARW *nmtb)
         {
             int ccht = strlen(nmtba.pszText);
             if (ccht)
-               MultiByteToWideChar(CP_ACP, 0, (LPCSTR)nmtba.pszText, -1, 
+               MultiByteToWideChar(CP_ACP, 0, nmtba.pszText, -1,
                   nmtb->pszText, nmtb->cchText);
 
             nmtb->tbButton = nmtba.tbButton;

dlls/comctl32/tooltips.c

@@ -368,7 +368,7 @@ static void TOOLTIPS_GetDispInfoA(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO
     ttnmdi.hdr.hwndFrom = hwnd;
     ttnmdi.hdr.idFrom = toolPtr->uId;
     ttnmdi.hdr.code = TTN_GETDISPINFOA; /* == TTN_NEEDTEXTA */
-    ttnmdi.lpszText = (LPSTR)ttnmdi.szText;
+    ttnmdi.lpszText = ttnmdi.szText;
     ttnmdi.uFlags = toolPtr->uFlags;
     ttnmdi.lParam = toolPtr->lParam;
 
@@ -424,7 +424,7 @@ static void TOOLTIPS_GetDispInfoW(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO
     ttnmdi.hdr.hwndFrom = hwnd;
     ttnmdi.hdr.idFrom = toolPtr->uId;
     ttnmdi.hdr.code = TTN_GETDISPINFOW; /* == TTN_NEEDTEXTW */
-    ttnmdi.lpszText = (LPWSTR)ttnmdi.szText;
+    ttnmdi.lpszText = ttnmdi.szText;
     ttnmdi.uFlags = toolPtr->uFlags;
     ttnmdi.lParam = toolPtr->lParam;
 

dlls/comctl32/updown.c

@@ -570,7 +570,7 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud)
                good to break the window proc chain. */
             if (!GetPropW(bud, BUDDY_SUPERCLASS_WNDPROC)) {
                 baseWndProc = (WNDPROC)SetWindowLongPtrW(bud, GWLP_WNDPROC, (LPARAM)UPDOWN_Buddy_SubclassProc);
-                SetPropW(bud, BUDDY_SUPERCLASS_WNDPROC, (HANDLE)baseWndProc);
+                SetPropW(bud, BUDDY_SUPERCLASS_WNDPROC, baseWndProc);
             }
         }