system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-15 23:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

propsys/tests: Get rid of strcmp_wa().

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2020-02-06 22:41:14 +02:00 committed by Alexandre Julliard
parent c8aad3407c
commit 2340212ee9
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dlls/propsys/tests/propsys.c
View file

@ -57,13 +57,6 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line)
ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc);
} }
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 test_PSStringFromPropertyKey(void) static void test_PSStringFromPropertyKey(void)
{ {
static const WCHAR fillerW[] = {'X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X', static const WCHAR fillerW[] = {'X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X',
@ -479,10 +472,10 @@ static void test_InitPropVariantFromGUIDAsString(void)
const struct { const struct {
REFGUID guid; REFGUID guid;
const char *str; const WCHAR *str;
} testcases[] = { } testcases[] = {
{&IID_NULL, "{00000000-0000-0000-0000-000000000000}" }, {&IID_NULL, L"{00000000-0000-0000-0000-000000000000}" },
{&dummy_guid, "{DEADBEEF-DEAD-BEEF-DEAD-BEEFCAFEBABE}" }, {&dummy_guid, L"{DEADBEEF-DEAD-BEEF-DEAD-BEEFCAFEBABE}" },
}; };
hres = InitPropVariantFromGUIDAsString(NULL, &propvar); hres = InitPropVariantFromGUIDAsString(NULL, &propvar);
@ -502,7 +495,7 @@ static void test_InitPropVariantFromGUIDAsString(void)
hres = InitPropVariantFromGUIDAsString(testcases[i].guid, &propvar); hres = InitPropVariantFromGUIDAsString(testcases[i].guid, &propvar);
ok(hres == S_OK, "%d) InitPropVariantFromGUIDAsString returned %x\n", i, hres); ok(hres == S_OK, "%d) InitPropVariantFromGUIDAsString returned %x\n", i, hres);
ok(propvar.vt == VT_LPWSTR, "%d) propvar.vt = %d\n", i, propvar.vt); ok(propvar.vt == VT_LPWSTR, "%d) propvar.vt = %d\n", i, propvar.vt);
ok(!strcmp_wa(propvar.u.pwszVal, testcases[i].str), "%d) propvar.u.pwszVal = %s\n", ok(!lstrcmpW(propvar.u.pwszVal, testcases[i].str), "%d) propvar.u.pwszVal = %s\n",
i, wine_dbgstr_w(propvar.u.pwszVal)); i, wine_dbgstr_w(propvar.u.pwszVal));
CoTaskMemFree(propvar.u.pwszVal); CoTaskMemFree(propvar.u.pwszVal);
@ -512,7 +505,7 @@ static void test_InitPropVariantFromGUIDAsString(void)
ok(V_VT(&var) == VT_BSTR, "%d) V_VT(&var) = %d\n", i, V_VT(&var)); ok(V_VT(&var) == VT_BSTR, "%d) V_VT(&var) = %d\n", i, V_VT(&var));
ok(SysStringLen(V_BSTR(&var)) == 38, "SysStringLen returned %d\n", ok(SysStringLen(V_BSTR(&var)) == 38, "SysStringLen returned %d\n",
SysStringLen(V_BSTR(&var))); SysStringLen(V_BSTR(&var)));
ok(!strcmp_wa(V_BSTR(&var), testcases[i].str), "%d) V_BSTR(&var) = %s\n", ok(!lstrcmpW(V_BSTR(&var), testcases[i].str), "%d) V_BSTR(&var) = %s\n",
i, wine_dbgstr_w(V_BSTR(&var))); i, wine_dbgstr_w(V_BSTR(&var)));
VariantClear(&var); VariantClear(&var);
} }
@ -1443,7 +1436,7 @@ static void test_PropVariantToString(void)
U(propvar).lVal = 22; U(propvar).lVal = 22;
hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW));
todo_wine ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); todo_wine ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr);
todo_wine ok(!strcmp_wa(bufferW, "22"), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); todo_wine ok(!lstrcmpW(bufferW, L"22"), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW));
memset(bufferW, 0, sizeof(bufferW)); memset(bufferW, 0, sizeof(bufferW));
PropVariantClear(&propvar); PropVariantClear(&propvar);