[PATCH v2 04/10] twinapi.appcore: Register runtimeclasses explicitly.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/twinapi.appcore/classes.idl       | 25 ++++++++++++++++---------
 include/windows.system.profile.idl     |  2 --
 include/windows.system.userprofile.idl |  2 --
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/dlls/twinapi.appcore/classes.idl b/dlls/twinapi.appcore/classes.idl
index 2abd79b8de5..3ad10afa227 100644
--- a/dlls/twinapi.appcore/classes.idl
+++ b/dlls/twinapi.appcore/classes.idl
@@ -17,10 +17,7 @@
  */

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

import "inspectable.idl";
 import "asyncinfo.idl";
@@ -30,10 +27,20 @@ import "windows.foundation.idl";
 import "windows.globalization.idl";
 import "windows.storage.streams.idl";
 import "windows.ui.windowmanagement.idl";
+import "windows.security.exchangeactivesyncprovisioning.idl";
+import "windows.system.profile.idl";
+import "windows.system.userprofile.idl";
+import "windows.ui.viewmanagement.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"
+namespace Windows.Security.ExchangeActiveSyncProvisioning {
+    runtimeclass EasClientDeviceInformation;
+}
+namespace Windows.System.Profile {
+    runtimeclass AnalyticsInfo;
+}
+namespace Windows.System.UserProfile {
+    runtimeclass AdvertisingManager;
+}
+namespace Windows.UI.ViewManagement {
+    runtimeclass ApplicationView;
+}
diff --git a/include/windows.system.profile.idl b/include/windows.system.profile.idl
index 70322745168..7adeb6aa8a2 100644
--- a/include/windows.system.profile.idl
+++ b/include/windows.system.profile.idl
@@ -121,7 +121,6 @@ namespace Windows.System.Profile {
     }
 #endif

-#ifndef _TWINAPI_APPCORE
     [
         contract(Windows.Foundation.UniversalApiContract, 3.0),
         marshaling_behavior(agile),
@@ -141,5 +140,4 @@ namespace Windows.System.Profile {
     {
         [default] interface Windows.System.Profile.ISystemIdentificationInfo;
     }
-#endif
 }
diff --git a/include/windows.system.userprofile.idl b/include/windows.system.userprofile.idl
index 41b3797dc26..9e2b64ac971 100644
--- a/include/windows.system.userprofile.idl
+++ b/include/windows.system.userprofile.idl
@@ -64,7 +64,6 @@ namespace Windows.System.UserProfile {
         [propget] HRESULT AdvertisingId([out, retval] HSTRING *value);
     }

-#ifndef _TWINAPI_APPCORE
     [
         contract(Windows.Foundation.UniversalApiContract, 1.0),
         marshaling_behavior(agile),
@@ -75,7 +74,6 @@ namespace Windows.System.UserProfile {
     runtimeclass GlobalizationPreferences
     {
     }
-#endif

#ifndef _WINDOWS_GLOBALIZATION
     [