February 2022 - Wine-commits

Rémi Bernon : dinput/tests: Merge dinput8.c tests with dinput.c.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 0c3686f5497561051b2c38b8e9e9648103af92ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c3686f5497561051b2c38b8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:24 2022 +0100 dinput/tests: Merge dinput8.c tests with dinput.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/dinput.c | 1096 +++++++++++++++++++++++++++-------------- dlls/dinput/tests/dinput8.c | 728 --------------------------- 3 files changed, 723 insertions(+), 1102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c3686f5497561051b2c…

1 0

Rémi Bernon : dinput/tests: Add some CoCreateInstance and aggregation tests.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 22663565428264c32aeb00243b28baa2bbfe85de URL: https://source.winehq.org/git/wine.git/?a=commit;h=22663565428264c32aeb0024… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:25 2022 +0100 dinput/tests: Add some CoCreateInstance and aggregation tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 795a9ed39c6..a2c7f5dbd8d 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -76,6 +76,41 @@ static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *con return DIENUM_STOP; } +static HRESULT WINAPI outer_QueryInterface( IUnknown *iface, REFIID iid, void **obj ) +{ + ok( 0, "unexpected call %s\n", debugstr_guid( iid ) ); + + if (IsEqualGUID( iid, &IID_IUnknown )) + { + *obj = (IUnknown *)iface; + return S_OK; + } + + ok( 0, "unexpected call %s\n", debugstr_guid( iid ) ); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef( IUnknown *iface ) +{ + ok( 0, "unexpected call\n" ); + return 2; +} + +static ULONG WINAPI outer_Release( IUnknown *iface ) +{ + ok( 0, "unexpected call\n" ); + return 1; +} + +static IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown outer = {&outer_vtbl}; + static void test_CoCreateInstance( DWORD version ) { static const struct @@ -113,6 +148,7 @@ static void test_CoCreateInstance( DWORD version ) IDirectInputDeviceA *device; IDirectInputA *dinput; + IUnknown *unknown; HRESULT hr; LONG ref; int i; @@ -127,6 +163,14 @@ static void test_CoCreateInstance( DWORD version ) return; } + if (version < 0x800) hr = CoCreateInstance( &CLSID_DirectInput, &outer, CLSCTX_INPROC_SERVER, + &IID_IDirectInputA, (void **)&unknown ); + else hr = CoCreateInstance( &CLSID_DirectInput8, &outer, CLSCTX_INPROC_SERVER, + &IID_IDirectInput8A, (void **)&unknown ); + todo_wine + ok( hr == CLASS_E_NOAGGREGATION, "CoCreateInstance returned %#x\n", hr ); + if (SUCCEEDED( hr )) IUnknown_Release( unknown ); + for (i = 0; i < ARRAY_SIZE(create_device_tests); i++) { winetest_push_context( "%u", i ); @@ -204,6 +248,14 @@ static void test_DirectInputCreate( DWORD version ) HRESULT hr; int i; + unknown = (void *)0xdeadbeef; + hr = DirectInputCreateW( hInstance, version, (IDirectInputW **)&unknown, &outer ); + todo_wine_if(version == 0x800) + ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); + todo_wine_if(version <= 0x700) + ok( unknown == NULL, "got IUnknown %p\n", unknown ); + if (unknown) IUnknown_Release( unknown ); + for (i = 0; i < ARRAY_SIZE(create_tests); i++) { winetest_push_context( "%u", i ); @@ -271,6 +323,14 @@ static void test_DirectInputCreateEx( DWORD version ) return; } + unknown = (void *)0xdeadbeef; + hr = pDirectInputCreateEx( hInstance, version, &IID_IDirectInputW, (void **)&unknown, &outer ); + todo_wine_if(version == 0x800) + ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); + todo_wine_if(version <= 0x700) + ok( unknown == NULL, "got IUnknown %p\n", unknown ); + if (unknown) IUnknown_Release( unknown ); + for (i = 0; i < ARRAY_SIZE(create_tests); i++) { winetest_push_context( "%u", i ); @@ -356,6 +416,13 @@ static void test_DirectInput8Create( DWORD version ) HRESULT hr; int i; + unknown = (void *)0xdeadbeef; + hr = DirectInput8Create( hInstance, version, &IID_IDirectInput8W, (void **)&unknown, &outer ); + ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); + todo_wine + ok( unknown == NULL, "got IUnknown %p\n", unknown ); + if (unknown) IUnknown_Release( unknown ); + for (i = 0; i < ARRAY_SIZE(create_tests); i++) { winetest_push_context( "%u", i );

1 0

