January 2008 - Wine-Commits

Alistair Leslie-Hughes : msxml3: Implement get_xml.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: 11331847ac51f9cb8ff1a656fe0cda5e046ffef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11331847ac51f9cb8ff1a656f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 4 09:15:28 2008 +1100 msxml3: Implement get_xml. --- dlls/msxml3/node.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index c0fd27c..8b17589 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -685,8 +685,41 @@ static HRESULT WINAPI xmlnode_get_xml( IXMLDOMNode *iface, BSTR* xmlString) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + xmlBufferPtr pXmlBuf; + int nSize; + + TRACE("iface %p\n", iface); + + if(!xmlString) + return E_INVALIDARG; + + *xmlString = NULL; + + pXmlBuf = xmlBufferCreate(); + if(pXmlBuf) + { + nSize = xmlNodeDump(pXmlBuf, This->node->doc, This->node, 0, 0); + if(nSize > 0) + { + const xmlChar *pContent; + + /* Attribute Nodes return a space infront of their name */ + pContent = xmlBufferContent(pXmlBuf); + if( ((char*)pContent)[0] == ' ') + *xmlString = bstr_from_xmlChar(pContent+1); + else + *xmlString = bstr_from_xmlChar(pContent); + + + xmlBufferFree(pXmlBuf); + } + } + + /* Always returns a string. */ + if(*xmlString == NULL) *xmlString = SysAllocStringLen( NULL, 0 ); + + return S_OK; } static HRESULT WINAPI xmlnode_transformNode(

1 0

Alistair Leslie-Hughes : msxml3: Add missing values for get_nodeName.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: 0a80e7c04e3aaff6da245e75fefb67c9988210fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a80e7c04e3aaff6da245e75f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 4 09:12:21 2008 +1100 msxml3: Add missing values for get_nodeName. --- dlls/msxml3/node.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index fd86e4e..019f1d3 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -159,13 +159,27 @@ static HRESULT WINAPI xmlnode_get_nodeName( switch( This->node->type ) { - case XML_TEXT_NODE: - str = (const xmlChar*) "#text"; + case XML_CDATA_SECTION_NODE: + str = (const xmlChar*) "#cdata-section"; + break; + case XML_COMMENT_NODE: + str = (const xmlChar*) "#comment"; + break; + case XML_DOCUMENT_FRAG_NODE: + str = (const xmlChar*) "#document-fragment"; break; + case XML_TEXT_NODE: + str = (const xmlChar*) "#text"; + break; case XML_DOCUMENT_NODE: - str = (const xmlChar*) "#document"; - break; + str = (const xmlChar*) "#document"; + break; + case XML_ATTRIBUTE_NODE: + case XML_ELEMENT_NODE: + str = This->node->name; + break; default: + FIXME("nodeName not mapped correctly (%d)\n", This->node->type); str = This->node->name; break; }

1 0

Alistair Leslie-Hughes : msxml3: Cannot add an attribute with appendChild.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: cdac6b500543381a047301ea3f36bd1844059508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdac6b500543381a047301ea3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 4 09:15:00 2008 +1100 msxml3: Cannot add an attribute with appendChild. --- dlls/msxml3/node.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 019f1d3..c0fd27c 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -482,9 +482,29 @@ static HRESULT WINAPI xmlnode_appendChild( IXMLDOMNode** outNewChild) { xmlnode *This = impl_from_IXMLDOMNode( iface ); + IXMLDOMNode *pAttr = NULL; VARIANT var; TRACE("(%p)->(%p,%p)\n", This, newChild, outNewChild); + + /* Cannot Append an Attribute node. */ + IUnknown_QueryInterface(newChild, &IID_IXMLDOMNode, (LPVOID*)&pAttr); + if(pAttr) + { + xmlnode *ThisNew = impl_from_IXMLDOMNode( pAttr ); + + if(ThisNew->node->type == XML_ATTRIBUTE_NODE) + { + if(outNewChild) *outNewChild = NULL; + + IUnknown_Release(pAttr); + + return E_FAIL; + } + + IUnknown_Release(pAttr); + } + VariantInit(&var); return IXMLDOMNode_insertBefore(iface, newChild, var, outNewChild); }

1 0

Alistair Leslie-Hughes : msxml3: Implement createAttribute.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: 300191d58c498174c815de019c93800449154533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300191d58c498174c815de019… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 4 09:11:27 2008 +1100 msxml3: Implement createAttribute. --- dlls/msxml3/domdoc.c | 25 +++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 10 ++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index ab5f03e..d955926 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -981,8 +981,29 @@ static HRESULT WINAPI domdoc_createAttribute( BSTR name, IXMLDOMAttribute** attribute ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + xmlNodePtr xmlnode; + xmlChar *xml_name; + + TRACE("%p->(%s %p)\n", iface, debugstr_w(name), attribute); + + if(!attribute) + return E_INVALIDARG; + + *attribute = NULL; + + xml_name = xmlChar_from_wchar((WCHAR*)name); + xmlnode = (xmlNode *)xmlNewProp(NULL, xml_name, NULL); + HeapFree(GetProcessHeap(), 0, xml_name); + + if(!xmlnode) + return E_FAIL; + + xmlnode->doc = get_doc( This ); + + *attribute = (IXMLDOMAttribute*)create_attribute(xmlnode); + + return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7865d9b..3084e33 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -137,6 +137,8 @@ static const WCHAR szfn1_txt[] = {'f','n','1','.','t','x','t',0}; static WCHAR szComment[] = {'A',' ','C','o','m','m','e','n','t',0 }; +static WCHAR szAttribute[] = {'A','t','t','r',0 }; + #define expect_bstr_eq_and_free(bstr, expect) { \ BSTR bstrExp = alloc_str_from_narrow(expect); \ ok(lstrcmpW(bstr, bstrExp) == 0, "String differs\n"); \ @@ -337,6 +339,7 @@ static void test_domdoc( void ) IXMLDOMNode *node; IXMLDOMText *nodetext = NULL; IXMLDOMComment *node_comment = NULL; + IXMLDOMAttribute *node_attr = NULL; VARIANT_BOOL b; VARIANT var; BSTR str; @@ -508,6 +511,13 @@ static void test_domdoc( void ) ok( r == S_OK, "returns %08x\n", r ); IXMLDOMText_Release( node_comment ); + /* test Create Attribute */ + r = IXMLDOMDocument_createAttribute(doc, NULL, NULL); + ok( r == E_INVALIDARG, "returns %08x\n", r ); + r = IXMLDOMDocument_createAttribute(doc, szAttribute, &node_attr); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMText_Release( node_attr); + r = IXMLDOMDocument_Release( doc ); ok( r == 0, "document ref count incorrect\n");

1 0

Alistair Leslie-Hughes : msxml3: Implement createComment.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: 2e3f5243ca4ba543a386191fc3ac847d5741f111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3f5243ca4ba543a386191fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 4 09:08:35 2008 +1100 msxml3: Implement createComment. --- dlls/msxml3/domdoc.c | 25 +++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 10 ++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index af5097c..ab5f03e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -909,8 +909,29 @@ static HRESULT WINAPI domdoc_createComment( BSTR data, IXMLDOMComment** comment ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + xmlNodePtr xmlnode; + xmlChar *xml_content; + + TRACE("%p->(%s %p)\n", iface, debugstr_w(data), comment); + + if(!comment) + return E_INVALIDARG; + + *comment = NULL; + + xml_content = xmlChar_from_wchar((WCHAR*)data); + xmlnode = xmlNewComment(xml_content); + HeapFree(GetProcessHeap(), 0, xml_content); + + if(!xmlnode) + return E_FAIL; + + xmlnode->doc = get_doc( This ); + + *comment = (IXMLDOMComment*)create_comment(xmlnode); + + return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9c5e680..7865d9b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -135,6 +135,8 @@ static const WCHAR szstr2[] = { 's','t','r','2',0 }; static const WCHAR szstar[] = { '*',0 }; static const WCHAR szfn1_txt[] = {'f','n','1','.','t','x','t',0}; +static WCHAR szComment[] = {'A',' ','C','o','m','m','e','n','t',0 }; + #define expect_bstr_eq_and_free(bstr, expect) { \ BSTR bstrExp = alloc_str_from_narrow(expect); \ ok(lstrcmpW(bstr, bstrExp) == 0, "String differs\n"); \ @@ -334,6 +336,7 @@ static void test_domdoc( void ) IXMLDOMElement *element = NULL; IXMLDOMNode *node; IXMLDOMText *nodetext = NULL; + IXMLDOMComment *node_comment = NULL; VARIANT_BOOL b; VARIANT var; BSTR str; @@ -498,6 +501,13 @@ static void test_domdoc( void ) IXMLDOMText_Release( nodetext ); SysFreeString( str ); + /* test Create Comment */ + r = IXMLDOMDocument_createComment(doc, NULL, NULL); + ok( r == E_INVALIDARG, "returns %08x\n", r ); + r = IXMLDOMDocument_createComment(doc, szComment, &node_comment); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMText_Release( node_comment ); + r = IXMLDOMDocument_Release( doc ); ok( r == 0, "document ref count incorrect\n");

1 0

Alistair Leslie-Hughes : msxml3: Implement setNamedItem.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: 48c0e684cb595d7d8e0008397b372066412c8f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c0e684cb595d7d8e0008397… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 4 09:06:03 2008 +1100 msxml3: Implement setNamedItem. --- dlls/msxml3/msxml_private.h | 15 +++++++++++++++ dlls/msxml3/node.c | 14 -------------- dlls/msxml3/nodemap.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 55 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 4914a58..59b1831 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -71,4 +71,19 @@ extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); extern HRESULT SchemaCache_create( IUnknown *pUnkOuter, LPVOID *ppObj ); extern HRESULT XMLDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); +/* IXMLDOMNode Internal Structure */ +typedef struct _xmlnode +{ + const struct IXMLDOMNodeVtbl *lpVtbl; + const struct IUnknownVtbl *lpInternalUnkVtbl; + IUnknown *pUnkOuter; + LONG ref; + xmlNodePtr node; +} xmlnode; + +static inline xmlnode *impl_from_IXMLDOMNode( IXMLDOMNode *iface ) +{ + return (xmlnode *)((char*)iface - FIELD_OFFSET(xmlnode, lpVtbl)); +} + #endif /* __MSXML_PRIVATE__ */ diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7122f7d..fd86e4e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -39,20 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 -typedef struct _xmlnode -{ - const struct IXMLDOMNodeVtbl *lpVtbl; - const struct IUnknownVtbl *lpInternalUnkVtbl; - IUnknown *pUnkOuter; - LONG ref; - xmlNodePtr node; -} xmlnode; - -static inline xmlnode *impl_from_IXMLDOMNode( IXMLDOMNode *iface ) -{ - return (xmlnode *)((char*)iface - FIELD_OFFSET(xmlnode, lpVtbl)); -} - static inline xmlnode *impl_from_InternalUnknown( IUnknown *iface ) { return (xmlnode *)((char*)iface - FIELD_OFFSET(xmlnode, lpInternalUnkVtbl)); diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 94b3f62..53f2171 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -195,8 +195,46 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( IXMLDOMNode* newItem, IXMLDOMNode** namedItem) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); + xmlnode *ThisNew = NULL; + xmlNodePtr nodeNew; + IXMLDOMNode *pAttr = NULL; + xmlNodePtr node; + + TRACE("%p %p %p\n", This, newItem, namedItem ); + + if(!newItem) + return E_INVALIDARG; + + if(namedItem) *namedItem = NULL; + + node = xmlNodePtr_from_domnode( This->node, 0 ); + if ( !node ) + return E_FAIL; + + /* Must be an Attribute */ + IUnknown_QueryInterface(newItem, &IID_IXMLDOMNode, (LPVOID*)&pAttr); + if(pAttr) + { + ThisNew = impl_from_IXMLDOMNode( pAttr ); + + if(ThisNew->node->type != XML_ATTRIBUTE_NODE) + { + IUnknown_Release(pAttr); + return E_FAIL; + } + + nodeNew = xmlAddChild(node, ThisNew->node); + + if(namedItem) + *namedItem = create_node( (xmlNodePtr) nodeNew ); + + IUnknown_Release(pAttr); + + return S_OK; + } + + return E_INVALIDARG; } static HRESULT WINAPI xmlnodemap_removeNamedItem(

1 0

Jacek Caban : shdocvw: Call try_application_url after BindToObject failure.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: f427951d0415e700428ff5cbd53bd0c5f7f5be4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f427951d0415e700428ff5cbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 16:41:31 2008 +0100 shdocvw: Call try_application_url after BindToObject failure. --- dlls/shdocvw/navigate.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index da45694..c8bfe2e 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -461,6 +461,7 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, const BYTE *post_dat SafeArrayDestroy(V_ARRAY(&var_post_data)); } +/* FIXME: urlmon should handle it */ static BOOL try_application_url(LPCWSTR url) { SHELLEXECUTEINFOW exec_info; @@ -564,6 +565,8 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt hres = S_OK; if(unk) IUnknown_Release(unk); + }else if(try_application_url(This->url)) { + hres = S_OK; }else { FIXME("BindToObject failed: %08x\n", hres); } @@ -666,7 +669,6 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, IBindStatusCallback *callback) { IHttpNegotiate *http_negotiate; - LPWSTR url = NULL; PBYTE post_data = NULL; ULONG post_data_len = 0; LPWSTR headers = NULL; @@ -674,9 +676,6 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, DWORD bindf = 0; HRESULT hres; - IMoniker_GetDisplayName(mon, NULL, NULL, &url); - TRACE("navigating to %s\n", debugstr_w(url)); - hres = IBindStatusCallback_QueryInterface(callback, &IID_IHttpNegotiate, (void**)&http_negotiate); if(SUCCEEDED(hres)) { @@ -698,15 +697,8 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, post_data = bindinfo.stgmedData.u.hGlobal; } - /* FIXME: We should do it after BindToObject call */ - if(try_application_url(url)) { - CoTaskMemFree(url); - return S_OK; - } - hres = navigate_mon(This, mon, post_data, post_data_len, headers); - CoTaskMemFree(url); CoTaskMemFree(headers); ReleaseBindInfo(&bindinfo);

1 0

Jacek Caban : shdocvw: Use BindToObject to load document (except for http, https and ftp protocols).
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: b5f387997c582fa35bb9186b0504701bb4cfd299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f387997c582fa35bb9186b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 16:40:38 2008 +0100 shdocvw: Use BindToObject to load document (except for http, https and ftp protocols). --- dlls/shdocvw/navigate.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index a3a0e24..da45694 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -537,15 +537,37 @@ static HRESULT http_load_hack(DocHost *This, IMoniker *mon, IBindStatusCallback static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCtx *bindctx, IBindStatusCallback *callback) { + WCHAR schema[30]; + DWORD schema_len; HRESULT hres; + static const WCHAR httpW[] = {'h','t','t','p',0}; + static const WCHAR httpsW[] = {'h','t','t','p','s',0}; + static const WCHAR ftpW[]= {'f','t','p',0}; + IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, (IUnknown*)CLIENTSITE(This)); if(This->frame) IOleInPlaceFrame_EnableModeless(This->frame, FALSE); - hres = http_load_hack(This, mon, callback, bindctx); + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), + &schema_len, 0); + if(SUCCEEDED(hres) && + (!strcmpW(schema, httpW) || !strcmpW(schema, httpsW) || !strcmpW(schema, ftpW))) { + hres = http_load_hack(This, mon, callback, bindctx); + }else { + IUnknown *unk = NULL; + + hres = IMoniker_BindToObject(mon, bindctx, NULL, &IID_IUnknown, (void**)&unk); + if(SUCCEEDED(hres)) { + hres = S_OK; + if(unk) + IUnknown_Release(unk); + }else { + FIXME("BindToObject failed: %08x\n", hres); + } + } if(This->frame) IOleInPlaceFrame_EnableModeless(This->frame, TRUE);

