Jacek Caban : mshtml: Store moniker in HTMLInnerWindow.
Alexandre Julliard
julliard at winehq.org
Tue Aug 14 12:59:52 CDT 2012
Module: wine
Branch: master
Commit: 1a25ed26376e1fd82ca5594d6a40638dae49d0e6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a25ed26376e1fd82ca5594d6a40638dae49d0e6
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Aug 14 11:28:37 2012 +0200
mshtml: Store moniker in HTMLInnerWindow.
---
dlls/mshtml/htmlwindow.c | 11 +++++++++--
dlls/mshtml/mshtml_private.h | 1 +
dlls/mshtml/navigate.c | 5 +++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index b5117f1..3884bf8 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -264,6 +264,8 @@ static void release_inner_window(HTMLInnerWindow *This)
IHTMLScreen_Release(This->screen);
if(This->history)
IOmHistory_Release(This->history);
+ if(This->mon)
+ IMoniker_Release(This->mon);
heap_free(This);
}
@@ -2609,7 +2611,7 @@ static void *alloc_window(size_t size)
return window;
}
-static HRESULT create_inner_window(HTMLOuterWindow *outer_window, HTMLInnerWindow **ret)
+static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, HTMLInnerWindow **ret)
{
HTMLInnerWindow *window;
@@ -2628,6 +2630,11 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, HTMLInnerWindo
window->task_magic = get_task_target_magic();
window->current_script_guid = CLSID_JScript;
+ if(mon) {
+ IMoniker_AddRef(mon);
+ window->mon = mon;
+ }
+
*ret = window;
return S_OK;
}
@@ -2701,7 +2708,7 @@ HRESULT create_pending_window(HTMLOuterWindow *outer_window, nsChannelBSC *chann
HTMLInnerWindow *pending_window;
HRESULT hres;
- hres = create_inner_window(outer_window, &pending_window);
+ hres = create_inner_window(outer_window, outer_window->mon /* FIXME */, &pending_window);
if(FAILED(hres))
return hres;
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index b0f00d3..f76ebaf 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -400,6 +400,7 @@ struct HTMLInnerWindow {
LONG task_magic;
+ IMoniker *mon;
nsChannelBSC *bscallback;
struct list bindings;
};
diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 8956dfd..91705dd 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -1784,6 +1784,11 @@ void abort_window_bindings(HTMLInnerWindow *window)
IBindStatusCallback_Release(&window->bscallback->bsc.IBindStatusCallback_iface);
window->bscallback = NULL;
}
+
+ if(window->mon) {
+ IMoniker_Release(window->mon);
+ window->mon = NULL;
+ }
}
HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IStream *stream)
More information about the wine-cvs
mailing list