Fixed #1494.

generation/WinSDK/Partitions/WinRT.Metadata/main.cpp

@@ -0,0 +1,12 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <rometadata.h>
+#include <rometadataapi.h>
+#include <rometadataresolution.h>
+#include <roparameterizediid.h>

generation/WinSDK/Partitions/WinRT.Metadata/settings.rsp

@@ -0,0 +1,22 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/cor.h
+<IncludeRoot>/um/CorError.h
+<IncludeRoot>/um/CorHdr.h
+<IncludeRoot>/winrt/rometadata.h
+<IncludeRoot>/winrt/RoMetadataApi.h
+<IncludeRoot>/winrt/rometadataresolution.h
+<IncludeRoot>/winrt/roparameterizediid.h
+--namespace
+Windows.Win32.System.WinRT.Metadata

generation/WinSDK/Partitions/WinRT/main.cpp

@@ -27,10 +27,6 @@
 #include <roapi.h>
 #include <robuffer.h>
 #include <roerrorapi.h>
-#include <rometadata.h>
-#include <rometadataapi.h>
-#include <rometadataresolution.h>
-#include <roparameterizediid.h>
 #include <roregistrationapi.h>
 #include <shcore.h>
 #include <memorybuffer.h>

generation/WinSDK/Partitions/WinRT/settings.rsp

@@ -14,9 +14,6 @@ ID2D1Factory
 <IncludeRoot>/um/accountssettingspaneinterop.h
 <IncludeRoot>/um/appserviceinterop.h
 <IncludeRoot>/um/CastingInterop.h
-<IncludeRoot>/um/cor.h
-<IncludeRoot>/um/CorError.h
-<IncludeRoot>/um/CorHdr.h
 <IncludeRoot>/um/dispatcherqueue.h
 <IncludeRoot>/um/dragdropinterop.h
 <IncludeRoot>/um/IMessageDispatcher.h
@@ -38,10 +35,6 @@ ID2D1Factory
 <IncludeRoot>/winrt/roapi.h
 <IncludeRoot>/winrt/robuffer.h
 <IncludeRoot>/winrt/roerrorapi.h
-<IncludeRoot>/winrt/rometadata.h
-<IncludeRoot>/winrt/RoMetadataApi.h
-<IncludeRoot>/winrt/rometadataresolution.h
-<IncludeRoot>/winrt/roparameterizediid.h
 <IncludeRoot>/winrt/roregistrationapi.h
 <IncludeRoot>/winrt/shcore.h
 <IncludeRoot>/winrt/weakreference.h

generation/WinSDK/scraper.header.txt

@@ -223,6 +223,7 @@ using Windows.Win32.System.VirtualDosMachines;
 using Windows.Win32.System.WindowsProgramming;
 using Windows.Win32.System.WindowsSync;
 using Windows.Win32.System.WinRT;
+using Windows.Win32.System.WinRT.Metadata;
 using Windows.Win32.System.Wmi;
 using Windows.Win32.UI.Accessibility;
 using Windows.Win32.UI.ColorSystem;

sources/GeneratorSdk/samples/DiaSdk/Microsoft.Dia.Win32Metadata.nuspec

@@ -17,7 +17,7 @@
     <icon>images\windows.png</icon>
     <repository type="git" url="https://github.com/microsoft/win32metadata.git" />
     <dependencies>
-      <dependency id="Microsoft.Windows.SDK.Win32Metadata" version="46.0.3-preview" />
+      <dependency id="Microsoft.Windows.SDK.Win32Metadata" version="46.0.4-preview" />
     </dependencies>
   </metadata>