Mega namespace refactor (#718)

* Another big round of namespace refactorings to reduce dependencies

* Missing namespace that broke the DWriteCore sample

.gitignore

@@ -366,4 +366,3 @@ MigrationBackup/
 !/tests/MetadataUtils.Tests/assets/x64
 !/tests/MetadataUtils.Tests/assets/x86
 !/tests/MetadataUtils.Tests/assets/arm64
-

generation/WinSDK/ConstantsScraper.header.txt

@@ -1,13 +1,13 @@
-using Windows.Win32.System.PropertiesSystem; // For PROPERTYKEY
+using Windows.Win32.UI.Shell.PropertiesSystem; // For PROPERTYKEY
 using Windows.Win32.System.SystemServices;
 using static Windows.Win32.Foundation.Apis; // Various constants
 using static Windows.Win32.Foundation.WIN32_ERROR;
 using static Windows.Win32.System.SystemServices.Apis; // Various constants
 using static Windows.Win32.Media.Apis; // Various constants
-using static Windows.Win32.Media.Multimedia.Apis; // Various constants
 using static Windows.Win32.Media.Audio.Apis; // Various constants
+using static Windows.Win32.Media.DirectShow.Apis; // Various constants
 using static Windows.Win32.Media.KernelStreaming.Apis; // Various constants
-using static Windows.Win32.Graphics.DirectShow.Apis; // Various constants
+using static Windows.Win32.Media.Multimedia.Apis; // Various constants
 using static Windows.Win32.UI.WindowsAndMessaging.Apis; // For WM_USER
 using static Windows.Win32.Storage.FileSystem.FILE_ACCESS_FLAGS; // For FILE_* constants
 using static Windows.Win32.System.Diagnostics.Debug.FACILITY_CODE; // For MAKE_HRESULT constants

generation/WinSDK/Partitions/Audio.DirectMusic/settings.rsp

@@ -7,7 +7,6 @@ IKsPropertySet
 --traverse
 <IncludeRoot>/um/dmusicc.h
 <IncludeRoot>/shared/dmusbuff.h
-<IncludeRoot>/um/dsound.h
 <IncludeRoot>/shared/dmdls.h
 <IncludeRoot>/shared/dls1.h
 <IncludeRoot>/shared/dls2.h

generation/WinSDK/Partitions/Audio.DirectSound/main.cpp

@@ -0,0 +1,10 @@
+#define SECURITY_WIN32 // For sspi.h
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <mmsystem.h>
+
+#include <dsound.h>

generation/WinSDK/Partitions/Audio.DirectSound/settings.rsp

@@ -0,0 +1,10 @@
+--with-librarypath
+GetDeviceID=DSOUND
+--exclude
+_D3DVECTOR
+IReferenceClock
+IKsPropertySet
+--traverse
+<IncludeRoot>/um/dsound.h
+--namespace
+Windows.Win32.Media.Audio.DirectSound

generation/WinSDK/Partitions/Authorization.UI/main.cpp

@@ -0,0 +1,15 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <accctrl.h>
+#include <adtgen.h>
+#include <authz.h>
+#include <azroles.h>
+#include <aclui.h>
+#include <aclapi.h>
+#include <sddl.h>

generation/WinSDK/Partitions/Authorization.UI/settings.rsp

@@ -0,0 +1,10 @@
+--with-type
+_tagSLDATATYPE=uint
+SLDATATYPE=uint
+--exclude
+_CYPHER_BLOCK
+_LM_OWF_PASSWORD
+--traverse
+<IncludeRoot>/um/AclUI.h
+--namespace
+Windows.Win32.Security.Authorization.UI

generation/WinSDK/Partitions/Authorization/settings.rsp

@@ -8,7 +8,6 @@ _LM_OWF_PASSWORD
 <IncludeRoot>/shared/sddl.h
 <IncludeRoot>/um/accctrl.h
 <IncludeRoot>/um/AclAPI.h
-<IncludeRoot>/um/AclUI.h
 <IncludeRoot>/um/adtgen.h
 <IncludeRoot>/um/AuthZ.h
 <IncludeRoot>/um/azroles.h

generation/WinSDK/Partitions/Base/main.cpp

@@ -15,10 +15,6 @@
 #include <winbase.h>
 #include <winnt.h>
 
-#define USERMODE_DRIVER
-#include <winddi.h>
-#undef USERMODE_DRIVER
-
 #include <winuser.h>
 
 #include <utilapiset.h>

generation/WinSDK/Partitions/Base/remap.rsp

@@ -1,3 +0,0 @@
---remap
-oldname=newname
-

generation/WinSDK/Partitions/Base/settings.rsp

@@ -32,21 +32,16 @@ _D3DTEXTURETRANSFORMFLAGS
 PENCLAVE_ROUTINE
 LPENCLAVE_ROUTINE
 --traverse
-<IncludeRoot>/shared/apdevpkey.h
-<IncludeRoot>/shared/devpkey.h
 <IncludeRoot>/um/dbt.h
-<IncludeRoot>/shared/devpropdef.h
 <IncludeRoot>/shared/ioevent.h
 <IncludeRoot>/um/d3dnthal.h
 <IncludeRoot>/um/d3dcaps.h
 <IncludeRoot>/um/d3dtypes.h
-<IncludeRoot>/um/winddi.h
 <IncludeRoot>/shared/wtypes.h
 <IncludeRoot>/um/rpcnsip.h
 <IncludeRoot>/um/minwinbase.h
 <IncludeRoot>/um/storprop.h
 <IncludeRoot>/um/atlthunk.h
-<IncludeRoot>/um/devpropdef.h
 <IncludeRoot>/shared/ntiologc.h
 <IncludeRoot>/um/dlnadeviceinterfaceids.h
 <IncludeRoot>/um/dlnametadataproviderproperties.h

generation/WinSDK/Partitions/Devices.Properties/main.cpp

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <mmsystem.h>
+
+#include <devpkey.h>
+#include <apdevpkey.h>

generation/WinSDK/Partitions/Devices.Properties/settings.rsp

@@ -0,0 +1,6 @@
+--traverse
+<IncludeRoot>/shared/apdevpkey.h
+<IncludeRoot>/shared/devpkey.h
+<IncludeRoot>/shared/devpropdef.h
+--namespace
+Windows.Win32.Devices.Properties

generation/WinSDK/Partitions/Direct2D.Common/main.cpp

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+//#define D2D_USE_C_DEFINITIONS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <dcommon.h>

generation/WinSDK/Partitions/Direct2D.Common/settings.rsp

@@ -0,0 +1,9 @@
+--exclude
+IWICBitmapSource
+IWICBitmap
+DWRITE_GLYPH_RUN
+DWRITE_GLYPH_RUN_DESCRIPTION
+--traverse
+<IncludeRoot>/um/dcommon.h
+--namespace
+Windows.Win32.Graphics.Direct2D.Common

generation/WinSDK/Partitions/Direct2D/settings.rsp

@@ -8,7 +8,6 @@ DWRITE_GLYPH_RUN_DESCRIPTION
 <IncludeRoot>/um/d2d1_3helper.h
 <IncludeRoot>/um/d2d1_1helper.h
 <IncludeRoot>/um/dciddi.h
-<IncludeRoot>/um/dcommon.h
 <IncludeRoot>/um/d2dbasetypes.h
 <IncludeRoot>/um/d2d1.h
 <IncludeRoot>/um/d2d1_1.h

generation/WinSDK/Partitions/Display/main.cpp

@@ -9,3 +9,7 @@
 #include <winddi.h>
 #include <devpropdef.h>
 #include <ntddvdeo.h>
+
+#define USERMODE_DRIVER
+#include <winddi.h>
+#undef USERMODE_DRIVER

generation/WinSDK/Partitions/Display/settings.rsp

@@ -2,5 +2,6 @@
 <IncludeRoot>/shared/ntddvdeo.h
 <IncludeRoot>/um/dxcore_interface.h
 <IncludeRoot>/um/dxcore.h
+<IncludeRoot>/um/winddi.h
 --namespace
 Windows.Win32.Devices.Display

generation/WinSDK/Partitions/Dxgi.Common/settings.rsp

@@ -0,0 +1,9 @@
+--exclude
+DXGI_ADAPTER_FLAG_FORCE_DWORD
+_D3DCOLORVALUE
+--traverse
+<IncludeRoot>/shared/dxgitype.h
+<IncludeRoot>/shared/dxgiformat.h
+<IncludeRoot>/shared/dxgicommon.h
+--namespace
+Windows.Win32.Graphics.Dxgi.Common

generation/WinSDK/Partitions/Dxgi/main.cpp

@@ -0,0 +1,22 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <winnt.h>
+#include <winerror.h>
+#include <dxgi.h>
+#include <dxgi1_2.h>
+#include <dxgi1_3.h>
+#include <dxgi1_4.h>
+#include <dxgi1_5.h>
+#include <dxgi1_6.h>
+#include <dxgidebug.h>
+#include <dxgitype.h>
+#include <dxgicommon.h>
+#include <dxgiformat.h>
+#include <dxgimessages.h>
+#include <dxprogrammablecapture.h>

generation/WinSDK/Partitions/Dxgi/settings.rsp

@@ -2,9 +2,6 @@
 DXGI_ADAPTER_FLAG_FORCE_DWORD
 _D3DCOLORVALUE
 --traverse
-<IncludeRoot>/shared/dxgitype.h
-<IncludeRoot>/shared/dxgiformat.h
-<IncludeRoot>/shared/dxgicommon.h
 <IncludeRoot>/shared/dxgi.h
 <IncludeRoot>/shared/dxgi1_2.h
 <IncludeRoot>/shared/dxgi1_4.h

generation/WinSDK/Partitions/Media.DShow.Xml/main.cpp

@@ -0,0 +1,10 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <amstream.h>
+#include <amxmlgraphbuilder.h>

generation/WinSDK/Partitions/Media.DShow.Xml/settings.rsp

@@ -0,0 +1,6 @@
+--exclude
+IKsPropertySet
+--traverse
+<IncludeRoot>/um/amxmlgraphbuilder.h
+--namespace
+Windows.Win32.Media.DirectShow.Xml

generation/WinSDK/Partitions/Media.DShow/main.cpp

@@ -6,7 +6,7 @@
 #include "windows.fixed.h"
 #include <sdkddkver.h>
 
-#include <uuids.h>
+//#include <uuids.h>
 #include <ks.h>
 #include <ksmedia.h>
 //#include <ksuuids.h>
@@ -62,10 +62,6 @@
 #include <codecapi.h>
 #include <mediaobj.h>
 #include <medparam.h>
-#include <dmoreg.h>
-#include <dmort.h>
-#include <mediaerr.h>
-#include <dmoimpl.h>
 #include <wmp.h>
 #include <austream.h>
 #include <ddstream.h>

generation/WinSDK/Partitions/Media.DShow/settings.rsp

@@ -31,12 +31,8 @@ IKsPropertySet
 <IncludeRoot>/um/vmr9.h
 <IncludeRoot>/um/vpconfig.h
 <IncludeRoot>/um/vpnotify.h
-<IncludeRoot>/um/amxmlgraphbuilder.h
 <IncludeRoot>/um/errors.h
 <IncludeRoot>/um/medparam.h
-<IncludeRoot>/um/dmoreg.h
-<IncludeRoot>/um/dmort.h
-<IncludeRoot>/um/dmoimpl.h
 <IncludeRoot>/um/austream.h
 <IncludeRoot>/um/ddstream.h
 <IncludeRoot>/um/mmstream.h
@@ -45,10 +41,9 @@ IKsPropertySet
 <IncludeRoot>/um/dxva.h
 <IncludeRoot>/um/dxva2swdev.h
 <IncludeRoot>/um/dxva2trace.h
-<IncludeRoot>/um/mediaerr.h
 <IncludeRoot>/um/mpeg2error.h
 <IncludeRoot>/um/pbdaerrors.h
 <IncludeRoot>/um/playlist.h
 <IncludeRoot>/um/xprtdefs.h
 --namespace
-Windows.Win32.Graphics.DirectShow
+Windows.Win32.Media.DirectShow

generation/WinSDK/Partitions/Media.DxMediaObjects/main.cpp

@@ -0,0 +1,14 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+
+#include <sdkddkver.h>
+#include <dmoreg.h>
+#include <dmort.h>
+#include <mediaobj.h>
+#include <mediaerr.h>
+
+//#include <dmoimpl.h> -- C++ classes

generation/WinSDK/Partitions/Media.DxMediaObjects/settings.rsp

@@ -0,0 +1,8 @@
+--traverse
+<IncludeRoot>/um/mediaobj.h
+<IncludeRoot>/um/mediaerr.h
+<IncludeRoot>/um/dmoreg.h
+<IncludeRoot>/um/dmort.h
+<IncludeRoot>/um/dmoimpl.h
+--namespace
+Windows.Win32.Media.DxMediaObjects

generation/WinSDK/Partitions/Media/main.cpp

@@ -10,3 +10,4 @@
 #include <timeapi.h>
 #include <mmsyscom.h>
 #include <mmiscapi2.h>
+#include <uuids.h>

generation/WinSDK/Partitions/Media/settings.rsp

@@ -8,5 +8,6 @@ AVIPALCHANGE
 <IncludeRoot>/um/timeapi.h
 <IncludeRoot>/um/mmsyscom.h
 <IncludeRoot>/um/mmiscapi2.h
+<IncludeRoot>/shared/uuids.h
 --namespace
 Windows.Win32.Media

generation/WinSDK/Partitions/Mf/settings.rsp

@@ -14,7 +14,6 @@ tagMPEG2VIDEOINFO
 <IncludeRoot>/um/evr.h
 <IncludeRoot>/um/evr9.h
 <IncludeRoot>/um/icodecapi.h
-<IncludeRoot>/um/mediaobj.h
 <IncludeRoot>/um/mfapi.h
 <IncludeRoot>/um/mfcaptureengine.h
 <IncludeRoot>/um/mfcontentdecryptionmodule.h

generation/WinSDK/Partitions/MsTv/settings.rsp

@@ -22,4 +22,4 @@ _SetAllocator=_SetAllocator2
 <IncludeRoot>/um/tune.h
 <IncludeRoot>/um/tvratings_enum.h
 --namespace
-Windows.Win32.Graphics.DirectShow
+Windows.Win32.Media.DirectShow

generation/WinSDK/Partitions/Properties/settings.rsp

@@ -2,4 +2,4 @@
 <IncludeRoot>/um/propsys.h
 <IncludeRoot>/um/propvarutil.h
 --namespace
-Windows.Win32.System.PropertiesSystem
+Windows.Win32.UI.Shell.PropertiesSystem

generation/WinSDK/Partitions/Security.Cryptography.UI/main.cpp

@@ -0,0 +1,31 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <winternl.h>
+
+// Usually brought in by windows.h
+typedef NTSTATUS* PNTSTATUS;
+
+#define _NTDEF_
+#define SECURITY_WIN32
+#include <NTSecAPI.h>
+#include <sspi.h>
+#include <wincred.h>
+#include <NTSecPKG.h>
+#include <schannel.h>
+#include <bcrypt.h>
+#include <ncryptprotect.h>
+#include <ncrypt.h>
+#include <wincrypt.h>
+#include <cryptxml.h>
+#include <cryptdlg.h>
+#include <cryptuiapi.h>
+#include <i_cryptasn1tls.h>
+#include <infocard.h>
+#include <dpapi.h>
+#include <casetup.h>

generation/WinSDK/Partitions/Security.Cryptography.UI/settings.rsp

@@ -0,0 +1,11 @@
+--with-type
+_tagSLDATATYPE=uint
+SLDATATYPE=uint
+--exclude
+_CYPHER_BLOCK
+_LM_OWF_PASSWORD
+--traverse
+<IncludeRoot>/um/cryptdlg.h
+<IncludeRoot>/um/cryptuiapi.h
+--namespace
+Windows.Win32.Security.Cryptography.UI

generation/WinSDK/Partitions/Security.Cryptography/settings.rsp

@@ -7,8 +7,6 @@ _LM_OWF_PASSWORD
 --traverse
 <IncludeRoot>/um/casetup.h
 <IncludeRoot>/shared/bcrypt.h
-<IncludeRoot>/um/cryptdlg.h
-<IncludeRoot>/um/cryptuiapi.h
 <IncludeRoot>/um/cryptxml.h
 <IncludeRoot>/um/dpapi.h
 <IncludeRoot>/um/ncrypt.h

generation/WinSDK/Partitions/Shell.Common/main.cpp

@@ -0,0 +1,10 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+#include <shtypes.h>
+#include <ObjectArray.h>

generation/WinSDK/Partitions/Shell.Common/settings.rsp

@@ -0,0 +1,9 @@
+--remap
+_NavigateToPidl=_NavigateToPidl2
+--traverse
+<IncludeRoot>/um/shtypes.h
+<IncludeRoot>/um/ObjectArray.h
+--with-attribute
+SIIGBF=Flags
+--namespace
+Windows.Win32.UI.Shell.Common

generation/WinSDK/Partitions/Shell/settings.rsp

@@ -5,7 +5,6 @@ _NavigateToPidl=_NavigateToPidl2
 <IncludeRoot>/um/hlink.h
 <IncludeRoot>/um/tlogstg.h
 <IncludeRoot>/um/profinfo.h
-<IncludeRoot>/um/shtypes.h
 <IncludeRoot>/um/knownfolders.h
 <IncludeRoot>/um/isguids.h
 <IncludeRoot>/um/shlguid.h
@@ -21,7 +20,6 @@ _NavigateToPidl=_NavigateToPidl2
 <IncludeRoot>/um/credentialprovider.h
 <IncludeRoot>/um/SyncMgr.h
 <IncludeRoot>/um/inputpanelconfiguration.h
-<IncludeRoot>/um/ObjectArray.h
 <IncludeRoot>/um/Shlwapi.h
 <IncludeRoot>/um/thumbcache.h
 <IncludeRoot>/um/shimgdata.h
@@ -39,6 +37,7 @@ _NavigateToPidl=_NavigateToPidl2
 <IncludeRoot>/um/cplext.h
 <IncludeRoot>/um/shdispid.h
 <IncludeRoot>/um/sherrors.h
+<IncludeRoot>/um/ExDisp.h
 --with-attribute
 SIIGBF=Flags
 --namespace

generation/WinSDK/Partitions/WinProg/settings.rsp

@@ -28,7 +28,6 @@ _TEB
 <IncludeRoot>/um/CompPkgSup.h
 <IncludeRoot>/um/Ime.h
 <IncludeRoot>/um/WinNls32.h
-<IncludeRoot>/um/ExDisp.h
 <IncludeRoot>/um/aux_ulib.h
 <IncludeRoot>/um/rtlsupportapi.h
 <IncludeRoot>/shared/stralign.h

generation/WinSDK/Partitions/WinRT.AllJoyn/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>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <alljoyn_c\AjAPI.h>
+#include <windows.devices.alljoyn.interop.h>

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

@@ -0,0 +1,4 @@
+--traverse
+<IncludeRoot>/um/windows.devices.alljoyn.interop.h
+--namespace
+Windows.Win32.System.WinRT.AllJoyn

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

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <windows.ui.composition.interop.h>

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

@@ -0,0 +1,17 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/winrt/windows.ui.composition.interop.h
+--namespace
+Windows.Win32.System.WinRT.Composition

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

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <windows.ui.viewmanagement.core.coreframeworkinputviewinterop.h>

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

@@ -0,0 +1,17 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/windows.ui.viewmanagement.core.coreframeworkinputviewinterop.h
+--namespace
+Windows.Win32.System.WinRT.CoreInputView

generation/WinSDK/Partitions/WinRT.Direct2D/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>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <windows.graphics.effects.interop.h>
+#include <windows.graphics.interop.h>

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

@@ -0,0 +1,18 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/winrt/windows.graphics.effects.interop.h
+<IncludeRoot>/winrt/windows.graphics.interop.h
+--namespace
+Windows.Win32.System.WinRT.Graphics.Direct2D

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

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <windows.graphics.directx.direct3d11.interop.h>

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

@@ -0,0 +1,17 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/windows.graphics.directx.direct3d11.interop.h
+--namespace
+Windows.Win32.System.WinRT.Direct3D11

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

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <Windows.Devices.Display.Core.Interop.h>

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

@@ -0,0 +1,17 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/Windows.Devices.Display.Core.Interop.h
+--namespace
+Windows.Win32.System.WinRT.Display

generation/WinSDK/Partitions/WinRT.Graphics.Capture/main.cpp

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <Windows.Graphics.Capture.Interop.h>

generation/WinSDK/Partitions/WinRT.Graphics.Capture/settings.rsp

@@ -0,0 +1,17 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/Windows.Graphics.Capture.Interop.h
+--namespace
+Windows.Win32.System.WinRT.Graphics.Capture

generation/WinSDK/Partitions/WinRT.Graphics.Imaging/main.cpp

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <windows.graphics.imaging.interop.h>

generation/WinSDK/Partitions/WinRT.Graphics.Imaging/settings.rsp

@@ -0,0 +1,17 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/windows.graphics.imaging.interop.h
+--namespace
+Windows.Win32.System.WinRT.Graphics.Imaging

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

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <Windows.Graphics.Holographic.Interop.h>

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

@@ -0,0 +1,17 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/Windows.Graphics.Holographic.Interop.h
+--namespace
+Windows.Win32.System.WinRT.Holographic

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

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <windows.security.isolation.isolatedenvironmentinterop.h>

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

@@ -0,0 +1,17 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/windows.security.isolation.isolatedenvironmentinterop.h
+--namespace
+Windows.Win32.System.WinRT.Isolation

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

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <windows.ai.machinelearning.native.h>

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

@@ -0,0 +1,17 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/windows.ai.machinelearning.native.h
+--namespace
+Windows.Win32.System.WinRT.ML

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

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <windows.media.core.interop.h>

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

@@ -0,0 +1,17 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/windows.media.core.interop.h
+--namespace
+Windows.Win32.System.WinRT.Media

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

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <windows.data.pdf.interop.h>

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

@@ -0,0 +1,18 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/windows.data.pdf.interop.h
+--namespace
+Windows.Win32.System.WinRT.Pdf
+

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

@@ -0,0 +1,13 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <Print3DManagerInterop.h>
+#include <PrintManagerInterop.h>
+#include <windows.graphics.printing.workflow.native.h>

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

@@ -0,0 +1,19 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/Print3DManagerInterop.h
+<IncludeRoot>/um/PrintManagerInterop.h
+<IncludeRoot>/um/windows.graphics.printing.workflow.native.h
+--namespace
+Windows.Win32.System.WinRT.Printing

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

@@ -0,0 +1,11 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <windowsstoragecom.h>

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

@@ -0,0 +1,17 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/windowsstoragecom.h
+--namespace
+Windows.Win32.System.WinRT.Storage

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

@@ -0,0 +1,13 @@
+#define SECURITY_WIN32 // For sspi.h
+#define QCC_OS_GROUP_WINDOWS
+
+#include "intrinfix.h"
+
+#include "windows.fixed.h"
+#include <sdkddkver.h>
+
+//#define RO_NO_TEMPLATE_NAME
+
+#include <windows.ui.xaml.media.dxinterop.h>
+#include <windows.ui.xaml.hosting.desktopwindowxamlsource.h>
+#include <windows.ui.xaml.hosting.referencetracker.h>

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

@@ -0,0 +1,19 @@
+--with-type
+HANDLE_OPTIONS=uint
+--with-attribute
+HANDLE_OPTIONS=Flags
+--exclude
+PFNGETACTIVATIONFACTORY
+RO_REGISTRATION_COOKIE
+RoGetActivatableClassRegistration
+RoErrorReportingFlags
+IDesktopWindowTarget
+ID2D1DeviceContext
+ID2D1Geometry
+ID2D1Factory
+--traverse
+<IncludeRoot>/um/windows.ui.xaml.hosting.desktopwindowxamlsource.h
+<IncludeRoot>/um/windows.ui.xaml.hosting.referencetracker.h
+<IncludeRoot>/um/windows.ui.xaml.media.dxinterop.h
+--namespace
+Windows.Win32.System.WinRT.Xaml

generation/WinSDK/Partitions/WinRT/main.cpp

@@ -15,24 +15,11 @@
 #include <dragdropinterop.h>
 #include <inputpaneinterop.h>
 #include <PlayToManagerInterop.h>
-#include <Print3DManagerInterop.h>
-#include <PrintManagerInterop.h>
 #include <RemoteSystemsInterop.h>
 #include <UIViewSettingsInterop.h>
 #include <useractivityinterop.h>
 #include <UserConsentVerifierInterop.h>
 #include <WebAuthenticationCoreManagerInterop.h>
-#include <windows.data.pdf.interop.h>
-#include <Windows.Devices.Display.Core.Interop.h>
-#include <Windows.Graphics.Capture.Interop.h>
-#include <windows.graphics.directx.direct3d11.interop.h>
-#include <windows.graphics.imaging.interop.h>
-#include <windows.media.core.interop.h>
-#include <windows.ui.xaml.media.dxinterop.h>
-
-#include <windows.graphics.effects.interop.h>
-#include <windows.graphics.interop.h>
-#include <windows.ui.composition.interop.h>
 
 #include <hstring.h>
 #include <winstring.h>
@@ -51,16 +38,6 @@
 #include <weakreference.h>
 
 #include <msajtransport.h>
-#include <alljoyn_c\AjAPI.h>
-#include <windows.devices.alljoyn.interop.h>
-#include <windows.ai.machinelearning.native.h>
-#include <Windows.Graphics.Holographic.Interop.h>
-#include <windows.graphics.printing.workflow.native.h>
-#include <windows.security.isolation.isolatedenvironmentinterop.h>
-#include <windows.ui.xaml.hosting.desktopwindowxamlsource.h>
-#include <windows.ui.xaml.hosting.referencetracker.h>
 #include <systemmediatransportcontrolsinterop.h>
 #include <sharewindowcommandsourceinterop.h>
-#include <windows.ui.viewmanagement.core.coreframeworkinputviewinterop.h>
-#include <windowsstoragecom.h>
 #include <messagedispatcherapi.h>

generation/WinSDK/Partitions/WinRT/settings.rsp

@@ -19,8 +19,6 @@ ID2D1Factory
 <IncludeRoot>/um/dragdropinterop.h
 <IncludeRoot>/um/inputpaneinterop.h
 <IncludeRoot>/um/PlayToManagerInterop.h
-<IncludeRoot>/um/Print3DManagerInterop.h
-<IncludeRoot>/um/PrintManagerInterop.h
 <IncludeRoot>/um/RemoteSystemsInterop.h
 <IncludeRoot>/um/restrictederrorinfo.h
 <IncludeRoot>/um/SystemMediaTransportControlsInterop.h
@@ -28,20 +26,6 @@ ID2D1Factory
 <IncludeRoot>/um/useractivityinterop.h
 <IncludeRoot>/um/UserConsentVerifierInterop.h
 <IncludeRoot>/um/WebAuthenticationCoreManagerInterop.h
-<IncludeRoot>/um/windows.ai.machinelearning.native.h
-<IncludeRoot>/um/windows.data.pdf.interop.h
-<IncludeRoot>/um/windows.devices.alljoyn.interop.h
-<IncludeRoot>/um/Windows.Devices.Display.Core.Interop.h
-<IncludeRoot>/um/Windows.Graphics.Capture.Interop.h
-<IncludeRoot>/um/windows.graphics.directx.direct3d11.interop.h
-<IncludeRoot>/um/Windows.Graphics.Holographic.Interop.h
-<IncludeRoot>/um/windows.graphics.imaging.interop.h
-<IncludeRoot>/um/windows.graphics.printing.workflow.native.h
-<IncludeRoot>/um/windows.media.core.interop.h
-<IncludeRoot>/um/windows.security.isolation.isolatedenvironmentinterop.h
-<IncludeRoot>/um/windows.ui.xaml.hosting.desktopwindowxamlsource.h
-<IncludeRoot>/um/windows.ui.xaml.hosting.referencetracker.h
-<IncludeRoot>/um/windows.ui.xaml.media.dxinterop.h
 <IncludeRoot>/winrt/activation.h
 <IncludeRoot>/winrt/hstring.h
 <IncludeRoot>/winrt/inspectable.h
@@ -56,13 +40,8 @@ ID2D1Factory
 <IncludeRoot>/winrt/roregistrationapi.h
 <IncludeRoot>/winrt/shcore.h
 <IncludeRoot>/winrt/weakreference.h
-<IncludeRoot>/winrt/windows.graphics.effects.interop.h
-<IncludeRoot>/winrt/windows.graphics.interop.h
-<IncludeRoot>/winrt/windows.ui.composition.interop.h
 <IncludeRoot>/winrt/winstring.h
 <IncludeRoot>/um/sharewindowcommandsourceinterop.h
-<IncludeRoot>/um/windows.ui.viewmanagement.core.coreframeworkinputviewinterop.h
-<IncludeRoot>/um/windowsstoragecom.h
 <IncludeRoot>/um/IMessageDispatcher.h
 <PartitionDir>\main.cpp
 --namespace

generation/WinSDK/Windows.Win32.proj

@@ -47,7 +47,7 @@
     <ShowEmitWinmdOutputDetails>true</ShowEmitWinmdOutputDetails>
 
     <!-- To regenerate this list; remove the property and the build will indicate what names can safely go here as a build optimization -->
-    <ExcludeFromCrossarch>Cos;ActiveDirectory;AllJoyn;Antimalware;ApplicationVerifier;Audio;Audio.Apo;Audio.DirectMusic;Audio.Endpoints;Authorization;Automation;Bits;Bluetooth;Buses;CEIP;Certificates;Cloudapi;CmpApi;Communication;CompositionSwapchain;Console;Controls.RichEdit;Credentials;Cryptography;DataXchg;DebuggerExtensions;Dedup;DeviceAccess;DeviceQuery;DevLic;Direct2D;Direct3D10;Direct3D11;Direct3D12;Direct3DDxgi;Direct3DHlsl;DirectComp;DirectDraw;DirectManipulation;DirectML;DirectWrite;Display;DShow;DTC;Dwm;Eap;EapHost;Edp;Enstor;Environment;Etw;Fax;FileHistory;Fs;Fsrm;FunctionDiscovery;GameMode;GamingDvcInfo;Gdi;Gpmc;HostComputeSystem;HostComputeNetwork;HtmlHelp;HttpServer;Identity;IdentityProvider;Ifsk;ImagingDevice;IMapi;IndexSrv;InputRadial;Input_Ink;Input_IntContext;Input.Ime;InternetConnectionWizard;InternetExplorer;Intl;IO;Isolation;JobObjects;Kernel;KeyboardAndMouseInput;Ldap;LibraryLoader;Lwef;MachineLearning;MadCap;MagApi;Mapi;Mbn;MdmReg;Memory;MessageQueuing;Mi;MixedReality;MixedRealityInterop;Mmc;Monitor;MsChap;MsCs;MsTv;MsXml;Media;Multimedia;Ndf;Ndis;NetMgmt;NetShell;NetworkAccessProtection;Nla;Nps;NWifi;Of;Opc;OpenGL;P2p;Parcon;PicAcq;Pipes;Pla;Policy;Power;PrintTicket;Proc_Snap;ProjFs;Properties;PWM;Qos;Rdc;Rdp;RealTimeCommunications;Registry;RemoteAssist;Rm;Rpc;RstMgr;SecBitomet;Security;Security.AppLocker;Security.ConfigurationSnapin;Security.Cryptography.Catalog;Security.Cryptography;Security.Cryptography.Sip;Security.DiagnosticDataQuery;Security.DirectoryServices;Security.LicenseProtection;Security.Tpm;Security.WinTrust;Security.WinWlx;SecurityCenter;Sens;SerPorts;Services;Setup;Shutdown;SideShow;Smi;Speech;Sr;SwDevice;Tapi3;TaskSchd;Tbs;Tcui;Threading;Time;ToolHelp;Tsf;Ual;UiAnimation;UpdateAssessment;Upnp;Vhd;VirtualDiskService;VSS;Wab;Wcm;Wcn;Wcs;Wds;WebDav;WebServicesOnDevices;WebSock;Wec;Wer;Wes;Wibe;Wic;Win32_Tile_Badge_Notif;WinAuto;WinContacts;WindowsConnectionManager;WindowsFilteringPlatform;WindowsFirewall;WindowsRibbon;WindowsSetupAndMigration;WinInet;WinLocation;WinRm;WinSat;WinSync;WinTouch;Wmdm;WmFormat;Wmi;Wmlss;Wmp;Wnet;wnv;WpdSdk;Wsb;Wsl;Wsw;Wua;Xaml_Diagnostics;Xaudio2;Xblidp;Xinput;XmlLite;Xps;XpsPrinting;AppxPackaging;Ado;Foundation;Hypervisor;Hid;Com;Com.CallObj;Com.ChannelCreds;Com.Events;Com.StructuredStorage;Com.Urlmon;ComOle;PsApi;RRas;Wia;WinSensors;Tablet;TermServ;TransactionServer;WinRT;Snmp;SystemInformation;Iis</ExcludeFromCrossarch>
+    <ExcludeFromCrossarch>ActiveDirectory;AllJoyn;Antimalware;ApplicationVerifier;AppxPackaging;Audio.Apo;Audio.DirectMusic;Audio.DirectSound;Audio.Endpoints;Authorization;Authorization.UI;Base;Bits;Bluetooth;Buses;CEIP;Certificates;Cloudapi;CmpApi;Com;Com.CallObj;Com.ChannelCreds;Com.Events;Com.StructuredStorage;Com.Urlmon;Communication;ComOle;CompositionSwapchain;Console;Controls.RichEdit;Cos;Credentials;DataXchg;DebuggerExtensions;Dedup;DeviceAccess;DeviceQuery;Devices.Properties;DevLic;Direct2D;Direct2D.Common;Direct3D10;Direct3D11;Direct3D12;Direct3DHlsl;DirectComp;DirectDraw;DirectManipulation;DirectML;DirectWrite;Display;DTC;Dwm;Dxgi;Dxgi.Common;Eap;EapHost;Edp;Enstor;Environment;Etw;Fax;FileHistory;Foundation;Fs;Fsrm;FunctionDiscovery;GameMode;GamingDvcInfo;Gdi;Gpmc;Hid;HostComputeNetwork;HostComputeSystem;HtmlHelp;HttpServer;Hypervisor;Identity;IdentityProvider;Ifsk;Iis;ImagingDevice;IMapi;IndexSrv;Input_Ink;Input_IntContext;Input.Ime;InputRadial;InternetConnectionWizard;InternetExplorer;Intl;IO;Isolation;JobObjects;Kernel;KeyboardAndMouseInput;Ldap;LibraryLoader;Lwef;MachineLearning;MadCap;MagApi;Mapi;Mbn;MdmReg;Media;Media.DShow;Media.DShow.Xml;Media.DxMediaObjects;Memory;MessageQueuing;Mi;MixedReality;MixedRealityInterop;Mmc;Monitor;MsChap;MsCs;MsTv;MsXml;Multimedia;Ndf;Ndis;NetMgmt;NetShell;NetworkAccessProtection;Nla;Nps;NWifi;Of;Opc;OpenGL;P2p;Parcon;PicAcq;Pipes;Pla;Policy;Power;PrintTicket;Proc_Snap;ProjFs;Properties;PsApi;PWM;Qos;Rdc;Rdp;RealTimeCommunications;Registry;RemoteAssist;Rm;Rpc;RRas;RstMgr;SecBitomet;Security;Security.AppLocker;Security.ConfigurationSnapin;Security.Cryptography;Security.Cryptography.Catalog;Security.Cryptography.Sip;Security.Cryptography.UI;Security.DiagnosticDataQuery;Security.DirectoryServices;Security.LicenseProtection;Security.Tpm;Security.WinTrust;Security.WinWlx;SecurityCenter;Sens;SerPorts;Services;Setup;Shell.Common;Shutdown;SideShow;Smi;Snmp;Speech;Sr;SwDevice;SystemInformation;Tablet;Tapi3;TaskSchd;Tbs;Tcui;TermServ;Threading;Time;ToolHelp;TransactionServer;Tsf;Ual;UiAnimation;UpdateAssessment;Upnp;Vhd;VirtualDiskService;VSS;Wab;Wcm;Wcn;Wcs;Wds;WebDav;WebServicesOnDevices;WebSock;Wec;Wer;Wes;Wia;Wibe;Wic;Win32_Tile_Badge_Notif;WinAuto;WinContacts;WindowsConnectionManager;WindowsFilteringPlatform;WindowsFirewall;WindowsRibbon;WindowsSetupAndMigration;WinInet;WinLocation;WinRm;WinRT;WinRT.AllJoyn;WinRT.Composition;WinRT.CoreInputView;WinRT.Direct2D;WinRT.Direct3D11;WinRT.Display;WinRT.Graphics.Capture;WinRT.Graphics.Imaging;WinRT.Holographic;WinRT.Isolation;WinRT.Media;WinRT.ML;WinRT.Pdf;WinRT.Printing;WinRT.Storage;WinRT.Xaml;WinSat;WinSensors;WinSync;WinTouch;Wmdm;WmFormat;Wmi;Wmlss;Wmp;Wnet;wnv;WpdSdk;Wsb;Wsl;Wsw;Wua;Xaml_Diagnostics;Xaudio2;Xblidp;Xinput;XmlLite;Xps;XpsPrinting</ExcludeFromCrossarch>
 
     <!-- Set to false because the WinSDK assets are already in this project -->
     <UseWinSDKAssets>false</UseWinSDKAssets>

generation/WinSDK/autoTypes.json

@@ -163,12 +163,12 @@
     "ValueType": "DECLARE_HANDLE"
   },
   {
-    "Namespace": "Windows.Win32.System.LibraryLoader",
+    "Namespace": "Windows.Win32.Foundation",
     "Name": "HRSRC",
     "ValueType": "DECLARE_HANDLE"
   },
   {
-    "Namespace": "Windows.Win32.UI.DisplayDevices",
+    "Namespace": "Windows.Win32.Devices.Display",
     "Name": "HSURF",
     "ValueType": "DECLARE_HANDLE"
   },
