Juan Lang : crypt32: Rename a couple of functions.

[Alexandre Julliard]

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

Author: Juan Lang 
Date:   Thu Sep 27 11:54:24 2007 -0700

crypt32: Rename a couple of functions.

---

dlls/crypt32/crypt32_private.h |    4 ++--
 dlls/crypt32/filestore.c       |    8 ++++----
 dlls/crypt32/object.c          |    2 +-
 dlls/crypt32/serialize.c       |    4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h
index 81a8685..533d483 100644
--- a/dlls/crypt32/crypt32_private.h
+++ b/dlls/crypt32/crypt32_private.h
@@ -269,12 +269,12 @@ const void *CRYPT_ReadSerializedElement(const BYTE *pbElement,
  DWORD cbElement, DWORD dwContextTypeFlags, DWORD *pdwContentType);

/* Writes contexts from the memory store to the file. */
-BOOL CRYPT_WriteSerializedFile(HANDLE file, HCERTSTORE store);
+BOOL CRYPT_WriteSerializedStoreToFile(HANDLE file, HCERTSTORE store);

/* Reads contexts serialized in the file into the memory store.  Returns FALSE
  * if the file is not of the expected format.
  */
-BOOL CRYPT_ReadSerializedFile(HANDLE file, HCERTSTORE store);
+BOOL CRYPT_ReadSerializedStoreFromFile(HANDLE file, HCERTSTORE store);

/* Fixes up the the pointers in info, where info is assumed to be a
  * CRYPT_KEY_PROV_INFO, followed by its container name, provider name, and any
diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c
index afe4327..df4b98d 100644
--- a/dlls/crypt32/filestore.c
+++ b/dlls/crypt32/filestore.c
@@ -39,7 +39,7 @@ static void WINAPI CRYPT_FileCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)

TRACE("(%p, %08x)\n", store, dwFlags);
     if (store->dirty)
-        CRYPT_WriteSerializedFile(store->file, store->memStore);
+        CRYPT_WriteSerializedStoreToFile(store->file, store->memStore);
     CertCloseStore(store->memStore, dwFlags);
     CloseHandle(store->file);
     CryptMemFree(store);
@@ -98,7 +98,7 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags,
     {
     case CERT_STORE_CTRL_RESYNC:
         CRYPT_EmptyStore(store->memStore);
-        CRYPT_ReadSerializedFile(store->file, store);
+        CRYPT_ReadSerializedStoreFromFile(store->file, store);
         ret = TRUE;
         break;
     case CERT_STORE_CTRL_COMMIT:
@@ -108,7 +108,7 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags,
             ret = FALSE;
         }
         else if (store->dirty)
-            ret = CRYPT_WriteSerializedFile(store->file, store->memStore);
+            ret = CRYPT_WriteSerializedStoreToFile(store->file, store->memStore);
         else
             ret = TRUE;
         break;
@@ -171,7 +171,7 @@ PWINECRYPT_CERTSTORE CRYPT_FileOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags,
          CERT_STORE_CREATE_NEW_FLAG, NULL);
         if (memStore)
         {
-            if (CRYPT_ReadSerializedFile(file, memStore))
+            if (CRYPT_ReadSerializedStoreFromFile(file, memStore))
             {
                 PWINE_FILESTOREINFO info = CryptMemAlloc(
                  sizeof(WINE_FILESTOREINFO));
diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c
index a8d4410..4184e6c 100644
--- a/dlls/crypt32/object.c
+++ b/dlls/crypt32/object.c
@@ -250,7 +250,7 @@ static BOOL CRYPT_QuerySerializedStoreObject(DWORD dwObjectType,
         HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
          CERT_STORE_CREATE_NEW_FLAG, NULL);

-        ret = CRYPT_ReadSerializedFile(file, store);
+        ret = CRYPT_ReadSerializedStoreFromFile(file, store);
         if (ret)
         {
             if (pdwMsgAndCertEncodingType)
diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c
index e45dcd0..9ef6b54 100644
--- a/dlls/crypt32/serialize.c
+++ b/dlls/crypt32/serialize.c
@@ -421,7 +421,7 @@ const void *CRYPT_ReadSerializedElement(const BYTE *pbElement, DWORD cbElement,

static const BYTE fileHeader[] = { 0, 0, 0, 0, 'C','E','R','T' };

-BOOL CRYPT_ReadSerializedFile(HANDLE file, HCERTSTORE store)
+BOOL CRYPT_ReadSerializedStoreFromFile(HANDLE file, HCERTSTORE store)
 {
     BYTE fileHeaderBuf[sizeof(fileHeader)];
     DWORD read;
@@ -565,7 +565,7 @@ static BOOL CRYPT_SerializeContextsToFile(HANDLE file,
     return ret;
 }

-BOOL CRYPT_WriteSerializedFile(HANDLE file, HCERTSTORE store)
+BOOL CRYPT_WriteSerializedStoreToFile(HANDLE file, HCERTSTORE store)
 {
     static const BYTE fileTrailer[12] = { 0 };
     WINE_CONTEXT_INTERFACE interface;