From d1691bc2044853548384c0a10254705b119948ec Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 11 Feb 2014 13:15:53 +0100 Subject: [PATCH] wmp: Added GetMiscStatus implementation. --- dlls/wmp/oleobj.c | 16 ++++++++++++++-- dlls/wmp/tests/oleobj.c | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 650682493f6..01204e2526f 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -268,8 +268,20 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **pp static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwAspect, pdwStatus); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwAspect, pdwStatus); + + switch(dwAspect) { + case DVASPECT_CONTENT: + *pdwStatus = OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE|OLEMISC_INSIDEOUT + |OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE; + break; + default: + FIXME("Unhandled aspect %d\n", dwAspect); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI OleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *pLogpal) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index c8fb5a30472..f209cc39863 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -630,6 +630,7 @@ static void test_wmp(void) IOleClientSite *client_site; IPersistStreamInit *psi; IOleObject *oleobj; + DWORD misc_status; GUID guid; LONG ref; HRESULT hres; @@ -652,6 +653,11 @@ static void test_wmp(void) test_QI((IUnknown*)oleobj); + hres = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, &misc_status); + ok(hres == S_OK, "GetMiscStatus failed: %08x\n", hres); + ok(misc_status == (OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE|OLEMISC_INSIDEOUT + |OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE), "misc_status = %x\n", misc_status); + hres = IOleObject_QueryInterface(oleobj, &IID_IPersistStreamInit, (void**)&psi); ok(hres == S_OK, "Could not get IPersistStreamInit iface: %08x\n", hres);