Update metadata to 39.0.18-preview

Generator: Add initial Interface generation.

Directory.Build.props

@@ -14,7 +14,7 @@
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     <RestoreConfigFile>$(MSBuildThisFileDirectory)NuGet.config</RestoreConfigFile>
 
-    <VersionPrefix>1.9.0</VersionPrefix>
+    <VersionPrefix>1.9.1</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
     
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/Generator/Program.cs

@@ -1029,6 +1029,12 @@ public static class Program
         // D3D11
         { "ID3D11DeviceContext::Map::MapFlags", "D3D11_MAP_FLAG" },
         { "ID3D11DeviceContext::ClearDepthStencilView::ClearFlags", "D3D11_CLEAR_FLAG" },
+        { "ID3D11DeviceContext1::Map::MapFlags", "D3D11_MAP_FLAG" },
+        { "ID3D11DeviceContext1::ClearDepthStencilView::ClearFlags", "D3D11_CLEAR_FLAG" },
+        { "ID3D11DeviceContext2::Map::MapFlags", "D3D11_MAP_FLAG" },
+        { "ID3D11DeviceContext2::ClearDepthStencilView::ClearFlags", "D3D11_CLEAR_FLAG" },
+        { "ID3D11DeviceContext3::Map::MapFlags", "D3D11_MAP_FLAG" },
+        { "ID3D11DeviceContext3::ClearDepthStencilView::ClearFlags", "D3D11_CLEAR_FLAG" },
 
         // D3D12
 
@@ -2251,10 +2257,10 @@ public static class Program
         string baseType = string.Empty;
         if (comType.Guid != null)
         {
-            baseType += " : INativeGuid";
+            baseType += ", INativeGuid";
         }
 
-        using (writer.PushBlock($"public unsafe partial struct {csTypeName}{baseType}"))
+        using (writer.PushBlock($"public unsafe partial struct {csTypeName} : {csTypeName}.Interface{baseType}"))
         {
             if (comType.Guid != null)
             {
@@ -2323,6 +2329,7 @@ public static class Program
             }
 
             bool needNewLine = false;
+            List<Tuple<int, string>> interfaceMethods = new();
             foreach (KeyValuePair<string, List<ApiType>> methodPair in methodsToGenerate)
             {
                 string docName = methodPair.Key;
@@ -2375,7 +2382,7 @@ public static class Program
 
                     foreach (ApiParameter parameter in method.Params)
                     {
-                        if(method.Name == "CreateRenderTargetView" && comType.Name == "ID3D12Device")
+                        if (method.Name == "CreateRenderTargetView" && comType.Name == "ID3D12Device")
                         {
 
                         }
@@ -2433,6 +2440,7 @@ public static class Program
                         argumentNamesString = ", " + argumentNamesString;
                     }
 
+                    bool needToAddInterfaceMethod = true;
                     if (comType.Name == docName)
                     {
                         if (string.IsNullOrEmpty(writer.DocFileName) == false)
@@ -2448,6 +2456,7 @@ public static class Program
                         }
 
                         writer.WriteLine($"/// <inheritdoc cref=\"{docName}.{method.Name}\" />");
+                        needToAddInterfaceMethod = false;
                     }
 
                     writer.WriteLine("[MethodImpl(MethodImplOptions.AggressiveInlining)]");
@@ -2484,10 +2493,43 @@ public static class Program
                         }
                     }
 
+                    if (needToAddInterfaceMethod)
+                    {
+                        string interfaceMethodDecl = $"{returnType} {method.Name}({argumentsString})";
+                        interfaceMethods.Add(Tuple.Create(vtblIndex, interfaceMethodDecl));
+                    }
+
                     needNewLine = true;
                     vtblIndex++;
                 }
             }
+
+            // Generate interface
+            string baseInterfaceDecl = string.Empty;
+            if (comType.Interface != null)
+            {
+                baseInterfaceDecl += $": {comType.Interface.Name}.Interface";
+            }
+
+            if (csTypeName == "IDXGIAdapter")
+            {
+            }
+
+            needNewLine = false;
+            using (writer.PushBlock($"public interface Interface {baseInterfaceDecl}"))
+            {
+                foreach (var item in interfaceMethods)
+                {
+                    if (needNewLine)
+                    {
+                        writer.WriteLine();
+                    }
+
+                    writer.WriteLine($"[VtblIndex({item.Item1})]");
+                    writer.WriteLine($"{item.Item2};");
+                    needNewLine = true;
+                }
+            }
         }
 
         writer.WriteLine();

src/Generator/win32json/api/Graphics.Dwm.json

@@ -0,0 +1,903 @@
+{
+
+"Constants":[
+	{
+		"Name":"DWM_BB_ENABLE"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":1
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_BB_BLURREGION"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":2
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_BB_TRANSITIONONMAXIMIZED"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":4
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWMWA_COLOR_DEFAULT"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":4294967295
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWMWA_COLOR_NONE"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":4294967294
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_CLOAKED_APP"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":1
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_CLOAKED_SHELL"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":2
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_CLOAKED_INHERITED"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":4
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_TNP_RECTDESTINATION"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":1
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_TNP_RECTSOURCE"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":2
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_TNP_OPACITY"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":4
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_TNP_VISIBLE"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":8
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_TNP_SOURCECLIENTAREAONLY"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":16
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_FRAME_DURATION_DEFAULT"
+		,"Type":{"Kind":"Native","Name":"Int32"}
+		,"ValueType":"Int32"
+		,"Value":-1
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_EC_DISABLECOMPOSITION"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":0
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_EC_ENABLECOMPOSITION"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":1
+		,"Attrs":[]
+	}
+	,{
+		"Name":"DWM_SIT_DISPLAYFRAME"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":1
+		,"Attrs":[]
+	}
+	,{
+		"Name":"c_DwmMaxQueuedBuffers"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":8
+		,"Attrs":[]
+	}
+	,{
+		"Name":"c_DwmMaxMonitors"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":16
+		,"Attrs":[]
+	}
+	,{
+		"Name":"c_DwmMaxAdapters"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":16
+		,"Attrs":[]
+	}
+]
+
+,"Types":[
+	{
+		"Name":"DWM_BLURBEHIND"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Struct"
+		,"Size":0
+		,"PackingSize":1
+		,"Fields":[
+			{"Name":"dwFlags","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"fEnable","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
+			,{"Name":"hRgnBlur","Type":{"Kind":"ApiRef","Name":"HRGN","TargetKind":"Default","Api":"Graphics.Gdi","Parents":[]},"Attrs":[]}
+			,{"Name":"fTransitionOnMaximized","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
+		]
+		,"NestedTypes":[
+		]
+	}
+	,{
+		"Name":"DWMWINDOWATTRIBUTE"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":false
+		,"Scoped":false
+		,"Values":[
+			{"Name":"DWMWA_NCRENDERING_ENABLED","Value":1}
+			,{"Name":"DWMWA_NCRENDERING_POLICY","Value":2}
+			,{"Name":"DWMWA_TRANSITIONS_FORCEDISABLED","Value":3}
+			,{"Name":"DWMWA_ALLOW_NCPAINT","Value":4}
+			,{"Name":"DWMWA_CAPTION_BUTTON_BOUNDS","Value":5}
+			,{"Name":"DWMWA_NONCLIENT_RTL_LAYOUT","Value":6}
+			,{"Name":"DWMWA_FORCE_ICONIC_REPRESENTATION","Value":7}
+			,{"Name":"DWMWA_FLIP3D_POLICY","Value":8}
+			,{"Name":"DWMWA_EXTENDED_FRAME_BOUNDS","Value":9}
+			,{"Name":"DWMWA_HAS_ICONIC_BITMAP","Value":10}
+			,{"Name":"DWMWA_DISALLOW_PEEK","Value":11}
+			,{"Name":"DWMWA_EXCLUDED_FROM_PEEK","Value":12}
+			,{"Name":"DWMWA_CLOAK","Value":13}
+			,{"Name":"DWMWA_CLOAKED","Value":14}
+			,{"Name":"DWMWA_FREEZE_REPRESENTATION","Value":15}
+			,{"Name":"DWMWA_PASSIVE_UPDATE_MODE","Value":16}
+			,{"Name":"DWMWA_USE_HOSTBACKDROPBRUSH","Value":17}
+			,{"Name":"DWMWA_USE_IMMERSIVE_DARK_MODE","Value":20}
+			,{"Name":"DWMWA_WINDOW_CORNER_PREFERENCE","Value":33}
+			,{"Name":"DWMWA_BORDER_COLOR","Value":34}
+			,{"Name":"DWMWA_CAPTION_COLOR","Value":35}
+			,{"Name":"DWMWA_TEXT_COLOR","Value":36}
+			,{"Name":"DWMWA_VISIBLE_FRAME_BORDER_THICKNESS","Value":37}
+			,{"Name":"DWMWA_LAST","Value":38}
+		]
+		,"IntegerBase":"Int32"
+	}
+	,{
+		"Name":"DWM_WINDOW_CORNER_PREFERENCE"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":false
+		,"Scoped":false
+		,"Values":[
+			{"Name":"DWMWCP_DEFAULT","Value":0}
+			,{"Name":"DWMWCP_DONOTROUND","Value":1}
+			,{"Name":"DWMWCP_ROUND","Value":2}
+			,{"Name":"DWMWCP_ROUNDSMALL","Value":3}
+		]
+		,"IntegerBase":"Int32"
+	}
+	,{
+		"Name":"DWMNCRENDERINGPOLICY"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":false
+		,"Scoped":false
+		,"Values":[
+			{"Name":"DWMNCRP_USEWINDOWSTYLE","Value":0}
+			,{"Name":"DWMNCRP_DISABLED","Value":1}
+			,{"Name":"DWMNCRP_ENABLED","Value":2}
+			,{"Name":"DWMNCRP_LAST","Value":3}
+		]
+		,"IntegerBase":"Int32"
+	}
+	,{
+		"Name":"DWMFLIP3DWINDOWPOLICY"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":false
+		,"Scoped":false
+		,"Values":[
+			{"Name":"DWMFLIP3D_DEFAULT","Value":0}
+			,{"Name":"DWMFLIP3D_EXCLUDEBELOW","Value":1}
+			,{"Name":"DWMFLIP3D_EXCLUDEABOVE","Value":2}
+			,{"Name":"DWMFLIP3D_LAST","Value":3}
+		]
+		,"IntegerBase":"Int32"
+	}
+	,{
+		"Name":"DWM_THUMBNAIL_PROPERTIES"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Struct"
+		,"Size":0
+		,"PackingSize":1
+		,"Fields":[
+			{"Name":"dwFlags","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"rcDestination","Type":{"Kind":"ApiRef","Name":"RECT","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
+			,{"Name":"rcSource","Type":{"Kind":"ApiRef","Name":"RECT","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
+			,{"Name":"opacity","Type":{"Kind":"Native","Name":"Byte"},"Attrs":[]}
+			,{"Name":"fVisible","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
+			,{"Name":"fSourceClientAreaOnly","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
+		]
+		,"NestedTypes":[
+		]
+	}
+	,{
+		"Name":"UNSIGNED_RATIO"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Struct"
+		,"Size":0
+		,"PackingSize":1
+		,"Fields":[
+			{"Name":"uiNumerator","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"uiDenominator","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+		]
+		,"NestedTypes":[
+		]
+	}
+	,{
+		"Name":"DWM_TIMING_INFO"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Struct"
+		,"Size":0
+		,"PackingSize":1
+		,"Fields":[
+			{"Name":"cbSize","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"rateRefresh","Type":{"Kind":"ApiRef","Name":"UNSIGNED_RATIO","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]},"Attrs":[]}
+			,{"Name":"qpcRefreshPeriod","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"rateCompose","Type":{"Kind":"ApiRef","Name":"UNSIGNED_RATIO","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]},"Attrs":[]}
+			,{"Name":"qpcVBlank","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cRefresh","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cDXRefresh","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"qpcCompose","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cFrame","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cDXPresent","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"cRefreshFrame","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cFrameSubmitted","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cDXPresentSubmitted","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"cFrameConfirmed","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cDXPresentConfirmed","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"cRefreshConfirmed","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cDXRefreshConfirmed","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"cFramesLate","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cFramesOutstanding","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"cFrameDisplayed","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"qpcFrameDisplayed","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cRefreshFrameDisplayed","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cFrameComplete","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"qpcFrameComplete","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cFramePending","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"qpcFramePending","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cFramesDisplayed","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cFramesComplete","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cFramesPending","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cFramesAvailable","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cFramesDropped","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cFramesMissed","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cRefreshNextDisplayed","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cRefreshNextPresented","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cRefreshesDisplayed","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cRefreshesPresented","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cRefreshStarted","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cPixelsReceived","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cPixelsDrawn","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cBuffersEmpty","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+		]
+		,"NestedTypes":[
+		]
+	}
+	,{
+		"Name":"DWM_SOURCE_FRAME_SAMPLING"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":false
+		,"Scoped":false
+		,"Values":[
+			{"Name":"DWM_SOURCE_FRAME_SAMPLING_POINT","Value":0}
+			,{"Name":"DWM_SOURCE_FRAME_SAMPLING_COVERAGE","Value":1}
+			,{"Name":"DWM_SOURCE_FRAME_SAMPLING_LAST","Value":2}
+		]
+		,"IntegerBase":"Int32"
+	}
+	,{
+		"Name":"DWM_PRESENT_PARAMETERS"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Struct"
+		,"Size":0
+		,"PackingSize":1
+		,"Fields":[
+			{"Name":"cbSize","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"fQueue","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
+			,{"Name":"cRefreshStart","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+			,{"Name":"cBuffer","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"fUseSourceRate","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
+			,{"Name":"rateSource","Type":{"Kind":"ApiRef","Name":"UNSIGNED_RATIO","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]},"Attrs":[]}
+			,{"Name":"cRefreshesPerFrame","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"eSampling","Type":{"Kind":"ApiRef","Name":"DWM_SOURCE_FRAME_SAMPLING","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]},"Attrs":[]}
+		]
+		,"NestedTypes":[
+		]
+	}
+	,{
+		"Name":"MilMatrix3x2D"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Struct"
+		,"Size":0
+		,"PackingSize":1
+		,"Fields":[
+			{"Name":"S_11","Type":{"Kind":"Native","Name":"Double"},"Attrs":[]}
+			,{"Name":"S_12","Type":{"Kind":"Native","Name":"Double"},"Attrs":[]}
+			,{"Name":"S_21","Type":{"Kind":"Native","Name":"Double"},"Attrs":[]}
+			,{"Name":"S_22","Type":{"Kind":"Native","Name":"Double"},"Attrs":[]}
+			,{"Name":"DX","Type":{"Kind":"Native","Name":"Double"},"Attrs":[]}
+			,{"Name":"DY","Type":{"Kind":"Native","Name":"Double"},"Attrs":[]}
+		]
+		,"NestedTypes":[
+		]
+	}
+	,{
+		"Name":"DWMTRANSITION_OWNEDWINDOW_TARGET"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":false
+		,"Scoped":false
+		,"Values":[
+			{"Name":"DWMTRANSITION_OWNEDWINDOW_NULL","Value":-1}
+			,{"Name":"DWMTRANSITION_OWNEDWINDOW_REPOSITION","Value":0}
+		]
+		,"IntegerBase":"Int32"
+	}
+	,{
+		"Name":"GESTURE_TYPE"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":false
+		,"Scoped":false
+		,"Values":[
+			{"Name":"GT_PEN_TAP","Value":0}
+			,{"Name":"GT_PEN_DOUBLETAP","Value":1}
+			,{"Name":"GT_PEN_RIGHTTAP","Value":2}
+			,{"Name":"GT_PEN_PRESSANDHOLD","Value":3}
+			,{"Name":"GT_PEN_PRESSANDHOLDABORT","Value":4}
+			,{"Name":"GT_TOUCH_TAP","Value":5}
+			,{"Name":"GT_TOUCH_DOUBLETAP","Value":6}
+			,{"Name":"GT_TOUCH_RIGHTTAP","Value":7}
+			,{"Name":"GT_TOUCH_PRESSANDHOLD","Value":8}
+			,{"Name":"GT_TOUCH_PRESSANDHOLDABORT","Value":9}
+			,{"Name":"GT_TOUCH_PRESSANDTAP","Value":10}
+		]
+		,"IntegerBase":"Int32"
+	}
+	,{
+		"Name":"DWM_SHOWCONTACT"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":true
+		,"Scoped":false
+		,"Values":[
+			{"Name":"DWMSC_DOWN","Value":1}
+			,{"Name":"DWMSC_UP","Value":2}
+			,{"Name":"DWMSC_DRAG","Value":4}
+			,{"Name":"DWMSC_HOLD","Value":8}
+			,{"Name":"DWMSC_PENBARREL","Value":16}
+			,{"Name":"DWMSC_NONE","Value":0}
+			,{"Name":"DWMSC_ALL","Value":4294967295}
+		]
+		,"IntegerBase":"UInt32"
+	}
+	,{
+		"Name":"DWM_TAB_WINDOW_REQUIREMENTS"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":true
+		,"Scoped":false
+		,"Values":[
+			{"Name":"DWMTWR_NONE","Value":0}
+			,{"Name":"DWMTWR_IMPLEMENTED_BY_SYSTEM","Value":1}
+			,{"Name":"DWMTWR_WINDOW_RELATIONSHIP","Value":2}
+			,{"Name":"DWMTWR_WINDOW_STYLES","Value":4}
+			,{"Name":"DWMTWR_WINDOW_REGION","Value":8}
+			,{"Name":"DWMTWR_WINDOW_DWM_ATTRIBUTES","Value":16}
+			,{"Name":"DWMTWR_WINDOW_MARGINS","Value":32}
+			,{"Name":"DWMTWR_TABBING_ENABLED","Value":64}
+			,{"Name":"DWMTWR_USER_POLICY","Value":128}
+			,{"Name":"DWMTWR_GROUP_POLICY","Value":256}
+			,{"Name":"DWMTWR_APP_COMPAT","Value":512}
+		]
+		,"IntegerBase":"UInt32"
+	}
+]
+
+,"Functions":[
+	{
+		"Name":"DwmDefWindowProc"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hWnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"msg","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
+			,{"Name":"wParam","Type":{"Kind":"ApiRef","Name":"WPARAM","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"lParam","Type":{"Kind":"ApiRef","Name":"LPARAM","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"plResult","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"LRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out"]}
+		]
+	}
+	,{
+		"Name":"DwmEnableBlurBehindWindow"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hWnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"pBlurBehind","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"DWM_BLURBEHIND","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]}},"Attrs":["In","Const"]}
+		]
+	}
+	,{
+		"Name":"DwmEnableComposition"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"uCompositionAction","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmEnableMMCSS"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"fEnableMMCSS","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmExtendFrameIntoClientArea"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hWnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"pMarInset","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"MARGINS","TargetKind":"Default","Api":"UI.Controls","Parents":[]}},"Attrs":["In","Const"]}
+		]
+	}
+	,{
+		"Name":"DwmGetColorizationColor"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"pcrColorization","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["Out"]}
+			,{"Name":"pfOpaqueBlend","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out"]}
+		]
+	}
+	,{
+		"Name":"DwmGetCompositionTimingInfo"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"pTimingInfo","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"DWM_TIMING_INFO","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]}},"Attrs":["Out"]}
+		]
+	}
+	,{
+		"Name":"DwmGetWindowAttribute"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"dwAttribute","Type":{"Kind":"ApiRef","Name":"DWMWINDOWATTRIBUTE","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]},"Attrs":["In"]}
+			,{"Name":"pvAttribute","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}},"Attrs":["Out",{"Kind":"MemorySize","BytesParamIndex":3}]}
+			,{"Name":"cbAttribute","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmIsCompositionEnabled"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"pfEnabled","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out"]}
+		]
+	}
+	,{
+		"Name":"DwmModifyPreviousDxFrameDuration"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"cRefreshes","Type":{"Kind":"Native","Name":"Int32"},"Attrs":["In"]}
+			,{"Name":"fRelative","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmQueryThumbnailSourceSize"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hThumbnail","Type":{"Kind":"Native","Name":"IntPtr"},"Attrs":["In"]}
+			,{"Name":"pSize","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"SIZE","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out"]}
+		]
+	}
+	,{
+		"Name":"DwmRegisterThumbnail"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwndDestination","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"hwndSource","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"phThumbnailId","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"IntPtr"}},"Attrs":["Out"]}
+		]
+	}
+	,{
+		"Name":"DwmSetDxFrameDuration"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"cRefreshes","Type":{"Kind":"Native","Name":"Int32"},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmSetPresentParameters"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"pPresentParams","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"DWM_PRESENT_PARAMETERS","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]}},"Attrs":["In","Out"]}
+		]
+	}
+	,{
+		"Name":"DwmSetWindowAttribute"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"dwAttribute","Type":{"Kind":"ApiRef","Name":"DWMWINDOWATTRIBUTE","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]},"Attrs":["In"]}
+			,{"Name":"pvAttribute","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}},"Attrs":["In",{"Kind":"MemorySize","BytesParamIndex":3},"Const"]}
+			,{"Name":"cbAttribute","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmUnregisterThumbnail"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hThumbnailId","Type":{"Kind":"Native","Name":"IntPtr"},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmUpdateThumbnailProperties"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hThumbnailId","Type":{"Kind":"Native","Name":"IntPtr"},"Attrs":["In"]}
+			,{"Name":"ptnProperties","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"DWM_THUMBNAIL_PROPERTIES","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]}},"Attrs":["In","Const"]}
+		]
+	}
+	,{
+		"Name":"DwmSetIconicThumbnail"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.1"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"hbmp","Type":{"Kind":"ApiRef","Name":"HBITMAP","TargetKind":"Default","Api":"Graphics.Gdi","Parents":[]},"Attrs":["In"]}
+			,{"Name":"dwSITFlags","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmSetIconicLivePreviewBitmap"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.1"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"hbmp","Type":{"Kind":"ApiRef","Name":"HBITMAP","TargetKind":"Default","Api":"Graphics.Gdi","Parents":[]},"Attrs":["In"]}
+			,{"Name":"pptClient","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"POINT","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["In","Optional"]}
+			,{"Name":"dwSITFlags","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmInvalidateIconicBitmaps"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.1"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmAttachMilContent"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmDetachMilContent"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmFlush"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+		]
+	}
+	,{
+		"Name":"DwmGetGraphicsStreamTransformHint"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"uIndex","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
+			,{"Name":"pTransform","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"MilMatrix3x2D","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]}},"Attrs":["Out"]}
+		]
+	}
+	,{
+		"Name":"DwmGetGraphicsStreamClient"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"uIndex","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
+			,{"Name":"pClientUuid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["Out"]}
+		]
+	}
+	,{
+		"Name":"DwmGetTransportAttributes"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows6.0.6000"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"pfIsRemoting","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out"]}
+			,{"Name":"pfIsConnected","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out"]}
+			,{"Name":"pDwGeneration","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["Out"]}
+		]
+	}
+	,{
+		"Name":"DwmTransitionOwnedWindow"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows8.0"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"hwnd","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"target","Type":{"Kind":"ApiRef","Name":"DWMTRANSITION_OWNEDWINDOW_TARGET","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmRenderGesture"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows8.0"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"gt","Type":{"Kind":"ApiRef","Name":"GESTURE_TYPE","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]},"Attrs":["In"]}
+			,{"Name":"cContacts","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
+			,{"Name":"pdwPointerID","Type":{"Kind":"LPArray","NullNullTerm":false,"CountConst":-1,"CountParamIndex":1,"Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["In","Const"]}
+			,{"Name":"pPoints","Type":{"Kind":"LPArray","NullNullTerm":false,"CountConst":-1,"CountParamIndex":1,"Child":{"Kind":"ApiRef","Name":"POINT","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["In","Const"]}
+		]
+	}
+	,{
+		"Name":"DwmTetherContact"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows8.0"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"dwPointerID","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
+			,{"Name":"fEnable","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+			,{"Name":"ptTether","Type":{"Kind":"ApiRef","Name":"POINT","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmShowContact"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows8.0"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"dwPointerID","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
+			,{"Name":"eShowContact","Type":{"Kind":"ApiRef","Name":"DWM_SHOWCONTACT","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]},"Attrs":["In"]}
+		]
+	}
+	,{
+		"Name":"DwmGetUnmetTabRequirements"
+		,"SetLastError":false
+		,"DllImport":"dwmapi.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":"windows10.0.17134"
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"appWindow","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In","Optional"]}
+			,{"Name":"value","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"DWM_TAB_WINDOW_REQUIREMENTS","TargetKind":"Default","Api":"Graphics.Dwm","Parents":[]}},"Attrs":["Out"]}
+		]
+	}
+]
+
+,"UnicodeAliases":[
+]
+
+}

src/Generator/win32json/api/Graphics.Hlsl.json

@@ -0,0 +1,29 @@
+{
+
+"Constants":[
+	{
+		"Name":"D3DCOMPILE_OPTIMIZATION_LEVEL2"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":49152
+		,"Attrs":[]
+	}
+	,{
+		"Name":"D3D_COMPILE_STANDARD_FILE_INCLUDE"
+		,"Type":{"Kind":"Native","Name":"UInt32"}
+		,"ValueType":"UInt32"
+		,"Value":1
+		,"Attrs":[]
+	}
+]
+
+,"Types":[
+]
+
+,"Functions":[
+]
+
+,"UnicodeAliases":[
+]
+
+}

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1AnalysisTransform.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("0359dc30-95e6-4568-9055-27720d130e93")]
 [NativeTypeName("struct ID2D1AnalysisTransform : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1AnalysisTransform : INativeGuid
+public unsafe partial struct ID2D1AnalysisTransform : ID2D1AnalysisTransform.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1AnalysisTransform
 	{
@@ -81,5 +81,10 @@ public unsafe partial struct ID2D1AnalysisTransform : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1AnalysisTransform*, byte*, uint, int>)(lpVtbl[3]))((ID2D1AnalysisTransform*)Unsafe.AsPointer(ref this), analysisData, analysisDataCount);
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		HResult ProcessAnalysisResults(byte* analysisData, uint analysisDataCount);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("a2296057-ea42-4099-983b-539fb6505426")]
 [NativeTypeName("struct ID2D1Bitmap : ID2D1Image")]
 [NativeInheritance("ID2D1Image")]
-public unsafe partial struct ID2D1Bitmap : INativeGuid
+public unsafe partial struct ID2D1Bitmap : ID2D1Bitmap.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Bitmap
 	{
@@ -140,5 +140,28 @@ public unsafe partial struct ID2D1Bitmap : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap*, Common.RectU*, void*, uint, int>)(lpVtbl[10]))((ID2D1Bitmap*)Unsafe.AsPointer(ref this), dstRect, srcData, pitch);
 	}
