wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

Nikolay Sivov : msxml3: Update refcount in replaceNode().
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 01dd81a78c16130629e97ea8bc598e284363a530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01dd81a78c16130629e97ea8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 25 15:36:56 2013 +0400 msxml3: Update refcount in replaceNode(). --- dlls/msxml3/node.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8571955..20f9ba9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -511,6 +511,7 @@ HRESULT node_replace_child(xmlnode *This, IXMLDOMNode *newChild, IXMLDOMNode *ol xmlnode *old_child, *new_child; xmlDocPtr leaving_doc; xmlNode *my_ancestor; + int refcount = 0; /* Do not believe any documentation telling that newChild == NULL means removal. It does certainly *not* apply to msxml3! */ @@ -548,9 +549,13 @@ HRESULT node_replace_child(xmlnode *This, IXMLDOMNode *newChild, IXMLDOMNode *ol WARN("%p is not an orphan of %p\n", new_child->node, new_child->node->doc); leaving_doc = new_child->node->doc; - xmldoc_add_ref(old_child->node->doc); + + if (leaving_doc != old_child->node->doc) + refcount = xmlnode_get_inst_cnt(new_child); + + if (refcount) xmldoc_add_refs(old_child->node->doc, refcount); xmlReplaceNode(old_child->node, new_child->node); - xmldoc_release(leaving_doc); + if (refcount) xmldoc_release_refs(leaving_doc, refcount); new_child->parent = old_child->parent; old_child->parent = NULL;

1 0

Nikolay Sivov : msxml3: Better handle cross-tree node moves.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: cb9d787be150af96c75a652341622d086f7da1ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9d787be150af96c75a65234… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 25 00:30:22 2013 +0400 msxml3: Better handle cross-tree node moves. --- dlls/msxml3/domdoc.c | 24 +++++++++++--- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 75 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 91 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f1915a3..fb96ba0 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -553,19 +553,28 @@ void xmldoc_init(xmlDocPtr doc, MSXML_VERSION version) priv_from_xmlDocPtr(doc)->properties = create_properties(version); } -LONG xmldoc_add_ref(xmlDocPtr doc) +LONG xmldoc_add_refs(xmlDocPtr doc, LONG refs) { - LONG ref = InterlockedIncrement(&priv_from_xmlDocPtr(doc)->refs); + LONG ref = InterlockedExchangeAdd(&priv_from_xmlDocPtr(doc)->refs, refs) + refs; TRACE("(%p)->(%d)\n", doc, ref); return ref; } -LONG xmldoc_release(xmlDocPtr doc) +LONG xmldoc_add_ref(xmlDocPtr doc) +{ + return xmldoc_add_refs(doc, 1); +} + +LONG xmldoc_release_refs(xmlDocPtr doc, LONG refs) { xmldoc_priv *priv = priv_from_xmlDocPtr(doc); - LONG ref = InterlockedDecrement(&priv->refs); + LONG ref = InterlockedExchangeAdd(&priv->refs, -refs) - refs; TRACE("(%p)->(%d)\n", doc, ref); - if(ref == 0) + + if (ref < 0) + WARN("negative refcount, expect troubles\n"); + + if (ref == 0) { orphan_entry *orphan, *orphan2; TRACE("freeing docptr %p\n", doc); @@ -584,6 +593,11 @@ LONG xmldoc_release(xmlDocPtr doc) return ref; } +LONG xmldoc_release(xmlDocPtr doc) +{ + return xmldoc_release_refs(doc, 1); +} + HRESULT xmldoc_add_orphan(xmlDocPtr doc, xmlNodePtr node) { xmldoc_priv *priv = priv_from_xmlDocPtr(doc); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 66baea8..3109a42 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -292,6 +292,8 @@ extern xmlChar *xmlChar_from_wchar( LPCWSTR str ) DECLSPEC_HIDDEN; extern void xmldoc_init( xmlDocPtr doc, MSXML_VERSION version ) DECLSPEC_HIDDEN; extern LONG xmldoc_add_ref( xmlDocPtr doc ) DECLSPEC_HIDDEN; extern LONG xmldoc_release( xmlDocPtr doc ) DECLSPEC_HIDDEN; +extern LONG xmldoc_add_refs( xmlDocPtr doc, LONG refs ) DECLSPEC_HIDDEN; +extern LONG xmldoc_release_refs ( xmlDocPtr doc, LONG refs ) DECLSPEC_HIDDEN; extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ) DECLSPEC_HIDDEN; extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ) DECLSPEC_HIDDEN; extern void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 867b890..8571955 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -374,11 +374,45 @@ HRESULT node_get_next_sibling(xmlnode *This, IXMLDOMNode **ret) return get_node(This, "next", This->node->next, ret); } +static int node_get_inst_cnt(xmlNodePtr node) +{ + int ret = *(LONG *)&node->_private; + xmlNodePtr child; + + /* add attribute counts */ + if (node->type == XML_ELEMENT_NODE) + { + xmlAttrPtr prop = node->properties; + + while (prop) + { + ret += node_get_inst_cnt((xmlNodePtr)prop); + prop = prop->next; + } + } + + /* add children counts */ + child = node->children; + while (child) + { + ret += node_get_inst_cnt(child); + child = child->next; + } + + return ret; +} + +static int xmlnode_get_inst_cnt(xmlnode *node) +{ + return node_get_inst_cnt(node->node); +} + HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT *ref_child, IXMLDOMNode **ret) { IXMLDOMNode *before = NULL; xmlnode *node_obj; + int refcount = 0; xmlDocPtr doc; HRESULT hr; @@ -414,6 +448,8 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT if(xmldoc_remove_orphan(node_obj->node->doc, node_obj->node) != S_OK) WARN("%p is not an orphan of %p\n", node_obj->node, node_obj->node->doc); + refcount = xmlnode_get_inst_cnt(node_obj); + if(before) { xmlnode *before_node_obj = get_node_obj(before); @@ -426,10 +462,16 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); } + doc = node_obj->node->doc; - xmldoc_add_ref(before_node_obj->node->doc); + + /* refs count including subtree */ + if (doc != before_node_obj->node->doc) + refcount = xmlnode_get_inst_cnt(node_obj); + + if (refcount) xmldoc_add_refs(before_node_obj->node->doc, refcount); xmlAddPrevSibling(before_node_obj->node, node_obj->node); - xmldoc_release(doc); + if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->parent; } else @@ -441,11 +483,15 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); } doc = node_obj->node->doc; - xmldoc_add_ref(This->node->doc); + + if (doc != This->node->doc) + refcount = xmlnode_get_inst_cnt(node_obj); + + if (refcount) xmldoc_add_refs(This->node->doc, refcount); /* xmlAddChild doesn't unlink node from previous parent */ xmlUnlinkNode(node_obj->node); xmlAddChild(This->node, node_obj->node); - xmldoc_release(doc); + if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->iface; } @@ -1017,17 +1063,36 @@ HRESULT node_get_base_name(xmlnode *This, BSTR *name) return S_OK; } +/* _private field holds a number of COM instances spawned from this libxml2 node */ +static void xmlnode_add_ref(xmlNodePtr node) +{ + if (node->type == XML_DOCUMENT_NODE) return; + InterlockedIncrement((LONG*)&node->_private); +} + +static void xmlnode_release(xmlNodePtr node) +{ + if (node->type == XML_DOCUMENT_NODE) return; + InterlockedDecrement((LONG*)&node->_private); +} + void destroy_xmlnode(xmlnode *This) { if(This->node) + { + xmlnode_release(This->node); xmldoc_release(This->node->doc); + } release_dispex(&This->dispex); } void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispex_static_data_t *dispex_data) { if(node) - xmldoc_add_ref( node->doc ); + { + xmlnode_add_ref(node); + xmldoc_add_ref(node->doc); + } This->node = node; This->iface = node_iface;

1 0

André Hentschel : api-ms-win*: Update spec files.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 91cec0e82af0e3f0e79df1db60b55155905bdd98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91cec0e82af0e3f0e79df1db6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 26 23:41:33 2013 +0100 api-ms-win*: Update spec files. --- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 83dc129..e7744a7 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -15,7 +15,7 @@ @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx @ stub AddAuditAccessObjectAce -@ stub AddMandatoryAce +@ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges @ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) advapi32.AllocateAndInitializeSid diff --git a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec index eacfd60..9d266fa 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec @@ -1,6 +1,6 @@ @ stdcall GetAcceptLanguagesW(ptr ptr) shlwapi.GetAcceptLanguagesW @ stdcall HashData(ptr long ptr long) shlwapi.HashData -@ stub IsInternetESCEnabled +@ stdcall IsInternetESCEnabled() shlwapi.IsInternetESCEnabled @ stdcall ParseURLW(wstr ptr) shlwapi.ParseURLW @ stdcall PathAddBackslashA(str) shlwapi.PathAddBackslashA @ stdcall PathAddBackslashW(wstr) shlwapi.PathAddBackslashW diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index 9b8ebcf..548ae83 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -15,7 +15,7 @@ @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx @ stub AddAuditAccessObjectAce -@ stub AddMandatoryAce +@ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges @ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) advapi32.AllocateAndInitializeSid

1 0

Michael Stefaniuc : shell32: Move IFSFolder_Constructor() to avoid forward declarations.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 8a40df9800f874b5dc1fee45f3da133e06a5c8db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a40df9800f874b5dc1fee45f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:36:58 2013 +0100 shell32: Move IFSFolder_Constructor() to avoid forward declarations. --- dlls/shell32/shfldr_fs.c | 74 ++++++++++++++++++--------------------------- 1 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index a88961c..6730733 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -78,11 +78,6 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IGenericSFImpl; -static const IShellFolder2Vtbl sfvt; -static const IPersistFolder3Vtbl pfvt; -static const IDropTargetVtbl dtvt; -static const ISFHelperVtbl shvt; - static inline IGenericSFImpl *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, IGenericSFImpl, IUnknown_inner); @@ -199,45 +194,6 @@ static const shvheader GenericSFHeader[] = { #define GENERICSHELLVIEWCOLUMNS 5 /************************************************************************** -* IFSFolder_Constructor -* -* NOTES -* creating undocumented ShellFS_Folder as part of an aggregation -* {F3364BA0-65B9-11CE-A9BA-00AA004AE837} -* -*/ -HRESULT WINAPI -IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) -{ - IGenericSFImpl *sf; - - TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); - - if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown)) - return CLASS_E_NOAGGREGATION; - sf = LocalAlloc (LMEM_ZEROINIT, sizeof (IGenericSFImpl)); - if (!sf) - return E_OUTOFMEMORY; - - sf->ref = 0; - sf->IUnknown_inner.lpVtbl = &unkvt; - sf->IShellFolder2_iface.lpVtbl = &sfvt; - sf->IPersistFolder3_iface.lpVtbl = &pfvt; - sf->IDropTarget_iface.lpVtbl = &dtvt; - sf->ISFHelper_iface.lpVtbl = &shvt; - sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; - sf->outer_unk = pUnkOuter ? pUnkOuter : &sf->IUnknown_inner; - - if (FAILED(IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv))) { - IUnknown_Release(&sf->IUnknown_inner); - return E_NOINTERFACE; - } - - TRACE ("--%p\n", *ppv); - return S_OK; -} - -/************************************************************************** * IShellFolder_fnQueryInterface */ static HRESULT WINAPI IShellFolder_fnQueryInterface(IShellFolder2 *iface, REFIID riid, @@ -1689,3 +1645,33 @@ static const IDropTargetVtbl dtvt = { ISFDropTarget_DragLeave, ISFDropTarget_Drop }; + +HRESULT WINAPI IFSFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) +{ + IGenericSFImpl *sf; + HRESULT hr; + + TRACE("outer_unk=%p %s\n", outer_unk, shdebugstr_guid(riid)); + + if (outer_unk && !IsEqualIID(riid, &IID_IUnknown)) + return CLASS_E_NOAGGREGATION; + + sf = LocalAlloc(LMEM_ZEROINIT, sizeof(*sf)); + if (!sf) + return E_OUTOFMEMORY; + + sf->ref = 1; + sf->IUnknown_inner.lpVtbl = &unkvt; + sf->IShellFolder2_iface.lpVtbl = &sfvt; + sf->IPersistFolder3_iface.lpVtbl = &pfvt; + sf->IDropTarget_iface.lpVtbl = &dtvt; + sf->ISFHelper_iface.lpVtbl = &shvt; + sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; + sf->outer_unk = outer_unk ? outer_unk : &sf->IUnknown_inner; + + hr = IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv); + IUnknown_Release(&sf->IUnknown_inner); + + TRACE ("--%p\n", *ppv); + return hr; +}

1 0

Michael Stefaniuc : shell32: Finish the COM cleanup of ShellFSFolder.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: a5560ebee68aa6305dc67c3f826aa39b4591821f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5560ebee68aa6305dc67c3f8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:35:56 2013 +0100 shell32: Finish the COM cleanup of ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 57 ++++++++++++++------------------------------- 1 files changed, 18 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 516750d..a88961c 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -63,8 +63,8 @@ typedef struct { LONG ref; IShellFolder2 IShellFolder2_iface; IPersistFolder3 IPersistFolder3_iface; - const IDropTargetVtbl *lpvtblDropTarget; - const ISFHelperVtbl *lpvtblSFHelper; + IDropTarget IDropTarget_iface; + ISFHelper ISFHelper_iface; IUnknown *outer_unk; CLSID *pclsid; @@ -98,23 +98,16 @@ static inline IGenericSFImpl *impl_from_IPersistFolder3(IPersistFolder3 *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, IPersistFolder3_iface); } -static inline IGenericSFImpl *impl_from_IDropTarget( IDropTarget *iface ) +static inline IGenericSFImpl *impl_from_IDropTarget(IDropTarget *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblDropTarget)); + return CONTAINING_RECORD(iface, IGenericSFImpl, IDropTarget_iface); } -static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) +static inline IGenericSFImpl *impl_from_ISFHelper(ISFHelper *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblSFHelper)); + return CONTAINING_RECORD(iface, IGenericSFImpl, ISFHelper_iface); } - -/* - converts This to an interface pointer -*/ -#define _IDropTarget_(This) (&(This)->lpvtblDropTarget) -#define _ISFHelper_(This) (&(This)->lpvtblSFHelper) - /************************************************************************** * registers clipboardformat once */ @@ -146,10 +139,10 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo IsEqualIID(riid, &IID_IPersistFolder2) || IsEqualIID(riid, &IID_IPersistFolder3)) *ppvObj = &This->IPersistFolder3_iface; else if (IsEqualIID (riid, &IID_ISFHelper)) - *ppvObj = _ISFHelper_ (This); + *ppvObj = &This->ISFHelper_iface; else if (IsEqualIID (riid, &IID_IDropTarget)) { - *ppvObj = _IDropTarget_ (This); - SF_RegisterClipFmt (This); + *ppvObj = &This->IDropTarget_iface; + SF_RegisterClipFmt(This); } if (*ppvObj) { @@ -230,8 +223,8 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) sf->IUnknown_inner.lpVtbl = &unkvt; sf->IShellFolder2_iface.lpVtbl = &sfvt; sf->IPersistFolder3_iface.lpVtbl = &pfvt; - sf->lpvtblDropTarget = &dtvt; - sf->lpvtblSFHelper = &shvt; + sf->IDropTarget_iface.lpVtbl = &dtvt; + sf->ISFHelper_iface.lpVtbl = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; sf->outer_unk = pUnkOuter ? pUnkOuter : &sf->IUnknown_inner; @@ -1105,31 +1098,24 @@ static const IShellFolder2Vtbl sfvt = * ISFHelper for IShellFolder implementation */ -static HRESULT WINAPI -ISFHelper_fnQueryInterface (ISFHelper * iface, REFIID riid, LPVOID * ppvObj) +static HRESULT WINAPI ISFHelper_fnQueryInterface(ISFHelper *iface, REFIID riid, void **ppvObj) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } -static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) +static ULONG WINAPI ISFHelper_fnAddRef(ISFHelper *iface) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef(This->outer_unk); } -static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) +static ULONG WINAPI ISFHelper_fnRelease(ISFHelper *iface) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)\n", This); - return IUnknown_Release(This->outer_unk); } @@ -1612,31 +1598,24 @@ static const IPersistFolder3Vtbl pfvt = /**************************************************************************** * ISFDropTarget implementation */ -static HRESULT WINAPI -ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj) +static HRESULT WINAPI ISFDropTarget_QueryInterface(IDropTarget *iface, REFIID riid, void **ppv) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } -static ULONG WINAPI ISFDropTarget_AddRef (IDropTarget * iface) +static ULONG WINAPI ISFDropTarget_AddRef(IDropTarget *iface) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - return IUnknown_AddRef(This->outer_unk); } -static ULONG WINAPI ISFDropTarget_Release (IDropTarget * iface) +static ULONG WINAPI ISFDropTarget_Release(IDropTarget *iface) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - return IUnknown_Release(This->outer_unk); }

