wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Nikolay Sivov : comctl32/listview: Revert column scrolling recent change, it should be handled differently.
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: 839b31fccef3961364e5d8458a60dd182ac53151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=839b31fccef3961364e5d8458… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 7 16:25:06 2009 +0400 comctl32/listview: Revert column scrolling recent change, it should be handled differently. --- dlls/comctl32/listview.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8fc89b6..38f7152 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4675,14 +4675,11 @@ static void LISTVIEW_ScrollColumns(LISTVIEW_INFO *infoPtr, INT nColumn, INT dx) rcCol.left = rcCol.right; /* adjust the other columns */ - for (nCol = 0; nCol < DPA_GetPtrCount(infoPtr->hdpaColumns); nCol++) + for (nCol = nColumn; nCol < DPA_GetPtrCount(infoPtr->hdpaColumns); nCol++) { lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, nCol); - if (lpColumnInfo->rcHeader.left >= rcCol.left) - { - lpColumnInfo->rcHeader.left += dx; - lpColumnInfo->rcHeader.right += dx; - } + lpColumnInfo->rcHeader.left += dx; + lpColumnInfo->rcHeader.right += dx; } /* do not update screen if not in report mode */

1 0

Nikolay Sivov : comctl32/listview: Use LV_VIEW_* constants instead of style .
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: e636998890bf903ac545c071e310ce17785308be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e636998890bf903ac545c071e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 7 15:25:16 2009 +0400 comctl32/listview: Use LV_VIEW_* constants instead of style. --- dlls/comctl32/listview.c | 53 +++++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 379c7ad..8fc89b6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3494,7 +3494,6 @@ static inline BOOL is_assignable_item(const LVITEMW *lpLVItem, LONG lStyle) */ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL isNew, BOOL isW, BOOL *bChanged) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; ITEM_INFO *lpItem; NMLISTVIEW nmlv; UINT uChanged = 0; @@ -3619,7 +3618,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL } infoPtr->nFocusedItem = lpLVItem->iItem; - LISTVIEW_EnsureVisible(infoPtr, lpLVItem->iItem, uView == LVS_LIST); + LISTVIEW_EnsureVisible(infoPtr, lpLVItem->iItem, infoPtr->uView == LV_VIEW_LIST); } else if (infoPtr->nFocusedItem == lpLVItem->iItem) { @@ -4800,7 +4799,6 @@ static BOOL LISTVIEW_DeleteColumn(LISTVIEW_INFO *infoPtr, INT nColumn) */ static void LISTVIEW_ScrollOnInsert(LISTVIEW_INFO *infoPtr, INT nItem, INT dir) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; INT nPerCol, nItemCol, nItemRow; RECT rcScroll; POINT Origin; @@ -4823,9 +4821,9 @@ static void LISTVIEW_ScrollOnInsert(LISTVIEW_INFO *infoPtr, INT nItem, INT dir) LISTVIEW_UpdateScroll(infoPtr); /* figure out the item's position */ - if (uView == LVS_REPORT) + if (infoPtr->uView == LV_VIEW_DETAILS) nPerCol = infoPtr->nItemCount + 1; - else if (uView == LVS_LIST) + else if (infoPtr->uView == LV_VIEW_LIST) nPerCol = LISTVIEW_GetCountPerColumn(infoPtr); else /* LV_VIEW_ICON, or LV_VIEW_SMALLICON */ return; @@ -4849,7 +4847,7 @@ static void LISTVIEW_ScrollOnInsert(LISTVIEW_INFO *infoPtr, INT nItem, INT dir) } /* report has only that column, so we're done */ - if (uView == LVS_REPORT) return; + if (infoPtr->uView == LV_VIEW_DETAILS) return; /* now for LISTs, we have to deal with the columns to the right */ rcScroll.left = (nItemCol + 1) * infoPtr->nItemWidth; @@ -5147,7 +5145,6 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) */ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *infoPtr, INT nItem, BOOL bPartial) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; INT nScrollPosHeight = 0; INT nScrollPosWidth = 0; INT nHorzAdjust = 0; @@ -5163,41 +5160,41 @@ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *infoPtr, INT nItem, BOOL bPart if (rcItem.left < infoPtr->rcList.left || rcItem.right > infoPtr->rcList.right) { - /* scroll left/right, but in LVS_REPORT mode */ - if (uView == LVS_LIST) + /* scroll left/right, but in LV_VIEW_DETAILS mode */ + if (infoPtr->uView == LV_VIEW_LIST) nScrollPosWidth = infoPtr->nItemWidth; - else if ((uView == LVS_SMALLICON) || (uView == LVS_ICON)) + else if ((infoPtr->uView == LV_VIEW_SMALLICON) || (infoPtr->uView == LV_VIEW_ICON)) nScrollPosWidth = 1; if (rcItem.left < infoPtr->rcList.left) { nHorzAdjust = -1; - if (uView != LVS_REPORT) nHorzDiff = rcItem.left - infoPtr->rcList.left; + if (infoPtr->uView != LV_VIEW_DETAILS) nHorzDiff = rcItem.left - infoPtr->rcList.left; } else { nHorzAdjust = 1; - if (uView != LVS_REPORT) nHorzDiff = rcItem.right - infoPtr->rcList.right; + if (infoPtr->uView != LV_VIEW_DETAILS) nHorzDiff = rcItem.right - infoPtr->rcList.right; } } if (rcItem.top < infoPtr->rcList.top || rcItem.bottom > infoPtr->rcList.bottom) { /* scroll up/down, but not in LVS_LIST mode */ - if (uView == LVS_REPORT) + if (infoPtr->uView == LV_VIEW_DETAILS) nScrollPosHeight = infoPtr->nItemHeight; - else if ((uView == LVS_ICON) || (uView == LVS_SMALLICON)) + else if ((infoPtr->uView == LV_VIEW_ICON) || (infoPtr->uView == LV_VIEW_SMALLICON)) nScrollPosHeight = 1; if (rcItem.top < infoPtr->rcList.top) { nVertAdjust = -1; - if (uView != LVS_LIST) nVertDiff = rcItem.top - infoPtr->rcList.top; + if (infoPtr->uView != LV_VIEW_LIST) nVertDiff = rcItem.top - infoPtr->rcList.top; } else { nVertAdjust = 1; - if (uView != LVS_LIST) nVertDiff = rcItem.bottom - infoPtr->rcList.bottom; + if (infoPtr->uView != LV_VIEW_LIST) nVertDiff = rcItem.bottom - infoPtr->rcList.bottom; } } @@ -6701,7 +6698,6 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, */ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL isW) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; INT nItem; HDPA hdpaSubItems; NMLISTVIEW nmlv; @@ -6788,7 +6784,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo; /* make room for the position, if we are in the right mode */ - if ((uView == LVS_SMALLICON) || (uView == LVS_ICON)) + if ((infoPtr->uView == LV_VIEW_SMALLICON) || (infoPtr->uView == LV_VIEW_ICON)) { if (DPA_InsertPtr(infoPtr->hdpaPosX, nItem, 0) == -1) goto undo; @@ -6808,7 +6804,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, return -1; /* align items (set position of each item) */ - if ((uView == LVS_SMALLICON || uView == LVS_ICON)) + if (infoPtr->uView == LV_VIEW_SMALLICON || infoPtr->uView == LV_VIEW_ICON) { POINT pt; @@ -8368,7 +8364,6 @@ fail: static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); - UINT uView = lpcs->style & LVS_TYPEMASK; TRACE("(lpcs=%p)\n", lpcs); @@ -8380,7 +8375,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) /* on error defaulting to ANSI notifications */ if (infoPtr->notifyFormat == 0) infoPtr->notifyFormat = NFR_ANSI; - if ((uView == LVS_REPORT) && (lpcs->style & WS_VISIBLE)) + if ((infoPtr->uView == LV_VIEW_DETAILS) && (lpcs->style & WS_VISIBLE)) { if (LISTVIEW_CreateHeader(infoPtr) < 0) return -1; } @@ -8390,7 +8385,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) /* init item size to avoid division by 0 */ LISTVIEW_UpdateItemSize (infoPtr); - if (uView == LVS_REPORT) + if (infoPtr->uView == LV_VIEW_DETAILS) { if (!(LVS_NOCOLUMNHEADER & lpcs->style) && (WS_VISIBLE & lpcs->style)) { @@ -8402,7 +8397,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) OpenThemeData(hwnd, themeClass); /* initialize the icon sizes */ - set_icon_size(&infoPtr->iconSize, infoPtr->himlNormal, uView != LVS_ICON); + set_icon_size(&infoPtr->iconSize, infoPtr->himlNormal, infoPtr->uView != LV_VIEW_ICON); set_icon_size(&infoPtr->iconStateSize, infoPtr->himlState, TRUE); return 0; } @@ -9748,13 +9743,11 @@ static LRESULT LISTVIEW_Size(LISTVIEW_INFO *infoPtr, int Width, int Height) */ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; - - TRACE("uView=%d, rcList(old)=%s\n", uView, wine_dbgstr_rect(&infoPtr->rcList)); + TRACE("uView=%d, rcList(old)=%s\n", infoPtr->uView, wine_dbgstr_rect(&infoPtr->rcList)); GetClientRect(infoPtr->hwndSelf, &infoPtr->rcList); - if (uView == LVS_LIST) + if (infoPtr->uView == LV_VIEW_LIST) { /* Apparently the "LIST" style is supposed to have the same * number of items in a column even if there is no scroll bar. @@ -9767,7 +9760,7 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) infoPtr->rcList.bottom -= GetSystemMetrics(SM_CYHSCROLL); infoPtr->rcList.bottom = max (infoPtr->rcList.bottom - 2, 0); } - else if (uView == LVS_REPORT) + else if (infoPtr->uView == LV_VIEW_DETAILS) { HDLAYOUT hl; WINDOWPOS wp; @@ -9945,10 +9938,8 @@ static INT LISTVIEW_StyleChanging(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, */ static LRESULT LISTVIEW_ShowWindow(LISTVIEW_INFO *infoPtr, BOOL bShown, INT iStatus) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; - /* header delayed creation */ - if ((uView == LVS_REPORT) && bShown) + if ((infoPtr->uView == LV_VIEW_DETAILS) && bShown) { LISTVIEW_CreateHeader(infoPtr);

1 0

Nikolay Sivov : comctl32/listview: Defaulting to NFR_ANSI on query failure.
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: ed250886ccf83c4b3cdd93744f964848f014f4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed250886ccf83c4b3cdd93744… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 7 15:01:55 2009 +0400 comctl32/listview: Defaulting to NFR_ANSI on query failure. --- dlls/comctl32/listview.c | 10 +- dlls/comctl32/tests/listview.c | 261 ++++++++++++++++++++++++++++++++++------ 2 files changed, 228 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed250886ccf83c4b3cdd9…

1 0

Nikolay Sivov : comctl32/listview: Position edit box after notification.
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: ae0d36304368556de2a9bc809174ef77dd8688d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0d36304368556de2a9bc809… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jun 6 07:54:43 2009 +0400 comctl32/listview: Position edit box after notification. --- dlls/comctl32/listview.c | 58 +++++++++++++++++++++------------------ dlls/comctl32/tests/listview.c | 1 + 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d302e38..e9593c0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -418,7 +418,7 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *, INT, const LVITEMW *); static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *, INT, INT, HWND); static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *, INT, INT, HWND); static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL); -static HWND CreateEditLabelT(LISTVIEW_INFO *, LPCWSTR, DWORD, INT, INT, INT, INT, BOOL); +static HWND CreateEditLabelT(LISTVIEW_INFO *, LPCWSTR, DWORD, BOOL); static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *, INT, HIMAGELIST); static INT LISTVIEW_HitTest(const LISTVIEW_INFO *, LPLVHITTESTINFO, BOOL, BOOL); @@ -5055,7 +5055,11 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) WCHAR szDispText[DISP_TEXT_SIZE] = { 0 }; NMLVDISPINFOW dispInfo; RECT rect; + SIZE sz; HWND hwndSelf = infoPtr->hwndSelf; + HDC hdc; + HFONT hOldFont = NULL; + TEXTMETRICW textMetric; TRACE("(nItem=%d, isW=%d)\n", nItem, isW); @@ -5088,8 +5092,7 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) dispInfo.item.cchTextMax = DISP_TEXT_SIZE; if (!LISTVIEW_GetItemT(infoPtr, &dispInfo.item, isW)) return 0; - infoPtr->hwndEdit = CreateEditLabelT(infoPtr, dispInfo.item.pszText, WS_VISIBLE, - rect.left-2, rect.top-1, 0, rect.bottom - rect.top+2, isW); + infoPtr->hwndEdit = CreateEditLabelT(infoPtr, dispInfo.item.pszText, WS_VISIBLE, isW); if (!infoPtr->hwndEdit) return 0; if (notify_dispinfoT(infoPtr, LVN_BEGINLABELEDITW, &dispInfo, isW)) @@ -5101,6 +5104,27 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) return 0; } + /* Now position and display edit box */ + hdc = GetDC(infoPtr->hwndSelf); + + /* Select the font to get appropriate metric dimensions */ + if(infoPtr->hFont != 0) + hOldFont = SelectObject(hdc, infoPtr->hFont); + + /* Get String Length in pixels */ + GetTextExtentPoint32W(hdc, dispInfo.item.pszText, lstrlenW(dispInfo.item.pszText), &sz); + + /* Add Extra spacing for the next character */ + GetTextMetricsW(hdc, &textMetric); + sz.cx += (textMetric.tmMaxCharWidth * 2); + + if(infoPtr->hFont != 0) + SelectObject(hdc, hOldFont); + + ReleaseDC(infoPtr->hwndSelf, hdc); + + MoveWindow(infoPtr->hwndEdit, rect.left - 2, rect.top - 1, sz.cx, + rect.bottom - rect.top + 2, FALSE); ShowWindow(infoPtr->hwndEdit, SW_NORMAL); SetFocus(infoPtr->hwndEdit); SendMessageW(infoPtr->hwndEdit, EM_SETSEL, 0, -1); @@ -10735,41 +10759,21 @@ static LRESULT CALLBACK EditLblWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPA * * RETURN: */ -static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, DWORD style, - INT x, INT y, INT width, INT height, BOOL isW) +static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, DWORD style, BOOL isW) { WCHAR editName[5] = { 'E', 'd', 'i', 't', '\0' }; HWND hedit; - SIZE sz; - HDC hdc; - HDC hOldFont=0; - TEXTMETRICW textMetric; HINSTANCE hinst = (HINSTANCE)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_HINSTANCE); TRACE("(text=%s, ..., isW=%d)\n", debugtext_t(text, isW), isW); style |= WS_CHILDWINDOW|WS_CLIPSIBLINGS|ES_LEFT|ES_AUTOHSCROLL|WS_BORDER; - hdc = GetDC(infoPtr->hwndSelf); - - /* Select the font to get appropriate metric dimensions */ - if(infoPtr->hFont != 0) - hOldFont = SelectObject(hdc, infoPtr->hFont); - /*Get String Length in pixels */ - GetTextExtentPoint32W(hdc, text, lstrlenW(text), &sz); - - /*Add Extra spacing for the next character */ - GetTextMetricsW(hdc, &textMetric); - sz.cx += (textMetric.tmMaxCharWidth * 2); - - if(infoPtr->hFont != 0) - SelectObject(hdc, hOldFont); - - ReleaseDC(infoPtr->hwndSelf, hdc); + /* Window will be resized and positioned after LVN_BEGINLABELEDIT */ if (isW) - hedit = CreateWindowW(editName, text, style, x, y, sz.cx, height, infoPtr->hwndSelf, 0, hinst, 0); + hedit = CreateWindowW(editName, text, style, 0, 0, 0, 0, infoPtr->hwndSelf, 0, hinst, 0); else - hedit = CreateWindowA("Edit", (LPCSTR)text, style, x, y, sz.cx, height, infoPtr->hwndSelf, 0, hinst, 0); + hedit = CreateWindowA("Edit", (LPCSTR)text, style, 0, 0, 0, 0, infoPtr->hwndSelf, 0, hinst, 0); if (!hedit) return 0; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e36697b..49c2f22 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -207,6 +207,7 @@ static const struct message editbox_create_pos[] = { { WM_WINDOWPOSCHANGED, sent }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc }, + /* the rest is todo */ { WM_WINDOWPOSCHANGING, sent }, { WM_WINDOWPOSCHANGED, sent }, { 0 }

