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

[CRYPT32] Sync with Wine Staging 1.9.11. CORE-11368

Browse source 
svn path=/trunk/; revision=71543
This commit is contained in:
Amine Khaldi 2016-06-05 19:00:43 +00:00
parent ca71fe522a
commit 4505fb6902
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/win32/crypt32/collectionstore.c
View file

@ -520,7 +520,6 @@ BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore,
entry->store = sibling; entry->store = sibling;
entry->dwUpdateFlags = dwUpdateFlags; entry->dwUpdateFlags = dwUpdateFlags;
entry->dwPriority = dwPriority; entry->dwPriority = dwPriority;
list_init(&entry->entry);
TRACE("%p: adding %p, priority %d\n", collection, entry, dwPriority); TRACE("%p: adding %p, priority %d\n", collection, entry, dwPriority);
EnterCriticalSection(&collection->cs); EnterCriticalSection(&collection->cs);
if (dwPriority) if (dwPriority)

2
reactos/dll/win32/crypt32/crypt32.spec
View file

@ -160,7 +160,7 @@
@ stdcall CryptMsgOpenToEncode(long long long ptr str ptr) @ stdcall CryptMsgOpenToEncode(long long long ptr str ptr)
@ stdcall CryptMsgSignCTL(long ptr long ptr long ptr ptr) @ stdcall CryptMsgSignCTL(long ptr long ptr long ptr ptr)
@ stdcall CryptMsgUpdate(ptr ptr long long) @ stdcall CryptMsgUpdate(ptr ptr long long)
@ stub CryptMsgVerifyCountersignatureEncoded @ stdcall CryptMsgVerifyCountersignatureEncoded(ptr long ptr long ptr long ptr)
@ stdcall CryptMsgVerifyCountersignatureEncodedEx(ptr long ptr long ptr long long ptr long ptr) @ stdcall CryptMsgVerifyCountersignatureEncodedEx(ptr long ptr long ptr long long ptr long ptr)
@ stdcall CryptProtectData(ptr wstr ptr ptr ptr long ptr) @ stdcall CryptProtectData(ptr wstr ptr ptr ptr long ptr)
@ stdcall CryptProtectMemory(ptr long long) @ stdcall CryptProtectMemory(ptr long long)

11
reactos/dll/win32/crypt32/msg.c
View file

@ -3725,6 +3725,17 @@ BOOL WINAPI CryptMsgGetAndVerifySigner(HCRYPTMSG hCryptMsg, DWORD cSignerStore,
return ret; return ret;
} }
BOOL WINAPI CryptMsgVerifyCountersignatureEncoded(HCRYPTPROV_LEGACY hCryptProv,
DWORD dwEncodingType, BYTE *pbSignerInfo, DWORD cbSignerInfo,
PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature,
CERT_INFO *pciCountersigner)
{
FIXME("(%08lx, %08x, %p, %d, %p, %d, %p): stub\n", hCryptProv,
dwEncodingType, pbSignerInfo, cbSignerInfo, pbSignerInfoCountersignature,
cbSignerInfoCountersignature, pciCountersigner);
return FALSE;
}
BOOL WINAPI CryptMsgVerifyCountersignatureEncodedEx(HCRYPTPROV_LEGACY hCryptProv, BOOL WINAPI CryptMsgVerifyCountersignatureEncodedEx(HCRYPTPROV_LEGACY hCryptProv,
DWORD dwEncodingType, PBYTE pbSignerInfo, DWORD cbSignerInfo, DWORD dwEncodingType, PBYTE pbSignerInfo, DWORD cbSignerInfo,
PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature, PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature,

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

@ -58,7 +58,7 @@ reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.11
reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.11 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.11
reactos/dll/win32/compstui # Synced to WineStaging-1.9.4 reactos/dll/win32/compstui # Synced to WineStaging-1.9.4
reactos/dll/win32/credui # Synced to WineStaging-1.9.4 reactos/dll/win32/credui # Synced to WineStaging-1.9.4
reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.4 reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.11
reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.4 reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.4
reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.4 reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.4
reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.4 reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.4