Commit f42e5070 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

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

parent 09fc4e80
...@@ -362,12 +362,17 @@ static void test_assembly_name_props_line(IAssemblyName *name, ...@@ -362,12 +362,17 @@ static void test_assembly_name_props_line(IAssemblyName *name,
hr = IAssemblyName_GetProperty(name, i, str, &size); hr = IAssemblyName_GetProperty(name, i, str, &size);
to_multibyte(val, str); to_multibyte(val, str);
if (i == ASM_NAME_PUBLIC_KEY_TOKEN) ok(hr == vals[i].hr ||
lstrcpyA((LPSTR)expect, vals[i].val); 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);
ok(hr == vals[i].hr, "%d: prop %d: Expected %08x, got %08x\n", line, i, vals[i].hr, hr); if (hr != E_INVALIDARG)
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); 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);
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment