Juan Lang : crypt32: Don' t neglect status to ignore on a Windows platform when a test is todo_wine.

[Alexandre Julliard]

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

Author: Juan Lang <juan.lang(a)gmail.com>
Date:   Wed Oct 29 13:49:17 2008 -0700

crypt32: Don't neglect status to ignore on a Windows platform when a test is todo_wine.

---

 dlls/crypt32/tests/chain.c |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c
index 7c13878..c583ed4 100644
--- a/dlls/crypt32/tests/chain.c
+++ b/dlls/crypt32/tests/chain.c
@@ -1167,12 +1167,19 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected,
  const CERT_TRUST_STATUS *got, const CERT_TRUST_STATUS *ignore,
  DWORD todo, DWORD testIndex, DWORD chainIndex, DWORD elementIndex)
 {
-    if (todo & TODO_ERROR && got->dwErrorStatus != expected->dwErrorStatus)
-        todo_wine
+    if (got->dwErrorStatus == expected->dwErrorStatus)
         ok(got->dwErrorStatus == expected->dwErrorStatus,
          "Chain %d, element [%d,%d]: expected error %08x, got %08x\n",
          testIndex, chainIndex, elementIndex, expected->dwErrorStatus,
          got->dwErrorStatus);
+    else if (todo & TODO_ERROR)
+        todo_wine
+        ok(got->dwErrorStatus == expected->dwErrorStatus ||
+         broken((got->dwErrorStatus & ~ignore->dwErrorStatus) ==
+         expected->dwErrorStatus),
+         "Chain %d, element [%d,%d]: expected error %08x, got %08x\n",
+         testIndex, chainIndex, elementIndex, expected->dwErrorStatus,
+         got->dwErrorStatus);
     else
         ok(got->dwErrorStatus == expected->dwErrorStatus ||
          broken((got->dwErrorStatus & ~ignore->dwErrorStatus) ==
@@ -1180,12 +1187,19 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected,
          "Chain %d, element [%d,%d]: expected error %08x, got %08x\n",
          testIndex, chainIndex, elementIndex, expected->dwErrorStatus,
          got->dwErrorStatus);
-    if (todo & TODO_INFO && got->dwInfoStatus != expected->dwInfoStatus)
-        todo_wine
+    if (got->dwInfoStatus == expected->dwInfoStatus)
         ok(got->dwInfoStatus == expected->dwInfoStatus,
          "Chain %d, element [%d,%d]: expected info %08x, got %08x\n",
          testIndex, chainIndex, elementIndex, expected->dwInfoStatus,
          got->dwInfoStatus);
+    else if (todo & TODO_INFO)
+        todo_wine
+        ok(got->dwInfoStatus == expected->dwInfoStatus ||
+         broken((got->dwInfoStatus & ~ignore->dwInfoStatus) ==
+         expected->dwInfoStatus),
+         "Chain %d, element [%d,%d]: expected info %08x, got %08x\n",
+         testIndex, chainIndex, elementIndex, expected->dwInfoStatus,
+         got->dwInfoStatus);
     else
         ok(got->dwInfoStatus == expected->dwInfoStatus ||
          broken((got->dwInfoStatus & ~ignore->dwInfoStatus) ==