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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 09121895fda57e9c4f8ba66435abd70530442422
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=09121895fda57e9c4f8ba66435...

Author: Jacek Caban 
Date:   Tue Oct  8 16:24:44 2013 +0200

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

---

dlls/crypt32/context.c         |    3 +--
 dlls/crypt32/crypt32_private.h |    3 +--
 dlls/crypt32/ctl.c             |    9 +++------
 dlls/crypt32/store.c           |   15 ++++++---------
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c
index 83e6133..cda1f4c 100644
--- a/dlls/crypt32/context.c
+++ b/dlls/crypt32/context.c
@@ -174,8 +174,7 @@ BOOL Context_Release(void *context, ContextFreeFunc dataContextFree)
     return ret;
 }

-void Context_CopyProperties(const void *to, const void *from,
- size_t contextSize)
+void Context_CopyProperties(const void *to, const void *from)
 {
     CONTEXT_PROPERTY_LIST *toProperties, *fromProperties;

diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h
index e98bc75..d978e5c 100644
--- a/dlls/crypt32/crypt32_private.h
+++ b/dlls/crypt32/crypt32_private.h
@@ -351,8 +351,7 @@ void *Context_GetExtra(const void *context, size_t contextSize) DECLSPEC_HIDDEN;
 void *Context_GetLinkedContext(void *context) DECLSPEC_HIDDEN;

/* Copies properties from fromContext to toContext. */
-void Context_CopyProperties(const void *to, const void *from,
- size_t contextSize) DECLSPEC_HIDDEN;
+void Context_CopyProperties(const void *to, const void *from) DECLSPEC_HIDDEN;

/* Returns context's properties, or the linked context's properties if context
  * is a link context.
diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c
index 6daa53a..ce534e9 100644
--- a/dlls/crypt32/ctl.c
+++ b/dlls/crypt32/ctl.c
@@ -29,9 +29,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(crypt);

-#define CtlContext_CopyProperties(to, from) \
- Context_CopyProperties((to), (from), sizeof(CTL_CONTEXT))
-
 BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore,
  PCCTL_CONTEXT pCtlContext, DWORD dwAddDisposition,
  PCCTL_CONTEXT* ppStoreContext)
@@ -91,7 +88,7 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore,
             if (newer < 0)
             {
                 toAdd = CertDuplicateCTLContext(pCtlContext);
-                CtlContext_CopyProperties(existing, pCtlContext);
+                Context_CopyProperties(existing, pCtlContext);
             }
             else
             {
@@ -109,12 +106,12 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore,
     case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES:
         toAdd = CertDuplicateCTLContext(pCtlContext);
         if (existing)
-            CtlContext_CopyProperties(toAdd, existing);
+            Context_CopyProperties(toAdd, existing);
         break;
     case CERT_STORE_ADD_USE_EXISTING:
         if (existing)
         {
-            CtlContext_CopyProperties(existing, pCtlContext);
+            Context_CopyProperties(existing, pCtlContext);
             if (ppStoreContext)
                 *ppStoreContext = CertDuplicateCTLContext(existing);
         }
diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c
index 5e60644..9bc14de 100644
--- a/dlls/crypt32/store.c
+++ b/dlls/crypt32/store.c
@@ -877,9 +877,6 @@ HCERTSTORE WINAPI CertOpenSystemStoreW(HCRYPTPROV_LEGACY hProv,
      CERT_SYSTEM_STORE_CURRENT_USER, szSubSystemProtocol);
 }

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