ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shdocvw: Move IDocHostUIHandler to DocHost object.

This commit is contained in:
Jacek Caban 2006-04-18 00:28:37 +02:00 committed by Alexandre Julliard
parent 89da131352
commit ff7a8abb85
4 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/shdocvw/client.c
View File

@ -43,10 +43,10 @@ static HRESULT WINAPI ClientSite_QueryInterface(IOleClientSite *iface, REFIID ri
*ppv = INPLACESITE(This); *ppv = INPLACESITE(This);
}else if(IsEqualGUID(&IID_IDocHostUIHandler, riid)) { }else if(IsEqualGUID(&IID_IDocHostUIHandler, riid)) {
TRACE("(%p)->(IID_IDocHostUIHandler %p)\n", This, ppv); TRACE("(%p)->(IID_IDocHostUIHandler %p)\n", This, ppv);
*ppv = DOCHOSTUI(This->wb); *ppv = DOCHOSTUI(This);
}else if(IsEqualGUID(&IID_IDocHostUIHandler2, riid)) { }else if(IsEqualGUID(&IID_IDocHostUIHandler2, riid)) {
TRACE("(%p)->(IID_IDocHostUIHandler2 %p)\n", This, ppv); TRACE("(%p)->(IID_IDocHostUIHandler2 %p)\n", This, ppv);
*ppv = DOCHOSTUI2(This->wb); *ppv = DOCHOSTUI2(This);
}else if(IsEqualGUID(&IID_IOleDocumentSite, riid)) { }else if(IsEqualGUID(&IID_IOleDocumentSite, riid)) {
TRACE("(%p)->(IID_IOleDocumentSite %p)\n", This, ppv); TRACE("(%p)->(IID_IOleDocumentSite %p)\n", This, ppv);
*ppv = DOCSITE(This->wb); *ppv = DOCSITE(This->wb);

56
dlls/shdocvw/dochost.c
View File

@ -256,31 +256,31 @@ static const IOleCommandTargetVtbl OleCommandTargetVtbl = {
ClOleCommandTarget_Exec ClOleCommandTarget_Exec
}; };
#define DOCHOSTUI_THIS(iface) DEFINE_THIS(WebBrowser, DocHostUIHandler, iface) #define DOCHOSTUI_THIS(iface) DEFINE_THIS(DocHost, DocHostUIHandler, iface)
static HRESULT WINAPI DocHostUIHandler_QueryInterface(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_QueryInterface(IDocHostUIHandler2 *iface,
REFIID riid, void **ppv) REFIID riid, void **ppv)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
return IOleClientSite_QueryInterface(CLIENTSITE(&This->doc_host), riid, ppv); return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv);
} }
static ULONG WINAPI DocHostUIHandler_AddRef(IDocHostUIHandler2 *iface) static ULONG WINAPI DocHostUIHandler_AddRef(IDocHostUIHandler2 *iface)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
return IOleClientSite_AddRef(CLIENTSITE(&This->doc_host)); return IOleClientSite_AddRef(CLIENTSITE(This));
} }
static ULONG WINAPI DocHostUIHandler_Release(IDocHostUIHandler2 *iface) static ULONG WINAPI DocHostUIHandler_Release(IDocHostUIHandler2 *iface)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
return IOleClientSite_Release(CLIENTSITE(&This->doc_host)); return IOleClientSite_Release(CLIENTSITE(This));
} }
static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface,
DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, IDispatch *pdispReserved) DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, IDispatch *pdispReserved)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%ld %p %p %p)\n", This, dwID, ppt, pcmdtReserved, pdispReserved); TRACE("(%p)->(%ld %p %p %p)\n", This, dwID, ppt, pcmdtReserved, pdispReserved);
@ -299,7 +299,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface
static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface,
DOCHOSTUIINFO *pInfo) DOCHOSTUIINFO *pInfo)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%p)\n", This, pInfo); TRACE("(%p)->(%p)\n", This, pInfo);
@ -320,7 +320,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD d
IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget, IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget,
IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc) IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)->(%ld %p %p %p %p)\n", This, dwID, pActiveObject, pCommandTarget, FIXME("(%p)->(%ld %p %p %p %p)\n", This, dwID, pActiveObject, pCommandTarget,
pFrame, pDoc); pFrame, pDoc);
return E_NOTIMPL; return E_NOTIMPL;
@ -328,14 +328,14 @@ static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD d
static HRESULT WINAPI DocHostUIHandler_HideUI(IDocHostUIHandler2 *iface) static HRESULT WINAPI DocHostUIHandler_HideUI(IDocHostUIHandler2 *iface)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)\n", This); FIXME("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI DocHostUIHandler_UpdateUI(IDocHostUIHandler2 *iface) static HRESULT WINAPI DocHostUIHandler_UpdateUI(IDocHostUIHandler2 *iface)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)\n", This); FIXME("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -343,7 +343,7 @@ static HRESULT WINAPI DocHostUIHandler_UpdateUI(IDocHostUIHandler2 *iface)
static HRESULT WINAPI DocHostUIHandler_EnableModeless(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_EnableModeless(IDocHostUIHandler2 *iface,
BOOL fEnable) BOOL fEnable)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)->(%x)\n", This, fEnable); FIXME("(%p)->(%x)\n", This, fEnable);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -351,7 +351,7 @@ static HRESULT WINAPI DocHostUIHandler_EnableModeless(IDocHostUIHandler2 *iface,
static HRESULT WINAPI DocHostUIHandler_OnDocWindowActivate(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_OnDocWindowActivate(IDocHostUIHandler2 *iface,
BOOL fActivate) BOOL fActivate)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)->(%x)\n", This, fActivate); FIXME("(%p)->(%x)\n", This, fActivate);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -359,7 +359,7 @@ static HRESULT WINAPI DocHostUIHandler_OnDocWindowActivate(IDocHostUIHandler2 *i
static HRESULT WINAPI DocHostUIHandler_OnFrameWindowActivate(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_OnFrameWindowActivate(IDocHostUIHandler2 *iface,
BOOL fActivate) BOOL fActivate)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)->(%x)\n", This, fActivate); FIXME("(%p)->(%x)\n", This, fActivate);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -367,7 +367,7 @@ static HRESULT WINAPI DocHostUIHandler_OnFrameWindowActivate(IDocHostUIHandler2
static HRESULT WINAPI DocHostUIHandler_ResizeBorder(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_ResizeBorder(IDocHostUIHandler2 *iface,
LPCRECT prcBorder, IOleInPlaceUIWindow *pUIWindow, BOOL fRameWindow) LPCRECT prcBorder, IOleInPlaceUIWindow *pUIWindow, BOOL fRameWindow)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)->(%p %p %X)\n", This, prcBorder, pUIWindow, fRameWindow); FIXME("(%p)->(%p %p %X)\n", This, prcBorder, pUIWindow, fRameWindow);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -375,7 +375,7 @@ static HRESULT WINAPI DocHostUIHandler_ResizeBorder(IDocHostUIHandler2 *iface,
static HRESULT WINAPI DocHostUIHandler_TranslateAccelerator(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_TranslateAccelerator(IDocHostUIHandler2 *iface,
LPMSG lpMsg, const GUID *pguidCmdGroup, DWORD nCmdID) LPMSG lpMsg, const GUID *pguidCmdGroup, DWORD nCmdID)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)->(%p %p %ld)\n", This, lpMsg, pguidCmdGroup, nCmdID); FIXME("(%p)->(%p %p %ld)\n", This, lpMsg, pguidCmdGroup, nCmdID);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -383,7 +383,7 @@ static HRESULT WINAPI DocHostUIHandler_TranslateAccelerator(IDocHostUIHandler2 *
static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *iface,
LPOLESTR *pchKey, DWORD dw) LPOLESTR *pchKey, DWORD dw)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
TRACE("(%p)->(%p %ld)\n", This, pchKey, dw); TRACE("(%p)->(%p %ld)\n", This, pchKey, dw);
@ -396,7 +396,7 @@ static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *ifac
static HRESULT WINAPI DocHostUIHandler_GetDropTarget(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_GetDropTarget(IDocHostUIHandler2 *iface,
IDropTarget *pDropTarget, IDropTarget **ppDropTarget) IDropTarget *pDropTarget, IDropTarget **ppDropTarget)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)\n", This); FIXME("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -404,7 +404,7 @@ static HRESULT WINAPI DocHostUIHandler_GetDropTarget(IDocHostUIHandler2 *iface,
static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface,
IDispatch **ppDispatch) IDispatch **ppDispatch)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)->(%p)\n", This, ppDispatch); FIXME("(%p)->(%p)\n", This, ppDispatch);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -412,7 +412,7 @@ static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface,
static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface,
DWORD dwTranslate, OLECHAR *pchURLIn, OLECHAR **ppchURLOut) DWORD dwTranslate, OLECHAR *pchURLIn, OLECHAR **ppchURLOut)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
TRACE("(%p)->(%ld %s %p)\n", This, dwTranslate, debugstr_w(pchURLIn), ppchURLOut); TRACE("(%p)->(%ld %s %p)\n", This, dwTranslate, debugstr_w(pchURLIn), ppchURLOut);
@ -426,7 +426,7 @@ static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface,
static HRESULT WINAPI DocHostUIHandler_FilterDataObject(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_FilterDataObject(IDocHostUIHandler2 *iface,
IDataObject *pDO, IDataObject **ppDORet) IDataObject *pDO, IDataObject **ppDORet)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)->(%p %p)\n", This, pDO, ppDORet); FIXME("(%p)->(%p %p)\n", This, pDO, ppDORet);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -434,17 +434,17 @@ static HRESULT WINAPI DocHostUIHandler_FilterDataObject(IDocHostUIHandler2 *ifac
static HRESULT WINAPI DocHostUIHandler_GetOverrideKeyPath(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_GetOverrideKeyPath(IDocHostUIHandler2 *iface,
LPOLESTR *pchKey, DWORD dw) LPOLESTR *pchKey, DWORD dw)
{ {
WebBrowser *This = DOCHOSTUI_THIS(iface); DocHost *This = DOCHOSTUI_THIS(iface);
IDocHostUIHandler2 *handler; IDocHostUIHandler2 *handler;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%p %ld)\n", This, pchKey, dw); TRACE("(%p)->(%p %ld)\n", This, pchKey, dw);
if(!This->client) if(!This->hostui)
return S_OK; return S_OK;
hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler2, hres = IDocHostUIHandler_QueryInterface(This->hostui, &IID_IDocHostUIHandler2,
(void**)&handler); (void**)&handler);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
hres = IDocHostUIHandler2_GetOverrideKeyPath(handler, pchKey, dw); hres = IDocHostUIHandler2_GetOverrideKeyPath(handler, pchKey, dw);
IDocHostUIHandler2_Release(handler); IDocHostUIHandler2_Release(handler);
@ -480,10 +480,10 @@ static const IDocHostUIHandler2Vtbl DocHostUIHandler2Vtbl = {
void WebBrowser_DocHost_Init(WebBrowser *This) void WebBrowser_DocHost_Init(WebBrowser *This)
{ {
This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; This->doc_host.lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl;
This->lpClOleCommandTargetVtbl = &OleCommandTargetVtbl; This->lpClOleCommandTargetVtbl = &OleCommandTargetVtbl;
This->hostui = NULL; This->doc_host.hostui = NULL;
This->doc_host.hwnd = NULL; This->doc_host.hwnd = NULL;
This->doc_host.frame_hwnd = NULL; This->doc_host.frame_hwnd = NULL;

8
dlls/shdocvw/oleobject.c
View File

@ -147,8 +147,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE
This->inplace = NULL; This->inplace = NULL;
} }
if(This->hostui) if(This->doc_host.hostui)
IDocHostUIHandler_Release(This->hostui); IDocHostUIHandler_Release(This->doc_host.hostui);
if(This->client) if(This->client)
IOleClientSite_Release(This->client); IOleClientSite_Release(This->client);
@ -163,9 +163,9 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE
IOleClientSite_AddRef(pClientSite); IOleClientSite_AddRef(pClientSite);
hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler,
(void**)&This->hostui); (void**)&This->doc_host.hostui);
if(FAILED(hres)) if(FAILED(hres))
This->hostui = NULL; This->doc_host.hostui = NULL;
create_shell_embedding_hwnd(This); create_shell_embedding_hwnd(This);

