ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Juan Lang 2008-10-29 13:49:17 -07:00 committed by Alexandre Julliard
parent 003392b545
commit 97cfb3adfe
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/crypt32/tests/chain.c
View File

@ -1167,12 +1167,19 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected,
const CERT_TRUST_STATUS *got, const CERT_TRUST_STATUS *ignore, const CERT_TRUST_STATUS *got, const CERT_TRUST_STATUS *ignore,
DWORD todo, DWORD testIndex, DWORD chainIndex, DWORD elementIndex) DWORD todo, DWORD testIndex, DWORD chainIndex, DWORD elementIndex)
{ {
if (todo & TODO_ERROR && got->dwErrorStatus != expected->dwErrorStatus) if (got->dwErrorStatus == expected->dwErrorStatus)
todo_wine
ok(got->dwErrorStatus == expected->dwErrorStatus, ok(got->dwErrorStatus == expected->dwErrorStatus,
"Chain %d, element [%d,%d]: expected error %08x, got %08x\n", "Chain %d, element [%d,%d]: expected error %08x, got %08x\n",
testIndex, chainIndex, elementIndex, expected->dwErrorStatus, testIndex, chainIndex, elementIndex, expected->dwErrorStatus,
got->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 else
ok(got->dwErrorStatus == expected->dwErrorStatus || ok(got->dwErrorStatus == expected->dwErrorStatus ||
broken((got->dwErrorStatus & ~ignore->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", "Chain %d, element [%d,%d]: expected error %08x, got %08x\n",
testIndex, chainIndex, elementIndex, expected->dwErrorStatus, testIndex, chainIndex, elementIndex, expected->dwErrorStatus,
got->dwErrorStatus); got->dwErrorStatus);
if (todo & TODO_INFO && got->dwInfoStatus != expected->dwInfoStatus) if (got->dwInfoStatus == expected->dwInfoStatus)
todo_wine
ok(got->dwInfoStatus == expected->dwInfoStatus, ok(got->dwInfoStatus == expected->dwInfoStatus,
"Chain %d, element [%d,%d]: expected info %08x, got %08x\n", "Chain %d, element [%d,%d]: expected info %08x, got %08x\n",
testIndex, chainIndex, elementIndex, expected->dwInfoStatus, testIndex, chainIndex, elementIndex, expected->dwInfoStatus,
got->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 else
ok(got->dwInfoStatus == expected->dwInfoStatus || ok(got->dwInfoStatus == expected->dwInfoStatus ||
broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == broken((got->dwInfoStatus & ~ignore->dwInfoStatus) ==