@@ -178,7 +178,7 @@
     "ValueType": "DECLARE_HANDLE"
   },
   {
-    "Namespace": "Windows.Win32.Media.Audio",
+    "Namespace": "Windows.Win32.Media",
     "Name": "HTASK",
     "ValueType": "DECLARE_HANDLE"
   },
@@ -850,58 +850,38 @@
     "Name": "PRJ_DIR_ENTRY_BUFFER_HANDLE",
     "ValueType": "DECLARE_HANDLE"
   },
-  {
-    "Namespace": "Windows.Win32.System.SystemServices",
-    "Name": "HUMPD",
-    "ValueType": "DECLARE_HANDLE"
-  },
-  {
-    "Namespace": "Windows.Win32.System.SystemServices",
-    "Name": "HSTR",
-    "ValueType": "DECLARE_HANDLE"
-  },
-  {
-    "Namespace": "Windows.Win32.System.SystemServices",
-    "Name": "HSPRITE",
-    "ValueType": "DECLARE_HANDLE"
-  },
   {
     "Name": "HSEMAPHORE",
-    "ValueType": "IntPtr",
+    "ValueType": "DECLARE_HANDLE",
     "CloseApi": "EngDeleteSemaphore"
   },
   {
-    "Namespace": "Windows.Win32.System.SystemServices",
-    "Name": "HLSURF",
-    "ValueType": "DECLARE_HANDLE"
-  },
-  {
-    "Namespace": "Windows.Win32.System.SystemServices",
+    "Namespace": "Windows.Win32.Devices.Display",
     "Name": "HFASTMUTEX",
     "ValueType": "DECLARE_HANDLE"
   },
   {
-    "Namespace": "Windows.Win32.System.SystemServices",
+    "Namespace": "Windows.Win32.Devices.Display",
     "Name": "HDRVOBJ",
     "ValueType": "DECLARE_HANDLE"
   },
   {
-    "Namespace": "Windows.Win32.System.SystemServices",
+    "Namespace": "Windows.Win32.Devices.Display",
     "Name": "HDEV",
     "ValueType": "DECLARE_HANDLE"
   },
   {
-    "Namespace": "Windows.Win32.System.SystemServices",
+    "Namespace": "Windows.Win32.Devices.Display",
     "Name": "HBM",
     "ValueType": "DECLARE_HANDLE"
   },
   {
-    "Namespace": "Windows.Win32.System.SystemServices",
+    "Namespace": "Windows.Win32.Devices.Display",
     "Name": "DHSURF",
     "ValueType": "DECLARE_HANDLE"
   },
   {
-    "Namespace": "Windows.Win32.System.SystemServices",
+    "Namespace": "Windows.Win32.Devices.Display",
     "Name": "DHPDEV",
     "ValueType": "DECLARE_HANDLE"
   },

