February 2009 - Wine-commits

Jacek Caban : jscript: Add IActiveScriptParse64 declaration and use it on Win64.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: 0194b8f08c86033e5c7f962c2d1176cd06d21665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0194b8f08c86033e5c7f962c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 2 15:27:24 2009 +0100 jscript: Add IActiveScriptParse64 declaration and use it on Win64. --- dlls/jscript/jscript.c | 24 ++++++++++++++++----- dlls/jscript/tests/jscript.c | 12 +++++----- dlls/jscript/tests/run.c | 14 ++++++------ dlls/mshtml/script.c | 6 ++-- dlls/mshtml/tests/script.c | 16 ++++++++++++- dlls/msi/script.c | 4 +- include/activscp.idl | 46 +++++++++++++++++++++++++++++++++++++++++- 7 files changed, 95 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0194b8f08c86033e5c7f9…

1 0

Andrew Talbot : wnaspi32: Declare some functions static.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: acbba11c49548ca5e99f21e3a4d238e7f5a3d8ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbba11c49548ca5e99f21e3a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 2 15:29:54 2009 +0000 wnaspi32: Declare some functions static. --- dlls/wnaspi32/aspi.c | 2 +- dlls/wnaspi32/winaspi16.c | 2 +- dlls/wnaspi32/winescsi.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index a0658e7..e03b767 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -148,7 +148,7 @@ int ASPI_GetNumControllers(void) return num_ha; } -BOOL SCSI_GetDeviceName( int h, int c, int t, int d, LPSTR devstr, LPDWORD lpcbData ) +static BOOL SCSI_GetDeviceName( int h, int c, int t, int d, LPSTR devstr, LPDWORD lpcbData ) { char buffer[200]; HKEY hkeyScsi; diff --git a/dlls/wnaspi32/winaspi16.c b/dlls/wnaspi32/winaspi16.c index 17d6a6c..094b923 100644 --- a/dlls/wnaspi32/winaspi16.c +++ b/dlls/wnaspi32/winaspi16.c @@ -385,7 +385,7 @@ WORD WINAPI GetASPISupportInfo16(void) } -DWORD ASPI_SendASPICommand(DWORD ptrSRB, UINT16 mode) +static DWORD ASPI_SendASPICommand(DWORD ptrSRB, UINT16 mode) { #ifdef linux LPSRB16 lpSRB = PTR_TO_LIN( ptrSRB, mode ); diff --git a/dlls/wnaspi32/winescsi.h b/dlls/wnaspi32/winescsi.h index a820141..be1d5f6 100644 --- a/dlls/wnaspi32/winescsi.h +++ b/dlls/wnaspi32/winescsi.h @@ -79,9 +79,6 @@ void SCSI_Fix_CMD_LEN( int fd, int cmd, int len ); #endif -BOOL -SCSI_GetDeviceName(int h, int c, int t, int d, LPSTR devstr, LPDWORD lpcbData); - DWORD ASPI_GetHCforController( int controller );

1 0

Alexandre Julliard : ntoskrnl.exe: Correctly remove the vectored exception handler.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: 5dcdb4aba3090794639c8988842898de70308597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dcdb4aba3090794639c89888… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 2 16:21:25 2009 +0100 ntoskrnl.exe: Correctly remove the vectored exception handler. --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a62f02a..0dc9aaf 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1166,17 +1166,18 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { + static void *handler; LARGE_INTEGER count; switch(reason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( inst ); - RtlAddVectoredExceptionHandler( TRUE, vectored_handler ); + handler = RtlAddVectoredExceptionHandler( TRUE, vectored_handler ); KeQueryTickCount( &count ); /* initialize the global KeTickCount */ break; case DLL_PROCESS_DETACH: - RtlRemoveVectoredExceptionHandler( vectored_handler ); + RtlRemoveVectoredExceptionHandler( handler ); break; } return TRUE;

1 0

Alexandre Julliard : ntdll: Add a trace when calling vectored exception handlers too.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: c727fe4adcfb1b54df87bf01e5a0253860b84c19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c727fe4adcfb1b54df87bf01e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 2 16:22:06 2009 +0100 ntdll: Add a trace when calling vectored exception handlers too. --- dlls/ntdll/exception.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 91a269b..f7ae947 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -243,7 +243,10 @@ static LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) LIST_FOR_EACH( ptr, &vectored_handlers ) { VECTORED_HANDLER *handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); + TRACE( "calling handler at %p code=%x flags=%x\n", + handler->func, rec->ExceptionCode, rec->ExceptionFlags ); ret = handler->func( &except_ptrs ); + TRACE( "handler at %p returned %x\n", handler->func, ret ); if (ret == EXCEPTION_CONTINUE_EXECUTION) break; } RtlLeaveCriticalSection( &vectored_handlers_section );

1 0

