October 2009 - Wine-commits

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: 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: 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: 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: Support for TCN_KEYDOWN notification.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 48fcccd861394f85ebae0065927431612e43739b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48fcccd861394f85ebae00659… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 10 03:27:33 2009 +0400 comctl32/tab: Support for TCN_KEYDOWN notification. --- dlls/comctl32/tab.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 431c54c..22af8d7 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -46,7 +46,6 @@ * NM_RELEASEDCAPTURE * TCN_FOCUSCHANGE * TCN_GETOBJECT - * TCN_KEYDOWN * * Macros: * TabCtrl_AdjustRect @@ -488,9 +487,18 @@ TAB_GetItemRect(const TAB_INFO *infoPtr, INT item, RECT *rect) * * This method is called to handle keyboard input */ -static LRESULT TAB_KeyDown(TAB_INFO* infoPtr, WPARAM keyCode) +static LRESULT TAB_KeyDown(TAB_INFO* infoPtr, WPARAM keyCode, LPARAM lParam) { INT newItem = -1; + NMTCKEYDOWN nm; + + /* TCN_KEYDOWN notification sent always */ + nm.hdr.hwndFrom = infoPtr->hwnd; + nm.hdr.idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); + nm.hdr.code = TCN_KEYDOWN; + nm.wVKey = keyCode; + nm.flags = lParam; + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nm.hdr.idFrom, (LPARAM)&nm); switch (keyCode) { @@ -3473,7 +3481,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) break; /* Don't disturb normal focus behavior */ case WM_KEYDOWN: - return TAB_KeyDown(infoPtr, wParam); + return TAB_KeyDown(infoPtr, wParam, lParam); case WM_NCHITTEST: return TAB_NCHitTest(infoPtr, lParam);

1 0

