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

crypt32: Get rid of no longer needed hCertStore checks.

This commit is contained in:
Jacek Caban 2013-10-21 15:59:11 +02:00 committed by Alexandre Julliard
parent e7ab43c4bb
commit 217e0119d9
4 changed files with 26 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/crypt32/cert.c
View File

@ -555,15 +555,7 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext,
ret = FALSE; ret = FALSE;
break; break;
case CERT_ACCESS_STATE_PROP_ID: case CERT_ACCESS_STATE_PROP_ID:
if (pCertContext->hCertStore) ret = CertGetStoreProperty(cert->ctx.hCertStore, dwPropId, pvData, pcbData);
ret = CertGetStoreProperty(pCertContext->hCertStore, dwPropId,
pvData, pcbData);
else
{
DWORD state = 0;
ret = CertContext_CopyParam(pvData, pcbData, &state, sizeof(state));
}
break; break;
case CERT_KEY_PROV_HANDLE_PROP_ID: case CERT_KEY_PROV_HANDLE_PROP_ID:
{ {

9
dlls/crypt32/crl.c
View File

@ -499,14 +499,7 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext,
} }
else else
{ {
if (pCRLContext->hCertStore) ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, pvData, pcbData);
ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId,
pvData, pcbData);
else
{
*(DWORD *)pvData = 0;
ret = TRUE;
}
} }
break; break;
default: default:

32
dlls/crypt32/ctl.c
View File

@ -341,26 +341,21 @@ PCCTL_CONTEXT WINAPI CertFindCTLInStore(HCERTSTORE hCertStore,
BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext)
{ {
WINECRYPT_CERTSTORE *hcs = pCtlContext->hCertStore;
ctl_t *ctl = ctl_from_ptr(pCtlContext);
BOOL ret; BOOL ret;
TRACE("(%p)\n", pCtlContext); TRACE("(%p)\n", pCtlContext);
if (!pCtlContext) if (!pCtlContext)
ret = TRUE; return TRUE;
else if (!pCtlContext->hCertStore)
ret = CertFreeCTLContext(pCtlContext);
else
{
WINECRYPT_CERTSTORE *hcs = pCtlContext->hCertStore;
ctl_t *ctl = ctl_from_ptr(pCtlContext);
if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
ret = FALSE; return FALSE;
else
ret = hcs->vtbl->ctls.delete(hcs, &ctl->base); ret = hcs->vtbl->ctls.delete(hcs, &ctl->base);
if (ret) if (ret)
ret = CertFreeCTLContext(pCtlContext); ret = CertFreeCTLContext(pCtlContext);
}
return ret; return ret;
} }
@ -621,14 +616,7 @@ BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext,
} }
else else
{ {
if (pCTLContext->hCertStore) ret = CertGetStoreProperty(pCTLContext->hCertStore, dwPropId, pvData, pcbData);
ret = CertGetStoreProperty(pCTLContext->hCertStore, dwPropId,
pvData, pcbData);
else
{
*(DWORD *)pvData = 0;
ret = TRUE;
}
} }
break; break;
default: default:

40
dlls/crypt32/store.c
View File

@ -949,24 +949,17 @@ PCCERT_CONTEXT WINAPI CertEnumCertificatesInStore(HCERTSTORE hCertStore, PCCERT_
BOOL WINAPI CertDeleteCertificateFromStore(PCCERT_CONTEXT pCertContext) BOOL WINAPI CertDeleteCertificateFromStore(PCCERT_CONTEXT pCertContext)
{ {
BOOL ret; WINECRYPT_CERTSTORE *hcs = pCertContext->hCertStore;
TRACE("(%p)\n", pCertContext); TRACE("(%p)\n", pCertContext);
if (!pCertContext) if (!pCertContext)
ret = TRUE; return TRUE;
else if (!pCertContext->hCertStore)
ret = CertFreeCertificateContext(pCertContext);
else
{
WINECRYPT_CERTSTORE *hcs = pCertContext->hCertStore;
if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
ret = FALSE; return FALSE;
else
ret = hcs->vtbl->certs.delete(hcs, &cert_from_ptr(pCertContext)->base); return hcs->vtbl->certs.delete(hcs, &cert_from_ptr(pCertContext)->base);
}
return ret;
} }
BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore,
@ -1091,25 +1084,20 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore,
BOOL WINAPI CertDeleteCRLFromStore(PCCRL_CONTEXT pCrlContext) BOOL WINAPI CertDeleteCRLFromStore(PCCRL_CONTEXT pCrlContext)
{ {
WINECRYPT_CERTSTORE *hcs = pCrlContext->hCertStore;
BOOL ret; BOOL ret;
TRACE("(%p)\n", pCrlContext); TRACE("(%p)\n", pCrlContext);
if (!pCrlContext) if (!pCrlContext)
ret = TRUE; return TRUE;
else if (!pCrlContext->hCertStore)
ret = CertFreeCRLContext(pCrlContext);
else
{
WINECRYPT_CERTSTORE *hcs = pCrlContext->hCertStore;
if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
ret = FALSE; return FALSE;
else
ret = hcs->vtbl->crls.delete(hcs, &crl_from_ptr(pCrlContext)->base); ret = hcs->vtbl->crls.delete(hcs, &crl_from_ptr(pCrlContext)->base);
if (ret) if (ret)
ret = CertFreeCRLContext(pCrlContext); ret = CertFreeCRLContext(pCrlContext);
}
return ret; return ret;
} }