Added non-throwing filename and normalized filename query.

Author: tyranid

NtApiDotNet/NtFile.cs

@@ -297,16 +297,18 @@ private static SafeFileHandle DuplicateAsFile(SafeKernelObjectHandle handle)
             }
         }
 
-        private string TryGetName(FileInformationClass info_class)
+        private NtResult<string> TryGetName(FileInformationClass info_class, bool throw_on_error)
         {
             using (var buffer = new SafeStructureInOutBuffer<FileNameInformation>(32 * 1024, true))
             {
                 IoStatus status = new IoStatus();
-                NtSystemCalls.NtQueryInformationFile(Handle,
-                    status, buffer, buffer.Length, info_class).ToNtException();
+                NtStatus nt_status = NtSystemCalls.NtQueryInformationFile(Handle,
+                    status, buffer, buffer.Length, info_class);
+                if (!nt_status.IsSuccess())
+                    return nt_status.CreateResultFromError<string>(throw_on_error);
                 char[] result = new char[buffer.Result.NameLength / 2];
                 buffer.Data.ReadArray(0, result, 0, result.Length);
-                return new string(result);
+                return new string(result).CreateResult();
             }
         }
 
@@ -1736,17 +1738,33 @@ public byte[] FsControl(NtIoControlCode control_code, byte[] input_buffer, int m
         /// <param name="desired_access">The desired access for the file handle</param>
         /// <param name="share_access">The file share access</param>
         /// <param name="open_options">File open options</param>
+        /// <param name="attributes">Flags for the object attributes.</param>
         /// <param name="throw_on_error">True to throw an exception on error.</param>
         /// <returns>The NT status code and object result.</returns>
         /// <exception cref="NtException">Thrown on error.</exception>
-        public NtResult<NtFile> ReOpen(FileAccessRights desired_access, FileShareMode share_access, FileOpenOptions open_options, bool throw_on_error)
+        public NtResult<NtFile> ReOpen(FileAccessRights desired_access, FileShareMode share_access, 
+            FileOpenOptions open_options, AttributeFlags attributes, bool throw_on_error)
         {
-            using (ObjectAttributes obj_attributes = new ObjectAttributes(string.Empty, AttributeFlags.CaseInsensitive, this))
+            using (ObjectAttributes obj_attributes = new ObjectAttributes(string.Empty, attributes, this))
             {
                 return Open(obj_attributes, desired_access, share_access, open_options, throw_on_error);
             }
         }
 
+        /// <summary>
+        /// Re-open an existing file for different access.
+        /// </summary>
+        /// <param name="desired_access">The desired access for the file handle</param>
+        /// <param name="share_access">The file share access</param>
+        /// <param name="open_options">File open options</param>
+        /// <param name="throw_on_error">True to throw an exception on error.</param>
+        /// <returns>The NT status code and object result.</returns>
+        /// <exception cref="NtException">Thrown on error.</exception>
+        public NtResult<NtFile> ReOpen(FileAccessRights desired_access, FileShareMode share_access, FileOpenOptions open_options, bool throw_on_error)
+        {
+            return ReOpen(desired_access, share_access, open_options, AttributeFlags.CaseInsensitive, throw_on_error);
+        }
+
         /// <summary>
         /// Re-open an exsiting file for different access.
         /// </summary>
@@ -4802,6 +4820,26 @@ public void SetQuota(Sid sid, long threshold, long limit)
             SetQuota(new FileQuotaEntry(sid, threshold, limit));
         }
 
+        /// <summary>
+        /// Get the file's full path.
+        /// </summary>
+        /// <param name="throw_on_error">True to throw on error.</param>
+        /// <returns>The file name.</returns>
+        public NtResult<string> GetFileName(bool throw_on_error)
+        {
+            return TryGetName(FileInformationClass.FileNameInformation, throw_on_error);
+        }
+
+        /// <summary>
+        /// Get the file's normalized path.
+        /// </summary>
+        /// <param name="throw_on_error">True to throw on error.</param>
+        /// <returns>The file name.</returns>
+        public NtResult<string> GetNormalizedFileName(bool throw_on_error)
+        {
+            return TryGetName(FileInformationClass.FileNormalizedNameInformation, throw_on_error);
+        }
+
         /// <summary>
         /// Method to query information for this object type.
         /// </summary>
@@ -5117,12 +5155,12 @@ public FileCaseSensitiveFlags CaseSensitiveFlags
         /// <summary>
         /// Get the filename with the volume path.
         /// </summary>
-        public string FileName => TryGetName(FileInformationClass.FileNameInformation);
+        public string FileName => TryGetName(FileInformationClass.FileNameInformation, true).Result;
 
         /// <summary>
         /// Get the normalized filename with the volume path.
         /// </summary>
-        public string NormalizedFileName => TryGetName(FileInformationClass.FileNormalizedNameInformation);
+        public string NormalizedFileName => TryGetName(FileInformationClass.FileNormalizedNameInformation, true).Result;
 
         /// <summary>
         /// Get the associated short filename
@@ -5139,7 +5177,7 @@ public string FileShortName
         /// </summary>
         public string ShortName
         {
-            get => TryGetName(FileInformationClass.FileAlternateNameInformation);
+            get => TryGetName(FileInformationClass.FileAlternateNameInformation, true).Result;
             set => SetName(FileInformationClass.FileShortNameInformation, value);
         }