Nikolay Sivov : comctl32/monthcal: Process UpDown year control through subclass procedure.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 2906aaf605e432bdb7d46be33727fe53a525470a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2906aaf605e432bdb7d46be33… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 10 21:04:16 2009 +0400 comctl32/monthcal: Process UpDown year control through subclass procedure. --- dlls/comctl32/monthcal.c | 126 ++++++++++++++++++++++++++++----------- dlls/comctl32/tests/monthcal.c | 23 +++++++ 2 files changed, 113 insertions(+), 36 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 7697187..fc73537 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -128,6 +128,7 @@ typedef struct HWND hwndNotify; /* Window to receive the notifications */ HWND hWndYearEdit; /* Window Handle of edit box to handle years */ HWND hWndYearUpDown;/* Window Handle of updown box to handle years */ + WNDPROC EditWndProc; /* original Edit window procedure */ } MONTHCAL_INFO, *LPMONTHCAL_INFO; @@ -1355,7 +1356,7 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) /* FIXME: if the specified date is not visible, make it visible */ static LRESULT -MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) +MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *curSel) { TRACE("%p\n", curSel); if(!curSel) return FALSE; @@ -1725,6 +1726,53 @@ MONTHCAL_RButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) return 0; } +/*** + * DESCRIPTION: + * Subclassed edit control windproc function + * + * PARAMETER(S): + * [I] hwnd : the edit window handle + * [I] uMsg : the message that is to be processed + * [I] wParam : first message parameter + * [I] lParam : second message parameter + * + */ +static LRESULT CALLBACK EditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + MONTHCAL_INFO *infoPtr = (MONTHCAL_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0); + + TRACE("(hwnd=%p, uMsg=%x, wParam=%lx, lParam=%lx)\n", + hwnd, uMsg, wParam, lParam); + + switch (uMsg) + { + case WM_GETDLGCODE: + return DLGC_WANTARROWS | DLGC_WANTALLKEYS; + + case WM_DESTROY: + { + WNDPROC editProc = infoPtr->EditWndProc; + infoPtr->EditWndProc = NULL; + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (DWORD_PTR)editProc); + return CallWindowProcW(editProc, hwnd, uMsg, wParam, lParam); + } + + case WM_KILLFOCUS: + break; + + case WM_KEYDOWN: + if ((VK_ESCAPE == (INT)wParam) || (VK_RETURN == (INT)wParam)) + break; + + default: + return CallWindowProcW(infoPtr->EditWndProc, hwnd, uMsg, wParam, lParam); + } + + SendMessageW(infoPtr->hWndYearUpDown, WM_CLOSE, 0, 0); + SendMessageW(hwnd, WM_CLOSE, 0, 0); + return 0; +} + /* creates updown control and edit box */ static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr) { @@ -1749,6 +1797,12 @@ static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr) MAKELONG(max_allowed_date.wYear, min_allowed_date.wYear)); SendMessageW(infoPtr->hWndYearUpDown, UDM_SETBUDDY, (WPARAM)infoPtr->hWndYearEdit, 0); SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, infoPtr->curSel.wYear); + + /* subclass edit box */ + infoPtr->EditWndProc = (WNDPROC)SetWindowLongPtrW(infoPtr->hWndYearEdit, + GWLP_WNDPROC, (DWORD_PTR)EditWndProc); + + SetFocus(infoPtr->hWndYearEdit); } static LRESULT @@ -1757,24 +1811,12 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) MCHITTESTINFO ht; DWORD hit; - if (infoPtr->hWndYearUpDown) + /* Actually we don't need input focus for calendar, this is used to kill + year updown and its buddy edit box */ + if (IsWindow(infoPtr->hWndYearUpDown)) { - infoPtr->curSel.wYear = SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, 0); - if(!DestroyWindow(infoPtr->hWndYearUpDown)) - { - FIXME("Can't destroy Updown Control\n"); - } - else - infoPtr->hWndYearUpDown = 0; - - if(!DestroyWindow(infoPtr->hWndYearEdit)) - { - FIXME("Can't destroy Updown Control\n"); - } - else - infoPtr->hWndYearEdit = 0; - - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + SetFocus(infoPtr->hwndSelf); + return 0; } SetCapture(infoPtr->hwndSelf); @@ -1899,6 +1941,8 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr); + if(!(infoPtr->status & MC_SEL_LBUTDOWN)) return 0; + ht.cbSize = sizeof(MCHITTESTINFO); ht.pt.x = (short)LOWORD(lParam); ht.pt.y = (short)HIWORD(lParam); @@ -2049,21 +2093,6 @@ MONTHCAL_Paint(MONTHCAL_INFO *infoPtr, HDC hdc_paint) return 0; } - -static LRESULT -MONTHCAL_KillFocus(const MONTHCAL_INFO *infoPtr, HWND hFocusWnd) -{ - TRACE("\n"); - - if (infoPtr->hwndNotify != hFocusWnd) - ShowWindow(infoPtr->hwndSelf, SW_HIDE); - else - InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); - - return 0; -} - - static LRESULT MONTHCAL_SetFocus(const MONTHCAL_INFO *infoPtr) { @@ -2360,6 +2389,31 @@ MONTHCAL_Destroy(MONTHCAL_INFO *infoPtr) return 0; } +/* + * Handler for WM_NOTIFY messages + */ +static LRESULT +MONTHCAL_Notify(MONTHCAL_INFO *infoPtr, NMHDR *hdr) +{ + /* notification from year edit updown */ + if (hdr->code == UDN_DELTAPOS) + { + NMUPDOWN *nmud = (NMUPDOWN*)hdr; + + if (hdr->hwndFrom == infoPtr->hWndYearUpDown) + { + /* year value limits are set up explicitly after updown creation */ + if ((nmud->iDelta + nmud->iPos) != infoPtr->curSel.wYear) + { + SYSTEMTIME new_date = infoPtr->curSel; + + new_date.wYear = nmud->iDelta + nmud->iPos; + MONTHCAL_SetCurSel(infoPtr, &new_date); + } + } + } + return 0; +} static LRESULT WINAPI MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -2439,9 +2493,6 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_GETDLGCODE: return DLGC_WANTARROWS | DLGC_WANTCHARS; - case WM_KILLFOCUS: - return MONTHCAL_KillFocus(infoPtr, (HWND)wParam); - case WM_RBUTTONUP: return MONTHCAL_RButtonUp(infoPtr, lParam); @@ -2464,6 +2515,9 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SIZE: return MONTHCAL_Size(infoPtr, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + case WM_NOTIFY: + return MONTHCAL_Notify(infoPtr, (NMHDR*)lParam); + case WM_CREATE: return MONTHCAL_Create(hwnd, (LPCREATESTRUCTW)lParam); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 21c171e..d767066 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1647,6 +1647,28 @@ static void test_monthcal_selrange(void) DestroyWindow(hwnd); } +static void test_killfocus(void) +{ + HWND hwnd; + DWORD style; + + hwnd = create_monthcal_control(0); + + /* make parent invisible */ + style = GetWindowLong(parent_wnd, GWL_STYLE); + SetWindowLong(parent_wnd, GWL_STYLE, style &~ WS_VISIBLE); + + SendMessage(hwnd, WM_KILLFOCUS, (WPARAM)GetDesktopWindow(), 0); + + style = GetWindowLong(hwnd, GWL_STYLE); + ok(style & WS_VISIBLE, "Expected WS_VISIBLE to be set\n"); + + style = GetWindowLong(parent_wnd, GWL_STYLE); + SetWindowLong(parent_wnd, GWL_STYLE, style | WS_VISIBLE); + + DestroyWindow(hwnd); +} + START_TEST(monthcal) { HMODULE hComctl32; @@ -1684,6 +1706,7 @@ START_TEST(monthcal) test_monthcal_size(); test_monthcal_maxselday(); test_monthcal_selrange(); + test_killfocus(); flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(parent_wnd);

1 0

Nikolay Sivov : comctl32/monthcal: Reuse existing calls to get day of week.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: a00c217ce910bc20f5c40a0a864c588dc720bf37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a00c217ce910bc20f5c40a0a8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 10 21:20:26 2009 +0400 comctl32/monthcal: Reuse existing calls to get day of week. --- dlls/comctl32/monthcal.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index fc73537..d75526a 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -131,10 +131,6 @@ typedef struct WNDPROC EditWndProc; /* original Edit window procedure */ } MONTHCAL_INFO, *LPMONTHCAL_INFO; - -/* Offsets of days in the week to the weekday of january 1 in a leap year */ -static const int DayOfWeekTable[] = {0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4}; - static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; /* empty SYSTEMTIME const */ @@ -389,10 +385,18 @@ static void MONTHCAL_CopyDate(const SYSTEMTIME *from, SYSTEMTIME *to) */ int MONTHCAL_CalculateDayOfWeek(WORD day, WORD month, WORD year) { - year-=(month < 3); + FILETIME ft; + SYSTEMTIME st; + + st.wYear = year; + st.wMonth = month; + st.wDay = day; + st.wHour = st.wMinute = st.wSecond = st.wMilliseconds = 0; + + SystemTimeToFileTime(&st, &ft); + FileTimeToSystemTime(&ft, &st); - return((year + year/4 - year/100 + year/400 + - DayOfWeekTable[month-1] + day ) % 7); + return st.wDayOfWeek; } /* properly updates date to point on next month */

