wine-commits November 2023

wine-commits@winehq.org

1 participants
989 discussions

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

23 Nov '23

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 : include: Add Windows.System.Profile.AnalyticsInfo runtimeclass.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 0cd904e1e1612f4979dc9c32beaaeb53dc9cf988 URL: https://gitlab.winehq.org/wine/wine/-/commit/0cd904e1e1612f4979dc9c32beaaeb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 24 13:16:36 2023 +0100 include: Add Windows.System.Profile.AnalyticsInfo runtimeclass. --- include/Makefile.in | 1 + include/windows.system.profile.idl | 86 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c57283c1145..97b4d0e90f6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -865,6 +865,7 @@ SOURCES = \ windows.storage.streams.idl \ windows.system.idl \ windows.system.power.idl \ + windows.system.profile.idl \ windows.system.profile.systemmanufacturers.idl \ windows.system.threading.idl \ windows.system.userprofile.idl \ diff --git a/include/windows.system.profile.idl b/include/windows.system.profile.idl new file mode 100644 index 00000000000..90a561ced07 --- /dev/null +++ b/include/windows.system.profile.idl @@ -0,0 +1,86 @@ +/* + * Copyright 2023 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +#ifndef DO_NO_IMPORTS +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.storage.streams.idl"; +import "windows.system.idl"; +#endif + +namespace Windows.System.Profile { + + interface IAnalyticsInfoStatics; + interface IAnalyticsInfoStatics2; + interface IAnalyticsVersionInfo; + interface IAnalyticsVersionInfo2; + runtimeclass AnalyticsVersionInfo; + runtimeclass AnalyticsInfo; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.System.Profile.AnalyticsInfo), + uuid(1d5ee066-188d-5ba9-4387-acaeb0e7e305) + ] + interface IAnalyticsInfoStatics : IInspectable + { + [propget] HRESULT VersionInfo([out, retval] Windows.System.Profile.AnalyticsVersionInfo **value); + [propget] HRESULT DeviceForm([out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.System.Profile.AnalyticsVersionInfo), + uuid(926130b8-9955-4c74-bdc1-7cd0decf9b03) + ] + interface IAnalyticsVersionInfo : IInspectable + { + [propget] HRESULT DeviceFamily([out, retval] HSTRING *value); + [propget] HRESULT DeviceFamilyVersion([out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass AnalyticsVersionInfo + { + [default] interface Windows.System.Profile.IAnalyticsVersionInfo; + [contract(Windows.Foundation.UniversalApiContract, 11.0)] interface Windows.System.Profile.IAnalyticsVersionInfo2; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.System.Profile.IAnalyticsInfoStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.System.Profile.IAnalyticsInfoStatics2, Windows.Foundation.UniversalApiContract, 6.0), + threading(both) + ] + runtimeclass AnalyticsInfo + { + } + +}

1 0

