[SHELL32_APITEST] Rename TestShellFolder, test_data and Tests. #179

This commit is contained in:
Amine Khaldi 2017-12-25 13:33:33 +01:00
parent a3797dba7a
commit a66bbfa92c
2 changed files with 6 additions and 6 deletions

View file

@ -145,7 +145,7 @@ TestCompareIDList(IShellFolder* psf)
static static
VOID VOID
TestShellFolder( TestDesktopFolder(
_In_ IShellFolder2 *psf2) _In_ IShellFolder2 *psf2)
{ {
HRESULT hr; HRESULT hr;
@ -243,7 +243,7 @@ START_TEST(CShellDesktop)
ok(hr == S_OK, "hr = %lx\n", hr); ok(hr == S_OK, "hr = %lx\n", hr);
ok(psf == static_cast<IShellFolder *>(psf2), "Expected %p == %p\n", static_cast<PVOID>(psf), static_cast<PVOID>(psf2)); ok(psf == static_cast<IShellFolder *>(psf2), "Expected %p == %p\n", static_cast<PVOID>(psf), static_cast<PVOID>(psf2));
TestShellFolder(psf2); TestDesktopFolder(psf2);
TestCompareIDList(psf); TestCompareIDList(psf);
TestInitialize(psf); TestInitialize(psf);
} }

View file

@ -15,13 +15,13 @@ ULONG DbgPrint(PCH Format,...);
HRESULT (STDAPICALLTYPE *pSHCreateFileExtractIconW)(LPCWSTR pszFile, DWORD dwFileAttributes, REFIID riid, void **ppv); HRESULT (STDAPICALLTYPE *pSHCreateFileExtractIconW)(LPCWSTR pszFile, DWORD dwFileAttributes, REFIID riid, void **ppv);
struct test_data struct TestData
{ {
const WCHAR* Name; const WCHAR* Name;
DWORD dwFlags; DWORD dwFlags;
}; };
static test_data Tests[] = static TestData IconTests[] =
{ {
{ L"xxx.zip", FILE_ATTRIBUTE_NORMAL }, { L"xxx.zip", FILE_ATTRIBUTE_NORMAL },
{ L"xxx.zip", FILE_ATTRIBUTE_DIRECTORY }, { L"xxx.zip", FILE_ATTRIBUTE_DIRECTORY },
@ -101,9 +101,9 @@ START_TEST(SHCreateFileExtractIconW)
return; return;
} }
for (size_t n = 0; n < _countof(Tests); ++n) for (size_t n = 0; n < _countof(IconTests); ++n)
{ {
test_data& cur = Tests[n]; TestData& cur = IconTests[n];
bool useMyIcon = false; bool useMyIcon = false;
if (cur.Name == NULL) if (cur.Name == NULL)