Juan Lang : crypt32: Fix tests on WinME.

Alexandre Julliard julliard at winehq.org
Thu Oct 16 06:07:07 CDT 2008


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

Author: Juan Lang <juan.lang at gmail.com>
Date:   Wed Oct 15 13:34:27 2008 -0700

crypt32: Fix tests on WinME.

---

 dlls/crypt32/tests/msg.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c
index f5dbec3..e8e7eb3 100644
--- a/dlls/crypt32/tests/msg.c
+++ b/dlls/crypt32/tests/msg.c
@@ -420,8 +420,10 @@ static void test_data_msg_update(void)
      &streamInfo);
     SetLastError(0xdeadbeef);
     ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE);
-    ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION,
-     "Expected STATUS_ACCESS_VIOLATION, got %x\n", GetLastError());
+    ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION ||
+     GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */),
+     "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %x\n",
+     GetLastError());
     CryptMsgClose(msg);
     /* Calling update with a valid output function succeeds, even if the data
      * exceeds the size specified in the stream info.
@@ -2028,8 +2030,10 @@ static void test_decode_msg_update(void)
     ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent),
      FALSE);
     todo_wine
-    ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION,
-     "Expected STATUS_ACCESS_VIOLATION, got %x\n", GetLastError());
+    ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION ||
+     GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */),
+     "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %x\n",
+     GetLastError());
     /* Changing the callback pointer after the fact yields the same error (so
      * the message must copy the stream info, not just store a pointer to it)
      */
@@ -2038,8 +2042,10 @@ static void test_decode_msg_update(void)
     ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent),
      FALSE);
     todo_wine
-    ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION,
-     "Expected STATUS_ACCESS_VIOLATION, got %x\n", GetLastError());
+    ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION ||
+     GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */),
+     "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %x\n",
+     GetLastError());
     CryptMsgClose(msg);
 
     /* Empty non-final updates are allowed when streaming.. */




More information about the wine-cvs mailing list