crypt32(4/11): Use public APIs to empty a store
Juan Lang
juan.lang at gmail.com
Thu Aug 16 13:02:10 CDT 2007
--Juan
-------------- next part --------------
From 05e728dd7ff334016cc176ab8e442f8cdc3be71a Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang at gmail.com>
Date: Thu, 16 Aug 2007 10:43:35 -0700
Subject: [PATCH] Use public APIs to empty a store
---
dlls/crypt32/store.c | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c
index 07b5448..14a6631 100644
--- a/dlls/crypt32/store.c
+++ b/dlls/crypt32/store.c
@@ -317,10 +317,21 @@ static BOOL CRYPT_MemDeleteCrl(PWINECRYP
return TRUE;
}
-static void CRYPT_MemEmptyStore(PWINE_MEMSTORE store)
+static void CRYPT_EmptyStore(HCERTSTORE store)
{
- ContextList_Empty(store->certs);
- ContextList_Empty(store->crls);
+ PCCERT_CONTEXT cert;
+ PCCRL_CONTEXT crl;
+
+ do {
+ cert = CertEnumCertificatesInStore(store, NULL);
+ if (cert)
+ CertDeleteCertificateFromStore(cert);
+ } while (cert);
+ do {
+ crl = CertEnumCRLsInStore(store, NULL);
+ if (crl)
+ CertDeleteCRLFromStore(crl);
+ } while (crl);
}
static void WINAPI CRYPT_MemCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)
@@ -1359,7 +1370,7 @@ static BOOL WINAPI CRYPT_RegControl(HCER
{
case CERT_STORE_CTRL_RESYNC:
CRYPT_RegFlushStore(store, FALSE);
- CRYPT_MemEmptyStore((PWINE_MEMSTORE)store->memStore);
+ CRYPT_EmptyStore(store->memStore);
CRYPT_RegReadFromReg(store);
ret = TRUE;
break;
@@ -1758,7 +1769,7 @@ static BOOL WINAPI CRYPT_FileControl(HCE
switch (dwCtrlType)
{
case CERT_STORE_CTRL_RESYNC:
- CRYPT_MemEmptyStore((PWINE_MEMSTORE)store->memStore);
+ CRYPT_EmptyStore(store->memStore);
CRYPT_ReadSerializedFile(store->file, store);
ret = TRUE;
break;
--
1.4.1
More information about the wine-patches
mailing list