From 0c086ac2678d277ed78d681376c47362b9bb8530 Mon Sep 17 00:00:00 2001 From: Steve Otteson Date: Tue, 2 Nov 2021 13:52:58 -0700 Subject: [PATCH] Mega namespace refactor (#718) * Another big round of namespace refactorings to reduce dependencies * Missing namespace that broke the DWriteCore sample --- .gitignore | 1 - generation/WinSDK/ConstantsScraper.header.txt | 6 +- .../Partitions/Audio.DirectMusic/settings.rsp | 1 - .../Partitions/Audio.DirectSound/main.cpp | 10 + .../Partitions/Audio.DirectSound/settings.rsp | 10 + .../Partitions/Authorization.UI/main.cpp | 15 + .../Partitions/Authorization.UI/settings.rsp | 10 + .../Partitions/Authorization/settings.rsp | 1 - generation/WinSDK/Partitions/Base/main.cpp | 4 - generation/WinSDK/Partitions/Base/remap.rsp | 3 - .../WinSDK/Partitions/Base/settings.rsp | 5 - .../Partitions/Devices.Properties/main.cpp | 11 + .../Devices.Properties/settings.rsp | 6 + .../Partitions/Direct2D.Common/main.cpp | 11 + .../Partitions/Direct2D.Common/settings.rsp | 9 + .../WinSDK/Partitions/Direct2D/settings.rsp | 1 - generation/WinSDK/Partitions/Display/main.cpp | 4 + .../WinSDK/Partitions/Display/settings.rsp | 1 + .../{Direct3DDxgi => Dxgi.Common}/main.cpp | 0 .../Partitions/Dxgi.Common/settings.rsp | 9 + generation/WinSDK/Partitions/Dxgi/main.cpp | 22 + .../{Direct3DDxgi => Dxgi}/settings.rsp | 3 - .../Partitions/Media.DShow.Xml/main.cpp | 10 + .../Partitions/Media.DShow.Xml/settings.rsp | 6 + .../{DShow => Media.DShow}/main.cpp | 6 +- .../{DShow => Media.DShow}/settings.rsp | 7 +- .../Partitions/Media.DxMediaObjects/main.cpp | 14 + .../Media.DxMediaObjects/settings.rsp | 8 + generation/WinSDK/Partitions/Media/main.cpp | 1 + .../WinSDK/Partitions/Media/settings.rsp | 1 + generation/WinSDK/Partitions/Mf/settings.rsp | 1 - .../WinSDK/Partitions/MsTv/settings.rsp | 2 +- .../WinSDK/Partitions/Properties/settings.rsp | 2 +- .../Security.Cryptography.UI/main.cpp | 31 + .../Security.Cryptography.UI/settings.rsp | 11 + .../Security.Cryptography/settings.rsp | 2 - .../WinSDK/Partitions/Shell.Common/main.cpp | 10 + .../Partitions/Shell.Common/settings.rsp | 9 + .../WinSDK/Partitions/Shell/settings.rsp | 3 +- .../WinSDK/Partitions/WinProg/settings.rsp | 1 - .../WinSDK/Partitions/WinRT.AllJoyn/main.cpp | 12 + .../Partitions/WinRT.AllJoyn/settings.rsp | 4 + .../Partitions/WinRT.Composition/main.cpp | 11 + .../Partitions/WinRT.Composition/settings.rsp | 17 + .../Partitions/WinRT.CoreInputView/main.cpp | 11 + .../WinRT.CoreInputView/settings.rsp | 17 + .../WinSDK/Partitions/WinRT.Direct2D/main.cpp | 12 + .../Partitions/WinRT.Direct2D/settings.rsp | 18 + .../Partitions/WinRT.Direct3D11/main.cpp | 11 + .../Partitions/WinRT.Direct3D11/settings.rsp | 17 + .../WinSDK/Partitions/WinRT.Display/main.cpp | 11 + .../Partitions/WinRT.Display/settings.rsp | 17 + .../WinRT.Graphics.Capture/main.cpp | 11 + .../WinRT.Graphics.Capture/settings.rsp | 17 + .../WinRT.Graphics.Imaging/main.cpp | 11 + .../WinRT.Graphics.Imaging/settings.rsp | 17 + .../Partitions/WinRT.Holographic/main.cpp | 11 + .../Partitions/WinRT.Holographic/settings.rsp | 17 + .../Partitions/WinRT.Isolation/main.cpp | 11 + .../Partitions/WinRT.Isolation/settings.rsp | 17 + .../WinSDK/Partitions/WinRT.ML/main.cpp | 11 + .../WinSDK/Partitions/WinRT.ML/settings.rsp | 17 + .../WinSDK/Partitions/WinRT.Media/main.cpp | 11 + .../Partitions/WinRT.Media/settings.rsp | 17 + .../WinSDK/Partitions/WinRT.Pdf/main.cpp | 11 + .../WinSDK/Partitions/WinRT.Pdf/settings.rsp | 18 + .../WinSDK/Partitions/WinRT.Printing/main.cpp | 13 + .../Partitions/WinRT.Printing/settings.rsp | 19 + .../WinSDK/Partitions/WinRT.Storage/main.cpp | 11 + .../Partitions/WinRT.Storage/settings.rsp | 17 + .../WinSDK/Partitions/WinRT.Xaml/main.cpp | 13 + .../WinSDK/Partitions/WinRT.Xaml/settings.rsp | 19 + generation/WinSDK/Partitions/WinRT/main.cpp | 23 - .../WinSDK/Partitions/WinRT/settings.rsp | 21 - generation/WinSDK/Windows.Win32.proj | 2 +- generation/WinSDK/autoTypes.json | 40 +- generation/WinSDK/emitter.settings.rsp | 2 + generation/WinSDK/enums.json | 4 +- .../WinSDK/requiredNamespacesForNames.rsp | 880 ++++++++++-------- generation/WinSDK/scraper.header.txt | 12 +- generation/WinSDK/scraper.settings.rsp | 3 + scripts/BaselineWinmd/Windows.Win32.winmd | 4 +- scripts/BuildMetadataBin.ps1 | 12 +- .../GeneratorSdk/MetadataTasks/EmitWinmd.cs | 3 +- sources/MetadataUtils/ConstantsScraper.cs | 2 +- .../MetadataUtils/NamespaceDependencyUtil.cs | 127 ++- sources/WinmdUtils/Program.cs | 84 +- .../WinmdUtils/Properties/launchSettings.json | 6 +- 88 files changed, 1431 insertions(+), 509 deletions(-) create mode 100644 generation/WinSDK/Partitions/Audio.DirectSound/main.cpp create mode 100644 generation/WinSDK/Partitions/Audio.DirectSound/settings.rsp create mode 100644 generation/WinSDK/Partitions/Authorization.UI/main.cpp create mode 100644 generation/WinSDK/Partitions/Authorization.UI/settings.rsp delete mode 100644 generation/WinSDK/Partitions/Base/remap.rsp create mode 100644 generation/WinSDK/Partitions/Devices.Properties/main.cpp create mode 100644 generation/WinSDK/Partitions/Devices.Properties/settings.rsp create mode 100644 generation/WinSDK/Partitions/Direct2D.Common/main.cpp create mode 100644 generation/WinSDK/Partitions/Direct2D.Common/settings.rsp rename generation/WinSDK/Partitions/{Direct3DDxgi => Dxgi.Common}/main.cpp (100%) create mode 100644 generation/WinSDK/Partitions/Dxgi.Common/settings.rsp create mode 100644 generation/WinSDK/Partitions/Dxgi/main.cpp rename generation/WinSDK/Partitions/{Direct3DDxgi => Dxgi}/settings.rsp (79%) create mode 100644 generation/WinSDK/Partitions/Media.DShow.Xml/main.cpp create mode 100644 generation/WinSDK/Partitions/Media.DShow.Xml/settings.rsp rename generation/WinSDK/Partitions/{DShow => Media.DShow}/main.cpp (94%) rename generation/WinSDK/Partitions/{DShow => Media.DShow}/settings.rsp (87%) create mode 100644 generation/WinSDK/Partitions/Media.DxMediaObjects/main.cpp create mode 100644 generation/WinSDK/Partitions/Media.DxMediaObjects/settings.rsp create mode 100644 generation/WinSDK/Partitions/Security.Cryptography.UI/main.cpp create mode 100644 generation/WinSDK/Partitions/Security.Cryptography.UI/settings.rsp create mode 100644 generation/WinSDK/Partitions/Shell.Common/main.cpp create mode 100644 generation/WinSDK/Partitions/Shell.Common/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.AllJoyn/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.AllJoyn/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Composition/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Composition/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.CoreInputView/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.CoreInputView/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Direct2D/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Direct2D/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Direct3D11/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Direct3D11/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Display/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Display/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Graphics.Capture/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Graphics.Capture/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Graphics.Imaging/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Graphics.Imaging/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Holographic/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Holographic/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Isolation/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Isolation/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.ML/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.ML/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Media/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Media/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Pdf/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Pdf/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Printing/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Printing/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Storage/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Storage/settings.rsp create mode 100644 generation/WinSDK/Partitions/WinRT.Xaml/main.cpp create mode 100644 generation/WinSDK/Partitions/WinRT.Xaml/settings.rsp diff --git a/.gitignore b/.gitignore index c495bf4b9..a45d57ddd 100644 --- a/.gitignore +++ b/.gitignore @@ -366,4 +366,3 @@ MigrationBackup/ !/tests/MetadataUtils.Tests/assets/x64 !/tests/MetadataUtils.Tests/assets/x86 !/tests/MetadataUtils.Tests/assets/arm64 - diff --git a/generation/WinSDK/ConstantsScraper.header.txt b/generation/WinSDK/ConstantsScraper.header.txt index a5a6eb7d9..910c9f758 100644 --- a/generation/WinSDK/ConstantsScraper.header.txt +++ b/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 diff --git a/generation/WinSDK/Partitions/Audio.DirectMusic/settings.rsp b/generation/WinSDK/Partitions/Audio.DirectMusic/settings.rsp index f0308fa3f..b3c66c49b 100644 --- a/generation/WinSDK/Partitions/Audio.DirectMusic/settings.rsp +++ b/generation/WinSDK/Partitions/Audio.DirectMusic/settings.rsp @@ -7,7 +7,6 @@ IKsPropertySet --traverse /um/dmusicc.h /shared/dmusbuff.h -/um/dsound.h /shared/dmdls.h /shared/dls1.h /shared/dls2.h diff --git a/generation/WinSDK/Partitions/Audio.DirectSound/main.cpp b/generation/WinSDK/Partitions/Audio.DirectSound/main.cpp new file mode 100644 index 000000000..f70257868 --- /dev/null +++ b/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 + +#include + +#include diff --git a/generation/WinSDK/Partitions/Audio.DirectSound/settings.rsp b/generation/WinSDK/Partitions/Audio.DirectSound/settings.rsp new file mode 100644 index 000000000..1d852cdc2 --- /dev/null +++ b/generation/WinSDK/Partitions/Audio.DirectSound/settings.rsp @@ -0,0 +1,10 @@ +--with-librarypath +GetDeviceID=DSOUND +--exclude +_D3DVECTOR +IReferenceClock +IKsPropertySet +--traverse +/um/dsound.h +--namespace +Windows.Win32.Media.Audio.DirectSound diff --git a/generation/WinSDK/Partitions/Authorization.UI/main.cpp b/generation/WinSDK/Partitions/Authorization.UI/main.cpp new file mode 100644 index 000000000..6e5768456 --- /dev/null +++ b/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 + +#include +#include +#include +#include +#include +#include +#include \ No newline at end of file diff --git a/generation/WinSDK/Partitions/Authorization.UI/settings.rsp b/generation/WinSDK/Partitions/Authorization.UI/settings.rsp new file mode 100644 index 000000000..3b827f012 --- /dev/null +++ b/generation/WinSDK/Partitions/Authorization.UI/settings.rsp @@ -0,0 +1,10 @@ +--with-type +_tagSLDATATYPE=uint +SLDATATYPE=uint +--exclude +_CYPHER_BLOCK +_LM_OWF_PASSWORD +--traverse +/um/AclUI.h +--namespace +Windows.Win32.Security.Authorization.UI diff --git a/generation/WinSDK/Partitions/Authorization/settings.rsp b/generation/WinSDK/Partitions/Authorization/settings.rsp index f71475920..6049cec37 100644 --- a/generation/WinSDK/Partitions/Authorization/settings.rsp +++ b/generation/WinSDK/Partitions/Authorization/settings.rsp @@ -8,7 +8,6 @@ _LM_OWF_PASSWORD /shared/sddl.h /um/accctrl.h /um/AclAPI.h -/um/AclUI.h /um/adtgen.h /um/AuthZ.h /um/azroles.h diff --git a/generation/WinSDK/Partitions/Base/main.cpp b/generation/WinSDK/Partitions/Base/main.cpp index e29174f05..ef67a7d3e 100644 --- a/generation/WinSDK/Partitions/Base/main.cpp +++ b/generation/WinSDK/Partitions/Base/main.cpp @@ -15,10 +15,6 @@ #include #include -#define USERMODE_DRIVER -#include -#undef USERMODE_DRIVER - #include #include diff --git a/generation/WinSDK/Partitions/Base/remap.rsp b/generation/WinSDK/Partitions/Base/remap.rsp deleted file mode 100644 index 19df5ccfc..000000000 --- a/generation/WinSDK/Partitions/Base/remap.rsp +++ /dev/null @@ -1,3 +0,0 @@ ---remap -oldname=newname - diff --git a/generation/WinSDK/Partitions/Base/settings.rsp b/generation/WinSDK/Partitions/Base/settings.rsp index 3274b0209..35911db07 100644 --- a/generation/WinSDK/Partitions/Base/settings.rsp +++ b/generation/WinSDK/Partitions/Base/settings.rsp @@ -32,21 +32,16 @@ _D3DTEXTURETRANSFORMFLAGS PENCLAVE_ROUTINE LPENCLAVE_ROUTINE --traverse -/shared/apdevpkey.h -/shared/devpkey.h /um/dbt.h -/shared/devpropdef.h /shared/ioevent.h /um/d3dnthal.h /um/d3dcaps.h /um/d3dtypes.h -/um/winddi.h /shared/wtypes.h /um/rpcnsip.h /um/minwinbase.h /um/storprop.h /um/atlthunk.h -/um/devpropdef.h /shared/ntiologc.h /um/dlnadeviceinterfaceids.h /um/dlnametadataproviderproperties.h diff --git a/generation/WinSDK/Partitions/Devices.Properties/main.cpp b/generation/WinSDK/Partitions/Devices.Properties/main.cpp new file mode 100644 index 000000000..fd6b3a407 --- /dev/null +++ b/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 + +#include + +#include +#include diff --git a/generation/WinSDK/Partitions/Devices.Properties/settings.rsp b/generation/WinSDK/Partitions/Devices.Properties/settings.rsp new file mode 100644 index 000000000..c19c3ccca --- /dev/null +++ b/generation/WinSDK/Partitions/Devices.Properties/settings.rsp @@ -0,0 +1,6 @@ +--traverse +/shared/apdevpkey.h +/shared/devpkey.h +/shared/devpropdef.h +--namespace +Windows.Win32.Devices.Properties diff --git a/generation/WinSDK/Partitions/Direct2D.Common/main.cpp b/generation/WinSDK/Partitions/Direct2D.Common/main.cpp new file mode 100644 index 000000000..44748c23e --- /dev/null +++ b/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 + +#include diff --git a/generation/WinSDK/Partitions/Direct2D.Common/settings.rsp b/generation/WinSDK/Partitions/Direct2D.Common/settings.rsp new file mode 100644 index 000000000..5d56d0a2a --- /dev/null +++ b/generation/WinSDK/Partitions/Direct2D.Common/settings.rsp @@ -0,0 +1,9 @@ +--exclude +IWICBitmapSource +IWICBitmap +DWRITE_GLYPH_RUN +DWRITE_GLYPH_RUN_DESCRIPTION +--traverse +/um/dcommon.h +--namespace +Windows.Win32.Graphics.Direct2D.Common diff --git a/generation/WinSDK/Partitions/Direct2D/settings.rsp b/generation/WinSDK/Partitions/Direct2D/settings.rsp index 2bcdafa7a..4a8db503f 100644 --- a/generation/WinSDK/Partitions/Direct2D/settings.rsp +++ b/generation/WinSDK/Partitions/Direct2D/settings.rsp @@ -8,7 +8,6 @@ DWRITE_GLYPH_RUN_DESCRIPTION /um/d2d1_3helper.h /um/d2d1_1helper.h /um/dciddi.h -/um/dcommon.h /um/d2dbasetypes.h /um/d2d1.h /um/d2d1_1.h diff --git a/generation/WinSDK/Partitions/Display/main.cpp b/generation/WinSDK/Partitions/Display/main.cpp index bbf6fde47..da8c501dc 100644 --- a/generation/WinSDK/Partitions/Display/main.cpp +++ b/generation/WinSDK/Partitions/Display/main.cpp @@ -9,3 +9,7 @@ #include #include #include + +#define USERMODE_DRIVER +#include +#undef USERMODE_DRIVER diff --git a/generation/WinSDK/Partitions/Display/settings.rsp b/generation/WinSDK/Partitions/Display/settings.rsp index 53169e57e..8690226f6 100644 --- a/generation/WinSDK/Partitions/Display/settings.rsp +++ b/generation/WinSDK/Partitions/Display/settings.rsp @@ -2,5 +2,6 @@ /shared/ntddvdeo.h /um/dxcore_interface.h /um/dxcore.h +/um/winddi.h --namespace Windows.Win32.Devices.Display diff --git a/generation/WinSDK/Partitions/Direct3DDxgi/main.cpp b/generation/WinSDK/Partitions/Dxgi.Common/main.cpp similarity index 100% rename from generation/WinSDK/Partitions/Direct3DDxgi/main.cpp rename to generation/WinSDK/Partitions/Dxgi.Common/main.cpp diff --git a/generation/WinSDK/Partitions/Dxgi.Common/settings.rsp b/generation/WinSDK/Partitions/Dxgi.Common/settings.rsp new file mode 100644 index 000000000..8634a3b6e --- /dev/null +++ b/generation/WinSDK/Partitions/Dxgi.Common/settings.rsp @@ -0,0 +1,9 @@ +--exclude +DXGI_ADAPTER_FLAG_FORCE_DWORD +_D3DCOLORVALUE +--traverse +/shared/dxgitype.h +/shared/dxgiformat.h +/shared/dxgicommon.h +--namespace +Windows.Win32.Graphics.Dxgi.Common diff --git a/generation/WinSDK/Partitions/Dxgi/main.cpp b/generation/WinSDK/Partitions/Dxgi/main.cpp new file mode 100644 index 000000000..7a86b11a9 --- /dev/null +++ b/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 + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/generation/WinSDK/Partitions/Direct3DDxgi/settings.rsp b/generation/WinSDK/Partitions/Dxgi/settings.rsp similarity index 79% rename from generation/WinSDK/Partitions/Direct3DDxgi/settings.rsp rename to generation/WinSDK/Partitions/Dxgi/settings.rsp index 1aa90d0bc..b2c512bb4 100644 --- a/generation/WinSDK/Partitions/Direct3DDxgi/settings.rsp +++ b/generation/WinSDK/Partitions/Dxgi/settings.rsp @@ -2,9 +2,6 @@ DXGI_ADAPTER_FLAG_FORCE_DWORD _D3DCOLORVALUE --traverse -/shared/dxgitype.h -/shared/dxgiformat.h -/shared/dxgicommon.h /shared/dxgi.h /shared/dxgi1_2.h /shared/dxgi1_4.h diff --git a/generation/WinSDK/Partitions/Media.DShow.Xml/main.cpp b/generation/WinSDK/Partitions/Media.DShow.Xml/main.cpp new file mode 100644 index 000000000..94ac0ab54 --- /dev/null +++ b/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 + +#include +#include diff --git a/generation/WinSDK/Partitions/Media.DShow.Xml/settings.rsp b/generation/WinSDK/Partitions/Media.DShow.Xml/settings.rsp new file mode 100644 index 000000000..a8ae33293 --- /dev/null +++ b/generation/WinSDK/Partitions/Media.DShow.Xml/settings.rsp @@ -0,0 +1,6 @@ +--exclude +IKsPropertySet +--traverse +/um/amxmlgraphbuilder.h +--namespace +Windows.Win32.Media.DirectShow.Xml diff --git a/generation/WinSDK/Partitions/DShow/main.cpp b/generation/WinSDK/Partitions/Media.DShow/main.cpp similarity index 94% rename from generation/WinSDK/Partitions/DShow/main.cpp rename to generation/WinSDK/Partitions/Media.DShow/main.cpp index 60dd6891e..98d3965e9 100644 --- a/generation/WinSDK/Partitions/DShow/main.cpp +++ b/generation/WinSDK/Partitions/Media.DShow/main.cpp @@ -6,7 +6,7 @@ #include "windows.fixed.h" #include -#include +//#include #include #include //#include @@ -62,10 +62,6 @@ #include #include #include -#include -#include -#include -#include #include #include #include diff --git a/generation/WinSDK/Partitions/DShow/settings.rsp b/generation/WinSDK/Partitions/Media.DShow/settings.rsp similarity index 87% rename from generation/WinSDK/Partitions/DShow/settings.rsp rename to generation/WinSDK/Partitions/Media.DShow/settings.rsp index 2704a7566..ef5f99abe 100644 --- a/generation/WinSDK/Partitions/DShow/settings.rsp +++ b/generation/WinSDK/Partitions/Media.DShow/settings.rsp @@ -31,12 +31,8 @@ IKsPropertySet /um/vmr9.h /um/vpconfig.h /um/vpnotify.h -/um/amxmlgraphbuilder.h /um/errors.h /um/medparam.h -/um/dmoreg.h -/um/dmort.h -/um/dmoimpl.h /um/austream.h /um/ddstream.h /um/mmstream.h @@ -45,10 +41,9 @@ IKsPropertySet /um/dxva.h /um/dxva2swdev.h /um/dxva2trace.h -/um/mediaerr.h /um/mpeg2error.h /um/pbdaerrors.h /um/playlist.h /um/xprtdefs.h --namespace -Windows.Win32.Graphics.DirectShow +Windows.Win32.Media.DirectShow diff --git a/generation/WinSDK/Partitions/Media.DxMediaObjects/main.cpp b/generation/WinSDK/Partitions/Media.DxMediaObjects/main.cpp new file mode 100644 index 000000000..26f98fd6b --- /dev/null +++ b/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 +#include +#include +#include +#include + +//#include -- C++ classes diff --git a/generation/WinSDK/Partitions/Media.DxMediaObjects/settings.rsp b/generation/WinSDK/Partitions/Media.DxMediaObjects/settings.rsp new file mode 100644 index 000000000..38d303219 --- /dev/null +++ b/generation/WinSDK/Partitions/Media.DxMediaObjects/settings.rsp @@ -0,0 +1,8 @@ +--traverse +/um/mediaobj.h +/um/mediaerr.h +/um/dmoreg.h +/um/dmort.h +/um/dmoimpl.h +--namespace +Windows.Win32.Media.DxMediaObjects diff --git a/generation/WinSDK/Partitions/Media/main.cpp b/generation/WinSDK/Partitions/Media/main.cpp index 3cb15e348..a4feed0c6 100644 --- a/generation/WinSDK/Partitions/Media/main.cpp +++ b/generation/WinSDK/Partitions/Media/main.cpp @@ -10,3 +10,4 @@ #include #include #include +#include diff --git a/generation/WinSDK/Partitions/Media/settings.rsp b/generation/WinSDK/Partitions/Media/settings.rsp index 5d5d4b0f0..bc6edebcc 100644 --- a/generation/WinSDK/Partitions/Media/settings.rsp +++ b/generation/WinSDK/Partitions/Media/settings.rsp @@ -8,5 +8,6 @@ AVIPALCHANGE /um/timeapi.h /um/mmsyscom.h /um/mmiscapi2.h +/shared/uuids.h --namespace Windows.Win32.Media diff --git a/generation/WinSDK/Partitions/Mf/settings.rsp b/generation/WinSDK/Partitions/Mf/settings.rsp index bd880bf1e..f284dc8c6 100644 --- a/generation/WinSDK/Partitions/Mf/settings.rsp +++ b/generation/WinSDK/Partitions/Mf/settings.rsp @@ -14,7 +14,6 @@ tagMPEG2VIDEOINFO /um/evr.h /um/evr9.h /um/icodecapi.h -/um/mediaobj.h /um/mfapi.h /um/mfcaptureengine.h /um/mfcontentdecryptionmodule.h diff --git a/generation/WinSDK/Partitions/MsTv/settings.rsp b/generation/WinSDK/Partitions/MsTv/settings.rsp index eac5e04fb..0828bd8e9 100644 --- a/generation/WinSDK/Partitions/MsTv/settings.rsp +++ b/generation/WinSDK/Partitions/MsTv/settings.rsp @@ -22,4 +22,4 @@ _SetAllocator=_SetAllocator2 /um/tune.h /um/tvratings_enum.h --namespace -Windows.Win32.Graphics.DirectShow +Windows.Win32.Media.DirectShow diff --git a/generation/WinSDK/Partitions/Properties/settings.rsp b/generation/WinSDK/Partitions/Properties/settings.rsp index 441eb3b33..e7a0a41cd 100644 --- a/generation/WinSDK/Partitions/Properties/settings.rsp +++ b/generation/WinSDK/Partitions/Properties/settings.rsp @@ -2,4 +2,4 @@ /um/propsys.h /um/propvarutil.h --namespace -Windows.Win32.System.PropertiesSystem +Windows.Win32.UI.Shell.PropertiesSystem diff --git a/generation/WinSDK/Partitions/Security.Cryptography.UI/main.cpp b/generation/WinSDK/Partitions/Security.Cryptography.UI/main.cpp new file mode 100644 index 000000000..38440660f --- /dev/null +++ b/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 + +#include + +// Usually brought in by windows.h +typedef NTSTATUS* PNTSTATUS; + +#define _NTDEF_ +#define SECURITY_WIN32 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/generation/WinSDK/Partitions/Security.Cryptography.UI/settings.rsp b/generation/WinSDK/Partitions/Security.Cryptography.UI/settings.rsp new file mode 100644 index 000000000..e4aff3a82 --- /dev/null +++ b/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 +/um/cryptdlg.h +/um/cryptuiapi.h +--namespace +Windows.Win32.Security.Cryptography.UI diff --git a/generation/WinSDK/Partitions/Security.Cryptography/settings.rsp b/generation/WinSDK/Partitions/Security.Cryptography/settings.rsp index df4246a06..bc1c412aa 100644 --- a/generation/WinSDK/Partitions/Security.Cryptography/settings.rsp +++ b/generation/WinSDK/Partitions/Security.Cryptography/settings.rsp @@ -7,8 +7,6 @@ _LM_OWF_PASSWORD --traverse /um/casetup.h /shared/bcrypt.h -/um/cryptdlg.h -/um/cryptuiapi.h /um/cryptxml.h /um/dpapi.h /um/ncrypt.h diff --git a/generation/WinSDK/Partitions/Shell.Common/main.cpp b/generation/WinSDK/Partitions/Shell.Common/main.cpp new file mode 100644 index 000000000..5f16274c2 --- /dev/null +++ b/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 + +#include +#include diff --git a/generation/WinSDK/Partitions/Shell.Common/settings.rsp b/generation/WinSDK/Partitions/Shell.Common/settings.rsp new file mode 100644 index 000000000..ae4dd7ecc --- /dev/null +++ b/generation/WinSDK/Partitions/Shell.Common/settings.rsp @@ -0,0 +1,9 @@ +--remap +_NavigateToPidl=_NavigateToPidl2 +--traverse +/um/shtypes.h +/um/ObjectArray.h +--with-attribute +SIIGBF=Flags +--namespace +Windows.Win32.UI.Shell.Common diff --git a/generation/WinSDK/Partitions/Shell/settings.rsp b/generation/WinSDK/Partitions/Shell/settings.rsp index f9ee6f74f..3612e133b 100644 --- a/generation/WinSDK/Partitions/Shell/settings.rsp +++ b/generation/WinSDK/Partitions/Shell/settings.rsp @@ -5,7 +5,6 @@ _NavigateToPidl=_NavigateToPidl2 /um/hlink.h /um/tlogstg.h /um/profinfo.h -/um/shtypes.h /um/knownfolders.h /um/isguids.h /um/shlguid.h @@ -21,7 +20,6 @@ _NavigateToPidl=_NavigateToPidl2 /um/credentialprovider.h /um/SyncMgr.h /um/inputpanelconfiguration.h -/um/ObjectArray.h /um/Shlwapi.h /um/thumbcache.h /um/shimgdata.h @@ -39,6 +37,7 @@ _NavigateToPidl=_NavigateToPidl2 /um/cplext.h /um/shdispid.h /um/sherrors.h +/um/ExDisp.h --with-attribute SIIGBF=Flags --namespace diff --git a/generation/WinSDK/Partitions/WinProg/settings.rsp b/generation/WinSDK/Partitions/WinProg/settings.rsp index fa409b439..feaa4f5fd 100644 --- a/generation/WinSDK/Partitions/WinProg/settings.rsp +++ b/generation/WinSDK/Partitions/WinProg/settings.rsp @@ -28,7 +28,6 @@ _TEB /um/CompPkgSup.h /um/Ime.h /um/WinNls32.h -/um/ExDisp.h /um/aux_ulib.h /um/rtlsupportapi.h /shared/stralign.h diff --git a/generation/WinSDK/Partitions/WinRT.AllJoyn/main.cpp b/generation/WinSDK/Partitions/WinRT.AllJoyn/main.cpp new file mode 100644 index 000000000..78d30aacf --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include +#include diff --git a/generation/WinSDK/Partitions/WinRT.AllJoyn/settings.rsp b/generation/WinSDK/Partitions/WinRT.AllJoyn/settings.rsp new file mode 100644 index 000000000..f44dd7edc --- /dev/null +++ b/generation/WinSDK/Partitions/WinRT.AllJoyn/settings.rsp @@ -0,0 +1,4 @@ +--traverse +/um/windows.devices.alljoyn.interop.h +--namespace +Windows.Win32.System.WinRT.AllJoyn diff --git a/generation/WinSDK/Partitions/WinRT.Composition/main.cpp b/generation/WinSDK/Partitions/WinRT.Composition/main.cpp new file mode 100644 index 000000000..5ad0dac01 --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include diff --git a/generation/WinSDK/Partitions/WinRT.Composition/settings.rsp b/generation/WinSDK/Partitions/WinRT.Composition/settings.rsp new file mode 100644 index 000000000..d8a408e19 --- /dev/null +++ b/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 +/winrt/windows.ui.composition.interop.h +--namespace +Windows.Win32.System.WinRT.Composition diff --git a/generation/WinSDK/Partitions/WinRT.CoreInputView/main.cpp b/generation/WinSDK/Partitions/WinRT.CoreInputView/main.cpp new file mode 100644 index 000000000..df86d7705 --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include diff --git a/generation/WinSDK/Partitions/WinRT.CoreInputView/settings.rsp b/generation/WinSDK/Partitions/WinRT.CoreInputView/settings.rsp new file mode 100644 index 000000000..59f95df3a --- /dev/null +++ b/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 +/um/windows.ui.viewmanagement.core.coreframeworkinputviewinterop.h +--namespace +Windows.Win32.System.WinRT.CoreInputView diff --git a/generation/WinSDK/Partitions/WinRT.Direct2D/main.cpp b/generation/WinSDK/Partitions/WinRT.Direct2D/main.cpp new file mode 100644 index 000000000..2a3af71ce --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include +#include diff --git a/generation/WinSDK/Partitions/WinRT.Direct2D/settings.rsp b/generation/WinSDK/Partitions/WinRT.Direct2D/settings.rsp new file mode 100644 index 000000000..f5d0195ea --- /dev/null +++ b/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 +/winrt/windows.graphics.effects.interop.h +/winrt/windows.graphics.interop.h +--namespace +Windows.Win32.System.WinRT.Graphics.Direct2D diff --git a/generation/WinSDK/Partitions/WinRT.Direct3D11/main.cpp b/generation/WinSDK/Partitions/WinRT.Direct3D11/main.cpp new file mode 100644 index 000000000..7335eefe8 --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include diff --git a/generation/WinSDK/Partitions/WinRT.Direct3D11/settings.rsp b/generation/WinSDK/Partitions/WinRT.Direct3D11/settings.rsp new file mode 100644 index 000000000..25fa9fa7f --- /dev/null +++ b/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 +/um/windows.graphics.directx.direct3d11.interop.h +--namespace +Windows.Win32.System.WinRT.Direct3D11 diff --git a/generation/WinSDK/Partitions/WinRT.Display/main.cpp b/generation/WinSDK/Partitions/WinRT.Display/main.cpp new file mode 100644 index 000000000..f4de8a8af --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include diff --git a/generation/WinSDK/Partitions/WinRT.Display/settings.rsp b/generation/WinSDK/Partitions/WinRT.Display/settings.rsp new file mode 100644 index 000000000..fd9d5ad21 --- /dev/null +++ b/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 +/um/Windows.Devices.Display.Core.Interop.h +--namespace +Windows.Win32.System.WinRT.Display diff --git a/generation/WinSDK/Partitions/WinRT.Graphics.Capture/main.cpp b/generation/WinSDK/Partitions/WinRT.Graphics.Capture/main.cpp new file mode 100644 index 000000000..155e84a5a --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include diff --git a/generation/WinSDK/Partitions/WinRT.Graphics.Capture/settings.rsp b/generation/WinSDK/Partitions/WinRT.Graphics.Capture/settings.rsp new file mode 100644 index 000000000..a470ef82e --- /dev/null +++ b/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 +/um/Windows.Graphics.Capture.Interop.h +--namespace +Windows.Win32.System.WinRT.Graphics.Capture diff --git a/generation/WinSDK/Partitions/WinRT.Graphics.Imaging/main.cpp b/generation/WinSDK/Partitions/WinRT.Graphics.Imaging/main.cpp new file mode 100644 index 000000000..84c93ae40 --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include diff --git a/generation/WinSDK/Partitions/WinRT.Graphics.Imaging/settings.rsp b/generation/WinSDK/Partitions/WinRT.Graphics.Imaging/settings.rsp new file mode 100644 index 000000000..33d01c976 --- /dev/null +++ b/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 +/um/windows.graphics.imaging.interop.h +--namespace +Windows.Win32.System.WinRT.Graphics.Imaging diff --git a/generation/WinSDK/Partitions/WinRT.Holographic/main.cpp b/generation/WinSDK/Partitions/WinRT.Holographic/main.cpp new file mode 100644 index 000000000..c6dde0c30 --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include diff --git a/generation/WinSDK/Partitions/WinRT.Holographic/settings.rsp b/generation/WinSDK/Partitions/WinRT.Holographic/settings.rsp new file mode 100644 index 000000000..d3c3e885a --- /dev/null +++ b/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 +/um/Windows.Graphics.Holographic.Interop.h +--namespace +Windows.Win32.System.WinRT.Holographic diff --git a/generation/WinSDK/Partitions/WinRT.Isolation/main.cpp b/generation/WinSDK/Partitions/WinRT.Isolation/main.cpp new file mode 100644 index 000000000..1670d25e2 --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include diff --git a/generation/WinSDK/Partitions/WinRT.Isolation/settings.rsp b/generation/WinSDK/Partitions/WinRT.Isolation/settings.rsp new file mode 100644 index 000000000..efc34f928 --- /dev/null +++ b/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 +/um/windows.security.isolation.isolatedenvironmentinterop.h +--namespace +Windows.Win32.System.WinRT.Isolation diff --git a/generation/WinSDK/Partitions/WinRT.ML/main.cpp b/generation/WinSDK/Partitions/WinRT.ML/main.cpp new file mode 100644 index 000000000..6265f8b8a --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include diff --git a/generation/WinSDK/Partitions/WinRT.ML/settings.rsp b/generation/WinSDK/Partitions/WinRT.ML/settings.rsp new file mode 100644 index 000000000..3ec91aa8a --- /dev/null +++ b/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 +/um/windows.ai.machinelearning.native.h +--namespace +Windows.Win32.System.WinRT.ML diff --git a/generation/WinSDK/Partitions/WinRT.Media/main.cpp b/generation/WinSDK/Partitions/WinRT.Media/main.cpp new file mode 100644 index 000000000..3d5b8471a --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include diff --git a/generation/WinSDK/Partitions/WinRT.Media/settings.rsp b/generation/WinSDK/Partitions/WinRT.Media/settings.rsp new file mode 100644 index 000000000..4976f98be --- /dev/null +++ b/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 +/um/windows.media.core.interop.h +--namespace +Windows.Win32.System.WinRT.Media diff --git a/generation/WinSDK/Partitions/WinRT.Pdf/main.cpp b/generation/WinSDK/Partitions/WinRT.Pdf/main.cpp new file mode 100644 index 000000000..e6597c1ef --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include diff --git a/generation/WinSDK/Partitions/WinRT.Pdf/settings.rsp b/generation/WinSDK/Partitions/WinRT.Pdf/settings.rsp new file mode 100644 index 000000000..085519548 --- /dev/null +++ b/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 +/um/windows.data.pdf.interop.h +--namespace +Windows.Win32.System.WinRT.Pdf + diff --git a/generation/WinSDK/Partitions/WinRT.Printing/main.cpp b/generation/WinSDK/Partitions/WinRT.Printing/main.cpp new file mode 100644 index 000000000..2317532bc --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include +#include +#include diff --git a/generation/WinSDK/Partitions/WinRT.Printing/settings.rsp b/generation/WinSDK/Partitions/WinRT.Printing/settings.rsp new file mode 100644 index 000000000..f487d9089 --- /dev/null +++ b/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 +/um/Print3DManagerInterop.h +/um/PrintManagerInterop.h +/um/windows.graphics.printing.workflow.native.h +--namespace +Windows.Win32.System.WinRT.Printing diff --git a/generation/WinSDK/Partitions/WinRT.Storage/main.cpp b/generation/WinSDK/Partitions/WinRT.Storage/main.cpp new file mode 100644 index 000000000..60b4fa1cc --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include diff --git a/generation/WinSDK/Partitions/WinRT.Storage/settings.rsp b/generation/WinSDK/Partitions/WinRT.Storage/settings.rsp new file mode 100644 index 000000000..38b07ee29 --- /dev/null +++ b/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 +/um/windowsstoragecom.h +--namespace +Windows.Win32.System.WinRT.Storage diff --git a/generation/WinSDK/Partitions/WinRT.Xaml/main.cpp b/generation/WinSDK/Partitions/WinRT.Xaml/main.cpp new file mode 100644 index 000000000..957496cb4 --- /dev/null +++ b/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 + +//#define RO_NO_TEMPLATE_NAME + +#include +#include +#include diff --git a/generation/WinSDK/Partitions/WinRT.Xaml/settings.rsp b/generation/WinSDK/Partitions/WinRT.Xaml/settings.rsp new file mode 100644 index 000000000..9a9d6cdf9 --- /dev/null +++ b/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 +/um/windows.ui.xaml.hosting.desktopwindowxamlsource.h +/um/windows.ui.xaml.hosting.referencetracker.h +/um/windows.ui.xaml.media.dxinterop.h +--namespace +Windows.Win32.System.WinRT.Xaml diff --git a/generation/WinSDK/Partitions/WinRT/main.cpp b/generation/WinSDK/Partitions/WinRT/main.cpp index 2494b4bf1..ee05dc1f1 100644 --- a/generation/WinSDK/Partitions/WinRT/main.cpp +++ b/generation/WinSDK/Partitions/WinRT/main.cpp @@ -15,24 +15,11 @@ #include #include #include -#include -#include #include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include #include #include @@ -51,16 +38,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include #include diff --git a/generation/WinSDK/Partitions/WinRT/settings.rsp b/generation/WinSDK/Partitions/WinRT/settings.rsp index cd1aa6cdc..613f485be 100644 --- a/generation/WinSDK/Partitions/WinRT/settings.rsp +++ b/generation/WinSDK/Partitions/WinRT/settings.rsp @@ -19,8 +19,6 @@ ID2D1Factory /um/dragdropinterop.h /um/inputpaneinterop.h /um/PlayToManagerInterop.h -/um/Print3DManagerInterop.h -/um/PrintManagerInterop.h /um/RemoteSystemsInterop.h /um/restrictederrorinfo.h /um/SystemMediaTransportControlsInterop.h @@ -28,20 +26,6 @@ ID2D1Factory /um/useractivityinterop.h /um/UserConsentVerifierInterop.h /um/WebAuthenticationCoreManagerInterop.h -/um/windows.ai.machinelearning.native.h -/um/windows.data.pdf.interop.h -/um/windows.devices.alljoyn.interop.h -/um/Windows.Devices.Display.Core.Interop.h -/um/Windows.Graphics.Capture.Interop.h -/um/windows.graphics.directx.direct3d11.interop.h -/um/Windows.Graphics.Holographic.Interop.h -/um/windows.graphics.imaging.interop.h -/um/windows.graphics.printing.workflow.native.h -/um/windows.media.core.interop.h -/um/windows.security.isolation.isolatedenvironmentinterop.h -/um/windows.ui.xaml.hosting.desktopwindowxamlsource.h -/um/windows.ui.xaml.hosting.referencetracker.h -/um/windows.ui.xaml.media.dxinterop.h /winrt/activation.h /winrt/hstring.h /winrt/inspectable.h @@ -56,13 +40,8 @@ ID2D1Factory /winrt/roregistrationapi.h /winrt/shcore.h /winrt/weakreference.h -/winrt/windows.graphics.effects.interop.h -/winrt/windows.graphics.interop.h -/winrt/windows.ui.composition.interop.h /winrt/winstring.h /um/sharewindowcommandsourceinterop.h -/um/windows.ui.viewmanagement.core.coreframeworkinputviewinterop.h -/um/windowsstoragecom.h /um/IMessageDispatcher.h \main.cpp --namespace diff --git a/generation/WinSDK/Windows.Win32.proj b/generation/WinSDK/Windows.Win32.proj index 5ed6c6fd7..50254a215 100644 --- a/generation/WinSDK/Windows.Win32.proj +++ b/generation/WinSDK/Windows.Win32.proj @@ -47,7 +47,7 @@ true - 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 + 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 false diff --git a/generation/WinSDK/autoTypes.json b/generation/WinSDK/autoTypes.json index 7861c2cf0..5273f7095 100644 --- a/generation/WinSDK/autoTypes.json +++ b/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" }, diff --git a/generation/WinSDK/emitter.settings.rsp b/generation/WinSDK/emitter.settings.rsp index 265fea3f2..a64d93112 100644 --- a/generation/WinSDK/emitter.settings.rsp +++ b/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 diff --git a/generation/WinSDK/enums.json b/generation/WinSDK/enums.json index f2a484985..c9283f14d 100644 --- a/generation/WinSDK/enums.json +++ b/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" } ] diff --git a/generation/WinSDK/requiredNamespacesForNames.rsp b/generation/WinSDK/requiredNamespacesForNames.rsp index e4f85407d..f03da5040 100644 --- a/generation/WinSDK/requiredNamespacesForNames.rsp +++ b/generation/WinSDK/requiredNamespacesForNames.rsp @@ -76,6 +76,34 @@ COMMON_LVB_REVERSE_VIDEO=Windows.Win32.System.Console COMMON_LVB_UNDERSCORE=Windows.Win32.System.Console COMMON_LVB_SBCSDBCS=Windows.Win32.System.Console # endregion consoleapi2.h (also defined in ntddvdeo.h) +# region d2d1.h +# These moved up to Common to break a circular dependency between D2D and DWrite +ID2D1SimplifiedGeometrySink=Windows.Win32.Graphics.Direct2D.Common +D2D1_FILL_MODE=Windows.Win32.Graphics.Direct2D.Common +D2D1_PATH_SEGMENT=Windows.Win32.Graphics.Direct2D.Common +D2D_POINT_2F=Windows.Win32.Graphics.Direct2D.Common +D2D_COLOR_F=Windows.Win32.Graphics.Direct2D.Common +D2D1_FIGURE_BEGIN=Windows.Win32.Graphics.Direct2D.Common +D2D1_BEZIER_SEGMENT=Windows.Win32.Graphics.Direct2D.Common +D2D1_FIGURE_END=Windows.Win32.Graphics.Direct2D.Common +D2D_SIZE_U=Windows.Win32.Graphics.Direct2D.Common +D2D1_PIXEL_FORMAT=Windows.Win32.Graphics.Direct2D.Common +D2D1_ALPHA_MODE=Windows.Win32.Graphics.Direct2D.Common +# Moved up to Common to avoid dragging in D2D when only the types are needed +D2D1_COLOR_F=Windows.Win32.Graphics.Direct2D.Common +D2D1_COLORMATRIX_ALPHA_MODE=Windows.Win32.Graphics.Direct2D.Common +D2D1_TURBULENCE_NOISE=Windows.Win32.Graphics.Direct2D.Common +# endregion d2d1.h +# region d2d1_1.h +# Moved up to avoid dragging in D2D when only the types are needed +D2D1_COMPOSITE_MODE=Windows.Win32.Graphics.Direct2D.Common +# endregion d2d1_1.h +# region d2deffects.h +# Moved up to avoid dragging in D2D when only the types are needed +D2D1_BORDER_MODE=Windows.Win32.Graphics.Direct2D.Common +D2D1_BLEND_MODE=Windows.Win32.Graphics.Direct2D.Common +D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE=Windows.Win32.Graphics +# endregion d2deffects.h # region d3d9.h IDirect3D9ExOverlayExtension=Windows.Win32.Media.MediaFoundation IDirect3DAuthenticatedChannel9=Windows.Win32.Media.MediaFoundation @@ -106,22 +134,32 @@ _AM_ASFWRITERCONFIG_PARAM=Windows.Win32.Media.WindowsMediaFormat IAMWMBufferPass=Windows.Win32.Media.WindowsMediaFormat IAMWMBufferPassCallback=Windows.Win32.Media.WindowsMediaFormat # endregion dshowasf.h +# region dxgi.h +DXGI_FORMAT=Windows.Win32.Graphics.Dxgi.Common +# endregion dxgi.h +# region dxgi1_2.h +DXGI_ALPHA_MODE=Windows.Win32.Graphics.Dxgi.Common +# endregion dxgi1_2.h +# region dxgitype.h +DXGI_JPEG_AC_HUFFMAN_TABLE=Windows.Win32.Graphics.Dxgi.Common +DXGI_JPEG_QUANTIZATION_TABLE=Windows.Win32.Graphics.Dxgi.Common +# endregion dxgitype.h # region dxva9typ.h -COPP_ACP_Protection_Level=Windows.Win32.Graphics.DirectShow -COPP_BusType=Windows.Win32.Graphics.DirectShow -COPP_CGMSA_Protection_Level=Windows.Win32.Graphics.DirectShow -COPP_ConnectorType=Windows.Win32.Graphics.DirectShow -COPP_HDCP_Protection_Level=Windows.Win32.Graphics.DirectShow -COPP_ImageAspectRatio_EN300294=Windows.Win32.Graphics.DirectShow -COPP_StatusFlags=Windows.Win32.Graphics.DirectShow -COPP_StatusHDCPFlags=Windows.Win32.Graphics.DirectShow -COPP_TVProtectionStandard=Windows.Win32.Graphics.DirectShow -DXVA_COPPSetProtectionLevelCmdData=Windows.Win32.Graphics.DirectShow -DXVA_COPPSetSignalingCmdData=Windows.Win32.Graphics.DirectShow -DXVA_COPPStatusData=Windows.Win32.Graphics.DirectShow -DXVA_COPPStatusDisplayData=Windows.Win32.Graphics.DirectShow -DXVA_COPPStatusHDCPKeyData=Windows.Win32.Graphics.DirectShow -DXVA_COPPStatusSignalingCmdData=Windows.Win32.Graphics.DirectShow +COPP_ACP_Protection_Level=Windows.Win32.Media.DirectShow +COPP_BusType=Windows.Win32.Media.DirectShow +COPP_CGMSA_Protection_Level=Windows.Win32.Media.DirectShow +COPP_ConnectorType=Windows.Win32.Media.DirectShow +COPP_HDCP_Protection_Level=Windows.Win32.Media.DirectShow +COPP_ImageAspectRatio_EN300294=Windows.Win32.Media.DirectShow +COPP_StatusFlags=Windows.Win32.Media.DirectShow +COPP_StatusHDCPFlags=Windows.Win32.Media.DirectShow +COPP_TVProtectionStandard=Windows.Win32.Media.DirectShow +DXVA_COPPSetProtectionLevelCmdData=Windows.Win32.Media.DirectShow +DXVA_COPPSetSignalingCmdData=Windows.Win32.Media.DirectShow +DXVA_COPPStatusData=Windows.Win32.Media.DirectShow +DXVA_COPPStatusDisplayData=Windows.Win32.Media.DirectShow +DXVA_COPPStatusHDCPKeyData=Windows.Win32.Media.DirectShow +DXVA_COPPStatusSignalingCmdData=Windows.Win32.Media.DirectShow # endregion dxva9typ.h # region errhandlingapi.h GetLastError=Windows.Win32.Foundation @@ -156,16 +194,6 @@ NERR_PasswordExpired=Windows.Win32.NetworkManagement.NetManagement # region lmserver.h SetServiceBits=Windows.Win32.System.Services # endregion lmserver.h -# region mediaobj.h -DMO_MEDIA_TYPE=Windows.Win32.Graphics.DirectShow -DMO_OUTPUT_DATA_BUFFER=Windows.Win32.Graphics.DirectShow -IDMOQualityControl=Windows.Win32.Graphics.DirectShow -IDMOVideoOutputOptimizations=Windows.Win32.Graphics.DirectShow -IEnumDMO=Windows.Win32.Graphics.DirectShow -IMediaBuffer=Windows.Win32.Graphics.DirectShow -IMediaObject=Windows.Win32.Graphics.DirectShow -IMediaObjectInPlace=Windows.Win32.Graphics.DirectShow -# endregion mediaobj.h # region memoryapi.h ReadProcessMemory=Windows.Win32.System.Diagnostics.Debug WriteProcessMemory=Windows.Win32.System.Diagnostics.Debug @@ -206,6 +234,7 @@ FINDEX_SEARCH_OPS=Windows.Win32.Storage.FileSystem GET_FILEEX_INFO_LEVELS=Windows.Win32.Storage.FileSystem LOAD_DLL_DEBUG_INFO=Windows.Win32.System.Diagnostics.Debug LPOVERLAPPED_COMPLETION_ROUTINE=Windows.Win32.System.IO +LPTHREAD_START_ROUTINE=Windows.Win32.System.Threading OUTPUT_DEBUG_STRING_INFO=Windows.Win32.System.Diagnostics.Debug OVERLAPPED_ENTRY=Windows.Win32.System.IO OVERLAPPED=Windows.Win32.System.IO @@ -227,10 +256,10 @@ VOLUMEWAVEFILTER=Windows.Win32.Media.Audio ECHOWAVEFILTER=Windows.Win32.Media.Audio WAVEFILTER=Windows.Win32.Media.Audio WAVEFORMATEXTENSIBLE=Windows.Win32.Media.Audio -HEAACWAVEFORMAT=Windows.Win32.Graphics.DirectShow -HEAACWAVEINFO=Windows.Win32.Graphics.DirectShow -MPEG1WAVEFORMAT=Windows.Win32.Graphics.DirectShow -MPEGLAYER3WAVEFORMAT=Windows.Win32.Graphics.DirectShow +HEAACWAVEFORMAT=Windows.Win32.Media.DirectShow +HEAACWAVEINFO=Windows.Win32.Media.DirectShow +MPEG1WAVEFORMAT=Windows.Win32.Media.DirectShow +MPEGLAYER3WAVEFORMAT=Windows.Win32.Media.DirectShow # endregion mmreg.h # region ntifs.h RtlConvertSidToUnicodeString=Windows.Win32.Security @@ -238,6 +267,39 @@ RtlConvertSidToUnicodeString=Windows.Win32.Security # region oaidl.h SAFEARRAY=Windows.Win32.System.Com SAFEARRAYBOUND=Windows.Win32.System.Com +IPropertyBag=Windows.Win32.System.Com.StructuredStorage +IPropertyBag2=Windows.Win32.System.Com.StructuredStorage +PROPBAG2=Windows.Win32.System.Com.StructuredStorage +IErrorInfo=Windows.Win32.System.Com +IErrorLog=Windows.Win32.System.Com +EXCEPINFO=Windows.Win32.System.Com +LPEXCEPFINO_DEFERRED_FILLIN=Windows.Win32.System.Com +IDispatch=Windows.Win32.System.Com +DISPPARAMS=Windows.Win32.System.Com +ITypeInfo=Windows.Win32.System.Com +ITypeInfo2=Windows.Win32.System.Com +TYPEATTR=Windows.Win32.System.Com +TYPEKIND=Windows.Win32.System.Com +FUNCDESC=Windows.Win32.System.Com +ELEMDESC=Windows.Win32.System.Com +TYPEDESC=Windows.Win32.System.Com +INVOKEKIND=Windows.Win32.System.Com +CALLCONV=Windows.Win32.System.Com +ITypeComp=Windows.Win32.System.Com +DESCKIND=Windows.Win32.System.Com +BINDPTR=Windows.Win32.System.Com +VARDESC=Windows.Win32.System.Com +CUSTDATA=Windows.Win32.System.Com +CUSTDATAITEM=Windows.Win32.System.Com +IDLDESC=Windows.Win32.System.Com +FUNCKIND=Windows.Win32.System.Com +VARKIND=Windows.Win32.System.Com +ITypeLib=Windows.Win32.System.Com +ITypeLib2=Windows.Win32.System.Com +ITypeLibRegistration=Windows.Win32.System.Com +ITypeLibRegistrationReader=Windows.Win32.System.Com +TLIBATTR=Windows.Win32.System.Com +SYSKIND=Windows.Win32.System.Com # endregion oaidl.h # region o*idl.h (duplicate definitions in many headers) ACTIVATIONTYPE=Windows.Win32.System.WinRT @@ -445,7 +507,7 @@ INotifyReplica=Windows.Win32.UI.Shell CveEventWrite=Windows.Win32.System.Diagnostics.Etw # endregion securitybaseapi.h # region shellapi.h -SHGetPropertyStoreForWindow=Windows.Win32.System.PropertiesSystem +SHGetPropertyStoreForWindow=Windows.Win32.UI.Shell.PropertiesSystem # endregion shellapi.h # region shellscalingapi.h GetDpiForMonitor=Windows.Win32.UI.HiDpi @@ -457,32 +519,42 @@ SetProcessDpiAwareness=Windows.Win32.UI.HiDpi # region shlobj.h IActiveDesktopP=Windows.Win32.UI.LegacyWindowsEnvironmentFeatures IADesktopP2=Windows.Win32.UI.LegacyWindowsEnvironmentFeatures +DoPrivacyDlg=Windows.Win32.Web.MsHtml # endregion shlobj.h # region shlobj_core.h -_PROPERTYUI_FLAGS=Windows.Win32.System.PropertiesSystem -IPropertyUI=Windows.Win32.System.PropertiesSystem -PDOPSTATUS=Windows.Win32.System.PropertiesSystem -PifMgr_CloseProperties=Windows.Win32.System.PropertiesSystem -PifMgr_GetProperties=Windows.Win32.System.PropertiesSystem -PifMgr_OpenProperties=Windows.Win32.System.PropertiesSystem -PifMgr_SetProperties=Windows.Win32.System.PropertiesSystem -PLACEHOLDER_STATES=Windows.Win32.System.PropertiesSystem -PROPPRG=Windows.Win32.System.PropertiesSystem -SHGetPropertyStoreFromIDList=Windows.Win32.System.PropertiesSystem -SHGetPropertyStoreFromParsingName=Windows.Win32.System.PropertiesSystem -SHPropStgCreate=Windows.Win32.System.PropertiesSystem -SHPropStgReadMultiple=Windows.Win32.System.PropertiesSystem -SHPropStgWriteMultiple=Windows.Win32.System.PropertiesSystem -SYNC_TRANSFER_STATUS=Windows.Win32.System.PropertiesSystem +PROPERTYUI_FLAGS=Windows.Win32.UI.Shell.PropertiesSystem +PROPERTYUI_NAME_FLAGS=Windows.Win32.UI.Shell.PropertiesSystem +PROPERTYUI_FORMAT_FLAGS=Windows.Win32.UI.Shell.PropertiesSystem +IPropertyUI=Windows.Win32.UI.Shell.PropertiesSystem +PDOPSTATUS=Windows.Win32.UI.Shell.PropertiesSystem +PifMgr_CloseProperties=Windows.Win32.UI.Shell.PropertiesSystem +PifMgr_GetProperties=Windows.Win32.UI.Shell.PropertiesSystem +PifMgr_OpenProperties=Windows.Win32.UI.Shell.PropertiesSystem +PifMgr_SetProperties=Windows.Win32.UI.Shell.PropertiesSystem +PLACEHOLDER_STATES=Windows.Win32.UI.Shell.PropertiesSystem +PROPPRG=Windows.Win32.UI.Shell.PropertiesSystem +SHGetPropertyStoreFromIDList=Windows.Win32.UI.Shell.PropertiesSystem +SHGetPropertyStoreFromParsingName=Windows.Win32.UI.Shell.PropertiesSystem +SHPropStgCreate=Windows.Win32.UI.Shell.PropertiesSystem +SHPropStgReadMultiple=Windows.Win32.UI.Shell.PropertiesSystem +SHPropStgWriteMultiple=Windows.Win32.UI.Shell.PropertiesSystem +SYNC_TRANSFER_STATUS=Windows.Win32.UI.Shell.PropertiesSystem # endregion shlobj_core.h # region shobjidl.h -SHAddDefaultPropertiesByExt=Windows.Win32.System.PropertiesSystem -SYNC_ENGINE_STATE_FLAGS=Windows.Win32.System.PropertiesSystem +SHAddDefaultPropertiesByExt=Windows.Win32.UI.Shell.PropertiesSystem +SYNC_ENGINE_STATE_FLAGS=Windows.Win32.UI.Shell.PropertiesSystem # endregion shobjidl.h +# region StructuredQueryCondition.h.h +CONDITION_TYPE=Windows.Win32.System.Search.Common +CONDITION_OPERATION=Windows.Win32.System.Search.Common +# endregion StructuredQueryCondition.h.h # region strmif.h -TIMECODE_SAMPLE=Windows.Win32.Media.KernelStreaming -TIMECODE=Windows.Win32.Media.KernelStreaming -VIDEOENCODER_BITRATE_MODE=Windows.Win32.Graphics.DirectShow +TIMECODE_SAMPLE=Windows.Win32.Media +TIMECODE=Windows.Win32.Media +VIDEOENCODER_BITRATE_MODE=Windows.Win32.Media.DirectShow +IReferenceClock=Windows.Win32.Media +IReferenceClock2=Windows.Win32.Media +IReferenceClockTimerControl=Windows.Win32.Media # endregion strmif.h # region sysinfoapi.h InstallELAMCertificateInfo=Windows.Win32.System.Antimalware @@ -491,8 +563,11 @@ InstallELAMCertificateInfo=Windows.Win32.System.Antimalware IRicheditWindowlessAccessibility=Windows.Win32.UI.Accessibility IRichEditUiaInformation=Windows.Win32.UI.Accessibility # endregion textserv.h +# region processthreadsapi.h +GetSystemCpuSetInformation=Windows.Win32.System.SystemInformation +# endregion processthreadsapi.h # region tvout.h -VIDEOPARAMETERS=Windows.Win32.UI.DisplayDevices +VIDEOPARAMETERS=Windows.Win32.Devices.Display # endregion tvout.h # region unknwnbase.h IUnknown_AddRef_Proxy=Windows.Win32.System.Rpc @@ -513,6 +588,9 @@ CreateUriFromMultiByteString=Windows.Win32.System.Com CreateIUriBuilder=Windows.Win32.System.Com BINDINFO=Windows.Win32.System.Com BINDINFOF=Windows.Win32.System.Com +IAuthenticate=Windows.Win32.System.Com +IAuthenticateEx=Windows.Win32.System.Com +AUTHENTICATEINFO=Windows.Win32.System.Com # endregion urlmon.h # region userenv.h CreateAppContainerProfile=Windows.Win32.Security.Isolation @@ -594,6 +672,7 @@ ConvertThreadToFiberEx=Windows.Win32.System.Threading CopyContext=Windows.Win32.System.Diagnostics.Debug COPYFILE2_COPY_PHASE=Windows.Win32.Storage.FileSystem COPYFILE2_EXTENDED_PARAMETERS=Windows.Win32.Storage.FileSystem +COPYFILE2_EXTENDED_PARAMETERS_V2=Windows.Win32.Storage.FileSystem COPYFILE2_MESSAGE_ACTION=Windows.Win32.Storage.FileSystem COPYFILE2_MESSAGE_TYPE=Windows.Win32.Storage.FileSystem COPYFILE2_MESSAGE=Windows.Win32.Storage.FileSystem @@ -622,6 +701,7 @@ CreateHardLinkTransactedA=Windows.Win32.Storage.FileSystem CreateHardLinkTransactedW=Windows.Win32.Storage.FileSystem CreateHardLinkW=Windows.Win32.Storage.FileSystem CreateJobObjectA=Windows.Win32.System.JobObjects +CreateJobSet=Windows.Win32.System.JobObjects CreateMailslotA=Windows.Win32.System.Mailslots CreateMailslotW=Windows.Win32.System.Mailslots CreateNamedPipeA=Windows.Win32.System.Pipes @@ -776,6 +856,7 @@ GetProcessDEPPolicy=Windows.Win32.System.Threading GetProcessIoCounters=Windows.Win32.System.Threading GetProcessWorkingSetSize=Windows.Win32.System.Threading GetShortPathNameA=Windows.Win32.Storage.FileSystem +GetStartupInfoA=Windows.Win32.System.Threading GetSystemDEPPolicy=Windows.Win32.System.SystemInformation GetSystemPowerStatus=Windows.Win32.System.Power GetTapeParameters=Windows.Win32.Storage.FileSystem @@ -808,6 +889,7 @@ GlobalSize=Windows.Win32.System.Memory GlobalUnlock=Windows.Win32.System.Memory InitAtomTable=Windows.Win32.System.DataExchange InitializeContext=Windows.Win32.System.Diagnostics.Debug +InitializeContext2=Windows.Win32.System.Diagnostics.Debug IsBadCodePtr=Windows.Win32.System.Memory IsBadReadPtr=Windows.Win32.System.Memory IsBadStringPtrA=Windows.Win32.System.Memory @@ -843,6 +925,7 @@ LookupPrivilegeNameW=Windows.Win32.Security LookupPrivilegeValueA=Windows.Win32.Security LookupPrivilegeValueW=Windows.Win32.Security LPPROGRESS_ROUTINE=Windows.Win32.Storage.FileSystem +LPFIBER_START_ROUTINE=Windows.Win32.System.Threading lstrcatA=Windows.Win32.Globalization lstrcatW=Windows.Win32.Globalization lstrcmpA=Windows.Win32.Globalization @@ -959,6 +1042,7 @@ SetTapeParameters=Windows.Win32.Storage.FileSystem SetTapePosition=Windows.Win32.Storage.FileSystem SetThreadAffinityMask=Windows.Win32.System.Threading SetThreadExecutionState=Windows.Win32.System.Power +SetTimerQueueTimer=Windows.Win32.System.Threading SetUmsThreadInformation=Windows.Win32.System.Threading SetupComm=Windows.Win32.Devices.Communication SetVolumeLabelA=Windows.Win32.Storage.FileSystem @@ -992,279 +1076,284 @@ WriteTapemark=Windows.Win32.Storage.FileSystem WTSGetActiveConsoleSessionId=Windows.Win32.System.RemoteDesktop ZombifyActCtx=Windows.Win32.System.ApplicationInstallationAndServicing # endregion winbase.h +# region wincodec.h +# Breaks a cyle between Graphics.D2D and Graphics.Imaging +IWICImageEncoder=Windows.Win32.Graphics.Imaging.D2D +IWICImagingFactory2=Windows.Win32.Graphics.Imaging.D2D +# endregion wincodec.h # region winddi.h -BLENDOBJ=Windows.Win32.UI.DisplayDevices -BRUSHOBJ_hGetColorTransform=Windows.Win32.UI.DisplayDevices -BRUSHOBJ_pvAllocRbrush=Windows.Win32.UI.DisplayDevices -BRUSHOBJ_pvGetRbrush=Windows.Win32.UI.DisplayDevices -BRUSHOBJ_ulGetBrushColor=Windows.Win32.UI.DisplayDevices -BRUSHOBJ=Windows.Win32.UI.DisplayDevices -CIECHROMA=Windows.Win32.UI.DisplayDevices -CLIPLINE=Windows.Win32.UI.DisplayDevices -CLIPOBJ_bEnum=Windows.Win32.UI.DisplayDevices -CLIPOBJ_cEnumStart=Windows.Win32.UI.DisplayDevices -CLIPOBJ_ppoGetPath=Windows.Win32.UI.DisplayDevices -CLIPOBJ=Windows.Win32.UI.DisplayDevices -COLORINFO=Windows.Win32.UI.DisplayDevices -DEVHTADJDATA=Windows.Win32.UI.DisplayDevices -DEVHTINFO=Windows.Win32.UI.DisplayDevices -DEVINFO=Windows.Win32.UI.DisplayDevices -DRIVEROBJ=Windows.Win32.UI.DisplayDevices -DrvAlphaBlend=Windows.Win32.UI.DisplayDevices -DrvAssertMode=Windows.Win32.UI.DisplayDevices -DrvBitBlt=Windows.Win32.UI.DisplayDevices -DrvCompletePDEV=Windows.Win32.UI.DisplayDevices -DrvCopyBits=Windows.Win32.UI.DisplayDevices -DrvCreateDeviceBitmap=Windows.Win32.UI.DisplayDevices -DrvDeleteDeviceBitmap=Windows.Win32.UI.DisplayDevices -DrvDeriveSurface=Windows.Win32.UI.DisplayDevices -DrvDescribePixelFormat=Windows.Win32.UI.DisplayDevices -DrvDestroyFont=Windows.Win32.UI.DisplayDevices -DrvDisableDirectDraw=Windows.Win32.UI.DisplayDevices -DrvDisableDriver=Windows.Win32.UI.DisplayDevices -DrvDisablePDEV=Windows.Win32.UI.DisplayDevices -DrvDisableSurface=Windows.Win32.UI.DisplayDevices -DrvDitherColor=Windows.Win32.UI.DisplayDevices -DrvDrawEscape=Windows.Win32.UI.DisplayDevices -DRVENABLEDATA=Windows.Win32.UI.DisplayDevices -DrvEnableDirectDraw=Windows.Win32.UI.DisplayDevices -DrvEnableDriver=Windows.Win32.UI.DisplayDevices -DrvEnablePDEV=Windows.Win32.UI.DisplayDevices -DrvEnableSurface=Windows.Win32.UI.DisplayDevices -DrvEndDoc=Windows.Win32.UI.DisplayDevices -DrvEscape=Windows.Win32.UI.DisplayDevices -DrvFillPath=Windows.Win32.UI.DisplayDevices -DRVFN=Windows.Win32.UI.DisplayDevices -DrvFontManagement=Windows.Win32.UI.DisplayDevices -DrvFree=Windows.Win32.UI.DisplayDevices -DrvGetDirectDrawInfo=Windows.Win32.UI.DisplayDevices -DrvGetGlyphMode=Windows.Win32.UI.DisplayDevices -DrvGetModes=Windows.Win32.UI.DisplayDevices -DrvGetTrueTypeFile=Windows.Win32.UI.DisplayDevices -DrvGradientFill=Windows.Win32.UI.DisplayDevices -DrvIcmCheckBitmapBits=Windows.Win32.UI.DisplayDevices -DrvIcmCreateColorTransform=Windows.Win32.UI.DisplayDevices -DrvIcmDeleteColorTransform=Windows.Win32.UI.DisplayDevices -DrvIcmSetDeviceGammaRamp=Windows.Win32.UI.DisplayDevices -DrvLineTo=Windows.Win32.UI.DisplayDevices -DrvLoadFontFile=Windows.Win32.UI.DisplayDevices -DrvMovePointer=Windows.Win32.UI.DisplayDevices -DrvNextBand=Windows.Win32.UI.DisplayDevices -DrvNotify=Windows.Win32.UI.DisplayDevices -DrvPaint=Windows.Win32.UI.DisplayDevices -DrvPlgBlt=Windows.Win32.UI.DisplayDevices -DrvQueryAdvanceWidths=Windows.Win32.UI.DisplayDevices -DrvQueryDeviceSupport=Windows.Win32.UI.DisplayDevices -DrvQueryDriverInfo=Windows.Win32.UI.DisplayDevices -DrvQueryFont=Windows.Win32.UI.DisplayDevices -DrvQueryFontCaps=Windows.Win32.UI.DisplayDevices -DrvQueryFontData=Windows.Win32.UI.DisplayDevices -DrvQueryFontFile=Windows.Win32.UI.DisplayDevices -DrvQueryFontTree=Windows.Win32.UI.DisplayDevices -DrvQueryPerBandInfo=Windows.Win32.UI.DisplayDevices -DrvQueryTrueTypeOutline=Windows.Win32.UI.DisplayDevices -DrvQueryTrueTypeTable=Windows.Win32.UI.DisplayDevices -DrvRealizeBrush=Windows.Win32.UI.DisplayDevices -DrvResetDevice=Windows.Win32.UI.DisplayDevices -DrvResetPDEV=Windows.Win32.UI.DisplayDevices -DrvSaveScreenBits=Windows.Win32.UI.DisplayDevices -DrvSendPage=Windows.Win32.UI.DisplayDevices -DrvSetPalette=Windows.Win32.UI.DisplayDevices -DrvSetPixelFormat=Windows.Win32.UI.DisplayDevices -DrvSetPointerShape=Windows.Win32.UI.DisplayDevices -DrvStartBanding=Windows.Win32.UI.DisplayDevices -DrvStartDoc=Windows.Win32.UI.DisplayDevices -DrvStartPage=Windows.Win32.UI.DisplayDevices -DrvStretchBlt=Windows.Win32.UI.DisplayDevices -DrvStretchBltROP=Windows.Win32.UI.DisplayDevices -DrvStrokeAndFillPath=Windows.Win32.UI.DisplayDevices -DrvStrokePath=Windows.Win32.UI.DisplayDevices -DrvSwapBuffers=Windows.Win32.UI.DisplayDevices -DrvSynchronize=Windows.Win32.UI.DisplayDevices -DrvSynchronizeSurface=Windows.Win32.UI.DisplayDevices -DrvTextOut=Windows.Win32.UI.DisplayDevices -DrvTransparentBlt=Windows.Win32.UI.DisplayDevices -DrvUnloadFontFile=Windows.Win32.UI.DisplayDevices -ENG_TIME_FIELDS=Windows.Win32.UI.DisplayDevices -EngAcquireSemaphore=Windows.Win32.UI.DisplayDevices -EngAlphaBlend=Windows.Win32.UI.DisplayDevices -EngAssociateSurface=Windows.Win32.UI.DisplayDevices -EngBitBlt=Windows.Win32.UI.DisplayDevices -EngBugCheckEx=Windows.Win32.UI.DisplayDevices -EngCheckAbort=Windows.Win32.UI.DisplayDevices -EngClearEvent=Windows.Win32.UI.DisplayDevices -EngComputeGlyphSet=Windows.Win32.UI.DisplayDevices -EngControlSprites=Windows.Win32.UI.DisplayDevices -EngCopyBits=Windows.Win32.UI.DisplayDevices -EngCreateBitmap=Windows.Win32.UI.DisplayDevices -EngCreateClip=Windows.Win32.UI.DisplayDevices -EngCreateDeviceBitmap=Windows.Win32.UI.DisplayDevices -EngCreateDeviceSurface=Windows.Win32.UI.DisplayDevices -EngCreateDriverObj=Windows.Win32.UI.DisplayDevices -EngCreateEvent=Windows.Win32.UI.DisplayDevices -EngCreatePalette=Windows.Win32.UI.DisplayDevices -EngCreatePath=Windows.Win32.UI.DisplayDevices -EngCreateSemaphore=Windows.Win32.UI.DisplayDevices -EngCreateWnd=Windows.Win32.UI.DisplayDevices -EngDebugBreak=Windows.Win32.UI.DisplayDevices -EngDebugPrint=Windows.Win32.UI.DisplayDevices -EngDeleteClip=Windows.Win32.UI.DisplayDevices -EngDeleteDriverObj=Windows.Win32.UI.DisplayDevices -EngDeleteEvent=Windows.Win32.UI.DisplayDevices -EngDeleteFile=Windows.Win32.UI.DisplayDevices -EngDeletePalette=Windows.Win32.UI.DisplayDevices -EngDeletePath=Windows.Win32.UI.DisplayDevices -EngDeleteSafeSemaphore=Windows.Win32.UI.DisplayDevices -EngDeleteSemaphore=Windows.Win32.UI.DisplayDevices -EngDeleteSurface=Windows.Win32.UI.DisplayDevices -EngDeleteWnd=Windows.Win32.UI.DisplayDevices -EngDeviceIoControl=Windows.Win32.UI.DisplayDevices -EngDitherColor=Windows.Win32.UI.DisplayDevices -EngEraseSurface=Windows.Win32.UI.DisplayDevices -EngFillPath=Windows.Win32.UI.DisplayDevices -EngFindResource=Windows.Win32.UI.DisplayDevices -EngFntCacheAlloc=Windows.Win32.UI.DisplayDevices -EngFntCacheFault=Windows.Win32.UI.DisplayDevices -EngFntCacheLookUp=Windows.Win32.UI.DisplayDevices -EngFreeModule=Windows.Win32.UI.DisplayDevices -EngGetCurrentCodePage=Windows.Win32.UI.DisplayDevices -EngGetCurrentProcessId=Windows.Win32.UI.DisplayDevices -EngGetCurrentThreadId=Windows.Win32.UI.DisplayDevices -EngGetDriverName=Windows.Win32.UI.DisplayDevices -EngGetFileChangeTime=Windows.Win32.UI.DisplayDevices -EngGetFilePath=Windows.Win32.UI.DisplayDevices -EngGetPrinterDataFileName=Windows.Win32.UI.DisplayDevices -EngGetProcessHandle=Windows.Win32.UI.DisplayDevices -EngGetType1FontList=Windows.Win32.UI.DisplayDevices -EngGradientFill=Windows.Win32.UI.DisplayDevices -EngHangNotification=Windows.Win32.UI.DisplayDevices -EngInitializeSafeSemaphore=Windows.Win32.UI.DisplayDevices -EngIsSemaphoreOwned=Windows.Win32.UI.DisplayDevices -EngIsSemaphoreOwnedByCurrentThread=Windows.Win32.UI.DisplayDevices -EngLineTo=Windows.Win32.UI.DisplayDevices -EngLoadModule=Windows.Win32.UI.DisplayDevices -EngLoadModuleForWrite=Windows.Win32.UI.DisplayDevices -EngLockDirectDrawSurface=Windows.Win32.UI.DisplayDevices -EngLockDriverObj=Windows.Win32.UI.DisplayDevices -EngLockSurface=Windows.Win32.UI.DisplayDevices -EngLpkInstalled=Windows.Win32.UI.DisplayDevices -EngMapEvent=Windows.Win32.UI.DisplayDevices -EngMapFile=Windows.Win32.UI.DisplayDevices -EngMapFontFile=Windows.Win32.UI.DisplayDevices -EngMapFontFileFD=Windows.Win32.UI.DisplayDevices -EngMarkBandingSurface=Windows.Win32.UI.DisplayDevices -EngModifySurface=Windows.Win32.UI.DisplayDevices -EngMovePointer=Windows.Win32.UI.DisplayDevices -EngMultiByteToUnicodeN=Windows.Win32.UI.DisplayDevices -EngMultiByteToWideChar=Windows.Win32.UI.DisplayDevices -EngPaint=Windows.Win32.UI.DisplayDevices -EngPlgBlt=Windows.Win32.UI.DisplayDevices -EngProbeForRead=Windows.Win32.UI.DisplayDevices -EngProbeForReadAndWrite=Windows.Win32.UI.DisplayDevices -EngQueryDeviceAttribute=Windows.Win32.UI.DisplayDevices -EngQueryFileTimeStamp=Windows.Win32.UI.DisplayDevices -EngQueryLocalTime=Windows.Win32.UI.DisplayDevices -EngQueryPalette=Windows.Win32.UI.DisplayDevices -EngQueryPerformanceCounter=Windows.Win32.UI.DisplayDevices -EngQueryPerformanceFrequency=Windows.Win32.UI.DisplayDevices -EngQuerySystemAttribute=Windows.Win32.UI.DisplayDevices -EngReadStateEvent=Windows.Win32.UI.DisplayDevices -EngReleaseSemaphore=Windows.Win32.UI.DisplayDevices -ENGSAFESEMAPHORE=Windows.Win32.UI.DisplayDevices -EngSecureMem=Windows.Win32.UI.DisplayDevices -EngSetEvent=Windows.Win32.UI.DisplayDevices -EngSetPointerShape=Windows.Win32.UI.DisplayDevices -EngSetPointerTag=Windows.Win32.UI.DisplayDevices -EngSort=Windows.Win32.UI.DisplayDevices -EngStretchBlt=Windows.Win32.UI.DisplayDevices -EngStretchBltROP=Windows.Win32.UI.DisplayDevices -EngStrokeAndFillPath=Windows.Win32.UI.DisplayDevices -EngStrokePath=Windows.Win32.UI.DisplayDevices -EngTextOut=Windows.Win32.UI.DisplayDevices -EngTransparentBlt=Windows.Win32.UI.DisplayDevices -EngUnicodeToMultiByteN=Windows.Win32.UI.DisplayDevices -EngUnlockDirectDrawSurface=Windows.Win32.UI.DisplayDevices -EngUnlockDriverObj=Windows.Win32.UI.DisplayDevices -EngUnlockSurface=Windows.Win32.UI.DisplayDevices -EngUnmapEvent=Windows.Win32.UI.DisplayDevices -EngUnmapFile=Windows.Win32.UI.DisplayDevices -EngUnmapFontFile=Windows.Win32.UI.DisplayDevices -EngUnmapFontFileFD=Windows.Win32.UI.DisplayDevices -EngUnsecureMem=Windows.Win32.UI.DisplayDevices -EngWaitForSingleObject=Windows.Win32.UI.DisplayDevices -EngWideCharToMultiByte=Windows.Win32.UI.DisplayDevices -ENUMRECTS=Windows.Win32.UI.DisplayDevices -FD_DEVICEMETRICS=Windows.Win32.UI.DisplayDevices -FD_GLYPHATTR=Windows.Win32.UI.DisplayDevices -FD_GLYPHSET=Windows.Win32.UI.DisplayDevices -FD_KERNINGPAIR=Windows.Win32.UI.DisplayDevices -FD_XFORM=Windows.Win32.UI.DisplayDevices -FONTDIFF=Windows.Win32.UI.DisplayDevices -FONTINFO=Windows.Win32.UI.DisplayDevices -FONTOBJ_cGetAllGlyphHandles=Windows.Win32.UI.DisplayDevices -FONTOBJ_cGetGlyphs=Windows.Win32.UI.DisplayDevices -FONTOBJ_pfdg=Windows.Win32.UI.DisplayDevices -FONTOBJ_pifi=Windows.Win32.UI.DisplayDevices -FONTOBJ_pjOpenTypeTablePointer=Windows.Win32.UI.DisplayDevices -FONTOBJ_pQueryGlyphAttrs=Windows.Win32.UI.DisplayDevices -FONTOBJ_pvTrueTypeFontFile=Windows.Win32.UI.DisplayDevices -FONTOBJ_pwszFontFilePaths=Windows.Win32.UI.DisplayDevices -FONTOBJ_pxoGetXform=Windows.Win32.UI.DisplayDevices -FONTOBJ_vGetInfo=Windows.Win32.UI.DisplayDevices -FONTOBJ=Windows.Win32.UI.DisplayDevices -FONTSIM=Windows.Win32.UI.DisplayDevices -GAMMARAMP=Windows.Win32.UI.DisplayDevices -GDIINFO=Windows.Win32.UI.DisplayDevices -GLYPHBITS=Windows.Win32.UI.DisplayDevices -GLYPHDATA=Windows.Win32.UI.DisplayDevices -GLYPHDEF=Windows.Win32.UI.DisplayDevices -GLYPHPOS=Windows.Win32.UI.DisplayDevices -HT_ComputeRGBGammaTable=Windows.Win32.UI.DisplayDevices -HT_Get8BPPFormatPalette=Windows.Win32.UI.DisplayDevices -HT_Get8BPPMaskPalette=Windows.Win32.UI.DisplayDevices -HTUI_DeviceColorAdjustment=Windows.Win32.UI.DisplayDevices -IFIEXTRA=Windows.Win32.UI.DisplayDevices -IFIMETRICS=Windows.Win32.UI.DisplayDevices -LINEATTRS=Windows.Win32.UI.DisplayDevices -PALOBJ_cGetColors=Windows.Win32.UI.DisplayDevices -PALOBJ=Windows.Win32.UI.DisplayDevices -PATHDATA=Windows.Win32.UI.DisplayDevices -PATHOBJ_bCloseFigure=Windows.Win32.UI.DisplayDevices -PATHOBJ_bEnum=Windows.Win32.UI.DisplayDevices -PATHOBJ_bEnumClipLines=Windows.Win32.UI.DisplayDevices -PATHOBJ_bMoveTo=Windows.Win32.UI.DisplayDevices -PATHOBJ_bPolyBezierTo=Windows.Win32.UI.DisplayDevices -PATHOBJ_bPolyLineTo=Windows.Win32.UI.DisplayDevices -PATHOBJ_vEnumStart=Windows.Win32.UI.DisplayDevices -PATHOBJ_vEnumStartClipLines=Windows.Win32.UI.DisplayDevices -PATHOBJ_vGetBounds=Windows.Win32.UI.DisplayDevices -PATHOBJ=Windows.Win32.UI.DisplayDevices -PERBANDINFO=Windows.Win32.UI.DisplayDevices -PFN_DrvQueryGlyphAttrs=Windows.Win32.UI.DisplayDevices -RUN=Windows.Win32.UI.DisplayDevices -STROBJ_bEnum=Windows.Win32.UI.DisplayDevices -STROBJ_bEnumPositionsOnly=Windows.Win32.UI.DisplayDevices -STROBJ_bGetAdvanceWidths=Windows.Win32.UI.DisplayDevices -STROBJ_dwGetCodePage=Windows.Win32.UI.DisplayDevices -STROBJ_fxBreakExtra=Windows.Win32.UI.DisplayDevices -STROBJ_fxCharacterExtra=Windows.Win32.UI.DisplayDevices -STROBJ_vEnumStart=Windows.Win32.UI.DisplayDevices -STROBJ=Windows.Win32.UI.DisplayDevices -SURFOBJ=Windows.Win32.UI.DisplayDevices -TYPE1_FONT=Windows.Win32.UI.DisplayDevices -WCRUN=Windows.Win32.UI.DisplayDevices -WNDOBJ_bEnum=Windows.Win32.UI.DisplayDevices -WNDOBJ_cEnumStart=Windows.Win32.UI.DisplayDevices -WNDOBJ_vSetConsumer=Windows.Win32.UI.DisplayDevices -WNDOBJ=Windows.Win32.UI.DisplayDevices -XFORML=Windows.Win32.UI.DisplayDevices -XFORMOBJ_bApplyXform=Windows.Win32.UI.DisplayDevices -XFORMOBJ_iGetXform=Windows.Win32.UI.DisplayDevices -XLATEOBJ_cGetPalette=Windows.Win32.UI.DisplayDevices -XLATEOBJ_hGetColorTransform=Windows.Win32.UI.DisplayDevices -XLATEOBJ_iXlate=Windows.Win32.UI.DisplayDevices -XLATEOBJ_piVector=Windows.Win32.UI.DisplayDevices -XLATEOBJ=Windows.Win32.UI.DisplayDevices +BLENDOBJ=Windows.Win32.Devices.Display +BRUSHOBJ_hGetColorTransform=Windows.Win32.Devices.Display +BRUSHOBJ_pvAllocRbrush=Windows.Win32.Devices.Display +BRUSHOBJ_pvGetRbrush=Windows.Win32.Devices.Display +BRUSHOBJ_ulGetBrushColor=Windows.Win32.Devices.Display +BRUSHOBJ=Windows.Win32.Devices.Display +CIECHROMA=Windows.Win32.Devices.Display +CLIPLINE=Windows.Win32.Devices.Display +CLIPOBJ_bEnum=Windows.Win32.Devices.Display +CLIPOBJ_cEnumStart=Windows.Win32.Devices.Display +CLIPOBJ_ppoGetPath=Windows.Win32.Devices.Display +CLIPOBJ=Windows.Win32.Devices.Display +COLORINFO=Windows.Win32.Devices.Display +DEVHTADJDATA=Windows.Win32.Devices.Display +DEVHTINFO=Windows.Win32.Devices.Display +DEVINFO=Windows.Win32.Devices.Display +DRIVEROBJ=Windows.Win32.Devices.Display +DrvAlphaBlend=Windows.Win32.Devices.Display +DrvAssertMode=Windows.Win32.Devices.Display +DrvBitBlt=Windows.Win32.Devices.Display +DrvCompletePDEV=Windows.Win32.Devices.Display +DrvCopyBits=Windows.Win32.Devices.Display +DrvCreateDeviceBitmap=Windows.Win32.Devices.Display +DrvDeleteDeviceBitmap=Windows.Win32.Devices.Display +DrvDeriveSurface=Windows.Win32.Devices.Display +DrvDescribePixelFormat=Windows.Win32.Devices.Display +DrvDestroyFont=Windows.Win32.Devices.Display +DrvDisableDirectDraw=Windows.Win32.Devices.Display +DrvDisableDriver=Windows.Win32.Devices.Display +DrvDisablePDEV=Windows.Win32.Devices.Display +DrvDisableSurface=Windows.Win32.Devices.Display +DrvDitherColor=Windows.Win32.Devices.Display +DrvDrawEscape=Windows.Win32.Devices.Display +DRVENABLEDATA=Windows.Win32.Devices.Display +DrvEnableDirectDraw=Windows.Win32.Devices.Display +DrvEnableDriver=Windows.Win32.Devices.Display +DrvEnablePDEV=Windows.Win32.Devices.Display +DrvEnableSurface=Windows.Win32.Devices.Display +DrvEndDoc=Windows.Win32.Devices.Display +DrvEscape=Windows.Win32.Devices.Display +DrvFillPath=Windows.Win32.Devices.Display +DRVFN=Windows.Win32.Devices.Display +DrvFontManagement=Windows.Win32.Devices.Display +DrvFree=Windows.Win32.Devices.Display +DrvGetDirectDrawInfo=Windows.Win32.Devices.Display +DrvGetGlyphMode=Windows.Win32.Devices.Display +DrvGetModes=Windows.Win32.Devices.Display +DrvGetTrueTypeFile=Windows.Win32.Devices.Display +DrvGradientFill=Windows.Win32.Devices.Display +DrvIcmCheckBitmapBits=Windows.Win32.Devices.Display +DrvIcmCreateColorTransform=Windows.Win32.Devices.Display +DrvIcmDeleteColorTransform=Windows.Win32.Devices.Display +DrvIcmSetDeviceGammaRamp=Windows.Win32.Devices.Display +DrvLineTo=Windows.Win32.Devices.Display +DrvLoadFontFile=Windows.Win32.Devices.Display +DrvMovePointer=Windows.Win32.Devices.Display +DrvNextBand=Windows.Win32.Devices.Display +DrvNotify=Windows.Win32.Devices.Display +DrvPaint=Windows.Win32.Devices.Display +DrvPlgBlt=Windows.Win32.Devices.Display +DrvQueryAdvanceWidths=Windows.Win32.Devices.Display +DrvQueryDeviceSupport=Windows.Win32.Devices.Display +DrvQueryDriverInfo=Windows.Win32.Devices.Display +DrvQueryFont=Windows.Win32.Devices.Display +DrvQueryFontCaps=Windows.Win32.Devices.Display +DrvQueryFontData=Windows.Win32.Devices.Display +DrvQueryFontFile=Windows.Win32.Devices.Display +DrvQueryFontTree=Windows.Win32.Devices.Display +DrvQueryPerBandInfo=Windows.Win32.Devices.Display +DrvQueryTrueTypeOutline=Windows.Win32.Devices.Display +DrvQueryTrueTypeTable=Windows.Win32.Devices.Display +DrvRealizeBrush=Windows.Win32.Devices.Display +DrvResetDevice=Windows.Win32.Devices.Display +DrvResetPDEV=Windows.Win32.Devices.Display +DrvSaveScreenBits=Windows.Win32.Devices.Display +DrvSendPage=Windows.Win32.Devices.Display +DrvSetPalette=Windows.Win32.Devices.Display +DrvSetPixelFormat=Windows.Win32.Devices.Display +DrvSetPointerShape=Windows.Win32.Devices.Display +DrvStartBanding=Windows.Win32.Devices.Display +DrvStartDoc=Windows.Win32.Devices.Display +DrvStartPage=Windows.Win32.Devices.Display +DrvStretchBlt=Windows.Win32.Devices.Display +DrvStretchBltROP=Windows.Win32.Devices.Display +DrvStrokeAndFillPath=Windows.Win32.Devices.Display +DrvStrokePath=Windows.Win32.Devices.Display +DrvSwapBuffers=Windows.Win32.Devices.Display +DrvSynchronize=Windows.Win32.Devices.Display +DrvSynchronizeSurface=Windows.Win32.Devices.Display +DrvTextOut=Windows.Win32.Devices.Display +DrvTransparentBlt=Windows.Win32.Devices.Display +DrvUnloadFontFile=Windows.Win32.Devices.Display +ENG_TIME_FIELDS=Windows.Win32.Devices.Display +EngAcquireSemaphore=Windows.Win32.Devices.Display +EngAlphaBlend=Windows.Win32.Devices.Display +EngAssociateSurface=Windows.Win32.Devices.Display +EngBitBlt=Windows.Win32.Devices.Display +EngBugCheckEx=Windows.Win32.Devices.Display +EngCheckAbort=Windows.Win32.Devices.Display +EngClearEvent=Windows.Win32.Devices.Display +EngComputeGlyphSet=Windows.Win32.Devices.Display +EngControlSprites=Windows.Win32.Devices.Display +EngCopyBits=Windows.Win32.Devices.Display +EngCreateBitmap=Windows.Win32.Devices.Display +EngCreateClip=Windows.Win32.Devices.Display +EngCreateDeviceBitmap=Windows.Win32.Devices.Display +EngCreateDeviceSurface=Windows.Win32.Devices.Display +EngCreateDriverObj=Windows.Win32.Devices.Display +EngCreateEvent=Windows.Win32.Devices.Display +EngCreatePalette=Windows.Win32.Devices.Display +EngCreatePath=Windows.Win32.Devices.Display +EngCreateSemaphore=Windows.Win32.Devices.Display +EngCreateWnd=Windows.Win32.Devices.Display +EngDebugBreak=Windows.Win32.Devices.Display +EngDebugPrint=Windows.Win32.Devices.Display +EngDeleteClip=Windows.Win32.Devices.Display +EngDeleteDriverObj=Windows.Win32.Devices.Display +EngDeleteEvent=Windows.Win32.Devices.Display +EngDeleteFile=Windows.Win32.Devices.Display +EngDeletePalette=Windows.Win32.Devices.Display +EngDeletePath=Windows.Win32.Devices.Display +EngDeleteSafeSemaphore=Windows.Win32.Devices.Display +EngDeleteSemaphore=Windows.Win32.Devices.Display +EngDeleteSurface=Windows.Win32.Devices.Display +EngDeleteWnd=Windows.Win32.Devices.Display +EngDeviceIoControl=Windows.Win32.Devices.Display +EngDitherColor=Windows.Win32.Devices.Display +EngEraseSurface=Windows.Win32.Devices.Display +EngFillPath=Windows.Win32.Devices.Display +EngFindResource=Windows.Win32.Devices.Display +EngFntCacheAlloc=Windows.Win32.Devices.Display +EngFntCacheFault=Windows.Win32.Devices.Display +EngFntCacheLookUp=Windows.Win32.Devices.Display +EngFreeModule=Windows.Win32.Devices.Display +EngGetCurrentCodePage=Windows.Win32.Devices.Display +EngGetCurrentProcessId=Windows.Win32.Devices.Display +EngGetCurrentThreadId=Windows.Win32.Devices.Display +EngGetDriverName=Windows.Win32.Devices.Display +EngGetFileChangeTime=Windows.Win32.Devices.Display +EngGetFilePath=Windows.Win32.Devices.Display +EngGetPrinterDataFileName=Windows.Win32.Devices.Display +EngGetProcessHandle=Windows.Win32.Devices.Display +EngGetType1FontList=Windows.Win32.Devices.Display +EngGradientFill=Windows.Win32.Devices.Display +EngHangNotification=Windows.Win32.Devices.Display +EngInitializeSafeSemaphore=Windows.Win32.Devices.Display +EngIsSemaphoreOwned=Windows.Win32.Devices.Display +EngIsSemaphoreOwnedByCurrentThread=Windows.Win32.Devices.Display +EngLineTo=Windows.Win32.Devices.Display +EngLoadModule=Windows.Win32.Devices.Display +EngLoadModuleForWrite=Windows.Win32.Devices.Display +EngLockDirectDrawSurface=Windows.Win32.Devices.Display +EngLockDriverObj=Windows.Win32.Devices.Display +EngLockSurface=Windows.Win32.Devices.Display +EngLpkInstalled=Windows.Win32.Devices.Display +EngMapEvent=Windows.Win32.Devices.Display +EngMapFile=Windows.Win32.Devices.Display +EngMapFontFile=Windows.Win32.Devices.Display +EngMapFontFileFD=Windows.Win32.Devices.Display +EngMarkBandingSurface=Windows.Win32.Devices.Display +EngModifySurface=Windows.Win32.Devices.Display +EngMovePointer=Windows.Win32.Devices.Display +EngMultiByteToUnicodeN=Windows.Win32.Devices.Display +EngMultiByteToWideChar=Windows.Win32.Devices.Display +EngPaint=Windows.Win32.Devices.Display +EngPlgBlt=Windows.Win32.Devices.Display +EngProbeForRead=Windows.Win32.Devices.Display +EngProbeForReadAndWrite=Windows.Win32.Devices.Display +EngQueryDeviceAttribute=Windows.Win32.Devices.Display +EngQueryFileTimeStamp=Windows.Win32.Devices.Display +EngQueryLocalTime=Windows.Win32.Devices.Display +EngQueryPalette=Windows.Win32.Devices.Display +EngQueryPerformanceCounter=Windows.Win32.Devices.Display +EngQueryPerformanceFrequency=Windows.Win32.Devices.Display +EngQuerySystemAttribute=Windows.Win32.Devices.Display +EngReadStateEvent=Windows.Win32.Devices.Display +EngReleaseSemaphore=Windows.Win32.Devices.Display +ENGSAFESEMAPHORE=Windows.Win32.Devices.Display +EngSecureMem=Windows.Win32.Devices.Display +EngSetEvent=Windows.Win32.Devices.Display +EngSetPointerShape=Windows.Win32.Devices.Display +EngSetPointerTag=Windows.Win32.Devices.Display +EngSort=Windows.Win32.Devices.Display +EngStretchBlt=Windows.Win32.Devices.Display +EngStretchBltROP=Windows.Win32.Devices.Display +EngStrokeAndFillPath=Windows.Win32.Devices.Display +EngStrokePath=Windows.Win32.Devices.Display +EngTextOut=Windows.Win32.Devices.Display +EngTransparentBlt=Windows.Win32.Devices.Display +EngUnicodeToMultiByteN=Windows.Win32.Devices.Display +EngUnlockDirectDrawSurface=Windows.Win32.Devices.Display +EngUnlockDriverObj=Windows.Win32.Devices.Display +EngUnlockSurface=Windows.Win32.Devices.Display +EngUnmapEvent=Windows.Win32.Devices.Display +EngUnmapFile=Windows.Win32.Devices.Display +EngUnmapFontFile=Windows.Win32.Devices.Display +EngUnmapFontFileFD=Windows.Win32.Devices.Display +EngUnsecureMem=Windows.Win32.Devices.Display +EngWaitForSingleObject=Windows.Win32.Devices.Display +EngWideCharToMultiByte=Windows.Win32.Devices.Display +ENUMRECTS=Windows.Win32.Devices.Display +FD_DEVICEMETRICS=Windows.Win32.Devices.Display +FD_GLYPHATTR=Windows.Win32.Devices.Display +FD_GLYPHSET=Windows.Win32.Devices.Display +FD_KERNINGPAIR=Windows.Win32.Devices.Display +FD_XFORM=Windows.Win32.Devices.Display +FONTDIFF=Windows.Win32.Devices.Display +FONTINFO=Windows.Win32.Devices.Display +FONTOBJ_cGetAllGlyphHandles=Windows.Win32.Devices.Display +FONTOBJ_cGetGlyphs=Windows.Win32.Devices.Display +FONTOBJ_pfdg=Windows.Win32.Devices.Display +FONTOBJ_pifi=Windows.Win32.Devices.Display +FONTOBJ_pjOpenTypeTablePointer=Windows.Win32.Devices.Display +FONTOBJ_pQueryGlyphAttrs=Windows.Win32.Devices.Display +FONTOBJ_pvTrueTypeFontFile=Windows.Win32.Devices.Display +FONTOBJ_pwszFontFilePaths=Windows.Win32.Devices.Display +FONTOBJ_pxoGetXform=Windows.Win32.Devices.Display +FONTOBJ_vGetInfo=Windows.Win32.Devices.Display +FONTOBJ=Windows.Win32.Devices.Display +FONTSIM=Windows.Win32.Devices.Display +GAMMARAMP=Windows.Win32.Devices.Display +GDIINFO=Windows.Win32.Devices.Display +GLYPHBITS=Windows.Win32.Devices.Display +GLYPHDATA=Windows.Win32.Devices.Display +GLYPHDEF=Windows.Win32.Devices.Display +GLYPHPOS=Windows.Win32.Devices.Display +HT_ComputeRGBGammaTable=Windows.Win32.Devices.Display +HT_Get8BPPFormatPalette=Windows.Win32.Devices.Display +HT_Get8BPPMaskPalette=Windows.Win32.Devices.Display +HTUI_DeviceColorAdjustment=Windows.Win32.Devices.Display +IFIEXTRA=Windows.Win32.Devices.Display +IFIMETRICS=Windows.Win32.Devices.Display +LINEATTRS=Windows.Win32.Devices.Display +PALOBJ_cGetColors=Windows.Win32.Devices.Display +PALOBJ=Windows.Win32.Devices.Display +PATHDATA=Windows.Win32.Devices.Display +PATHOBJ_bCloseFigure=Windows.Win32.Devices.Display +PATHOBJ_bEnum=Windows.Win32.Devices.Display +PATHOBJ_bEnumClipLines=Windows.Win32.Devices.Display +PATHOBJ_bMoveTo=Windows.Win32.Devices.Display +PATHOBJ_bPolyBezierTo=Windows.Win32.Devices.Display +PATHOBJ_bPolyLineTo=Windows.Win32.Devices.Display +PATHOBJ_vEnumStart=Windows.Win32.Devices.Display +PATHOBJ_vEnumStartClipLines=Windows.Win32.Devices.Display +PATHOBJ_vGetBounds=Windows.Win32.Devices.Display +PATHOBJ=Windows.Win32.Devices.Display +PERBANDINFO=Windows.Win32.Devices.Display +PFN_DrvQueryGlyphAttrs=Windows.Win32.Devices.Display +RUN=Windows.Win32.Devices.Display +STROBJ_bEnum=Windows.Win32.Devices.Display +STROBJ_bEnumPositionsOnly=Windows.Win32.Devices.Display +STROBJ_bGetAdvanceWidths=Windows.Win32.Devices.Display +STROBJ_dwGetCodePage=Windows.Win32.Devices.Display +STROBJ_fxBreakExtra=Windows.Win32.Devices.Display +STROBJ_fxCharacterExtra=Windows.Win32.Devices.Display +STROBJ_vEnumStart=Windows.Win32.Devices.Display +STROBJ=Windows.Win32.Devices.Display +SURFOBJ=Windows.Win32.Devices.Display +TYPE1_FONT=Windows.Win32.Devices.Display +WCRUN=Windows.Win32.Devices.Display +WNDOBJ_bEnum=Windows.Win32.Devices.Display +WNDOBJ_cEnumStart=Windows.Win32.Devices.Display +WNDOBJ_vSetConsumer=Windows.Win32.Devices.Display +WNDOBJ=Windows.Win32.Devices.Display +XFORML=Windows.Win32.Devices.Display +XFORMOBJ_bApplyXform=Windows.Win32.Devices.Display +XFORMOBJ_iGetXform=Windows.Win32.Devices.Display +XLATEOBJ_cGetPalette=Windows.Win32.Devices.Display +XLATEOBJ_hGetColorTransform=Windows.Win32.Devices.Display +XLATEOBJ_iXlate=Windows.Win32.Devices.Display +XLATEOBJ_piVector=Windows.Win32.Devices.Display +XLATEOBJ=Windows.Win32.Devices.Display # endregion winddi.h # region windef.h DPI_AWARENESS=Windows.Win32.UI.HiDpi @@ -1276,6 +1365,10 @@ RECT=Windows.Win32.Foundation RECTL=Windows.Win32.Foundation SIZE=Windows.Win32.Foundation # endregion windef.h +# region windowsstoragecom.h +IDDEInitializer=Windows.Win32.System.WinRT.Shell +CreateProcessMethod=Windows.Win32.System.WinRT.Shell +# endregion windowsstoragecom.h # region winerror.h DXGI_ERROR_*=Windows.Win32.Graphics.Dxgi E_FAIL=Windows.Win32.Foundation @@ -1300,40 +1393,40 @@ DeleteColorSpace=Windows.Win32.UI.ColorSystem DescribePixelFormat=Windows.Win32.Graphics.OpenGL DeviceCapabilitiesA=Windows.Win32.Storage.Xps DeviceCapabilitiesW=Windows.Win32.Storage.Xps -#DEVMODEA=Windows.Win32.UI.DisplayDevices -#DEVMODEW=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_2DREGION=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_ADAPTER_NAME=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_DESKTOP_IMAGE_INFO=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_DEVICE_INFO_HEADER=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_SDR_WHITE_LEVEL=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_GET_MONITOR_SPECIALIZATION=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_SET_MONITOR_SPECIALIZATION=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_DEVICE_INFO_TYPE=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_MODE_INFO_TYPE=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_MODE_INFO=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_PATH_INFO=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_PATH_SOURCE_INFO=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_PATH_TARGET_INFO=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_PIXELFORMAT=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_RATIONAL=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_ROTATION=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_SCALING=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_SCANLINE_ORDERING=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_SET_TARGET_PERSISTENCE=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_SOURCE_DEVICE_NAME=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_SOURCE_MODE=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_TARGET_BASE_TYPE=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_TARGET_DEVICE_NAME=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_TARGET_MODE=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_TARGET_PREFERRED_MODE=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_TOPOLOGY_ID=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY=Windows.Win32.UI.DisplayDevices -DISPLAYCONFIG_VIDEO_SIGNAL_INFO=Windows.Win32.UI.DisplayDevices +#DEVMODEA=Windows.Win32.Devices.Display +#DEVMODEW=Windows.Win32.Devices.Display +DISPLAYCONFIG_2DREGION=Windows.Win32.Devices.Display +DISPLAYCONFIG_ADAPTER_NAME=Windows.Win32.Devices.Display +DISPLAYCONFIG_DESKTOP_IMAGE_INFO=Windows.Win32.Devices.Display +DISPLAYCONFIG_DEVICE_INFO_HEADER=Windows.Win32.Devices.Display +DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO=Windows.Win32.Devices.Display +DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE=Windows.Win32.Devices.Display +DISPLAYCONFIG_SDR_WHITE_LEVEL=Windows.Win32.Devices.Display +DISPLAYCONFIG_GET_MONITOR_SPECIALIZATION=Windows.Win32.Devices.Display +DISPLAYCONFIG_SET_MONITOR_SPECIALIZATION=Windows.Win32.Devices.Display +DISPLAYCONFIG_DEVICE_INFO_TYPE=Windows.Win32.Devices.Display +DISPLAYCONFIG_MODE_INFO_TYPE=Windows.Win32.Devices.Display +DISPLAYCONFIG_MODE_INFO=Windows.Win32.Devices.Display +DISPLAYCONFIG_PATH_INFO=Windows.Win32.Devices.Display +DISPLAYCONFIG_PATH_SOURCE_INFO=Windows.Win32.Devices.Display +DISPLAYCONFIG_PATH_TARGET_INFO=Windows.Win32.Devices.Display +DISPLAYCONFIG_PIXELFORMAT=Windows.Win32.Devices.Display +DISPLAYCONFIG_RATIONAL=Windows.Win32.Devices.Display +DISPLAYCONFIG_ROTATION=Windows.Win32.Devices.Display +DISPLAYCONFIG_SCALING=Windows.Win32.Devices.Display +DISPLAYCONFIG_SCANLINE_ORDERING=Windows.Win32.Devices.Display +DISPLAYCONFIG_SET_TARGET_PERSISTENCE=Windows.Win32.Devices.Display +DISPLAYCONFIG_SOURCE_DEVICE_NAME=Windows.Win32.Devices.Display +DISPLAYCONFIG_SOURCE_MODE=Windows.Win32.Devices.Display +DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION=Windows.Win32.Devices.Display +DISPLAYCONFIG_TARGET_BASE_TYPE=Windows.Win32.Devices.Display +DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS=Windows.Win32.Devices.Display +DISPLAYCONFIG_TARGET_DEVICE_NAME=Windows.Win32.Devices.Display +DISPLAYCONFIG_TARGET_MODE=Windows.Win32.Devices.Display +DISPLAYCONFIG_TARGET_PREFERRED_MODE=Windows.Win32.Devices.Display +DISPLAYCONFIG_TOPOLOGY_ID=Windows.Win32.Devices.Display +DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY=Windows.Win32.Devices.Display +DISPLAYCONFIG_VIDEO_SIGNAL_INFO=Windows.Win32.Devices.Display DOCINFOA=Windows.Win32.Storage.Xps DOCINFOW=Windows.Win32.Storage.Xps DRAWPATRECT=Windows.Win32.Storage.Xps @@ -1454,6 +1547,7 @@ CLAIM_SECURITY_ATTRIBUTES_INFORMATION=Windows.Win32.Security COMPARTMENT_ID=Windows.Win32.System.Kernel COMPATIBILITY_CONTEXT_ELEMENT=Windows.Win32.System.ApplicationInstallationAndServicing CONTEXT=Windows.Win32.System.Diagnostics.Debug +CUSTOM_SYSTEM_EVENT_TRIGGER_CONFIG=Windows.Win32.System.WindowsProgramming EXCEPTION_POINTERS=Windows.Win32.System.Diagnostics.Debug EXCEPTION_RECORD=Windows.Win32.System.Diagnostics.Debug EXCEPTION_RECORD64=Windows.Win32.System.Diagnostics.Debug @@ -1480,6 +1574,9 @@ IMAGE_NT_HEADERS64=Windows.Win32.System.Diagnostics.Debug IMAGE_OPTIONAL_HEADER32=Windows.Win32.System.Diagnostics.Debug IMAGE_OPTIONAL_HEADER64=Windows.Win32.System.Diagnostics.Debug IMAGE_SECTION_HEADER=Windows.Win32.System.Diagnostics.Debug +IMAGE_DELAYLOAD_DESCRIPTOR=Windows.Win32.System.WindowsProgramming +IMAGE_THUNK_DATA32=Windows.Win32.System.WindowsProgramming +IMAGE_THUNK_DATA64=Windows.Win32.System.WindowsProgramming LATENCY_TIME=Windows.Win32.System.Power LDT_ENTRY=Windows.Win32.System.Diagnostics.Debug LOGICAL_PROCESSOR_RELATIONSHIP=Windows.Win32.System.SystemInformation @@ -1508,6 +1605,30 @@ OSVERSIONINFOEXW=Windows.Win32.System.SystemInformation OSVERSIONINFOEXW=Windows.Win32.System.SystemInformation OSVERSIONINFOW=Windows.Win32.System.SystemInformation OSVERSIONINFOW=Windows.Win32.System.SystemInformation +PFLS_CALLBACK_FUNCTION=Windows.Win32.System.Threading +RTL_SRWLOCK=Windows.Win32.System.Threading +RTL_CRITICAL_SECTION=Windows.Win32.System.Threading +RTL_RUN_ONCE=Windows.Win32.System.Threading +RTL_CONDITION_VARIABLE=Windows.Win32.System.Threading +REASON_CONTEXT=Windows.Win32.System.Threading +RTL_BARRIER=Windows.Win32.System.Threading +PROCESS_DYNAMIC_EH_CONTINUATION_TARGET=Windows.Win32.System.Threading +PROCESS_DYNAMIC_ENFORCED_ADDRESS_RANGE=Windows.Win32.System.Threading +WAITORTIMERCALLBACK=Windows.Win32.System.Threading +TP_POOL_STACK_INFORMATION=Windows.Win32.System.Threading +TP_CALLBACK_INSTANCE=Windows.Win32.System.Threading +PTP_SIMPLE_CALLBACK=Windows.Win32.System.Threading +TP_CALLBACK_ENVIRON_V3=Windows.Win32.System.Threading +TP_WORK=Windows.Win32.System.Threading +PTP_WORK_CALLBACK=Windows.Win32.System.Threading +TP_TIMER=Windows.Win32.System.Threading +PTP_TIMER_CALLBACK=Windows.Win32.System.Threading +TP_WAIT=Windows.Win32.System.Threading +PTP_WAIT_CALLBACK=Windows.Win32.System.Threading +TP_IO=Windows.Win32.System.Threading +IO_COUNTERS=Windows.Win32.System.Threading +RTL_UMS_THREAD_INFO_CLASS=Windows.Win32.System.Threading +PRTL_UMS_SCHEDULER_ENTRY_POINT=Windows.Win32.System.Threading SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX=Windows.Win32.System.SystemInformation PAPFUNC=Windows.Win32.System.Threading PROCESSOR_CACHE_TYPE=Windows.Win32.System.SystemInformation @@ -1524,6 +1645,7 @@ SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION=Windows.Win32.System.SystemInformation SYSTEM_SUPPORTED_PROCESSOR_ARCHITECTURES_INFORMATION=Windows.Win32.System.SystemInformation CPU_SET_INFORMATION_TYPE=Windows.Win32.System.SystemInformation GROUP_AFFINITY=Windows.Win32.System.SystemInformation +PAPCFUNC=Windows.Win32.Foundation PERFORMANCE_DATA=Windows.Win32.System.Performance.HardwareCounterProfiling POWER_ACTION_POLICY=Windows.Win32.System.Power POWER_ACTION=Windows.Win32.System.Power @@ -1615,6 +1737,31 @@ WOW64_FLOATING_SAVE_AREA=Windows.Win32.System.Diagnostics.Debug WOW64_LDT_ENTRY=Windows.Win32.System.Diagnostics.Debug WOW64_MAXIMUM_SUPPORTED_EXTENSION=Windows.Win32.System.Diagnostics.Debug WOW64_SIZE_OF_80387_REGISTERS=Windows.Win32.System.Diagnostics.Debug +PROCESS_MITIGATION_POLICY=Windows.Win32.System.Threading +RTL_CRITICAL_SECTION_DEBUG=Windows.Win32.System.Threading +PTP_CLEANUP_GROUP_CANCEL_CALLBACK=Windows.Win32.System.Threading +TP_CALLBACK_PRIORITY=Windows.Win32.System.Threading +SYSTEM_CPU_SET_INFORMATION_PARKED=Windows.Win32.System.SystemInformation +SYSTEM_CPU_SET_INFORMATION_ALLOCATED=Windows.Win32.System.SystemInformation +SYSTEM_CPU_SET_INFORMATION_ALLOCATED_TO_TARGET_PROCESS=Windows.Win32.System.SystemInformation +SYSTEM_CPU_SET_INFORMATION_REALTIME=Windows.Win32.System.SystemInformation +IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY=Windows.Win32.System.Diagnostics.Debug +UNWIND_HISTORY_TABLE=Windows.Win32.System.Diagnostics.Debug +KNONVOLATILE_CONTEXT_POINTERS_ARM64=Windows.Win32.System.Diagnostics.Debug +PGET_RUNTIME_FUNCTION_CALLBACK=Windows.Win32.System.Diagnostics.Debug +KNONVOLATILE_CONTEXT_POINTERS=Windows.Win32.System.Diagnostics.Debug +ARM64_NT_NEON128=Windows.Win32.System.Diagnostics.Debug +M128A=Windows.Win32.System.Diagnostics.Debug +IMAGE_LOAD_CONFIG_CODE_INTEGRITY=Windows.Win32.System.Diagnostics.Debug +XSTATE_FEATURE=Windows.Win32.System.Diagnostics.Debug +EXCEPTION_RECORD32=Windows.Win32.System.Diagnostics.Debug +IMAGE_RUNTIME_FUNCTION_ENTRY=Windows.Win32.System.Diagnostics.Debug +UNWIND_HISTORY_TABLE_ENTRY=Windows.Win32.System.Diagnostics.Debug +HEAP_INFORMATION_CLASS=Windows.Win32.System.Memory +PROCESS_HEAP_ENTRY=Windows.Win32.System.Memory +CFG_CALL_TARGET_INFO=Windows.Win32.System.Memory +MEM_EXTENDED_PARAMETER=Windows.Win32.System.Memory +MEM_EXTENDED_PARAMETER_TYPE=Windows.Win32.System.Memory # endregion winnt.h (SLIST per-architecture design also defined in ntdef.h) # region winsock2.h QOS=Windows.Win32.NetworkManagement.QoS @@ -1632,7 +1779,10 @@ HSTRING_UserUnmarshal64=Windows.Win32.System.WinRT # region winternl.h NtQueryInformationProcess=Windows.Win32.System.Threading NtQueryInformationThread=Windows.Win32.System.Threading +NtSetInformationThread=Windows.Win32.System.Threading +NtCreateFile=Windows.Win32.Storage.FileSystem PEB_LDR_DATA=Windows.Win32.System.Threading +PPS_POST_PROCESS_INIT_ROUTINE=Windows.Win32.System.Threading PEB=Windows.Win32.System.Threading PROCESS_BASIC_INFORMATION=Windows.Win32.System.Threading PROCESSINFOCLASS=Windows.Win32.System.Threading @@ -1694,8 +1844,8 @@ DestroySyntheticPointerDevice=Windows.Win32.UI.Controls DIALOG_CONTROL_DPI_CHANGE_BEHAVIORS=Windows.Win32.UI.HiDpi DIALOG_DPI_CHANGE_BEHAVIORS=Windows.Win32.UI.HiDpi DisableProcessWindowsGhosting=Windows.Win32.UI.WindowsAndMessaging -DisplayConfigGetDeviceInfo=Windows.Win32.UI.DisplayDevices -DisplayConfigSetDeviceInfo=Windows.Win32.UI.DisplayDevices +DisplayConfigGetDeviceInfo=Windows.Win32.Devices.Display +DisplayConfigSetDeviceInfo=Windows.Win32.Devices.Display DlgDirListA=Windows.Win32.UI.Controls DlgDirListComboBoxA=Windows.Win32.UI.Controls DlgDirListComboBoxW=Windows.Win32.UI.Controls @@ -1817,7 +1967,7 @@ GetDialogControlDpiChangeBehavior=Windows.Win32.UI.HiDpi GetDialogDpiChangeBehavior=Windows.Win32.UI.HiDpi GetDisplayAutoRotationPreferences=Windows.Win32.Devices.Display GetDisplayAutoRotationPreferencesByProcessId=Windows.Win32.Devices.Display -GetDisplayConfigBufferSizes=Windows.Win32.UI.DisplayDevices +GetDisplayConfigBufferSizes=Windows.Win32.Devices.Display GetDoubleClickTime=Windows.Win32.UI.Input.KeyboardAndMouse GetDpiForSystem=Windows.Win32.UI.HiDpi GetDpiForWindow=Windows.Win32.UI.HiDpi @@ -1966,8 +2116,8 @@ mouse_event=Windows.Win32.UI.Input.KeyboardAndMouse MOUSEINPUT=Windows.Win32.UI.Input.KeyboardAndMouse MOUSEKEYS=Windows.Win32.UI.Accessibility MOUSEMOVEPOINT=Windows.Win32.UI.Input.KeyboardAndMouse -MsgWaitForMultipleObjects=Windows.Win32.System.Threading -MsgWaitForMultipleObjectsEx=Windows.Win32.System.Threading +MsgWaitForMultipleObjects=Windows.Win32.UI.WindowsAndMessaging +MsgWaitForMultipleObjectsEx=Windows.Win32.UI.WindowsAndMessaging MULTIKEYHELPA=Windows.Win32.UI.Shell MULTIKEYHELPW=Windows.Win32.UI.Shell NMHDR=Windows.Win32.UI.Controls @@ -1999,7 +2149,7 @@ POINTER_TYPE_INFO=Windows.Win32.UI.Controls POWERBROADCAST_SETTING=Windows.Win32.System.Power PrintWindow=Windows.Win32.Storage.Xps PtInRect=Windows.Win32.Graphics.Gdi -QueryDisplayConfig=Windows.Win32.UI.DisplayDevices +QueryDisplayConfig=Windows.Win32.Devices.Display RAWHID=Windows.Win32.UI.Input RAWINPUT=Windows.Win32.UI.Input HRAWINPUT=Windows.Win32.UI.Input @@ -2045,7 +2195,7 @@ SetClipboardViewer=Windows.Win32.System.DataExchange SetDialogControlDpiChangeBehavior=Windows.Win32.UI.HiDpi SetDialogDpiChangeBehavior=Windows.Win32.UI.HiDpi SetDisplayAutoRotationPreferences=Windows.Win32.Devices.Display -SetDisplayConfig=Windows.Win32.UI.DisplayDevices +SetDisplayConfig=Windows.Win32.Devices.Display SetDoubleClickTime=Windows.Win32.UI.Input.KeyboardAndMouse SetFocus=Windows.Win32.UI.Input.KeyboardAndMouse SetGestureConfig=Windows.Win32.UI.Input.Touch @@ -2138,7 +2288,7 @@ Wow64SetThreadContext=Windows.Win32.System.Diagnostics.Debug uCLSSPEC=Windows.Win32.System.Com CSPLATFORM=Windows.Win32.System.Com DVASPECT=Windows.Win32.System.Com -PROPERTYKEY=Windows.Win32.System.PropertiesSystem +PROPERTYKEY=Windows.Win32.UI.Shell.PropertiesSystem QUERYCONTEXT=Windows.Win32.System.Com STATFLAG=Windows.Win32.System.Com.StructuredStorage STGC=Windows.Win32.System.Com.StructuredStorage diff --git a/generation/WinSDK/scraper.header.txt b/generation/WinSDK/scraper.header.txt index 62f075ef2..ef9402e3c 100644 --- a/generation/WinSDK/scraper.header.txt +++ b/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; diff --git a/generation/WinSDK/scraper.settings.rsp b/generation/WinSDK/scraper.settings.rsp index 40442f858..27b6f2270 100644 --- a/generation/WinSDK/scraper.settings.rsp +++ b/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 diff --git a/scripts/BaselineWinmd/Windows.Win32.winmd b/scripts/BaselineWinmd/Windows.Win32.winmd index 25894e852..191222d7e 100644 --- a/scripts/BaselineWinmd/Windows.Win32.winmd +++ b/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 diff --git a/scripts/BuildMetadataBin.ps1 b/scripts/BuildMetadataBin.ps1 index c6f9a97f3..fcb1ee1ea 100644 --- a/scripts/BuildMetadataBin.ps1 +++ b/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 diff --git a/sources/GeneratorSdk/MetadataTasks/EmitWinmd.cs b/sources/GeneratorSdk/MetadataTasks/EmitWinmd.cs index 85f340739..1399f1897 100644 --- a/sources/GeneratorSdk/MetadataTasks/EmitWinmd.cs +++ b/sources/GeneratorSdk/MetadataTasks/EmitWinmd.cs @@ -135,12 +135,13 @@ protected override int ExecuteTool(string pathToTool, string responseFileCommand 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, - $"{this.partitionsWithoutCrossarchDifferences}"); + $"{sortedDifferences}"); this.Log.LogMessage( MessageImportance.High, $"Or, add this property to any partitions you want to exclude: true"); diff --git a/sources/MetadataUtils/ConstantsScraper.cs b/sources/MetadataUtils/ConstantsScraper.cs index 12dcbb079..c72db32af 100644 --- a/sources/MetadataUtils/ConstantsScraper.cs +++ b/sources/MetadataUtils/ConstantsScraper.cs @@ -39,7 +39,7 @@ private class ConstantsScraperImpl : IDisposable 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( diff --git a/sources/MetadataUtils/NamespaceDependencyUtil.cs b/sources/MetadataUtils/NamespaceDependencyUtil.cs index 965612ce4..b565c3827 100644 --- a/sources/MetadataUtils/NamespaceDependencyUtil.cs +++ b/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(this T[] array, T item) + { + List list = new List(array); + list.Add(item); + + return list.ToArray(); + } + } + public static class NamespaceDependencyUtil { public static IEnumerable GetNamespaceDependencies(string winmdFileName) @@ -12,6 +25,72 @@ public static IEnumerable GetNamespaceDependencies(stri return impl.GetNamespaceDependencies(winmdFileName); } + public static IEnumerable> GetNamespaceCycles(string winmdFileName) + { + GetNamespaceCyclesImpl impl = new(winmdFileName); + return impl.GetNamespaceCycles(); + } + + public static Dictionary> GetNamespaceToDependencyNamespaces(string winmdFileName) + { + Dictionary> 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> namespaceToDepends; + + public GetNamespaceCyclesImpl(string winmdFileName) + { + this.namespaceToDepends = GetNamespaceToDependencyNamespaces(winmdFileName); + } + + public IEnumerable> GetNamespaceCycles() + { + foreach (var ns in this.namespaceToDepends.Keys) + { + var empty = Array.Empty(); + foreach (var cycle in this.GetCycles(ns, empty)) + { + yield return cycle; + } + } + } + + private IEnumerable> 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 namespacesToDepends = new(); @@ -88,7 +167,21 @@ public IEnumerable GetNamespaceDependencies(string winm } } - return this.namespacesToDepends.Values.OrderBy(d => d.Namespace); + var finalDepends = this.namespacesToDepends.Values.OrderBy(d => d.Namespace); + + Dictionary> 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 @@ private void AddTypeDependency(ITypeDefinition ownerType, DependenciesInNamespac public class DependenciesInNamespace { private Dictionary> namespacesToDepends = new(); + private string[] allDependencyNamespaces; public DependenciesInNamespace(string ns) { @@ -142,7 +236,9 @@ public IEnumerable>> GetDependencie } } - public void AddTypeDependency(string broughtInBy, IType type) + public IEnumerable 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 @@ public void AddTypeDependency(string broughtInBy, IType type) dependency.AddBroughtInBy(broughtInBy); } + + internal void LoadAllDependendencyNamespaces(Dictionary> namespaceToDepends) + { + HashSet dependencyNamespaces = new(); + + foreach (var directNamespace in this.namespacesToDepends.Keys) + { + VisitNamespace(directNamespace, dependencyNamespaces); + } + + void VisitNamespace(string ns, HashSet dependencyNamespaces) + { + if (!dependencyNamespaces.Contains(ns)) + { + dependencyNamespaces.Add(ns); + + foreach (var dependNamespace in namespaceToDepends[ns]) + { + VisitNamespace(dependNamespace, dependencyNamespaces); + } + } + } + + this.allDependencyNamespaces = dependencyNamespaces.ToArray(); + } } public class Dependency diff --git a/sources/WinmdUtils/Program.cs b/sources/WinmdUtils/Program.cs index 43b288a16..e14940097 100644 --- a/sources/WinmdUtils/Program.cs +++ b/sources/WinmdUtils/Program.cs @@ -98,9 +98,18 @@ static int Main(string[] args) new Option("--winmd", "The winmd to inspect.") { IsRequired = true }.ExistingOnly(), new Option("--ignoreDependNamespace", "Ignore dependencies to this namespace.", ArgumentArity.OneOrMore), new Option("--namespaceFilter", "Namespace filter", ArgumentArity.OneOrMore), + new Option("--maxBroughtInBy", getDefaultValue: () => int.MaxValue, description: "The max number of items to display of a type that brought in a namespace"), + new Option("--maxDependTypes", getDefaultValue: () => int.MaxValue, description: "The max number of types to display that brought in a namespace"), }; - showNamespaceDependencies.Handler = CommandHandler.Create(ShowNamespaceDependencies); + showNamespaceDependencies.Handler = CommandHandler.Create(ShowNamespaceDependencies); + + var showNamespaceCycles = new Command("showNamespaceCycles", "Show namespace cyclical dependencies.") + { + new Option("--winmd", "The winmd to inspect.") { IsRequired = true }.ExistingOnly(), + }; + + showNamespaceCycles.Handler = CommandHandler.Create(ShowNamespaceCycles); var rootCommand = new RootCommand("Win32metadata winmd utils") { @@ -113,7 +122,8 @@ static int Main(string[] args) compareCommand, showLibImports, createLibRsp, - showNamespaceDependencies + showNamespaceDependencies, + showNamespaceCycles }; return rootCommand.Invoke(args); @@ -630,7 +640,32 @@ private static string GetArchInfo(IEnumerable attributes) 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 namespaceFilterRegex = new List(); if (namespaceFilter != null) @@ -670,24 +705,46 @@ public static int ShowNamespaceDependencies(FileInfo winmd, string[] ignoreDepen 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 @@ public static int ShowNamespaceDependencies(FileInfo winmd, string[] ignoreDepen } console.Out.Write(broughtInBy); + broughtInCount++; } console.Out.Write("\r\n"); @@ -706,7 +764,7 @@ public static int ShowNamespaceDependencies(FileInfo winmd, string[] ignoreDepen console.Out.Write("\r\n"); } - if (hadDepends) + if (allDependsByNamespace.Length != 0) { console.Out.Write("\r\n\r\n"); } diff --git a/sources/WinmdUtils/Properties/launchSettings.json b/sources/WinmdUtils/Properties/launchSettings.json index 47abb3d93..6291f7b23 100644 --- a/sources/WinmdUtils/Properties/launchSettings.json +++ b/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" } } } \ No newline at end of file