From a71128513767d44a8f42e10895578b650061bdce Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Wed, 6 Jul 2016 23:35:45 -0600 Subject: [PATCH] shell32: Set output interfaces to NULL in FolderItems functions. Signed-off-by: Alex Henrie Signed-off-by: Alexandre Julliard --- dlls/shell32/shelldispatch.c | 9 ++++++++- dlls/shell32/tests/shelldispatch.c | 3 --- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 0c1662d2a85..ac79302c933 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1063,12 +1063,16 @@ static HRESULT WINAPI FolderItemsImpl_get_Application(FolderItems3 *iface, IDisp if (!ppid) return E_INVALIDARG; + *ppid = NULL; return E_NOTIMPL; } static HRESULT WINAPI FolderItemsImpl_get_Parent(FolderItems3 *iface, IDispatch **ppid) { - FIXME("(%p,%p)\n", iface, ppid); + TRACE("(%p,%p)\n", iface, ppid); + + if (ppid) + *ppid = NULL; return E_NOTIMPL; } @@ -1077,6 +1081,7 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F { FIXME("(%p,%s,%p)\n", iface, debugstr_variant(&index), ppid); + *ppid = NULL; return E_NOTIMPL; } @@ -1087,6 +1092,7 @@ static HRESULT WINAPI FolderItemsImpl__NewEnum(FolderItems3 *iface, IUnknown **p if (!ppunk) return E_INVALIDARG; + *ppunk = NULL; return E_NOTIMPL; } @@ -1111,6 +1117,7 @@ static HRESULT WINAPI FolderItemsImpl_get_Verbs(FolderItems3 *iface, FolderItemV if (!ppfic) return E_INVALIDARG; + *ppfic = NULL; return E_NOTIMPL; } diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index c1995495a8b..1f5027722fa 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -370,7 +370,6 @@ todo_wine r = FolderItems_Item(items, var, &item); todo_wine ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); -todo_wine ok(!item, "item is not null\n"); if (0) /* crashes on xp */ @@ -395,7 +394,6 @@ todo_wine disp = (IDispatch*)0xdeadbeef; r = FolderItems_get_Parent(items, &disp); ok(r == E_NOTIMPL, "expected E_NOTIMPL, got %08x\n", r); -todo_wine ok(!disp, "disp is not null\n"); if (0) /* crashes on xp */ @@ -426,7 +424,6 @@ todo_wine r = FolderItems3_get_Verbs(items3, &verbs); todo_wine ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); -todo_wine ok(!verbs, "verbs is not null\n"); }