Merge commit '6911289cc35166f1179c63e1ed0bf2dc389f572f'

Author: Mirroring

eng/Versions.props

@@ -49,7 +49,7 @@
       Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
     -->
     <MicrosoftNETCoreILAsmVersion>$(MicrosoftNETCoreILAsmPackageVersion)</MicrosoftNETCoreILAsmVersion>
-    <MicrosoftWindowsCsWin32PackageVersion>0.3.75-beta</MicrosoftWindowsCsWin32PackageVersion>
+    <MicrosoftWindowsCsWin32PackageVersion>0.3.106</MicrosoftWindowsCsWin32PackageVersion>
   </PropertyGroup>
   <!-- Docs / Intellisense -->
   <PropertyGroup>

src/System.Private.Windows.Core/src/Windows/Win32/Graphics/GdiPlus/EncoderParameters.cs

@@ -1,12 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Runtime.InteropServices;
-
 namespace Windows.Win32.Graphics.GdiPlus;
 
 internal partial struct EncoderParameters
 {
     [UnscopedRef]
-    internal unsafe Span<EncoderParameter> Parameters => MemoryMarshal.CreateSpan(ref Parameter._0, (int)Count);
+    internal unsafe Span<EncoderParameter> Parameters => Parameter.AsSpan((int)Count);
 }

src/System.Windows.Forms.Primitives/src/NativeMethods.txt

@@ -277,6 +277,7 @@ HideCaret
 HitTestThemeBackground
 HT*
 HTML_HELP_COMMAND
+HtmlHelp
 HTREEITEM
 IAccessible
 IAccessibleEx

src/System.Windows.Forms.Primitives/src/Windows/Win32/PInvoke.HtmlHelp.cs