1 0

Nikolay Sivov : comctl32/listview: Test showing that Edit box should be positioned after LVN_BEGINLABELEDIT.
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: c98dc0da7107fd7cd63faf3cf7c01d38537eed51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98dc0da7107fd7cd63faf3cf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jun 6 07:04:43 2009 +0400 comctl32/listview: Test showing that Edit box should be positioned after LVN_BEGINLABELEDIT. --- dlls/comctl32/tests/listview.c | 95 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 91 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 933aa29..e36697b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -29,7 +29,8 @@ #define PARENT_SEQ_INDEX 0 #define PARENT_FULL_SEQ_INDEX 1 #define LISTVIEW_SEQ_INDEX 2 -#define NUM_MSG_SEQUENCES 3 +#define EDITBOX_SEQ_INDEX 3 +#define NUM_MSG_SEQUENCES 4 #define LISTVIEW_ID 0 #define HEADER_ID 1 @@ -39,6 +40,9 @@ "expected (%d,%d), got (%d,%d)\n", expected1, expected2, got1, got2) HWND hwndparent; +/* prevents edit box creation, LVN_BEGINLABELEDIT return value */ +BOOL blockEdit; +static HWND subclass_editbox(HWND hwndListview); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -196,6 +200,18 @@ static const struct message getitemposition_seq2[] = { { 0 } }; +static const struct message editbox_create_pos[] = { + /* sequence sent after LVN_BEGINLABELEDIT */ + { WM_WINDOWPOSCHANGING, sent }, + { WM_NCCALCSIZE, sent }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_WINDOWPOSCHANGING, sent }, + { WM_WINDOWPOSCHANGED, sent }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -230,9 +246,22 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP } add_message(sequences, PARENT_FULL_SEQ_INDEX, &msg); - /* always accept new item text */ - if (message == WM_NOTIFY && lParam && ((NMHDR*)lParam)->code == LVN_ENDLABELEDIT) - return TRUE; + if (message == WM_NOTIFY && lParam) + { + switch (((NMHDR*)lParam)->code) + { + case LVN_BEGINLABELEDIT: + /* subclass edit box */ + if (!blockEdit) + subclass_editbox(((NMHDR*)lParam)->hwndFrom); + + return blockEdit; + + case LVN_ENDLABELEDIT: + /* always accept new item text */ + return TRUE; + } + } defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); @@ -263,6 +292,8 @@ static HWND create_parent_window(void) if (!register_parent_wnd_class()) return NULL; + blockEdit = FALSE; + return CreateWindowEx(0, "Listview test parent class", "Listview test parent window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | @@ -402,6 +433,52 @@ static HWND subclass_header(HWND hwndListview) return hwnd; } +static LRESULT WINAPI editbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + static LONG defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + + /* all we need is sizing */ + if (message == WM_WINDOWPOSCHANGING || + message == WM_NCCALCSIZE || + message == WM_WINDOWPOSCHANGED || + message == WM_MOVE || + message == WM_SIZE) + { + add_message(sequences, EDITBOX_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + ret = CallWindowProcA(info->oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + return ret; +} + +static HWND subclass_editbox(HWND hwndListview) +{ + struct subclass_info *info; + HWND hwnd; + + info = HeapAlloc(GetProcessHeap(), 0, sizeof(struct subclass_info)); + if (!info) + return NULL; + + hwnd = (HWND)SendMessage(hwndListview, LVM_GETEDITCONTROL, 0, 0); + info->oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, + (LONG_PTR)editbox_subclass_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)info); + + return hwnd; +} + /* Performs a single LVM_HITTEST test */ static void test_lvm_hittest(HWND hwnd, INT x, INT y, INT item, UINT flags, BOOL todo_item, BOOL todo_flags, int line) @@ -2989,6 +3066,16 @@ static void test_editbox(void) ok(!IsWindow(hwndedit), "Expected Edit window to be destroyed\n"); ok(GetFocus() == hwnd, "Expected List to be focused\n"); + /* messaging tests */ + SetFocus(hwnd); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + blockEdit = FALSE; + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + /* testing only sizing messages */ + ok_sequence(sequences, EDITBOX_SEQ_INDEX, editbox_create_pos, + "edit box create - sizing", TRUE); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Edit box should be destroyed on invalid index too (LVM_EDITLABEL).
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: c1115004582371e015a6cbe6ea2cf8bea50a223c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1115004582371e015a6cbe6e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jun 6 01:32:02 2009 +0400 comctl32/listview: Edit box should be destroyed on invalid index too (LVM_EDITLABEL). --- dlls/comctl32/listview.c | 7 ++++--- dlls/comctl32/tests/listview.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8d4f6f3..d302e38 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5060,9 +5060,6 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) TRACE("(nItem=%d, isW=%d)\n", nItem, isW); if (~infoPtr->dwStyle & LVS_EDITLABELS) return 0; - if (nItem < 0 || nItem >= infoPtr->nItemCount) return 0; - - infoPtr->nEditLabelItem = nItem; /* Is the EditBox still there, if so remove it */ if(infoPtr->hwndEdit != 0) @@ -5071,6 +5068,10 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) infoPtr->hwndEdit = 0; } + if (nItem < 0 || nItem >= infoPtr->nItemCount) return 0; + + infoPtr->nEditLabelItem = nItem; + LISTVIEW_SetSelection(infoPtr, nItem); LISTVIEW_SetItemFocus(infoPtr, nItem); LISTVIEW_InvalidateItem(infoPtr, nItem); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9ecbeed..933aa29 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2957,6 +2957,38 @@ static void test_editbox(void) expect(lstrlen(item.pszText), r); ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); + /* LVM_EDITLABEL with -1 destroys current edit */ + hwndedit = (HWND)SendMessage(hwnd, LVM_GETEDITCONTROL, 0, 0); + ok(hwndedit == NULL, "Expected Edit window not to be created\n"); + /* no edit present */ + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, -1, 0); + ok(hwndedit == NULL, "Expected Edit window not to be created\n"); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + /* edit present */ + ok(GetFocus() == hwndedit, "Expected Edit to be focused\n"); + hwndedit2 = (HWND)SendMessage(hwnd, LVM_EDITLABEL, -1, 0); + ok(hwndedit2 == NULL, "Expected Edit window not to be created\n"); + ok(!IsWindow(hwndedit), "Expected Edit window to be destroyed\n"); + ok(GetFocus() == hwnd, "Expected List to be focused\n"); + /* check another negative value */ + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + ok(GetFocus() == hwndedit, "Expected Edit to be focused\n"); + hwndedit2 = (HWND)SendMessage(hwnd, LVM_EDITLABEL, -2, 0); + ok(hwndedit2 == NULL, "Expected Edit window not to be created\n"); + ok(!IsWindow(hwndedit), "Expected Edit window to be destroyed\n"); + ok(GetFocus() == hwnd, "Expected List to be focused\n"); + /* and value greater then max item index */ + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + ok(GetFocus() == hwndedit, "Expected Edit to be focused\n"); + r = SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); + hwndedit2 = (HWND)SendMessage(hwnd, LVM_EDITLABEL, r, 0); + ok(hwndedit2 == NULL, "Expected Edit window not to be created\n"); + ok(!IsWindow(hwndedit), "Expected Edit window to be destroyed\n"); + ok(GetFocus() == hwnd, "Expected List to be focused\n"); + DestroyWindow(hwnd); }