Rémi Bernon : dinput: Cleanup DllGetClassObject and IClassFactory implementation.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: ac7ff2611d418ea40bfa6cbf4c92bd793b2e4349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac7ff2611d418ea40bfa6cbf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:26 2022 +0100 dinput: Cleanup DllGetClassObject and IClassFactory implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 121 +++++++++++++++++++++++---------------------- dlls/dinput/tests/dinput.c | 1 - 2 files changed, 63 insertions(+), 59 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index dbb727c3c43..2172eb32ee9 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1089,90 +1089,95 @@ static const IDirectInputJoyConfig8Vtbl JoyConfig8vt = JoyConfig8Impl_OpenAppStatusKey }; -/******************************************************************************* - * DirectInput ClassFactory - */ -typedef struct +struct class_factory { - /* IUnknown fields */ IClassFactory IClassFactory_iface; - LONG ref; -} IClassFactoryImpl; +}; -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +static inline struct class_factory *impl_from_IClassFactory( IClassFactory *iface ) { - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); + return CONTAINING_RECORD( iface, struct class_factory, IClassFactory_iface ); } -static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); +static HRESULT WINAPI class_factory_QueryInterface( IClassFactory *iface, REFIID iid, void **out ) +{ + struct class_factory *impl = impl_from_IClassFactory(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IClassFactory)) + *out = &impl->IClassFactory_iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } -static ULONG WINAPI DICF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - return InterlockedIncrement(&(This->ref)); +static ULONG WINAPI class_factory_AddRef( IClassFactory *iface ) +{ + return 2; } -static ULONG WINAPI DICF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - /* static class, won't be freed */ - return InterlockedDecrement(&(This->ref)); +static ULONG WINAPI class_factory_Release( IClassFactory *iface ) +{ + return 1; } -static HRESULT WINAPI DICF_CreateInstance( - LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj -) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); +static HRESULT WINAPI class_factory_CreateInstance( IClassFactory *iface, IUnknown *outer, REFIID iid, void **out ) +{ + IUnknown *unknown; + HRESULT hr; - TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); - if ( IsEqualGUID( &IID_IUnknown, riid ) || - IsEqualGUID( &IID_IDirectInputA, riid ) || - IsEqualGUID( &IID_IDirectInputW, riid ) || - IsEqualGUID( &IID_IDirectInput2A, riid ) || - IsEqualGUID( &IID_IDirectInput2W, riid ) || - IsEqualGUID( &IID_IDirectInput7A, riid ) || - IsEqualGUID( &IID_IDirectInput7W, riid ) || - IsEqualGUID( &IID_IDirectInput8A, riid ) || - IsEqualGUID( &IID_IDirectInput8W, riid ) ) - { - return create_directinput_instance(riid, ppobj, NULL); - } + TRACE( "iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid( iid ), out ); + + if (outer) return CLASS_E_NOAGGREGATION; - FIXME("(%p,%p,%s,%p) Interface not found!\n",This,pOuter,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; + if (FAILED(hr = create_directinput_instance( &IID_IUnknown, (void **)&unknown, NULL ))) return hr; + hr = IUnknown_QueryInterface( unknown, iid, out ); + IUnknown_Release( unknown ); + + return hr; } -static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("(%p)->(%d),stub!\n",This,dolock); - return S_OK; +static HRESULT WINAPI class_factory_LockServer( IClassFactory *iface, BOOL lock ) +{ + FIXME( "iface %p, lock %d stub!\n", iface, lock ); + return S_OK; } -static const IClassFactoryVtbl DICF_Vtbl = { - DICF_QueryInterface, - DICF_AddRef, - DICF_Release, - DICF_CreateInstance, - DICF_LockServer +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, }; -static IClassFactoryImpl DINPUT_CF = {{&DICF_Vtbl}, 1 }; + +static struct class_factory class_factory = {{&class_factory_vtbl}}; /*********************************************************************** * DllGetClassObject (DINPUT.@) */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **out ) { - TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) { - *ppv = &DINPUT_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } + TRACE( "clsid %s, iid %s, out %p.\n", debugstr_guid( clsid ), debugstr_guid( iid ), out ); + +#if DIRECTINPUT_VERSION == 0x0700 + if (IsEqualCLSID( &CLSID_DirectInput, clsid )) + return IClassFactory_QueryInterface( &class_factory.IClassFactory_iface, iid, out ); +#else + if (IsEqualCLSID( &CLSID_DirectInput8, clsid )) + return IClassFactory_QueryInterface( &class_factory.IClassFactory_iface, iid, out ); +#endif - FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + WARN( "%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid( clsid ) ); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index a2c7f5dbd8d..0b3ce276e52 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -167,7 +167,6 @@ static void test_CoCreateInstance( DWORD version ) &IID_IDirectInputA, (void **)&unknown ); else hr = CoCreateInstance( &CLSID_DirectInput8, &outer, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (void **)&unknown ); - todo_wine ok( hr == CLASS_E_NOAGGREGATION, "CoCreateInstance returned %#x\n", hr ); if (SUCCEEDED( hr )) IUnknown_Release( unknown );

