Nikolay Sivov : shell32/tests: Use ILIsEqual() directly.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b9349d135e655d9a25fc4f77e9dc115757402067
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b9349d135e655d9a25fc4f77e...

Author: Nikolay Sivov 
Date:   Wed Jan  8 11:24:09 2020 +0300

shell32/tests: Use ILIsEqual() directly.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/shell32/tests/shelllink.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c
index 2c2ee94c17..7828f0edf2 100644
--- a/dlls/shell32/tests/shelllink.c
+++ b/dlls/shell32/tests/shelllink.c
@@ -38,7 +38,6 @@
 #  define SLDF_HAS_LOGO3ID 0x00000800 /* not available in the Vista SDK */
 #endif

-static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
 static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*);
 static HRESULT (WINAPI *pSHGetFolderLocation)(HWND,INT,HANDLE,DWORD,PIDLIST_ABSOLUTE*);
 static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT);
@@ -234,12 +233,12 @@ static void test_get_set(void)
         tmp_pidl=NULL;
         r = IShellLinkA_GetIDList(sl, &tmp_pidl);
         ok(r == S_OK, "GetIDList failed (0x%08x)\n", r);
-        ok(tmp_pidl && pILIsEqual(pidl, tmp_pidl),
+        ok(tmp_pidl && ILIsEqual(pidl, tmp_pidl),
            "GetIDList returned an incorrect pidl\n");

r = IShellLinkA_GetIDList(sl, &second_pidl);
         ok(r == S_OK, "GetIDList failed (0x%08x)\n", r);
-        ok(second_pidl && pILIsEqual(pidl, second_pidl),
+        ok(second_pidl && ILIsEqual(pidl, second_pidl),
            "GetIDList returned an incorrect pidl\n");
         ok(second_pidl != tmp_pidl, "pidls are the same\n");

@@ -583,7 +582,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo)
         r = IShellLinkA_GetIDList(sl, &pidl);
         lok(r == S_OK, "GetIDList failed (0x%08x)\n", r);
         todo_wine_if ((todo & 0x8) != 0)
-            lok(pILIsEqual(pidl, desc->pidl), "GetIDList returned an incorrect pidl\n");
+            lok(ILIsEqual(pidl, desc->pidl), "GetIDList returned an incorrect pidl\n");
     }
     if (desc->showcmd)
     {
@@ -1453,7 +1452,6 @@ START_TEST(shelllink)
     HMODULE hmod = GetModuleHandleA("shell32.dll");
     HMODULE huser32 = GetModuleHandleA("user32.dll");

-    pILIsEqual = (void *)GetProcAddress(hmod, (LPSTR)21);
     pSHILCreateFromPath = (void *)GetProcAddress(hmod, (LPSTR)28);
     pSHGetFolderLocation = (void *)GetProcAddress(hmod, "SHGetFolderLocation");
     pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA");