More namespace cleanup

Fixes #733
Fixes #731
Fixes #722
Fixes #721

DoAll.ps1

@@ -19,7 +19,7 @@ if (!$SkipInstallTools.IsPresent)
 {
     . .\scripts\CommonUtils.ps1
 
-    Install-BuildTools
+    Install-BuildTools -Clean:$Clean.IsPresent
 }
 
 if ($Clean.IsPresent)

generation/WinSDK/Partitions/Base/settings.rsp

@@ -38,7 +38,6 @@ LPENCLAVE_ROUTINE
 <IncludeRoot>/um/d3dcaps.h
 <IncludeRoot>/um/d3dtypes.h
 <IncludeRoot>/shared/wtypes.h
-<IncludeRoot>/um/rpcnsip.h
 <IncludeRoot>/um/minwinbase.h
 <IncludeRoot>/um/storprop.h
 <IncludeRoot>/um/atlthunk.h

generation/WinSDK/Partitions/Debug.WebApp/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 <ntdef.h>
+
+// Would need to use ntdef.h, but we need windows.h
+typedef LONG NTSTATUS;
+typedef UCHAR KIRQL;
+
+#include <webapplication.h>

generation/WinSDK/Partitions/Debug.WebApp/settings.rsp

@@ -0,0 +1,4 @@
+--traverse
+<IncludeRoot>/winrt/webapplication.h
+--namespace
+Windows.Win32.System.Diagnostics.Debug.WebApp

generation/WinSDK/Partitions/Debug/main.cpp

@@ -16,7 +16,6 @@ typedef UCHAR KIRQL;
 #include <minidumpapiset.h>
 #include <activdbg.h>
 #include <activprof.h>
-#include <webapplication.h>
 #include <ImageHlp.h>
 #include <bugcodes.h>
 #include <activaut.h>

generation/WinSDK/Partitions/Debug/settings.rsp

@@ -9,7 +9,6 @@
 <IncludeRoot>/um/activdbg.h
 <IncludeRoot>/um/dbgprop.h
 <IncludeRoot>/um/activprof.h
-<IncludeRoot>/winrt/webapplication.h
 <IncludeRoot>/shared/bugcodes.h
 <IncludeRoot>/um/activaut.h
 <IncludeRoot>/um/activdbg100.h

generation/WinSDK/Partitions/Rpc/main.cpp

@@ -21,5 +21,5 @@
 #include <rpcssl.h>
 //#include <rpcproxy.h> Leaving out on purpose. Requires C-only interfaces and we don't think we need proxy metadata
 #include <ndr64types.h>
-
+#include <rpcnsip.h>
 

generation/WinSDK/Partitions/Rpc/settings.rsp

@@ -11,5 +11,6 @@ NDR_SCONTEXT
 <IncludeRoot>/shared/rpcndr.h
 <IncludeRoot>/um/ndr64types.h
 <IncludeRoot>/um/rpcproxy.h
+<IncludeRoot>/um/rpcnsip.h
 --namespace
 Windows.Win32.System.Rpc

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>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;Direct3D;Direct3D10;Direct3D11;Direct3D11on12;Direct3D12;Direct3DDxc;Direct3DFxc;DirectComp;DirectDraw;DirectManipulation;DirectML;DirectWrite;DTC;Dwm;DXCore;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>
+    <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;Debug.WebApp;Dedup;DeviceAccess;DeviceQuery;Devices.Properties;DevLic;Direct2D;Direct2D.Common;Direct3D;Direct3D10;Direct3D11;Direct3D11on12;Direct3D12;Direct3DDxc;Direct3DFxc;DirectComp;DirectDraw;DirectManipulation;DirectML;DirectWrite;DTC;Dwm;DXCore;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

@@ -1050,6 +1050,16 @@
     "Name": "HTREEITEM",
     "ValueType": "IntPtr"
   },
+  {
+    "Namespace": "Windows.Win32.UI.Controls",
+    "Name": "HDSA",
+    "ValueType": "IntPtr"
+  },
+  {
+    "Namespace": "Windows.Win32.UI.Controls",
+    "Name": "HDPA",
+    "ValueType": "IntPtr"
+  },
   {
     "Namespace": "Windows.Win32.System.Threading",
     "Name": "LPPROC_THREAD_ATTRIBUTE_LIST",

generation/WinSDK/enums.json

@@ -20575,6 +20575,7 @@
   },
   {
     "name": "JOB_OBJECT_CPU_RATE_CONTROL",
+    "namespace": "Windows.Win32.System.JobObjects",
     "members": [
       {
         "name": "JOB_OBJECT_CPU_RATE_CONTROL_ENABLE",
@@ -23928,6 +23929,7 @@
   },
   {
     "name": "JOB_OBJECT_TERMINATE_AT_END_ACTION",
+    "namepace": "Windows.Win32.System.JobObjects",
     "members": [
       {
         "name": "JOB_OBJECT_TERMINATE_AT_END_OF_JOB",
@@ -29243,5 +29245,37 @@
         "parameter": "dwOS"
       }
     ]
+  },
+  {
+    "name": "DEVICEFAMILYINFOENUM",
+    "flags": false,
+    "type": "uint",
+    "autoPopulate": {
+      "header": "winnt.h",
+      "filter": "DEVICEFAMILYINFOENUM_"
+    },
+    "members": [],
+    "uses": [
+      {
+        "method": "RtlGetDeviceFamilyInfoEnum",
+        "parameter": "pulDeviceFamily"
+      }
+    ]
+  },
+  {
+    "name": "DEVICEFAMILYDEVICEFORM",
+    "flags": false,
+    "type": "uint",
+    "autoPopulate": {
+      "header": "winnt.h",
+      "filter": "DEVICEFAMILYDEVICEFORM_"
+    },
+    "members": [],
+    "uses": [
+      {
+        "method": "RtlGetDeviceFamilyInfoEnum",
+        "parameter": "pulDeviceForm"
+      }
+    ]
   }
 ]

generation/WinSDK/manual/Foundation.cs

@@ -8,5 +8,8 @@ public static unsafe partial class Apis
     {
         [NativeTypeName("HANDLE")]
         public const int INVALID_HANDLE_VALUE = -1;
+
+        [NativeTypeName("HRESULT")]
+        public const int CO_E_NOTINITIALIZED = unchecked((int)0x800401F0);
     }
 }