Jacek Caban : shdocvw: Move offline and silent variables to DocHost.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Mar 9 15:47:41 CST 2007
Module: wine
Branch: master
Commit: 1f92fba5cc592812c10fdd2f434f7c72b7419cbf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f92fba5cc592812c10fdd2f434f7c72b7419cbf
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Mar 9 16:52:16 2007 +0100
shdocvw: Move offline and silent variables to DocHost.
---
dlls/shdocvw/dochost.c | 3 +++
dlls/shdocvw/shdocvw.h | 5 +++--
dlls/shdocvw/webbrowser.c | 10 ++++------
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c
index 834788f..6d51f2e 100644
--- a/dlls/shdocvw/dochost.c
+++ b/dlls/shdocvw/dochost.c
@@ -493,6 +493,9 @@ void DocHost_Init(DocHost *This, IDispatch *disp)
This->frame_hwnd = NULL;
This->url = NULL;
+ This->silent = VARIANT_FALSE;
+ This->offline = VARIANT_FALSE;
+
DocHost_ClientSite_Init(This);
DocHost_Frame_Init(This);
diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h
index 92a9216..78b43d2 100644
--- a/dlls/shdocvw/shdocvw.h
+++ b/dlls/shdocvw/shdocvw.h
@@ -83,6 +83,9 @@ typedef struct {
LPOLESTR url;
+ VARIANT_BOOL silent;
+ VARIANT_BOOL offline;
+
ConnectionPointContainer cps;
} DocHost;
@@ -126,8 +129,6 @@ struct WebBrowser {
VARIANT_BOOL address_bar;
VARIANT_BOOL status_bar;
VARIANT_BOOL tool_bar;
- VARIANT_BOOL silent;
- VARIANT_BOOL offline;
DocHost doc_host;
};
diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c
index 312ab76..f62df9c 100644
--- a/dlls/shdocvw/webbrowser.c
+++ b/dlls/shdocvw/webbrowser.c
@@ -706,7 +706,7 @@ static HRESULT WINAPI WebBrowser_get_Offline(IWebBrowser2 *iface, VARIANT_BOOL *
TRACE("(%p)->(%p)\n", This, pbOffline);
- *pbOffline = This->offline;
+ *pbOffline = This->doc_host.offline;
return S_OK;
}
@@ -716,7 +716,7 @@ static HRESULT WINAPI WebBrowser_put_Offline(IWebBrowser2 *iface, VARIANT_BOOL b
TRACE("(%p)->(%x)\n", This, bOffline);
- This->offline = bOffline ? VARIANT_TRUE : VARIANT_FALSE;
+ This->doc_host.offline = bOffline ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
}
@@ -726,7 +726,7 @@ static HRESULT WINAPI WebBrowser_get_Silent(IWebBrowser2 *iface, VARIANT_BOOL *p
TRACE("(%p)->(%p)\n", This, pbSilent);
- *pbSilent = This->silent;
+ *pbSilent = This->doc_host.silent;
return S_OK;
}
@@ -736,7 +736,7 @@ static HRESULT WINAPI WebBrowser_put_Silent(IWebBrowser2 *iface, VARIANT_BOOL bS
TRACE("(%p)->(%x)\n", This, bSilent);
- This->silent = bSilent ? VARIANT_TRUE : VARIANT_FALSE;
+ This->doc_host.silent = bSilent ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
}
@@ -927,8 +927,6 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi
ret->address_bar = VARIANT_TRUE;
ret->status_bar = VARIANT_TRUE;
ret->tool_bar = VARIANT_TRUE;
- ret->silent = VARIANT_FALSE;
- ret->offline = VARIANT_FALSE;
WebBrowser_OleObject_Init(ret);
WebBrowser_ViewObject_Init(ret);
More information about the wine-cvs
mailing list