March 2009 - Wine-commits - list.winehq.org

Paul Vriens : fusion/tests: Skip some tests on .NET 1.x.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 7a435c01ca922fadd941aebda68abc0df54cebd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a435c01ca922fadd941aebda… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Feb 28 21:52:36 2009 +0100 fusion/tests: Skip some tests on .NET 1.x. --- dlls/fusion/tests/asmname.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 98004ea..b989c37 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -437,7 +437,11 @@ static void test_CreateAssemblyNameObject(void) ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); - test_assembly_name_props(name, defaults); + if (hr == S_OK) + win_skip(".NET 1.x doesn't handle ASM_NAME_PROCESSOR_ID_ARRAY" + " and ASM_NAME_OSINFO_ARRAY correctly\n"); + else + test_assembly_name_props(name, defaults); IAssemblyName_Release(name); @@ -469,7 +473,11 @@ static void test_CreateAssemblyNameObject(void) ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); - test_assembly_name_props(name, emptyname); + if (hr == S_OK) + win_skip(".NET 1.x doesn't handle ASM_NAME_PROCESSOR_ID_ARRAY" + " and ASM_NAME_OSINFO_ARRAY correctly\n"); + else + test_assembly_name_props(name, emptyname); IAssemblyName_Release(name); @@ -502,7 +510,11 @@ static void test_CreateAssemblyNameObject(void) ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); - test_assembly_name_props(name, winename); + if (hr == S_OK) + win_skip(".NET 1.x doesn't handle ASM_NAME_PROCESSOR_ID_ARRAY" + " and ASM_NAME_OSINFO_ARRAY correctly\n"); + else + test_assembly_name_props(name, winename); IAssemblyName_Release(name);

1 0

Paul Vriens : fusion/tests: Fix the last test failure on .NET 1.x.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: d929ea739a9f2c70dd1329c0e461e03623ec87d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d929ea739a9f2c70dd1329c0e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Feb 28 21:57:39 2009 +0100 fusion/tests: Fix the last test failure on .NET 1.x. --- dlls/fusion/tests/asmname.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index b989c37..442f00f 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -610,7 +610,9 @@ static void test_CreateAssemblyNameObject(void) 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(hi == 0 || + broken(hi == 0x10005), /* .NET 1.x */ + "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); test_assembly_name_props(name, badvername);

1 0

Rico Schüller : mshtml/tests: Fix SysFreeString call with wrong variable.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 0215c75260e3c1a22ac3134550550748f5431fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0215c75260e3c1a22ac313455… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 1 14:11:40 2009 +0100 mshtml/tests: Fix SysFreeString call with wrong variable. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c39f79f..1e7acae 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3225,7 +3225,7 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_backgroundRepeat(style, sDefault); ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres); - SysFreeString(str); + SysFreeString(sDefault); hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres);

1 0

Rico Schüller : mshtml/tests: Add SysFreeString( sDefault) after the variable isn't used any more.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 9f60f4e30d376ed70c99fe131676f0001ea5c5d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f60f4e30d376ed70c99fe131… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 1 14:14:43 2009 +0100 mshtml/tests: Add SysFreeString(sDefault) after the variable isn't used any more. --- dlls/mshtml/tests/dom.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1e7acae..37cc549 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2668,6 +2668,7 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_fontWeight(style, sDefault); ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(sDefault); /* font Variant */ hres = IHTMLStyle_get_fontVariant(style, NULL); @@ -3071,6 +3072,7 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_fontStyle(style, sDefault); ok(hres == S_OK, "put_fontStyle failed: %08x\n", hres); + SysFreeString(sDefault); /* overflow */ hres = IHTMLStyle_get_overflow(style, NULL);

1 0