system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

mshtml: Moved history property to HTMLInnerWindow.

Browse source
This commit is contained in:
Jacek Caban 2012-06-26 12:32:53 +02:00 committed by Alexandre Julliard
parent 4647fe0f23
commit d31176ec03
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/mshtml/htmlwindow.c
View file

@ -232,6 +232,8 @@ static void release_inner_window(HTMLInnerWindow *This)
if(This->screen)
IHTMLScreen_Release(This->screen);
if(This->history)
IOmHistory_Release(This->history);
heap_free(This);
}
@ -684,7 +686,7 @@ static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocatio
static HRESULT WINAPI HTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory **p)
{
HTMLWindow *This = impl_from_IHTMLWindow2(iface);
HTMLOuterWindow *window = This->outer_window;
HTMLInnerWindow *window = This->inner_window;
TRACE("(%p)->(%p)\n", This, p);

2
dlls/mshtml/mshtml_private.h
View file

@ -336,7 +336,6 @@ struct HTMLOuterWindow {
IInternetSecurityManager *secmgr;
HTMLLocation *location;
IOmHistory *history;
struct list children;
struct list sibling_entry;
@ -356,6 +355,7 @@ struct HTMLInnerWindow {
HTMLImageElementFactory *image_factory;
HTMLOptionElementFactory *option_factory;
IHTMLScreen *screen;
IOmHistory *history;
global_prop_t *global_props;
DWORD global_prop_cnt;