+	public interface Interface : ID2D1Image.Interface
+	{
+		[VtblIndex(4)]
+		System.Drawing.SizeF GetSize();
+
+		[VtblIndex(5)]
+		System.Drawing.Size GetPixelSize();
+
+		[VtblIndex(6)]
+		Common.PixelFormat GetPixelFormat();
+
+		[VtblIndex(7)]
+		void GetDpi(float* dpiX, float* dpiY);
+
+		[VtblIndex(8)]
+		HResult CopyFromBitmap(System.Drawing.Point* destPoint, ID2D1Bitmap* bitmap, Common.RectU* srcRect);
+
+		[VtblIndex(9)]
+		HResult CopyFromRenderTarget(System.Drawing.Point* destPoint, ID2D1RenderTarget* renderTarget, Common.RectU* srcRect);
+
+		[VtblIndex(10)]
+		HResult CopyFromMemory(Common.RectU* dstRect, void* srcData, uint pitch);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("a898a84c-3873-4588-b08b-ebbf978df041")]
 [NativeTypeName("struct ID2D1Bitmap1 : ID2D1Bitmap")]
 [NativeInheritance("ID2D1Bitmap")]
-public unsafe partial struct ID2D1Bitmap1 : INativeGuid
+public unsafe partial struct ID2D1Bitmap1 : ID2D1Bitmap1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Bitmap1
 	{
@@ -180,5 +180,22 @@ public unsafe partial struct ID2D1Bitmap1 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap1*, int>)(lpVtbl[15]))((ID2D1Bitmap1*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : ID2D1Bitmap.Interface
+	{
+		[VtblIndex(11)]
+		void GetColorContext(ID2D1ColorContext** colorContext);
+
+		[VtblIndex(12)]
+		BitmapOptions GetOptions();
+
+		[VtblIndex(13)]
+		HResult GetSurface(Graphics.Dxgi.IDXGISurface** dxgiSurface);
+
+		[VtblIndex(14)]
+		HResult Map(MapOptions options, MappedRect* mappedRect);
+
+		[VtblIndex(15)]
+		HResult Unmap();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapBrush.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906aa-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1BitmapBrush : ID2D1Brush")]
 [NativeInheritance("ID2D1Brush")]
-public unsafe partial struct ID2D1BitmapBrush : INativeGuid
+public unsafe partial struct ID2D1BitmapBrush : ID2D1BitmapBrush.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1BitmapBrush
 	{
@@ -177,5 +177,31 @@ public unsafe partial struct ID2D1BitmapBrush : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1BitmapBrush*, ID2D1Bitmap**, void>)(lpVtbl[15]))((ID2D1BitmapBrush*)Unsafe.AsPointer(ref this), bitmap);
 	}
+	public interface Interface : ID2D1Brush.Interface
+	{
+		[VtblIndex(8)]
+		void SetExtendModeX(ExtendMode extendModeX);
+
+		[VtblIndex(9)]
+		void SetExtendModeY(ExtendMode extendModeY);
+
+		[VtblIndex(10)]
+		void SetInterpolationMode(BitmapInterpolationMode interpolationMode);
+
+		[VtblIndex(11)]
+		void SetBitmap(ID2D1Bitmap* bitmap);
+
+		[VtblIndex(12)]
+		ExtendMode GetExtendModeX();
+
+		[VtblIndex(13)]
+		ExtendMode GetExtendModeY();
+
+		[VtblIndex(14)]
+		BitmapInterpolationMode GetInterpolationMode();
+
+		[VtblIndex(15)]
+		void GetBitmap(ID2D1Bitmap** bitmap);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapBrush1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("41343a53-e41a-49a2-91cd-21793bbb62e5")]
 [NativeTypeName("struct ID2D1BitmapBrush1 : ID2D1BitmapBrush")]
 [NativeInheritance("ID2D1BitmapBrush")]
-public unsafe partial struct ID2D1BitmapBrush1 : INativeGuid
+public unsafe partial struct ID2D1BitmapBrush1 : ID2D1BitmapBrush1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1BitmapBrush1
 	{
@@ -193,5 +193,13 @@ public unsafe partial struct ID2D1BitmapBrush1 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1BitmapBrush1*, InterpolationMode>)(lpVtbl[17]))((ID2D1BitmapBrush1*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : ID2D1BitmapBrush.Interface
+	{
+		[VtblIndex(16)]
+		void SetInterpolationMode1(InterpolationMode interpolationMode);
+
+		[VtblIndex(17)]
+		InterpolationMode GetInterpolationMode1();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapRenderTarget.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd90695-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1BitmapRenderTarget : ID2D1RenderTarget")]
 [NativeInheritance("ID2D1RenderTarget")]
-public unsafe partial struct ID2D1BitmapRenderTarget : INativeGuid
+public unsafe partial struct ID2D1BitmapRenderTarget : ID2D1BitmapRenderTarget.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1BitmapRenderTarget
 	{
@@ -516,5 +516,10 @@ public unsafe partial struct ID2D1BitmapRenderTarget : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, ID2D1Bitmap**, int>)(lpVtbl[57]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), bitmap);
 	}
+	public interface Interface : ID2D1RenderTarget.Interface
+	{
+		[VtblIndex(57)]
+		HResult GetBitmap(ID2D1Bitmap** bitmap);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BlendTransform.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("63ac0b32-ba44-450f-8806-7f4ca1ff2f1b")]
 [NativeTypeName("struct ID2D1BlendTransform : ID2D1ConcreteTransform")]
 [NativeInheritance("ID2D1ConcreteTransform")]
-public unsafe partial struct ID2D1BlendTransform : INativeGuid
+public unsafe partial struct ID2D1BlendTransform : ID2D1BlendTransform.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1BlendTransform
 	{
@@ -113,5 +113,13 @@ public unsafe partial struct ID2D1BlendTransform : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1BlendTransform*, BlendDescription*, void>)(lpVtbl[7]))((ID2D1BlendTransform*)Unsafe.AsPointer(ref this), description);
 	}
+	public interface Interface : ID2D1ConcreteTransform.Interface
+	{
+		[VtblIndex(6)]
+		void SetDescription(BlendDescription* description);
+
+		[VtblIndex(7)]
+		void GetDescription(BlendDescription* description);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BorderTransform.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("4998735c-3a19-473c-9781-656847e3a347")]
 [NativeTypeName("struct ID2D1BorderTransform : ID2D1ConcreteTransform")]
 [NativeInheritance("ID2D1ConcreteTransform")]
-public unsafe partial struct ID2D1BorderTransform : INativeGuid
+public unsafe partial struct ID2D1BorderTransform : ID2D1BorderTransform.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1BorderTransform
 	{
@@ -129,5 +129,19 @@ public unsafe partial struct ID2D1BorderTransform : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1BorderTransform*, ExtendMode>)(lpVtbl[9]))((ID2D1BorderTransform*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : ID2D1ConcreteTransform.Interface
+	{
+		[VtblIndex(6)]
+		void SetExtendModeX(ExtendMode extendMode);
+
+		[VtblIndex(7)]
+		void SetExtendModeY(ExtendMode extendMode);
+
+		[VtblIndex(8)]
+		ExtendMode GetExtendModeX();
+
+		[VtblIndex(9)]
+		ExtendMode GetExtendModeY();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BoundsAdjustmentTransform.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("90f732e2-5092-4606-a819-8651970baccd")]
 [NativeTypeName("struct ID2D1BoundsAdjustmentTransform : ID2D1TransformNode")]
 [NativeInheritance("ID2D1TransformNode")]
-public unsafe partial struct ID2D1BoundsAdjustmentTransform : INativeGuid
+public unsafe partial struct ID2D1BoundsAdjustmentTransform : ID2D1BoundsAdjustmentTransform.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1BoundsAdjustmentTransform
 	{
@@ -97,5 +97,13 @@ public unsafe partial struct ID2D1BoundsAdjustmentTransform : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1BoundsAdjustmentTransform*, RawRect*, void>)(lpVtbl[5]))((ID2D1BoundsAdjustmentTransform*)Unsafe.AsPointer(ref this), outputBounds);
 	}
+	public interface Interface : ID2D1TransformNode.Interface
+	{
+		[VtblIndex(4)]
+		void SetOutputBounds(RawRect* outputBounds);
+
+		[VtblIndex(5)]
+		void GetOutputBounds(RawRect* outputBounds);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Brush.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906a8-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1Brush : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1Brush : INativeGuid
+public unsafe partial struct ID2D1Brush : ID2D1Brush.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Brush
 	{
@@ -113,5 +113,19 @@ public unsafe partial struct ID2D1Brush : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1Brush*, Matrix3x2*, void>)(lpVtbl[7]))((ID2D1Brush*)Unsafe.AsPointer(ref this), transform);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		void SetOpacity(float opacity);
+
+		[VtblIndex(5)]
+		void SetTransform(Matrix3x2* transform);
+
+		[VtblIndex(6)]
+		float GetOpacity();
+
+		[VtblIndex(7)]
+		void GetTransform(Matrix3x2* transform);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ColorContext.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("1c4820bb-5771-4518-a581-2fe4dd0ec657")]
 [NativeTypeName("struct ID2D1ColorContext : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1ColorContext : INativeGuid
+public unsafe partial struct ID2D1ColorContext : ID2D1ColorContext.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1ColorContext
 	{
@@ -105,5 +105,16 @@ public unsafe partial struct ID2D1ColorContext : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1ColorContext*, byte*, uint, int>)(lpVtbl[6]))((ID2D1ColorContext*)Unsafe.AsPointer(ref this), profile, profileSize);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		ColorSpace GetColorSpace();
+
+		[VtblIndex(5)]
+		uint GetProfileSize();
+
+		[VtblIndex(6)]
+		HResult GetProfile(byte* profile, uint profileSize);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ColorContext1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("1ab42875-c57f-4be9-bd85-9cd78d6f55ee")]
 [NativeTypeName("struct ID2D1ColorContext1 : ID2D1ColorContext")]
 [NativeInheritance("ID2D1ColorContext")]
