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

msscript: Implement GetViewStatus(). 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-06-21 13:41:36 +03:00 committed by Alexandre Julliard
parent 33c2a22f66
commit c34f09b9d8
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/msscript.ocx/msscript.c
View File

@ -1073,9 +1073,10 @@ static HRESULT WINAPI ViewObject_GetViewStatus(IViewObjectEx *iface, DWORD *stat
{ {
ScriptControl *This = impl_from_IViewObjectEx(iface); ScriptControl *This = impl_from_IViewObjectEx(iface);
FIXME("(%p)->(%p)\n", This, status); TRACE("(%p)->(%p)\n", This, status);
return E_NOTIMPL; *status = VIEWSTATUS_OPAQUE;
return S_OK;
} }
static HRESULT WINAPI ViewObject_QueryHitPoint(IViewObjectEx *iface, DWORD aspect, const RECT *bounds, static HRESULT WINAPI ViewObject_QueryHitPoint(IViewObjectEx *iface, DWORD aspect, const RECT *bounds,

15
dlls/msscript.ocx/tests/msscript.c
View File

@ -828,8 +828,10 @@ static void test_quickactivate(void)
static void test_viewobject(void) static void test_viewobject(void)
{ {
IViewObjectEx *viewex;
IScriptControl *sc; IScriptControl *sc;
IViewObject *view; IViewObject *view;
DWORD status;
HRESULT hr; HRESULT hr;
hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
@ -844,9 +846,18 @@ static void test_viewobject(void)
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
IViewObject_Release(view); IViewObject_Release(view);
hr = IScriptControl_QueryInterface(sc, &IID_IViewObjectEx, (void**)&view); hr = IScriptControl_QueryInterface(sc, &IID_IViewObjectEx, (void**)&viewex);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
IViewObject_Release(view);
if (0) /* crashes */
hr = IViewObjectEx_GetViewStatus(viewex, NULL);
status = 0;
hr = IViewObjectEx_GetViewStatus(viewex, &status);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(status == VIEWSTATUS_OPAQUE, "got %#x\n", status);
IViewObjectEx_Release(viewex);
IScriptControl_Release(sc); IScriptControl_Release(sc);
} }