October 2006 - Wine-Commits

Stefan Dösinger : d3d8: Implement CopyRects with BltFast.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 1e6a38967cc09c146e28fce1689a3f48e7d74e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6a38967cc09c146e28fce16… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 13 12:14:59 2006 +0200 d3d8: Implement CopyRects with BltFast. --- dlls/d3d8/device.c | 59 +++++++++++++++- dlls/wined3d/device.c | 144 -------------------------------------- include/wine/wined3d_interface.h | 2 - 3 files changed, 55 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e6a38967cc09c146e28f…

1 0

Jacek Caban : shdocvw: Added IDocHostUIHandler2 test.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: a7395adee38ee6daad9a974617a791b7f4c44e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7395adee38ee6daad9a97461… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 15 21:52:28 2006 +0200 shdocvw: Added IDocHostUIHandler2 test. --- dlls/shdocvw/tests/webbrowser.c | 153 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 151 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 23c07d8..9523640 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "ole2.h" #include "exdisp.h" #include "htiframe.h" +#include "mshtmhst.h" #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -192,6 +193,8 @@ static const IOleClientSiteVtbl ClientSi ClientSite_RequestNewObjectLayout }; +static IOleClientSite ClientSite = { &ClientSiteVtbl }; + static HRESULT WINAPI InPlaceUIWindow_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) { @@ -344,8 +347,6 @@ static const IOleInPlaceFrameVtbl InPlac static IOleInPlaceFrame InPlaceFrame = { &InPlaceFrameVtbl }; -static IOleClientSite ClientSite = { &ClientSiteVtbl }; - static HRESULT WINAPI InPlaceSite_QueryInterface(IOleInPlaceSiteEx *iface, REFIID riid, void **ppv) { return QueryInterface(riid, ppv); @@ -510,6 +511,151 @@ static const IOleInPlaceSiteExVtbl InPla static IOleInPlaceSiteEx InPlaceSite = { &InPlaceSiteExVtbl }; +static HRESULT WINAPI DocHostUIHandler_QueryInterface(IDocHostUIHandler2 *iface, REFIID riid, void **ppv) +{ + return QueryInterface(riid, ppv); +} + +static ULONG WINAPI DocHostUIHandler_AddRef(IDocHostUIHandler2 *iface) +{ + return 2; +} + +static ULONG WINAPI DocHostUIHandler_Release(IDocHostUIHandler2 *iface) +{ + return 1; +} + +static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface, DWORD dwID, POINT *ppt, + IUnknown *pcmdtReserved, IDispatch *pdicpReserved) +{ + ok(0, "unexpected call %d %p %p %p\n", dwID, ppt, pcmdtReserved, pdicpReserved); + return S_FALSE; +} + +static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DOCHOSTUIINFO *pInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD dwID, + IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget, + IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_HideUI(IDocHostUIHandler2 *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_UpdateUI(IDocHostUIHandler2 *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_EnableModeless(IDocHostUIHandler2 *iface, BOOL fEnable) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_OnDocWindowActivate(IDocHostUIHandler2 *iface, BOOL fActivate) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_OnFrameWindowActivate(IDocHostUIHandler2 *iface, BOOL fActivate) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_ResizeBorder(IDocHostUIHandler2 *iface, LPCRECT prcBorder, + IOleInPlaceUIWindow *pUIWindow, BOOL fRameWindow) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_TranslateAccelerator(IDocHostUIHandler2 *iface, LPMSG lpMsg, + const GUID *pguidCmdGroup, DWORD nCmdID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *iface, + LPOLESTR *pchKey, DWORD dw) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_GetDropTarget(IDocHostUIHandler2 *iface, + IDropTarget *pDropTarget, IDropTarget **ppDropTarget) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface, IDispatch **ppDispatch) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, DWORD dwTranslate, + OLECHAR *pchURLIn, OLECHAR **ppchURLOut) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_FilterDataObject(IDocHostUIHandler2 *iface, IDataObject *pDO, + IDataObject **ppPORet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocHostUIHandler_GetOverrideKeyPath(IDocHostUIHandler2 *iface, + LPOLESTR *pchKey, DWORD dw) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IDocHostUIHandler2Vtbl DocHostUIHandlerVtbl = { + DocHostUIHandler_QueryInterface, + DocHostUIHandler_AddRef, + DocHostUIHandler_Release, + DocHostUIHandler_ShowContextMenu, + DocHostUIHandler_GetHostInfo, + DocHostUIHandler_ShowUI, + DocHostUIHandler_HideUI, + DocHostUIHandler_UpdateUI, + DocHostUIHandler_EnableModeless, + DocHostUIHandler_OnDocWindowActivate, + DocHostUIHandler_OnFrameWindowActivate, + DocHostUIHandler_ResizeBorder, + DocHostUIHandler_TranslateAccelerator, + DocHostUIHandler_GetOptionKeyPath, + DocHostUIHandler_GetDropTarget, + DocHostUIHandler_GetExternal, + DocHostUIHandler_TranslateUrl, + DocHostUIHandler_FilterDataObject, + DocHostUIHandler_GetOverrideKeyPath +}; + +static IDocHostUIHandler2 DocHostUIHandler = { &DocHostUIHandlerVtbl }; + static HRESULT QueryInterface(REFIID riid, void **ppv) { *ppv = NULL; @@ -521,6 +667,9 @@ static HRESULT QueryInterface(REFIID rii || IsEqualGUID(&IID_IOleInPlaceSite, riid) || IsEqualGUID(&IID_IOleInPlaceSiteEx, riid)) *ppv = &InPlaceSite; + else if(IsEqualGUID(&IID_IDocHostUIHandler, riid) + || IsEqualGUID(&IID_IDocHostUIHandler2, riid)) + *ppv = &DocHostUIHandler; if(*ppv) return S_OK;

