include/windows.devices.enumeration: Update file to newer formatting.

Remove nested namespaces and forward declares, add comma to last entry
of enums.
This commit is contained in:
Julian Klemann 2022-08-15 15:53:25 -05:00 committed by Alexandre Julliard
parent c8c7ff640a
commit 1f030a7534

View file

@ -27,202 +27,170 @@ import "windowscontracts.idl";
import "windows.storage.streams.idl"; import "windows.storage.streams.idl";
import "windows.foundation.idl"; import "windows.foundation.idl";
namespace Windows { namespace Windows.Devices.Enumeration {
namespace Devices { typedef enum DeviceWatcherStatus DeviceWatcherStatus;
namespace Enumeration { typedef enum Panel Panel;
typedef enum DeviceWatcherStatus DeviceWatcherStatus;
typedef enum Panel Panel;
interface IDeviceInformation; interface IDeviceInformation;
interface IDeviceInformationStatics; interface IDeviceInformationStatics;
interface IDeviceInformationStatics2; interface IDeviceInformationStatics2;
interface IDeviceInformationUpdate; interface IDeviceInformationUpdate;
interface IEnclosureLocation; interface IEnclosureLocation;
runtimeclass DeviceInformation; runtimeclass DeviceInformation;
runtimeclass DeviceInformationUpdate; runtimeclass DeviceInformationUpdate;
runtimeclass DeviceThumbnail; runtimeclass DeviceThumbnail;
runtimeclass DeviceWatcher; runtimeclass DeviceWatcher;
runtimeclass EnclosureLocation; runtimeclass EnclosureLocation;
}
}
}
namespace Windows declare
{
namespace Devices
{ {
namespace Enumeration interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Enumeration.DeviceInformation *>;
{ interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Enumeration.DeviceThumbnail *>;
declare interface Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *>;
{ interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformation *>;
interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Enumeration.DeviceInformation *>; interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceThumbnail *>;
interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Devices.Enumeration.DeviceThumbnail *>; interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, IInspectable *>;
interface Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *>; interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, Windows.Devices.Enumeration.DeviceInformation *>;
interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformation *>; interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, Windows.Devices.Enumeration.DeviceInformationUpdate *>;
interface Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceThumbnail *>;
interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, IInspectable *>;
interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, Windows.Devices.Enumeration.DeviceInformation *>;
interface Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, Windows.Devices.Enumeration.DeviceInformationUpdate *>;
}
}
} }
} }
namespace Windows namespace Windows.Devices.Enumeration {
{ enum DeviceWatcherStatus
namespace Storage
{ {
namespace Streams Created = 0,
{ Started = 1,
interface IContentTypeProvider; EnumerationCompleted = 2,
interface IInputStream; Stopping = 3,
interface IOutputStream; Stopped = 4,
interface IRandomAccessStream; Aborted = 5,
interface IRandomAccessStreamWithContentType; };
}
} enum Panel
} {
Unknown = 0,
namespace Windows { Front = 1,
namespace Devices { Back = 2,
namespace Enumeration { Top = 3,
enum DeviceWatcherStatus Bottom = 4,
{ Left = 5,
Created = 0, Right = 6,
Started = 1, };
EnumerationCompleted = 2,
Stopping = 3, [
Stopped = 4, exclusiveto(Windows.Devices.Enumeration.DeviceInformation),
Aborted = 5 uuid(aba0fb95-4398-489d-8e44-e6130927011f)
}; ]
interface IDeviceInformation : IInspectable
enum Panel {
{ [propget] HRESULT Id([out, retval] HSTRING *value);
Unknown = 0, [propget] HRESULT Name([out, retval] HSTRING *value);
Front = 1, [propget] HRESULT IsEnabled([out, retval] boolean *value);
Back = 2, [propget] HRESULT IsDefault([out, retval] boolean *value);
Top = 3, [propget] HRESULT EnclosureLocation([out, retval] Windows.Devices.Enumeration.EnclosureLocation **value);
Bottom = 4, [propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *> **value);
Left = 5, HRESULT Update([in] Windows.Devices.Enumeration.DeviceInformationUpdate *info);
Right = 6 HRESULT GetThumbnailAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceThumbnail *> **operation);
}; HRESULT GetGlyphThumbnailAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceThumbnail *> **operation);
}
[
exclusiveto(Windows.Devices.Enumeration.DeviceInformation), [
uuid(aba0fb95-4398-489d-8e44-e6130927011f) exclusiveto(Windows.Devices.Enumeration.DeviceInformationUpdate),
] uuid(8f315305-d972-44b7-a37e-9e822c78213b)
interface IDeviceInformation : IInspectable ]
{ interface IDeviceInformationUpdate : IInspectable
[propget] HRESULT Id([out, retval] HSTRING *value); {
[propget] HRESULT Name([out, retval] HSTRING *value); [propget] HRESULT Id([out, retval] HSTRING *value);
[propget] HRESULT IsEnabled([out, retval] boolean *value); [propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *> **value);
[propget] HRESULT IsDefault([out, retval] boolean *value); }
[propget] HRESULT EnclosureLocation([out, retval] Windows.Devices.Enumeration.EnclosureLocation **value);
[propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *> **value); [
HRESULT Update([in] Windows.Devices.Enumeration.DeviceInformationUpdate *info); exclusiveto(Windows.Devices.Enumeration.DeviceWatcher),
HRESULT GetThumbnailAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceThumbnail *> **operation); uuid(c9eab97d-8f6b-4f96-a9f4-abc814e22271),
HRESULT GetGlyphThumbnailAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceThumbnail *> **operation); ]
} interface IDeviceWatcher : IInspectable
{
[ [eventadd] HRESULT Added([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *,
exclusiveto(Windows.Devices.Enumeration.DeviceInformationUpdate), Windows.Devices.Enumeration.DeviceInformation *> *handler, [out, retval] EventRegistrationToken *token);
uuid(8f315305-d972-44b7-a37e-9e822c78213b) [eventremove] HRESULT Added([in] EventRegistrationToken token);
] [eventadd] HRESULT Updated([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *,
interface IDeviceInformationUpdate : IInspectable Windows.Devices.Enumeration.DeviceInformationUpdate *> *handler, [out, retval] EventRegistrationToken *token);
{ [eventremove] HRESULT Updated([in] EventRegistrationToken token);
[propget] HRESULT Id([out, retval] HSTRING *value); [eventadd] HRESULT Removed([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *,
[propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, IInspectable *> **value); Windows.Devices.Enumeration.DeviceInformationUpdate *> *handler, [out, retval] EventRegistrationToken *token);
} [eventremove] HRESULT Removed([in] EventRegistrationToken token);
[eventadd] HRESULT EnumerationCompleted([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *,
[ IInspectable *> *handler, [out, retval] EventRegistrationToken *token);
exclusiveto(Windows.Devices.Enumeration.DeviceWatcher), [eventremove] HRESULT EnumerationCompleted([in] EventRegistrationToken token);
uuid(c9eab97d-8f6b-4f96-a9f4-abc814e22271), [eventadd] HRESULT Stopped([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *,
] IInspectable *> *handler, [out, retval] EventRegistrationToken *token);
interface IDeviceWatcher : IInspectable [eventremove] HRESULT Stopped([in] EventRegistrationToken token);
{ [propget] HRESULT Status([out, retval] Windows.Devices.Enumeration.DeviceWatcherStatus *status);
[eventadd] HRESULT Added([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher*, HRESULT Start();
Windows.Devices.Enumeration.DeviceInformation *> *handler, [out, retval] EventRegistrationToken *token); HRESULT Stop();
[eventremove] HRESULT Added([in] EventRegistrationToken token); }
[eventadd] HRESULT Updated([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *,
Windows.Devices.Enumeration.DeviceInformationUpdate *> *handler, [out, retval] EventRegistrationToken *token); [
[eventremove] HRESULT Updated([in] EventRegistrationToken token); exclusiveto(Windows.Devices.Enumeration.EnclosureLocation),
[eventadd] HRESULT Removed([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, uuid(42340a27-5810-459c-aabb-c65e1f813ecf)
Windows.Devices.Enumeration.DeviceInformationUpdate *> *handler, [out, retval] EventRegistrationToken *token); ]
[eventremove] HRESULT Removed([in] EventRegistrationToken token); interface IEnclosureLocation : IInspectable
[eventadd] HRESULT EnumerationCompleted([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, {
IInspectable *> *handler, [out, retval] EventRegistrationToken *token); [propget] HRESULT InDock([out, retval] boolean *value);
[eventremove] HRESULT EnumerationCompleted([in] EventRegistrationToken token); [propget] HRESULT InLid([out, retval] boolean *value);
[eventadd] HRESULT Stopped([in] Windows.Foundation.TypedEventHandler<Windows.Devices.Enumeration.DeviceWatcher *, [propget] HRESULT Panel([out, retval] Windows.Devices.Enumeration.Panel *value);
IInspectable *> *handler, [out, retval] EventRegistrationToken *token); }
[eventremove] HRESULT Stopped([in] EventRegistrationToken token);
[propget] HRESULT Status([out, retval] Windows.Devices.Enumeration.DeviceWatcherStatus *status); [
HRESULT Start(); contract(Windows.Foundation.UniversalApiContract, 1.0),
HRESULT Stop(); marshaling_behavior(agile),
} static(Windows.Devices.Enumeration.IDeviceInformationStatics, Windows.Foundation.UniversalApiContract, 1.0),
static(Windows.Devices.Enumeration.IDeviceInformationStatics2, Windows.Foundation.UniversalApiContract, 1.0),
[ threading(both)
exclusiveto(Windows.Devices.Enumeration.EnclosureLocation), ]
uuid(42340a27-5810-459c-aabb-c65e1f813ecf) runtimeclass DeviceInformation
] {
interface IEnclosureLocation : IInspectable [default] interface Windows.Devices.Enumeration.IDeviceInformation;
{ [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Devices.Enumeration.IDeviceInformation2;
[propget] HRESULT InDock([out, retval] boolean *value); }
[propget] HRESULT InLid([out, retval] boolean *value);
[propget] HRESULT Panel([out, retval] Windows.Devices.Enumeration.Panel *value); [
} marshaling_behavior(agile),
]
[ runtimeclass DeviceInformationUpdate
contract(Windows.Foundation.UniversalApiContract, 1.0), {
marshaling_behavior(agile), [default] interface Windows.Devices.Enumeration.IDeviceInformationUpdate;
static(Windows.Devices.Enumeration.IDeviceInformationStatics, Windows.Foundation.UniversalApiContract, 1.0), interface Windows.Devices.Enumeration.IDeviceInformationUpdate2;
static(Windows.Devices.Enumeration.IDeviceInformationStatics2, Windows.Foundation.UniversalApiContract, 1.0), }
threading(both)
] [
runtimeclass DeviceInformation marshaling_behavior(agile),
{ ]
[default] interface Windows.Devices.Enumeration.IDeviceInformation; runtimeclass DeviceThumbnail
[contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Devices.Enumeration.IDeviceInformation2; {
} [default] interface Windows.Storage.Streams.IRandomAccessStreamWithContentType;
interface Windows.Storage.Streams.IContentTypeProvider;
[ interface Windows.Storage.Streams.IRandomAccessStream;
marshaling_behavior(agile), interface Windows.Storage.Streams.IOutputStream;
] interface Windows.Foundation.IClosable;
runtimeclass DeviceInformationUpdate interface Windows.Storage.Streams.IInputStream;
{ }
[default] interface Windows.Devices.Enumeration.IDeviceInformationUpdate;
interface Windows.Devices.Enumeration.IDeviceInformationUpdate2; [
} marshaling_behavior(agile),
]
[ runtimeclass DeviceWatcher
marshaling_behavior(agile), {
] [default] interface Windows.Devices.Enumeration.IDeviceWatcher;
runtimeclass DeviceThumbnail interface Windows.Devices.Enumeration.IDeviceWatcher2;
{ }
[default] interface Windows.Storage.Streams.IRandomAccessStreamWithContentType;
interface Windows.Storage.Streams.IContentTypeProvider; [
interface Windows.Storage.Streams.IRandomAccessStream; marshaling_behavior(agile)
interface Windows.Storage.Streams.IOutputStream; ]
interface Windows.Foundation.IClosable; runtimeclass EnclosureLocation
interface Windows.Storage.Streams.IInputStream; {
} [default] interface Windows.Devices.Enumeration.IEnclosureLocation;
[
marshaling_behavior(agile),
]
runtimeclass DeviceWatcher
{
[default] interface Windows.Devices.Enumeration.IDeviceWatcher;
interface Windows.Devices.Enumeration.IDeviceWatcher2;
}
[
marshaling_behavior(agile)
]
runtimeclass EnclosureLocation
{
[default] interface Windows.Devices.Enumeration.IEnclosureLocation;
}
}
} }
} }