Merge remote-tracking branch 'terrafx/v10.0.20348.2'

terrafx · Jul 31, 2022 · 0c255fa · 0c255fa
2 parents 8773003 + 367300f
commit 0c255fa
Show file tree

Hide file tree

Showing 71 changed files with 41,719 additions and 177 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,6 +5,7 @@ on:
     branches: [ main, v* ]
   pull_request:
     branches: [ main, v* ]
+  workflow_dispatch:
 
 jobs:
   windows-x64:

diff --git a/TerraFX.Interop.Windows.sln b/TerraFX.Interop.Windows.sln
@@ -2950,15 +2950,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gdiplustypes", "gdiplustype
 		generation\Gdiplus\um\gdiplustypes\um-gdiplustypes.h = generation\Gdiplus\um\gdiplustypes\um-gdiplustypes.h
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{8891C297-49D7-495C-B66E-2A77C3D5F50D}"
+	ProjectSection(SolutionItems) = preProject
+		.github\ISSUE_TEMPLATE\bug.md = .github\ISSUE_TEMPLATE\bug.md
+		.github\ISSUE_TEMPLATE\proposal.md = .github\ISSUE_TEMPLATE\proposal.md
+		.github\ISSUE_TEMPLATE\regression.md = .github\ISSUE_TEMPLATE\regression.md
+	EndProjectSection
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "evntprov", "evntprov", "{ECCEAECE-9019-4EB6-A44A-244BCC77A624}"
 	ProjectSection(SolutionItems) = preProject
 		generation\Windows\shared\evntprov\generate.rsp = generation\Windows\shared\evntprov\generate.rsp
 		generation\Windows\shared\evntprov\header.txt = generation\Windows\shared\evntprov\header.txt
 		generation\Windows\shared\evntprov\shared-evntprov.h = generation\Windows\shared\evntprov\shared-evntprov.h
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "d3d12", "d3d12", "{65954CB3-F28F-4CF0-BC77-0FFD6E858BCE}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "d3d12", "d3d12", "{F0F69CE3-AA7D-4673-AC07-F54578A75A91}"
 	ProjectSection(SolutionItems) = preProject
 		generation\DirectX\d3d12\d3d12\d3d12.h = generation\DirectX\d3d12\d3d12\d3d12.h
@@ -3007,6 +3012,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dxgiformat", "dxgiformat",
 		generation\DirectX\d3d12\dxgiformat\shared-dxgiformat.h = generation\DirectX\d3d12\dxgiformat\shared-dxgiformat.h
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "propkey", "propkey", "{21B748B3-53EF-42AD-B5F3-A5215C5AE574}"
+	ProjectSection(SolutionItems) = preProject
+		generation\Windows\um\propkey\generate.rsp = generation\Windows\um\propkey\generate.rsp
+		generation\Windows\um\propkey\header.txt = generation\Windows\um\propkey\header.txt
+		generation\Windows\um\propkey\um-propkey.h = generation\Windows\um\propkey\um-propkey.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "knownfolders", "knownfolders", "{DBA8B1B8-BE4B-4C8F-BD75-EAD47581AE39}"
+	ProjectSection(SolutionItems) = preProject
+		generation\Windows\um\knownfolders\generate.rsp = generation\Windows\um\knownfolders\generate.rsp
+		generation\Windows\um\knownfolders\header.txt = generation\Windows\um\knownfolders\header.txt
+		generation\Windows\um\knownfolders\um-knownfolders.h = generation\Windows\um\knownfolders\um-knownfolders.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "knownfolderpathscom", "knownfolderpathscom", "{EA5B695A-5F25-401E-9FD9-23BFDEFBA01B}"
+	ProjectSection(SolutionItems) = preProject
+		generation\Windows\um\knownfolderpathscom\generate.rsp = generation\Windows\um\knownfolderpathscom\generate.rsp
+		generation\Windows\um\knownfolderpathscom\header.txt = generation\Windows\um\knownfolderpathscom\header.txt
+		generation\Windows\um\knownfolderpathscom\um-knownfolderpathscom.h = generation\Windows\um\knownfolderpathscom\um-knownfolderpathscom.h
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -3470,6 +3496,11 @@ Global
 		{5911A131-AE94-40E8-B501-3C088C5252CE} = {65954CB3-F28F-4CF0-BC77-0FFD6E858BCE}
 		{19D7C317-C032-44BE-BBF7-D1D912585FE0} = {65954CB3-F28F-4CF0-BC77-0FFD6E858BCE}
 		{2BE4B04C-FB90-4A79-9161-3D1CA5E34825} = {65954CB3-F28F-4CF0-BC77-0FFD6E858BCE}