1 0

Jacek Caban : shdocvw.5: Move on_before_navigate2 call to navigate_mon.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: e5321be5a318cb5f27a44b34c896364753c47724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5321be5a318cb5f27a44b34c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 16:43:03 2008 +0100 shdocvw.5: Move on_before_navigate2 call to navigate_mon. --- dlls/shdocvw/navigate.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 6f35a06..a3a0e24 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -558,13 +558,24 @@ static HRESULT navigate_mon(DocHost *This, IMoniker *mon, PBYTE post_data, ULONG { IBindStatusCallback *callback; IBindCtx *bindctx; + VARIANT_BOOL cancel = VARIANT_FALSE; + LPWSTR url; HRESULT hres; - IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); - TRACE("navigating to %s\n", debugstr_w(This->url)); + IMoniker_GetDisplayName(mon, NULL, NULL, &url); + TRACE("navigating to %s\n", debugstr_w(url)); + + on_before_navigate2(This, url, post_data, post_data_len, headers, &cancel); + if(cancel) { + FIXME("Navigation canceled\n"); + CoTaskMemFree(url); + return S_OK; + } if(This->document) deactivate_document(This); + CoTaskMemFree(This->url); + This->url = url; callback = create_callback(This, post_data, post_data_len, (LPWSTR)headers); CreateAsyncBindCtx(0, callback, 0, &bindctx); @@ -637,7 +648,6 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, PBYTE post_data = NULL; ULONG post_data_len = 0; LPWSTR headers = NULL; - VARIANT_BOOL cancel = VARIANT_FALSE; BINDINFO bindinfo; DWORD bindf = 0; HRESULT hres; @@ -666,20 +676,15 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, post_data = bindinfo.stgmedData.u.hGlobal; } - on_before_navigate2(This, url, post_data, post_data_len, headers, &cancel); - CoTaskMemFree(url); - - if(cancel) { - FIXME("navigation canceled\n"); - hres = S_OK; - }else { - /* FIXME: We should do it after BindToObject call */ - if(try_application_url(url)) - return S_OK; - - hres = navigate_mon(This, mon, post_data, post_data_len, headers); + /* FIXME: We should do it after BindToObject call */ + if(try_application_url(url)) { + CoTaskMemFree(url); + return S_OK; } + hres = navigate_mon(This, mon, post_data, post_data_len, headers); + + CoTaskMemFree(url); CoTaskMemFree(headers); ReleaseBindInfo(&bindinfo);

1 0

Jacek Caban : shdocvw: Use OnObjectAvailable in http_load_hack.
by Alexandre Julliard Jan. 4, 2008

Jan. 4, 2008

Module: wine Branch: master Commit: 6f1c3f3613681a3b7080d9eaef92b1d9e00bf661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f1c3f3613681a3b7080d9eae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 3 16:38:44 2008 +0100 shdocvw: Use OnObjectAvailable in http_load_hack. --- dlls/shdocvw/navigate.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 43aa3b2..e9c3db1 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -466,8 +466,8 @@ static BOOL try_application_url(LPCWSTR url) static HRESULT http_load_hack(DocHost *This, IMoniker *mon, IBindStatusCallback *callback, IBindCtx *bindctx) { - IOleObject *oleobj; IPersistMoniker *persist; + IUnknown *doc; HRESULT hres; /* @@ -478,40 +478,33 @@ static HRESULT http_load_hack(DocHost *This, IMoniker *mon, IBindStatusCallback hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IUnknown, (void**)&This->document); + &IID_IUnknown, (void**)&doc); if(FAILED(hres)) { ERR("Could not create HTMLDocument: %08x\n", hres); return hres; } - hres = IUnknown_QueryInterface(This->document, &IID_IPersistMoniker, (void**)&persist); + hres = IUnknown_QueryInterface(doc, &IID_IPersistMoniker, (void**)&persist); if(FAILED(hres)) return hres; hres = IPersistMoniker_Load(persist, FALSE, mon, bindctx, 0); IPersistMoniker_Release(persist); + if(SUCCEEDED(hres)) + hres = IBindStatusCallback_OnObjectAvailable(callback, &IID_IUnknown, doc); + else + WARN("Load failed: %08x\n", hres); + + IUnknown_Release(doc); + if(This->frame) { static const WCHAR empty[] = {0}; IOleInPlaceFrame_SetStatusText(This->frame, empty); /* FIXME */ } - if(FAILED(hres)) { - WARN("Load failed: %08x\n", hres); - return hres; - } - - hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&oleobj); - if(FAILED(hres)) - return hres; - - hres = IOleObject_SetClientSite(oleobj, CLIENTSITE(This)); - IOleObject_Release(oleobj); - - PostMessageW(This->hwnd, WB_WM_NAVIGATE2, 0, 0); - return hres; }

1 0