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

crypt32: Allow imprecision of one millisecond in time decoding to fix test failures on Windows.

This commit is contained in:
Juan Lang 2007-10-10 14:40:20 -07:00 committed by Alexandre Julliard
parent 076340402d
commit e6dbb9d203
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/crypt32/tests/encode.c
View File

@ -482,17 +482,31 @@ static const char *printFileTime(const FILETIME *ft)
return buf; return buf;
} }
static void compareTime(const SYSTEMTIME *expected, const FILETIME *got)
{
SYSTEMTIME st;
FileTimeToSystemTime(got, &st);
ok(expected->wYear == st.wYear &&
expected->wMonth == st.wMonth &&
expected->wDay == st.wDay &&
expected->wHour == st.wHour &&
expected->wMinute == st.wMinute &&
expected->wSecond == st.wSecond &&
abs(expected->wMilliseconds - st.wMilliseconds) <= 1,
"Got unexpected value for time decoding:\nexpected %s, got %s\n",
printSystemTime(expected), printFileTime(got));
}
static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType,
const struct encodedFiletime *time) const struct encodedFiletime *time)
{ {
FILETIME ft1 = { 0 }, ft2 = { 0 }; FILETIME ft = { 0 };
DWORD size = sizeof(ft2); DWORD size = sizeof(ft);
BOOL ret; BOOL ret;
ret = SystemTimeToFileTime(&time->sysTime, &ft1);
ok(ret, "SystemTimeToFileTime failed: %d\n", GetLastError());
ret = CryptDecodeObjectEx(dwEncoding, structType, time->encodedTime, ret = CryptDecodeObjectEx(dwEncoding, structType, time->encodedTime,
time->encodedTime[1] + 2, 0, NULL, &ft2, &size); time->encodedTime[1] + 2, 0, NULL, &ft, &size);
/* years other than 1950-2050 are not allowed for encodings other than /* years other than 1950-2050 are not allowed for encodings other than
* X509_CHOICE_OF_TIME. * X509_CHOICE_OF_TIME.
*/ */
@ -501,9 +515,7 @@ static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType,
{ {
ok(ret, "CryptDecodeObjectEx failed: %d (0x%08x)\n", GetLastError(), ok(ret, "CryptDecodeObjectEx failed: %d (0x%08x)\n", GetLastError(),
GetLastError()); GetLastError());
ok(!memcmp(&ft1, &ft2, sizeof(ft1)), compareTime(&time->sysTime, &ft);
"Got unexpected value for time decoding:\nexpected %s, got %s\n",
printSystemTime(&time->sysTime), printFileTime(&ft2));
} }
else else
ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG,