Author: akhaldi
Date: Sat Sep 27 00:03:33 2014
New Revision: 64319
URL: http://svn.reactos.org/svn/reactos?rev=64319&view=rev
Log:
[BCRYPT]
* Sync with Wine 1.7.27.
CORE-8540
Modified:
trunk/reactos/dll/win32/bcrypt/bcrypt.spec
trunk/reactos/dll/win32/bcrypt/bcrypt_main.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/bcrypt/bcrypt.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt.spec?rev=64319&r1=64318&r2=64319&view=diff
==============================================================================
--- trunk/reactos/dll/win32/bcrypt/bcrypt.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/bcrypt/bcrypt.spec [iso-8859-1] Sat Sep 27
00:03:33 2014
@@ -1,6 +1,6 @@
@ stub BCryptAddContextFunction
@ stub BCryptAddContextFunctionProvider
-@ stub BCryptCloseAlgorithmProvider
+@ stdcall BCryptCloseAlgorithmProvider(ptr long)
@ stub BCryptConfigureContext
@ stub BCryptConfigureContextFunction
@ stub BCryptCreateContext
@@ -27,12 +27,12 @@
@ stdcall BCryptGenRandom(ptr ptr long long)
@ stub BCryptGenerateKeyPair
@ stub BCryptGenerateSymmetricKey
-@ stub BCryptGetFipsAlgorithmMode
+@ stdcall BCryptGetFipsAlgorithmMode(ptr)
@ stub BCryptGetProperty
@ stub BCryptHashData
@ stub BCryptImportKey
@ stub BCryptImportKeyPair
-@ stub BCryptOpenAlgorithmProvider
+@ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long)
@ stub BCryptQueryContextConfiguration
@ stub BCryptQueryContextFunctionConfiguration
@ stub BCryptQueryContextFunctionProperty
Modified: trunk/reactos/dll/win32/bcrypt/bcrypt_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt_main.c?rev=64319&r1=64318&r2=64319&view=diff
==============================================================================
--- trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] Sat Sep 27
00:03:33 2014
@@ -29,20 +29,6 @@
#include <bcrypt.h>
WINE_DEFAULT_DEBUG_CHANNEL(bcrypt);
-
-BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
-{
- TRACE("fdwReason %u\n", fdwReason);
-
- switch(fdwReason)
- {
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(hInstDLL);
- break;
- }
-
- return TRUE;
-}
NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount,
BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList,
ULONG dwFlags)
@@ -90,3 +76,34 @@
FIXME("called with unsupported parameters, returning error\n");
return STATUS_NOT_IMPLEMENTED;
}
+
+NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *algorithm,
LPCWSTR algorithmId,
+ LPCWSTR implementation, DWORD
flags)
+{
+ FIXME("%p, %s, %s, %08x - stub\n", algorithm, wine_dbgstr_w(algorithmId),
wine_dbgstr_w(implementation), flags);
+
+ if (!algorithm)
+ return STATUS_INVALID_PARAMETER;
+
+ *algorithm = NULL;
+
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE algorithm,
DWORD flags)
+{
+ FIXME("%p, %08x - stub\n", algorithm, flags);
+
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled)
+{
+ FIXME("%p - semi-stub\n", enabled);
+
+ if (!enabled)
+ return STATUS_INVALID_PARAMETER;
+
+ *enabled = FALSE;
+ return STATUS_SUCCESS;
+}
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=64319&r1=64318&r2=64319&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 27 00:03:33 2014
@@ -55,7 +55,7 @@
reactos/dll/win32/atl80 # Synced to Wine-1.7.27
reactos/dll/win32/atl100 # Synced to Wine-1.7.27
reactos/dll/win32/avifil32 # Synced to Wine-1.7.17
-reactos/dll/win32/bcrypt # Synced to Wine-1.7.17
+reactos/dll/win32/bcrypt # Synced to Wine-1.7.27
reactos/dll/win32/browseui # Out of sync
reactos/dll/win32/cabinet # Synced to Wine-1.7.17
reactos/dll/win32/clusapi # Synced to Wine-1.7.17