generation/WinSDK/emitter.settings.rsp

@@ -538,3 +538,5 @@ SetupDiOpenDeviceInterfaceA::DeviceInterfaceData=[In]
 SetupDiOpenDeviceInterfaceW::DeviceInterfaceData=[In]
 SetupDiRegisterDeviceInfo::DupDeviceInfoData=[In]
 GetLastInputInfo::plii=[In]
+IReferenceClock::AdviseTime::hEvent=HANDLE
+IReferenceClock::AdvisePeriodic::hSemaphore=HANDLE

generation/WinSDK/enums.json

@@ -27898,11 +27898,11 @@
     ],
     "uses": [
       {
-        "struct": "cert_viewproperties_struct_a",
+        "struct": "CERT_VIEWPROPERTIES_STRUCT_A",
         "field": "dwFlags"
       },
       {
-        "struct": "cert_viewproperties_struct_w",
+        "struct": "CERT_VIEWPROPERTIES_STRUCT_W",
         "field": "dwFlags"
       }
     ]

generation/WinSDK/scraper.header.txt

@@ -19,6 +19,7 @@ using Windows.Win32.Devices.Geolocation;
 using Windows.Win32.Devices.HumanInterfaceDevice;
 using Windows.Win32.Devices.ImageAcquisition;
 using Windows.Win32.Devices.PortableDevices;
