November 2009 - Wine-commits

Nikolay Sivov : comctl32/listview: Draw LVIS_CUT items with white foreground color.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 8eb9e7ebd52cb9bc14c34740a5c4c98744f25135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eb9e7ebd52cb9bc14c34740a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Nov 27 19:08:59 2009 +0300 comctl32/listview: Draw LVIS_CUT items with white foreground color. --- dlls/comctl32/listview.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index df48272..bd048bf 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -74,7 +74,6 @@ * * States * -- LVIS_ACTIVATING (not currently supported by comctl32.dll version 6.0) - * -- LVIS_CUT * -- LVIS_DROPHILITED * -- LVIS_OVERLAYMASK * @@ -4439,7 +4438,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; if (nSubItem == 0) lvItem.mask |= LVIF_STATE; if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT; - lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK; + lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT; lvItem.iItem = nItem; lvItem.iSubItem = nSubItem; lvItem.state = 0; @@ -4542,14 +4541,23 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS } } - /* small icons */ + /* item icons */ himl = (infoPtr->uView == LV_VIEW_ICON ? infoPtr->himlNormal : infoPtr->himlSmall); if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) { + UINT style; + TRACE("iImage=%d\n", lvItem.iImage); + + if (lvItem.state & (LVIS_SELECTED | LVIS_CUT) && infoPtr->bFocus) + style = ILD_SELECTED; + else + style = ILD_NORMAL; + ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, - rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, CLR_DEFAULT, - (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); + rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, + lvItem.state & LVIS_CUT ? RGB(255, 255, 255) : CLR_DEFAULT, + style); } /* Don't bother painting item being edited */

1 0

