shell32/tests: Get rid of strcmp_wa().

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-02-07 19:33:06 +03:00 committed by Alexandre Julliard
parent 5066a67835
commit 5b7dc90efb
1 changed files with 6 additions and 10 deletions

View File

@ -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);