Jacek Caban : crypt32: Get rid of no longer used contextSize argument in Context_GetProperties.
Alexandre Julliard
julliard at winehq.org
Tue Oct 8 15:41:07 CDT 2013
Module: wine
Branch: master
Commit: c6fd036b54fd1ee832ab59a96a564f1f24e4b58f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6fd036b54fd1ee832ab59a96a564f1f24e4b58f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Oct 8 16:24:19 2013 +0200
crypt32: Get rid of no longer used contextSize argument in Context_GetProperties.
---
dlls/crypt32/cert.c | 9 +++------
dlls/crypt32/context.c | 6 +++---
dlls/crypt32/crl.c | 9 +++------
dlls/crypt32/crypt32_private.h | 2 +-
dlls/crypt32/ctl.c | 8 +++-----
5 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c
index 3c60310..7c6a18c 100644
--- a/dlls/crypt32/cert.c
+++ b/dlls/crypt32/cert.c
@@ -211,8 +211,7 @@ BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext)
DWORD WINAPI CertEnumCertificateContextProperties(PCCERT_CONTEXT pCertContext,
DWORD dwPropId)
{
- CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(
- pCertContext, sizeof(CERT_CONTEXT));
+ CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(pCertContext);
DWORD ret;
TRACE("(%p, %d)\n", pCertContext, dwPropId);
@@ -264,8 +263,7 @@ static BOOL CertContext_GetProperty(void *context, DWORD dwPropId,
void *pvData, DWORD *pcbData)
{
PCCERT_CONTEXT pCertContext = context;
- CONTEXT_PROPERTY_LIST *properties =
- Context_GetProperties(context, sizeof(CERT_CONTEXT));
+ CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context);
BOOL ret;
CRYPT_DATA_BLOB blob;
@@ -515,8 +513,7 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties
static BOOL CertContext_SetProperty(void *context, DWORD dwPropId,
DWORD dwFlags, const void *pvData)
{
- CONTEXT_PROPERTY_LIST *properties =
- Context_GetProperties(context, sizeof(CERT_CONTEXT));
+ CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context);
BOOL ret;
TRACE("(%p, %d, %08x, %p)\n", context, dwPropId, dwFlags, pvData);
diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c
index d57e0bf..53fb022 100644
--- a/dlls/crypt32/context.c
+++ b/dlls/crypt32/context.c
@@ -131,7 +131,7 @@ void *Context_GetLinkedContext(void *context)
return CONTEXT_FROM_BASE_CONTEXT(baseContext->u.linked);
}
-CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context, size_t contextSize)
+CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context)
{
BASE_CONTEXT *ptr = BASE_CONTEXT_FROM_CONTEXT(context);
@@ -180,8 +180,8 @@ void Context_CopyProperties(const void *to, const void *from,
{
CONTEXT_PROPERTY_LIST *toProperties, *fromProperties;
- toProperties = Context_GetProperties(to, contextSize);
- fromProperties = Context_GetProperties(from, contextSize);
+ toProperties = Context_GetProperties(to);
+ fromProperties = Context_GetProperties(from);
assert(toProperties && fromProperties);
ContextPropertyList_Copy(toProperties, fromProperties);
}
diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c
index dc23183..e79dd4a 100644
--- a/dlls/crypt32/crl.c
+++ b/dlls/crypt32/crl.c
@@ -354,8 +354,7 @@ BOOL WINAPI CertFreeCRLContext( PCCRL_CONTEXT pCrlContext)
DWORD WINAPI CertEnumCRLContextProperties(PCCRL_CONTEXT pCRLContext,
DWORD dwPropId)
{
- CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(
- pCRLContext, sizeof(CRL_CONTEXT));
+ CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(pCRLContext);
DWORD ret;
TRACE("(%p, %d)\n", pCRLContext, dwPropId);
@@ -388,8 +387,7 @@ static BOOL CRLContext_GetHashProp(PCCRL_CONTEXT context, DWORD dwPropId,
static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId,
void *pvData, DWORD *pcbData)
{
- CONTEXT_PROPERTY_LIST *properties =
- Context_GetProperties(context, sizeof(CRL_CONTEXT));
+ CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context);
BOOL ret;
CRYPT_DATA_BLOB blob;
@@ -488,8 +486,7 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext,
static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId,
DWORD dwFlags, const void *pvData)
{
- CONTEXT_PROPERTY_LIST *properties =
- Context_GetProperties(context, sizeof(CRL_CONTEXT));
+ CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context);
BOOL ret;
TRACE("(%p, %d, %08x, %p)\n", context, dwPropId, dwFlags, pvData);
diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h
index 5a0232f..f60bfae 100644
--- a/dlls/crypt32/crypt32_private.h
+++ b/dlls/crypt32/crypt32_private.h
@@ -357,7 +357,7 @@ void Context_CopyProperties(const void *to, const void *from,
/* Returns context's properties, or the linked context's properties if context
* is a link context.
*/
-CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context, size_t contextSize) DECLSPEC_HIDDEN;
+CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context) DECLSPEC_HIDDEN;
void Context_AddRef(void *context) DECLSPEC_HIDDEN;
diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c
index bb29a71..04ec03d 100644
--- a/dlls/crypt32/ctl.c
+++ b/dlls/crypt32/ctl.c
@@ -489,8 +489,7 @@ BOOL WINAPI CertFreeCTLContext(PCCTL_CONTEXT pCTLContext)
DWORD WINAPI CertEnumCTLContextProperties(PCCTL_CONTEXT pCTLContext,
DWORD dwPropId)
{
- CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(
- pCTLContext, sizeof(CTL_CONTEXT));
+ CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(pCTLContext);
DWORD ret;
TRACE("(%p, %d)\n", pCTLContext, dwPropId);
@@ -523,8 +522,7 @@ static BOOL CTLContext_GetHashProp(PCCTL_CONTEXT context, DWORD dwPropId,
static BOOL CTLContext_GetProperty(PCCTL_CONTEXT context, DWORD dwPropId,
void *pvData, DWORD *pcbData)
{
- CONTEXT_PROPERTY_LIST *properties =
- Context_GetProperties(context, sizeof(CTL_CONTEXT));
+ CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context);
BOOL ret;
CRYPT_DATA_BLOB blob;
@@ -621,7 +619,7 @@ BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext,
static BOOL CTLContext_SetProperty(PCCTL_CONTEXT context, DWORD dwPropId,
DWORD dwFlags, const void *pvData)
{
- CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context, sizeof(CTL_CONTEXT));
+ CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context);
BOOL ret;
TRACE("(%p, %d, %08x, %p)\n", context, dwPropId, dwFlags, pvData);
More information about the wine-cvs
mailing list