-public unsafe partial struct ID2D1ColorContext1 : INativeGuid
+public unsafe partial struct ID2D1ColorContext1 : ID2D1ColorContext1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1ColorContext1
 	{
@@ -129,5 +129,16 @@ public unsafe partial struct ID2D1ColorContext1 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1ColorContext1*, SimpleColorProfile*, int>)(lpVtbl[9]))((ID2D1ColorContext1*)Unsafe.AsPointer(ref this), simpleProfile);
 	}
+	public interface Interface : ID2D1ColorContext.Interface
+	{
+		[VtblIndex(7)]
+		ColorContextType GetColorContextType();
+
+		[VtblIndex(8)]
+		Graphics.Dxgi.Common.ColorSpaceType GetDXGIColorSpace();
+
+		[VtblIndex(9)]
+		HResult GetSimpleColorProfile(SimpleColorProfile* simpleProfile);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandList.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("b4f34a19-2383-4d76-94f6-ec343657c3dc")]
 [NativeTypeName("struct ID2D1CommandList : ID2D1Image")]
 [NativeInheritance("ID2D1Image")]
-public unsafe partial struct ID2D1CommandList : INativeGuid
+public unsafe partial struct ID2D1CommandList : ID2D1CommandList.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1CommandList
 	{
@@ -97,5 +97,13 @@ public unsafe partial struct ID2D1CommandList : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1CommandList*, int>)(lpVtbl[5]))((ID2D1CommandList*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : ID2D1Image.Interface
+	{
+		[VtblIndex(4)]
+		HResult Stream(ID2D1CommandSink* sink);
+
+		[VtblIndex(5)]
+		HResult Close();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("54d7898a-a061-40a7-bec7-e465bcba2c4f")]
 [NativeTypeName("struct ID2D1CommandSink : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1CommandSink : INativeGuid
+public unsafe partial struct ID2D1CommandSink : ID2D1CommandSink.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1CommandSink
 	{
@@ -273,5 +273,82 @@ public unsafe partial struct ID2D1CommandSink : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, int>)(lpVtbl[27]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		HResult BeginDraw();
+
+		[VtblIndex(4)]
+		HResult EndDraw();
+
+		[VtblIndex(5)]
+		HResult SetAntialiasMode(AntialiasMode antialiasMode);
+
+		[VtblIndex(6)]
+		HResult SetTags(ulong tag1, ulong tag2);
+
+		[VtblIndex(7)]
+		HResult SetTextAntialiasMode(TextAntialiasMode textAntialiasMode);
+
+		[VtblIndex(8)]
+		HResult SetTextRenderingParams(Graphics.DirectWrite.IDWriteRenderingParams* textRenderingParams);
+
+		[VtblIndex(9)]
+		HResult SetTransform(Matrix3x2* transform);
+
+		[VtblIndex(10)]
+		HResult SetPrimitiveBlend(PrimitiveBlend primitiveBlend);
+
+		[VtblIndex(11)]
+		HResult SetUnitMode(UnitMode unitMode);
+
+		[VtblIndex(12)]
+		HResult Clear(Color4* color);
+
+		[VtblIndex(13)]
+		HResult DrawGlyphRun(System.Drawing.PointF baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.GlyphRunDescription* glyphRunDescription, ID2D1Brush* foregroundBrush, Graphics.DirectWrite.MeasuringMode measuringMode);
+
+		[VtblIndex(14)]
+		HResult DrawLine(System.Drawing.PointF point0, System.Drawing.PointF point1, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
+
+		[VtblIndex(15)]
+		HResult DrawGeometry(ID2D1Geometry* geometry, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
+
+		[VtblIndex(16)]
+		HResult DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
+
+		[VtblIndex(17)]
+		HResult DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform);
+
+		[VtblIndex(18)]
+		HResult DrawImage(ID2D1Image* image, System.Drawing.PointF* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode);
+
+		[VtblIndex(19)]
+		HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, System.Drawing.PointF* targetOffset);
+
+		[VtblIndex(20)]
+		HResult FillMesh(ID2D1Mesh* mesh, ID2D1Brush* brush);
+
+		[VtblIndex(21)]
+		HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle);
+
+		[VtblIndex(22)]
+		HResult FillGeometry(ID2D1Geometry* geometry, ID2D1Brush* brush, ID2D1Brush* opacityBrush);
+
+		[VtblIndex(23)]
+		HResult FillRectangle(Common.RectF* rect, ID2D1Brush* brush);
+
+		[VtblIndex(24)]
+		HResult PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode);
+
+		[VtblIndex(25)]
+		HResult PushLayer(LayerParameters1* layerParameters1, ID2D1Layer* layer);
+
+		[VtblIndex(26)]
+		HResult PopAxisAlignedClip();
+
+		[VtblIndex(27)]
+		HResult PopLayer();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("9eb767fd-4269-4467-b8c2-eb30cb305743")]
 [NativeTypeName("struct ID2D1CommandSink1 : ID2D1CommandSink")]
 [NativeInheritance("ID2D1CommandSink")]
-public unsafe partial struct ID2D1CommandSink1 : INativeGuid
+public unsafe partial struct ID2D1CommandSink1 : ID2D1CommandSink1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1CommandSink1
 	{
@@ -281,5 +281,10 @@ public unsafe partial struct ID2D1CommandSink1 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, PrimitiveBlend, int>)(lpVtbl[28]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), primitiveBlend);
 	}
+	public interface Interface : ID2D1CommandSink.Interface
+	{
+		[VtblIndex(28)]
+		HResult SetPrimitiveBlend1(PrimitiveBlend primitiveBlend);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink2.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("3bab440e-417e-47df-a2e2-bc0be6a00916")]
 [NativeTypeName("struct ID2D1CommandSink2 : ID2D1CommandSink1")]
 [NativeInheritance("ID2D1CommandSink1")]
-public unsafe partial struct ID2D1CommandSink2 : INativeGuid
+public unsafe partial struct ID2D1CommandSink2 : ID2D1CommandSink2.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1CommandSink2
 	{
@@ -305,5 +305,16 @@ public unsafe partial struct ID2D1CommandSink2 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, ID2D1GdiMetafile*, Common.RectF*, Common.RectF*, int>)(lpVtbl[31]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
 	}
+	public interface Interface : ID2D1CommandSink1.Interface
+	{
+		[VtblIndex(29)]
+		HResult DrawInk(ID2D1Ink* ink, ID2D1Brush* brush, ID2D1InkStyle* inkStyle);
+
+		[VtblIndex(30)]
+		HResult DrawGradientMesh(ID2D1GradientMesh* gradientMesh);
+
+		[VtblIndex(31)]
+		HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink3.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("18079135-4cf3-4868-bc8e-06067e6d242d")]
 [NativeTypeName("struct ID2D1CommandSink3 : ID2D1CommandSink2")]
 [NativeInheritance("ID2D1CommandSink2")]
-public unsafe partial struct ID2D1CommandSink3 : INativeGuid
+public unsafe partial struct ID2D1CommandSink3 : ID2D1CommandSink3.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1CommandSink3
 	{
@@ -313,5 +313,10 @@ public unsafe partial struct ID2D1CommandSink3 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, ID2D1SpriteBatch*, uint, uint, ID2D1Bitmap*, BitmapInterpolationMode, SpriteOptions, int>)(lpVtbl[32]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), spriteBatch, startIndex, spriteCount, bitmap, interpolationMode, spriteOptions);
 	}
+	public interface Interface : ID2D1CommandSink2.Interface
+	{
+		[VtblIndex(32)]
+		HResult DrawSpriteBatch(ID2D1SpriteBatch* spriteBatch, uint startIndex, uint spriteCount, ID2D1Bitmap* bitmap, BitmapInterpolationMode interpolationMode, SpriteOptions spriteOptions);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink4.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("c78a6519-40d6-4218-b2de-beeeb744bb3e")]
 [NativeTypeName("struct ID2D1CommandSink4 : ID2D1CommandSink3")]
 [NativeInheritance("ID2D1CommandSink3")]
-public unsafe partial struct ID2D1CommandSink4 : INativeGuid
+public unsafe partial struct ID2D1CommandSink4 : ID2D1CommandSink4.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1CommandSink4
 	{
@@ -321,5 +321,10 @@ public unsafe partial struct ID2D1CommandSink4 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, PrimitiveBlend, int>)(lpVtbl[33]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), primitiveBlend);
 	}
+	public interface Interface : ID2D1CommandSink3.Interface
+	{
+		[VtblIndex(33)]
+		HResult SetPrimitiveBlend2(PrimitiveBlend primitiveBlend);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink5.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("7047dd26-b1e7-44a7-959a-8349e2144fa8")]
 [NativeTypeName("struct ID2D1CommandSink5 : ID2D1CommandSink4")]
 [NativeInheritance("ID2D1CommandSink4")]
-public unsafe partial struct ID2D1CommandSink5 : INativeGuid
+public unsafe partial struct ID2D1CommandSink5 : ID2D1CommandSink5.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1CommandSink5
 	{
@@ -329,5 +329,10 @@ public unsafe partial struct ID2D1CommandSink5 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, ID2D1Image*, Common.BlendMode, System.Drawing.PointF*, Common.RectF*, InterpolationMode, int>)(lpVtbl[34]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), image, blendMode, targetOffset, imageRectangle, interpolationMode);
 	}
+	public interface Interface : ID2D1CommandSink4.Interface
+	{
+		[VtblIndex(34)]
+		HResult BlendImage(ID2D1Image* image, Common.BlendMode blendMode, System.Drawing.PointF* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeInfo.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("5598b14b-9fd7-48b7-9bdb-8f0964eb38bc")]
 [NativeTypeName("struct ID2D1ComputeInfo : ID2D1RenderInfo")]
 [NativeInheritance("ID2D1RenderInfo")]
-public unsafe partial struct ID2D1ComputeInfo : INativeGuid
+public unsafe partial struct ID2D1ComputeInfo : ID2D1ComputeInfo.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1ComputeInfo
 	{
@@ -129,5 +129,16 @@ public unsafe partial struct ID2D1ComputeInfo : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeInfo*, uint, ID2D1ResourceTexture*, int>)(lpVtbl[9]))((ID2D1ComputeInfo*)Unsafe.AsPointer(ref this), textureIndex, resourceTexture);
 	}
+	public interface Interface : ID2D1RenderInfo.Interface
+	{
+		[VtblIndex(7)]
+		HResult SetComputeShaderConstantBuffer(byte* buffer, uint bufferCount);
+
+		[VtblIndex(8)]
+		HResult SetComputeShader(Guid* shaderId);
+
+		[VtblIndex(9)]
+		HResult SetResourceTexture(uint textureIndex, ID2D1ResourceTexture* resourceTexture);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeTransform.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("0d85573c-01e3-4f7d-bfd9-0d60608bf3c3")]
 [NativeTypeName("struct ID2D1ComputeTransform : ID2D1Transform")]
 [NativeInheritance("ID2D1Transform")]
-public unsafe partial struct ID2D1ComputeTransform : INativeGuid
+public unsafe partial struct ID2D1ComputeTransform : ID2D1ComputeTransform.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1ComputeTransform
 	{
@@ -121,5 +121,13 @@ public unsafe partial struct ID2D1ComputeTransform : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeTransform*, RawRect*, uint*, uint*, uint*, int>)(lpVtbl[8]))((ID2D1ComputeTransform*)Unsafe.AsPointer(ref this), outputRect, dimensionX, dimensionY, dimensionZ);
 	}
+	public interface Interface : ID2D1Transform.Interface
+	{
+		[VtblIndex(7)]
+		HResult SetComputeInfo(ID2D1ComputeInfo* computeInfo);
+
+		[VtblIndex(8)]
+		HResult CalculateThreadgroups(RawRect* outputRect, uint* dimensionX, uint* dimensionY, uint* dimensionZ);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ConcreteTransform.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("1a799d8a-69f7-4e4c-9fed-437ccc6684cc")]
 [NativeTypeName("struct ID2D1ConcreteTransform : ID2D1TransformNode")]
 [NativeInheritance("ID2D1TransformNode")]
-public unsafe partial struct ID2D1ConcreteTransform : INativeGuid
+public unsafe partial struct ID2D1ConcreteTransform : ID2D1ConcreteTransform.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1ConcreteTransform
 	{
@@ -97,5 +97,13 @@ public unsafe partial struct ID2D1ConcreteTransform : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1ConcreteTransform*, Bool32, void>)(lpVtbl[5]))((ID2D1ConcreteTransform*)Unsafe.AsPointer(ref this), isCached);
 	}
+	public interface Interface : ID2D1TransformNode.Interface
+	{
+		[VtblIndex(4)]
+		HResult SetOutputBuffer(BufferPrecision bufferPrecision, ChannelDepth channelDepth);
+
+		[VtblIndex(5)]
+		void SetCached(Bool32 isCached);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DCRenderTarget.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("1c51bc64-de61-46fd-9899-63a5d8f03950")]
 [NativeTypeName("struct ID2D1DCRenderTarget : ID2D1RenderTarget")]
 [NativeInheritance("ID2D1RenderTarget")]
-public unsafe partial struct ID2D1DCRenderTarget : INativeGuid
+public unsafe partial struct ID2D1DCRenderTarget : ID2D1DCRenderTarget.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1DCRenderTarget
 	{
@@ -516,5 +516,10 @@ public unsafe partial struct ID2D1DCRenderTarget : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, IntPtr, RawRect*, int>)(lpVtbl[57]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), hDC, pSubRect);
 	}
+	public interface Interface : ID2D1RenderTarget.Interface
+	{
+		[VtblIndex(57)]
+		HResult BindDC(IntPtr hDC, RawRect* pSubRect);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("47dd575d-ac05-4cdd-8049-9b02cd16f44c")]
 [NativeTypeName("struct ID2D1Device : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1Device : INativeGuid
+public unsafe partial struct ID2D1Device : ID2D1Device.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Device
 	{
@@ -113,5 +113,19 @@ public unsafe partial struct ID2D1Device : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1Device*, uint, void>)(lpVtbl[7]))((ID2D1Device*)Unsafe.AsPointer(ref this), millisecondsSinceUse);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		HResult CreateDeviceContext(DeviceContextOptions options, ID2D1DeviceContext** deviceContext);
+
+		[VtblIndex(5)]
+		void SetMaximumTextureMemory(ulong maximumInBytes);
+
+		[VtblIndex(6)]
+		ulong GetMaximumTextureMemory();
+
+		[VtblIndex(7)]
+		void ClearResources(uint millisecondsSinceUse);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("d21768e1-23a4-4823-a14b-7c3eba85d658")]
 [NativeTypeName("struct ID2D1Device1 : ID2D1Device")]
 [NativeInheritance("ID2D1Device")]
-public unsafe partial struct ID2D1Device1 : INativeGuid
+public unsafe partial struct ID2D1Device1 : ID2D1Device1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Device1
 	{
@@ -137,5 +137,16 @@ public unsafe partial struct ID2D1Device1 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Device1*, DeviceContextOptions, ID2D1DeviceContext1**, int>)(lpVtbl[10]))((ID2D1Device1*)Unsafe.AsPointer(ref this), options, deviceContext1);
 	}
+	public interface Interface : ID2D1Device.Interface
+	{
+		[VtblIndex(8)]
+		RenderingPriority GetRenderingPriority();
+
+		[VtblIndex(9)]
+		void SetRenderingPriority(RenderingPriority renderingPriority);
+
+		[VtblIndex(10)]
+		HResult CreateDeviceContext(DeviceContextOptions options, ID2D1DeviceContext1** deviceContext1);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device2.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("a44472e1-8dfb-4e60-8492-6e2861c9ca8b")]
 [NativeTypeName("struct ID2D1Device2 : ID2D1Device1")]
 [NativeInheritance("ID2D1Device1")]
-public unsafe partial struct ID2D1Device2 : INativeGuid
+public unsafe partial struct ID2D1Device2 : ID2D1Device2.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Device2
 	{
@@ -161,5 +161,16 @@ public unsafe partial struct ID2D1Device2 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Device2*, Graphics.Dxgi.IDXGIDevice**, int>)(lpVtbl[13]))((ID2D1Device2*)Unsafe.AsPointer(ref this), dxgiDevice);
 	}
+	public interface Interface : ID2D1Device1.Interface
+	{
+		[VtblIndex(11)]
+		HResult CreateDeviceContext(DeviceContextOptions options, ID2D1DeviceContext2** deviceContext2);
+
+		[VtblIndex(12)]
+		void FlushDeviceContexts(ID2D1Bitmap* bitmap);
+
+		[VtblIndex(13)]
+		HResult GetDxgiDevice(Graphics.Dxgi.IDXGIDevice** dxgiDevice);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device3.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("852f2087-802c-4037-ab60-ff2e7ee6fc01")]
 [NativeTypeName("struct ID2D1Device3 : ID2D1Device2")]
 [NativeInheritance("ID2D1Device2")]
-public unsafe partial struct ID2D1Device3 : INativeGuid
+public unsafe partial struct ID2D1Device3 : ID2D1Device3.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Device3
 	{
@@ -169,5 +169,10 @@ public unsafe partial struct ID2D1Device3 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Device3*, DeviceContextOptions, ID2D1DeviceContext3**, int>)(lpVtbl[14]))((ID2D1Device3*)Unsafe.AsPointer(ref this), options, deviceContext3);
 	}
+	public interface Interface : ID2D1Device2.Interface
+	{
+		[VtblIndex(14)]
+		HResult CreateDeviceContext(DeviceContextOptions options, ID2D1DeviceContext3** deviceContext3);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device4.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("d7bdb159-5683-4a46-bc9c-72dc720b858b")]
 [NativeTypeName("struct ID2D1Device4 : ID2D1Device3")]
 [NativeInheritance("ID2D1Device3")]
