Module: wine Branch: master Commit: d8cff0dc6f1b2837cb3b6444d9704c0d20c1f958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8cff0dc6f1b2837cb3b6444d... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:12:55 2019 +0100 mshtml: Access document object via browser object in IOmHistory::get_length. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 533afd0..cc4ea5a 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -666,16 +666,16 @@ static HRESULT WINAPI OmHistory_Invoke(IOmHistory *iface, DISPID dispIdMember, R static HRESULT WINAPI OmHistory_get_length(IOmHistory *iface, short *p) { OmHistory *This = impl_from_IOmHistory(iface); + GeckoBrowser *browser = NULL; TRACE("(%p)->(%p)\n", This, p); - if(!This->window || !This->window->base.outer_window->doc_obj - || !This->window->base.outer_window->doc_obj->travel_log) { - *p = 0; - }else { - *p = ITravelLog_CountEntries(This->window->base.outer_window->doc_obj->travel_log, - This->window->base.outer_window->doc_obj->browser_service); - } + if(This->window && This->window->base.outer_window) + browser = This->window->base.outer_window->browser; + + *p = browser->doc->travel_log + ? ITravelLog_CountEntries(browser->doc->travel_log, browser->doc->browser_service) + : 0; return S_OK; }