- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Convert the ARM64EC context to ARM64 for syscalls.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 2328a1d9df4ffeb66b958bb9becfc238fb039774 URL: https://gitlab.winehq.org/wine/wine/-/commit/2328a1d9df4ffeb66b958bb9becfc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 11:03:28 2023 +0100 ntdll: Convert the ARM64EC context to ARM64 for syscalls. --- dlls/ntdll/signal_arm64ec.c | 195 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 187 insertions(+), 8 deletions(-)

1 0

Alexandre Julliard : nsiproxy.sys: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 0c102b1a0b7bd33d4c8760c93bd3d0dbf7591391 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c102b1a0b7bd33d4c8760c93bd3d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 11:33:34 2023 +0100 nsiproxy.sys: Remove DECLSPEC_HIDDEN usage. --- dlls/nsiproxy.sys/unix_private.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 84fea0c42d2..907496a01c7 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -24,9 +24,9 @@ #define IPV4_ADDR(b1, b2, b3, b4) (((unsigned int)b4 << 24) | (b3 << 16) | (b2 << 8) | b1) #endif -NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; -NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) DECLSPEC_HIDDEN; -NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) DECLSPEC_HIDDEN; +NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ); +NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ); +NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ); static inline NTSTATUS nsi_enumerate_all( UINT unk, UINT unk2, const NPI_MODULEID *module, UINT table, void *key_data, UINT key_size, void *rw_data, UINT rw_size, @@ -57,8 +57,8 @@ static inline NTSTATUS nsi_enumerate_all( UINT unk, UINT unk2, const NPI_MODULEI return status; } -BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) DECLSPEC_HIDDEN; -BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) DECLSPEC_HIDDEN; +BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ); +BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ); static inline BOOL convert_luid_to_index( const NET_LUID *luid, UINT *index ) { @@ -104,8 +104,8 @@ struct ipv6_addr_scope UINT scope; }; -struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) DECLSPEC_HIDDEN; -UINT find_ipv6_addr_scope( const IN6_ADDR *addr, const struct ipv6_addr_scope *table, unsigned int size ) DECLSPEC_HIDDEN; +struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ); +UINT find_ipv6_addr_scope( const IN6_ADDR *addr, const struct ipv6_addr_scope *table, unsigned int size ); struct pid_map { @@ -113,8 +113,8 @@ struct pid_map unsigned int unix_pid; }; -struct pid_map *get_pid_map( unsigned int *num_entries ) DECLSPEC_HIDDEN; -unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UINT_PTR inode ) DECLSPEC_HIDDEN; +struct pid_map *get_pid_map( unsigned int *num_entries ); +unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UINT_PTR inode ); struct module_table { @@ -136,11 +136,11 @@ struct module const struct module_table *tables; }; -extern const struct module ndis_module DECLSPEC_HIDDEN; -extern const struct module ipv4_module DECLSPEC_HIDDEN; -extern const struct module ipv6_module DECLSPEC_HIDDEN; -extern const struct module tcp_module DECLSPEC_HIDDEN; -extern const struct module udp_module DECLSPEC_HIDDEN; +extern const struct module ndis_module; +extern const struct module ipv4_module; +extern const struct module ipv6_module; +extern const struct module tcp_module; +extern const struct module udp_module; static inline int ascii_strncasecmp( const char *s1, const char *s2, size_t n ) { @@ -163,7 +163,7 @@ static inline int ascii_strcasecmp( const char *s1, const char *s2 ) return ascii_strncasecmp( s1, s2, -1 ); } -NTSTATUS icmp_cancel_listen( void *args ) DECLSPEC_HIDDEN; -NTSTATUS icmp_close( void *args ) DECLSPEC_HIDDEN; -NTSTATUS icmp_listen( void *args ) DECLSPEC_HIDDEN; -NTSTATUS icmp_send_echo( void *args ) DECLSPEC_HIDDEN; +NTSTATUS icmp_cancel_listen( void *args ); +NTSTATUS icmp_close( void *args ); +NTSTATUS icmp_listen( void *args ); +NTSTATUS icmp_send_echo( void *args );

1 0