-public unsafe partial struct ID2D1Device4 : INativeGuid
+public unsafe partial struct ID2D1Device4 : ID2D1Device4.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Device4
 	{
@@ -193,5 +193,16 @@ public unsafe partial struct ID2D1Device4 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Device4*, ulong>)(lpVtbl[17]))((ID2D1Device4*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : ID2D1Device3.Interface
+	{
+		[VtblIndex(15)]
+		HResult CreateDeviceContext(DeviceContextOptions options, ID2D1DeviceContext4** deviceContext4);
+
+		[VtblIndex(16)]
+		void SetMaximumColorGlyphCacheMemory(ulong maximumInBytes);
+
+		[VtblIndex(17)]
+		ulong GetMaximumColorGlyphCacheMemory();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device5.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("d55ba0a4-6405-4694-aef5-08ee1a4358b4")]
 [NativeTypeName("struct ID2D1Device5 : ID2D1Device4")]
 [NativeInheritance("ID2D1Device4")]
-public unsafe partial struct ID2D1Device5 : INativeGuid
+public unsafe partial struct ID2D1Device5 : ID2D1Device5.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Device5
 	{
@@ -201,5 +201,10 @@ public unsafe partial struct ID2D1Device5 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Device5*, DeviceContextOptions, ID2D1DeviceContext5**, int>)(lpVtbl[18]))((ID2D1Device5*)Unsafe.AsPointer(ref this), options, deviceContext5);
 	}
+	public interface Interface : ID2D1Device4.Interface
+	{
+		[VtblIndex(18)]
+		HResult CreateDeviceContext(DeviceContextOptions options, ID2D1DeviceContext5** deviceContext5);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device6.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("7bfef914-2d75-4bad-be87-e18ddb077b6d")]
 [NativeTypeName("struct ID2D1Device6 : ID2D1Device5")]
 [NativeInheritance("ID2D1Device5")]
-public unsafe partial struct ID2D1Device6 : INativeGuid
+public unsafe partial struct ID2D1Device6 : ID2D1Device6.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Device6
 	{
@@ -209,5 +209,10 @@ public unsafe partial struct ID2D1Device6 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Device6*, DeviceContextOptions, ID2D1DeviceContext6**, int>)(lpVtbl[19]))((ID2D1Device6*)Unsafe.AsPointer(ref this), options, deviceContext6);
 	}
+	public interface Interface : ID2D1Device5.Interface
+	{
+		[VtblIndex(19)]
+		HResult CreateDeviceContext(DeviceContextOptions options, ID2D1DeviceContext6** deviceContext6);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("e8f7fe7a-191c-466d-ad95-975678bda998")]
 [NativeTypeName("struct ID2D1DeviceContext : ID2D1RenderTarget")]
 [NativeInheritance("ID2D1RenderTarget")]
-public unsafe partial struct ID2D1DeviceContext : INativeGuid
+public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1DeviceContext
 	{
@@ -788,5 +788,112 @@ public unsafe partial struct ID2D1DeviceContext : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
+	public interface Interface : ID2D1RenderTarget.Interface
+	{
+		[VtblIndex(57)]
+		HResult CreateBitmap(System.Drawing.Size size, void* sourceData, uint pitch, BitmapProperties1* bitmapProperties, ID2D1Bitmap1** bitmap);
+
+		[VtblIndex(58)]
+		HResult CreateBitmapFromWicBitmap(Graphics.Imaging.IWICBitmapSource* wicBitmapSource, BitmapProperties1* bitmapProperties, ID2D1Bitmap1** bitmap);
+
+		[VtblIndex(59)]
+		HResult CreateColorContext(ColorSpace space, byte* profile, uint profileSize, ID2D1ColorContext** colorContext);
+
+		[VtblIndex(60)]
+		HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext);
+
+		[VtblIndex(61)]
+		HResult CreateColorContextFromWicColorContext(Graphics.Imaging.IWICColorContext* wicColorContext, ID2D1ColorContext** colorContext);
+
+		[VtblIndex(62)]
+		HResult CreateBitmapFromDxgiSurface(Graphics.Dxgi.IDXGISurface* surface, BitmapProperties1* bitmapProperties, ID2D1Bitmap1** bitmap);
+
+		[VtblIndex(63)]
+		HResult CreateEffect(Guid* effectId, ID2D1Effect** effect);
+
+		[VtblIndex(64)]
+		HResult CreateGradientStopCollection(GradientStop* straightAlphaGradientStops, uint straightAlphaGradientStopsCount, ColorSpace preInterpolationSpace, ColorSpace postInterpolationSpace, BufferPrecision bufferPrecision, ExtendMode extendMode, ColorInterpolationMode colorInterpolationMode, ID2D1GradientStopCollection1** gradientStopCollection1);
+
+		[VtblIndex(65)]
+		HResult CreateImageBrush(ID2D1Image* image, ImageBrushProperties* imageBrushProperties, BrushProperties* brushProperties, ID2D1ImageBrush** imageBrush);
+
+		[VtblIndex(66)]
+		HResult CreateBitmapBrush(ID2D1Bitmap* bitmap, BitmapBrushProperties1* bitmapBrushProperties, BrushProperties* brushProperties, ID2D1BitmapBrush1** bitmapBrush);
+
+		[VtblIndex(67)]
+		HResult CreateCommandList(ID2D1CommandList** commandList);
+
+		[VtblIndex(68)]
+		Bool32 IsDxgiFormatSupported(Graphics.Dxgi.Common.Format format);
+
+		[VtblIndex(69)]
+		Bool32 IsBufferPrecisionSupported(BufferPrecision bufferPrecision);
+
+		[VtblIndex(70)]
+		HResult GetImageLocalBounds(ID2D1Image* image, Common.RectF* localBounds);
+
+		[VtblIndex(71)]
+		HResult GetImageWorldBounds(ID2D1Image* image, Common.RectF* worldBounds);
+
+		[VtblIndex(72)]
+		HResult GetGlyphRunWorldBounds(System.Drawing.PointF baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Common.RectF* bounds);
+
+		[VtblIndex(73)]
+		void GetDevice(ID2D1Device** device);
+
+		[VtblIndex(74)]
+		void SetTarget(ID2D1Image* image);
+
+		[VtblIndex(75)]
+		void GetTarget(ID2D1Image** image);
+
+		[VtblIndex(76)]
+		void SetRenderingControls(RenderingControls* renderingControls);
+
+		[VtblIndex(77)]
+		void GetRenderingControls(RenderingControls* renderingControls);
+
+		[VtblIndex(78)]
+		void SetPrimitiveBlend(PrimitiveBlend primitiveBlend);
+
+		[VtblIndex(79)]
+		PrimitiveBlend GetPrimitiveBlend();
+
+		[VtblIndex(80)]
+		void SetUnitMode(UnitMode unitMode);
+
+		[VtblIndex(81)]
+		UnitMode GetUnitMode();
+
+		[VtblIndex(82)]
+		void DrawGlyphRun(System.Drawing.PointF baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.GlyphRunDescription* glyphRunDescription, ID2D1Brush* foregroundBrush, Graphics.DirectWrite.MeasuringMode measuringMode);
+
+		[VtblIndex(83)]
+		void DrawImage(ID2D1Image* image, System.Drawing.PointF* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode);
+
+		[VtblIndex(84)]
+		void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, System.Drawing.PointF* targetOffset);
+
+		[VtblIndex(85)]
+		void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform);
+
+		[VtblIndex(86)]
+		void PushLayer(LayerParameters1* layerParameters, ID2D1Layer* layer);
+
+		[VtblIndex(87)]
+		HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Common.RectF* inputRectangle);
+
+		[VtblIndex(88)]
+		HResult GetEffectInvalidRectangleCount(ID2D1Effect* effect, uint* rectangleCount);
+
+		[VtblIndex(89)]
+		HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Common.RectF* rectangles, uint rectanglesCount);
+
+		[VtblIndex(90)]
+		HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Common.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Common.RectF* requiredInputRects, uint inputCount);
+
+		[VtblIndex(91)]
+		void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("d37f57e4-6908-459f-a199-e72f24f79987")]
 [NativeTypeName("struct ID2D1DeviceContext1 : ID2D1DeviceContext")]
 [NativeInheritance("ID2D1DeviceContext")]
-public unsafe partial struct ID2D1DeviceContext1 : INativeGuid
+public unsafe partial struct ID2D1DeviceContext1 : ID2D1DeviceContext1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1DeviceContext1
 	{
@@ -812,5 +812,16 @@ public unsafe partial struct ID2D1DeviceContext1 : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1GeometryRealization*, ID2D1Brush*, void>)(lpVtbl[94]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), geometryRealization, brush);
 	}
+	public interface Interface : ID2D1DeviceContext.Interface
+	{
+		[VtblIndex(92)]
+		HResult CreateFilledGeometryRealization(ID2D1Geometry* geometry, float flatteningTolerance, ID2D1GeometryRealization** geometryRealization);
+
+		[VtblIndex(93)]
+		HResult CreateStrokedGeometryRealization(ID2D1Geometry* geometry, float flatteningTolerance, float strokeWidth, ID2D1StrokeStyle* strokeStyle, ID2D1GeometryRealization** geometryRealization);
+
+		[VtblIndex(94)]
+		void DrawGeometryRealization(ID2D1GeometryRealization* geometryRealization, ID2D1Brush* brush);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext2.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("394ea6a3-0c34-4321-950b-6ca20f0be6c7")]
 [NativeTypeName("struct ID2D1DeviceContext2 : ID2D1DeviceContext1")]
 [NativeInheritance("ID2D1DeviceContext1")]
-public unsafe partial struct ID2D1DeviceContext2 : INativeGuid
+public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1DeviceContext2
 	{
@@ -900,5 +900,40 @@ public unsafe partial struct ID2D1DeviceContext2 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1ImageSource*, TransformedImageSourceProperties*, ID2D1TransformedImageSource**, int>)(lpVtbl[105]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), imageSource, properties, transformedImageSource);
 	}
+	public interface Interface : ID2D1DeviceContext1.Interface
+	{
+		[VtblIndex(95)]
+		HResult CreateInk(InkPoint* startPoint, ID2D1Ink** ink);
+
+		[VtblIndex(96)]
+		HResult CreateInkStyle(InkStyleProperties* inkStyleProperties, ID2D1InkStyle** inkStyle);
+
+		[VtblIndex(97)]
+		HResult CreateGradientMesh(GradientMeshPatch* patches, uint patchesCount, ID2D1GradientMesh** gradientMesh);
+
+		[VtblIndex(98)]
+		HResult CreateImageSourceFromWic(Graphics.Imaging.IWICBitmapSource* wicBitmapSource, ImageSourceLoadingOptions loadingOptions, Common.AlphaMode alphaMode, ID2D1ImageSourceFromWic** imageSource);
+
+		[VtblIndex(99)]
+		HResult CreateLookupTable3D(BufferPrecision precision, uint* extents, byte* data, uint dataCount, uint* strides, ID2D1LookupTable3D** lookupTable);
+
+		[VtblIndex(100)]
+		HResult CreateImageSourceFromDxgi(Graphics.Dxgi.IDXGISurface** surfaces, uint surfaceCount, Graphics.Dxgi.Common.ColorSpaceType colorSpace, ImageSourceFromDxgiOptions options, ID2D1ImageSource** imageSource);
+
+		[VtblIndex(101)]
+		HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Common.RectF* pBounds);
+
+		[VtblIndex(102)]
+		void DrawInk(ID2D1Ink* ink, ID2D1Brush* brush, ID2D1InkStyle* inkStyle);
+
+		[VtblIndex(103)]
+		void DrawGradientMesh(ID2D1GradientMesh* gradientMesh);
+
+		[VtblIndex(104)]
+		void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle);
+
+		[VtblIndex(105)]
+		HResult CreateTransformedImageSource(ID2D1ImageSource* imageSource, TransformedImageSourceProperties* properties, ID2D1TransformedImageSource** transformedImageSource);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext3.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("235a7496-8351-414c-bcd4-6672ab2d8e00")]
 [NativeTypeName("struct ID2D1DeviceContext3 : ID2D1DeviceContext2")]
 [NativeInheritance("ID2D1DeviceContext2")]
-public unsafe partial struct ID2D1DeviceContext3 : INativeGuid
+public unsafe partial struct ID2D1DeviceContext3 : ID2D1DeviceContext3.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1DeviceContext3
 	{
@@ -916,5 +916,13 @@ public unsafe partial struct ID2D1DeviceContext3 : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1SpriteBatch*, uint, uint, ID2D1Bitmap*, BitmapInterpolationMode, SpriteOptions, void>)(lpVtbl[107]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), spriteBatch, startIndex, spriteCount, bitmap, interpolationMode, spriteOptions);
 	}
+	public interface Interface : ID2D1DeviceContext2.Interface
+	{
+		[VtblIndex(106)]
+		HResult CreateSpriteBatch(ID2D1SpriteBatch** spriteBatch);
+
+		[VtblIndex(107)]
+		void DrawSpriteBatch(ID2D1SpriteBatch* spriteBatch, uint startIndex, uint spriteCount, ID2D1Bitmap* bitmap, BitmapInterpolationMode interpolationMode, SpriteOptions spriteOptions);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext4.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("8c427831-3d90-4476-b647-c4fae349e4db")]
 [NativeTypeName("struct ID2D1DeviceContext4 : ID2D1DeviceContext3")]
 [NativeInheritance("ID2D1DeviceContext3")]
-public unsafe partial struct ID2D1DeviceContext4 : INativeGuid
+public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1DeviceContext4
 	{
@@ -972,5 +972,28 @@ public unsafe partial struct ID2D1DeviceContext4 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, System.Drawing.PointF, Graphics.DirectWrite.IDWriteFontFace*, float, ushort, Bool32, Matrix3x2*, ID2D1Brush*, ID2D1SvgGlyphStyle*, uint, Matrix3x2*, ID2D1CommandList**, int>)(lpVtbl[114]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), glyphOrigin, fontFace, fontEmSize, glyphIndex, isSideways, worldTransform, defaultFillBrush, svgGlyphStyle, colorPaletteIndex, glyphTransform, glyphImage);
 	}
+	public interface Interface : ID2D1DeviceContext3.Interface
+	{
+		[VtblIndex(108)]
+		HResult CreateSvgGlyphStyle(ID2D1SvgGlyphStyle** svgGlyphStyle);
+
+		[VtblIndex(109)]
+		void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode);
+
+		[VtblIndex(110)]
+		void DrawTextLayout(System.Drawing.PointF origin, Graphics.DirectWrite.IDWriteTextLayout* textLayout, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, DrawTextOptions options);
+
+		[VtblIndex(111)]
+		void DrawColorBitmapGlyphRun(Graphics.DirectWrite.GlyphImageFormats glyphImageFormat, System.Drawing.PointF baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, ColorBitmapGlyphSnapOption bitmapSnapOption);
+
+		[VtblIndex(112)]
+		void DrawSvgGlyphRun(System.Drawing.PointF baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, Graphics.DirectWrite.MeasuringMode measuringMode);
+
+		[VtblIndex(113)]
+		HResult GetColorBitmapGlyphImage(Graphics.DirectWrite.GlyphImageFormats glyphImageFormat, System.Drawing.PointF glyphOrigin, Graphics.DirectWrite.IDWriteFontFace* fontFace, float fontEmSize, ushort glyphIndex, Bool32 isSideways, Matrix3x2* worldTransform, float dpiX, float dpiY, Matrix3x2* glyphTransform, ID2D1Image** glyphImage);
+
+		[VtblIndex(114)]
+		HResult GetSvgGlyphImage(System.Drawing.PointF glyphOrigin, Graphics.DirectWrite.IDWriteFontFace* fontFace, float fontEmSize, ushort glyphIndex, Bool32 isSideways, Matrix3x2* worldTransform, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, Matrix3x2* glyphTransform, ID2D1CommandList** glyphImage);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext5.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("7836d248-68cc-4df6-b9e8-de991bf62eb7")]
 [NativeTypeName("struct ID2D1DeviceContext5 : ID2D1DeviceContext4")]
 [NativeInheritance("ID2D1DeviceContext4")]
-public unsafe partial struct ID2D1DeviceContext5 : INativeGuid
+public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1DeviceContext5
 	{
@@ -1004,5 +1004,19 @@ public unsafe partial struct ID2D1DeviceContext5 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, SimpleColorProfile*, ID2D1ColorContext1**, int>)(lpVtbl[118]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), simpleProfile, colorContext);
 	}
+	public interface Interface : ID2D1DeviceContext4.Interface
+	{
+		[VtblIndex(115)]
+		HResult CreateSvgDocument(Com.IStream* inputXmlStream, System.Drawing.SizeF viewportSize, ID2D1SvgDocument** svgDocument);
+
+		[VtblIndex(116)]
+		void DrawSvgDocument(ID2D1SvgDocument* svgDocument);
+
+		[VtblIndex(117)]
+		HResult CreateColorContextFromDxgiColorSpace(Graphics.Dxgi.Common.ColorSpaceType colorSpace, ID2D1ColorContext1** colorContext);
+
+		[VtblIndex(118)]
+		HResult CreateColorContextFromSimpleColorProfile(SimpleColorProfile* simpleProfile, ID2D1ColorContext1** colorContext);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext6.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("985f7e37-4ed0-4a19-98a3-15b0edfde306")]
 [NativeTypeName("struct ID2D1DeviceContext6 : ID2D1DeviceContext5")]
 [NativeInheritance("ID2D1DeviceContext5")]
-public unsafe partial struct ID2D1DeviceContext6 : INativeGuid
+public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1DeviceContext6
 	{
@@ -1012,5 +1012,10 @@ public unsafe partial struct ID2D1DeviceContext6 : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Image*, Common.BlendMode, System.Drawing.PointF*, Common.RectF*, InterpolationMode, void>)(lpVtbl[119]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), image, blendMode, targetOffset, imageRectangle, interpolationMode);
 	}
+	public interface Interface : ID2D1DeviceContext5.Interface
+	{
+		[VtblIndex(119)]
+		void BlendImage(ID2D1Image* image, Common.BlendMode blendMode, System.Drawing.PointF* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawInfo.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("693ce632-7f2f-45de-93fe-18d88b37aa21")]
 [NativeTypeName("struct ID2D1DrawInfo : ID2D1RenderInfo")]
 [NativeInheritance("ID2D1RenderInfo")]
-public unsafe partial struct ID2D1DrawInfo : INativeGuid
+public unsafe partial struct ID2D1DrawInfo : ID2D1DrawInfo.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1DrawInfo
 	{
@@ -145,5 +145,22 @@ public unsafe partial struct ID2D1DrawInfo : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1DrawInfo*, ID2D1VertexBuffer*, VertexOptions, BlendDescription*, VertexRange*, Guid*, int>)(lpVtbl[11]))((ID2D1DrawInfo*)Unsafe.AsPointer(ref this), vertexBuffer, vertexOptions, blendDescription, vertexRange, vertexShader);
 	}
+	public interface Interface : ID2D1RenderInfo.Interface
+	{
+		[VtblIndex(7)]
+		HResult SetPixelShaderConstantBuffer(byte* buffer, uint bufferCount);
+
+		[VtblIndex(8)]
+		HResult SetResourceTexture(uint textureIndex, ID2D1ResourceTexture* resourceTexture);
+
+		[VtblIndex(9)]
+		HResult SetVertexShaderConstantBuffer(byte* buffer, uint bufferCount);
+
+		[VtblIndex(10)]
+		HResult SetPixelShader(Guid* shaderId, PixelOptions pixelOptions);
+
+		[VtblIndex(11)]
+		HResult SetVertexProcessing(ID2D1VertexBuffer* vertexBuffer, VertexOptions vertexOptions, BlendDescription* blendDescription, VertexRange* vertexRange, Guid* vertexShader);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawTransform.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("36bfdcb6-9739-435d-a30d-a653beff6a6f")]
 [NativeTypeName("struct ID2D1DrawTransform : ID2D1Transform")]
 [NativeInheritance("ID2D1Transform")]
-public unsafe partial struct ID2D1DrawTransform : INativeGuid
+public unsafe partial struct ID2D1DrawTransform : ID2D1DrawTransform.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1DrawTransform
 	{
@@ -113,5 +113,10 @@ public unsafe partial struct ID2D1DrawTransform : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1DrawTransform*, ID2D1DrawInfo*, int>)(lpVtbl[7]))((ID2D1DrawTransform*)Unsafe.AsPointer(ref this), drawInfo);
 	}
+	public interface Interface : ID2D1Transform.Interface
+	{
+		[VtblIndex(7)]
+		HResult SetDrawInfo(ID2D1DrawInfo* drawInfo);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawingStateBlock.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("28506e39-ebf6-46a1-bb47-fd85565ab957")]
 [NativeTypeName("struct ID2D1DrawingStateBlock : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1DrawingStateBlock : INativeGuid
+public unsafe partial struct ID2D1DrawingStateBlock : ID2D1DrawingStateBlock.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1DrawingStateBlock
 	{
@@ -113,5 +113,19 @@ public unsafe partial struct ID2D1DrawingStateBlock : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1DrawingStateBlock*, Graphics.DirectWrite.IDWriteRenderingParams**, void>)(lpVtbl[7]))((ID2D1DrawingStateBlock*)Unsafe.AsPointer(ref this), textRenderingParams);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		void GetDescription(DrawingStateDescription* stateDescription);
+
+		[VtblIndex(5)]
+		void SetDescription(DrawingStateDescription* stateDescription);
+
+		[VtblIndex(6)]
+		void SetTextRenderingParams(Graphics.DirectWrite.IDWriteRenderingParams* textRenderingParams);
+
+		[VtblIndex(7)]
+		void GetTextRenderingParams(Graphics.DirectWrite.IDWriteRenderingParams** textRenderingParams);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawingStateBlock1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("689f1f85-c72e-4e33-8f19-85754efd5ace")]
 [NativeTypeName("struct ID2D1DrawingStateBlock1 : ID2D1DrawingStateBlock")]
 [NativeInheritance("ID2D1DrawingStateBlock")]
-public unsafe partial struct ID2D1DrawingStateBlock1 : INativeGuid
+public unsafe partial struct ID2D1DrawingStateBlock1 : ID2D1DrawingStateBlock1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1DrawingStateBlock1
 	{
@@ -129,5 +129,13 @@ public unsafe partial struct ID2D1DrawingStateBlock1 : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1DrawingStateBlock1*, DrawingStateDescription1*, void>)(lpVtbl[9]))((ID2D1DrawingStateBlock1*)Unsafe.AsPointer(ref this), stateDescription);
 	}
+	public interface Interface : ID2D1DrawingStateBlock.Interface
+	{
+		[VtblIndex(8)]
+		void GetDescription(DrawingStateDescription1* stateDescription);
+
+		[VtblIndex(9)]
+		void SetDescription(DrawingStateDescription1* stateDescription);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Effect.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("28211a43-7d89-476f-8181-2d6159b220ad")]
 [NativeTypeName("struct ID2D1Effect : ID2D1Properties")]
 [NativeInheritance("ID2D1Properties")]
-public unsafe partial struct ID2D1Effect : INativeGuid
+public unsafe partial struct ID2D1Effect : ID2D1Effect.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Effect
 	{
@@ -201,5 +201,22 @@ public unsafe partial struct ID2D1Effect : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1Effect*, ID2D1Image**, void>)(lpVtbl[18]))((ID2D1Effect*)Unsafe.AsPointer(ref this), outputImage);
 	}
+	public interface Interface : ID2D1Properties.Interface
+	{
+		[VtblIndex(14)]
+		void SetInput(uint index, ID2D1Image* input, Bool32 invalidate);
+
+		[VtblIndex(15)]
+		HResult SetInputCount(uint inputCount);
+
+		[VtblIndex(16)]
+		void GetInput(uint index, ID2D1Image** input);
+
+		[VtblIndex(17)]
+		uint GetInputCount();
+
+		[VtblIndex(18)]
+		void GetOutput(ID2D1Image** outputImage);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("3d9f916b-27dc-4ad7-b4f1-64945340f563")]
 [NativeTypeName("struct ID2D1EffectContext : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1EffectContext : INativeGuid
+public unsafe partial struct ID2D1EffectContext : ID2D1EffectContext.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1EffectContext
 	{
@@ -241,5 +241,70 @@ public unsafe partial struct ID2D1EffectContext : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1EffectContext*, BufferPrecision, Bool32>)(lpVtbl[23]))((ID2D1EffectContext*)Unsafe.AsPointer(ref this), bufferPrecision);
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		void GetDpi(float* dpiX, float* dpiY);
+
+		[VtblIndex(4)]
+		HResult CreateEffect(Guid* effectId, ID2D1Effect** effect);
+
+		[VtblIndex(5)]
+		HResult GetMaximumSupportedFeatureLevel(Graphics.Direct3D.FeatureLevel* featureLevels, uint featureLevelsCount, Graphics.Direct3D.FeatureLevel* maximumSupportedFeatureLevel);
+
+		[VtblIndex(6)]
+		HResult CreateTransformNodeFromEffect(ID2D1Effect* effect, ID2D1TransformNode** transformNode);
+
+		[VtblIndex(7)]
+		HResult CreateBlendTransform(uint numInputs, BlendDescription* blendDescription, ID2D1BlendTransform** transform);
+
+		[VtblIndex(8)]
+		HResult CreateBorderTransform(ExtendMode extendModeX, ExtendMode extendModeY, ID2D1BorderTransform** transform);
+
+		[VtblIndex(9)]
+		HResult CreateOffsetTransform(System.Drawing.Point offset, ID2D1OffsetTransform** transform);
+
+		[VtblIndex(10)]
+		HResult CreateBoundsAdjustmentTransform(RawRect* outputRectangle, ID2D1BoundsAdjustmentTransform** transform);
+
+		[VtblIndex(11)]
+		HResult LoadPixelShader(Guid* shaderId, byte* shaderBuffer, uint shaderBufferCount);
+
+		[VtblIndex(12)]
+		HResult LoadVertexShader(Guid* resourceId, byte* shaderBuffer, uint shaderBufferCount);
+
+		[VtblIndex(13)]
+		HResult LoadComputeShader(Guid* resourceId, byte* shaderBuffer, uint shaderBufferCount);
+
+		[VtblIndex(14)]
+		Bool32 IsShaderLoaded(Guid* shaderId);
+
+		[VtblIndex(15)]
+		HResult CreateResourceTexture(Guid* resourceId, ResourceTextureProperties* resourceTextureProperties, byte* data, uint* strides, uint dataSize, ID2D1ResourceTexture** resourceTexture);
+
+		[VtblIndex(16)]
+		HResult FindResourceTexture(Guid* resourceId, ID2D1ResourceTexture** resourceTexture);
+
+		[VtblIndex(17)]
+		HResult CreateVertexBuffer(VertexBufferProperties* vertexBufferProperties, Guid* resourceId, CustomVertexBufferProperties* customVertexBufferProperties, ID2D1VertexBuffer** buffer);
+
+		[VtblIndex(18)]
+		HResult FindVertexBuffer(Guid* resourceId, ID2D1VertexBuffer** buffer);
+
+		[VtblIndex(19)]
+		HResult CreateColorContext(ColorSpace space, byte* profile, uint profileSize, ID2D1ColorContext** colorContext);
+
+		[VtblIndex(20)]
+		HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext);
+
+		[VtblIndex(21)]
+		HResult CreateColorContextFromWicColorContext(Graphics.Imaging.IWICColorContext* wicColorContext, ID2D1ColorContext** colorContext);
+
+		[VtblIndex(22)]
+		HResult CheckFeatureSupport(Feature feature, void* featureSupportData, uint featureSupportDataSize);
+
+		[VtblIndex(23)]
+		Bool32 IsBufferPrecisionSupported(BufferPrecision bufferPrecision);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("84ab595a-fc81-4546-bacd-e8ef4d8abe7a")]
 [NativeTypeName("struct ID2D1EffectContext1 : ID2D1EffectContext")]
 [NativeInheritance("ID2D1EffectContext")]
-public unsafe partial struct ID2D1EffectContext1 : INativeGuid
+public unsafe partial struct ID2D1EffectContext1 : ID2D1EffectContext1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1EffectContext1
 	{
@@ -249,5 +249,10 @@ public unsafe partial struct ID2D1EffectContext1 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1EffectContext1*, BufferPrecision, uint*, byte*, uint, uint*, ID2D1LookupTable3D**, int>)(lpVtbl[24]))((ID2D1EffectContext1*)Unsafe.AsPointer(ref this), precision, extents, data, dataCount, strides, lookupTable);
 	}
+	public interface Interface : ID2D1EffectContext.Interface
+	{
+		[VtblIndex(24)]
+		HResult CreateLookupTable3D(BufferPrecision precision, uint* extents, byte* data, uint dataCount, uint* strides, ID2D1LookupTable3D** lookupTable);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext2.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("577ad2a0-9fc7-4dda-8b18-dab810140052")]
 [NativeTypeName("struct ID2D1EffectContext2 : ID2D1EffectContext1")]
 [NativeInheritance("ID2D1EffectContext1")]
-public unsafe partial struct ID2D1EffectContext2 : INativeGuid
+public unsafe partial struct ID2D1EffectContext2 : ID2D1EffectContext2.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1EffectContext2
 	{
@@ -265,5 +265,13 @@ public unsafe partial struct ID2D1EffectContext2 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1EffectContext2*, SimpleColorProfile*, ID2D1ColorContext1**, int>)(lpVtbl[26]))((ID2D1EffectContext2*)Unsafe.AsPointer(ref this), simpleProfile, colorContext);
 	}
+	public interface Interface : ID2D1EffectContext1.Interface
+	{
+		[VtblIndex(25)]
+		HResult CreateColorContextFromDxgiColorSpace(Graphics.Dxgi.Common.ColorSpaceType colorSpace, ID2D1ColorContext1** colorContext);
+
+		[VtblIndex(26)]
+		HResult CreateColorContextFromSimpleColorProfile(SimpleColorProfile* simpleProfile, ID2D1ColorContext1** colorContext);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectImpl.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("a248fd3f-3e6c-4e63-9f03-7f68ecc91db9")]
 [NativeTypeName("struct ID2D1EffectImpl : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1EffectImpl : INativeGuid
+public unsafe partial struct ID2D1EffectImpl : ID2D1EffectImpl.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1EffectImpl
 	{
@@ -97,5 +97,16 @@ public unsafe partial struct ID2D1EffectImpl : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1EffectImpl*, ID2D1TransformGraph*, int>)(lpVtbl[5]))((ID2D1EffectImpl*)Unsafe.AsPointer(ref this), transformGraph);
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		HResult Initialize(ID2D1EffectContext* effectContext, ID2D1TransformGraph* transformGraph);
+
+		[VtblIndex(4)]
+		HResult PrepareForRender(ChangeType changeType);
+
+		[VtblIndex(5)]
+		HResult SetGraph(ID2D1TransformGraph* transformGraph);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EllipseGeometry.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906a4-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1EllipseGeometry : ID2D1Geometry")]
 [NativeInheritance("ID2D1Geometry")]
-public unsafe partial struct ID2D1EllipseGeometry : INativeGuid
+public unsafe partial struct ID2D1EllipseGeometry : ID2D1EllipseGeometry.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1EllipseGeometry
 	{
@@ -193,5 +193,10 @@ public unsafe partial struct ID2D1EllipseGeometry : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1EllipseGeometry*, Ellipse*, void>)(lpVtbl[17]))((ID2D1EllipseGeometry*)Unsafe.AsPointer(ref this), ellipse);
 	}
+	public interface Interface : ID2D1Geometry.Interface
+	{
+		[VtblIndex(17)]
+		void GetEllipse(Ellipse* ellipse);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("06152247-6f50-465a-9245-118bfd3b6007")]
 [NativeTypeName("struct ID2D1Factory : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1Factory : INativeGuid
+public unsafe partial struct ID2D1Factory : ID2D1Factory.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Factory
 	{
@@ -185,5 +185,49 @@ public unsafe partial struct ID2D1Factory : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Factory*, RenderTargetProperties*, ID2D1DCRenderTarget**, int>)(lpVtbl[16]))((ID2D1Factory*)Unsafe.AsPointer(ref this), renderTargetProperties, dcRenderTarget);
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		HResult ReloadSystemMetrics();
+
+		[VtblIndex(4)]
+		void GetDesktopDpi(float* dpiX, float* dpiY);
+
+		[VtblIndex(5)]
+		HResult CreateRectangleGeometry(Common.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry);
+
+		[VtblIndex(6)]
+		HResult CreateRoundedRectangleGeometry(RoundedRect* roundedRectangle, ID2D1RoundedRectangleGeometry** roundedRectangleGeometry);
+
+		[VtblIndex(7)]
+		HResult CreateEllipseGeometry(Ellipse* ellipse, ID2D1EllipseGeometry** ellipseGeometry);
+
+		[VtblIndex(8)]
+		HResult CreateGeometryGroup(Common.FillMode fillMode, ID2D1Geometry** geometries, uint geometriesCount, ID2D1GeometryGroup** geometryGroup);
+
+		[VtblIndex(9)]
+		HResult CreateTransformedGeometry(ID2D1Geometry* sourceGeometry, Matrix3x2* transform, ID2D1TransformedGeometry** transformedGeometry);
+
+		[VtblIndex(10)]
+		HResult CreatePathGeometry(ID2D1PathGeometry** pathGeometry);
+
+		[VtblIndex(11)]
+		HResult CreateStrokeStyle(StrokeStyleProperties* strokeStyleProperties, float* dashes, uint dashesCount, ID2D1StrokeStyle** strokeStyle);
+
+		[VtblIndex(12)]
+		HResult CreateDrawingStateBlock(DrawingStateDescription* drawingStateDescription, Graphics.DirectWrite.IDWriteRenderingParams* textRenderingParams, ID2D1DrawingStateBlock** drawingStateBlock);
+
+		[VtblIndex(13)]
+		HResult CreateWicBitmapRenderTarget(Graphics.Imaging.IWICBitmap* target, RenderTargetProperties* renderTargetProperties, ID2D1RenderTarget** renderTarget);
+
+		[VtblIndex(14)]
+		HResult CreateHwndRenderTarget(RenderTargetProperties* renderTargetProperties, HwndRenderTargetProperties* hwndRenderTargetProperties, ID2D1HwndRenderTarget** hwndRenderTarget);
+
+		[VtblIndex(15)]
+		HResult CreateDxgiSurfaceRenderTarget(Graphics.Dxgi.IDXGISurface* dxgiSurface, RenderTargetProperties* renderTargetProperties, ID2D1RenderTarget** renderTarget);
+
+		[VtblIndex(16)]
+		HResult CreateDCRenderTarget(RenderTargetProperties* renderTargetProperties, ID2D1DCRenderTarget** dcRenderTarget);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("bb12d362-daee-4b9a-aa1d-14ba401cfa1f")]
 [NativeTypeName("struct ID2D1Factory1 : ID2D1Factory")]
 [NativeInheritance("ID2D1Factory")]
-public unsafe partial struct ID2D1Factory1 : INativeGuid
+public unsafe partial struct ID2D1Factory1 : ID2D1Factory1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Factory1
 	{
@@ -265,5 +265,37 @@ public unsafe partial struct ID2D1Factory1 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Factory1*, Guid*, ID2D1Properties**, int>)(lpVtbl[26]))((ID2D1Factory1*)Unsafe.AsPointer(ref this), effectId, properties);
 	}
+	public interface Interface : ID2D1Factory.Interface
+	{
+		[VtblIndex(17)]
+		HResult CreateDevice(Graphics.Dxgi.IDXGIDevice* dxgiDevice, ID2D1Device** d2dDevice);
+
+		[VtblIndex(18)]
+		HResult CreateStrokeStyle(StrokeStyleProperties1* strokeStyleProperties, float* dashes, uint dashesCount, ID2D1StrokeStyle1** strokeStyle);
+
+		[VtblIndex(19)]
+		HResult CreatePathGeometry(ID2D1PathGeometry1** pathGeometry);
+
+		[VtblIndex(20)]
+		HResult CreateDrawingStateBlock(DrawingStateDescription1* drawingStateDescription, Graphics.DirectWrite.IDWriteRenderingParams* textRenderingParams, ID2D1DrawingStateBlock1** drawingStateBlock);
+
+		[VtblIndex(21)]
+		HResult CreateGdiMetafile(Com.IStream* metafileStream, ID2D1GdiMetafile** metafile);
+
+		[VtblIndex(22)]
+		HResult RegisterEffectFromStream(Guid* classId, Com.IStream* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall]<IUnknown**, HResult> effectFactory);
+
+		[VtblIndex(23)]
+		HResult RegisterEffectFromString(Guid* classId, ushort* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall]<IUnknown**, HResult> effectFactory);
+
+		[VtblIndex(24)]
+		HResult UnregisterEffect(Guid* classId);
+
+		[VtblIndex(25)]
+		HResult GetRegisteredEffects(Guid* effects, uint effectsCount, uint* effectsReturned, uint* effectsRegistered);
+
+		[VtblIndex(26)]
+		HResult GetEffectProperties(Guid* effectId, ID2D1Properties** properties);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory2.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("94f81a73-9212-4376-9c58-b16a3a0d3992")]
 [NativeTypeName("struct ID2D1Factory2 : ID2D1Factory1")]
 [NativeInheritance("ID2D1Factory1")]
