[PATCH 5/6] comsvcs: Implement IsSystemMoniker() for "new" moniker.

Nikolay Sivov nsivov at codeweavers.com
Sun Nov 3 13:30:59 CST 2019


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/comsvcs/main.c          | 6 ++++--
 dlls/comsvcs/tests/comsvcs.c | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c
index 7addd1ee80..d772365dda 100644
--- a/dlls/comsvcs/main.c
+++ b/dlls/comsvcs/main.c
@@ -621,9 +621,11 @@ static HRESULT WINAPI new_moniker_ParseDisplayName(IMoniker *iface, IBindCtx *pb
 
 static HRESULT WINAPI new_moniker_IsSystemMoniker(IMoniker *iface, DWORD *moniker_type)
 {
-    FIXME("%p, %p.\n", iface, moniker_type);
+    TRACE("%p, %p.\n", iface, moniker_type);
 
-    return E_NOTIMPL;
+    *moniker_type = MKSYS_NONE;
+
+    return S_FALSE;
 }
 
 static const IMonikerVtbl new_moniker_vtbl =
diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c
index cbe338872a..5fb73d29ca 100644
--- a/dlls/comsvcs/tests/comsvcs.c
+++ b/dlls/comsvcs/tests/comsvcs.c
@@ -332,10 +332,9 @@ static void test_new_moniker(void)
 
     moniker_type = MKSYS_CLASSMONIKER;
     hr = IMoniker_IsSystemMoniker(moniker, &moniker_type);
-todo_wine {
     ok(hr == S_FALSE || broken(hr == S_OK) /* XP */, "Unexpected hr %#x.\n", hr);
     ok(moniker_type == MKSYS_NONE, "Unexpected moniker type %d.\n", moniker_type);
-}
+
     hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL);
 todo_wine
     ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
-- 
2.24.0.rc1




More information about the wine-devel mailing list