5
dlls/shdocvw/shdocvw.h
View File

@ -56,9 +56,12 @@ struct WebBrowser;
typedef struct { typedef struct {
const IOleClientSiteVtbl *lpOleClientSiteVtbl; const IOleClientSiteVtbl *lpOleClientSiteVtbl;
const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl; const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl;
const IDocHostUIHandler2Vtbl *lpDocHostUIHandlerVtbl;
IDispatch *disp; IDispatch *disp;
IDocHostUIHandler *hostui;
HWND hwnd; HWND hwnd;
HWND frame_hwnd; HWND frame_hwnd;
@ -83,7 +86,6 @@ typedef struct WebBrowser {
/* Interfaces available for embeded document */ /* Interfaces available for embeded document */
const IDocHostUIHandler2Vtbl *lpDocHostUIHandlerVtbl;
const IOleDocumentSiteVtbl *lpOleDocumentSiteVtbl; const IOleDocumentSiteVtbl *lpOleDocumentSiteVtbl;
const IOleCommandTargetVtbl *lpClOleCommandTargetVtbl; const IOleCommandTargetVtbl *lpClOleCommandTargetVtbl;
const IDispatchVtbl *lpDispatchVtbl; const IDispatchVtbl *lpDispatchVtbl;
@ -100,7 +102,6 @@ typedef struct WebBrowser {
IOleClientSite *client; IOleClientSite *client;
IOleContainer *container; IOleContainer *container;
IOleDocumentView *view; IOleDocumentView *view;
IDocHostUIHandler *hostui;
IOleInPlaceSite *inplace; IOleInPlaceSite *inplace;
LPOLESTR url; LPOLESTR url;