wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Vincent Povirk : ole32: Add and use a destroyDirEntry function for deleting directory entries.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 29c5ba5a778964ee2dedaaf450b46af381a6a85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c5ba5a778964ee2dedaaf45… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 2 12:25:46 2009 -0600 ole32: Add and use a destroyDirEntry function for deleting directory entries. We need this so we can free any related resources in memory. --- dlls/ole32/storage32.c | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3af5157..e4b933e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -183,6 +183,10 @@ static HRESULT createDirEntry( const StgProperty *newData, ULONG *index); +static HRESULT destroyDirEntry( + StorageImpl *storage, + ULONG index); + static void updatePropertyChain( StorageBaseImpl *storage, ULONG newPropertyIndex, @@ -1257,6 +1261,27 @@ static HRESULT createDirEntry( return hr; } +/*************************************************************************** + * + * Internal Method + * + * Mark a directory entry in the file as free. + */ +static HRESULT destroyDirEntry( + StorageImpl *storage, + ULONG index) +{ + HRESULT hr; + BYTE emptyData[PROPSET_BLOCK_SIZE]; + + memset(&emptyData, 0, PROPSET_BLOCK_SIZE); + + hr = StorageImpl_WriteRawDirEntry(storage, index, emptyData); + + return hr; +} + + /**************************************************************************** * * Internal Method @@ -1802,13 +1827,11 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( foundPropertyIndexToDelete); /* - * Invalidate the property by zeroing its name member. + * Invalidate the property */ - propertyToDelete.sizeOfNameString = 0; - - StorageImpl_WriteProperty(This->ancestorStorage, - foundPropertyIndexToDelete, - &propertyToDelete); + if (SUCCEEDED(hr)) + destroyDirEntry(This->ancestorStorage, + foundPropertyIndexToDelete); return hr; }

1 0

