winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
February 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
674 discussions
Start a n
N
ew thread
Austin English : msi/tests: Don't check return values inside of if(0) (LLVM /Clang).
by Alexandre Julliard
11 Feb '11
11 Feb '11
Module: wine Branch: master Commit: 5e92277f97aac84354e5f4acd835fc81dbdad677 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5e92277f97aac84354e5f4acd…
Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:40 2011 -0800 msi/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/msi/tests/automation.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 46178b8..a6f1ddb 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -661,10 +661,10 @@ static void test_dispatch(void) /* Test invoking this function (without parameters passed) */ if (0) /* All of these crash MSI on Windows XP */ { - hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, NULL, NULL, NULL); - hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, NULL, &excepinfo, NULL); + IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, NULL, NULL, NULL); + IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, NULL, &excepinfo, NULL); VariantInit(&varresult); - hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, &varresult, &excepinfo, NULL); + IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, &varresult, &excepinfo, NULL); } /* Try with NULL params */ @@ -2289,7 +2289,7 @@ static void test_Installer_Products(BOOL bProductInstalled) if (0) /* Crashes on Windows XP */ { /* IEnumVARIANT::Clone, NULL pointer */ - hr = IEnumVARIANT_Clone(pEnum, NULL); + IEnumVARIANT_Clone(pEnum, NULL); } /* IEnumVARIANT::Clone */
1
0
0
0
Austin English : crypt32/tests: Make sure to use a return value (LLVM/Clang ).
by Alexandre Julliard
11 Feb '11
11 Feb '11
Module: wine Branch: master Commit: 641d74845d88a5781e7754e9de9c4fa8c845d802 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=641d74845d88a5781e7754e9d…
Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:16 2011 -0800 crypt32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/crypt32/tests/oid.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 030a548..b661407 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -451,6 +451,7 @@ static void test_registerDefaultOIDFunction(void) /* Repeat a few tests on the normal encoding type */ ret = CryptRegisterDefaultOIDFunction(X509_ASN_ENCODING, "CertDllOpenStoreProv", 0, bogusDll); + ok(ret, "CryptRegisterDefaultOIDFunction failed\n"); ret = CryptUnregisterDefaultOIDFunction(X509_ASN_ENCODING, "CertDllOpenStoreProv", bogusDll); ok(ret, "CryptUnregisterDefaultOIDFunction failed\n");
1
0
0
0
Austin English : crypt32/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard
11 Feb '11
11 Feb '11
Module: wine Branch: master Commit: 29b5aab0265cf04e6a85b6804066af43a212b277 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=29b5aab0265cf04e6a85b6804…
Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:12 2011 -0800 crypt32/tests: Make sure to use return values (LLVM/Clang). --- dlls/crypt32/tests/message.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index 37ae6fd..1fe9a57 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -515,6 +515,8 @@ static void test_verify_message_signature(void) cbDecoded = 0xdeadbeef; ret = CryptVerifyMessageSignature(NULL, 0, NULL, 0, NULL, &cbDecoded, NULL); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); ok(cbDecoded == 0, "expected 0, got %08x\n", cbDecoded); SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(¶, 0, NULL, 0, NULL, 0, NULL); @@ -541,15 +543,24 @@ static void test_verify_message_signature(void) /* Check whether cert is set on error */ cert = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptVerifyMessageSignature(¶, 0, NULL, 0, NULL, 0, &cert); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG /* NT40 */), + "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); ok(cert == NULL, "Expected NULL cert\n"); /* Check whether cbDecoded is set on error */ cbDecoded = 0xdeadbeef; ret = CryptVerifyMessageSignature(¶, 0, NULL, 0, NULL, &cbDecoded, NULL); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG /* NT40 */), + "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); ok(!cbDecoded, "Expected 0\n"); SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(¶, 0, dataEmptyBareContent, sizeof(dataEmptyBareContent), NULL, 0, NULL); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_PDU_MISMATCH /* NT40 */), + "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); ok(GetLastError() == CRYPT_E_ASN1_BADTAG || GetLastError() == OSS_PDU_MISMATCH, /* win9x */ "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); @@ -679,6 +690,7 @@ static void test_hash_message(void) SetLastError(0xdeadbeef); ret = CryptHashMessage(¶, FALSE, 2, toHash, hashSize, NULL, NULL, NULL, NULL); + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); /* Try again with a valid encoding type */ para.dwMsgEncodingType = PKCS_7_ASN_ENCODING; SetLastError(0xdeadbeef); @@ -694,7 +706,7 @@ static void test_hash_message(void) */ if (0) { - ret = CryptHashMessage(¶, FALSE, 2, NULL, NULL, NULL, + CryptHashMessage(¶, FALSE, 2, NULL, NULL, NULL, &hashedBlobSize, NULL, NULL); } /* Passing a valid pointer for the data to hash fails, as the hash @@ -781,6 +793,7 @@ static void test_hash_message(void) SetLastError(0xdeadbeef); ret = CryptHashMessage(¶, TRUE, 2, toHash, hashSize, NULL, &hashedBlobSize, computedHash, &computedHashSize); + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); ok(computedHashSize == sizeof(hashVal), "unexpected size of hash value %d\n", computedHashSize); ok(!memcmp(computedHash, hashVal, computedHashSize),
1
0
0
0
Austin English : crypt32/tests: Don't check return values inside of if(0) ( LLVM/Clang).
by Alexandre Julliard
11 Feb '11
11 Feb '11
Module: wine Branch: master Commit: c6301aec11012ffaa6f3cd1510568e7b94e4ab98 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c6301aec11012ffaa6f3cd151…
Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:09 2011 -0800 crypt32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/crypt32/tests/main.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 5f2e4d0..8c5b41e 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -47,8 +47,7 @@ static void test_findAttribute(void) if (0) { /* crashes */ - SetLastError(0xdeadbeef); - ret = CertFindAttribute(NULL, 1, NULL); + CertFindAttribute(NULL, 1, NULL); /* returns NULL, last error is ERROR_INVALID_PARAMETER * crashes on Vista */ @@ -138,7 +137,7 @@ static void test_findRDNAttr(void) { /* crashes */ SetLastError(0xdeadbeef); - ret = CertFindRDNAttr(NULL, NULL); + CertFindRDNAttr(NULL, NULL); /* returns NULL, last error is ERROR_INVALID_PARAMETER * crashes on Vista */ @@ -395,7 +394,7 @@ static void test_format_object(void) /* Crash */ if (0) { - ret = pCryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, NULL); + pCryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, NULL); } /* When called with any but the default encoding, it fails to find a * formatting function.
1
0
0
0
Austin English : crypt32/tests: Make sure to use a return value (LLVM/Clang ).
by Alexandre Julliard
11 Feb '11
11 Feb '11
Module: wine Branch: master Commit: f6364bf9703adefea326276bb652966b5438738a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f6364bf9703adefea326276bb…
Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:06 2011 -0800 crypt32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/crypt32/tests/ctl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index 8ee2652..978ccda 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -213,6 +213,7 @@ static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, memset(hashProperty, 0, sizeof(hashProperty)); size = sizeof(hash); ret = CryptHashCertificate(0, algID, 0, data, dataLen, hash, &size); + ok(ret, "CryptHashCertificate failed: %08x\n", GetLastError()); ret = CertGetCTLContextProperty(context, propID, hashProperty, &size); ok(ret, "CertGetCTLContextProperty failed: %08x\n", GetLastError()); if (ret)
1
0
0
0
Austin English : crypt32/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard
11 Feb '11
11 Feb '11
Module: wine Branch: master Commit: 4d5293bd81a9790f49ffe99f628bab9a64bc4173 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4d5293bd81a9790f49ffe99f6…
Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:03 2011 -0800 crypt32/tests: Make sure to use return values (LLVM/Clang). --- dlls/crypt32/tests/crl.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 214d612..fb7b6e4 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -102,7 +102,6 @@ static void testCreateCRL(void) ok(!context && (GLE == CRYPT_E_ASN1_EOD || GLE == OSS_MORE_INPUT), "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08x\n", GLE); context = CertCreateCRLContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); - GLE = GetLastError(); ok(!context, "Expected failure\n"); context = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, sizeof(signedCRL) - 1); @@ -205,6 +204,7 @@ static void testAddCRL(void) /* Normal cases: a "signed" CRL is okay.. */ ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, NULL); + ok(ret, "CertAddEncodedCRLToStore failed: %08x\n", GetLastError()); /* and an unsigned one is too. */ ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, CRL, sizeof(CRL), CERT_STORE_ADD_ALWAYS, NULL); @@ -477,9 +477,9 @@ static void testFindCRL(void) if (0) { /* Crash or return NULL/STATUS_ACCESS_VIOLATION */ - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, NULL, + pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, NULL, NULL); - context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, + pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, &issuedForPara, NULL); } /* Test whether the cert matches the CRL in the store */ @@ -906,6 +906,7 @@ static void testCRLProperties(void) size = sizeof(hashProperty); ret = CertGetCRLContextProperty(context, CERT_HASH_PROP_ID, hashProperty, &size); + ok(ret, "CertSetCRLContextProperty failed: %08x\n", GetLastError()); ok(!memcmp(hashProperty, hash, sizeof(hash)), "Unexpected hash\n"); /* Delete the (bogus) hash, and get the real one */ ret = CertSetCRLContextProperty(context, CERT_HASH_PROP_ID, 0, NULL);
1
0
0
0
Juan Lang : crypt32: Allow updating data messages with no content.
by Alexandre Julliard
11 Feb '11
11 Feb '11
Module: wine Branch: master Commit: 2910cf9660d4e6a3791289286d364ea1a22d343c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2910cf9660d4e6a3791289286…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 10 11:58:17 2011 -0800 crypt32: Allow updating data messages with no content. --- dlls/crypt32/msg.c | 21 ++++++++------------- dlls/crypt32/tests/msg.c | 1 - 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ee80f1a..97860e5 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -277,20 +277,15 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, } else { - msg->base.state = MsgStateFinalized; - if (!cbData) - SetLastError(E_INVALIDARG); - else - { - CRYPT_DATA_BLOB blob = { cbData, (LPBYTE)pbData }; + CRYPT_DATA_BLOB blob = { cbData, (LPBYTE)pbData }; - /* non-streamed data messages don't allow non-final updates, - * don't bother checking whether data already exist, they can't. - */ - ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, - &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, &msg->bare_content, - &msg->bare_content_len); - } + msg->base.state = MsgStateFinalized; + /* non-streamed data messages don't allow non-final updates, + * don't bother checking whether data already exist, they can't. + */ + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, + &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, &msg->bare_content, + &msg->bare_content_len); } } return ret; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 95a0a29..de55d6b 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -394,7 +394,6 @@ static void test_data_msg_update(void) NULL); /* Starting with Vista, can update a message with no data. */ ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - todo_wine ok(ret || broken(!ret), "CryptMsgUpdate failed: %08x\n", GetLastError()); if (ret) {
1
0
0
0
Juan Lang : crypt32/tests: In more recent Windows versions, updating a data message with no content succeeds.
by Alexandre Julliard
11 Feb '11
11 Feb '11
Module: wine Branch: master Commit: 07297ea9d014468381b691624a843696e8315f53 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=07297ea9d014468381b691624…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 10 12:02:52 2011 -0800 crypt32/tests: In more recent Windows versions, updating a data message with no content succeeds. --- dlls/crypt32/tests/msg.c | 45 +++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 3834760..95a0a29 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -365,6 +365,8 @@ static BOOL WINAPI nop_stream_output(const void *pvArg, BYTE *pb, DWORD cb, return TRUE; } +static const BYTE dataEmptyBareContent[] = { 0x04,0x00 }; + static void test_data_msg_update(void) { HCRYPTMSG msg; @@ -390,20 +392,36 @@ static void test_data_msg_update(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, NULL); - /* Can't update a message with no data */ - SetLastError(0xdeadbeef); + /* Starting with Vista, can update a message with no data. */ ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - /* This test returns FALSE on XP and earlier but TRUE on Vista, so can't be tested. - * GetLastError is either E_INVALIDARG (NT) or unset (9x/Vista), so it doesn't - * make sense to test this. - */ + todo_wine + ok(ret || broken(!ret), "CryptMsgUpdate failed: %08x\n", GetLastError()); + if (ret) + { + DWORD size; - /* Curiously, a valid update will now fail as well, presumably because of - * the last (invalid, but final) update. - */ - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, - "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); + ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + if (ret) + { + LPBYTE buf = CryptMemAlloc(size); + + if (buf) + { + ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, buf, + &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(dataEmptyBareContent), + "unexpected size %d\n", size); + ok(!memcmp(buf, dataEmptyBareContent, size), + "unexpected value\n"); + } + CryptMemFree(buf); + } + } + } CryptMsgClose(msg); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, @@ -510,7 +528,6 @@ static void test_data_msg_get_param(void) CryptMsgClose(msg); } -static const BYTE dataEmptyBareContent[] = { 0x04,0x00 }; static const BYTE dataEmptyContent[] = { 0x30,0x0f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x02, 0x04,0x00 };
1
0
0
0
Juan Lang : crypt32/tests: Update a CryptMsgUpdate call to succeed on more Windows versions, and check its return value (Clang).
by Alexandre Julliard
11 Feb '11
11 Feb '11
Module: wine Branch: master Commit: 14626a7804053b7972cde8b8b6a4fb74ac1ebe7e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=14626a7804053b7972cde8b8b…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 10 12:00:40 2011 -0800 crypt32/tests: Update a CryptMsgUpdate call to succeed on more Windows versions, and check its return value (Clang). --- dlls/crypt32/tests/msg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index fc54041..3834760 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -3205,7 +3205,8 @@ static void test_msg_control(void) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); } - ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); /* or after an update. */ for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) {
1
0
0
0
Alexander Kochetkov : wineps.drv: All map modes should have inverted y-transforms.
by Alexandre Julliard
10 Feb '11
10 Feb '11
Module: wine Branch: master Commit: ecde55b7572a9b5c145d3cc3a934ddf99c267ae7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ecde55b7572a9b5c145d3cc3a…
Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Thu Feb 10 03:08:12 2011 +0300 wineps.drv: All map modes should have inverted y-transforms. --- dlls/wineps.drv/download.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 52de752..cc57ae1 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -280,17 +280,8 @@ BOOL PSDRV_WriteSetDownloadFont(PSDRV_PDEVICE *physDev) physDev->font.size.xx = ps_round(ppem * xform.eM11); physDev->font.size.xy = ps_round(ppem * xform.eM12); - physDev->font.size.yx = ps_round(ppem * xform.eM21); - physDev->font.size.yy = ps_round(ppem * xform.eM22); - - switch(GetMapMode(physDev->hdc)) - { - case MM_TEXT: - case MM_ISOTROPIC: - case MM_ANISOTROPIC: - physDev->font.size.yx *= -1; - physDev->font.size.yy *= -1; - } + physDev->font.size.yx = -ps_round(ppem * xform.eM21); + physDev->font.size.yy = -ps_round(ppem * xform.eM22); physDev->font.underlineThickness = potm->otmsUnderscoreSize; physDev->font.underlinePosition = potm->otmsUnderscorePosition;
1
0
0
0
← Newer
1
...
39
40
41
42
43
44
45
...
68
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
Results per page:
10
25
50
100
200