From 74edf133e040a4ed9abd5be0b2ee17abd0c7bc03 Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Thu, 14 Jun 2007 08:32:31 +0200 Subject: [PATCH] crypt32/tests: Vista uses a different error code. --- dlls/crypt32/tests/sip.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 22a7b9ecd49..cce058e9f65 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -210,8 +210,9 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); ok ( GetLastError() == ERROR_FILE_INVALID || - GetLastError() == S_OK /* Win98 */, - "Expected ERROR_FILE_INVALID or S_OK, got 0x%08x\n", GetLastError()); + GetLastError() == ERROR_INVALID_PARAMETER /* Vista */ || + GetLastError() == ERROR_SUCCESS /* Win98 */, + "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject)); @@ -225,8 +226,8 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); ok ( GetLastError() == ERROR_INVALID_PARAMETER || - GetLastError() == S_OK /* Win98 */, - "Expected ERROR_INVALID_PARAMETER or S_OK, got 0x%08x\n", GetLastError()); + GetLastError() == ERROR_SUCCESS /* Win98 */, + "Expected ERROR_INVALID_PARAMETER or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject)); @@ -240,8 +241,8 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN || - GetLastError() == S_OK /* Win98 */, - "Expected TRUST_E_SUBJECT_FORM_UNKNOWN or S_OK, got 0x%08x\n", GetLastError()); + GetLastError() == ERROR_SUCCESS /* Win98 */, + "Expected TRUST_E_SUBJECT_FORM_UNKNOWN or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject));