wine-commits February 2023

wine-commits@winehq.org

1 participants
599 discussions

Mohamad Al-Jaf : cryptowinrt: Add private.h file.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: a68435f015c2b9356aa2cd68d029769eb4d0b664 URL: https://gitlab.winehq.org/wine/wine/-/commit/a68435f015c2b9356aa2cd68d02976… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Nov 15 22:27:49 2022 -0500 cryptowinrt: Add private.h file. --- dlls/cryptowinrt/main.c | 63 +++---------------------------------- dlls/cryptowinrt/private.h | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 58 deletions(-) diff --git a/dlls/cryptowinrt/main.c b/dlls/cryptowinrt/main.c index 720b137e4a9..3fa8e318cdc 100644 --- a/dlls/cryptowinrt/main.c +++ b/dlls/cryptowinrt/main.c @@ -16,32 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#include "initguid.h" +#include "private.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" - #include "bcrypt.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 char *debugstr_hstring(HSTRING hstr) { const WCHAR *str; UINT32 len; @@ -62,11 +52,6 @@ static inline struct cryptobuffer_factory *impl_from_IActivationFactory(IActivat 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) { @@ -157,45 +142,7 @@ static const struct IActivationFactoryVtbl cryptobuffer_factory_vtbl = 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; -} +DEFINE_IINSPECTABLE(cryptobuffer_statics, ICryptographicBufferStatics, struct cryptobuffer_factory, IActivationFactory_iface); static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_Compare( ICryptographicBufferStatics *iface, IBuffer *object1, IBuffer *object2, boolean *is_equal) diff --git a/dlls/cryptowinrt/private.h b/dlls/cryptowinrt/private.h new file mode 100644 index 00000000000..dcf07750dd5 --- /dev/null +++ b/dlls/cryptowinrt/private.h @@ -0,0 +1,78 @@ +/* CryptoWinRT Implementation + * + * Copyright (C) 2022 Mohamad Al-Jaf + * + * 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 + */ + +#ifndef __WINE_CRYPTOWINRT_PRIVATE_H +#define __WINE_CRYPTOWINRT_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.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" + +extern const char *debugstr_hstring( HSTRING hstr ); + +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) + +#endif

1 0

Mohamad Al-Jaf : cryptowinrt/tests: Add ICryptographicBufferStatics interface test.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 62bd7578f312ae60b3b352a3ed37a526571eaf9c URL: https://gitlab.winehq.org/wine/wine/-/commit/62bd7578f312ae60b3b352a3ed37a5… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Dec 1 03:45:32 2022 -0500 cryptowinrt/tests: Add ICryptographicBufferStatics interface test. --- configure | 1 + configure.ac | 1 + dlls/cryptowinrt/tests/Makefile.in | 5 ++ dlls/cryptowinrt/tests/crypto.c | 94 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+) diff --git a/configure b/configure index f3ef73cc21c..922b3a3640e 100755 --- a/configure +++ b/configure @@ -21110,6 +21110,7 @@ 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/cryptowinrt/tests enable_tests 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 85f4f384bc4..16bada50512 100644 --- a/configure.ac +++ b/configure.ac @@ -2423,6 +2423,7 @@ 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/cryptowinrt/tests) WINE_CONFIG_MAKEFILE(dlls/cryptsp) WINE_CONFIG_MAKEFILE(dlls/cryptui) WINE_CONFIG_MAKEFILE(dlls/cryptui/tests) diff --git a/dlls/cryptowinrt/tests/Makefile.in b/dlls/cryptowinrt/tests/Makefile.in new file mode 100644 index 00000000000..af7cc510dc2 --- /dev/null +++ b/dlls/cryptowinrt/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = cryptowinrt.dll +IMPORTS = combase + +C_SRCS = \ + crypto.c diff --git a/dlls/cryptowinrt/tests/crypto.c b/dlls/cryptowinrt/tests/crypto.c new file mode 100644 index 00000000000..fc841b2c3c6 --- /dev/null +++ b/dlls/cryptowinrt/tests/crypto.c @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * 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 + */ +#define COBJMACROS +#include "initguid.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winstring.h" + +#include "roapi.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" + +#include "wine/test.h" + +#define check_interface( obj, iid ) check_interface_( __LINE__, obj, iid ) +static void check_interface_( unsigned int line, void *obj, const IID *iid ) +{ + IUnknown *iface = obj; + IUnknown *unk; + HRESULT hr; + + hr = IUnknown_QueryInterface( iface, iid, (void **)&unk ); + ok_(__FILE__, line)( hr == S_OK, "got hr %#lx.\n", hr ); + IUnknown_Release( unk ); +} + +static void test_CryptobufferStatics(void) +{ + static const WCHAR *cryptobuffer_statics_name = L"Windows.Security.Cryptography.CryptographicBuffer"; + ICryptographicBufferStatics *cryptobuffer_statics; + IActivationFactory *factory; + HSTRING str; + HRESULT hr; + LONG ref; + + hr = WindowsCreateString( cryptobuffer_statics_name, wcslen( cryptobuffer_statics_name ), &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + hr = RoGetActivationFactory( str, &IID_IActivationFactory, (void **)&factory ); + WindowsDeleteString( str ); + ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "got hr %#lx.\n", hr ); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( cryptobuffer_statics_name ) ); + return; + } + + check_interface( factory, &IID_IUnknown ); + check_interface( factory, &IID_IInspectable ); + check_interface( factory, &IID_IAgileObject ); + + hr = IActivationFactory_QueryInterface( factory, &IID_ICryptographicBufferStatics, (void **)&cryptobuffer_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = ICryptographicBufferStatics_Release( cryptobuffer_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); + ref = IActivationFactory_Release( factory ); + ok( ref == 1, "got ref %ld.\n", ref ); +} + +START_TEST(crypto) +{ + HRESULT hr; + + hr = RoInitialize( RO_INIT_MULTITHREADED ); + ok( hr == S_OK, "RoInitialize failed, hr %#lx\n", hr ); + + test_CryptobufferStatics(); + + RoUninitialize(); +}

