Merge pull request #364 from tannergooding/main

Fix an issue with string escaping
terrafx · Nov 26, 2023 · 2f06c29 · 2f06c29
2 parents c76ed73 + a49d138
commit 2f06c29
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/generation/DirectX/um/d2d1_3/generate.rsp b/generation/DirectX/um/d2d1_3/generate.rsp
@@ -28,6 +28,7 @@ ID2D1DeviceContext3=SupportedOSPlatform("windows10.0")
 ID2D1DeviceContext4=SupportedOSPlatform("windows10.0")
 ID2D1DeviceContext5=SupportedOSPlatform("windows10.0")
 ID2D1DeviceContext6=SupportedOSPlatform("windows10.0")
+ID2D1DeviceContext7=SupportedOSPlatform("windows10.0")
 ID2D1GdiMetafile1=SupportedOSPlatform("windows10.0")
 ID2D1GdiMetafileSink1=SupportedOSPlatform("windows10.0")
 ID2D1GradientMesh=SupportedOSPlatform("windows6.3")

diff --git a/generation/Windows/um/sysinfoapi/generate.rsp b/generation/Windows/um/sysinfoapi/generate.rsp
@@ -13,6 +13,7 @@ TerraFX.Interop.Windows
 --traverse
 C:/Program Files (x86)/Windows Kits/10/Include/10.0.22621.0/um/sysinfoapi.h
 --with-attribute
+GetDeveloperDriveEnablementState=SupportedOSPlatform("windows10.0.22631.0")
 GetIntegratedDisplaySize=SupportedOSPlatform("windows10.0")
 GetSystemTimeAdjustmentPrecise=SupportedOSPlatform("windows10.0")
 GetSystemTimePreciseAsFileTime=SupportedOSPlatform("windows6.2")

diff --git a/sources/Interop/Windows/DirectX/um/d2d1_3/ID2D1DeviceContext7.cs b/sources/Interop/Windows/DirectX/um/d2d1_3/ID2D1DeviceContext7.cs
@@ -28,6 +28,7 @@ namespace TerraFX.Interop.DirectX;
 [Guid("EC891CF7-9B69-4851-9DEF-4E0915771E62")]
 [NativeTypeName("struct ID2D1DeviceContext7 : ID2D1DeviceContext6")]
 [NativeInheritance("ID2D1DeviceContext6")]
+[SupportedOSPlatform("windows10.0")]
 public unsafe partial struct ID2D1DeviceContext7 : ID2D1DeviceContext7.Interface, INativeGuid
 {
     static Guid* INativeGuid.NativeGuid => (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in IID_ID2D1DeviceContext7));
@@ -178,8 +179,6 @@ public HRESULT CreateImageSourceFromWic(IWICBitmapSource* wicBitmapSource, D2D1_
         return CreateImageSourceFromWic(wicBitmapSource, loadingOptions, D2D1_ALPHA_MODE_UNKNOWN, imageSource);
     }
 
-
-    [SupportedOSPlatform("windows10.0")]
     public HRESULT CreateImageSourceFromWic(IWICBitmapSource* wicBitmapSource, ID2D1ImageSourceFromWic** imageSource)
     {
         return CreateImageSourceFromWic(wicBitmapSource, D2D1_IMAGE_SOURCE_LOADING_OPTIONS_NONE, D2D1_ALPHA_MODE_UNKNOWN, imageSource);

diff --git a/sources/Interop/Windows/Windows/um/PathCch/Windows.cs b/sources/Interop/Windows/Windows/um/PathCch/Windows.cs
@@ -121,7 +121,7 @@ public static unsafe partial class Windows
     public static extern HRESULT PathAllocCanonicalize([NativeTypeName("PCWSTR")] char* pszPathIn, [NativeTypeName("ULONG")] uint dwFlags, [NativeTypeName("PWSTR *")] char** ppszPathOut);
 
     [NativeTypeName("#define VOLUME_PREFIX L\"\\\\?\\Volume\"")]
-    public const string VOLUME_PREFIX = "\\?\\Volume";
+    public const string VOLUME_PREFIX = "\\\\?\\Volume";
 
     [NativeTypeName("#define VOLUME_PREFIX_LEN (ARRAYSIZE(VOLUME_PREFIX) - 1)")]
     public const uint VOLUME_PREFIX_LEN = ((11) - 1);

diff --git a/tests/Interop/Windows/DirectX/um/d2d1_3/ID2D1DeviceContext7Tests.cs b/tests/Interop/Windows/DirectX/um/d2d1_3/ID2D1DeviceContext7Tests.cs
@@ -6,11 +6,13 @@
 using NUnit.Framework;
 using System;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 using static TerraFX.Interop.Windows.IID;
 
 namespace TerraFX.Interop.DirectX.UnitTests;
 
 /// <summary>Provides validation of the <see cref="ID2D1DeviceContext7" /> struct.</summary>
+[SupportedOSPlatform("windows10.0")]
 public static unsafe partial class ID2D1DeviceContext7Tests
 {
     /// <summary>Validates that the <see cref="Guid" /> of the <see cref="ID2D1DeviceContext7" /> struct is correct.</summary>