December 2009 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLDocument::cookie tests.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 0909e8b18c13ab1f61f337665fc73d3dc2700f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0909e8b18c13ab1f61f337665… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 22:51:27 2009 +0100 mshtml: Added IHTMLDocument::cookie tests. --- dlls/mshtml/tests/Makefile.in | 2 +- dlls/mshtml/tests/htmldoc.c | 78 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in index d2815ae..04f8494 100644 --- a/dlls/mshtml/tests/Makefile.in +++ b/dlls/mshtml/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = mshtml.dll -IMPORTS = ole32 oleaut32 user32 urlmon gdi32 advapi32 kernel32 +IMPORTS = ole32 oleaut32 wininet user32 urlmon gdi32 advapi32 kernel32 CTESTS = \ dom.c \ diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 26ea5ef..0be3021 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "mshtml.h" #include "docobj.h" +#include "wininet.h" #include "mshtmhst.h" #include "mshtmdid.h" #include "mshtmcid.h" @@ -179,6 +180,9 @@ static const char html_page[] = static const char css_data[] = "body {color: red}"; +static const WCHAR http_urlW[] = + {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR doc_url[] = {'w','i','n','e','t','e','s','t',':','d','o','c',0}; static const WCHAR about_blank_url[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; @@ -212,6 +216,18 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } +static const WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ) +{ + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) return str; + str++; + } + return NULL; +} + static BSTR a2bstr(const char *str) { BSTR ret; @@ -764,6 +780,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 1012: CHECK_EXPECT(OnChanged_1012); return S_OK; + case 1030: case 3000029: case 3000030: /* TODO */ @@ -4119,6 +4136,63 @@ static void test_HTMLDocument_hlink(void) ok(ref == 0, "ref=%d, expected 0\n", ref); } +static void test_cookies(IUnknown *unk) +{ + WCHAR buf[1024]; + IHTMLDocument2 *doc; + DWORD size; + BSTR str, str2; + BOOL b; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument2, (void**)&doc); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument2) failed: %08x\n", hres); + + hres = IHTMLDocument2_get_cookie(doc, &str); + ok(hres == S_OK, "get_cookie failed: %08x\n", hres); + if(str) { + size = sizeof(buf)/sizeof(WCHAR); + b = InternetGetCookieExW(http_urlW, NULL, buf, &size, 0, NULL); + ok(b, "InternetGetCookieEx failed: %08x\n", GetLastError()); + ok(!lstrcmpW(buf, str), "cookie = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buf)); + SysFreeString(str); + } + + str = a2bstr("test=testval"); + hres = IHTMLDocument2_put_cookie(doc, str); + ok(hres == S_OK, "put_cookie failed: %08x\n", hres); + + str2 = NULL; + hres = IHTMLDocument2_get_cookie(doc, &str2); + ok(hres == S_OK, "get_cookie failed: %08x\n", hres); + ok(str2 != NULL, "cookie = NULL\n"); + size = sizeof(buf)/sizeof(WCHAR); + b = InternetGetCookieExW(http_urlW, NULL, buf, &size, 0, NULL); + ok(b, "InternetGetCookieEx failed: %08x\n", GetLastError()); + ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); + ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); + SysFreeString(str); + SysFreeString(str2); + + str = a2bstr("test=testval2"); + hres = IHTMLDocument2_put_cookie(doc, str); + ok(hres == S_OK, "put_cookie failed: %08x\n", hres); + + str2 = NULL; + hres = IHTMLDocument2_get_cookie(doc, &str2); + ok(hres == S_OK, "get_cookie failed: %08x\n", hres); + ok(str2 != NULL, "cookie = NULL\n"); + size = sizeof(buf)/sizeof(WCHAR); + b = InternetGetCookieExW(http_urlW, NULL, buf, &size, 0, NULL); + ok(b, "InternetGetCookieEx failed: %08x\n", GetLastError()); + ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); + ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); + SysFreeString(str); + SysFreeString(str2); + + IHTMLDocument2_Release(doc); +} + static void test_HTMLDocument_http(void) { IMoniker *http_mon; @@ -4126,9 +4200,6 @@ static void test_HTMLDocument_http(void) ULONG ref; HRESULT hres; - static const WCHAR http_urlW[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; - trace("Testing HTMLDocument (http)...\n"); hres = CreateURLMoniker(NULL, http_urlW, &http_mon); @@ -4156,6 +4227,7 @@ static void test_HTMLDocument_http(void) else win_skip("IE running in Enhanced Security Configuration\n"); + test_cookies(unk); test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED);

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::put_cookie implementation.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 8ddcbd00eb321a080bf1cfde1027527e718b735a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ddcbd00eb321a080bf1cfde1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 22:51:11 2009 +0100 mshtml: Added IHTMLDocument2::put_cookie implementation. --- dlls/mshtml/htmldoc.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 048b4ae..291bba5 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -611,8 +611,17 @@ static HRESULT WINAPI HTMLDocument_get_domain(IHTMLDocument2 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument_put_cookie(IHTMLDocument2 *iface, BSTR v) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + BOOL bret; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + bret = InternetSetCookieExW(This->window->url, NULL, v, 0, 0); + if(!bret) { + FIXME("InternetSetCookieExW failed: %u\n", GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_cookie(IHTMLDocument2 *iface, BSTR *p)

1 0

Andrew Eikum : mshtml: Support get_dispid and invoke methods in HTMLFormElement.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 3007b73cc9c252457e9fa92944d243f5f900a3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3007b73cc9c252457e9fa9294… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Dec 1 14:18:07 2009 -0600 mshtml: Support get_dispid and invoke methods in HTMLFormElement. --- dlls/mshtml/htmlform.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 138 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 153d8aa..1db965a 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -338,11 +338,148 @@ static void HTMLFormElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, + BSTR name, DWORD grfdex, DISPID *pid) +{ + HTMLFormElement *This = HTMLFORM_NODE_THIS(iface); + nsIDOMHTMLCollection *elements; + PRUint32 len, i; + static const PRUnichar nameW[] = {'n','a','m','e',0}; + nsAString nsname; + nsresult nsres; + + TRACE("(%p)->(%s %x %p)\n", This, wine_dbgstr_w(name), grfdex, pid); + + nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements); + if(NS_FAILED(nsres)) { + FIXME("GetElements failed: 0x%08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMHTMLCollection_GetLength(elements, &len); + if(NS_FAILED(nsres)) { + FIXME("GetLength failed: 0x%08x\n", nsres); + nsIDOMHTMLCollection_Release(elements); + return E_FAIL; + } + + nsAString_Init(&nsname, nameW); + for(i = 0; i < len; ++i) { + nsIDOMNode *nsitem; + nsIDOMHTMLElement *nshtml_elem; + nsAString nsstr; + const PRUnichar *str; + + nsres = nsIDOMHTMLCollection_Item(elements, i, &nsitem); + if(NS_FAILED(nsres)) { + FIXME("Item failed: 0x%08x\n", nsres); + nsAString_Finish(&nsname); + nsIDOMHTMLCollection_Release(elements); + return E_FAIL; + } + + nsres = nsIDOMNode_QueryInterface(nsitem, &IID_nsIDOMHTMLElement, (void**)&nshtml_elem); + nsIDOMNode_Release(nsitem); + if(NS_FAILED(nsres)) { + FIXME("Failed to get nsIDOMHTMLNode interface: 0x%08x\n", nsres); + nsAString_Finish(&nsname); + nsIDOMHTMLCollection_Release(elements); + return E_FAIL; + } + + /* compare by id attr */ + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLElement_GetId(nshtml_elem, &nsstr); + if(NS_FAILED(nsres)) { + FIXME("GetId failed: 0x%08x\n", nsres); + nsAString_Finish(&nsname); + nsIDOMHTMLElement_Release(nshtml_elem); + nsIDOMHTMLCollection_Release(elements); + return E_FAIL; + } + nsAString_GetData(&nsstr, &str); + if(!strcmpiW(str, name)) { + /* FIXME: using index for dispid */ + *pid = MSHTML_DISPID_CUSTOM_MIN + i; + nsAString_Finish(&nsname); + nsAString_Finish(&nsstr); + nsIDOMHTMLElement_Release(nshtml_elem); + nsIDOMHTMLCollection_Release(elements); + return S_OK; + } + + /* compare by name attr */ + nsres = nsIDOMHTMLElement_GetAttribute(nshtml_elem, &nsname, &nsstr); + nsAString_GetData(&nsstr, &str); + if(!strcmpiW(str, name)) { + /* FIXME: using index for dispid */ + *pid = MSHTML_DISPID_CUSTOM_MIN + i; + nsAString_Finish(&nsname); + nsAString_Finish(&nsstr); + nsIDOMHTMLElement_Release(nshtml_elem); + nsIDOMHTMLCollection_Release(elements); + return S_OK; + } + nsAString_Finish(&nsstr); + + nsIDOMHTMLElement_Release(nshtml_elem); + } + nsAString_Finish(&nsname); + + nsIDOMHTMLCollection_Release(elements); + + return DISP_E_UNKNOWNNAME; +} + +static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, + DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, + EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLFormElement *This = HTMLFORM_NODE_THIS(iface); + nsIDOMHTMLCollection *elements; + nsIDOMNode *item; + HTMLDOMNode *node; + nsresult nsres; + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); + + nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements); + if(NS_FAILED(nsres)) { + FIXME("GetElements failed: 0x%08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMHTMLCollection_Item(elements, id - MSHTML_DISPID_CUSTOM_MIN, &item); + nsIDOMHTMLCollection_Release(elements); + if(NS_FAILED(nsres)) { + FIXME("Item failed: 0x%08x\n", nsres); + return E_FAIL; + } + + node = get_node(This->element.node.doc, item, TRUE); + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)node; + + IHTMLDOMNode_AddRef(HTMLDOMNODE(node)); + nsIDOMNode_Release(item); + + return S_OK; +} + #undef HTMLFORM_NODE_THIS static const NodeImplVtbl HTMLFormElementImplVtbl = { HTMLFormElement_QI, - HTMLFormElement_destructor + HTMLFormElement_destructor, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLFormElement_get_dispid, + HTMLFormElement_invoke }; static const tid_t HTMLFormElement_iface_tids[] = {

1 0

Juan Lang : crypt32: Correct AKI extension used in end certificate and CRL when checking revocation .
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 9f5a554de044908fe8ef00405720e0fa27377afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5a554de044908fe8ef00405… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 1 12:28:06 2009 -0800 crypt32: Correct AKI extension used in end certificate and CRL when checking revocation. --- dlls/crypt32/tests/cert.c | 86 +++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 42 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 89268c0..4a3b0ae 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3099,55 +3099,57 @@ static const BYTE rootWithKeySignAndCRLSign[] = { 0x45,0xd4,0xf5,0xe3,0xdf,0x2a,0xf1,0x18,0x28,0x20,0xb5,0xf8,0xf5,0x8d,0x7a, 0x2e,0x84,0xee }; static const BYTE eeCert[] = { -0x30,0x82,0x01,0x93,0x30,0x81,0xfd,0xa0,0x03,0x02,0x01,0x02,0x02,0x01,0x01, +0x30,0x82,0x01,0xbb,0x30,0x82,0x01,0x24,0xa0,0x03,0x02,0x01,0x02,0x02,0x01, +0x01,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05, +0x00,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43, +0x65,0x72,0x74,0x31,0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x35,0x30,0x31,0x30, +0x30,0x30,0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x30,0x30,0x31,0x30, +0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55, +0x04,0x03,0x13,0x05,0x43,0x65,0x72,0x74,0x32,0x30,0x81,0x9f,0x30,0x0d,0x06, +0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x81,0x8d, +0x00,0x30,0x81,0x89,0x02,0x81,0x81,0x00,0xb8,0x52,0xda,0xc5,0x4b,0x3f,0xe5, +0x33,0x0e,0x67,0x5f,0x48,0x21,0xdc,0x7e,0xef,0x37,0x33,0xba,0xff,0xb4,0xc6, +0xdc,0xb6,0x17,0x8e,0x20,0x55,0x07,0x12,0xd2,0x7b,0x3c,0xce,0x30,0xc5,0xa7, +0x48,0x9f,0x6e,0xfe,0xb8,0xbe,0xdb,0x9f,0x9b,0x17,0x60,0x16,0xde,0xc6,0x8b, +0x47,0xd1,0x57,0x71,0x3c,0x93,0xfc,0xbd,0xec,0x44,0x32,0x3b,0xb9,0xcf,0x6b, +0x05,0x72,0xa7,0x87,0x8e,0x7e,0xd4,0x9a,0x87,0x1c,0x2f,0xb7,0x82,0x40,0xfc, +0x6a,0x80,0x83,0x68,0x28,0xce,0x84,0xf4,0x0b,0x2e,0x44,0xcb,0x53,0xac,0x85, +0x85,0xb5,0x46,0x36,0x98,0x3c,0x10,0x02,0xaa,0x02,0xbc,0x8b,0xa2,0x23,0xb2, +0xd3,0x51,0x9a,0x22,0x4a,0xe3,0xaa,0x4e,0x7c,0xda,0x38,0xcf,0x49,0x98,0x72, +0xa3,0x02,0x03,0x01,0x00,0x01,0xa3,0x25,0x30,0x23,0x30,0x21,0x06,0x03,0x55, +0x1d,0x23,0x04,0x1a,0x30,0x18,0x80,0x16,0x04,0x14,0x14,0x8c,0x16,0xbb,0xbe, +0x70,0xa2,0x28,0x89,0xa0,0x58,0xff,0x98,0xbd,0xa8,0x24,0x2b,0x8a,0xe9,0x9a, 0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00, -0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65, -0x72,0x74,0x31,0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x35,0x30,0x31,0x30,0x30, -0x30,0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x30,0x30,0x31,0x30,0x30, -0x30,0x30,0x30,0x30,0x5a,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04, -0x03,0x13,0x05,0x43,0x65,0x72,0x74,0x32,0x30,0x81,0x9f,0x30,0x0d,0x06,0x09, -0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x81,0x8d,0x00, -0x30,0x81,0x89,0x02,0x81,0x81,0x00,0xb8,0x52,0xda,0xc5,0x4b,0x3f,0xe5,0x33, -0x0e,0x67,0x5f,0x48,0x21,0xdc,0x7e,0xef,0x37,0x33,0xba,0xff,0xb4,0xc6,0xdc, -0xb6,0x17,0x8e,0x20,0x55,0x07,0x12,0xd2,0x7b,0x3c,0xce,0x30,0xc5,0xa7,0x48, -0x9f,0x6e,0xfe,0xb8,0xbe,0xdb,0x9f,0x9b,0x17,0x60,0x16,0xde,0xc6,0x8b,0x47, -0xd1,0x57,0x71,0x3c,0x93,0xfc,0xbd,0xec,0x44,0x32,0x3b,0xb9,0xcf,0x6b,0x05, -0x72,0xa7,0x87,0x8e,0x7e,0xd4,0x9a,0x87,0x1c,0x2f,0xb7,0x82,0x40,0xfc,0x6a, -0x80,0x83,0x68,0x28,0xce,0x84,0xf4,0x0b,0x2e,0x44,0xcb,0x53,0xac,0x85,0x85, -0xb5,0x46,0x36,0x98,0x3c,0x10,0x02,0xaa,0x02,0xbc,0x8b,0xa2,0x23,0xb2,0xd3, -0x51,0x9a,0x22,0x4a,0xe3,0xaa,0x4e,0x7c,0xda,0x38,0xcf,0x49,0x98,0x72,0xa3, -0x02,0x03,0x01,0x00,0x01,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d, -0x01,0x01,0x05,0x05,0x00,0x03,0x81,0x81,0x00,0x22,0xf1,0x66,0x00,0x79,0xd2, -0xe6,0xb2,0xb2,0xf7,0x2f,0x98,0x92,0x7d,0x73,0xc3,0x6c,0x5c,0x77,0x20,0xe3, -0xbf,0x3e,0xe0,0xb3,0x5c,0x68,0xb4,0x9b,0x3a,0x41,0xae,0x94,0xa0,0x80,0x3a, -0xfe,0x5d,0x7a,0x56,0x87,0x85,0x44,0x45,0xcf,0xa6,0xd3,0x10,0xe7,0x73,0x41, -0xf2,0x7f,0x88,0x85,0x91,0x8e,0xe6,0xec,0xe2,0xce,0x08,0xbc,0xa5,0x76,0xe5, -0x4d,0x1d,0xb7,0x70,0x31,0xdd,0xc9,0x9a,0x15,0x32,0x11,0x5a,0x4e,0x62,0xc8, -0xd1,0xf8,0xec,0x46,0x39,0x5b,0xe7,0x67,0x1f,0x58,0xe8,0xa1,0xa0,0x5b,0xf7, -0x8a,0x6d,0x5f,0x91,0x18,0xd4,0x90,0x85,0xff,0x30,0xc7,0xca,0x9c,0xc6,0x92, -0xb0,0xca,0x16,0xc4,0xa4,0xc0,0xd6,0xe8,0xff,0x15,0x19,0xd1,0x30,0x61,0xf3, -0xef,0x9f }; +0x03,0x81,0x81,0x00,0x91,0xd2,0x78,0xe5,0xdc,0x10,0xa3,0x08,0x5e,0x20,0x85, +0xec,0x57,0x09,0x83,0x68,0x45,0xbe,0x4c,0xab,0x09,0x7b,0xe9,0x8f,0x71,0x43, +0x29,0x02,0x7e,0x26,0x55,0xc6,0xf1,0xfa,0xb2,0xbf,0x17,0x8f,0x37,0x30,0x57, +0x75,0x63,0xce,0xb8,0x5f,0x7e,0x3f,0xfd,0xc2,0x7a,0xa0,0x61,0x5f,0x41,0x6c, +0x94,0x6a,0xc3,0x04,0x0c,0xd7,0xcf,0x6f,0x4a,0x1e,0xdb,0x42,0xd2,0xa0,0x45, +0xeb,0xd4,0x4d,0x3a,0x3d,0x98,0x05,0x03,0x61,0x87,0x81,0xae,0xe7,0x8a,0xfd, +0x92,0x8c,0xb9,0xe1,0x48,0xf9,0xe2,0x0e,0x0f,0xef,0x72,0xe6,0x6e,0x7e,0x41, +0xc2,0x8c,0x99,0xa9,0xbe,0x3a,0x01,0xa0,0x55,0x1d,0x65,0x7e,0x2a,0xb7,0x93, +0xc5,0x09,0x7d,0x81,0x76,0xa8,0x50,0xff,0x48,0xe5,0xec,0x72 }; static const BYTE rootSignedCRL[] = { -0x30,0x82,0x01,0x1d,0x30,0x81,0x87,0x02,0x01,0x01,0x30,0x0d,0x06,0x09,0x2a, +0x30,0x82,0x01,0x21,0x30,0x81,0x8b,0x02,0x01,0x01,0x30,0x0d,0x06,0x09,0x2a, 0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x30,0x10,0x31,0x0e,0x30, 0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65,0x72,0x74,0x31,0x17,0x0d, 0x30,0x37,0x30,0x39,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x17,0x0d, 0x30,0x37,0x31,0x32,0x33,0x31,0x32,0x33,0x35,0x39,0x35,0x39,0x5a,0x30,0x14, 0x30,0x12,0x02,0x01,0x01,0x17,0x0d,0x30,0x37,0x30,0x39,0x30,0x31,0x30,0x30, -0x30,0x30,0x30,0x30,0x5a,0xa0,0x2d,0x30,0x2b,0x30,0x0a,0x06,0x03,0x55,0x1d, -0x14,0x04,0x03,0x02,0x01,0x01,0x30,0x1d,0x06,0x03,0x55,0x1d,0x23,0x04,0x16, -0x04,0x14,0x14,0x8c,0x16,0xbb,0xbe,0x70,0xa2,0x28,0x89,0xa0,0x58,0xff,0x98, -0xbd,0xa8,0x24,0x2b,0x8a,0xe9,0x9a,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86, -0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x03,0x81,0x81,0x00,0x9b,0x2b,0x99,0x0d, -0x16,0x83,0x93,0x54,0x29,0x3a,0xa6,0x53,0x5d,0xf8,0xa6,0x73,0x9f,0x2a,0x45, -0x39,0x91,0xff,0x91,0x1c,0x27,0x06,0xe8,0xdb,0x72,0x3f,0x66,0x89,0x15,0x68, -0x55,0xd5,0x49,0x63,0xa6,0x00,0xe9,0x66,0x9c,0x97,0xf9,0xb3,0xb3,0x2b,0x1b, -0xc7,0x79,0x46,0xa8,0xd8,0x2b,0x78,0x27,0xa0,0x70,0x02,0x81,0xc6,0x40,0xb3, -0x76,0x32,0x65,0x4c,0xf8,0xff,0x1d,0x41,0x6e,0x16,0x09,0xa2,0x8a,0x7b,0x0c, -0xd0,0xa6,0x9b,0x61,0xa3,0x7c,0x02,0x91,0x79,0xdf,0x6a,0x5e,0x88,0x95,0x66, -0x33,0x17,0xcb,0x5a,0xd2,0xdc,0x89,0x05,0x62,0x97,0x60,0x73,0x7b,0x2c,0x1a, -0x90,0x20,0x73,0x24,0x9f,0x45,0x22,0x4b,0xc1,0x33,0xd1,0xda,0xd8,0x7e,0x1b, -0x3d,0x74,0xd6,0x3b }; +0x30,0x30,0x30,0x30,0x5a,0xa0,0x31,0x30,0x2f,0x30,0x0a,0x06,0x03,0x55,0x1d, +0x14,0x04,0x03,0x02,0x01,0x01,0x30,0x21,0x06,0x03,0x55,0x1d,0x23,0x04,0x1a, +0x30,0x18,0x80,0x16,0x04,0x14,0x14,0x8c,0x16,0xbb,0xbe,0x70,0xa2,0x28,0x89, +0xa0,0x58,0xff,0x98,0xbd,0xa8,0x24,0x2b,0x8a,0xe9,0x9a,0x30,0x0d,0x06,0x09, +0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x03,0x81,0x81,0x00, +0x66,0x62,0xcd,0xcf,0x5e,0x70,0xa5,0xf2,0x5b,0x39,0x86,0x5c,0x93,0x7b,0xd2, +0xde,0x51,0x29,0x1e,0x87,0x0c,0xe1,0xae,0xfe,0xf6,0x34,0x64,0x5a,0xd7,0xa9, +0x7c,0xa0,0x7b,0x98,0x2c,0x39,0x3a,0x43,0x2a,0xd8,0xe4,0x5c,0x4b,0x3d,0x99, +0xbb,0x04,0x10,0xe8,0xe4,0xfa,0x26,0xf5,0x83,0x6f,0xf5,0x81,0x6a,0xf4,0x23, +0xd0,0x68,0x52,0x2b,0x62,0x7c,0xe8,0xb1,0x69,0x21,0x99,0x80,0xd7,0x2d,0x16, +0xd8,0x4f,0xf2,0xd9,0xac,0x99,0xf1,0xb5,0xbb,0xd0,0x5e,0xeb,0xa5,0x31,0x99, +0x79,0xd2,0x81,0x24,0x8c,0x64,0xc6,0xa7,0x3d,0x2f,0x77,0xa2,0x08,0xad,0x00, +0x8b,0x65,0xde,0x00,0x8b,0xd5,0x8e,0x29,0xb9,0xdf,0x9c,0x5c,0x57,0x76,0xe1, +0x17,0x4c,0x47,0x4b,0xfa,0xf2,0xa4,0x38 }; static void testVerifyRevocation(void) {

1 0

Jacek Caban : mshtml: Don't depend on necko channel in nsChannel:: QueryInterface implementation.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 28677ea87d99933ca9672a4619b3f12171f5cae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28677ea87d99933ca9672a461… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 22:50:19 2009 +0100 mshtml: Don't depend on necko channel in nsChannel::QueryInterface implementation. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsio.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 626bc4a..804d918 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -441,6 +441,7 @@ typedef struct { char *content_type; char *charset; PRUint32 response_status; + UINT url_scheme; } nsChannel; typedef struct { diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 5362117..e4c5321 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -158,6 +158,11 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) return hres != S_OK; } +static inline BOOL is_http_channel(nsChannel *This) +{ + return This->url_scheme == URL_SCHEME_HTTP || This->url_scheme == URL_SCHEME_HTTP; +} + #define NSCHANNEL_THIS(iface) DEFINE_THIS(nsChannel, HttpChannel, iface) static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef riid, nsQIResult result) @@ -175,13 +180,13 @@ static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef r *result = NSCHANNEL(This); }else if(IsEqualGUID(&IID_nsIHttpChannel, riid)) { TRACE("(%p)->(IID_nsIHttpChannel %p)\n", This, result); - *result = This->http_channel ? NSHTTPCHANNEL(This) : NULL; + *result = is_http_channel(This) ? NSHTTPCHANNEL(This) : NULL; }else if(IsEqualGUID(&IID_nsIUploadChannel, riid)) { TRACE("(%p)->(IID_nsIUploadChannel %p)\n", This, result); *result = NSUPCHANNEL(This); }else if(IsEqualGUID(&IID_nsIHttpChannelInternal, riid)) { TRACE("(%p)->(IID_nsIHttpChannelInternal %p)\n", This, result); - *result = This->http_channel_internal ? NSHTTPINTERNAL(This) : NULL; + *result = is_http_channel(This) ? NSHTTPINTERNAL(This) : NULL; }else { TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), result); *result = NULL; @@ -2689,9 +2694,11 @@ static nsresult NSAPI nsIOService_NewFileURI(nsIIOService *iface, nsIFile *aFile static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI *aURI, nsIChannel **_retval) { + PARSEDURLW parsed_url = {sizeof(PARSEDURLW)}; nsIChannel *channel = NULL; nsChannel *ret; nsIWineURI *wine_uri; + const WCHAR *url; nsresult nsres; TRACE("(%p %p)\n", aURI, _retval); @@ -2716,6 +2723,9 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI nsIURI_AddRef(aURI); ret->original_uri = aURI; + nsIWineURI_GetWineURL(wine_uri, &url); + ret->url_scheme = url && SUCCEEDED(ParseURLW(url, &parsed_url)) ? parsed_url.nScheme : URL_SCHEME_UNKNOWN; + if(channel) { nsIChannel_QueryInterface(channel, &IID_nsIHttpChannel, (void**)&ret->http_channel); nsIChannel_QueryInterface(channel, &IID_nsIHttpChannelInternal, (void**)&ret->http_channel_internal);

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::get_cookie implementation.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 614c66a41815085e692d23a3813a63b5f2f73557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=614c66a41815085e692d23a38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 22:50:43 2009 +0100 mshtml: Added IHTMLDocument2::get_cookie implementation. --- dlls/mshtml/htmldoc.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e746fb0..048b4ae 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "wininet.h" #include "ole2.h" #include "perhist.h" #include "mshtmdid.h" @@ -617,8 +618,42 @@ static HRESULT WINAPI HTMLDocument_put_cookie(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_cookie(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + DWORD size; + BOOL bret; + + TRACE("(%p)->(%p)\n", This, p); + + size = 0; + bret = InternetGetCookieExW(This->window->url, NULL, NULL, &size, 0, NULL); + if(!bret) { + switch(GetLastError()) { + case ERROR_INSUFFICIENT_BUFFER: + break; + case ERROR_NO_MORE_ITEMS: + *p = NULL; + return S_OK; + default: + FIXME("InternetGetCookieExW failed: %u\n", GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + } + + if(!size) { + *p = NULL; + return S_OK; + } + + *p = SysAllocStringLen(NULL, size-1); + if(!*p) + return E_OUTOFMEMORY; + + bret = InternetGetCookieExW(This->window->url, NULL, *p, &size, 0, NULL); + if(!bret) { + ERR("InternetGetCookieExW failed: %u\n", GetLastError()); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_put_expando(IHTMLDocument2 *iface, VARIANT_BOOL v)