Rémi Bernon : windows.globalization: Implement GeographicRegion_get_CodeTwoLetter.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: a26fb1947e8cb6d297936a9882d0bf90c683b9b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a26fb1947e8cb6d297936a9882d0bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 12:19:34 2023 +0100 windows.globalization: Implement GeographicRegion_get_CodeTwoLetter. --- dlls/windows.globalization/geographic_region.c | 8 ++++++-- dlls/windows.globalization/tests/globalization.c | 17 ++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/windows.globalization/geographic_region.c b/dlls/windows.globalization/geographic_region.c index d8159550522..05ae7388ccc 100644 --- a/dlls/windows.globalization/geographic_region.c +++ b/dlls/windows.globalization/geographic_region.c @@ -95,8 +95,12 @@ static HRESULT WINAPI geographic_region_get_Code( IGeographicRegion *iface, HSTR static HRESULT WINAPI geographic_region_get_CodeTwoLetter( IGeographicRegion *iface, HSTRING *value ) { - FIXME( "iface %p stub!\n", iface ); - return E_NOTIMPL; + WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; + + FIXME( "iface %p semi-stub!\n", iface ); + + if (!GetLocaleInfoEx( LOCALE_NAME_USER_DEFAULT, LOCALE_SISO3166CTRYNAME, buffer, ARRAY_SIZE(buffer) )) return E_INVALIDARG; + return WindowsCreateString( buffer, wcslen( buffer ), value ); } static HRESULT WINAPI geographic_region_get_CodeThreeLetter( IGeographicRegion *iface, HSTRING *value ) diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index a01ed7f87f7..1abbc161cfd 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -317,8 +317,9 @@ static void test_GeographicRegion(void) IGeographicRegionFactory *geographic_region_factory; IGeographicRegion *geographic_region; IActivationFactory *factory; - HSTRING str; + HSTRING str, expect_str; HRESULT hr; + INT32 res; LONG ref; hr = WindowsCreateString( class_name, wcslen( class_name ), &str ); @@ -344,6 +345,10 @@ static void test_GeographicRegion(void) check_interface( geographic_region, &IID_IInspectable ); check_interface( geographic_region, &IID_IAgileObject ); + hr = IGeographicRegion_get_CodeTwoLetter( geographic_region, &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + WindowsDeleteString( str ); + ref = IGeographicRegion_Release( geographic_region ); ok( ref == 0, "got ref %ld.\n", ref ); @@ -358,6 +363,16 @@ static void test_GeographicRegion(void) if (hr == S_OK) { + hr = WindowsCreateString( L"US", wcslen( L"US" ), &expect_str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IGeographicRegion_get_CodeTwoLetter( geographic_region, &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 = IGeographicRegion_Release( geographic_region ); ok( ref == 0, "got ref %ld.\n", ref ); }

1 0

Rémi Bernon : windows.globalization: Stub Windows.Globalization.GeographicRegion runtimeclass.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: fe467cf452196de64adee04da8775a6456e8cfb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe467cf452196de64adee04da8775a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 27 22:35:47 2023 +0100 windows.globalization: Stub Windows.Globalization.GeographicRegion runtimeclass. --- dlls/windows.globalization/geographic_region.c | 139 ++++++++++++++++++++++- dlls/windows.globalization/tests/globalization.c | 31 ++++- 2 files changed, 167 insertions(+), 3 deletions(-) diff --git a/dlls/windows.globalization/geographic_region.c b/dlls/windows.globalization/geographic_region.c index 350d85c67a6..d8159550522 100644 --- a/dlls/windows.globalization/geographic_region.c +++ b/dlls/windows.globalization/geographic_region.c @@ -21,6 +21,133 @@ WINE_DEFAULT_DEBUG_CHANNEL(locale); +struct geographic_region +{ + IGeographicRegion IGeographicRegion_iface; + LONG ref; +}; + +static inline struct geographic_region *impl_from_IGeographicRegion( IGeographicRegion *iface ) +{ + return CONTAINING_RECORD( iface, struct geographic_region, IGeographicRegion_iface ); +} + +static HRESULT WINAPI geographic_region_QueryInterface( IGeographicRegion *iface, REFIID iid, void **out ) +{ + struct geographic_region *impl = impl_from_IGeographicRegion( 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_IGeographicRegion )) + { + IInspectable_AddRef( (*out = &impl->IGeographicRegion_iface) ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI geographic_region_AddRef( IGeographicRegion *iface ) +{ + struct geographic_region *impl = impl_from_IGeographicRegion( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI geographic_region_Release( IGeographicRegion *iface ) +{ + struct geographic_region *impl = impl_from_IGeographicRegion( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + if (!ref) free( impl ); + return ref; +} + +static HRESULT WINAPI geographic_region_GetIids( IGeographicRegion *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 geographic_region_GetRuntimeClassName( IGeographicRegion *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI geographic_region_GetTrustLevel( IGeographicRegion *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI geographic_region_get_Code( IGeographicRegion *iface, HSTRING *value ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI geographic_region_get_CodeTwoLetter( IGeographicRegion *iface, HSTRING *value ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI geographic_region_get_CodeThreeLetter( IGeographicRegion *iface, HSTRING *value ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI geographic_region_get_CodeThreeDigit( IGeographicRegion *iface, HSTRING *value ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI geographic_region_get_DisplayName( IGeographicRegion *iface, HSTRING *value ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI geographic_region_get_NativeName( IGeographicRegion *iface, HSTRING *value ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI geographic_region_get_CurrenciesInUse( IGeographicRegion *iface, IVectorView_HSTRING **value ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static const struct IGeographicRegionVtbl geographic_region_vtbl = +{ + geographic_region_QueryInterface, + geographic_region_AddRef, + geographic_region_Release, + /* IInspectable methods */ + geographic_region_GetIids, + geographic_region_GetRuntimeClassName, + geographic_region_GetTrustLevel, + /* IGeographicRegion methods */ + geographic_region_get_Code, + geographic_region_get_CodeTwoLetter, + geographic_region_get_CodeThreeLetter, + geographic_region_get_CodeThreeDigit, + geographic_region_get_DisplayName, + geographic_region_get_NativeName, + geographic_region_get_CurrenciesInUse, +}; + struct geographic_region_factory { IActivationFactory IActivationFactory_iface; @@ -95,8 +222,16 @@ static HRESULT WINAPI activation_factory_GetTrustLevel( IActivationFactory *ifac static HRESULT WINAPI activation_factory_ActivateInstance( IActivationFactory *iface, IInspectable **out ) { - FIXME( "iface %p, out %p stub!\n", iface, out ); - return E_NOTIMPL; + struct geographic_region *region; + + TRACE( "iface %p, out %p.\n", iface, out ); + + if (!(region = calloc( 1, sizeof(*region) ))) return E_OUTOFMEMORY; + region->IGeographicRegion_iface.lpVtbl = &geographic_region_vtbl; + region->ref = 1; + + *out = (IInspectable *)&region->IGeographicRegion_iface; + return S_OK; } static const struct IActivationFactoryVtbl activation_factory_vtbl = diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index c391bea5804..a01ed7f87f7 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -314,6 +314,8 @@ static void test_Language(void) static void test_GeographicRegion(void) { static const WCHAR *class_name = RuntimeClass_Windows_Globalization_GeographicRegion; + IGeographicRegionFactory *geographic_region_factory; + IGeographicRegion *geographic_region; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -334,7 +336,34 @@ static void test_GeographicRegion(void) check_interface( factory, &IID_IUnknown ); check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); - check_interface( factory, &IID_IGeographicRegionFactory ); + + hr = IActivationFactory_ActivateInstance( factory, (IInspectable **)&geographic_region ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + check_interface( geographic_region, &IID_IUnknown ); + check_interface( geographic_region, &IID_IInspectable ); + check_interface( geographic_region, &IID_IAgileObject ); + + ref = IGeographicRegion_Release( geographic_region ); + ok( ref == 0, "got ref %ld.\n", ref ); + + hr = IActivationFactory_QueryInterface( factory, &IID_IGeographicRegionFactory, (void **)&geographic_region_factory ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + hr = WindowsCreateString( L"US", wcslen( L"US" ), &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IGeographicRegionFactory_CreateGeographicRegion( geographic_region_factory, str, &geographic_region ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + WindowsDeleteString( str ); + + if (hr == S_OK) + { + ref = IGeographicRegion_Release( geographic_region ); + ok( ref == 0, "got ref %ld.\n", ref ); + } + + ref = IGeographicRegionFactory_Release( geographic_region_factory ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref );

1 0

Rémi Bernon : windows.globalization: Stub Windows.Globalization.GeographicRegion factory.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 452f0381c39cfee1bb568164dd45aabcdfa4f887 URL: https://gitlab.winehq.org/wine/wine/-/commit/452f0381c39cfee1bb568164dd45aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 27 22:35:47 2023 +0100 windows.globalization: Stub Windows.Globalization.GeographicRegion factory. --- dlls/windows.globalization/Makefile.in | 1 + dlls/windows.globalization/geographic_region.c | 144 +++++++++++++++++++++++ dlls/windows.globalization/main.c | 24 +--- dlls/windows.globalization/private.h | 83 +++++++++++++ dlls/windows.globalization/tests/globalization.c | 58 +++++++-- 5 files changed, 280 insertions(+), 30 deletions(-)

1 0

Rémi Bernon : include: Add Windows.Globalization.GeographicRegion runtimeclass.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 57873adfcf44f17de1f37c9e310caf6301fc5c19 URL: https://gitlab.winehq.org/wine/wine/-/commit/57873adfcf44f17de1f37c9e310caf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 24 13:05:06 2023 +0100 include: Add Windows.Globalization.GeographicRegion runtimeclass. --- include/windows.globalization.idl | 53 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/include/windows.globalization.idl b/include/windows.globalization.idl index 639d0d24411..49b484f6467 100644 --- a/include/windows.globalization.idl +++ b/include/windows.globalization.idl @@ -40,7 +40,11 @@ namespace Windows { interface ILanguageStatics; interface ILanguageStatics2; interface ILanguageStatics3; + interface IGeographicRegion; + interface IGeographicRegionFactory; + interface IGeographicRegionStatics; runtimeclass Language; + runtimeclass GeographicRegion; } } @@ -163,6 +167,42 @@ namespace Windows { HRESULT GetMuiCompatibleLanguageListFromLanguageTags([in] Windows.Foundation.Collections.IIterable<HSTRING> *tags, [out, retval] Windows.Foundation.Collections.IVector<HSTRING> **result); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.GeographicRegion), + uuid(01e9a621-4a64-4ed9-954f-9edeb07bd903) + ] + interface IGeographicRegion : IInspectable + { + [propget] HRESULT Code([out, retval] HSTRING *value); + [propget] HRESULT CodeTwoLetter([out, retval] HSTRING *value); + [propget] HRESULT CodeThreeLetter([out, retval] HSTRING *value); + [propget] HRESULT CodeThreeDigit([out, retval] HSTRING *value); + [propget] HRESULT DisplayName([out, retval] HSTRING *value); + [propget] HRESULT NativeName([out, retval] HSTRING *value); + [propget] HRESULT CurrenciesInUse([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.GeographicRegion), + uuid(53425270-77b4-426b-859f-81e19d512546) + ] + interface IGeographicRegionFactory : IInspectable + { + HRESULT CreateGeographicRegion([in] HSTRING region_code, [out, retval] Windows.Globalization.GeographicRegion **result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.GeographicRegion), + uuid(29e28974-7ad9-4ef4-8799-b3b44fadec08) + ] + interface IGeographicRegionStatics : IInspectable + { + HRESULT IsSupported([in] HSTRING region_code, [out, retval] boolean *result); + } + [ activatable(Windows.Globalization.ILanguageFactory, Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -179,5 +219,18 @@ namespace Windows { [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Globalization.ILanguage2; [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.Globalization.ILanguage3; } + + [ + activatable(Windows.Foundation.UniversalApiContract, 1.0), + activatable(Windows.Globalization.IGeographicRegionFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Globalization.IGeographicRegionStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass GeographicRegion + { + [contract(Windows.Foundation.UniversalApiContract, 1.0), default] interface Windows.Globalization.IGeographicRegion; + } } }

1 0

Rémi Bernon : include: Use nested namespaces in windows.system.userprofile.idl.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 8ff59986d55e6efd84077086053dc9d43e650c59 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ff59986d55e6efd84077086053dc9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 28 13:43:56 2023 +0100 include: Use nested namespaces in windows.system.userprofile.idl. --- include/windows.system.userprofile.idl | 65 +++++++++++++++------------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/include/windows.system.userprofile.idl b/include/windows.system.userprofile.idl index 65a334b97f8..255ea7dcf6d 100644 --- a/include/windows.system.userprofile.idl +++ b/include/windows.system.userprofile.idl @@ -29,44 +29,37 @@ import "windows.foundation.idl"; import "windows.globalization.idl"; #endif -namespace Windows { - namespace System { - namespace UserProfile { - interface IGlobalizationPreferencesStatics; - interface IGlobalizationPreferencesStatics2; - interface IGlobalizationPreferencesStatics3; - runtimeclass GlobalizationPreferences; - } - } -} +namespace Windows.System.UserProfile { -namespace Windows { - namespace System { - namespace UserProfile { + interface IGlobalizationPreferencesStatics; + interface IGlobalizationPreferencesStatics2; + interface IGlobalizationPreferencesStatics3; + runtimeclass GlobalizationPreferences; - [ - contract(Windows.Foundation.UniversalApiContract, 1.0), - exclusiveto(Windows.System.UserProfile.GlobalizationPreferences), - uuid(01bf4326-ed37-4e96-b0e9-c1340d1ea158) - ] - interface IGlobalizationPreferencesStatics : IInspectable - { - [propget] HRESULT Calendars([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING>** value); - [propget] HRESULT Clocks([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING>** value); - [propget] HRESULT Currencies([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING>** value); - [propget] HRESULT Languages([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING>** value); - [propget] HRESULT HomeGeographicRegion([out, retval] HSTRING* value); - [propget] HRESULT WeekStartsOn([out, retval] Windows.Globalization.DayOfWeek* value); - } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.System.UserProfile.GlobalizationPreferences), + uuid(01bf4326-ed37-4e96-b0e9-c1340d1ea158) + ] + interface IGlobalizationPreferencesStatics : IInspectable + { + [propget] HRESULT Calendars([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING> **value); + [propget] HRESULT Clocks([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING> **value); + [propget] HRESULT Currencies([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING> **value); + [propget] HRESULT Languages([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING> **value); + [propget] HRESULT HomeGeographicRegion([out, retval] HSTRING *value); + [propget] HRESULT WeekStartsOn([out, retval] Windows.Globalization.DayOfWeek *value); + } - [contract(Windows.Foundation.UniversalApiContract, 1.0)] - [marshaling_behavior(agile)] - [static(Windows.System.UserProfile.IGlobalizationPreferencesStatics, Windows.Foundation.UniversalApiContract, 1.0)] - [static(Windows.System.UserProfile.IGlobalizationPreferencesStatics2, Windows.Foundation.UniversalApiContract, 5.0)] - [static(Windows.System.UserProfile.IGlobalizationPreferencesStatics3, Windows.Foundation.UniversalApiContract, 6.0)] - runtimeclass GlobalizationPreferences - { - } - } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.System.UserProfile.IGlobalizationPreferencesStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.System.UserProfile.IGlobalizationPreferencesStatics2, Windows.Foundation.UniversalApiContract, 5.0), + static(Windows.System.UserProfile.IGlobalizationPreferencesStatics3, Windows.Foundation.UniversalApiContract, 6.0), + ] + runtimeclass GlobalizationPreferences + { } + }

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
99
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 November 2023