ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Rename a couple of functions.

This commit is contained in:
Juan Lang 2007-09-27 11:54:24 -07:00 committed by Alexandre Julliard
parent 36886f7dd1
commit bc81929519
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/crypt32/crypt32_private.h
View File

@ -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

8
dlls/crypt32/filestore.c
View File

@ -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));

2
dlls/crypt32/object.c
View File

@ -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)

4
dlls/crypt32/serialize.c
View File

@ -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;