Replace Marshal.SizeOf for primitive types (#33020)

nxtn · web-flow · commit 6d9e5035905a · 2020-02-29T20:41:44.000-08:00
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/utils.cs b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/common/utils.cs
@@ -52,10 +52,10 @@ internal static IntPtr AllocHGlobalIntPtrArray(int size)
         {
             checked
             {
-                IntPtr intPtrArray = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)) * size);
+                IntPtr intPtrArray = Marshal.AllocHGlobal(IntPtr.Size * size);
                 for (int i = 0; i < size; i++)
                 {
-                    IntPtr tempPtr = (IntPtr)((long)intPtrArray + Marshal.SizeOf(typeof(IntPtr)) * i);
+                    IntPtr tempPtr = (IntPtr)((long)intPtrArray + IntPtr.Size * i);
                     Marshal.WriteIntPtr(tempPtr, IntPtr.Zero);
                 }
                 return intPtrArray;
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapConnection.cs b/src/libraries/System.DirectoryServices.Protocols/src/System/DirectoryServices/Protocols/ldap/LdapConnection.cs
@@ -1298,7 +1298,7 @@ internal LdapControl[] BuildControlArray(DirectoryControlCollection controls, bo
                             managedControls[i].ldctl_value = new berval
                             {
                                 bv_len = byteControlValue.Length,
-                                bv_val = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(byte)) * byteControlValue.Length)
+                                bv_val = Marshal.AllocHGlobal(sizeof(byte) * byteControlValue.Length)
                             };
                             Marshal.Copy(byteControlValue, 0, managedControls[i].ldctl_value.bv_val, managedControls[i].ldctl_value.bv_len);
                         }
diff --git a/src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/ActiveDirectoryReplicationMetaData.cs b/src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/ActiveDirectoryReplicationMetaData.cs
@@ -65,14 +65,14 @@ internal void AddHelper(int count, IntPtr info, bool advanced)
             {
                 if (advanced)
                 {
-                    addr = IntPtr.Add(info, Marshal.SizeOf(typeof(int)) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_ATTR_META_DATA_2)));
+                    addr = IntPtr.Add(info, sizeof(int) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_ATTR_META_DATA_2)));
 
                     AttributeMetadata managedMetaData = new AttributeMetadata(addr, true, _server, _nameTable);
                     Add(managedMetaData.Name, managedMetaData);
                 }
                 else
                 {
-                    addr = IntPtr.Add(info, Marshal.SizeOf(typeof(int)) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_ATTR_META_DATA)));
+                    addr = IntPtr.Add(info, sizeof(int) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_ATTR_META_DATA)));
 
                     AttributeMetadata managedMetaData = new AttributeMetadata(addr, false, _server, _nameTable);
                     Add(managedMetaData.Name, managedMetaData);
diff --git a/src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/ReplicationCursorCollection.cs b/src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/ReplicationCursorCollection.cs
@@ -56,7 +56,7 @@ internal void AddHelper(string partition, object cursors, bool advanced, IntPtr
             {
                 if (advanced)
                 {
-                    addr = IntPtr.Add(info, Marshal.SizeOf(typeof(int)) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_CURSOR_3)));
+                    addr = IntPtr.Add(info, sizeof(int) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_CURSOR_3)));
                     DS_REPL_CURSOR_3 cursor = new DS_REPL_CURSOR_3();
                     Marshal.PtrToStructure(addr, cursor);
 
@@ -70,7 +70,7 @@ internal void AddHelper(string partition, object cursors, bool advanced, IntPtr
                 }
                 else
                 {
-                    addr = IntPtr.Add(info, Marshal.SizeOf(typeof(int)) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_CURSOR)));
+                    addr = IntPtr.Add(info, sizeof(int) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_CURSOR)));
                     DS_REPL_CURSOR cursor = new DS_REPL_CURSOR();
                     Marshal.PtrToStructure(addr, cursor);
 
diff --git a/src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/ReplicationFailureCollection.cs b/src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/ReplicationFailureCollection.cs
@@ -53,7 +53,7 @@ internal void AddHelper(DS_REPL_KCC_DSA_FAILURES failures, IntPtr info)
 
             for (int i = 0; i < count; i++)
             {
-                addr = IntPtr.Add(info, Marshal.SizeOf(typeof(int)) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_KCC_DSA_FAILURE)));
+                addr = IntPtr.Add(info, sizeof(int) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_KCC_DSA_FAILURE)));
 
                 ReplicationFailure managedFailure = new ReplicationFailure(addr, _server, _nameTable);
 
