[PATCH v2 0/10] MR8853: misc: Register runtimeclasses explicitly (1/3)
-- v2: cryptowinrt: Register runtimeclasses explicitly. https://gitlab.winehq.org/wine/wine/-/merge_requests/8853
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.ui/classes.idl | 19 ++++++++++--------- include/windows.ui.viewmanagement.idl | 20 -------------------- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/dlls/windows.ui/classes.idl b/dlls/windows.ui/classes.idl index 6c0e0991474..1765624bcb5 100644 --- a/dlls/windows.ui/classes.idl +++ b/dlls/windows.ui/classes.idl @@ -19,10 +19,7 @@ */ #pragma makedep register - -#ifdef __WIDL__ #pragma winrt ns_prefix -#endif import "inspectable.idl"; import "asyncinfo.idl"; @@ -33,10 +30,14 @@ import "windows.system.idl"; import "windows.devices.enumeration.idl"; import "windows.ui.idl"; import "windows.devices.input.idl"; +import "windows.ui.core.idl"; +import "windows.ui.input.idl"; +import "windows.ui.windowmanagement.idl"; +import "windows.ui.viewmanagement.idl"; -#define DO_NO_IMPORTS -#define _WINDOWS_UI -#include "windows.ui.core.idl" -#include "windows.ui.input.idl" -#include "windows.ui.windowmanagement.idl" -#include "windows.ui.viewmanagement.idl" +namespace Windows.UI.ViewManagement { + runtimeclass AccessibilitySettings; + runtimeclass UISettings; + runtimeclass UIViewSettings; + runtimeclass InputPane; +} diff --git a/include/windows.ui.viewmanagement.idl b/include/windows.ui.viewmanagement.idl index cfb63c5a07e..784ea900370 100644 --- a/include/windows.ui.viewmanagement.idl +++ b/include/windows.ui.viewmanagement.idl @@ -99,16 +99,12 @@ namespace Windows.UI.ViewManagement interface IInputPaneStatics2; runtimeclass AccessibilitySettings; -#ifndef _WINDOWS_UI runtimeclass ApplicationView; -#endif runtimeclass ApplicationViewConsolidatedEventArgs; runtimeclass ApplicationViewScaling; -#ifndef _WINDOWS_UI runtimeclass ApplicationViewSwitcher; runtimeclass ApplicationViewTitleBar; runtimeclass ApplicationViewTransferContext; -#endif runtimeclass UISettings; runtimeclass UISettingsAnimationsEnabledChangedEventArgs; runtimeclass UISettingsAutoHideScrollBarsChangedEventArgs; @@ -120,10 +116,8 @@ namespace Windows.UI.ViewManagement declare { interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.AccessibilitySettings *, IInspectable *>; -#ifndef _WINDOWS_UI interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.ApplicationView *, IInspectable *>; interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.ApplicationView *, Windows.UI.ViewManagement.ApplicationViewConsolidatedEventArgs *>; -#endif interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings *, IInspectable *>; interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings *, Windows.UI.ViewManagement.UISettingsAnimationsEnabledChangedEventArgs *>; interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings *, Windows.UI.ViewManagement.UISettingsAutoHideScrollBarsChangedEventArgs *>; @@ -325,7 +319,6 @@ namespace Windows.UI.ViewManagement [eventremove] HRESULT HighContrastChanged([in] EventRegistrationToken cookie); } -#ifndef _WINDOWS_UI [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.UI.ViewManagement.ApplicationView), @@ -416,7 +409,6 @@ namespace Windows.UI.ViewManagement [propget] HRESULT WindowingEnvironment([out, retval] Windows.UI.WindowManagement.WindowingEnvironment **value); HRESULT GetDisplayRegions([out, retval] Windows.Foundation.Collections.IVectorView<Windows.UI.WindowManagement.DisplayRegion *> **result); } -#endif [ contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -438,7 +430,6 @@ namespace Windows.UI.ViewManagement [propget] HRESULT IsAppInitiated([out, retval] boolean *value); } -#ifndef _WINDOWS_UI [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.UI.ViewManagement.ApplicationView), @@ -458,7 +449,6 @@ namespace Windows.UI.ViewManagement { HRESULT GetApplicationViewIdForWindow([in] Windows.UI.Core.ICoreWindow *window, [out, retval] INT32 *id); } -#endif [ contract(Windows.UI.ViewManagement.ViewManagementViewScalingContract, 1.0), @@ -480,7 +470,6 @@ namespace Windows.UI.ViewManagement HRESULT TrySetDisableLayoutScaling([in] boolean disabled, [out, retval] boolean *success); } -#ifndef _WINDOWS_UI [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.UI.ViewManagement.ApplicationView), @@ -629,7 +618,6 @@ namespace Windows.UI.ViewManagement { [propget] HRESULT UIContext([out, retval] Windows.UI.UIContext **value); } -#endif [ contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -872,7 +860,6 @@ namespace Windows.UI.ViewManagement [default] interface Windows.UI.ViewManagement.IAccessibilitySettings; } -#ifndef _WINDOWS_UI [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -894,7 +881,6 @@ namespace Windows.UI.ViewManagement [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.ViewManagement.IApplicationView9; [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.ViewManagement.IApplicationViewWithContext; } -#endif [ contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -915,7 +901,6 @@ namespace Windows.UI.ViewManagement [default] interface Windows.UI.ViewManagement.IApplicationViewScaling; } -#ifndef _WINDOWS_UI [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -946,7 +931,6 @@ namespace Windows.UI.ViewManagement { [contract(Windows.Foundation.UniversalApiContract, 2.0), default] interface Windows.UI.ViewManagement.IApplicationViewTransferContext; } -#endif [ activatable(Windows.Foundation.UniversalApiContract, 1.0), @@ -990,7 +974,6 @@ namespace Windows.UI.ViewManagement [default] interface Windows.UI.ViewManagement.IUISettingsMessageDurationChangedEventArgs; } -#ifndef _WINDOWS_UI [ static(Windows.UI.ViewManagement.IUIViewSettingsStatics, Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -1000,7 +983,6 @@ namespace Windows.UI.ViewManagement { [default] interface Windows.UI.ViewManagement.IUIViewSettings; } -#endif [ static(Windows.UI.ViewManagement.IInputPaneStatics, Windows.Foundation.UniversalApiContract, 1.0), @@ -1024,7 +1006,6 @@ namespace Windows.UI.ViewManagement [default] interface Windows.UI.ViewManagement.IInputPaneVisibilityEventArgs; } -#ifndef _WINDOWS_UI [ contract(Windows.Foundation.UniversalApiContract, 4.0), static(Windows.UI.ViewManagement.IViewModePreferencesStatics, Windows.Foundation.UniversalApiContract, 4.0) @@ -1033,5 +1014,4 @@ namespace Windows.UI.ViewManagement { [contract(Windows.Foundation.UniversalApiContract, 4.0), default] interface Windows.UI.ViewManagement.IViewModePreferences; } -#endif } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8853
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.ui.xaml/classes.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windows.ui.xaml/classes.idl b/dlls/windows.ui.xaml/classes.idl index 1783048c492..70d9d595b13 100644 --- a/dlls/windows.ui.xaml/classes.idl +++ b/dlls/windows.ui.xaml/classes.idl @@ -19,5 +19,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.ui.idl" +import "windows.ui.idl"; + +namespace Windows.UI { + runtimeclass ColorHelper; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8853
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/coremessaging/classes.idl | 8 ++++++-- include/windows.system.idl | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/coremessaging/classes.idl b/dlls/coremessaging/classes.idl index a7509d2a658..af84f0a4eab 100644 --- a/dlls/coremessaging/classes.idl +++ b/dlls/coremessaging/classes.idl @@ -19,6 +19,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#define _CORE_MESSAGING -#include "windows.system.idl" +import "windows.system.idl"; + +namespace Windows.System { + runtimeclass DispatcherQueueController; +} diff --git a/include/windows.system.idl b/include/windows.system.idl index 954fe5fcfb0..8c58136b339 100644 --- a/include/windows.system.idl +++ b/include/windows.system.idl @@ -462,7 +462,6 @@ namespace Windows.System [default] interface Windows.System.IDispatcherQueueTimer; } -#ifndef _CORE_MESSAGING [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -473,7 +472,6 @@ namespace Windows.System { [default] interface Windows.System.IUser; } -#endif [ contract(Windows.Foundation.UniversalApiContract, 1.0), -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8853
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/twinapi.appcore/classes.idl | 25 ++++++++++++++++--------- include/windows.system.profile.idl | 2 -- include/windows.system.userprofile.idl | 2 -- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/twinapi.appcore/classes.idl b/dlls/twinapi.appcore/classes.idl index 2abd79b8de5..3ad10afa227 100644 --- a/dlls/twinapi.appcore/classes.idl +++ b/dlls/twinapi.appcore/classes.idl @@ -17,10 +17,7 @@ */ #pragma makedep register - -#ifdef __WIDL__ #pragma winrt ns_prefix -#endif import "inspectable.idl"; import "asyncinfo.idl"; @@ -30,10 +27,20 @@ import "windows.foundation.idl"; import "windows.globalization.idl"; import "windows.storage.streams.idl"; import "windows.ui.windowmanagement.idl"; +import "windows.security.exchangeactivesyncprovisioning.idl"; +import "windows.system.profile.idl"; +import "windows.system.userprofile.idl"; +import "windows.ui.viewmanagement.idl"; -#define DO_NO_IMPORTS -#define _TWINAPI_APPCORE -#include "windows.security.exchangeactivesyncprovisioning.idl" -#include "windows.system.profile.idl" -#include "windows.system.userprofile.idl" -#include "windows.ui.viewmanagement.idl" +namespace Windows.Security.ExchangeActiveSyncProvisioning { + runtimeclass EasClientDeviceInformation; +} +namespace Windows.System.Profile { + runtimeclass AnalyticsInfo; +} +namespace Windows.System.UserProfile { + runtimeclass AdvertisingManager; +} +namespace Windows.UI.ViewManagement { + runtimeclass ApplicationView; +} diff --git a/include/windows.system.profile.idl b/include/windows.system.profile.idl index 70322745168..7adeb6aa8a2 100644 --- a/include/windows.system.profile.idl +++ b/include/windows.system.profile.idl @@ -121,7 +121,6 @@ namespace Windows.System.Profile { } #endif -#ifndef _TWINAPI_APPCORE [ contract(Windows.Foundation.UniversalApiContract, 3.0), marshaling_behavior(agile), @@ -141,5 +140,4 @@ namespace Windows.System.Profile { { [default] interface Windows.System.Profile.ISystemIdentificationInfo; } -#endif } diff --git a/include/windows.system.userprofile.idl b/include/windows.system.userprofile.idl index 41b3797dc26..9e2b64ac971 100644 --- a/include/windows.system.userprofile.idl +++ b/include/windows.system.userprofile.idl @@ -64,7 +64,6 @@ namespace Windows.System.UserProfile { [propget] HRESULT AdvertisingId([out, retval] HSTRING *value); } -#ifndef _TWINAPI_APPCORE [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -75,7 +74,6 @@ namespace Windows.System.UserProfile { runtimeclass GlobalizationPreferences { } -#endif #ifndef _WINDOWS_GLOBALIZATION [ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8853
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.applicationmodel/classes.idl | 14 +++++--------- include/windows.applicationmodel.core.idl | 2 -- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/windows.applicationmodel/classes.idl b/dlls/windows.applicationmodel/classes.idl index c1f76f67d2f..0dfd9808b59 100644 --- a/dlls/windows.applicationmodel/classes.idl +++ b/dlls/windows.applicationmodel/classes.idl @@ -19,18 +19,14 @@ */ #pragma makedep register - -#ifdef __WIDL__ #pragma winrt ns_prefix -#endif import "windows.foundation.idl"; import "windows.storage.idl"; import "windows.system.idl"; +import "windows.applicationmodel.idl"; -#define DO_NO_IMPORTS -#define _WINDOWS_APPLICATIONMODEL -#include "windows.applicationmodel.core.idl" -#include "windows.applicationmodel.idl" -#include "windows.applicationmodel.activation.idl" -#include "windows.applicationmodel.background.idl" +namespace Windows.ApplicationModel { + runtimeclass Package; + runtimeclass DesignMode; +} diff --git a/include/windows.applicationmodel.core.idl b/include/windows.applicationmodel.core.idl index 4d3504ede68..fb3a14ce0e3 100644 --- a/include/windows.applicationmodel.core.idl +++ b/include/windows.applicationmodel.core.idl @@ -385,7 +385,6 @@ namespace Windows.ApplicationModel.Core { [contract(Windows.Foundation.UniversalApiContract, 11.0)] interface Windows.ApplicationModel.Core.IAppListEntry4; } -#ifndef _WINDOWS_APPLICATIONMODEL [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -402,7 +401,6 @@ namespace Windows.ApplicationModel.Core { runtimeclass CoreApplication { } -#endif [ contract(Windows.Foundation.UniversalApiContract, 1.0), -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8853
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.system.profile.systemid/classes.idl | 8 ++++++-- include/windows.system.profile.idl | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.system.profile.systemid/classes.idl b/dlls/windows.system.profile.systemid/classes.idl index f143f50f092..1ca32931759 100644 --- a/dlls/windows.system.profile.systemid/classes.idl +++ b/dlls/windows.system.profile.systemid/classes.idl @@ -19,6 +19,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#define _WINDOWS_SYSTEM_PROFILE_SYSTEM_ID -#include "windows.system.profile.idl" +import "windows.system.profile.idl"; + +namespace Windows.System.Profile { + runtimeclass SystemIdentification; +} diff --git a/include/windows.system.profile.idl b/include/windows.system.profile.idl index 7adeb6aa8a2..c6cfe9a9fb2 100644 --- a/include/windows.system.profile.idl +++ b/include/windows.system.profile.idl @@ -97,7 +97,6 @@ namespace Windows.System.Profile { HRESULT GetSystemIdForUser([in] Windows.System.User *user, [out, retval] Windows.System.Profile.SystemIdentificationInfo **result); } -#ifndef _WINDOWS_SYSTEM_PROFILE_SYSTEM_ID [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -119,7 +118,6 @@ namespace Windows.System.Profile { runtimeclass AnalyticsInfo { } -#endif [ contract(Windows.Foundation.UniversalApiContract, 3.0), -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8853
From: Rémi Bernon <rbernon(a)codeweavers.com> --- .../windows.system.profile.systemmanufacturers/classes.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windows.system.profile.systemmanufacturers/classes.idl b/dlls/windows.system.profile.systemmanufacturers/classes.idl index 6072a782222..30a84c8abf1 100644 --- a/dlls/windows.system.profile.systemmanufacturers/classes.idl +++ b/dlls/windows.system.profile.systemmanufacturers/classes.idl @@ -19,5 +19,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.system.profile.systemmanufacturers.idl" +import "windows.system.profile.systemmanufacturers.idl"; + +namespace Windows.System.Profile.SystemManufacturers { + runtimeclass SmbiosInformation; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8853
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.globalization/classes.idl | 17 ++++++++++------- include/windows.system.userprofile.idl | 2 -- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/windows.globalization/classes.idl b/dlls/windows.globalization/classes.idl index 6a006b15423..1a295feaf45 100644 --- a/dlls/windows.globalization/classes.idl +++ b/dlls/windows.globalization/classes.idl @@ -19,10 +19,7 @@ */ #pragma makedep register - -#ifdef __WIDL__ #pragma winrt ns_prefix -#endif import "inspectable.idl"; import "asyncinfo.idl"; @@ -30,8 +27,14 @@ import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; import "windows.system.idl"; +import "windows.globalization.idl"; +import "windows.system.userprofile.idl"; -#define DO_NO_IMPORTS -#define _WINDOWS_GLOBALIZATION -#include "windows.globalization.idl" -#include "windows.system.userprofile.idl" +namespace Windows.System.UserProfile { + runtimeclass GlobalizationPreferences; +} +namespace Windows.Globalization { + runtimeclass Language; + runtimeclass GeographicRegion; + runtimeclass ApplicationLanguages; +} diff --git a/include/windows.system.userprofile.idl b/include/windows.system.userprofile.idl index 9e2b64ac971..e0353b1d9ee 100644 --- a/include/windows.system.userprofile.idl +++ b/include/windows.system.userprofile.idl @@ -75,7 +75,6 @@ namespace Windows.System.UserProfile { { } -#ifndef _WINDOWS_GLOBALIZATION [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(standard), @@ -85,6 +84,5 @@ namespace Windows.System.UserProfile { runtimeclass AdvertisingManager { } -#endif } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8853
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/appxdeploymentclient/classes.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/appxdeploymentclient/classes.idl b/dlls/appxdeploymentclient/classes.idl index edef0414d2d..635625564de 100644 --- a/dlls/appxdeploymentclient/classes.idl +++ b/dlls/appxdeploymentclient/classes.idl @@ -19,5 +19,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.management.deployment.idl" +import "windows.management.deployment.idl"; + +namespace Windows.Management.Deployment { + runtimeclass PackageManager; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8853
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/cryptowinrt/classes.idl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/cryptowinrt/classes.idl b/dlls/cryptowinrt/classes.idl index 62272d2f93c..7e1e6345b42 100644 --- a/dlls/cryptowinrt/classes.idl +++ b/dlls/cryptowinrt/classes.idl @@ -17,6 +17,14 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.security.cryptography.idl" -#include "windows.security.credentials.idl" +import "windows.security.cryptography.idl"; +import "windows.security.credentials.idl"; + +namespace Windows.Security.Cryptography { + runtimeclass CryptographicBuffer; +} +namespace Windows.Security.Credentials { + runtimeclass KeyCredentialManager; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8853
v2: Fix a typo in the cryptowinrt namespaces. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8853#note_114167
participants (1)
-
Rémi Bernon