May 2009 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/syslink: Use cached colors for SysLink.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: a2f309a3ee6d4d8df5d4c88687d82c47d5a44b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f309a3ee6d4d8df5d4c8868… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 19:59:13 2009 +0400 comctl32/syslink: Use cached colors for SysLink. --- dlls/comctl32/syslink.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 8f48b4c..1b89bc7 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -831,7 +831,7 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) hOldFont = SelectObject(hdc, infoPtr->Font); OldTextColor = SetTextColor(hdc, infoPtr->TextColor); - OldBkColor = SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); + OldBkColor = SetBkColor(hdc, comctl32_color.clrBtnFace); GetClientRect(infoPtr->Self, &rc); rc.right -= SL_RIGHTMARGIN + SL_LEFTMARGIN; @@ -1729,9 +1729,9 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, infoPtr->Items = NULL; infoPtr->HasFocus = FALSE; infoPtr->MouseDownID = -1; - infoPtr->TextColor = GetSysColor(COLOR_WINDOWTEXT); - infoPtr->LinkColor = GetSysColor(COLOR_HIGHLIGHT); - infoPtr->VisitedColor = GetSysColor(COLOR_HIGHLIGHT); + infoPtr->TextColor = comctl32_color.clrWindowText; + infoPtr->LinkColor = comctl32_color.clrHighlight; + infoPtr->VisitedColor = comctl32_color.clrHighlight; infoPtr->BreakChar = ' '; TRACE("SysLink Ctrl creation, hwnd=%p\n", hwnd); SYSLINK_SetText(infoPtr, ((LPCREATESTRUCTW)lParam)->lpszName); @@ -1746,6 +1746,10 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, Free (infoPtr); return 0; + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return 0; + default: HandleDefaultMessage: if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message))

1 0

Nikolay Sivov : comctl32/tooltips: Use cached colors for ToolTips.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 8f5a1ae8c90d819c7f2e80ae911c7a9d981c32a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5a1ae8c90d819c7f2e80ae9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 20:02:09 2009 +0400 comctl32/tooltips: Use cached colors for ToolTips. --- dlls/comctl32/tooltips.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 010f3a9..fc9052e 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -189,8 +189,8 @@ TOOLTIPS_InitSystemSettings (TOOLTIPS_INFO *infoPtr) { NONCLIENTMETRICSW nclm; - infoPtr->clrBk = GetSysColor (COLOR_INFOBK); - infoPtr->clrText = GetSysColor (COLOR_INFOTEXT); + infoPtr->clrBk = comctl32_color.clrInfoBk; + infoPtr->clrText = comctl32_color.clrInfoText; DeleteObject (infoPtr->hFont); nclm.cbSize = sizeof(nclm); @@ -2839,6 +2839,10 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SETFONT: return TOOLTIPS_SetFont (hwnd, wParam, lParam); + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return 0; + case WM_TIMER: return TOOLTIPS_Timer (hwnd, wParam, lParam);

1 0

Nikolay Sivov : comctl32/listview: Handle mouse selections more accurately.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: d769368f66ae648dce519264c748fe670e79aab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d769368f66ae648dce519264c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 20:50:43 2009 +0400 comctl32/listview: Handle mouse selections more accurately. --- dlls/comctl32/listview.c | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e94d389..ce78224 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -293,6 +293,7 @@ typedef struct tagLISTVIEW_INFO HWND hwndEdit; WNDPROC EditWndProc; INT nEditLabelItem; + INT nLButtonDownItem; /* tracks item to reset multiselection on WM_LBUTTONUP */ DWORD dwHoverTime; HWND hwndToolTip; @@ -3388,6 +3389,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN { POINT tmp; RECT rect; + LVHITTESTINFO lvHitTestInfo; WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); @@ -3399,11 +3401,33 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN tmp.x = x; tmp.y = y; + lvHitTestInfo.pt = tmp; + LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); + + /* reset item marker */ + if (infoPtr->nLButtonDownItem != lvHitTestInfo.iItem) + infoPtr->nLButtonDownItem = -1; + if (!PtInRect(&rect, tmp)) { - LVHITTESTINFO lvHitTestInfo; NMLISTVIEW nmlv; + /* this path covers the following: + 1. WM_LBUTTONDOWN over selected item (sets focus on it) + 2. change focus with keys + 3. move mouse over item from step 1 selects it and moves focus on it */ + if (infoPtr->nLButtonDownItem != -1 && + !LISTVIEW_GetItemState(infoPtr, infoPtr->nLButtonDownItem, LVIS_SELECTED)) + { + LVITEMW lvItem; + + lvItem.state = LVIS_FOCUSED | LVIS_SELECTED; + lvItem.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + + LISTVIEW_SetItemState(infoPtr, infoPtr->nLButtonDownItem, &lvItem); + infoPtr->nLButtonDownItem = -1; + } + lvHitTestInfo.pt = infoPtr->ptClickPos; LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); @@ -3420,8 +3444,6 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN return 0; } } - else - infoPtr->bLButtonDown = FALSE; /* see if we are supposed to be tracking mouse hovering */ if (LISTVIEW_isHotTracking(infoPtr)) { @@ -8144,6 +8166,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING); infoPtr->nEditLabelItem = -1; + infoPtr->nLButtonDownItem = -1; infoPtr->dwHoverTime = -1; /* default system hover time */ infoPtr->nMeasureItemHeight = 0; infoPtr->xTrackLine = -1; /* no track line */ @@ -8835,10 +8858,15 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN else { if (LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED)) + { infoPtr->nEditLabelItem = nItem; + infoPtr->nLButtonDownItem = nItem; - /* set selection (clears other pre-existing selections) */ - LISTVIEW_SetSelection(infoPtr, nItem); + LISTVIEW_SetItemFocus(infoPtr, nItem); + } + else + /* set selection (clears other pre-existing selections) */ + LISTVIEW_SetSelection(infoPtr, nItem); } } @@ -8848,7 +8876,8 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN else { /* remove all selections */ - LISTVIEW_DeselectAll(infoPtr); + if (!(wKey & MK_CONTROL) && !(wKey & MK_SHIFT)) + LISTVIEW_DeselectAll(infoPtr); ReleaseCapture(); } @@ -8885,6 +8914,11 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT /* set left button flag */ infoPtr->bLButtonDown = FALSE; + /* set a single selection, reset others */ + if(lvHitTestInfo.iItem == infoPtr->nLButtonDownItem && lvHitTestInfo.iItem != -1) + LISTVIEW_SetSelection(infoPtr, infoPtr->nLButtonDownItem); + infoPtr->nLButtonDownItem = -1; + if (infoPtr->bDragging) { infoPtr->bDragging = FALSE;

1 0

Nikolay Sivov : comctl32/ipaddress: Use cached colors instead of GetSysColor for IPAddress control.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 8806b1e83e3eeb5810428f374a1f0005fd88fd5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8806b1e83e3eeb5810428f374… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 18:57:19 2009 +0400 comctl32/ipaddress: Use cached colors instead of GetSysColor for IPAddress control. --- dlls/comctl32/ipaddress.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index a90f6e9..42ac703 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -158,18 +158,18 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) GetClientRect (infoPtr->Self, &rect); if (infoPtr->Enabled) { - bgCol = COLOR_WINDOW; - fgCol = COLOR_WINDOWTEXT; + bgCol = comctl32_color.clrWindow; + fgCol = comctl32_color.clrWindowText; } else { - bgCol = COLOR_3DFACE; - fgCol = COLOR_GRAYTEXT; + bgCol = comctl32_color.clr3dFace; + fgCol = comctl32_color.clrGrayText; } FillRect (hdc, &rect, (HBRUSH)(DWORD_PTR)(bgCol+1)); DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); - SetBkColor (hdc, GetSysColor(bgCol)); - SetTextColor(hdc, GetSysColor(fgCol)); + SetBkColor (hdc, bgCol); + SetTextColor(hdc, fgCol); for (i = 0; i < 3; i++) { GetWindowRect (infoPtr->Part[i].EditHwnd, &rcPart); @@ -595,6 +595,10 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } break; + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return 0; + case IPM_CLEARADDRESS: IPADDRESS_ClearAddress (infoPtr); break;

1 0

