wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Michael Stefaniuc : dmloader: Handle NULL and empty path strings in SetSearchDirectory().
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: 2e3a8a6fb8e0dfc58f84f1f10445387f9153f44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3a8a6fb8e0dfc58f84f1f10… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 25 20:57:18 2017 +0200 dmloader: Handle NULL and empty path strings in SetSearchDirectory(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index aa5dfed..6d58d43 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -522,9 +522,14 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetSearchDirectory(IDirectMusicLoad TRACE("(%p, %s, %s, %d)\n", This, debugstr_dmguid(class), debugstr_w(path), clear); - attr = GetFileAttributesW(path); - if (attr == INVALID_FILE_ATTRIBUTES || !(attr & FILE_ATTRIBUTE_DIRECTORY)) - return DMUS_E_LOADER_BADPATH; + if (!path) + return E_POINTER; + + if (path[0]) { + attr = GetFileAttributesW(path); + if (attr == INVALID_FILE_ATTRIBUTES || !(attr & FILE_ATTRIBUTE_DIRECTORY)) + return DMUS_E_LOADER_BADPATH; + } if (clear) FIXME("clear flag ignored\n");

1 0

Fabian Maurer : gdiplus: Avoid division by zero in SOFTWARE_GdipDrawThinPath.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: 400cfb0fd9d0f25316b680882fce938d2f0724b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=400cfb0fd9d0f25316b680882… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jul 25 00:50:09 2017 +0200 gdiplus: Avoid division by zero in SOFTWARE_GdipDrawThinPath. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c5c66a9..43cd6ac 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3615,6 +3615,9 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa end_pointi.X = floorf(end_point.X); end_pointi.Y = floorf(end_point.Y); + if(start_pointi.X == end_pointi.X && start_pointi.Y == end_pointi.Y) + continue; + /* draw line segment */ if (abs(start_pointi.Y - end_pointi.Y) > abs(start_pointi.X - end_pointi.X)) {

1 0

Piotr Caban : mshtml: Add IElementTraversal:: get_firstElementChild implementation.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: 3c7415f715108d30164e280e08a4683f974e5034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7415f715108d30164e280e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 25 17:57:20 2017 +0200 mshtml: Add IElementTraversal::get_firstElementChild implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/elements.js | 17 ++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ae31d1d..927541b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4953,8 +4953,25 @@ static HRESULT WINAPI ElementTraversal_Invoke(IElementTraversal *iface, DISPID d static HRESULT WINAPI ElementTraversal_get_firstElementChild(IElementTraversal *iface, IHTMLElement **p) { HTMLElement *This = impl_from_IElementTraversal(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMElement *nselem = NULL; + HTMLElement *elem; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsIDOMHTMLElement_GetFirstElementChild(This->nselem, &nselem); + if(!nselem) { + *p = NULL; + return S_OK; + } + + hres = get_elem(This->node.doc, nselem, &elem); + nsIDOMElement_Release(nselem); + if(FAILED(hres)) + return hres; + + *p = &elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI ElementTraversal_get_lastElementChild(IElementTraversal *iface, IHTMLElement **p) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 4167e32..b7db0bc 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -80,7 +80,22 @@ function test_textContent() { next_test(); } +function test_ElementTraversal() { + var div = document.createElement("div"); + div.innerHTML = "abc<b>bold</b><script>/* */<script><div>text</div>def"; + ok(div.firstElementChild.outerHTML === "<b>bold</b>", + "div.firstElementChild.outerHTML = " + div.firstElementChild.outerHTML); + + div.innerHTML = "abc"; + ok(div.firstElementChild === null, "div.firstElementChild = " + div.firstElementChild); + + ok(!("firstElementChild" in document), "firstElementChild found in document"); + + next_test(); +} + var tests = [ test_input_selection, - test_textContent + test_textContent, + test_ElementTraversal ];

1 0

Piotr Caban : mshtml: Expose IElementTraversal interface to scripts.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: 188a1d7d8f6d255810609a4fdb7d9c337dd87426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=188a1d7d8f6d255810609a4fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 25 17:57:13 2017 +0200 mshtml: Expose IElementTraversal interface to scripts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 3 +++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index faa2399..ae31d1d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5288,6 +5288,9 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) if(mode >= COMPAT_MODE_IE8) dispex_info_add_interface(info, IElementSelector_tid, NULL); + + if(mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(info, IElementTraversal_tid, NULL); } static const tid_t HTMLElement_iface_tids[] = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index fbbd458..1e12a6e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -127,6 +127,7 @@ typedef struct EventTarget EventTarget; XDIID(HTMLElementEvents2) \ XIID(IDocumentSelector) \ XIID(IElementSelector) \ + XIID(IElementTraversal) \ XIID(IHTMLAnchorElement) \ XIID(IHTMLAreaElement) \ XIID(IHTMLAttributeCollection) \ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 84138e7..69ec6a3 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -34,6 +34,7 @@ function test_elem_props() { test_exposed("querySelectorAll", v >= 8); test_exposed("textContent", v >= 9); test_exposed("prefix", v >= 9); + test_exposed("firstElementChild", v >= 9); next_test(); }

1 0

Piotr Caban : mshtml: Add IElementTraversal stub implementation.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: 59028126f00f31720c78b2149cdb6a7696c5df7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59028126f00f31720c78b2149… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 25 17:57:08 2017 +0200 mshtml: Add IElementTraversal stub implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 107 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 108 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index dd23517..faa2399 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4896,6 +4896,110 @@ static const IProvideMultipleClassInfoVtbl ProvideMultipleClassInfoVtbl = { ProvideMultipleClassInfo_GetInfoOfIndex }; +static inline HTMLElement *impl_from_IElementTraversal(IElementTraversal *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, IElementTraversal_iface); +} + +static HRESULT WINAPI ElementTraversal_QueryInterface(IElementTraversal *iface, REFIID riid, void **ppv) +{ + HTMLElement *This = impl_from_IElementTraversal(iface); + return IHTMLElement_QueryInterface(&This->IHTMLElement_iface, riid, ppv); +} + +static ULONG WINAPI ElementTraversal_AddRef(IElementTraversal *iface) +{ + HTMLElement *This = impl_from_IElementTraversal(iface); + + return IHTMLElement_AddRef(&This->IHTMLElement_iface); +} + +static ULONG WINAPI ElementTraversal_Release(IElementTraversal *iface) +{ + HTMLElement *This = impl_from_IElementTraversal(iface); + + return IHTMLElement_Release(&This->IHTMLElement_iface); +} + +static HRESULT WINAPI ElementTraversal_GetTypeInfoCount(IElementTraversal *iface, UINT *pctinfo) +{ + HTMLElement *This = impl_from_IElementTraversal(iface); + return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI ElementTraversal_GetTypeInfo(IElementTraversal *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLElement *This = impl_from_IElementTraversal(iface); + return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI ElementTraversal_GetIDsOfNames(IElementTraversal *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLElement *This = impl_from_IElementTraversal(iface); + return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI ElementTraversal_Invoke(IElementTraversal *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLElement *This = impl_from_IElementTraversal(iface); + return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI ElementTraversal_get_firstElementChild(IElementTraversal *iface, IHTMLElement **p) +{ + HTMLElement *This = impl_from_IElementTraversal(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI ElementTraversal_get_lastElementChild(IElementTraversal *iface, IHTMLElement **p) +{ + HTMLElement *This = impl_from_IElementTraversal(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI ElementTraversal_get_previousElementSibling(IElementTraversal *iface, IHTMLElement **p) +{ + HTMLElement *This = impl_from_IElementTraversal(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI ElementTraversal_get_nextElementSibling(IElementTraversal *iface, IHTMLElement **p) +{ + HTMLElement *This = impl_from_IElementTraversal(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI ElementTraversal_get_childElementCount(IElementTraversal *iface, LONG *p) +{ + HTMLElement *This = impl_from_IElementTraversal(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IElementTraversalVtbl ElementTraversalVtbl = { + ElementTraversal_QueryInterface, + ElementTraversal_AddRef, + ElementTraversal_Release, + ElementTraversal_GetTypeInfoCount, + ElementTraversal_GetTypeInfo, + ElementTraversal_GetIDsOfNames, + ElementTraversal_Invoke, + ElementTraversal_get_firstElementChild, + ElementTraversal_get_lastElementChild, + ElementTraversal_get_previousElementSibling, + ElementTraversal_get_nextElementSibling, + ElementTraversal_get_childElementCount +}; + static inline HTMLElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLElement, node); @@ -4923,6 +5027,8 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IHTMLUniqueName_iface; }else if(IsEqualGUID(&IID_IElementSelector, riid)) { *ppv = &This->IElementSelector_iface; + }else if(IsEqualGUID(&IID_IElementTraversal, riid)) { + *ppv = &This->IElementTraversal_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { *ppv = &This->cp_container.IConnectionPointContainer_iface; }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { @@ -5214,6 +5320,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen This->IHTMLElement6_iface.lpVtbl = &HTMLElement6Vtbl; This->IHTMLUniqueName_iface.lpVtbl = &HTMLUniqueNameVtbl; This->IElementSelector_iface.lpVtbl = &ElementSelectorVtbl; + This->IElementTraversal_iface.lpVtbl = &ElementTraversalVtbl; This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; if(dispex_data && !dispex_data->vtbl) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f95adc0..fbbd458 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -757,6 +757,7 @@ typedef struct { IHTMLElement6 IHTMLElement6_iface; IHTMLUniqueName IHTMLUniqueName_iface; IElementSelector IElementSelector_iface; + IElementTraversal IElementTraversal_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; nsIDOMHTMLElement *nselem;

1 0

Piotr Caban : include: Define IElementTraversal interface.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: c267c5d91b4827e0b72eb06a79f0cf24b2bce38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c267c5d91b4827e0b72eb06a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 25 17:56:51 2017 +0200 include: Define IElementTraversal interface. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 7 +++++++ include/mshtml.idl | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 947e1b8..d509b18 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1661,6 +1661,13 @@ #define DISPID_IHTMLELEMENT6_ONWAITING DISPID_EVPROP_WAITING #define DISPID_IHTMLELEMENT6_IE9_HASATTRIBUTES DISPID_IE9_ELEMENT+29 +/* IElementTraversal */ +#define DISPID_IELEMENTTRAVERSAL_FIRSTELEMENTCHILD DISPID_IE9_ELEMENT+22 +#define DISPID_IELEMENTTRAVERSAL_LASTELEMENTCHILD DISPID_IE9_ELEMENT+23 +#define DISPID_IELEMENTTRAVERSAL_PREVIOUSELEMENTSIBLING DISPID_IE9_ELEMENT+24 +#define DISPID_IELEMENTTRAVERSAL_NEXTELEMENTSIBLING DISPID_IE9_ELEMENT+25 +#define DISPID_IELEMENTTRAVERSAL_CHILDELEMENTCOUNT DISPID_IE9_ELEMENT+26 + /* IHTMLGenericElement */ #define DISPID_IHTMLGENERICELEMENT_RECORDSET DISPID_GENERIC+1 #define DISPID_IHTMLGENERICELEMENT_NAMEDRECORDSET DISPID_GENERIC+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index 10aa69d..4e48b5d 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -6617,6 +6617,29 @@ interface IHTMLElement6 : IDispatch VARIANT_BOOL ie9_hasAttributes() /***************************************************************************** + * IElementTraversal interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510736-98b5-11cf-bb82-00aa00bdce0b) +] +interface IElementTraversal : IDispatch +{ + [propget, id(DISPID_IELEMENTTRAVERSAL_FIRSTELEMENTCHILD)] + HRESULT firstElementChild([retval, out] IHTMLElement **p); + [propget, id(DISPID_IELEMENTTRAVERSAL_LASTELEMENTCHILD)] + HRESULT lastElementChild([retval, out] IHTMLElement **p); + [propget, id(DISPID_IELEMENTTRAVERSAL_PREVIOUSELEMENTSIBLING)] + HRESULT previousElementSibling([retval, out] IHTMLElement **p); + [propget, id(DISPID_IELEMENTTRAVERSAL_NEXTELEMENTSIBLING)] + HRESULT nextElementSibling([retval, out] IHTMLElement **p); + [propget, id(DISPID_IELEMENTTRAVERSAL_CHILDELEMENTCOUNT)] + HRESULT childElementCount([retval, out] long *p); +} + +/***************************************************************************** * IElementSelector interface */ [

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: 3b14f71eb1ffbf4b5c045c7b63c23e8177592146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b14f71eb1ffbf4b5c045c7b6… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jul 25 15:17:12 2017 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 309 +++++++++++++++++++++++---------------------------------------- 1 file changed, 110 insertions(+), 199 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b14f71eb1ffbf4b5c045…

1 0

Jacek Caban : mshtml: Set referrer in load_nsuri.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: b9f0ac40b97d9621bc8d1e418aa9dbe525d2000b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f0ac40b97d9621bc8d1e418… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 25 15:30:55 2017 +0200 mshtml: Set referrer in load_nsuri. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1857aee..bc1dae9 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -303,6 +303,16 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post assert(nsres == NS_OK); } + if(window->uri_nofrag) { + nsWineURI *referrer_uri; + nsres = create_nsuri(window->uri_nofrag, window, window->doc_obj ? window->doc_obj->nscontainer : NULL, NULL, &referrer_uri); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDocShellLoadInfo_SetReferrer(load_info, (nsIURI*)&referrer_uri->nsIFileURL_iface); + assert(nsres == NS_OK); + nsIFileURL_Release(&referrer_uri->nsIFileURL_iface); + } + } + uri->channel_bsc = channelbsc; doc = window->base.inner_window->doc; doc->skip_mutation_notif = TRUE;

1 0

Jacek Caban : mshtml: Always create load info object in load_nsuri.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: 3296a18c3e4713459c3d3839086f29ca5587ed99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3296a18c3e4713459c3d38390… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 25 15:30:44 2017 +0200 mshtml: Always create load info object in load_nsuri. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7baf0cc..1857aee 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -270,8 +270,8 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post_stream, nsChannelBSC *channelbsc, DWORD flags) { - nsIDocShellLoadInfo *load_info = NULL; nsIWebNavigation *web_navigation; + nsIDocShellLoadInfo *load_info; nsIDocShell *doc_shell; HTMLDocumentNode *doc; nsresult nsres; @@ -289,16 +289,16 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post return E_FAIL; } - if(post_stream) { - nsres = nsIDocShell_CreateLoadInfo(doc_shell, &load_info); - if(NS_FAILED(nsres)) { - nsIDocShell_Release(doc_shell); - return E_FAIL; - } + nsres = nsIDocShell_CreateLoadInfo(doc_shell, &load_info); + if(NS_FAILED(nsres)) { + nsIDocShell_Release(doc_shell); + return E_FAIL; + } - nsres = nsIDocShellLoadInfo_SetLoadType(load_info, (flags & LOAD_FLAGS_BYPASS_CACHE) ? loadNormalBypassCache : loadNormal); - assert(nsres == NS_OK); + nsres = nsIDocShellLoadInfo_SetLoadType(load_info, (flags & LOAD_FLAGS_BYPASS_CACHE) ? loadNormalBypassCache : loadNormal); + assert(nsres == NS_OK); + if(post_stream) { nsres = nsIDocShellLoadInfo_SetPostDataStream(load_info, post_stream); assert(nsres == NS_OK); } @@ -311,8 +311,7 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post doc->skip_mutation_notif = FALSE; uri->channel_bsc = NULL; nsIDocShell_Release(doc_shell); - if(load_info) - nsIDocShellLoadInfo_Release(load_info); + nsIDocShellLoadInfo_Release(load_info); if(NS_FAILED(nsres)) { WARN("LoadURI failed: %08x\n", nsres); return E_FAIL;

1 0

Jacek Caban : mshtml: Set correct load type in load_nsuri.
by Alexandre Julliard 25 Jul '17

25 Jul '17

Module: wine Branch: master Commit: fcd136e1a2a074c9139b90de87926ad00133759f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd136e1a2a074c9139b90de8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 25 15:30:32 2017 +0200 mshtml: Set correct load type in load_nsuri. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsiface.idl | 25 ++++++++++++++++++++++++- dlls/mshtml/nsio.c | 3 +++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 83b91a7..04add4d 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3757,9 +3757,32 @@ interface nsIContentViewer : nsISupports ] interface nsIDocShellLoadInfo : nsISupports { - typedef int32_t nsDocShellInfoLoadType; typedef uint32_t nsDocShellInfoReferrerPolicy; + typedef enum { + loadNormal = 0, + loadNormalReplace = 1, + loadHistory = 2, + loadReloadNormal = 3, + loadReloadBypassCache = 4, + loadReloadBypassProxy = 5, + loadReloadBypassProxyAndCache = 6, + loadLink = 7, + loadRefresh = 8, + loadReloadCharsetChange = 9, + loadBypassHistory = 10, + loadStopContent = 11, + loadStopContentAndReplace = 12, + loadNormalExternal = 13, + loadNormalBypassCache = 14, + loadNormalBypassProxy = 15, + loadNormalBypassProxyAndCache = 16, + loadPushState = 17, + loadReplaceBypassCache = 18, + loadReloadMixedContent = 19, + loadNormalAllowMixedContent = 20 + } nsDocShellInfoLoadType; + nsresult GetReferrer(nsIURI **aReferrer); nsresult SetReferrer(nsIURI *aReferrer); nsresult GetOriginalURI(nsIURI **aOriginalURI); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 5a806c4..7baf0cc 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -296,6 +296,9 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post return E_FAIL; } + nsres = nsIDocShellLoadInfo_SetLoadType(load_info, (flags & LOAD_FLAGS_BYPASS_CACHE) ? loadNormalBypassCache : loadNormal); + assert(nsres == NS_OK); + nsres = nsIDocShellLoadInfo_SetPostDataStream(load_info, post_stream); assert(nsres == NS_OK); }

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017