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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f42e50703705a1276a77175bca91dff8c5116f4a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f42e50703705a1276a77175bca...

Author: Paul Vriens 
Date:   Fri Feb  6 11:20:00 2009 +0100

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

---

dlls/fusion/tests/asmname.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c
index fa6e996..29b0ec8 100644
--- a/dlls/fusion/tests/asmname.c
+++ b/dlls/fusion/tests/asmname.c
@@ -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);
+        }
     }
 }