Nikolay Sivov : comctl32/monthcal: Use cached colors instead of GetSysColor for MonthCal.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: cf67786e406c3a5a7be913bd1c31b0903e6ba29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf67786e406c3a5a7be913bd1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 19:03:40 2009 +0400 comctl32/monthcal: Use cached colors instead of GetSysColor for MonthCal. --- 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 15acf1f..be41451 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -456,7 +456,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT SYSTEMTIME localtime; int startofprescal; - oldTextColor = SetTextColor(hdc, GetSysColor(COLOR_WINDOWTEXT)); + oldTextColor = SetTextColor(hdc, comctl32_color.clrWindowText); /* fill background */ hbr = CreateSolidBrush (infoPtr->bk); @@ -1926,12 +1926,12 @@ MONTHCAL_Create(HWND hwnd, LPARAM lParam) infoPtr->monthRange = 3; infoPtr->monthdayState = Alloc (infoPtr->monthRange * sizeof(MONTHDAYSTATE)); - infoPtr->titlebk = GetSysColor(COLOR_ACTIVECAPTION); - infoPtr->titletxt = GetSysColor(COLOR_WINDOW); - infoPtr->monthbk = GetSysColor(COLOR_WINDOW); - infoPtr->trailingtxt = GetSysColor(COLOR_GRAYTEXT); - infoPtr->bk = GetSysColor(COLOR_WINDOW); - infoPtr->txt = GetSysColor(COLOR_WINDOWTEXT); + infoPtr->titlebk = comctl32_color.clrActiveCaption; + infoPtr->titletxt = comctl32_color.clrWindow; + infoPtr->monthbk = comctl32_color.clrWindow; + infoPtr->trailingtxt = comctl32_color.clrGrayText; + infoPtr->bk = comctl32_color.clrWindow; + infoPtr->txt = comctl32_color.clrWindowText; /* set the current day for highlighing */ infoPtr->minSel.wDay = infoPtr->todaysDate.wDay; @@ -2082,6 +2082,10 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_DESTROY: return MONTHCAL_Destroy(infoPtr); + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return 0; + default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) ERR( "unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);

1 0

Nikolay Sivov : comctl32/rebar: Use cached colors instead of GetSysColor for Rebar.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 109a10c961e63ef7c63fb48c8723dcad61965c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=109a10c961e63ef7c63fb48c8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 19:07:00 2009 +0400 comctl32/rebar: Use cached colors instead of GetSysColor for Rebar. --- dlls/comctl32/rebar.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 089da39..982c844 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3190,8 +3190,8 @@ REBAR_NCCreate (HWND hwnd, LPARAM lParam) /* initialize info structure - initial values are 0 */ infoPtr->clrBk = CLR_NONE; infoPtr->clrText = CLR_NONE; - infoPtr->clrBtnText = GetSysColor (COLOR_BTNTEXT); - infoPtr->clrBtnFace = GetSysColor (COLOR_BTNFACE); + infoPtr->clrBtnText = comctl32_color.clrBtnText; + infoPtr->clrBtnFace = comctl32_color.clrBtnFace; infoPtr->iOldBand = -1; infoPtr->ichevronhotBand = -2; infoPtr->iGrabbedBand = -1; @@ -3720,10 +3720,9 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_THEMECHANGED: return theme_changed (infoPtr); -/* case WM_SYSCOLORCHANGE: supported according to ControlSpy */ -/* "Applications that have brushes using the existing system colors - should delete those brushes and recreate them using the new - system colors." per MSDN */ + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return 0; /* case WM_VKEYTOITEM: supported according to ControlSpy */ /* case WM_WININICHANGE: */

1 0

Nikolay Sivov : comctl32/status: Use cached colors instead of GetSysColor for Status.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 2b72ae6e01f72dca5503677a5097c1c002e6db09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b72ae6e01f72dca5503677a5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 19:08:00 2009 +0400 comctl32/status: Use cached colors instead of GetSysColor for Status. --- dlls/comctl32/status.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 17ba1e9..f7d203b 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -167,7 +167,7 @@ STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) pt.x = lpRect->right - 1; pt.y = lpRect->bottom - 1; - hPenFace = CreatePen( PS_SOLID, 1, GetSysColor( COLOR_3DFACE )); + hPenFace = CreatePen( PS_SOLID, 1, comctl32_color.clr3dFace); hOldPen = SelectObject( hdc, hPenFace ); MoveToEx (hdc, pt.x - 12, pt.y, NULL); LineTo (hdc, pt.x, pt.y); @@ -176,7 +176,7 @@ STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) pt.x--; pt.y--; - hPenShadow = CreatePen( PS_SOLID, 1, GetSysColor( COLOR_3DSHADOW )); + hPenShadow = CreatePen( PS_SOLID, 1, comctl32_color.clr3dShadow); SelectObject( hdc, hPenShadow ); for (i = 1; i < 11; i += 4) { MoveToEx (hdc, pt.x - i, pt.y, NULL); @@ -186,7 +186,7 @@ STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) LineTo (hdc, pt.x + 1, pt.y - i - 2); } - hPenHighlight = CreatePen( PS_SOLID, 1, GetSysColor( COLOR_3DHIGHLIGHT )); + hPenHighlight = CreatePen( PS_SOLID, 1, comctl32_color.clr3dHilight); SelectObject( hdc, hPenHighlight ); for (i = 3; i < 13; i += 4) { MoveToEx (hdc, pt.x - i, pt.y, NULL); @@ -1313,6 +1313,10 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) if (STATUSBAR_WMSize (infoPtr, (WORD)wParam)) return 0; return DefWindowProcW (hwnd, msg, wParam, lParam); + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return 0; + case WM_THEMECHANGED: return theme_changed (infoPtr);