1 0

Hans Leidekker : secur32: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 2638e9d467fe294c7af1c275e8e283d2bf25be2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2638e9d467fe294c7af1c275e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Oct 15 14:51:52 2006 +0200 secur32: Win64 printf format warning fixes. --- dlls/secur32/Makefile.in | 1 - dlls/secur32/negotiate.c | 24 ++++++++------- dlls/secur32/ntlm.c | 32 ++++++++++---------- dlls/secur32/schannel.c | 18 ++++++----- dlls/secur32/secur32.c | 12 ++++---- dlls/secur32/thunks.c | 68 +++++++++++++++++++++---------------------- dlls/secur32/thunks.h | 32 ++++++++++---------- dlls/secur32/wrapper.c | 73 +++++++++++++++++++++++----------------------- include/sspi.h | 66 ++++++++++++++++++++---------------------- 9 files changed, 161 insertions(+), 165 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2638e9d467fe294c7af1c…

1 0

Jacek Caban : mshtml: Don' t crash in remove_doc_tasks if thread_data is not allocated.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 377071f42c68a25bf695db64b9a5dfdbad34e754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=377071f42c68a25bf695db64b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 15 13:18:47 2006 +0200 mshtml: Don't crash in remove_doc_tasks if thread_data is not allocated. --- dlls/mshtml/task.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 87a6add..25b9501 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -71,6 +71,9 @@ void remove_doc_tasks(HTMLDocument *doc) thread_data_t *thread_data = get_thread_data(FALSE); task_t *iter, *tmp; + if(!thread_data) + return; + while(thread_data->task_queue_head && thread_data->task_queue_head->doc == doc) pop_task();

1 0

