July 2015 - Wine-commits - list.winehq.org

Michael Stefaniuc : dmime: Remove the extraneous IUnknown from DMTimeSigTrack.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: ad81735d05561a0790ccfe7bfdeebb4d8dbe89d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad81735d05561a0790ccfe7bf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:52:54 2015 +0200 dmime: Remove the extraneous IUnknown from DMTimeSigTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmime/timesigtrack.c | 121 +++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 72 deletions(-) diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 44adb30..b56f4de 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -25,67 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); * IDirectMusicTimeSigTrack implementation */ typedef struct IDirectMusicTimeSigTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack IDirectMusicTrack_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicTimeSigTrack; -/* IDirectMusicTimeSigTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicTimeSigTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack)) { - *ppobj = &This->IDirectMusicTrack_iface; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IUnknown_AddRef (iface); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicTimeSigTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMIME_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicTimeSigTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMIME_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicTimeSigTrack_Unknown_Vtbl = { - IDirectMusicTimeSigTrack_IUnknown_QueryInterface, - IDirectMusicTimeSigTrack_IUnknown_AddRef, - IDirectMusicTimeSigTrack_IUnknown_Release -}; - /* IDirectMusicTimeSigTrack IDirectMusicTrack8 part: */ static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusicTrack *iface) { @@ -93,22 +38,50 @@ static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusic } static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMIME_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrackImpl_Init(IDirectMusicTrack *iface, @@ -219,17 +192,17 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { /* IDirectMusicTimeSigTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack_QueryInterface(&This->IDirectMusicTrack_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicTimeSigTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack_AddRef(&This->IDirectMusicTrack_iface); } static ULONG WINAPI IDirectMusicTimeSigTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack_Release(&This->IDirectMusicTrack_iface); } static HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -267,21 +240,25 @@ static const IPersistStreamVtbl DirectMusicTimeSigTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmtimesigtrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicTimeSigTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTimeSigTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicTimeSigTrack_Unknown_Vtbl; + IDirectMusicTimeSigTrack *track; + HRESULT hr; + + track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); + if (!track) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } track->IDirectMusicTrack_iface.lpVtbl = &dmtack_vtbl; track->PersistStreamVtbl = &DirectMusicTimeSigTrack_PersistStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; track->pDesc->guidClass = CLSID_DirectMusicTimeSigTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMIME_LockModule(); + hr = IDirectMusicTrack_QueryInterface(&track->IDirectMusicTrack_iface, lpcGUID, ppobj); + IDirectMusicTrack_Release(&track->IDirectMusicTrack_iface); - return IDirectMusicTimeSigTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Michael Stefaniuc : dmime: Use the generic IPersistStream for DMTimeSigTrack.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: 7123c74532724bf3c23a609e44d6a87e606bc966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7123c74532724bf3c23a609e4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:53:27 2015 +0200 dmime: Use the generic IPersistStream for DMTimeSigTrack. --- dlls/dmime/tests/dmime.c | 2 +- dlls/dmime/timesigtrack.c | 67 ++++++++++++----------------------------------- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 30afee3..e2d1b0f 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -501,7 +501,7 @@ static void test_track(void) { X(DirectMusicSeqTrack), TRUE }, { X(DirectMusicSysExTrack), TRUE }, { X(DirectMusicTempoTrack), FALSE }, - { X(DirectMusicTimeSigTrack), TRUE }, + { X(DirectMusicTimeSigTrack), FALSE }, { X(DirectMusicWaveTrack), TRUE } }; #undef X diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index b56f4de..9bd7450 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -18,6 +18,7 @@ */ #include "dmime_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); @@ -26,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); */ typedef struct IDirectMusicTimeSigTrack { IDirectMusicTrack IDirectMusicTrack_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicTimeSigTrack; /* IDirectMusicTimeSigTrack IDirectMusicTrack8 part: */ @@ -49,7 +49,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *if if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack)) *ret_iface = iface; else if (IsEqualIID(riid, &IID_IPersistStream)) - *ret_iface = &This->PersistStreamVtbl; + *ret_iface = &This->dmobj.IPersistStream_iface; else { WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); return E_NOINTERFACE; @@ -189,52 +189,21 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_Clone }; -/* IDirectMusicTimeSigTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack_QueryInterface(&This->IDirectMusicTrack_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicTimeSigTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack_AddRef(&This->IDirectMusicTrack_iface); -} - -static ULONG WINAPI IDirectMusicTimeSigTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack_Release(&This->IDirectMusicTrack_iface); -} - -static HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +{ FIXME(": Loading not implemented yet\n"); return S_OK; } -static HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicTimeSigTrack_PersistStream_Vtbl = { - IDirectMusicTimeSigTrack_IPersistStream_QueryInterface, - IDirectMusicTimeSigTrack_IPersistStream_AddRef, - IDirectMusicTimeSigTrack_IPersistStream_Release, - IDirectMusicTimeSigTrack_IPersistStream_GetClassID, - IDirectMusicTimeSigTrack_IPersistStream_IsDirty, - IDirectMusicTimeSigTrack_IPersistStream_Load, - IDirectMusicTimeSigTrack_IPersistStream_Save, - IDirectMusicTimeSigTrack_IPersistStream_GetSizeMax +static const IPersistStreamVtbl persiststream_vtbl = { + dmobj_IPersistStream_QueryInterface, + dmobj_IPersistStream_AddRef, + dmobj_IPersistStream_Release, + dmobj_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, + IPersistStreamImpl_Load, + unimpl_IPersistStream_Save, + unimpl_IPersistStream_GetSizeMax }; /* for ClassFactory */ @@ -249,12 +218,10 @@ HRESULT WINAPI create_dmtimesigtrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack_iface.lpVtbl = &dmtack_vtbl; - track->PersistStreamVtbl = &DirectMusicTimeSigTrack_PersistStream_Vtbl; - track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); - DM_STRUCT_INIT(track->pDesc); - track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - track->pDesc->guidClass = CLSID_DirectMusicTimeSigTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicTimeSigTrack, + (IUnknown *)&track->IDirectMusicTrack_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; DMIME_LockModule(); hr = IDirectMusicTrack_QueryInterface(&track->IDirectMusicTrack_iface, lpcGUID, ppobj);

1 0

Jacek Caban : mshtml: Added support for binding XHR events.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: 8d85da757a7f1ab36d11078cb08ea84511190fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d85da757a7f1ab36d11078cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 1 17:38:17 2015 +0200 mshtml: Added support for binding XHR events. --- dlls/mshtml/htmlevent.c | 6 +- dlls/mshtml/htmlevent.h | 3 + dlls/mshtml/tests/xmlhttprequest.c | 2 +- dlls/mshtml/xmlhttprequest.c | 135 ++++++++++++++++++++++++++++++++++++- 4 files changed, 140 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 254b864..ad016b9 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -256,7 +256,7 @@ static eventid_t attr_to_eid(LPCWSTR str) return EVENTID_LAST; } -typedef struct { +struct HTMLEventObj { DispatchEx dispex; IHTMLEventObj IHTMLEventObj_iface; @@ -268,7 +268,7 @@ typedef struct { VARIANT return_value; BOOL prevent_default; BOOL cancel_bubble; -} HTMLEventObj; +}; static inline HTMLEventObj *impl_from_IHTMLEventObj(IHTMLEventObj *iface) { @@ -966,7 +966,7 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) return FALSE; } -static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTarget *event_target, +void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTarget *event_target, ConnectionPointContainer *cp_container, eventid_t eid, IDispatch *this_obj) { event_target_t *data = get_event_target_data(event_target, FALSE); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 4579617f..fefc749 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -67,6 +67,9 @@ HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,eventid_t) DECLSPEC_HIDDEN; +typedef struct HTMLEventObj HTMLEventObj; +void call_event_handlers(HTMLDocumentNode*,HTMLEventObj*,EventTarget*,ConnectionPointContainer*,eventid_t,IDispatch*); + void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void add_nsevent_listener(HTMLDocumentNode*,nsIDOMNode*,LPCWSTR) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index cf5f674..d3f682c 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -504,7 +504,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) SET_EXPECT(xmlhttprequest_onreadystatechange_opened); hres = IHTMLXMLHttpRequest_open(xhr, method, url, vbool, vempty, vempty); ok(hres == S_OK, "open failed: %08x\n", hres); - todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); + CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); SysFreeString(method); SysFreeString(url); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 6f417a5..1432b2c 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -60,14 +60,117 @@ static HRESULT variant_to_nsastr(VARIANT var, nsAString *ret) } } -/* IHTMLXMLHttpRequest */ +typedef struct XMLHttpReqEventListener XMLHttpReqEventListener; + typedef struct { EventTarget event_target; IHTMLXMLHttpRequest IHTMLXMLHttpRequest_iface; LONG ref; nsIXMLHttpRequest *nsxhr; + XMLHttpReqEventListener *event_listener; } HTMLXMLHttpRequest; +struct XMLHttpReqEventListener { + nsIDOMEventListener nsIDOMEventListener_iface; + LONG ref; + HTMLXMLHttpRequest *xhr; +}; + +static void detach_xhr_event_listener(XMLHttpReqEventListener *event_listener) +{ + nsIDOMEventTarget *event_target; + nsAString str; + nsresult nsres; + + static const WCHAR readystatechangeW[] = + {'o','n','r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; + + nsres = nsIXMLHttpRequest_QueryInterface(event_listener->xhr->nsxhr, &IID_nsIDOMEventTarget, (void**)&event_target); + assert(nsres == NS_OK); + + nsAString_InitDepend(&str, readystatechangeW); + nsres = nsIDOMEventTarget_RemoveEventListener(event_target, &str, &event_listener->nsIDOMEventListener_iface, FALSE); + nsAString_Finish(&str); + nsIDOMEventTarget_Release(event_target); + + event_listener->xhr->event_listener = NULL; + event_listener->xhr = NULL; + nsIDOMEventListener_Release(&event_listener->nsIDOMEventListener_iface); +} + + +static inline XMLHttpReqEventListener *impl_from_nsIDOMEventListener(nsIDOMEventListener *iface) +{ + return CONTAINING_RECORD(iface, XMLHttpReqEventListener, nsIDOMEventListener_iface); +} + +static nsresult NSAPI XMLHttpReqEventListener_QueryInterface(nsIDOMEventListener *iface, + nsIIDRef riid, void **result) +{ + XMLHttpReqEventListener *This = impl_from_nsIDOMEventListener(iface); + + if(IsEqualGUID(&IID_nsISupports, riid)) { + TRACE("(%p)->(IID_nsISupports, %p)\n", This, result); + *result = &This->nsIDOMEventListener_iface; + }else if(IsEqualGUID(&IID_nsIDOMEventListener, riid)) { + TRACE("(%p)->(IID_nsIDOMEventListener %p)\n", This, result); + *result = &This->nsIDOMEventListener_iface; + }else { + *result = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), result); + return NS_NOINTERFACE; + } + + nsIDOMEventListener_AddRef(&This->nsIDOMEventListener_iface); + return NS_OK; +} + +static nsrefcnt NSAPI XMLHttpReqEventListener_AddRef(nsIDOMEventListener *iface) +{ + XMLHttpReqEventListener *This = impl_from_nsIDOMEventListener(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static nsrefcnt NSAPI XMLHttpReqEventListener_Release(nsIDOMEventListener *iface) +{ + XMLHttpReqEventListener *This = impl_from_nsIDOMEventListener(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + assert(!This->xhr); + heap_free(This); + } + + return ref; +} + +static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *iface, nsIDOMEvent *event) +{ + XMLHttpReqEventListener *This = impl_from_nsIDOMEventListener(iface); + + TRACE("(%p)\n", This); + + if(!This->xhr) + return NS_OK; + + call_event_handlers(NULL, NULL, &This->xhr->event_target, NULL, EVENTID_READYSTATECHANGE, + (IDispatch*)&This->xhr->IHTMLXMLHttpRequest_iface); + return NS_OK; +} + +static const nsIDOMEventListenerVtbl XMLHttpReqEventListenerVtbl = { + XMLHttpReqEventListener_QueryInterface, + XMLHttpReqEventListener_AddRef, + XMLHttpReqEventListener_Release, + XMLHttpReqEventListener_HandleEvent +}; + static inline HTMLXMLHttpRequest *impl_from_IHTMLXMLHttpRequest(IHTMLXMLHttpRequest *iface) { return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IHTMLXMLHttpRequest_iface); @@ -115,6 +218,8 @@ static ULONG WINAPI HTMLXMLHttpRequest_Release(IHTMLXMLHttpRequest *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->event_listener) + detach_xhr_event_listener(This->event_listener); release_dispex(&This->event_target.dispex); nsIXMLHttpRequest_Release(This->nsxhr); heap_free(This); @@ -357,10 +462,36 @@ static inline HTMLXMLHttpRequest *impl_from_DispatchEx(DispatchEx *iface) static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, int eid) { HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); + nsIDOMEventTarget *nstarget; + nsAString type_str; + nsresult nsres; + + static const WCHAR readystatechangeW[] = {'r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; - FIXME("(%p)\n", This); + TRACE("(%p)\n", This); assert(eid == EVENTID_READYSTATECHANGE); + + if(This->event_listener) + return; + + This->event_listener = heap_alloc(sizeof(*This->event_listener)); + if(!This->event_listener) + return; + + This->event_listener->nsIDOMEventListener_iface.lpVtbl = &XMLHttpReqEventListenerVtbl; + This->event_listener->ref = 1; + This->event_listener->xhr = This; + + nsres = nsIXMLHttpRequest_QueryInterface(This->nsxhr, &IID_nsIDOMEventTarget, (void**)&nstarget); + assert(nsres == NS_OK); + + nsAString_InitDepend(&type_str, readystatechangeW); + nsres = nsIDOMEventTarget_AddEventListener(nstarget, &type_str, &This->event_listener->nsIDOMEventListener_iface, FALSE, TRUE, 2); + nsAString_Finish(&type_str); + nsIDOMEventTarget_Release(nstarget); + if(NS_FAILED(nsres)) + ERR("AddEventListener failed: %08x\n", nsres); } static dispex_static_data_vtbl_t HTMLXMLHttpRequest_dispex_vtbl = {

1 0

Nikolay Sivov : dwrite: Initial layout GetMetrics() implementation.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: a940c9b970b1769771145bfe4a67ebb48b339274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a940c9b970b1769771145bfe4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 1 20:43:30 2015 +0300 dwrite: Initial layout GetMetrics() implementation. --- dlls/dwrite/layout.c | 37 +++++++++++++++++++++++++++++++++---- dlls/dwrite/tests/layout.c | 7 +++---- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 752bd50..a718538 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -248,6 +248,8 @@ struct dwrite_textlayout { UINT32 line_count; UINT32 line_alloc; + DWRITE_TEXT_METRICS1 metrics; + /* gdi-compatible layout specifics */ BOOL gdicompatible; FLOAT pixels_per_dip; @@ -1125,7 +1127,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) i == layout->cluster_count - 1) /* end of the text */ { UINT32 strlength, last_cluster = i, index; - FLOAT descent; + FLOAT descent, trailingspacewidth; if (!overflow) { metrics.length += layout->clustermetrics[i].length; @@ -1145,6 +1147,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) trailing properties for current line */ strlength = metrics.length; index = last_cluster; + trailingspacewidth = 0.0; while (strlength) { DWRITE_CLUSTER_METRICS *cluster = &layout->clustermetrics[index]; @@ -1156,8 +1159,10 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) metrics.newlineLength += cluster->length; } - if (cluster->isWhitespace) + if (cluster->isWhitespace) { metrics.trailingWhitespaceLength += cluster->length; + trailingspacewidth += cluster->width; + } strlength -= cluster->length; index--; @@ -1184,6 +1189,11 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) } metrics.height = descent + metrics.baseline; + if (width > layout->metrics.widthIncludingTrailingWhitespace) + layout->metrics.widthIncludingTrailingWhitespace = width; + if (width - trailingspacewidth > layout->metrics.width) + layout->metrics.width = width - trailingspacewidth; + metrics.isTrimmed = width > layout->maxwidth; hr = layout_set_line_metrics(layout, &metrics, &line); if (FAILED(hr)) @@ -1203,6 +1213,12 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) textpos += layout->clustermetrics[i].length; } + layout->metrics.left = layout->metrics.top = 0.0; + layout->metrics.layoutWidth = layout->maxwidth; + layout->metrics.layoutHeight = layout->maxheight; + layout->metrics.maxBidiReorderingDepth = 1; /* FIXME */ + layout->metrics.lineCount = layout->line_count; + /* Now all line info is here, update effective runs positions in flow direction */ erun = layout_get_next_erun(layout, NULL); inrun = layout_get_next_inline_run(layout, NULL); @@ -1227,8 +1243,12 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) if (!inrun) break; } + + layout->metrics.height += layout->lines[line].height; } + layout->metrics.heightIncludingTrailingWhitespace = layout->metrics.height; /* FIXME: not true for vertical text */ + layout->recompute &= ~RECOMPUTE_EFFECTIVE_RUNS; return hr; } @@ -2775,8 +2795,16 @@ static HRESULT WINAPI dwritetextlayout1_GetCharacterSpacing(IDWriteTextLayout2 * static HRESULT WINAPI dwritetextlayout2_GetMetrics(IDWriteTextLayout2 *iface, DWRITE_TEXT_METRICS1 *metrics) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%p): stub\n", This, metrics); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, metrics); + + hr = layout_compute_effective_runs(This); + if (FAILED(hr)) + return hr; + + *metrics = This->metrics; + return S_OK; } static HRESULT WINAPI dwritetextlayout2_SetVerticalGlyphOrientation(IDWriteTextLayout2 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) @@ -3542,6 +3570,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * list_init(&layout->effects); list_init(&layout->spacing); memset(&layout->format, 0, sizeof(layout->format)); + memset(&layout->metrics, 0, sizeof(layout->metrics)); layout->gdicompatible = FALSE; layout->pixels_per_dip = 0.0; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 43233f4..84e1a2b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2485,7 +2485,6 @@ static void test_GetMetrics(void) memset(&metrics, 0xcc, sizeof(metrics)); hr = IDWriteTextLayout_GetMetrics(layout, &metrics); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(metrics.left == 0.0, "got %.2f\n", metrics.left); ok(metrics.top == 0.0, "got %.2f\n", metrics.top); @@ -2496,7 +2495,7 @@ todo_wine { ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight); ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth); ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount); -} + IDWriteTextLayout_Release(layout); /* a string with more complex bidi sequence */ @@ -2506,7 +2505,6 @@ todo_wine { memset(&metrics, 0xcc, sizeof(metrics)); metrics.maxBidiReorderingDepth = 0; hr = IDWriteTextLayout_GetMetrics(layout, &metrics); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(metrics.left == 0.0, "got %.2f\n", metrics.left); ok(metrics.top == 0.0, "got %.2f\n", metrics.top); @@ -2515,9 +2513,10 @@ todo_wine { ok(metrics.height > 0.0, "got %.2f\n", metrics.height); ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth); ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight); +todo_wine ok(metrics.maxBidiReorderingDepth > 1, "got %u\n", metrics.maxBidiReorderingDepth); ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount); -} + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Nikolay Sivov : dwrite: Add last cluster width to line width.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: d86f2af3b6f7c3e514c357deaae8fa410305cbda URL: http://source.winehq.org/git/wine.git/?a=commit;h=d86f2af3b6f7c3e514c357dea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 1 20:44:03 2015 +0300 dwrite: Add last cluster width to line width. --- dlls/dwrite/layout.c | 1 + dlls/dwrite/tests/layout.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index a718538..4dbb53f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1130,6 +1130,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) FLOAT descent, trailingspacewidth; if (!overflow) { + width += layout->clustermetrics[i].width; metrics.length += layout->clustermetrics[i].length; last_cluster = i; } diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 84e1a2b..eee86a9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2468,10 +2468,14 @@ static void test_GetMetrics(void) { static const WCHAR str2W[] = {0x2066,')',')',0x661,'(',0x627,')',0}; static const WCHAR strW[] = {'a','b','c','d',0}; + static const WCHAR str3W[] = {'a',0}; + DWRITE_CLUSTER_METRICS clusters[4]; DWRITE_TEXT_METRICS metrics; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFactory *factory; + UINT32 count, i; + FLOAT width; HRESULT hr; factory = create_factory(); @@ -2483,13 +2487,21 @@ static void test_GetMetrics(void) hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 4, "got %u\n", count); + for (i = 0, width = 0.0; i < count; i++) + width += clusters[i].width; + memset(&metrics, 0xcc, sizeof(metrics)); hr = IDWriteTextLayout_GetMetrics(layout, &metrics); ok(hr == S_OK, "got 0x%08x\n", hr); ok(metrics.left == 0.0, "got %.2f\n", metrics.left); ok(metrics.top == 0.0, "got %.2f\n", metrics.top); - ok(metrics.width > 0.0, "got %.2f\n", metrics.width); - ok(metrics.widthIncludingTrailingWhitespace > 0.0, "got %.2f\n", metrics.widthIncludingTrailingWhitespace); + ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width); + ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n", + metrics.widthIncludingTrailingWhitespace, width); ok(metrics.height > 0.0, "got %.2f\n", metrics.height); ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth); ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight); @@ -2519,6 +2531,29 @@ todo_wine IDWriteTextLayout_Release(layout); + /* single cluster layout */ + hr = IDWriteFactory_CreateTextLayout(factory, str3W, 1, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 1, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); + + memset(&metrics, 0xcc, sizeof(metrics)); + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(metrics.left == 0.0, "got %.2f\n", metrics.left); + ok(metrics.top == 0.0, "got %.2f\n", metrics.top); + ok(metrics.width == clusters[0].width, "got %.2f, expected %.2f\n", metrics.width, clusters[0].width); + ok(metrics.widthIncludingTrailingWhitespace == clusters[0].width, "got %.2f\n", metrics.widthIncludingTrailingWhitespace); + ok(metrics.height > 0.0, "got %.2f\n", metrics.height); + ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth); + ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight); + ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth); + ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount); + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : uxtheme: Partial implementation of DrawThemeTextEx.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: 2bb581b9b7265a0ffea839c62d131cb043a3917b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb581b9b7265a0ffea839c62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 2 00:14:21 2015 +0300 uxtheme: Partial implementation of DrawThemeTextEx. --- dlls/uxtheme/draw.c | 45 +++++++++++++++++++++++++++++++++++---------- dlls/uxtheme/uxtheme.spec | 1 + include/uxtheme.h | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 10 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index a7f80fd..e3d3679 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1633,8 +1633,29 @@ HRESULT WINAPI DrawThemeIcon(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, * DrawThemeText (UXTHEME.@) */ HRESULT WINAPI DrawThemeText(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, - LPCWSTR pszText, int iCharCount, DWORD dwTextFlags, - DWORD dwTextFlags2, const RECT *pRect) + LPCWSTR pszText, int iCharCount, DWORD flags, + DWORD flags2, const RECT *pRect) +{ + DTTOPTS opts; + RECT rt; + + TRACE("%d %d\n", iPartId, iStateId); + + CopyRect(&rt, pRect); + + opts.dwSize = sizeof(opts); + if (flags2 & DTT_GRAYED) { + opts.dwFlags = DTT_TEXTCOLOR; + opts.crText = GetSysColor(COLOR_GRAYTEXT); + } + return DrawThemeTextEx(hTheme, hdc, iPartId, iStateId, pszText, iCharCount, flags, &rt, &opts); +} + +/*********************************************************************** + * DrawThemeTextEx (UXTHEME.@) + */ +HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, + LPCWSTR pszText, int iCharCount, DWORD flags, RECT *rect, const DTTOPTS *options) { HRESULT hr; HFONT hFont = NULL; @@ -1643,11 +1664,15 @@ HRESULT WINAPI DrawThemeText(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, COLORREF textColor; COLORREF oldTextColor; int oldBkMode; - RECT rt; - - TRACE("%d %d: stub\n", iPartId, iStateId); + + TRACE("%p %p %d %d %s:%d 0x%08x %p %p\n", hTheme, hdc, iPartId, iStateId, + debugstr_wn(pszText, iCharCount), iCharCount, flags, rect, options); + if(!hTheme) return E_HANDLE; + + if (options->dwFlags & ~DTT_TEXTCOLOR) + FIXME("unsupported flags 0x%08x\n", options->dwFlags); hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont); if(SUCCEEDED(hr)) { @@ -1655,19 +1680,19 @@ HRESULT WINAPI DrawThemeText(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, if(!hFont) TRACE("Failed to create font\n"); } - CopyRect(&rt, pRect); + if(hFont) oldFont = SelectObject(hdc, hFont); - - if(dwTextFlags2 & DTT_GRAYED) - textColor = GetSysColor(COLOR_GRAYTEXT); + + if (options->dwFlags & DTT_TEXTCOLOR) + textColor = options->crText; else { if(FAILED(GetThemeColor(hTheme, iPartId, iStateId, TMT_TEXTCOLOR, &textColor))) textColor = GetTextColor(hdc); } oldTextColor = SetTextColor(hdc, textColor); oldBkMode = SetBkMode(hdc, TRANSPARENT); - DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags); + DrawTextW(hdc, pszText, iCharCount, rect, flags); SetBkMode(hdc, oldBkMode); SetTextColor(hdc, oldTextColor); diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 7a0e7e4..d4ea07a 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -58,6 +58,7 @@ @ stdcall DrawThemeIcon(ptr ptr long long ptr ptr long) @ stdcall DrawThemeParentBackground(ptr ptr ptr) @ stdcall DrawThemeText(ptr ptr long long wstr long long long ptr) +@ stdcall DrawThemeTextEx(ptr ptr long long wstr long long ptr ptr) @ stdcall EnableThemeDialogTexture(ptr long) @ stdcall EnableTheming(long) @ stdcall EndBufferedAnimation(ptr long) diff --git a/include/uxtheme.h b/include/uxtheme.h index e167d80..7606306 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -53,6 +53,46 @@ HRESULT WINAPI DrawThemeParentBackground(HWND,HDC,RECT*); HRESULT WINAPI DrawThemeText(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,DWORD, const RECT*); +/* DTTOPTS.dwFlags bits */ +#define DTT_TEXTCOLOR 0x00000001 +#define DTT_BORDERCOLOR 0x00000002 +#define DTT_SHADOWCOLOR 0x00000004 +#define DTT_SHADOWTYPE 0x00000008 +#define DTT_SHADOWOFFSET 0x00000010 +#define DTT_BORDERSIZE 0x00000020 +#define DTT_FONTPROP 0x00000040 +#define DTT_COLORPROP 0x00000080 +#define DTT_STATEID 0x00000100 +#define DTT_CALCRECT 0x00000200 +#define DTT_APPLYOVERLAY 0x00000400 +#define DTT_GLOWSIZE 0x00000800 +#define DTT_CALLBACK 0x00001000 +#define DTT_COMPOSITED 0x00002000 +#define DTT_VALIDBITS 0x00003fff + +typedef int (WINAPI *DTT_CALLBACK_PROC)(HDC,LPWSTR,int,RECT*,UINT,LPARAM); + +typedef struct _DTTOPTS { + DWORD dwSize; + DWORD dwFlags; + COLORREF crText; + COLORREF crBorder; + COLORREF crShadow; + int iTextShadowType; + POINT ptShadowOffset; + int iBorderSize; + int iFontPropId; + int iColorPropId; + int iStateId; + BOOL fApplyOverlay; + int iGlowSize; + DTT_CALLBACK_PROC pfnDrawTextCallback; + LPARAM lParam; +} DTTOPTS, *PDTTOPTS; + +HRESULT WINAPI DrawThemeTextEx(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,RECT*, + const DTTOPTS*); + #define ETDT_DISABLE 0x00000001 #define ETDT_ENABLE 0x00000002 #define ETDT_USETABTEXTURE 0x00000004

1 0

Huw Davies : comctl32: Add a helper to free button text.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 01cd45cce1ba05069ebe88670c23c9478cadb6e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01cd45cce1ba05069ebe88670… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 09:14:52 2015 +0100 comctl32: Add a helper to free button text. --- dlls/comctl32/toolbar.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index bbfc6b7..19d45a0 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -353,6 +353,12 @@ static void set_stringT( TBUTTON_INFO *btn, const WCHAR *str, BOOL unicode ) set_string_index( btn, (DWORD_PTR)str, unicode ); } +static void free_string( TBUTTON_INFO *btn ) +{ + set_string_index( btn, 0, TRUE ); + +} + /*********************************************************************** * TOOLBAR_CheckStyle * @@ -3224,8 +3230,7 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) if (infoPtr->nNumButtons == 1) { TRACE(" simple delete!\n"); - if (TOOLBAR_ButtonHasString(infoPtr->buttons)) - Free((LPWSTR)infoPtr->buttons[0].iString); + free_string( infoPtr->buttons ); Free (infoPtr->buttons); infoPtr->buttons = NULL; infoPtr->nNumButtons = 0; @@ -3246,8 +3251,7 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) (infoPtr->nNumButtons - nIndex) * sizeof(TBUTTON_INFO)); } - if (TOOLBAR_ButtonHasString(&oldButtons[nIndex])) - Free((LPWSTR)oldButtons[nIndex].iString); + free_string( oldButtons + nIndex ); Free (oldButtons); } @@ -5227,8 +5231,7 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) /* delete button data */ for (i = 0; i < infoPtr->nNumButtons; i++) - if (TOOLBAR_ButtonHasString(&infoPtr->buttons[i])) - Free ((LPWSTR)infoPtr->buttons[i].iString); + free_string( infoPtr->buttons + i ); Free (infoPtr->buttons); /* delete strings */

