Author: akhaldi Date: Wed Oct 22 18:29:59 2014 New Revision: 64900
URL: http://svn.reactos.org/svn/reactos?rev=64900&view=rev Log: [ADVAPI32/CRYPT] * Sync with Wine 1.7.27. CORE-8540
Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/crypt/crypt.c trunk/reactos/dll/win32/advapi32/crypt/crypt.h trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi32... ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Wed Oct 22 18:29:59 2014 @@ -681,4 +681,4 @@ @ stub WmiSetSingleItemA @ stub WmiSetSingleItemW @ stub Wow64Win32ApiEntry -@ stub WriteEncryptedFileRaw +@ stdcall WriteEncryptedFileRaw(ptr ptr ptr)
Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/cr... ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Wed Oct 22 18:29:59 2014 @@ -1802,7 +1802,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, +BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey) { PCRYPTPROV prov = (PCRYPTPROV)hProv; @@ -1922,7 +1922,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags) +BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, const BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov; PCRYPTHASH hash = (PCRYPTHASH)hHash; @@ -1956,7 +1956,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags) +BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, const BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov; PCRYPTKEY key = (PCRYPTKEY)hKey; @@ -2131,7 +2131,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags) +BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov = (PCRYPTPROV)hProv;
@@ -2147,7 +2147,7 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (dwFlags & PP_USE_HARDWARE_RNG) + if (dwParam == PP_USE_HARDWARE_RNG) { FIXME("PP_USE_HARDWARE_RNG: What do I do with this?\n"); FIXME("\tLetting the CSP decide.\n"); @@ -2190,7 +2190,7 @@ * NULL. It is supported only for compatibility with Microsoft's Cryptographic * Providers. */ -BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, +BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, const BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags) { PCRYPTHASH hash = (PCRYPTHASH)hHash; @@ -2218,7 +2218,7 @@ * * See CryptVerifySignatureW. */ -BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, +BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, const BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCSTR sDescription, DWORD dwFlags) { LPWSTR wsDescription; @@ -2362,3 +2362,22 @@ return STATUS_SUCCESS; } #endif /* !__REACTOS __ */ + +/****************************************************************************** + * WriteEncryptedFileRaw (ADVAPI32.@) + * + * Import encrypted files + * + * PARAMS + * import [I] pointer to the import callback function + * callback [I] pointer to the application defined context + * context [I] pointer to the system context + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +DWORD WINAPI WriteEncryptedFileRaw(PFE_IMPORT_FUNC import, PVOID callback, PVOID context) +{ + FIXME("(%p, %p, %p): stub\n", import, callback, context); + return ERROR_CALL_NOT_IMPLEMENTED; +}
Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/cr... ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.h [iso-8859-1] Wed Oct 22 18:29:59 2014 @@ -45,15 +45,15 @@ BOOL (WINAPI *pCPGetKeyParam)(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD *pdwDataLen, DWORD dwFlags); BOOL (WINAPI *pCPGetProvParam)(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD *pdwDataLen, DWORD dwFlags); BOOL (WINAPI *pCPGetUserKey)(HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *phUserKey); - BOOL (WINAPI *pCPHashData)(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pbData, DWORD dwDataLen, DWORD dwFlags); + BOOL (WINAPI *pCPHashData)(HCRYPTPROV hProv, HCRYPTHASH hHash, const BYTE *pbData, DWORD dwDataLen, DWORD dwFlags); BOOL (WINAPI *pCPHashSessionKey)(HCRYPTPROV hProv, HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags); - BOOL (WINAPI *pCPImportKey)(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey); + BOOL (WINAPI *pCPImportKey)(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey); BOOL (WINAPI *pCPReleaseContext)(HCRYPTPROV hProv, DWORD dwFlags); - BOOL (WINAPI *pCPSetHashParam)(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); - BOOL (WINAPI *pCPSetKeyParam)(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); - BOOL (WINAPI *pCPSetProvParam)(HCRYPTPROV hProv, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); + BOOL (WINAPI *pCPSetHashParam)(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwParam, const BYTE *pbData, DWORD dwFlags); + BOOL (WINAPI *pCPSetKeyParam)(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, const BYTE *pbData, DWORD dwFlags); + BOOL (WINAPI *pCPSetProvParam)(HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbData, DWORD dwFlags); BOOL (WINAPI *pCPSignHash)(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR sDescription, DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen); - BOOL (WINAPI *pCPVerifySignature)(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags); + BOOL (WINAPI *pCPVerifySignature)(HCRYPTPROV hProv, HCRYPTHASH hHash, const BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags); } PROVFUNCS, *PPROVFUNCS;
#define MAGIC_CRYPTPROV 0xA39E741F
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Oct 22 18:29:59 2014 @@ -256,7 +256,7 @@ reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.27
advapi32 - - reactos/dll/win32/advapi32/crypt/*.c # Synced to Wine-1.7.1 + reactos/dll/win32/advapi32/crypt/*.c # Synced to Wine-1.7.27 reactos/dll/win32/advapi32/sec/cred.c # Synced to Wine-1.7.1 reactos/dll/win32/advapi32/sec/sid.c # Out of Sync