fusion/tests: Fix some tests failures on .NET 1.1 (and Win98).

This commit is contained in:
Paul Vriens 2009-02-06 11:20:00 +01:00 committed by Alexandre Julliard
parent 09fc4e8063
commit f42e507037
1 changed files with 11 additions and 6 deletions

View File

@ -362,12 +362,17 @@ static void test_assembly_name_props_line(IAssemblyName *name,
hr = IAssemblyName_GetProperty(name, i, str, &size);
to_multibyte(val, str);
if (i == ASM_NAME_PUBLIC_KEY_TOKEN)
lstrcpyA((LPSTR)expect, vals[i].val);
ok(hr == vals[i].hr, "%d: prop %d: Expected %08x, got %08x\n", line, i, vals[i].hr, hr);
ok(!lstrcmpW(str, expect), "%d: prop %d: Expected \"%s\", got \"%s\"\n", line, i, vals[i].val, val);
ok(size == vals[i].size, "%d: prop %d: Expected %d, got %d\n", line, i, vals[i].size, size);
ok(hr == vals[i].hr ||
broken(i >= ASM_NAME_CONFIG_MASK && hr == E_INVALIDARG), /* .NET 1.1 */
"%d: prop %d: Expected %08x, got %08x\n", line, i, vals[i].hr, hr);
if (hr != E_INVALIDARG)
{
if (i == ASM_NAME_PUBLIC_KEY_TOKEN)
ok(!memcmp(vals[i].val, str, size), "Expected a correct ASM_NAME_PUBLIC_KEY_TOKEN\n");
else
ok(!lstrcmpA(vals[i].val, val), "%d: prop %d: Expected \"%s\", got \"%s\"\n", line, i, vals[i].val, val);
ok(size == vals[i].size, "%d: prop %d: Expected %d, got %d\n", line, i, vals[i].size, size);
}
}
}