Commit 69ab9da0 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

oleacc: Add IOleWindow interface stub to default window accessible object.

parent 8c808f3e
...@@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); ...@@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc);
typedef struct { typedef struct {
IAccessible IAccessible_iface; IAccessible IAccessible_iface;
IOleWindow IOleWindow_iface;
LONG ref; LONG ref;
} Window; } Window;
...@@ -46,11 +47,16 @@ static HRESULT WINAPI Window_QueryInterface(IAccessible *iface, REFIID riid, voi ...@@ -46,11 +47,16 @@ static HRESULT WINAPI Window_QueryInterface(IAccessible *iface, REFIID riid, voi
IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IDispatch) ||
IsEqualIID(riid, &IID_IUnknown)) { IsEqualIID(riid, &IID_IUnknown)) {
*ppv = iface; *ppv = iface;
IAccessible_AddRef(iface); }else if(IsEqualIID(riid, &IID_IOleWindow)) {
return S_OK; *ppv = &This->IOleWindow_iface;
}else {
WARN("no interface: %s\n", debugstr_guid(riid));
*ppv = NULL;
return E_NOINTERFACE;
} }
return E_NOINTERFACE; IAccessible_AddRef(iface);
return S_OK;
} }
static ULONG WINAPI Window_AddRef(IAccessible *iface) static ULONG WINAPI Window_AddRef(IAccessible *iface)
...@@ -295,6 +301,51 @@ static const IAccessibleVtbl WindowVtbl = { ...@@ -295,6 +301,51 @@ static const IAccessibleVtbl WindowVtbl = {
Window_put_accValue Window_put_accValue
}; };
static inline Window* impl_from_Window_OleWindow(IOleWindow *iface)
{
return CONTAINING_RECORD(iface, Window, IOleWindow_iface);
}
static HRESULT WINAPI Window_OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **ppv)
{
Window *This = impl_from_Window_OleWindow(iface);
return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv);
}
static ULONG WINAPI Window_OleWindow_AddRef(IOleWindow *iface)
{
Window *This = impl_from_Window_OleWindow(iface);
return IAccessible_AddRef(&This->IAccessible_iface);
}
static ULONG WINAPI Window_OleWindow_Release(IOleWindow *iface)
{
Window *This = impl_from_Window_OleWindow(iface);
return IAccessible_Release(&This->IAccessible_iface);
}
static HRESULT WINAPI Window_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd)
{
Window *This = impl_from_Window_OleWindow(iface);
FIXME("(%p)->(%p)\n", This, phwnd);
return E_NOTIMPL;
}
static HRESULT WINAPI Window_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode)
{
Window *This = impl_from_Window_OleWindow(iface);
FIXME("(%p)->(%x)\n", This, fEnterMode);
return E_NOTIMPL;
}
static const IOleWindowVtbl WindowOleWindowVtbl = {
Window_OleWindow_QueryInterface,
Window_OleWindow_AddRef,
Window_OleWindow_Release,
Window_OleWindow_GetWindow,
Window_OleWindow_ContextSensitiveHelp
};
HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj)
{ {
Window *window; Window *window;
...@@ -308,6 +359,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) ...@@ -308,6 +359,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
window->IAccessible_iface.lpVtbl = &WindowVtbl; window->IAccessible_iface.lpVtbl = &WindowVtbl;
window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl;
window->ref = 1; window->ref = 1;
hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj); hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment