From: Zhiyi Zhang zzhang@codeweavers.com
--- dlls/twinapi.appcore/classes.idl | 2 ++ dlls/windows.ui/classes.idl | 1 + include/windows.ui.viewmanagement.idl | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+)
diff --git a/dlls/twinapi.appcore/classes.idl b/dlls/twinapi.appcore/classes.idl index e846c523e9e..2abd79b8de5 100644 --- a/dlls/twinapi.appcore/classes.idl +++ b/dlls/twinapi.appcore/classes.idl @@ -29,9 +29,11 @@ import "windowscontracts.idl"; import "windows.foundation.idl"; import "windows.globalization.idl"; import "windows.storage.streams.idl"; +import "windows.ui.windowmanagement.idl";
#define DO_NO_IMPORTS #define _TWINAPI_APPCORE #include "windows.security.exchangeactivesyncprovisioning.idl" #include "windows.system.profile.idl" #include "windows.system.userprofile.idl" +#include "windows.ui.viewmanagement.idl" diff --git a/dlls/windows.ui/classes.idl b/dlls/windows.ui/classes.idl index f8c59c3169f..6c0e0991474 100644 --- a/dlls/windows.ui/classes.idl +++ b/dlls/windows.ui/classes.idl @@ -35,6 +35,7 @@ import "windows.ui.idl"; import "windows.devices.input.idl";
#define DO_NO_IMPORTS +#define _WINDOWS_UI #include "windows.ui.core.idl" #include "windows.ui.input.idl" #include "windows.ui.windowmanagement.idl" diff --git a/include/windows.ui.viewmanagement.idl b/include/windows.ui.viewmanagement.idl index e6dfb1659ce..d7fad9fe2b8 100644 --- a/include/windows.ui.viewmanagement.idl +++ b/include/windows.ui.viewmanagement.idl @@ -97,12 +97,16 @@ namespace Windows.UI.ViewManagement interface IInputPaneStatics; interface IInputPaneStatics2;
+#ifndef _WINDOWS_UI runtimeclass ApplicationView; +#endif runtimeclass ApplicationViewConsolidatedEventArgs; runtimeclass ApplicationViewScaling; +#ifndef _WINDOWS_UI runtimeclass ApplicationViewSwitcher; runtimeclass ApplicationViewTitleBar; runtimeclass ApplicationViewTransferContext; +#endif runtimeclass UISettings; runtimeclass UISettingsAnimationsEnabledChangedEventArgs; runtimeclass UISettingsAutoHideScrollBarsChangedEventArgs; @@ -113,8 +117,10 @@ namespace Windows.UI.ViewManagement runtimeclass ViewModePreferences;
declare { +#ifndef _WINDOWS_UI interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.ApplicationView *, IInspectable *>; interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.ApplicationView *, Windows.UI.ViewManagement.ApplicationViewConsolidatedEventArgs *>; +#endif interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings *, IInspectable *>; interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings *, Windows.UI.ViewManagement.UISettingsAnimationsEnabledChangedEventArgs *>; interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings *, Windows.UI.ViewManagement.UISettingsAutoHideScrollBarsChangedEventArgs *>; @@ -303,6 +309,7 @@ namespace Windows.UI.ViewManagement Custom = 6, };
+#ifndef _WINDOWS_UI [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.UI.ViewManagement.ApplicationView), @@ -393,6 +400,7 @@ namespace Windows.UI.ViewManagement [propget] HRESULT WindowingEnvironment([out, retval] Windows.UI.WindowManagement.WindowingEnvironment **value); HRESULT GetDisplayRegions([out, retval] Windows.Foundation.Collections.IVectorView<Windows.UI.WindowManagement.DisplayRegion *> **result); } +#endif
[ contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -414,6 +422,7 @@ namespace Windows.UI.ViewManagement [propget] HRESULT IsAppInitiated([out, retval] boolean *value); }
+#ifndef _WINDOWS_UI [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.UI.ViewManagement.ApplicationView), @@ -433,6 +442,7 @@ namespace Windows.UI.ViewManagement { HRESULT GetApplicationViewIdForWindow([in] Windows.UI.Core.ICoreWindow *window, [out, retval] INT32 *id); } +#endif
[ contract(Windows.UI.ViewManagement.ViewManagementViewScalingContract, 1.0), @@ -454,6 +464,7 @@ namespace Windows.UI.ViewManagement HRESULT TrySetDisableLayoutScaling([in] boolean disabled, [out, retval] boolean *success); }
+#ifndef _WINDOWS_UI [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.UI.ViewManagement.ApplicationView), @@ -602,6 +613,7 @@ namespace Windows.UI.ViewManagement { [propget] HRESULT UIContext([out, retval] Windows.UI.UIContext **value); } +#endif
[ contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -834,6 +846,7 @@ namespace Windows.UI.ViewManagement HRESULT CreateDefault([in] Windows.UI.ViewManagement.ApplicationViewMode mode, [out, retval] Windows.UI.ViewManagement.ViewModePreferences **result); }
+#ifndef _WINDOWS_UI [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -855,6 +868,7 @@ namespace Windows.UI.ViewManagement [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.ViewManagement.IApplicationView9; [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.ViewManagement.IApplicationViewWithContext; } +#endif
[ contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -875,6 +889,7 @@ namespace Windows.UI.ViewManagement [default] interface Windows.UI.ViewManagement.IApplicationViewScaling; }
+#ifndef _WINDOWS_UI [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -905,6 +920,7 @@ namespace Windows.UI.ViewManagement { [contract(Windows.Foundation.UniversalApiContract, 2.0), default] interface Windows.UI.ViewManagement.IApplicationViewTransferContext; } +#endif
[ activatable(Windows.Foundation.UniversalApiContract, 1.0), @@ -980,6 +996,7 @@ namespace Windows.UI.ViewManagement [default] interface Windows.UI.ViewManagement.IInputPaneVisibilityEventArgs; }
+#ifndef _WINDOWS_UI [ contract(Windows.Foundation.UniversalApiContract, 4.0), static(Windows.UI.ViewManagement.IViewModePreferencesStatics, Windows.Foundation.UniversalApiContract, 4.0) @@ -988,4 +1005,5 @@ namespace Windows.UI.ViewManagement { [contract(Windows.Foundation.UniversalApiContract, 4.0), default] interface Windows.UI.ViewManagement.IViewModePreferences; } +#endif }