1 0

Aurimas Fišeras : winemine: Add Lithuanian translation .
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: e90102d5ff5750183d2bea154a3b29502f4e1662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90102d5ff5750183d2bea154… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 7 19:07:57 2009 +0300 winemine: Add Lithuanian translation. --- programs/winemine/Lt.rc | 96 +++++++++++++++++++++++++++++++++++++++++++++ programs/winemine/rsrc.rc | 1 + 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/programs/winemine/Lt.rc b/programs/winemine/Lt.rc new file mode 100644 index 0000000..692717d --- /dev/null +++ b/programs/winemine/Lt.rc @@ -0,0 +1,96 @@ +/* + * WineMine + * Lithuanian Language Support + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE { + IDS_APPNAME, "WineMine" + IDS_NOBODY, "Niekas" + IDS_ABOUT, "Autoriaus teisės 2000 Joshua Thielen" +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Parinktys" { + MENUITEM "&Naujas\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Žymėti klaustuku", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "P&radedantis", IDM_BEGINNER + MENUITEM "&Pažengęs", IDM_ADVANCED + MENUITEM "Ek&spertas", IDM_EXPERT + MENUITEM "Pasirin&ktas", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "Iš&eiti\tAlt+X", IDM_EXIT + } + POPUP "&Informacija" { + MENUITEM "&Geriausi laikai", IDM_TIMES + MENUITEM "&Apie", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Geriausi laikai" +{ + GROUPBOX "Geriausi laikai", -1, 10, 10, 140, 45 + LTEXT "Pradedantis", -1, 20, 20, 40, 8 + LTEXT "Pažengęs", -1, 20, 30, 40, 8 + LTEXT "Ekspertas", -1, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "Gerai", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Sveikiname!" +{ + LTEXT "Įveskite savo vardą", -1, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Gerai", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Pasirinktas žaidimas" +{ + LTEXT "Eilutės", -1, 5, 5, 30, 10 + LTEXT "Stulpeliai", -1, 5, 35, 30, 10 + LTEXT "Minos", -1, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "Gerai", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Atsisakyti", IDCANCEL, 40, 50, 50, 15 +} + +#pragma code_page(default) diff --git a/programs/winemine/rsrc.rc b/programs/winemine/rsrc.rc index 8387ad8..09f5cd3 100644 --- a/programs/winemine/rsrc.rc +++ b/programs/winemine/rsrc.rc @@ -34,6 +34,7 @@ #include "It.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

Gerald Pfeifer : wined3d: Fix (and simplify) the ATI case in IWineD3DImpl_FillGLCaps.
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: 6d1a76fb106b71c18ab0368adb0f877af30c0a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1a76fb106b71c18ab0368ad… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jun 7 14:13:06 2009 +0200 wined3d: Fix (and simplify) the ATI case in IWineD3DImpl_FillGLCaps. --- dlls/wined3d/directx.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6013cfe..05443fc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -615,21 +615,15 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { major = minor = 0; gl_string_cursor = strchr(gl_string, '-'); if (gl_string_cursor) { - int error = 0; gl_string_cursor++; /* Check if version number is of the form x.y.z */ - if (*gl_string_cursor > '9' && *gl_string_cursor < '0') - error = 1; - if (!error && *(gl_string_cursor+2) > '9' && *(gl_string_cursor+2) < '0') - error = 1; - if (!error && *(gl_string_cursor+4) > '9' && *(gl_string_cursor+4) < '0') - error = 1; - if (!error && *(gl_string_cursor+1) != '.' && *(gl_string_cursor+3) != '.') - error = 1; - - /* Mark version number as malformed */ - if (error) + if ( *gl_string_cursor < '0' || *gl_string_cursor > '9' + || *(gl_string_cursor+1) != '.' + || *(gl_string_cursor+2) < '0' || *(gl_string_cursor+2) > '9' + || *(gl_string_cursor+3) != '.' + || *(gl_string_cursor+4) < '0' || *(gl_string_cursor+4) > '9' ) + /* Mark version number as malformed */ gl_string_cursor = 0; }