Nikolay Sivov : comctl32/listview: Make mouse hover work.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 5f191553e8a7c9c8b528403ff02a5a0c12c0662f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f191553e8a7c9c8b528403ff… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Nov 27 21:08:49 2009 +0300 comctl32/listview: Make mouse hover work. Event data was overwritten by TME_QUERY response. --- dlls/comctl32/listview.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bd048bf..6d563b7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3627,7 +3627,7 @@ static BOOL LISTVIEW_GetItemAtPt(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVIte return LISTVIEW_GetItemT(infoPtr, lpLVItem, TRUE); } -static inline BOOL LISTVIEW_isHotTracking(const LISTVIEW_INFO *infoPtr) +static inline BOOL LISTVIEW_IsHotTracking(const LISTVIEW_INFO *infoPtr) { return ((infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) || (infoPtr->dwLvExStyle & LVS_EX_ONECLICKACTIVATE) || @@ -3654,11 +3654,13 @@ static inline BOOL LISTVIEW_isHotTracking(const LISTVIEW_INFO *infoPtr) */ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, INT y) { - if (LISTVIEW_isHotTracking(infoPtr)) + if (LISTVIEW_IsHotTracking(infoPtr)) { LVITEMW item; POINT pt; + SetFocus(infoPtr->hwndSelf); + pt.x = x; pt.y = y; @@ -3874,8 +3876,6 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent */ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, INT y) { - TRACKMOUSEEVENT trackinfo; - if (!(fwKeys & MK_LBUTTON)) infoPtr->bLButtonDown = FALSE; @@ -4007,18 +4007,19 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN } /* see if we are supposed to be tracking mouse hovering */ - if (LISTVIEW_isHotTracking(infoPtr)) { - /* fill in the trackinfo struct */ + if (LISTVIEW_IsHotTracking(infoPtr)) { + TRACKMOUSEEVENT trackinfo; + trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); trackinfo.dwFlags = TME_QUERY; - trackinfo.hwndTrack = infoPtr->hwndSelf; - trackinfo.dwHoverTime = infoPtr->dwHoverTime; /* see if we are already tracking this hwnd */ _TrackMouseEvent(&trackinfo); - if(!(trackinfo.dwFlags & TME_HOVER)) { - trackinfo.dwFlags = TME_HOVER; + if(!(trackinfo.dwFlags & TME_HOVER) || trackinfo.hwndTrack != infoPtr->hwndSelf) { + trackinfo.dwFlags = TME_HOVER; + trackinfo.dwHoverTime = infoPtr->dwHoverTime; + trackinfo.hwndTrack = infoPtr->hwndSelf; /* call TRACKMOUSEEVENT so we receive WM_MOUSEHOVER messages */ _TrackMouseEvent(&trackinfo); @@ -9079,7 +9080,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING); infoPtr->nEditLabelItem = -1; infoPtr->nLButtonDownItem = -1; - infoPtr->dwHoverTime = -1; /* default system hover time */ + infoPtr->dwHoverTime = HOVER_DEFAULT; /* default system hover time */ infoPtr->nMeasureItemHeight = 0; infoPtr->xTrackLine = -1; /* no track line */ infoPtr->itemEdit.fEnabled = FALSE; @@ -10425,7 +10426,7 @@ static BOOL LISTVIEW_SetCursor(const LISTVIEW_INFO *infoPtr, WPARAM wParam, LPAR { LVHITTESTINFO lvHitTestInfo; - if (!(LISTVIEW_isHotTracking(infoPtr))) goto forward; + if (!LISTVIEW_IsHotTracking(infoPtr)) goto forward; if (!infoPtr->hHotCursor) goto forward;

1 0

Nikolay Sivov : comctl32/listview: Add NM_HOVER notification.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: ea058d22ba2374e7b41d0067a9202100b1f047e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea058d22ba2374e7b41d0067a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Nov 27 23:05:43 2009 +0300 comctl32/listview: Add NM_HOVER notification. --- dlls/comctl32/listview.c | 9 ++++++--- dlls/comctl32/tests/listview.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6d563b7..97bf05a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -99,7 +99,6 @@ * -- LVN_GETINFOTIP * -- LVN_HOTTRACK * -- LVN_SETDISPINFO - * -- NM_HOVER * -- LVN_BEGINRDRAG * * Messages: @@ -3654,18 +3653,22 @@ static inline BOOL LISTVIEW_IsHotTracking(const LISTVIEW_INFO *infoPtr) */ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, INT y) { + NMHDR hdr; + + if (notify_hdr(infoPtr, NM_HOVER, &hdr)) return 0; + if (LISTVIEW_IsHotTracking(infoPtr)) { LVITEMW item; POINT pt; - SetFocus(infoPtr->hwndSelf); - pt.x = x; pt.y = y; if (LISTVIEW_GetItemAtPt(infoPtr, &item, pt)) LISTVIEW_SetSelection(infoPtr, item.iItem); + + SetFocus(infoPtr->hwndSelf); } return 0; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 651b941..0b55a23 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -46,7 +46,9 @@ static const WCHAR testparentclassW[] = HWND hwndparent, hwndparentW; /* prevents edit box creation, LVN_BEGINLABELEDIT return value */ -BOOL blockEdit; +static BOOL blockEdit; +/* return nonzero on NM_HOVER */ +static BOOL g_block_hover; /* dumps LVN_ITEMCHANGED message data */ static BOOL g_dump_itemchanged; /* format reported to control: @@ -278,6 +280,12 @@ static const struct message edit_end_nochange[] = { { 0 } }; +static const struct message hover_parent[] = { + { WM_GETDLGCODE, sent }, /* todo_wine */ + { WM_NOTIFY, sent|id, 0, 0, NM_HOVER }, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -344,6 +352,9 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP nmlv->iItem, nmlv->uNewState, nmlv->uOldState, nmlv->uChanged); } break; + case NM_HOVER: + if (g_block_hover) return 1; + break; } break; } @@ -4247,6 +4258,28 @@ static void test_LVS_EX_HEADERINALLVIEWS(void) DestroyWindow(hwnd); } +static void test_hover(void) +{ + HWND hwnd; + DWORD r; + + hwnd = create_custom_listview_control(LVS_ICON); + + /* test WM_MOUSEHOVER forwarding */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + r = SendMessage(hwnd, WM_MOUSEHOVER, 0, 0); + expect(0, r); + ok_sequence(sequences, PARENT_SEQ_INDEX, hover_parent, "NM_HOVER allow test", TRUE); + g_block_hover = TRUE; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + r = SendMessage(hwnd, WM_MOUSEHOVER, 0, 0); + expect(0, r); + ok_sequence(sequences, PARENT_SEQ_INDEX, hover_parent, "NM_HOVER block test", TRUE); + g_block_hover = FALSE; + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4306,6 +4339,7 @@ START_TEST(listview) test_getcolumnwidth(); test_approximate_viewrect(); test_finditem(); + test_hover(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Nikolay Sivov : comctl32/listview: New hover value should be passed using LPARAM.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 78e7b3cf9c9b03544e8ac367bf247306b7469052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e7b3cf9c9b03544e8ac367b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Nov 28 11:50:30 2009 +0300 comctl32/listview: New hover value should be passed using LPARAM. --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 97bf05a..8f6db54 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11134,7 +11134,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_SetHotItem(infoPtr, (INT)wParam); case LVM_SETHOVERTIME: - return LISTVIEW_SetHoverTime(infoPtr, (DWORD)wParam); + return LISTVIEW_SetHoverTime(infoPtr, (DWORD)lParam); case LVM_SETICONSPACING: return LISTVIEW_SetIconSpacing(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0b55a23..8e2d9d5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4277,6 +4277,11 @@ static void test_hover(void) ok_sequence(sequences, PARENT_SEQ_INDEX, hover_parent, "NM_HOVER block test", TRUE); g_block_hover = FALSE; + r = SendMessage(hwnd, LVM_SETHOVERTIME, 0, 500); + expect(HOVER_DEFAULT, r); + r = SendMessage(hwnd, LVM_GETHOVERTIME, 0, 0); + expect(500, r); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : ntdll: Call DLL_PROCESS_DETACH if attaching failed.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: dbbd2161ab516bef0c92d116c7a3cf7d061caa42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbd2161ab516bef0c92d116c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Nov 25 10:18:07 2009 +0300 ntdll: Call DLL_PROCESS_DETACH if attaching failed. --- dlls/ntdll/loader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6ce51e7..e3d7adb 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1073,6 +1073,7 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) wm->ldr.Flags |= LDR_PROCESS_ATTACHED; else { + MODULE_InitDLL( wm, DLL_PROCESS_DETACH, lpReserved ); /* point to the name so LdrInitializeThunk can print it */ last_failed_modref = wm; WARN("Initialization of %s failed\n", debugstr_w(wm->ldr.BaseDllName.Buffer));

1 0

Nikolay Sivov : comctl32/listview: Default column width in LVS_LIST to better value.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: fc43895f49a423bdc6d826be7ad16b00c960612c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc43895f49a423bdc6d826be7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Nov 26 22:42:33 2009 +0300 comctl32/listview: Default column width in LVS_LIST to better value. --- dlls/comctl32/listview.c | 13 +++++++++---- dlls/comctl32/tests/listview.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5b45ffb..b846176 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -403,7 +403,7 @@ typedef struct tagLISTVIEW_INFO #define MAX_EMPTYTEXT_SELECT_WIDTH 80 /* default column width for items in list display mode */ -#define DEFAULT_COLUMN_WIDTH 128 +#define DEFAULT_COLUMN_WIDTH 96 /* Size of "line" scroll for V & H scrolls */ #define LISTVIEW_SCROLL_ICON_LINE_SIZE 37 @@ -2786,15 +2786,20 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) } else /* LV_VIEW_SMALLICON, or LV_VIEW_LIST */ { + BOOL empty; INT i; - + for (i = 0; i < infoPtr->nItemCount; i++) nItemWidth = max(LISTVIEW_GetLabelWidth(infoPtr, i), nItemWidth); + empty = nItemWidth == 0; if (infoPtr->himlSmall) nItemWidth += infoPtr->iconSize.cx; if (infoPtr->himlState) nItemWidth += infoPtr->iconStateSize.cx; - nItemWidth = max(DEFAULT_COLUMN_WIDTH, nItemWidth + WIDTH_PADDING); + if (empty) + nItemWidth = max(nItemWidth, DEFAULT_COLUMN_WIDTH); + else + nItemWidth += WIDTH_PADDING; } return nItemWidth; @@ -7454,7 +7459,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems ); if (nItem == -1) goto fail; - infoPtr->nItemCount++; + if (infoPtr->nItemCount++ == 0) LISTVIEW_UpdateItemSize(infoPtr); /* shift indices first so they don't get tangled */ LISTVIEW_ShiftIndices(infoPtr, nItem, 1); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 95d9ddc..1b6fcab 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3124,6 +3124,20 @@ static void test_getitemrect(void) INT order[2]; POINT pt; + /* rectangle isn't empty for empty text items */ + hwnd = create_custom_listview_control(LVS_LIST); + memset(&item, 0, sizeof(item)); + item.mask = 0; + item.iItem = 0; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + expect(0, r); + rect.left = LVIR_LABEL; + SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(0, rect.left); + expect(0, rect.top); + todo_wine expect(96, rect.right); + DestroyWindow(hwnd); + hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -3921,6 +3935,7 @@ static void test_getcolumnwidth(void) DWORD ret; DWORD_PTR style; LVCOLUMNA col; + LVITEMA itema; /* default column width */ hwnd = create_custom_listview_control(0); @@ -3938,6 +3953,14 @@ static void test_getcolumnwidth(void) ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); expect(10, ret); DestroyWindow(hwnd); + + /* default column width with item added */ + hwnd = create_custom_listview_control(LVS_LIST); + memset(&itema, 0, sizeof(itema)); + SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); + ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + expect(96, ret); + DestroyWindow(hwnd); } static void test_scrollnotify(void)

1 0

Nikolay Sivov : comctl32/listview: Collapse some handlers call in winproc.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 62c610df3cc6a8a81962ea6eb597353ae3495dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c610df3cc6a8a81962ea6eb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Nov 26 22:49:49 2009 +0300 comctl32/listview: Collapse some handlers call in winproc. --- dlls/comctl32/listview.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b846176..9f0f404 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10930,10 +10930,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return FALSE; case LVM_GETITEMA: - return LISTVIEW_GetItemExtT(infoPtr, (LPLVITEMW)lParam, FALSE); - case LVM_GETITEMW: - return LISTVIEW_GetItemExtT(infoPtr, (LPLVITEMW)lParam, TRUE); + return LISTVIEW_GetItemExtT(infoPtr, (LPLVITEMW)lParam, uMsg == LVM_GETITEMW); case LVM_GETITEMCOUNT: return infoPtr->nItemCount; @@ -10951,10 +10949,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_GetItemState(infoPtr, (INT)wParam, (UINT)lParam); case LVM_GETITEMTEXTA: - return LISTVIEW_GetItemTextT(infoPtr, (INT)wParam, (LPLVITEMW)lParam, FALSE); - case LVM_GETITEMTEXTW: - return LISTVIEW_GetItemTextT(infoPtr, (INT)wParam, (LPLVITEMW)lParam, TRUE); + return LISTVIEW_GetItemTextT(infoPtr, (INT)wParam, (LPLVITEMW)lParam, + uMsg == LVM_GETITEMTEXTW); case LVM_GETNEXTITEM: return LISTVIEW_GetNextItem(infoPtr, (INT)wParam, LOWORD(lParam)); @@ -10981,10 +10978,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return infoPtr->nSelectionMark; case LVM_GETSTRINGWIDTHA: - return LISTVIEW_GetStringWidthT(infoPtr, (LPCWSTR)lParam, FALSE); - case LVM_GETSTRINGWIDTHW: - return LISTVIEW_GetStringWidthT(infoPtr, (LPCWSTR)lParam, TRUE); + return LISTVIEW_GetStringWidthT(infoPtr, (LPCWSTR)lParam, + uMsg == LVM_GETSTRINGWIDTHW); case LVM_GETSUBITEMRECT: return LISTVIEW_GetSubItemRect(infoPtr, (UINT)wParam, (LPRECT)lParam); @@ -11026,10 +11022,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_HitTest(infoPtr, (LPLVHITTESTINFO)lParam, FALSE, TRUE); case LVM_INSERTCOLUMNA: - return LISTVIEW_InsertColumnT(infoPtr, (INT)wParam, (LPLVCOLUMNW)lParam, FALSE); - case LVM_INSERTCOLUMNW: - return LISTVIEW_InsertColumnT(infoPtr, (INT)wParam, (LPLVCOLUMNW)lParam, TRUE); + return LISTVIEW_InsertColumnT(infoPtr, (INT)wParam, (LPLVCOLUMNW)lParam, + uMsg == LVM_INSERTCOLUMNW); /* case LVM_INSERTGROUP: */ @@ -11076,10 +11071,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TRUE; case LVM_SETCOLUMNA: - return LISTVIEW_SetColumnT(infoPtr, (INT)wParam, (LPLVCOLUMNW)lParam, FALSE); - case LVM_SETCOLUMNW: - return LISTVIEW_SetColumnT(infoPtr, (INT)wParam, (LPLVCOLUMNW)lParam, TRUE); + return LISTVIEW_SetColumnT(infoPtr, (INT)wParam, (LPLVCOLUMNW)lParam, + uMsg == LVM_SETCOLUMNW); case LVM_SETCOLUMNORDERARRAY: return LISTVIEW_SetColumnOrderArray(infoPtr, (INT)wParam, (LPINT)lParam); @@ -11142,10 +11136,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_SetItemState(infoPtr, (INT)wParam, (LPLVITEMW)lParam); case LVM_SETITEMTEXTA: - return LISTVIEW_SetItemTextT(infoPtr, (INT)wParam, (LPLVITEMW)lParam, FALSE); - case LVM_SETITEMTEXTW: - return LISTVIEW_SetItemTextT(infoPtr, (INT)wParam, (LPLVITEMW)lParam, TRUE); + return LISTVIEW_SetItemTextT(infoPtr, (INT)wParam, (LPLVITEMW)lParam, + uMsg == LVM_SETITEMTEXTW); /* case LVM_SETOUTLINECOLOR: */

1 0

Nikolay Sivov : comctl32/listview: Remove parameter check from winproc for LVM_SETITEMPOSITION32.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 8d43bdd2eee2893aaa4297f3fae428c146629d02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d43bdd2eee2893aaa4297f3f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Nov 26 23:01:54 2009 +0300 comctl32/listview: Remove parameter check from winproc for LVM_SETITEMPOSITION32. --- dlls/comctl32/listview.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9f0f404..11fb401 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8489,34 +8489,35 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl * SUCCESS : TRUE * FAILURE : FALSE */ -static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, POINT pt) +static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, POINT *pt) { - POINT Origin; + POINT Origin, Pt; - TRACE("(nItem=%d, &pt=%s\n", nItem, wine_dbgstr_point(&pt)); + TRACE("(nItem=%d, pt=%s\n", nItem, wine_dbgstr_point(pt)); - if (nItem < 0 || nItem >= infoPtr->nItemCount || + if (!pt || nItem < 0 || nItem >= infoPtr->nItemCount || !(infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON)) return FALSE; + Pt = *pt; LISTVIEW_GetOrigin(infoPtr, &Origin); /* This point value seems to be an undocumented feature. * The best guess is that it means either at the origin, * or at true beginning of the list. I will assume the origin. */ - if ((pt.x == -1) && (pt.y == -1)) - pt = Origin; + if ((Pt.x == -1) && (Pt.y == -1)) + Pt = Origin; if (infoPtr->uView == LV_VIEW_ICON) { - pt.x -= (infoPtr->nItemWidth - infoPtr->iconSize.cx) / 2; - pt.y -= ICON_TOP_PADDING; + Pt.x -= (infoPtr->nItemWidth - infoPtr->iconSize.cx) / 2; + Pt.y -= ICON_TOP_PADDING; } - pt.x -= Origin.x; - pt.y -= Origin.y; + Pt.x -= Origin.x; + Pt.y -= Origin.y; infoPtr->bAutoarrange = FALSE; - return LISTVIEW_MoveIconTo(infoPtr, nItem, &pt, FALSE); + return LISTVIEW_MoveIconTo(infoPtr, nItem, &Pt, FALSE); } /*** @@ -11124,12 +11125,11 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) POINT pt; pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, pt); + return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, &pt); } case LVM_SETITEMPOSITION32: - if (lParam == 0) return FALSE; - return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, *((POINT*)lParam)); + return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, (POINT*)lParam); case LVM_SETITEMSTATE: if (lParam == 0) return FALSE;

1 0

Nikolay Sivov : comctl32/listview: Call default procedure directly from handlers if such forwarding needed.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 60f0f4e8cacbff76eb39358de57740e0b109b74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f0f4e8cacbff76eb39358de… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Nov 26 23:16:50 2009 +0300 comctl32/listview: Call default procedure directly from handlers if such forwarding needed. --- dlls/comctl32/listview.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 11fb401..fd4ac37 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10124,7 +10124,8 @@ static BOOL LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) int cxEdge = GetSystemMetrics (SM_CXEDGE), cyEdge = GetSystemMetrics (SM_CYEDGE); - if (!theme) return FALSE; + if (!theme) + return DefWindowProcW (infoPtr->hwndSelf, WM_NCPAINT, (WPARAM)region, 0); GetWindowRect(infoPtr->hwndSelf, &r); @@ -10145,7 +10146,7 @@ static BOOL LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) /* Call default proc to get the scrollbars etc. painted */ DefWindowProcW (infoPtr->hwndSelf, WM_NCPAINT, (WPARAM)cliprgn, 0); - return TRUE; + return FALSE; } /*** @@ -10395,20 +10396,24 @@ static LRESULT LISTVIEW_RButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT * TRUE if cursor is set * FALSE otherwise */ -static BOOL LISTVIEW_SetCursor(const LISTVIEW_INFO *infoPtr, HWND hwnd, UINT nHittest, UINT wMouseMsg) +static BOOL LISTVIEW_SetCursor(const LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { LVHITTESTINFO lvHitTestInfo; - if(!(LISTVIEW_isHotTracking(infoPtr))) return FALSE; + if (!(LISTVIEW_isHotTracking(infoPtr))) goto forward; - if(!infoPtr->hHotCursor) return FALSE; + if (!infoPtr->hHotCursor) goto forward; GetCursorPos(&lvHitTestInfo.pt); - if (LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, FALSE, FALSE) < 0) return FALSE; + if (LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, FALSE, FALSE) < 0) goto forward; SetCursor(infoPtr->hHotCursor); return TRUE; + +forward: + + return DefWindowProcW(infoPtr->hwndSelf, WM_SETCURSOR, wParam, lParam); } /*** @@ -11245,9 +11250,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_NCDestroy(infoPtr); case WM_NCPAINT: - if (LISTVIEW_NCPaint(infoPtr, (HRGN)wParam)) - return 0; - goto fwd_msg; + return LISTVIEW_NCPaint(infoPtr, (HRGN)wParam); case WM_NOTIFY: if (lParam && ((LPNMHDR)lParam)->hwndFrom == infoPtr->hwndHeader) @@ -11273,9 +11276,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_RButtonUp(infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); case WM_SETCURSOR: - if(LISTVIEW_SetCursor(infoPtr, (HWND)wParam, LOWORD(lParam), HIWORD(lParam))) - return TRUE; - goto fwd_msg; + return LISTVIEW_SetCursor(infoPtr, wParam, lParam); case WM_SETFOCUS: return LISTVIEW_SetFocus(infoPtr, (HWND)wParam); @@ -11337,8 +11338,6 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); - fwd_msg: - /* call default window procedure */ return DefWindowProcW(hwnd, uMsg, wParam, lParam); }

