wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

James Hawkins : rasapi32: Fix several failing tests in win98.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: d82d5d665c1d21eda57e35b634f0e58c19f0dbba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82d5d665c1d21eda57e35b63… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:58:32 2008 -0500 rasapi32: Fix several failing tests in win98. --- dlls/rasapi32/tests/rasapi.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index a997e02..64d1f66 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -77,28 +77,32 @@ static void test_rasenum(void) /* test first parameter */ cb = bufsize; result = pRasEnumDevicesA(NULL, &cb, &cDevices); - ok(result == ERROR_BUFFER_TOO_SMALL, + ok(result == ERROR_BUFFER_TOO_SMALL || + result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); rasDevInfo[0].dwSize = 0; cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); todo_wine - ok(result == ERROR_INVALID_SIZE, + ok(result == ERROR_INVALID_SIZE || + result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) -1; cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); todo_wine - ok(result == ERROR_INVALID_SIZE, + ok(result == ERROR_INVALID_SIZE || + result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) +1; cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); todo_wine - ok(result == ERROR_INVALID_SIZE, + ok(result == ERROR_INVALID_SIZE || + result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); /* test second parameter */ @@ -139,14 +143,16 @@ static void test_rasenum(void) "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); result = pRasEnumDevicesA(NULL, &cb, NULL); - ok(result == ERROR_INVALID_PARAMETER, + ok(result == ERROR_INVALID_PARAMETER || + result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); cb = 0; rasDevInfo[0].dwSize = 0; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); todo_wine - ok(result == ERROR_INVALID_SIZE, + ok(result == ERROR_INVALID_SIZE || + broken(result == ERROR_BUFFER_TOO_SMALL), /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); HeapFree(GetProcessHeap(), 0, rasDevInfo);

1 0

James Hawkins : ntdll: Fix a failing test in NT4.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: b5812e00130e85088fe6d548cef97f17603a44b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5812e00130e85088fe6d548c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:57:13 2008 -0500 ntdll: Fix a failing test in NT4. --- dlls/ntdll/tests/rtlstr.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index f4304c8..f444273 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1696,12 +1696,17 @@ static void test_RtlIsTextUnicode(void) WCHAR mixed_controls[] = {'\t',0x9000,0x0d00,'\n',0}; WCHAR *be_unicode; WCHAR *be_unicode_no_controls; + BOOLEAN res; int flags; int i; ok(!pRtlIsTextUnicode(ascii, sizeof(ascii), NULL), "ASCII text detected as Unicode\n"); - ok(pRtlIsTextUnicode(unicode, sizeof(unicode), NULL), "Text should be Unicode\n"); + res = pRtlIsTextUnicode(unicode, sizeof(unicode), NULL); + ok(res || + broken(res == FALSE), /* NT4 */ + "Text should be Unicode\n"); + ok(!pRtlIsTextUnicode(unicode, sizeof(unicode) - 1, NULL), "Text should be Unicode\n"); flags = IS_TEXT_UNICODE_UNICODE_MASK;

1 0

James Hawkins : netapi32: Fix two failing tests in NT4.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: fc3019ac990955cbefe3506a5ef3af728e49c096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc3019ac990955cbefe3506a5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:54:28 2008 -0500 netapi32: Fix two failing tests in NT4. --- dlls/netapi32/tests/access.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index f8536a7..3999bdd 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -257,7 +257,9 @@ static void run_userhandling_tests(void) ok(ret == NERR_Success, "Deleting the user failed : %d\n", ret); } else - ok(ret == NERR_BadUsername, "Adding user with too long username returned 0x%08x\n", ret); + ok(ret == NERR_BadUsername || + broken(ret == NERR_PasswordTooShort), /* NT4 */ + "Adding user with too long username returned 0x%08x\n", ret); usri.usri1_name = sTestUserName; usri.usri1_password = sTooLongPassword; @@ -293,7 +295,9 @@ static void run_userhandling_tests(void) return; } - ok(ret == NERR_Success, "Adding user failed with error 0x%08x\n", ret); + ok(ret == NERR_Success || + broken(ret == NERR_PasswordTooShort), /* NT4 */ + "Adding user failed with error 0x%08x\n", ret); if(ret != NERR_Success) return;

1 0

