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

comctl32/header: Use proper return type for HDM_CREATEDRAGIMAGE handler. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-05-12 23:00:03 +03:00 committed by Alexandre Julliard
parent b51aaa40dc
commit ac75a00b0d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/comctl32/header.c
View File

@ -1005,7 +1005,7 @@ HEADER_FreeCallbackItems(HEADER_ITEM *lpItem)
lpItem->iImage = I_IMAGECALLBACK; lpItem->iImage = I_IMAGECALLBACK;
} }
static LRESULT static HIMAGELIST
HEADER_CreateDragImage (HEADER_INFO *infoPtr, INT iItem) HEADER_CreateDragImage (HEADER_INFO *infoPtr, INT iItem)
{ {
HEADER_ITEM *lpItem; HEADER_ITEM *lpItem;
@ -1019,7 +1019,7 @@ HEADER_CreateDragImage (HEADER_INFO *infoPtr, INT iItem)
HFONT hFont; HFONT hFont;
if (iItem >= infoPtr->uNumItem) if (iItem >= infoPtr->uNumItem)
return FALSE; return NULL;
if (!infoPtr->bRectsValid) if (!infoPtr->bRectsValid)
HEADER_SetItemBounds(infoPtr); HEADER_SetItemBounds(infoPtr);
@ -1047,12 +1047,12 @@ HEADER_CreateDragImage (HEADER_INFO *infoPtr, INT iItem)
DeleteDC(hMemoryDC); DeleteDC(hMemoryDC);
if (hMemory == NULL) /* if anything failed */ if (hMemory == NULL) /* if anything failed */
return FALSE; return NULL;
himl = ImageList_Create(width, height, ILC_COLORDDB, 1, 1); himl = ImageList_Create(width, height, ILC_COLORDDB, 1, 1);
ImageList_Add(himl, hMemory, NULL); ImageList_Add(himl, hMemory, NULL);
DeleteObject(hMemory); DeleteObject(hMemory);
return (LRESULT)himl; return himl;
} }
static LRESULT static LRESULT
@ -1836,7 +1836,7 @@ HEADER_MouseMove (HEADER_INFO *infoPtr, LPARAM lParam)
{ {
if (!HEADER_SendNotifyWithHDItemT(infoPtr, HDN_BEGINDRAG, infoPtr->iMoveItem, NULL)) if (!HEADER_SendNotifyWithHDItemT(infoPtr, HDN_BEGINDRAG, infoPtr->iMoveItem, NULL))
{ {
HIMAGELIST hDragItem = (HIMAGELIST)HEADER_CreateDragImage(infoPtr, infoPtr->iMoveItem); HIMAGELIST hDragItem = HEADER_CreateDragImage(infoPtr, infoPtr->iMoveItem);
if (hDragItem != NULL) if (hDragItem != NULL)
{ {
HEADER_ITEM *lpItem = &infoPtr->items[infoPtr->iMoveItem]; HEADER_ITEM *lpItem = &infoPtr->items[infoPtr->iMoveItem];
@ -2067,7 +2067,7 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
/* case HDM_CLEARFILTER: */ /* case HDM_CLEARFILTER: */
case HDM_CREATEDRAGIMAGE: case HDM_CREATEDRAGIMAGE:
return HEADER_CreateDragImage (infoPtr, (INT)wParam); return (LRESULT)HEADER_CreateDragImage (infoPtr, (INT)wParam);
case HDM_DELETEITEM: case HDM_DELETEITEM:
return HEADER_DeleteItem (infoPtr, (INT)wParam); return HEADER_DeleteItem (infoPtr, (INT)wParam);