wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Nikolay Sivov : comctl32/tab: Handle item focusing better ( including keyboard support).
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 64102f5f71ec8e5d7d591b952d450f8698dd5839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64102f5f71ec8e5d7d591b952… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 10 02:40:03 2009 +0400 comctl32/tab: Handle item focusing better (including keyboard support). --- dlls/comctl32/tab.c | 85 +++++++++++++++++++++++++++++++++------------------ include/commctrl.h | 3 +- 2 files changed, 57 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 00f29b2..431c54c 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -161,6 +161,7 @@ static void TAB_InvalidateTabArea(const TAB_INFO *); static void TAB_EnsureSelectionVisible(TAB_INFO *); static void TAB_DrawItemInterior(const TAB_INFO *, HDC, INT, RECT*); static LRESULT TAB_DeselectAll(TAB_INFO *, BOOL); +static BOOL TAB_InternalGetItemRect(const TAB_INFO *, INT, RECT*, RECT*); static BOOL TAB_SendSimpleNotify (const TAB_INFO *infoPtr, UINT code) @@ -272,9 +273,25 @@ static LRESULT TAB_SetCurFocus (TAB_INFO *infoPtr, INT iItem) infoPtr->uFocus = -1; else if (iItem < infoPtr->uNumItem) { if (infoPtr->dwStyle & TCS_BUTTONS) { - FIXME("Should set input focus\n"); + /* set focus to new item, leave selection as is */ + if (infoPtr->uFocus != iItem) { + INT prev_focus = infoPtr->uFocus; + RECT r; + + infoPtr->uFocus = iItem; + + if (prev_focus != infoPtr->iSelected) { + if (TAB_InternalGetItemRect(infoPtr, prev_focus, &r, NULL)) + InvalidateRect(infoPtr->hwnd, &r, FALSE); + } + + if (TAB_InternalGetItemRect(infoPtr, iItem, &r, NULL)) + InvalidateRect(infoPtr->hwnd, &r, FALSE); + + TAB_SendSimpleNotify(infoPtr, TCN_FOCUSCHANGE); + } } else { - int oldFocus = infoPtr->uFocus; + INT oldFocus = infoPtr->uFocus; if (infoPtr->iSelected != iItem || oldFocus == -1 ) { infoPtr->uFocus = iItem; if (oldFocus != -1) { @@ -467,13 +484,13 @@ TAB_GetItemRect(const TAB_INFO *infoPtr, INT item, RECT *rect) } /****************************************************************************** - * TAB_KeyUp + * TAB_KeyDown * * This method is called to handle keyboard input */ -static LRESULT TAB_KeyUp(TAB_INFO* infoPtr, WPARAM keyCode) +static LRESULT TAB_KeyDown(TAB_INFO* infoPtr, WPARAM keyCode) { - int newItem = -1; + INT newItem = -1; switch (keyCode) { @@ -485,23 +502,30 @@ static LRESULT TAB_KeyUp(TAB_INFO* infoPtr, WPARAM keyCode) break; } - /* - * If we changed to a valid item, change the selection - */ - if (newItem >= 0 && - newItem < infoPtr->uNumItem && - infoPtr->uFocus != newItem) - { - if (!TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING)) - { - TAB_SetCurSel(infoPtr, newItem); - TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGE); - } - } + /* If we changed to a valid item, change focused item */ + if (newItem >= 0 && newItem < infoPtr->uNumItem && infoPtr->uFocus != newItem) + TAB_SetCurFocus(infoPtr, newItem); return 0; } +/* + * WM_KILLFOCUS handler + */ +static void TAB_KillFocus(TAB_INFO *infoPtr) +{ + /* clear current focused item back to selected for TCS_BUTTONS */ + if ((infoPtr->dwStyle & TCS_BUTTONS) && (infoPtr->uFocus != infoPtr->iSelected)) + { + RECT r; + + if (TAB_InternalGetItemRect(infoPtr, infoPtr->uFocus, &r, NULL)) + InvalidateRect(infoPtr->hwnd, &r, FALSE); + + infoPtr->uFocus = infoPtr->iSelected; + } +} + /****************************************************************************** * TAB_FocusChanging * @@ -598,7 +622,7 @@ TAB_LButtonDown (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TAB_RelayEvent (infoPtr->hwndToolTip, infoPtr->hwnd, WM_LBUTTONDOWN, wParam, lParam); - if (infoPtr->dwStyle & TCS_FOCUSONBUTTONDOWN) { + if (!(infoPtr->dwStyle & TCS_FOCUSNEVER)) { SetFocus (infoPtr->hwnd); } @@ -1482,7 +1506,8 @@ TAB_EraseTabInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, const RECT *dr { InflateRect(&rTemp, 2, 2); FillRect(hdc, &rTemp, hbr); - if (iItem == infoPtr->iHotTracked) + if (iItem == infoPtr->iHotTracked || + (iItem != infoPtr->iSelected && iItem == infoPtr->uFocus)) DrawEdge(hdc, &rTemp, BDR_RAISEDINNER, BF_RECT); } else @@ -1651,16 +1676,14 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect (iItem == infoPtr->uFocus) ) { RECT rFocus = *drawRect; - InflateRect(&rFocus, -3, -3); + + if (!(infoPtr->dwStyle & TCS_BUTTONS)) InflateRect(&rFocus, -3, -3); if (infoPtr->dwStyle & TCS_BOTTOM && !(infoPtr->dwStyle & TCS_VERTICAL)) rFocus.top -= 3; - if (infoPtr->dwStyle & TCS_BUTTONS) - { - rFocus.left -= 3; - rFocus.top -= 3; - } - DrawFocusRect(hdc, &rFocus); + /* focus should stay on selected item for TCS_BUTTONS style */ + if (!((infoPtr->dwStyle & TCS_BUTTONS) && (infoPtr->iSelected != iItem))) + DrawFocusRect(hdc, &rFocus); } /* @@ -2013,7 +2036,7 @@ static void TAB_DrawItem(const TAB_INFO *infoPtr, HDC hdc, INT iItem) { DWORD state = TAB_GetItem(infoPtr, iItem)->dwState; - if (state & TCIS_BUTTONPRESSED) + if ((state & TCIS_BUTTONPRESSED) || (iItem == infoPtr->uFocus)) DrawEdge(hdc, &r, EDGE_SUNKEN, BF_SOFT|BF_RECT); else if (!(infoPtr->dwStyle & TCS_FLATBUTTONS)) @@ -3444,12 +3467,14 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return theme_changed (infoPtr); case WM_KILLFOCUS: + TAB_KillFocus(infoPtr); case WM_SETFOCUS: TAB_FocusChanging(infoPtr); break; /* Don't disturb normal focus behavior */ - case WM_KEYUP: - return TAB_KeyUp(infoPtr, wParam); + case WM_KEYDOWN: + return TAB_KeyDown(infoPtr, wParam); + case WM_NCHITTEST: return TAB_NCHitTest(infoPtr, lParam); diff --git a/include/commctrl.h b/include/commctrl.h index 6a42e2e..8e22e7a 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4262,9 +4262,10 @@ typedef struct tagTCITEMW #define TCN_FIRST (0U-550U) #define TCN_LAST (0U-580U) #define TCN_KEYDOWN (TCN_FIRST - 0) -#define TCN_SELCHANGE (TCN_FIRST - 1) +#define TCN_SELCHANGE (TCN_FIRST - 1) #define TCN_SELCHANGING (TCN_FIRST - 2) #define TCN_GETOBJECT (TCN_FIRST - 3) +#define TCN_FOCUSCHANGE (TCN_FIRST - 4) #include <pshpack1.h> typedef struct tagTCKEYDOWN

