[v2 PATCH 1/2] msscript: Implement GetMiscStatus()
Nikolay Sivov
nsivov at codeweavers.com
Tue Jun 7 03:29:35 CDT 2016
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
v2: fixed a test failure
dlls/msscript.ocx/Makefile.in | 2 +-
dlls/msscript.ocx/msscript.c | 4 ++--
dlls/msscript.ocx/tests/msscript.c | 9 +++++++++
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in
index 959cd83..bc12e76 100644
--- a/dlls/msscript.ocx/Makefile.in
+++ b/dlls/msscript.ocx/Makefile.in
@@ -1,7 +1,7 @@
MODULE = msscript.ocx
RC_SRCS = msscript.rc
IDL_SRCS = msscript.idl
-IMPORTS = oleaut32
+IMPORTS = ole32 oleaut32
C_SRCS = \
msscript.c
diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c
index 188980e..f837f1e 100644
--- a/dlls/msscript.ocx/msscript.c
+++ b/dlls/msscript.ocx/msscript.c
@@ -618,9 +618,9 @@ static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD aspect, D
{
ScriptControl *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%d %p)\n", This, aspect, status);
+ TRACE("(%p)->(%d %p)\n", This, aspect, status);
- return E_NOTIMPL;
+ return OleRegGetMiscStatus(&CLSID_ScriptControl, aspect, status);
}
static HRESULT WINAPI OleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *logpal)
diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c
index 89ce1ec..c9a409e 100644
--- a/dlls/msscript.ocx/tests/msscript.c
+++ b/dlls/msscript.ocx/tests/msscript.c
@@ -28,12 +28,21 @@
static void test_oleobject(void)
{
IOleObject *obj;
+ DWORD status;
HRESULT hr;
hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
&IID_IOleObject, (void**)&obj);
ok(hr == S_OK, "got 0x%08x\n", hr);
+ if (0) /* crashes on w2k3 */
+ hr = IOleObject_GetMiscStatus(obj, DVASPECT_CONTENT, NULL);
+
+ status = 0;
+ hr = IOleObject_GetMiscStatus(obj, DVASPECT_CONTENT, &status);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+ ok(status != 0, "got 0x%08x\n", status);
+
IOleObject_Release(obj);
}
--
2.8.1
More information about the wine-patches
mailing list