Nikolay Sivov : shell32/tests: Get rid of strcmp_wa().

[Alexandre Julliard]

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

Author: Nikolay Sivov 
Date:   Fri Feb  7 19:33:06 2020 +0300

shell32/tests: Get rid of strcmp_wa().

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

---

dlls/shell32/tests/shlfolder.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 14d243a03b..c9606c6f10 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -83,13 +83,6 @@ static WCHAR *make_wstr(const char *str)
     return ret;
 }

-static int strcmp_wa(LPCWSTR strw, const char *stra)
-{
-    CHAR buf[512];
-    WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL);
-    return lstrcmpA(stra, buf);
-}
-
 static void init_function_pointers(void)
 {
     HMODULE hmod;
@@ -4503,10 +4496,13 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path)
                     "didn't get expected path (%s), instead: %s\n",
                      wine_dbgstr_w(path), wine_dbgstr_w(U(filename).pOleStr));
             SHFree(U(filename).pOleStr);
-        }else if(filename.uType == STRRET_CSTR){
-            ok_(__FILE__,l)(strcmp_wa(path, U(filename).cStr) == 0,
-                    "didn't get expected path (%s), instead: %s\n",
+        }
+        else if(filename.uType == STRRET_CSTR)
+        {
+            WCHAR *strW = make_wstr(U(filename).cStr);
+            ok_(__FILE__,l)(!lstrcmpW(path, strW), "didn't get expected path (%s), instead: %s\n",
                      wine_dbgstr_w(path), U(filename).cStr);
+            heap_free(strW);
         }

IShellFolder_Release(parent);