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

comctl32/listview: Remove current sorting arguments from control structure. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-03-08 17:44:38 +03:00 committed by Alexandre Julliard
parent 043ecca384
commit fef35d7b5d
1 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
dlls/comctl32/listview.c
View File

@ -254,10 +254,6 @@ typedef struct tagLISTVIEW_INFO
INT nItemHeight; INT nItemHeight;
INT nItemWidth; INT nItemWidth;
/* sorting */
PFNLVCOMPARE pfnCompare; /* sorting callback pointer */
LPARAM lParamSort;
/* style */ /* style */
DWORD dwStyle; /* the cached window GWL_STYLE */ DWORD dwStyle; /* the cached window GWL_STYLE */
DWORD dwLvExStyle; /* extended listview style */ DWORD dwLvExStyle; /* extended listview style */
@ -9232,52 +9228,31 @@ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView)
/* LISTVIEW_SetWorkAreas */ /* LISTVIEW_SetWorkAreas */
/*** struct sorting_context
* DESCRIPTION: {
* Callback internally used by LISTVIEW_SortItems() in response of LVM_SORTITEMS LISTVIEW_INFO *infoPtr;
* PFNLVCOMPARE compare_func;
* PARAMETER(S): LPARAM lParam;
* [I] first : pointer to first ITEM_INFO to compare };
* [I] second : pointer to second ITEM_INFO to compare
* [I] lParam : HWND of control /* DPA_Sort() callback used for LVM_SORTITEMS */
*
* RETURN:
* if first comes before second : negative
* if first comes after second : positive
* if first and second are equivalent : zero
*/
static INT WINAPI LISTVIEW_CallBackCompare(LPVOID first, LPVOID second, LPARAM lParam) static INT WINAPI LISTVIEW_CallBackCompare(LPVOID first, LPVOID second, LPARAM lParam)
{ {
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)lParam; struct sorting_context *context = (struct sorting_context *)lParam;
ITEM_INFO* lv_first = DPA_GetPtr( first, 0 ); ITEM_INFO* lv_first = DPA_GetPtr( first, 0 );
ITEM_INFO* lv_second = DPA_GetPtr( second, 0 ); ITEM_INFO* lv_second = DPA_GetPtr( second, 0 );
/* Forward the call to the client defined callback */ return context->compare_func(lv_first->lParam, lv_second->lParam, context->lParam);
return (infoPtr->pfnCompare)( lv_first->lParam , lv_second->lParam, infoPtr->lParamSort );
} }
/*** /* DPA_Sort() callback used for LVM_SORTITEMSEX */
* DESCRIPTION:
* Callback internally used by LISTVIEW_SortItems() in response of LVM_SORTITEMSEX
*
* PARAMETER(S):
* [I] first : pointer to first ITEM_INFO to compare
* [I] second : pointer to second ITEM_INFO to compare
* [I] lParam : HWND of control
*
* RETURN:
* if first comes before second : negative
* if first comes after second : positive
* if first and second are equivalent : zero
*/
static INT WINAPI LISTVIEW_CallBackCompareEx(LPVOID first, LPVOID second, LPARAM lParam) static INT WINAPI LISTVIEW_CallBackCompareEx(LPVOID first, LPVOID second, LPARAM lParam)
{ {
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)lParam; struct sorting_context *context = (struct sorting_context *)lParam;
INT first_idx = DPA_GetPtrIndex( infoPtr->hdpaItems, first ); INT first_idx = DPA_GetPtrIndex( context->infoPtr->hdpaItems, first );
INT second_idx = DPA_GetPtrIndex( infoPtr->hdpaItems, second ); INT second_idx = DPA_GetPtrIndex( context->infoPtr->hdpaItems, second );
/* Forward the call to the client defined callback */ return context->compare_func(first_idx, second_idx, context->lParam);
return (infoPtr->pfnCompare)( first_idx, second_idx, infoPtr->lParamSort );
} }
/*** /***
@ -9301,6 +9276,7 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare,
ITEM_INFO *lpItem; ITEM_INFO *lpItem;
LPVOID selectionMarkItem = NULL; LPVOID selectionMarkItem = NULL;
LPVOID focusedItem = NULL; LPVOID focusedItem = NULL;
struct sorting_context context;
int i; int i;
TRACE("(pfnCompare=%p, lParamSort=%lx)\n", pfnCompare, lParamSort); TRACE("(pfnCompare=%p, lParamSort=%lx)\n", pfnCompare, lParamSort);
@ -9322,12 +9298,13 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare,
if (infoPtr->nFocusedItem >= 0) if (infoPtr->nFocusedItem >= 0)
focusedItem = DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nFocusedItem); focusedItem = DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nFocusedItem);
infoPtr->pfnCompare = pfnCompare; context.infoPtr = infoPtr;
infoPtr->lParamSort = lParamSort; context.compare_func = pfnCompare;
context.lParam = lParamSort;
if (IsEx) if (IsEx)
DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompareEx, (LPARAM)infoPtr); DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompareEx, (LPARAM)&context);
else else
DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)infoPtr); DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)&context);
/* restore selection ranges */ /* restore selection ranges */
for (i=0; i < infoPtr->nItemCount; i++) for (i=0; i < infoPtr->nItemCount; i++)