February 2010 - Wine-Commits

Nikolay Sivov : msxml3: Create entity reference node properly.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 970ec3d6991724803762d7bb0fa45f6d3ef58ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=970ec3d6991724803762d7bb0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 9 03:43:38 2010 +0300 msxml3: Create entity reference node properly. --- dlls/msxml3/node.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 2487fa8..ebf865e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1738,6 +1738,9 @@ IXMLDOMNode *create_node( xmlNodePtr node ) case XML_CDATA_SECTION_NODE: pUnk = create_cdata( node ); break; + case XML_ENTITY_REF_NODE: + pUnk = create_doc_entity_ref( node ); + break; case XML_PI_NODE: pUnk = create_pi( node ); break;

1 0

Jacek Caban : mshtml: Set image size in IHTMLImageElementFactory::create.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 23306623404c7e293112a747ba890dd23139c0d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23306623404c7e293112a747b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 8 21:46:45 2010 +0100 mshtml: Set image size in IHTMLImageElementFactory::create. --- dlls/mshtml/htmlimg.c | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index aad1274..296db23 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -724,12 +724,38 @@ static HRESULT WINAPI HTMLImageElementFactory_Invoke(IHTMLImageElementFactory *i return E_NOTIMPL; } +static LONG var_to_size(const VARIANT *v) +{ + switch(V_VT(v)) { + case VT_EMPTY: + return 0; + case VT_I4: + return V_I4(v); + case VT_BSTR: { + LONG ret; + HRESULT hres; + + hres = VarI4FromStr(V_BSTR(v), 0, 0, &ret); + if(FAILED(hres)) { + FIXME("VarI4FromStr failed: %08x\n", hres); + return 0; + } + return ret; + } + default: + FIXME("unsupported size %s\n", debugstr_variant(v)); + } + return 0; +} + static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *iface, VARIANT width, VARIANT height, IHTMLImgElement **img_elem) { HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + IHTMLImgElement *img; HTMLElement *elem; nsIDOMHTMLElement *nselem; + LONG l; HRESULT hres; static const PRUnichar imgW[] = {'I','M','G',0}; @@ -754,7 +780,7 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i return E_FAIL; } - hres = IHTMLElement_QueryInterface(HTMLELEM(elem), &IID_IHTMLImgElement, (void**)img_elem); + hres = IHTMLElement_QueryInterface(HTMLELEM(elem), &IID_IHTMLImgElement, (void**)&img); if(FAILED(hres)) { ERR("IHTMLElement_QueryInterface failed: 0x%08x\n", hres); return hres; @@ -762,9 +788,14 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i nsIDOMHTMLElement_Release(nselem); - if(V_VT(&width) != VT_EMPTY || V_VT(&height) != VT_EMPTY) - FIXME("Not setting image dimensions\n"); + l = var_to_size(&width); + if(l) + IHTMLImgElement_put_width(img, l); + l = var_to_size(&height); + if(l) + IHTMLImgElement_put_height(img, l); + *img_elem = img; return S_OK; }

1 0

