wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Piotr Caban : shlwapi: Fix MLBuildResURLW implementation.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 147ea8b7c6fb6621fdb4e171d756a9e715262d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=147ea8b7c6fb6621fdb4e171d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 15 08:18:55 2010 +0100 shlwapi: Fix MLBuildResURLW implementation. --- dlls/shlwapi/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index f8a5162..544b529 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2384,7 +2384,7 @@ HRESULT WINAPI MLBuildResURLW(LPCWSTR lpszLibName, HMODULE hMod, DWORD dwFlags, dwResLen = strlenW(lpszRes) + 1; if (dwDestLen >= dwResLen + 1) { - lpszDest[szResLen + dwPathLen + dwResLen] = '/'; + lpszDest[szResLen + dwPathLen-1] = '/'; memcpy(lpszDest + szResLen + dwPathLen, lpszRes, dwResLen * sizeof(WCHAR)); hRet = S_OK; }

1 0

Piotr Caban : jscript: Added implementation of Array.reverse.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 6f61893685b466357f264a367503cee183f39352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f61893685b466357f264a367… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 15 08:17:30 2010 +0100 jscript: Added implementation of Array.reverse. --- dlls/jscript/array.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 26 ++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 873ab6e..bb54493 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -469,8 +469,41 @@ static HRESULT Array_push(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + DispatchEx *jsthis; + DWORD length, k, l; + VARIANT v1, v2; + HRESULT hres1, hres2; + + TRACE("\n"); + + hres1 = get_length(ctx, vthis, ei, &jsthis, &length); + if(FAILED(hres1)) + return hres1; + + for(k=0; k<length/2; k++) { + l = length-k-1; + + hres1 = jsdisp_propget_idx(jsthis, k, &v1, ei, sp); + hres2 = jsdisp_propget_idx(jsthis, l, &v2, ei, sp); + + if(hres1 == DISP_E_UNKNOWNNAME) + jsdisp_delete_idx(jsthis, l); + else + jsdisp_propput_idx(jsthis, l, &v1, ei, sp); + + if(hres2 == DISP_E_UNKNOWNNAME) + jsdisp_delete_idx(jsthis, k); + else + jsdisp_propput_idx(jsthis, k, &v2, ei, sp); + } + + if(retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(jsthis); + IDispatch_AddRef(V_DISPATCH(retv)); + } + + return S_OK; } /* ECMA-262 3rd Edition 15.4.4.9 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7ad2984..69deab2 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -688,6 +688,31 @@ ok(arr.valueOf === Object.prototype.valueOf, "arr.valueOf !== Object.prototype.v ok(arr === arr.valueOf(), "arr !== arr.valueOf"); arr = [1,2,3]; +tmp = arr.reverse(); +ok(tmp === arr, "tmp !== arr"); +ok(arr.length === 3, "arr.length = " + arr.length); +ok(arr.toString() === "3,2,1", "arr.toString() = " + arr.toString()); + +arr = []; +arr[3] = 5; +arr[5] = 1; +tmp = arr.reverse(); +ok(tmp === arr, "tmp !== arr"); +ok(arr.length === 6, "arr.length = " + arr.length); +ok(arr.toString() === "1,,5,,,", "arr.toString() = " + arr.toString()); + +arr = new Object(); +arr.length = 3; +arr[0] = "aa"; +arr[2] = 2; +arr[7] = 3; +arr.reverse = Array.prototype.reverse; +tmp = arr.reverse(); +ok(tmp === arr, "tmp !== arr"); +ok(arr.length === 3, "arr.length = " + arr.length); +ok(arr[0] === 2 && arr[1] === undefined && arr[2] === "aa", "unexpected array"); + +arr = [1,2,3]; tmp = arr.unshift(0); ok(tmp === (invokeVersion < 2 ? undefined : 4), "[1,2,3].unshift(0) returned " +tmp); ok(arr.length === 4, "arr.length = " + arr.length); @@ -1854,6 +1879,7 @@ testArrayHostThis("shift"); testArrayHostThis("slice"); testArrayHostThis("splice"); testArrayHostThis("unshift"); +testArrayHostThis("reverse"); function testObjectInherit(obj, constr, ts, tls, vo) { ok(obj instanceof Object, "obj is not instance of Object");

1 0

Nikolay Sivov : msxml3/tests: Fix interface leak and message typo.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: e6edbc451de81f1258cb27d3f113971bbbe7aedf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6edbc451de81f1258cb27d3f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 15 00:44:19 2010 +0300 msxml3/tests: Fix interface leak and message typo. --- dlls/msxml3/tests/domdoc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 87ad9b5..49ffe1d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -509,8 +509,8 @@ static char *list_to_string(IXMLDOMNodeList *list) return buf; } -#define expect_node(node, expstr) { char str[4096]; node_to_string(node, str); ok(strcmp(str, expstr)==0, "Invalid node: %s, exptected %s\n", str, expstr); } -#define expect_list_and_release(list, expstr) { char *str = list_to_string(list); ok(strcmp(str, expstr)==0, "Invalid node list: %s, exptected %s\n", str, expstr); if (list) IXMLDOMNodeList_Release(list); } +#define expect_node(node, expstr) { char str[4096]; node_to_string(node, str); ok(strcmp(str, expstr)==0, "Invalid node: %s, expected %s\n", str, expstr); } +#define expect_list_and_release(list, expstr) { char *str = list_to_string(list); ok(strcmp(str, expstr)==0, "Invalid node list: %s, expected %s\n", str, expstr); if (list) IXMLDOMNodeList_Release(list); } static void test_domdoc( void ) { @@ -1071,6 +1071,7 @@ static void test_domnode( void ) r = IXMLDOMNode_get_ownerDocument( element, &owner ); ok( r == S_OK, "get_ownerDocument return code\n"); ok( owner != doc, "get_ownerDocument return\n"); + IXMLDOMDocument_Release(owner); type = NODE_INVALID; r = IXMLDOMNode_get_nodeType( element, &type);

1 0

Nikolay Sivov : msxml3: Track linked/ unlinked state for element and free node data only when unlinked.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: f9cb63116d2558dd2bb0759218b2d6773fb048a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9cb63116d2558dd2bb075921… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 15 00:18:32 2010 +0300 msxml3: Track linked/unlinked state for element and free node data only when unlinked. --- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/tests/xmlelem.c | 1 + dlls/msxml3/xmldoc.c | 4 ++-- dlls/msxml3/xmlelem.c | 16 ++++++++++++---- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index d62a8a4..e46642d 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -135,7 +135,7 @@ extern LONG xmldoc_release( xmlDocPtr doc ); extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ); extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ); -extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj ); +extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own ); extern xmlDocPtr parse_xml(char *ptr, int len); diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index bcbae94..3304d5a 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -523,6 +523,7 @@ static void test_xmlelem_children(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(child2 != NULL, "Expected not NULL child\n"); IXMLElementCollection_Release(collection); + IXMLElement_Release(child2); /* add element->child->child2 structure, then remove child2 from node */ V_VT(&vType) = VT_I4; diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index af67d4e..b77fd00 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -209,7 +209,7 @@ static HRESULT WINAPI xmldoc_get_root(IXMLDocument *iface, IXMLElement **p) if (!(root = xmlDocGetRootElement(This->xmldoc))) return E_FAIL; - return XMLElement_create((IUnknown *)This, root, (LPVOID *)p); + return XMLElement_create((IUnknown *)This, root, (LPVOID *)p, FALSE); } static HRESULT WINAPI xmldoc_get_fileSize(IXMLDocument *iface, BSTR *p) @@ -520,7 +520,7 @@ static HRESULT WINAPI xmldoc_createElement(IXMLDocument *iface, VARIANT vType, node->type = type_msxml_to_libxml(V_I4(&vType)); /* FIXME: create xmlNodePtr based on vType and var1 */ - return XMLElement_create((IUnknown *)iface, node, (LPVOID *)ppElem); + return XMLElement_create((IUnknown *)iface, node, (LPVOID *)ppElem, TRUE); } static const struct IXMLDocumentVtbl xmldoc_vtbl = diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index b96df3a..3c1f4f2 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -48,6 +48,7 @@ typedef struct _xmlelem const IXMLElementVtbl *lpVtbl; LONG ref; xmlNodePtr node; + BOOL own; } xmlelem; static inline xmlelem *impl_from_IXMLElement(IXMLElement *iface) @@ -94,6 +95,7 @@ static ULONG WINAPI xmlelem_Release(IXMLElement *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) { + if (This->own) xmlFreeNode(This->node); HeapFree(GetProcessHeap(), 0, This); } @@ -212,7 +214,7 @@ static HRESULT WINAPI xmlelem_get_parent(IXMLElement *iface, IXMLElement **paren if (!This->node->parent) return S_FALSE; - return XMLElement_create((IUnknown *)iface, This->node->parent, (LPVOID *)parent); + return XMLElement_create((IUnknown *)iface, This->node->parent, (LPVOID *)parent, FALSE); } static HRESULT WINAPI xmlelem_setAttribute(IXMLElement *iface, BSTR strPropertyName, @@ -407,6 +409,9 @@ static HRESULT WINAPI xmlelem_addChild(IXMLElement *iface, IXMLElement *pChildEl else child = xmlAddNextSibling(This->node, childElem->node->last); + /* parent is responsible for child data */ + if (child) childElem->own = FALSE; + return (child) ? S_OK : S_FALSE; } @@ -425,6 +430,8 @@ static HRESULT WINAPI xmlelem_removeChild(IXMLElement *iface, IXMLElement *pChil return E_INVALIDARG; xmlUnlinkNode(childElem->node); + /* standalone element now */ + childElem->own = TRUE; return S_OK; } @@ -452,7 +459,7 @@ static const struct IXMLElementVtbl xmlelem_vtbl = xmlelem_removeChild }; -HRESULT XMLElement_create(IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj) +HRESULT XMLElement_create(IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own) { xmlelem *elem; @@ -470,6 +477,7 @@ HRESULT XMLElement_create(IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj) elem->lpVtbl = &xmlelem_vtbl; elem->ref = 1; elem->node = node; + elem->own = own; *ppObj = &elem->lpVtbl; @@ -652,7 +660,7 @@ static HRESULT WINAPI xmlelem_collection_item(IXMLElementCollection *iface, VARI for (i = 0; i < index; i++) ptr = ptr->next; - return XMLElement_create((IUnknown *)iface, ptr, (LPVOID *)ppDisp); + return XMLElement_create((IUnknown *)iface, ptr, (LPVOID *)ppDisp, FALSE); } static const struct IXMLElementCollectionVtbl xmlelem_collection_vtbl = @@ -712,7 +720,7 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next( This->current = This->current->next; V_VT(rgVar) = VT_DISPATCH; - return XMLElement_create((IUnknown *)iface, ptr, (LPVOID *)&V_DISPATCH(rgVar)); + return XMLElement_create((IUnknown *)iface, ptr, (LPVOID *)&V_DISPATCH(rgVar), FALSE); } static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Skip(

1 0

Nikolay Sivov : msxml3: In IXMLElementCollection store pointer to node instead of pointer to children .
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 20e63dcfd1634352ae8d94b8f985749dc34f65f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e63dcfd1634352ae8d94b8f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 15 00:16:03 2010 +0300 msxml3: In IXMLElementCollection store pointer to node instead of pointer to children. Collection should be able to track node removal from children list. --- dlls/msxml3/tests/xmlelem.c | 2 +- dlls/msxml3/xmlelem.c | 36 ++++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index dec1464..bcbae94 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -483,7 +483,7 @@ static void test_xmlelem_children(void) length = -1; hr = IXMLElementCollection_get_length(collection, &length); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - todo_wine ok(length == 0, "Expected 0, got %08x\n", length); + ok(length == 0, "Expected 0, got %08x\n", length); IXMLElementCollection_Release(collection); hr = IXMLElement_AddRef(child); diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 8fe24eb..b96df3a 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -316,7 +316,7 @@ static HRESULT WINAPI xmlelem_get_children(IXMLElement *iface, IXMLElementCollec if (!p) return E_INVALIDARG; - return XMLElementCollection_create((IUnknown *)iface, This->node->children, (LPVOID *)p); + return XMLElementCollection_create((IUnknown *)iface, This->node, (LPVOID *)p); } static LONG type_libxml_to_msxml(xmlElementType type) @@ -492,6 +492,19 @@ typedef struct _xmlelem_collection xmlNodePtr current; } xmlelem_collection; +static inline LONG xmlelem_collection_updatelength(xmlelem_collection *collection) +{ + xmlNodePtr ptr = collection->node->children; + + collection->length = 0; + while (ptr) + { + collection->length++; + ptr = ptr->next; + } + return collection->length; +} + static inline xmlelem_collection *impl_from_IXMLElementCollection(IXMLElementCollection *iface) { return (xmlelem_collection *)((char*)iface - FIELD_OFFSET(xmlelem_collection, lpVtbl)); @@ -596,7 +609,7 @@ static HRESULT WINAPI xmlelem_collection_get_length(IXMLElementCollection *iface if (!p) return E_INVALIDARG; - *p = This->length; + *p = xmlelem_collection_updatelength(This); return S_OK; } @@ -618,7 +631,7 @@ static HRESULT WINAPI xmlelem_collection_item(IXMLElementCollection *iface, VARI VARIANT var2, IDispatch **ppDisp) { xmlelem_collection *This = impl_from_IXMLElementCollection(iface); - xmlNodePtr ptr = This->node; + xmlNodePtr ptr = This->node->children; int index, i; TRACE("(%p, %p)\n", iface, ppDisp); @@ -631,6 +644,8 @@ static HRESULT WINAPI xmlelem_collection_item(IXMLElementCollection *iface, VARI index = V_I4(&var1); if (index < 0) return E_INVALIDARG; + + xmlelem_collection_updatelength(This); if (index >= This->length) return E_FAIL; @@ -711,7 +726,7 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Reset( IEnumVARIANT *iface) { xmlelem_collection *This = impl_from_IEnumVARIANT(iface); - This->current = This->node; + This->current = This->node->children; return S_OK; } @@ -736,13 +751,12 @@ static const struct IEnumVARIANTVtbl xmlelem_collection_IEnumVARIANTvtbl = static HRESULT XMLElementCollection_create(IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj) { xmlelem_collection *collection; - xmlNodePtr ptr; TRACE("(%p,%p)\n", pUnkOuter, ppObj); *ppObj = NULL; - if (!node) + if (!node->children) return S_FALSE; collection = HeapAlloc(GetProcessHeap(), 0, sizeof (*collection)); @@ -754,14 +768,8 @@ static HRESULT XMLElementCollection_create(IUnknown *pUnkOuter, xmlNodePtr node, collection->ref = 1; collection->length = 0; collection->node = node; - collection->current = node; - - ptr = node; - while (ptr) - { - collection->length++; - ptr = ptr->next; - } + collection->current = node->children; + xmlelem_collection_updatelength(collection); *ppObj = &collection->lpVtbl;

1 0

Nikolay Sivov : msxml3: Implement IXMLElement::removeChild() with some tests.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 7f5cedf70aa01f23ee7a6a92c63e62405c9adc88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5cedf70aa01f23ee7a6a92c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 15 00:13:50 2010 +0300 msxml3: Implement IXMLElement::removeChild() with some tests. --- dlls/msxml3/tests/xmlelem.c | 26 +++++++++++++++++++++++--- dlls/msxml3/xmlelem.c | 17 +++++++++++++++-- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index 38b621f..dec1464 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -478,7 +478,7 @@ static void test_xmlelem_children(void) /* remove/add child and check what happens with collection */ hr = IXMLElement_removeChild(element, child); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); length = -1; hr = IXMLElementCollection_get_length(collection, &length); @@ -522,14 +522,34 @@ static void test_xmlelem_children(void) hr = IXMLElementCollection_item(collection, vIndex, vName, (IDispatch **)&child2); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(child2 != NULL, "Expected not NULL child\n"); + IXMLElementCollection_Release(collection); + + /* add element->child->child2 structure, then remove child2 from node */ + V_VT(&vType) = VT_I4; + V_I4(&vType) = XMLELEMTYPE_TEXT; + V_VT(&vName) = VT_NULL; + hr = IXMLDocument_createElement(doc, vType, vName, &child2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(child2 != NULL, "Expected non-NULL child\n"); + + hr = IXMLElement_addChild(child, child2, 0, -1); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXMLElement_removeChild(element, child2); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IXMLElement_removeChild(child, child2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXMLElement_removeChild(child, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); IXMLElement_Release(element); IXMLElement_Release(child); - IXMLElementCollection_Release(collection); + IXMLElement_Release(child2); IXMLDocument_Release(doc); } - static BOOL test_try_xmldoc(void) { IXMLDocument *doc = NULL; diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index b91722c..8fe24eb 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -412,8 +412,21 @@ static HRESULT WINAPI xmlelem_addChild(IXMLElement *iface, IXMLElement *pChildEl static HRESULT WINAPI xmlelem_removeChild(IXMLElement *iface, IXMLElement *pChildElem) { - FIXME("(%p, %p): stub\n", iface, pChildElem); - return E_NOTIMPL; + xmlelem *This = impl_from_IXMLElement(iface); + xmlelem *childElem = impl_from_IXMLElement(pChildElem); + + TRACE("(%p, %p)\n", This, childElem); + + if (!pChildElem) + return E_INVALIDARG; + + /* only supported for This is childElem parent case */ + if (This->node != childElem->node->parent) + return E_INVALIDARG; + + xmlUnlinkNode(childElem->node); + + return S_OK; } static const struct IXMLElementVtbl xmlelem_vtbl =

1 0

Nikolay Sivov : msxml3: Don't preallocate root element, return new instance on each call.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 5afdfaba86f089dfef6f2ad2897321c3dc540f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afdfaba86f089dfef6f2ad28… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 15 00:10:22 2010 +0300 msxml3: Don't preallocate root element, return new instance on each call. --- dlls/msxml3/tests/xmldoc.c | 7 ++ dlls/msxml3/tests/xmlelem.c | 136 +++++++++++++++++++++++++++++++++++++++--- dlls/msxml3/xmldoc.c | 15 ++--- 3 files changed, 139 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 7cc6cd5..aadf088 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -141,6 +141,13 @@ static void test_xmldoc(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(element != NULL, "Expected non-NULL element\n"); + /* ::root() returns new instance each time */ + hr = IXMLDocument_get_root(doc, &child); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(child != NULL, "Expected non-NULL element\n"); + ok(child != element, "Expected new element instance\n"); + IXMLElement_Release(child); + hr = IXMLElement_get_type(element, &type); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(type == XMLELEMTYPE_ELEMENT, "Expected XMLELEMTYPE_ELEMENT, got %d\n", type); diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index 1738b2c..38b621f 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -53,11 +53,7 @@ static void test_xmlelem(void) hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); - if (FAILED(hr)) - { - skip("Failed to create XMLDocument instance\n"); - return; - } + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); V_VT(&vType) = VT_I4; V_I4(&vType) = XMLELEMTYPE_ELEMENT; @@ -265,11 +261,7 @@ static void test_xmlelem_collection(void) hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); - if (FAILED(hr)) - { - skip("Failed to create XMLDocument instance\n"); - return; - } + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); create_xml_file(szBankXML); GetFullPathNameA(szBankXML, MAX_PATH, pathA, NULL); @@ -438,6 +430,123 @@ cleanup: DeleteFileA("bank.xml"); } +static void test_xmlelem_children(void) +{ + IXMLDocument *doc = NULL; + IXMLElement *element = NULL, *child = NULL, *child2 = NULL; + IXMLElementCollection *collection = NULL; + VARIANT vType, vName, vIndex; + LONG length; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDocument, (LPVOID*)&doc); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + V_VT(&vType) = VT_I4; + V_I4(&vType) = XMLELEMTYPE_ELEMENT; + V_VT(&vName) = VT_NULL; + hr = IXMLDocument_createElement(doc, vType, vName, &element); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(element != NULL, "Expected non-NULL element\n"); + + V_VT(&vType) = VT_I4; + V_I4(&vType) = XMLELEMTYPE_TEXT; + V_VT(&vName) = VT_NULL; + hr = IXMLDocument_createElement(doc, vType, vName, &child); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(child != NULL, "Expected non-NULL child\n"); + + V_VT(&vType) = VT_I4; + V_I4(&vType) = XMLELEMTYPE_TEXT; + V_VT(&vName) = VT_NULL; + hr = IXMLDocument_createElement(doc, vType, vName, &child2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(child2 != NULL, "Expected non-NULL child\n"); + + hr = IXMLElement_addChild(element, child, 0, -1); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXMLElement_get_children(element, &collection); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(collection != NULL, "Expected non-NULL collection\n"); + + length = 0; + hr = IXMLElementCollection_get_length(collection, &length); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(length == 1, "Expected 1, got %08x\n", length); + + /* remove/add child and check what happens with collection */ + hr = IXMLElement_removeChild(element, child); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + length = -1; + hr = IXMLElementCollection_get_length(collection, &length); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine ok(length == 0, "Expected 0, got %08x\n", length); + IXMLElementCollection_Release(collection); + + hr = IXMLElement_AddRef(child); + ok(hr == 2, "Expected 2, got %08x\n", hr); + IXMLElement_Release(child); + hr = IXMLElement_addChild(element, child, 0, -1); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IXMLElement_AddRef(child); + ok(hr == 2, "Expected 2, got %08x\n", hr); + IXMLElement_Release(child); + hr = IXMLElement_addChild(element, child2, 0, -1); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXMLElement_get_children(element, &collection); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(collection != NULL, "Expected non-NULL collection\n"); + + hr = IXMLElement_AddRef(child); + ok(hr == 2, "Expected 2, got %08x\n", hr); + IXMLElement_Release(child); + + length = 0; + hr = IXMLElementCollection_get_length(collection, &length); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(length == 2, "Expected 2, got %08x\n", length); + + IXMLElement_Release(child2); + + length = 0; + hr = IXMLElementCollection_get_length(collection, &length); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(length == 2, "Expected 2, got %08x\n", length); + + V_VT(&vIndex) = VT_I4; + V_I4(&vIndex) = 1; + hr = IXMLElementCollection_item(collection, vIndex, vName, (IDispatch **)&child2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(child2 != NULL, "Expected not NULL child\n"); + + IXMLElement_Release(element); + IXMLElement_Release(child); + IXMLElementCollection_Release(collection); + IXMLDocument_Release(doc); +} + + +static BOOL test_try_xmldoc(void) +{ + IXMLDocument *doc = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDocument, (LPVOID*)&doc); + if (FAILED(hr)) + { + skip("Failed to create XMLDocument instance\n"); + return FALSE; + } + + IXMLDocument_Release(doc); + return TRUE; +} + START_TEST(xmlelem) { HRESULT hr; @@ -445,8 +554,15 @@ START_TEST(xmlelem) hr = CoInitialize(NULL); ok(hr == S_OK, "failed to init com\n"); + if (!test_try_xmldoc()) + { + CoUninitialize(); + return; + } + test_xmlelem(); test_xmlelem_collection(); + test_xmlelem_children(); CoUninitialize(); } diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index cf39cc5..af67d4e 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -54,7 +54,6 @@ typedef struct _xmldoc HRESULT error; /* IXMLDocument */ - IXMLElement *root; xmlDocPtr xmldoc; /* IPersistStream */ @@ -198,17 +197,19 @@ static HRESULT WINAPI xmldoc_Invoke(IXMLDocument *iface, DISPID dispIdMember, static HRESULT WINAPI xmldoc_get_root(IXMLDocument *iface, IXMLElement **p) { xmldoc *This = impl_from_IXMLDocument(iface); + xmlNodePtr root; TRACE("(%p, %p)\n", iface, p); if (!p) return E_INVALIDARG; - *p = This->root; - if (!*p) + *p = NULL; + + if (!(root = xmlDocGetRootElement(This->xmldoc))) return E_FAIL; - return S_OK; + return XMLElement_create((IUnknown *)This, root, (LPVOID *)p); } static HRESULT WINAPI xmldoc_get_fileSize(IXMLDocument *iface, BSTR *p) @@ -604,7 +605,6 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Load( IPersistStreamInit *iface, LPSTREAM pStm) { xmldoc *This = impl_from_IPersistStreamInit(iface); - xmlNodePtr xmlnode; HRESULT hr; HGLOBAL hglobal; DWORD read, written, len; @@ -653,9 +653,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Load( return E_FAIL; } - if (This->root) IXMLElement_Release(This->root); - xmlnode = xmlDocGetRootElement(This->xmldoc); - return XMLElement_create((IUnknown *)This, xmlnode, (LPVOID *)&This->root); + return S_OK; } static HRESULT WINAPI xmldoc_IPersistStreamInit_Save( @@ -708,7 +706,6 @@ HRESULT XMLDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->lpvtblIPersistStreamInit = &xmldoc_IPersistStreamInit_VTable; doc->ref = 1; doc->error = S_OK; - doc->root = NULL; doc->xmldoc = NULL; doc->stream = NULL;

1 0

Michael Stefaniuc : d3d10: Remove break after return (Smatch).
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: ea5896861f8af68d256938e33fc38068d3870748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5896861f8af68d256938e33… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 14 21:58:11 2010 +0100 d3d10: Remove break after return (Smatch). --- dlls/d3d10/effect.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9dc94b6..f31bddd 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -308,7 +308,6 @@ static HRESULT parse_shader(struct d3d10_effect_variable *v, const char *data) default: ERR("This should not happen!\n"); return E_FAIL; - break; } return parse_dxbc(ptr, dxbc_size, shader_chunk_handler, s);

1 0

Michael Stefaniuc : d3d10: Remove superfluous NULL check before HeapFree ( Smatch).
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 5cc257e5c215b4538512924eaedbd46ab80e77ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc257e5c215b4538512924ea… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 14 21:58:05 2010 +0100 d3d10: Remove superfluous NULL check before HeapFree (Smatch). --- dlls/d3d10/effect.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ae757f3..9dc94b6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1726,10 +1726,7 @@ static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) TRACE("pass %p\n", p); HeapFree(GetProcessHeap(), 0, p->name); - if (p->objects) - { - HeapFree(GetProcessHeap(), 0, p->objects); - } + HeapFree(GetProcessHeap(), 0, p->objects); if (p->annotations) {

1 0

Stefan Leichter : user.exe: Forward WNetGetUser16 to WNetGetUserA of mpr. dll, based on a patch from Andrew Nguyen.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 5ef5ead15fbebc52b799e1b5e59a52f69aed01b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef5ead15fbebc52b799e1b5e… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Jan 14 21:09:54 2010 +0100 user.exe: Forward WNetGetUser16 to WNetGetUserA of mpr.dll, based on a patch from Andrew Nguyen. --- dlls/user.exe16/Makefile.in | 2 +- dlls/user.exe16/network.c | 23 ++++++++++++++++++++--- dlls/user.exe16/user.exe16.spec | 2 +- include/wine/winnet16.h | 2 +- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in index 9efa686..e5015cb 100644 --- a/dlls/user.exe16/Makefile.in +++ b/dlls/user.exe16/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = user.exe16 -IMPORTS = user32 gdi32 kernel32 kernel ntdll +IMPORTS = mpr user32 gdi32 kernel32 kernel ntdll EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,user32.dll,--heap,65520 EXTRARCFLAGS = -O res16 diff --git a/dlls/user.exe16/network.c b/dlls/user.exe16/network.c index 105d016..8dc31b1 100644 --- a/dlls/user.exe16/network.c +++ b/dlls/user.exe16/network.c @@ -30,6 +30,7 @@ #include "windef.h" #include "winbase.h" +#include "winnetwk.h" #include "wine/winnet16.h" #include "wine/debug.h" @@ -306,10 +307,26 @@ WORD WINAPI WNetGetCaps16( WORD capability ) /************************************************************************** * WNetGetUser [USER.516] */ -WORD WINAPI WNetGetUser16( LPCSTR lpName, LPSTR szUser, LPINT16 nBufferSize ) +WORD WINAPI WNetGetUser16( LPSTR szUser, LPINT16 nBufferSize ) { - FIXME( "(%p, %p, %p): stub\n", lpName, szUser, nBufferSize ); - return WN16_NOT_SUPPORTED; + DWORD lpBufferSize, ret; + + if(!szUser || !nBufferSize) return WN16_BAD_POINTER; + + lpBufferSize = *nBufferSize; + ret = WNetGetUserA( NULL, szUser, &lpBufferSize ); + *nBufferSize = lpBufferSize; + + switch (ret) + { + case NO_ERROR: + return WN16_SUCCESS; + case ERROR_MORE_DATA: + return WN16_MORE_DATA; + default: + FIXME("Untranslated return value %d\n", ret); + } + return ret; } diff --git a/dlls/user.exe16/user.exe16.spec b/dlls/user.exe16/user.exe16.spec index 517ced8..7094f47 100644 --- a/dlls/user.exe16/user.exe16.spec +++ b/dlls/user.exe16/user.exe16.spec @@ -463,7 +463,7 @@ 513 pascal -ret16 WNetGetCaps(word) WNetGetCaps16 514 pascal -ret16 WNetDeviceMode(word) WNetDeviceMode16 515 pascal -ret16 WNetBrowseDialog(word word ptr) WNetBrowseDialog16 -516 pascal -ret16 WNetGetUser(ptr ptr ptr) WNetGetUser16 +516 pascal -ret16 WNetGetUser(ptr ptr) WNetGetUser16 517 pascal -ret16 WNetAddConnection(str str str) WNetAddConnection16 518 pascal -ret16 WNetCancelConnection(str word) WNetCancelConnection16 519 pascal -ret16 WNetGetError(ptr) WNetGetError16 diff --git a/include/wine/winnet16.h b/include/wine/winnet16.h index 8f04860..15b046e 100644 --- a/include/wine/winnet16.h +++ b/include/wine/winnet16.h @@ -199,7 +199,7 @@ WORD WINAPI WNetGetCaps16(WORD); * Get User */ -WORD WINAPI WNetGetUser16(LPCSTR,LPSTR,LPINT16); +WORD WINAPI WNetGetUser16(LPSTR,LPINT16); /*

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
62
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 January 2010