From cee5558a02f6242b4448d1c6849247f5582bc2c4 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 28 Jul 2017 14:15:06 -0700
Subject: [PATCH] Clean up ClrFacade.cs - remove ClrFacade.StructureToPtr

---
 .../LocalAccounts/Sam.cs                              |  6 +++---
 .../engine/remoting/fanin/WSManPluginFacade.cs        |  2 +-
 .../namespaces/FileSystemProvider.cs                  |  4 ++--
 src/System.Management.Automation/utils/ClrFacade.cs   | 11 -----------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Sam.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Sam.cs
index 20f582b6998..cae1f50f95b 100644
--- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Sam.cs
+++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Sam.cs
@@ -2248,7 +2248,7 @@ private void SetUserData(IntPtr userHandle,
                         info.UserAccountControl = uac;
 
                     buffer = Marshal.AllocHGlobal(ClrFacade.SizeOf<USER_ALL_INFORMATION>());
-                    ClrFacade.StructureToPtr<USER_ALL_INFORMATION>(info, buffer, false);
+                    Marshal.StructureToPtr<USER_ALL_INFORMATION>(info, buffer, false);
 
                     status = SamApi.SamSetInformationUser(userHandle,
                                                           USER_INFORMATION_CLASS.UserAllInformation,
@@ -2393,7 +2393,7 @@ private void SetSamDacl(IntPtr objectHandle, RawAcl rawAcl)
 
                 if (rawAcl != null && rawAcl.BinaryLength > 0)
                 {
-                    ClrFacade.StructureToPtr<SECURITY_DESCRIPTOR>(sd, ipsd, false);
+                    Marshal.StructureToPtr<SECURITY_DESCRIPTOR>(sd, ipsd, false);
 
                     // put the DACL into unmanaged memory
                     var length = rawAcl.BinaryLength;
@@ -2601,7 +2601,7 @@ private void SetUserPassword(IntPtr userHandle,
                     info.PasswordExpired = setPwExpire;
 
                     buffer = Marshal.AllocHGlobal(Marshal.SizeOf(info));
-                    ClrFacade.StructureToPtr<USER_SET_PASSWORD_INFORMATION>(info, buffer, false);
+                    Marshal.StructureToPtr<USER_SET_PASSWORD_INFORMATION>(info, buffer, false);
 
                     var status = SamApi.SamSetInformationUser(userHandle,
                                                               USER_INFORMATION_CLASS.UserSetPasswordInformation,
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
index 9e5ea7e9c6c..1aa7bbb753a 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
@@ -468,7 +468,7 @@ public static int InitPlugin(
                 // If there are any non-critical exceptions (e.g. we are running on CLR prior to 4.6.2), we won't be able to use long paths
             }
 #endif
-            ClrFacade.StructureToPtr<WSManPluginEntryDelegates.WSManPluginEntryDelegatesInternal>(workerPtrs.UnmanagedStruct, wkrPtrs, false);
+            Marshal.StructureToPtr<WSManPluginEntryDelegates.WSManPluginEntryDelegatesInternal>(workerPtrs.UnmanagedStruct, wkrPtrs, false);
             return WSManPluginConstants.ExitCodeSuccess;
         }
 
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index c4cb76d0c8e..d4c9a31dcc5 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -8561,7 +8561,7 @@ internal static bool DeleteJunction(string junctionPath)
                         // Using the wrong one results in mismatched-tag error.
 
                         REPARSE_GUID_DATA_BUFFER junctionData = new REPARSE_GUID_DATA_BUFFER();
-                        ClrFacade.StructureToPtr<REPARSE_GUID_DATA_BUFFER>(junctionData, outBuffer, false);
+                        Marshal.StructureToPtr<REPARSE_GUID_DATA_BUFFER>(junctionData, outBuffer, false);
 
                         result = DeviceIoControl(dangerousHandle, FSCTL_GET_REPARSE_POINT, IntPtr.Zero, 0,
                             outBuffer, inOutBufferSize, out bytesReturned, IntPtr.Zero);
@@ -8575,7 +8575,7 @@ internal static bool DeleteJunction(string junctionPath)
                         junctionData.ReparseDataLength = 0;
                         junctionData.DataBuffer = new char[MAX_REPARSE_SIZE];
 
-                        ClrFacade.StructureToPtr<REPARSE_GUID_DATA_BUFFER>(junctionData, inBuffer, false);
+                        Marshal.StructureToPtr<REPARSE_GUID_DATA_BUFFER>(junctionData, inBuffer, false);
 
                         // To delete a reparse point:
                         // ReparseDataLength must be 0
diff --git a/src/System.Management.Automation/utils/ClrFacade.cs b/src/System.Management.Automation/utils/ClrFacade.cs
index 1f3ae196b0a..87e34171330 100644
--- a/src/System.Management.Automation/utils/ClrFacade.cs
+++ b/src/System.Management.Automation/utils/ClrFacade.cs
@@ -96,17 +96,6 @@ internal static T PtrToStructure<T>(IntPtr ptr)
             return Marshal.PtrToStructure<T>(ptr);
         }
 
-        /// <summary>
-        /// Wraps Marshal.StructureToPtr to hide differences between the CLRs.
-        /// </summary>
-        internal static void StructureToPtr<T>(
-            T structure,
-            IntPtr ptr,
-            bool deleteOld)
-        {
-            Marshal.StructureToPtr<T>(structure, ptr, deleteOld);
-        }
-
         #endregion Marshal
 
         #region Assembly