1 0

Mohamad Al-Jaf : include: Add windows.security.credentials.idl file.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 80dc6df8fd9f5d604138338a97dde7c664f3723e URL: https://gitlab.winehq.org/wine/wine/-/commit/80dc6df8fd9f5d604138338a97dde7… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Nov 13 21:21:15 2022 -0500 include: Add windows.security.credentials.idl file. --- include/Makefile.in | 1 + include/windows.security.credentials.idl | 125 +++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 921ea4307cd..19dacb850ed 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -821,6 +821,7 @@ SOURCES = \ windows.media.idl \ windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ + windows.security.credentials.idl \ windows.security.cryptography.idl \ windows.storage.streams.idl \ windows.system.idl \ diff --git a/include/windows.security.credentials.idl b/include/windows.security.credentials.idl new file mode 100644 index 00000000000..ca682baaf0e --- /dev/null +++ b/include/windows.security.credentials.idl @@ -0,0 +1,125 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * 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 "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +/* import "windows.security.cryptography.core.idl"; */ +import "windows.storage.streams.idl"; +import "windows.system.idl"; + +namespace Windows.Security.Credentials { + typedef enum KeyCredentialCreationOption KeyCredentialCreationOption; + typedef enum KeyCredentialStatus KeyCredentialStatus; + + interface IKeyCredential; + interface IKeyCredentialManagerStatics; + interface IKeyCredentialRetrievalResult; + + runtimeclass KeyCredential; + runtimeclass KeyCredentialManager; + runtimeclass KeyCredentialRetrievalResult; + + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Security.Credentials.KeyCredentialRetrievalResult *>; + interface Windows.Foundation.IAsyncOperation<Windows.Security.Credentials.KeyCredentialRetrievalResult *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum KeyCredentialCreationOption + { + ReplaceExisting = 0, + FailIfExists = 1, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum KeyCredentialStatus + { + Success = 0, + UnknownError = 1, + NotFound = 2, + UserCanceled = 3, + UserPrefersPassword = 4, + CredentialAlreadyExists = 5, + SecurityDeviceLocked = 6, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Security.Credentials.KeyCredentialManager), + uuid(6aac468b-0ef1-4ce0-8290-4106da6a63b5) + ] + interface IKeyCredentialManagerStatics : IInspectable + { + HRESULT IsSupportedAsync([out, retval] Windows.Foundation.IAsyncOperation<boolean> **value); + HRESULT RenewAttestationAsync([out, retval] Windows.Foundation.IAsyncAction **operation); + HRESULT RequestCreateAsync(HSTRING name, Windows.Security.Credentials.KeyCredentialCreationOption option, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Security.Credentials.KeyCredentialRetrievalResult *> **value); + HRESULT OpenAsync(HSTRING name, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Security.Credentials.KeyCredentialRetrievalResult *> **value); + HRESULT DeleteAsync(HSTRING name, [out, retval] Windows.Foundation.IAsyncAction **operation); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Security.Credentials.KeyCredentialRetrievalResult), + uuid(58cd7703-8d87-4249-9b58-f6598cc9644e) + ] + interface IKeyCredentialRetrievalResult : IInspectable + { + [propget] HRESULT Credential([out, retval] Windows.Security.Credentials.KeyCredential **value); + [propget] HRESULT Status([out, retval] Windows.Security.Credentials.KeyCredentialStatus *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass KeyCredential + { + [default] interface Windows.Security.Credentials.IKeyCredential; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Security.Credentials.IKeyCredentialManagerStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass KeyCredentialManager + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass KeyCredentialRetrievalResult + { + [default] interface Windows.Security.Credentials.IKeyCredentialRetrievalResult; + } +}