1 0

Henri Verbeet : d3d10core: Allow a NULL input layout to be set in IASetInputLayout().
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: ee396dda28744f0ea5aa1681f45d37f1ca108c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee396dda28744f0ea5aa1681f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 2 10:41:21 2009 +0100 d3d10core: Allow a NULL input layout to be set in IASetInputLayout(). --- dlls/d3d10core/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 4898a09..6f96218 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -186,7 +186,7 @@ static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device *iface, TRACE("iface %p, input_layout %p\n", iface, input_layout); IWineD3DDevice_SetVertexDeclaration(This->wined3d_device, - ((struct d3d10_input_layout *)input_layout)->wined3d_decl); + input_layout ? ((struct d3d10_input_layout *)input_layout)->wined3d_decl : NULL); } static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *iface,

1 0

Andrew Eikum : mshtml: Add get_dispid and invoke methods to HTMLNode vtbl.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: e5948590ee754f133fbb496d7adcc4497408d5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5948590ee754f133fbb496d7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Dec 1 14:04:17 2009 -0600 mshtml: Add get_dispid and invoke methods to HTMLNode vtbl. --- dlls/mshtml/htmlelem.c | 35 ++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4e154cd..efcdb6c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1374,6 +1374,31 @@ static HRESULT WINAPI HTMLElement_get_all(IHTMLElement *iface, IDispatch **p) return S_OK; } +static HRESULT HTMLElement_get_dispid(IUnknown *iface, BSTR name, + DWORD grfdex, DISPID *pid) +{ + HTMLElement *This = HTMLELEM_THIS(iface); + + if(This->node.vtbl->get_dispid) + return This->node.vtbl->get_dispid(&This->node, name, grfdex, pid); + + return DISP_E_UNKNOWNNAME; +} + +static HRESULT HTMLElement_invoke(IUnknown *iface, DISPID id, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, + IServiceProvider *caller) +{ + HTMLElement *This = HTMLELEM_THIS(iface); + + if(This->node.vtbl->invoke) + return This->node.vtbl->invoke(&This->node, id, lcid, flags, + params, res, ei, caller); + + ERR("(%p): element has no invoke method\n", This); + return E_NOTIMPL; +} + #undef HTMLELEM_THIS static const IHTMLElementVtbl HTMLElementVtbl = { @@ -1533,8 +1558,14 @@ static const tid_t HTMLElement_iface_tids[] = { 0 }; -static dispex_static_data_t HTMLElement_dispex = { +static dispex_static_data_vtbl_t HTMLElement_dispex_vtbl = { NULL, + HTMLElement_get_dispid, + HTMLElement_invoke +}; + +static dispex_static_data_t HTMLElement_dispex = { + &HTMLElement_dispex_vtbl, DispHTMLUnknownElement_tid, NULL, HTMLElement_iface_tids @@ -1547,6 +1578,8 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen HTMLElement2_Init(This); HTMLElement3_Init(This); + if(dispex_data && !dispex_data->vtbl) + dispex_data->vtbl = &HTMLElement_dispex_vtbl; init_dispex(&This->node.dispex, (IUnknown*)HTMLELEM(This), dispex_data ? dispex_data : &HTMLElement_dispex); if(nselem) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e0e842c..626bc4a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -452,6 +452,8 @@ typedef struct { HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); HRESULT (*get_document)(HTMLDOMNode*,IDispatch**); HRESULT (*get_readystate)(HTMLDOMNode*,BSTR*); + HRESULT (*get_dispid)(HTMLDOMNode*,BSTR,DWORD,DISPID*); + HRESULT (*invoke)(HTMLDOMNode*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); } NodeImplVtbl; struct HTMLDOMNode {