1 0

Michael Stefaniuc : shell32: Get rid of a helper function.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 00a20667fa3437c851bdf0e46ec5ff08c47d122e URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a20667fa3437c851bdf0e46… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:35:00 2013 +0100 shell32: Get rid of a helper function. --- dlls/shell32/shfldr_fs.c | 31 ++++++++----------------------- 1 files changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index f52c192..516750d 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1612,27 +1612,6 @@ static const IPersistFolder3Vtbl pfvt = /**************************************************************************** * ISFDropTarget implementation */ -static BOOL -ISFDropTarget_QueryDrop (IDropTarget * iface, DWORD dwKeyState, - LPDWORD pdwEffect) -{ - DWORD dwEffect = *pdwEffect; - - IGenericSFImpl *This = impl_from_IDropTarget(iface); - - *pdwEffect = DROPEFFECT_NONE; - - if (This->fAcceptFmt) { /* Does our interpretation of the keystate ... */ - *pdwEffect = KeyStateToDropEffect (dwKeyState); - - /* ... matches the desired effect ? */ - if (dwEffect & *pdwEffect) { - return TRUE; - } - } - return FALSE; -} - static HRESULT WINAPI ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj) { @@ -1673,7 +1652,10 @@ ISFDropTarget_DragEnter (IDropTarget * iface, IDataObject * pDataObject, InitFormatEtc (fmt, This->cfShellIDList, TYMED_HGLOBAL); This->fAcceptFmt = IDataObject_QueryGetData (pDataObject, &fmt) == S_OK; - ISFDropTarget_QueryDrop (iface, dwKeyState, pdwEffect); + if (This->fAcceptFmt) + *pdwEffect = KeyStateToDropEffect(dwKeyState); + else + *pdwEffect = DROPEFFECT_NONE; return S_OK; } @@ -1689,7 +1671,10 @@ ISFDropTarget_DragOver (IDropTarget * iface, DWORD dwKeyState, POINTL pt, if (!pdwEffect) return E_INVALIDARG; - ISFDropTarget_QueryDrop (iface, dwKeyState, pdwEffect); + if (This->fAcceptFmt) + *pdwEffect = KeyStateToDropEffect(dwKeyState); + else + *pdwEffect = DROPEFFECT_NONE; return S_OK; }

1 0

Michael Stefaniuc : shell32: COM clean up for IPersistFolder3 in ShellFSFolder.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 90d88de2bfda806ce4d84cbec94d179ee2bc9211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d88de2bfda806ce4d84cbec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:33:53 2013 +0100 shell32: COM clean up for IPersistFolder3 in ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 46 ++++++++++++++-------------------------------- 1 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 0d52156..f52c192 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -62,7 +62,7 @@ typedef struct { IUnknown IUnknown_inner; LONG ref; IShellFolder2 IShellFolder2_iface; - const IPersistFolder3Vtbl *lpvtblPersistFolder3; + IPersistFolder3 IPersistFolder3_iface; const IDropTargetVtbl *lpvtblDropTarget; const ISFHelperVtbl *lpvtblSFHelper; IUnknown *outer_unk; @@ -79,7 +79,7 @@ typedef struct { } IGenericSFImpl; static const IShellFolder2Vtbl sfvt; -static const IPersistFolder3Vtbl vt_FSFldr_PersistFolder3; /* IPersistFolder3 for a FS_Folder */ +static const IPersistFolder3Vtbl pfvt; static const IDropTargetVtbl dtvt; static const ISFHelperVtbl shvt; @@ -93,9 +93,9 @@ static inline IGenericSFImpl *impl_from_IShellFolder2(IShellFolder2 *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, IShellFolder2_iface); } -static inline IGenericSFImpl *impl_from_IPersistFolder3( IPersistFolder3 *iface ) +static inline IGenericSFImpl *impl_from_IPersistFolder3(IPersistFolder3 *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblPersistFolder3)); + return CONTAINING_RECORD(iface, IGenericSFImpl, IPersistFolder3_iface); } static inline IGenericSFImpl *impl_from_IDropTarget( IDropTarget *iface ) @@ -112,10 +112,6 @@ static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) /* converts This to an interface pointer */ -#define _IPersist_(This) (&(This)->lpvtblPersistFolder3) -#define _IPersistFolder_(This) (&(This)->lpvtblPersistFolder3) -#define _IPersistFolder2_(This) (&(This)->lpvtblPersistFolder3) -#define _IPersistFolder3_(This) (&(This)->lpvtblPersistFolder3) #define _IDropTarget_(This) (&(This)->lpvtblDropTarget) #define _ISFHelper_(This) (&(This)->lpvtblSFHelper) @@ -146,14 +142,9 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo *ppvObj = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_IShellFolder) || IsEqualIID(riid, &IID_IShellFolder2)) *ppvObj = &This->IShellFolder2_iface; - else if (IsEqualIID (riid, &IID_IPersist)) - *ppvObj = _IPersist_ (This); - else if (IsEqualIID (riid, &IID_IPersistFolder)) - *ppvObj = _IPersistFolder_ (This); - else if (IsEqualIID (riid, &IID_IPersistFolder2)) - *ppvObj = _IPersistFolder2_ (This); - else if (IsEqualIID (riid, &IID_IPersistFolder3)) - *ppvObj = _IPersistFolder3_ (This); + else if (IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IPersistFolder) || + IsEqualIID(riid, &IID_IPersistFolder2) || IsEqualIID(riid, &IID_IPersistFolder3)) + *ppvObj = &This->IPersistFolder3_iface; else if (IsEqualIID (riid, &IID_ISFHelper)) *ppvObj = _ISFHelper_ (This); else if (IsEqualIID (riid, &IID_IDropTarget)) { @@ -238,7 +229,7 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) sf->ref = 0; sf->IUnknown_inner.lpVtbl = &unkvt; sf->IShellFolder2_iface.lpVtbl = &sfvt; - sf->lpvtblPersistFolder3 = &vt_FSFldr_PersistFolder3; + sf->IPersistFolder3_iface.lpVtbl = &pfvt; sf->lpvtblDropTarget = &dtvt; sf->lpvtblSFHelper = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; @@ -1427,28 +1418,22 @@ static const ISFHelperVtbl shvt = * IFSFldr_PersistFolder3_QueryInterface * */ -static HRESULT WINAPI -IFSFldr_PersistFolder3_QueryInterface (IPersistFolder3 * iface, REFIID iid, - LPVOID * ppvObj) +static HRESULT WINAPI IFSFldr_PersistFolder3_QueryInterface(IPersistFolder3 *iface, REFIID iid, + void **ppv) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)\n", This); - - return IUnknown_QueryInterface(This->outer_unk, iid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, iid, ppv); } /************************************************************************ * IFSFldr_PersistFolder3_AddRef * */ -static ULONG WINAPI -IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) +static ULONG WINAPI IFSFldr_PersistFolder3_AddRef(IPersistFolder3 *iface) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef(This->outer_unk); } @@ -1456,13 +1441,10 @@ IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) * IFSFldr_PersistFolder3_Release * */ -static ULONG WINAPI -IFSFldr_PersistFolder3_Release (IPersistFolder3 * iface) +static ULONG WINAPI IFSFldr_PersistFolder3_Release(IPersistFolder3 *iface) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release(This->outer_unk); } @@ -1615,7 +1597,7 @@ IFSFldr_PersistFolder3_GetFolderTargetInfo (IPersistFolder3 * iface, return E_NOTIMPL; } -static const IPersistFolder3Vtbl vt_FSFldr_PersistFolder3 = +static const IPersistFolder3Vtbl pfvt = { IFSFldr_PersistFolder3_QueryInterface, IFSFldr_PersistFolder3_AddRef,

