Jacek Caban : mshtml: Moved history property to HTMLInnerWindow.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Jun 26 12:32:53 2012 +0200

mshtml: Moved history property to HTMLInnerWindow.

---

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

diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index 2c355a9..651aa75 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -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);
 
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 401e5cb..d8d67f7 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -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;