+		{8891C297-49D7-495C-B66E-2A77C3D5F50D} = {3BDDFFAD-B31F-4930-B557-E8486D23C67A}
+		{7ADEB031-2298-4F79-8103-79CFF01CA00C} = {F9716DD9-2967-4295-AC71-F1FD5A9EEFEF}
+		{21B748B3-53EF-42AD-B5F3-A5215C5AE574} = {67311E5E-FA9C-43A6-B431-9EF10047A0CE}
+		{DBA8B1B8-BE4B-4C8F-BD75-EAD47581AE39} = {67311E5E-FA9C-43A6-B431-9EF10047A0CE}
+		{EA5B695A-5F25-401E-9FD9-23BFDEFBA01B} = {67311E5E-FA9C-43A6-B431-9EF10047A0CE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2FE36DF8-2D9C-4F20-8787-45DC74B57461}

diff --git a/generation/DirectX/other/D3D11On12On7/generate.rsp b/generation/DirectX/other/D3D11On12On7/generate.rsp
@@ -2,6 +2,7 @@
 @../../../remap.rsp
 --exclude
 GetD3D11On12On7Interface
+IID_ID3D11On12On7
 --file
 other-d3d11on12on7.h
 --methodClassName

diff --git a/generation/Windows/um/Shlwapi/generate.rsp b/generation/Windows/um/Shlwapi/generate.rsp
@@ -34,6 +34,7 @@ UrlEscapeSpaces
 UrlIsFileUrlA
 UrlIsFileUrlW
 UrlUnescapeInPlace
+wnsprintf
 --file
 um-Shlwapi.h
 --methodClassName

diff --git a/generation/Windows/um/WinUser/generate.rsp b/generation/Windows/um/WinUser/generate.rsp
@@ -102,6 +102,7 @@ TOUCH_COORD_TO_PIXEL
 WINSTAENUMPROC
 WINSTAENUMPROCA
 WINSTAENUMPROCW
+wsprintf
 _Inout_grows_updates_bypassable_or_z_
 _In_bypassable_reads_or_z_
 --file

diff --git a/generation/Windows/um/knownfolderpathscom/generate.rsp b/generation/Windows/um/knownfolderpathscom/generate.rsp
@@ -0,0 +1,14 @@
+@../../../settings.rsp
+@../../../remap.rsp
+--file
+um-knownfolderpathscom.h
+--methodClassName
+Windows
+--namespace
+TerraFX.Interop.Windows
+--output
+../../../../sources/Interop/Windows/Windows/um/knownfolderpathscom
+--test-output
+../../../../tests/Interop/Windows/Windows/um/knownfolderpathscom
+--traverse
+C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0/um/knownfolderpathscom.h
diff --git a/generation/Windows/um/knownfolderpathscom/header.txt b/generation/Windows/um/knownfolderpathscom/header.txt
@@ -0,0 +1,4 @@
+// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information.
+
+// Ported from um/knownfolderpathscom.h in the Windows SDK for Windows 10.0.22000.0
+// Original source is Copyright © Microsoft. All rights reserved.
diff --git a/generation/Windows/um/knownfolderpathscom/um-knownfolderpathscom.h b/generation/Windows/um/knownfolderpathscom/um-knownfolderpathscom.h
@@ -0,0 +1,2 @@
+#include "..\..\..\TerraFX.h"
+#include <knownfolderpathscom.h>
diff --git a/generation/Windows/um/knownfolders/generate.rsp b/generation/Windows/um/knownfolders/generate.rsp
@@ -0,0 +1,16 @@
+@../../../settings.rsp
+@../../../remap.rsp
+--exclude
+DEFINE_KNOWN_FOLDER
+--file
+um-knownfolders.h
+--methodClassName
+Windows
+--namespace
+TerraFX.Interop.Windows
+--output
+../../../../sources/Interop/Windows/Windows/um/knownfolders
+--test-output
+../../../../tests/Interop/Windows/Windows/um/knownfolders
+--traverse
+C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0/um/knownfolders.h
diff --git a/generation/Windows/um/knownfolders/header.txt b/generation/Windows/um/knownfolders/header.txt
@@ -0,0 +1,4 @@
+// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information.
+
+// Ported from um/knownfolders.h in the Windows SDK for Windows 10.0.22000.0
+// Original source is Copyright © Microsoft. All rights reserved.
diff --git a/generation/Windows/um/knownfolders/um-knownfolders.h b/generation/Windows/um/knownfolders/um-knownfolders.h
@@ -0,0 +1,2 @@
+#include "..\..\..\TerraFX.h"
+#include <knownfolders.h>
diff --git a/generation/Windows/um/mfapi/generate.rsp b/generation/Windows/um/mfapi/generate.rsp
@@ -67,6 +67,8 @@ PackSize=SupportedOSPlatform("windows8.0")
 ROI_AREA=SupportedOSPlatform("windows8.1")
 unpackratio=SupportedOSPlatform("windows8.0")
 UnpackSize=SupportedOSPlatform("windows8.0")