Alistair Leslie-Hughes : mshtml: Add missing StyleSheet interfaces.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 183bb795b6c1cd1e24503a20b1a4a7b9ec12524b URL: http://source.winehq.org/git/wine.git/?a=commit;h=183bb795b6c1cd1e24503a20b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 2 21:18:46 2009 +1100 mshtml: Add missing StyleSheet interfaces. --- dlls/mshtml/htmlstylesheet.c | 8 +- include/mshtmdid.h | 14 ++++ include/mshtml.idl | 160 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index adbe740..5be78b8 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -32,21 +32,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLStyleSheet { const IHTMLStyleSheetVtbl *lpHTMLStyleSheetVtbl; LONG ref; nsIDOMCSSStyleSheet *nsstylesheet; -} HTMLStyleSheet; +}; -typedef struct { +struct HTMLStyleSheetsCollection { const IHTMLStyleSheetsCollectionVtbl *lpHTMLStyleSheetsCollectionVtbl; LONG ref; nsIDOMStyleSheetList *nslist; -} HTMLStyleSheetsCollection; +}; typedef struct { const IHTMLStyleSheetRulesCollectionVtbl *lpHTMLStyleSheetRulesCollectionVtbl; diff --git a/include/mshtmdid.h b/include/mshtmdid.h index c8c8b27..75a7290 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -74,8 +74,10 @@ #define DISPID_SCRIPT DISPID_NORMAL_FIRST #define DISPID_STYLESHEET DISPID_NORMAL_FIRST #define DISPID_STYLERULE DISPID_NORMAL_FIRST +#define DISPID_STYLEPAGE DISPID_NORMAL_FIRST #define DISPID_STYLESHEETS_COL DISPID_NORMAL_FIRST #define DISPID_STYLERULES_COL DISPID_NORMAL_FIRST +#define DISPID_STYLEPAGES_COL DISPID_NORMAL_FIRST #define DISPID_MIMETYPES_COL DISPID_NORMAL_FIRST #define DISPID_PLUGINS_COL DISPID_NORMAL_FIRST #define DISPID_2D DISPID_NORMAL_FIRST @@ -1798,10 +1800,22 @@ #define DISPID_IHTMLSTYLESHEET_RULES (DISPID_STYLESHEET+15) #define DISPID_IHTMLSTYLESHEET_DISABLED STDPROPID_XOBJ_DISABLED +/* IHTMLStyleSheet2 */ +#define DISPID_IHTMLSTYLESHEET2_PAGES (DISPID_STYLESHEET+16) +#define DISPID_IHTMLSTYLESHEET2_ADDPAGERULE (DISPID_STYLESHEET+17) + /* IHTMLStyleSheetRulesCollection */ #define DISPID_IHTMLSTYLESHEETRULESCOLLECTION_LENGTH (DISPID_STYLERULES_COL+1) #define DISPID_IHTMLSTYLESHEETRULESCOLLECTION_ITEM DISPID_VALUE +/* IHTMLStyleSheetPage */ +#define DISPID_IHTMLSTYLESHEETPAGE_SELECTOR (DISPID_STYLEPAGE+1) +#define DISPID_IHTMLSTYLESHEETPAGE_PSEUDOCLASS (DISPID_STYLEPAGE+2) + +/* IHTMLStyleSheetPagesCollection */ +#define DISPID_IHTMLSTYLESHEETPAGESCOLLECTION_LENGTH (DISPID_STYLEPAGES_COL+1) +#define DISPID_IHTMLSTYLESHEETPAGESCOLLECTION_ITEM DISPID_VALUE + /* IHTMLStyleSheetRule */ #define DISPID_IHTMLSTYLESHEETRULE_SELECTORTEXT (DISPID_STYLERULE+1) #define DISPID_IHTMLSTYLESHEETRULE_READONLY (DISPID_STYLERULE+2) diff --git a/include/mshtml.idl b/include/mshtml.idl index 1e17857..dd71879 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -5393,6 +5393,38 @@ interface IHTMLStyleSheetRulesCollection : IDispatch [retval, out] IHTMLStyleSheetRule **ppHTMLStyleSheetRule); } +[ + odl, + oleautomation, + dual, + uuid(3050f7ee-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLStyleSheetPage : IDispatch +{ + [propget, id(DISPID_IHTMLSTYLESHEETPAGE_SELECTOR)] + HRESULT selector([retval, out] BSTR *p); + + [propget, id(DISPID_IHTMLSTYLESHEETPAGE_PSEUDOCLASS)] + HRESULT pseudoClass([retval, out] BSTR *p); +} + +[ + odl, + oleautomation, + dual, + uuid(3050f7f0-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLStyleSheetPagesCollection : IDispatch +{ + [propget, id(DISPID_IHTMLSTYLESHEETPAGESCOLLECTION_LENGTH)] + HRESULT length([retval, out] long *p); + + [id(DISPID_IHTMLSTYLESHEETPAGESCOLLECTION_ITEM)] + HRESULT item( + [in] long index, + [retval, out] IHTMLStyleSheetPage **ppHTMLStyleSheetPage); +} + /***************************************************************************** * IHTMLStyleSheet interface */ @@ -5476,6 +5508,125 @@ interface IHTMLStyleSheet : IDispatch } /***************************************************************************** + * IHTMLStyleSheet2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f3d1-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLStyleSheet2 : IDispatch +{ + [propget, id(DISPID_IHTMLSTYLESHEET2_PAGES)] + HRESULT pages([retval, out] IHTMLStyleSheetPagesCollection **p); + + [id(DISPID_IHTMLSTYLESHEET2_ADDPAGERULE)] + HRESULT addPageRule( + [in] BSTR bstrSelector, + [in] BSTR bstrStyle, + [defaultvalue(-1), in] long lIndex, + [retval, out] long *plNewIndex); +} + +[ + hidden, + uuid(3050f58d-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLStyleSheet +{ +properties: +methods: + [propput, id(DISPID_IHTMLSTYLESHEET_TITLE)] + void title(BSTR v); + + [propget, id(DISPID_IHTMLSTYLESHEET_TITLE)] + BSTR title(); + + [propget, id(DISPID_IHTMLSTYLESHEET_PARENTSTYLESHEET)] + IHTMLStyleSheet* parentStyleSheet(); + + [propget, id(DISPID_IHTMLSTYLESHEET_OWNINGELEMENT)] + IHTMLElement* owningElement(); + + [propput, id(DISPID_IHTMLSTYLESHEET_DISABLED)] + void disabled(VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLSTYLESHEET_DISABLED)] + VARIANT_BOOL disabled(); + + [propget, id(DISPID_IHTMLSTYLESHEET_READONLY)] + VARIANT_BOOL readOnly(); + + [propget, id(DISPID_IHTMLSTYLESHEET_IMPORTS)] + IHTMLStyleSheetsCollection* imports(); + + [propput, id(DISPID_IHTMLSTYLESHEET_HREF)] + void href(BSTR v); + + [propget, id(DISPID_IHTMLSTYLESHEET_HREF)] + BSTR href(); + + [propget, id(DISPID_IHTMLSTYLESHEET_TYPE)] + BSTR type(); + + [propget, id(DISPID_IHTMLSTYLESHEET_ID)] + BSTR id(); + + [id(DISPID_IHTMLSTYLESHEET_ADDIMPORT)] + long addImport( + [in] BSTR bstrURL, + [defaultvalue(-1), in] long lIndex); + + [id(DISPID_IHTMLSTYLESHEET_ADDRULE)] + long addRule( + [in] BSTR bstrSelector, + [in] BSTR bstrStyle, + [defaultvalue(-1), in] long lIndex); + + [id(DISPID_IHTMLSTYLESHEET_REMOVEIMPORT)] + void removeImport([in] long lIndex); + + [id(DISPID_IHTMLSTYLESHEET_REMOVERULE)] + void removeRule([in] long lIndex); + + [propput, id(DISPID_IHTMLSTYLESHEET_MEDIA)] + void media(BSTR v); + + [propget, id(DISPID_IHTMLSTYLESHEET_MEDIA)] + BSTR media(); + + [propput, id(DISPID_IHTMLSTYLESHEET_CSSTEXT)] + void cssText(BSTR v); + + [propget, id(DISPID_IHTMLSTYLESHEET_CSSTEXT)] + BSTR cssText(); + + [propget, id(DISPID_IHTMLSTYLESHEET_RULES)] + IHTMLStyleSheetRulesCollection* rules(); + + [propget, id(DISPID_IHTMLSTYLESHEET2_PAGES)] + IHTMLStyleSheetPagesCollection* pages(); + + [id(DISPID_IHTMLSTYLESHEET2_ADDPAGERULE)] + long addPageRule( + [in] BSTR bstrSelector, + [in] BSTR bstrStyle, + [defaultvalue(-1), in] long lIndex); +} + +[ + noncreatable, + uuid(3050f2e4-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLStyleSheet +{ + [default] dispinterface DispHTMLStyleSheet; + interface IHTMLStyleSheet; + interface IHTMLStyleSheet2; +} + +/***************************************************************************** * IHTMLStyleSheetsCollection interface */ [ @@ -5646,6 +5797,15 @@ interface IHTMLTxtRange : IDispatch [retval, out] VARIANT_BOOL *pfRet); } +[ + noncreatable, + uuid(3050f37f-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLStyleSheetsCollection +{ + [default] interface IHTMLStyleSheetsCollection; +} + /***************************************************************************** * IHTMLFormElement interface */