diff --git a/src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/ReplicationNeighborCollection.cs b/src/libraries/System.DirectoryServices/src/System/DirectoryServices/ActiveDirectory/ReplicationNeighborCollection.cs
@@ -53,7 +53,7 @@ internal void AddHelper(DS_REPL_NEIGHBORS neighbors, IntPtr info)
 
             for (int i = 0; i < count; i++)
             {
-                addr = IntPtr.Add(info, Marshal.SizeOf(typeof(int)) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_NEIGHBOR)));
+                addr = IntPtr.Add(info, sizeof(int) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_NEIGHBOR)));
 
                 ReplicationNeighbor managedNeighbor = new ReplicationNeighbor(addr, _server, _nameTable);
 
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/EncoderParameters.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/EncoderParameters.cs
@@ -57,11 +57,11 @@ internal IntPtr ConvertToMemory()
             int size = Marshal.SizeOf(typeof(EncoderParameter));
 
             int length = _param.Length;
-            IntPtr memory = Marshal.AllocHGlobal(checked(length * size + Marshal.SizeOf(typeof(IntPtr))));
+            IntPtr memory = Marshal.AllocHGlobal(checked(length * size + IntPtr.Size));
 
             Marshal.WriteIntPtr(memory, (IntPtr)length);
 
-            long arrayOffset = checked((long)memory + Marshal.SizeOf(typeof(IntPtr)));
+            long arrayOffset = checked((long)memory + IntPtr.Size);
 
             for (int i = 0; i < length; i++)
             {
@@ -86,7 +86,7 @@ internal static EncoderParameters ConvertFromMemory(IntPtr memory)
 
             EncoderParameters p = new EncoderParameters(count);
             int size = Marshal.SizeOf(typeof(EncoderParameter));
-            long arrayOffset = (long)memory + Marshal.SizeOf(typeof(IntPtr));
+            long arrayOffset = (long)memory + IntPtr.Size;
 
             for (int i = 0; i < count; i++)
             {
diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Windows.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Windows.cs
@@ -180,11 +180,11 @@ public static StringCollection InstalledPrinters
                 // PRINTER_INFO_4 is 12 or 24 bytes in size depending on the architecture.
                 if (IntPtr.Size == 8)
                 {
-                    sizeofstruct = (IntPtr.Size * 2) + (Marshal.SizeOf(typeof(int)) * 1) + Padding64Bit;
+                    sizeofstruct = (IntPtr.Size * 2) + (sizeof(int) * 1) + Padding64Bit;
                 }
                 else
                 {
-                    sizeofstruct = (IntPtr.Size * 2) + (Marshal.SizeOf(typeof(int)) * 1);
+                    sizeofstruct = (IntPtr.Size * 2) + (sizeof(int) * 1);
                 }
 
                 int bufferSize;
@@ -454,7 +454,7 @@ public bool IsDirectPrintingSupported(ImageFormat imageFormat)
                 HandleRef hdc = new HandleRef(dc, dc.Hdc);
                 try
                 {
-                    isDirectPrintingSupported = SafeNativeMethods.ExtEscape(hdc, SafeNativeMethods.QUERYESCSUPPORT, Marshal.SizeOf(typeof(int)), ref nEscape, 0, out outData) > 0;
+                    isDirectPrintingSupported = SafeNativeMethods.ExtEscape(hdc, SafeNativeMethods.QUERYESCSUPPORT, sizeof(int), ref nEscape, 0, out outData) > 0;
                 }
                 finally
                 {
@@ -495,10 +495,10 @@ public bool IsDirectPrintingSupported(Image image)
                         HandleRef hdc = new HandleRef(dc, dc.Hdc);
                         try
                         {
-                            bool querySupported = SafeNativeMethods.ExtEscape(hdc, SafeNativeMethods.QUERYESCSUPPORT, Marshal.SizeOf(typeof(int)), ref nEscape, 0, out outData) > 0;
+                            bool querySupported = SafeNativeMethods.ExtEscape(hdc, SafeNativeMethods.QUERYESCSUPPORT, sizeof(int), ref nEscape, 0, out outData) > 0;
                             if (querySupported)
                             {
-                                isDirectPrintingSupported = (SafeNativeMethods.ExtEscape(hdc, nEscape, pvImageLen, pvImage, Marshal.SizeOf(typeof(int)), out outData) > 0)
+                                isDirectPrintingSupported = (SafeNativeMethods.ExtEscape(hdc, nEscape, pvImageLen, pvImage, sizeof(int), out outData) > 0)
                                                             && (outData == 1);
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,10 @@ internal static IntPtr AllocHGlobalIntPtrArray(int size)`
`52`	`52`	`{`
`53`	`53`	`checked`
`54`	`54`	`{`
`55`		`- IntPtr intPtrArray = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)) * size);`
	`55`	`+ IntPtr intPtrArray = Marshal.AllocHGlobal(IntPtr.Size * size);`
`56`	`56`	`for (int i = 0; i < size; i++)`
`57`	`57`	`{`
`58`		`- IntPtr tempPtr = (IntPtr)((long)intPtrArray + Marshal.SizeOf(typeof(IntPtr)) * i);`
	`58`	`+ IntPtr tempPtr = (IntPtr)((long)intPtrArray + IntPtr.Size * i);`
`59`	`59`	`Marshal.WriteIntPtr(tempPtr, IntPtr.Zero);`
`60`	`60`	`}`
`61`	`61`	`return intPtrArray;`
Original file line number	Diff line number	Diff line change
`@@ -1298,7 +1298,7 @@ internal LdapControl[] BuildControlArray(DirectoryControlCollection controls, bo`
`1298`	`1298`	`managedControls[i].ldctl_value = new berval`
`1299`	`1299`	`{`
`1300`	`1300`	`bv_len = byteControlValue.Length,`
`1301`		`- bv_val = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(byte)) * byteControlValue.Length)`
	`1301`	`+ bv_val = Marshal.AllocHGlobal(sizeof(byte) * byteControlValue.Length)`
`1302`	`1302`	`};`
`1303`	`1303`	`Marshal.Copy(byteControlValue, 0, managedControls[i].ldctl_value.bv_val, managedControls[i].ldctl_value.bv_len);`
`1304`	`1304`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,14 @@ internal void AddHelper(int count, IntPtr info, bool advanced)`
`65`	`65`	`{`
`66`	`66`	`if (advanced)`
`67`	`67`	`{`
`68`		`- addr = IntPtr.Add(info, Marshal.SizeOf(typeof(int)) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_ATTR_META_DATA_2)));`
	`68`	`+ addr = IntPtr.Add(info, sizeof(int) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_ATTR_META_DATA_2)));`
`69`	`69`
`70`	`70`	`AttributeMetadata managedMetaData = new AttributeMetadata(addr, true, _server, _nameTable);`
`71`	`71`	`Add(managedMetaData.Name, managedMetaData);`
`72`	`72`	`}`
`73`	`73`	`else`
`74`	`74`	`{`
`75`		`- addr = IntPtr.Add(info, Marshal.SizeOf(typeof(int)) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_ATTR_META_DATA)));`
	`75`	`+ addr = IntPtr.Add(info, sizeof(int) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_ATTR_META_DATA)));`
`76`	`76`
`77`	`77`	`AttributeMetadata managedMetaData = new AttributeMetadata(addr, false, _server, _nameTable);`
`78`	`78`	`Add(managedMetaData.Name, managedMetaData);`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ internal void AddHelper(string partition, object cursors, bool advanced, IntPtr`
`56`	`56`	`{`
`57`	`57`	`if (advanced)`
`58`	`58`	`{`
`59`		`- addr = IntPtr.Add(info, Marshal.SizeOf(typeof(int)) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_CURSOR_3)));`
	`59`	`+ addr = IntPtr.Add(info, sizeof(int) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_CURSOR_3)));`
`60`	`60`	`DS_REPL_CURSOR_3 cursor = new DS_REPL_CURSOR_3();`
`61`	`61`	`Marshal.PtrToStructure(addr, cursor);`
`62`	`62`
`@@ -70,7 +70,7 @@ internal void AddHelper(string partition, object cursors, bool advanced, IntPtr`
`70`	`70`	`}`
`71`	`71`	`else`
`72`	`72`	`{`
`73`		`- addr = IntPtr.Add(info, Marshal.SizeOf(typeof(int)) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_CURSOR)));`
	`73`	`+ addr = IntPtr.Add(info, sizeof(int) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_CURSOR)));`
`74`	`74`	`DS_REPL_CURSOR cursor = new DS_REPL_CURSOR();`
`75`	`75`	`Marshal.PtrToStructure(addr, cursor);`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ internal void AddHelper(DS_REPL_KCC_DSA_FAILURES failures, IntPtr info)`
`53`	`53`
`54`	`54`	`for (int i = 0; i < count; i++)`
`55`	`55`	`{`
`56`		`- addr = IntPtr.Add(info, Marshal.SizeOf(typeof(int)) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_KCC_DSA_FAILURE)));`
	`56`	`+ addr = IntPtr.Add(info, sizeof(int) * 2 + i * Marshal.SizeOf(typeof(DS_REPL_KCC_DSA_FAILURE)));`
