ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Set output interfaces to NULL in FolderItems functions. 

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alex Henrie 2016-07-06 23:35:45 -06:00 committed by Alexandre Julliard
parent 970de7df99
commit a711285137
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/shell32/shelldispatch.c
View File

@ -1063,12 +1063,16 @@ static HRESULT WINAPI FolderItemsImpl_get_Application(FolderItems3 *iface, IDisp
if (!ppid) if (!ppid)
return E_INVALIDARG; return E_INVALIDARG;
*ppid = NULL;
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI FolderItemsImpl_get_Parent(FolderItems3 *iface, IDispatch **ppid) 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; 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); FIXME("(%p,%s,%p)\n", iface, debugstr_variant(&index), ppid);
*ppid = NULL;
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1087,6 +1092,7 @@ static HRESULT WINAPI FolderItemsImpl__NewEnum(FolderItems3 *iface, IUnknown **p
if (!ppunk) if (!ppunk)
return E_INVALIDARG; return E_INVALIDARG;
*ppunk = NULL;
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1111,6 +1117,7 @@ static HRESULT WINAPI FolderItemsImpl_get_Verbs(FolderItems3 *iface, FolderItemV
if (!ppfic) if (!ppfic)
return E_INVALIDARG; return E_INVALIDARG;
*ppfic = NULL;
return E_NOTIMPL; return E_NOTIMPL;
} }

3
dlls/shell32/tests/shelldispatch.c
View File

@ -370,7 +370,6 @@ todo_wine
r = FolderItems_Item(items, var, &item); r = FolderItems_Item(items, var, &item);
todo_wine todo_wine
ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r);
todo_wine
ok(!item, "item is not null\n"); ok(!item, "item is not null\n");
if (0) /* crashes on xp */ if (0) /* crashes on xp */
@ -395,7 +394,6 @@ todo_wine
disp = (IDispatch*)0xdeadbeef; disp = (IDispatch*)0xdeadbeef;
r = FolderItems_get_Parent(items, &disp); r = FolderItems_get_Parent(items, &disp);
ok(r == E_NOTIMPL, "expected E_NOTIMPL, got %08x\n", r); ok(r == E_NOTIMPL, "expected E_NOTIMPL, got %08x\n", r);
todo_wine
ok(!disp, "disp is not null\n"); ok(!disp, "disp is not null\n");
if (0) /* crashes on xp */ if (0) /* crashes on xp */
@ -426,7 +424,6 @@ todo_wine
r = FolderItems3_get_Verbs(items3, &verbs); r = FolderItems3_get_Verbs(items3, &verbs);
todo_wine todo_wine
ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r);
todo_wine
ok(!verbs, "verbs is not null\n"); ok(!verbs, "verbs is not null\n");
} }