1 0

Nikolay Sivov : comctl32/monthcal: Handle September 1752 with a special case - it's a 19 day month.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 18857222ecf7c13a113efe4d15fd8952d80efcce URL: http://source.winehq.org/git/wine.git/?a=commit;h=18857222ecf7c13a113efe4d1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 10 23:12:43 2009 +0400 comctl32/monthcal: Handle September 1752 with a special case - it's a 19 day month. --- dlls/comctl32/monthcal.c | 17 +++++++++++++---- dlls/comctl32/tests/monthcal.c | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index d75526a..9f242ed 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -184,6 +184,9 @@ int MONTHCAL_MonthLength(int month, int year) else if(month == 13) month = 1; + /* special case for calendar transition year */ + if(month == min_allowed_date.wMonth && year == min_allowed_date.wYear) return 19; + /* if we have a leap year add 1 day to February */ /* a leap year is a year either divisible by 400 */ /* or divisible by 4 and not by 100 */ @@ -1224,11 +1227,17 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) switch (flag) { case GMR_VISIBLE: { - /*FIXME: currently multicalendar feature isn't implelented, so entirely + /*FIXME: currently multicalendar feature isn't implemented, so entirely visible month is current */ st[0] = st[1] = infoPtr->curSel; - st[0].wDay = 1; + if (infoPtr->curSel.wMonth == min_allowed_date.wMonth && + infoPtr->curSel.wYear == min_allowed_date.wYear) + { + st[0].wDay = min_allowed_date.wDay; + } + else + st[0].wDay = 1; st[0].wDayOfWeek = MONTHCAL_CalculateDayOfWeek(1, st[0].wMonth, st[0].wYear); st[1].wDay = MONTHCAL_MonthLength(st[1].wMonth, st[1].wYear); @@ -1239,7 +1248,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) } case GMR_DAYSTATE: { - /*FIXME: currently multicalendar feature isn't implelented, + /*FIXME: currently multicalendar feature isn't implemented, min date from previous month and max date from next one returned */ MONTHCAL_GetMinDate(infoPtr, &st[0]); MONTHCAL_GetMaxDate(infoPtr, &st[1]); @@ -1625,7 +1634,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) lpht->st.wDay = day; } /* always update day of week */ - lpht->st.wDayOfWeek = MONTHCAL_CalculateDayOfWeek(day, lpht->st.wMonth, + lpht->st.wDayOfWeek = MONTHCAL_CalculateDayOfWeek(lpht->st.wDay, lpht->st.wMonth, lpht->st.wYear); goto done; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index d767066..3ead3ed 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1350,6 +1350,7 @@ static void test_monthcal_monthrange(void) int res; SYSTEMTIME st_visible[2], st_daystate[2], st; HWND hwnd; + RECT r; hwnd = create_monthcal_control(0); @@ -1404,6 +1405,30 @@ static void test_monthcal_monthrange(void) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_monthrange_seq, "monthcal monthrange", FALSE); + /* resize control to display single Calendar */ + res = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r); + MoveWindow(hwnd, 0, 0, r.right, r.bottom, FALSE); + + memset(&st, 0, sizeof(st)); + st.wMonth = 9; + st.wYear = 1752; + st.wDay = 14; + + res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st); + expect(1, res); + + /* September 1752 has 19 days */ + res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st_visible); + expect(1, res); + + expect(1752, st_visible[0].wYear); + expect(9, st_visible[0].wMonth); + expect(14, st_visible[0].wDay); + + expect(1752, st_visible[1].wYear); + expect(9, st_visible[1].wMonth); + expect(19, st_visible[1].wDay); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/monthcal: Handle over/ underflow while navigation with month menu.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 6b72f16906b4659d6d7a33e3e5cf1b8e9317ae07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b72f16906b4659d6d7a33e3e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 11 00:28:51 2009 +0400 comctl32/monthcal: Handle over/underflow while navigation with month menu. --- dlls/comctl32/monthcal.c | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 9f242ed..87ce751 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -248,26 +248,41 @@ static LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME * * [I] infoPtr : valid pointer to control data * [I] date : pointer to valid date data to check + * [I] fix : make date fit valid range * * RETURN VALUE * * TRUE - date whithin largest and configured range * FALSE - date is outside largest or configured range */ -static BOOL MONTHCAL_IsDateInValidRange(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *date) +static BOOL MONTHCAL_IsDateInValidRange(const MONTHCAL_INFO *infoPtr, + SYSTEMTIME *date, BOOL fix) { - if((MONTHCAL_CompareSystemTime(date, &max_allowed_date) == 1) || - (MONTHCAL_CompareSystemTime(date, &min_allowed_date) == -1)) return FALSE; + const SYSTEMTIME *fix_st = NULL; - if(infoPtr->rangeValid & GDTR_MAX) { - if((MONTHCAL_CompareSystemTime(date, &infoPtr->maxDate) == 1)) return FALSE; + if(MONTHCAL_CompareSystemTime(date, &max_allowed_date) == 1) { + fix_st = &max_allowed_date; + } + else if(MONTHCAL_CompareSystemTime(date, &min_allowed_date) == -1) { + fix_st = &min_allowed_date; + } + else if(infoPtr->rangeValid & GDTR_MAX) { + if((MONTHCAL_CompareSystemTime(date, &infoPtr->maxDate) == 1)) { + fix_st = &infoPtr->maxDate; + } + } + else if(infoPtr->rangeValid & GDTR_MIN) { + if((MONTHCAL_CompareSystemTime(date, &infoPtr->minDate) == -1)) { + fix_st = &infoPtr->minDate; + } } - if(infoPtr->rangeValid & GDTR_MIN) { - if((MONTHCAL_CompareSystemTime(date, &infoPtr->minDate) == -1)) return FALSE; + if (fix && fix_st) { + date->wYear = fix_st->wYear; + date->wMonth = fix_st->wMonth; } - return TRUE; + return fix_st ? FALSE : TRUE; } /* Checks passed range width with configured maximum selection count @@ -1369,7 +1384,7 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) /* FIXME: if the specified date is not visible, make it visible */ static LRESULT -MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *curSel) +MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) { TRACE("%p\n", curSel); if(!curSel) return FALSE; @@ -1379,7 +1394,7 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *curSel) /* exit earlier if selection equals current */ if (MONTHCAL_IsDateEqual(&infoPtr->curSel, curSel)) return TRUE; - if(!MONTHCAL_IsDateInValidRange(infoPtr, curSel)) return FALSE; + if(!MONTHCAL_IsDateInValidRange(infoPtr, curSel, FALSE)) return FALSE; infoPtr->minSel = *curSel; infoPtr->maxSel = *curSel; @@ -1686,7 +1701,7 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) MONTHCAL_GetNextMonth(&next); - if(!MONTHCAL_IsDateInValidRange(infoPtr, &next)) return; + if(!MONTHCAL_IsDateInValidRange(infoPtr, &next, FALSE)) return; infoPtr->curSel = next; @@ -1702,7 +1717,7 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) MONTHCAL_GetPrevMonth(&prev); - if(!MONTHCAL_IsDateInValidRange(infoPtr, &prev)) return; + if(!MONTHCAL_IsDateInValidRange(infoPtr, &prev, FALSE)) return; infoPtr->curSel = prev; @@ -1879,6 +1894,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) if ((i > 0) && (i < 13) && infoPtr->curSel.wMonth != i) { infoPtr->curSel.wMonth = i; + MONTHCAL_IsDateInValidRange(infoPtr, &infoPtr->curSel, TRUE); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); } return 0;