1 0

Mikołaj Zalewski : comctl32: toolbar: Use different function for dumping of TBUTTON_INFO and TBBUTTON.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: ada088e62d2dcdc6eee82095c47df3016cf103c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada088e62d2dcdc6eee82095c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Feb 1 13:02:26 2009 +0100 comctl32: toolbar: Use different function for dumping of TBUTTON_INFO and TBBUTTON. --- dlls/comctl32/toolbar.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b2dcfb1..730919c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -277,18 +277,24 @@ TOOLBAR_GetText(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *btnPtr) } static void -TOOLBAR_DumpButton(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *bP, INT btn_num, BOOL internal) +TOOLBAR_DumpTBButton(const TBBUTTON *tbb, BOOL fUnicode) +{ + TRACE("TBBUTTON: id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, stringid=0x%08lx (%s)\n", + tbb->idCommand,tbb->iBitmap, tbb->fsState, tbb->fsStyle, tbb->dwData, tbb->iString, + (fUnicode ? wine_dbgstr_w((LPWSTR)tbb->iString) : wine_dbgstr_a((LPSTR)tbb->iString))); +} + +static void +TOOLBAR_DumpButton(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *bP, INT btn_num) { if (TRACE_ON(toolbar)){ TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, stringid=0x%08lx\n", btn_num, bP->idCommand, GETIBITMAP(infoPtr, bP->iBitmap), bP->fsState, bP->fsStyle, bP->dwData, bP->iString); TRACE("string %s\n", debugstr_w(TOOLBAR_GetText(infoPtr,bP))); - if (internal) - TRACE("button %d id %d, hot=%s, row=%d, rect=(%s)\n", - btn_num, bP->idCommand, - (bP->bHot) ? "TRUE":"FALSE", bP->nRow, - wine_dbgstr_rect(&bP->rect)); + TRACE("button %d id %d, hot=%s, row=%d, rect=(%s)\n", + btn_num, bP->idCommand, (bP->bHot) ? "TRUE":"FALSE", bP->nRow, + wine_dbgstr_rect(&bP->rect)); } } @@ -308,7 +314,7 @@ TOOLBAR_DumpToolbar(const TOOLBAR_INFO *iP, INT line) iP->himlInt, iP->himlDef, iP->himlHot, iP->himlDis, (iP->bDoRedraw) ? "TRUE" : "FALSE"); for(i=0; i<iP->nNumButtons; i++) { - TOOLBAR_DumpButton(iP, &iP->buttons[i], i, TRUE); + TOOLBAR_DumpButton(iP, &iP->buttons[i], i); } } } @@ -1836,6 +1842,9 @@ TOOLBAR_InternalInsertButtonsT(TOOLBAR_INFO *infoPtr, INT iIndex, UINT nAddButto /* insert new buttons data */ for (iButton = 0; iButton < nAddButtons; iButton++) { TBUTTON_INFO *btnPtr = &infoPtr->buttons[iIndex + iButton]; + + TOOLBAR_DumpTBButton(lpTbb, fUnicode); + ZeroMemory(btnPtr, sizeof(*btnPtr)); btnPtr->iBitmap = lpTbb[iButton].iBitmap; btnPtr->idCommand = lpTbb[iButton].idCommand; @@ -3776,8 +3785,6 @@ TOOLBAR_InsertButtonT(HWND hwnd, WPARAM wParam, LPARAM lParam, BOOL fUnicode) if (lpTbb == NULL) return FALSE; - TOOLBAR_DumpButton(infoPtr, (TBUTTON_INFO *)lpTbb, nIndex, FALSE); - if (nIndex == -1) { /* EPP: this seems to be an undocumented call (from my IE4) * I assume in that case that:

1 0

Mikołaj Zalewski : comctl32: toolbar: TB_SETBUTTONINFO should do a relayout instead of a recalc.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 5de172af78adbe3663ff014706431d7eeff64bdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5de172af78adbe3663ff01470… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Feb 1 13:05:03 2009 +0100 comctl32: toolbar: TB_SETBUTTONINFO should do a relayout instead of a recalc. --- dlls/comctl32/tests/toolbar.c | 10 ++++++++++ dlls/comctl32/toolbar.c | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 6aefd41..514eece 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1028,6 +1028,8 @@ static BOOL did_recalc(HWND hToolbar) static void test_recalc(void) { HWND hToolbar; + TBBUTTONINFO bi; + CHAR test[] = "Test"; /* Like TB_ADDBUTTONS tested in test_sized, inserting a button without text * results in a relayout, while adding one with text forces a recalc */ @@ -1039,6 +1041,14 @@ static void test_recalc(void) SendMessage(hToolbar, TB_INSERTBUTTON, 1, (LPARAM)&buttons3[3]); ok(did_recalc(hToolbar), "Expected a recalc - adding button with text\n"); + /* TB_SETBUTTONINFO, even when adding a text, results only in a relayout */ + prepare_recalc_test(&hToolbar); + bi.cbSize = sizeof(bi); + bi.dwMask = TBIF_TEXT; + bi.pszText = test; + SendMessage(hToolbar, TB_SETBUTTONINFO, 1, (LPARAM)&bi); + ok(!did_recalc(hToolbar), "Unexpected recalc - setting a button text\n"); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 730919c..d810e18 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4447,7 +4447,7 @@ TOOLBAR_SetButtonInfoA (HWND hwnd, WPARAM wParam, LPARAM lParam) /* save the button rect to see if we need to redraw the whole toolbar */ oldBtnRect = btnPtr->rect; - TOOLBAR_CalcToolbar(hwnd); + TOOLBAR_LayoutToolbar(hwnd); if (!EqualRect(&oldBtnRect, &btnPtr->rect)) InvalidateRect(hwnd, NULL, TRUE); @@ -4500,7 +4500,7 @@ TOOLBAR_SetButtonInfoW (HWND hwnd, WPARAM wParam, LPARAM lParam) /* save the button rect to see if we need to redraw the whole toolbar */ oldBtnRect = btnPtr->rect; - TOOLBAR_CalcToolbar(hwnd); + TOOLBAR_LayoutToolbar(hwnd); if (!EqualRect(&oldBtnRect, &btnPtr->rect)) InvalidateRect(hwnd, NULL, TRUE);

1 0

Mikołaj Zalewski : comctl32: toolbar: Unlike in listview, TB_SETEXTENDEDSTYLE takes the actual style, not a mask .
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 574c0dcc322804d92d683ad097ac9f36d13056b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574c0dcc322804d92d683ad09… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Feb 1 13:07:08 2009 +0100 comctl32: toolbar: Unlike in listview, TB_SETEXTENDEDSTYLE takes the actual style, not a mask. --- dlls/comctl32/tests/toolbar.c | 12 ++++++++++++ dlls/comctl32/toolbar.c | 9 ++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 514eece..1eac700 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1030,6 +1030,7 @@ static void test_recalc(void) HWND hToolbar; TBBUTTONINFO bi; CHAR test[] = "Test"; + int i; /* Like TB_ADDBUTTONS tested in test_sized, inserting a button without text * results in a relayout, while adding one with text forces a recalc */ @@ -1049,6 +1050,17 @@ static void test_recalc(void) SendMessage(hToolbar, TB_SETBUTTONINFO, 1, (LPARAM)&bi); ok(!did_recalc(hToolbar), "Unexpected recalc - setting a button text\n"); + for (i = 0; i < 32; i++) + { + if (i == 1 || i == 3) /* an undoc style and TBSTYLE_EX_MIXEDBUTTONS */ + continue; + prepare_recalc_test(&hToolbar); + expect(0, (int)SendMessage(hToolbar, TB_GETEXTENDEDSTYLE, 0, 0)); + SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, (1 << i)); + SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, 0); + expect(0, (int)SendMessage(hToolbar, TB_GETEXTENDEDSTYLE, 0, 0)); + } + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d810e18..b83f944 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4648,11 +4648,10 @@ static LRESULT TOOLBAR_SetExtendedStyle (HWND hwnd, WPARAM wParam, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); - DWORD dwTemp; + DWORD dwOldStyle; - dwTemp = infoPtr->dwExStyle; - infoPtr->dwExStyle &= ~wParam; - infoPtr->dwExStyle |= (DWORD)lParam; + dwOldStyle = infoPtr->dwExStyle; + infoPtr->dwExStyle = (DWORD)lParam; TRACE("new style 0x%08x\n", infoPtr->dwExStyle); @@ -4666,7 +4665,7 @@ TOOLBAR_SetExtendedStyle (HWND hwnd, WPARAM wParam, LPARAM lParam) InvalidateRect(hwnd, NULL, TRUE); - return (LRESULT)dwTemp; + return (LRESULT)dwOldStyle; }