Alexandre Julliard : mountmgr: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 2c19fc3a3e33fe90ff13c09446bdc925fa13c873 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c19fc3a3e33fe90ff13c09446bdc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 11:33:15 2023 +0100 mountmgr: Remove DECLSPEC_HIDDEN usage. --- dlls/mountmgr.sys/mountmgr.h | 24 ++++++++++++------------ dlls/mountmgr.sys/unixlib.h | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 143401e3b9b..b1de312dffb 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -50,9 +50,9 @@ enum device_type DEVICE_RAMDISK }; -extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI serial_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI parallel_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ); +extern NTSTATUS WINAPI serial_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ); +extern NTSTATUS WINAPI parallel_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ); enum scsi_device_type { @@ -90,24 +90,24 @@ struct scsi_info extern NTSTATUS add_volume( const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid, const char *disk_serial, - const struct scsi_info *info ) DECLSPEC_HIDDEN; -extern NTSTATUS remove_volume( const char *udi ) DECLSPEC_HIDDEN; + const struct scsi_info *info ); +extern NTSTATUS remove_volume( const char *udi ); extern NTSTATUS add_dos_device( int letter, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid, - const struct scsi_info *info ) DECLSPEC_HIDDEN; -extern NTSTATUS remove_dos_device( int letter, const char *udi ) DECLSPEC_HIDDEN; + const struct scsi_info *info ); +extern NTSTATUS remove_dos_device( int letter, const char *udi ); extern NTSTATUS query_unix_drive( void *buff, SIZE_T insize, SIZE_T outsize, - IO_STATUS_BLOCK *iosb ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *iosb ); /* mount point functions */ struct mount_point; extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - int drive ) DECLSPEC_HIDDEN; + int drive ); extern struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - const GUID *guid ) DECLSPEC_HIDDEN; -extern void delete_mount_point( struct mount_point *mount ) DECLSPEC_HIDDEN; -extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ) DECLSPEC_HIDDEN; + const GUID *guid ); +extern void delete_mount_point( struct mount_point *mount ); +extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ); #endif /* __WINE_MOUNTMGR_H */ diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index 93e812a516f..41f64251e22 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -179,13 +179,13 @@ enum mountmgr_funcs extern void queue_device_op( enum device_op op, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid, - const char *disk_serial, const struct scsi_info *info ) DECLSPEC_HIDDEN; -extern void run_dbus_loop(void) DECLSPEC_HIDDEN; -extern void run_diskarbitration_loop(void) DECLSPEC_HIDDEN; - -extern NTSTATUS dhcp_request( void *args ) DECLSPEC_HIDDEN; -extern NTSTATUS query_symbol_file( void *args ) DECLSPEC_HIDDEN; -extern NTSTATUS read_credential( void *args ) DECLSPEC_HIDDEN; -extern NTSTATUS write_credential( void *args ) DECLSPEC_HIDDEN; -extern NTSTATUS delete_credential( void *args ) DECLSPEC_HIDDEN; -extern NTSTATUS enumerate_credentials( void *args ) DECLSPEC_HIDDEN; + const char *disk_serial, const struct scsi_info *info ); +extern void run_dbus_loop(void); +extern void run_diskarbitration_loop(void); + +extern NTSTATUS dhcp_request( void *args ); +extern NTSTATUS query_symbol_file( void *args ); +extern NTSTATUS read_credential( void *args ); +extern NTSTATUS write_credential( void *args ); +extern NTSTATUS delete_credential( void *args ); +extern NTSTATUS enumerate_credentials( void *args );

1 0

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

Nov. 23, 2023

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

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

Nov. 23, 2023

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 : include: Add Windows.System.UserProfile.AdvertisingManager runtimeclass.
by Alexandre Julliard Nov. 23, 2023

Nov. 23, 2023

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 Nov. 23, 2023

Nov. 23, 2023

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: Stub Windows.System.Profile.AnalyticsInfo factory.
by Alexandre Julliard Nov. 23, 2023

Nov. 23, 2023

Module: wine Branch: master Commit: ced55e1dd42c327096ecfa22503c17b0e8656acf URL: https://gitlab.winehq.org/wine/wine/-/commit/ced55e1dd42c327096ecfa22503c17… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 12:02:30 2023 +0100 twinapi.appcore: Stub Windows.System.Profile.AnalyticsInfo factory. --- dlls/twinapi.appcore/Makefile.in | 1 + dlls/twinapi.appcore/analytics_info.c | 150 ++++++++++++++++++++++++++++++++++ dlls/twinapi.appcore/classes.idl | 13 +++ dlls/twinapi.appcore/main.c | 2 + dlls/twinapi.appcore/private.h | 45 ++++++++++ dlls/twinapi.appcore/tests/twinapi.c | 39 +++++++++ 6 files changed, 250 insertions(+)

1 0

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

Nov. 23, 2023

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 Nov. 23, 2023

Nov. 23, 2023

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