1 0

Nikolay Sivov : comctl32/tab: Add more TRACE(), further cleanup.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 64945b2779debf5c77b6f3828808bfd798aa13d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64945b2779debf5c77b6f3828… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 23:26:13 2009 +0400 comctl32/tab: Add more TRACE(), further cleanup. --- dlls/comctl32/tab.c | 68 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index c9fd8a0..00f29b2 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -221,6 +221,7 @@ TAB_DumpItemInternal(const TAB_INFO *infoPtr, UINT iItem) * the index of the selected tab, or -1 if no tab is selected. */ static inline LRESULT TAB_GetCurSel (const TAB_INFO *infoPtr) { + TRACE("(%p)\n", infoPtr); return infoPtr->iSelected; } @@ -229,12 +230,13 @@ static inline LRESULT TAB_GetCurSel (const TAB_INFO *infoPtr) static inline LRESULT TAB_GetCurFocus (const TAB_INFO *infoPtr) { + TRACE("(%p)\n", infoPtr); return infoPtr->uFocus; } static inline LRESULT TAB_GetToolTips (const TAB_INFO *infoPtr) { - if (infoPtr == NULL) return 0; + TRACE("(%p)\n", infoPtr); return (LRESULT)infoPtr->hwndToolTip; } @@ -242,6 +244,8 @@ static inline LRESULT TAB_SetCurSel (TAB_INFO *infoPtr, INT iItem) { INT prevItem = infoPtr->iSelected; + TRACE("(%p %d)\n", infoPtr, iItem); + if (iItem < 0) infoPtr->iSelected=-1; else if (iItem >= infoPtr->uNumItem) @@ -262,6 +266,8 @@ static inline LRESULT TAB_SetCurSel (TAB_INFO *infoPtr, INT iItem) static LRESULT TAB_SetCurFocus (TAB_INFO *infoPtr, INT iItem) { + TRACE("(%p %d)\n", infoPtr, iItem); + if (iItem < 0) infoPtr->uFocus = -1; else if (iItem < infoPtr->uNumItem) { @@ -290,19 +296,18 @@ static LRESULT TAB_SetCurFocus (TAB_INFO *infoPtr, INT iItem) static inline LRESULT TAB_SetToolTips (TAB_INFO *infoPtr, HWND hwndToolTip) { - if (infoPtr) - infoPtr->hwndToolTip = hwndToolTip; + TRACE("%p %p", infoPtr, hwndToolTip); + infoPtr->hwndToolTip = hwndToolTip; return 0; } static inline LRESULT TAB_SetPadding (TAB_INFO *infoPtr, LPARAM lParam) { - if (infoPtr) - { - infoPtr->uHItemPadding_s=LOWORD(lParam); - infoPtr->uVItemPadding_s=HIWORD(lParam); - } + TRACE("(%p %d %d)\n", infoPtr, LOWORD(lParam), HIWORD(lParam)); + infoPtr->uHItemPadding_s = LOWORD(lParam); + infoPtr->uVItemPadding_s = HIWORD(lParam); + return 0; } @@ -455,9 +460,10 @@ static BOOL TAB_InternalGetItemRect( } static inline BOOL -TAB_GetItemRect(const TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +TAB_GetItemRect(const TAB_INFO *infoPtr, INT item, RECT *rect) { - return TAB_InternalGetItemRect(infoPtr, wParam, (LPRECT)lParam, NULL); + TRACE("(%p, %d, %p)\n", infoPtr, item, rect); + return TAB_InternalGetItemRect(infoPtr, item, rect, NULL); } /****************************************************************************** @@ -549,6 +555,7 @@ static INT TAB_InternalHitTest (const TAB_INFO *infoPtr, POINT pt, UINT *flags) static inline LRESULT TAB_HitTest (const TAB_INFO *infoPtr, LPTCHITTESTINFO lptest) { + TRACE("(%p, %p)\n", infoPtr, lptest); return TAB_InternalHitTest (infoPtr, lptest->pt, &lptest->flags); } @@ -2363,6 +2370,7 @@ static void TAB_Refresh (const TAB_INFO *infoPtr, HDC hdc) static inline DWORD TAB_GetRowCount (const TAB_INFO *infoPtr) { + TRACE("(%p)\n", infoPtr); return infoPtr->uNumRows; } @@ -2574,19 +2582,14 @@ static inline LRESULT TAB_Paint (TAB_INFO *infoPtr, HDC hdcPaint) } static LRESULT -TAB_InsertItemT (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnicode) +TAB_InsertItemT (TAB_INFO *infoPtr, INT iItem, TCITEMW *pti, BOOL bUnicode) { TAB_ITEM *item; - TCITEMW *pti; - INT iItem; RECT rect; GetClientRect (infoPtr->hwnd, &rect); TRACE("Rect: %p %s\n", infoPtr->hwnd, wine_dbgstr_rect(&rect)); - pti = (TCITEMW *)lParam; - iItem = (INT)wParam; - if (iItem < 0) return -1; if (iItem > infoPtr->uNumItem) iItem = infoPtr->uNumItem; @@ -2664,7 +2667,7 @@ TAB_InsertItemT (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnicode) } static LRESULT -TAB_SetItemSize (TAB_INFO *infoPtr, LPARAM lParam) +TAB_SetItemSize (TAB_INFO *infoPtr, INT cx, INT cy) { LONG lResult = 0; BOOL bNeedPaint = FALSE; @@ -2672,16 +2675,16 @@ TAB_SetItemSize (TAB_INFO *infoPtr, LPARAM lParam) lResult = MAKELONG(infoPtr->tabWidth, infoPtr->tabHeight); /* UNDOCUMENTED: If requested Width or Height is 0 this means that program wants to use auto size. */ - if (infoPtr->dwStyle & TCS_FIXEDWIDTH && (infoPtr->tabWidth != (INT)LOWORD(lParam))) + if (infoPtr->dwStyle & TCS_FIXEDWIDTH && (infoPtr->tabWidth != cx)) { - infoPtr->tabWidth = (INT)LOWORD(lParam); + infoPtr->tabWidth = cx; bNeedPaint = TRUE; } - if (infoPtr->tabHeight != (INT)HIWORD(lParam)) + if (infoPtr->tabHeight != cy) { - if ((infoPtr->fHeightSet = ((INT)HIWORD(lParam) != 0))) - infoPtr->tabHeight = (INT)HIWORD(lParam); + if ((infoPtr->fHeightSet = (cy != 0))) + infoPtr->tabHeight = cy; bNeedPaint = TRUE; } @@ -2785,7 +2788,8 @@ TAB_SetItemT (TAB_INFO *infoPtr, INT iItem, LPTCITEMW tabItem, BOOL bUnicode) static inline LRESULT TAB_GetItemCount (const TAB_INFO *infoPtr) { - return infoPtr->uNumItem; + TRACE("\n"); + return infoPtr->uNumItem; } @@ -2936,7 +2940,7 @@ static inline LRESULT TAB_GetImageList (const TAB_INFO *infoPtr) static inline LRESULT TAB_SetImageList (TAB_INFO *infoPtr, HIMAGELIST himlNew) { HIMAGELIST himlPrev = infoPtr->himl; - TRACE("\n"); + TRACE("himl=%p\n", himlNew); infoPtr->himl = himlNew; TAB_SetItemBounds(infoPtr); InvalidateRect(infoPtr->hwnd, NULL, TRUE); @@ -2945,6 +2949,7 @@ static inline LRESULT TAB_SetImageList (TAB_INFO *infoPtr, HIMAGELIST himlNew) static inline LRESULT TAB_GetUnicodeFormat (const TAB_INFO *infoPtr) { + TRACE("(%p)\n", infoPtr); return infoPtr->bUnicode; } @@ -2952,6 +2957,7 @@ static inline LRESULT TAB_SetUnicodeFormat (TAB_INFO *infoPtr, BOOL bUnicode) { BOOL bTemp = infoPtr->bUnicode; + TRACE("(%p %d)\n", infoPtr, bUnicode); infoPtr->bUnicode = bUnicode; return bTemp; @@ -3143,6 +3149,8 @@ static LRESULT TAB_NCCalcSize(WPARAM wParam) static inline LRESULT TAB_SetItemExtra (TAB_INFO *infoPtr, INT cbInfo) { + TRACE("(%p %d)\n", infoPtr, cbInfo); + if (cbInfo <= 0) return FALSE; @@ -3158,6 +3166,8 @@ TAB_SetItemExtra (TAB_INFO *infoPtr, INT cbInfo) static LRESULT TAB_RemoveImage (TAB_INFO *infoPtr, INT image) { + TRACE("%p %d\n", infoPtr, image); + if (ImageList_Remove (infoPtr->himl, image)) { INT i, *idx; @@ -3223,6 +3233,8 @@ TAB_DeselectAll (TAB_INFO *infoPtr, BOOL excludesel) BOOL paint = FALSE; INT i, selected = infoPtr->iSelected; + TRACE("(%p, %d)\n", infoPtr, excludesel); + if (!(infoPtr->dwStyle & TCS_BUTTONS)) return 0; @@ -3312,7 +3324,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_DeleteAllItems (infoPtr); case TCM_GETITEMRECT: - return TAB_GetItemRect (infoPtr, wParam, lParam); + return TAB_GetItemRect (infoPtr, (INT)wParam, (LPRECT)lParam); case TCM_GETCURSEL: return TAB_GetCurSel (infoPtr); @@ -3325,7 +3337,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case TCM_INSERTITEMA: case TCM_INSERTITEMW: - return TAB_InsertItemT (infoPtr, wParam, lParam, uMsg == TCM_INSERTITEMW); + return TAB_InsertItemT (infoPtr, (INT)wParam, (TCITEMW*)lParam, uMsg == TCM_INSERTITEMW); case TCM_SETITEMEXTRA: return TAB_SetItemExtra (infoPtr, (INT)wParam); @@ -3334,10 +3346,10 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_AdjustRect (infoPtr, (BOOL)wParam, (LPRECT)lParam); case TCM_SETITEMSIZE: - return TAB_SetItemSize (infoPtr, lParam); + return TAB_SetItemSize (infoPtr, (INT)LOWORD(lParam), (INT)HIWORD(lParam)); case TCM_REMOVEIMAGE: - return TAB_RemoveImage (infoPtr, wParam); + return TAB_RemoveImage (infoPtr, (INT)wParam); case TCM_SETPADDING: return TAB_SetPadding (infoPtr, lParam);

1 0

Nikolay Sivov : comctl32/tab: Remove dead parameter check code.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 6f05fd2dd9ba7f8be0f7596340587cc1a27d8721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f05fd2dd9ba7f8be0f759634… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 22:42:32 2009 +0400 comctl32/tab: Remove dead parameter check code. --- dlls/comctl32/tab.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 5cb7360..c9fd8a0 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2722,9 +2722,9 @@ TAB_HighlightItem (TAB_INFO *infoPtr, INT iItem, BOOL fHighlight) TRACE("(%p,%d,%s)\n", infoPtr, iItem, fHighlight ? "true" : "false"); - if (!infoPtr || iItem < 0 || iItem >= infoPtr->uNumItem) + if (iItem < 0 || iItem >= infoPtr->uNumItem) return FALSE; - + lpState = &TAB_GetItem(infoPtr, iItem)->dwState; oldState = *lpState; @@ -3100,9 +3100,6 @@ TAB_Destroy (TAB_INFO *infoPtr) { UINT iItem; - if (!infoPtr) - return 0; - SetWindowLongPtrW(infoPtr->hwnd, 0, 0); if (infoPtr->items) { @@ -3122,7 +3119,7 @@ TAB_Destroy (TAB_INFO *infoPtr) KillTimer(infoPtr->hwnd, TAB_HOTTRACK_TIMER); CloseThemeData (GetWindowTheme (infoPtr->hwnd)); - + Free (infoPtr); return 0; } @@ -3146,7 +3143,7 @@ static LRESULT TAB_NCCalcSize(WPARAM wParam) static inline LRESULT TAB_SetItemExtra (TAB_INFO *infoPtr, INT cbInfo) { - if (!infoPtr || cbInfo <= 0) + if (cbInfo <= 0) return FALSE; if (infoPtr->uNumItem) @@ -3161,9 +3158,6 @@ TAB_SetItemExtra (TAB_INFO *infoPtr, INT cbInfo) static LRESULT TAB_RemoveImage (TAB_INFO *infoPtr, INT image) { - if (!infoPtr) - return 0; - if (ImageList_Remove (infoPtr->himl, image)) { INT i, *idx; @@ -3334,7 +3328,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_InsertItemT (infoPtr, wParam, lParam, uMsg == TCM_INSERTITEMW); case TCM_SETITEMEXTRA: - return TAB_SetItemExtra (infoPtr, (int)wParam); + return TAB_SetItemExtra (infoPtr, (INT)wParam); case TCM_ADJUSTRECT: return TAB_AdjustRect (infoPtr, (BOOL)wParam, (LPRECT)lParam);

1 0

Nikolay Sivov : comctl32/tab: Remove unnecessary helper parameter, use SDK name for UpDown control.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: b0952c959bba6752109496909a79c1c9ee0c1bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0952c959bba6752109496909… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 22:35:54 2009 +0400 comctl32/tab: Remove unnecessary helper parameter, use SDK name for UpDown control. --- dlls/comctl32/tab.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index a611b64..5cb7360 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -957,14 +957,11 @@ static LRESULT TAB_OnHScroll(TAB_INFO *infoPtr, int nScrollCode, int nPos) * scrolling control is displayed (or not). */ static void TAB_SetupScrolling( - HWND hwnd, TAB_INFO* infoPtr, const RECT* clientRect) { - static const WCHAR msctls_updown32W[] = { 'm','s','c','t','l','s','_','u','p','d','o','w','n','3','2',0 }; static const WCHAR emptyW[] = { 0 }; INT maxRange = 0; - DWORD lStyle = GetWindowLongW(hwnd, GWL_STYLE); if (infoPtr->needsScrolling) { @@ -974,12 +971,12 @@ static void TAB_SetupScrolling( /* * Calculate the position of the scroll control. */ - if(lStyle & TCS_VERTICAL) + if(infoPtr->dwStyle & TCS_VERTICAL) { controlPos.right = clientRect->right; controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); - if (lStyle & TCS_BOTTOM) + if (infoPtr->dwStyle & TCS_BOTTOM) { controlPos.top = clientRect->bottom - infoPtr->tabHeight; controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); @@ -995,7 +992,7 @@ static void TAB_SetupScrolling( controlPos.right = clientRect->right; controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); - if (lStyle & TCS_BOTTOM) + if (infoPtr->dwStyle & TCS_BOTTOM) { controlPos.top = clientRect->bottom - infoPtr->tabHeight; controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); @@ -1013,12 +1010,12 @@ static void TAB_SetupScrolling( */ if (infoPtr->hwndUpDown==0) { - infoPtr->hwndUpDown = CreateWindowW(msctls_updown32W, emptyW, + infoPtr->hwndUpDown = CreateWindowW(UPDOWN_CLASSW, emptyW, WS_VISIBLE | WS_CHILD | UDS_HORZ, controlPos.left, controlPos.top, controlPos.right - controlPos.left, controlPos.bottom - controlPos.top, - hwnd, NULL, NULL, NULL); + infoPtr->hwnd, NULL, NULL, NULL); } else { @@ -1053,7 +1050,7 @@ static void TAB_SetupScrolling( else { /* If we once had a scroll control... hide it */ - if (infoPtr->hwndUpDown!=0) + if (infoPtr->hwndUpDown) ShowWindow(infoPtr->hwndUpDown, SW_HIDE); } if (infoPtr->hwndUpDown) @@ -1267,7 +1264,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) infoPtr->needsScrolling = FALSE; infoPtr->leftmostVisible = 0; } - TAB_SetupScrolling(infoPtr->hwnd, infoPtr, &clientRect); + TAB_SetupScrolling(infoPtr, &clientRect); /* Set the number of rows */ infoPtr->uNumRows = curItemRowCount;

1 0

Nikolay Sivov : comctl32/tab: Cache window GWL_STYLE style.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 9b06ec73fcd470367751f052718ab47aafd35d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b06ec73fcd470367751f0527… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 22:27:32 2009 +0400 comctl32/tab: Cache window GWL_STYLE style. --- dlls/comctl32/tab.c | 231 +++++++++++++++++++++++++++------------------------ 1 files changed, 123 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b06ec73fcd470367751f…

1 0

Dmitry Timoshkov : kernel32: Implement HeapQueryInformation, add some basic tests for it.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 27ebfdb879ad4ddccbef5a864ea6928c7b80ccc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ebfdb879ad4ddccbef5a864… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 12 17:20:57 2009 +0900 kernel32: Implement HeapQueryInformation, add some basic tests for it. --- dlls/kernel32/heap.c | 8 ++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/heap.c | 55 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/heap.c | 23 ++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 6 files changed, 89 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 93cf545..e85ccc3 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -291,6 +291,14 @@ SIZE_T WINAPI HeapSize( HANDLE heap, DWORD flags, LPCVOID ptr ) return RtlSizeHeap( heap, flags, ptr ); } +BOOL WINAPI HeapQueryInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, + PVOID info, SIZE_T size_in, PSIZE_T size_out) +{ + NTSTATUS ret = RtlQueryHeapInformation( heap, info_class, info, size_in, size_out ); + if (ret) SetLastError( RtlNtStatusToDosError(ret) ); + return !ret; +} + BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, PVOID info, SIZE_T size) { FIXME("%p %d %p %ld\n", heap, infoclass, info, size ); diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c97aa28..f5df031 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -707,7 +707,7 @@ @ stub HeapExtend @ stdcall HeapFree(long long long) ntdll.RtlFreeHeap @ stdcall HeapLock(long) -# @ stub HeapQueryInformation +@ stdcall HeapQueryInformation(long long ptr long ptr) @ stub HeapQueryTagW @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap @ stub HeapSetFlags diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 19b4106..c59d304 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -28,6 +28,8 @@ #define MAGIC_DEAD 0xdeadbeef +static BOOL (WINAPI *pHeapQueryInformation)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T, PSIZE_T); + static SIZE_T resize_9x(SIZE_T size) { DWORD dwSizeAligned = (size + 3) & ~3; @@ -410,6 +412,58 @@ static void test_obsolete_flags(void) } } +static void test_HeapQueryInformation(void) +{ + ULONG info; + SIZE_T size; + BOOL ret; + + pHeapQueryInformation = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "HeapQueryInformation"); + if (!pHeapQueryInformation) + { + win_skip("HeapQueryInformation is not available\n"); + return; + } + + if (0) /* crashes under XP */ + { + size = 0; + ret = pHeapQueryInformation(0, + HeapCompatibilityInformation, + &info, sizeof(info), &size); + size = 0; + ret = pHeapQueryInformation(GetProcessHeap(), + HeapCompatibilityInformation, + NULL, sizeof(info), &size); + } + + size = 0; + SetLastError(0xdeadbeef); + ret = pHeapQueryInformation(GetProcessHeap(), + HeapCompatibilityInformation, + NULL, 0, &size); + ok(!ret, "HeapQueryInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError()); + ok(size == sizeof(ULONG), "expected 4, got %lu\n", size); + + SetLastError(0xdeadbeef); + ret = pHeapQueryInformation(GetProcessHeap(), + HeapCompatibilityInformation, + NULL, 0, NULL); + ok(!ret, "HeapQueryInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError()); + + info = 0xdeadbeaf; + SetLastError(0xdeadbeef); + ret = pHeapQueryInformation(GetProcessHeap(), + HeapCompatibilityInformation, + &info, sizeof(info) + 1, NULL); + ok(ret, "HeapQueryInformation error %u\n", GetLastError()); + ok(info == 0 || info == 1 || info == 2, "expected 0, 1 or 2, got %u\n", info); +} + START_TEST(heap) { test_heap(); @@ -422,4 +476,5 @@ START_TEST(heap) test_sized_HeapReAlloc(1, (1 << 20)); test_sized_HeapReAlloc((1 << 20), (2 << 20)); test_sized_HeapReAlloc((1 << 20), 1); + test_HeapQueryInformation(); } diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 14cac32..adaf693 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1961,3 +1961,26 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps ) RtlLeaveCriticalSection( &processHeap->critSection ); return total; } + +/*********************************************************************** + * RtlQueryHeapInformation (NTDLL.@) + */ +NTSTATUS WINAPI RtlQueryHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, + PVOID info, SIZE_T size_in, PSIZE_T size_out) +{ + switch (info_class) + { + case HeapCompatibilityInformation: + if (size_out) *size_out = sizeof(ULONG); + + if (size_in < sizeof(ULONG)) + return STATUS_BUFFER_TOO_SMALL; + + *(ULONG *)info = 0; /* standard heap */ + return STATUS_SUCCESS; + + default: + FIXME("Unknown heap information class %u\n", info_class); + return STATUS_INVALID_INFO_CLASS; + } +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8787611..70647d2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -768,7 +768,7 @@ @ stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) -@ stub RtlQueryHeapInformation +@ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) @ stub RtlQueryInformationActiveActivationContext diff --git a/include/winternl.h b/include/winternl.h index a6fea7d..a78e9e5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2412,6 +2412,7 @@ NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PUNICODE_STRING); +NTSYSAPI NTSTATUS WINAPI RtlQueryHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationAcl(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationActivationContext(ULONG,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI RtlQueryProcessDebugInformation(ULONG,ULONG,PDEBUG_BUFFER);

1 0

Paul Vriens : user32/tests: Fix an intermittent test failure.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 42f7e4a4d9b9ebc9a0364647a34910038562fe64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f7e4a4d9b9ebc9a0364647a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 12 09:21:25 2009 +0200 user32/tests: Fix an intermittent test failure. --- dlls/user32/tests/listbox.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 0aef698..942c780 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -303,6 +303,7 @@ static void test_ownerdraw(void) hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); assert(hLB); + SetForegroundWindow(hLB); UpdateWindow(hLB); /* make height short enough */

1 0

Henri Verbeet : d3d10: Explicitly handle D3D10_SVC_STRUCT in set_variable_vtbl().
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: b8668a9ce58c14f7531bfe3d4e55b57416428fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8668a9ce58c14f7531bfe3d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 12 10:10:26 2009 +0200 d3d10: Explicitly handle D3D10_SVC_STRUCT in set_variable_vtbl(). --- dlls/d3d10/effect.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index b41daeb..e567bd8 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -483,6 +483,10 @@ static void set_variable_vtbl(struct d3d10_effect_variable *v) v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl; break; + case D3D10_SVC_STRUCT: + v->vtbl = &d3d10_effect_variable_vtbl; + break; + default: FIXME("Unhandled type class %s.\n", debug_d3d10_shader_variable_class(v->type->type_class)); v->vtbl = &d3d10_effect_variable_vtbl;

1 0

Henri Verbeet : d3d9: Cleanup the stateblock test callbacks a bit.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 803eab27c7d69451251eeb6a77623cf377852c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803eab27c7d69451251eeb6a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 12 10:10:25 2009 +0200 d3d9: Cleanup the stateblock test callbacks a bit. --- dlls/d3d9/tests/stateblock.c | 118 +++++++++++++++++++----------------------- 1 files changed, 53 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=803eab27c7d69451251ee…

1 0

Henri Verbeet : d3d8: Cleanup the stateblock test callbacks a bit.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: eb9727bbabb1cb125ec0ef23edcb89b4119a039d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb9727bbabb1cb125ec0ef23e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 12 10:10:24 2009 +0200 d3d8: Cleanup the stateblock test callbacks a bit. This mostly just makes the naming more conistent with what we use in other D3D code, but also passes the device to the init() and cleanup() callbacks to allow device resources to be created there. Future tests require this. --- dlls/d3d8/tests/stateblock.c | 98 ++++++++++++++++++------------------------ 1 files changed, 42 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb9727bbabb1cb125ec0e…

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 October 2009