Paul Vriens : fusion/tests: Fix some test failures on .NET 1.x.
Alexandre Julliard
julliard at winehq.org
Fri Feb 27 10:02:42 CST 2009
Module: wine
Branch: master
Commit: bc48bd95775b261f150314329f8a699c82f6c065
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc48bd95775b261f150314329f8a699c82f6c065
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Fri Feb 27 10:04:26 2009 +0100
fusion/tests: Fix some test failures on .NET 1.x.
---
dlls/fusion/tests/asmname.c | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c
index 4592850..98004ea 100644
--- a/dlls/fusion/tests/asmname.c
+++ b/dlls/fusion/tests/asmname.c
@@ -417,7 +417,8 @@ static void test_CreateAssemblyNameObject(void)
size = MAX_PATH;
hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL);
- ok(hr == FUSION_E_INVALID_NAME,
+ ok(hr == FUSION_E_INVALID_NAME ||
+ broken(hr == E_INVALIDARG), /* .NET 1.x */
"Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
size = MAX_PATH;
@@ -430,7 +431,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace;
lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo);
- ok(hr == FUSION_E_INVALID_NAME,
+ ok(hr == FUSION_E_INVALID_NAME ||
+ broken(hr == S_OK), /* .NET 1.x */
"Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo);
@@ -447,7 +449,8 @@ static void test_CreateAssemblyNameObject(void)
size = MAX_PATH;
hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL);
- ok(hr == FUSION_E_INVALID_NAME,
+ ok(hr == FUSION_E_INVALID_NAME ||
+ broken(hr == S_OK), /* .NET 1.x */
"Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
size = MAX_PATH;
@@ -460,7 +463,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace;
lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo);
- ok(hr == FUSION_E_INVALID_NAME,
+ ok(hr == FUSION_E_INVALID_NAME ||
+ broken(hr == S_OK), /* .NET 1.x */
"Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo);
@@ -492,7 +496,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace;
lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo);
- ok(hr == FUSION_E_INVALID_NAME,
+ ok(hr == FUSION_E_INVALID_NAME ||
+ broken(hr == S_OK), /* .NET 1.x */
"Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo);
@@ -526,7 +531,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace;
lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo);
- ok(hr == FUSION_E_INVALID_NAME,
+ ok(hr == FUSION_E_INVALID_NAME ||
+ broken(hr == S_OK), /* .NET 1.x */
"Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo);
@@ -589,7 +595,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace;
lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo);
- ok(hr == FUSION_E_INVALID_NAME,
+ ok(hr == FUSION_E_INVALID_NAME ||
+ broken(hr == S_OK), /* .NET 1.x */
"Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo);
@@ -621,7 +628,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace;
lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo);
- ok(hr == FUSION_E_INVALID_NAME,
+ ok(hr == FUSION_E_INVALID_NAME ||
+ broken(hr == S_OK), /* .NET 1.x */
"Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo);
@@ -653,7 +661,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace;
lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo);
- ok(hr == FUSION_E_INVALID_NAME,
+ ok(hr == FUSION_E_INVALID_NAME ||
+ broken(hr == S_OK), /* .NET 1.x */
"Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo);
@@ -685,7 +694,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace;
lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo);
- ok(hr == FUSION_E_INVALID_NAME,
+ ok(hr == FUSION_E_INVALID_NAME ||
+ broken(hr == S_OK), /* .NET 1.x */
"Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo);
@@ -720,7 +730,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace;
lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo);
- ok(hr == FUSION_E_INVALID_NAME,
+ ok(hr == FUSION_E_INVALID_NAME ||
+ broken(hr == S_OK), /* .NET 1.x */
"Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo);
More information about the wine-cvs
mailing list