1 0

Andrew Talbot : urlmon: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: bc1a457b1ce4da8ffb0204cf4e3543a9483aa945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc1a457b1ce4da8ffb0204cf4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 26 22:16:03 2013 +0000 urlmon: Avoid signed-unsigned integer comparisons. --- dlls/urlmon/uri.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 90113f2..42cfe71 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -891,7 +891,7 @@ static BOOL ipv6_to_number(const ipv6_address *address, USHORT number[8]) { /* Means we just passed the elision and need to add its values to * 'number' before we do anything else. */ - DWORD j = 0; + INT j; for(j = 0; j < address->elision_size; j+=2) number[cur_component++] = 0; @@ -904,7 +904,8 @@ static BOOL ipv6_to_number(const ipv6_address *address, USHORT number[8]) { /* Case when the elision appears after the h16 components. */ if(!already_passed_elision && address->elision) { - for(i = 0; i < address->elision_size; i+=2) + INT j; + for(j = 0; j < address->elision_size; j+=2) number[cur_component++] = 0; }

1 0

Andrew Talbot : usbd.sys: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: ec128b732482356fb640e25d88dd1ed482524008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec128b732482356fb640e25d8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 26 22:16:05 2013 +0000 usbd.sys: Avoid signed-unsigned integer comparisons. --- dlls/usbd.sys/usbd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index 485a24c..ff0362c 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -105,7 +105,7 @@ PURB WINAPI USBD_CreateConfigurationRequestEx( interfaceInfo = &urb->u.UrbSelectConfiguration.Interface; for (interfaceEntry = InterfaceList; interfaceEntry->InterfaceDescriptor; interfaceEntry++) { - int i; + ULONG i; USB_INTERFACE_DESCRIPTOR *currentInterface; USB_ENDPOINT_DESCRIPTOR *endpointDescriptor; interfaceInfo->InterfaceNumber = interfaceEntry->InterfaceDescriptor->bInterfaceNumber;

1 0

Piotr Caban : hlink: Added basic Hlink::Navigate tests.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: 0159558560e6823f1390e1a62febc161ebebaac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0159558560e6823f1390e1a62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 26 17:21:31 2013 +0100 hlink: Added basic Hlink::Navigate tests. --- dlls/hlink/tests/hlink.c | 303 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 298 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0159558560e6823f1390e…

1 0

← Newer
1
2
3
4
5
6
7
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2013