+--with-guid
+MFASYNCRESULT=00000000-0000-0000-0000-000000000000
 --with-librarypath
 MFAddPeriodicCallback=mfplat
 MFAllocateSerialWorkQueue=mfplat
@@ -191,8 +193,6 @@ MFUnregisterPlatformFromMMCSS=mfplat
 MFUnwrapMediaType=mfplat
 MFValidateMediaTypeSize=mfplat
 MFWrapMediaType=mfplat
---with-guid
-MFASYNCRESULT=00000000-0000-0000-0000-000000000000
 --with-librarypath
 MFCreateDXSurfaceBuffer=evr
 MFIsFormatYUV=evr
diff --git a/generation/Windows/um/propkey/generate.rsp b/generation/Windows/um/propkey/generate.rsp
@@ -1,5 +1,7 @@
 @../../../settings.rsp
 @../../../remap.rsp
+--exclude
+DEFINE_API_PKEY
 --file
 um-propkey.h
 --methodClassName

diff --git a/generation/Windows/um/propkey/header.txt b/generation/Windows/um/propkey/header.txt
@@ -1,4 +1,4 @@
 // Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information.
 
-// Ported from um/propkeydef.h in the Windows SDK for Windows 10.0.22000.0
+// Ported from um/propkey.h in the Windows SDK for Windows 10.0.22000.0
 // Original source is Copyright © Microsoft. All rights reserved.
diff --git a/generation/Windows/um/propkey/um-propkey.h b/generation/Windows/um/propkey/um-propkey.h
@@ -1,2 +1,2 @@
 #include "..\..\..\TerraFX.h"
-#include <propkeydef.h>
+#include <propkey.h>
diff --git a/generation/Windows/um/shellapi/generate.rsp b/generation/Windows/um/shellapi/generate.rsp
@@ -18,6 +18,7 @@ NOTIFYICONDATA_V1_SIZE
 NOTIFYICONDATA_V2_SIZE
 NOTIFYICONDATA_V3_SIZE
 SHDOCAPI_
+ShellMessageBox
 SHEnumerateUnreadMailAccountsA
 SHGetUnreadMailCountA
 SHSetUnreadMailCountA

diff --git a/sources/Interop/Windows/WinRT/um/MLOperatorAuthor/MLOperatorAttribute.cs b/sources/Interop/Windows/WinRT/um/MLOperatorAuthor/MLOperatorAttribute.cs
@@ -16,5 +16,6 @@ public unsafe partial struct MLOperatorAttribute
     public MLOperatorAttributeType type;
 
     /// <include file='MLOperatorAttribute.xml' path='doc/member[@name="MLOperatorAttribute.required"]/*' />
