Module: wine Branch: master Commit: e1aa05b13e151cfa3781ac1fcd30ee37c91e8b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1aa05b13e151cfa3781ac1fcd...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Sep 16 22:11:05 2009 +0200
mshtml: Moved hostinfo to HTMLDocumentObj.
---
dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/oleobj.c | 4 ++-- dlls/mshtml/view.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 77cb5a7..94ddbbc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -289,8 +289,6 @@ struct HTMLDocument { LPOLESTR url; struct list bindings;
- DOCHOSTUIINFO hostinfo; - USERMODE usermode; READYSTATE readystate; BOOL in_place_active; @@ -350,6 +348,8 @@ struct HTMLDocumentObj { IOleInPlaceFrame *frame; IOleInPlaceUIWindow *ip_window;
+ DOCHOSTUIINFO hostinfo; + IOleUndoManager *undomgr;
HWND hwnd; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index b0a097f..f25611d 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -111,7 +111,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->hostui = NULL; }
- memset(&This->hostinfo, 0, sizeof(DOCHOSTUIINFO)); + memset(&This->doc_obj->hostinfo, 0, sizeof(DOCHOSTUIINFO));
if(!pClientSite) return S_OK; @@ -130,7 +130,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); update_hostinfo(This->doc_obj, &hostinfo); - This->hostinfo = hostinfo; + This->doc_obj->hostinfo = hostinfo; }
if(!This->has_key_path) { diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index ae9ad39..dcc2ebf 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -60,7 +60,7 @@ static void paint_document(HTMLDocumentObj *This)
hdc = BeginPaint(This->hwnd, &ps);
- if(!(This->basedoc.hostinfo.dwFlags & (DOCHOSTUIFLAG_NO3DOUTERBORDER|DOCHOSTUIFLAG_NO3DBORDER))) + if(!(This->hostinfo.dwFlags & (DOCHOSTUIFLAG_NO3DOUTERBORDER|DOCHOSTUIFLAG_NO3DBORDER))) DrawEdge(hdc, &rect, EDGE_SUNKEN, BF_RECT|BF_ADJUST);
if(!This->nscontainer) { @@ -204,7 +204,7 @@ static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if(This->nscontainer) { INT ew=0, eh=0;
- if(!(This->basedoc.hostinfo.dwFlags & (DOCHOSTUIFLAG_NO3DOUTERBORDER|DOCHOSTUIFLAG_NO3DBORDER))) { + if(!(This->hostinfo.dwFlags & (DOCHOSTUIFLAG_NO3DOUTERBORDER|DOCHOSTUIFLAG_NO3DBORDER))) { ew = GetSystemMetrics(SM_CXEDGE); eh = GetSystemMetrics(SM_CYEDGE); }