include: Use nested namespace declaration in windows.foundation.idl.

And move generic instantiations forward.

Signed-off-by: Biswapriyo Nath <nathbappai@gmail.com>
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Biswapriyo Nath 2022-04-25 11:00:39 +02:00 committed by Alexandre Julliard
parent 47b9dc3dde
commit 82fe55f3ca
1 changed files with 145 additions and 148 deletions

View File

@ -27,153 +27,150 @@ import "windowscontracts.idl";
/* import "ivectorchangedeventargs.idl"; */ /* import "ivectorchangedeventargs.idl"; */
import "windows.foundation.collections.idl"; import "windows.foundation.collections.idl";
namespace Windows { namespace Windows.Foundation {
namespace Foundation { typedef enum PropertyType PropertyType;
interface IAsyncAction; typedef struct Point Point;
} typedef struct Size Size;
} typedef struct Rect Rect;
typedef struct DateTime DateTime;
namespace Windows { typedef struct TimeSpan TimeSpan;
namespace Foundation { interface IAsyncAction;
typedef enum PropertyType PropertyType; interface IClosable;
typedef struct Point Point; interface IStringable;
typedef struct Size Size;
typedef struct Rect Rect; declare {
typedef struct DateTime DateTime; interface Windows.Foundation.Collections.IIterable<HSTRING>;
typedef struct TimeSpan TimeSpan; interface Windows.Foundation.Collections.IIterable<IInspectable *>;
interface Windows.Foundation.Collections.IIterator<HSTRING>;
[ interface Windows.Foundation.Collections.IIterator<IInspectable *>;
contract(Windows.Foundation.FoundationContract, 1.0), interface Windows.Foundation.Collections.IVectorView<HSTRING>;
uuid(a4ed5c81-76c9-40bd-8be6-b1d90fb20ae7) interface Windows.Foundation.Collections.IVectorView<IInspectable *>;
] interface Windows.Foundation.Collections.IVector<HSTRING>;
delegate HRESULT AsyncActionCompletedHandler([in] Windows.Foundation.IAsyncAction *action, [in] AsyncStatus status); interface Windows.Foundation.Collections.IVector<IInspectable *>;
interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING> *>;
[contract(Windows.Foundation.FoundationContract, 1.0)] interface Windows.Foundation.EventHandler<IInspectable *>;
enum PropertyType { interface Windows.Foundation.AsyncOperationCompletedHandler<IInspectable *>;
Empty = 0, interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>;
UInt8 = 1, interface Windows.Foundation.IAsyncOperation<IInspectable *>;
Int16 = 2, interface Windows.Foundation.IAsyncOperation<boolean>;
UInt16 = 3, interface Windows.Foundation.IReference<INT32>;
Int32 = 4, interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>;
UInt32 = 5, }
Int64 = 6,
UInt64 = 7, [
Single = 8, contract(Windows.Foundation.FoundationContract, 1.0),
Double = 9, uuid(a4ed5c81-76c9-40bd-8be6-b1d90fb20ae7)
Char16 = 10, ]
Boolean = 11, delegate HRESULT AsyncActionCompletedHandler([in] Windows.Foundation.IAsyncAction *action, [in] AsyncStatus status);
String = 12,
Inspectable = 13, [contract(Windows.Foundation.FoundationContract, 1.0)]
DateTime = 14, enum PropertyType
TimeSpan = 15, {
Guid = 16, Empty = 0,
Point = 17, UInt8 = 1,
Size = 18, Int16 = 2,
Rect = 19, UInt16 = 3,
OtherType = 20, Int32 = 4,
UInt8Array = 1025, UInt32 = 5,
Int16Array = 1026, Int64 = 6,
UInt16Array = 1027, UInt64 = 7,
Int32Array = 1028, Single = 8,
UInt32Array = 1029, Double = 9,
Int64Array = 1030, Char16 = 10,
UInt64Array = 1031, Boolean = 11,
SingleArray = 1032, String = 12,
DoubleArray = 1033, Inspectable = 13,
Char16Array = 1034, DateTime = 14,
BooleanArray = 1035, TimeSpan = 15,
StringArray = 1036, Guid = 16,
InspectableArray = 1037, Point = 17,
DateTimeArray = 1038, Size = 18,
TimeSpanArray = 1039, Rect = 19,
GuidArray = 1040, OtherType = 20,
PointArray = 1041, UInt8Array = 1025,
SizeArray = 1042, Int16Array = 1026,
RectArray = 1043, UInt16Array = 1027,
OtherTypeArray = 1044 Int32Array = 1028,
}; UInt32Array = 1029,
Int64Array = 1030,
[contract(Windows.Foundation.FoundationContract, 1.0)] UInt64Array = 1031,
struct Point { SingleArray = 1032,
FLOAT X; DoubleArray = 1033,
FLOAT Y; Char16Array = 1034,
}; BooleanArray = 1035,
StringArray = 1036,
[contract(Windows.Foundation.FoundationContract, 1.0)] InspectableArray = 1037,
struct Size { DateTimeArray = 1038,
FLOAT Width; TimeSpanArray = 1039,
FLOAT Height; GuidArray = 1040,
}; PointArray = 1041,
SizeArray = 1042,
[contract(Windows.Foundation.FoundationContract, 1.0)] RectArray = 1043,
struct Rect { OtherTypeArray = 1044,
FLOAT X; };
FLOAT Y;
FLOAT Width; [contract(Windows.Foundation.FoundationContract, 1.0)]
FLOAT Height; struct Point
}; {
FLOAT X;
[contract(Windows.Foundation.FoundationContract, 1.0)] FLOAT Y;
struct DateTime { };
INT64 UniversalTime;
}; [contract(Windows.Foundation.FoundationContract, 1.0)]
struct Size
[contract(Windows.Foundation.FoundationContract, 1.0)] {
struct TimeSpan { FLOAT Width;
INT64 Duration; FLOAT Height;
}; };
[ [contract(Windows.Foundation.FoundationContract, 1.0)]
contract(Windows.Foundation.FoundationContract, 1.0), struct Rect
uuid(96369f54-8eb6-48f0-abce-c1b211e627c3) {
] FLOAT X;
interface IStringable : IInspectable FLOAT Y;
{ FLOAT Width;
HRESULT ToString([out, retval] HSTRING *value); FLOAT Height;
} };
[ [contract(Windows.Foundation.FoundationContract, 1.0)]
contract(Windows.Foundation.FoundationContract, 1.0), struct DateTime
uuid(30d5a829-7fa4-4026-83bb-d75bae4ea99e) {
] INT64 UniversalTime;
interface IClosable : IInspectable };
{
HRESULT Close(); [contract(Windows.Foundation.FoundationContract, 1.0)]
} struct TimeSpan
{
[ INT64 Duration;
contract(Windows.Foundation.FoundationContract, 1.0), };
uuid(5a648006-843a-4da9-865b-9d26e5dfad7b)
] [
interface IAsyncAction : IInspectable contract(Windows.Foundation.FoundationContract, 1.0),
requires IAsyncInfo uuid(96369f54-8eb6-48f0-abce-c1b211e627c3)
{ ]
[propput] HRESULT Completed([in] Windows.Foundation.AsyncActionCompletedHandler *handler); interface IStringable : IInspectable
[propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncActionCompletedHandler **handler); {
HRESULT GetResults(); HRESULT ToString([out, retval] HSTRING *value);
} }
}
} [
contract(Windows.Foundation.FoundationContract, 1.0),
namespace Windows { uuid(30d5a829-7fa4-4026-83bb-d75bae4ea99e)
namespace Foundation { ]
declare { interface IClosable : IInspectable
interface Windows.Foundation.Collections.IIterable<HSTRING>; {
interface Windows.Foundation.Collections.IIterable<IInspectable *>; HRESULT Close();
interface Windows.Foundation.Collections.IIterator<HSTRING>; }
interface Windows.Foundation.Collections.IIterator<IInspectable *>;
interface Windows.Foundation.Collections.IVectorView<HSTRING>; [
interface Windows.Foundation.Collections.IVectorView<IInspectable *>; contract(Windows.Foundation.FoundationContract, 1.0),
interface Windows.Foundation.Collections.IVector<HSTRING>; uuid(5a648006-843a-4da9-865b-9d26e5dfad7b)
interface Windows.Foundation.Collections.IVector<IInspectable *>; ]
interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*>; interface IAsyncAction : IInspectable
interface Windows.Foundation.EventHandler<IInspectable *>; requires IAsyncInfo
interface Windows.Foundation.AsyncOperationCompletedHandler<IInspectable *>; {
interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>; [propput] HRESULT Completed([in] Windows.Foundation.AsyncActionCompletedHandler *handler);
interface Windows.Foundation.IAsyncOperation<IInspectable *>; [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncActionCompletedHandler **handler);
interface Windows.Foundation.IAsyncOperation<boolean>; HRESULT GetResults();
interface Windows.Foundation.IReference<INT32>;
interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>;
}
} }
} }