September 2014 - Wine-commits

Jacek Caban : mshtml: Don't share nsoption reference with nsnode.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: 01e09bbb47b1779f1d5024da34a5c2b6da3c6407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e09bbb47b1779f1d5024da3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:11:19 2014 +0200 mshtml: Don't share nsoption reference with nsnode. --- dlls/mshtml/htmloption.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 4738eb5..b5c8b7d 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -311,13 +311,44 @@ static HRESULT HTMLOptionElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } +static void HTMLOptionElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLOptionElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsoption) + note_cc_edge((nsISupports*)This->nsoption, "This->nsoption", cb); +} + +static void HTMLOptionElement_unlink(HTMLDOMNode *iface) +{ + HTMLOptionElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsoption) { + nsIDOMHTMLOptionElement *nsoption = This->nsoption; + + This->nsoption = NULL; + nsIDOMHTMLOptionElement_Release(nsoption); + } +} + static const NodeImplVtbl HTMLOptionElementImplVtbl = { HTMLOptionElement_QI, HTMLElement_destructor, HTMLElement_cpc, HTMLElement_clone, HTMLElement_handle_event, - HTMLElement_get_attr_col + HTMLElement_get_attr_col, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLOptionElement_traverse, + HTMLOptionElement_unlink }; static const tid_t HTMLOptionElement_iface_tids[] = { @@ -347,10 +378,7 @@ HRESULT HTMLOptionElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele HTMLElement_Init(&ret->element, doc, nselem, &HTMLOptionElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLOptionElement, (void**)&ret->nsoption); - - /* Share nsoption reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsoption == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Don't share nstextarea reference with nsnode.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: 556b2ad0c5b3504727dd11e3292d0b986367bcf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=556b2ad0c5b3504727dd11e32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:11:32 2014 +0200 mshtml: Don't share nstextarea reference with nsnode. --- dlls/mshtml/htmltextarea.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index e11cb8d..9fb8453 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -411,6 +411,26 @@ static HRESULT HTMLTextAreaElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_ return IHTMLTextAreaElement_get_disabled(&This->IHTMLTextAreaElement_iface, p); } +static void HTMLTextAreaElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nstextarea) + note_cc_edge((nsISupports*)This->nstextarea, "This->nstextarea", cb); +} + +static void HTMLTextAreaElement_unlink(HTMLDOMNode *iface) +{ + HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nstextarea) { + nsIDOMHTMLTextAreaElement *nstextarea = This->nstextarea; + + This->nstextarea = NULL; + nsIDOMHTMLTextAreaElement_Release(nstextarea); + } +} + static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { HTMLTextAreaElement_QI, HTMLElement_destructor, @@ -421,7 +441,14 @@ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { NULL, NULL, HTMLTextAreaElementImpl_put_disabled, - HTMLTextAreaElementImpl_get_disabled + HTMLTextAreaElementImpl_get_disabled, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLTextAreaElement_traverse, + HTMLTextAreaElement_unlink }; static const tid_t HTMLTextAreaElement_iface_tids[] = { @@ -451,12 +478,8 @@ HRESULT HTMLTextAreaElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nse HTMLElement_Init(&ret->element, doc, nselem, &HTMLTextAreaElement_dispex); - nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTextAreaElement, - (void**)&ret->nstextarea); - - /* Share nstextarea reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nstextarea == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTextAreaElement, (void**)&ret->nstextarea); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Don't share nstable reference with nsnode.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: e5e0fc30190f31d7bfa00b8160cf042ab78d83cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e0fc30190f31d7bfa00b816… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:11:42 2014 +0200 mshtml: Don't share nstable reference with nsnode. --- dlls/mshtml/htmltable.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index d938699..8e64efa 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -993,6 +993,26 @@ static HRESULT HTMLTable_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } +static void HTMLTable_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTable *This = impl_from_HTMLDOMNode(iface); + + if(This->nstable) + note_cc_edge((nsISupports*)This->nstable, "This->nstable", cb); +} + +static void HTMLTable_unlink(HTMLDOMNode *iface) +{ + HTMLTable *This = impl_from_HTMLDOMNode(iface); + + if(This->nstable) { + nsIDOMHTMLTableElement *nstable = This->nstable; + + This->nstable = NULL; + nsIDOMHTMLTableElement_Release(nstable); + } +} + static const cpc_entry_t HTMLTable_cpc[] = { {&DIID_HTMLTableEvents}, HTMLELEMENT_CPC, @@ -1005,7 +1025,18 @@ static const NodeImplVtbl HTMLTableImplVtbl = { HTMLTable_cpc, HTMLElement_clone, HTMLElement_handle_event, - HTMLElement_get_attr_col + HTMLElement_get_attr_col, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLTable_traverse, + HTMLTable_unlink }; static const tid_t HTMLTable_iface_tids[] = { @@ -1040,10 +1071,7 @@ HRESULT HTMLTable_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLE HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableElement, (void**)&ret->nstable); - - /* Share the reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nstable == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Don't share nscell reference with nsnode.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: d2a97e73eb9c05feebe0c0becc67f3c771f3285c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a97e73eb9c05feebe0c0bec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:11:52 2014 +0200 mshtml: Don't share nscell reference with nsnode. --- dlls/mshtml/htmltablecell.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index 4bcde18..3d3fdb2 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -398,13 +398,44 @@ static void HTMLTableCell_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +static void HTMLTableCell_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTableCell *This = impl_from_HTMLDOMNode(iface); + + if(This->nscell) + note_cc_edge((nsISupports*)This->nscell, "This->nstablecell", cb); +} + +static void HTMLTableCell_unlink(HTMLDOMNode *iface) +{ + HTMLTableCell *This = impl_from_HTMLDOMNode(iface); + + if(This->nscell) { + nsIDOMHTMLTableCellElement *nscell = This->nscell; + + This->nscell = NULL; + nsIDOMHTMLTableCellElement_Release(nscell); + } +} + static const NodeImplVtbl HTMLTableCellImplVtbl = { HTMLTableCell_QI, HTMLTableCell_destructor, HTMLElement_cpc, HTMLElement_clone, HTMLElement_handle_event, - HTMLElement_get_attr_col + HTMLElement_get_attr_col, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLTableCell_traverse, + HTMLTableCell_unlink }; static const tid_t HTMLTableCell_iface_tids[] = { @@ -435,10 +466,7 @@ HRESULT HTMLTableCell_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, H HTMLElement_Init(&ret->element, doc, nselem, &HTMLTableCell_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableCellElement, (void**)&ret->nscell); - - /* Share nscell reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nscell == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Don't share nsobject reference with nsnode.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: b472a1f3f427e4c60fbd4a5d8c44ff86e92a3154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b472a1f3f427e4c60fbd4a5d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 12:11:59 2014 +0200 mshtml: Don't share nsobject reference with nsnode. --- dlls/mshtml/htmlobject.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 34c42d5..2a8ccfa 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -704,6 +704,26 @@ static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid return invoke_plugin_prop(&This->plugin_container, id, lcid, flags, params, res, ei); } +static void HTMLObjectElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsobject) + note_cc_edge((nsISupports*)This->nsobject, "This->nsobject", cb); +} + +static void HTMLObjectElement_unlink(HTMLDOMNode *iface) +{ + HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsobject) { + nsIDOMHTMLObjectElement *nsobject = This->nsobject; + + This->nsobject = NULL; + nsIDOMHTMLObjectElement_Release(nsobject); + } +} + static const NodeImplVtbl HTMLObjectElementImplVtbl = { HTMLObjectElement_QI, HTMLObjectElement_destructor, @@ -718,7 +738,10 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = { NULL, HTMLObjectElement_get_readystate, HTMLObjectElement_get_dispid, - HTMLObjectElement_invoke + HTMLObjectElement_invoke, + NULL, + HTMLObjectElement_traverse, + HTMLObjectElement_unlink }; static const tid_t HTMLObjectElement_iface_tids[] = { @@ -750,10 +773,7 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele HTMLElement_Init(&ret->plugin_container.element, doc, nselem, &HTMLObjectElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLObjectElement, (void**)&ret->nsobject); - - /* Share nsobject reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsobject == ret->plugin_container.element.node.nsnode); - nsIDOMNode_Release(ret->plugin_container.element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->plugin_container.element; return S_OK;

1 0

Nikolay Sivov : dwrite: Update to IDWriteTextAnalyzer2.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: d58f519c08da13aaf6677371a314e24b031a04f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58f519c08da13aaf6677371a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 25 11:25:52 2014 +0400 dwrite: Update to IDWriteTextAnalyzer2. --- dlls/dwrite/analyzer.c | 149 ++++++++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/main.c | 1 + 2 files changed, 135 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d58f519c08da13aaf6677…

1 0

Nikolay Sivov : dwrite: Allow underscores in script names.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: dae9096c2ee265d3fca0895a3ee89bb680751e37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae9096c2ee265d3fca0895a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 25 11:56:08 2014 +0400 dwrite: Allow underscores in script names. --- dlls/dwrite/scripts.c | 924 ++++++++++++++++++++++++-------------------------- dlls/dwrite/scripts.h | 162 ++++----- tools/make_unicode | 4 +- 3 files changed, 524 insertions(+), 566 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dae9096c2ee265d3fca08…

1 0

Jacek Caban : ieframe: Added partial Refresh2 implementation.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: c1acf1647b505460baa5cb3891926358f0677cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1acf1647b505460baa5cb389… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 25 13:38:24 2014 +0200 ieframe: Added partial Refresh2 implementation. --- dlls/ieframe/dochost.c | 5 ++++- dlls/ieframe/ie.c | 8 +++++--- dlls/ieframe/ieframe.h | 2 +- dlls/ieframe/tests/webbrowser.c | 21 +++++++++++++++++---- dlls/ieframe/webbrowser.c | 8 +++++--- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 8c5d4b5..c76e91c 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -532,12 +532,15 @@ void deactivate_document(DocHost *This) This->document = NULL; } -HRESULT refresh_document(DocHost *This) +HRESULT refresh_document(DocHost *This, const VARIANT *level) { IOleCommandTarget *cmdtrg; VARIANT vin, vout; HRESULT hres; + if(level && (V_VT(level) != VT_I4 || V_I4(level) != REFRESH_NORMAL)) + FIXME("Unsupported refresh level %s\n", debugstr_variant(level)); + if(!This->document) { FIXME("no document\n"); return E_FAIL; diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 5eb1d26..12be68e 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -182,14 +182,16 @@ static HRESULT WINAPI InternetExplorer_Refresh(IWebBrowser2 *iface) TRACE("(%p)\n", This); - return refresh_document(&This->doc_host); + return refresh_document(&This->doc_host, NULL); } static HRESULT WINAPI InternetExplorer_Refresh2(IWebBrowser2 *iface, VARIANT *Level) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, Level); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, Level); + + return refresh_document(&This->doc_host, Level); } static HRESULT WINAPI InternetExplorer_Stop(IWebBrowser2 *iface) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 063832d..93be1fe 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -265,7 +265,7 @@ HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VAR HRESULT go_home(DocHost*) DECLSPEC_HIDDEN; HRESULT go_back(DocHost*) DECLSPEC_HIDDEN; HRESULT go_forward(DocHost*) DECLSPEC_HIDDEN; -HRESULT refresh_document(DocHost*) DECLSPEC_HIDDEN; +HRESULT refresh_document(DocHost*,const VARIANT*) DECLSPEC_HIDDEN; HRESULT get_location_url(DocHost*,BSTR*) DECLSPEC_HIDDEN; HRESULT set_dochost_url(DocHost*,const WCHAR*) DECLSPEC_HIDDEN; void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 12b349f..0ddd360 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2835,15 +2835,27 @@ static void test_download(DWORD flags) CLEAR_CALLED(QueryStatus_STOP); } -static void test_Refresh(IWebBrowser2 *webbrowser) +static void test_Refresh(IWebBrowser2 *webbrowser, BOOL use_refresh2) { HRESULT hres; trace("Refresh...\n"); SET_EXPECT(Exec_DocHostCommandHandler_2300); - hres = IWebBrowser2_Refresh(webbrowser); - ok(hres == S_OK, "Refresh failed: %08x\n", hres); + + if(use_refresh2) { + VARIANT v; + + V_VT(&v) = VT_I4; + V_I4(&v) = REFRESH_NORMAL; + + hres = IWebBrowser2_Refresh2(webbrowser, &v); + ok(hres == S_OK, "Refresh failed: %08x\n", hres); + }else { + hres = IWebBrowser2_Refresh(webbrowser); + ok(hres == S_OK, "Refresh failed: %08x\n", hres); + } + CHECK_CALLED(Exec_DocHostCommandHandler_2300); test_download(DWL_REFRESH); @@ -3423,7 +3435,8 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_Navigate2(webbrowser, "http://test.winehq.org/tests/hello.html"); test_download(DWL_EXPECT_BEFORE_NAVIGATE|DWL_HTTP); - test_Refresh(webbrowser); + test_Refresh(webbrowser, FALSE); + test_Refresh(webbrowser, TRUE); trace("put_href http URL...\n"); test_put_href(webbrowser, "http://test.winehq.org/tests/winehq_snapshot/"); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 55f757f..a3233e1 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -296,14 +296,16 @@ static HRESULT WINAPI WebBrowser_Refresh(IWebBrowser2 *iface) TRACE("(%p)\n", This); - return refresh_document(&This->doc_host); + return refresh_document(&This->doc_host, NULL); } static HRESULT WINAPI WebBrowser_Refresh2(IWebBrowser2 *iface, VARIANT *Level) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(Level)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(Level)); + + return refresh_document(&This->doc_host, Level); } static HRESULT WINAPI WebBrowser_Stop(IWebBrowser2 *iface)

1 0

Alistair Leslie-Hughes : dpvoice: Add DirectPlay Voice test.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: 92564dd03eea1ab5cd005df0c71e6f1755a83076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92564dd03eea1ab5cd005df0c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 12 11:02:42 2014 +1000 dpvoice: Add DirectPlay Voice test. --- configure | 1 + configure.ac | 1 + dlls/dpvoice/tests/Makefile.in | 5 + dlls/dpvoice/tests/voice.c | 342 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 349 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92564dd03eea1ab5cd005…

1 0

Hans Leidekker : wininet/tests: Update test data to match the new certificate on winehq.org.
by Alexandre Julliard 25 Sep '14

25 Sep '14

Module: wine Branch: master Commit: bbfae5be4b34995e66a92f553e2a8c71ce52f998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfae5be4b34995e66a92f553… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 25 14:21:06 2014 +0200 wininet/tests: Update test data to match the new certificate on winehq.org. --- dlls/wininet/tests/http.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ad6622c..e7c3e17 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4180,15 +4180,14 @@ typedef struct { } cert_struct_test_t; static const cert_struct_test_t test_winehq_org_cert = { - "6JcR7G3G8tgjkeoMcitK-bTbzcpumDSy\r\n" "GT98380011\r\n" "See www.rapidssl.com/resources/cps (c)14\r\n" "Domain Control Validated - RapidSSL(R)\r\n" "*.winehq.org", "US\r\n" - "\"GeoTrust, Inc.\"\r\n" - "RapidSSL CA" + "GeoTrust Inc.\r\n" + "RapidSSL SHA256 CA - G3" }; static const cert_struct_test_t test_winehq_com_cert = {

1 0