1 0

Rémi Bernon : msvcrt: Fix _wdupenv_s behavior with missing env var.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: aafef01cc2a0c49ed902e63edac6da4b0278e53f URL: https://gitlab.winehq.org/wine/wine/-/commit/aafef01cc2a0c49ed902e63edac6da… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 12:21:03 2023 +0100 msvcrt: Fix _wdupenv_s behavior with missing env var. --- dlls/msvcr80/tests/msvcr80.c | 3 --- dlls/msvcrt/environ.c | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index 961bef504b6..fa04b024031 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -211,11 +211,8 @@ static void test_wdupenv_s(void) len = 0xdeadbeef; tmp = (void *)0xdeadbeef; ret = p_wdupenv_s( &tmp, &len, L"nonexistent" ); - todo_wine ok( !ret, "_wdupenv_s returned %d\n", ret ); - todo_wine ok( !len, "_wdupenv_s returned length is %Id\n", len ); - todo_wine ok( !tmp, "_wdupenv_s returned pointer is %p\n", tmp ); } diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index e9c15b732ba..2c2a3353582 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -279,7 +279,12 @@ int CDECL _wdupenv_s(wchar_t **buffer, size_t *numberOfElements, if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; - if (!(e = _wgetenv(varname))) return *_errno() = EINVAL; + if (!(e = _wgetenv(varname))) + { + *buffer = NULL; + if (numberOfElements) *numberOfElements = 0; + return 0; + } sz = wcslen(e) + 1; if (!(*buffer = malloc(sz * sizeof(wchar_t))))

1 0

