February 2010 - Wine-Commits

Nikolay Sivov : msxml3: Support more node types in IXMLDOMDocument_createNode().
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 16d83dc7d42dcd80a6ba495fa67270e1c77e4738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d83dc7d42dcd80a6ba495fa… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 03:48:46 2010 +0300 msxml3: Support more node types in IXMLDOMDocument_createNode(). --- dlls/msxml3/domdoc.c | 52 +++++++++++++++++++++++++++++-------------- dlls/msxml3/node.c | 3 ++ dlls/msxml3/tests/domdoc.c | 29 ++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d4be6b6..6c80844 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1342,11 +1342,11 @@ static HRESULT WINAPI domdoc_createNode( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); DOMNodeType node_type; - xmlNodePtr xmlnode = NULL; + xmlNodePtr xmlnode; xmlChar *xml_name; HRESULT hr; - TRACE("(%p)->(type,%s,%s,%p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); + TRACE("(%p)->(%s,%s,%p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); if(!node) return E_INVALIDARG; @@ -1354,8 +1354,7 @@ static HRESULT WINAPI domdoc_createNode( FIXME("nodes with namespaces currently not supported.\n"); hr = get_node_type(Type, &node_type); - if(FAILED(hr)) - return hr; + if(FAILED(hr)) return hr; TRACE("node_type %d\n", node_type); @@ -1365,30 +1364,49 @@ static HRESULT WINAPI domdoc_createNode( { case NODE_ELEMENT: xmlnode = xmlNewDocNode(get_doc(This), NULL, xml_name, NULL); - *node = create_node(xmlnode); - TRACE("created %p\n", xmlnode); break; case NODE_ATTRIBUTE: - xmlnode = (xmlNode *)xmlNewProp(NULL, xml_name, NULL); - if(xmlnode) - { - xmlnode->doc = get_doc( This ); - - *node = (IXMLDOMNode*)create_attribute(xmlnode); - } - - TRACE("created %p\n", xmlnode); + xmlnode = (xmlNodePtr)xmlNewDocProp(get_doc(This), xml_name, NULL); break; - + case NODE_TEXT: + xmlnode = (xmlNodePtr)xmlNewDocText(get_doc(This), NULL); + break; + case NODE_CDATA_SECTION: + xmlnode = xmlNewCDataBlock(get_doc(This), NULL, 0); + break; + case NODE_PROCESSING_INSTRUCTION: +#ifdef HAVE_XMLNEWDOCPI + xmlnode = xmlNewDocPI(get_doc(This), xml_name, NULL); +#else + FIXME("xmlNewDocPI() not supported, use libxml2 2.6.15 or greater\n"); + xmlnode = NULL; +#endif + break; + case NODE_COMMENT: + xmlnode = xmlNewDocComment(get_doc(This), NULL); + break; + case NODE_DOCUMENT_FRAGMENT: + xmlnode = xmlNewDocFragment(get_doc(This)); + break; + /* unsupported types */ + case NODE_DOCUMENT: + case NODE_DOCUMENT_TYPE: + case NODE_ENTITY: + case NODE_NOTATION: + heap_free(xml_name); + return E_INVALIDARG; default: FIXME("unhandled node type %d\n", node_type); + xmlnode = NULL; break; } + *node = create_node(xmlnode); heap_free(xml_name); - if(xmlnode && *node) + if(*node) { + TRACE("created node (%d, %p, %p)\n", node_type, *node, xmlnode); xmldoc_add_orphan(xmlnode->doc, xmlnode); return S_OK; } diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index da9afd2..5691c52 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1752,6 +1752,9 @@ IXMLDOMNode *create_node( xmlNodePtr node ) case XML_DOCUMENT_NODE: pUnk = create_domdoc( node ); break; + case XML_DOCUMENT_FRAG_NODE: + pUnk = create_doc_fragment( node ); + break; default: { xmlnode *new_node; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3ef37fc..8f0ac8b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1657,6 +1657,35 @@ static void test_create(void) if( r != S_OK ) return; + /* types not supported for creation */ + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_DOCUMENT; + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); + ok( r == E_INVALIDARG, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_DOCUMENT_TYPE; + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); + ok( r == E_INVALIDARG, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ENTITY; + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); + ok( r == E_INVALIDARG, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_NOTATION; + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); + ok( r == E_INVALIDARG, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + V_VT(&var) = VT_I1; V_I1(&var) = NODE_ELEMENT; str = SysAllocString( szlc );

1 0

Nikolay Sivov : msxml3: Check for Null out pointer in node creation ( with tests).
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: e2b727807d8a8d8cbc8ccb5fc001f5bdece7827e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b727807d8a8d8cbc8ccb5fc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 00:06:51 2010 +0300 msxml3: Check for Null out pointer in node creation (with tests). --- dlls/msxml3/domdoc.c | 4 ++++ dlls/msxml3/tests/domdoc.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 77d1d2e..d4be6b6 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1046,6 +1046,8 @@ static HRESULT WINAPI domdoc_createElement( TRACE("%p->(%s,%p)\n", iface, debugstr_w(tagname), element); + if (!element) return E_INVALIDARG; + xml_name = xmlChar_from_wchar(tagname); xmlnode = xmlNewDocNode(get_doc(This), NULL, xml_name, NULL); xmldoc_add_orphan(xmlnode->doc, xmlnode); @@ -1346,6 +1348,8 @@ static HRESULT WINAPI domdoc_createNode( TRACE("(%p)->(type,%s,%s,%p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); + if(!node) return E_INVALIDARG; + if(namespaceURI && namespaceURI[0]) FIXME("nodes with namespaces currently not supported.\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1b134af..3ef37fc 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1664,6 +1664,11 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ELEMENT; + r = IXMLDOMDocument_createNode( doc, var, str, NULL, NULL ); + ok( r == E_INVALIDARG, "returns %08x\n", r ); + V_VT(&var) = VT_R4; V_R4(&var) = NODE_ELEMENT; r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); @@ -3641,6 +3646,9 @@ static void test_nodeTypeTests( void ) if( hr != S_OK ) return; + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK)

1 0

Nikolay Sivov : msxml3: Reimplement IXMLDOMDocument::createDocumentFragment () over ::createNode().
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: f5a2f4a2b9bcee4cec04899953d612afe7422c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a2f4a2b9bcee4cec0489995… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 03:59:14 2010 +0300 msxml3: Reimplement IXMLDOMDocument::createDocumentFragment() over ::createNode(). --- dlls/msxml3/domdoc.c | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 6c80844..f999e12 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1065,27 +1065,16 @@ static HRESULT WINAPI domdoc_createElement( static HRESULT WINAPI domdoc_createDocumentFragment( IXMLDOMDocument2 *iface, - IXMLDOMDocumentFragment** docFrag ) + IXMLDOMDocumentFragment** frag ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - xmlNodePtr xmlnode; - - TRACE("%p\n", iface); - - if(!docFrag) - return E_INVALIDARG; - - *docFrag = NULL; + VARIANT type; - xmlnode = xmlNewDocFragment(get_doc( This ) ); + TRACE("(%p)->(%p)\n", This, frag); - if(!xmlnode) - return E_FAIL; - - xmldoc_add_orphan(xmlnode->doc, xmlnode); - *docFrag = (IXMLDOMDocumentFragment*)create_doc_fragment(xmlnode); - - return S_OK; + V_VT(&type) = VT_I1; + V_I1(&type) = NODE_DOCUMENT_FRAGMENT; + return IXMLDOMDocument_createNode(iface, type, NULL, NULL, (IXMLDOMNode**)frag); }

1 0

Nikolay Sivov : msxml3: Reimplement IXMLDOMDocument::createElement() over : :createNode().
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: ca01a441644285507ce009e53cc4678f892584e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca01a441644285507ce009e53… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 06:44:59 2010 +0300 msxml3: Reimplement IXMLDOMDocument::createElement() over ::createNode(). --- dlls/msxml3/domdoc.c | 26 +++++++++----------------- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/tests/domdoc.c | 25 ++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f999e12..f3bd371 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1038,28 +1038,17 @@ static HRESULT WINAPI domdoc_createElement( BSTR tagname, IXMLDOMElement** element ) { - xmlNodePtr xmlnode; domdoc *This = impl_from_IXMLDOMDocument2( iface ); - xmlChar *xml_name; - IUnknown *elem_unk; - HRESULT hr; - - TRACE("%p->(%s,%p)\n", iface, debugstr_w(tagname), element); + VARIANT type; - if (!element) return E_INVALIDARG; + TRACE("(%p)->(%s,%p)\n", This, debugstr_w(tagname), element); - xml_name = xmlChar_from_wchar(tagname); - xmlnode = xmlNewDocNode(get_doc(This), NULL, xml_name, NULL); - xmldoc_add_orphan(xmlnode->doc, xmlnode); + if (!element || !tagname) return E_INVALIDARG; - TRACE("created xmlptr %p\n", xmlnode); - elem_unk = create_element(xmlnode); - heap_free(xml_name); + V_VT(&type) = VT_I1; + V_I1(&type) = NODE_ELEMENT; - hr = IUnknown_QueryInterface(elem_unk, &IID_IXMLDOMElement, (void **)element); - IUnknown_Release(elem_unk); - TRACE("returning %p\n", *element); - return hr; + return IXMLDOMDocument_createNode(iface, type, tagname, NULL, (IXMLDOMNode**)element); } @@ -1347,6 +1336,9 @@ static HRESULT WINAPI domdoc_createNode( TRACE("node_type %d\n", node_type); + if ((!name || SysStringLen(name) == 0) && (node_type == NODE_ELEMENT)) + return E_FAIL; + xml_name = xmlChar_from_wchar(name); switch(node_type) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index e46642d..dd7b2af 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -1,5 +1,5 @@ /* - * MSXML Class Factory + * Common definitions * * Copyright 2005 Mike McCormack * diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 869e261..11115b6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1698,6 +1698,21 @@ static void test_create(void) V_VT(&var) = VT_I1; V_I1(&var) = NODE_ELEMENT; str = SysAllocString( szlc ); + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); + ok( r == E_FAIL, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ELEMENT; + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, _bstr_(""), NULL, &node ); + ok( r == E_FAIL, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ELEMENT; + str = SysAllocString( szlc ); r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); @@ -2885,7 +2900,15 @@ static void test_xmlTypes(void) IXMLDOMImplementation_Release(pIXMLDOMImplementation); } + pRoot = (IXMLDOMElement*)0x1; + hr = IXMLDOMDocument_createElement(doc, NULL, &pRoot); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + ok(pRoot == (void*)0x1, "Expect same ptr, got %p\n", pRoot); + pRoot = (IXMLDOMElement*)0x1; + hr = IXMLDOMDocument_createElement(doc, _bstr_(""), &pRoot); + ok(hr == E_FAIL, "ret %08x\n", hr ); + ok(pRoot == (void*)0x1, "Expect same ptr, got %p\n", pRoot); hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); ok(hr == S_OK, "ret %08x\n", hr ); @@ -3146,7 +3169,7 @@ static void test_xmlTypes(void) /* Element */ str = SysAllocString(szElement); - hr = IXMLDOMDocument_createElement(doc, szElement, &pElement); + hr = IXMLDOMDocument_createElement(doc, str, &pElement); SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK)

1 0

Kusanagi Kouichi : winex11.drv: Private copy of a result string is unnecessary.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: af0882862fa4d802fb816ae42e2fe5a318396999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0882862fa4d802fb816ae42… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Fri Feb 12 14:54:04 2010 +0900 winex11.drv: Private copy of a result string is unnecessary. --- dlls/winex11.drv/xim.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 5c30d5b..1e55431 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -45,8 +45,6 @@ BOOL ximInComposeMode=FALSE; static DWORD dwCompStringLength = 0; static LPBYTE CompositionString = NULL; static DWORD dwCompStringSize = 0; -static LPBYTE ResultString = NULL; -static DWORD dwResultStringSize = 0; #define STYLE_OFFTHESPOT (XIMPreeditArea | XIMStatusArea) #define STYLE_OVERTHESPOT (XIMPreeditPosition | XIMStatusNothing) @@ -159,14 +157,8 @@ static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset, } else if ((dwIndex == GCS_RESULTSTR) && (lpComp) && (dwCompLen)) { - if (dwResultStringSize) - HeapFree(GetProcessHeap(),0,ResultString); - dwResultStringSize= byte_length; - ResultString= HeapAlloc(GetProcessHeap(),0,byte_length); - memcpy(ResultString,lpComp,byte_length); - - rc = IME_SetCompositionString(SCS_SETSTR, ResultString, - dwResultStringSize, NULL, 0); + rc = IME_SetCompositionString(SCS_SETSTR, lpComp, + byte_length, NULL, 0); IME_NotifyIME( NI_COMPOSITIONSTR, CPS_COMPLETE, 0); } @@ -203,12 +195,6 @@ static void X11DRV_ImmSetOpenStatus(BOOL fOpen) dwCompStringSize = 0; dwCompStringLength = 0; CompositionString = NULL; - - if (dwResultStringSize) - HeapFree(GetProcessHeap(),0,ResultString); - - dwResultStringSize = 0; - ResultString = NULL; } IME_SetOpenStatus(fOpen);

1 0

Nikolay Sivov : msxml3/tests: Don' t try to use wchar buffers as BSTR parameters.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 469b0ff6b58fa6fd82977ca47e816ec6f549ba9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=469b0ff6b58fa6fd82977ca47… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 12 05:22:06 2010 +0300 msxml3/tests: Don't try to use wchar buffers as BSTR parameters. --- dlls/msxml3/tests/domdoc.c | 45 +++++++++++++++++++++++++++++++++---------- 1 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8f0ac8b..869e261 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -969,7 +969,9 @@ static void test_domdoc( void ) /* test Create Comment */ r = IXMLDOMDocument_createComment(doc, NULL, NULL); ok( r == E_INVALIDARG, "returns %08x\n", r ); - r = IXMLDOMDocument_createComment(doc, szComment, &node_comment); + str = SysAllocString(szComment); + r = IXMLDOMDocument_createComment(doc, str, &node_comment); + SysFreeString(str); ok( r == S_OK, "returns %08x\n", r ); if(node_comment) { @@ -992,11 +994,13 @@ static void test_domdoc( void ) } /* test Create Attribute */ + str = SysAllocString(szAttribute); r = IXMLDOMDocument_createAttribute(doc, NULL, NULL); ok( r == E_INVALIDARG, "returns %08x\n", r ); - r = IXMLDOMDocument_createAttribute(doc, szAttribute, &node_attr); + r = IXMLDOMDocument_createAttribute(doc, str, &node_attr); ok( r == S_OK, "returns %08x\n", r ); IXMLDOMText_Release( node_attr); + SysFreeString(str); /* test Processing Instruction */ str = SysAllocStringLen(NULL, 0); @@ -1432,10 +1436,15 @@ todo_wine ole_check(IXMLDOMNodeList_reset(list)); node = (void*)0xdeadbeef; - r = IXMLDOMNode_selectSingleNode( element, szdl, &node ); + str = SysAllocString(szdl); + r = IXMLDOMNode_selectSingleNode( element, str, &node ); + SysFreeString(str); ok( r == S_FALSE, "ret %08x\n", r ); ok( node == NULL, "node %p\n", node ); - r = IXMLDOMNode_selectSingleNode( element, szbs, &node ); + + str = SysAllocString(szbs); + r = IXMLDOMNode_selectSingleNode( element, str, &node ); + SysFreeString(str); ok( r == S_OK, "ret %08x\n", r ); r = IXMLDOMNode_Release( node ); ok( r == 0, "ret %08x\n", r ); @@ -2370,7 +2379,7 @@ static void test_XMLHTTP(void) 'p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0}; IXMLHttpRequest *pXMLHttpRequest; - BSTR bstrResponse; + BSTR bstrResponse, str1, str2; VARIANT dummy; VARIANT varfalse; VARIANT varbody; @@ -2390,8 +2399,12 @@ static void test_XMLHTTP(void) V_VT(&varbody) = VT_BSTR; V_BSTR(&varbody) = SysAllocString(wszBody); - hr = IXMLHttpRequest_open(pXMLHttpRequest, wszPOST, wszUrl, varfalse, dummy, dummy); + str1 = SysAllocString(wszPOST); + str2 = SysAllocString(wszUrl); + hr = IXMLHttpRequest_open(pXMLHttpRequest, str1, str2, varfalse, dummy, dummy); todo_wine ok(hr == S_OK, "IXMLHttpRequest_open should have succeeded instead of failing with 0x%08x\n", hr); + SysFreeString(str1); + SysFreeString(str2); hr = IXMLHttpRequest_send(pXMLHttpRequest, varbody); todo_wine ok(hr == S_OK, "IXMLHttpRequest_send should have succeeded instead of failing with 0x%08x\n", hr); @@ -2883,7 +2896,9 @@ static void test_xmlTypes(void) if(hr == S_OK) { /* Comment */ + str = SysAllocString(szComment); hr = IXMLDOMDocument_createComment(doc, szComment, &pComment); + SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { @@ -3130,7 +3145,9 @@ static void test_xmlTypes(void) } /* Element */ + str = SysAllocString(szElement); hr = IXMLDOMDocument_createElement(doc, szElement, &pElement); + SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { @@ -3158,8 +3175,10 @@ static void test_xmlTypes(void) ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n"); VariantClear(&v); - /* Attribute */ + /* Attribute */ + str = SysAllocString(szAttribute); hr = IXMLDOMDocument_createAttribute(doc, szAttribute, &pAttrubute); + SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { @@ -3275,10 +3294,12 @@ static void test_xmlTypes(void) } /* CData Section */ - hr = IXMLDOMDocument_createCDATASection(doc, szCData, NULL); + str = SysAllocString(szCData); + hr = IXMLDOMDocument_createCDATASection(doc, str, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); - hr = IXMLDOMDocument_createCDATASection(doc, szCData, &pCDataSec); + hr = IXMLDOMDocument_createCDATASection(doc, str, &pCDataSec); + SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { @@ -3615,10 +3636,12 @@ static void test_xmlTypes(void) } /* Entity References */ - hr = IXMLDOMDocument_createEntityReference(doc, szEntityRef, NULL); + str = SysAllocString(szEntityRef); + hr = IXMLDOMDocument_createEntityReference(doc, str, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); - hr = IXMLDOMDocument_createEntityReference(doc, szEntityRef, &pEntityRef); + hr = IXMLDOMDocument_createEntityReference(doc, str, &pEntityRef); + SysFreeString(str); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) {

1 0

Vincent Povirk : ole32: Only warn about storage share mode once.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 35b800dc923518b3a321f7a3391a3f52a4908f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b800dc923518b3a321f7a33… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 11 16:49:21 2010 -0600 ole32: Only warn about storage share mode once. --- dlls/ole32/storage32.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8fe0542..3beff78 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6353,7 +6353,11 @@ HRESULT WINAPI StgCreateDocfile( fileAttributes = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS; if (STGM_SHARE_MODE(grfMode) && !(grfMode & STGM_SHARE_DENY_NONE)) + { + static int fixme; + if (!fixme++) FIXME("Storage share mode not implemented.\n"); + } *ppstgOpen = 0;

1 0

Jason Edmeades : ws2_32: Support indefinite receive timeouts.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 6cea48b9281c9890e852889b9bba7a4698341b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cea48b9281c9890e852889b9… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Thu Feb 11 13:32:18 2010 -0800 ws2_32: Support indefinite receive timeouts. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c66c853..1af90b1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3303,7 +3303,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, tval.tv_usec = (*(const UINT32*)optval % 1000) * 1000; tval.tv_sec = *(const UINT32*)optval / 1000; /* min of 500 milliseconds */ - if (tval.tv_sec == 0 && tval.tv_usec < 500000) + if (tval.tv_sec == 0 && tval.tv_usec && tval.tv_usec < 500000) tval.tv_usec = 500000; optlen = sizeof(struct timeval); optval = (char*)&tval; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index be846fa..5b519b8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -986,6 +986,15 @@ static void test_set_getsockopt(void) err = getsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (char *) &timeout, &size); ok( !err, "get/setsockopt(SO_RCVTIMEO) failed error: %d\n", WSAGetLastError()); ok( timeout == SOCKTIMEOUT1, "getsockopt(SO_RCVTIMEO) returned wrong value %d\n", timeout); + + timeout = 0; + size = sizeof(timeout); + err = setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (char *) &timeout, size); + if( !err) + err = getsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (char *) &timeout, &size); + ok( !err, "get/setsockopt(SO_RCVTIMEO) failed error: %d\n", WSAGetLastError()); + ok( timeout == 0, "getsockopt(SO_RCVTIMEO) returned wrong value %d\n", timeout); + /* SO_SNDTIMEO */ timeout = SOCKTIMEOUT2; /* 997 seconds. See remark above */ size = sizeof(timeout);

1 0

Nikolay Sivov : comctl32/rebar: Don't try to access band data before it' s needed.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 70890031a336c053b39dfeb0ec428742a300bea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70890031a336c053b39dfeb0e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Feb 11 22:40:15 2010 +0300 comctl32/rebar: Don't try to access band data before it's needed. --- dlls/comctl32/rebar.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 21aabfa..cc06425 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2919,7 +2919,6 @@ REBAR_PushChevron(const REBAR_INFO *infoPtr, UINT uBand, LPARAM lParam) static LRESULT REBAR_LButtonDown (REBAR_INFO *infoPtr, LPARAM lParam) { - REBAR_BAND *lpBand; UINT htFlags; INT iHitBand; POINT ptMouseDown; @@ -2927,7 +2926,6 @@ REBAR_LButtonDown (REBAR_INFO *infoPtr, LPARAM lParam) ptMouseDown.y = (short)HIWORD(lParam); REBAR_InternalHitTest(infoPtr, &ptMouseDown, &htFlags, &iHitBand); - lpBand = REBAR_GetBand(infoPtr, iHitBand); if (htFlags == RBHT_CHEVRON) { @@ -2935,8 +2933,12 @@ REBAR_LButtonDown (REBAR_INFO *infoPtr, LPARAM lParam) } else if (htFlags == RBHT_GRABBER || htFlags == RBHT_CAPTION) { + REBAR_BAND *lpBand; + TRACE("Starting drag\n"); + lpBand = REBAR_GetBand(infoPtr, iHitBand); + SetCapture (infoPtr->hwndSelf); infoPtr->iGrabbedBand = iHitBand;

1 0

Alexandre Julliard : makefiles: Add helper functions to build the various make lists more efficiently.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 2de10c4a4244c612674d7f9cad9b608799a9790e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de10c4a4244c612674d7f9ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 23:23:45 2010 +0100 makefiles: Add helper functions to build the various make lists more efficiently. --- aclocal.m4 | 89 +- configure | 7614 ++++++++++++++++++++---------------------------------------- 2 files changed, 2572 insertions(+), 5131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2de10c4a4244c612674d7…

1 0