1 0

Rémi Bernon : dinput: Cleanup IDirectInputJoyConfig8 names and traces.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 44f7ccfcd19be8fea74ba4099796a1a676ed3d5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=44f7ccfcd19be8fea74ba409… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:27 2022 +0100 dinput: Cleanup IDirectInputJoyConfig8 names and traces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 137 +++++++++++++++++++++++----------------------- 1 file changed, 70 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44f7ccfcd19be8fea74b…

1 0

Rémi Bernon : dinput: Cleanup IDirectInput7W names and traces.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: d33103bf0577dc7a76791bafd23b150e44a1a832 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d33103bf0577dc7a76791baf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:28 2022 +0100 dinput: Cleanup IDirectInput7W names and traces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 184 ++++++++++++++++++++++------------------------ 1 file changed, 86 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d33103bf0577dc7a7679…

1 0

Rémi Bernon : dinput: Cleanup IDirectInput8W names and traces.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 73ba9d34597dadafefbabf20bba43cdfd07a4965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73ba9d34597dadafefbabf20… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:29 2022 +0100 dinput: Cleanup IDirectInput8W names and traces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 157 ++++++++++++++++++++++------------------------ 1 file changed, 76 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73ba9d34597dadafefba…

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: cf4eecbf4f7326f7fe14b10c544f07211217cd74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4eecbf4f7326f7fe14b10c… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Feb 5 10:30:22 2022 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/po/nl.po b/po/nl.po index 51a3e0f88e8..f174bf9c3e8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-22 10:00+0100\n" +"PO-Revision-Date: 2022-02-05 10:30+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -6972,54 +6972,40 @@ msgid "This network connection does not exist.\n" msgstr "Deze netwerkverbinding bestaat niet.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "Ongeldig op interruptietijd.\n" +msgstr "Oproep onderbroken.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "Ongeldige handle.\n" +msgstr "Ongeldige bestandsingang.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "Ongeldig netwerkadres.\n" +msgstr "Ongeldig pointeradres.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "Ongeldige naam.\n" +msgstr "Ongeldig argument.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Verbinding opnieuw ingesteld door gelijkwaardige computer.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "Punt niet gevonden.\n" +msgstr "Host niet gevonden.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "Kenmerk is niet gevonden.\n" +msgstr "Niet-gemachtigde host niet gevonden.\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "Onherstelbare fout opgetreden.\n" +msgstr "Onherstelbare fout.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "Geldige naam, geen gegevensrecord.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n"

1 0

Andrey Gusev : api-ms-win-security-lsalookup-ansi-l2-1-0: Add dll.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 0894a4ad48c14f40956c7cc85c5ffc12985442d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0894a4ad48c14f40956c7cc8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Feb 4 14:52:40 2022 +0200 api-ms-win-security-lsalookup-ansi-l2-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in | 1 + .../api-ms-win-security-lsalookup-ansi-l2-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index 2d4aed06f6f..4a9f9010f94 100755 --- a/configure +++ b/configure @@ -1158,6 +1158,7 @@ enable_api_ms_win_security_base_private_l1_1_1 enable_api_ms_win_security_credentials_l1_1_0 enable_api_ms_win_security_cryptoapi_l1_1_0 enable_api_ms_win_security_grouppolicy_l1_1_0 +enable_api_ms_win_security_lsalookup_ansi_l2_1_0 enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 enable_api_ms_win_security_lsalookup_l2_1_0 @@ -21652,6 +21653,7 @@ wine_fn_config_makefile dlls/api-ms-win-security-base-private-l1-1-1 enable_api_ wine_fn_config_makefile dlls/api-ms-win-security-credentials-l1-1-0 enable_api_ms_win_security_credentials_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-cryptoapi-l1-1-0 enable_api_ms_win_security_cryptoapi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-grouppolicy-l1-1-0 enable_api_ms_win_security_grouppolicy_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-security-lsalookup-ansi-l2-1-0 enable_api_ms_win_security_lsalookup_ansi_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-security-lsalookup-l2-1-0 enable_api_ms_win_security_lsalookup_l2_1_0 diff --git a/configure.ac b/configure.ac index 63e7aa7f5dd..e51e114c45e 100644 --- a/configure.ac +++ b/configure.ac @@ -2545,6 +2545,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-credentials-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-cryptoapi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-grouppolicy-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-ansi-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l2-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in new file mode 100644 index 00000000000..3a880198bd7 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-ansi-l2-1-0.dll diff --git a/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec new file mode 100644 index 00000000000..fcb48049250 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec @@ -0,0 +1,5 @@ +@ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) advapi32.LookupAccountNameA +@ stdcall LookupAccountSidA(str ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidA +@ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) advapi32.LookupPrivilegeDisplayNameA +@ stdcall LookupPrivilegeNameA(str ptr ptr ptr) advapi32.LookupPrivilegeNameA +@ stdcall LookupPrivilegeValueA(str str ptr) advapi32.LookupPrivilegeValueA diff --git a/tools/make_specfiles b/tools/make_specfiles index b5e6443dd3c..594e01396db 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -137,6 +137,7 @@ my @dll_groups = "api-ms-win-security-base-private-l1-1-1", "api-ms-win-security-credentials-l1-1-0", "api-ms-win-security-cryptoapi-l1-1-0", + "api-ms-win-security-lsalookup-ansi-l2-1-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-lsalookup-l1-1-1", "api-ms-win-security-lsalookup-l2-1-0",

