Jacek Caban : mshtml: Moved screen property to HTMLInnerWindow.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4647fe0f231d57cc056b3dc61c2bf21c314059f1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4647fe0f231d57cc056b3dc61c...

Author: Jacek Caban 
Date:   Tue Jun 26 12:32:40 2012 +0200

mshtml: Moved screen property to HTMLInnerWindow.

---

dlls/mshtml/htmlwindow.c     |    8 ++++----
 dlls/mshtml/mshtml_private.h |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index 5852a26..2c355a9 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -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);

diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index d9f0639..401e5cb 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -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;