Simplistic back port of IDL NDR formatter.

Author: tyranid

NtApiDotNet/Ndr/IdlNdrFormatterInternal.cs

@@ -129,6 +129,16 @@ internal NdrConformantArrayTypeReference(NdrFormatCharacter format, NdrParseCont
             ReadElementType(context, reader);
         }
 
+        internal override NdrCorrelationDescriptor GetConformanceDescriptor()
+        {
+            return ConformanceDescriptor;
+        }
+
+        internal override NdrCorrelationDescriptor GetVarianceDescriptor()
+        {
+            return VarianceDescriptor;
+        }
+
         protected override int GetElementSize()
         {
             return _element_size;
@@ -185,6 +195,16 @@ internal NdrBogusArrayTypeReference(NdrParseContext context, BinaryReader reader
             ReadElementType(context, reader);
         }
 
+        internal override NdrCorrelationDescriptor GetConformanceDescriptor()
+        {
+            return ConformanceDescriptor;
+        }
+
+        internal override NdrCorrelationDescriptor GetVarianceDescriptor()
+        {
+            return VarianceDescriptor;
+        }
+
         protected override int GetElementCount()
         {
             if (NumberofElements > 0)

NtApiDotNet/Ndr/NdrArrayTypes.cs

@@ -345,6 +345,10 @@ public enum DefaultNdrFormatterFlags
         /// Don't emit comments.
         /// </summary>
         RemoveComments = 0x1,
+        /// <summary>
+        /// Enable type defs.
+        /// </summary>
+        EnableTypeDefs = 0x2,
     }
 
     /// <summary>
@@ -485,4 +489,23 @@ public static INdrFormatter Create()
             return Create(new Dictionary<Guid, string>());
         }
     }
+
+    /// <summary>
+    /// NDR formatter constructor for IDL style output.
+    /// </summary>
+    public static class IdlNdrFormatter
+    {
+        /// <summary>
+        /// Create the CPP formatter.
+        /// </summary>
+        /// <param name="iids_to_names">Specify a dictionary of IIDs to names.</param>
+        /// <param name="demangle_com_name">Function to demangle COM interface names during formatting.</param>
+        /// <param name="flags">Formatter flags.</param>
+        /// <returns>The CPP formatter.</returns>
+        public static INdrFormatter Create(IDictionary<Guid, string> iids_to_names = null, 
+            Func<string, string> demangle_com_name = null, DefaultNdrFormatterFlags flags = 0)
+        {
+            return new IdlNdrFormatterInternal(iids_to_names, demangle_com_name, flags);
+        }
+    }
 }

NtApiDotNet/Ndr/NdrFormatter.cs

@@ -131,6 +131,7 @@ internal static U[] Cast<T, U>(this T[] array)
 
         internal static readonly Guid IID_IUnknown = new Guid("00000000-0000-0000-C000-000000000046");
         internal static readonly Guid IID_IDispatch = new Guid("00020400-0000-0000-C000-000000000046");
+        internal static readonly Guid IID_IInspectable = new Guid("AF86E2E0-B12D-4c6a-9C5A-D7AA65101E90");
         internal static readonly Guid IID_IPSFactoryBuffer = new Guid("D5F569D0-593B-101A-B569-08002B2DBF7A");
         internal static readonly Guid DCE_TransferSyntax = new Guid("8A885D04-1CEB-11C9-9FE8-08002B104860");
         internal static readonly Guid NDR64_TransferSyntax = new Guid("71710533-BEBA-4937-8319-B5DBEF9CCC36");

NtApiDotNet/Ndr/NdrNativeUtils.cs

@@ -122,6 +122,16 @@ internal override string FormatType(INdrFormatterInternal formatter)
             }
         }
 
+        internal override NdrCorrelationDescriptor GetConformanceDescriptor()
+        {
+            return Type.GetConformanceDescriptor();
+        }
+
+        internal override NdrCorrelationDescriptor GetVarianceDescriptor()
+        {
+            return Type.GetVarianceDescriptor();
+        }
+
         public override int GetSize()
         {
             return IntPtr.Size;

NtApiDotNet/Ndr/NdrPointerTypes.cs

@@ -196,6 +196,16 @@ internal static NdrFormatCharacter ReadFormat(BinaryReader reader)
             return (NdrFormatCharacter)reader.ReadByte();
         }
 
+        internal virtual NdrCorrelationDescriptor GetConformanceDescriptor()
+        {
+            return null;
+        }
+
+        internal virtual NdrCorrelationDescriptor GetVarianceDescriptor()
+        {
+            return null;
+        }
+
         protected virtual void OnFixupLateBoundTypes()
         {
             // Do nothing in the base.

NtApiDotNet/Ndr/NdrSimpleTypes.cs

@@ -104,6 +104,11 @@ internal override string FormatType(INdrFormatterInternal context)
             return $"{conformance_desc}{base.FormatType(context)}[{GetCharCount()}]";
         }
 
+        internal override NdrCorrelationDescriptor GetConformanceDescriptor()
+        {
+            return ConformanceDescriptor;
+        }
+
         private int GetCharSize()
         {
             if (Format == NdrFormatCharacter.FC_C_WSTRING)

NtApiDotNet/Ndr/NdrStringTypes.cs

@@ -73,6 +73,7 @@
     <Compile Include="IO\UsnJournal\UsnJournalReasonFlags.cs" />
     <Compile Include="IO\UsnJournal\UsnJournalUtils.cs" />
     <Compile Include="KnownSids.cs" />
+    <Compile Include="Ndr\IdlNdrFormatterInternal.cs" />
     <Compile Include="Ndr\Marshal\FLAGGED_WORD_BLOB.cs" />
     <Compile Include="Ndr\Marshal\NdrUserMarshal.cs" />
     <Compile Include="Ndr\NdrUtils.cs" />