Skip to content

W
wine-winehq
Commit bc48bd95 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard
Browse files
Options

fusion/tests: Fix some test failures on .NET 1.x.

parent c71348ff
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 11 deletions
dlls/fusion/tests/asmname.c
View file @ bc48bd95
...@@ -417,7 +417,8 @@ static void test_CreateAssemblyNameObject(void) ...@@ -417,7 +417,8 @@ static void test_CreateAssemblyNameObject(void)
size = MAX_PATH; size = MAX_PATH;
hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); 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); "Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
size = MAX_PATH; size = MAX_PATH;
...@@ -430,7 +431,8 @@ static void test_CreateAssemblyNameObject(void) ...@@ -430,7 +431,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace; hi = 0xbeefcace;
lo = 0xcafebabe; lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo); 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); "Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi); ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo); ok(lo == 0, "Expected 0, got %08x\n", lo);
...@@ -447,7 +449,8 @@ static void test_CreateAssemblyNameObject(void) ...@@ -447,7 +449,8 @@ static void test_CreateAssemblyNameObject(void)
size = MAX_PATH; size = MAX_PATH;
hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); 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); "Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
size = MAX_PATH; size = MAX_PATH;
...@@ -460,7 +463,8 @@ static void test_CreateAssemblyNameObject(void) ...@@ -460,7 +463,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace; hi = 0xbeefcace;
lo = 0xcafebabe; lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo); 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); "Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi); ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo); ok(lo == 0, "Expected 0, got %08x\n", lo);
...@@ -492,7 +496,8 @@ static void test_CreateAssemblyNameObject(void) ...@@ -492,7 +496,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace; hi = 0xbeefcace;
lo = 0xcafebabe; lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo); 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); "Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi); ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo); ok(lo == 0, "Expected 0, got %08x\n", lo);
...@@ -526,7 +531,8 @@ static void test_CreateAssemblyNameObject(void) ...@@ -526,7 +531,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace; hi = 0xbeefcace;
lo = 0xcafebabe; lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo); 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); "Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi); ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo); ok(lo == 0, "Expected 0, got %08x\n", lo);
...@@ -589,7 +595,8 @@ static void test_CreateAssemblyNameObject(void) ...@@ -589,7 +595,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace; hi = 0xbeefcace;
lo = 0xcafebabe; lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo); 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); "Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi); ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo); ok(lo == 0, "Expected 0, got %08x\n", lo);
...@@ -621,7 +628,8 @@ static void test_CreateAssemblyNameObject(void) ...@@ -621,7 +628,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace; hi = 0xbeefcace;
lo = 0xcafebabe; lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo); 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); "Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi); ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo); ok(lo == 0, "Expected 0, got %08x\n", lo);
...@@ -653,7 +661,8 @@ static void test_CreateAssemblyNameObject(void) ...@@ -653,7 +661,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace; hi = 0xbeefcace;
lo = 0xcafebabe; lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo); 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); "Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi); ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo); ok(lo == 0, "Expected 0, got %08x\n", lo);
...@@ -685,7 +694,8 @@ static void test_CreateAssemblyNameObject(void) ...@@ -685,7 +694,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace; hi = 0xbeefcace;
lo = 0xcafebabe; lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo); 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); "Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi); ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo); ok(lo == 0, "Expected 0, got %08x\n", lo);
...@@ -720,7 +730,8 @@ static void test_CreateAssemblyNameObject(void) ...@@ -720,7 +730,8 @@ static void test_CreateAssemblyNameObject(void)
hi = 0xbeefcace; hi = 0xbeefcace;
lo = 0xcafebabe; lo = 0xcafebabe;
hr = IAssemblyName_GetVersion(name, &hi, &lo); 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); "Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
ok(hi == 0, "Expected 0, got %08x\n", hi); ok(hi == 0, "Expected 0, got %08x\n", hi);
ok(lo == 0, "Expected 0, got %08x\n", lo); ok(lo == 0, "Expected 0, got %08x\n", lo);
......
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