James Hawkins : kernel32: Fix a failing test in win95.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: d6bb1d9a70e6418b3fc871187088fc33e2fae278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bb1d9a70e6418b3fc871187… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:53:53 2008 -0500 kernel32: Fix a failing test in win95. --- dlls/kernel32/tests/version.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 5371795..94b4311 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -92,7 +92,9 @@ static void test_GetVersionEx(void) SetLastError(0xdeadbeef); infoExA.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); ret = GetVersionExA((OSVERSIONINFOA *)&infoExA); - ok(ret, "Expected GetVersionExA to succeed\n"); + ok(ret || + broken(ret == 0), /* win95 */ + "Expected GetVersionExA to succeed\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); }

1 0

James Hawkins : iphlapi: Fix a failing test in win95.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 53f4e4345d2f575124f4a31403934ab024379d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f4e4345d2f575124f4a3140… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:51:37 2008 -0500 iphlapi: Fix a failing test in win95. --- dlls/iphlpapi/tests/iphlpapi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index a68ea7b..8251151 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -432,7 +432,8 @@ static void testGetTcpTable(void) "GetTcpTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); apiReturn = gGetTcpTable(NULL, &dwSize, FALSE); - ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, + ok(apiReturn == ERROR_INSUFFICIENT_BUFFER || + broken(apiReturn == ERROR_NO_DATA), /* win95 */ "GetTcpTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) {

1 0

James Hawkins : gdi32: Fix a failing test in win9x.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 5468f40ab8b720c3ff7de3ad5c15d9d5f7a001cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5468f40ab8b720c3ff7de3ad5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:50:14 2008 -0500 gdi32: Fix a failing test in win9x. --- dlls/gdi32/tests/palette.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index c9455ca..851c321 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -110,7 +110,9 @@ static void test_DIB_PAL_COLORS(void) { SetPixel( memhdc, 0, 0, setColor ); chkColor = RGB( logpalettedata[3].peRed, logpalettedata[3].peGreen, logpalettedata[3].peBlue ); getColor = GetPixel( memhdc, 0, 0 ); - ok( getColor == chkColor, "getColor=%08X\n", (UINT)getColor ); + ok( getColor == chkColor || + broken(getColor == 0), /* win9x */ + "getColor=%08X\n", (UINT)getColor ); SelectPalette( memhdc, hpalOld, FALSE ); DeleteObject( hpal );

1 0

James Hawkins : crypt32: Fix a few test failures in win9x.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 4490de3528ae762c3ea5a8808ccc8db5f8d51a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4490de3528ae762c3ea5a8808… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:48:54 2008 -0500 crypt32: Fix a few test failures in win9x. --- dlls/crypt32/tests/store.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index db1447a..b982c56 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -830,7 +830,9 @@ static void testRegStore(void) if (context) certCount++; } while (context != NULL); - ok(certCount == 1, "Expected 1 certificates, got %d\n", certCount); + ok(certCount == 1 || + broken(certCount == 2), /* win9x */ + "Expected 1 certificates, got %d\n", certCount); /* Try again with the correct hash... */ ptr = buf + sizeof(*hdr); @@ -1029,7 +1031,9 @@ static void testSystemStore(void) /* Check opening a bogus store */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, BogusW); - ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, + ok((!store || + broken(store != 0)) && /* win9x */ + GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, BogusW); @@ -1544,7 +1548,9 @@ static void testMessageStore(void) blob.pbData = (LPBYTE)hashBareContent; SetLastError(0xdeadbeef); store = CertOpenStore(CERT_STORE_PROV_PKCS7, 0, 0, 0, &blob); - ok(!store && GetLastError() == CRYPT_E_ASN1_BADTAG, + ok(!store && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_DATA_ERROR), /* win9x */ "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); }

1 0

James Hawkins : crypt32: Fix several failing tests in win9x.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 05499a41b8af064c42161fe352b1805667f80a93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05499a41b8af064c42161fe35… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:47:53 2008 -0500 crypt32: Fix several failing tests in win9x. --- dlls/crypt32/tests/message.c | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index 1072185..d515d9b 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -59,13 +59,15 @@ static void test_msg_get_signer_count(void) SetLastError(0xdeadbeef); count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, NULL, 0); ok(count == -1, "Expected -1, got %d\n", count); - ok(GetLastError() == CRYPT_E_ASN1_EOD, + ok(GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG, /* win9x */ "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, dataEmptyBareContent, sizeof(dataEmptyBareContent)); ok(count == -1, "Expected -1, got %d\n", count); - ok(GetLastError() == CRYPT_E_ASN1_BADTAG, + ok(GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_PDU_MISMATCH, /* win9x */ "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, @@ -77,11 +79,14 @@ static void test_msg_get_signer_count(void) count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, signedEmptyBareContent, sizeof(signedEmptyBareContent)); ok(count == -1, "Expected -1, got %d\n", count); - ok(GetLastError() == CRYPT_E_ASN1_BADTAG, + ok(GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_DATA_ERROR, /* win9x */ "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, signedEmptyContent, sizeof(signedEmptyContent)); - ok(count == 1, "Expected 1, got %d\n", count); + ok(count == 1 || + broken(count == -1), /* win9x */ + "Expected 1, got %d\n", count); } static BYTE detachedHashContent[] = { @@ -121,7 +126,9 @@ static void test_verify_detached_message_hash(void) SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG), /* win9x */ "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); para.dwMsgEncodingType = X509_ASN_ENCODING; SetLastError(0xdeadbeef); @@ -133,7 +140,9 @@ static void test_verify_detached_message_hash(void) SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG), /* win9x */ "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); /* Curiously, passing no data to hash succeeds.. */ ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, @@ -282,7 +291,9 @@ static void test_verify_message_signature(void) para.cbSize = sizeof(para); SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, NULL, 0, NULL, 0, NULL); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG), /* win9x */ "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); /* Check whether cert is set on error */ cert = (PCCERT_CONTEXT)0xdeadbeef; @@ -296,7 +307,8 @@ static void test_verify_message_signature(void) SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, dataEmptyBareContent, sizeof(dataEmptyBareContent), NULL, 0, NULL); - ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + ok(GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_PDU_MISMATCH, /* win9x */ "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, dataEmptyContent, @@ -306,17 +318,23 @@ static void test_verify_message_signature(void) SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, signedEmptyBareContent, sizeof(signedEmptyBareContent), NULL, 0, NULL); - ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_DATA_ERROR), /* win9x */ "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, signedEmptyContent, sizeof(signedEmptyContent), NULL, 0, NULL); - ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + ok(!ret && + (GetLastError() == CRYPT_E_NOT_FOUND || + GetLastError() == OSS_DATA_ERROR), /* win9x */ "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, signedContent, sizeof(signedContent), NULL, 0, NULL); - ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + ok(!ret && + (GetLastError() == CRYPT_E_NOT_FOUND || + GetLastError() == OSS_DATA_ERROR), /* win9x */ "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); /* FIXME: Windows fails with CRYPT_E_NOT_FOUND for these messages, but * their signer certs have invalid public keys that fail to decode. In

1 0

James Hawkins : crypt32: Fix several test failures in win9x.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 12330b433efb99b7c002516d3ff53d83e270ffe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12330b433efb99b7c002516d3… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:46:44 2008 -0500 crypt32: Fix several test failures in win9x. --- dlls/crypt32/tests/ctl.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index 168b05d..f92760c 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -117,13 +117,17 @@ static void testCreateCTL(void) "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, NULL, 0); - ok(!ctl && GetLastError() == ERROR_INVALID_DATA, + ok(!ctl && + (GetLastError() == ERROR_INVALID_DATA || + GetLastError() == OSS_MORE_INPUT), /* win9x */ "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); /* An empty CTL can't be created.. */ SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, emptyCTL, sizeof(emptyCTL)); - ok(!ctl && GetLastError() == ERROR_INVALID_DATA, + ok(!ctl && + (GetLastError() == ERROR_INVALID_DATA || + GetLastError() == OSS_DATA_ERROR), /* win9x */ "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); /* Nor can any of these "signed" CTLs whose inner content OID isn't @@ -131,19 +135,25 @@ static void testCreateCTL(void) */ SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTL, sizeof(signedCTL)); - ok(!ctl && GetLastError() == ERROR_INVALID_DATA, + ok(!ctl && + (GetLastError() == ERROR_INVALID_DATA || + GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE), /* win9x */ "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, ctlWithOneEntry, sizeof(ctlWithOneEntry)); - ok(!ctl && GetLastError() == ERROR_INVALID_DATA, + ok(!ctl && + (GetLastError() == ERROR_INVALID_DATA || + GetLastError() == OSS_DATA_ERROR), /* win9x */ "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTLWithSubjectAlgorithm, sizeof(signedCTLWithSubjectAlgorithm)); - ok(!ctl && GetLastError() == ERROR_INVALID_DATA, + ok(!ctl && + (GetLastError() == ERROR_INVALID_DATA || + GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE), /* win9x */ "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); /* This signed CTL with the appropriate inner content type can be decoded. @@ -349,7 +359,9 @@ static void testAddCTLToStore(void) signedCTLWithCTLInnerContentAndBadSig, sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_NEW, NULL); - ok(!ret && GetLastError() == CRYPT_E_EXISTS, + ok(!ret && + (GetLastError() == CRYPT_E_EXISTS || + GetLastError() == CRYPT_E_NOT_FOUND), /* win9x */ "expected CRYPT_E_EXISTS, got %08x\n", GetLastError()); CertCloseStore(store, 0);

1 0

James Hawkins : crypt32: Fix several failing tests in win9x.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 094545079cfd4b8c9d0f8a2a93b5a0012d308b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094545079cfd4b8c9d0f8a2a9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Sep 2 22:46:01 2008 -0500 crypt32: Fix several failing tests in win9x. --- dlls/crypt32/tests/cert.c | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index cd0808a..b4f8760 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -513,7 +513,8 @@ static void testCertProperties(void) CERT_SIGNATURE_HASH_PROP_ID, NULL, &size); ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == CRYPT_E_NOT_FOUND), + GetLastError() == CRYPT_E_NOT_FOUND || + GetLastError() == OSS_DATA_ERROR), /* win9x */ "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); /* Test key contexts and handles and such */ @@ -1815,7 +1816,9 @@ static void testSignAndEncodeCert(void) */ ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, &algID, NULL, NULL, &size); - ok(!ret && GetLastError() == NTE_BAD_ALGID, + ok(!ret && + (GetLastError() == NTE_BAD_ALGID || + GetLastError() == OSS_BAD_PTR), /* win9x */ "Expected NTE_BAD_ALGID, got %08x\n", GetLastError()); algID.pszObjId = oid_rsa_md5rsa; ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, @@ -2625,19 +2628,25 @@ static void testHashToBeSigned(void) "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, NULL, 0, NULL, &size); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG), /* win9x */ "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); /* Can't sign anything: has to be asn.1 encoded, at least */ SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, int1, sizeof(int1), NULL, &size); - ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_MORE_INPUT), /* win9x */ "expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); /* Can't be empty, either */ SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, emptyCert, sizeof(emptyCert), NULL, &size); - ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_CORRUPT || + GetLastError() == OSS_DATA_ERROR), /* win9x */ "expected CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); /* Signing a cert works */ ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, md5SignedEmptyCert, @@ -3021,7 +3030,9 @@ static void testGetPublicKeyLength(void) ret, GetLastError()); SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_EOD, + ok(ret == 0 && + (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG), /* win9x */ "Expected length 0 and CRYPT_E_ASN1_EOD, got length %d, %08x\n", ret, GetLastError()); /* With a nearly-empty public key info */ @@ -3033,7 +3044,9 @@ static void testGetPublicKeyLength(void) ret, GetLastError()); SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_EOD, + ok(ret == 0 && + (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG), /* win9x */ "Expected length 0 and CRYPT_E_ASN1_EOD, got length %d, %08x\n", ret, GetLastError()); /* With a bogus key */ @@ -3046,7 +3059,9 @@ static void testGetPublicKeyLength(void) ret, GetLastError()); SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_BADTAG, + ok(ret == 0 && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_PDU_MISMATCH), /* win9x */ "Expected length 0 and CRYPT_E_ASN1_BADTAGTAG, got length %d, %08x\n", ret, GetLastError()); /* With a believable RSA key but a bogus OID */ @@ -3065,7 +3080,9 @@ static void testGetPublicKeyLength(void) info.Algorithm.pszObjId = oid_rsa_dh; SetLastError(0xdeadbeef); ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); - ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_BADTAG, + ok(ret == 0 && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == E_INVALIDARG), /* win9x */ "Expected length 0 and CRYPT_E_ASN1_BADTAG, got length %d, %08x\n", ret, GetLastError()); /* With the RSA OID */

1 0

Jump to page:

2025

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 September 2008