mshtml: Moved hostinfo to HTMLDocumentObj.

This commit is contained in:
Jacek Caban 2009-09-16 22:11:05 +02:00 committed by Alexandre Julliard
parent fffc8c66fd
commit e1aa05b13e
3 changed files with 6 additions and 6 deletions

View File

@ -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;

View File

@ -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) {

View File

@ -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);
}