Piotr Caban : urlmon/tests: Added more url parsing tests.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: c0bfc2fb95dd3e667b8b5d18036f26d92622c741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0bfc2fb95dd3e667b8b5d180… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 9 01:08:43 2010 +0100 urlmon/tests: Added more url parsing tests. --- dlls/urlmon/tests/misc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index dd6ba6d..467aa7c 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -780,7 +780,19 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) { - CHECK_EXPECT(ParseUrl); + CHECK_EXPECT2(ParseUrl); + + if(ParseAction == PARSE_SECURITY_URL) { + if(pcchResult) + *pcchResult = sizeof(url1)/sizeof(WCHAR); + + if(cchResult<sizeof(url1)/sizeof(WCHAR)) + return S_FALSE; + + memcpy(pwzResult, url1, sizeof(url1)); + return S_OK; + } + return E_NOTIMPL; } @@ -825,7 +837,7 @@ static IClassFactory *expect_cf; static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) { - CHECK_EXPECT(QI_IInternetProtocolInfo); + CHECK_EXPECT2(QI_IInternetProtocolInfo); ok(iface == expect_cf, "unexpected iface\n"); *ppv = &protocol_info; return qiret; @@ -896,6 +908,7 @@ static void test_NameSpace(void) { IInternetSession *session; WCHAR buf[200]; + LPWSTR sec_url; DWORD size; HRESULT hres; @@ -943,6 +956,35 @@ static void test_NameSpace(void) CHECK_CALLED(QI_IInternetProtocolInfo); CHECK_CALLED(ParseUrl); + SET_EXPECT(QI_IInternetProtocolInfo); + SET_EXPECT(ParseUrl); + + hres = CoInternetParseUrl(url8, PARSE_SECURITY_URL, 0, buf, + sizeof(buf)/sizeof(WCHAR), &size, 0); + ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); + ok(size == sizeof(url1)/sizeof(WCHAR), "Size = %d, expected %d\n", + size, sizeof(url1)/sizeof(WCHAR)); + if(size == sizeof(url1)/sizeof(WCHAR)) + ok(!memcmp(buf, url1, sizeof(url1)), "Encoded url = %s\n", wine_dbgstr_w(buf)); + + CHECK_CALLED(QI_IInternetProtocolInfo); + CHECK_CALLED(ParseUrl); + + SET_EXPECT(QI_IInternetProtocolInfo); + SET_EXPECT(ParseUrl); + + hres = CoInternetGetSecurityUrl(url8, &sec_url, PSU_SECURITY_URL_ONLY, 0); + ok(hres == S_OK, "CoInternetGetSecurityUrl failed: %08x\n", hres); + if(hres == S_OK) { + ok(lstrlenW(sec_url)>sizeof(wszFile)/sizeof(WCHAR) && + !memcmp(sec_url, wszFile, sizeof(wszFile)-sizeof(WCHAR)), + "Encoded url = %s\n", wine_dbgstr_w(sec_url)); + CoTaskMemFree(sec_url); + } + + CHECK_CALLED(QI_IInternetProtocolInfo); + CHECK_CALLED(ParseUrl); + hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLImgElement::width property implementation.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 11ec75c18ba7d54c19e0c4b8caaf54c51c7214cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=11ec75c18ba7d54c19e0c4b8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 8 21:47:21 2010 +0100 mshtml: Added IHTMLImgElement::width property implementation. --- dlls/mshtml/htmlimg.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 6 +++--- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 296db23..8fbfcae 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -460,15 +460,35 @@ static HRESULT WINAPI HTMLImgElement_get_name(IHTMLImgElement *iface, BSTR *p) static HRESULT WINAPI HTMLImgElement_put_width(IHTMLImgElement *iface, LONG v) { HTMLImgElement *This = HTMLIMG_THIS(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + + nsres = nsIDOMHTMLImageElement_SetWidth(This->nsimg, v); + if(NS_FAILED(nsres)) { + ERR("SetWidth failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLImgElement_get_width(IHTMLImgElement *iface, LONG *p) { HTMLImgElement *This = HTMLIMG_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRInt32 width; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLImageElement_GetWidth(This->nsimg, &width); + if(NS_FAILED(nsres)) { + ERR("GetWidth failed: %08x\n", nsres); + return E_FAIL; + } + + *p = width; + return S_OK; } static HRESULT WINAPI HTMLImgElement_put_height(IHTMLImgElement *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f6e4cf9..db16b99 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1145,8 +1145,8 @@ static void _test_img_width(unsigned line, IHTMLImgElement *img, const long exp) HRESULT hres; hres = IHTMLImgElement_get_width(img, &found); - todo_wine ok_(__FILE__,line) (hres == S_OK, "get_width failed: %08x\n", hres); - todo_wine ok_(__FILE__,line) (found == exp, "width=%d\n", found); + ok_(__FILE__,line) (hres == S_OK, "get_width failed: %08x\n", hres); + ok_(__FILE__,line) (found == exp, "width=%d\n", found); } #define test_img_put_width(o,w) _test_img_put_width(__LINE__,o,w) @@ -1155,7 +1155,7 @@ static void _test_img_put_width(unsigned line, IHTMLImgElement *img, const long HRESULT hres; hres = IHTMLImgElement_put_width(img, width); - todo_wine ok(hres == S_OK, "put_width failed: %08x\n", hres); + ok(hres == S_OK, "put_width failed: %08x\n", hres); _test_img_width(line, img, width); }

1 0

Jacek Caban : mshtml: Correctly handle comment nodes in IHTMLElement::[ get|put]_title implementation.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 0849a81169f1feb915a9265b01be843b0f93e456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0849a81169f1feb915a9265b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 8 21:50:08 2010 +0100 mshtml: Correctly handle comment nodes in IHTMLElement::[get|put]_title implementation. --- dlls/mshtml/htmlelem.c | 33 +++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 3 +++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 73c623a..e77c1dc 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -593,6 +593,8 @@ static HRESULT WINAPI HTMLElement_get_document(IHTMLElement *iface, IDispatch ** return S_OK; } +static const WCHAR titleW[] = {'t','i','t','l','e',0}; + static HRESULT WINAPI HTMLElement_put_title(IHTMLElement *iface, BSTR v) { HTMLElement *This = HTMLELEM_THIS(iface); @@ -601,6 +603,20 @@ static HRESULT WINAPI HTMLElement_put_title(IHTMLElement *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + if(!This->nselem) { + VARIANT *var; + HRESULT hres; + + hres = dispex_get_dprop_ref(&This->node.dispex, titleW, TRUE, &var); + if(FAILED(hres)) + return hres; + + VariantClear(var); + V_VT(var) = VT_BSTR; + V_BSTR(var) = v ? SysAllocString(v) : NULL; + return S_OK; + } + nsAString_InitDepend(&title_str, v); nsres = nsIDOMHTMLElement_SetTitle(This->nselem, &title_str); nsAString_Finish(&title_str); @@ -618,6 +634,23 @@ static HRESULT WINAPI HTMLElement_get_title(IHTMLElement *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); + if(!This->nselem) { + VARIANT *var; + HRESULT hres; + + hres = dispex_get_dprop_ref(&This->node.dispex, titleW, FALSE, &var); + if(hres == DISP_E_UNKNOWNNAME) { + *p = NULL; + }else if(V_VT(var) != VT_BSTR) { + FIXME("title = %s\n", debugstr_variant(var)); + return E_FAIL; + }else { + *p = V_BSTR(var) ? SysAllocString(V_BSTR(var)) : NULL; + } + + return S_OK; + } + nsAString_Init(&title_str, NULL); nsres = nsIDOMHTMLElement_GetTitle(This->nselem, &title_str); if(NS_SUCCEEDED(nsres)) { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index aa09d9e..c0128a6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5908,6 +5908,9 @@ static void test_create_elems(IHTMLDocument2 *doc) ok(type == 8, "type=%d, expected 8\n", type); test_node_get_value_str((IUnknown*)comment, "testing"); + test_elem_title((IUnknown*)comment, NULL); + test_elem_set_title((IUnknown*)comment, "comment title"); + test_elem_title((IUnknown*)comment, "comment title"); IHTMLDOMNode_Release(comment); }

1 0

Jacek Caban : mshtml: Added IHTMLImgElement::height property implementation .
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: a3ff647c1e8741b4e2ea1c67d66b497ff1277121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ff647c1e8741b4e2ea1c67d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 8 21:47:57 2010 +0100 mshtml: Added IHTMLImgElement::height property implementation. --- dlls/mshtml/htmlimg.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 6 +++--- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 8fbfcae..17b6cce 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -494,15 +494,35 @@ static HRESULT WINAPI HTMLImgElement_get_width(IHTMLImgElement *iface, LONG *p) static HRESULT WINAPI HTMLImgElement_put_height(IHTMLImgElement *iface, LONG v) { HTMLImgElement *This = HTMLIMG_THIS(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + + nsres = nsIDOMHTMLImageElement_SetHeight(This->nsimg, v); + if(NS_FAILED(nsres)) { + ERR("SetHeight failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLImgElement_get_height(IHTMLImgElement *iface, LONG *p) { HTMLImgElement *This = HTMLIMG_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRInt32 height; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLImageElement_GetHeight(This->nsimg, &height); + if(NS_FAILED(nsres)) { + ERR("GetHeight failed: %08x\n", nsres); + return E_FAIL; + } + + *p = height; + return S_OK; } static HRESULT WINAPI HTMLImgElement_put_start(IHTMLImgElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index db16b99..ba8f7bd 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1167,8 +1167,8 @@ static void _test_img_height(unsigned line, IHTMLImgElement *img, const long exp HRESULT hres; hres = IHTMLImgElement_get_height(img, &found); - todo_wine ok_(__FILE__,line) (hres == S_OK, "get_height failed: %08x\n", hres); - todo_wine ok_(__FILE__,line) (found == exp, "height=%d\n", found); + ok_(__FILE__,line) (hres == S_OK, "get_height failed: %08x\n", hres); + ok_(__FILE__,line) (found == exp, "height=%d\n", found); } #define test_img_put_height(o,w) _test_img_put_height(__LINE__,o,w) @@ -1177,7 +1177,7 @@ static void _test_img_put_height(unsigned line, IHTMLImgElement *img, const long HRESULT hres; hres = IHTMLImgElement_put_height(img, height); - todo_wine ok(hres == S_OK, "put_height failed: %08x\n", hres); + ok(hres == S_OK, "put_height failed: %08x\n", hres); _test_img_height(line, img, height); }

1 0

Jacek Caban : mshtml: Use set_nsstyle_attr_var in IHTMLStyle:: put_width implementation.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 352e0ec8936f30c9b7f9467338bedde2585960e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=352e0ec8936f30c9b7f946733… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 8 21:48:31 2010 +0100 mshtml: Use set_nsstyle_attr_var in IHTMLStyle::put_width implementation. --- dlls/mshtml/htmlstyle.c | 16 +++++----------- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 04ba1d6..3022e2b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -345,10 +345,12 @@ HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, case VT_I4: { WCHAR str[14]; + static const WCHAR format[] = {'%','d',0}; + static const WCHAR px_format[] = {'%','d','p','x',0}; - wsprintfW(str, format, V_I4(value)); - return set_nsstyle_attr(nsstyle, sid, str, flags); + wsprintfW(str, flags&ATTR_FIX_PX ? px_format : format, V_I4(value)); + return set_nsstyle_attr(nsstyle, sid, str, flags & ~ATTR_FIX_PX); } default: FIXME("not implemented vt %d\n", V_VT(value)); @@ -1779,15 +1781,7 @@ static HRESULT WINAPI HTMLStyle_put_width(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(v%d)\n", This, V_VT(&v)); - switch(V_VT(&v)) { - case VT_BSTR: - TRACE("%s\n", debugstr_w(V_BSTR(&v))); - return set_style_attr(This, STYLEID_WIDTH, V_BSTR(&v), 0); - default: - FIXME("unsupported vt %d\n", V_VT(&v)); - } - - return E_NOTIMPL; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_WIDTH, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_width(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ba8f7bd..aa09d9e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3869,6 +3869,18 @@ static void test_default_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "auto"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_I4; + V_I4(&v) = 100; + hres = IHTMLStyle_put_width(style, v); + ok(hres == S_OK, "put_width failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_width(style, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "100px"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + /* margin tests */ str = (void*)0xdeadbeef; hres = IHTMLStyle_get_margin(style, &str);

1 0

Piotr Caban : urlmon: Fix map_url_to_zone implementation.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 7d3693549f2d503993a180d7c0355577e3da67c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3693549f2d503993a180d7c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 9 01:07:46 2010 +0100 urlmon: Fix map_url_to_zone implementation. --- dlls/urlmon/sec_mgr.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index c242274..3216333 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -147,12 +147,18 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) DWORD size=0; HRESULT hres; - secur_url = heap_alloc(INTERNET_MAX_URL_LENGTH*sizeof(WCHAR)); *zone = -1; - hres = CoInternetParseUrl(url, PARSE_SECURITY_URL, 0, secur_url, INTERNET_MAX_URL_LENGTH, &size, 0); - if(hres != S_OK) - strcpyW(secur_url, url); + hres = CoInternetGetSecurityUrl(url, &secur_url, PSU_SECURITY_URL_ONLY, 0); + if(hres != S_OK) { + size = strlenW(url)*sizeof(WCHAR); + + secur_url = heap_alloc(size); + if(!secur_url) + return E_OUTOFMEMORY; + + memcpy(secur_url, url, size); + } hres = CoInternetParseUrl(secur_url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(WCHAR), &size, 0); if(FAILED(hres) || !*schema) {

1 0

Piotr Caban : urlmon: Fixed CoInternetGetSecurityUrl implementation.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 1db3e475113d393e5c99094440b9801142fdd9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db3e475113d393e5c9909444… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 9 01:08:16 2010 +0100 urlmon: Fixed CoInternetGetSecurityUrl implementation. --- dlls/urlmon/sec_mgr.c | 80 ++++++++++++++++++++++++++++-------------------- 1 files changed, 47 insertions(+), 33 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 3216333..81f2f50 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1240,28 +1240,44 @@ HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider* pSP, IInternetZoneM */ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUACTION psuAction, DWORD dwReserved) { - WCHAR url[INTERNET_MAX_URL_LENGTH], domain[INTERNET_MAX_URL_LENGTH]; + WCHAR buf1[INTERNET_MAX_URL_LENGTH], buf2[INTERNET_MAX_URL_LENGTH]; + LPWSTR url, domain; DWORD len; HRESULT hres; TRACE("(%p,%p,%u,%u)\n", pwzUrl, ppwzSecUrl, psuAction, dwReserved); - hres = CoInternetParseUrl(pwzUrl, PARSE_SECURITY_URL, 0, url, INTERNET_MAX_URL_LENGTH, &len, 0); - if(hres==S_OK) { - if(psuAction == PSU_DEFAULT) - hres = CoInternetParseUrl(url, PARSE_SECURITY_DOMAIN, 0, domain, - INTERNET_MAX_URL_LENGTH, &len, 0); + url = buf1; + domain = buf2; + strcpyW(url, pwzUrl); + + while(1) { + hres = CoInternetParseUrl(url, PARSE_SECURITY_URL, 0, domain, INTERNET_MAX_URL_LENGTH, &len, 0); + if(hres!=S_OK || !strcmpW(url, domain)) + break; + + if(url == buf1) { + url = buf2; + domain = buf1; + } else { + url = buf1; + domain = buf2; + } + } - if(psuAction==PSU_SECURITY_URL_ONLY || hres!=S_OK) { - len = lstrlenW(url)+1; - *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ppwzSecUrl) - return E_OUTOFMEMORY; + if(psuAction==PSU_SECURITY_URL_ONLY) { + len = lstrlenW(url)+1; + *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!*ppwzSecUrl) + return E_OUTOFMEMORY; - memcpy(*ppwzSecUrl, url, len*sizeof(WCHAR)); - return S_OK; - } + memcpy(*ppwzSecUrl, url, len*sizeof(WCHAR)); + return S_OK; + } + hres = CoInternetParseUrl(url, PARSE_SECURITY_DOMAIN, 0, domain, + INTERNET_MAX_URL_LENGTH, &len, 0); + if(SUCCEEDED(hres)) { len++; *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); if(!*ppwzSecUrl) @@ -1271,33 +1287,31 @@ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUA return S_OK; } - if(psuAction == PSU_DEFAULT) { - hres = CoInternetParseUrl(pwzUrl, PARSE_ROOTDOCUMENT, 0, url, 0, &len, 0); - if(hres == S_FALSE) { - hres = CoInternetParseUrl(pwzUrl, PARSE_SCHEMA, 0, domain, - INTERNET_MAX_URL_LENGTH, &len, 0); + hres = CoInternetParseUrl(url, PARSE_ROOTDOCUMENT, 0, domain, 0, &len, 0); + if(hres == S_FALSE) { + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, domain, + INTERNET_MAX_URL_LENGTH, &len, 0); + if(hres == S_OK) { + domain[len] = ':'; + hres = CoInternetParseUrl(url, PARSE_DOMAIN, 0, domain+len+1, + INTERNET_MAX_URL_LENGTH-len-1, &len, 0); if(hres == S_OK) { - domain[len] = ':'; - hres = CoInternetParseUrl(pwzUrl, PARSE_DOMAIN, 0, domain+len+1, - INTERNET_MAX_URL_LENGTH-len-1, &len, 0); - if(hres == S_OK) { - len = lstrlenW(domain)+1; - *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ppwzSecUrl) - return E_OUTOFMEMORY; - - memcpy(*ppwzSecUrl, domain, len*sizeof(WCHAR)); - return S_OK; - } + len = lstrlenW(domain)+1; + *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!*ppwzSecUrl) + return E_OUTOFMEMORY; + + memcpy(*ppwzSecUrl, domain, len*sizeof(WCHAR)); + return S_OK; } } } - len = lstrlenW(pwzUrl)+1; + len = lstrlenW(url)+1; *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); if(!*ppwzSecUrl) return E_OUTOFMEMORY; - memcpy(*ppwzSecUrl, pwzUrl, len*sizeof(WCHAR)); + memcpy(*ppwzSecUrl, url, len*sizeof(WCHAR)); return S_OK; }

1 0

Nikolay Sivov : msxml3: Create PI node properly.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 07162a624edce151758eee7205e6a852f4c4e575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07162a624edce151758eee720… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 9 03:03:30 2010 +0300 msxml3: Create PI node properly. --- dlls/msxml3/node.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 6729512..2487fa8 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1738,6 +1738,9 @@ IXMLDOMNode *create_node( xmlNodePtr node ) case XML_CDATA_SECTION_NODE: pUnk = create_cdata( node ); break; + case XML_PI_NODE: + pUnk = create_pi( node ); + break; case XML_COMMENT_NODE: pUnk = create_comment( node ); break;

1 0