-public unsafe partial struct ID2D1Factory2 : INativeGuid
+public unsafe partial struct ID2D1Factory2 : ID2D1Factory2.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Factory2
 	{
@@ -273,5 +273,10 @@ public unsafe partial struct ID2D1Factory2 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Factory2*, Graphics.Dxgi.IDXGIDevice*, ID2D1Device1**, int>)(lpVtbl[27]))((ID2D1Factory2*)Unsafe.AsPointer(ref this), dxgiDevice, d2dDevice1);
 	}
+	public interface Interface : ID2D1Factory1.Interface
+	{
+		[VtblIndex(27)]
+		HResult CreateDevice(Graphics.Dxgi.IDXGIDevice* dxgiDevice, ID2D1Device1** d2dDevice1);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory3.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("0869759f-4f00-413f-b03e-2bda45404d0f")]
 [NativeTypeName("struct ID2D1Factory3 : ID2D1Factory2")]
 [NativeInheritance("ID2D1Factory2")]
-public unsafe partial struct ID2D1Factory3 : INativeGuid
+public unsafe partial struct ID2D1Factory3 : ID2D1Factory3.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Factory3
 	{
@@ -281,5 +281,10 @@ public unsafe partial struct ID2D1Factory3 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Factory3*, Graphics.Dxgi.IDXGIDevice*, ID2D1Device2**, int>)(lpVtbl[28]))((ID2D1Factory3*)Unsafe.AsPointer(ref this), dxgiDevice, d2dDevice2);
 	}
+	public interface Interface : ID2D1Factory2.Interface
+	{
+		[VtblIndex(28)]
+		HResult CreateDevice(Graphics.Dxgi.IDXGIDevice* dxgiDevice, ID2D1Device2** d2dDevice2);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory4.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("bd4ec2d2-0662-4bee-ba8e-6f29f032e096")]
 [NativeTypeName("struct ID2D1Factory4 : ID2D1Factory3")]
 [NativeInheritance("ID2D1Factory3")]
-public unsafe partial struct ID2D1Factory4 : INativeGuid
+public unsafe partial struct ID2D1Factory4 : ID2D1Factory4.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Factory4
 	{
@@ -289,5 +289,10 @@ public unsafe partial struct ID2D1Factory4 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Factory4*, Graphics.Dxgi.IDXGIDevice*, ID2D1Device3**, int>)(lpVtbl[29]))((ID2D1Factory4*)Unsafe.AsPointer(ref this), dxgiDevice, d2dDevice3);
 	}
+	public interface Interface : ID2D1Factory3.Interface
+	{
+		[VtblIndex(29)]
+		HResult CreateDevice(Graphics.Dxgi.IDXGIDevice* dxgiDevice, ID2D1Device3** d2dDevice3);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory5.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("c4349994-838e-4b0f-8cab-44997d9eeacc")]
 [NativeTypeName("struct ID2D1Factory5 : ID2D1Factory4")]
 [NativeInheritance("ID2D1Factory4")]
-public unsafe partial struct ID2D1Factory5 : INativeGuid
+public unsafe partial struct ID2D1Factory5 : ID2D1Factory5.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Factory5
 	{
@@ -297,5 +297,10 @@ public unsafe partial struct ID2D1Factory5 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Factory5*, Graphics.Dxgi.IDXGIDevice*, ID2D1Device4**, int>)(lpVtbl[30]))((ID2D1Factory5*)Unsafe.AsPointer(ref this), dxgiDevice, d2dDevice4);
 	}
+	public interface Interface : ID2D1Factory4.Interface
+	{
+		[VtblIndex(30)]
+		HResult CreateDevice(Graphics.Dxgi.IDXGIDevice* dxgiDevice, ID2D1Device4** d2dDevice4);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory6.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("f9976f46-f642-44c1-97ca-da32ea2a2635")]
 [NativeTypeName("struct ID2D1Factory6 : ID2D1Factory5")]
 [NativeInheritance("ID2D1Factory5")]
-public unsafe partial struct ID2D1Factory6 : INativeGuid
+public unsafe partial struct ID2D1Factory6 : ID2D1Factory6.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Factory6
 	{
@@ -305,5 +305,10 @@ public unsafe partial struct ID2D1Factory6 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Factory6*, Graphics.Dxgi.IDXGIDevice*, ID2D1Device5**, int>)(lpVtbl[31]))((ID2D1Factory6*)Unsafe.AsPointer(ref this), dxgiDevice, d2dDevice5);
 	}
+	public interface Interface : ID2D1Factory5.Interface
+	{
+		[VtblIndex(31)]
+		HResult CreateDevice(Graphics.Dxgi.IDXGIDevice* dxgiDevice, ID2D1Device5** d2dDevice5);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory7.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("bdc2bdd3-b96c-4de6-bdf7-99d4745454de")]
 [NativeTypeName("struct ID2D1Factory7 : ID2D1Factory6")]
 [NativeInheritance("ID2D1Factory6")]
-public unsafe partial struct ID2D1Factory7 : INativeGuid
+public unsafe partial struct ID2D1Factory7 : ID2D1Factory7.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Factory7
 	{
@@ -313,5 +313,10 @@ public unsafe partial struct ID2D1Factory7 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Factory7*, Graphics.Dxgi.IDXGIDevice*, ID2D1Device6**, int>)(lpVtbl[32]))((ID2D1Factory7*)Unsafe.AsPointer(ref this), dxgiDevice, d2dDevice6);
 	}
+	public interface Interface : ID2D1Factory6.Interface
+	{
+		[VtblIndex(32)]
+		HResult CreateDevice(Graphics.Dxgi.IDXGIDevice* dxgiDevice, ID2D1Device6** d2dDevice6);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiInteropRenderTarget.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("e0db51c3-6f77-4bae-b3d5-e47509b35838")]
 [NativeTypeName("struct ID2D1GdiInteropRenderTarget : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1GdiInteropRenderTarget : INativeGuid
+public unsafe partial struct ID2D1GdiInteropRenderTarget : ID2D1GdiInteropRenderTarget.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1GdiInteropRenderTarget
 	{
@@ -89,5 +89,13 @@ public unsafe partial struct ID2D1GdiInteropRenderTarget : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1GdiInteropRenderTarget*, RawRect*, int>)(lpVtbl[4]))((ID2D1GdiInteropRenderTarget*)Unsafe.AsPointer(ref this), update);
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		HResult GetDC(DCInitializeMode mode, IntPtr* hdc);
+
+		[VtblIndex(4)]
+		HResult ReleaseDC(RawRect* update);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2f543dc3-cfc1-4211-864f-cfd91c6f3395")]
 [NativeTypeName("struct ID2D1GdiMetafile : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1GdiMetafile : INativeGuid
+public unsafe partial struct ID2D1GdiMetafile : ID2D1GdiMetafile.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1GdiMetafile
 	{
@@ -97,5 +97,13 @@ public unsafe partial struct ID2D1GdiMetafile : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1GdiMetafile*, Common.RectF*, int>)(lpVtbl[5]))((ID2D1GdiMetafile*)Unsafe.AsPointer(ref this), bounds);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		HResult Stream(ID2D1GdiMetafileSink* sink);
+
+		[VtblIndex(5)]
+		HResult GetBounds(Common.RectF* bounds);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2e69f9e8-dd3f-4bf9-95ba-c04f49d788df")]
 [NativeTypeName("struct ID2D1GdiMetafile1 : ID2D1GdiMetafile")]
 [NativeInheritance("ID2D1GdiMetafile")]
-public unsafe partial struct ID2D1GdiMetafile1 : INativeGuid
+public unsafe partial struct ID2D1GdiMetafile1 : ID2D1GdiMetafile1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1GdiMetafile1
 	{
@@ -113,5 +113,13 @@ public unsafe partial struct ID2D1GdiMetafile1 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1GdiMetafile1*, Common.RectF*, int>)(lpVtbl[7]))((ID2D1GdiMetafile1*)Unsafe.AsPointer(ref this), bounds);
 	}
+	public interface Interface : ID2D1GdiMetafile.Interface
+	{
+		[VtblIndex(6)]
+		HResult GetDpi(float* dpiX, float* dpiY);
+
+		[VtblIndex(7)]
+		HResult GetSourceBounds(Common.RectF* bounds);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafileSink.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("82237326-8111-4f7c-bcf4-b5c1175564fe")]
 [NativeTypeName("struct ID2D1GdiMetafileSink : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1GdiMetafileSink : INativeGuid
+public unsafe partial struct ID2D1GdiMetafileSink : ID2D1GdiMetafileSink.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1GdiMetafileSink
 	{
@@ -81,5 +81,10 @@ public unsafe partial struct ID2D1GdiMetafileSink : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1GdiMetafileSink*, uint, void*, uint, int>)(lpVtbl[3]))((ID2D1GdiMetafileSink*)Unsafe.AsPointer(ref this), recordType, recordData, recordDataSize);
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		HResult ProcessRecord(uint recordType, void* recordData, uint recordDataSize);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafileSink1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("fd0ecb6b-91e6-411e-8655-395e760f91b4")]
 [NativeTypeName("struct ID2D1GdiMetafileSink1 : ID2D1GdiMetafileSink")]
 [NativeInheritance("ID2D1GdiMetafileSink")]
-public unsafe partial struct ID2D1GdiMetafileSink1 : INativeGuid
+public unsafe partial struct ID2D1GdiMetafileSink1 : ID2D1GdiMetafileSink1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1GdiMetafileSink1
 	{
@@ -89,5 +89,10 @@ public unsafe partial struct ID2D1GdiMetafileSink1 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1GdiMetafileSink1*, uint, void*, uint, uint, int>)(lpVtbl[4]))((ID2D1GdiMetafileSink1*)Unsafe.AsPointer(ref this), recordType, recordData, recordDataSize, flags);
 	}
+	public interface Interface : ID2D1GdiMetafileSink.Interface
+	{
+		[VtblIndex(4)]
+		HResult ProcessRecord(uint recordType, void* recordData, uint recordDataSize, uint flags);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Geometry.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906a1-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1Geometry : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1Geometry : INativeGuid
+public unsafe partial struct ID2D1Geometry : ID2D1Geometry.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Geometry
 	{
@@ -185,5 +185,46 @@ public unsafe partial struct ID2D1Geometry : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Geometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Common.ID2D1SimplifiedGeometrySink*, int>)(lpVtbl[16]))((ID2D1Geometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		HResult GetBounds(Matrix3x2* worldTransform, Common.RectF* bounds);
+
+		[VtblIndex(5)]
+		HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.RectF* bounds);
+
+		[VtblIndex(6)]
+		HResult StrokeContainsPoint(System.Drawing.PointF point, float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Bool32* contains);
+
+		[VtblIndex(7)]
+		HResult FillContainsPoint(System.Drawing.PointF point, Matrix3x2* worldTransform, float flatteningTolerance, Bool32* contains);
+
+		[VtblIndex(8)]
+		HResult CompareWithGeometry(ID2D1Geometry* inputGeometry, Matrix3x2* inputGeometryTransform, float flatteningTolerance, GeometryRelation* relation);
+
+		[VtblIndex(9)]
+		HResult Simplify(GeometrySimplificationOption simplificationOption, Matrix3x2* worldTransform, float flatteningTolerance, Common.ID2D1SimplifiedGeometrySink* geometrySink);
+
+		[VtblIndex(10)]
+		HResult Tessellate(Matrix3x2* worldTransform, float flatteningTolerance, ID2D1TessellationSink* tessellationSink);
+
+		[VtblIndex(11)]
+		HResult CombineWithGeometry(ID2D1Geometry* inputGeometry, CombineMode combineMode, Matrix3x2* inputGeometryTransform, float flatteningTolerance, Common.ID2D1SimplifiedGeometrySink* geometrySink);
+
+		[VtblIndex(12)]
+		HResult Outline(Matrix3x2* worldTransform, float flatteningTolerance, Common.ID2D1SimplifiedGeometrySink* geometrySink);
+
+		[VtblIndex(13)]
+		HResult ComputeArea(Matrix3x2* worldTransform, float flatteningTolerance, float* area);
+
+		[VtblIndex(14)]
+		HResult ComputeLength(Matrix3x2* worldTransform, float flatteningTolerance, float* length);
+
+		[VtblIndex(15)]
+		HResult ComputePointAtLength(float length, Matrix3x2* worldTransform, float flatteningTolerance, System.Drawing.PointF* point, System.Drawing.PointF* unitTangentVector);
+
+		[VtblIndex(16)]
+		HResult Widen(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.ID2D1SimplifiedGeometrySink* geometrySink);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometryGroup.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906a6-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1GeometryGroup : ID2D1Geometry")]
 [NativeInheritance("ID2D1Geometry")]
-public unsafe partial struct ID2D1GeometryGroup : INativeGuid
+public unsafe partial struct ID2D1GeometryGroup : ID2D1GeometryGroup.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1GeometryGroup
 	{
@@ -209,5 +209,16 @@ public unsafe partial struct ID2D1GeometryGroup : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1GeometryGroup*, ID2D1Geometry**, uint, void>)(lpVtbl[19]))((ID2D1GeometryGroup*)Unsafe.AsPointer(ref this), geometries, geometriesCount);
 	}
+	public interface Interface : ID2D1Geometry.Interface
+	{
+		[VtblIndex(17)]
+		Common.FillMode GetFillMode();
+
+		[VtblIndex(18)]
+		uint GetSourceGeometryCount();
+
+		[VtblIndex(19)]
+		void GetSourceGeometries(ID2D1Geometry** geometries, uint geometriesCount);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometryRealization.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("a16907d7-bc02-4801-99e8-8cf7f485f774")]
 [NativeTypeName("struct ID2D1GeometryRealization : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1GeometryRealization : INativeGuid
+public unsafe partial struct ID2D1GeometryRealization : ID2D1GeometryRealization.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1GeometryRealization
 	{
@@ -81,5 +81,8 @@ public unsafe partial struct ID2D1GeometryRealization : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1GeometryRealization*, ID2D1Factory**, void>)(lpVtbl[3]))((ID2D1GeometryRealization*)Unsafe.AsPointer(ref this), factory);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometrySink.cs

@@ -7,6 +7,8 @@
 // </auto-generated>
 // ------------------------------------------------------------------------------
 
+using Win32.Graphics.Direct2D.Common;
+
 namespace Win32.Graphics.Direct2D;
 
 /// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1GeometrySink"]/*' />
@@ -14,7 +16,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd9069f-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1GeometrySink : ID2D1SimplifiedGeometrySink")]
 [NativeInheritance("ID2D1SimplifiedGeometrySink")]
-public unsafe partial struct ID2D1GeometrySink : INativeGuid
+public unsafe partial struct ID2D1GeometrySink : ID2D1GeometrySink.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1GeometrySink
 	{
@@ -48,8 +50,34 @@ public unsafe partial struct ID2D1GeometrySink : INativeGuid
 
 	public void** lpVtbl;
 
-	/// <inheritdoc cref="Win32.Graphics.Direct2D.Common.ID2D1SimplifiedGeometrySink.SetFillMode" />
+    /// <inheritdoc cref="IUnknown.QueryInterface" />
-	[MethodImpl(MethodImplOptions.AggressiveInlining)]
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    [VtblIndex(0)]
+    public HResult QueryInterface([NativeTypeName("const IID &")] Guid* riid, void** ppvObject)
+    {
+        return ((delegate* unmanaged[Stdcall]<ID2D1GeometrySink*, Guid*, void**, int>)(lpVtbl[0]))((ID2D1GeometrySink*)Unsafe.AsPointer(ref this), riid, ppvObject);
+    }
+
+    /// <inheritdoc cref="IUnknown.AddRef" />
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    [VtblIndex(1)]
+    [return: NativeTypeName("ULONG")]
+    public uint AddRef()
+    {
+        return ((delegate* unmanaged[Stdcall]<ID2D1GeometrySink*, uint>)(lpVtbl[1]))((ID2D1GeometrySink*)Unsafe.AsPointer(ref this));
+    }
+
+    /// <inheritdoc cref="IUnknown.Release" />
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    [VtblIndex(2)]
+    [return: NativeTypeName("ULONG")]
+    public uint Release()
+    {
+        return ((delegate* unmanaged[Stdcall]<ID2D1GeometrySink*, uint>)(lpVtbl[2]))((ID2D1GeometrySink*)Unsafe.AsPointer(ref this));
+    }
+
+    /// <inheritdoc cref="Win32.Graphics.Direct2D.Common.ID2D1SimplifiedGeometrySink.SetFillMode" />
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(0)]
 	public void SetFillMode(Common.FillMode fillMode)
 	{
@@ -143,5 +171,22 @@ public unsafe partial struct ID2D1GeometrySink : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1GeometrySink*, ArcSegment*, void>)(lpVtbl[11]))((ID2D1GeometrySink*)Unsafe.AsPointer(ref this), arc);
 	}
