ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32: Remove unneeded casts.

Browse Source
This commit is contained in:
Andrew Talbot 2007-12-01 16:14:50 +00:00 committed by Alexandre Julliard
parent 263cb72e13
commit 1bf787d521
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/comctl32/commctrl.c
View File

@ -343,7 +343,7 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
else { else {
/* menu item was selected */ /* menu item was selected */
if (HIWORD(wParam) & MF_POPUP) if (HIWORD(wParam) & MF_POPUP)
uMenuID = (UINT)*(lpwIDs+1); uMenuID = *(lpwIDs+1);
else else
uMenuID = (UINT)LOWORD(wParam); uMenuID = (UINT)LOWORD(wParam);
TRACE("uMenuID = %u\n", uMenuID); TRACE("uMenuID = %u\n", uMenuID);

6
dlls/comctl32/dpa.c
View File

@ -443,7 +443,7 @@ HDPA WINAPI DPA_Clone (const HDPA hdpa, const HDPA hdpaNew)
/* create a new pointer array */ /* create a new pointer array */
nNewItems = hdpaTemp->nGrow * nNewItems = hdpaTemp->nGrow *
((INT)((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1); (((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1);
nSize = nNewItems * sizeof(LPVOID); nSize = nNewItems * sizeof(LPVOID);
hdpaTemp->ptrs = HeapAlloc (hdpaTemp->hHeap, HEAP_ZERO_MEMORY, nSize); hdpaTemp->ptrs = HeapAlloc (hdpaTemp->hHeap, HEAP_ZERO_MEMORY, nSize);
hdpaTemp->nMaxCount = nNewItems; hdpaTemp->nMaxCount = nNewItems;
@ -583,7 +583,7 @@ BOOL WINAPI DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p)
if (hdpa->nMaxCount <= i) { if (hdpa->nMaxCount <= i) {
/* resize the block of memory */ /* resize the block of memory */
INT nNewItems = INT nNewItems =
hdpa->nGrow * ((INT)(((i+1) - 1) / hdpa->nGrow) + 1); hdpa->nGrow * ((((i+1) - 1) / hdpa->nGrow) + 1);
INT nSize = nNewItems * sizeof(LPVOID); INT nSize = nNewItems * sizeof(LPVOID);
if (hdpa->ptrs) if (hdpa->ptrs)
@ -654,7 +654,7 @@ LPVOID WINAPI DPA_DeletePtr (const HDPA hdpa, INT i)
return NULL; return NULL;
hdpa->nMaxCount = nNewItems; hdpa->nMaxCount = nNewItems;
hdpa->ptrs = (LPVOID*)lpDest; hdpa->ptrs = lpDest;
} }
return lpTemp; return lpTemp;

2
dlls/comctl32/dsa.c
View File

@ -211,7 +211,7 @@ BOOL WINAPI DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc)
else { else {
/* resize the block of memory */ /* resize the block of memory */
nNewItems = nNewItems =
hdsa->nGrow * ((INT)(((nIndex + 1) - 1) / hdsa->nGrow) + 1); hdsa->nGrow * ((((nIndex + 1) - 1) / hdsa->nGrow) + 1);
nSize = hdsa->nItemSize * nNewItems; nSize = hdsa->nItemSize * nNewItems;
lpTemp = ReAlloc (hdsa->pData, nSize); lpTemp = ReAlloc (hdsa->pData, nSize);

4
dlls/comctl32/propsheet.c
View File

@ -1527,7 +1527,7 @@ static VOID PROPSHEET_LoadWizardBitmaps(PropSheetInfo *psInfo)
if ((psInfo->ppshheader.dwFlags & PSH_WATERMARK) && if ((psInfo->ppshheader.dwFlags & PSH_WATERMARK) &&
!(psInfo->ppshheader.dwFlags & PSH_USEHBMWATERMARK)) !(psInfo->ppshheader.dwFlags & PSH_USEHBMWATERMARK))
{ {
((PropSheetInfo *)psInfo)->ppshheader.u4.hbmWatermark = psInfo->ppshheader.u4.hbmWatermark =
CreateMappedBitmap(psInfo->ppshheader.hInstance, (INT_PTR)psInfo->ppshheader.u4.pszbmWatermark, 0, NULL, 0); CreateMappedBitmap(psInfo->ppshheader.hInstance, (INT_PTR)psInfo->ppshheader.u4.pszbmWatermark, 0, NULL, 0);
} }
@ -1535,7 +1535,7 @@ static VOID PROPSHEET_LoadWizardBitmaps(PropSheetInfo *psInfo)
if ((psInfo->ppshheader.dwFlags & PSH_HEADER) && if ((psInfo->ppshheader.dwFlags & PSH_HEADER) &&
!(psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER)) !(psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER))
{ {
((PropSheetInfo *)psInfo)->ppshheader.u5.hbmHeader = psInfo->ppshheader.u5.hbmHeader =
CreateMappedBitmap(psInfo->ppshheader.hInstance, (INT_PTR)psInfo->ppshheader.u5.pszbmHeader, 0, NULL, 0); CreateMappedBitmap(psInfo->ppshheader.hInstance, (INT_PTR)psInfo->ppshheader.u5.pszbmHeader, 0, NULL, 0);
} }
} }

4
dlls/comctl32/toolbar.c
View File

@ -3190,7 +3190,7 @@ TOOLBAR_Customize (HWND hwnd)
(LPWSTR)RT_DIALOG))) (LPWSTR)RT_DIALOG)))
return FALSE; return FALSE;
if(!(template = (LPVOID)LoadResource (COMCTL32_hModule, hRes))) if(!(template = LoadResource (COMCTL32_hModule, hRes)))
return FALSE; return FALSE;
ret = DialogBoxIndirectParamW ((HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE), ret = DialogBoxIndirectParamW ((HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE),
@ -5893,7 +5893,7 @@ TOOLBAR_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
infoPtr->nButtonDown = -1; infoPtr->nButtonDown = -1;
/* Issue NM_RELEASEDCAPTURE to parent to let him know it is released */ /* Issue NM_RELEASEDCAPTURE to parent to let him know it is released */
TOOLBAR_SendNotify ((NMHDR *) &hdr, infoPtr, TOOLBAR_SendNotify (&hdr, infoPtr,
NM_RELEASEDCAPTURE); NM_RELEASEDCAPTURE);
/* native issues TBN_ENDDRAG here, if _LBUTTONDOWN issued the /* native issues TBN_ENDDRAG here, if _LBUTTONDOWN issued the

2
dlls/comctl32/tooltips.c
View File

@ -1109,7 +1109,7 @@ TOOLTIPS_AddToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (IS_INTRESOURCE(lpToolInfo->lpszText)) { if (IS_INTRESOURCE(lpToolInfo->lpszText)) {
TRACE("add string id %x\n", LOWORD(lpToolInfo->lpszText)); TRACE("add string id %x\n", LOWORD(lpToolInfo->lpszText));
toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText; toolPtr->lpszText = lpToolInfo->lpszText;
} }
else if (lpToolInfo->lpszText) { else if (lpToolInfo->lpszText) {
if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW) { if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW) {

2
dlls/comctl32/trackbar.c
View File

@ -811,7 +811,7 @@ TRACKBAR_UpdateToolTip (const TRACKBAR_INFO *infoPtr)
ClientToScreen(infoPtr->hwndSelf, &pt); ClientToScreen(infoPtr->hwndSelf, &pt);
SendMessageW (infoPtr->hwndToolTip, TTM_TRACKPOSITION, SendMessageW (infoPtr->hwndToolTip, TTM_TRACKPOSITION,
0, (LPARAM)MAKELPARAM(pt.x, pt.y)); 0, MAKELPARAM(pt.x, pt.y));
} }

2
dlls/comctl32/treeview.c
View File

@ -3996,7 +3996,7 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam)
if(ht.hItem && (ht.flags & TVHT_ONITEM)) if(ht.hItem && (ht.flags & TVHT_ONITEM))
{ {
infoPtr->focusedItem = ht.hItem; infoPtr->focusedItem = ht.hItem;
InvalidateRect(hwnd, &(((HTREEITEM)(ht.hItem))->rect), TRUE); InvalidateRect(hwnd, &ht.hItem->rect, TRUE);
if(infoPtr->selectedItem) if(infoPtr->selectedItem)
InvalidateRect(hwnd, &(infoPtr->selectedItem->rect), TRUE); InvalidateRect(hwnd, &(infoPtr->selectedItem->rect), TRUE);