+using Windows.Win32.Devices.Properties;
 using Windows.Win32.Devices.Pwm;
 using Windows.Win32.Devices.Sensors;
 using Windows.Win32.Devices.SerialCommunication;
@@ -29,6 +30,7 @@ using Windows.Win32.Foundation;
 using Windows.Win32.Gaming;
 using Windows.Win32.Globalization;
 using Windows.Win32.Graphics.Direct2D;
+using Windows.Win32.Graphics.Direct2D.Common;
 using Windows.Win32.Graphics.Direct3D10;
 using Windows.Win32.Graphics.Direct3D11;
 using Windows.Win32.Graphics.Direct3D12;
@@ -36,7 +38,6 @@ using Windows.Win32.Graphics.Direct3D9;
 using Windows.Win32.Graphics.DirectComposition;
 using Windows.Win32.Graphics.DirectDraw;
 using Windows.Win32.Graphics.DirectManipulation;
-using Windows.Win32.Graphics.DirectShow;
 using Windows.Win32.Graphics.DirectWrite;
 using Windows.Win32.Graphics.Dwm;
 using Windows.Win32.Graphics.Dxgi;
@@ -51,9 +52,12 @@ using Windows.Win32.Media;
 using Windows.Win32.Media.Audio;
 using Windows.Win32.Media.Audio.Apo;
 using Windows.Win32.Media.Audio.DirectMusic;