`57`	`57`
`58`	`58`	`ReplicationFailure managedFailure = new ReplicationFailure(addr, _server, _nameTable);`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -180,11 +180,11 @@ public static StringCollection InstalledPrinters`
`180`	`180`	`// PRINTER_INFO_4 is 12 or 24 bytes in size depending on the architecture.`
`181`	`181`	`if (IntPtr.Size == 8)`
`182`	`182`	`{`
`183`		`- sizeofstruct = (IntPtr.Size * 2) + (Marshal.SizeOf(typeof(int)) * 1) + Padding64Bit;`
	`183`	`+ sizeofstruct = (IntPtr.Size * 2) + (sizeof(int) * 1) + Padding64Bit;`
`184`	`184`	`}`
`185`	`185`	`else`
`186`	`186`	`{`
`187`		`- sizeofstruct = (IntPtr.Size * 2) + (Marshal.SizeOf(typeof(int)) * 1);`
	`187`	`+ sizeofstruct = (IntPtr.Size * 2) + (sizeof(int) * 1);`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`int bufferSize;`
`@@ -454,7 +454,7 @@ public bool IsDirectPrintingSupported(ImageFormat imageFormat)`
`454`	`454`	`HandleRef hdc = new HandleRef(dc, dc.Hdc);`
`455`	`455`	`try`
`456`	`456`	`{`
`457`		`- isDirectPrintingSupported = SafeNativeMethods.ExtEscape(hdc, SafeNativeMethods.QUERYESCSUPPORT, Marshal.SizeOf(typeof(int)), ref nEscape, 0, out outData) > 0;`
	`457`	`+ isDirectPrintingSupported = SafeNativeMethods.ExtEscape(hdc, SafeNativeMethods.QUERYESCSUPPORT, sizeof(int), ref nEscape, 0, out outData) > 0;`
`458`	`458`	`}`
`459`	`459`	`finally`
`460`	`460`	`{`
`@@ -495,10 +495,10 @@ public bool IsDirectPrintingSupported(Image image)`
`495`	`495`	`HandleRef hdc = new HandleRef(dc, dc.Hdc);`
`496`	`496`	`try`
`497`	`497`	`{`
`498`		`- bool querySupported = SafeNativeMethods.ExtEscape(hdc, SafeNativeMethods.QUERYESCSUPPORT, Marshal.SizeOf(typeof(int)), ref nEscape, 0, out outData) > 0;`
	`498`	`+ bool querySupported = SafeNativeMethods.ExtEscape(hdc, SafeNativeMethods.QUERYESCSUPPORT, sizeof(int), ref nEscape, 0, out outData) > 0;`
`499`	`499`	`if (querySupported)`
`500`	`500`	`{`
`501`		`- isDirectPrintingSupported = (SafeNativeMethods.ExtEscape(hdc, nEscape, pvImageLen, pvImage, Marshal.SizeOf(typeof(int)), out outData) > 0)`
	`501`	`+ isDirectPrintingSupported = (SafeNativeMethods.ExtEscape(hdc, nEscape, pvImageLen, pvImage, sizeof(int), out outData) > 0)`
`502`	`502`	`&& (outData == 1);`
`503`	`503`	`}`
`504`	`504`	`}`