Michael Stefaniuc : ole32: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 21ff87bf502f28dd75cb9962f3e13e46c6c7b8e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ff87bf502f28dd75cb9962f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 15 12:28:08 2006 +0200 ole32: Win64 printf format warning fixes. --- dlls/ole32/Makefile.in | 2 + dlls/ole32/antimoniker.c | 4 +- dlls/ole32/bindctx.c | 8 ++--- dlls/ole32/classmoniker.c | 4 +- dlls/ole32/clipboard.c | 18 +++++----- dlls/ole32/compobj.c | 48 ++++++++++++++------------- dlls/ole32/compositemoniker.c | 24 +++++++------- dlls/ole32/datacache.c | 10 +++--- dlls/ole32/dcom.idl | 4 +- dlls/ole32/defaulthandler.c | 28 ++++++++-------- dlls/ole32/enumx.c | 4 +- dlls/ole32/errorinfo.c | 12 +++---- dlls/ole32/filemoniker.c | 4 +- dlls/ole32/ftmarshal.c | 10 +++--- dlls/ole32/git.c | 6 ++- dlls/ole32/hglobalstream.c | 12 +++---- dlls/ole32/ifs.c | 18 +++++----- dlls/ole32/itemmoniker.c | 4 +- dlls/ole32/marshal.c | 72 +++++++++++++++++++++-------------------- dlls/ole32/memlockbytes.c | 8 ++--- dlls/ole32/memlockbytes16.c | 6 ++- dlls/ole32/moniker.c | 20 ++++++----- dlls/ole32/ole16.c | 22 ++++++------- dlls/ole32/ole2.c | 32 +++++++++--------- dlls/ole32/ole2_16.c | 2 + dlls/ole32/ole2stubs.c | 4 +- dlls/ole32/oleobj.c | 22 ++++++------- dlls/ole32/oleproxy.c | 30 +++++++++-------- dlls/ole32/rpc.c | 28 ++++++++-------- dlls/ole32/stg_bigblockfile.c | 14 ++++---- dlls/ole32/stg_prop.c | 70 ++++++++++++++++++++-------------------- dlls/ole32/stg_stream.c | 18 +++++----- dlls/ole32/storage.c | 62 ++++++++++++++++++----------------- dlls/ole32/storage32.c | 58 +++++++++++++++++---------------- dlls/ole32/stubmanager.c | 14 ++++---- 35 files changed, 351 insertions(+), 351 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21ff87bf502f28dd75cb9…

1 0

Michael Stefaniuc : The Data1 member of the GUID struct needs to be an unsigned int too for Win64 compatibility .
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 15765dd95351b4aafccc7c89afb3b7cb8bc70cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=15765dd95351b4aafccc7c89a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 15 12:27:34 2006 +0200 The Data1 member of the GUID struct needs to be an unsigned int too for Win64 compatibility. --- dlls/crypt32/sip.c | 2 +- dlls/crypt32/tests/sip.c | 2 +- dlls/dsound/tests/propset.c | 8 ++++---- dlls/infosoft/infosoft_main.c | 2 +- dlls/mshtml/main.c | 2 +- dlls/ole32/tests/marshal.c | 2 +- dlls/oleaut32/tmarshal.c | 2 +- dlls/oleaut32/typelib.c | 2 +- dlls/oleaut32/typelib16.c | 2 +- dlls/shell32/classes.c | 2 +- dlls/shell32/debughlp.c | 4 ++-- dlls/shell32/shfldr.h | 2 +- dlls/shlwapi/ordinal.c | 2 +- dlls/urlmon/regsvr.c | 2 +- include/guiddef.h | 4 ++++ include/wine/debug.h | 4 ++++ tools/widl/header.c | 2 +- tools/winedump/lnk.c | 2 +- 18 files changed, 28 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15765dd95351b4aafccc7…

1 0

