[PATCH] riched20: Remove the separate implementation of IOleWindow as IOleInPlaceSite inherits from IOleWindow.
Huw Davies
huw at codeweavers.com
Thu Aug 24 04:59:31 CDT 2017
Signed-off-by: Huw Davies <huw at codeweavers.com>
---
dlls/riched20/richole.c | 73 +++++++++----------------------------------------
1 file changed, 13 insertions(+), 60 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index c5f04412e2..dbb21b27b8 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -258,7 +258,6 @@ typedef struct ITextParaImpl {
struct IOleClientSiteImpl {
struct reole_child child;
IOleClientSite IOleClientSite_iface;
- IOleWindow IOleWindow_iface;
IOleInPlaceSite IOleInPlaceSite_iface;
LONG ref;
};
@@ -278,11 +277,6 @@ static inline IRichEditOleImpl *impl_from_IUnknown(IUnknown *iface)
return CONTAINING_RECORD(iface, IRichEditOleImpl, IUnknown_inner);
}
-static inline IOleClientSiteImpl *impl_from_IOleWindow(IOleWindow *iface)
-{
- return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleWindow_iface);
-}
-
static inline IOleClientSiteImpl *impl_from_IOleInPlaceSite(IOleInPlaceSite *iface)
{
return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleInPlaceSite_iface);
@@ -1068,9 +1062,8 @@ IOleClientSite_fnQueryInterface(IOleClientSite *me, REFIID riid, LPVOID *ppvObj)
if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_IOleClientSite))
*ppvObj = me;
- else if (IsEqualGUID(riid, &IID_IOleWindow))
- *ppvObj = &This->IOleWindow_iface;
- else if (IsEqualGUID(riid, &IID_IOleInPlaceSite))
+ else if (IsEqualGUID(riid, &IID_IOleWindow) ||
+ IsEqualGUID(riid, &IID_IOleInPlaceSite))
*ppvObj = &This->IOleInPlaceSite_iface;
if (*ppvObj)
{
@@ -1181,35 +1174,28 @@ static const IOleClientSiteVtbl ocst = {
IOleClientSite_fnRequestNewObjectLayout
};
-/* IOleWindow interface */
-static HRESULT WINAPI IOleWindow_fnQueryInterface(IOleWindow *iface, REFIID riid, void **ppvObj)
+/* IOleInPlaceSite interface */
+static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnQueryInterface(IOleInPlaceSite *iface, REFIID riid, void **ppvObj)
{
- IOleClientSiteImpl *This = impl_from_IOleWindow(iface);
+ IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface);
return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppvObj);
}
-static ULONG WINAPI IOleWindow_fnAddRef(IOleWindow *iface)
+static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnAddRef(IOleInPlaceSite *iface)
{
- IOleClientSiteImpl *This = impl_from_IOleWindow(iface);
+ IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface);
return IOleClientSite_AddRef(&This->IOleClientSite_iface);
}
-static ULONG WINAPI IOleWindow_fnRelease(IOleWindow *iface)
+static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnRelease(IOleInPlaceSite *iface)
{
- IOleClientSiteImpl *This = impl_from_IOleWindow(iface);
+ IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface);
return IOleClientSite_Release(&This->IOleClientSite_iface);
}
-static HRESULT WINAPI IOleWindow_fnContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode)
-{
- IOleClientSiteImpl *This = impl_from_IOleWindow(iface);
- FIXME("not implemented: (%p)->(%d)\n", This, fEnterMode);
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd)
+static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow(IOleInPlaceSite *iface, HWND *phwnd)
{
- IOleClientSiteImpl *This = impl_from_IOleWindow(iface);
+ IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface);
TRACE("(%p)->(%p)\n", This, phwnd);
@@ -1223,43 +1209,11 @@ static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd)
return S_OK;
}
-static const IOleWindowVtbl olewinvt = {
- IOleWindow_fnQueryInterface,
- IOleWindow_fnAddRef,
- IOleWindow_fnRelease,
- IOleWindow_fnGetWindow,
- IOleWindow_fnContextSensitiveHelp
-};
-
-/* IOleInPlaceSite interface */
-static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnQueryInterface(IOleInPlaceSite *iface, REFIID riid, void **ppvObj)
-{
- IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface);
- return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppvObj);
-}
-
-static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnAddRef(IOleInPlaceSite *iface)
-{
- IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface);
- return IOleClientSite_AddRef(&This->IOleClientSite_iface);
-}
-
-static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnRelease(IOleInPlaceSite *iface)
-{
- IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface);
- return IOleClientSite_Release(&This->IOleClientSite_iface);
-}
-
-static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow(IOleInPlaceSite *iface, HWND *phwnd)
-{
- IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface);
- return IOleWindow_GetWindow(&This->IOleWindow_iface, phwnd);
-}
-
static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode)
{
IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface);
- return IOleWindow_ContextSensitiveHelp(&This->IOleWindow_iface, fEnterMode);
+ FIXME("not implemented: (%p)->(%d)\n", This, fEnterMode);
+ return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnCanInPlaceActivate(IOleInPlaceSite *iface)
@@ -1361,7 +1315,6 @@ static HRESULT CreateOleClientSite(IRichEditOleImpl *reOle, IOleClientSite **ret
return E_OUTOFMEMORY;
clientSite->IOleClientSite_iface.lpVtbl = &ocst;
- clientSite->IOleWindow_iface.lpVtbl = &olewinvt;
clientSite->IOleInPlaceSite_iface.lpVtbl = &olestvt;
clientSite->ref = 1;
clientSite->child.reole = reOle;
--
2.12.0
More information about the wine-patches
mailing list