-    public bool required;
+    [NativeTypeName("bool")]
+    public byte required;
 }
diff --git a/sources/Interop/Windows/Windows/um/SetupAPI/FILE_IN_CABINET_INFO_A.Manual.cs b/sources/Interop/Windows/Windows/um/SetupAPI/FILE_IN_CABINET_INFO_A.Manual.cs
@@ -135,11 +135,11 @@ public Span<sbyte> FullTargetName
         {
             if (sizeof(nint) == 4)
             {
-                return MemoryMarshal.CreateSpan(ref _value32.FullTargetName[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value32.FullTargetName[0], 260);
             }
             else
             {
-                return MemoryMarshal.CreateSpan(ref _value64.FullTargetName[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value64.FullTargetName[0], 260);
             }
         }
     }

diff --git a/sources/Interop/Windows/Windows/um/SetupAPI/FILE_IN_CABINET_INFO_W.Manual.cs b/sources/Interop/Windows/Windows/um/SetupAPI/FILE_IN_CABINET_INFO_W.Manual.cs
@@ -135,11 +135,11 @@ public Span<ushort> FullTargetName
         {
             if (sizeof(nint) == 4)
             {
-                return MemoryMarshal.CreateSpan(ref _value32.FullTargetName[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value32.FullTargetName[0], 260);
             }
             else
             {
-                return MemoryMarshal.CreateSpan(ref _value64.FullTargetName[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value64.FullTargetName[0], 260);
             }
         }
     }

diff --git a/sources/Interop/Windows/Windows/um/SetupAPI/SP_BACKUP_QUEUE_PARAMS_V1_A.Manual.cs b/sources/Interop/Windows/Windows/um/SetupAPI/SP_BACKUP_QUEUE_PARAMS_V1_A.Manual.cs
@@ -55,11 +55,11 @@ public Span<sbyte> FullInfPath
         {
             if (sizeof(nint) == 4)
             {
-                return MemoryMarshal.CreateSpan(ref _value32.FullInfPath[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value32.FullInfPath[0], 260);
             }
             else
             {
-                return MemoryMarshal.CreateSpan(ref _value64.FullInfPath[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value64.FullInfPath[0], 260);
             }
         }
     }

diff --git a/sources/Interop/Windows/Windows/um/SetupAPI/SP_BACKUP_QUEUE_PARAMS_V1_W.Manual.cs b/sources/Interop/Windows/Windows/um/SetupAPI/SP_BACKUP_QUEUE_PARAMS_V1_W.Manual.cs
@@ -55,11 +55,11 @@ public Span<ushort> FullInfPath
         {
             if (sizeof(nint) == 4)
             {
-                return MemoryMarshal.CreateSpan(ref _value32.FullInfPath[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value32.FullInfPath[0], 260);
             }
             else
             {
-                return MemoryMarshal.CreateSpan(ref _value64.FullInfPath[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value64.FullInfPath[0], 260);
             }
         }
     }

diff --git a/sources/Interop/Windows/Windows/um/SetupAPI/SP_BACKUP_QUEUE_PARAMS_V2_A.Manual.cs b/sources/Interop/Windows/Windows/um/SetupAPI/SP_BACKUP_QUEUE_PARAMS_V2_A.Manual.cs
@@ -55,11 +55,11 @@ public Span<sbyte> FullInfPath
         {
             if (sizeof(nint) == 4)
             {
-                return MemoryMarshal.CreateSpan(ref _value32.FullInfPath[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value32.FullInfPath[0], 260);
             }
             else
             {
-                return MemoryMarshal.CreateSpan(ref _value64.FullInfPath[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value64.FullInfPath[0], 260);
             }
         }
     }
@@ -86,11 +86,11 @@ public Span<sbyte> ReinstallInstance
         {
             if (sizeof(nint) == 4)
             {
-                return MemoryMarshal.CreateSpan(ref _value32.ReinstallInstance[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value32.ReinstallInstance[0], 260);
             }
             else
             {
-                return MemoryMarshal.CreateSpan(ref _value64.ReinstallInstance[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value64.ReinstallInstance[0], 260);
             }
         }
     }

diff --git a/sources/Interop/Windows/Windows/um/SetupAPI/SP_BACKUP_QUEUE_PARAMS_V2_W.Manual.cs b/sources/Interop/Windows/Windows/um/SetupAPI/SP_BACKUP_QUEUE_PARAMS_V2_W.Manual.cs
@@ -55,11 +55,11 @@ public Span<ushort> FullInfPath
         {
             if (sizeof(nint) == 4)
             {
-                return MemoryMarshal.CreateSpan(ref _value32.FullInfPath[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value32.FullInfPath[0], 260);
             }
             else
             {
-                return MemoryMarshal.CreateSpan(ref _value64.FullInfPath[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value64.FullInfPath[0], 260);
             }
         }
     }
@@ -86,11 +86,11 @@ public Span<ushort> ReinstallInstance
         {
             if (sizeof(nint) == 4)
             {
-                return MemoryMarshal.CreateSpan(ref _value32.ReinstallInstance[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value32.ReinstallInstance[0], 260);
             }
             else
             {
-                return MemoryMarshal.CreateSpan(ref _value64.ReinstallInstance[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value64.ReinstallInstance[0], 260);
             }
         }
     }

diff --git a/sources/Interop/Windows/Windows/um/SetupAPI/SP_DEVINFO_LIST_DETAIL_DATA_A.Manual.cs b/sources/Interop/Windows/Windows/um/SetupAPI/SP_DEVINFO_LIST_DETAIL_DATA_A.Manual.cs
@@ -85,11 +85,11 @@ public Span<sbyte> RemoteMachineName
         {
             if (sizeof(nint) == 4)
             {
-                return MemoryMarshal.CreateSpan(ref _value32.RemoteMachineName[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value32.RemoteMachineName[0], 263);
             }
             else
             {
-                return MemoryMarshal.CreateSpan(ref _value64.RemoteMachineName[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value64.RemoteMachineName[0], 263);
             }
         }
     }

diff --git a/sources/Interop/Windows/Windows/um/SetupAPI/SP_DEVINFO_LIST_DETAIL_DATA_W.Manual.cs b/sources/Interop/Windows/Windows/um/SetupAPI/SP_DEVINFO_LIST_DETAIL_DATA_W.Manual.cs
@@ -85,11 +85,11 @@ public Span<ushort> RemoteMachineName
         {
             if (sizeof(nint) == 4)
             {
-                return MemoryMarshal.CreateSpan(ref _value32.RemoteMachineName[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value32.RemoteMachineName[0], 263);
             }
             else
             {
-                return MemoryMarshal.CreateSpan(ref _value64.RemoteMachineName[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value64.RemoteMachineName[0], 263);
             }
         }
     }

diff --git a/sources/Interop/Windows/Windows/um/SetupAPI/SP_DEVINSTALL_PARAMS_A.Manual.cs b/sources/Interop/Windows/Windows/um/SetupAPI/SP_DEVINSTALL_PARAMS_A.Manual.cs
@@ -181,11 +181,11 @@ public Span<sbyte> DriverPath
         {
             if (sizeof(nint) == 4)
             {
-                return MemoryMarshal.CreateSpan(ref _value32.DriverPath[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value32.DriverPath[0], 260);
             }
             else
             {
-                return MemoryMarshal.CreateSpan(ref _value64.DriverPath[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value64.DriverPath[0], 260);
             }
         }
     }

diff --git a/sources/Interop/Windows/Windows/um/SetupAPI/SP_DEVINSTALL_PARAMS_W.Manual.cs b/sources/Interop/Windows/Windows/um/SetupAPI/SP_DEVINSTALL_PARAMS_W.Manual.cs
@@ -181,11 +181,11 @@ public Span<ushort> DriverPath
         {
             if (sizeof(nint) == 4)
             {
-                return MemoryMarshal.CreateSpan(ref _value32.DriverPath[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value32.DriverPath[0], 260);
             }
             else
             {
-                return MemoryMarshal.CreateSpan(ref _value64.DriverPath[0], 1);
+                return MemoryMarshal.CreateSpan(ref _value64.DriverPath[0], 260);
             }
         }
     }