+using Windows.Win32.Media.Audio.DirectSound;
 using Windows.Win32.Media.Audio.Endpoints;
 using Windows.Win32.Media.Audio.XAudio2;
 using Windows.Win32.Media.DeviceManager;
+using Windows.Win32.Media.DirectShow;
+using Windows.Win32.Media.DxMediaObjects;
 using Windows.Win32.Media.KernelStreaming;
 using Windows.Win32.Media.LibrarySharingServices;
 using Windows.Win32.Media.MediaFoundation;
@@ -103,12 +107,14 @@ using Windows.Win32.Security.AppLocker;
 using Windows.Win32.Security.Authentication.Identity;
 using Windows.Win32.Security.Authentication.Identity.Provider;
 using Windows.Win32.Security.Authorization;
+using Windows.Win32.Security.Authorization.UI;
 using Windows.Win32.Security.ConfigurationSnapin;
 using Windows.Win32.Security.Credentials;
 using Windows.Win32.Security.Cryptography;
 using Windows.Win32.Security.Cryptography.Catalog
 using Windows.Win32.Security.Cryptography.Certificates;
 using Windows.Win32.Security.Cryptography.Sip;
+using Windows.Win32.Security.Cryptography.UI;
 using Windows.Win32.Security.DiagnosticDataQuery;
 using Windows.Win32.Security.DirectoryServices;
 using Windows.Win32.Security.EnterpriseData;