1 0

Mikołaj Zalewski : comctl32: toolbar: Only changing TBSTYLE_EX_MIXEDBUTTONS should cause a recalc.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: aa7a0b85b03e84c620daa021e3d6414ad3c2cfb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7a0b85b03e84c620daa021e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Feb 1 13:17:21 2009 +0100 comctl32: toolbar: Only changing TBSTYLE_EX_MIXEDBUTTONS should cause a recalc. --- dlls/comctl32/tests/toolbar.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/comctl32/toolbar.c | 6 ++++-- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 1eac700..1c155f5 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1025,11 +1025,30 @@ static BOOL did_recalc(HWND hToolbar) return (rect.top == 0); } +/* call after a recalc did happen to return to an unstable state */ +static void restore_recalc_state(HWND hToolbar) +{ + RECT rect; + /* return to style with a 2px top margin */ + SetWindowLong(hToolbar, GWL_STYLE, + GetWindowLong(hToolbar, GWL_STYLE) & ~TBSTYLE_FLAT); + /* recalc */ + SendMessage(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]); + /* top margin will be 0px if a recalc occures */ + SetWindowLong(hToolbar, GWL_STYLE, + GetWindowLong(hToolbar, GWL_STYLE) | TBSTYLE_FLAT); + /* safety check */ + SendMessage(hToolbar, TB_GETITEMRECT, 1, (LPARAM)&rect); + ok(rect.top == 2, "Test will make no sense because initial top is %d instead of 2\n", + rect.top); +} + static void test_recalc(void) { HWND hToolbar; TBBUTTONINFO bi; CHAR test[] = "Test"; + const int EX_STYLES_COUNT = 5; int i; /* Like TB_ADDBUTTONS tested in test_sized, inserting a button without text @@ -1050,17 +1069,35 @@ static void test_recalc(void) SendMessage(hToolbar, TB_SETBUTTONINFO, 1, (LPARAM)&bi); ok(!did_recalc(hToolbar), "Unexpected recalc - setting a button text\n"); - for (i = 0; i < 32; i++) + /* most extended styled doesn't force a recalc (testing all the bits gives + * the same results, but prints some ERRs while testing) */ + for (i = 0; i < EX_STYLES_COUNT; i++) { if (i == 1 || i == 3) /* an undoc style and TBSTYLE_EX_MIXEDBUTTONS */ continue; prepare_recalc_test(&hToolbar); expect(0, (int)SendMessage(hToolbar, TB_GETEXTENDEDSTYLE, 0, 0)); SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, (1 << i)); + ok(!did_recalc(hToolbar), "Unexpected recalc - setting bit %d\n", i); SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, 0); + ok(!did_recalc(hToolbar), "Unexpected recalc - clearing bit %d\n", i); expect(0, (int)SendMessage(hToolbar, TB_GETEXTENDEDSTYLE, 0, 0)); } + /* TBSTYLE_EX_MIXEDBUTTONS does a recalc on change */ + prepare_recalc_test(&hToolbar); + SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + ok(did_recalc(hToolbar), "Expected a recalc - setting TBSTYLE_EX_MIXEDBUTTONS\n"); + restore_recalc_state(hToolbar); + SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + ok(!did_recalc(hToolbar), "Unexpected recalc - setting TBSTYLE_EX_MIXEDBUTTONS again\n"); + restore_recalc_state(hToolbar); + SendMessage(hToolbar, TB_SETEXTENDEDSTYLE, 0, 0); + ok(did_recalc(hToolbar), "Expected a recalc - clearing TBSTYLE_EX_MIXEDBUTTONS\n"); + + /* undocumented exstyle 0x2 seems to changes the top margin, what + * interferes with these tests */ + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b83f944..3fbbdec 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4659,10 +4659,12 @@ TOOLBAR_SetExtendedStyle (HWND hwnd, WPARAM wParam, LPARAM lParam) FIXME("Unknown Toolbar Extended Style 0x%08x. Please report.\n", (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL)); - TOOLBAR_CalcToolbar (hwnd); + if ((dwOldStyle ^ infoPtr->dwExStyle) & TBSTYLE_EX_MIXEDBUTTONS) + TOOLBAR_CalcToolbar(hwnd); + else + TOOLBAR_LayoutToolbar(hwnd); TOOLBAR_AutoSize(hwnd); - InvalidateRect(hwnd, NULL, TRUE); return (LRESULT)dwOldStyle;