@@ -1,25 +1,19 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Runtime.InteropServices;
 using Windows.Win32.Data.HtmlHelp;
 
 namespace Windows.Win32;
 
 internal static partial class PInvoke
 {
-    internal static unsafe HWND HtmlHelp(HWND hwndCaller, string? pszFile, HTML_HELP_COMMAND uCommand, nuint dwData)
+    /// <inheritdoc cref="HtmlHelp(HWND, string, HTML_HELP_COMMAND, nuint)" />
+    internal static unsafe HWND HtmlHelp<T>(T hwndCaller, string? pszFile, HTML_HELP_COMMAND uCommand, nuint dwData)
+        where T : IHandle<HWND>
     {
-        // Copied from generated code pending resolution of https://github.com/microsoft/win32metadata/issues/1749
-
-        fixed (char* p = pszFile)
-        {
-            HWND __retVal = LocalExternFunction(hwndCaller, p, (uint)uCommand, dwData);
-            return __retVal;
-        }
-
-        [DllImport(Libraries.Hhctrl, ExactSpelling = true, EntryPoint = "HtmlHelpW")]
-        static extern HWND LocalExternFunction(HWND hwndCaller, PCWSTR pszFile, uint uCommand, nuint dwData);
+        HWND result = HtmlHelp(hwndCaller.Handle, pszFile, uCommand, dwData);
+        GC.KeepAlive(hwndCaller.Wrapper);
+        return result;
     }
 
     /// <inheritdoc cref="HtmlHelp(HWND, string, HTML_HELP_COMMAND, nuint)" />

src/System.Windows.Forms.Primitives/src/Windows/Win32/PInvoke.ImmGetContext.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Windows.Win32.Globalization;
+using Windows.Win32.UI.Input.Ime;
 
 namespace Windows.Win32;
 

src/System.Windows.Forms.Primitives/src/Windows/Win32/PInvoke.ImmReleaseContext.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Windows.Win32.Globalization;
+using Windows.Win32.UI.Input.Ime;
 
 namespace Windows.Win32;
 

src/System.Windows.Forms.Primitives/tests/TestUtilities/Metafiles/EmfRecord.cs

@@ -29,7 +29,7 @@ public EmfRecord(
     }
 
     public ENHANCED_METAFILE_RECORD_TYPE Type => _lpmr->iType;
-    public ReadOnlySpan<uint> Params => _lpmr->dParm.AsReadOnlySpan();
+    public ReadOnlySpan<uint> Params => _lpmr->dParm.AsSpan((int)(_lpmr->nSize / sizeof(uint)) - 2);
     public ReadOnlySpan<HGDIOBJ> Handles => new(_lpht, _nHandles);
 
     public ENHMETAHEADER* HeaderRecord => Type == ENHANCED_METAFILE_RECORD_TYPE.EMR_HEADER ? (ENHMETAHEADER*)_lpmr : null;

src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Oleaut32/SAFEARRAYTests.cs

@@ -66,8 +66,8 @@ public void SAFEARRAY_CreateSingleDimension_GetProperties_Success(ushort vt, ush
             Assert.Equal(expectedCbElements, psa->cbElements);
             Assert.Equal(0u, psa->cLocks);
             Assert.True(psa->pvData != null);
-            Assert.Equal(10u, psa->rgsabound._0.cElements);
-            Assert.Equal(1, psa->rgsabound._0.lLbound);
+            Assert.Equal(10u, psa->rgsabound.AsSpan(1)[0].cElements);
+            Assert.Equal(1, psa->rgsabound.AsSpan(1)[0].lLbound);
 
             VARENUM arrayVt = VT_EMPTY;
             HRESULT hr = PInvokeCore.SafeArrayGetVartype(psa, &arrayVt);
@@ -102,8 +102,8 @@ public void SAFEARRAY_CreateSingleDimensionRECORD_GetProperties_Success()
             Assert.Equal((uint)sizeof(int), psa->cbElements);
             Assert.Equal(0u, psa->cLocks);
             Assert.True(psa->pvData != null);
-            Assert.Equal(10u, psa->rgsabound._0.cElements);
-            Assert.Equal(1, psa->rgsabound._0.lLbound);
+            Assert.Equal(10u, psa->rgsabound.AsSpan(1)[0].cElements);
+            Assert.Equal(1, psa->rgsabound.AsSpan(1)[0].lLbound);
 
             VARENUM arrayVt = VT_EMPTY;
             HRESULT hr = PInvokeCore.SafeArrayGetVartype(psa, &arrayVt);
@@ -190,8 +190,8 @@ public void SAFEARRAY_CreateMultipleDimensions_GetProperties_Success(ushort vt,
             Assert.Equal(expectedCbElements, psa->cbElements);
             Assert.Equal(0u, psa->cLocks);
             Assert.True(psa->pvData != null);
-            Assert.Equal(20u, psa->rgsabound._0.cElements);
-            Assert.Equal(0, psa->rgsabound._0.lLbound);
+            Assert.Equal(20u, psa->rgsabound.AsSpan(1)[0].cElements);
+            Assert.Equal(0, psa->rgsabound.AsSpan(1)[0].lLbound);
             Assert.Equal(10u, ((SAFEARRAYBOUND*)&psa->rgsabound)[1].cElements);
             Assert.Equal(1, ((SAFEARRAYBOUND*)&psa->rgsabound)[1].lLbound);
 

src/System.Windows.Forms/src/System/Windows/Forms/Control.Ime.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.ComponentModel;
-using Windows.Win32.Globalization;
 using Windows.Win32.UI.Input.Ime;
 
 namespace System.Windows.Forms;

src/System.Windows.Forms/src/System/Windows/Forms/Controls/TextBox/MaskedTextBox.cs

@@ -7,7 +7,6 @@
 using System.Drawing.Design;
 using System.Globalization;
 using System.Windows.Forms.VisualStyles;
-using Windows.Win32.Globalization;
 using Windows.Win32.UI.Accessibility;
 using Windows.Win32.UI.Input.Ime;