[PATCH 0/6] MR6594: include: Add Windows.ApplicationModel.DesignMode runtime class.
React Native apps require these. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6594
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/windows.applicationmodel.idl | 35 ++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/include/windows.applicationmodel.idl b/include/windows.applicationmodel.idl index 3d6f4c60d0f..d9c4a0989e5 100644 --- a/include/windows.applicationmodel.idl +++ b/include/windows.applicationmodel.idl @@ -36,6 +36,8 @@ namespace Windows.ApplicationModel { typedef struct PackageVersion PackageVersion; interface IAppDisplayInfo; + interface IDesignModeStatics; + interface IDesignModeStatics2; interface IEnteredBackgroundEventArgs; interface ILeavingBackgroundEventArgs; interface IPackage; @@ -50,6 +52,7 @@ namespace Windows.ApplicationModel { interface ISuspendingOperation; runtimeclass AppDisplayInfo; + runtimeclass DesignMode; runtimeclass EnteredBackgroundEventArgs; runtimeclass LeavingBackgroundEventArgs; runtimeclass Package; @@ -94,6 +97,26 @@ namespace Windows.ApplicationModel { HRESULT GetLogo([in] Windows.Foundation.Size size, [out, retval] Windows.Storage.Streams.RandomAccessStreamReference **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.ApplicationModel.DesignMode), + uuid(2c3893cc-f81a-4e7a-b857-76a80887e185) + ] + interface IDesignModeStatics : IInspectable + { + [propget] HRESULT DesignModeEnabled([out, retval] boolean *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.ApplicationModel.DesignMode), + uuid(80cf8137-b064-4858-bec8-3eba22357535) + ] + interface IDesignModeStatics2 : IInspectable + { + [propget] HRESULT DesignMode2Enabled([out, retval] boolean *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), uuid(f722dcc2-9827-403d-aaed-ecca9ac17398) @@ -250,6 +273,18 @@ namespace Windows.ApplicationModel { [default] interface Windows.ApplicationModel.IAppDisplayInfo; } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.ApplicationModel.IDesignModeStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.ApplicationModel.IDesignModeStatics2, Windows.Foundation.UniversalApiContract, 5.0), + threading(both) + ] + runtimeclass DesignMode + { + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), marshaling_behavior(agile) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6594
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/windows.foundation.idl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 0ac0f78fa5e..5182d0b1147 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -108,12 +108,20 @@ namespace Windows.Foundation { interface Windows.Foundation.IAsyncOperation<boolean>; interface Windows.Foundation.IAsyncOperation<UINT32>; interface Windows.Foundation.IReference<BYTE>; - interface Windows.Foundation.IReference<INT32>; interface Windows.Foundation.IReference<DOUBLE>; interface Windows.Foundation.IReference<FLOAT>; + interface Windows.Foundation.IReference<GUID>; + interface Windows.Foundation.IReference<INT16>; + interface Windows.Foundation.IReference<INT32>; + interface Windows.Foundation.IReference<INT64>; interface Windows.Foundation.IReference<UINT32>; interface Windows.Foundation.IReference<UINT64>; interface Windows.Foundation.IReference<Windows.Foundation.DateTime>; + interface Windows.Foundation.IReference<Windows.Foundation.Point>; + interface Windows.Foundation.IReference<Windows.Foundation.Rect>; + interface Windows.Foundation.IReference<Windows.Foundation.Size>; + interface Windows.Foundation.IReference<Windows.Foundation.TimeSpan>; + interface Windows.Foundation.IReference<boolean>; interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>; interface Windows.Foundation.TypedEventHandler<Windows.Foundation.IMemoryBufferReference *, IInspectable *>; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6594
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/Makefile.in | 1 + include/windows.ui.xaml.interop.idl | 51 +++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 include/windows.ui.xaml.interop.idl diff --git a/include/Makefile.in b/include/Makefile.in index 8d25e40ba05..55c7516df6e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -895,6 +895,7 @@ SOURCES = \ windows.ui.input.idl \ windows.ui.viewmanagement.idl \ windows.ui.xaml.hosting.desktopwindowxamlsource.idl \ + windows.ui.xaml.interop.idl \ windowscontracts.idl \ windowsx.h \ wine/afd.h \ diff --git a/include/windows.ui.xaml.interop.idl b/include/windows.ui.xaml.interop.idl new file mode 100644 index 00000000000..ef786d5702b --- /dev/null +++ b/include/windows.ui.xaml.interop.idl @@ -0,0 +1,51 @@ +/* + * Copyright 2024 Zhiyi Zhang 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 + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.UI.Xaml.Interop { + typedef enum TypeKind TypeKind; + typedef struct TypeName TypeName; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum TypeKind + { + Primitive = 0, + Metadata = 1, + Custom = 2 + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + struct TypeName + { + HSTRING Name; + Windows.UI.Xaml.Interop.TypeKind Kind; + }; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6594
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/Makefile.in | 1 + include/windows.ui.xaml.idl | 255 ++++++++++++++++++++++++++++++++++++ 2 files changed, 256 insertions(+) create mode 100644 include/windows.ui.xaml.idl diff --git a/include/Makefile.in b/include/Makefile.in index 55c7516df6e..d4f63fe169c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -895,6 +895,7 @@ SOURCES = \ windows.ui.input.idl \ windows.ui.viewmanagement.idl \ windows.ui.xaml.hosting.desktopwindowxamlsource.idl \ + windows.ui.xaml.idl \ windows.ui.xaml.interop.idl \ windowscontracts.idl \ windowsx.h \ diff --git a/include/windows.ui.xaml.idl b/include/windows.ui.xaml.idl new file mode 100644 index 00000000000..e143597281d --- /dev/null +++ b/include/windows.ui.xaml.idl @@ -0,0 +1,255 @@ +/* + * Copyright 2024 Zhiyi Zhang 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 + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.applicationmodel.idl"; +import "windows.applicationmodel.activation.idl"; +import "windows.applicationmodel.core.idl"; +import "windows.foundation.numerics.idl"; +import "windows.graphics.imaging.idl"; +import "windows.ui.idl"; +import "windows.ui.composition.idl"; +import "windows.ui.core.idl"; +import "windows.ui.input.idl"; +import "windows.ui.xaml.interop.idl"; + +namespace Windows.UI.Xaml { + interface IDataTemplateKey; + interface IDependencyObject; + interface IDependencyProperty; + interface IDependencyPropertyChangedEventArgs; + interface IDependencyPropertyStatics; + interface IPropertyMetadata; + interface IPropertyMetadataFactory; + interface IPropertyMetadataStatics; + + runtimeclass DataTemplateKey; + runtimeclass DependencyObject; + runtimeclass DependencyProperty; + runtimeclass DependencyPropertyChangedEventArgs; + runtimeclass PropertyMetadata; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(d6ecb12c-15b5-4ec8-b95c-cdd208f08153) + ] + delegate HRESULT CreateDefaultValueCallback([out, retval] IInspectable **result); + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(45883d16-27bf-4bc1-ac26-94c1601f3a49) + ] + delegate HRESULT DependencyPropertyChangedCallback([in] Windows.UI.Xaml.DependencyObject *sender, [in] Windows.UI.Xaml.DependencyProperty *dp); + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(5a9f8a25-d142-44a4-8231-fd676724f29b) + ] + delegate HRESULT PropertyChangedCallback([in] Windows.UI.Xaml.DependencyObject *obj, [in] Windows.UI.Xaml.DependencyPropertyChangedEventArgs *args); + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Xaml.DataTemplateKey), + uuid(873b6c28-cceb-4b61-86fa-b2cec39cc2fa) + ] + interface IDataTemplateKey : IInspectable + { + [propget] HRESULT DataType([out, retval] IInspectable **value); + [propput] HRESULT DataType([in] IInspectable *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Xaml.DataTemplateKey), + uuid(e96b2959-d982-4152-91cb-de0e4dfd7693) + ] + interface IDataTemplateKeyFactory : IInspectable + { + HRESULT CreateInstance([in] IInspectable *base_interface, [out] IInspectable **inner_interface, [out, retval] Windows.UI.Xaml.DataTemplateKey **value); + HRESULT CreateInstanceWithType([in] IInspectable *data_type, [in] IInspectable *base_interface, [out] IInspectable **inner_interface, [out, retval] Windows.UI.Xaml.DataTemplateKey **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Xaml.DependencyObject), + uuid(5c526665-f60e-4912-af59-5fe0680f089d) + ] + interface IDependencyObject : IInspectable + { + HRESULT GetValue([in] Windows.UI.Xaml.DependencyProperty *dp, [out, retval] IInspectable **result); + HRESULT SetValue([in] Windows.UI.Xaml.DependencyProperty *dp, [in] IInspectable *value); + HRESULT ClearValue([in] Windows.UI.Xaml.DependencyProperty *dp); + HRESULT ReadLocalValue([in] Windows.UI.Xaml.DependencyProperty *dp, [out, retval] IInspectable **result); + HRESULT GetAnimationBaseValue([in] Windows.UI.Xaml.DependencyProperty *dp, [out, retval] IInspectable **result); + [propget] HRESULT Dispatcher([out, retval] Windows.UI.Core.CoreDispatcher **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Xaml.DependencyObject), + uuid(29fed85d-3d22-43a1-add0-17027c08b212) + ] + interface IDependencyObject2 : IInspectable + { + HRESULT RegisterPropertyChangedCallback([in] Windows.UI.Xaml.DependencyProperty *dp, [in] Windows.UI.Xaml.DependencyPropertyChangedCallback *callback, [out, retval] INT64 *result); + HRESULT UnregisterPropertyChangedCallback([in] Windows.UI.Xaml.DependencyProperty *dp, [in] INT64 token); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Xaml.DependencyObject), + uuid(9a03af92-7d8a-4937-884f-ecf34fe02acb) + ] + interface IDependencyObjectFactory : IInspectable + { + HRESULT CreateInstance([in] IInspectable *base_interface, [out] IInspectable **inner_interface, [out, retval] Windows.UI.Xaml.DependencyObject **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Xaml.DependencyProperty), + uuid(85b13970-9bc4-4e96-acf1-30c8fd3d55c8) + ] + interface IDependencyProperty : IInspectable + { + HRESULT GetMetadata([in] Windows.UI.Xaml.Interop.TypeName type, [out, retval] Windows.UI.Xaml.PropertyMetadata **result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Xaml.DependencyPropertyChangedEventArgs), + uuid(81212c2b-24d0-4957-abc3-224470a93a4e) + ] + interface IDependencyPropertyChangedEventArgs : IInspectable + { + [propget] HRESULT Property([out, retval] Windows.UI.Xaml.DependencyProperty **value); + [propget] HRESULT OldValue([out, retval] IInspectable **value); + [propget] HRESULT NewValue([out, retval] IInspectable **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Xaml.DependencyProperty), + uuid(49e5f28f-8259-4d5c-aae0-83d56dbb68d9) + ] + interface IDependencyPropertyStatics : IInspectable + { + [propget] HRESULT UnsetValue([out, retval] IInspectable **value); + HRESULT Register([in] HSTRING name, [in] Windows.UI.Xaml.Interop.TypeName property_type, [in] Windows.UI.Xaml.Interop.TypeName owner_type, [in] Windows.UI.Xaml.PropertyMetadata *type_metadata, [out, retval] Windows.UI.Xaml.DependencyProperty **result); + HRESULT RegisterAttached([in] HSTRING name, [in] Windows.UI.Xaml.Interop.TypeName property_type, [in] Windows.UI.Xaml.Interop.TypeName owner_type, [in] Windows.UI.Xaml.PropertyMetadata *default_metadata, [out, retval] Windows.UI.Xaml.DependencyProperty **result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Xaml.PropertyMetadata), + uuid(814ef30d-8d18-448a-8644-f2cb51e70380) + ] + interface IPropertyMetadata : IInspectable + { + [propget] HRESULT DefaultValue([out, retval] IInspectable **value); + [propget] HRESULT CreateDefaultValueCallback([out, retval] Windows.UI.Xaml.CreateDefaultValueCallback **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Xaml.PropertyMetadata), + uuid(c1b81cc0-57cd-4f2f-b0a9-e1801b28f76b) + ] + interface IPropertyMetadataFactory : IInspectable + { + HRESULT CreateInstanceWithDefaultValue([in] IInspectable *default_value, [in] IInspectable *base_interface, [out] IInspectable **inner_interface, [out, retval] Windows.UI.Xaml.PropertyMetadata **value); + HRESULT CreateInstanceWithDefaultValueAndCallback([in] IInspectable *default_value, [in] Windows.UI.Xaml.PropertyChangedCallback *property_changed_callback, [in] IInspectable* base_interface, [out] IInspectable **inner_interface, [out, retval] Windows.UI.Xaml.PropertyMetadata **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Xaml.PropertyMetadata), + uuid(3b01077a-6e06-45e9-8b5c-af243458c062) + ] + interface IPropertyMetadataStatics : IInspectable + { + [default_overload] [overload("Create")] HRESULT CreateWithDefaultValue([in] IInspectable *default_value, [out, retval] Windows.UI.Xaml.PropertyMetadata **result); + [default_overload] [overload("Create")] HRESULT CreateWithDefaultValueAndCallback([in] IInspectable *default_value, [in] Windows.UI.Xaml.PropertyChangedCallback *property_changed_callback, [out, retval] Windows.UI.Xaml.PropertyMetadata **result); + [overload("Create")] HRESULT CreateWithFactory([in] Windows.UI.Xaml.CreateDefaultValueCallback *create_default_value_callback, [out, retval] Windows.UI.Xaml.PropertyMetadata **result); + [overload("Create")] HRESULT CreateWithFactoryAndCallback([in] Windows.UI.Xaml.CreateDefaultValueCallback *create_default_value_callback, [in] Windows.UI.Xaml.PropertyChangedCallback *property_changed_callback, [out, retval] Windows.UI.Xaml.PropertyMetadata **result); + } + + + [ + composable(Windows.UI.Xaml.IDataTemplateKeyFactory, public, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass DataTemplateKey + { + [default] interface Windows.UI.Xaml.IDataTemplateKey; + } + + [ + composable(Windows.UI.Xaml.IDependencyObjectFactory, protected, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass DependencyObject + { + [default] interface Windows.UI.Xaml.IDependencyObject; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.Xaml.IDependencyObject2; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.UI.Xaml.IDependencyPropertyStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass DependencyProperty + { + [default] interface Windows.UI.Xaml.IDependencyProperty; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass DependencyPropertyChangedEventArgs + { + [default] interface Windows.UI.Xaml.IDependencyPropertyChangedEventArgs; + } + + [ + composable(Windows.UI.Xaml.IPropertyMetadataFactory, public, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.UI.Xaml.IPropertyMetadataStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass PropertyMetadata + { + [default] interface Windows.UI.Xaml.IPropertyMetadata; + } +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6594
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/windows.globalization/classes.idl | 1 + include/windows.globalization.idl | 38 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/windows.globalization/classes.idl b/dlls/windows.globalization/classes.idl index b8db4cdfeb2..6a006b15423 100644 --- a/dlls/windows.globalization/classes.idl +++ b/dlls/windows.globalization/classes.idl @@ -29,6 +29,7 @@ import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; +import "windows.system.idl"; #define DO_NO_IMPORTS #define _WINDOWS_GLOBALIZATION diff --git a/include/windows.globalization.idl b/include/windows.globalization.idl index 382cb4d5ac8..7282af63969 100644 --- a/include/windows.globalization.idl +++ b/include/windows.globalization.idl @@ -26,12 +26,15 @@ import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; +import "windows.system.idl"; #endif namespace Windows { namespace Globalization { typedef enum DayOfWeek DayOfWeek; typedef enum LanguageLayoutDirection LanguageLayoutDirection; + interface IApplicationLanguagesStatics; + interface IApplicationLanguagesStatics2; interface ICalendar; interface ICalendarFactory; interface ICalendarFactory2; @@ -47,6 +50,7 @@ namespace Windows { interface IGeographicRegionFactory; interface IGeographicRegionStatics; interface ITimeZoneOnCalendar; + runtimeclass ApplicationLanguages; runtimeclass Calendar; runtimeclass Language; runtimeclass GeographicRegion; @@ -227,6 +231,29 @@ namespace Windows { [out, retval] Windows.Globalization.Calendar **result); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.ApplicationLanguages), + uuid(75b40847-0a4c-4a92-9565-fd63c95f7aed) + ] + interface IApplicationLanguagesStatics : IInspectable + { + [propget] HRESULT PrimaryLanguageOverride([out, retval] HSTRING *value); + [propput] HRESULT PrimaryLanguageOverride([in] HSTRING value); + [propget] HRESULT Languages([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING> **value); + [propget] HRESULT ManifestLanguages([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + exclusiveto(Windows.Globalization.ApplicationLanguages), + uuid(1df0de4f-072b-4d7b-8f06-cb2db40f2bb5) + ] + interface IApplicationLanguagesStatics2 : IInspectable + { + HRESULT GetLanguagesForUser([in] Windows.System.User *user, [out, retval] Windows.Foundation.Collections.IVectorView<HSTRING> **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Globalization.Language), @@ -374,6 +401,17 @@ namespace Windows { [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Globalization.ITimeZoneOnCalendar; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Globalization.IApplicationLanguagesStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Globalization.IApplicationLanguagesStatics2, Windows.Foundation.UniversalApiContract, 6.0), + threading(both) + ] + runtimeclass ApplicationLanguages + { + } + [ activatable(Windows.Globalization.ILanguageFactory, Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0), -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6594
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/windows.ui/classes.idl | 17 +++++++++++++++++ include/windows.ui.core.idl | 2 ++ include/windows.ui.viewmanagement.idl | 2 ++ 3 files changed, 21 insertions(+) diff --git a/dlls/windows.ui/classes.idl b/dlls/windows.ui/classes.idl index e6680b2e550..a36e858603f 100644 --- a/dlls/windows.ui/classes.idl +++ b/dlls/windows.ui/classes.idl @@ -20,4 +20,21 @@ #pragma makedep register +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.system.idl"; +import "windows.devices.enumeration.idl"; +import "windows.ui.idl"; +import "windows.devices.input.idl"; + +#define DO_NO_IMPORTS +#include "windows.ui.core.idl" +#include "windows.ui.input.idl" #include "windows.ui.viewmanagement.idl" diff --git a/include/windows.ui.core.idl b/include/windows.ui.core.idl index d6bbf7ee9fb..e6b4ec5007d 100644 --- a/include/windows.ui.core.idl +++ b/include/windows.ui.core.idl @@ -20,6 +20,7 @@ #pragma winrt ns_prefix #endif +#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -32,6 +33,7 @@ import "windows.ui.input.idl"; /* import "windows.ui.input.inking.idl"; */ /* import "windows.ui.input.inking.core.idl"; */ /* import "windows.ui.popups.idl"; */ +#endif namespace Windows.UI.Input { runtimeclass PointerPoint; diff --git a/include/windows.ui.viewmanagement.idl b/include/windows.ui.viewmanagement.idl index d4a382d2f68..7d320f32164 100644 --- a/include/windows.ui.viewmanagement.idl +++ b/include/windows.ui.viewmanagement.idl @@ -20,6 +20,7 @@ #pragma winrt ns_prefix #endif +#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -31,6 +32,7 @@ import "windows.ui.idl"; import "windows.ui.core.idl"; /* import "windows.ui.popups.idl"; */ /* import "windows.ui.windowmanagement.idl"; */ +#endif namespace Windows.UI.ViewManagement { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6594
participants (2)
-
Zhiyi Zhang -
Zhiyi Zhang (＠zhiyi)