From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- include/Makefile.in | 1 + include/windows.security.cryptography.idl | 110 ++++++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 include/windows.security.cryptography.idl
diff --git a/include/Makefile.in b/include/Makefile.in index 0598a3ce3de..7308b77634a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -806,6 +806,7 @@ SOURCES = \ windows.media.idl \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ + windows.security.cryptography.idl \ windows.storage.streams.idl \ windows.system.idl \ windows.system.power.idl \ diff --git a/include/windows.security.cryptography.idl b/include/windows.security.cryptography.idl new file mode 100644 index 00000000000..7d7b7fba2dc --- /dev/null +++ b/include/windows.security.cryptography.idl @@ -0,0 +1,110 @@ +/* + * Copyright 2022 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.storage.streams.idl"; + +namespace Windows.Security.Cryptography +{ + typedef enum BinaryStringEncoding BinaryStringEncoding; + runtimeclass CryptographicBuffer; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum BinaryStringEncoding + { + Utf8 = 0, + Utf16LE = 1, + Utf16BE = 2, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Security.Cryptography.CryptographicBuffer), + uuid(320b7e22-3cb0-4cdf-8663-1d28910065eb) + ] + interface ICryptographicBufferStatics : IInspectable + { + HRESULT Compare( + [in] Windows.Storage.Streams.IBuffer *object1, + [in] Windows.Storage.Streams.IBuffer *object2, + [out, retval] boolean *is_equal + ); + HRESULT GenerateRandom( + [in] UINT32 length, + [out, retval] Windows.Storage.Streams.IBuffer **buffer + ); + HRESULT GenerateRandomNumber( + [out, retval] UINT32 *value + ); + HRESULT CreateFromByteArray( + [in] UINT32 value_size, + [in, size_is(value_size)] BYTE *value, + [out, retval] Windows.Storage.Streams.IBuffer **buffer + ); + HRESULT CopyToByteArray( + [in] Windows.Storage.Streams.IBuffer *buffer, + [out] UINT32 *value_size, + [out, size_is(, *value_size)] BYTE **value + ); + HRESULT DecodeFromHexString( + [in] HSTRING value, + [out, retval] Windows.Storage.Streams.IBuffer **buffer + ); + HRESULT EncodeToHexString( + [in] Windows.Storage.Streams.IBuffer *buffer, + [out, retval] HSTRING *value + ); + HRESULT DecodeFromBase64String( + [in] HSTRING value, + [out, retval] Windows.Storage.Streams.IBuffer **buffer + ); + HRESULT EncodeToBase64String( + [in] Windows.Storage.Streams.IBuffer *buffer, + [out, retval] HSTRING *value + ); + HRESULT ConvertStringToBinary( + [in] HSTRING value, + [in] Windows.Security.Cryptography.BinaryStringEncoding encoding, + [out, retval] Windows.Storage.Streams.IBuffer **buffer + ); + HRESULT ConvertBinaryToString( + [in] Windows.Security.Cryptography.BinaryStringEncoding encoding, + [in] Windows.Storage.Streams.IBuffer *buffer, + [out, retval] HSTRING *value + ); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Security.Cryptography.ICryptographicBufferStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass CryptographicBuffer + { + } +}
From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- configure | 2 + configure.ac | 1 + dlls/cryptowinrt/Makefile.in | 7 + dlls/cryptowinrt/classes.idl | 21 ++ dlls/cryptowinrt/cryptowinrt.spec | 3 + dlls/cryptowinrt/main.c | 339 ++++++++++++++++++++++++++++++ 6 files changed, 373 insertions(+) create mode 100644 dlls/cryptowinrt/Makefile.in create mode 100644 dlls/cryptowinrt/classes.idl create mode 100644 dlls/cryptowinrt/cryptowinrt.spec create mode 100644 dlls/cryptowinrt/main.c
diff --git a/configure b/configure index e9219680458..19dade9b44d 100755 --- a/configure +++ b/configure @@ -980,6 +980,7 @@ enable_cryptdlg enable_cryptdll enable_cryptext enable_cryptnet +enable_cryptowinrt enable_cryptsp enable_cryptui enable_ctapi32 @@ -21346,6 +21347,7 @@ wine_fn_config_makefile dlls/cryptdll enable_cryptdll wine_fn_config_makefile dlls/cryptext enable_cryptext wine_fn_config_makefile dlls/cryptnet enable_cryptnet wine_fn_config_makefile dlls/cryptnet/tests enable_tests +wine_fn_config_makefile dlls/cryptowinrt enable_cryptowinrt wine_fn_config_makefile dlls/cryptsp enable_cryptsp wine_fn_config_makefile dlls/cryptui enable_cryptui wine_fn_config_makefile dlls/cryptui/tests enable_tests diff --git a/configure.ac b/configure.ac index e2f54a66718..436adc67e81 100644 --- a/configure.ac +++ b/configure.ac @@ -2452,6 +2452,7 @@ WINE_CONFIG_MAKEFILE(dlls/cryptdll) WINE_CONFIG_MAKEFILE(dlls/cryptext) WINE_CONFIG_MAKEFILE(dlls/cryptnet) WINE_CONFIG_MAKEFILE(dlls/cryptnet/tests) +WINE_CONFIG_MAKEFILE(dlls/cryptowinrt) WINE_CONFIG_MAKEFILE(dlls/cryptsp) WINE_CONFIG_MAKEFILE(dlls/cryptui) WINE_CONFIG_MAKEFILE(dlls/cryptui/tests) diff --git a/dlls/cryptowinrt/Makefile.in b/dlls/cryptowinrt/Makefile.in new file mode 100644 index 00000000000..0129e83fb63 --- /dev/null +++ b/dlls/cryptowinrt/Makefile.in @@ -0,0 +1,7 @@ +MODULE = cryptowinrt.dll +IMPORTS = combase uuid + +C_SRCS = \ + main.c + +IDL_SRCS = classes.idl diff --git a/dlls/cryptowinrt/classes.idl b/dlls/cryptowinrt/classes.idl new file mode 100644 index 00000000000..4352a8562e5 --- /dev/null +++ b/dlls/cryptowinrt/classes.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2022 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "windows.security.cryptography.idl" diff --git a/dlls/cryptowinrt/cryptowinrt.spec b/dlls/cryptowinrt/cryptowinrt.spec new file mode 100644 index 00000000000..20a8bfa98ea --- /dev/null +++ b/dlls/cryptowinrt/cryptowinrt.spec @@ -0,0 +1,3 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/dlls/cryptowinrt/main.c b/dlls/cryptowinrt/main.c new file mode 100644 index 00000000000..811975d8d79 --- /dev/null +++ b/dlls/cryptowinrt/main.c @@ -0,0 +1,339 @@ +/* + * Copyright 2022 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <assert.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "initguid.h" +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Storage_Streams +#include "windows.storage.streams.h" +#define WIDL_using_Windows_Security_Cryptography +#include "windows.security.cryptography.h" + +WINE_DEFAULT_DEBUG_CHANNEL(crypto); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct cryptobuffer_factory +{ + IActivationFactory IActivationFactory_iface; + ICryptographicBufferStatics ICryptographicBufferStatics_iface; + LONG refcount; +}; + +static inline struct cryptobuffer_factory *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct cryptobuffer_factory, IActivationFactory_iface); +} + +static inline struct cryptobuffer_factory *impl_from_ICryptographicBufferStatics(ICryptographicBufferStatics *iface) +{ + return CONTAINING_RECORD(iface, struct cryptobuffer_factory, ICryptographicBufferStatics_iface); +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_factory_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + struct cryptobuffer_factory *factory = impl_from_IActivationFactory(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = &factory->IActivationFactory_iface; + return S_OK; + } + + if (IsEqualGUID(iid, &IID_ICryptographicBufferStatics)) + { + IUnknown_AddRef(iface); + *out = &factory->ICryptographicBufferStatics_iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE cryptobuffer_factory_AddRef(IActivationFactory *iface) +{ + struct cryptobuffer_factory *factory = impl_from_IActivationFactory(iface); + ULONG refcount = InterlockedIncrement(&factory->refcount); + + TRACE("iface %p, refcount %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE cryptobuffer_factory_Release(IActivationFactory *iface) +{ + struct cryptobuffer_factory *factory = impl_from_IActivationFactory(iface); + ULONG refcount = InterlockedDecrement(&factory->refcount); + + TRACE("iface %p, refcount %lu.\n", iface, refcount); + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_factory_GetIids( + IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_factory_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_factory_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_factory_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl cryptobuffer_factory_vtbl = +{ + cryptobuffer_factory_QueryInterface, + cryptobuffer_factory_AddRef, + cryptobuffer_factory_Release, + /* IInspectable methods */ + cryptobuffer_factory_GetIids, + cryptobuffer_factory_GetRuntimeClassName, + cryptobuffer_factory_GetTrustLevel, + /* IActivationFactory methods */ + cryptobuffer_factory_ActivateInstance, +}; + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_QueryInterface( + ICryptographicBufferStatics *iface, REFIID iid, void **object) +{ + struct cryptobuffer_factory *factory = impl_from_ICryptographicBufferStatics(iface); + return IActivationFactory_QueryInterface(&factory->IActivationFactory_iface, iid, object); +} + +static ULONG STDMETHODCALLTYPE cryptobuffer_statics_AddRef(ICryptographicBufferStatics *iface) +{ + struct cryptobuffer_factory *factory = impl_from_ICryptographicBufferStatics(iface); + return IActivationFactory_AddRef(&factory->IActivationFactory_iface); +} + +static ULONG STDMETHODCALLTYPE cryptobuffer_statics_Release(ICryptographicBufferStatics *iface) +{ + struct cryptobuffer_factory *factory = impl_from_ICryptographicBufferStatics(iface); + return IActivationFactory_Release(&factory->IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_GetIids( + ICryptographicBufferStatics *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_GetRuntimeClassName( + ICryptographicBufferStatics *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_GetTrustLevel( + ICryptographicBufferStatics *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_Compare( + ICryptographicBufferStatics *iface, IBuffer *object1, IBuffer *object2, boolean *is_equal) +{ + FIXME("iface %p, object1 %p, object2 %p, is_equal %p stub!\n", iface, object1, object2, is_equal); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_GenerateRandom( + ICryptographicBufferStatics *iface, UINT32 length, IBuffer **buffer) +{ + FIXME("iface %p, length %u, buffer %p stub!\n", iface, length, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_GenerateRandomNumber( + ICryptographicBufferStatics *iface, UINT32 *value) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_CreateFromByteArray( + ICryptographicBufferStatics *iface, UINT32 value_size, BYTE *value, IBuffer **buffer) +{ + FIXME("iface %p, value_size %u, value %p, buffer %p stub!\n", iface, value_size, value, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_CopyToByteArray( + ICryptographicBufferStatics *iface, IBuffer *buffer, UINT32 *value_size, BYTE **value) +{ + FIXME("iface %p, buffer %p, value_size %p, value %p stub!\n", iface, buffer, value_size, value); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_DecodeFromHexString( + ICryptographicBufferStatics *iface, HSTRING value, IBuffer **buffer) +{ + FIXME("iface %p, value %p, buffer %p stub!\n", iface, value, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_EncodeToHexString( + ICryptographicBufferStatics *iface, IBuffer *buffer, HSTRING *value) +{ + FIXME("iface %p, buffer %p, value %p stub!\n", iface, buffer, value); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_DecodeFromBase64String( + ICryptographicBufferStatics *iface, HSTRING value, IBuffer **buffer) +{ + FIXME("iface %p, value %p, buffer %p stub!\n", iface, value, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_EncodeToBase64String( + ICryptographicBufferStatics *iface, IBuffer *buffer, HSTRING *value) +{ + FIXME("iface %p, buffer %p, value %p stub!\n", iface, buffer, value); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_ConvertStringToBinary( + ICryptographicBufferStatics *iface, HSTRING value, BinaryStringEncoding encoding, + IBuffer **buffer) +{ + FIXME("iface %p, value %p, encoding %d, buffer %p stub!\n", iface, value, encoding, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_ConvertBinaryToString( + ICryptographicBufferStatics *iface, BinaryStringEncoding encoding, IBuffer *buffer, HSTRING *value) +{ + FIXME("iface %p, encoding %d, buffer %p, value %p stub!\n", iface, encoding, buffer, value); + + return E_NOTIMPL; +} + +static const struct ICryptographicBufferStaticsVtbl cryptobuffer_statics_vtbl = +{ + cryptobuffer_statics_QueryInterface, + cryptobuffer_statics_AddRef, + cryptobuffer_statics_Release, + /* IInspectable methods */ + cryptobuffer_statics_GetIids, + cryptobuffer_statics_GetRuntimeClassName, + cryptobuffer_statics_GetTrustLevel, + /* ICryptographicBufferStatics methods */ + cryptobuffer_statics_Compare, + cryptobuffer_statics_GenerateRandom, + cryptobuffer_statics_GenerateRandomNumber, + cryptobuffer_statics_CreateFromByteArray, + cryptobuffer_statics_CopyToByteArray, + cryptobuffer_statics_DecodeFromHexString, + cryptobuffer_statics_EncodeToHexString, + cryptobuffer_statics_DecodeFromBase64String, + cryptobuffer_statics_EncodeToBase64String, + cryptobuffer_statics_ConvertStringToBinary, + cryptobuffer_statics_ConvertBinaryToString, +}; + +static struct cryptobuffer_factory cryptobuffer_factory = +{ + .IActivationFactory_iface.lpVtbl = &cryptobuffer_factory_vtbl, + .ICryptographicBufferStatics_iface.lpVtbl = &cryptobuffer_statics_vtbl, + .refcount = 1, +}; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + const WCHAR *name = WindowsGetStringRawBuffer(classid, NULL); + + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + + *factory = NULL; + + if (!wcscmp(name, RuntimeClass_Windows_Security_Cryptography_CryptographicBuffer)) + { + *factory = &cryptobuffer_factory.IActivationFactory_iface; + IUnknown_AddRef(*factory); + } + + if (*factory) return S_OK; + return CLASS_E_CLASSNOTAVAILABLE; +}
From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/cryptowinrt/Makefile.in | 2 +- dlls/cryptowinrt/main.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/cryptowinrt/Makefile.in b/dlls/cryptowinrt/Makefile.in index 0129e83fb63..192ef49f178 100644 --- a/dlls/cryptowinrt/Makefile.in +++ b/dlls/cryptowinrt/Makefile.in @@ -1,5 +1,5 @@ MODULE = cryptowinrt.dll -IMPORTS = combase uuid +IMPORTS = combase bcrypt uuid
C_SRCS = \ main.c diff --git a/dlls/cryptowinrt/main.c b/dlls/cryptowinrt/main.c index 811975d8d79..720b137e4a9 100644 --- a/dlls/cryptowinrt/main.c +++ b/dlls/cryptowinrt/main.c @@ -29,6 +29,8 @@ #include "initguid.h" #include "activation.h"
+#include "bcrypt.h" + #define WIDL_using_Windows_Foundation #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" @@ -214,9 +216,10 @@ static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_GenerateRandom( static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_GenerateRandomNumber( ICryptographicBufferStatics *iface, UINT32 *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + TRACE("iface %p, value %p.\n", iface, value);
- return E_NOTIMPL; + BCryptGenRandom(NULL, (UCHAR *)value, sizeof(*value), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + return S_OK; }
static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_CreateFromByteArray(
-
Nikolay Sivov -
Nikolay Sivov (＠nsivov)