1 0

Nikolay Sivov : comctl32/toolbar: Retrieve control data once at WinProc.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 9a0f600574fdc8a01625a5c7f65b0e0b08b1af8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0f600574fdc8a01625a5c7f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 19:27:15 2009 +0400 comctl32/toolbar: Retrieve control data once at WinProc. --- dlls/comctl32/toolbar.c | 975 ++++++++++++++++++++--------------------------- 1 files changed, 419 insertions(+), 556 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a0f600574fdc8a01625a…

1 0

Nikolay Sivov : comctl32/toolbar: Remove superfluous forward declarations.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: b97600699ab89a408a30b115eb37af5c5e4c8be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97600699ab89a408a30b115e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 19:31:15 2009 +0400 comctl32/toolbar: Remove superfluous forward declarations. --- dlls/comctl32/toolbar.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d47a611..f1c3fa7 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -246,15 +246,12 @@ static PIMLENTRY TOOLBAR_GetImageListEntry(const PIMLENTRY *pies, INT cies, INT static VOID TOOLBAR_DeleteImageList(PIMLENTRY **pies, INT *cies); static HIMAGELIST TOOLBAR_InsertImageList(PIMLENTRY **pies, INT *cies, HIMAGELIST himl, INT id); static LRESULT TOOLBAR_LButtonDown(TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam); -static void TOOLBAR_SetHotItemEx (TOOLBAR_INFO *infoPtr, INT nHit, DWORD dwReason); static void TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr); static LRESULT TOOLBAR_AutoSize(TOOLBAR_INFO *infoPtr); static void TOOLBAR_CheckImageListIconSize(TOOLBAR_INFO *infoPtr); static void TOOLBAR_TooltipAddTool(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *button); static void TOOLBAR_TooltipSetRect(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *button); -static LRESULT -TOOLBAR_NotifyFormat(const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam); static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) {

1 0

Nikolay Sivov : comctl32/toolbar: Use already cached control window style.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 97ecd468c49c8490a7a287428869a64f20a1f0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ecd468c49c8490a7a287428… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 19:36:26 2009 +0400 comctl32/toolbar: Use already cached control window style. --- dlls/comctl32/toolbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index f1c3fa7..097d628 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3612,7 +3612,7 @@ TOOLBAR_GetState (const TOOLBAR_INFO *infoPtr, WPARAM wParam) static LRESULT TOOLBAR_GetStyle (const TOOLBAR_INFO *infoPtr) { - return GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); + return infoPtr->dwStyle; } @@ -5491,7 +5491,7 @@ TOOLBAR_LButtonDblClk (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (nHit >= 0) TOOLBAR_LButtonDown (infoPtr, wParam, lParam); - else if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & CCS_ADJUSTABLE) + else if (infoPtr->dwStyle & CCS_ADJUSTABLE) TOOLBAR_Customize (infoPtr); return 0;

1 0