diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Native.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Native.cs index 609320215de..607166b6f19 100644 --- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Native.cs +++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Native.cs @@ -155,7 +155,7 @@ public void Dispose() { if (objectName != IntPtr.Zero) { - ClrFacade.DestroyStructure(objectName); + Marshal.DestroyStructure(objectName); Marshal.FreeHGlobal(objectName); objectName = IntPtr.Zero; } diff --git a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Sam.cs b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Sam.cs index 20f582b6998..5c36b2c0097 100644 --- a/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Sam.cs +++ b/src/Microsoft.PowerShell.LocalAccounts/LocalAccounts/Sam.cs @@ -1252,7 +1252,7 @@ private LocalUser CreateUser(LocalUser userInfo, System.Security.SecureString pa out userHandle, out grantedAccess, out relativeId); - ClrFacade.DestroyStructure(buffer); + Marshal.DestroyStructure(buffer); Marshal.FreeHGlobal(buffer); buffer = IntPtr.Zero; ThrowOnFailure(status); @@ -1371,7 +1371,7 @@ private void RenameGroup(SecurityIdentifier sid, string newName) { if (buffer != IntPtr.Zero) { - ClrFacade.DestroyStructure(buffer); + Marshal.DestroyStructure(buffer); Marshal.FreeHGlobal(buffer); } if (aliasHandle != IntPtr.Zero) @@ -1700,7 +1700,7 @@ private void EnableUser(SecurityIdentifier sid, Enabling enable) status = SamApi.SamSetInformationUser(userHandle, USER_INFORMATION_CLASS.UserAllInformation, buffer); - ClrFacade.DestroyStructure(buffer); + Marshal.DestroyStructure(buffer); Marshal.FreeHGlobal(buffer); buffer = IntPtr.Zero; ThrowOnFailure(status); @@ -1760,7 +1760,7 @@ private void RenameUser(SecurityIdentifier sid, string newName) { if (buffer != IntPtr.Zero) { - ClrFacade.DestroyStructure(buffer); + Marshal.DestroyStructure(buffer); Marshal.FreeHGlobal(buffer); } if (userHandle != IntPtr.Zero) @@ -1903,7 +1903,7 @@ private LocalGroup CreateGroup(LocalGroup groupInfo, IntPtr domainHandle) Win32.MAXIMUM_ALLOWED, out aliasHandle, out relativeId); - ClrFacade.DestroyStructure(buffer); + Marshal.DestroyStructure(buffer); Marshal.FreeHGlobal(buffer); buffer = IntPtr.Zero; ThrowOnFailure(status); @@ -1920,7 +1920,7 @@ private LocalGroup CreateGroup(LocalGroup groupInfo, IntPtr domainHandle) ALIAS_INFORMATION_CLASS.AliasAdminCommentInformation, buffer); - ClrFacade.DestroyStructure(buffer); + Marshal.DestroyStructure(buffer); Marshal.FreeHGlobal(buffer); buffer = IntPtr.Zero; ThrowOnFailure(status); @@ -1995,7 +1995,7 @@ private void UpdateGroup(LocalGroup group, LocalGroup changed) { if (buffer != IntPtr.Zero) { - ClrFacade.DestroyStructure(buffer); + Marshal.DestroyStructure(buffer); Marshal.FreeHGlobal(buffer); } if (aliasHandle != IntPtr.Zero) @@ -2268,7 +2268,7 @@ private void SetUserData(IntPtr userHandle, { if (buffer != IntPtr.Zero) { - ClrFacade.DestroyStructure(buffer); + Marshal.DestroyStructure(buffer); Marshal.FreeHGlobal(buffer); } } @@ -2612,7 +2612,7 @@ private void SetUserPassword(IntPtr userHandle, { if (buffer != IntPtr.Zero) { - ClrFacade.DestroyStructure(buffer); + Marshal.DestroyStructure(buffer); Marshal.FreeHGlobal(buffer); } } diff --git a/src/System.Management.Automation/security/Authenticode.cs b/src/System.Management.Automation/security/Authenticode.cs index 47e0364bcee..c90cd1013aa 100644 --- a/src/System.Management.Automation/security/Authenticode.cs +++ b/src/System.Management.Automation/security/Authenticode.cs @@ -216,7 +216,7 @@ internal static Signature SignFile(SigningOption option, if (si.pSignExtInfo != null) { - ClrFacade.DestroyStructure(si.pSignExtInfo); + Marshal.DestroyStructure(si.pSignExtInfo); Marshal.FreeCoTaskMem(si.pSignExtInfo); } @@ -268,7 +268,7 @@ internal static Signature SignFile(SigningOption option, } finally { - ClrFacade.DestroyStructure(pSignInfo); + Marshal.DestroyStructure(pSignInfo); Marshal.FreeCoTaskMem(pSignInfo); } @@ -552,9 +552,9 @@ private static DWORD GetWinTrustData(string fileName, string fileContent, } finally { - ClrFacade.DestroyStructure(WINTRUST_ACTION_GENERIC_VERIFY_V2); + Marshal.DestroyStructure(WINTRUST_ACTION_GENERIC_VERIFY_V2); Marshal.FreeCoTaskMem(WINTRUST_ACTION_GENERIC_VERIFY_V2); - ClrFacade.DestroyStructure(wtdBuffer); + Marshal.DestroyStructure(wtdBuffer); Marshal.FreeCoTaskMem(wtdBuffer); } return dwResult; diff --git a/src/System.Management.Automation/security/nativeMethods.cs b/src/System.Management.Automation/security/nativeMethods.cs index 04878490a1d..b19a9021bed 100644 --- a/src/System.Management.Automation/security/nativeMethods.cs +++ b/src/System.Management.Automation/security/nativeMethods.cs @@ -1037,9 +1037,9 @@ internal static DWORD DestroyWintrustDataStruct(WINTRUST_DATA wtd) } finally { - ClrFacade.DestroyStructure(wtdBuffer); + Marshal.DestroyStructure(wtdBuffer); Marshal.FreeCoTaskMem(wtdBuffer); - ClrFacade.DestroyStructure(WINTRUST_ACTION_GENERIC_VERIFY_V2); + Marshal.DestroyStructure(WINTRUST_ACTION_GENERIC_VERIFY_V2); Marshal.FreeCoTaskMem(WINTRUST_ACTION_GENERIC_VERIFY_V2); } @@ -1051,12 +1051,12 @@ internal static DWORD DestroyWintrustDataStruct(WINTRUST_DATA wtd) (WINTRUST_BLOB_INFO)ClrFacade.PtrToStructure(wtd.Choice.pBlob); Marshal.FreeCoTaskMem(originalBlob.pbMemObject); - ClrFacade.DestroyStructure(wtd.Choice.pBlob); + Marshal.DestroyStructure(wtd.Choice.pBlob); Marshal.FreeCoTaskMem(wtd.Choice.pBlob); } else { - ClrFacade.DestroyStructure(wtd.Choice.pFile); + Marshal.DestroyStructure(wtd.Choice.pFile); Marshal.FreeCoTaskMem(wtd.Choice.pFile); } @@ -1170,9 +1170,9 @@ internal static void FreeWVTStateData(System.IntPtr phWVTStateData) } finally { - ClrFacade.DestroyStructure(wtdBuffer); + Marshal.DestroyStructure(wtdBuffer); Marshal.FreeCoTaskMem(wtdBuffer); - ClrFacade.DestroyStructure(WINTRUST_ACTION_GENERIC_VERIFY_V2); + Marshal.DestroyStructure(WINTRUST_ACTION_GENERIC_VERIFY_V2); Marshal.FreeCoTaskMem(WINTRUST_ACTION_GENERIC_VERIFY_V2); } } diff --git a/src/System.Management.Automation/utils/ClrFacade.cs b/src/System.Management.Automation/utils/ClrFacade.cs index 1f3ae196b0a..1e1f1e65697 100644 --- a/src/System.Management.Automation/utils/ClrFacade.cs +++ b/src/System.Management.Automation/utils/ClrFacade.cs @@ -78,15 +78,6 @@ internal static int SizeOf() return Marshal.SizeOf(); } - /// - /// Facade for Marshal.DestroyStructure - /// - internal static void DestroyStructure(IntPtr ptr) - { - // Marshal.DestroyStructure(IntPtr, Type) is obsolete in CoreCLR - Marshal.DestroyStructure(ptr); - } - /// /// Facade for Marshal.PtrToStructure ///