[PATCH v3 1/3] shell32/tests: Add more tests for FolderItems.

Alex Henrie alexhenrie24 at gmail.com
Mon Jul 25 01:32:28 CDT 2016


Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 dlls/shell32/tests/Makefile.in     |   2 +-
 dlls/shell32/tests/shelldispatch.c | 311 +++++++++++++++++++++++++++++++++++--
 2 files changed, 299 insertions(+), 14 deletions(-)

diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in
index cfe0c50..ef95b52 100644
--- a/dlls/shell32/tests/Makefile.in
+++ b/dlls/shell32/tests/Makefile.in
@@ -1,5 +1,5 @@
 TESTDLL   = shell32.dll
-IMPORTS   = shell32 ole32 oleaut32 user32 advapi32
+IMPORTS   = shell32 ole32 oleaut32 user32 advapi32 shlwapi
 
 C_SRCS = \
 	appbar.c \
diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c
index 70b6c36..0855e76 100644
--- a/dlls/shell32/tests/shelldispatch.c
+++ b/dlls/shell32/tests/shelldispatch.c
@@ -25,13 +25,14 @@
 #include "shldisp.h"
 #include "shlobj.h"
 #include "shlwapi.h"
+#include "shellapi.h"
 #include "winsvc.h"
 #include "wine/test.h"
 
 #define EXPECT_HR(hr,hr_exp) \
     ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp)
 
-static const WCHAR winetestW[] = {'w','i','n','e','t','e','s','t',0};
+static const WCHAR winetestW[] = {'w','i','n','e','t','e','s','t',0,0};
 
 static HRESULT (WINAPI *pSHGetFolderPathW)(HWND, int, HANDLE, DWORD, LPWSTR);
 static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*);
@@ -310,19 +311,47 @@ static void test_namespace(void)
 
 static void test_items(void)
 {
-    WCHAR wstr[MAX_PATH], orig_dir[MAX_PATH];
+    static const struct
+    {
+        char name[32];
+        enum
+        {
+            DIRECTORY,
+            SHORTCUT,
+            EMPTY,
+            RANDOM,
+        }
+        type;
+    }
+    file_defs[] =
+    {
+        { "00-Myfolder",       DIRECTORY },
+        { "01-empty.lnk",      EMPTY     },
+        { "02-shortcut.lnk",   SHORTCUT  },
+        { "03-empty.bin",      EMPTY     },
+        { "04-random.bin",     RANDOM    },
+    };
+    WCHAR wstr[MAX_PATH], wstr2[MAX_PATH], orig_dir[MAX_PATH];
     HRESULT r;
     IShellDispatch *sd = NULL;
     Folder *folder = NULL;
     FolderItems *items = NULL;
     FolderItems2 *items2 = NULL;
     FolderItems3 *items3 = NULL;
-    FolderItem *item = (FolderItem*)0xdeadbeef;
-    IDispatch *disp = NULL;
+    FolderItem *item = (FolderItem*)0xdeadbeef, *item2 = (FolderItem*)0xdeadbeef;
+    VARIANT_BOOL b;
+    IDispatch *disp = NULL, *disp2 = NULL;
     IUnknown *unk = NULL;
-    FolderItemVerbs *verbs = (FolderItemVerbs*)0xdeadbeef;
+    FolderItemVerbs *verbs = (FolderItemVerbs*)0xdeadbeef, *verbs2 = (FolderItemVerbs*)0xdeadbeef;
     VARIANT var;
     LONG lcount = -1;
+    HANDLE file;
+    DWORD dwcount;
+    IPersistFile *shortcut = NULL;
+    BSTR bstr;
+    SHFILEOPSTRUCTW del;
+    char buf[512];
+    int i, j;
 
     r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, &IID_IShellDispatch, (void**)&sd);
     ok(SUCCEEDED(r), "CoCreateInstance failed: %08x\n", r);
@@ -345,13 +374,6 @@ static void test_items(void)
     r = Folder_Items(folder, &items);
     ok(r == S_OK, "Folder::Items failed: %08x\n", r);
     ok(!!items, "items is null\n");
-    r = FolderItems_QueryInterface(items, &IID_FolderItems2, (void**)&items2);
-    ok(r == S_OK || broken(E_NOINTERFACE) /* xp and later */, "FolderItems::QueryInterface failed: %08x\n", r);
-    ok(!!items2 || broken(!items2) /* xp and later */, "items2 is null\n");
-    r = FolderItems_QueryInterface(items, &IID_FolderItems3, (void**)&items3);
-    ok(r == S_OK, "FolderItems::QueryInterface failed: %08x\n", r);
-    ok(!!items3, "items3 is null\n");
-    Folder_Release(folder);
 
     if (0) /* crashes on all versions of Windows */
         r = FolderItems_get_Count(items, NULL);
