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>

include: Use nested namespace declaration in windows.foundation.idl.
82fe55f3 · Biswapriyo Nath · Alexandre Julliard · 47b9dc3d · 82fe55f3
Commit 82fe55f3 authored Apr 25, 2022 by Biswapriyo Nath Committed by Alexandre Julliard Apr 25, 2022
Show whitespace changes
Inline Side-by-side

Showing with 36 additions and 39 deletions

windows.foundation.idl include/windows.foundation.idl +36 -39

No files found.
--- a/include/windows.foundation.idl
+++ b/include/windows.foundation.idl
@@ -27,20 +27,35 @@ import "windowscontracts.idl";
 /* import "ivectorchangedeventargs.idl"; */
 import "windows.foundation.collections.idl";

-namespace Windows {
-    namespace Foundation {
-        interface IAsyncAction;
-    }
-}
-
-namespace Windows {
-    namespace Foundation {
+namespace Windows.Foundation {
    typedef enum PropertyType PropertyType;
    typedef struct Point Point;
    typedef struct Size Size;
    typedef struct Rect Rect;
    typedef struct DateTime DateTime;
    typedef struct TimeSpan TimeSpan;
+    interface IAsyncAction;
+    interface IClosable;
+    interface IStringable;
+
+    declare {
+        interface Windows.Foundation.Collections.IIterable<HSTRING>;
+        interface Windows.Foundation.Collections.IIterable<IInspectable *>;
+        interface Windows.Foundation.Collections.IIterator<HSTRING>;
+        interface Windows.Foundation.Collections.IIterator<IInspectable *>;
+        interface Windows.Foundation.Collections.IVectorView<HSTRING>;
+        interface Windows.Foundation.Collections.IVectorView<IInspectable *>;
+        interface Windows.Foundation.Collections.IVector<HSTRING>;
+        interface Windows.Foundation.Collections.IVector<IInspectable *>;
+        interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING> *>;
+        interface Windows.Foundation.EventHandler<IInspectable *>;
+        interface Windows.Foundation.AsyncOperationCompletedHandler<IInspectable *>;
+        interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>;
+        interface Windows.Foundation.IAsyncOperation<IInspectable *>;
+        interface Windows.Foundation.IAsyncOperation<boolean>;
+        interface Windows.Foundation.IReference<INT32>;
+        interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>;
+    }

    [
        contract(Windows.Foundation.FoundationContract, 1.0),
@@ -49,7 +64,8 @@ namespace Windows {
    delegate HRESULT AsyncActionCompletedHandler([in] Windows.Foundation.IAsyncAction *action, [in] AsyncStatus status);

    [contract(Windows.Foundation.FoundationContract, 1.0)]
-        enum PropertyType {
+    enum PropertyType
+    {
        Empty       = 0,
        UInt8       = 1,
        Int16       = 2,
@@ -90,23 +106,26 @@ namespace Windows {
        PointArray       = 1041,
        SizeArray        = 1042,
        RectArray        = 1043,
-            OtherTypeArray   = 1044
+        OtherTypeArray   = 1044,
    };

    [contract(Windows.Foundation.FoundationContract, 1.0)]
-        struct Point {
+    struct Point
+    {
        FLOAT X;
        FLOAT Y;
    };

    [contract(Windows.Foundation.FoundationContract, 1.0)]
-        struct Size {
+    struct Size
+    {
        FLOAT Width;
        FLOAT Height;
    };

    [contract(Windows.Foundation.FoundationContract, 1.0)]
-        struct Rect {
+    struct Rect
+    {
        FLOAT X;
        FLOAT Y;
        FLOAT Width;
@@ -114,12 +133,14 @@ namespace Windows {
    };

    [contract(Windows.Foundation.FoundationContract, 1.0)]
-        struct DateTime {
+    struct DateTime
+    {
        INT64 UniversalTime;
    };

    [contract(Windows.Foundation.FoundationContract, 1.0)]
-        struct TimeSpan {
+    struct TimeSpan
+    {
        INT64 Duration;
    };

@@ -152,28 +173,4 @@ namespace Windows {
        [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncActionCompletedHandler **handler);
        HRESULT GetResults();
    }
-    }
-}
-
-namespace Windows {
-    namespace Foundation {
-        declare {
-            interface Windows.Foundation.Collections.IIterable<HSTRING>;
-            interface Windows.Foundation.Collections.IIterable<IInspectable *>;
-            interface Windows.Foundation.Collections.IIterator<HSTRING>;
-            interface Windows.Foundation.Collections.IIterator<IInspectable *>;
-            interface Windows.Foundation.Collections.IVectorView<HSTRING>;
-            interface Windows.Foundation.Collections.IVectorView<IInspectable *>;
-            interface Windows.Foundation.Collections.IVector<HSTRING>;
-            interface Windows.Foundation.Collections.IVector<IInspectable *>;
-            interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*>;
-            interface Windows.Foundation.EventHandler<IInspectable *>;
-            interface Windows.Foundation.AsyncOperationCompletedHandler<IInspectable *>;
-            interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>;
-            interface Windows.Foundation.IAsyncOperation<IInspectable *>;
-            interface Windows.Foundation.IAsyncOperation<boolean>;
-            interface Windows.Foundation.IReference<INT32>;
-            interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>;
-        }
-    }
 }