Juan Lang : crypt32: Fix a regression in chain tests.

Alexandre Julliard julliard at winehq.org
Mon Feb 9 10:29:12 CST 2009


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

Author: Juan Lang <juan.lang at gmail.com>
Date:   Fri Feb  6 09:43:33 2009 -0800

crypt32: Fix a regression in chain tests.

Relaxing the tests on older versions of Windows caused a couple tests
to fail on more recent ones, which was unintended.

---

 dlls/crypt32/tests/chain.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c
index aabea27..9fd32f5 100644
--- a/dlls/crypt32/tests/chain.c
+++ b/dlls/crypt32/tests/chain.c
@@ -1183,7 +1183,7 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected,
     else
         ok(got->dwErrorStatus == expected->dwErrorStatus ||
          broken((got->dwErrorStatus & ~ignore->dwErrorStatus) ==
-         expected->dwErrorStatus),
+         (expected->dwErrorStatus & ~ignore->dwErrorStatus)),
          "Chain %d, element [%d,%d]: expected error %08x, got %08x\n",
          testIndex, chainIndex, elementIndex, expected->dwErrorStatus,
          got->dwErrorStatus);
@@ -1258,7 +1258,8 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain,
          chainStatus->status.dwErrorStatus ||
          broken((chain->TrustStatus.dwErrorStatus &
          ~chainStatus->statusToIgnore.dwErrorStatus) ==
-         chainStatus->status.dwErrorStatus),
+         (chainStatus->status.dwErrorStatus &
+         ~chainStatus->statusToIgnore.dwErrorStatus)),
          "Chain %d: expected error %08x, got %08x\n",
          testIndex, chainStatus->status.dwErrorStatus,
          chain->TrustStatus.dwErrorStatus);




More information about the wine-cvs mailing list