Rémi Bernon : msvcrt: Fix _dupenv_s behavior with missing env var.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 5a08eab3033edf1f858776523699f333d793a8c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a08eab3033edf1f858776523699f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 12:20:30 2023 +0100 msvcrt: Fix _dupenv_s behavior with missing env var. --- dlls/msvcr80/tests/msvcr80.c | 3 --- dlls/msvcrt/environ.c | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index 34f50cd6a69..961bef504b6 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -197,11 +197,8 @@ static void test_dupenv_s(void) len = 0xdeadbeef; tmp = (void *)0xdeadbeef; ret = p_dupenv_s( &tmp, &len, "nonexistent" ); - todo_wine ok( !ret, "_dupenv_s returned %d\n", ret ); - todo_wine ok( !len, "_dupenv_s returned length is %Id\n", len ); - todo_wine ok( !tmp, "_dupenv_s returned pointer is %p\n", tmp ); } diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 729eb0560bd..e9c15b732ba 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -249,7 +249,12 @@ int CDECL _dupenv_s(char **buffer, size_t *numberOfElements, const char *varname if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; - if (!(e = getenv(varname))) return *_errno() = EINVAL; + if (!(e = getenv(varname))) + { + *buffer = NULL; + if (numberOfElements) *numberOfElements = 0; + return 0; + } sz = strlen(e) + 1; if (!(*buffer = malloc(sz)))

1 0

Rémi Bernon : msvcr80/tests: Test _wdupenv_s outcome with missing env var.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 6017344edb37e99a03617154bd54dc2d29a73b21 URL: https://gitlab.winehq.org/wine/wine/-/commit/6017344edb37e99a03617154bd54dc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 12:18:11 2023 +0100 msvcr80/tests: Test _wdupenv_s outcome with missing env var. --- dlls/msvcr80/tests/msvcr80.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index 0910dc83b3d..34f50cd6a69 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -63,6 +63,7 @@ static intptr_t (__cdecl *p__get_osfhandle)(int); static int (__cdecl *p_strcmp)(const char *, const char *); static int (__cdecl *p_strncmp)(const char *, const char *, size_t); static int (__cdecl *p_dupenv_s)(char **, size_t *, const char *); +static int (__cdecl *p_wdupenv_s)(wchar_t **, size_t *, const wchar_t *); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hcrt,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -85,6 +86,7 @@ static BOOL init(void) SET(p_strcmp, "strcmp"); SET(p_strncmp, "strncmp"); SET(p_dupenv_s, "_dupenv_s"); + SET(p_wdupenv_s, "_wdupenv_s"); return TRUE; } @@ -203,6 +205,23 @@ static void test_dupenv_s(void) ok( !tmp, "_dupenv_s returned pointer is %p\n", tmp ); } +static void test_wdupenv_s(void) +{ + wchar_t *tmp; + size_t len; + int ret; + + len = 0xdeadbeef; + tmp = (void *)0xdeadbeef; + ret = p_wdupenv_s( &tmp, &len, L"nonexistent" ); + todo_wine + ok( !ret, "_wdupenv_s returned %d\n", ret ); + todo_wine + ok( !len, "_wdupenv_s returned length is %Id\n", len ); + todo_wine + ok( !tmp, "_wdupenv_s returned pointer is %p\n", tmp ); +} + START_TEST(msvcr80) { if(!init()) @@ -211,4 +230,5 @@ START_TEST(msvcr80) test_ioinfo_flags(); test_strcmp(); test_dupenv_s(); + test_wdupenv_s(); }

1 0

Rémi Bernon : msvcr80/tests: Test _dupenv_s outcome with missing env var.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: a48d470e97e158d834fba582d707b55a05706d27 URL: https://gitlab.winehq.org/wine/wine/-/commit/a48d470e97e158d834fba582d707b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 12:18:11 2023 +0100 msvcr80/tests: Test _dupenv_s outcome with missing env var. --- dlls/msvcr80/tests/msvcr80.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index a2a3734f6c0..0910dc83b3d 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -62,6 +62,7 @@ static int (__cdecl *p__close)(int); static intptr_t (__cdecl *p__get_osfhandle)(int); static int (__cdecl *p_strcmp)(const char *, const char *); static int (__cdecl *p_strncmp)(const char *, const char *, size_t); +static int (__cdecl *p_dupenv_s)(char **, size_t *, const char *); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hcrt,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -83,6 +84,7 @@ static BOOL init(void) SET(p_strcmp, "strcmp"); SET(p_strncmp, "strncmp"); + SET(p_dupenv_s, "_dupenv_s"); return TRUE; } @@ -184,6 +186,23 @@ static void test_strcmp(void) ok( ret == 0, "wrong ret %d\n", ret ); } +static void test_dupenv_s(void) +{ + size_t len; + char *tmp; + int ret; + + len = 0xdeadbeef; + tmp = (void *)0xdeadbeef; + ret = p_dupenv_s( &tmp, &len, "nonexistent" ); + todo_wine + ok( !ret, "_dupenv_s returned %d\n", ret ); + todo_wine + ok( !len, "_dupenv_s returned length is %Id\n", len ); + todo_wine + ok( !tmp, "_dupenv_s returned pointer is %p\n", tmp ); +} + START_TEST(msvcr80) { if(!init()) @@ -191,4 +210,5 @@ START_TEST(msvcr80) test_ioinfo_flags(); test_strcmp(); + test_dupenv_s(); }

1 0

Rémi Bernon : ntdll: Avoid shrinking large heap block to small block.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 63fb16338c4017a80cbe49d0f5f232babb1a5f1a URL: https://gitlab.winehq.org/wine/wine/-/commit/63fb16338c4017a80cbe49d0f5f232… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 20 14:20:20 2023 +0100 ntdll: Avoid shrinking large heap block to small block. Even though this is a waste of memory it seems to trip on some UAF with some games. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54475 --- dlls/ntdll/heap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index afe38eddaa8..6688fab9690 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -2092,7 +2092,6 @@ static NTSTATUS heap_resize_large( struct heap *heap, ULONG flags, struct block SIZE_T old_block_size = large->block_size; *old_size = large->data_size; - if (block_size < HEAP_MIN_LARGE_BLOCK_SIZE / 4) return STATUS_NO_MEMORY; /* shrinking large block to small block */ if (old_block_size < block_size) return STATUS_NO_MEMORY; /* FIXME: we could remap zero-pages instead */

1 0

Zebediah Figura : wined3d: Disable 64-bit integer support.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 26c1edf4b242f75fb6af45ec67afbde3d9587bd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/26c1edf4b242f75fb6af45ec67afbd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 20:07:35 2022 -0600 wined3d: Disable 64-bit integer support. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index ce3f59d8af0..cf8a7aec6dc 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -299,6 +299,7 @@ static void wined3d_disable_vulkan_features(struct wined3d_physical_device_info features->shaderSampledImageArrayDynamicIndexing = VK_FALSE; features->shaderStorageBufferArrayDynamicIndexing = VK_FALSE; features->shaderStorageImageArrayDynamicIndexing = VK_FALSE; + features->shaderInt64 = VK_FALSE; features->shaderInt16 = VK_FALSE; features->shaderResourceResidency = VK_FALSE; features->shaderResourceMinLod = VK_FALSE;

1 0

Zebediah Figura : wined3d: Require shader cull distance support to create a feature level 10.0 device.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: a0043c96708bd14c182070e0cf8033f1d1bd10e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0043c96708bd14c182070e0cf8033… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 20:03:48 2022 -0600 wined3d: Require shader cull distance support to create a feature level 10.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 21b1875c619..ce3f59d8af0 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2258,6 +2258,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->features2.features.depthBiasClamp && info->features2.features.pipelineStatisticsQuery && info->features2.features.shaderClipDistance + && info->features2.features.shaderCullDistance && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2023