Alexandre Julliard : crypt32: Avoid casting away const from the context pointer.
Alexandre Julliard
julliard at winehq.org
Wed Jan 2 07:34:46 CST 2008
Module: wine
Branch: master
Commit: 8926dce077cb3a2b210da45381278c14c31a7513
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8926dce077cb3a2b210da45381278c14c31a7513
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jan 2 12:22:16 2008 +0100
crypt32: Avoid casting away const from the context pointer.
---
dlls/crypt32/context.c | 2 +-
dlls/crypt32/crl.c | 22 ++++++++++------------
dlls/crypt32/crypt32_private.h | 2 +-
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c
index 50fec4d..a5b749f 100644
--- a/dlls/crypt32/context.c
+++ b/dlls/crypt32/context.c
@@ -125,7 +125,7 @@ void *Context_GetLinkedContext(void *context, size_t contextSize)
contextSize);
}
-PCONTEXT_PROPERTY_LIST Context_GetProperties(void *context, size_t contextSize)
+PCONTEXT_PROPERTY_LIST Context_GetProperties(const void *context, size_t contextSize)
{
PBASE_CONTEXT ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize);
diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c
index ada06fc..9caf46d 100644
--- a/dlls/crypt32/crl.c
+++ b/dlls/crypt32/crl.c
@@ -266,10 +266,10 @@ DWORD WINAPI CertEnumCRLContextProperties(PCCRL_CONTEXT pCRLContext,
return ret;
}
-static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId,
- DWORD dwFlags, const void *pvData);
+static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId,
+ DWORD dwFlags, const void *pvData);
-static BOOL CRLContext_GetHashProp(void *context, DWORD dwPropId,
+static BOOL CRLContext_GetHashProp(PCCRL_CONTEXT context, DWORD dwPropId,
ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData,
DWORD *pcbData)
{
@@ -284,10 +284,9 @@ static BOOL CRLContext_GetHashProp(void *context, DWORD dwPropId,
return ret;
}
-static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId,
- void *pvData, DWORD *pcbData)
+static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId,
+ void *pvData, DWORD *pcbData)
{
- PCCRL_CONTEXT pCRLContext = (PCCRL_CONTEXT)context;
PCONTEXT_PROPERTY_LIST properties =
Context_GetProperties(context, sizeof(CRL_CONTEXT));
BOOL ret;
@@ -322,12 +321,12 @@ static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId,
{
case CERT_SHA1_HASH_PROP_ID:
ret = CRLContext_GetHashProp(context, dwPropId, CALG_SHA1,
- pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData,
+ context->pbCrlEncoded, context->cbCrlEncoded, pvData,
pcbData);
break;
case CERT_MD5_HASH_PROP_ID:
ret = CRLContext_GetHashProp(context, dwPropId, CALG_MD5,
- pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData,
+ context->pbCrlEncoded, context->cbCrlEncoded, pvData,
pcbData);
break;
default:
@@ -377,13 +376,13 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext,
}
break;
default:
- ret = CRLContext_GetProperty((void *)pCRLContext, dwPropId, pvData,
+ ret = CRLContext_GetProperty(pCRLContext, dwPropId, pvData,
pcbData);
}
return ret;
}
-static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId,
+static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId,
DWORD dwFlags, const void *pvData)
{
PCONTEXT_PROPERTY_LIST properties =
@@ -460,8 +459,7 @@ BOOL WINAPI CertSetCRLContextProperty(PCCRL_CONTEXT pCRLContext,
SetLastError(E_INVALIDARG);
return FALSE;
}
- ret = CRLContext_SetProperty((void *)pCRLContext, dwPropId, dwFlags,
- pvData);
+ ret = CRLContext_SetProperty(pCRLContext, dwPropId, dwFlags, pvData);
TRACE("returning %d\n", ret);
return ret;
}
diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h
index c1009d6..18384dc 100644
--- a/dlls/crypt32/crypt32_private.h
+++ b/dlls/crypt32/crypt32_private.h
@@ -317,7 +317,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.
*/
-PCONTEXT_PROPERTY_LIST Context_GetProperties(void *context, size_t contextSize);
+PCONTEXT_PROPERTY_LIST Context_GetProperties(const void *context, size_t contextSize);
void Context_AddRef(void *context, size_t contextSize);
More information about the wine-cvs
mailing list