Vincent Povirk : ole32: Remove uses of This->base. ancestorStorage in createDirEntry.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 4e4810f2c55a561b048734beedcb7d4483e7b457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4810f2c55a561b048734bee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 15:01:32 2009 -0500 ole32: Remove uses of This->base.ancestorStorage in createDirEntry. --- dlls/ole32/storage32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 66cbf92..68ca23a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1166,7 +1166,7 @@ static HRESULT createDirEntry( do { - hr = StorageImpl_ReadRawDirEntry(storage->base.ancestorStorage, + hr = StorageImpl_ReadRawDirEntry(storage, currentPropertyIndex, currentData); @@ -1211,7 +1211,7 @@ static HRESULT createDirEntry( * obtain the new count of property blocks */ blockCount = BlockChainStream_GetCount( - storage->base.ancestorStorage->rootBlockChain)+1; + storage->rootBlockChain)+1; /* * initialize the size used by the property stream @@ -1222,7 +1222,7 @@ static HRESULT createDirEntry( /* * add a property block to the property chain */ - BlockChainStream_SetSize(storage->base.ancestorStorage->rootBlockChain, newSize); + BlockChainStream_SetSize(storage->rootBlockChain, newSize); /* * memset the empty property in order to initialize the unused newly @@ -1241,7 +1241,7 @@ static HRESULT createDirEntry( propertyIndex++) { StorageImpl_WriteRawDirEntry( - storage->base.ancestorStorage, + storage, propertyIndex, emptyData); }

1 0

Vincent Povirk : ole32: Rename StorageImpl_SetStateBits to StorageBaseImpl_SetStateBits.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 7973904d56b8e9704462da339f5fb794d5a8e419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7973904d56b8e9704462da339… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 14:56:19 2009 -0500 ole32: Rename StorageImpl_SetStateBits to StorageBaseImpl_SetStateBits. --- dlls/ole32/storage32.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c7aca84..66cbf92 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2119,13 +2119,13 @@ static HRESULT WINAPI StorageBaseImpl_SetElementTimes( /****************************************************************************** * SetStateBits (IStorage) */ -static HRESULT WINAPI StorageImpl_SetStateBits( +static HRESULT WINAPI StorageBaseImpl_SetStateBits( IStorage* iface, DWORD grfStateBits,/* [in] */ DWORD grfMask) /* [in] */ { - StorageImpl* const This = (StorageImpl*)iface; - This->base.stateBits = (This->base.stateBits & ~grfMask) | (grfStateBits & grfMask); + StorageBaseImpl* const This = (StorageBaseImpl*)iface; + This->stateBits = (This->stateBits & ~grfMask) | (grfStateBits & grfMask); return S_OK; } @@ -2150,7 +2150,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = StorageBaseImpl_RenameElement, StorageBaseImpl_SetElementTimes, StorageBaseImpl_SetClass, - StorageImpl_SetStateBits, + StorageBaseImpl_SetStateBits, StorageImpl_Stat }; @@ -3958,7 +3958,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = StorageBaseImpl_RenameElement, StorageBaseImpl_SetElementTimes, StorageBaseImpl_SetClass, - StorageImpl_SetStateBits, + StorageBaseImpl_SetStateBits, StorageBaseImpl_Stat };

1 0

Vincent Povirk : ole32: Rename StorageImpl_SetElementTimes to StorageBaseImpl_SetElementTimes.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 17236668c918d06d8474a0f28f202c3fcb62c1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17236668c918d06d8474a0f28… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 14:54:36 2009 -0500 ole32: Rename StorageImpl_SetElementTimes to StorageBaseImpl_SetElementTimes. --- dlls/ole32/storage32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 313bad7..c7aca84 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2105,7 +2105,7 @@ static HRESULT removeFromTree( /****************************************************************************** * SetElementTimes (IStorage) */ -static HRESULT WINAPI StorageImpl_SetElementTimes( +static HRESULT WINAPI StorageBaseImpl_SetElementTimes( IStorage* iface, const OLECHAR *pwcsName,/* [string][in] */ const FILETIME *pctime, /* [in] */ @@ -2148,7 +2148,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = StorageBaseImpl_EnumElements, StorageBaseImpl_DestroyElement, StorageBaseImpl_RenameElement, - StorageImpl_SetElementTimes, + StorageBaseImpl_SetElementTimes, StorageBaseImpl_SetClass, StorageImpl_SetStateBits, StorageImpl_Stat @@ -3956,7 +3956,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = StorageBaseImpl_EnumElements, StorageBaseImpl_DestroyElement, StorageBaseImpl_RenameElement, - StorageImpl_SetElementTimes, + StorageBaseImpl_SetElementTimes, StorageBaseImpl_SetClass, StorageImpl_SetStateBits, StorageBaseImpl_Stat

1 0

Vincent Povirk : ole32: Rename StorageImpl_DestroyElement to StorageBaseImpl_DestroyElement.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: fd2f35a8727476853511ca9a0e8fd70ae4307b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2f35a8727476853511ca9a0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 14:53:30 2009 -0500 ole32: Rename StorageImpl_DestroyElement to StorageBaseImpl_DestroyElement. --- dlls/ole32/storage32.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d022ae4..313bad7 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -160,12 +160,12 @@ typedef struct * Forward declaration of internal functions used by the method DestroyElement */ static HRESULT deleteStorageProperty( - StorageImpl *parentStorage, + StorageBaseImpl *parentStorage, ULONG foundPropertyIndexToDelete, StgProperty propertyToDelete); static HRESULT deleteStreamProperty( - StorageImpl *parentStorage, + StorageBaseImpl *parentStorage, ULONG foundPropertyIndexToDelete, StgProperty propertyToDelete); @@ -1745,11 +1745,11 @@ static HRESULT WINAPI StorageImpl_Revert( * enumeration strategy that would give all the leaves of a storage * first. (postfix order) */ -static HRESULT WINAPI StorageImpl_DestroyElement( +static HRESULT WINAPI StorageBaseImpl_DestroyElement( IStorage* iface, const OLECHAR *pwcsName)/* [string][in] */ { - StorageImpl* const This=(StorageImpl*)iface; + StorageBaseImpl* const This=(StorageBaseImpl*)iface; HRESULT hr = S_OK; StgProperty propertyToDelete; @@ -1761,12 +1761,12 @@ static HRESULT WINAPI StorageImpl_DestroyElement( if (pwcsName==NULL) return STG_E_INVALIDPOINTER; - if ( STGM_ACCESS_MODE( This->base.openFlags ) == STGM_READ ) + if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) return STG_E_ACCESSDENIED; foundPropertyIndexToDelete = findElement( - This->base.ancestorStorage, - This->base.rootPropertySetIndex, + This->ancestorStorage, + This->rootPropertySetIndex, pwcsName, &propertyToDelete); @@ -1797,8 +1797,8 @@ static HRESULT WINAPI StorageImpl_DestroyElement( * Adjust the property chain */ hr = removeFromTree( - This->base.ancestorStorage, - This->base.rootPropertySetIndex, + This->ancestorStorage, + This->rootPropertySetIndex, foundPropertyIndexToDelete); /* @@ -1806,7 +1806,7 @@ static HRESULT WINAPI StorageImpl_DestroyElement( */ propertyToDelete.sizeOfNameString = 0; - StorageImpl_WriteProperty(This->base.ancestorStorage, + StorageImpl_WriteProperty(This->ancestorStorage, foundPropertyIndexToDelete, &propertyToDelete); @@ -1876,7 +1876,7 @@ static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg) * */ static HRESULT deleteStorageProperty( - StorageImpl *parentStorage, + StorageBaseImpl *parentStorage, ULONG indexOfPropertyToDelete, StgProperty propertyToDelete) { @@ -1916,7 +1916,7 @@ static HRESULT deleteStorageProperty( hr = IEnumSTATSTG_Next(elements, 1, &currentElement, NULL); if (hr==S_OK) { - destroyHr = StorageImpl_DestroyElement(childStorage, currentElement.pwcsName); + destroyHr = IStorage_DestroyElement(childStorage, currentElement.pwcsName); CoTaskMemFree(currentElement.pwcsName); } @@ -1943,7 +1943,7 @@ static HRESULT deleteStorageProperty( * */ static HRESULT deleteStreamProperty( - StorageImpl *parentStorage, + StorageBaseImpl *parentStorage, ULONG indexOfPropertyToDelete, StgProperty propertyToDelete) { @@ -2146,7 +2146,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = StorageImpl_Commit, StorageImpl_Revert, StorageBaseImpl_EnumElements, - StorageImpl_DestroyElement, + StorageBaseImpl_DestroyElement, StorageBaseImpl_RenameElement, StorageImpl_SetElementTimes, StorageBaseImpl_SetClass, @@ -3954,7 +3954,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = StorageInternalImpl_Commit, StorageInternalImpl_Revert, StorageBaseImpl_EnumElements, - StorageImpl_DestroyElement, + StorageBaseImpl_DestroyElement, StorageBaseImpl_RenameElement, StorageImpl_SetElementTimes, StorageBaseImpl_SetClass,

1 0

Vincent Povirk : ole32: Rename StorageImpl_MoveElementTo to StorageBaseImpl_MoveElementTo.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: c4aed16590c60cbb33d2de38674a2a53ff9d95be URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4aed16590c60cbb33d2de386… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 14:49:30 2009 -0500 ole32: Rename StorageImpl_MoveElementTo to StorageBaseImpl_MoveElementTo. --- dlls/ole32/storage32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1a4a315..d022ae4 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1691,7 +1691,7 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( /************************************************************************* * MoveElementTo (IStorage) */ -static HRESULT WINAPI StorageImpl_MoveElementTo( +static HRESULT WINAPI StorageBaseImpl_MoveElementTo( IStorage* iface, const OLECHAR *pwcsName, /* [string][in] */ IStorage *pstgDest, /* [unique][in] */ @@ -2142,7 +2142,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = StorageBaseImpl_CreateStorage, StorageBaseImpl_OpenStorage, StorageBaseImpl_CopyTo, - StorageImpl_MoveElementTo, + StorageBaseImpl_MoveElementTo, StorageImpl_Commit, StorageImpl_Revert, StorageBaseImpl_EnumElements, @@ -3950,7 +3950,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = StorageBaseImpl_CreateStorage, StorageBaseImpl_OpenStorage, StorageBaseImpl_CopyTo, - StorageImpl_MoveElementTo, + StorageBaseImpl_MoveElementTo, StorageInternalImpl_Commit, StorageInternalImpl_Revert, StorageBaseImpl_EnumElements,

1 0

Juan Lang : crypt32: Fix a memory leak in a test.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: af3afcf81d9f51c20e61299e25ffa9255e01f83e URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3afcf81d9f51c20e61299e2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 2 10:53:35 2009 -0800 crypt32: Fix a memory leak in a test. --- dlls/crypt32/tests/chain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 7f3aa81..3f36afb 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2117,6 +2117,7 @@ static void test_CERT_CHAIN_PARA_cbSize(void) pCertFreeCertificateChain(chain); } + CertFreeCertificateContext(cert); CertCloseStore(store, 0); }

1 0

Juan Lang : crypt32: Fix a memory leak reading trusted root certs.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 7a73fd97ad2117180261d4796d48b8ef0df0f818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a73fd97ad2117180261d4796… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 2 10:54:34 2009 -0800 crypt32: Fix a memory leak reading trusted root certs. --- dlls/crypt32/rootstore.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index a4a75ab..a55b281 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -719,6 +719,7 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); check_and_store_certs(from, store); } + CertCloseStore(from, 0); } static HCERTSTORE create_root_store(void)

1 0

Juan Lang : crypt32: Fix a memory leak querying a message object.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 7dd75d1181ba5038d9f3b0f40e669b7541435315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd75d1181ba5038d9f3b0f40… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 2 10:27:25 2009 -0800 crypt32: Fix a memory leak querying a message object. --- dlls/crypt32/object.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index c337784..3d18c50 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -599,11 +599,13 @@ static BOOL CRYPT_QueryMessageObject(DWORD dwObjectType, const void *pvObject, { if (pdwFormatType) *pdwFormatType = formatType; - if (phMsg) - *phMsg = msg; if (phCertStore) *phCertStore = CertOpenStore(CERT_STORE_PROV_MSG, encodingType, 0, 0, msg); + if (phMsg) + *phMsg = msg; + else + CryptMsgClose(msg); } if (blob == &fileBlob) CryptMemFree(blob->pbData);

1 0

Juan Lang : crypt32: Support reading a serialized store object from memory in CryptQueryObject.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 9928e2e1c534ac5e9fafeb03140c354743c09d82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9928e2e1c534ac5e9fafeb031… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 29 16:48:52 2009 -0700 crypt32: Support reading a serialized store object from memory in CryptQueryObject. --- dlls/crypt32/crypt32_private.h | 6 ++++ dlls/crypt32/object.c | 55 +++++++++++++++++++++++++++++++++------ dlls/crypt32/serialize.c | 31 ++++++++++++++++++++++ 3 files changed, 83 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 5e5b540..8c5b13b 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -282,6 +282,12 @@ const void *CRYPT_ReadSerializedElement(const BYTE *pbElement, */ BOOL CRYPT_ReadSerializedStoreFromFile(HANDLE file, HCERTSTORE store); +/* Reads contexts serialized in the blob into the memory store. Returns FALSE + * if the file is not of the expected format. + */ +BOOL CRYPT_ReadSerializedStoreFromBlob(const CRYPT_DATA_BLOB *blob, + HCERTSTORE store); + /* Fixes up the pointers in info, where info is assumed to be a * CRYPT_KEY_PROV_INFO, followed by its container name, provider name, and any * provider parameters, in a contiguous buffer, but where info's pointers are diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index f505b7d..c337784 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -283,20 +283,13 @@ end: return ret; } -static BOOL CRYPT_QuerySerializedStoreObject(DWORD dwObjectType, - const void *pvObject, DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, +static BOOL CRYPT_QuerySerializedStoreFromFile(LPCWSTR fileName, + DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, HCERTSTORE *phCertStore, HCRYPTMSG *phMsg) { - LPCWSTR fileName = pvObject; HANDLE file; BOOL ret = FALSE; - if (dwObjectType != CERT_QUERY_OBJECT_FILE) - { - FIXME("unimplemented for non-file type %d\n", dwObjectType); - SetLastError(E_INVALIDARG); /* FIXME: is this the correct error? */ - return FALSE; - } TRACE("%s\n", debugstr_w(fileName)); file = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); @@ -322,6 +315,50 @@ static BOOL CRYPT_QuerySerializedStoreObject(DWORD dwObjectType, return ret; } +static BOOL CRYPT_QuerySerializedStoreFromBlob(const CRYPT_DATA_BLOB *blob, + DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, + HCERTSTORE *phCertStore, HCRYPTMSG *phMsg) +{ + HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + BOOL ret; + + TRACE("(%d, %p)\n", blob->cbData, blob->pbData); + + ret = CRYPT_ReadSerializedStoreFromBlob(blob, store); + if (ret) + { + if (pdwMsgAndCertEncodingType) + *pdwMsgAndCertEncodingType = X509_ASN_ENCODING; + if (pdwContentType) + *pdwContentType = CERT_QUERY_CONTENT_SERIALIZED_STORE; + if (phCertStore) + *phCertStore = CertDuplicateStore(store); + } + CertCloseStore(store, 0); + TRACE("returning %d\n", ret); + return ret; +} + +static BOOL CRYPT_QuerySerializedStoreObject(DWORD dwObjectType, + const void *pvObject, DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, + HCERTSTORE *phCertStore, HCRYPTMSG *phMsg) +{ + switch (dwObjectType) + { + case CERT_QUERY_OBJECT_FILE: + return CRYPT_QuerySerializedStoreFromFile(pvObject, + pdwMsgAndCertEncodingType, pdwContentType, phCertStore, phMsg); + case CERT_QUERY_OBJECT_BLOB: + return CRYPT_QuerySerializedStoreFromBlob(pvObject, + pdwMsgAndCertEncodingType, pdwContentType, phCertStore, phMsg); + default: + FIXME("unimplemented for type %d\n", dwObjectType); + SetLastError(E_INVALIDARG); /* FIXME: is this the correct error? */ + return FALSE; + } +} + static BOOL CRYPT_QuerySignedMessage(const CRYPT_DATA_BLOB *blob, DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, HCRYPTMSG *phMsg) { diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 45a3e25..b502110 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -534,6 +534,37 @@ BOOL CRYPT_ReadSerializedStoreFromFile(HANDLE file, HCERTSTORE store) return CRYPT_ReadSerializedStore(file, read_file_wrapper, store); } +struct BlobReader +{ + const CRYPT_DATA_BLOB *blob; + DWORD current; +}; + +static BOOL read_blob_wrapper(void *handle, void *buffer, DWORD bytesToRead, + DWORD *bytesRead) +{ + struct BlobReader *reader = handle; + BOOL ret; + + if (reader->current < reader->blob->cbData) + { + *bytesRead = min(bytesToRead, reader->blob->cbData - reader->current); + memcpy(buffer, reader->blob->pbData + reader->current, *bytesRead); + ret = TRUE; + } + else + ret = FALSE; + return ret; +} + +BOOL CRYPT_ReadSerializedStoreFromBlob(const CRYPT_DATA_BLOB *blob, + HCERTSTORE store) +{ + struct BlobReader reader = { blob, 0 }; + + return CRYPT_ReadSerializedStore(&reader, read_blob_wrapper, store); +} + static BOOL WINAPI CRYPT_SerializeCertNoHash(PCCERT_CONTEXT pCertContext, DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) {

1 0

← Newer
1
...
83
84
85
86
87
88
89
90
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009