[PATCH 0/6] MR8892: Comment or define undefined WinRT member interfaces (1/2)
The goal is to require member interfaces to be defined like midlrt does. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8892
From: Hans Leidekker <hans(a)codeweavers.com> --- include/windows.applicationmodel.core.idl | 6 +- include/windows.applicationmodel.idl | 14 ++--- include/windows.data.json.idl | 2 +- ...ices.bluetooth.genericattributeprofile.idl | 2 +- include/windows.devices.bluetooth.idl | 22 +++---- include/windows.devices.bluetooth.rfcomm.idl | 4 +- include/windows.devices.enumeration.idl | 6 +- include/windows.management.deployment.idl | 16 ++--- include/windows.media.idl | 4 +- include/windows.media.mediaproperties.idl | 18 +++--- include/windows.networking.connectivity.idl | 10 ++-- include/windows.storage.fileproperties.idl | 2 +- include/windows.storage.idl | 26 ++++----- include/windows.system.idl | 2 +- include/windows.system.profile.idl | 2 +- include/windows.ui.composition.idl | 58 +++++++++---------- include/windows.ui.core.idl | 8 +-- 17 files changed, 101 insertions(+), 101 deletions(-) diff --git a/include/windows.applicationmodel.core.idl b/include/windows.applicationmodel.core.idl index 00261c7bafd..20ff8503134 100644 --- a/include/windows.applicationmodel.core.idl +++ b/include/windows.applicationmodel.core.idl @@ -378,9 +378,9 @@ namespace Windows.ApplicationModel.Core { runtimeclass AppListEntry { [default] interface Windows.ApplicationModel.Core.IAppListEntry; - [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.ApplicationModel.Core.IAppListEntry2; - [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.ApplicationModel.Core.IAppListEntry3; - [contract(Windows.Foundation.UniversalApiContract, 11.0)] interface Windows.ApplicationModel.Core.IAppListEntry4; + /* [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.ApplicationModel.Core.IAppListEntry2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.ApplicationModel.Core.IAppListEntry3; */ + /* [contract(Windows.Foundation.UniversalApiContract, 11.0)] interface Windows.ApplicationModel.Core.IAppListEntry4; */ } [ diff --git a/include/windows.applicationmodel.idl b/include/windows.applicationmodel.idl index a6a5ca6ef5c..dec3d96a550 100644 --- a/include/windows.applicationmodel.idl +++ b/include/windows.applicationmodel.idl @@ -402,12 +402,12 @@ namespace Windows.ApplicationModel { [default] interface Windows.ApplicationModel.IPackage; [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.ApplicationModel.IPackage2; [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.ApplicationModel.IPackage3; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.ApplicationModel.IPackageWithMetadata; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.ApplicationModel.IPackage4; - [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.ApplicationModel.IPackage5; - [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.ApplicationModel.IPackage6; - [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.ApplicationModel.IPackage7; - [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.ApplicationModel.IPackage8; + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.ApplicationModel.IPackageWithMetadata; */ + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.ApplicationModel.IPackage4; */ + /* [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.ApplicationModel.IPackage5; */ + /* [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.ApplicationModel.IPackage6; */ + /* [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.ApplicationModel.IPackage7; */ + /* [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.ApplicationModel.IPackage8; */ } [ @@ -417,7 +417,7 @@ namespace Windows.ApplicationModel { runtimeclass PackageStatus { [default] interface Windows.ApplicationModel.IPackageStatus; - [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.ApplicationModel.IPackageStatus2; + /* [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.ApplicationModel.IPackageStatus2; */ } [ diff --git a/include/windows.data.json.idl b/include/windows.data.json.idl index c38e5929bba..4dfe36d095a 100644 --- a/include/windows.data.json.idl +++ b/include/windows.data.json.idl @@ -157,7 +157,7 @@ namespace Windows.Data.Json { interface Windows.Data.Json.IJsonValue; interface Windows.Foundation.Collections.IMap<HSTRING, Windows.Data.Json.IJsonValue *>; interface Windows.Foundation.Collections.IIterable<Windows.Foundation.Collections.IKeyValuePair<HSTRING, Windows.Data.Json.IJsonValue *> *>; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Data.Json.IJsonObjectWithDefaultValues; + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Data.Json.IJsonObjectWithDefaultValues; */ [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Foundation.IStringable; } diff --git a/include/windows.devices.bluetooth.genericattributeprofile.idl b/include/windows.devices.bluetooth.genericattributeprofile.idl index be6487345e2..a1a2c265b9e 100644 --- a/include/windows.devices.bluetooth.genericattributeprofile.idl +++ b/include/windows.devices.bluetooth.genericattributeprofile.idl @@ -677,7 +677,7 @@ namespace Windows.Devices.Bluetooth.GenericAttributeProfile { runtimeclass GattReadResult { [default] interface Windows.Devices.Bluetooth.GenericAttributeProfile.IGattReadResult; - [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Devices.Bluetooth.GenericAttributeProfile.IGattReadResult2; + /* [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Devices.Bluetooth.GenericAttributeProfile.IGattReadResult2; */ } [ diff --git a/include/windows.devices.bluetooth.idl b/include/windows.devices.bluetooth.idl index f51025d53df..e3e45d3df5e 100644 --- a/include/windows.devices.bluetooth.idl +++ b/include/windows.devices.bluetooth.idl @@ -295,8 +295,8 @@ namespace Windows.Devices.Bluetooth { runtimeclass BluetoothAdapter { [default] interface Windows.Devices.Bluetooth.IBluetoothAdapter; - [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Devices.Bluetooth.IBluetoothAdapter2; - [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.Devices.Bluetooth.IBluetoothAdapter3; + /* [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Devices.Bluetooth.IBluetoothAdapter2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.Devices.Bluetooth.IBluetoothAdapter3; */ } [ @@ -388,10 +388,10 @@ namespace Windows.Devices.Bluetooth { runtimeclass BluetoothDevice { [default] interface Windows.Devices.Bluetooth.IBluetoothDevice; - [contract(Windows.Foundation.UniversalApiContract, 2.0)] interface Windows.Devices.Bluetooth.IBluetoothDevice2; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.Devices.Bluetooth.IBluetoothDevice3; - [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.Devices.Bluetooth.IBluetoothDevice4; - [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Devices.Bluetooth.IBluetoothDevice5; + /* [contract(Windows.Foundation.UniversalApiContract, 2.0)] interface Windows.Devices.Bluetooth.IBluetoothDevice2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.Devices.Bluetooth.IBluetoothDevice3; */ + /* [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.Devices.Bluetooth.IBluetoothDevice4; */ + /* [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Devices.Bluetooth.IBluetoothDevice5; */ interface Windows.Foundation.IClosable; } @@ -478,11 +478,11 @@ namespace Windows.Devices.Bluetooth { runtimeclass BluetoothLEDevice { [default] interface Windows.Devices.Bluetooth.IBluetoothLEDevice; - [contract(Windows.Foundation.UniversalApiContract, 2.0)] interface Windows.Devices.Bluetooth.IBluetoothLEDevice2; - [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Devices.Bluetooth.IBluetoothLEDevice3; - [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.Devices.Bluetooth.IBluetoothLEDevice4; - [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Devices.Bluetooth.IBluetoothLEDevice5; - [contract(Windows.Foundation.UniversalApiContract, 13.0)] interface Windows.Devices.Bluetooth.IBluetoothLEDevice6; + /* [contract(Windows.Foundation.UniversalApiContract, 2.0)] interface Windows.Devices.Bluetooth.IBluetoothLEDevice2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Devices.Bluetooth.IBluetoothLEDevice3; */ + /* [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.Devices.Bluetooth.IBluetoothLEDevice4; */ + /* [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Devices.Bluetooth.IBluetoothLEDevice5; */ + /* [contract(Windows.Foundation.UniversalApiContract, 13.0)] interface Windows.Devices.Bluetooth.IBluetoothLEDevice6; */ interface Windows.Foundation.IClosable; } diff --git a/include/windows.devices.bluetooth.rfcomm.idl b/include/windows.devices.bluetooth.rfcomm.idl index 5005ca647b8..aeb538f13a8 100644 --- a/include/windows.devices.bluetooth.rfcomm.idl +++ b/include/windows.devices.bluetooth.rfcomm.idl @@ -92,9 +92,9 @@ namespace Windows.Devices.Bluetooth.Rfcomm { runtimeclass RfcommDeviceService { [default] interface Windows.Devices.Bluetooth.Rfcomm.IRfcommDeviceService; - interface Windows.Devices.Bluetooth.Rfcomm.IRfcommDeviceService2; + /* interface Windows.Devices.Bluetooth.Rfcomm.IRfcommDeviceService2; */ interface Windows.Foundation.IClosable; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.Devices.Bluetooth.Rfcomm.IRfcommDeviceService3; + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.Devices.Bluetooth.Rfcomm.IRfcommDeviceService3; */ } [ diff --git a/include/windows.devices.enumeration.idl b/include/windows.devices.enumeration.idl index 555b07dad4e..72e7beb36c4 100644 --- a/include/windows.devices.enumeration.idl +++ b/include/windows.devices.enumeration.idl @@ -310,7 +310,7 @@ namespace Windows.Devices.Enumeration { runtimeclass DeviceInformation { [default] interface Windows.Devices.Enumeration.IDeviceInformation; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Devices.Enumeration.IDeviceInformation2; + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Devices.Enumeration.IDeviceInformation2; */ } [ @@ -330,7 +330,7 @@ namespace Windows.Devices.Enumeration { runtimeclass DeviceInformationUpdate { [default] interface Windows.Devices.Enumeration.IDeviceInformationUpdate; - interface Windows.Devices.Enumeration.IDeviceInformationUpdate2; + /* interface Windows.Devices.Enumeration.IDeviceInformationUpdate2; */ } [ @@ -354,7 +354,7 @@ namespace Windows.Devices.Enumeration { runtimeclass DeviceWatcher { [default] interface Windows.Devices.Enumeration.IDeviceWatcher; - interface Windows.Devices.Enumeration.IDeviceWatcher2; + /* interface Windows.Devices.Enumeration.IDeviceWatcher2; */ } [ diff --git a/include/windows.management.deployment.idl b/include/windows.management.deployment.idl index bdb115b924e..9691b228c2b 100644 --- a/include/windows.management.deployment.idl +++ b/include/windows.management.deployment.idl @@ -245,7 +245,7 @@ namespace Windows.Management.Deployment { runtimeclass DeploymentResult { [default] interface Windows.Management.Deployment.IDeploymentResult; - [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Management.Deployment.IDeploymentResult2; + /* [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Management.Deployment.IDeploymentResult2; */ } [ @@ -258,13 +258,13 @@ namespace Windows.Management.Deployment { { [default] interface Windows.Management.Deployment.IPackageManager; [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Management.Deployment.IPackageManager2; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Management.Deployment.IPackageManager3; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.Management.Deployment.IPackageManager4; - [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Management.Deployment.IPackageManager5; - [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.Management.Deployment.IPackageManager6; - [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Management.Deployment.IPackageManager7; - [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.Management.Deployment.IPackageManager8; - [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.Management.Deployment.IPackageManager9; + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Management.Deployment.IPackageManager3; */ + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.Management.Deployment.IPackageManager4; */ + /* [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Management.Deployment.IPackageManager5; */ + /* [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.Management.Deployment.IPackageManager6; */ + /* [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Management.Deployment.IPackageManager7; */ + /* [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.Management.Deployment.IPackageManager8; */ + /* [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.Management.Deployment.IPackageManager9; */ } [ diff --git a/include/windows.media.idl b/include/windows.media.idl index d908ede5265..5d3666c281c 100644 --- a/include/windows.media.idl +++ b/include/windows.media.idl @@ -418,7 +418,7 @@ namespace Windows.Media { [default] interface Windows.Media.IMusicDisplayProperties; [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.IMusicDisplayProperties2; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.Media.IMusicDisplayProperties3; + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.Media.IMusicDisplayProperties3; */ } [ @@ -507,6 +507,6 @@ namespace Windows.Media runtimeclass VideoDisplayProperties { [default] interface Windows.Media.IVideoDisplayProperties; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.IVideoDisplayProperties2; + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.IVideoDisplayProperties2; */ } } diff --git a/include/windows.media.mediaproperties.idl b/include/windows.media.mediaproperties.idl index 9fa810f58db..6dcd5ec61e1 100644 --- a/include/windows.media.mediaproperties.idl +++ b/include/windows.media.mediaproperties.idl @@ -147,8 +147,8 @@ namespace Windows.Media.MediaProperties { [default] interface Windows.Media.MediaProperties.IAudioEncodingProperties; interface Windows.Media.MediaProperties.IMediaEncodingProperties; [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.MediaProperties.IAudioEncodingPropertiesWithFormatUserData; - [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Media.MediaProperties.IAudioEncodingProperties2; - [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Media.MediaProperties.IAudioEncodingProperties3; + /* [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Media.MediaProperties.IAudioEncodingProperties2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Media.MediaProperties.IAudioEncodingProperties3; */ } [ @@ -161,7 +161,7 @@ namespace Windows.Media.MediaProperties { { [default] interface Windows.Media.MediaProperties.IContainerEncodingProperties; interface Windows.Media.MediaProperties.IMediaEncodingProperties; - [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Media.MediaProperties.IContainerEncodingProperties2; + /* [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Media.MediaProperties.IContainerEncodingProperties2; */ } [ @@ -176,8 +176,8 @@ namespace Windows.Media.MediaProperties { runtimeclass MediaEncodingProfile { [default] interface Windows.Media.MediaProperties.IMediaEncodingProfile; - [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.Media.MediaProperties.IMediaEncodingProfile2; - [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Media.MediaProperties.IMediaEncodingProfile3; + /* [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.Media.MediaProperties.IMediaEncodingProfile2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Media.MediaProperties.IMediaEncodingProfile3; */ } [ @@ -202,9 +202,9 @@ namespace Windows.Media.MediaProperties { { [default] interface Windows.Media.MediaProperties.IVideoEncodingProperties; interface Windows.Media.MediaProperties.IMediaEncodingProperties; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.MediaProperties.IVideoEncodingProperties2; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.Media.MediaProperties.IVideoEncodingProperties3; - [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Media.MediaProperties.IVideoEncodingProperties4; - [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Media.MediaProperties.IVideoEncodingProperties5; + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.MediaProperties.IVideoEncodingProperties2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.Media.MediaProperties.IVideoEncodingProperties3; */ + /* [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Media.MediaProperties.IVideoEncodingProperties4; */ + /* [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Media.MediaProperties.IVideoEncodingProperties5; */ } } diff --git a/include/windows.networking.connectivity.idl b/include/windows.networking.connectivity.idl index 48800b97fb5..df470c1789e 100644 --- a/include/windows.networking.connectivity.idl +++ b/include/windows.networking.connectivity.idl @@ -515,7 +515,7 @@ namespace Windows.Networking.Connectivity runtimeclass ConnectionCost { [default] interface Windows.Networking.Connectivity.IConnectionCost; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Networking.Connectivity.IConnectionCost2; + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Networking.Connectivity.IConnectionCost2; */ } [ @@ -526,9 +526,9 @@ namespace Windows.Networking.Connectivity { [default] interface Windows.Networking.Connectivity.IConnectionProfile; [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Networking.Connectivity.IConnectionProfile2; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Networking.Connectivity.IConnectionProfile3; - [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.Networking.Connectivity.IConnectionProfile4; - [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.Networking.Connectivity.IConnectionProfile5; + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Networking.Connectivity.IConnectionProfile3; */ + /* [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.Networking.Connectivity.IConnectionProfile4; */ + /* [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.Networking.Connectivity.IConnectionProfile5; */ } [ @@ -637,7 +637,7 @@ namespace Windows.Networking.Connectivity runtimeclass WwanConnectionProfileDetails { [default] interface Windows.Networking.Connectivity.IWwanConnectionProfileDetails; - [contract(Windows.Networking.Connectivity.WwanContract, 2.0)] interface Windows.Networking.Connectivity.IWwanConnectionProfileDetails2; + /* [contract(Windows.Networking.Connectivity.WwanContract, 2.0)] interface Windows.Networking.Connectivity.IWwanConnectionProfileDetails2; */ } [ diff --git a/include/windows.storage.fileproperties.idl b/include/windows.storage.fileproperties.idl index 9426d02fefb..77c17298d97 100644 --- a/include/windows.storage.fileproperties.idl +++ b/include/windows.storage.fileproperties.idl @@ -57,6 +57,6 @@ namespace Windows.Storage.FileProperties { runtimeclass BasicProperties { [default] interface Windows.Storage.FileProperties.IBasicProperties; - interface Windows.Storage.FileProperties.IStorageItemExtraProperties; + /* interface Windows.Storage.FileProperties.IStorageItemExtraProperties; */ } } diff --git a/include/windows.storage.idl b/include/windows.storage.idl index 1f4741ac8b9..3473281fece 100644 --- a/include/windows.storage.idl +++ b/include/windows.storage.idl @@ -672,12 +672,12 @@ namespace Windows.Storage { interface Windows.Storage.Streams.IInputStreamReference; interface Windows.Storage.Streams.IRandomAccessStreamReference; interface Windows.Storage.IStorageItem; - interface Windows.Storage.IStorageItemProperties; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemProperties2; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItem2; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemPropertiesWithProvider; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageFilePropertiesWithAvailability; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageFile2; + /* interface Windows.Storage.IStorageItemProperties; */ + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemProperties2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItem2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemPropertiesWithProvider; */ + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageFilePropertiesWithAvailability; */ + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageFile2; */ } [ @@ -689,13 +689,13 @@ namespace Windows.Storage { { [default] interface Windows.Storage.IStorageFolder; interface Windows.Storage.IStorageItem; - interface Windows.Storage.Search.IStorageFolderQueryOperations; - interface Windows.Storage.IStorageItemProperties; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemProperties2; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItem2; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageFolder2; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemPropertiesWithProvider; - [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Storage.IStorageFolder3; + /* interface Windows.Storage.Search.IStorageFolderQueryOperations; */ + /* interface Windows.Storage.IStorageItemProperties; */ + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemProperties2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItem2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageFolder2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Storage.IStorageItemPropertiesWithProvider; */ + /* [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Storage.IStorageFolder3; */ } [ diff --git a/include/windows.system.idl b/include/windows.system.idl index 8c58136b339..c395058860b 100644 --- a/include/windows.system.idl +++ b/include/windows.system.idl @@ -480,6 +480,6 @@ namespace Windows.System runtimeclass UserChangedEventArgs { [default] interface Windows.System.IUserChangedEventArgs; - [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.System.IUserChangedEventArgs2; + /* [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.System.IUserChangedEventArgs2; */ } } diff --git a/include/windows.system.profile.idl b/include/windows.system.profile.idl index 765a75542a3..be3cb80a7a0 100644 --- a/include/windows.system.profile.idl +++ b/include/windows.system.profile.idl @@ -103,7 +103,7 @@ namespace Windows.System.Profile { runtimeclass AnalyticsVersionInfo { [default] interface Windows.System.Profile.IAnalyticsVersionInfo; - [contract(Windows.Foundation.UniversalApiContract, 11.0)] interface Windows.System.Profile.IAnalyticsVersionInfo2; + /* [contract(Windows.Foundation.UniversalApiContract, 11.0)] interface Windows.System.Profile.IAnalyticsVersionInfo2; */ } [ diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index a8a8594370e..0eb7e4321c0 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -918,9 +918,9 @@ namespace Windows.UI.Composition { runtimeclass CompositionAnimation : Windows.UI.Composition.CompositionObject { [default] interface Windows.UI.Composition.ICompositionAnimation; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionAnimation2; - [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.UI.Composition.ICompositionAnimation3; - [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.UI.Composition.ICompositionAnimation4; + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionAnimation2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.UI.Composition.ICompositionAnimation3; */ + /* [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.UI.Composition.ICompositionAnimation4; */ [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionAnimationBase; } @@ -954,7 +954,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionClip : Windows.UI.Composition.CompositionObject { [default] interface Windows.UI.Composition.ICompositionClip; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionClip2; + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionClip2; */ } [ @@ -986,7 +986,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionDrawingSurface : Windows.UI.Composition.CompositionObject { [default] interface Windows.UI.Composition.ICompositionDrawingSurface; - [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.ICompositionDrawingSurface2; + /* [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.ICompositionDrawingSurface2; */ interface Windows.UI.Composition.ICompositionSurface; } @@ -1030,9 +1030,9 @@ namespace Windows.UI.Composition { runtimeclass CompositionGraphicsDevice : Windows.UI.Composition.CompositionObject { [default] interface Windows.UI.Composition.ICompositionGraphicsDevice; - [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.ICompositionGraphicsDevice2; - [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositionGraphicsDevice3; - [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.UI.Composition.ICompositionGraphicsDevice4; + /* [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.ICompositionGraphicsDevice2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositionGraphicsDevice3; */ + /* [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.UI.Composition.ICompositionGraphicsDevice4; */ } [ @@ -1045,11 +1045,11 @@ namespace Windows.UI.Composition { runtimeclass CompositionObject { [default] interface Windows.UI.Composition.ICompositionObject; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionObject2; - [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.UI.Composition.ICompositionObject3; - [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.UI.Composition.ICompositionObject4; + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionObject2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.UI.Composition.ICompositionObject3; */ + /* [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.UI.Composition.ICompositionObject4; */ interface Windows.Foundation.IClosable; - [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.UI.Composition.IAnimationObject; + /* [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.UI.Composition.IAnimationObject; */ } [ @@ -1060,7 +1060,7 @@ namespace Windows.UI.Composition { runtimeclass CompositionPropertySet : Windows.UI.Composition.CompositionObject { [default] interface Windows.UI.Composition.ICompositionPropertySet; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionPropertySet2; + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionPropertySet2; */ } [ @@ -1081,8 +1081,8 @@ namespace Windows.UI.Composition { runtimeclass CompositionSurfaceBrush : Windows.UI.Composition.CompositionBrush { [default] interface Windows.UI.Composition.ICompositionSurfaceBrush; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionSurfaceBrush2; - [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositionSurfaceBrush3; + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionSurfaceBrush2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositionSurfaceBrush3; */ } [ @@ -1106,16 +1106,16 @@ namespace Windows.UI.Composition { runtimeclass Compositor { [default] interface Windows.UI.Composition.ICompositor; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositor2; - [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.ICompositor3; - [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.UI.Composition.ICompositor4; - [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.UI.Composition.ICompositor5; - [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.UI.Composition.ICompositor6; - [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositorWithProjectedShadow; - [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositorWithRadialGradient; - [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositorWithVisualSurface; - [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.UI.Composition.ICompositor7; - [contract(Windows.Foundation.UniversalApiContract, 13.0)] interface Windows.UI.Composition.ICompositorWithBlurredWallpaperBackdropBrush; + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositor2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.ICompositor3; */ + /* [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.UI.Composition.ICompositor4; */ + /* [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.UI.Composition.ICompositor5; */ + /* [contract(Windows.Foundation.UniversalApiContract, 7.0)] interface Windows.UI.Composition.ICompositor6; */ + /* [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositorWithProjectedShadow; */ + /* [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositorWithRadialGradient; */ + /* [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositorWithVisualSurface; */ + /* [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.UI.Composition.ICompositor7; */ + /* [contract(Windows.Foundation.UniversalApiContract, 13.0)] interface Windows.UI.Composition.ICompositorWithBlurredWallpaperBackdropBrush; */ interface Windows.Foundation.IClosable; } @@ -1208,7 +1208,7 @@ namespace Windows.UI.Composition { runtimeclass SpriteVisual : Windows.UI.Composition.ContainerVisual { [default] interface Windows.UI.Composition.ISpriteVisual; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ISpriteVisual2; + /* [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ISpriteVisual2; */ } [ @@ -1250,9 +1250,9 @@ namespace Windows.UI.Composition { runtimeclass Visual : Windows.UI.Composition.CompositionObject { [default] interface Windows.UI.Composition.IVisual; - [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.IVisual2; - [contract(Windows.Foundation.UniversalApiContract, 11.0)] interface Windows.UI.Composition.IVisual3; - [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.UI.Composition.IVisual4; + /* [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Composition.IVisual2; */ + /* [contract(Windows.Foundation.UniversalApiContract, 11.0)] interface Windows.UI.Composition.IVisual3; */ + /* [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.UI.Composition.IVisual4; */ } [ diff --git a/include/windows.ui.core.idl b/include/windows.ui.core.idl index d6bbf7ee9fb..e2017322eae 100644 --- a/include/windows.ui.core.idl +++ b/include/windows.ui.core.idl @@ -586,8 +586,8 @@ namespace Windows.UI.Core { { [default] interface Windows.UI.Core.ICoreDispatcher; interface Windows.UI.Core.ICoreAcceleratorKeys; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.Core.ICoreDispatcherWithTaskPriority; - [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.Core.ICoreDispatcher2; + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.Core.ICoreDispatcherWithTaskPriority; */ + /* [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.Core.ICoreDispatcher2; */ } [ @@ -599,11 +599,11 @@ namespace Windows.UI.Core { { [default] interface Windows.UI.Core.ICoreWindow; [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.Core.ICoreWindow2; - [contract(Windows.Foundation.UniversalApiContract, 2.0)] interface Windows.UI.Core.ICorePointerRedirector; + /* [contract(Windows.Foundation.UniversalApiContract, 2.0)] interface Windows.UI.Core.ICorePointerRedirector; */ [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Core.ICoreWindow3; [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.UI.Core.ICoreWindow4; [contract(Windows.Foundation.UniversalApiContract, 5.0)] interface Windows.UI.Core.ICoreWindow5; - [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Core.ICoreWindowWithContext; + /* [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Core.ICoreWindowWithContext; */ } [ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8892
From: Hans Leidekker <hans(a)codeweavers.com> --- include/windows.storage.streams.idl | 50 +++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/include/windows.storage.streams.idl b/include/windows.storage.streams.idl index c51d4601e55..161baa88e41 100644 --- a/include/windows.storage.streams.idl +++ b/include/windows.storage.streams.idl @@ -30,6 +30,7 @@ namespace Windows.Storage { namespace Windows.Storage.Streams { typedef enum ByteOrder ByteOrder; + typedef enum InputStreamOptions InputStreamOptions; typedef enum UnicodeEncoding UnicodeEncoding; interface IBuffer; interface IBufferFactory; @@ -54,8 +55,11 @@ namespace Windows.Storage.Streams { declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.IBuffer *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.IInputStream *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.IOutputStream *>; + interface Windows.Foundation.IAsyncOperation<UINT32>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IBuffer *>; + interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IInputStream *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IOutputStream *>; interface Windows.Foundation.Collections.IIterable<Windows.Storage.Streams.IRandomAccessStream *>; interface Windows.Foundation.Collections.IIterator<Windows.Storage.Streams.IRandomAccessStream *>; @@ -69,6 +73,8 @@ namespace Windows.Storage.Streams { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.IRandomAccessStreamWithContentType *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.RandomAccessStreamReference *>; interface Windows.Foundation.AsyncOperationProgressHandler<UINT64,UINT64>; + interface Windows.Foundation.AsyncOperationProgressHandler<Windows.Storage.Streams.IBuffer *,UINT32>; + interface Windows.Foundation.AsyncOperationWithProgressCompletedHandler<Windows.Storage.Streams.IBuffer *,UINT32>; interface Windows.Foundation.AsyncOperationWithProgressCompletedHandler<UINT64,UINT64>; interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IMapView<HSTRING, Windows.Storage.Streams.RandomAccessStreamReference *> *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IRandomAccessStream *>; @@ -76,6 +82,7 @@ namespace Windows.Storage.Streams { interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IRandomAccessStreamWithContentType *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.RandomAccessStreamReference *>; interface Windows.Foundation.IAsyncOperationWithProgress<UINT64,UINT64>; + interface Windows.Foundation.IAsyncOperationWithProgress<Windows.Storage.Streams.IBuffer *,UINT32>; } [ @@ -87,6 +94,17 @@ namespace Windows.Storage.Streams { BigEndian = 1, }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + flags + ] + enum InputStreamOptions + { + None = 0x0, + Partial = 0x1, + ReadAhead = 0x2, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0) ] @@ -132,6 +150,15 @@ namespace Windows.Storage.Streams { [out, retval] Windows.Foundation.MemoryBuffer **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(97d098a5-3b99-4de9-88a5-e11d2f50c795) + ] + interface IContentTypeProvider : IInspectable + { + [propget] HRESULT ContentType([out, retval] HSTRING *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(64b89265-d341-4922-b38a-dd4af8808c4e) @@ -179,6 +206,29 @@ namespace Windows.Storage.Streams { [out, retval] Windows.Storage.Streams.DataWriter **data_writer); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(905a0fe2-bc53-11df-8c49-001e4fc686da) + ] + interface IInputStream : IInspectable + requires Windows.Foundation.IClosable + { + HRESULT ReadAsync( + [in] Windows.Storage.Streams.IBuffer *buffer, + [in] UINT32 count, + [in] Windows.Storage.Streams.InputStreamOptions options, + [out, retval] Windows.Foundation.IAsyncOperationWithProgress<Windows.Storage.Streams.IBuffer *, UINT32> **operation); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(43929d18-5ec9-4b5a-919c-4205b0c804b6) + ] + interface IInputStreamReference : IInspectable + { + HRESULT OpenSequentialReadAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IInputStream *> **operation); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(905a0fe6-bc53-11df-8c49-001e4fc686da) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8892
From: Hans Leidekker <hans(a)codeweavers.com> --- include/windows.storage.idl | 4 +++ include/windows.system.idl | 66 +++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/include/windows.storage.idl b/include/windows.storage.idl index 3473281fece..fb2a211e0d8 100644 --- a/include/windows.storage.idl +++ b/include/windows.storage.idl @@ -33,6 +33,10 @@ import "windows.storage.streams.idl"; import "windows.system.idl"; #endif +namespace Windows.System { + runtimeclass User; +} + namespace Windows.Storage { typedef enum ApplicationDataCreateDisposition ApplicationDataCreateDisposition; typedef enum ApplicationDataLocality ApplicationDataLocality; diff --git a/include/windows.system.idl b/include/windows.system.idl index c395058860b..5eeb8cf93d4 100644 --- a/include/windows.system.idl +++ b/include/windows.system.idl @@ -25,11 +25,24 @@ import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; +import "windows.storage.idl"; +import "windows.storage.streams.idl"; + +namespace Windows.Foundation.Collections { + interface IPropertySet; +} + +namespace Windows.Storage.Streams { + interface IRandomAccessStreamReference; +} namespace Windows.System { typedef enum DispatcherQueuePriority DispatcherQueuePriority; typedef enum ProcessorArchitecture ProcessorArchitecture; + typedef enum UserAuthenticationStatus UserAuthenticationStatus; + typedef enum UserPictureSize UserPictureSize; + typedef enum UserType UserType; typedef enum VirtualKey VirtualKey; typedef enum VirtualKeyModifiers VirtualKeyModifiers; @@ -54,6 +67,10 @@ namespace Windows.System declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IPropertySet *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.Streams.IRandomAccessStreamReference *>; + interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IPropertySet *>; + interface Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IRandomAccessStreamReference *>; interface Windows.Foundation.TypedEventHandler<Windows.System.DispatcherQueue *, IInspectable *>; interface Windows.Foundation.TypedEventHandler<Windows.System.DispatcherQueue *, Windows.System.DispatcherQueueShutdownStartingEventArgs *>; interface Windows.Foundation.TypedEventHandler<Windows.System.DispatcherQueueTimer *, IInspectable *>; @@ -85,6 +102,40 @@ namespace Windows.System Unknown = 65535 }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum UserAuthenticationStatus + { + Unauthenticated = 0, + LocallyAuthenticated = 1, + RemotelyAuthenticated = 2, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum UserPictureSize + { + Size64x64 = 0, + Size208x208 = 1, + Size424x424 = 2, + Size1080x1080 = 3, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum UserType + { + LocalUser = 0, + RemoteUser = 1, + LocalGuest = 2, + RemoteGuest = 3, + [contract(Windows.Foundation.UniversalApiContract, 11.0)] + SystemManaged = 4, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0) ] @@ -411,6 +462,21 @@ namespace Windows.System [eventremove] HRESULT Tick([in] EventRegistrationToken token); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.System.User), + uuid(df9a26c6-e746-4bcd-b5d4-120103c4209b) + ] + interface IUser : IInspectable + { + [propget] HRESULT NonRoamableId([out, retval] HSTRING *value); + [propget] HRESULT AuthenticationStatus([out, retval] Windows.System.UserAuthenticationStatus *value); + [propget] HRESULT Type([out, retval] Windows.System.UserType *value); + HRESULT GetPropertyAsync([in] HSTRING value, [out, retval] Windows.Foundation.IAsyncOperation<IInspectable *> **operation); + HRESULT GetPropertiesAsync([in] Windows.Foundation.Collections.IVectorView<HSTRING> *values, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IPropertySet *> **operation); + HRESULT GetPictureAsync([in] Windows.System.UserPictureSize desired_size, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.Streams.IRandomAccessStreamReference *> **operation); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.System.UserChangedEventArgs), -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8892
From: Hans Leidekker <hans(a)codeweavers.com> --- include/windows.ui.core.idl | 52 +++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/windows.ui.core.idl b/include/windows.ui.core.idl index e2017322eae..68159d7c3ee 100644 --- a/include/windows.ui.core.idl +++ b/include/windows.ui.core.idl @@ -43,6 +43,7 @@ namespace Windows.UI.Input { } namespace Windows.UI.Core { + typedef enum CoreAcceleratorKeyEventType CoreAcceleratorKeyEventType; typedef enum CoreCursorType CoreCursorType; typedef enum CoreDispatcherPriority CoreDispatcherPriority; typedef enum CoreProcessEventsOption CoreProcessEventsOption; @@ -53,6 +54,7 @@ namespace Windows.UI.Core { typedef struct CorePhysicalKeyStatus CorePhysicalKeyStatus; typedef struct CoreProximityEvaluation CoreProximityEvaluation; + interface IAcceleratorKeyEventArgs; interface IAutomationProviderRequestedEventArgs; interface ICharacterReceivedEventArgs; interface IClosestInteractiveBoundsRequestedEventArgs; @@ -97,6 +99,7 @@ namespace Windows.UI.Core { runtimeclass WindowSizeChangedEventArgs; declare { + interface Windows.Foundation.TypedEventHandler<Windows.UI.Core.CoreDispatcher *, Windows.UI.Core.AcceleratorKeyEventArgs *>; interface Windows.Foundation.TypedEventHandler<Windows.UI.Core.CoreWindow *, IInspectable *>; interface Windows.Foundation.TypedEventHandler<Windows.UI.Core.CoreWindow *, Windows.UI.Core.AutomationProviderRequestedEventArgs *>; interface Windows.Foundation.TypedEventHandler<Windows.UI.Core.CoreWindow *, Windows.UI.Core.CharacterReceivedEventArgs *>; @@ -111,6 +114,22 @@ namespace Windows.UI.Core { interface Windows.Foundation.TypedEventHandler<Windows.UI.Core.CoreWindow *, Windows.UI.Core.WindowSizeChangedEventArgs *>; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum CoreAcceleratorKeyEventType + { + Character = 2, + DeadCharacter = 3, + KeyDown = 0, + KeyUp = 1, + SystemCharacter = 6, + SystemDeadCharacter = 7, + SystemKeyDown = 4, + SystemKeyUp = 5, + UnicodeCharacter = 8, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0) ] @@ -234,6 +253,19 @@ namespace Windows.UI.Core { ] delegate HRESULT IdleDispatchedHandler([in] Windows.UI.Core.IdleDispatchedHandlerArgs *e); + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Core.AcceleratorKeyEventArgs), + uuid(ff1c4c4a-9287-470b-836e-9086e3126ade) + ] + interface IAcceleratorKeyEventArgs : IInspectable + requires Windows.UI.Core.ICoreWindowEventArgs + { + [propget] HRESULT EventType([out, retval] Windows.UI.Core.CoreAcceleratorKeyEventType *value); + [propget] HRESULT VirtualKey([out, retval] Windows.System.VirtualKey *value); + [propget] HRESULT KeyStatus([out, retval] Windows.UI.Core.CorePhysicalKeyStatus *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.UI.Core.AutomationProviderRequestedEventArgs), @@ -271,6 +303,16 @@ namespace Windows.UI.Core { [propput] HRESULT ClosestInteractiveBounds([in] Windows.Foundation.Rect value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(9ffdf7f5-b8c9-4ef0-b7d2-1de626561fc8) + ] + interface ICoreAcceleratorKeys : IInspectable + { + [eventadd] HRESULT AcceleratorKeyActivated([in] Windows.Foundation.TypedEventHandler<Windows.UI.Core.CoreDispatcher *, Windows.UI.Core.AcceleratorKeyEventArgs *> *handler, [out, retval] EventRegistrationToken *cookie); + [eventremove] HRESULT AcceleratorKeyActivated([in] EventRegistrationToken cookie); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.UI.Core.CoreCursor), @@ -539,6 +581,16 @@ namespace Windows.UI.Core { [propget] HRESULT Size([out, retval] Windows.Foundation.Size *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass AcceleratorKeyEventArgs + { + [default] interface Windows.UI.Core.IAcceleratorKeyEventArgs; + interface Windows.UI.Core.ICoreWindowEventArgs; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(standard) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8892
From: Hans Leidekker <hans(a)codeweavers.com> --- include/Makefile.in | 1 + include/windows.security.credentials.idl | 81 ++++++++++++++++++- .../windows.security.cryptography.core.idl | 46 +++++++++++ 3 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 include/windows.security.cryptography.core.idl diff --git a/include/Makefile.in b/include/Makefile.in index 2913b018a9b..45d9932339d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -920,6 +920,7 @@ SOURCES = \ windows.security.credentials.idl \ windows.security.credentials.ui.idl \ windows.security.cryptography.idl \ + windows.security.cryptography.core.idl \ windows.security.enterprisedata.idl \ windows.security.exchangeactivesyncprovisioning.idl \ windows.security.isolation.idl \ diff --git a/include/windows.security.credentials.idl b/include/windows.security.credentials.idl index ca682baaf0e..35b739f29f3 100644 --- a/include/windows.security.credentials.idl +++ b/include/windows.security.credentials.idl @@ -25,27 +25,51 @@ import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; -/* import "windows.security.cryptography.core.idl"; */ +import "windows.security.cryptography.core.idl"; import "windows.storage.streams.idl"; import "windows.system.idl"; +namespace Windows.Security.Cryptography.Core { + typedef enum CryptographicPublicKeyBlobType CryptographicPublicKeyBlobType; +} + namespace Windows.Security.Credentials { + typedef enum KeyCredentialAttestationStatus KeyCredentialAttestationStatus; typedef enum KeyCredentialCreationOption KeyCredentialCreationOption; typedef enum KeyCredentialStatus KeyCredentialStatus; interface IKeyCredential; + interface IKeyCredentialAttestationResult; interface IKeyCredentialManagerStatics; + interface IKeyCredentialOperationResult; interface IKeyCredentialRetrievalResult; runtimeclass KeyCredential; + runtimeclass KeyCredentialAttestationResult; runtimeclass KeyCredentialManager; + runtimeclass KeyCredentialOperationResult; runtimeclass KeyCredentialRetrievalResult; declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Security.Credentials.KeyCredentialAttestationResult *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Security.Credentials.KeyCredentialOperationResult *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Security.Credentials.KeyCredentialRetrievalResult *>; + interface Windows.Foundation.IAsyncOperation<Windows.Security.Credentials.KeyCredentialAttestationResult *>; + interface Windows.Foundation.IAsyncOperation<Windows.Security.Credentials.KeyCredentialOperationResult *>; interface Windows.Foundation.IAsyncOperation<Windows.Security.Credentials.KeyCredentialRetrievalResult *>; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum KeyCredentialAttestationStatus + { + Success = 0, + UnknownError = 1, + NotSupported = 2, + TemporaryFailure = 3, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0) ] @@ -69,6 +93,32 @@ namespace Windows.Security.Credentials { SecurityDeviceLocked = 6, }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Security.Credentials.KeyCredential), + uuid(9585ef8d-457b-4847-b11a-fa960bbdb138) + ] + interface IKeyCredential : IInspectable + { + [propget] HRESULT Name([out, retval] HSTRING *value); + [overload("RetrievePublicKey")] HRESULT RetrievePublicKeyWithDefaultBlobType([out, retval] Windows.Storage.Streams.IBuffer **value); + [overload("RetrievePublicKey")] HRESULT RetrievePublicKeyWithBlobType([in] Windows.Security.Cryptography.Core.CryptographicPublicKeyBlobType blobType, [out, retval] Windows.Storage.Streams.IBuffer **value); + HRESULT RequestSignAsync([in] Windows.Storage.Streams.IBuffer *data, [out, retval] Windows.Foundation.IAsyncOperation<Windows.Security.Credentials.KeyCredentialOperationResult *> **value); + HRESULT GetAttestationAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Security.Credentials.KeyCredentialAttestationResult *> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Security.Credentials.KeyCredentialAttestationResult), + uuid(78aab3a1-a3c1-4103-b6cc-472c44171cbb) + ] + interface IKeyCredentialAttestationResult : IInspectable + { + [propget] HRESULT CertificateChainBuffer([out, retval] Windows.Storage.Streams.IBuffer **value); + [propget] HRESULT AttestationBuffer([out, retval] Windows.Storage.Streams.IBuffer **value); + [propget] HRESULT Status([out, retval] Windows.Security.Credentials.KeyCredentialAttestationStatus *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Security.Credentials.KeyCredentialManager), @@ -84,6 +134,17 @@ namespace Windows.Security.Credentials { HRESULT DeleteAsync(HSTRING name, [out, retval] Windows.Foundation.IAsyncAction **operation); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Security.Credentials.KeyCredentialOperationResult), + uuid(f53786c1-5261-4cdd-976d-cc909ac71620) + ] + interface IKeyCredentialOperationResult : IInspectable + { + [propget] HRESULT Result([out, retval] Windows.Storage.Streams.IBuffer **value); + [propget] HRESULT Status([out, retval] Windows.Security.Credentials.KeyCredentialStatus *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Security.Credentials.KeyCredentialRetrievalResult), @@ -104,6 +165,15 @@ namespace Windows.Security.Credentials { [default] interface Windows.Security.Credentials.IKeyCredential; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass KeyCredentialAttestationResult + { + [default] interface Windows.Security.Credentials.IKeyCredentialAttestationResult; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -114,6 +184,15 @@ namespace Windows.Security.Credentials { { } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass KeyCredentialOperationResult + { + [default] interface Windows.Security.Credentials.IKeyCredentialOperationResult; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile) diff --git a/include/windows.security.cryptography.core.idl b/include/windows.security.cryptography.core.idl new file mode 100644 index 00000000000..48a7f4c85a9 --- /dev/null +++ b/include/windows.security.cryptography.core.idl @@ -0,0 +1,46 @@ +/* + * Copyright 2025 Hans Leidekker 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.security.cryptography.certificates.idl"; */ +import "windows.storage.streams.idl"; + +namespace Windows.Security.Cryptography.Core { + typedef enum CryptographicPublicKeyBlobType CryptographicPublicKeyBlobType; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum CryptographicPublicKeyBlobType + { + X509SubjectPublicKeyInfo = 0, + Pkcs1RsaPublicKey = 1, + BCryptPublicKey = 2, + Capi1PublicKey = 3, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + BCryptEccFullPublicKey = 4, + }; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8892
From: Hans Leidekker <hans(a)codeweavers.com> --- include/windows.devices.bluetooth.rfcomm.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/windows.devices.bluetooth.rfcomm.idl b/include/windows.devices.bluetooth.rfcomm.idl index aeb538f13a8..df285b906f7 100644 --- a/include/windows.devices.bluetooth.rfcomm.idl +++ b/include/windows.devices.bluetooth.rfcomm.idl @@ -82,6 +82,18 @@ namespace Windows.Devices.Bluetooth.Rfcomm { HRESULT GetDeviceSelector([in] Windows.Devices.Bluetooth.Rfcomm.RfcommServiceId *id, [out] [retval] HSTRING *selector); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Bluetooth.Rfcomm.RfcommServiceId), + uuid(22629204-7e02-4017-8136-da1b6a1b9bbf) + ] + interface IRfcommServiceId : IInspectable + { + [propget] HRESULT Uuid([out, retval] GUID *value); + HRESULT AsShortId([out, retval] UINT32 *short_id); + HRESULT AsString([out, retval] HSTRING *id); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8892
participants (2)
-
Hans Leidekker -
Hans Leidekker (＠hans)