[PATCH v3 3/3] shell32: Implement FolderItems_get_Count.
Alex Henrie
alexhenrie24 at gmail.com
Mon Jul 25 01:32:30 CDT 2016
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
dlls/shell32/shelldispatch.c | 10 ++++++++--
dlls/shell32/tests/shelldispatch.c | 6 ------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c
index d9b0527..f347ac6 100644
--- a/dlls/shell32/shelldispatch.c
+++ b/dlls/shell32/shelldispatch.c
@@ -1061,9 +1061,15 @@ static HRESULT WINAPI FolderItemsImpl_Invoke(FolderItems3 *iface,
static HRESULT WINAPI FolderItemsImpl_get_Count(FolderItems3 *iface, LONG *count)
{
- FIXME("(%p,%p)\n", iface, count);
+ FolderItemsImpl *This = impl_from_FolderItems(iface);
- return E_NOTIMPL;
+ TRACE("(%p,%p)\n", iface, count);
+
+ if (!count)
+ return E_INVALIDARG;
+
+ *count = This->item_count;
+ return S_OK;
}
static HRESULT WINAPI FolderItemsImpl_get_Application(FolderItems3 *iface, IDispatch **ppid)
diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c
index 68025db..41851aa 100644
--- a/dlls/shell32/tests/shelldispatch.c
+++ b/dlls/shell32/tests/shelldispatch.c
@@ -379,9 +379,7 @@ static void test_items(void)
r = FolderItems_get_Count(items, NULL);
r = FolderItems_get_Count(items, &lcount);
-todo_wine
ok(r == S_OK, "FolderItems::get_Count failed: %08x\n", r);
-todo_wine
ok(!lcount, "expected 0 files, got %d\n", lcount);
V_VT(&var) = VT_I4;
@@ -428,9 +426,7 @@ todo_wine
lcount = -1;
r = FolderItems_get_Count(items, &lcount);
-todo_wine
ok(r == S_OK, "FolderItems::get_Count failed: %08x\n", r);
-todo_wine
ok(!lcount, "expected 0 files, got %d\n", lcount);
FolderItems_Release(items);
@@ -448,9 +444,7 @@ todo_wine
lcount = -1;
r = FolderItems_get_Count(items, &lcount);
-todo_wine
ok(r == S_OK, "FolderItems::get_Count failed: %08x\n", r);
-todo_wine
ok(lcount == sizeof(file_defs)/sizeof(file_defs[0]),
"expected %d files, got %d\n", sizeof(file_defs)/sizeof(file_defs[0]), lcount);
--
2.9.0
More information about the wine-patches
mailing list