Remove redundant CharSet from StructLayout attributes

xtqqczze · xtqqczze · commit 7a6b90079472 · 2025-10-20T11:55:23.000+01:00
Remove explicit `CharSet` values from `[StructLayout]` attributes applied to structs that do not contain `char`, `string`, or `StringBuilder` fields.
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/UnsafeNativeMethods.cs b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/UnsafeNativeMethods.cs
@@ -263,7 +263,7 @@ internal struct SystemTime
             public short Milliseconds;
         }
 
-        [StructLayout(LayoutKind.Explicit, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Explicit)]
         [SecurityCritical]
         internal struct EvtVariant
         {
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs
@@ -928,7 +928,7 @@ private struct WSManDWordDataInternal
         /// sequencing of data. Because of this the following structure will
         /// have only one string to hold stream information.
         /// </summary>
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct WSManStreamIDSetStruct
         {
             internal int streamIDsCount;
@@ -1078,7 +1078,7 @@ internal struct WSManOption
         /// <summary>
         /// Unmanaged to Managed: WSMAN_OPERATION_INFO includes the struct directly, so this cannot be made internal to WsmanOptionSet.
         /// </summary>
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         internal struct WSManOptionSetStruct
         {
             internal int optionsCount;
@@ -1326,7 +1326,7 @@ internal static WSManCommandArgSet UnMarshal(IntPtr unmanagedData)
 
         internal struct WSManShellDisconnectInfo : IDisposable
         {
-            [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+            [StructLayout(LayoutKind.Sequential)]
             private struct WSManShellDisconnectInfoInternal
             {
                 /// <summary>
@@ -1544,7 +1544,7 @@ internal static WSManEnvironmentVariableSet UnMarshal(IntPtr unmanagedData)
                 return result;
             }
 
-            [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+            [StructLayout(LayoutKind.Sequential)]
             private struct WSManEnvironmentVariableSetInternal
             {
                 internal uint varsCount;
@@ -1567,7 +1567,7 @@ internal struct WSManEnvironmentVariableInternal
         /// </summary>
         internal class WSManProxyInfo : IDisposable
         {
-            [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+            [StructLayout(LayoutKind.Sequential)]
             private struct WSManProxyInfoInternal
             {
                 public int proxyAccessType;
@@ -2232,7 +2232,7 @@ internal static WSManOperationInfo UnMarshal(IntPtr unmanagedData)
             /// selectorSet and optionSet are handled differently because they are structs that contain pointers to arrays of structs.
             /// Most other data structures in the API point to structures using IntPtr rather than including the actual structure.
             /// </summary>
-            [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+            [StructLayout(LayoutKind.Sequential)]
             private struct WSManOperationInfoInternal
             {
                 internal WSManFragmentInternal fragment;
@@ -2304,7 +2304,7 @@ internal static WSManSelectorSet UnMarshal(WSManSelectorSetStruct resultInternal
             /// <summary>
             /// Managed representation of WSMAN_SELECTOR_SET.
             /// </summary>
-            [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+            [StructLayout(LayoutKind.Sequential)]
             internal struct WSManSelectorSetStruct
             {
                 internal int numberKeys;
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManPlugin.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManPlugin.cs
@@ -89,7 +89,7 @@ internal enum WSManPluginErrorCodes : int
     /// Explicit destruction and release of the IntPtrs is not required because
     /// their lifetime is managed by WinRM.
     /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    [StructLayout(LayoutKind.Sequential)]
     internal class WSManPluginOperationShutdownContext // TODO: Rename to OperationShutdownContext when removing the MC++ module.
     {
         #region Internal Members

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ internal struct SystemTime`
`263`	`263`	`public short Milliseconds;`
`264`	`264`	`}`
`265`	`265`
`266`		`- [StructLayout(LayoutKind.Explicit, CharSet = CharSet.Unicode)]`
	`266`	`+ [StructLayout(LayoutKind.Explicit)]`
`267`	`267`	`[SecurityCritical]`
`268`	`268`	`internal struct EvtVariant`
`269`	`269`	`{`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ internal enum WSManPluginErrorCodes : int`
`89`	`89`	`/// Explicit destruction and release of the IntPtrs is not required because`
`90`	`90`	`/// their lifetime is managed by WinRM.`
`91`	`91`	`/// </summary>`
`92`		`- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]`
	`92`	`+ [StructLayout(LayoutKind.Sequential)]`
`93`	`93`	`internal class WSManPluginOperationShutdownContext // TODO: Rename to OperationShutdownContext when removing the MC++ module.`
`94`	`94`	`{`
`95`	`95`	`#region Internal Members`