Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 05:22:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINTRUST]

Browse source 
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62948
This commit is contained in:
Amine Khaldi 2014-04-24 15:47:48 +00:00
parent 91311347ce
commit b6ab23258c
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/wintrust/crypt.c
View file

@ -104,7 +104,7 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN *catAdmin,
TRACE("%p %s %x\n", catAdmin, debugstr_guid(sys), dwFlags); TRACE("%p %s %x\n", catAdmin, debugstr_guid(sys), dwFlags);
if (!catAdmin) if (!catAdmin || dwFlags)
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return FALSE; return FALSE;
@ -900,6 +900,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h
if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size))
{ {
CryptMsgClose(hmsg); CryptMsgClose(hmsg);
HeapFree(GetProcessHeap(), 0, cc);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
sum += size; sum += size;
@ -907,6 +908,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h
if (!(cc->attr = HeapAlloc(GetProcessHeap(), 0, sizeof(*cc->attr) * cc->attr_count + sum))) if (!(cc->attr = HeapAlloc(GetProcessHeap(), 0, sizeof(*cc->attr) * cc->attr_count + sum)))
{ {
CryptMsgClose(hmsg); CryptMsgClose(hmsg);
HeapFree(GetProcessHeap(), 0, cc);
SetLastError(ERROR_OUTOFMEMORY); SetLastError(ERROR_OUTOFMEMORY);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
@ -917,12 +919,14 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h
{ {
CryptMsgClose(hmsg); CryptMsgClose(hmsg);
HeapFree(GetProcessHeap(), 0, cc->attr); HeapFree(GetProcessHeap(), 0, cc->attr);
HeapFree(GetProcessHeap(), 0, cc);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, p, &size)) if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, p, &size))
{ {
CryptMsgClose(hmsg); CryptMsgClose(hmsg);
HeapFree(GetProcessHeap(), 0, cc->attr); HeapFree(GetProcessHeap(), 0, cc->attr);
HeapFree(GetProcessHeap(), 0, cc);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
p += size; p += size;
@ -939,6 +943,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h
cc->magic = CRYPTCAT_MAGIC; cc->magic = CRYPTCAT_MAGIC;
return cc; return cc;
} }
HeapFree(GetProcessHeap(), 0, cc);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }

8
reactos/dll/win32/wintrust/register.c
View file

@ -215,7 +215,7 @@ error_close_key:
* *
* NOTES * NOTES
* Adding definitions is basically only adding relevant information * Adding definitions is basically only adding relevant information
* to the registry. No verification takes place whether a DLL or it's * to the registry. No verification takes place whether a DLL or its
* entrypoints exist. * entrypoints exist.
* Information in the registry will always be overwritten. * Information in the registry will always be overwritten.
* *
@ -948,10 +948,10 @@ HRESULT WINAPI DllRegisterServer(void)
TRACE("\n"); TRACE("\n");
/* Testing on native shows that when an error is encountered in one of the CryptRegisterOIDFunction calls /* Testing on native shows that when an error is encountered in one of the CryptRegisterOIDFunction calls
* the rest of these calls is skipped. Registering is however continued for the trust providers. * the rest of these calls are skipped. Registering is however continued for the trust providers.
* *
* We are not totally in line with native as there all decoding functions are registered after all encoding * We are not totally in line with native as all decoding functions are registered after all encoding
* functions. * functions there.
*/ */
#define WINTRUST_REGISTEROID( oid, encode_funcname, decode_funcname ) \ #define WINTRUST_REGISTEROID( oid, encode_funcname, decode_funcname ) \
do { \ do { \

2
reactos/media/doc/README.WINE
View file

@ -212,7 +212,7 @@ reactos/dll/win32/wininet # Synced to Wine-1.7.1
reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm # Forked at Wine-20050628
reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628
reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628
reactos/dll/win32/wintrust # Synced to Wine-1.7.1 reactos/dll/win32/wintrust # Synced to Wine-1.7.17
reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 reactos/dll/win32/wldap32 # Synced to Wine-1.7.1
reactos/dll/win32/wmi # Synced to Wine-1.7.1 reactos/dll/win32/wmi # Synced to Wine-1.7.1
reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1