@@ -373,6 +395,264 @@ todo_wine
     ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r);
     ok(!item, "item is not null\n");
 
+    for (i = 0; i < sizeof(file_defs)/sizeof(file_defs[0]); i++)
+    {
+        switch (file_defs[i].type)
+        {
+            case DIRECTORY:
+                CreateDirectoryA(file_defs[i].name, NULL);
+                PathCombineA(buf, file_defs[i].name, "foo.txt");
+                CloseHandle(CreateFileA(buf, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
+                break;
+
+            case SHORTCUT:
+                CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistFile, (void**)&shortcut);
+                MultiByteToWideChar(CP_ACP, 0, file_defs[i].name, -1, wstr, sizeof(wstr)/sizeof(WCHAR));
+                IPersistFile_Save(shortcut, wstr, FALSE);
+                IPersistFile_Release(shortcut);
+                break;
+
+            case EMPTY:
+                CloseHandle(CreateFileA(file_defs[i].name, 0, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
+                break;
+
+            case RANDOM:
+                file = CreateFileA(file_defs[i].name, GENERIC_WRITE, 0, NULL,
+                                   CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+                for (j = 0; j < sizeof(buf); j++)
+                    buf[j] = rand() % 256;
+                WriteFile(file, buf, sizeof(buf), &dwcount, NULL);
+                CloseHandle(file);
+                break;
+        }
+    }
+
+    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);
+
+    items = NULL;
+    r = Folder_Items(folder, &items);
+    ok(r == S_OK, "Folder::Items failed: %08x\n", r);
+    ok(!!items, "items is null\n");
+    r = FolderItems_QueryInterface(items, &IID_FolderItems2, (void**)&items2);
+    ok(r == S_OK || broken(E_NOINTERFACE) /* xp and later */, "FolderItems::QueryInterface failed: %08x\n", r);
+    if (r == S_OK) ok(!!items2, "items2 is null\n");
+    r = FolderItems_QueryInterface(items, &IID_FolderItems3, (void**)&items3);
+    ok(r == S_OK, "FolderItems::QueryInterface failed: %08x\n", r);
+    ok(!!items3, "items3 is null\n");
+    Folder_Release(folder);
+
+    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);
+
+    VariantInit(&var);
+    for (i = -10; i < 0x10000; i++)
+    {
+        item = NULL;
+        V_VT(&var) = i;
+        r = FolderItems_Item(items, var, &item);
+        if (i == VT_I2 || i == VT_I4 || i == VT_ERROR)
+        {
+todo_wine
+            ok(r == S_OK, "type %d: expected S_OK, got %08x\n", i, r);
+todo_wine
+            ok(!!item, "item is null\n");
+        }
+        else if (i == VT_BSTR)
+        {
+todo_wine
+            ok(r == S_FALSE, "type %d: expected S_FALSE, got %08x\n", i, r);
+            ok(!item, "item is not null\n");
+        }
+        else
+        {
+            ok(r == E_NOTIMPL, "type %d: expected E_NOTIMPL, got %08x\n", i, r);
+            ok(!item, "item is not null\n");
+        }
+        if (item) FolderItem_Release(item);
+    }
+
+    for (i = 0; i < 10; i++)
+    {
+        item = NULL;
+        wstr[0] = '0' + i;
+        wstr[1] = '\0';
+        V_VT(&var) = VT_BSTR;
+        V_BSTR(&var) = SysAllocString(wstr);
+        r = FolderItems_Item(items, var, &item);
+todo_wine
+        ok(r == S_FALSE, "%d: expected S_FALSE, got %08x\n", i, r);
+        ok(!item, "item is not null\n");
+        SysFreeString(V_BSTR(&var));
+    }
+
+    for (i = -10; i < 10; i++)
+    {
+        item = NULL;
+        V_VT(&var) = VT_ERROR;
+        V_ERROR(&var) = 0;
+        r = FolderItems_Item(items, var, &item);
+todo_wine
+        ok(r == S_OK, "expected S_OK, got %08x\n", r);
+todo_wine
+        ok(!!item, "item is null\n");
+        if (item)
+        {
+            bstr = NULL;
+            r = FolderItem_get_Path(item, &bstr);
+            ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r);
+            ok(!!bstr, "bstr is null\n");
+            GetCurrentDirectoryW(MAX_PATH, wstr);
+            GetLongPathNameW(wstr, wstr2, MAX_PATH);
+            ok(!lstrcmpW(bstr, wstr2),
+               "expected %s, got %s\n", wine_dbgstr_w(wstr2), wine_dbgstr_w(bstr));
+
+            SysFreeString(bstr);
+            FolderItem_Release(item);
+        }
+    }
+
+    item = NULL;
+    V_VT(&var) = VT_I4;
+    V_I4(&var) = -1;
+    r = FolderItems_Item(items, var, &item);
+todo_wine
+    ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r);
+    ok(!item, "item is not null\n");
+
+    for (i = 0; i < sizeof(file_defs)/sizeof(file_defs[0]); i++)
+    {
+        item = NULL;
+        V_I4(&var) = i;
+        r = FolderItems_Item(items, var, &item);
+todo_wine
+        ok(r == S_OK, "file_defs[%d]: FolderItems::Item failed: %08x\n", i, r);
+todo_wine
+        ok(!!item, "file_defs[%d]: item is null\n", i);
+        if (!item) continue;
+
+        r = FolderItems_Item(items, var, &item2);
+        ok(r == S_OK, "file_defs[%d]: FolderItems::Item failed: %08x\n", i, r);
+        ok(item2 != item, "file_defs[%d]: item and item2 are the same\n", i);
+        FolderItem_Release(item2);
+
+        disp = NULL;
+        r = FolderItem_get_Application(item, &disp);
+        ok(r == S_OK, "file_defs[%d]: FolderItem::get_Application failed: %08x\n", i, r);
+        ok(!!disp, "file_defs[%d]: disp is null\n", i);
+        r = FolderItem_get_Application(item, &disp2);
+        ok(r == S_OK, "file_defs[%d]: FolderItem::get_Application failed: %08x\n", i, r);
+        ok(disp2 == disp, "file_defs[%d]: disp and disp2 are different\n", i);
+        if (disp) IDispatch_Release(disp);
+        if (disp2) IDispatch_Release(disp2);
+
+        disp = NULL;
+        r = FolderItem_get_Parent(item, &disp);
+        ok(r == S_OK, "file_defs[%d]: FolderItem::get_Parent failed: %08x\n", i, r);
+        ok(!!disp, "file_defs[%d]: disp is null\n", i);
+        r = FolderItem_get_Parent(item, &disp2);
+        ok(r == S_OK, "file_defs[%d]: FolderItem::get_Parent failed: %08x\n", i, r);
+        ok(disp2 == disp, "file_defs[%d]: disp and disp2 different\n", i);
+        if (disp) IDispatch_Release(disp);
+        if (disp2) IDispatch_Release(disp2);
+
+        bstr = NULL;
+        r = FolderItem_get_Path(item, &bstr);
+        ok(r == S_OK, "file_defs[%d]: FolderItem::get_Path failed: %08x\n", i, r);
+        ok(!!bstr, "file_defs[%d]: bstr is null\n", i);
+        MultiByteToWideChar(CP_ACP, 0, file_defs[i].name, -1, wstr, MAX_PATH);
+        GetFullPathNameW(wstr, MAX_PATH, wstr2, NULL);
+        GetLongPathNameW(wstr2, wstr, MAX_PATH);
+        ok(!lstrcmpW(bstr, wstr),
+           "file_defs[%d]: expected %s, got %s\n", i, wine_dbgstr_w(wstr), wine_dbgstr_w(bstr));
+        SysFreeString(bstr);
+
+        b = 0xbeef;
+        r = FolderItem_get_IsLink(item, &b);
+        ok(r == S_OK, "file_defs[%d]: FolderItem::get_IsLink failed: %08x\n", i, r);
+        disp = (IDispatch*)0xdeadbeef;
+        r = FolderItem_get_GetLink(item, &disp);
+        if (!lstrcmpA(PathFindExtensionA(file_defs[i].name), ".lnk"))
+        {
+            ok(b == VARIANT_TRUE, "file_defs[%d]: expected VARIANT_TRUE, got %04x\n", i, b);
+            ok(r == S_OK, "file_defs[%d]: FolderItem::get_GetLink failed: %08x\n", i, r);
+            ok(!!disp, "file_defs[%d]: disp is null\n", i);
+            r = FolderItem_get_GetLink(item, &disp2);
+            ok(r == S_OK, "file_defs[%d]: FolderItem::get_GetLink failed: %08x\n", i, r);
+            ok(disp2 != disp, "file_defs[%d]: disp and disp2 are the same\n", i);
+            if (disp2) IDispatch_Release(disp2);
+        }
+        else
+        {
+            ok(b == VARIANT_FALSE, "file_defs[%d]: expected VARIANT_FALSE, got %04x\n", i, b);
+            ok(r == E_NOTIMPL || broken(r == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) /* xp */,
+               "file_defs[%d]: expected E_NOTIMPL, got %08x\n", i, r);
+            ok(!disp, "file_defs[%d]: disp is not null\n", i);
+        }
+        if (disp) IDispatch_Release(disp);
+
+        b = 0xbeef;
+        r = FolderItem_get_IsFolder(item, &b);
+        ok(r == S_OK, "file_defs[%d]: FolderItem::get_IsFolder failed: %08x\n", i, r);
+        disp = (IDispatch*)0xdeadbeef;
+        r = FolderItem_get_GetFolder(item, &disp);
+        if (file_defs[i].type == DIRECTORY)
+        {
+            ok(b == VARIANT_TRUE, "file_defs[%d]: expected VARIANT_TRUE, got %04x\n", i, b);
+            ok(r == S_OK, "file_defs[%d]: FolderItem::get_GetFolder failed: %08x\n", i, r);
+            ok(!!disp, "file_defs[%d]: disp is null\n", i);
+            r = FolderItem_get_GetFolder(item, &disp2);
+            ok(r == S_OK, "file_defs[%d]: FolderItem::get_GetFolder failed: %08x\n", i, r);
+            ok(disp2 != disp, "file_defs[%d]: disp and disp2 are the same\n", i);
+            if (disp2) IDispatch_Release(disp2);
+        }
+        else
+        {
+            ok(b == VARIANT_FALSE, "file_defs[%d]: expected VARIANT_FALSE, got %04x\n", i, b);
+            ok(r == E_FAIL || broken(r == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) /* xp */,
+               "file_defs[%d]: expected E_FAIL, got %08x\n", i, r);
+            ok(!disp, "file_defs[%d]: disp is not null\n", i);
+        }
+        if (disp) IDispatch_Release(disp);
+
+        lcount = -1;
+        r = FolderItem_get_Size(item, &lcount);
+        ok(r == S_OK, "file_defs[%d]: FolderItem::get_Size failed: %08x\n", i, r);
+        if (file_defs[i].type == DIRECTORY || file_defs[i].type == EMPTY)
+            ok(!lcount, "file_defs[%d]: got %d\n", i, lcount);
+        else
+            ok(lcount > 0, "file_defs[%d]: got %d\n", i, lcount);
+
+        verbs = NULL;
+        r = FolderItem_Verbs(item, &verbs);
+        ok(r == S_OK, "file_defs[%d]: FolderItem::Verbs failed: %08x\n", i, r);
+        ok(!!verbs, "file_defs[%d]: verbs is null\n", i);
+        r = FolderItem_Verbs(item, &verbs2);
+        ok(r == S_OK, "file_defs[%d]: FolderItem::Verbs failed: %08x\n", i, r);
+        ok(verbs2 != verbs, "verbs and verbs2 are the same\n");
+        if (verbs) FolderItemVerbs_Release(verbs);
+        if (verbs2) FolderItemVerbs_Release(verbs2);
+
+        FolderItem_Release(item);
+    }
+
+    V_I4(&var) = sizeof(file_defs)/sizeof(file_defs[0]);
+    item = NULL;
+    r = FolderItems_Item(items, var, &item);
+todo_wine
+    ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r);
+    ok(!item, "item is not null\n");
+
     if (0) /* crashes on xp */
     {
         r = FolderItems_get_Application(items, NULL);
@@ -422,6 +702,7 @@ todo_wine
             ok(r == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", r);
         }
 
+        verbs = (FolderItemVerbs*)0xdeadbeef;
         r = FolderItems3_get_Verbs(items3, &verbs);
 todo_wine
         ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r);
@@ -430,7 +711,11 @@ todo_wine
 
     GetTempPathW(MAX_PATH, wstr);
     SetCurrentDirectoryW(wstr);
-    RemoveDirectoryW(winetestW);
+    memset(&del, 0, sizeof(del));
+    del.wFunc = FO_DELETE;
+    del.pFrom = winetestW;
+    del.fFlags = FOF_NO_UI;
+    SHFileOperationW(&del);
     SetCurrentDirectoryW(orig_dir);
 
     FolderItems_Release(items);
-- 
2.9.0




More information about the wine-patches mailing list