+	public interface Interface : ID2D1SimplifiedGeometrySink.Interface
+	{
+		[VtblIndex(7)]
+		void AddLine(System.Drawing.PointF point);
+
+		[VtblIndex(8)]
+		void AddBezier(Common.BezierSegment* bezier);
+
+		[VtblIndex(9)]
+		void AddQuadraticBezier(QuadraticBezierSegment* bezier);
+
+		[VtblIndex(10)]
+		void AddQuadraticBeziers(QuadraticBezierSegment* beziers, uint beziersCount);
+
+		[VtblIndex(11)]
+		void AddArc(ArcSegment* arc);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GradientMesh.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("f292e401-c050-4cde-83d7-04962d3b23c2")]
 [NativeTypeName("struct ID2D1GradientMesh : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1GradientMesh : INativeGuid
+public unsafe partial struct ID2D1GradientMesh : ID2D1GradientMesh.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1GradientMesh
 	{
@@ -97,5 +97,13 @@ public unsafe partial struct ID2D1GradientMesh : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1GradientMesh*, uint, GradientMeshPatch*, uint, int>)(lpVtbl[5]))((ID2D1GradientMesh*)Unsafe.AsPointer(ref this), startIndex, patches, patchesCount);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		uint GetPatchCount();
+
+		[VtblIndex(5)]
+		HResult GetPatches(uint startIndex, GradientMeshPatch* patches, uint patchesCount);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GradientStopCollection.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906a7-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1GradientStopCollection : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1GradientStopCollection : INativeGuid
+public unsafe partial struct ID2D1GradientStopCollection : ID2D1GradientStopCollection.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1GradientStopCollection
 	{
@@ -113,5 +113,19 @@ public unsafe partial struct ID2D1GradientStopCollection : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1GradientStopCollection*, ExtendMode>)(lpVtbl[7]))((ID2D1GradientStopCollection*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		uint GetGradientStopCount();
+
+		[VtblIndex(5)]
+		void GetGradientStops(GradientStop* gradientStops, uint gradientStopsCount);
+
+		[VtblIndex(6)]
+		Gamma GetColorInterpolationGamma();
+
+		[VtblIndex(7)]
+		ExtendMode GetExtendMode();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GradientStopCollection1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("ae1572f4-5dd0-4777-998b-9279472ae63b")]
 [NativeTypeName("struct ID2D1GradientStopCollection1 : ID2D1GradientStopCollection")]
 [NativeInheritance("ID2D1GradientStopCollection")]
-public unsafe partial struct ID2D1GradientStopCollection1 : INativeGuid
+public unsafe partial struct ID2D1GradientStopCollection1 : ID2D1GradientStopCollection1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1GradientStopCollection1
 	{
@@ -153,5 +153,22 @@ public unsafe partial struct ID2D1GradientStopCollection1 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1GradientStopCollection1*, ColorInterpolationMode>)(lpVtbl[12]))((ID2D1GradientStopCollection1*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : ID2D1GradientStopCollection.Interface
+	{
+		[VtblIndex(8)]
+		void GetGradientStops1(GradientStop* gradientStops, uint gradientStopsCount);
+
+		[VtblIndex(9)]
+		ColorSpace GetPreInterpolationSpace();
+
+		[VtblIndex(10)]
+		ColorSpace GetPostInterpolationSpace();
+
+		[VtblIndex(11)]
+		BufferPrecision GetBufferPrecision();
+
+		[VtblIndex(12)]
+		ColorInterpolationMode GetColorInterpolationMode();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1HwndRenderTarget.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd90698-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1HwndRenderTarget : ID2D1RenderTarget")]
 [NativeInheritance("ID2D1RenderTarget")]
-public unsafe partial struct ID2D1HwndRenderTarget : INativeGuid
+public unsafe partial struct ID2D1HwndRenderTarget : ID2D1HwndRenderTarget.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1HwndRenderTarget
 	{
@@ -532,5 +532,16 @@ public unsafe partial struct ID2D1HwndRenderTarget : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, IntPtr>)(lpVtbl[59]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : ID2D1RenderTarget.Interface
+	{
+		[VtblIndex(57)]
+		WindowState CheckWindowState();
+
+		[VtblIndex(58)]
+		HResult Resize(System.Drawing.Size* pixelSize);
+
+		[VtblIndex(59)]
+		IntPtr GetHwnd();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Image.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("65019f75-8da2-497c-b32c-dfa34e48ede6")]
 [NativeTypeName("struct ID2D1Image : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1Image : INativeGuid
+public unsafe partial struct ID2D1Image : ID2D1Image.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Image
 	{
@@ -81,5 +81,8 @@ public unsafe partial struct ID2D1Image : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1Image*, ID2D1Factory**, void>)(lpVtbl[3]))((ID2D1Image*)Unsafe.AsPointer(ref this), factory);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageBrush.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("fe9e984d-3f95-407c-b5db-cb94d4e8f87c")]
 [NativeTypeName("struct ID2D1ImageBrush : ID2D1Brush")]
 [NativeInheritance("ID2D1Brush")]
-public unsafe partial struct ID2D1ImageBrush : INativeGuid
+public unsafe partial struct ID2D1ImageBrush : ID2D1ImageBrush.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1ImageBrush
 	{
@@ -193,5 +193,37 @@ public unsafe partial struct ID2D1ImageBrush : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1ImageBrush*, Common.RectF*, void>)(lpVtbl[17]))((ID2D1ImageBrush*)Unsafe.AsPointer(ref this), sourceRectangle);
 	}
+	public interface Interface : ID2D1Brush.Interface
+	{
+		[VtblIndex(8)]
+		void SetImage(ID2D1Image* image);
+
+		[VtblIndex(9)]
+		void SetExtendModeX(ExtendMode extendModeX);
+
+		[VtblIndex(10)]
+		void SetExtendModeY(ExtendMode extendModeY);
+
+		[VtblIndex(11)]
+		void SetInterpolationMode(InterpolationMode interpolationMode);
+
+		[VtblIndex(12)]
+		void SetSourceRectangle(Common.RectF* sourceRectangle);
+
+		[VtblIndex(13)]
+		void GetImage(ID2D1Image** image);
+
+		[VtblIndex(14)]
+		ExtendMode GetExtendModeX();
+
+		[VtblIndex(15)]
+		ExtendMode GetExtendModeY();
+
+		[VtblIndex(16)]
+		InterpolationMode GetInterpolationMode();
+
+		[VtblIndex(17)]
+		void GetSourceRectangle(Common.RectF* sourceRectangle);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageSource.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("c9b664e5-74a1-4378-9ac2-eefc37a3f4d8")]
 [NativeTypeName("struct ID2D1ImageSource : ID2D1Image")]
 [NativeInheritance("ID2D1Image")]
-public unsafe partial struct ID2D1ImageSource : INativeGuid
+public unsafe partial struct ID2D1ImageSource : ID2D1ImageSource.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1ImageSource
 	{
@@ -97,5 +97,13 @@ public unsafe partial struct ID2D1ImageSource : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1ImageSource*, Bool32*, int>)(lpVtbl[5]))((ID2D1ImageSource*)Unsafe.AsPointer(ref this), resourcesDiscarded);
 	}
+	public interface Interface : ID2D1Image.Interface
+	{
+		[VtblIndex(4)]
+		HResult OfferResources();
+
+		[VtblIndex(5)]
+		HResult TryReclaimResources(Bool32* resourcesDiscarded);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageSourceFromWic.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("77395441-1c8f-4555-8683-f50dab0fe792")]
 [NativeTypeName("struct ID2D1ImageSourceFromWic : ID2D1ImageSource")]
 [NativeInheritance("ID2D1ImageSource")]
-public unsafe partial struct ID2D1ImageSourceFromWic : INativeGuid
+public unsafe partial struct ID2D1ImageSourceFromWic : ID2D1ImageSourceFromWic.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1ImageSourceFromWic
 	{
@@ -121,5 +121,16 @@ public unsafe partial struct ID2D1ImageSourceFromWic : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1ImageSourceFromWic*, Graphics.Imaging.IWICBitmapSource**, void>)(lpVtbl[8]))((ID2D1ImageSourceFromWic*)Unsafe.AsPointer(ref this), wicBitmapSource);
 	}
+	public interface Interface : ID2D1ImageSource.Interface
+	{
+		[VtblIndex(6)]
+		HResult EnsureCached(Common.RectU* rectangleToFill);
+
+		[VtblIndex(7)]
+		HResult TrimCache(Common.RectU* rectangleToPreserve);
+
+		[VtblIndex(8)]
+		void GetSource(Graphics.Imaging.IWICBitmapSource** wicBitmapSource);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Ink.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("b499923b-7029-478f-a8b3-432c7c5f5312")]
 [NativeTypeName("struct ID2D1Ink : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1Ink : INativeGuid
+public unsafe partial struct ID2D1Ink : ID2D1Ink.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Ink
 	{
@@ -162,5 +162,37 @@ public unsafe partial struct ID2D1Ink : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Ink*, ID2D1InkStyle*, Matrix3x2*, Common.RectF*, int>)(lpVtbl[13]))((ID2D1Ink*)Unsafe.AsPointer(ref this), inkStyle, worldTransform, bounds);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		void SetStartPoint(InkPoint* startPoint);
+
+		[VtblIndex(5)]
+		InkPoint GetStartPoint();
+
+		[VtblIndex(6)]
+		HResult AddSegments(InkBezierSegment* segments, uint segmentsCount);
+
+		[VtblIndex(7)]
+		HResult RemoveSegmentsAtEnd(uint segmentsCount);
+
+		[VtblIndex(8)]
+		HResult SetSegments(uint startSegment, InkBezierSegment* segments, uint segmentsCount);
+
+		[VtblIndex(9)]
+		HResult SetSegmentAtEnd(InkBezierSegment* segment);
+
+		[VtblIndex(10)]
+		uint GetSegmentCount();
+
+		[VtblIndex(11)]
+		HResult GetSegments(uint startSegment, InkBezierSegment* segments, uint segmentsCount);
+
+		[VtblIndex(12)]
+		HResult StreamAsGeometry(ID2D1InkStyle* inkStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.ID2D1SimplifiedGeometrySink* geometrySink);
+
+		[VtblIndex(13)]
+		HResult GetBounds(ID2D1InkStyle* inkStyle, Matrix3x2* worldTransform, Common.RectF* bounds);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1InkStyle.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("bae8b344-23fc-4071-8cb5-d05d6f073848")]
 [NativeTypeName("struct ID2D1InkStyle : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1InkStyle : INativeGuid
+public unsafe partial struct ID2D1InkStyle : ID2D1InkStyle.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1InkStyle
 	{
@@ -113,5 +113,19 @@ public unsafe partial struct ID2D1InkStyle : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1InkStyle*, InkNibShape>)(lpVtbl[7]))((ID2D1InkStyle*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		void SetNibTransform(Matrix3x2* transform);
+
+		[VtblIndex(5)]
+		void GetNibTransform(Matrix3x2* transform);
+
+		[VtblIndex(6)]
+		void SetNibShape(InkNibShape nibShape);
+
+		[VtblIndex(7)]
+		InkNibShape GetNibShape();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Layer.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd9069b-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1Layer : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1Layer : INativeGuid
+public unsafe partial struct ID2D1Layer : ID2D1Layer.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Layer
 	{
@@ -90,5 +90,10 @@ public unsafe partial struct ID2D1Layer : INativeGuid
 		System.Drawing.SizeF result;
 		return *((delegate* unmanaged[Stdcall]<ID2D1Layer*, System.Drawing.SizeF*, System.Drawing.SizeF*>)(lpVtbl[4]))((ID2D1Layer*)Unsafe.AsPointer(ref this), &result);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		System.Drawing.SizeF GetSize();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1LinearGradientBrush.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906ab-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1LinearGradientBrush : ID2D1Brush")]
 [NativeInheritance("ID2D1Brush")]
-public unsafe partial struct ID2D1LinearGradientBrush : INativeGuid
+public unsafe partial struct ID2D1LinearGradientBrush : ID2D1LinearGradientBrush.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1LinearGradientBrush
 	{
@@ -155,5 +155,22 @@ public unsafe partial struct ID2D1LinearGradientBrush : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1LinearGradientBrush*, ID2D1GradientStopCollection**, void>)(lpVtbl[12]))((ID2D1LinearGradientBrush*)Unsafe.AsPointer(ref this), gradientStopCollection);
 	}
+	public interface Interface : ID2D1Brush.Interface
+	{
+		[VtblIndex(8)]
+		void SetStartPoint(System.Drawing.PointF startPoint);
+
+		[VtblIndex(9)]
+		void SetEndPoint(System.Drawing.PointF endPoint);
+
+		[VtblIndex(10)]
+		System.Drawing.PointF GetStartPoint();
+
+		[VtblIndex(11)]
+		System.Drawing.PointF GetEndPoint();
+
+		[VtblIndex(12)]
+		void GetGradientStopCollection(ID2D1GradientStopCollection** gradientStopCollection);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1LookupTable3D.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("53dd9855-a3b0-4d5b-82e1-26e25c5e5797")]
 [NativeTypeName("struct ID2D1LookupTable3D : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1LookupTable3D : INativeGuid
+public unsafe partial struct ID2D1LookupTable3D : ID2D1LookupTable3D.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1LookupTable3D
 	{
@@ -81,5 +81,8 @@ public unsafe partial struct ID2D1LookupTable3D : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1LookupTable3D*, ID2D1Factory**, void>)(lpVtbl[3]))((ID2D1LookupTable3D*)Unsafe.AsPointer(ref this), factory);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Mesh.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906c2-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1Mesh : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1Mesh : INativeGuid
+public unsafe partial struct ID2D1Mesh : ID2D1Mesh.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Mesh
 	{
@@ -89,5 +89,10 @@ public unsafe partial struct ID2D1Mesh : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Mesh*, ID2D1TessellationSink**, int>)(lpVtbl[4]))((ID2D1Mesh*)Unsafe.AsPointer(ref this), tessellationSink);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		HResult Open(ID2D1TessellationSink** tessellationSink);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Multithread.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("31e6e7bc-e0ff-4d46-8c64-a0a8c41c15d3")]
 [NativeTypeName("struct ID2D1Multithread : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1Multithread : INativeGuid
+public unsafe partial struct ID2D1Multithread : ID2D1Multithread.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Multithread
 	{
@@ -97,5 +97,16 @@ public unsafe partial struct ID2D1Multithread : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1Multithread*, void>)(lpVtbl[5]))((ID2D1Multithread*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		Bool32 GetMultithreadProtected();
+
+		[VtblIndex(4)]
+		void Enter();
+
+		[VtblIndex(5)]
+		void Leave();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1OffsetTransform.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("3fe6adea-7643-4f53-bd14-a0ce63f24042")]
 [NativeTypeName("struct ID2D1OffsetTransform : ID2D1TransformNode")]
 [NativeInheritance("ID2D1TransformNode")]
-public unsafe partial struct ID2D1OffsetTransform : INativeGuid
+public unsafe partial struct ID2D1OffsetTransform : ID2D1OffsetTransform.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1OffsetTransform
 	{
@@ -98,5 +98,13 @@ public unsafe partial struct ID2D1OffsetTransform : INativeGuid
 		System.Drawing.Point result;
 		return *((delegate* unmanaged[Stdcall]<ID2D1OffsetTransform*, System.Drawing.Point*, System.Drawing.Point*>)(lpVtbl[5]))((ID2D1OffsetTransform*)Unsafe.AsPointer(ref this), &result);
 	}
+	public interface Interface : ID2D1TransformNode.Interface
+	{
+		[VtblIndex(4)]
+		void SetOffset(System.Drawing.Point offset);
+
+		[VtblIndex(5)]
+		System.Drawing.Point GetOffset();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906a5-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1PathGeometry : ID2D1Geometry")]
 [NativeInheritance("ID2D1Geometry")]
-public unsafe partial struct ID2D1PathGeometry : INativeGuid
+public unsafe partial struct ID2D1PathGeometry : ID2D1PathGeometry.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1PathGeometry
 	{
@@ -217,5 +217,19 @@ public unsafe partial struct ID2D1PathGeometry : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1PathGeometry*, uint*, int>)(lpVtbl[20]))((ID2D1PathGeometry*)Unsafe.AsPointer(ref this), count);
 	}
+	public interface Interface : ID2D1Geometry.Interface
+	{
+		[VtblIndex(17)]
+		HResult Open(ID2D1GeometrySink** geometrySink);
+
+		[VtblIndex(18)]
+		HResult Stream(ID2D1GeometrySink* geometrySink);
+
+		[VtblIndex(19)]
+		HResult GetSegmentCount(uint* count);
+
+		[VtblIndex(20)]
+		HResult GetFigureCount(uint* count);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry1.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("62baa2d2-ab54-41b7-b872-787e0106a421")]
 [NativeTypeName("struct ID2D1PathGeometry1 : ID2D1PathGeometry")]
 [NativeInheritance("ID2D1PathGeometry")]
-public unsafe partial struct ID2D1PathGeometry1 : INativeGuid
+public unsafe partial struct ID2D1PathGeometry1 : ID2D1PathGeometry1.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1PathGeometry1
 	{
@@ -225,5 +225,10 @@ public unsafe partial struct ID2D1PathGeometry1 : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1PathGeometry1*, float, uint, Matrix3x2*, float, PointDescription*, int>)(lpVtbl[21]))((ID2D1PathGeometry1*)Unsafe.AsPointer(ref this), length, startSegment, worldTransform, flatteningTolerance, pointDescription);
 	}
