wine-commits March 2009

2 participants
834 discussions

Paul Vriens : fusion/tests: Fix the last test failure on .NET 1.x.

by Alexandre Julliard

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);

15 years, 2 months

Paul Vriens : fusion/tests: Skip some tests on .NET 1.x.

by Alexandre Julliard

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);

15 years, 2 months

Paul Vriens : crypt32/tests: Don't crash on NT4.

by Alexandre Julliard

Module: wine Branch: master Commit: 1461b2c1b48c6b6701e9146ff6a2aebfa3674086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1461b2c1b48c6b6701e9146ff… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Feb 28 19:54:25 2009 +0100 crypt32/tests: Don't crash on NT4. --- dlls/crypt32/tests/msg.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 14492fe..42da890 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2635,6 +2635,14 @@ static void test_msg_control(void) CMSG_HASHED_ENCODE_INFO hashInfo = { 0 }; CMSG_SIGNED_ENCODE_INFO signInfo = { sizeof(signInfo), 0 }; CMSG_CTRL_DECRYPT_PARA decryptPara = { sizeof(decryptPara), 0 }; + BOOL old_crypt32 = FALSE; + + /* I_CertUpdateStore can be used for verification if crypt32 is new enough */ + if (!GetProcAddress(GetModuleHandleA("crypt32.dll"), "I_CertUpdateStore")) + { + win_skip("Some tests will crash on older crypt32 implementations\n"); + old_crypt32 = TRUE; + } /* Crashes ret = CryptMsgControl(NULL, 0, 0, NULL); @@ -2644,7 +2652,7 @@ static void test_msg_control(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, NULL); /* either with no prior update.. */ - for (i = 1; have_nt && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -2653,7 +2661,7 @@ static void test_msg_control(void) } ret = CryptMsgUpdate(msg, NULL, 0, TRUE); /* or after an update. */ - for (i = 1; have_nt && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -2668,7 +2676,7 @@ static void test_msg_control(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, &hashInfo, NULL, NULL); /* either with no prior update.. */ - for (i = 1; have_nt && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -2677,7 +2685,7 @@ static void test_msg_control(void) } ret = CryptMsgUpdate(msg, NULL, 0, TRUE); /* or after an update. */ - for (i = 1; have_nt && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -2691,7 +2699,7 @@ static void test_msg_control(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); /* either before an update.. */ - for (i = 1; have_nt && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); @@ -2700,7 +2708,7 @@ static void test_msg_control(void) } ret = CryptMsgUpdate(msg, NULL, 0, TRUE); /* or after an update. */ - for (i = 1; have_nt && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) + for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL);

15 years, 2 months

Michael Stefaniuc : mcicda: Compare a file handle with INVALID_HANDLE_VALUE instead of NULL.

by Alexandre Julliard

Module: wine Branch: master Commit: 4362e840d0a2df85ce08d97f024e5a6ce159a48d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4362e840d0a2df85ce08d97f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 27 23:55:31 2009 +0100 mcicda: Compare a file handle with INVALID_HANDLE_VALUE instead of NULL. Found by Smatch. --- dlls/mcicda/mcicda.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 79f3bae..81dc18f 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -463,7 +463,7 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar /* now, open the handle */ root[0] = root[1] = '\\'; root[2] = '.'; root[3] = '\\'; root[4] = drive; root[5] = ':'; root[6] = '\0'; wmcda->handle = CreateFileW(root, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - if (wmcda->handle != 0) + if (wmcda->handle != INVALID_HANDLE_VALUE) return 0; the_error:

15 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2009