[PATCH v2 05/10] windows.applicationmodel: Register runtimeclasses explicitly.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/windows.applicationmodel/classes.idl | 14 +++++---------
 include/windows.applicationmodel.core.idl |  2 --
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/dlls/windows.applicationmodel/classes.idl b/dlls/windows.applicationmodel/classes.idl
index c1f76f67d2f..0dfd9808b59 100644
--- a/dlls/windows.applicationmodel/classes.idl
+++ b/dlls/windows.applicationmodel/classes.idl
@@ -19,18 +19,14 @@
  */

#pragma makedep register
-
-#ifdef __WIDL__
 #pragma winrt ns_prefix
-#endif

import "windows.foundation.idl";
 import "windows.storage.idl";
 import "windows.system.idl";
+import "windows.applicationmodel.idl";

-#define DO_NO_IMPORTS
-#define _WINDOWS_APPLICATIONMODEL
-#include "windows.applicationmodel.core.idl"
-#include "windows.applicationmodel.idl"
-#include "windows.applicationmodel.activation.idl"
-#include "windows.applicationmodel.background.idl"
+namespace Windows.ApplicationModel {
+    runtimeclass Package;
+    runtimeclass DesignMode;
+}
diff --git a/include/windows.applicationmodel.core.idl b/include/windows.applicationmodel.core.idl
index 4d3504ede68..fb3a14ce0e3 100644
--- a/include/windows.applicationmodel.core.idl
+++ b/include/windows.applicationmodel.core.idl
@@ -385,7 +385,6 @@ namespace Windows.ApplicationModel.Core {
         [contract(Windows.Foundation.UniversalApiContract, 11.0)] interface Windows.ApplicationModel.Core.IAppListEntry4;
     }

-#ifndef _WINDOWS_APPLICATIONMODEL
     [
         contract(Windows.Foundation.UniversalApiContract, 1.0),
         marshaling_behavior(agile),
@@ -402,7 +401,6 @@ namespace Windows.ApplicationModel.Core {
     runtimeclass CoreApplication
     {
     }
-#endif

[
         contract(Windows.Foundation.UniversalApiContract, 1.0),