@@ -181,7 +187,6 @@ using Windows.Win32.System.Performance;
 using Windows.Win32.System.Pipes;
 using Windows.Win32.System.Power;
 using Windows.Win32.System.ProcessStatus;
-using Windows.Win32.System.PropertiesSystem;
 using Windows.Win32.System.Registry;
 using Windows.Win32.System.RemoteAssistance;
 using Windows.Win32.System.RemoteDesktop;
@@ -216,7 +221,6 @@ using Windows.Win32.UI.ColorSystem;
 using Windows.Win32.UI.Controls;
 using Windows.Win32.UI.Controls.Dialogs;
 using Windows.Win32.UI.Controls.RichEdit;
-using Windows.Win32.UI.DisplayDevices;
 using Windows.Win32.UI.Input.Ime;
 using Windows.Win32.UI.Input.Ink;
 using Windows.Win32.UI.Input.KeyboardAndMouse;
@@ -230,6 +234,8 @@ using Windows.Win32.UI.Magnification;
 using Windows.Win32.UI.Notifications;
 using Windows.Win32.UI.Ribbon;
 using Windows.Win32.UI.Shell;
+using Windows.Win32.UI.Shell.Common;
+using Windows.Win32.UI.Shell.PropertiesSystem;
 using Windows.Win32.UI.TabletPC;
 using Windows.Win32.UI.TextServices;
 using Windows.Win32.UI.WindowsAndMessaging;

generation/WinSDK/scraper.settings.rsp

@@ -11927,3 +11927,6 @@ tACMDRVSTREAMINSTANCE=ACMDRVSTREAMINSTANCE
 tACMDRVSTREAMHEADER=ACMDRVSTREAMHEADER
 tACMDRVSTREAMSIZE=ACMDRVSTREAMSIZE
 tACMDRVFORMATSUGGEST=ACMDRVFORMATSUGGEST