1 0

Nikolay Sivov : comctl32/listview: Further winproc simplification.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: a729e040e6233cbb4fdabc75fee3f8a87d8a9c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a729e040e6233cbb4fdabc75f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Nov 26 23:30:07 2009 +0300 comctl32/listview: Further winproc simplification. --- dlls/comctl32/listview.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index fd4ac37..bbb7502 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10766,7 +10766,7 @@ static INT LISTVIEW_StyleChanging(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, * RETURN: * Zero */ -static LRESULT LISTVIEW_ShowWindow(LISTVIEW_INFO *infoPtr, BOOL bShown, INT iStatus) +static LRESULT LISTVIEW_ShowWindow(LISTVIEW_INFO *infoPtr, WPARAM bShown, LPARAM iStatus) { /* header delayed creation */ if ((infoPtr->uView == LV_VIEW_DETAILS) && bShown) @@ -10777,7 +10777,7 @@ static LRESULT LISTVIEW_ShowWindow(LISTVIEW_INFO *infoPtr, BOOL bShown, INT iSta ShowWindow(infoPtr->hwndHeader, SW_SHOWNORMAL); } - return 0; + return DefWindowProcW(infoPtr->hwndSelf, WM_SHOWWINDOW, bShown, iStatus); } /*** @@ -10859,12 +10859,10 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_DELETEITEM: return LISTVIEW_DeleteItem(infoPtr, (INT)wParam); - case LVM_EDITLABELW: - return (LRESULT)LISTVIEW_EditLabelT(infoPtr, (INT)wParam, TRUE); - case LVM_EDITLABELA: - return (LRESULT)LISTVIEW_EditLabelT(infoPtr, (INT)wParam, FALSE); - + case LVM_EDITLABELW: + return (LRESULT)LISTVIEW_EditLabelT(infoPtr, (INT)wParam, + uMsg == LVM_EDITLABELW); /* case LVM_ENABLEGROUPVIEW: */ case LVM_ENSUREVISIBLE: @@ -10885,10 +10883,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return infoPtr->uCallbackMask; case LVM_GETCOLUMNA: - return LISTVIEW_GetColumnT(infoPtr, (INT)wParam, (LPLVCOLUMNW)lParam, FALSE); - case LVM_GETCOLUMNW: - return LISTVIEW_GetColumnT(infoPtr, (INT)wParam, (LPLVCOLUMNW)lParam, TRUE); + return LISTVIEW_GetColumnT(infoPtr, (INT)wParam, (LPLVCOLUMNW)lParam, + uMsg == LVM_GETCOLUMNW); case LVM_GETCOLUMNORDERARRAY: return LISTVIEW_GetColumnOrderArray(infoPtr, (INT)wParam, (LPINT)lParam); @@ -11178,11 +11175,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_SORTGROUPS: */ case LVM_SORTITEMS: - return LISTVIEW_SortItems(infoPtr, (PFNLVCOMPARE)lParam, (LPARAM)wParam, FALSE); - case LVM_SORTITEMSEX: - return LISTVIEW_SortItems(infoPtr, (PFNLVCOMPARE)lParam, (LPARAM)wParam, TRUE); - + return LISTVIEW_SortItems(infoPtr, (PFNLVCOMPARE)lParam, (LPARAM)wParam, + uMsg == LVM_SORTITEMSEX); case LVM_SUBITEMHITTEST: return LISTVIEW_HitTest(infoPtr, (LPLVHITTESTINFO)lParam, TRUE, FALSE); @@ -11288,8 +11283,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_SetRedraw(infoPtr, (BOOL)wParam); case WM_SHOWWINDOW: - LISTVIEW_ShowWindow(infoPtr, (BOOL)wParam, (INT)lParam); - return DefWindowProcW(hwnd, uMsg, wParam, lParam); + return LISTVIEW_ShowWindow(infoPtr, wParam, lParam); case WM_SIZE: return LISTVIEW_Size(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam));

1 0