Michael Stefaniuc : janitorial: Remove redundant NULL checks before calling HeapFree wrappers.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 56b87f3a0fa1fe591a4f2ec4519ff08c765cd490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b87f3a0fa1fe591a4f2ec45… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 15 01:03:58 2006 +0200 janitorial: Remove redundant NULL checks before calling HeapFree wrappers. --- dlls/rpcrt4/rpc_message.c | 6 ++---- dlls/winedos/module.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index fb6187f..0120bf6 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -595,7 +595,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection status = RPC_S_OK; fail: - if (status != RPC_S_OK && *Header) { + if (status != RPC_S_OK) { RPCRT4_FreeHeader(*Header); *Header = NULL; } @@ -765,9 +765,7 @@ RPC_STATUS WINAPI I_RpcReceive(PRPC_MESS status = RPC_S_OK; fail: - if (hdr) { - RPCRT4_FreeHeader(hdr); - } + RPCRT4_FreeHeader(hdr); RPCRT4_CloseBinding(bind, conn); return status; } diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c index e00b77e..24d6a73 100644 --- a/dlls/winedos/module.c +++ b/dlls/winedos/module.c @@ -273,7 +273,7 @@ static BOOL MZ_DoLoadImage( HANDLE hFile env_seg = par_env_seg; else env_seg=MZ_InitEnvironment(oldenv, filename); - if( alloc && oldenv) + if (alloc) FreeEnvironmentStringsA( oldenv); /* allocate memory for the executable */

1 0

Mikołaj Zalewski : comctl32: toolbar: Test and improve TB_SETHOTITEM.
by Alexandre Julliard Oct. 14, 2006

Oct. 14, 2006

Module: wine Branch: master Commit: 76b162067f9e5f2a373ddfab4151c2d8cb337fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b162067f9e5f2a373ddfab4… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Oct 14 19:59:54 2006 +0200 comctl32: toolbar: Test and improve TB_SETHOTITEM. --- dlls/comctl32/tests/toolbar.c | 135 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 53 ++++++++-------- 2 files changed, 162 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index a007fa8..110e8cb 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -33,6 +33,8 @@ #include "resources.h" #include "wine/test.h" HWND hMainWnd; +BOOL g_fBlockHotItemChange; +BOOL g_fReceivedHotItemChange; static void MakeButton(TBBUTTON *p, int idCommand, int fsStyle, int nString) { p->iBitmap = -2; @@ -42,8 +44,27 @@ static void MakeButton(TBBUTTON *p, int p->iString = nString; } +LRESULT MyWnd_Notify(hWnd, wParam, lParam) +{ + NMHDR *hdr = (NMHDR *)lParam; + switch (hdr->code) + { + case TBN_HOTITEMCHANGE: + g_fReceivedHotItemChange = TRUE; + if (g_fBlockHotItemChange) + return 1; + break; + } + return 0; +} + static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + switch (msg) + { + case WM_NOTIFY: + return MyWnd_Notify(hWnd, wParam, lParam); + } return DefWindowProcA(hWnd, msg, wParam, lParam); } @@ -110,6 +131,32 @@ static void rebuild_toolbar(HWND *hToolb ok(SendMessage(*hToolbar, TB_AUTOSIZE, 0, 0) == 0, "TB_AUTOSIZE failed\n"); } +void rebuild_toolbar_with_buttons(HWND *hToolbar) +{ + TBBUTTON buttons[5]; + rebuild_toolbar(hToolbar); + + ZeroMemory(&buttons, sizeof(buttons)); + buttons[0].idCommand = 1; + buttons[0].fsStyle = BTNS_BUTTON; + buttons[0].fsState = TBSTATE_ENABLED; + buttons[1].idCommand = 3; + buttons[1].fsStyle = BTNS_BUTTON; + buttons[1].fsState = TBSTATE_ENABLED; + buttons[2].idCommand = 5; + buttons[2].fsStyle = BTNS_SEP; + buttons[2].fsState = TBSTATE_ENABLED; + buttons[3].idCommand = 7; + buttons[3].fsStyle = BTNS_BUTTON; + buttons[3].fsState = TBSTATE_ENABLED; + buttons[4].idCommand = 9; + buttons[4].fsStyle = BTNS_BUTTON; + buttons[4].fsState = 0; /* disabled */ + ok(SendMessage(*hToolbar, TB_ADDBUTTONS, 5, (LPARAM)buttons) == 1, "TB_ADDBUTTONS failed\n"); + ok(SendMessage(*hToolbar, TB_AUTOSIZE, 0, 0) == 0, "TB_AUTOSIZE failed\n"); +} + + #define CHECK_IMAGELIST(count, dx, dy) { \ int cx, cy; \ HIMAGELIST himl = (HIMAGELIST)SendMessageA(hToolbar, TB_GETIMAGELIST, 0, 0); \ @@ -375,6 +422,93 @@ void test_add_string() CHECK_STRING_TABLE(14, ret7); } +void test_hotitem() +{ + HWND hToolbar = NULL; + TBBUTTONINFO tbinfo; + LRESULT ret; + + g_fBlockHotItemChange = FALSE; + + rebuild_toolbar_with_buttons(&hToolbar); + /* set TBSTYLE_FLAT. comctl5 allows hot items only for such toolbars. + * comctl6 doesn't have this requirement even when theme == NULL */ + SetWindowLong(hToolbar, GWL_STYLE, TBSTYLE_FLAT | GetWindowLong(hToolbar, GWL_STYLE)); + ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); + ok(ret == -1, "Hot item: %ld, expected -1\n", ret); + ret = SendMessage(hToolbar, TB_SETHOTITEM, 1, 0); + ok(ret == -1, "TB_SETHOTITEM returned %ld, expected -1\n", ret); + ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); + ok(ret == 1, "Hot item: %ld, expected 1\n", ret); + ret = SendMessage(hToolbar, TB_SETHOTITEM, 2, 0); + ok(ret == 1, "TB_SETHOTITEM returned %ld, expected 1\n", ret); + + ret = SendMessage(hToolbar, TB_SETHOTITEM, 0xbeef, 0); + ok(ret == 2, "TB_SETHOTITEM returned %ld, expected 2\n", ret); + ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); + ok(ret == 2, "Hot item: %lx, expected 2\n", ret); + ret = SendMessage(hToolbar, TB_SETHOTITEM, -0xbeef, 0); + ok(ret == 2, "TB_SETHOTITEM returned %ld, expected 2\n", ret); + ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); + ok(ret == -1, "Hot item: %lx, expected -1\n", ret); + + g_fReceivedHotItemChange = FALSE; + ret = SendMessage(hToolbar, TB_SETHOTITEM, 3, 0); + ok(ret == -1, "TB_SETHOTITEM returned %ld, expected -1\n", ret); + ok(g_fReceivedHotItemChange, "TBN_HOTITEMCHANGE not received\n"); + ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); + ok(ret == 3, "Hot item: %lx, expected 3\n", ret); + g_fBlockHotItemChange = TRUE; + ret = SendMessage(hToolbar, TB_SETHOTITEM, 2, 0); + ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 2\n", ret); + ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); + ok(ret == 3, "Hot item: %lx, expected 3\n", ret); + g_fBlockHotItemChange = FALSE; + + g_fReceivedHotItemChange = FALSE; + ret = SendMessage(hToolbar, TB_SETHOTITEM, 0xbeaf, 0); + ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); + ok(g_fReceivedHotItemChange == FALSE, "TBN_HOTITEMCHANGE received for invalid parameter\n"); + + g_fReceivedHotItemChange = FALSE; + ret = SendMessage(hToolbar, TB_SETHOTITEM, 3, 0); + ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); + ok(g_fReceivedHotItemChange == FALSE, "TBN_HOTITEMCHANGE received after a duplication\n"); + + ret = SendMessage(hToolbar, TB_SETHOTITEM, -0xbeaf, 0); + ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); + ok(g_fReceivedHotItemChange, "TBN_HOTITEMCHANGE not received\n"); + SendMessage(hToolbar, TB_SETHOTITEM, 3, 0); + + /* setting disabled buttons as hot failed and generates no notify */ + g_fReceivedHotItemChange = FALSE; + ret = SendMessage(hToolbar, TB_SETHOTITEM, 4, 0); + ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); + ok(!g_fReceivedHotItemChange, "TBN_HOTITEMCHANGE received\n"); + ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); + ok(ret == 3, "Hot item: %lx, expected 3\n", ret); + + /* but disabling a hot button works */ + ret = SendMessage(hToolbar, TB_SETHOTITEM, 3, 0); + ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); + g_fReceivedHotItemChange = FALSE; + SendMessage(hToolbar, TB_ENABLEBUTTON, 7, FALSE); + ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); + ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret); + ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n"); + + SendMessage(hToolbar, TB_SETHOTITEM, 1, 0); + tbinfo.cbSize = sizeof(TBBUTTONINFO); + tbinfo.dwMask = TBIF_STATE; + tbinfo.fsState = 0; /* disabled */ + g_fReceivedHotItemChange = FALSE; + ok(SendMessage(hToolbar, TB_SETBUTTONINFO, 1, (LPARAM)&tbinfo) == TRUE, "TB_SETBUTTONINFO failed\n"); + ret = SendMessage(hToolbar, TB_GETHOTITEM, 0, 0); + ok(ret == 1, "TB_SETHOTITEM returned %ld, expected 1\n", ret); + ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n"); + +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -403,6 +537,7 @@ START_TEST(toolbar) basic_test(); test_add_bitmap(); test_add_string(); + test_hotitem(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index ac85b46..92ded23 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4780,42 +4780,41 @@ TOOLBAR_SetHotItemEx (TOOLBAR_INFO *info { NMTBHOTITEM nmhotitem; TBUTTON_INFO *btnPtr = NULL, *oldBtnPtr = NULL; - LRESULT no_highlight; - /* Remove the effect of an old hot button if the button was - drawn with the hot button effect */ if(infoPtr->nHotItem >= 0) { oldBtnPtr = &infoPtr->buttons[infoPtr->nHotItem]; - oldBtnPtr->bHot = FALSE; + nmhotitem.idOld = oldBtnPtr->idCommand; } + else + nmhotitem.dwFlags |= HICF_ENTERING; - infoPtr->nHotItem = nHit; - - /* It's not a separator or in nowhere. It's a hot button. */ if (nHit >= 0) + { btnPtr = &infoPtr->buttons[nHit]; - - nmhotitem.dwFlags = dwReason; - if (oldBtnPtr) - nmhotitem.idOld = oldBtnPtr->idCommand; - else - nmhotitem.dwFlags |= HICF_ENTERING; - if (btnPtr) - nmhotitem.idNew = btnPtr->idCommand; + nmhotitem.idNew = btnPtr->idCommand; + /* setting disabled buttons as hot fails */ + if (!(btnPtr->fsState & TBSTATE_ENABLED)) + return; + } else nmhotitem.dwFlags |= HICF_LEAVING; - no_highlight = TOOLBAR_SendNotify(&nmhotitem.hdr, infoPtr, TBN_HOTITEMCHANGE); + nmhotitem.dwFlags = dwReason; - /* now invalidate the old and new buttons so they will be painted, - * but only if they are enabled - disabled buttons cannot become hot */ - if (oldBtnPtr && (oldBtnPtr->fsState & TBSTATE_ENABLED)) - InvalidateRect(infoPtr->hwndSelf, &oldBtnPtr->rect, TRUE); - if (btnPtr && !no_highlight && (btnPtr->fsState & TBSTATE_ENABLED)) + /* now change the hot and invalidate the old and new buttons - if the + * parent agrees */ + if (!TOOLBAR_SendNotify(&nmhotitem.hdr, infoPtr, TBN_HOTITEMCHANGE)) { - btnPtr->bHot = TRUE; - InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); + infoPtr->nHotItem = nHit; + if (btnPtr) { + btnPtr->bHot = TRUE; + InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); + } + if (oldBtnPtr) { + oldBtnPtr->bHot = FALSE; + InvalidateRect(infoPtr->hwndSelf, &oldBtnPtr->rect, TRUE); + } } } } @@ -4828,14 +4827,16 @@ TOOLBAR_SetHotItem (HWND hwnd, WPARAM wP TRACE("hwnd = %p, nHit = %d\n", hwnd, (INT)wParam); - if ((INT) wParam < 0 || (INT)wParam > infoPtr->nNumButtons) + if ((INT)wParam > infoPtr->nNumButtons) + return infoPtr->nHotItem; + + if ((INT)wParam < 0) wParam = -1; /* NOTE: an application can still remove the hot item even if anchor * highlighting is enabled */ - if ((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) - TOOLBAR_SetHotItemEx(infoPtr, wParam, HICF_OTHER); + TOOLBAR_SetHotItemEx(infoPtr, wParam, HICF_OTHER); if (nOldHotItem < 0) return -1;

1 0

Mikołaj Zalewski : comctl32: toolbar: Use nHotItem not nOldHit for the hot item in MouseLeave.
by Alexandre Julliard Oct. 14, 2006

Oct. 14, 2006

Module: wine Branch: master Commit: 010f31f413dc63bbe01fc411296ee2902af179e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=010f31f413dc63bbe01fc4112… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Oct 14 19:54:25 2006 +0200 comctl32: toolbar: Use nHotItem not nOldHit for the hot item in MouseLeave. --- dlls/comctl32/toolbar.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 5758356..ac85b46 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5973,14 +5973,15 @@ static LRESULT TOOLBAR_MouseLeave (HWND hwnd, WPARAM wParam, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); - TBUTTON_INFO *hotBtnPtr; - - hotBtnPtr = &infoPtr->buttons[infoPtr->nOldHit]; /* don't remove hot effects when in anchor highlighting mode or when a * drop-down button is pressed */ - if (!infoPtr->bAnchor && (infoPtr->nOldHit < 0 || !hotBtnPtr->bDropDownPressed)) - TOOLBAR_SetHotItemEx(infoPtr, TOOLBAR_NOWHERE, HICF_MOUSE); + if (infoPtr->nHotItem >= 0 && !infoPtr->bAnchor) + { + TBUTTON_INFO *hotBtnPtr = &infoPtr->buttons[infoPtr->nHotItem]; + if (!hotBtnPtr->bDropDownPressed) + TOOLBAR_SetHotItemEx(infoPtr, TOOLBAR_NOWHERE, HICF_MOUSE); + } if (infoPtr->nOldHit < 0) return TRUE; @@ -5996,7 +5997,7 @@ TOOLBAR_MouseLeave (HWND hwnd, WPARAM wP btnPtr->fsState &= ~TBSTATE_PRESSED; - rc1 = hotBtnPtr->rect; + rc1 = btnPtr->rect; InflateRect (&rc1, 1, 1); InvalidateRect (hwnd, &rc1, TRUE); }

1 0

Mikołaj Zalewski : comctl32: toolbar: Don' t try to redraw buttons outside of the clipping rect.
by Alexandre Julliard Oct. 14, 2006

Oct. 14, 2006

Module: wine Branch: master Commit: d929cec6712bfb300fda78f42fda94044b1d05fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d929cec6712bfb300fda78f42… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Oct 14 19:53:39 2006 +0200 comctl32: toolbar: Don't try to redraw buttons outside of the clipping rect. --- dlls/comctl32/toolbar.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 5d82a1d..5758356 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1111,6 +1111,8 @@ TOOLBAR_Refresh (HWND hwnd, HDC hdc, PAI for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) { BOOL bDraw; + if (!RectVisible(hdc, &btnPtr->rect)) + continue; if (infoPtr->dwExStyle & TBSTYLE_EX_HIDECLIPPEDBUTTONS) { IntersectRect(&rcTemp, &rcClient, &btnPtr->rect);

1 0