+_PROPERTYUI_NAME_FLAGS=PROPERTYUI_NAME_FLAGS
+_PROPERTYUI_FLAGS=PROPERTYUI_FLAGS
+_PROPERTYUI_FORMAT_FLAGS=PROPERTYUI_FORMAT_FLAGS

scripts/BaselineWinmd/Windows.Win32.winmd

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d4a03869de936709491825725431f4189e5ffabd57042074cf5273505bcbeff
-size 15459328
+oid sha256:f16b12b5e18a110df5b4ed85eb7b40f5f2188b1fca892e072a8f921072c0894d
+size 15435776

scripts/BuildMetadataBin.ps1

@@ -4,11 +4,19 @@ param
     $assetsScrapedSeparately,
 
     [switch]
-    $skipInstallTools
+    $skipInstallTools,
+
+    [switch]
+    $Clean
 )
 
 . "$PSScriptRoot\CommonUtils.ps1"
-    
+
+if ($Clean.IsPresent)
+{
+    & $PSScriptRoot\CleanOutputs.ps1
+}
+
 if (!$skipInstallTools.IsPresent)
 {
     Install-BuildTools

sources/GeneratorSdk/MetadataTasks/EmitWinmd.cs

@@ -135,12 +135,13 @@ namespace MetadataTasks
 
             if (!string.IsNullOrEmpty(this.partitionsWithoutCrossarchDifferences))
             {
+                string sortedDifferences = string.Join(';', this.partitionsWithoutCrossarchDifferences.Split(';').OrderBy(s => s).ToArray());
                 this.Log.LogMessage(
                     MessageImportance.High,
                     "There are partitions that have no cross-arch differences. You can exclude them from cross-arch processing and speed up builds by adding this property to the project file:");
                 this.Log.LogMessage(
                     MessageImportance.High,
-                    $"<ExcludeFromCrossarch>{this.partitionsWithoutCrossarchDifferences}</ExcludeFromCrossarch>");
+                    $"<ExcludeFromCrossarch>{sortedDifferences}</ExcludeFromCrossarch>");
                 this.Log.LogMessage(
                     MessageImportance.High,
                     $"Or, add this property to any partitions you want to exclude: <ExcludeFromCrossarch>true</ExcludeFromCrossarch>");

sources/MetadataUtils/ConstantsScraper.cs

@@ -39,7 +39,7 @@ namespace MetadataUtils
 
             private static readonly Regex DefineGuidConstRegex =
                 new Regex(
-                    @"^\s*(DEFINE_GUID|DEFINE_DEVPROPKEY|DEFINE_KNOWN_FOLDER)\s*\((.*)");
+                    @"^\s*(DEFINE_GUID|DEFINE_DEVPROPKEY|DEFINE_KNOWN_FOLDER|OUR_GUID_ENTRY)\s*\((.*)");
 
             private static readonly Regex DefineAviGuidConstRegex =
                 new Regex(

sources/MetadataUtils/NamespaceDependencyUtil.cs

@@ -1,9 +1,22 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using ICSharpCode.Decompiler.TypeSystem;
 
 namespace MetadataUtils
 {
+    public static class ExtensionClass
+    {
+        // Extension method to append the element
+        public static T[] Append<T>(this T[] array, T item)
+        {
+            List<T> list = new List<T>(array);
+            list.Add(item);
+
+            return list.ToArray();
+        }
+    }
+
     public static class NamespaceDependencyUtil
     {
         public static IEnumerable<DependenciesInNamespace> GetNamespaceDependencies(string winmdFileName)
@@ -12,6 +25,72 @@ namespace MetadataUtils
             return impl.GetNamespaceDependencies(winmdFileName);
         }
 
+        public static IEnumerable<IEnumerable<string>> GetNamespaceCycles(string winmdFileName)
+        {
+            GetNamespaceCyclesImpl impl = new(winmdFileName);
+            return impl.GetNamespaceCycles();
+        }
+
+        public static Dictionary<string, IEnumerable<string>> GetNamespaceToDependencyNamespaces(string winmdFileName)
+        {
+            Dictionary<string, IEnumerable<string>> namespaceToDepends = new();
+
+            foreach (var dependsInNamespace in GetNamespaceDependencies(winmdFileName))
+            {
+                namespaceToDepends.Add(dependsInNamespace.Namespace, dependsInNamespace.GetDependenciesByNamespace().Select(p => p.Key));
+            }
+
+            return namespaceToDepends;
+        }
+
+        private class GetNamespaceCyclesImpl
+        {
+            private Dictionary<string, IEnumerable<string>> namespaceToDepends;
+            
+            public GetNamespaceCyclesImpl(string winmdFileName)
+            {
+                this.namespaceToDepends = GetNamespaceToDependencyNamespaces(winmdFileName);
+            }
+
+            public IEnumerable<IEnumerable<string>> GetNamespaceCycles()
+            {
+                foreach (var ns in this.namespaceToDepends.Keys)
+                {
+                    var empty = Array.Empty<string>();
+                    foreach (var cycle in this.GetCycles(ns, empty))
+                    {
+                        yield return cycle;
+                    }
+                }
+            }
+
+            private IEnumerable<IEnumerable<string>> GetCycles(string ns, string[] currentList)
+            {
+                int alreadyInListIndex = Array.IndexOf(currentList, ns);
+                if (alreadyInListIndex != -1)
+                {
+                    System.Diagnostics.Debug.WriteLine($"alreadyInListIndex = {alreadyInListIndex} for {ns} : {string.Join(';', currentList)}");
+                    if (alreadyInListIndex == 0)
+                    {
+                        var ret = currentList.Append(ns);
+                        yield return ret;
+                    }
+
+                    yield break;
+                }
+
+                currentList = currentList.Append(ns);
+
+                foreach (var dependNamespace in this.namespaceToDepends[ns])
+                {
+                    foreach (var cycle in this.GetCycles(dependNamespace, currentList))
+                    {
+                        yield return cycle;
+                    }
+                }
+            }
+        }
+
         private class GetNamespaceDependenciesImpl
         {
             private Dictionary<string, DependenciesInNamespace> namespacesToDepends = new();
@@ -88,7 +167,21 @@ namespace MetadataUtils
                     }
                 }
 
-                return this.namespacesToDepends.Values.OrderBy(d => d.Namespace);
+                var finalDepends = this.namespacesToDepends.Values.OrderBy(d => d.Namespace);
+
+                Dictionary<string, IEnumerable<string>> namespaceToDepends = new();
+
+                foreach (var dependsInNamespace in finalDepends)
+                {
+                    namespaceToDepends.Add(dependsInNamespace.Namespace, dependsInNamespace.GetDependenciesByNamespace().Select(p => p.Key));
+                }
+
+                foreach (var dependsInNamespace in finalDepends)
+                {
+                    dependsInNamespace.LoadAllDependendencyNamespaces(namespaceToDepends);
+                }
+
+                return finalDepends;
             }
 
             private void AddTypeDependency(ITypeDefinition ownerType, DependenciesInNamespace depends, string broughtInBy, IType memberType)
@@ -126,6 +219,7 @@ namespace MetadataUtils
     public class DependenciesInNamespace
     {
         private Dictionary<string, Dictionary<IType, Dependency>> namespacesToDepends = new();
+        private string[] allDependencyNamespaces;
 
         public DependenciesInNamespace(string ns)
         {
@@ -142,7 +236,9 @@ namespace MetadataUtils
             }
         }
 
-        public void AddTypeDependency(string broughtInBy, IType type)
+        public IEnumerable<string> AllDependencyNamespaces => this.allDependencyNamespaces;
+
+        internal void AddTypeDependency(string broughtInBy, IType type)
         {
             string typeNamespace = type.Namespace;
             if (!this.namespacesToDepends.TryGetValue(typeNamespace, out var dependsHash))
@@ -159,6 +255,31 @@ namespace MetadataUtils
 
             dependency.AddBroughtInBy(broughtInBy);
         }