1 0

Alexandre Julliard : faudio: Import upstream release 22.02.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 6446382c74ccafcf006bf86af17c12e9ef3467be URL: https://source.winehq.org/git/wine.git/?a=commit;h=6446382c74ccafcf006bf86a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 7 11:53:56 2022 +0100 faudio: Import upstream release 22.02. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FAudio_platform_win32.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h index 28fa62c4fc5..eb3d5dea80b 100644 --- a/libs/faudio/include/FAudio.h +++ b/libs/faudio/include/FAudio.h @@ -485,7 +485,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; #define FAUDIO_ABI_VERSION 0 #define FAUDIO_MAJOR_VERSION 22 -#define FAUDIO_MINOR_VERSION 1 +#define FAUDIO_MINOR_VERSION 2 #define FAUDIO_PATCH_VERSION 0 #define FAUDIO_COMPILED_VERSION ( \ diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index 89101a6cf7a..9edb2b21bff 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -399,6 +399,12 @@ uint32_t FAudio_PlatformGetDeviceCount(void) eConsole, &device ); + + if (hr == E_NOTFOUND) { + FAudio_PlatformRelease(); + return 0; + } + FAudio_assert(!FAILED(hr) && "Failed to get default audio endpoint!"); IMMDevice_Release(device); @@ -1191,8 +1197,8 @@ static void FAudio_INTERNAL_DecodeWMAMF( uint32_t samples ) { const FAudioWaveFormatExtensible *wfx = (FAudioWaveFormatExtensible *)voice->src.format; + size_t samples_pos, samples_size, copy_size = 0; struct FAudioWMADEC *impl = voice->src.wmadec; - size_t samples_pos, samples_size, copy_size; HRESULT hr; LOG_FUNC_ENTER(voice->audio) @@ -1264,8 +1270,12 @@ static void FAudio_INTERNAL_DecodeWMAMF( impl->input_size = 0; } - copy_size = FAudio_clamp(impl->output_pos - samples_pos, 0, samples_size); - FAudio_memcpy(decodeCache, impl->output_buf + samples_pos, copy_size); + if (impl->output_pos > samples_pos) + { + copy_size = FAudio_min(impl->output_pos - samples_pos, samples_size); + FAudio_memcpy(decodeCache, impl->output_buf + samples_pos, copy_size); + } + FAudio_zero(decodeCache + copy_size, samples_size - copy_size); LOG_INFO( voice->audio, "decoded %x / %x bytes, copied %x / %x bytes",

1 0

Nikolay Sivov : rtworkq/tests: Build without WINE_NO_LONG_TYPES.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 6d7aeedec2de0a06e87797b0f0d97231220fdd6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7aeedec2de0a06e87797b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 7 11:33:30 2022 +0300 rtworkq/tests: Build without WINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/tests/Makefile.in | 1 - dlls/rtworkq/tests/rtworkq.c | 32 ++++++++++++++++---------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/rtworkq/tests/Makefile.in b/dlls/rtworkq/tests/Makefile.in index 7a2f6db51c7..8354cd810d1 100644 --- a/dlls/rtworkq/tests/Makefile.in +++ b/dlls/rtworkq/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = rtworkq.dll IMPORTS = rtworkq ole32 diff --git a/dlls/rtworkq/tests/rtworkq.c b/dlls/rtworkq/tests/rtworkq.c index 627e024d761..2ff74d57b84 100644 --- a/dlls/rtworkq/tests/rtworkq.c +++ b/dlls/rtworkq/tests/rtworkq.c @@ -33,72 +33,72 @@ static void test_platform_init(void) /* Startup initializes MTA. */ hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr); hr = RtwqStartup(); - ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr); /* Try with STA initialized before startup. */ hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqStartup(); - ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); CoUninitialize(); /* Startup -> init main STA -> uninitialize -> shutdown */ hr = RtwqStartup(); - ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); CoUninitialize(); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); } START_TEST(rtworkq)

1 0