November 2023 - Wine-commits

Rémi Bernon : twinapi.appcore: Stub Windows.System.Profile.AnalyticsInfo runtimeclass.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: f082ff9e5cbec6aad3fb2ceb34c4b6324508ccf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f082ff9e5cbec6aad3fb2ceb34c4b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 12:25:32 2023 +0100 twinapi.appcore: Stub Windows.System.Profile.AnalyticsInfo runtimeclass. --- dlls/twinapi.appcore/analytics_info.c | 104 +++++++++++++++++++++++++++++++++- dlls/twinapi.appcore/tests/twinapi.c | 11 ++++ 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/twinapi.appcore/analytics_info.c b/dlls/twinapi.appcore/analytics_info.c index efbd623a046..8ab7610dcf3 100644 --- a/dlls/twinapi.appcore/analytics_info.c +++ b/dlls/twinapi.appcore/analytics_info.c @@ -21,6 +21,98 @@ WINE_DEFAULT_DEBUG_CHANNEL(twinapi); +struct analytics_version_info +{ + IAnalyticsVersionInfo IAnalyticsVersionInfo_iface; + LONG ref; +}; + +static inline struct analytics_version_info *impl_from_IAnalyticsVersionInfo( IAnalyticsVersionInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct analytics_version_info, IAnalyticsVersionInfo_iface ); +} + +static HRESULT WINAPI analytics_version_info_QueryInterface( IAnalyticsVersionInfo *iface, REFIID iid, void **out ) +{ + struct analytics_version_info *impl = impl_from_IAnalyticsVersionInfo( 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_IAnalyticsVersionInfo )) + { + IAnalyticsVersionInfo_AddRef( (*out = &impl->IAnalyticsVersionInfo_iface) ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI analytics_version_info_AddRef( IAnalyticsVersionInfo *iface ) +{ + struct analytics_version_info *impl = impl_from_IAnalyticsVersionInfo( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI analytics_version_info_Release( IAnalyticsVersionInfo *iface ) +{ + struct analytics_version_info *impl = impl_from_IAnalyticsVersionInfo( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + if (!ref) free( impl ); + return ref; +} + +static HRESULT WINAPI analytics_version_info_GetIids( IAnalyticsVersionInfo *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 WINAPI analytics_version_info_GetRuntimeClassName( IAnalyticsVersionInfo *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI analytics_version_info_GetTrustLevel( IAnalyticsVersionInfo *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI analytics_version_info_get_DeviceFamily( IAnalyticsVersionInfo *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI analytics_version_info_get_DeviceFamilyVersion( IAnalyticsVersionInfo *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static IAnalyticsVersionInfoVtbl analytics_version_info_vtbl = +{ + analytics_version_info_QueryInterface, + analytics_version_info_AddRef, + analytics_version_info_Release, + /* IInspectable methods */ + analytics_version_info_GetIids, + analytics_version_info_GetRuntimeClassName, + analytics_version_info_GetTrustLevel, + /* IAnalyticsVersionInfo methods */ + analytics_version_info_get_DeviceFamily, + analytics_version_info_get_DeviceFamilyVersion, +}; + struct analytics_info_factory { IActivationFactory IActivationFactory_iface; @@ -116,8 +208,16 @@ DEFINE_IINSPECTABLE( statics, IAnalyticsInfoStatics, struct analytics_info_facto static HRESULT WINAPI statics_get_VersionInfo( IAnalyticsInfoStatics *iface, IAnalyticsVersionInfo **value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct analytics_version_info *info; + + TRACE( "iface %p, out %p.\n", iface, value ); + + if (!(info = calloc( 1, sizeof(*info) ))) return E_OUTOFMEMORY; + info->IAnalyticsVersionInfo_iface.lpVtbl = &analytics_version_info_vtbl; + info->ref = 1; + + *value = &info->IAnalyticsVersionInfo_iface; + return S_OK; } static HRESULT WINAPI statics_get_DeviceForm( IAnalyticsInfoStatics *iface, HSTRING *value ) diff --git a/dlls/twinapi.appcore/tests/twinapi.c b/dlls/twinapi.appcore/tests/twinapi.c index 0e8181aee7a..358cd6719a8 100644 --- a/dlls/twinapi.appcore/tests/twinapi.c +++ b/dlls/twinapi.appcore/tests/twinapi.c @@ -115,6 +115,7 @@ static void test_AnalyticsVersionInfo(void) { static const WCHAR *class_name = RuntimeClass_Windows_System_Profile_AnalyticsInfo; IAnalyticsInfoStatics *analytics_info_statics; + IAnalyticsVersionInfo *analytics_version_info; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -139,6 +140,16 @@ static void test_AnalyticsVersionInfo(void) hr = IActivationFactory_QueryInterface( factory, &IID_IAnalyticsInfoStatics, (void **)&analytics_info_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IAnalyticsInfoStatics_get_VersionInfo( analytics_info_statics, &analytics_version_info ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + check_interface( analytics_version_info, &IID_IUnknown, TRUE ); + check_interface( analytics_version_info, &IID_IInspectable, TRUE ); + check_interface( analytics_version_info, &IID_IAgileObject, TRUE ); + + ref = IAnalyticsVersionInfo_Release( analytics_version_info ); + ok( ref == 0, "got ref %ld.\n", ref ); + ref = IAnalyticsInfoStatics_Release( analytics_info_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Rémi Bernon : twinapi.appcore: Implement Windows.System.Profile.AnalyticsInfo_get_DeviceFamily.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 377aac9c6aebb897fdefb50e8ad12217eef07d7b URL: https://gitlab.winehq.org/wine/wine/-/commit/377aac9c6aebb897fdefb50e8ad122… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 12:02:30 2023 +0100 twinapi.appcore: Implement Windows.System.Profile.AnalyticsInfo_get_DeviceFamily. --- dlls/twinapi.appcore/analytics_info.c | 4 ++-- dlls/twinapi.appcore/tests/twinapi.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/twinapi.appcore/analytics_info.c b/dlls/twinapi.appcore/analytics_info.c index 8ab7610dcf3..ee640e54daf 100644 --- a/dlls/twinapi.appcore/analytics_info.c +++ b/dlls/twinapi.appcore/analytics_info.c @@ -89,8 +89,8 @@ static HRESULT WINAPI analytics_version_info_GetTrustLevel( IAnalyticsVersionInf static HRESULT WINAPI analytics_version_info_get_DeviceFamily( IAnalyticsVersionInfo *iface, HSTRING *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + TRACE( "iface %p, value %p\n", iface, value ); + return WindowsCreateString( L"Windows.Desktop", wcslen( L"Windows.Desktop" ), value ); } static HRESULT WINAPI analytics_version_info_get_DeviceFamilyVersion( IAnalyticsVersionInfo *iface, HSTRING *value ) diff --git a/dlls/twinapi.appcore/tests/twinapi.c b/dlls/twinapi.appcore/tests/twinapi.c index 358cd6719a8..a32b232af9a 100644 --- a/dlls/twinapi.appcore/tests/twinapi.c +++ b/dlls/twinapi.appcore/tests/twinapi.c @@ -117,8 +117,9 @@ static void test_AnalyticsVersionInfo(void) IAnalyticsInfoStatics *analytics_info_statics; IAnalyticsVersionInfo *analytics_version_info; IActivationFactory *factory; - HSTRING str; + HSTRING str, expect_str; HRESULT hr; + INT32 res; LONG ref; hr = WindowsCreateString( class_name, wcslen( class_name ), &str ); @@ -147,6 +148,16 @@ static void test_AnalyticsVersionInfo(void) check_interface( analytics_version_info, &IID_IInspectable, TRUE ); check_interface( analytics_version_info, &IID_IAgileObject, TRUE ); + hr = WindowsCreateString( L"Windows.Desktop", wcslen( L"Windows.Desktop" ), &expect_str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IAnalyticsVersionInfo_get_DeviceFamily( analytics_version_info, &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = WindowsCompareStringOrdinal( str, expect_str, &res ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( !res, "got unexpected string %s.\n", debugstr_hstring(str) ); + WindowsDeleteString( str ); + WindowsDeleteString( expect_str ); + ref = IAnalyticsVersionInfo_Release( analytics_version_info ); ok( ref == 0, "got ref %ld.\n", ref );

1 0

Rémi Bernon : twinapi.appcore: Implement Windows.System.Profile.AnalyticsInfo_get_DeviceFamilyVersion.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 2b22cf580e9281760e69e0c64a6a444aa68ccfe6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b22cf580e9281760e69e0c64a6a44… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 12:02:30 2023 +0100 twinapi.appcore: Implement Windows.System.Profile.AnalyticsInfo_get_DeviceFamilyVersion. --- dlls/twinapi.appcore/Makefile.in | 2 +- dlls/twinapi.appcore/analytics_info.c | 21 +++++++++++++++++++-- dlls/twinapi.appcore/tests/Makefile.in | 2 +- dlls/twinapi.appcore/tests/twinapi.c | 23 +++++++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/twinapi.appcore/Makefile.in b/dlls/twinapi.appcore/Makefile.in index 0b15039e768..c115182d948 100644 --- a/dlls/twinapi.appcore/Makefile.in +++ b/dlls/twinapi.appcore/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -D_CONTRACT_GEN MODULE = twinapi.appcore.dll -IMPORTS = combase +IMPORTS = combase advapi32 SOURCES = \ analytics_info.c \ diff --git a/dlls/twinapi.appcore/analytics_info.c b/dlls/twinapi.appcore/analytics_info.c index ee640e54daf..abbdb621e1d 100644 --- a/dlls/twinapi.appcore/analytics_info.c +++ b/dlls/twinapi.appcore/analytics_info.c @@ -19,6 +19,8 @@ #include "private.h" +#include "winternl.h" + WINE_DEFAULT_DEBUG_CHANNEL(twinapi); struct analytics_version_info @@ -95,8 +97,23 @@ static HRESULT WINAPI analytics_version_info_get_DeviceFamily( IAnalyticsVersion static HRESULT WINAPI analytics_version_info_get_DeviceFamilyVersion( IAnalyticsVersionInfo *iface, HSTRING *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + DWORD revision, size; + WCHAR buffer[32]; + UINT64 version; + UINT len; + + TRACE( "iface %p, value %p\n", iface, value ); + + if (RegGetValueW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"UBR", + RRF_RT_REG_DWORD, NULL, &revision, &size )) + revision = 0; + version = NtCurrentTeb()->Peb->OSMajorVersion & 0xffff; + version = (version << 16) | (NtCurrentTeb()->Peb->OSMinorVersion & 0xffff); + version = (version << 16) | (NtCurrentTeb()->Peb->OSBuildNumber & 0xffff); + version = (version << 16) | revision; + + len = swprintf( buffer, ARRAY_SIZE(buffer), L"%I64u", version ); + return WindowsCreateString( buffer, len, value ); } static IAnalyticsVersionInfoVtbl analytics_version_info_vtbl = diff --git a/dlls/twinapi.appcore/tests/Makefile.in b/dlls/twinapi.appcore/tests/Makefile.in index 65db4bdd3e6..292924c91e2 100644 --- a/dlls/twinapi.appcore/tests/Makefile.in +++ b/dlls/twinapi.appcore/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = twinapi.appcore.dll -IMPORTS = combase +IMPORTS = combase advapi32 SOURCES = \ twinapi.c diff --git a/dlls/twinapi.appcore/tests/twinapi.c b/dlls/twinapi.appcore/tests/twinapi.c index a32b232af9a..17c572e0f3a 100644 --- a/dlls/twinapi.appcore/tests/twinapi.c +++ b/dlls/twinapi.appcore/tests/twinapi.c @@ -25,6 +25,7 @@ #define COBJMACROS #include "initguid.h" #include "winstring.h" +#include "winternl.h" #include "roapi.h" #define WIDL_using_Windows_Foundation @@ -118,6 +119,9 @@ static void test_AnalyticsVersionInfo(void) IAnalyticsVersionInfo *analytics_version_info; IActivationFactory *factory; HSTRING str, expect_str; + DWORD revision, size; + WCHAR buffer[32]; + UINT64 version; HRESULT hr; INT32 res; LONG ref; @@ -158,6 +162,25 @@ static void test_AnalyticsVersionInfo(void) WindowsDeleteString( str ); WindowsDeleteString( expect_str ); + if (RegGetValueW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"UBR", + RRF_RT_REG_DWORD, NULL, &revision, &size )) + revision = 0; + version = NtCurrentTeb()->Peb->OSMajorVersion & 0xffff; + version = (version << 16) | (NtCurrentTeb()->Peb->OSMinorVersion & 0xffff); + version = (version << 16) | (NtCurrentTeb()->Peb->OSBuildNumber & 0xffff); + version = (version << 16) | revision; + + res = swprintf( buffer, ARRAY_SIZE(buffer), L"%I64u", version ); + hr = WindowsCreateString( buffer, res, &expect_str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IAnalyticsVersionInfo_get_DeviceFamilyVersion( analytics_version_info, &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = WindowsCompareStringOrdinal( str, expect_str, &res ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( !res || broken(revision == 0) /* Win11 */, "got unexpected string %s.\n", debugstr_hstring(str) ); + WindowsDeleteString( str ); + WindowsDeleteString( expect_str ); + ref = IAnalyticsVersionInfo_Release( analytics_version_info ); ok( ref == 0, "got ref %ld.\n", ref );

1 0

Rémi Bernon : include: Add Windows.System.UserProfile.AdvertisingManager runtimeclass.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 81fb29bfb632f3f107b3a8e0e40183323648621d URL: https://gitlab.winehq.org/wine/wine/-/commit/81fb29bfb632f3f107b3a8e0e40183… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 28 13:46:13 2023 +0100 include: Add Windows.System.UserProfile.AdvertisingManager runtimeclass. --- include/windows.system.userprofile.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/windows.system.userprofile.idl b/include/windows.system.userprofile.idl index 255ea7dcf6d..672f520c37a 100644 --- a/include/windows.system.userprofile.idl +++ b/include/windows.system.userprofile.idl @@ -31,9 +31,12 @@ import "windows.globalization.idl"; namespace Windows.System.UserProfile { + interface IAdvertisingManagerStatics; + interface IAdvertisingManagerStatics2; interface IGlobalizationPreferencesStatics; interface IGlobalizationPreferencesStatics2; interface IGlobalizationPreferencesStatics3; + runtimeclass AdvertisingManager; runtimeclass GlobalizationPreferences; [ @@ -51,6 +54,16 @@ namespace Windows.System.UserProfile { [propget] HRESULT WeekStartsOn([out, retval] Windows.Globalization.DayOfWeek *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.System.UserProfile.AdvertisingManager), + uuid(add3468c-a273-48cb-b346-3544522d5581), + ] + interface IAdvertisingManagerStatics : IInspectable + { + [propget] HRESULT AdvertisingId([out, retval] HSTRING *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -62,4 +75,14 @@ namespace Windows.System.UserProfile { { } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(standard), + static(Windows.System.UserProfile.IAdvertisingManagerStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.System.UserProfile.IAdvertisingManagerStatics2, Windows.Foundation.UniversalApiContract, 3.0), + ] + runtimeclass AdvertisingManager + { + } + }

1 0

Rémi Bernon : twinapi.appcore: Stub Windows.System.UserProfile.AdvertisingManager factory.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: abc0c3c129c3ba956463ad4e1522abdc91db4d56 URL: https://gitlab.winehq.org/wine/wine/-/commit/abc0c3c129c3ba956463ad4e1522ab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 12:02:50 2023 +0100 twinapi.appcore: Stub Windows.System.UserProfile.AdvertisingManager factory. --- dlls/twinapi.appcore/Makefile.in | 1 + dlls/twinapi.appcore/advertising_manager.c | 143 +++++++++++++++++++++++++++++ dlls/twinapi.appcore/classes.idl | 2 + dlls/twinapi.appcore/main.c | 2 + dlls/twinapi.appcore/private.h | 1 + dlls/twinapi.appcore/tests/twinapi.c | 47 +++++++++- dlls/windows.globalization/classes.idl | 1 + include/windows.system.userprofile.idl | 4 + 8 files changed, 196 insertions(+), 5 deletions(-)

1 0

Rémi Bernon : twinapi.appcore: Return success from AdvertisingManager_get_AdvertisingId stub.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: e04c976fa95776300ee5b485a6b65c0071d3bb84 URL: https://gitlab.winehq.org/wine/wine/-/commit/e04c976fa95776300ee5b485a6b65c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 12:33:10 2023 +0100 twinapi.appcore: Return success from AdvertisingManager_get_AdvertisingId stub. --- dlls/twinapi.appcore/advertising_manager.c | 2 +- dlls/twinapi.appcore/tests/twinapi.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/twinapi.appcore/advertising_manager.c b/dlls/twinapi.appcore/advertising_manager.c index a61a57c01fa..6a861e2883d 100644 --- a/dlls/twinapi.appcore/advertising_manager.c +++ b/dlls/twinapi.appcore/advertising_manager.c @@ -117,7 +117,7 @@ DEFINE_IINSPECTABLE( statics, IAdvertisingManagerStatics, struct factory, IActiv static HRESULT WINAPI statics_get_AdvertisingId( IAdvertisingManagerStatics *iface, HSTRING *out ) { FIXME( "iface %p, out %p stub!\n", iface, out ); - return E_NOTIMPL; + return WindowsCreateString( NULL, 0, out ); } static const struct IAdvertisingManagerStaticsVtbl statics_vtbl = diff --git a/dlls/twinapi.appcore/tests/twinapi.c b/dlls/twinapi.appcore/tests/twinapi.c index e5251475e57..5ee5c45fc91 100644 --- a/dlls/twinapi.appcore/tests/twinapi.c +++ b/dlls/twinapi.appcore/tests/twinapi.c @@ -220,6 +220,10 @@ static void test_AdvertisingManager(void) hr = IActivationFactory_QueryInterface( factory, &IID_IAdvertisingManagerStatics, (void **)&advertising_manager_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IAdvertisingManagerStatics_get_AdvertisingId( advertising_manager_statics, &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + WindowsDeleteString( str ); + ref = IAdvertisingManagerStatics_Release( advertising_manager_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Alfred Agrell : winegstreamer: Implement DMO interface for WMA decoder.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 33d9310a9f0bc0f723e58afa3c5a217ac83ccd5f URL: https://gitlab.winehq.org/wine/wine/-/commit/33d9310a9f0bc0f723e58afa3c5a21… Author: Alfred Agrell <floating(a)muncher.se> Date: Mon Nov 20 22:57:39 2023 +0100 winegstreamer: Implement DMO interface for WMA decoder. --- dlls/mf/tests/transform.c | 36 +----- dlls/winegstreamer/wma_decoder.c | 243 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 228 insertions(+), 51 deletions(-)

1 0

Alfred Agrell : mf/tests: Test IMediaObject_GetOutputSizeInfo.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 9c78628f14924f800f77996777676fb7afd6652b URL: https://gitlab.winehq.org/wine/wine/-/commit/9c78628f14924f800f77996777676f… Author: Alfred Agrell <floating(a)muncher.se> Date: Mon Nov 20 22:57:39 2023 +0100 mf/tests: Test IMediaObject_GetOutputSizeInfo. --- dlls/mf/tests/transform.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 460b354c9d1..e228dcf12ac 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -3534,7 +3534,7 @@ static void test_wma_decoder_dmo_output_type(void) char buffer_good_output[1024], buffer_bad_output[1024], buffer_input[1024]; DMO_MEDIA_TYPE *good_output_type, *bad_output_type, *input_type, type; - DWORD count, i, ret; + DWORD count, i, ret, size, alignment; IMediaObject *dmo; HRESULT hr; @@ -3711,6 +3711,20 @@ static void test_wma_decoder_dmo_output_type(void) MoFreeMediaType(&type); } + /* Test GetOutputSizeInfo. */ + hr = IMediaObject_GetOutputSizeInfo(dmo, 1, NULL, NULL); + ok(hr == E_POINTER, "GetOutputSizeInfo returned %#lx.\n", hr); + hr = IMediaObject_GetOutputSizeInfo(dmo, 0, NULL, NULL); + ok(hr == E_POINTER, "GetOutputSizeInfo returned %#lx.\n", hr); + hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, NULL); + ok(hr == E_POINTER, "GetOutputSizeInfo returned %#lx.\n", hr); + hr = IMediaObject_GetOutputSizeInfo(dmo, 0, NULL, &alignment); + ok(hr == E_POINTER, "GetOutputSizeInfo returned %#lx.\n", hr); + hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); + ok(hr == S_OK, "GetOutputSizeInfo returned %#lx.\n", hr); + ok(size == 8192, "Unexpected size %lu.\n", size); + ok(alignment == 1, "Unexpected alignment %lu.\n", alignment); + hr = IMediaObject_GetInputCurrentType(dmo, 0, input_type); todo_wine ok(hr == S_OK, "GetInputCurrentType returned %#lx.\n", hr);

1 0

Zhiyi Zhang : oledb32/tests: Add more IDataInitialize::GetInitializationString() tests.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 23b556c55a2873438f29f84c82a15d7168a215e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/23b556c55a2873438f29f84c82a15d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 20 15:06:47 2023 +0800 oledb32/tests: Add more IDataInitialize::GetInitializationString() tests. --- dlls/oledb32/tests/database.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index ebd3cb2fadf..bd940634847 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -530,6 +530,25 @@ static void test_errorinfo(void) IUnknown_Release(unk); } +#define expect_initstring(a, b, c) _expect_initstring(__LINE__, a, b, c) +static void _expect_initstring(int line, IDataInitialize *datainit, const WCHAR *initstring, const WCHAR *expected) +{ + IDBInitialize *dbinit = NULL; + WCHAR *result = NULL; + HRESULT hr; + + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, initstring, + &IID_IDBInitialize, (IUnknown**)&dbinit); + ok_(__FILE__, line)(hr == S_OK, "got %08lx\n", hr); + hr = IDataInitialize_GetInitializationString(datainit, (IUnknown*)dbinit, 0, &result); + ok_(__FILE__, line)(hr == S_OK, "got %08lx\n", hr); + todo_wine + ok_(__FILE__, line)(!lstrcmpW(expected, result), "expected %s, got %s\n", + wine_dbgstr_w(expected), wine_dbgstr_w(result)); + CoTaskMemFree(result); + IDBInitialize_Release(dbinit); +} + static void test_initializationstring(void) { static const WCHAR *initstring_default = L"Data Source=dummy;"; @@ -539,6 +558,20 @@ static void test_initializationstring(void) static const WCHAR *initstring_mode = L"Provider=MSDASQL.1;Data Source=dummy;Mode=invalid"; static const WCHAR *initstring_mode2 = L"Provider=MSDASQL.1;Data Source=dummy;Mode=WriteRead"; static const WCHAR *initstring_mode3 = L"Provider=MSDASQL.1;Data Source=dummy;Mode=ReadWRITE"; + static const WCHAR *initstring_quote_semicolon = L"Provider=MSDASQL.1;" + "Data Source=dummy;" + "Extended Properties=\"ConnectTo=11.0;Cell Error Mode=TextValue;Optimize Response=3;\""; + static const WCHAR *initstring_duplicate = L"Provider=MSDASQL.1;" + "Data Source=dummy;" + "Data Source=dummy;"; + static const WCHAR *initstring_skip_properties = L"Provider=MSDASQL.1;" + "Data Source=dummy;" + "Window Handle=0;" + "Prompt=4;" + "Connect Timeout=1000;" + "General Timeout=1000;" + "OLE DB Services=0;" + "Locale Identifier=1033"; IDataInitialize *datainit = NULL; IDBInitialize *dbinit; HRESULT hr; @@ -597,6 +630,15 @@ static void test_initializationstring(void) else ok(dbinit == NULL, "got %p\n", dbinit); + /* Test quoting property values */ + expect_initstring(datainit, initstring_quote_semicolon, initstring_quote_semicolon); + + /* Test duplicate properties */ + expect_initstring(datainit, initstring_duplicate, initstring_msdasql); + + /* Test properties that should be skipped */ + expect_initstring(datainit, initstring_skip_properties, initstring_msdasql); + IDataInitialize_Release(datainit); } }

1 0

Zhiyi Zhang : oledb32: Remove the trailing semicolon.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: c2571f23a903b840e6469cdf51ebd0f3e375c7ee URL: https://gitlab.winehq.org/wine/wine/-/commit/c2571f23a903b840e6469cdf51ebd0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 20 15:27:50 2023 +0800 oledb32: Remove the trailing semicolon. Also, this fixes an out-of-bounds write because the space for the terminating '\0' wasn't included previously. --- dlls/oledb32/datainit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index c2066712f8b..0d321932991 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -903,7 +903,7 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I IDBProperties_Release(props); /* check if we need to skip password */ - len = lstrlenW(progid) + lstrlenW(providerW) + 1; /* including ';' */ + len = lstrlenW(progid) + lstrlenW(providerW) + 1; /* including '\0' */ for (i = 0; i < count; i++) { WCHAR *descr = get_propinfo_descr(&propset->rgProperties[i], propinfoset); @@ -926,7 +926,6 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I /* provider name */ lstrcatW(*init_string, providerW); lstrcatW(*init_string, progid); - lstrcatW(*init_string, L";"); CoTaskMemFree(progid); for (i = 0; i < count; i++) @@ -938,10 +937,10 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I descr = get_propinfo_descr(&propset->rgProperties[i], propinfoset); if (descr) { + lstrcatW(*init_string, L";"); lstrcatW(*init_string, descr); lstrcatW(*init_string, L"="); write_propvalue_str(*init_string, &propset->rgProperties[i]); - lstrcatW(*init_string, L";"); } }

1 0