1 0

Jacek Caban : mshtml: Don't wrap URIs related to Gecko special URIs.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: dc3818e70786de3a6e7fb16b53b7fde796347ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3818e70786de3a6e7fb16b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 22:50:00 2009 +0100 mshtml: Don't wrap URIs related to Gecko special URIs. --- dlls/mshtml/nsio.c | 33 ++++++++++----------------------- 1 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 4328761..5362117 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -844,7 +844,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen } if(!window) { - TRACE("window = NULL\n"); + ERR("window = NULL\n"); return This->channel ? nsIChannel_AsyncOpen(This->channel, aListener, aContext) : NS_ERROR_UNEXPECTED; @@ -2627,38 +2627,25 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * } if(aBaseURI) { - nsACString base_uri_str; - const char *base_uri = NULL; + PARSEDURLA parsed_url = {sizeof(PARSEDURLA)}; - nsACString_Init(&base_uri_str, NULL); - - nsres = nsIURI_GetSpec(aBaseURI, &base_uri_str); + nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsIWineURI, (void**)&base_wine_uri); if(NS_SUCCEEDED(nsres)) { - nsACString_GetData(&base_uri_str, &base_uri); - TRACE("base_uri=%s\n", debugstr_a(base_uri)); + nsIWineURI_GetWineURL(base_wine_uri, &base_wine_url); + nsIWineURI_GetWindow(base_wine_uri, &window); + TRACE("base url: %s window: %p\n", debugstr_w(base_wine_url), window); + }else if(FAILED(ParseURLA(spec, &parsed_url))) { + TRACE("not wraping\n"); + return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval); }else { - ERR("GetSpec failed: %08x\n", nsres); + WARN("Could not get base nsIWineURI: %08x\n", nsres); } - - nsACString_Finish(&base_uri_str); } nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri); if(NS_FAILED(nsres)) TRACE("NewURI failed: %08x\n", nsres); - if(aBaseURI) { - nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsIWineURI, (void**)&base_wine_uri); - if(NS_SUCCEEDED(nsres)) { - nsIWineURI_GetWindow(base_wine_uri, &window); - nsIWineURI_GetWineURL(base_wine_uri, &base_wine_url); - }else { - TRACE("Could not get base nsIWineURI: %08x\n", nsres); - } - } - - TRACE("window = %p\n", window); - nsres = create_uri(uri, window, NULL, &wine_uri); *_retval = (nsIURI*)wine_uri;

1 0

Henri Verbeet : wined3d: Set appropriate error codes in IWineD3DDeviceImpl_Init3D() on out of memory.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 36823dd96b54e6530627ed173298c67d6a1bb5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=36823dd96b54e6530627ed173… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 2 10:41:20 2009 +0100 wined3d: Set appropriate error codes in IWineD3DDeviceImpl_Init3D() on out of memory. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 136f396..98c5002 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1783,11 +1783,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, This->palettes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PALETTEENTRY*)); if(!This->palettes || !This->render_targets || !This->draw_buffers) { ERR("Out of memory!\n"); + hr = E_OUTOFMEMORY; goto err_out; } This->palettes[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(PALETTEENTRY) * 256); if(!This->palettes[0]) { ERR("Out of memory!\n"); + hr = E_OUTOFMEMORY; goto err_out; } for (i = 0; i < 256; ++i) {

1 0