Consume latest source generator.

dotnet · May 26, 2022 · a544b08 · a544b08
1 parent 2d11979
commit a544b08
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 56 deletions.
diff --git a/eng/tools/HelixTestRunner/ProcessUtil.cs b/eng/tools/HelixTestRunner/ProcessUtil.cs
@@ -17,7 +17,7 @@ namespace HelixTestRunner;
 
 public static partial class ProcessUtil
 {
-    [LibraryImportAttribute("libc", SetLastError = true, EntryPoint = "kill")]
+    [LibraryImport("libc", SetLastError = true, EntryPoint = "kill")]
     private static partial int sys_kill(int pid, int sig);
 
     public static Task CaptureDumpAsync()

diff --git a/src/Servers/HttpSys/src/NativeInterop/HttpApi.cs b/src/Servers/HttpSys/src/NativeInterop/HttpApi.cs
@@ -68,7 +68,7 @@ internal static unsafe partial class HttpApi
 
     [LibraryImport(HTTPAPI, SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
     internal static unsafe partial uint HttpCreateRequestQueue(HTTPAPI_VERSION version, string? pName,
-        UnsafeNclNativeMethods.SECURITY_ATTRIBUTES? pSecurityAttributes, HTTP_CREATE_REQUEST_QUEUE_FLAG flags, out HttpRequestQueueV2Handle pReqQueueHandle);
+        IntPtr pSecurityAttributes, HTTP_CREATE_REQUEST_QUEUE_FLAG flags, out HttpRequestQueueV2Handle pReqQueueHandle);
 
     [LibraryImport(HTTPAPI, SetLastError = true)]
     internal static unsafe partial uint HttpCloseRequestQueue(IntPtr pReqQueueHandle);

diff --git a/src/Servers/HttpSys/src/NativeInterop/RequestQueue.cs b/src/Servers/HttpSys/src/NativeInterop/RequestQueue.cs
@@ -44,7 +44,7 @@ private RequestQueue(string? requestQueueName, RequestQueueMode mode, ILogger lo
         var statusCode = HttpApi.HttpCreateRequestQueue(
                 HttpApi.Version,
                 requestQueueName,
-                null,
+                IntPtr.Zero,
                 flags,
                 out var requestQueueHandle);
 
@@ -56,7 +56,7 @@ private RequestQueue(string? requestQueueName, RequestQueueMode mode, ILogger lo
             statusCode = HttpApi.HttpCreateRequestQueue(
                     HttpApi.Version,
                     requestQueueName,
-                    null,
+                    IntPtr.Zero,
                     flags,
                     out requestQueueHandle);
         }

diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerOnExistingQueueTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerOnExistingQueueTests.cs
@@ -243,7 +243,7 @@ public async Task Server_CreateOrAttach_NoUrlPrefix_NewUrlPrefixWorks()
         var statusCode = HttpApi.HttpCreateRequestQueue(
                 HttpApi.Version,
                 queueName,
-                null,
+                IntPtr.Zero,
                 0,
                 out requestQueueHandle);
 

diff --git a/src/Servers/HttpSys/test/FunctionalTests/ServerTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ServerTests.cs
@@ -49,7 +49,7 @@ public async Task Server_ConnectExistingQueueName_Success(RequestQueueMode queue
         var statusCode = HttpApi.HttpCreateRequestQueue(
                 HttpApi.Version,
                 queueName,
-                null,
+                IntPtr.Zero,
                 0,
                 out requestQueueHandle);
 

diff --git a/src/Servers/IIS/IIS/src/Core/IISConfigurationData.cs b/src/Servers/IIS/IIS/src/Core/IISConfigurationData.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.AspNetCore.Server.IIS.Core;
 
+[NativeMarshalling(typeof(Native))]
 [StructLayout(LayoutKind.Sequential)]
 internal struct IISConfigurationData
 {

diff --git a/src/Servers/IIS/IIS/src/NativeMethods.cs b/src/Servers/IIS/IIS/src/NativeMethods.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
 using Microsoft.AspNetCore.HttpSys.Internal;
 using Microsoft.AspNetCore.Server.IIS.Core;
 
@@ -89,13 +88,13 @@ private static unsafe partial int register_callbacks(NativeSafeHandle pInProcess
     private static partial int http_set_managed_context(NativeSafeHandle pInProcessHandler, IntPtr pvManagedContext);
 
     [LibraryImport(AspNetCoreModuleDll)]
-    private static partial int http_get_application_properties([MarshalUsing(typeof(IISConfigurationData.Native))] ref IISConfigurationData iiConfigData);
+    private static partial int http_get_application_properties(out IISConfigurationData iiConfigData);
 
     [LibraryImport(AspNetCoreModuleDll)]
     private static partial int http_get_server_variable(
         NativeSafeHandle pInProcessHandler,
         [MarshalAs(UnmanagedType.LPStr)] string variableName,
-        [MarshalUsing(typeof(BstrStringMarshaller))] out string value);
+        [MarshalAs(UnmanagedType.BStr)] out string value);
 
     [LibraryImport(AspNetCoreModuleDll)]
     private static partial int http_set_server_variable(
@@ -149,7 +148,7 @@ private static unsafe partial int http_websockets_write_bytes(
     private static unsafe partial int http_response_set_known_header(NativeSafeHandle pInProcessHandler, int headerId, byte* pHeaderValue, ushort length, [MarshalAs(UnmanagedType.Bool)] bool fReplace);
 
     [LibraryImport(AspNetCoreModuleDll)]
-    private static partial int http_get_authentication_information(NativeSafeHandle pInProcessHandler, [MarshalUsing(typeof(BstrStringMarshaller))] out string authType, out IntPtr token);
+    private static partial int http_get_authentication_information(NativeSafeHandle pInProcessHandler, [MarshalAs(UnmanagedType.BStr)] out string authType, out IntPtr token);
 
     [LibraryImport(AspNetCoreModuleDll)]
     private static unsafe partial int http_set_startup_error_page_content(byte* content, int contentLength);
@@ -228,8 +227,7 @@ public static void HttpSetManagedContext(NativeSafeHandle pInProcessHandler, Int
 
     internal static IISConfigurationData HttpGetApplicationProperties()
     {
-        var iisConfigurationData = new IISConfigurationData();
-        Validate(http_get_application_properties(ref iisConfigurationData));
+        Validate(http_get_application_properties(out IISConfigurationData iisConfigurationData));
         return iisConfigurationData;
     }
 
@@ -341,33 +339,4 @@ private static void Validate(int hr)
             throw Marshal.GetExceptionForHR(hr)!;
         }
     }
-
-    /// <summary>
-    /// Marshaller for BSTR strings
-    /// </summary>
-    [CustomTypeMarshaller(typeof(string),
-        Features = CustomTypeMarshallerFeatures.UnmanagedResources | CustomTypeMarshallerFeatures.TwoStageMarshalling)]
-    internal ref struct BstrStringMarshaller
-    {
-        private IntPtr _allocated;
-
-        public BstrStringMarshaller(string? str)
-        {
-            _allocated = Marshal.StringToBSTR(str);
-        }
-
-        public IntPtr ToNativeValue() => _allocated;
-
-        public void FromNativeValue(IntPtr value) => _allocated = value;
-
-        public string? ToManaged() => Marshal.PtrToStringBSTR(_allocated);
-
-        public void FreeNative()
-        {
-            if (_allocated != IntPtr.Zero)
-            {
-                Marshal.FreeBSTR(_allocated);
-            }
-        }
-    }
 }
diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <Import Project="..\..\..\..\build\testsite.props" />
 
   <PropertyGroup>
@@ -7,6 +7,7 @@
     <DefineConstants>FORWARDCOMPAT</DefineConstants>
     <CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
     <ImplicitUsings>disable</ImplicitUsings>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT'">

diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs
@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Net;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using System.Security.Principal;
 using System.Text;
 using System.Threading;
@@ -179,12 +180,12 @@ public void CompressedData(IApplicationBuilder builder)
             });
     }
 
-    [DllImport("kernel32.dll")]
-    static extern uint GetDllDirectory(uint nBufferLength, [Out] StringBuilder lpBuffer);
+    [LibraryImport("kernel32.dll", StringMarshalling = StringMarshalling.Utf16)]
+    private static partial uint GetDllDirectory(uint nBufferLength, [Out] char[] lpBuffer);
 
     private async Task DllDirectory(HttpContext context)
     {
-        var builder = new StringBuilder(1024);
+        var builder = new char[1024];
         GetDllDirectory(1024, builder);
         await context.Response.WriteAsync(builder.ToString());
     }

diff --git a/src/Shared/HttpSys/NativeInterop/UnsafeNativeMethods.cs b/src/Shared/HttpSys/NativeInterop/UnsafeNativeMethods.cs
@@ -143,15 +143,4 @@ internal unsafe struct TOKENBINDING_RESULT_LIST
             public TOKENBINDING_RESULT_DATA* resultData;
         }
     }
-
-    // DACL related stuff
-
-    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Instantiated natively")]
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct SECURITY_ATTRIBUTES
-    {
-        public uint nLength;
-        public IntPtr lpSecurityDescriptor;
-        public int bInheritHandle;
-    }
 }