[PATCH v2 0/12] MR8876: misc: Register runtimeclasses explicitly (3/3)
-- v2: include: Remove now unnecessary DO_NO_IMPORTS ifdefs. windows.web: Register runtimeclasses explicitly. windows.security.credentials.ui.userconsentverifier: Register runtimeclasses explicitly. windows.security.authentication.onlineid: Register runtimeclasses explicitly. windows.perception.stub: Register runtimeclasses explicitly. windows.networking.hostname: Register runtimeclasses explicitly. windows.networking.connectivity: Register runtimeclasses explicitly. windows.media: Register runtimeclasses explicitly. https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.gaming.ui.gamebar/classes.idl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/windows.gaming.ui.gamebar/classes.idl b/dlls/windows.gaming.ui.gamebar/classes.idl index ef10fcb6283..7279eda3bd5 100644 --- a/dlls/windows.gaming.ui.gamebar/classes.idl +++ b/dlls/windows.gaming.ui.gamebar/classes.idl @@ -19,15 +19,14 @@ */ #pragma makedep register - -#ifdef __WIDL__ #pragma winrt ns_prefix -#endif import "inspectable.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; +import "windows.gaming.ui.idl"; -#define DO_NO_IMPORTS -#include "windows.gaming.ui.idl" +namespace Windows.Gaming.UI { + runtimeclass GameBar; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.media.devices/classes.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.devices/classes.idl b/dlls/windows.media.devices/classes.idl index 9d6f482d395..4a53fde6be4 100644 --- a/dlls/windows.media.devices/classes.idl +++ b/dlls/windows.media.devices/classes.idl @@ -20,5 +20,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.media.devices.idl" +import "windows.media.devices.idl"; + +namespace Windows.Media.Devices { + runtimeclass MediaDevice; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.media.mediacontrol/classes.idl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/windows.media.mediacontrol/classes.idl b/dlls/windows.media.mediacontrol/classes.idl index b58facdc46a..c6d4ac4eb68 100644 --- a/dlls/windows.media.mediacontrol/classes.idl +++ b/dlls/windows.media.mediacontrol/classes.idl @@ -19,6 +19,11 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "systemmediatransportcontrolsinterop.idl" -#include "windows.media.idl" +import "systemmediatransportcontrolsinterop.idl"; +import "windows.media.idl"; + +namespace Windows.Media { + runtimeclass SystemMediaTransportControls; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.media.speech/classes.idl | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/windows.media.speech/classes.idl b/dlls/windows.media.speech/classes.idl index 4dd43cf6eed..ee68760a08f 100644 --- a/dlls/windows.media.speech/classes.idl +++ b/dlls/windows.media.speech/classes.idl @@ -15,6 +15,15 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.media.speechrecognition.idl" -#include "windows.media.speechsynthesis.idl" +import "windows.media.speechrecognition.idl"; +import "windows.media.speechsynthesis.idl"; + +namespace Windows.Media.SpeechRecognition { + runtimeclass SpeechRecognizer; + runtimeclass SpeechRecognitionListConstraint; +} +namespace Windows.Media.SpeechSynthesis { + runtimeclass SpeechSynthesizer; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.media/classes.idl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/windows.media/classes.idl b/dlls/windows.media/classes.idl index 63db8409f9d..3f40d43ae66 100644 --- a/dlls/windows.media/classes.idl +++ b/dlls/windows.media/classes.idl @@ -19,6 +19,14 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.media.closedcaptioning.idl" -#include "windows.media.transcoding.idl" +import "windows.media.closedcaptioning.idl"; +import "windows.media.transcoding.idl"; + +namespace Windows.Media.ClosedCaptioning { + runtimeclass ClosedCaptionProperties; +} +namespace Windows.Media.Transcoding { + runtimeclass MediaTranscoder; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.networking.connectivity/classes.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windows.networking.connectivity/classes.idl b/dlls/windows.networking.connectivity/classes.idl index b42f11f40d4..1cc3c38a08f 100644 --- a/dlls/windows.networking.connectivity/classes.idl +++ b/dlls/windows.networking.connectivity/classes.idl @@ -19,5 +19,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.networking.connectivity.idl" +import "windows.networking.connectivity.idl"; + +namespace Windows.Networking.Connectivity { + runtimeclass NetworkInformation; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.networking.hostname/classes.idl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/windows.networking.hostname/classes.idl b/dlls/windows.networking.hostname/classes.idl index 98a026877e9..fb61ddb8105 100644 --- a/dlls/windows.networking.hostname/classes.idl +++ b/dlls/windows.networking.hostname/classes.idl @@ -19,16 +19,15 @@ */ #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.networking.idl"; -#define DO_NO_IMPORTS -#include "windows.networking.idl" +namespace Windows.Networking { + runtimeclass HostName; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.perception.stub/classes.idl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/windows.perception.stub/classes.idl b/dlls/windows.perception.stub/classes.idl index cf5d6c1ee34..e79c20c715b 100644 --- a/dlls/windows.perception.stub/classes.idl +++ b/dlls/windows.perception.stub/classes.idl @@ -19,6 +19,14 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.perception.spatial.surfaces.idl" -#include "windows.graphics.holographic.idl" +import "windows.perception.spatial.surfaces.idl"; +import "windows.graphics.holographic.idl"; + +namespace Windows.Perception.Spatial.Surfaces { + runtimeclass SpatialSurfaceObserver; +} +namespace Windows.Graphics.Holographic { + runtimeclass HolographicSpace; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.security.authentication.onlineid/classes.idl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/windows.security.authentication.onlineid/classes.idl b/dlls/windows.security.authentication.onlineid/classes.idl index 7b644de1fc4..86f2def1dc8 100644 --- a/dlls/windows.security.authentication.onlineid/classes.idl +++ b/dlls/windows.security.authentication.onlineid/classes.idl @@ -19,5 +19,11 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.security.authentication.onlineid.idl" +import "windows.security.authentication.onlineid.idl"; + +namespace Windows.Security.Authentication.OnlineId { + runtimeclass OnlineIdSystemAuthenticator; + runtimeclass OnlineIdServiceTicketRequest; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
From: Rémi Bernon <rbernon(a)codeweavers.com> --- .../classes.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windows.security.credentials.ui.userconsentverifier/classes.idl b/dlls/windows.security.credentials.ui.userconsentverifier/classes.idl index fa573197a25..6411cf86da9 100644 --- a/dlls/windows.security.credentials.ui.userconsentverifier/classes.idl +++ b/dlls/windows.security.credentials.ui.userconsentverifier/classes.idl @@ -19,5 +19,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.security.credentials.ui.idl" +import "windows.security.credentials.ui.idl"; + +namespace Windows.Security.Credentials.UI { + runtimeclass UserConsentVerifier; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.web/classes.idl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/windows.web/classes.idl b/dlls/windows.web/classes.idl index 4fca998e169..37537cfeb26 100644 --- a/dlls/windows.web/classes.idl +++ b/dlls/windows.web/classes.idl @@ -19,5 +19,11 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.data.json.idl" +import "windows.data.json.idl"; + +namespace Windows.Data.Json { + runtimeclass JsonObject; + runtimeclass JsonValue; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
From: Rémi Bernon <rbernon(a)codeweavers.com> --- include/activation.idl | 2 -- include/windows.applicationmodel.activation.idl | 2 -- include/windows.applicationmodel.background.idl | 2 -- include/windows.applicationmodel.core.idl | 2 -- include/windows.applicationmodel.datatransfer.dragdrop.core.idl | 2 -- include/windows.applicationmodel.datatransfer.dragdrop.idl | 2 -- include/windows.applicationmodel.datatransfer.idl | 2 -- include/windows.applicationmodel.idl | 2 -- include/windows.devices.bluetooth.advertisement.idl | 2 -- include/windows.devices.bluetooth.genericattributeprofile.idl | 2 -- include/windows.devices.bluetooth.idl | 2 -- include/windows.devices.bluetooth.rfcomm.idl | 2 -- include/windows.devices.geolocation.idl | 2 -- include/windows.devices.input.idl | 2 -- include/windows.foundation.metadata.idl | 2 -- include/windows.gaming.input.custom.idl | 2 -- include/windows.gaming.input.forcefeedback.idl | 2 -- include/windows.gaming.input.idl | 2 -- include/windows.gaming.ui.idl | 2 -- include/windows.globalization.idl | 2 -- include/windows.networking.idl | 2 -- include/windows.security.enterprisedata.idl | 2 -- include/windows.security.exchangeactivesyncprovisioning.idl | 2 -- include/windows.storage.fileproperties.idl | 2 -- include/windows.storage.search.idl | 2 -- include/windows.storage.streams.idl | 2 -- include/windows.system.profile.idl | 2 -- include/windows.system.userprofile.idl | 2 -- include/windows.ui.core.idl | 2 -- include/windows.ui.input.idl | 2 -- include/windows.ui.viewmanagement.core.idl | 2 -- include/windows.ui.viewmanagement.idl | 2 -- include/windows.ui.windowmanagement.idl | 2 -- 33 files changed, 66 deletions(-) diff --git a/include/activation.idl b/include/activation.idl index b86c9f6b6fc..7a9d02367df 100644 --- a/include/activation.idl +++ b/include/activation.idl @@ -16,9 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef DO_NO_IMPORTS import "inspectable.idl"; -#endif [ object, diff --git a/include/windows.applicationmodel.activation.idl b/include/windows.applicationmodel.activation.idl index 3392a5bb316..2ea83d82b1d 100644 --- a/include/windows.applicationmodel.activation.idl +++ b/include/windows.applicationmodel.activation.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -30,7 +29,6 @@ import "windows.applicationmodel.background.idl"; import "windows.applicationmodel.core.idl"; import "windows.storage.idl"; import "windows.system.idl"; -#endif namespace Windows.ApplicationModel.Background { interface IBackgroundTaskInstance; diff --git a/include/windows.applicationmodel.background.idl b/include/windows.applicationmodel.background.idl index 12780e5c9c6..59601ebc043 100644 --- a/include/windows.applicationmodel.background.idl +++ b/include/windows.applicationmodel.background.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -29,7 +28,6 @@ import "windows.foundation.idl"; import "windows.applicationmodel.activation.idl"; import "windows.storage.idl"; import "windows.system.idl"; -#endif namespace Windows.ApplicationModel.Activation { runtimeclass BackgroundActivatedEventArgs; diff --git a/include/windows.applicationmodel.core.idl b/include/windows.applicationmodel.core.idl index fb3a14ce0e3..00261c7bafd 100644 --- a/include/windows.applicationmodel.core.idl +++ b/include/windows.applicationmodel.core.idl @@ -20,14 +20,12 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "windows.foundation.idl"; import "windows.storage.idl"; import "windows.system.idl"; import "windows.applicationmodel.idl"; import "windows.applicationmodel.activation.idl"; import "windows.ui.core.idl"; -#endif namespace Windows.ApplicationModel.Core { runtimeclass CoreApplicationView; diff --git a/include/windows.applicationmodel.datatransfer.dragdrop.core.idl b/include/windows.applicationmodel.datatransfer.dragdrop.core.idl index 6f7aa314130..afc9765c578 100644 --- a/include/windows.applicationmodel.datatransfer.dragdrop.core.idl +++ b/include/windows.applicationmodel.datatransfer.dragdrop.core.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -29,7 +28,6 @@ import "windows.foundation.idl"; import "windows.applicationmodel.datatransfer.idl"; import "windows.applicationmodel.datatransfer.dragdrop.idl"; import "windows.graphics.imaging.idl"; -#endif namespace Windows.ApplicationModel.DataTransfer.DragDrop.Core { interface ICoreDragDropManager; diff --git a/include/windows.applicationmodel.datatransfer.dragdrop.idl b/include/windows.applicationmodel.datatransfer.dragdrop.idl index ccbe46efd34..f8646d22867 100644 --- a/include/windows.applicationmodel.datatransfer.dragdrop.idl +++ b/include/windows.applicationmodel.datatransfer.dragdrop.idl @@ -20,13 +20,11 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; -#endif namespace Windows.ApplicationModel.DataTransfer.DragDrop { typedef enum DragDropModifiers DragDropModifiers; diff --git a/include/windows.applicationmodel.datatransfer.idl b/include/windows.applicationmodel.datatransfer.idl index 7ba383f28d1..06c128c1df8 100644 --- a/include/windows.applicationmodel.datatransfer.idl +++ b/include/windows.applicationmodel.datatransfer.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -30,7 +29,6 @@ import "windows.security.enterprisedata.idl"; import "windows.storage.idl"; import "windows.storage.streams.idl"; import "windows.ui.idl"; -#endif namespace Windows.ApplicationModel.DataTransfer { typedef enum ClipboardHistoryItemsResultStatus ClipboardHistoryItemsResultStatus; diff --git a/include/windows.applicationmodel.idl b/include/windows.applicationmodel.idl index 387a77ebef4..a6a5ca6ef5c 100644 --- a/include/windows.applicationmodel.idl +++ b/include/windows.applicationmodel.idl @@ -20,13 +20,11 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "windows.foundation.idl"; import "windows.storage.idl"; import "windows.system.idl"; import "windows.applicationmodel.activation.idl"; import "windows.applicationmodel.core.idl"; -#endif namespace Windows.ApplicationModel.Core { runtimeclass AppListEntry; diff --git a/include/windows.devices.bluetooth.advertisement.idl b/include/windows.devices.bluetooth.advertisement.idl index a150ea91c6f..892c2cf82be 100644 --- a/include/windows.devices.bluetooth.advertisement.idl +++ b/include/windows.devices.bluetooth.advertisement.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -28,7 +27,6 @@ import "windowscontracts.idl"; import "windows.foundation.idl"; import "windows.storage.streams.idl"; import "windows.devices.bluetooth.idl"; -#endif namespace Windows.Devices.Bluetooth { typedef enum BluetoothAddressType BluetoothAddressType; diff --git a/include/windows.devices.bluetooth.genericattributeprofile.idl b/include/windows.devices.bluetooth.genericattributeprofile.idl index b545bcca23b..be6487345e2 100644 --- a/include/windows.devices.bluetooth.genericattributeprofile.idl +++ b/include/windows.devices.bluetooth.genericattributeprofile.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -29,7 +28,6 @@ import "windows.foundation.idl"; import "windows.storage.streams.idl"; import "windows.devices.bluetooth.idl"; import "windows.devices.enumeration.idl"; -#endif namespace Windows.Devices.Bluetooth { typedef enum BluetoothCacheMode BluetoothCacheMode; diff --git a/include/windows.devices.bluetooth.idl b/include/windows.devices.bluetooth.idl index bca654db074..f51025d53df 100644 --- a/include/windows.devices.bluetooth.idl +++ b/include/windows.devices.bluetooth.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -32,7 +31,6 @@ import "windows.devices.enumeration.idl"; import "windows.devices.radios.idl"; import "windows.networking.idl"; import "windows.storage.streams.idl"; -#endif namespace Windows.Devices.Bluetooth { typedef enum BluetoothCacheMode BluetoothCacheMode; diff --git a/include/windows.devices.bluetooth.rfcomm.idl b/include/windows.devices.bluetooth.rfcomm.idl index ed56864d712..5005ca647b8 100644 --- a/include/windows.devices.bluetooth.rfcomm.idl +++ b/include/windows.devices.bluetooth.rfcomm.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -30,7 +29,6 @@ import "windows.devices.bluetooth.idl"; import "windows.networking.idl"; import "windows.networking.sockets.idl"; import "windows.storage.streams.idl"; -#endif namespace Windows.Devices.Bluetooth { typedef enum BluetoothCacheMode BluetoothCacheMode; diff --git a/include/windows.devices.geolocation.idl b/include/windows.devices.geolocation.idl index 054c7955bae..2d9dcd91d89 100644 --- a/include/windows.devices.geolocation.idl +++ b/include/windows.devices.geolocation.idl @@ -20,13 +20,11 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; -#endif namespace Windows.Devices.Geolocation { diff --git a/include/windows.devices.input.idl b/include/windows.devices.input.idl index 492d43c5807..db390e5fff3 100644 --- a/include/windows.devices.input.idl +++ b/include/windows.devices.input.idl @@ -20,13 +20,11 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; -#endif namespace Windows.Devices.Input { typedef enum PointerDeviceType PointerDeviceType; diff --git a/include/windows.foundation.metadata.idl b/include/windows.foundation.metadata.idl index 6488405aa7a..9487737e071 100644 --- a/include/windows.foundation.metadata.idl +++ b/include/windows.foundation.metadata.idl @@ -20,13 +20,11 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; -#endif namespace Windows.Foundation.Metadata { diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index 8347f4663d3..0811b991091 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -28,7 +27,6 @@ import "windowscontracts.idl"; import "windows.foundation.idl"; import "windows.gaming.input.idl"; import "windows.storage.streams.idl"; -#endif namespace Windows.Gaming.Input.Custom { typedef enum XusbDeviceSubtype XusbDeviceSubtype; diff --git a/include/windows.gaming.input.forcefeedback.idl b/include/windows.gaming.input.forcefeedback.idl index 82fb083b34b..290d1f62971 100644 --- a/include/windows.gaming.input.forcefeedback.idl +++ b/include/windows.gaming.input.forcefeedback.idl @@ -20,14 +20,12 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; import "windows.foundation.numerics.idl"; -#endif namespace Windows.Gaming.Input.ForceFeedback { typedef enum ForceFeedbackEffectAxes ForceFeedbackEffectAxes; diff --git a/include/windows.gaming.input.idl b/include/windows.gaming.input.idl index 5fc5265247d..a79cc071ec2 100644 --- a/include/windows.gaming.input.idl +++ b/include/windows.gaming.input.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -30,7 +29,6 @@ import "windows.devices.haptics.idl"; import "windows.gaming.input.forcefeedback.idl"; import "windows.system.idl"; import "windows.devices.power.idl"; -#endif namespace Windows.Gaming.Input { typedef enum ArcadeStickButtons ArcadeStickButtons; diff --git a/include/windows.gaming.ui.idl b/include/windows.gaming.ui.idl index fc7e661ccf9..050bd78e7da 100644 --- a/include/windows.gaming.ui.idl +++ b/include/windows.gaming.ui.idl @@ -20,12 +20,10 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; -#endif namespace Windows.Gaming.UI { runtimeclass GameBar; diff --git a/include/windows.globalization.idl b/include/windows.globalization.idl index 7282af63969..df35566edc2 100644 --- a/include/windows.globalization.idl +++ b/include/windows.globalization.idl @@ -20,14 +20,12 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; import "windows.system.idl"; -#endif namespace Windows { namespace Globalization { diff --git a/include/windows.networking.idl b/include/windows.networking.idl index 28e0f983154..2dfa25649a3 100644 --- a/include/windows.networking.idl +++ b/include/windows.networking.idl @@ -20,14 +20,12 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; import "windows.networking.connectivity.idl"; -#endif namespace Windows.Networking.Connectivity { diff --git a/include/windows.security.enterprisedata.idl b/include/windows.security.enterprisedata.idl index fe0a401d980..3a1b4f8205e 100644 --- a/include/windows.security.enterprisedata.idl +++ b/include/windows.security.enterprisedata.idl @@ -20,13 +20,11 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; -#endif namespace Windows.Security.EnterpriseData { typedef enum ProtectionPolicyEvaluationResult ProtectionPolicyEvaluationResult; diff --git a/include/windows.security.exchangeactivesyncprovisioning.idl b/include/windows.security.exchangeactivesyncprovisioning.idl index afdb427c207..f68506dfd2f 100644 --- a/include/windows.security.exchangeactivesyncprovisioning.idl +++ b/include/windows.security.exchangeactivesyncprovisioning.idl @@ -20,11 +20,9 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "eventtoken.idl"; import "windows.foundation.idl"; -#endif namespace Windows.Security.ExchangeActiveSyncProvisioning { interface IEasClientDeviceInformation; diff --git a/include/windows.storage.fileproperties.idl b/include/windows.storage.fileproperties.idl index 8469e6c12aa..9426d02fefb 100644 --- a/include/windows.storage.fileproperties.idl +++ b/include/windows.storage.fileproperties.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -29,7 +28,6 @@ import "windows.foundation.idl"; import "windows.devices.geolocation.idl"; /* import "windows.storage.idl"; */ import "windows.storage.streams.idl"; -#endif namespace Windows.Storage.FileProperties { interface IBasicProperties; diff --git a/include/windows.storage.search.idl b/include/windows.storage.search.idl index 217889c3c89..093b0837afb 100644 --- a/include/windows.storage.search.idl +++ b/include/windows.storage.search.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -30,7 +29,6 @@ import "windows.foundation.idl"; /* import "windows.storage.idl"; */ import "windows.storage.fileproperties.idl"; import "windows.storage.streams.idl"; -#endif namespace Windows.Storage.Search { interface IStorageFolderQueryOperations; diff --git a/include/windows.storage.streams.idl b/include/windows.storage.streams.idl index 3ef6254c0ec..c51d4601e55 100644 --- a/include/windows.storage.streams.idl +++ b/include/windows.storage.streams.idl @@ -20,11 +20,9 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "eventtoken.idl"; import "windows.foundation.idl"; -#endif namespace Windows.Storage { interface IStorageFile; diff --git a/include/windows.system.profile.idl b/include/windows.system.profile.idl index c6cfe9a9fb2..765a75542a3 100644 --- a/include/windows.system.profile.idl +++ b/include/windows.system.profile.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -28,7 +27,6 @@ import "windowscontracts.idl"; import "windows.foundation.idl"; import "windows.storage.streams.idl"; import "windows.system.idl"; -#endif namespace Windows.System.Profile { typedef enum SystemIdentificationSource SystemIdentificationSource; diff --git a/include/windows.system.userprofile.idl b/include/windows.system.userprofile.idl index e0353b1d9ee..5694387af2c 100644 --- a/include/windows.system.userprofile.idl +++ b/include/windows.system.userprofile.idl @@ -20,14 +20,12 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; import "windows.globalization.idl"; -#endif namespace Windows.System.UserProfile { diff --git a/include/windows.ui.core.idl b/include/windows.ui.core.idl index e6b4ec5007d..d6bbf7ee9fb 100644 --- a/include/windows.ui.core.idl +++ b/include/windows.ui.core.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -33,7 +32,6 @@ 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.input.idl b/include/windows.ui.input.idl index f160671f232..f396a3ce8a7 100644 --- a/include/windows.ui.input.idl +++ b/include/windows.ui.input.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -29,7 +28,6 @@ import "windows.foundation.idl"; import "windows.devices.input.idl"; import "windows.system.idl"; import "windows.ui.core.idl"; -#endif namespace Windows.UI.Input { typedef enum PointerUpdateKind PointerUpdateKind; diff --git a/include/windows.ui.viewmanagement.core.idl b/include/windows.ui.viewmanagement.core.idl index be392aa40fe..c3d7f0de1bf 100644 --- a/include/windows.ui.viewmanagement.core.idl +++ b/include/windows.ui.viewmanagement.core.idl @@ -20,14 +20,12 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; import "windows.ui.idl"; -#endif namespace Windows.UI.ViewManagement.Core { diff --git a/include/windows.ui.viewmanagement.idl b/include/windows.ui.viewmanagement.idl index 784ea900370..a1976d46244 100644 --- a/include/windows.ui.viewmanagement.idl +++ b/include/windows.ui.viewmanagement.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -32,7 +31,6 @@ import "windows.ui.idl"; import "windows.ui.core.idl"; /* import "windows.ui.popups.idl"; */ import "windows.ui.windowmanagement.idl"; -#endif namespace Windows.UI.ViewManagement { diff --git a/include/windows.ui.windowmanagement.idl b/include/windows.ui.windowmanagement.idl index b6ca12c0248..5865c78e16b 100644 --- a/include/windows.ui.windowmanagement.idl +++ b/include/windows.ui.windowmanagement.idl @@ -20,7 +20,6 @@ #pragma winrt ns_prefix #endif -#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -29,7 +28,6 @@ import "windows.foundation.idl"; import "windows.system.idl"; import "windows.ui.idl"; import "windows.ui.composition.idl"; -#endif namespace Windows.UI.WindowManagement { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8876
Thanks, fixed I think. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8876#note_114562
participants (1)
-
Rémi Bernon