1 0

Huw Davies : comctl32: Don't leak button text.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 199f51ff78c94925bdbdd13a0c431035358f682b URL: http://source.winehq.org/git/wine.git/?a=commit;h=199f51ff78c94925bdbdd13a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 09:14:53 2015 +0100 comctl32: Don't leak button text. --- dlls/comctl32/toolbar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 19d45a0..aa9ffcd 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4088,6 +4088,7 @@ TOOLBAR_DeleteAllButtons(TOOLBAR_INFO *infoPtr) for (i = 0; i < infoPtr->nNumButtons; i++) { + free_string( infoPtr->buttons + i ); TOOLBAR_TooltipDelTool(infoPtr, &infoPtr->buttons[i]); }

1 0

Huw Davies : comctl32: Implement toolbar saving.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 063c7866f5e770c5efaa628e2e49db503f95469b URL: http://source.winehq.org/git/wine.git/?a=commit;h=063c7866f5e770c5efaa628e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 09:14:54 2015 +0100 comctl32: Implement toolbar saving. --- dlls/comctl32/tests/toolbar.c | 89 ++++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/toolbar.c | 53 +++++++++++++++++++++++--- 2 files changed, 136 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 2041216..18dc534 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -54,6 +54,18 @@ static const struct message ttgetdispinfo_parent_seq[] = { { 0 } }; +static const struct message save_parent_seq[] = { + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, -1 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 0 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 1 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 2 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 3 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 4 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 5 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 6 }, + { 0 } +}; + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -133,6 +145,25 @@ static LRESULT parent_wnd_notify(LPARAM lParam) compare(nmdisp->dwMask, g_dwExpectedDispInfoMask, "%x"); ok(nmdisp->pszText == NULL, "pszText is not NULL\n"); break; + case TBN_SAVE: + { + NMTBSAVE *save = (NMTBSAVE *)lParam; + if (save->iItem == -1) + { + save->cbData = save->cbData * 2 + sizeof(DWORD); + save->pData = HeapAlloc( GetProcessHeap(), 0, save->cbData ); + save->pData[0] = 0xcafe; + save->pCurrent = save->pData + 1; + } + else + { + save->pCurrent[0] = 0xcafe0000 + save->iItem; + save->pCurrent++; + } + /* Return value is ignored */ + return 1; + } + } return 0; } @@ -148,7 +179,19 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + if (message == WM_NOTIFY && lParam) + { + msg.id = ((NMHDR*)lParam)->code; + switch (msg.id) + { + case TBN_SAVE: + { + NMTBSAVE *save = (NMTBSAVE *)lParam; + msg.stage = save->iItem; + } + break; + } + } /* log system messages, except for painting */ if (message < WM_USER && @@ -2079,6 +2122,49 @@ static void test_noresize(void) } +static void test_save(void) +{ + HWND wnd = NULL; + TBSAVEPARAMSW params; + static const WCHAR subkey[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','T','e','s','t',0}; + static const WCHAR value[] = {'t','o','o','l','b','a','r','t','e','s','t',0}; + LONG res; + HKEY key; + BYTE data[100]; + DWORD size = sizeof(data), type; + static const TBBUTTON more_btns[2] = + { + {0, 11, TBSTATE_HIDDEN, BTNS_BUTTON, {0}, 0, -1}, + {0, 13, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, -1} + }; + static const DWORD expect[] = {0xcafe, 1, 0xcafe0000, 3, 0xcafe0001, 5, 0xcafe0002, 7, 0xcafe0003, + 9, 0xcafe0004, 11, 0xcafe0005, 13, 0xcafe0006 }; + + params.hkr = HKEY_CURRENT_USER; + params.pszSubKey = subkey; + params.pszValueName = value; + + rebuild_toolbar_with_buttons( &wnd ); + SendMessageW( wnd, TB_ADDBUTTONSW, sizeof(more_btns) / sizeof(more_btns[0]), (LPARAM)more_btns ); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageW( wnd, TB_SAVERESTOREW, TRUE, (LPARAM)&params ); + ok( res, "saving failed\n" ); + ok_sequence(sequences, PARENT_SEQ_INDEX, save_parent_seq, "save", FALSE); + DestroyWindow( wnd ); + + res = RegOpenKeyW( HKEY_CURRENT_USER, subkey, &key ); + ok( !res, "got %08x\n", res ); + res = RegQueryValueExW( key, value, NULL, &type, data, &size ); + ok( !res, "got %08x\n", res ); + ok( type == REG_BINARY, "got %08x\n", type ); + ok( size == sizeof(expect), "got %08x\n", size ); + ok( !memcmp( data, expect, size ), "mismatch\n" ); + + RegDeleteValueW( key, value ); + RegCloseKey( key ); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2122,6 +2208,7 @@ START_TEST(toolbar) test_create(); test_TB_GET_SET_EXTENDEDSTYLE(); test_noresize(); + test_save(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index aa9ffcd..e230d885 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4071,12 +4071,55 @@ TOOLBAR_ReplaceBitmap (TOOLBAR_INFO *infoPtr, const TBREPLACEBITMAP *lpReplace) /* helper for TOOLBAR_SaveRestoreW */ static BOOL -TOOLBAR_Save(const TBSAVEPARAMSW *lpSave) +TOOLBAR_Save(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *params) { - FIXME("save to %s %s\n", debugstr_w(lpSave->pszSubKey), - debugstr_w(lpSave->pszValueName)); + NMTBSAVE save; + INT ret, i; + BOOL alloced = FALSE; + HKEY key; - return FALSE; + TRACE( "save to %s %s\n", debugstr_w(params->pszSubKey), debugstr_w(params->pszValueName) ); + + memset( &save, 0, sizeof(save) ); + save.cbData = infoPtr->nNumButtons * sizeof(DWORD); + save.iItem = -1; + save.cButtons = infoPtr->nNumButtons; + save.tbButton.idCommand = -1; + TOOLBAR_SendNotify( &save.hdr, infoPtr, TBN_SAVE ); + + if (!save.pData) + { + save.pData = Alloc( save.cbData ); + if (!save.pData) return FALSE; + alloced = TRUE; + } + if (!save.pCurrent) save.pCurrent = save.pData; + + for (i = 0; i < infoPtr->nNumButtons; i++) + { + save.iItem = i; + save.tbButton.iBitmap = infoPtr->buttons[i].iBitmap; + save.tbButton.idCommand = infoPtr->buttons[i].idCommand; + save.tbButton.fsState = infoPtr->buttons[i].fsState; + save.tbButton.fsStyle = infoPtr->buttons[i].fsStyle; + memset( save.tbButton.bReserved, 0, sizeof(save.tbButton.bReserved) ); + save.tbButton.dwData = infoPtr->buttons[i].dwData; + save.tbButton.iString = infoPtr->buttons[i].iString; + + *save.pCurrent++ = save.tbButton.idCommand; + + TOOLBAR_SendNotify( &save.hdr, infoPtr, TBN_SAVE ); + } + + ret = RegCreateKeyW( params->hkr, params->pszSubKey, &key ); + if (ret == ERROR_SUCCESS) + { + ret = RegSetValueExW( key, params->pszValueName, 0, REG_BINARY, (BYTE *)save.pData, save.cbData ); + RegCloseKey( key ); + } + + if (alloced) Free( save.pData ); + return !ret; } @@ -4211,7 +4254,7 @@ TOOLBAR_SaveRestoreW (TOOLBAR_INFO *infoPtr, WPARAM wParam, const TBSAVEPARAMSW if (lpSave == NULL) return 0; if (wParam) - return TOOLBAR_Save(lpSave); + return TOOLBAR_Save(infoPtr, lpSave); else return TOOLBAR_Restore(infoPtr, lpSave); }