+
+        internal void LoadAllDependendencyNamespaces(Dictionary<string, IEnumerable<string>> namespaceToDepends)
+        {
+            HashSet<string> dependencyNamespaces = new();
+
+            foreach (var directNamespace in this.namespacesToDepends.Keys)
+            {
+                VisitNamespace(directNamespace, dependencyNamespaces);
+            }
+
+            void VisitNamespace(string ns, HashSet<string> dependencyNamespaces)
+            {
+                if (!dependencyNamespaces.Contains(ns))
+                {
+                    dependencyNamespaces.Add(ns);
+
+                    foreach (var dependNamespace in namespaceToDepends[ns])
+                    {
+                        VisitNamespace(dependNamespace, dependencyNamespaces);
+                    }
+                }
+            }
+
+            this.allDependencyNamespaces = dependencyNamespaces.ToArray();
+        }
     }
 
     public class Dependency

sources/WinmdUtils/Program.cs

@@ -98,9 +98,18 @@ namespace WinmdUtilsProgram
                 new Option<FileInfo>("--winmd", "The winmd to inspect.") { IsRequired = true }.ExistingOnly(),
                 new Option<string>("--ignoreDependNamespace", "Ignore dependencies to this namespace.", ArgumentArity.OneOrMore),
                 new Option<string>("--namespaceFilter", "Namespace filter", ArgumentArity.OneOrMore),
+                new Option<int>("--maxBroughtInBy", getDefaultValue: () => int.MaxValue,  description: "The max number of items to display of a type that brought in a namespace"),
+                new Option<int>("--maxDependTypes", getDefaultValue: () => int.MaxValue,  description: "The max number of types to display that brought in a namespace"),
             };
 
-            showNamespaceDependencies.Handler = CommandHandler.Create<FileInfo, string[], string[], IConsole>(ShowNamespaceDependencies);
+            showNamespaceDependencies.Handler = CommandHandler.Create<FileInfo, string[], string[], int, int, IConsole>(ShowNamespaceDependencies);
+
+            var showNamespaceCycles = new Command("showNamespaceCycles", "Show namespace cyclical dependencies.")
+            {
+                new Option<FileInfo>("--winmd", "The winmd to inspect.") { IsRequired = true }.ExistingOnly(),
+            };
+
+            showNamespaceCycles.Handler = CommandHandler.Create<FileInfo, IConsole>(ShowNamespaceCycles);
 
             var rootCommand = new RootCommand("Win32metadata winmd utils")
             {
@@ -113,7 +122,8 @@ namespace WinmdUtilsProgram
                 compareCommand,
                 showLibImports,
                 createLibRsp,
-                showNamespaceDependencies
+                showNamespaceDependencies,
+                showNamespaceCycles
             };
 
             return rootCommand.Invoke(args);
@@ -630,7 +640,32 @@ namespace WinmdUtilsProgram
             return string.Empty;
         }
 
-        public static int ShowNamespaceDependencies(FileInfo winmd, string[] ignoreDependNamespace, string[] namespaceFilter, IConsole console)
+        public static int ShowNamespaceCycles(FileInfo winmd, IConsole console)
+        {
+            foreach (var cycle in NamespaceDependencyUtil.GetNamespaceCycles(winmd.FullName))
+            {
+                bool first = true;
+                foreach (var ns in cycle)
+                {
+                    if (!first)
+                    {
+                        console.Out.Write(" -> ");
+                    }
+                    else
+                    {
+                        first = false;
+                    }
+
+                    console.Out.Write(ns);
+                }
+
+                console.Out.Write("\r\n");
+            }
+
+            return 0;
+        }
+
+        public static int ShowNamespaceDependencies(FileInfo winmd, string[] ignoreDependNamespace, string[] namespaceFilter, int maxBroughtInBy, int maxDependTypes, IConsole console)
         {
             List<Regex> namespaceFilterRegex = new List<Regex>();
             if (namespaceFilter != null)
@@ -670,24 +705,46 @@ namespace WinmdUtilsProgram
 
                 console.Out.Write($"{item.Namespace}\r\n");
 
-                bool hadDepends = false;
-                foreach (var dependsByNamespace in item.GetDependenciesByNamespace())
+                string[] allDependNamespaces = item.AllDependencyNamespaces.Where(ns => !ignoreNamespaces.Contains(ns)).ToArray();
+                if (allDependNamespaces.Length != 0)
+                {
+                    console.Out.Write($"  All dependent namespaces: {string.Join(", ", allDependNamespaces)}\r\n");
+                }
+
+                var allDependsByNamespace = item.GetDependenciesByNamespace().Where(d => !ignoreNamespaces.Contains(d.Key)).ToArray();
+                foreach (var dependsByNamespace in allDependsByNamespace)
                 {
                     var currentNamespace = dependsByNamespace.Key;
-                    if (ignoreNamespaces.Contains(currentNamespace))
-                    {
-                        continue;
-                    }
 
-                    hadDepends = true;
                     console.Out.Write($"  {dependsByNamespace.Key}\r\n");
-                    foreach (var depend in dependsByNamespace.Value)
+
+                    var allDependTypes = dependsByNamespace.Value.ToArray();
+                    var dependCount = 0;
+                    foreach (var depend in allDependTypes)
                     {
+                        if (dependCount >= maxDependTypes)
+                        {
+                            int remainingCount = allDependTypes.Length - dependCount;
+                            console.Out.Write($"    ({remainingCount} more...)\r\n");
+                            break;
+                        }
+
                         console.Out.Write($"    {depend.Type.Name}: ");
 
+                        dependCount++;
+
                         bool first = true;
-                        foreach (var broughtInBy in depend.BroughtInBy)
+                        string[] broughtInByItems = depend.BroughtInBy.ToArray();
+                        int broughtInCount = 0;
+                        foreach (var broughtInBy in broughtInByItems)
                         {
+                            if (broughtInCount == maxBroughtInBy)
+                            {
+                                int itemsRemaining = broughtInByItems.Length - broughtInCount;
+                                console.Out.Write($" ({itemsRemaining} more...)");
+                                break;
+                            }
+
                             if (first)
                             {
                                 first = false;
@@ -698,6 +755,7 @@ namespace WinmdUtilsProgram
                             }
 
                             console.Out.Write(broughtInBy);
+                            broughtInCount++;
                         }
 
                         console.Out.Write("\r\n");
@@ -706,7 +764,7 @@ namespace WinmdUtilsProgram
                     console.Out.Write("\r\n");
                 }
 
-                if (hadDepends)
+                if (allDependsByNamespace.Length != 0)
                 {
                     console.Out.Write("\r\n\r\n");
                 }

sources/WinmdUtils/Properties/launchSettings.json

@@ -38,11 +38,15 @@
     },
     "showNamespaceDependencies": {
       "commandName": "Project",
-      "commandLineArgs": "showNamespaceDependencies --winmd $(ProjectDir)..\\..\\bin\\Windows.Win32.winmd --ignoreNamespace Windows.Win32.Foundation"
+      "commandLineArgs": "showNamespaceDependencies --winmd $(ProjectDir)..\\..\\bin\\Windows.Win32.winmd --ignoreDependNamespace Windows.Win32.Foundation --maxBroughtInBy 5 --maxDependTypes 5"
     },
     "Show depends for a few ns": {
       "commandName": "Project",
       "commandLineArgs": "showNamespaceDependencies --winmd $(ProjectDir)..\\..\\bin\\Windows.Win32.winmd --ignoreDependNamespace Windows.Win32.Foundation --namespaceFilter Windows.Win32.System.Com"
+    },
+    "showNamespaceCycles": {
+      "commandName": "Project",
+      "commandLineArgs": "showNamespaceCycles --winmd $(ProjectDir)..\\..\\bin\\Windows.Win32.winmd"
     }
   }
 }