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

crypt32/tests: Improve granularity of testing a store's serialized form.

Browse Source
This commit is contained in:
Juan Lang 2010-05-24 14:15:34 -07:00 committed by Alexandre Julliard
parent b4d895b3d2
commit d0b7cc5bb9
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/crypt32/tests/store.c
View File

@ -2064,21 +2064,32 @@ static void testAddSerialized(void)
} }
static void compareStore(HCERTSTORE store, LPCSTR name, const BYTE *pb, static void compareStore(HCERTSTORE store, LPCSTR name, const BYTE *pb,
DWORD cb) DWORD cb, BOOL todo)
{ {
BOOL ret; BOOL ret;
CRYPT_DATA_BLOB blob = { 0, NULL }; CRYPT_DATA_BLOB blob = { 0, NULL };
ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE, ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE,
CERT_STORE_SAVE_TO_MEMORY, &blob, 0); CERT_STORE_SAVE_TO_MEMORY, &blob, 0);
ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb, ok(ret, "CertSaveStore failed: %08x\n", GetLastError());
blob.cbData); if (todo)
todo_wine
ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb,
blob.cbData);
else
ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb,
blob.cbData);
blob.pbData = HeapAlloc(GetProcessHeap(), 0, blob.cbData); blob.pbData = HeapAlloc(GetProcessHeap(), 0, blob.cbData);
if (blob.pbData) if (blob.pbData)
{ {
ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE, ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE,
CERT_STORE_SAVE_TO_MEMORY, &blob, 0); CERT_STORE_SAVE_TO_MEMORY, &blob, 0);
ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name); ok(ret, "CertSaveStore failed: %08x\n", GetLastError());
if (todo)
todo_wine
ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name);
else
ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name);
HeapFree(GetProcessHeap(), 0, blob.pbData); HeapFree(GetProcessHeap(), 0, blob.pbData);
} }
} }
@ -2330,7 +2341,7 @@ static void testAddCertificateLink(void)
CertFreeCertificateContext(linked); CertFreeCertificateContext(linked);
compareStore(store2, "file store -> file store", compareStore(store2, "file store -> file store",
serializedStoreWithCertWithFriendlyName, serializedStoreWithCertWithFriendlyName,
sizeof(serializedStoreWithCertWithFriendlyName)); sizeof(serializedStoreWithCertWithFriendlyName), FALSE);
} }
CertCloseStore(store2, 0); CertCloseStore(store2, 0);
DeleteFileW(filename2); DeleteFileW(filename2);
@ -2380,10 +2391,9 @@ static void testAddCertificateLink(void)
ok(linked->hCertStore == store2, "unexpected store"); ok(linked->hCertStore == store2, "unexpected store");
ret = pCertControlStore(store2, 0, CERT_STORE_CTRL_COMMIT, NULL); ret = pCertControlStore(store2, 0, CERT_STORE_CTRL_COMMIT, NULL);
ok(ret, "CertControlStore failed: %d\n", ret); ok(ret, "CertControlStore failed: %d\n", ret);
todo_wine
compareStore(store2, "file store -> system store", compareStore(store2, "file store -> system store",
serializedStoreWithCertAndHash, serializedStoreWithCertAndHash,
sizeof(serializedStoreWithCertAndHash)); sizeof(serializedStoreWithCertAndHash), TRUE);
CertFreeCertificateContext(linked); CertFreeCertificateContext(linked);
} }