1 0

Gerald Pfeifer : wined3d: Use & instead of && for bit test in IWineD3DDeviceImpl_CreateSurface().
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: 7856ac3c19d8f17be871aa86ec6f543cd1bc031b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7856ac3c19d8f17be871aa86e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jun 7 11:33:48 2009 +0200 wined3d: Use & instead of && for bit test in IWineD3DDeviceImpl_CreateSurface(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16e4062..fe084ca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1022,7 +1022,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, break; case WINED3DPOOL_DEFAULT: /*TODO: Create offscreen plain can cause this check to fail..., find out if it should */ if(!(Usage & WINED3DUSAGE_DYNAMIC) && !(Usage & WINED3DUSAGE_RENDERTARGET) - && !(Usage && WINED3DUSAGE_DEPTHSTENCIL ) && Lockable) + && !(Usage & WINED3DUSAGE_DEPTHSTENCIL ) && Lockable) WARN("Creating a surface with a POOL of DEFAULT with Lockable true, that doesn't specify DYNAMIC usage.\n"); break; default:

1 0

Gerald Pfeifer : winmm: Use & instead of && for bit test in wave_out_test_deviceOut().
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: c4a0539a79a73905b581d2f9d2dbc0d57b52b86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a0539a79a73905b581d2f9d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jun 7 11:28:44 2009 +0200 winmm: Use & instead of && for bit test in wave_out_test_deviceOut(). --- dlls/winmm/tests/wave.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index b509f74..97544c0 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -640,7 +640,7 @@ static void wave_out_test_deviceOut(int device, double duration, trace("CALLBACK_THREAD not implemented\n"); CloseHandle(hevent); return; - } else if (flags && CALLBACK_TYPEMASK) { + } else if (flags & CALLBACK_TYPEMASK) { trace("Undefined callback type!\n"); CloseHandle(hevent); return;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009