1 0

Huw Davies : comctl32: The number of buttons is set by the first TBN_RESTORE notification.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 77ed3733af8b8c45c2a8a89db4a9f31733eec397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ed3733af8b8c45c2a8a89db… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 09:14:55 2015 +0100 comctl32: The number of buttons is set by the first TBN_RESTORE notification. --- dlls/comctl32/tests/toolbar.c | 49 +++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 4 ++-- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 18dc534..9535947 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -163,7 +163,45 @@ static LRESULT parent_wnd_notify(LPARAM lParam) /* Return value is ignored */ return 1; } + case TBN_RESTORE: + { + NMTBRESTORE *restore = (NMTBRESTORE *)lParam; + + if (restore->iItem == -1) + { + ok( restore->cButtons == 15, "got %d\n", restore->cButtons ); + ok( *restore->pCurrent == 0xcafe, "got %08x\n", *restore->pCurrent ); + /* Skip the last one */ + restore->cButtons = 6; + restore->pCurrent++; + /* BytesPerRecord is ignored */ + restore->cbBytesPerRecord = 10; + } + else + { + ok( *restore->pCurrent == 0xcafe0000 + restore->iItem, "got %08x\n", *restore->pCurrent ); + ok( restore->tbButton.iBitmap == -1, "got %08x\n", restore->tbButton.iBitmap ); + ok( restore->tbButton.idCommand == restore->iItem * 2 + 1, "got %08x\n", restore->tbButton.idCommand ); + ok( restore->tbButton.fsState == 0, "got %02x\n", restore->tbButton.fsState ); + ok( restore->tbButton.fsStyle == 0, "got %02x\n", restore->tbButton.fsStyle ); + ok( restore->tbButton.dwData == 0, "got %08lx\n", restore->tbButton.dwData ); + ok( restore->tbButton.iString == 0, "got %08lx\n", restore->tbButton.iString ); + + restore->tbButton.iBitmap = 0; + restore->tbButton.fsState = TBSTATE_ENABLED; + restore->tbButton.fsStyle = 0; + restore->tbButton.iString = -1; + + restore->pCurrent++; + /* Altering cButtons after the 1st call makes no difference. */ + restore->cButtons--; + } + /* Returning non-zero from the 1st call aborts the restore, + otherwise the return value is ignored. */ + if (restore->iItem == -1) return 0; + return 1; + } } return 0; } @@ -2161,6 +2199,17 @@ static void test_save(void) ok( size == sizeof(expect), "got %08x\n", size ); ok( !memcmp( data, expect, size ), "mismatch\n" ); + RegCloseKey( key ); + + wnd = NULL; + rebuild_toolbar( &wnd ); + res = SendMessageW( wnd, TB_SAVERESTOREW, FALSE, (LPARAM)&params ); + ok( res, "restoring failed\n" ); + res = SendMessageW( wnd, TB_BUTTONCOUNT, 0, 0 ); + ok( res == 6, "got %d\n", res ); + + DestroyWindow( wnd ); + RegOpenKeyW( HKEY_CURRENT_USER, subkey, &key ); RegDeleteValueW( key, value ); RegCloseKey( key ); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index e230d885..9c3707b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4183,13 +4183,13 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) if (!TOOLBAR_SendNotify(&nmtbr.hdr, infoPtr, TBN_RESTORE)) { - INT i; + INT i, count = nmtbr.cButtons; /* remove all existing buttons as this function is designed to * restore the toolbar to a previously saved state */ TOOLBAR_DeleteAllButtons(infoPtr); - for (i = 0; i < nmtbr.cButtons; i++) + for (i = 0; i < count; i++) { nmtbr.iItem = i; nmtbr.tbButton.iBitmap = -1;

1 0