Added additional object queries.

tyranid · tyranid · commit decb80bda6a4 · 2020-11-18T21:45:27.000-08:00
diff --git a/NtApiDotNet.Forms/Properties/AssemblyInfo.cs b/NtApiDotNet.Forms/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/NtApiDotNet/NtEnlistment.cs b/NtApiDotNet/NtEnlistment.cs
@@ -404,6 +404,24 @@ public override NtStatus QueryInformation(EnlistmentInformationClass info_class,
         public override NtStatus SetInformation(EnlistmentInformationClass info_class, SafeBuffer buffer)
         {
             return NtSystemCalls.NtSetInformationEnlistment(Handle, info_class, buffer, buffer.GetLength());
+        }
+
+        /// <summary>
+        /// Query the information class as an object.
+        /// </summary>
+        /// <param name="info_class">The information class.</param>
+        /// <param name="throw_on_error">True to throw on error.</param>
+        /// <returns>The information class as an object.</returns>
+        public override NtResult<object> QueryObject(EnlistmentInformationClass info_class, bool throw_on_error)
+        {
+            switch (info_class)
+            {
+                case EnlistmentInformationClass.EnlistmentBasicInformation:
+                    return Query<EnlistmentBasicInformation>(info_class, default, throw_on_error);
+                case EnlistmentInformationClass.EnlistmentCrmInformation:
+                    return Query<EnlistmentCrmInformation>(info_class, default, throw_on_error);
+            }
+            return base.QueryObject(info_class, throw_on_error);
         }
 
         #endregion
diff --git a/NtApiDotNet/NtEvent.cs b/NtApiDotNet/NtEvent.cs
@@ -257,7 +257,7 @@ public override NtResult<object> QueryObject(EventInformationClass info_class, b
             switch (info_class)
             {
                 case EventInformationClass.EventBasicInformation:
-                    return Query<EventBasicInformation>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<EventBasicInformation>(info_class, default, throw_on_error);
             }
 
             return base.QueryObject(info_class, throw_on_error);
diff --git a/NtApiDotNet/NtFile.cs b/NtApiDotNet/NtFile.cs
@@ -4840,17 +4840,17 @@ public override NtResult<object> QueryObject(FileInformationClass info_class, bo
             switch (info_class)
             {
                 case FileInformationClass.FileBasicInformation:
-                    return Query<FileBasicInformation>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<FileBasicInformation>(info_class, default, throw_on_error);
                 case FileInformationClass.FileEndOfFileInformation:
-                    return Query<FileEndOfFileInformation>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<FileEndOfFileInformation>(info_class, default, throw_on_error);
                 case FileInformationClass.FileStandardInformation:
-                    return Query<FileStandardInformation>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<FileStandardInformation>(info_class, default, throw_on_error);
                 case FileInformationClass.FileNetworkOpenInformation:
-                    return Query<FileNetworkOpenInformation>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<FileNetworkOpenInformation>(info_class, default, throw_on_error);
                 case FileInformationClass.FileInternalInformation:
-                    return Query<FileInternalInformation>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<FileInternalInformation>(info_class, default, throw_on_error);
                 case FileInformationClass.FileRemoteProtocolInformation:
-                    return Query<FileRemoteProtocolInformation>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<FileRemoteProtocolInformation>(info_class, default, throw_on_error);
             }
             return base.QueryObject(info_class, throw_on_error);
         }
diff --git a/NtApiDotNet/NtNamedPipeFile.cs b/NtApiDotNet/NtNamedPipeFile.cs
@@ -313,11 +313,11 @@ public override NtResult<object> QueryObject(FileInformationClass info_class, bo
             switch (info_class)
             {
                 case FileInformationClass.FilePipeInformation:
-                    return Query<FilePipeInformation>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<FilePipeInformation>(info_class, default, throw_on_error);
                 case FileInformationClass.FilePipeLocalInformation:
-                    return Query<FilePipeLocalInformation>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<FilePipeLocalInformation>(info_class, default, throw_on_error);
                 case FileInformationClass.FilePipeRemoteInformation:
-                    return Query<FilePipeRemoteInformation>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<FilePipeRemoteInformation>(info_class, default, throw_on_error);
             }
             return base.QueryObject(info_class, throw_on_error);
         }
diff --git a/NtApiDotNet/NtObjectWithDuplicateAndInfo.cs b/NtApiDotNet/NtObjectWithDuplicateAndInfo.cs
@@ -178,7 +178,7 @@ public virtual NtResult<object> QueryObject(Q info_class, bool throw_on_error)
         /// <param name="info_class">The information class.</param>
         /// <returns>The information class as an object.</returns>
         /// <remarks>If the information class doesn't have an explicit object type a raw byte query will be made.</remarks>
-        public virtual object QueryObject(Q info_class)
+        public object QueryObject(Q info_class)
         {
             return QueryObject(info_class, true).Result;
         }
diff --git a/NtApiDotNet/NtProcess.cs b/NtApiDotNet/NtProcess.cs
@@ -2196,19 +2196,19 @@ public override NtResult<object> QueryObject(ProcessInformationClass info_class,
             switch (info_class)
             {
                 case ProcessInformationClass.ProcessBasicInformation:
-                    return Query<ProcessBasicInformation>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<ProcessBasicInformation>(info_class, default, throw_on_error);
                 case ProcessInformationClass.ProcessIoCounters:
-                    return Query<IoCounters>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<IoCounters>(info_class, default, throw_on_error);
                 case ProcessInformationClass.ProcessTimes:
-                    return Query<KernelUserTimes>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<KernelUserTimes>(info_class, default, throw_on_error);
                 case ProcessInformationClass.ProcessQuotaLimits:
-                    return Query<QuotaLimitsEx>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<QuotaLimitsEx>(info_class, default, throw_on_error);
                 case ProcessInformationClass.ProcessVmCounters:
-                    return Query<VmCountersEx>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<VmCountersEx>(info_class, default, throw_on_error);
                 case ProcessInformationClass.ProcessCycleTime:
-                    return Query<ProcessCycleTimeInformation>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<ProcessCycleTimeInformation>(info_class, default, throw_on_error);
                 case ProcessInformationClass.ProcessProtectionInformation:
-                    return Query<PsProtection>(info_class, default, throw_on_error).Cast<object>();
+                    return Query<PsProtection>(info_class, default, throw_on_error);
             }
             return base.QueryObject(info_class, throw_on_error);
         }
diff --git a/NtApiDotNet/NtResourceManager.cs b/NtApiDotNet/NtResourceManager.cs
@@ -528,7 +528,24 @@ public override NtStatus QueryInformation(ResourceManagerInformationClass info_c
         public override NtStatus SetInformation(ResourceManagerInformationClass info_class, SafeBuffer buffer)
         {
             return NtSystemCalls.NtSetInformationResourceManager(Handle, info_class, buffer, buffer.GetLength());
+        }
+
+        /// <summary>
+        /// Query the information class as an object.
+        /// </summary>
+        /// <param name="info_class">The information class.</param>
+        /// <param name="throw_on_error">True to throw on error.</param>
+        /// <returns>The information class as an object.</returns>
+        public override NtResult<object> QueryObject(ResourceManagerInformationClass info_class, bool throw_on_error)
+        {
+            switch (info_class)
+            {
+                case ResourceManagerInformationClass.ResourceManagerBasicInformation:
+                    return Query<ResourceManagerBasicInformation>(info_class, default, throw_on_error);
+            }
+            return base.QueryObject(info_class, throw_on_error);
         }
+
         #endregion
 
         #region Public Properties
diff --git a/NtApiDotNet/NtResult.cs b/NtApiDotNet/NtResult.cs
@@ -137,6 +137,15 @@ public static NtResult<T> CreateResultFromError(NtStatus status, bool throw_on_e
             return status.CreateResultFromError<T>(throw_on_error);
         }
 
+        /// <summary>
+        /// Conversion operator from T to object.
+        /// </summary>
+        /// <param name="result">The result to convert.</param>
+        public static implicit operator NtResult<object>(NtResult<T> result)
+        {
+            return result.Cast<object>();
+        }
+
         internal NtResult(NtStatus status, T result)
         {
             Status = status;
diff --git a/NtApiDotNet/NtSemaphore.cs b/NtApiDotNet/NtSemaphore.cs
@@ -157,7 +157,25 @@ public NtResult<int> Release(int count, bool throw_on_error)
         public override NtStatus QueryInformation(SemaphoreInformationClass info_class, SafeBuffer buffer, out int return_length)
         {
             return NtSystemCalls.NtQuerySemaphore(Handle, info_class, buffer, (int)buffer.ByteLength, out return_length);
+        }
+
+        /// <summary>
+        /// Query the information class as an object.
+        /// </summary>
+        /// <param name="info_class">The information class.</param>
+        /// <param name="throw_on_error">True to throw on error.</param>
+        /// <returns>The information class as an object.</returns>
+        public override NtResult<object> QueryObject(SemaphoreInformationClass info_class, bool throw_on_error)
+        {
+            switch (info_class)
+            {
+                case SemaphoreInformationClass.SemaphoreBasicInformation:
+                    return Query<SemaphoreBasicInformation>(info_class, default, throw_on_error);
+            }
+
+            return base.QueryObject(info_class, throw_on_error);
         }
+
         #endregion
 
         #region Public Properties
diff --git a/NtApiDotNet/NtThread.cs b/NtApiDotNet/NtThread.cs
@@ -1205,6 +1205,26 @@ public override NtStatus QueryInformation(ThreadInformationClass info_class, Saf
         public override NtStatus SetInformation(ThreadInformationClass info_class, SafeBuffer buffer)
         {
             return NtSystemCalls.NtSetInformationThread(Handle, info_class, buffer, buffer.GetLength());
+        }
+
+        /// <summary>
+        /// Query the information class as an object.
+        /// </summary>
+        /// <param name="info_class">The information class.</param>
+        /// <param name="throw_on_error">True to throw on error.</param>
+        /// <returns>The information class as an object.</returns>
+        public override NtResult<object> QueryObject(ThreadInformationClass info_class, bool throw_on_error)
+        {
+            switch (info_class)
+            {
+                case ThreadInformationClass.ThreadBasicInformation:
+                    return Query<ThreadBasicInformation>(info_class, default, throw_on_error);
+                case ThreadInformationClass.ThreadTimes:
+                    return Query<KernelUserTimes>(info_class, default, throw_on_error);
+                case ThreadInformationClass.ThreadCycleTime:
+                    return Query<ThreadCycleTimeInformation>(info_class, default, throw_on_error);
+            }
+            return base.QueryObject(info_class, throw_on_error);
         }
 
         #endregion
diff --git a/NtApiDotNet/NtThreadNative.cs b/NtApiDotNet/NtThreadNative.cs
@@ -137,6 +137,13 @@ public class ThreadBasicInformation
         public UIntPtr AffinityMask;
         public int Priority;
         public int BasePriority;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct ThreadCycleTimeInformation
+    {
+        public long AccumulatedCycles;
+        public long CurrentCycleCount;
     }
 
     [Flags]
diff --git a/NtApiDotNet/NtTimer.cs b/NtApiDotNet/NtTimer.cs
@@ -292,6 +292,22 @@ public NtResult<bool> Cancel(bool throw_on_error)
         public bool Cancel()
         {
             return Cancel(true).Result;
+        }
+
+        /// <summary>
+        /// Query the information class as an object.
+        /// </summary>
+        /// <param name="info_class">The information class.</param>
+        /// <param name="throw_on_error">True to throw on error.</param>
+        /// <returns>The information class as an object.</returns>
+        public override NtResult<object> QueryObject(TimerInformationClass info_class, bool throw_on_error)
+        {
+            switch (info_class)
+            {
+                case TimerInformationClass.TimerBasicInformation:
+                    return Query<TimerBasicInformation>(info_class, default, throw_on_error);
+            }
+            return base.QueryObject(info_class, throw_on_error);
         }
 
         #endregion
diff --git a/NtApiDotNet/NtToken.cs b/NtApiDotNet/NtToken.cs
@@ -1193,6 +1193,22 @@ public override NtStatus QueryInformation(TokenInformationClass info_class, Safe
         public override NtStatus SetInformation(TokenInformationClass info_class, SafeBuffer buffer)
         {
             return NtSystemCalls.NtSetInformationToken(Handle, info_class, buffer, buffer.GetLength());
+        }
+
+        /// <summary>
+        /// Query the information class as an object.
+        /// </summary>
+        /// <param name="info_class">The information class.</param>
+        /// <param name="throw_on_error">True to throw on error.</param>
+        /// <returns>The information class as an object.</returns>
+        public override NtResult<object> QueryObject(TokenInformationClass info_class, bool throw_on_error)
+        {
+            switch (info_class)
+            {
+                case TokenInformationClass.TokenStatistics:
+                    return Query<TokenStatistics>(info_class, default, throw_on_error);
+            }
+            return base.QueryObject(info_class, throw_on_error);
         }
 
         #endregion
diff --git a/NtApiDotNet/NtTransaction.cs b/NtApiDotNet/NtTransaction.cs
@@ -443,6 +443,28 @@ public override NtStatus QueryInformation(TransactionInformationClass info_class
         public override NtStatus SetInformation(TransactionInformationClass info_class, SafeBuffer buffer)
         {
             return NtSystemCalls.NtSetInformationTransaction(Handle, info_class, buffer, buffer.GetLength());
+        }
+
+        /// <summary>
+        /// Query the information class as an object.
+        /// </summary>
+        /// <param name="info_class">The information class.</param>
+        /// <param name="throw_on_error">True to throw on error.</param>
+        /// <returns>The information class as an object.</returns>
+        public override NtResult<object> QueryObject(TransactionInformationClass info_class, bool throw_on_error)
+        {
+            switch (info_class)
+            {
+                case TransactionInformationClass.TransactionBasicInformation:
+                    return Query<TransactionBasicInformation>(info_class, default, throw_on_error);
+                case TransactionInformationClass.TransactionPropertiesInformation:
+                    return Query<TransactionPropertiesInformation>(info_class, default, throw_on_error);
+                case TransactionInformationClass.TransactionEnlistmentInformation:
+                    return Query<TransactionEnlistmentsInformation>(info_class, default, throw_on_error);
+                case TransactionInformationClass.TransactionSuperiorEnlistmentInformation:
+                    return Query<TransactionSuperiorEnlistmentInformation>(info_class, default, throw_on_error);
+            }
+            return base.QueryObject(info_class, throw_on_error);
         }
 
         #endregion
diff --git a/NtApiDotNet/NtTransactionManager.cs b/NtApiDotNet/NtTransactionManager.cs
@@ -515,6 +515,26 @@ public override NtStatus QueryInformation(TransactionManagerInformationClass inf
         public override NtStatus SetInformation(TransactionManagerInformationClass info_class, SafeBuffer buffer)
         {
             return NtSystemCalls.NtSetInformationTransactionManager(Handle, info_class, buffer, buffer.GetLength());
+        }
+
+        /// <summary>
+        /// Query the information class as an object.
+        /// </summary>
+        /// <param name="info_class">The information class.</param>
+        /// <param name="throw_on_error">True to throw on error.</param>
+        /// <returns>The information class as an object.</returns>
+        public override NtResult<object> QueryObject(TransactionManagerInformationClass info_class, bool throw_on_error)
+        {
+            switch (info_class)
+            {
+                case TransactionManagerInformationClass.TransactionManagerBasicInformation:
+                    return Query<TransactionManagerBasicInformation>(info_class, default, throw_on_error);
+                case TransactionManagerInformationClass.TransactionManagerLogInformation:
+                    return Query<TransactionManagerLogInformation>(info_class, default, throw_on_error);
+                case TransactionManagerInformationClass.TransactionManagerRecoveryInformation:
+                    return Query<TransactionManagerRecoveryInformation>(info_class, default, throw_on_error);
+            }
+            return base.QueryObject(info_class, throw_on_error);
         }
 
         /// <summary>
diff --git a/NtObjectManager/Utils/SecurityDescriptorTransformAttribute.cs b/NtObjectManager/Utils/SecurityDescriptorTransformAttribute.cs
@@ -34,7 +34,7 @@ protected override object DefaultValue(object obj)
 
         protected override NtResult<object> Parse(string value, bool throw_on_error)
         {
-            return SecurityDescriptor.Parse(value, false).Cast<object>();
+            return SecurityDescriptor.Parse(value, false);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Reflection;`
`2`		`-using System.Runtime.CompilerServices;`
`3`	`2`	`using System.Runtime.InteropServices;`
`4`	`3`
`5`	`4`	`// General Information about an assembly is controlled through the following`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ public override NtResult<object> QueryObject(EventInformationClass info_class, b`
`257`	`257`	`switch (info_class)`
`258`	`258`	`{`
`259`	`259`	`case EventInformationClass.EventBasicInformation:`
`260`		`- return Query<EventBasicInformation>(info_class, default, throw_on_error).Cast<object>();`
	`260`	`+ return Query<EventBasicInformation>(info_class, default, throw_on_error);`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`return base.QueryObject(info_class, throw_on_error);`
Original file line number	Diff line number	Diff line change
`@@ -313,11 +313,11 @@ public override NtResult<object> QueryObject(FileInformationClass info_class, bo`
`313`	`313`	`switch (info_class)`
`314`	`314`	`{`
`315`	`315`	`case FileInformationClass.FilePipeInformation:`
`316`		`- return Query<FilePipeInformation>(info_class, default, throw_on_error).Cast<object>();`
	`316`	`+ return Query<FilePipeInformation>(info_class, default, throw_on_error);`
`317`	`317`	`case FileInformationClass.FilePipeLocalInformation:`
`318`		`- return Query<FilePipeLocalInformation>(info_class, default, throw_on_error).Cast<object>();`
	`318`	`+ return Query<FilePipeLocalInformation>(info_class, default, throw_on_error);`
`319`	`319`	`case FileInformationClass.FilePipeRemoteInformation:`
`320`		`- return Query<FilePipeRemoteInformation>(info_class, default, throw_on_error).Cast<object>();`
	`320`	`+ return Query<FilePipeRemoteInformation>(info_class, default, throw_on_error);`
`321`	`321`	`}`
`322`	`322`	`return base.QueryObject(info_class, throw_on_error);`
`323`	`323`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ public virtual NtResult<object> QueryObject(Q info_class, bool throw_on_error)`
`178`	`178`	`/// <param name="info_class">The information class.</param>`
`179`	`179`	`/// <returns>The information class as an object.</returns>`
`180`	`180`	`/// <remarks>If the information class doesn't have an explicit object type a raw byte query will be made.</remarks>`
`181`		`- public virtual object QueryObject(Q info_class)`
	`181`	`+ public object QueryObject(Q info_class)`
`182`	`182`	`{`
`183`	`183`	`return QueryObject(info_class, true).Result;`
`184`	`184`	`}`