Nikolay Sivov : ole32: Enumeration is not supported for pointer monikers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2017977cb30b1ed724491cd87dc043a6c15780ac
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2017977cb30b1ed724491cd87dc043a6c15780ac

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Jan 30 14:53:43 2020 +0300

ole32: Enumeration is not supported for pointer monikers.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ole32/pointermoniker.c | 9 ++++-----
 dlls/ole32/tests/moniker.c  | 2 --
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c
index bb578a6f61..101fda4e3b 100644
--- a/dlls/ole32/pointermoniker.c
+++ b/dlls/ole32/pointermoniker.c
@@ -328,17 +328,16 @@ PointerMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight,
 /******************************************************************************
  *        PointerMoniker_Enum
  ******************************************************************************/
-static HRESULT WINAPI
-PointerMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker)
+static HRESULT WINAPI PointerMonikerImpl_Enum(IMoniker *iface, BOOL fForward, IEnumMoniker **ppenumMoniker)
 {
-    TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
+    TRACE("%p, %d, %p.\n", iface, fForward, ppenumMoniker);
 
-    if (ppenumMoniker == NULL)
+    if (!ppenumMoniker)
         return E_POINTER;
 
     *ppenumMoniker = NULL;
 
-    return S_OK;
+    return E_NOTIMPL;
 }
 
 /******************************************************************************
diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c
index 4c273547cb..7e7d615645 100644
--- a/dlls/ole32/tests/moniker.c
+++ b/dlls/ole32/tests/moniker.c
@@ -3008,11 +3008,9 @@ todo_wine
 
     /* Enum() */
     hr = IMoniker_Enum(moniker, TRUE, &enummoniker);
-todo_wine
     ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr);
 
     hr = IMoniker_Enum(moniker, FALSE, &enummoniker);
-todo_wine
     ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr);
 
     IMoniker_Release(moniker);