Refactored Debug APIs for #1500.

microsoft · Mar 23, 2023 · e4b5ac0 · e4b5ac0
1 parent 2cfb882
commit e4b5ac0
Show file tree

Hide file tree

Showing 10 changed files with 3,985 additions and 21 deletions.
diff --git a/generation/WinSDK/Partitions/Debug.ActiveScript/main.cpp b/generation/WinSDK/Partitions/Debug.ActiveScript/main.cpp
@@ -0,0 +1,19 @@
+#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 <activdbg.h>
+#include <activprof.h>
+#include <activaut.h>
+#include <activdbg100.h>
+#include <jscript9diag.h>
diff --git a/generation/WinSDK/Partitions/Debug.ActiveScript/settings.rsp b/generation/WinSDK/Partitions/Debug.ActiveScript/settings.rsp
@@ -0,0 +1,9 @@
+--traverse
+<IncludeRoot>/um/activaut.h
+<IncludeRoot>/um/activdbg.h
+<IncludeRoot>/um/activdbg100.h
+<IncludeRoot>/um/activprof.h
+<IncludeRoot>/um/activscp.h
+<IncludeRoot>/um/jscript9diag.h
+--namespace
+Windows.Win32.System.Diagnostics.Debug.ActiveScript
diff --git a/...DK/Partitions/DebuggerExtensions/main.cpp → ...nSDK/Partitions/Debug.Extensions/main.cpp b/...DK/Partitions/DebuggerExtensions/main.cpp → ...nSDK/Partitions/Debug.Extensions/main.cpp
diff --git a/...artitions/DebuggerExtensions/settings.rsp → .../Partitions/Debug.Extensions/settings.rsp b/...artitions/DebuggerExtensions/settings.rsp → .../Partitions/Debug.Extensions/settings.rsp
@@ -9,4 +9,4 @@ PDEBUG_ENTENSION_KNOWNSTRUCT
 <IncludeRoot>/um/extsfns.h
 <IncludeRoot>/um/WDBGEXTS.H
 --namespace
-Windows.Win32.System.Diagnostics.Debug
+Windows.Win32.System.Diagnostics.Debug.Extensions
diff --git a/generation/WinSDK/Partitions/Debug/main.cpp b/generation/WinSDK/Partitions/Debug/main.cpp
@@ -14,15 +14,14 @@ typedef UCHAR KIRQL;
 
 #include <wct.h>
 #include <minidumpapiset.h>
-#include <activdbg.h>
-#include <activprof.h>
 #include <ImageHlp.h>
 #include <bugcodes.h>
-#include <activaut.h>
-#include <activdbg100.h>
 #include <dxcore.h>
 #include <dxcore_interface.h>
-#include <jscript9diag.h>
 #include <mindumpdef.h>
 #include <objsafe.h>
 #include <wheadef.h>
+#include <errhandlingapi.h>
+#include <debugapi.h>
+#include <dbgprop.h>
+#include <utilapiset.h>
diff --git a/generation/WinSDK/Partitions/Debug/settings.rsp b/generation/WinSDK/Partitions/Debug/settings.rsp
@@ -1,20 +1,14 @@
 --traverse
-<IncludeRoot>/um/activscp.h
-<IncludeRoot>/um/minidumpapiset.h
-<IncludeRoot>/um/ImageHlp.h
-<IncludeRoot>/um/wct.h
-<IncludeRoot>/um/errhandlingapi.h
-<IncludeRoot>/um/utilapiset.h
-<IncludeRoot>/um/debugapi.h
-<IncludeRoot>/um/activdbg.h
-<IncludeRoot>/um/dbgprop.h
-<IncludeRoot>/um/activprof.h
 <IncludeRoot>/shared/bugcodes.h
-<IncludeRoot>/um/activaut.h
-<IncludeRoot>/um/activdbg100.h
-<IncludeRoot>/um/jscript9diag.h
+<IncludeRoot>/um/dbgprop.h
+<IncludeRoot>/um/debugapi.h
+<IncludeRoot>/um/errhandlingapi.h
+<IncludeRoot>/um/ImageHlp.h
 <IncludeRoot>/um/mindumpdef.h
+<IncludeRoot>/um/minidumpapiset.h
 <IncludeRoot>/um/objsafe.h
+<IncludeRoot>/um/utilapiset.h
+<IncludeRoot>/um/wct.h
 <IncludeRoot>/um/wheadef.h
 --namespace
 Windows.Win32.System.Diagnostics.Debug
diff --git a/generation/WinSDK/Windows.Win32.proj b/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;Audio.Apo;Audio.DirectMusic;Audio.DirectSound;Audio.Endpoints;Authorization;Authorization.UI;Base;Bits;Bluetooth;Buses;CEIP;Certificates;Cloudapi;ClrHosting;ClrProfiling;CmpApi;Com;Com.CallObj;Com.ChannelCreds;Com.Events;Com.StructuredStorage;Com.Urlmon;Communication;ComOle;CompositionSwapchain;Console;Cos;Credentials;DataXchg;Debug.WebApp;DebuggerExtensions;Dedup;DeviceAccess;DeviceQuery;Devices.Properties;DevLic;Dhcp;Direct2D;Direct2D.Common;Direct3D;Direct3D10;Direct3D11;Direct3D11on12;Direct3D12;Direct3D9on12;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;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;MsHtml;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;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;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;Audio.Apo;Audio.DirectMusic;Audio.DirectSound;Audio.Endpoints;Authorization;Authorization.UI;Base;Bits;Bluetooth;Buses;CEIP;Certificates;Cloudapi;ClrHosting;ClrProfiling;CmpApi;Com;Com.CallObj;Com.ChannelCreds;Com.Events;Com.StructuredStorage;Com.Urlmon;Communication;ComOle;CompositionSwapchain;Console;Cos;Credentials;DataXchg;Debug.ActiveScript;Debug.Extensions;Debug.WebApp;Dedup;DeviceAccess;DeviceQuery;Devices.Properties;DevLic;Dhcp;Direct2D;Direct2D.Common;Direct3D;Direct3D10;Direct3D11;Direct3D11on12;Direct3D12;Direct3D9on12;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;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;MsHtml;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;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;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>

diff --git a/generation/WinSDK/scraper.header.txt b/generation/WinSDK/scraper.header.txt
@@ -172,6 +172,7 @@ using Windows.Win32.System.DesktopSharing;
 using Windows.Win32.System.DeveloperLicensing;
 using Windows.Win32.System.Diagnostics.Ceip;
 using Windows.Win32.System.Diagnostics.Debug;
+using Windows.Win32.System.Diagnostics.Debug.ActiveScript;
 using Windows.Win32.System.Diagnostics.Etw;
 using Windows.Win32.System.Diagnostics.ProcessSnapshotting;
 using Windows.Win32.System.Diagnostics.ToolHelp;