Commit 4647fe0f authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Moved screen property to HTMLInnerWindow.

parent b85631ba
......@@ -197,9 +197,6 @@ static void release_outer_window(HTMLOuterWindow *This)
IHTMLLocation_Release(&This->location->IHTMLLocation_iface);
}
if(This->screen)
IHTMLScreen_Release(This->screen);
This->window_ref->window = NULL;
windowref_release(This->window_ref);
......@@ -233,6 +230,9 @@ static void release_inner_window(HTMLInnerWindow *This)
IHTMLOptionElementFactory_Release(&This->option_factory->IHTMLOptionElementFactory_iface);
}
if(This->screen)
IHTMLScreen_Release(This->screen);
heap_free(This);
}
......@@ -1068,7 +1068,7 @@ static HRESULT WINAPI HTMLWindow2_showHelp(IHTMLWindow2 *iface, BSTR helpURL, VA
static HRESULT WINAPI HTMLWindow2_get_screen(IHTMLWindow2 *iface, IHTMLScreen **p)
{
HTMLWindow *This = impl_from_IHTMLWindow2(iface);
HTMLOuterWindow *window = This->outer_window;
HTMLInnerWindow *window = This->inner_window;
TRACE("(%p)->(%p)\n", This, p);
......
......@@ -336,7 +336,6 @@ struct HTMLOuterWindow {
IInternetSecurityManager *secmgr;
HTMLLocation *location;
IHTMLScreen *screen;
IOmHistory *history;
struct list children;
......@@ -356,6 +355,7 @@ struct HTMLInnerWindow {
HTMLImageElementFactory *image_factory;
HTMLOptionElementFactory *option_factory;
IHTMLScreen *screen;
global_prop_t *global_props;
DWORD global_prop_cnt;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment