marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Get rid of no longer used contextSize argument in Context_CopyProperties.

oldstable
Jacek Caban 2013-10-08 16:24:44 +02:00 committed by Alexandre Julliard
parent c1fa23ac5d
commit 09121895fd
4 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/crypt32/context.c
View File

@ -174,8 +174,7 @@ BOOL Context_Release(void *context, ContextFreeFunc dataContextFree)
return ret; return ret;
} }
void Context_CopyProperties(const void *to, const void *from, void Context_CopyProperties(const void *to, const void *from)
size_t contextSize)
{ {
CONTEXT_PROPERTY_LIST *toProperties, *fromProperties; CONTEXT_PROPERTY_LIST *toProperties, *fromProperties;

3
dlls/crypt32/crypt32_private.h
View File

@ -351,8 +351,7 @@ void *Context_GetExtra(const void *context, size_t contextSize) DECLSPEC_HIDDEN;
void *Context_GetLinkedContext(void *context) DECLSPEC_HIDDEN; void *Context_GetLinkedContext(void *context) DECLSPEC_HIDDEN;
/* Copies properties from fromContext to toContext. */ /* Copies properties from fromContext to toContext. */
void Context_CopyProperties(const void *to, const void *from, void Context_CopyProperties(const void *to, const void *from) DECLSPEC_HIDDEN;
size_t contextSize) DECLSPEC_HIDDEN;
/* Returns context's properties, or the linked context's properties if context /* Returns context's properties, or the linked context's properties if context
* is a link context. * is a link context.

9
dlls/crypt32/ctl.c
View File

@ -29,9 +29,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(crypt); WINE_DEFAULT_DEBUG_CHANNEL(crypt);
#define CtlContext_CopyProperties(to, from) \
Context_CopyProperties((to), (from), sizeof(CTL_CONTEXT))
BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore,
PCCTL_CONTEXT pCtlContext, DWORD dwAddDisposition, PCCTL_CONTEXT pCtlContext, DWORD dwAddDisposition,
PCCTL_CONTEXT* ppStoreContext) PCCTL_CONTEXT* ppStoreContext)
@ -91,7 +88,7 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore,
if (newer < 0) if (newer < 0)
{ {
toAdd = CertDuplicateCTLContext(pCtlContext); toAdd = CertDuplicateCTLContext(pCtlContext);
CtlContext_CopyProperties(existing, pCtlContext); Context_CopyProperties(existing, pCtlContext);
} }
else else
{ {
@ -109,12 +106,12 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore,
case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES:
toAdd = CertDuplicateCTLContext(pCtlContext); toAdd = CertDuplicateCTLContext(pCtlContext);
if (existing) if (existing)
CtlContext_CopyProperties(toAdd, existing); Context_CopyProperties(toAdd, existing);
break; break;
case CERT_STORE_ADD_USE_EXISTING: case CERT_STORE_ADD_USE_EXISTING:
if (existing) if (existing)
{ {
CtlContext_CopyProperties(existing, pCtlContext); Context_CopyProperties(existing, pCtlContext);
if (ppStoreContext) if (ppStoreContext)
*ppStoreContext = CertDuplicateCTLContext(existing); *ppStoreContext = CertDuplicateCTLContext(existing);
} }

15
dlls/crypt32/store.c
View File

@ -877,9 +877,6 @@ HCERTSTORE WINAPI CertOpenSystemStoreW(HCRYPTPROV_LEGACY hProv,
CERT_SYSTEM_STORE_CURRENT_USER, szSubSystemProtocol); CERT_SYSTEM_STORE_CURRENT_USER, szSubSystemProtocol);
} }
#define CertContext_CopyProperties(to, from) \
Context_CopyProperties((to), (from), sizeof(CERT_CONTEXT))
BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore,
PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition,
PCCERT_CONTEXT *ppStoreContext) PCCERT_CONTEXT *ppStoreContext)
@ -944,12 +941,12 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore,
case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES:
toAdd = CertDuplicateCertificateContext(pCertContext); toAdd = CertDuplicateCertificateContext(pCertContext);
if (existing) if (existing)
CertContext_CopyProperties(toAdd, existing); Context_CopyProperties(toAdd, existing);
break; break;
case CERT_STORE_ADD_USE_EXISTING: case CERT_STORE_ADD_USE_EXISTING:
if (existing) if (existing)
{ {
CertContext_CopyProperties(existing, pCertContext); Context_CopyProperties(existing, pCertContext);
if (ppStoreContext) if (ppStoreContext)
*ppStoreContext = CertDuplicateCertificateContext(existing); *ppStoreContext = CertDuplicateCertificateContext(existing);
} }
@ -985,7 +982,7 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore,
else else
{ {
toAdd = CertDuplicateCertificateContext(pCertContext); toAdd = CertDuplicateCertificateContext(pCertContext);
CertContext_CopyProperties(toAdd, existing); Context_CopyProperties(toAdd, existing);
} }
} }
else else
@ -1116,7 +1113,7 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore,
if (newer < 0) if (newer < 0)
{ {
toAdd = CertDuplicateCRLContext(pCrlContext); toAdd = CertDuplicateCRLContext(pCrlContext);
CrlContext_CopyProperties(toAdd, existing); Context_CopyProperties(toAdd, existing);
} }
else else
{ {
@ -1134,12 +1131,12 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore,
case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES:
toAdd = CertDuplicateCRLContext(pCrlContext); toAdd = CertDuplicateCRLContext(pCrlContext);
if (existing) if (existing)
CrlContext_CopyProperties(toAdd, existing); Context_CopyProperties(toAdd, existing);
break; break;
case CERT_STORE_ADD_USE_EXISTING: case CERT_STORE_ADD_USE_EXISTING:
if (existing) if (existing)
{ {
CrlContext_CopyProperties(existing, pCrlContext); Context_CopyProperties(existing, pCrlContext);
if (ppStoreContext) if (ppStoreContext)
*ppStoreContext = CertDuplicateCRLContext(existing); *ppStoreContext = CertDuplicateCRLContext(existing);
} }