Author: akhaldi Date: Sun Jun 5 19:00:43 2016 New Revision: 71543
URL: http://svn.reactos.org/svn/reactos?rev=71543&view=rev Log: [CRYPT32] Sync with Wine Staging 1.9.11. CORE-11368
Modified: trunk/reactos/dll/win32/crypt32/collectionstore.c trunk/reactos/dll/win32/crypt32/crypt32.spec trunk/reactos/dll/win32/crypt32/msg.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/crypt32/collectionstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/collectio... ============================================================================== --- trunk/reactos/dll/win32/crypt32/collectionstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/collectionstore.c [iso-8859-1] Sun Jun 5 19:00:43 2016 @@ -520,7 +520,6 @@ entry->store = sibling; entry->dwUpdateFlags = dwUpdateFlags; entry->dwPriority = dwPriority; - list_init(&entry->entry); TRACE("%p: adding %p, priority %d\n", collection, entry, dwPriority); EnterCriticalSection(&collection->cs); if (dwPriority)
Modified: trunk/reactos/dll/win32/crypt32/crypt32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.s... ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.spec [iso-8859-1] Sun Jun 5 19:00:43 2016 @@ -160,7 +160,7 @@ @ stdcall CryptMsgOpenToEncode(long long long ptr str ptr) @ stdcall CryptMsgSignCTL(long ptr long ptr long ptr ptr) @ 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 CryptProtectData(ptr wstr ptr ptr ptr long ptr) @ stdcall CryptProtectMemory(ptr long long)
Modified: trunk/reactos/dll/win32/crypt32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/msg.c?rev... ============================================================================== --- trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] Sun Jun 5 19:00:43 2016 @@ -3725,6 +3725,17 @@ 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, DWORD dwEncodingType, PBYTE pbSignerInfo, DWORD cbSignerInfo, PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature,
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jun 5 19:00:43 2016 @@ -58,7 +58,7 @@ reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.11 reactos/dll/win32/compstui # 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/cryptdll # Synced to WineStaging-1.9.4 reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.4
-
akhaldi＠svn.reactos.org