Module: wine Branch: master Commit: 96b5670ac74df6a470018f56b527ffca923b70c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b5670ac74df6a470018f56b...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Sun Nov 3 22:30:59 2019 +0300
comsvcs: Implement IsSystemMoniker() for "new" moniker.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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);