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/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/Direct3DDxgi/settings.rsp → 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/DShow/main.cpp → 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/DShow/settings.rsp → 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