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

diff --git a/modules/rostests/apitests/shell32/CShellDesktop.cpp b/modules/rostests/apitests/shell32/CShellDesktop.cpp
index 7b1fd34..764e150 100644 (file)
--- a/modules/rostests/apitests/shell32/CShellDesktop.cpp
+++ b/modules/rostests/apitests/shell32/CShellDesktop.cpp
@@ -145,7 +145,7 @@ TestCompareIDList(IShellFolder* psf)
 
 static
 VOID
-TestShellFolder(
+TestDesktopFolder(
     _In_ IShellFolder2 *psf2)
 {
     HRESULT hr;
@@ -243,7 +243,7 @@ START_TEST(CShellDesktop)
     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));
 
-    TestShellFolder(psf2);
+    TestDesktopFolder(psf2);
     TestCompareIDList(psf);
     TestInitialize(psf);
 }

diff --git a/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp b/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp
index e610338..b48054e 100644 (file)
--- a/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp
+++ b/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp
@@ -15,13 +15,13 @@ ULONG DbgPrint(PCH Format,...);
 
 HRESULT (STDAPICALLTYPE *pSHCreateFileExtractIconW)(LPCWSTR pszFile, DWORD dwFileAttributes, REFIID riid, void **ppv);
 
-struct test_data
+struct TestData
 {
     const WCHAR* Name;
     DWORD dwFlags;
 };
 
-static test_data Tests[] =
+static TestData IconTests[] =
 {
     { L"xxx.zip", FILE_ATTRIBUTE_NORMAL },
     { L"xxx.zip", FILE_ATTRIBUTE_DIRECTORY },
@@ -101,9 +101,9 @@ START_TEST(SHCreateFileExtractIconW)
         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;
 
         if (cur.Name == NULL)