Jacek Caban : wmp: Added GetMiscStatus implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d1691bc2044853548384c0a10254705b119948ec
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d1691bc2044853548384c0a102...

Author: Jacek Caban 
Date:   Tue Feb 11 13:15:53 2014 +0100

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 6506824..01204e2 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 c8fb5a3..f209cc3 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);