a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PrivilegeUtil: use native methods to get pointer offset (#43461)

pull/4420/head
Jordan Borean 2018-07-31 08:33:49 +10:00 committed by ansibot
parent 240b65ddda
commit d115794bf7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ansible/module_utils/powershell/Ansible.ModuleUtils.PrivilegeUtil.psm1
View File

@ -166,7 +166,7 @@ namespace Ansible.PrivilegeUtil
NativeHelpers.TOKEN_PRIVILEGES privilegeInfo = (NativeHelpers.TOKEN_PRIVILEGES)Marshal.PtrToStructure(privilegesPtr, typeof(NativeHelpers.TOKEN_PRIVILEGES)); NativeHelpers.TOKEN_PRIVILEGES privilegeInfo = (NativeHelpers.TOKEN_PRIVILEGES)Marshal.PtrToStructure(privilegesPtr, typeof(NativeHelpers.TOKEN_PRIVILEGES));
privileges = new NativeHelpers.LUID_AND_ATTRIBUTES[privilegeInfo.PrivilegeCount]; privileges = new NativeHelpers.LUID_AND_ATTRIBUTES[privilegeInfo.PrivilegeCount];
PtrToStructureArray(privileges, privilegesPtr.ToInt64() + Marshal.SizeOf(privilegeInfo.PrivilegeCount)); PtrToStructureArray(privileges, IntPtr.Add(privilegesPtr, Marshal.SizeOf(privilegeInfo.PrivilegeCount)));
} }
finally finally
{ {
@ -301,7 +301,7 @@ namespace Ansible.PrivilegeUtil
// Marshal the oldStatePtr to the struct // Marshal the oldStatePtr to the struct
NativeHelpers.TOKEN_PRIVILEGES oldState = (NativeHelpers.TOKEN_PRIVILEGES)Marshal.PtrToStructure(oldStatePtr, typeof(NativeHelpers.TOKEN_PRIVILEGES)); NativeHelpers.TOKEN_PRIVILEGES oldState = (NativeHelpers.TOKEN_PRIVILEGES)Marshal.PtrToStructure(oldStatePtr, typeof(NativeHelpers.TOKEN_PRIVILEGES));
oldStatePrivileges = new NativeHelpers.LUID_AND_ATTRIBUTES[oldState.PrivilegeCount]; oldStatePrivileges = new NativeHelpers.LUID_AND_ATTRIBUTES[oldState.PrivilegeCount];
PtrToStructureArray(oldStatePrivileges, oldStatePtr.ToInt64() + Marshal.SizeOf(oldState.PrivilegeCount)); PtrToStructureArray(oldStatePrivileges, IntPtr.Add(oldStatePtr, Marshal.SizeOf(oldState.PrivilegeCount)));
} }
finally finally
{ {
@ -334,11 +334,11 @@ namespace Ansible.PrivilegeUtil
return name.ToString(); return name.ToString();
} }
private static void PtrToStructureArray<T>(T[] array, Int64 pointerAddress) private static void PtrToStructureArray<T>(T[] array, IntPtr ptr)
{ {
Int64 pointerOffset = pointerAddress; IntPtr ptrOffset = ptr;
for (int i = 0; i < array.Length; i++, pointerOffset += Marshal.SizeOf(typeof(T))) for (int i = 0; i < array.Length; i++, ptrOffset = IntPtr.Add(ptrOffset, Marshal.SizeOf(typeof(T))))
array[i] = (T)Marshal.PtrToStructure(new IntPtr(pointerOffset), typeof(T)); array[i] = (T)Marshal.PtrToStructure(ptrOffset, typeof(T));
} }
private static int StructureToBytes<T>(T structure, byte[] array, int offset) private static int StructureToBytes<T>(T structure, byte[] array, int offset)