ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Moved screen property to HTMLInnerWindow.

This commit is contained in:
Jacek Caban 2012-06-26 12:32:40 +02:00 committed by Alexandre Julliard
parent b85631bab6
commit 4647fe0f23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/mshtml/htmlwindow.c
View File

@ -197,9 +197,6 @@ static void release_outer_window(HTMLOuterWindow *This)
IHTMLLocation_Release(&This->location->IHTMLLocation_iface); IHTMLLocation_Release(&This->location->IHTMLLocation_iface);
} }
if(This->screen)
IHTMLScreen_Release(This->screen);
This->window_ref->window = NULL; This->window_ref->window = NULL;
windowref_release(This->window_ref); windowref_release(This->window_ref);
@ -233,6 +230,9 @@ static void release_inner_window(HTMLInnerWindow *This)
IHTMLOptionElementFactory_Release(&This->option_factory->IHTMLOptionElementFactory_iface); IHTMLOptionElementFactory_Release(&This->option_factory->IHTMLOptionElementFactory_iface);
} }
if(This->screen)
IHTMLScreen_Release(This->screen);
heap_free(This); 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) static HRESULT WINAPI HTMLWindow2_get_screen(IHTMLWindow2 *iface, IHTMLScreen **p)
{ {
HTMLWindow *This = impl_from_IHTMLWindow2(iface); HTMLWindow *This = impl_from_IHTMLWindow2(iface);
HTMLOuterWindow *window = This->outer_window; HTMLInnerWindow *window = This->inner_window;
TRACE("(%p)->(%p)\n", This, p); TRACE("(%p)->(%p)\n", This, p);

2
dlls/mshtml/mshtml_private.h
View File

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