1 0

Jeffrey Morlan : netapi32: Fix heap buffer overflows.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: d5f2172c093e0b4cef04fd3d99639c0b7300907c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f2172c093e0b4cef04fd3d9… Author: Jeffrey Morlan <mrnobo1024(a)yahoo.com> Date: Sun Oct 11 13:02:40 2009 -0700 netapi32: Fix heap buffer overflows. --- dlls/netapi32/access.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 8a3b8f4..0044035 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -112,7 +112,7 @@ static BOOL NETAPI_IsCurrentUser(LPCWSTR username) BOOL ret = FALSE; dwSize = LM20_UNLEN+1; - curr_user = HeapAlloc(GetProcessHeap(), 0, dwSize); + curr_user = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); if(!curr_user) { ERR("Failed to allocate memory for user name.\n"); @@ -431,7 +431,7 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, return status; size = UNLEN + 1; - NetApiBufferAllocate(size, (LPVOID*)&currentuser); + NetApiBufferAllocate(size * sizeof(WCHAR), (LPVOID*)&currentuser); GetUserNameW(currentuser, &size); if (lstrcmpiW(username, currentuser) && NETAPI_FindUser(username)) @@ -640,7 +640,7 @@ NetQueryDisplayInformation( /* get data */ dwSize = UNLEN + 1; - NetApiBufferAllocate(dwSize, (LPVOID *) &name); + NetApiBufferAllocate(dwSize * sizeof(WCHAR), (LPVOID *) &name); if (!GetUserNameW(name, &dwSize)) { NetApiBufferFree(name);

1 0