Juan Lang : crypt32: Fix a couple tests on some Windows 98 systems.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 44ab73e289b8e877e3eaf8b21dff22c040a0d3e9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=44ab73e289b8e877e3eaf8b21d...

Author: Juan Lang 
Date:   Wed Feb 11 17:23:52 2009 -0800

crypt32: Fix a couple tests on some Windows 98 systems.

---

dlls/crypt32/tests/sip.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c
index 1ef23b3..372d7ce 100644
--- a/dlls/crypt32/tests/sip.c
+++ b/dlls/crypt32/tests/sip.c
@@ -238,8 +238,9 @@ static void test_SIPRetrieveSubjectGUID(void)
     ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n");
     ok ( GetLastError() == ERROR_FILE_INVALID ||
          GetLastError() == ERROR_INVALID_PARAMETER /* Vista */ ||
-         GetLastError() == ERROR_SUCCESS /* Win98 */,
-        "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER or ERROR_SUCCESS, got 0x%08x\n", GetLastError());
+         GetLastError() == ERROR_SUCCESS /* most Win98 */ ||
+         GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN /* some Win98 */,
+        "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER, ERROR_SUCCESS or TRUST_E_SUBJECT_FORM_UNKNOWN, 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, guid1));

@@ -253,8 +254,9 @@ static void test_SIPRetrieveSubjectGUID(void)
     ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject);
     ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n");
     ok ( GetLastError() == ERROR_INVALID_PARAMETER ||
-         GetLastError() == ERROR_SUCCESS /* Win98 */,
-        "Expected ERROR_INVALID_PARAMETER or ERROR_SUCCESS, got 0x%08x\n", GetLastError());
+         GetLastError() == ERROR_SUCCESS /* most Win98 */ ||
+         GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN /* some Win98 */,
+        "Expected ERROR_INVALID_PARAMETER, ERROR_SUCCESS or TRUST_E_SUBJECT_FORM_UNKNOWN, 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, guid1));