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

Michael Stefaniuc : dsound: Handle IDirectSound by the IDirectSound8 implementation.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 9cc62d321c6c6bd05747d94d073cdeb3241c2bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc62d321c6c6bd05747d94d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 19 02:05:37 2012 +0200 dsound: Handle IDirectSound by the IDirectSound8 implementation. --- dlls/dsound/dsound.c | 194 +----------------------------------------- dlls/dsound/dsound_private.h | 1 - dlls/dsound/tests/dsound8.c | 6 +- 3 files changed, 6 insertions(+), 195 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9cc62d321c6c6bd05747d…

1 0

Michael Stefaniuc : dsound: Get rid of the DSOUND_QueryInterface() helper.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 4c7e608d5ceb1ac51d0a6e7456205d0f7f85743b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7e608d5ceb1ac51d0a6e745… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 19 02:07:23 2012 +0200 dsound: Get rid of the DSOUND_QueryInterface() helper. --- dlls/dsound/dsound.c | 52 +++++++++++++++++++------------------------------ 1 files changed, 20 insertions(+), 32 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 3d74821..ad41f59 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -116,37 +116,6 @@ static void _dump_DSBCAPS(DWORD xmask) { TRACE("%s ",flags[i].name); } -/******************************************************************************* - * IDirectSoundImpl_DirectSound - */ -static HRESULT DSOUND_QueryInterface( - LPDIRECTSOUND8 iface, - REFIID riid, - LPVOID * ppobj) -{ - IDirectSoundImpl *This = (IDirectSoundImpl *)iface; - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); - - if (ppobj == NULL) { - WARN("invalid parameter\n"); - return E_INVALIDARG; - } - - if (IsEqualIID(riid, &IID_IUnknown)) { - IUnknown_AddRef(&This->IUnknown_iface); - *ppobj = &This->IUnknown_iface; - return S_OK; - } else if (IsEqualIID(riid, &IID_IDirectSound) || (This->has_ds8 && IsEqualIID(riid, &IID_IDirectSound8))) { - IDirectSound8_AddRef(&This->IDirectSound8_iface); - *ppobj = &This->IDirectSound8_iface; - return S_OK; - } - - *ppobj = NULL; - WARN("Unknown IID %s\n",debugstr_guid(riid)); - return E_NOINTERFACE; -} - static void directsound_destroy(IDirectSoundImpl *This) { if (This->device) @@ -166,8 +135,27 @@ static inline IDirectSoundImpl *impl_from_IUnknown(IUnknown *iface) static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { IDirectSoundImpl *This = impl_from_IUnknown(iface); + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppv); - return DSOUND_QueryInterface((IDirectSound8 *)This, riid, ppv); + + if (!ppv) { + WARN("invalid parameter\n"); + return E_INVALIDARG; + } + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_iface; + else if (IsEqualIID(riid, &IID_IDirectSound) || + (IsEqualIID(riid, &IID_IDirectSound8) && This->has_ds8)) + *ppv = &This->IDirectSound8_iface; + else { + WARN("unknown IID %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface)

1 0

Jacek Caban : mshtml: Make node object cycle collector aware.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 97ff991f463ef129340c0ec917d8cbf70e57856e URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ff991f463ef129340c0ec91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 11:28:35 2012 +0200 mshtml: Make node object cycle collector aware. --- dlls/mshtml/htmlnode.c | 65 ++++++++++++++++++++++++++++++++++++++---- dlls/mshtml/mshtml_private.h | 30 ++++++++++++++++++- dlls/mshtml/nsembed.c | 17 +++++++++++ dlls/mshtml/nsiface.idl | 7 ++++ 4 files changed, 112 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 3951494..f33df64 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -312,7 +312,7 @@ static HRESULT WINAPI HTMLDOMNode_QueryInterface(IHTMLDOMNode *iface, static ULONG WINAPI HTMLDOMNode_AddRef(IHTMLDOMNode *iface) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = ccref_incr(&This->ccref, (nsISupports*)&This->IHTMLDOMNode_iface); TRACE("(%p) ref=%d\n", This, ref); @@ -322,7 +322,7 @@ static ULONG WINAPI HTMLDOMNode_AddRef(IHTMLDOMNode *iface) static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - LONG ref = InterlockedDecrement(&This->ref); + LONG ref = ccref_decr(&This->ccref, (nsISupports*)&This->IHTMLDOMNode_iface); TRACE("(%p) ref=%d\n", This, ref); @@ -977,6 +977,8 @@ static const IHTMLDOMNode2Vtbl HTMLDOMNode2Vtbl = { HTMLDOMNode2_get_ownerDocument }; +static nsXPCOMCycleCollectionParticipant node_ccp; + HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -1001,6 +1003,14 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLDOMNode2, riid)) { TRACE("(%p)->(IID_IHTMLDOMNode2 %p)\n", This, ppv); *ppv = &This->IHTMLDOMNode2_iface; + }else if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid)) { + TRACE("(%p)->(IID_nsXPCOMCycleCollectionParticipant %p)\n", This, ppv); + *ppv = &node_ccp; + return NS_OK; + }else if(IsEqualGUID(&IID_nsCycleCollectionISupports, riid)) { + TRACE("(%p)->(IID_nsCycleCollectionISupports %p)\n", This, ppv); + *ppv = &This->IHTMLDOMNode_iface; + return NS_OK; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -1037,12 +1047,9 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno { node->IHTMLDOMNode_iface.lpVtbl = &HTMLDOMNodeVtbl; node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; - node->ref = 2; + ccref_init(&node->ccref, &doc->node != node ? 2 : 1); node->doc = doc; - if(&doc->node != node) - node->ref++; /* one extra for list entry reference */ - if(nsnode) nsIDOMNode_AddRef(nsnode); node->nsnode = nsnode; @@ -1100,6 +1107,52 @@ static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNod return S_OK; } +static void NSAPI HTMLDOMNode_unmark_if_purple(void *p) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode(p); + ccref_unmark_if_purple(&This->ccref); +} + +static nsresult NSAPI HTMLDOMNode_traverse(void *ccp, void *p, nsCycleCollectionTraversalCallback *cb) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode(p); + + TRACE("%p\n", This); + + describe_cc_node(&This->ccref, sizeof(*This), "HTMLDOMNode", cb); + + if(This->nsnode) + note_cc_edge((nsISupports*)This->nsnode, "This->nsnode", cb); + + return NS_OK; +} + +static nsresult NSAPI HTMLDOMNode_unlink(void *p) +{ + HTMLDOMNode *This = impl_from_IHTMLDOMNode(p); + + TRACE("%p\n", This); + + if(This->nsnode) { + nsIDOMNode *nsnode = This->nsnode; + This->nsnode = NULL; + nsIDOMNode_Release(nsnode); + } + + return NS_OK; +} + +void init_node_cc(void) +{ + static const CCObjCallback node_ccp_callback = { + HTMLDOMNode_unmark_if_purple, + HTMLDOMNode_traverse, + HTMLDOMNode_unlink + }; + + ccp_init(&node_ccp, &node_ccp_callback); +} + /* * FIXME * List looks really ugly here. We should use a better data structure or diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e2d347c..efa6f52 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -225,6 +225,32 @@ struct DispatchEx { dispex_dynamic_data_t *dynamic_data; }; +typedef struct { + void *x; +} nsCycleCollectingAutoRefCnt; + +typedef struct { + void *x[3]; +} nsXPCOMCycleCollectionParticipant; + +typedef struct nsCycleCollectionTraversalCallback nsCycleCollectionTraversalCallback; + +typedef struct { + void (NSAPI *unmark_if_purple)(void*); + nsresult (NSAPI *traverse)(void*,void*,nsCycleCollectionTraversalCallback*); + nsresult (NSAPI *unlink)(void*); +} CCObjCallback; + +DEFINE_GUID(IID_nsXPCOMCycleCollectionParticipant, 0x9674489b,0x1f6f,0x4550,0xa7,0x30, 0xcc,0xae,0xdd,0x10,0x4c,0xf9); + +nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*); +nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*); +void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt); +void (__cdecl *ccref_unmark_if_purple)(nsCycleCollectingAutoRefCnt*); +void (__cdecl *ccp_init)(nsXPCOMCycleCollectionParticipant*,const CCObjCallback*); +void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,size_t,const char*,nsCycleCollectionTraversalCallback*); +void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*); + void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; @@ -567,7 +593,7 @@ struct HTMLDOMNode { IHTMLDOMNode2 IHTMLDOMNode2_iface; const NodeImplVtbl *vtbl; - LONG ref; + nsCycleCollectingAutoRefCnt ccref; nsIDOMNode *nsnode; HTMLDocumentNode *doc; @@ -723,6 +749,8 @@ void init_nsio(nsIComponentManager*,nsIComponentRegistrar*) DECLSPEC_HIDDEN; void release_nsio(void) DECLSPEC_HIDDEN; BOOL is_gecko_path(const char*) DECLSPEC_HIDDEN; +void init_node_cc(void); + HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; BOOL compare_ignoring_frag(IUri*,IUri*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 70bdfa7..8ff7ad2 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -347,6 +347,21 @@ static BOOL load_xul(const PRUnichar *gre_path) #undef NS_DLSYM +#define NS_DLSYM(func) \ + func = (void *)GetProcAddress(xul_handle, #func); \ + if(!func) \ + ERR("Could not GetProcAddress(" #func ") failed\n") + + NS_DLSYM(ccref_incr); + NS_DLSYM(ccref_decr); + NS_DLSYM(ccref_init); + NS_DLSYM(ccref_unmark_if_purple); + NS_DLSYM(ccp_init); + NS_DLSYM(describe_cc_node); + NS_DLSYM(note_cc_edge); + +#undef NS_DLSYM + return TRUE; } @@ -561,6 +576,8 @@ static BOOL init_xpcom(const PRUnichar *gre_path) nsIComponentRegistrar_Release(registrar); } + init_node_cc(); + return TRUE; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 04d77d5..13748b9 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3450,6 +3450,13 @@ interface nsIDocumentObserver : nsIMutationObserver [ object, + uuid(c61eac14-5f7a-4481-965e-7eaa6effa85f), + local +] +interface nsCycleCollectionISupports {} + +[ + object, uuid(3682dd99-8560-44f4-9b8f-ccce9d7b96fb), local ]

1 0

Jacek Caban : mshtml: Make node object' s dynamic IDispatchEx-based properties cycle collectable.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: e9cc7676fa239264598570f1cd800475d61bca36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9cc7676fa239264598570f1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 11:28:54 2012 +0200 mshtml: Make node object's dynamic IDispatchEx-based properties cycle collectable. --- dlls/mshtml/dispex.c | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/htmlnode.c | 3 +++ dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index bbe6098..b2024d4 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1377,6 +1377,38 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) return TRUE; } +void dispex_traverse(DispatchEx *This, nsCycleCollectionTraversalCallback *cb) +{ + dynamic_prop_t *prop; + + if(!This->dynamic_data) + return; + + for(prop = This->dynamic_data->props; prop < This->dynamic_data->props + This->dynamic_data->prop_cnt; prop++) { + if(V_VT(&prop->var) == VT_DISPATCH) + note_cc_edge((nsISupports*)V_DISPATCH(&prop->var), "dispex_data", cb); + } + + /* FIXME: Traverse func_disps */ +} + +void dispex_unlink(DispatchEx *This) +{ + dynamic_prop_t *prop; + + if(!This->dynamic_data) + return; + + for(prop = This->dynamic_data->props; prop < This->dynamic_data->props + This->dynamic_data->prop_cnt; prop++) { + if(V_VT(&prop->var) == VT_DISPATCH) { + V_VT(&prop->var) = VT_EMPTY; + IDispatch_Release(V_DISPATCH(&prop->var)); + }else { + VariantClear(&prop->var); + } + } +} + void release_dispex(DispatchEx *This) { dynamic_prop_t *prop; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index f33df64..2afcb23 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1123,6 +1123,7 @@ static nsresult NSAPI HTMLDOMNode_traverse(void *ccp, void *p, nsCycleCollection if(This->nsnode) note_cc_edge((nsISupports*)This->nsnode, "This->nsnode", cb); + dispex_traverse(&This->dispex, cb); return NS_OK; } @@ -1133,6 +1134,8 @@ static nsresult NSAPI HTMLDOMNode_unlink(void *p) TRACE("%p\n", This); + dispex_unlink(&This->dispex); + if(This->nsnode) { nsIDOMNode *nsnode = This->nsnode; This->nsnode = NULL; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index efa6f52..803d214 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -258,6 +258,8 @@ HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**) DECLSPEC_H HRESULT get_dispids(tid_t,DWORD*,DISPID**) DECLSPEC_HIDDEN; HRESULT remove_prop(DispatchEx*,BSTR,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT dispex_get_dynid(DispatchEx*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; +void dispex_traverse(DispatchEx*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; +void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Make nsIDOMHTMLDocument reference cycle collectable.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 94060b99c939413d9425f4c196e36066644421b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94060b99c939413d9425f4c19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 11:29:13 2012 +0200 mshtml: Make nsIDOMHTMLDocument reference cycle collectable. --- dlls/mshtml/htmldoc.c | 43 ++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/htmlnode.c | 6 +++++ dlls/mshtml/mshtml_private.h | 2 + 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8d5330e..d78767c 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2085,8 +2085,10 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) while(!list_empty(&This->plugin_hosts)) detach_plugin_host(LIST_ENTRY(list_head(&This->plugin_hosts), PluginHost, entry)); - if(This->nsdoc) + if(This->nsdoc) { release_document_mutation(This); + nsIDOMHTMLDocument_Release(This->nsdoc); + } heap_free(This->event_vector); destroy_htmldoc(&This->basedoc); @@ -2099,10 +2101,44 @@ static HRESULT HTMLDocumentNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HT return E_NOTIMPL; } +static void HTMLDocumentNode_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + + if(This->nsdoc) + note_cc_edge((nsISupports*)This->nsdoc, "This->nsdoc", cb); +} + +static void HTMLDocumentNode_unlink(HTMLDOMNode *iface) +{ + HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + + if(This->nsdoc) { + nsIDOMHTMLDocument *nsdoc = This->nsdoc; + + release_document_mutation(This); + This->nsdoc = NULL; + nsIDOMHTMLDocument_Release(nsdoc); + } +} + static const NodeImplVtbl HTMLDocumentNodeImplVtbl = { HTMLDocumentNode_QI, HTMLDocumentNode_destructor, - HTMLDocumentNode_clone + HTMLDocumentNode_clone, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLDocumentNode_traverse, + HTMLDocumentNode_unlink }; static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) @@ -2236,8 +2272,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); - /* No AddRef, share the reference with nsnode */ - assert((nsIDOMNode*)nsdoc == doc->node.nsnode); + nsIDOMHTMLDocument_AddRef(nsdoc); doc->nsdoc = nsdoc; init_document_mutation(doc); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 2afcb23..a9e5d3f 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1125,6 +1125,9 @@ static nsresult NSAPI HTMLDOMNode_traverse(void *ccp, void *p, nsCycleCollection note_cc_edge((nsISupports*)This->nsnode, "This->nsnode", cb); dispex_traverse(&This->dispex, cb); + if(This->vtbl->traverse) + This->vtbl->traverse(This, cb); + return NS_OK; } @@ -1134,6 +1137,9 @@ static nsresult NSAPI HTMLDOMNode_unlink(void *p) TRACE("%p\n", This); + if(This->vtbl->unlink) + This->vtbl->unlink(This); + dispex_unlink(&This->dispex); if(This->nsnode) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 803d214..af165bf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -587,6 +587,8 @@ typedef struct { HRESULT (*get_dispid)(HTMLDOMNode*,BSTR,DWORD,DISPID*); HRESULT (*invoke)(HTMLDOMNode*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*bind_to_tree)(HTMLDOMNode*); + void (*traverse)(HTMLDOMNode*,nsCycleCollectionTraversalCallback*); + void (*unlink)(HTMLDOMNode*); } NodeImplVtbl; struct HTMLDOMNode {

1 0

Jacek Caban : mshtml: Store MSHTML node reference in Gecko node object and get rid of all node list in document object .
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 12f1fbb7a4f0c6e741275e69eb9a12c4b32da79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f1fbb7a4f0c6e741275e69e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 11:29:34 2012 +0200 mshtml: Store MSHTML node reference in Gecko node object and get rid of all node list in document object. --- dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlnode.c | 65 ++++++++++++++++++++--------------------- dlls/mshtml/mshtml_private.h | 4 -- 3 files changed, 32 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d78767c..f9e11ce 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2080,7 +2080,6 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) detach_selection(This); detach_ranges(This); - release_nodes(This); while(!list_empty(&This->plugin_hosts)) detach_plugin_host(LIST_ENTRY(list_head(&This->plugin_hosts), PluginHost, entry)); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index a9e5d3f..7fcff17 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -1028,6 +1029,8 @@ void HTMLDOMNode_destructor(HTMLDOMNode *This) { if(This->nsnode) nsIDOMNode_Release(This->nsnode); + if(This->doc && &This->doc->node != This) + htmldoc_release(&This->doc->basedoc); if(This->event_target) release_event_target(This->event_target); } @@ -1045,17 +1048,23 @@ static const NodeImplVtbl HTMLDOMNodeImplVtbl = { void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsnode) { + nsresult nsres; + node->IHTMLDOMNode_iface.lpVtbl = &HTMLDOMNodeVtbl; node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; - ccref_init(&node->ccref, &doc->node != node ? 2 : 1); + + ccref_init(&node->ccref, 1); + + if(&doc->node != node) + htmldoc_addref(&doc->basedoc); node->doc = doc; if(nsnode) nsIDOMNode_AddRef(nsnode); node->nsnode = nsnode; - node->next = doc->nodes; - doc->nodes = node; + nsres = nsIDOMNode_SetMshtmlNode(nsnode, (nsISupports*)&node->IHTMLDOMNode_iface); + assert(nsres == NS_OK); } static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNode **ret) @@ -1123,6 +1132,8 @@ static nsresult NSAPI HTMLDOMNode_traverse(void *ccp, void *p, nsCycleCollection if(This->nsnode) note_cc_edge((nsISupports*)This->nsnode, "This->nsnode", cb); + if(This->doc && &This->doc->node != This) + note_cc_edge((nsISupports*)&This->doc->node.IHTMLDOMNode_iface, "This->doc", cb); dispex_traverse(&This->dispex, cb); if(This->vtbl->traverse) @@ -1148,6 +1159,14 @@ static nsresult NSAPI HTMLDOMNode_unlink(void *p) nsIDOMNode_Release(nsnode); } + if(This->doc && &This->doc->node != This) { + HTMLDocument *doc = &This->doc->basedoc; + This->doc = NULL; + htmldoc_release(doc); + }else { + This->doc = NULL; + } + return NS_OK; } @@ -1162,43 +1181,23 @@ void init_node_cc(void) ccp_init(&node_ccp, &node_ccp_callback); } -/* - * FIXME - * List looks really ugly here. We should use a better data structure or - * (better) find a way to store HTMLDOMelement pointer in nsIDOMNode. - */ - HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDOMNode **ret) { - HTMLDOMNode *iter = This->nodes; + nsISupports *unk = NULL; + nsresult nsres; - while(iter) { - if(iter->nsnode == nsnode) - break; - iter = iter->next; + nsres = nsIDOMNode_GetMshtmlNode(nsnode, &unk); + assert(nsres == NS_OK); + + if(unk) { + *ret = get_node_obj(This, (IUnknown*)unk); + return NS_OK; } - if(iter || !create) { - if(iter) - IHTMLDOMNode_AddRef(&iter->IHTMLDOMNode_iface); - *ret = iter; + if(!create) { + *ret = NULL; return S_OK; } return create_node(This, nsnode, ret); } - -void release_nodes(HTMLDocumentNode *This) -{ - HTMLDOMNode *iter, *next; - - if(!This->nodes) - return; - - for(iter = This->nodes; iter; iter = next) { - next = iter->next; - iter->doc = NULL; - if(&This->node != iter) - IHTMLDOMNode_Release(&iter->IHTMLDOMNode_iface); - } -} diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index af165bf..f006176 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -603,8 +603,6 @@ struct HTMLDOMNode { HTMLDocumentNode *doc; event_target_t *event_target; ConnectionPointContainer *cp_container; - - HTMLDOMNode *next; }; static inline void node_addref(HTMLDOMNode *node) @@ -673,7 +671,6 @@ struct HTMLDocumentNode { LONG ref; nsIDOMHTMLDocument *nsdoc; - HTMLDOMNode *nodes; BOOL content_ready; event_target_t *body_event_target; @@ -881,7 +878,6 @@ HRESULT HTMLFrameBase_QI(HTMLFrameBase*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLFrameBase_destructor(HTMLFrameBase*) DECLSPEC_HIDDEN; HRESULT get_node(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLDOMNode**) DECLSPEC_HIDDEN; -void release_nodes(HTMLDocumentNode*) DECLSPEC_HIDDEN; HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : ole32: Use proper allocators for storing source in ErrorInfoImpl.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 4843f031f987ad4ac5bf21a64d90d3ffd5a0e8ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4843f031f987ad4ac5bf21a64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 11:49:09 2012 +0200 ole32: Use proper allocators for storing source in ErrorInfoImpl. --- dlls/ole32/errorinfo.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 055d6a5..8dbfff9 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -41,6 +41,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +static inline WCHAR *heap_strdupW(const WCHAR *str) +{ + WCHAR *ret = NULL; + + if(str) { + size_t size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = heap_alloc(size); + if(ret) + memcpy(ret, str, size); + } + + return ret; +} + /* this code is from SysAllocStringLen (ole2disp.c in oleaut32) */ static BSTR ERRORINFO_SysAllocString(const OLECHAR* in) { @@ -129,7 +155,7 @@ typedef struct ErrorInfoImpl LONG ref; GUID m_Guid; - BSTR bstrSource; + WCHAR *source; BSTR bstrDescription; BSTR bstrHelpFile; DWORD m_dwHelpContext; @@ -203,7 +229,7 @@ static ULONG WINAPI IErrorInfoImpl_Release( { TRACE("-- destroying IErrorInfo(%p)\n",This); - ERRORINFO_SysFreeString(This->bstrSource); + heap_free(This->source); ERRORINFO_SysFreeString(This->bstrDescription); ERRORINFO_SysFreeString(This->bstrHelpFile); HeapFree(GetProcessHeap(),0,This); @@ -231,7 +257,7 @@ static HRESULT WINAPI IErrorInfoImpl_GetSource( TRACE("(%p)->(pBstrSource=%p)\n",This,pBstrSource); if (pBstrSource == NULL) return E_INVALIDARG; - *pBstrSource = ERRORINFO_SysAllocString(This->bstrSource); + *pBstrSource = SysAllocString(This->source); return S_OK; } @@ -329,9 +355,9 @@ static HRESULT WINAPI ICreateErrorInfoImpl_SetSource( { ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); TRACE("(%p): %s\n",This, debugstr_w(szSource)); - if (This->bstrSource != NULL) - ERRORINFO_SysFreeString(This->bstrSource); - This->bstrSource = ERRORINFO_SysAllocString(szSource); + + heap_free(This->source); + This->source = heap_strdupW(szSource); return S_OK; } @@ -423,7 +449,7 @@ static const ISupportErrorInfoVtbl SupportErrorInfoVtbl = static IErrorInfo* IErrorInfoImpl_Constructor(void) { - ErrorInfoImpl *This = HeapAlloc(GetProcessHeap(), 0, sizeof(ErrorInfoImpl)); + ErrorInfoImpl *This = heap_alloc(sizeof(ErrorInfoImpl)); if (!This) return NULL; @@ -431,7 +457,7 @@ static IErrorInfo* IErrorInfoImpl_Constructor(void) This->ICreateErrorInfo_iface.lpVtbl = &CreateErrorInfoVtbl; This->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; This->ref = 1; - This->bstrSource = NULL; + This->source = NULL; This->bstrDescription = NULL; This->bstrHelpFile = NULL; This->m_dwHelpContext = 0;

1 0

Jacek Caban : ole32: Use proper allocators for storing description in ErrorInfoImpl.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: cd1f67ee24cc0f3c1ae9c114c7e681f4705df326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd1f67ee24cc0f3c1ae9c114c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 11:49:22 2012 +0200 ole32: Use proper allocators for storing description in ErrorInfoImpl. --- dlls/ole32/errorinfo.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 8dbfff9..fda942f 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -156,7 +156,7 @@ typedef struct ErrorInfoImpl GUID m_Guid; WCHAR *source; - BSTR bstrDescription; + WCHAR *description; BSTR bstrHelpFile; DWORD m_dwHelpContext; } ErrorInfoImpl; @@ -230,7 +230,7 @@ static ULONG WINAPI IErrorInfoImpl_Release( TRACE("-- destroying IErrorInfo(%p)\n",This); heap_free(This->source); - ERRORINFO_SysFreeString(This->bstrDescription); + heap_free(This->description); ERRORINFO_SysFreeString(This->bstrHelpFile); HeapFree(GetProcessHeap(),0,This); return 0; @@ -270,7 +270,7 @@ static HRESULT WINAPI IErrorInfoImpl_GetDescription( TRACE("(%p)->(pBstrDescription=%p)\n",This,pBstrDescription); if (pBstrDescription == NULL) return E_INVALIDARG; - *pBstrDescription = ERRORINFO_SysAllocString(This->bstrDescription); + *pBstrDescription = SysAllocString(This->description); return S_OK; } @@ -368,10 +368,9 @@ static HRESULT WINAPI ICreateErrorInfoImpl_SetDescription( { ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); TRACE("(%p): %s\n",This, debugstr_w(szDescription)); - if (This->bstrDescription != NULL) - ERRORINFO_SysFreeString(This->bstrDescription); - This->bstrDescription = ERRORINFO_SysAllocString(szDescription); + heap_free(This->description); + This->description = heap_strdupW(szDescription); return S_OK; } @@ -458,7 +457,7 @@ static IErrorInfo* IErrorInfoImpl_Constructor(void) This->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; This->ref = 1; This->source = NULL; - This->bstrDescription = NULL; + This->description = NULL; This->bstrHelpFile = NULL; This->m_dwHelpContext = 0;

1 0

Jacek Caban : ole32: Use proper allocators for storing help file in ErrorInfoImpl.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 4da232070e253fe4a4f6f9a0893faad3d20103f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da232070e253fe4a4f6f9a08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 11:49:33 2012 +0200 ole32: Use proper allocators for storing help file in ErrorInfoImpl. --- dlls/ole32/errorinfo.c | 96 +++-------------------------------------------- 1 files changed, 7 insertions(+), 89 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index fda942f..b71ee2d 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -67,86 +67,6 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) return ret; } -/* this code is from SysAllocStringLen (ole2disp.c in oleaut32) */ -static BSTR ERRORINFO_SysAllocString(const OLECHAR* in) -{ - DWORD bufferSize; - DWORD* newBuffer; - WCHAR* stringBuffer; - DWORD len; - - if (in == NULL) - return NULL; - /* - * Find the length of the buffer passed-in, in bytes. - */ - len = strlenW(in); - bufferSize = len * sizeof (WCHAR); - - /* - * Allocate a new buffer to hold the string. - * don't forget to keep an empty spot at the beginning of the - * buffer for the character count and an extra character at the - * end for the '\0'. - */ - newBuffer = HeapAlloc(GetProcessHeap(), 0, - bufferSize + sizeof(WCHAR) + sizeof(DWORD)); - - /* - * If the memory allocation failed, return a null pointer. - */ - if (newBuffer==0) - return 0; - - /* - * Copy the length of the string in the placeholder. - */ - *newBuffer = bufferSize; - - /* - * Skip the byte count. - */ - newBuffer++; - - /* - * Copy the information in the buffer. It is not possible to pass - * a NULL pointer here. - */ - memcpy(newBuffer, in, bufferSize); - - /* - * Make sure that there is a nul character at the end of the - * string. - */ - stringBuffer = (WCHAR*)newBuffer; - stringBuffer[len] = 0; - - return stringBuffer; -} - -/* this code is from SysFreeString (ole2disp.c in oleaut32)*/ -static VOID ERRORINFO_SysFreeString(BSTR in) -{ - DWORD* bufferPointer; - - /* NULL is a valid parameter */ - if(!in) return; - - /* - * We have to be careful when we free a BSTR pointer, it points to - * the beginning of the string but it skips the byte count contained - * before the string. - */ - bufferPointer = (DWORD*)in; - - bufferPointer--; - - /* - * Free the memory from it's "real" origin. - */ - HeapFree(GetProcessHeap(), 0, bufferPointer); -} - typedef struct ErrorInfoImpl { IErrorInfo IErrorInfo_iface; @@ -157,7 +77,7 @@ typedef struct ErrorInfoImpl GUID m_Guid; WCHAR *source; WCHAR *description; - BSTR bstrHelpFile; + WCHAR *help_file; DWORD m_dwHelpContext; } ErrorInfoImpl; @@ -231,9 +151,8 @@ static ULONG WINAPI IErrorInfoImpl_Release( heap_free(This->source); heap_free(This->description); - ERRORINFO_SysFreeString(This->bstrHelpFile); - HeapFree(GetProcessHeap(),0,This); - return 0; + heap_free(This->help_file); + heap_free(This); } return ref; } @@ -284,7 +203,7 @@ static HRESULT WINAPI IErrorInfoImpl_GetHelpFile( TRACE("(%p)->(pBstrHelpFile=%p)\n",This, pBstrHelpFile); if (pBstrHelpFile == NULL) return E_INVALIDARG; - *pBstrHelpFile = ERRORINFO_SysAllocString(This->bstrHelpFile); + *pBstrHelpFile = SysAllocString(This->help_file); return S_OK; } @@ -380,9 +299,8 @@ static HRESULT WINAPI ICreateErrorInfoImpl_SetHelpFile( { ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); TRACE("(%p,%s)\n",This,debugstr_w(szHelpFile)); - if (This->bstrHelpFile != NULL) - ERRORINFO_SysFreeString(This->bstrHelpFile); - This->bstrHelpFile = ERRORINFO_SysAllocString(szHelpFile); + heap_free(This->help_file); + This->help_file = heap_strdupW(szHelpFile); return S_OK; } @@ -458,7 +376,7 @@ static IErrorInfo* IErrorInfoImpl_Constructor(void) This->ref = 1; This->source = NULL; This->description = NULL; - This->bstrHelpFile = NULL; + This->help_file = NULL; This->m_dwHelpContext = 0; return &This->IErrorInfo_iface;

1 0

Henri Verbeet : ddraw: Implement ddraw7_GetVerticalBlankStatus() on top of wined3d_get_adapter_raster_status().
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 5f83f2cdf4fb64cd972741f3606d05d9cda96a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f83f2cdf4fb64cd972741f36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 18 21:32:31 2012 +0200 ddraw: Implement ddraw7_GetVerticalBlankStatus() on top of wined3d_get_adapter_raster_status(). --- dlls/ddraw/ddraw.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b96fd48..3accf03 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1620,31 +1620,27 @@ static HRESULT WINAPI ddraw1_GetMonitorFrequency(IDirectDraw *iface, DWORD *freq return ddraw7_GetMonitorFrequency(&ddraw->IDirectDraw7_iface, frequency); } -/***************************************************************************** - * IDirectDraw7::GetVerticalBlankStatus - * - * Returns the Vertical blank status of the monitor. This should be in WineD3D - * too basically, but as it's a semi stub, I didn't create a function there - * - * Params: - * status: Pointer to a BOOL to be filled with the vertical blank status - * - * Returns - * DD_OK on success - * DDERR_INVALIDPARAMS if status is NULL - * - *****************************************************************************/ static HRESULT WINAPI ddraw7_GetVerticalBlankStatus(IDirectDraw7 *iface, BOOL *status) { - static BOOL fake_vblank; + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + struct wined3d_raster_status raster_status; + HRESULT hr; TRACE("iface %p, status %p.\n", iface, status); if(!status) return DDERR_INVALIDPARAMS; - *status = fake_vblank; - fake_vblank = !fake_vblank; + wined3d_mutex_lock(); + hr = wined3d_get_adapter_raster_status(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &raster_status); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to get raster status, hr %#x.\n", hr); + return hr; + } + + *status = raster_status.in_vblank; return DD_OK; }

1 0