+	public interface Interface : ID2D1PathGeometry.Interface
+	{
+		[VtblIndex(21)]
+		HResult ComputePointAndSegmentAtLength(float length, uint startSegment, Matrix3x2* worldTransform, float flatteningTolerance, PointDescription* pointDescription);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PrintControl.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2c1d867d-c290-41c8-ae7e-34a98702e9a5")]
 [NativeTypeName("struct ID2D1PrintControl : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1PrintControl : INativeGuid
+public unsafe partial struct ID2D1PrintControl : ID2D1PrintControl.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1PrintControl
 	{
@@ -89,5 +89,13 @@ public unsafe partial struct ID2D1PrintControl : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1PrintControl*, int>)(lpVtbl[4]))((ID2D1PrintControl*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		HResult AddPage(ID2D1CommandList* commandList, System.Drawing.SizeF pageSize, Com.IStream* pagePrintTicketStream, ulong* tag1, ulong* tag2);
+
+		[VtblIndex(4)]
+		HResult Close();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Properties.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("483473d7-cd46-4f9d-9d3a-3112aa80159d")]
 [NativeTypeName("struct ID2D1Properties : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1Properties : INativeGuid
+public unsafe partial struct ID2D1Properties : ID2D1Properties.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Properties
 	{
@@ -161,5 +161,40 @@ public unsafe partial struct ID2D1Properties : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1Properties*, uint, ID2D1Properties**, int>)(lpVtbl[13]))((ID2D1Properties*)Unsafe.AsPointer(ref this), index, subProperties);
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		uint GetPropertyCount();
+
+		[VtblIndex(4)]
+		HResult GetPropertyName(uint index, ushort* name, uint nameCount);
+
+		[VtblIndex(5)]
+		uint GetPropertyNameLength(uint index);
+
+		[VtblIndex(6)]
+		PropertyType GetType(uint index);
+
+		[VtblIndex(7)]
+		uint GetPropertyIndex(ushort* name);
+
+		[VtblIndex(8)]
+		HResult SetValueByName(ushort* name, PropertyType type, byte* data, uint dataSize);
+
+		[VtblIndex(9)]
+		HResult SetValue(uint index, PropertyType type, byte* data, uint dataSize);
+
+		[VtblIndex(10)]
+		HResult GetValueByName(ushort* name, PropertyType type, byte* data, uint dataSize);
+
+		[VtblIndex(11)]
+		HResult GetValue(uint index, PropertyType type, byte* data, uint dataSize);
+
+		[VtblIndex(12)]
+		uint GetValueSize(uint index);
+
+		[VtblIndex(13)]
+		HResult GetSubProperties(uint index, ID2D1Properties** subProperties);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RadialGradientBrush.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906ac-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1RadialGradientBrush : ID2D1Brush")]
 [NativeInheritance("ID2D1Brush")]
-public unsafe partial struct ID2D1RadialGradientBrush : INativeGuid
+public unsafe partial struct ID2D1RadialGradientBrush : ID2D1RadialGradientBrush.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1RadialGradientBrush
 	{
@@ -187,5 +187,34 @@ public unsafe partial struct ID2D1RadialGradientBrush : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1RadialGradientBrush*, ID2D1GradientStopCollection**, void>)(lpVtbl[16]))((ID2D1RadialGradientBrush*)Unsafe.AsPointer(ref this), gradientStopCollection);
 	}
+	public interface Interface : ID2D1Brush.Interface
+	{
+		[VtblIndex(8)]
+		void SetCenter(System.Drawing.PointF center);
+
+		[VtblIndex(9)]
+		void SetGradientOriginOffset(System.Drawing.PointF gradientOriginOffset);
+
+		[VtblIndex(10)]
+		void SetRadiusX(float radiusX);
+
+		[VtblIndex(11)]
+		void SetRadiusY(float radiusY);
+
+		[VtblIndex(12)]
+		System.Drawing.PointF GetCenter();
+
+		[VtblIndex(13)]
+		System.Drawing.PointF GetGradientOriginOffset();
+
+		[VtblIndex(14)]
+		float GetRadiusX();
+
+		[VtblIndex(15)]
+		float GetRadiusY();
+
+		[VtblIndex(16)]
+		void GetGradientStopCollection(ID2D1GradientStopCollection** gradientStopCollection);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RectangleGeometry.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906a2-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1RectangleGeometry : ID2D1Geometry")]
 [NativeInheritance("ID2D1Geometry")]
-public unsafe partial struct ID2D1RectangleGeometry : INativeGuid
+public unsafe partial struct ID2D1RectangleGeometry : ID2D1RectangleGeometry.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1RectangleGeometry
 	{
@@ -193,5 +193,10 @@ public unsafe partial struct ID2D1RectangleGeometry : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1RectangleGeometry*, Common.RectF*, void>)(lpVtbl[17]))((ID2D1RectangleGeometry*)Unsafe.AsPointer(ref this), rect);
 	}
+	public interface Interface : ID2D1Geometry.Interface
+	{
+		[VtblIndex(17)]
+		void GetRect(Common.RectF* rect);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderInfo.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("519ae1bd-d19a-420d-b849-364f594776b7")]
 [NativeTypeName("struct ID2D1RenderInfo : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1RenderInfo : INativeGuid
+public unsafe partial struct ID2D1RenderInfo : ID2D1RenderInfo.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1RenderInfo
 	{
@@ -105,5 +105,19 @@ public unsafe partial struct ID2D1RenderInfo : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1RenderInfo*, uint, void>)(lpVtbl[6]))((ID2D1RenderInfo*)Unsafe.AsPointer(ref this), instructionCount);
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		HResult SetInputDescription(uint inputIndex, InputDescription inputDescription);
+
+		[VtblIndex(4)]
+		HResult SetOutputBuffer(BufferPrecision bufferPrecision, ChannelDepth channelDepth);
+
+		[VtblIndex(5)]
+		void SetCached(Bool32 isCached);
+
+		[VtblIndex(6)]
+		void SetInstructionCountHint(uint instructionCount);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderTarget.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd90694-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1RenderTarget : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1RenderTarget : INativeGuid
+public unsafe partial struct ID2D1RenderTarget : ID2D1RenderTarget.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1RenderTarget
 	{
@@ -508,5 +508,166 @@ public unsafe partial struct ID2D1RenderTarget : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, RenderTargetProperties*, Bool32>)(lpVtbl[56]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), renderTargetProperties);
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		HResult CreateBitmap(System.Drawing.Size size, void* srcData, uint pitch, BitmapProperties* bitmapProperties, ID2D1Bitmap** bitmap);
+
+		[VtblIndex(5)]
+		HResult CreateBitmapFromWicBitmap(Graphics.Imaging.IWICBitmapSource* wicBitmapSource, BitmapProperties* bitmapProperties, ID2D1Bitmap** bitmap);
+
+		[VtblIndex(6)]
+		HResult CreateSharedBitmap(Guid* riid, void* data, BitmapProperties* bitmapProperties, ID2D1Bitmap** bitmap);
+
+		[VtblIndex(7)]
+		HResult CreateBitmapBrush(ID2D1Bitmap* bitmap, BitmapBrushProperties* bitmapBrushProperties, BrushProperties* brushProperties, ID2D1BitmapBrush** bitmapBrush);
+
+		[VtblIndex(8)]
+		HResult CreateSolidColorBrush(Color4* color, BrushProperties* brushProperties, ID2D1SolidColorBrush** solidColorBrush);
+
+		[VtblIndex(9)]
+		HResult CreateGradientStopCollection(GradientStop* gradientStops, uint gradientStopsCount, Gamma colorInterpolationGamma, ExtendMode extendMode, ID2D1GradientStopCollection** gradientStopCollection);
+
+		[VtblIndex(10)]
+		HResult CreateLinearGradientBrush(LinearGradientBrushProperties* linearGradientBrushProperties, BrushProperties* brushProperties, ID2D1GradientStopCollection* gradientStopCollection, ID2D1LinearGradientBrush** linearGradientBrush);
+
+		[VtblIndex(11)]
+		HResult CreateRadialGradientBrush(RadialGradientBrushProperties* radialGradientBrushProperties, BrushProperties* brushProperties, ID2D1GradientStopCollection* gradientStopCollection, ID2D1RadialGradientBrush** radialGradientBrush);
+
+		[VtblIndex(12)]
+		HResult CreateCompatibleRenderTarget(System.Drawing.SizeF* desiredSize, System.Drawing.Size* desiredPixelSize, Common.PixelFormat* desiredFormat, CompatibleRenderTargetOptions options, ID2D1BitmapRenderTarget** bitmapRenderTarget);
+
+		[VtblIndex(13)]
+		HResult CreateLayer(System.Drawing.SizeF* size, ID2D1Layer** layer);
+
+		[VtblIndex(14)]
+		HResult CreateMesh(ID2D1Mesh** mesh);
+
+		[VtblIndex(15)]
+		void DrawLine(System.Drawing.PointF point0, System.Drawing.PointF point1, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
+
+		[VtblIndex(16)]
+		void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
+
+		[VtblIndex(17)]
+		void FillRectangle(Common.RectF* rect, ID2D1Brush* brush);
+
+		[VtblIndex(18)]
+		void DrawRoundedRectangle(RoundedRect* roundedRect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
+
+		[VtblIndex(19)]
+		void FillRoundedRectangle(RoundedRect* roundedRect, ID2D1Brush* brush);
+
+		[VtblIndex(20)]
+		void DrawEllipse(Ellipse* ellipse, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
+
+		[VtblIndex(21)]
+		void FillEllipse(Ellipse* ellipse, ID2D1Brush* brush);
+
+		[VtblIndex(22)]
+		void DrawGeometry(ID2D1Geometry* geometry, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
+
+		[VtblIndex(23)]
+		void FillGeometry(ID2D1Geometry* geometry, ID2D1Brush* brush, ID2D1Brush* opacityBrush);
+
+		[VtblIndex(24)]
+		void FillMesh(ID2D1Mesh* mesh, ID2D1Brush* brush);
+
+		[VtblIndex(25)]
+		void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle);
+
+		[VtblIndex(26)]
+		void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle);
+
+		[VtblIndex(27)]
+		void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode);
+
+		[VtblIndex(28)]
+		void DrawTextLayout(System.Drawing.PointF origin, Graphics.DirectWrite.IDWriteTextLayout* textLayout, ID2D1Brush* defaultFillBrush, DrawTextOptions options);
+
+		[VtblIndex(29)]
+		void DrawGlyphRun(System.Drawing.PointF baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, ID2D1Brush* foregroundBrush, Graphics.DirectWrite.MeasuringMode measuringMode);
+
+		[VtblIndex(30)]
+		void SetTransform(Matrix3x2* transform);
+
+		[VtblIndex(31)]
+		void GetTransform(Matrix3x2* transform);
+
+		[VtblIndex(32)]
+		void SetAntialiasMode(AntialiasMode antialiasMode);
+
+		[VtblIndex(33)]
+		AntialiasMode GetAntialiasMode();
+
+		[VtblIndex(34)]
+		void SetTextAntialiasMode(TextAntialiasMode textAntialiasMode);
+
+		[VtblIndex(35)]
+		TextAntialiasMode GetTextAntialiasMode();
+
+		[VtblIndex(36)]
+		void SetTextRenderingParams(Graphics.DirectWrite.IDWriteRenderingParams* textRenderingParams);
+
+		[VtblIndex(37)]
+		void GetTextRenderingParams(Graphics.DirectWrite.IDWriteRenderingParams** textRenderingParams);
+
+		[VtblIndex(38)]
+		void SetTags(ulong tag1, ulong tag2);
+
+		[VtblIndex(39)]
+		void GetTags(ulong* tag1, ulong* tag2);
+
+		[VtblIndex(40)]
+		void PushLayer(LayerParameters* layerParameters, ID2D1Layer* layer);
+
+		[VtblIndex(41)]
+		void PopLayer();
+
+		[VtblIndex(42)]
+		HResult Flush(ulong* tag1, ulong* tag2);
+
+		[VtblIndex(43)]
+		void SaveDrawingState(ID2D1DrawingStateBlock* drawingStateBlock);
+
+		[VtblIndex(44)]
+		void RestoreDrawingState(ID2D1DrawingStateBlock* drawingStateBlock);
+
+		[VtblIndex(45)]
+		void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode);
+
+		[VtblIndex(46)]
+		void PopAxisAlignedClip();
+
+		[VtblIndex(47)]
+		void Clear(Color4* clearColor);
+
+		[VtblIndex(48)]
+		void BeginDraw();
+
+		[VtblIndex(49)]
+		HResult EndDraw(ulong* tag1 = null, ulong* tag2 = null);
+
+		[VtblIndex(50)]
+		Common.PixelFormat GetPixelFormat();
+
+		[VtblIndex(51)]
+		void SetDpi(float dpiX, float dpiY);
+
+		[VtblIndex(52)]
+		void GetDpi(float* dpiX, float* dpiY);
+
+		[VtblIndex(53)]
+		System.Drawing.SizeF GetSize();
+
+		[VtblIndex(54)]
+		System.Drawing.Size GetPixelSize();
+
+		[VtblIndex(55)]
+		uint GetMaximumBitmapSize();
+
+		[VtblIndex(56)]
+		Bool32 IsSupported(RenderTargetProperties* renderTargetProperties);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Resource.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd90691-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1Resource : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1Resource : INativeGuid
+public unsafe partial struct ID2D1Resource : ID2D1Resource.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1Resource
 	{
@@ -81,5 +81,10 @@ public unsafe partial struct ID2D1Resource : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1Resource*, ID2D1Factory**, void>)(lpVtbl[3]))((ID2D1Resource*)Unsafe.AsPointer(ref this), factory);
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		void GetFactory(ID2D1Factory** factory);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ResourceTexture.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("688d15c3-02b0-438d-b13a-d1b44c32c39a")]
 [NativeTypeName("struct ID2D1ResourceTexture : IUnknown")]
 [NativeInheritance("IUnknown")]
-public unsafe partial struct ID2D1ResourceTexture : INativeGuid
+public unsafe partial struct ID2D1ResourceTexture : ID2D1ResourceTexture.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1ResourceTexture
 	{
@@ -81,5 +81,10 @@ public unsafe partial struct ID2D1ResourceTexture : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1ResourceTexture*, uint*, uint*, uint*, uint, byte*, uint, int>)(lpVtbl[3]))((ID2D1ResourceTexture*)Unsafe.AsPointer(ref this), minimumExtents, maximimumExtents, strides, dimensions, data, dataCount);
 	}
+	public interface Interface : IUnknown.Interface
+	{
+		[VtblIndex(3)]
+		HResult Update(uint* minimumExtents, uint* maximimumExtents, uint* strides, uint dimensions, byte* data, uint dataCount);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RoundedRectangleGeometry.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906a3-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1RoundedRectangleGeometry : ID2D1Geometry")]
 [NativeInheritance("ID2D1Geometry")]
-public unsafe partial struct ID2D1RoundedRectangleGeometry : INativeGuid
+public unsafe partial struct ID2D1RoundedRectangleGeometry : ID2D1RoundedRectangleGeometry.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1RoundedRectangleGeometry
 	{
@@ -193,5 +193,10 @@ public unsafe partial struct ID2D1RoundedRectangleGeometry : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1RoundedRectangleGeometry*, RoundedRect*, void>)(lpVtbl[17]))((ID2D1RoundedRectangleGeometry*)Unsafe.AsPointer(ref this), roundedRect);
 	}
+	public interface Interface : ID2D1Geometry.Interface
+	{
+		[VtblIndex(17)]
+		void GetRoundedRect(RoundedRect* roundedRect);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SolidColorBrush.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("2cd906a9-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1SolidColorBrush : ID2D1Brush")]
 [NativeInheritance("ID2D1Brush")]
-public unsafe partial struct ID2D1SolidColorBrush : INativeGuid
+public unsafe partial struct ID2D1SolidColorBrush : ID2D1SolidColorBrush.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1SolidColorBrush
 	{
@@ -130,5 +130,13 @@ public unsafe partial struct ID2D1SolidColorBrush : INativeGuid
 		Color4 result;
 		return *((delegate* unmanaged[Stdcall]<ID2D1SolidColorBrush*, Color4*, Color4*>)(lpVtbl[9]))((ID2D1SolidColorBrush*)Unsafe.AsPointer(ref this), &result);
 	}
+	public interface Interface : ID2D1Brush.Interface
+	{
+		[VtblIndex(8)]
+		void SetColor(Color4* color);
+
+		[VtblIndex(9)]
+		Color4 GetColor();
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SourceTransform.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("db1800dd-0c34-4cf9-be90-31cc0a5653e1")]
 [NativeTypeName("struct ID2D1SourceTransform : ID2D1Transform")]
 [NativeInheritance("ID2D1Transform")]
-public unsafe partial struct ID2D1SourceTransform : INativeGuid
+public unsafe partial struct ID2D1SourceTransform : ID2D1SourceTransform.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1SourceTransform
 	{
@@ -121,5 +121,13 @@ public unsafe partial struct ID2D1SourceTransform : INativeGuid
 	{
 		return ((delegate* unmanaged[Stdcall]<ID2D1SourceTransform*, ID2D1Bitmap1*, RawRect*, System.Drawing.Point, int>)(lpVtbl[8]))((ID2D1SourceTransform*)Unsafe.AsPointer(ref this), target, drawRect, targetOrigin);
 	}
+	public interface Interface : ID2D1Transform.Interface
+	{
+		[VtblIndex(7)]
+		HResult SetRenderInfo(ID2D1RenderInfo* renderInfo);
+
+		[VtblIndex(8)]
+		HResult Draw(ID2D1Bitmap1* target, RawRect* drawRect, System.Drawing.Point targetOrigin);
+	}
 }
 

src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SpriteBatch.cs

@@ -14,7 +14,7 @@ namespace Win32.Graphics.Direct2D;
 [Guid("4dc583bf-3a10-438a-8722-e9765224f1f1")]
 [NativeTypeName("struct ID2D1SpriteBatch : ID2D1Resource")]
 [NativeInheritance("ID2D1Resource")]
-public unsafe partial struct ID2D1SpriteBatch : INativeGuid
+public unsafe partial struct ID2D1SpriteBatch : ID2D1SpriteBatch.Interface, INativeGuid
 {
 	public static ref readonly Guid IID_ID2D1SpriteBatch
 	{
@@ -121,5 +121,22 @@ public unsafe partial struct ID2D1SpriteBatch : INativeGuid
 	{
 		((delegate* unmanaged[Stdcall]<ID2D1SpriteBatch*, void>)(lpVtbl[8]))((ID2D1SpriteBatch*)Unsafe.AsPointer(ref this));
 	}
+	public interface Interface : ID2D1Resource.Interface
+	{
+		[VtblIndex(4)]
+		HResult AddSprites(uint spriteCount, Common.RectF* destinationRectangles, Common.RectU* sourceRectangles, Color4* colors, Matrix3x2* transforms, uint destinationRectanglesStride, uint sourceRectanglesStride, uint colorsStride, uint transformsStride);
+
+		[VtblIndex(5)]
+		HResult SetSprites(uint startIndex, uint spriteCount, Common.RectF* destinationRectangles, Common.RectU* sourceRectangles, Color4* colors, Matrix3x2* transforms, uint destinationRectanglesStride, uint sourceRectanglesStride, uint colorsStride, uint transformsStride);
+
+		[VtblIndex(6)]
+		HResult GetSprites(uint startIndex, uint spriteCount, Common.RectF* destinationRectangles, Common.RectU* sourceRectangles, Color4** colors, Matrix3x2* transforms);
+
+		[VtblIndex(7)]
+		uint GetSpriteCount();
+
+		[VtblIndex(8)]
+		void Clear();
+	}
 }