1 0

Mikołaj Zalewski : comctl32: toolbar: Move common TB_ADDBUTTONS and TB_INSERTBUTTONS code into a helper function , makes TB_INSERTBUTTON with a text perform a recalc (with testcase).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: ca9f7d314046aafc22aeccda9e3135e434c06af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9f7d314046aafc22aeccda9… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Feb 1 12:52:58 2009 +0100 comctl32: toolbar: Move common TB_ADDBUTTONS and TB_INSERTBUTTONS code into a helper function, makes TB_INSERTBUTTON with a text perform a recalc (with testcase). --- dlls/comctl32/tests/toolbar.c | 44 ++++++++++++++ dlls/comctl32/toolbar.c | 133 +++++++++++++++++----------------------- 2 files changed, 101 insertions(+), 76 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index ee86c1c..6aefd41 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -999,6 +999,49 @@ static void test_sizes(void) DestroyWindow(hToolbar); } +/* Toolbar control has two ways of reacting to a change. We call them a + * relayout and recalc. A recalc forces a recompute of values like button size + * and top margin (the latter in comctl32 <v6), while a relayout uses the cached + * values. This functions creates a flat toolbar with a top margin of a non-flat + * toolbar. We will notice a recalc, as it will recompte the top margin and + * change it to zero*/ +static void prepare_recalc_test(HWND *phToolbar) +{ + RECT rect; + rebuild_toolbar_with_buttons(phToolbar); + SetWindowLong(*phToolbar, GWL_STYLE, + GetWindowLong(*phToolbar, GWL_STYLE) | TBSTYLE_FLAT); + SendMessage(*phToolbar, TB_GETITEMRECT, 1, (LPARAM)&rect); + ok(rect.top == 2, "Test will make no sense because initial top is %d instead of 2\n", + rect.top); +} + +static BOOL did_recalc(HWND hToolbar) +{ + RECT rect; + SendMessage(hToolbar, TB_GETITEMRECT, 1, (LPARAM)&rect); + ok(rect.top == 2 || rect.top == 0, "Unexpected top margin %d in recalc test\n", + rect.top); + return (rect.top == 0); +} + +static void test_recalc(void) +{ + HWND hToolbar; + + /* Like TB_ADDBUTTONS tested in test_sized, inserting a button without text + * results in a relayout, while adding one with text forces a recalc */ + prepare_recalc_test(&hToolbar); + SendMessage(hToolbar, TB_INSERTBUTTON, 1, (LPARAM)&buttons3[0]); + ok(!did_recalc(hToolbar), "Unexpected recalc - adding button without text\n"); + + prepare_recalc_test(&hToolbar); + SendMessage(hToolbar, TB_INSERTBUTTON, 1, (LPARAM)&buttons3[3]); + ok(did_recalc(hToolbar), "Expected a recalc - adding button with text\n"); + + DestroyWindow(hToolbar); +} + static void test_getbuttoninfo(void) { HWND hToolbar = NULL; @@ -1224,6 +1267,7 @@ START_TEST(toolbar) test_add_string(); test_hotitem(); test_sizes(); + test_recalc(); test_getbuttoninfo(); test_createtoolbarex(); test_dispinfo(); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index df5b19d..b2dcfb1 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -251,6 +251,7 @@ static void TOOLBAR_SetHotItemEx (TOOLBAR_INFO *infoPtr, INT nHit, DWORD dwReaso static void TOOLBAR_LayoutToolbar(HWND hwnd); static LRESULT TOOLBAR_AutoSize(HWND hwnd); 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 @@ -1814,6 +1815,59 @@ TOOLBAR_InternalHitTest (HWND hwnd, const POINT *lpPt) } +/* worker for TB_ADDBUTTONS and TB_INSERTBUTTON */ +static BOOL +TOOLBAR_InternalInsertButtonsT(TOOLBAR_INFO *infoPtr, INT iIndex, UINT nAddButtons, TBBUTTON *lpTbb, BOOL fUnicode) +{ + INT nOldButtons, nNewButtons, iButton; + BOOL fHasString = FALSE; + + if (iIndex < 0) /* iIndex can be negative, what means adding at the end */ + iIndex = infoPtr->nNumButtons; + + nOldButtons = infoPtr->nNumButtons; + nNewButtons = nOldButtons + nAddButtons; + + infoPtr->buttons = ReAlloc(infoPtr->buttons, sizeof(TBUTTON_INFO)*nNewButtons); + memmove(&infoPtr->buttons[iIndex + nAddButtons], &infoPtr->buttons[iIndex], + (nOldButtons - iIndex) * sizeof(TBUTTON_INFO)); + infoPtr->nNumButtons += nAddButtons; + + /* insert new buttons data */ + for (iButton = 0; iButton < nAddButtons; iButton++) { + TBUTTON_INFO *btnPtr = &infoPtr->buttons[iIndex + iButton]; + ZeroMemory(btnPtr, sizeof(*btnPtr)); + btnPtr->iBitmap = lpTbb[iButton].iBitmap; + btnPtr->idCommand = lpTbb[iButton].idCommand; + btnPtr->fsState = lpTbb[iButton].fsState; + btnPtr->fsStyle = lpTbb[iButton].fsStyle; + btnPtr->dwData = lpTbb[iButton].dwData; + if(HIWORD(lpTbb[iButton].iString) && lpTbb[iButton].iString != -1) + { + if (fUnicode) + Str_SetPtrW((LPWSTR*)&btnPtr->iString, (LPWSTR)lpTbb[iButton].iString ); + else + Str_SetPtrAtoW((LPWSTR*)&btnPtr->iString, (LPSTR)lpTbb[iButton].iString); + fHasString = TRUE; + } + else + btnPtr->iString = lpTbb[iButton].iString; + + TOOLBAR_TooltipAddTool(infoPtr, btnPtr); + } + + if (infoPtr->nNumStrings > 0 || fHasString) + TOOLBAR_CalcToolbar(infoPtr->hwndSelf); + else + TOOLBAR_LayoutToolbar(infoPtr->hwndSelf); + TOOLBAR_AutoSize(infoPtr->hwndSelf); + + TOOLBAR_DumpToolbar(infoPtr, __LINE__); + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + return TRUE; +} + + static INT TOOLBAR_GetButtonIndex (const TOOLBAR_INFO *infoPtr, INT idCommand, BOOL CommandIsIndex) { @@ -2839,52 +2893,11 @@ TOOLBAR_AddButtonsT(HWND hwnd, WPARAM wParam, LPARAM lParam, BOOL fUnicode) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); LPTBBUTTON lpTbb = (LPTBBUTTON)lParam; - INT nOldButtons, nNewButtons, nAddButtons, nCount; - BOOL fHasString = FALSE; + INT nAddButtons = (UINT)wParam; TRACE("adding %ld buttons (unicode=%d)!\n", wParam, fUnicode); - nAddButtons = (UINT)wParam; - nOldButtons = infoPtr->nNumButtons; - nNewButtons = nOldButtons + nAddButtons; - - infoPtr->buttons = ReAlloc(infoPtr->buttons, sizeof(TBUTTON_INFO)*nNewButtons); - infoPtr->nNumButtons = nNewButtons; - - /* insert new button data */ - for (nCount = 0; nCount < nAddButtons; nCount++) { - TBUTTON_INFO *btnPtr = &infoPtr->buttons[nOldButtons+nCount]; - btnPtr->iBitmap = lpTbb[nCount].iBitmap; - btnPtr->idCommand = lpTbb[nCount].idCommand; - btnPtr->fsState = lpTbb[nCount].fsState; - btnPtr->fsStyle = lpTbb[nCount].fsStyle; - btnPtr->dwData = lpTbb[nCount].dwData; - btnPtr->bHot = FALSE; - if(HIWORD(lpTbb[nCount].iString) && lpTbb[nCount].iString != -1) - { - if (fUnicode) - Str_SetPtrW ((LPWSTR*)&btnPtr->iString, (LPWSTR)lpTbb[nCount].iString ); - else - Str_SetPtrAtoW((LPWSTR*)&btnPtr->iString, (LPSTR)lpTbb[nCount].iString); - fHasString = TRUE; - } - else - btnPtr->iString = lpTbb[nCount].iString; - - TOOLBAR_TooltipAddTool(infoPtr, btnPtr); - } - - if (infoPtr->nNumStrings > 0 || fHasString) - TOOLBAR_CalcToolbar(hwnd); - else - TOOLBAR_LayoutToolbar(hwnd); - TOOLBAR_AutoSize (hwnd); - - TOOLBAR_DumpToolbar (infoPtr, __LINE__); - - InvalidateRect(hwnd, NULL, TRUE); - - return TRUE; + return TOOLBAR_InternalInsertButtonsT(infoPtr, -1, nAddButtons, lpTbb, fUnicode); } @@ -3783,39 +3796,7 @@ TOOLBAR_InsertButtonT(HWND hwnd, WPARAM wParam, LPARAM lParam, BOOL fUnicode) TRACE("adjust index=%d\n", nIndex); } - infoPtr->nNumButtons++; - infoPtr->buttons = ReAlloc(infoPtr->buttons, sizeof(TBUTTON_INFO) * infoPtr->nNumButtons); - memmove(&infoPtr->buttons[nIndex+1], &infoPtr->buttons[nIndex], - (infoPtr->nNumButtons - nIndex - 1) * sizeof(TBUTTON_INFO)); - - /* insert new button */ - ZeroMemory(&infoPtr->buttons[nIndex], sizeof(infoPtr->buttons[nIndex])); - infoPtr->buttons[nIndex].iBitmap = lpTbb->iBitmap; - infoPtr->buttons[nIndex].idCommand = lpTbb->idCommand; - infoPtr->buttons[nIndex].fsState = lpTbb->fsState; - infoPtr->buttons[nIndex].fsStyle = lpTbb->fsStyle; - infoPtr->buttons[nIndex].dwData = lpTbb->dwData; - /* if passed string and not index, then add string */ - if(HIWORD(lpTbb->iString) && lpTbb->iString!=-1) { - if (fUnicode) - Str_SetPtrW((LPWSTR *)&infoPtr->buttons[nIndex].iString, (LPWSTR)lpTbb->iString); - else - Str_SetPtrAtoW((LPWSTR *)&infoPtr->buttons[nIndex].iString, (LPCSTR )lpTbb->iString); - } - else - infoPtr->buttons[nIndex].iString = lpTbb->iString; - - TOOLBAR_TooltipAddTool(infoPtr, &infoPtr->buttons[nIndex]); - - if (infoPtr->nNumStrings > 0) - TOOLBAR_CalcToolbar(hwnd); - else - TOOLBAR_LayoutToolbar(hwnd); - TOOLBAR_AutoSize (hwnd); - - InvalidateRect (hwnd, NULL, TRUE); - - return TRUE; + return TOOLBAR_InternalInsertButtonsT(infoPtr, nIndex, 1, lpTbb, fUnicode); } /* << TOOLBAR_InsertMarkHitTest >> */

1 0