diff --git a/Directory.Build.props b/Directory.Build.props index 1b8da5f..c0a44af 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,7 +7,7 @@ true true - 1.7.4 + 1.7.5 true diff --git a/Vortice.Win32.sln b/Vortice.Win32.sln index 76c5538..6a035ec 100644 --- a/Vortice.Win32.sln +++ b/Vortice.Win32.sln @@ -32,6 +32,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Dxc", "src\Vo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Direct2D", "src\Vortice.Win32.Direct2D\Vortice.Win32.Direct2D.csproj", "{942D599C-CDAC-479A-825E-1B7B84DE1328}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.DirectWrite", "src\Vortice.Win32.DirectWrite\Vortice.Win32.DirectWrite.csproj", "{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -70,6 +72,10 @@ Global {942D599C-CDAC-479A-825E-1B7B84DE1328}.Debug|Any CPU.Build.0 = Debug|Any CPU {942D599C-CDAC-479A-825E-1B7B84DE1328}.Release|Any CPU.ActiveCfg = Release|Any CPU {942D599C-CDAC-479A-825E-1B7B84DE1328}.Release|Any CPU.Build.0 = Release|Any CPU + {CB383B94-16DF-4937-9CAD-15DE1DC77B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CB383B94-16DF-4937-9CAD-15DE1DC77B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CB383B94-16DF-4937-9CAD-15DE1DC77B3A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CB383B94-16DF-4937-9CAD-15DE1DC77B3A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs index 0a72025..ca7285f 100644 --- a/src/Generator/Program.cs +++ b/src/Generator/Program.cs @@ -1042,6 +1042,7 @@ public static class Program string d3d12Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Direct3D12"); string d3d11on12Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Direct3D11on12"); string d2dPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Direct2D"); + string dwritePath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.DirectWrite"); string dxcPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Dxc"); // Generate docs @@ -1090,6 +1091,11 @@ public static class Program useSubFolders = false; cleanFolder = false; } + else if (jsonFile == "Graphics.DirectWrite.json") + { + outputPath = dwritePath; + useSubFolders = false; + } else if (jsonFile.EndsWith("Direct3D.Dxc.json")) { outputPath = dxcPath; diff --git a/src/Vortice.Win32.Direct2D/Vortice.Win32.Direct2D.csproj b/src/Vortice.Win32.Direct2D/Vortice.Win32.Direct2D.csproj index 05e3b78..7e501d6 100644 --- a/src/Vortice.Win32.Direct2D/Vortice.Win32.Direct2D.csproj +++ b/src/Vortice.Win32.Direct2D/Vortice.Win32.Direct2D.csproj @@ -2,7 +2,7 @@ netstandard2.0;netstandard2.1;net6.0;net7.0 - DXC bindings. + Direct2D1 bindings. true 0419;$(NoWarn) @@ -18,7 +18,7 @@ - + diff --git a/src/Vortice.Win32.Direct3D11/Direct3D11.xml b/src/Vortice.Win32.Direct3D11/Direct3D11.xml index fb652a8..f736dc9 100644 --- a/src/Vortice.Win32.Direct3D11/Direct3D11.xml +++ b/src/Vortice.Win32.Direct3D11/Direct3D11.xml @@ -8244,7 +8244,7 @@ The filter value indicates the amount by which the left and right views are adju Gets the minimum feature level. Microsoft Docs: - A pointer to one of the enumerated values in D3D_FEATURE_LEVEL, which represents the minimum feature level. + A pointer to one of the enumerated values in D3D_FEATURE_LEVEL, which represents the minimum feature level. @@ -9898,7 +9898,7 @@ An empty box results in a no-op. A box is empty if the top value is greater than - Retrieves the initial contents of the specified input register. + Retrieves the initial contents of the specified input register. Microsoft Docs: A pointer to a D3D11_TRACE_VALUE structure. GetInitialRegisterContents fills the members of this structure with information about the initial contents. diff --git a/src/Vortice.Win32.DirectWrite/Apis.cs b/src/Vortice.Win32.DirectWrite/Apis.cs new file mode 100644 index 0000000..a80033a --- /dev/null +++ b/src/Vortice.Win32.DirectWrite/Apis.cs @@ -0,0 +1,8 @@ +// Copyright © Amer Koleci and Contributors. +// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. + +namespace Win32.Graphics.DirectWrite; + +public static partial class Apis +{ +} diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite.xml b/src/Vortice.Win32.DirectWrite/DirectWrite.xml similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite.xml rename to src/Vortice.Win32.DirectWrite/DirectWrite.xml diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/Apis.Functions.cs b/src/Vortice.Win32.DirectWrite/Generated/Apis.Functions.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/Apis.Functions.cs rename to src/Vortice.Win32.DirectWrite/Generated/Apis.Functions.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/Apis.cs b/src/Vortice.Win32.DirectWrite/Generated/Apis.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/Apis.cs rename to src/Vortice.Win32.DirectWrite/Generated/Apis.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/AutomaticFontAxes.cs b/src/Vortice.Win32.DirectWrite/Generated/AutomaticFontAxes.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/AutomaticFontAxes.cs rename to src/Vortice.Win32.DirectWrite/Generated/AutomaticFontAxes.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/Baseline.cs b/src/Vortice.Win32.DirectWrite/Generated/Baseline.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/Baseline.cs rename to src/Vortice.Win32.DirectWrite/Generated/Baseline.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/BreakCondition.cs b/src/Vortice.Win32.DirectWrite/Generated/BreakCondition.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/BreakCondition.cs rename to src/Vortice.Win32.DirectWrite/Generated/BreakCondition.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/CaretMetrics.cs b/src/Vortice.Win32.DirectWrite/Generated/CaretMetrics.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/CaretMetrics.cs rename to src/Vortice.Win32.DirectWrite/Generated/CaretMetrics.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/ClusterMetrics.cs b/src/Vortice.Win32.DirectWrite/Generated/ClusterMetrics.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/ClusterMetrics.cs rename to src/Vortice.Win32.DirectWrite/Generated/ClusterMetrics.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/ColorGlyphRun.cs b/src/Vortice.Win32.DirectWrite/Generated/ColorGlyphRun.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/ColorGlyphRun.cs rename to src/Vortice.Win32.DirectWrite/Generated/ColorGlyphRun.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/ColorGlyphRun1.cs b/src/Vortice.Win32.DirectWrite/Generated/ColorGlyphRun1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/ColorGlyphRun1.cs rename to src/Vortice.Win32.DirectWrite/Generated/ColorGlyphRun1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/ContainerType.cs b/src/Vortice.Win32.DirectWrite/Generated/ContainerType.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/ContainerType.cs rename to src/Vortice.Win32.DirectWrite/Generated/ContainerType.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FactoryType.cs b/src/Vortice.Win32.DirectWrite/Generated/FactoryType.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FactoryType.cs rename to src/Vortice.Win32.DirectWrite/Generated/FactoryType.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FileFragment.cs b/src/Vortice.Win32.DirectWrite/Generated/FileFragment.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FileFragment.cs rename to src/Vortice.Win32.DirectWrite/Generated/FileFragment.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FlowDirection.cs b/src/Vortice.Win32.DirectWrite/Generated/FlowDirection.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FlowDirection.cs rename to src/Vortice.Win32.DirectWrite/Generated/FlowDirection.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontAxisAttributes.cs b/src/Vortice.Win32.DirectWrite/Generated/FontAxisAttributes.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontAxisAttributes.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontAxisAttributes.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontAxisRange.cs b/src/Vortice.Win32.DirectWrite/Generated/FontAxisRange.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontAxisRange.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontAxisRange.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontAxisTag.cs b/src/Vortice.Win32.DirectWrite/Generated/FontAxisTag.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontAxisTag.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontAxisTag.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontAxisValue.cs b/src/Vortice.Win32.DirectWrite/Generated/FontAxisValue.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontAxisValue.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontAxisValue.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontFaceType.cs b/src/Vortice.Win32.DirectWrite/Generated/FontFaceType.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontFaceType.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontFaceType.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontFamilyModel.cs b/src/Vortice.Win32.DirectWrite/Generated/FontFamilyModel.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontFamilyModel.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontFamilyModel.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontFeature.cs b/src/Vortice.Win32.DirectWrite/Generated/FontFeature.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontFeature.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontFeature.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontFeatureTag.cs b/src/Vortice.Win32.DirectWrite/Generated/FontFeatureTag.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontFeatureTag.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontFeatureTag.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontFileType.cs b/src/Vortice.Win32.DirectWrite/Generated/FontFileType.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontFileType.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontFileType.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontLineGapUsage.cs b/src/Vortice.Win32.DirectWrite/Generated/FontLineGapUsage.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontLineGapUsage.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontLineGapUsage.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontMetrics.cs b/src/Vortice.Win32.DirectWrite/Generated/FontMetrics.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontMetrics.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontMetrics.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontMetrics1.cs b/src/Vortice.Win32.DirectWrite/Generated/FontMetrics1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontMetrics1.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontMetrics1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontProperty.cs b/src/Vortice.Win32.DirectWrite/Generated/FontProperty.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontProperty.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontProperty.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontPropertyId.cs b/src/Vortice.Win32.DirectWrite/Generated/FontPropertyId.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontPropertyId.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontPropertyId.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontSimulations.cs b/src/Vortice.Win32.DirectWrite/Generated/FontSimulations.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontSimulations.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontSimulations.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontSourceType.cs b/src/Vortice.Win32.DirectWrite/Generated/FontSourceType.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontSourceType.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontSourceType.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontStretch.cs b/src/Vortice.Win32.DirectWrite/Generated/FontStretch.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontStretch.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontStretch.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontStyle.cs b/src/Vortice.Win32.DirectWrite/Generated/FontStyle.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontStyle.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontStyle.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/FontWeight.cs b/src/Vortice.Win32.DirectWrite/Generated/FontWeight.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/FontWeight.cs rename to src/Vortice.Win32.DirectWrite/Generated/FontWeight.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphImageData.cs b/src/Vortice.Win32.DirectWrite/Generated/GlyphImageData.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphImageData.cs rename to src/Vortice.Win32.DirectWrite/Generated/GlyphImageData.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphImageFormats.cs b/src/Vortice.Win32.DirectWrite/Generated/GlyphImageFormats.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphImageFormats.cs rename to src/Vortice.Win32.DirectWrite/Generated/GlyphImageFormats.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphMetrics.cs b/src/Vortice.Win32.DirectWrite/Generated/GlyphMetrics.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphMetrics.cs rename to src/Vortice.Win32.DirectWrite/Generated/GlyphMetrics.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphOffset.cs b/src/Vortice.Win32.DirectWrite/Generated/GlyphOffset.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphOffset.cs rename to src/Vortice.Win32.DirectWrite/Generated/GlyphOffset.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphOrientationAngle.cs b/src/Vortice.Win32.DirectWrite/Generated/GlyphOrientationAngle.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphOrientationAngle.cs rename to src/Vortice.Win32.DirectWrite/Generated/GlyphOrientationAngle.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphRun.cs b/src/Vortice.Win32.DirectWrite/Generated/GlyphRun.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphRun.cs rename to src/Vortice.Win32.DirectWrite/Generated/GlyphRun.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphRunDescription.cs b/src/Vortice.Win32.DirectWrite/Generated/GlyphRunDescription.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/GlyphRunDescription.cs rename to src/Vortice.Win32.DirectWrite/Generated/GlyphRunDescription.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/GridFitMode.cs b/src/Vortice.Win32.DirectWrite/Generated/GridFitMode.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/GridFitMode.cs rename to src/Vortice.Win32.DirectWrite/Generated/GridFitMode.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/HitTestMetrics.cs b/src/Vortice.Win32.DirectWrite/Generated/HitTestMetrics.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/HitTestMetrics.cs rename to src/Vortice.Win32.DirectWrite/Generated/HitTestMetrics.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteAsyncResult.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteAsyncResult.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteAsyncResult.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteAsyncResult.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteBitmapRenderTarget.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteBitmapRenderTarget.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteBitmapRenderTarget.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteBitmapRenderTarget.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteBitmapRenderTarget1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteBitmapRenderTarget1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteBitmapRenderTarget1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteBitmapRenderTarget1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteColorGlyphRunEnumerator.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteColorGlyphRunEnumerator.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteColorGlyphRunEnumerator.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteColorGlyphRunEnumerator.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteColorGlyphRunEnumerator1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteColorGlyphRunEnumerator1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteColorGlyphRunEnumerator1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteColorGlyphRunEnumerator1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory2.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory2.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory2.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory2.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory3.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory3.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory3.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory3.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory4.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory4.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory4.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory4.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory5.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory5.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory5.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory5.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory6.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory6.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory6.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory6.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory7.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory7.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory7.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory7.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFont.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFont.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFont.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFont.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFont1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFont1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFont1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFont1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFont2.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFont2.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFont2.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFont2.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFont3.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFont3.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFont3.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFont3.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollection.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollection.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollection1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollection1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollection2.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection2.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollection2.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection2.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollection3.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection3.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollection3.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection3.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollectionLoader.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollectionLoader.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollectionLoader.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollectionLoader.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontDownloadListener.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontDownloadListener.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontDownloadListener.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontDownloadListener.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontDownloadQueue.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontDownloadQueue.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontDownloadQueue.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontDownloadQueue.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace2.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace2.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace2.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace2.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace3.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace3.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace3.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace3.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace4.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace4.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace4.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace4.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace5.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace5.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace5.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace5.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace6.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace6.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace6.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace6.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFaceReference.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFaceReference.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFaceReference.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFaceReference.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFaceReference1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFaceReference1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFaceReference1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFaceReference1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFallback.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFallback.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFallback.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFallback.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFallback1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFallback1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFallback1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFallback1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFallbackBuilder.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFallbackBuilder.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFallbackBuilder.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFallbackBuilder.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFamily.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFamily.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFamily.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFamily.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFamily1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFamily1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFamily1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFamily1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFamily2.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFamily2.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFamily2.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFamily2.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFile.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFile.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFile.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFile.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFileEnumerator.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFileEnumerator.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFileEnumerator.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFileEnumerator.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFileLoader.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFileLoader.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFileLoader.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFileLoader.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFileStream.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFileStream.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFileStream.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFileStream.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontList.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontList.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontList.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontList.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontList1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontList1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontList1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontList1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontList2.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontList2.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontList2.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontList2.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontResource.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontResource.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontResource.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontResource.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet2.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet2.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet2.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet2.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet3.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet3.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet3.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet3.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSetBuilder.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSetBuilder.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSetBuilder.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSetBuilder.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSetBuilder1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSetBuilder1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSetBuilder1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSetBuilder1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSetBuilder2.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSetBuilder2.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSetBuilder2.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSetBuilder2.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteGdiInterop.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteGdiInterop.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteGdiInterop.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteGdiInterop.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteGdiInterop1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteGdiInterop1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteGdiInterop1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteGdiInterop1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteGlyphRunAnalysis.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteGlyphRunAnalysis.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteGlyphRunAnalysis.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteGlyphRunAnalysis.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteInMemoryFontFileLoader.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteInMemoryFontFileLoader.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteInMemoryFontFileLoader.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteInMemoryFontFileLoader.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteInlineObject.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteInlineObject.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteInlineObject.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteInlineObject.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteLocalFontFileLoader.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteLocalFontFileLoader.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteLocalFontFileLoader.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteLocalFontFileLoader.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteLocalizedStrings.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteLocalizedStrings.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteLocalizedStrings.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteLocalizedStrings.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteNumberSubstitution.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteNumberSubstitution.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteNumberSubstitution.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteNumberSubstitution.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWritePixelSnapping.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWritePixelSnapping.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWritePixelSnapping.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWritePixelSnapping.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteRemoteFontFileLoader.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteRemoteFontFileLoader.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteRemoteFontFileLoader.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteRemoteFontFileLoader.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteRemoteFontFileStream.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteRemoteFontFileStream.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteRemoteFontFileStream.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteRemoteFontFileStream.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteRenderingParams.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteRenderingParams.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteRenderingParams1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteRenderingParams1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteRenderingParams2.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams2.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteRenderingParams2.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams2.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteRenderingParams3.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams3.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteRenderingParams3.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams3.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteStringList.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteStringList.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteStringList.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteStringList.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalysisSink.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSink.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalysisSink.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSink.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalysisSink1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSink1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalysisSink1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSink1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalysisSource.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSource.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalysisSource.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSource.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalysisSource1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSource1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalysisSource1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSource1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalyzer.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalyzer.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalyzer1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalyzer1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer2.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalyzer2.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer2.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalyzer2.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextFormat.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextFormat.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextFormat1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextFormat1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextFormat2.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat2.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextFormat2.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat2.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextFormat3.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat3.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextFormat3.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat3.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextLayout.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextLayout.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextLayout1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextLayout1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextLayout2.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout2.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextLayout2.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout2.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextLayout3.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout3.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextLayout3.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout3.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextLayout4.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout4.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextLayout4.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout4.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextRenderer.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextRenderer.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextRenderer.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextRenderer.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextRenderer1.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextRenderer1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextRenderer1.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTextRenderer1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTypography.cs b/src/Vortice.Win32.DirectWrite/Generated/IDWriteTypography.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTypography.cs rename to src/Vortice.Win32.DirectWrite/Generated/IDWriteTypography.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/InformationalStringId.cs b/src/Vortice.Win32.DirectWrite/Generated/InformationalStringId.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/InformationalStringId.cs rename to src/Vortice.Win32.DirectWrite/Generated/InformationalStringId.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/InlineObjectMetrics.cs b/src/Vortice.Win32.DirectWrite/Generated/InlineObjectMetrics.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/InlineObjectMetrics.cs rename to src/Vortice.Win32.DirectWrite/Generated/InlineObjectMetrics.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/JustificationOpportunity.cs b/src/Vortice.Win32.DirectWrite/Generated/JustificationOpportunity.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/JustificationOpportunity.cs rename to src/Vortice.Win32.DirectWrite/Generated/JustificationOpportunity.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/LineBreakpoint.cs b/src/Vortice.Win32.DirectWrite/Generated/LineBreakpoint.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/LineBreakpoint.cs rename to src/Vortice.Win32.DirectWrite/Generated/LineBreakpoint.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/LineMetrics.cs b/src/Vortice.Win32.DirectWrite/Generated/LineMetrics.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/LineMetrics.cs rename to src/Vortice.Win32.DirectWrite/Generated/LineMetrics.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/LineMetrics1.cs b/src/Vortice.Win32.DirectWrite/Generated/LineMetrics1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/LineMetrics1.cs rename to src/Vortice.Win32.DirectWrite/Generated/LineMetrics1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/LineSpacing.cs b/src/Vortice.Win32.DirectWrite/Generated/LineSpacing.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/LineSpacing.cs rename to src/Vortice.Win32.DirectWrite/Generated/LineSpacing.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/LineSpacingMethod.cs b/src/Vortice.Win32.DirectWrite/Generated/LineSpacingMethod.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/LineSpacingMethod.cs rename to src/Vortice.Win32.DirectWrite/Generated/LineSpacingMethod.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/Locality.cs b/src/Vortice.Win32.DirectWrite/Generated/Locality.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/Locality.cs rename to src/Vortice.Win32.DirectWrite/Generated/Locality.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/MeasuringMode.cs b/src/Vortice.Win32.DirectWrite/Generated/MeasuringMode.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/MeasuringMode.cs rename to src/Vortice.Win32.DirectWrite/Generated/MeasuringMode.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/NumberSubstitutionMethod.cs b/src/Vortice.Win32.DirectWrite/Generated/NumberSubstitutionMethod.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/NumberSubstitutionMethod.cs rename to src/Vortice.Win32.DirectWrite/Generated/NumberSubstitutionMethod.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/OpticalAlignment.cs b/src/Vortice.Win32.DirectWrite/Generated/OpticalAlignment.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/OpticalAlignment.cs rename to src/Vortice.Win32.DirectWrite/Generated/OpticalAlignment.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/OutlineThreshold.cs b/src/Vortice.Win32.DirectWrite/Generated/OutlineThreshold.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/OutlineThreshold.cs rename to src/Vortice.Win32.DirectWrite/Generated/OutlineThreshold.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/OverhangMetrics.cs b/src/Vortice.Win32.DirectWrite/Generated/OverhangMetrics.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/OverhangMetrics.cs rename to src/Vortice.Win32.DirectWrite/Generated/OverhangMetrics.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/Panose.cs b/src/Vortice.Win32.DirectWrite/Generated/Panose.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/Panose.cs rename to src/Vortice.Win32.DirectWrite/Generated/Panose.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseArmStyle.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseArmStyle.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseArmStyle.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseArmStyle.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseAspect.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseAspect.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseAspect.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseAspect.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseAspectRatio.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseAspectRatio.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseAspectRatio.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseAspectRatio.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseCharacterRanges.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseCharacterRanges.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseCharacterRanges.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseCharacterRanges.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseContrast.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseContrast.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseContrast.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseContrast.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseDecorativeClass.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseDecorativeClass.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseDecorativeClass.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseDecorativeClass.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseDecorativeTopology.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseDecorativeTopology.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseDecorativeTopology.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseDecorativeTopology.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseFamily.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseFamily.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseFamily.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseFamily.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseFill.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseFill.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseFill.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseFill.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseFinials.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseFinials.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseFinials.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseFinials.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseLetterform.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseLetterform.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseLetterform.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseLetterform.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseLining.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseLining.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseLining.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseLining.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseMidline.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseMidline.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseMidline.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseMidline.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseProportion.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseProportion.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseProportion.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseProportion.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseScriptForm.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseScriptForm.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseScriptForm.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseScriptForm.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseScriptTopology.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseScriptTopology.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseScriptTopology.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseScriptTopology.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseSerifStyle.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseSerifStyle.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseSerifStyle.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseSerifStyle.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseSpacing.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseSpacing.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseSpacing.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseSpacing.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseStrokeVariation.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseStrokeVariation.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseStrokeVariation.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseStrokeVariation.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseSymbolAspectRatio.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseSymbolAspectRatio.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseSymbolAspectRatio.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseSymbolAspectRatio.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseSymbolKind.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseSymbolKind.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseSymbolKind.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseSymbolKind.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseToolKind.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseToolKind.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseToolKind.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseToolKind.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseWeight.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseWeight.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseWeight.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseWeight.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseXascent.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseXascent.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseXascent.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseXascent.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseXheight.cs b/src/Vortice.Win32.DirectWrite/Generated/PanoseXheight.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PanoseXheight.cs rename to src/Vortice.Win32.DirectWrite/Generated/PanoseXheight.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/ParagraphAlignment.cs b/src/Vortice.Win32.DirectWrite/Generated/ParagraphAlignment.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/ParagraphAlignment.cs rename to src/Vortice.Win32.DirectWrite/Generated/ParagraphAlignment.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/PixelGeometry.cs b/src/Vortice.Win32.DirectWrite/Generated/PixelGeometry.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/PixelGeometry.cs rename to src/Vortice.Win32.DirectWrite/Generated/PixelGeometry.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/ReadingDirection.cs b/src/Vortice.Win32.DirectWrite/Generated/ReadingDirection.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/ReadingDirection.cs rename to src/Vortice.Win32.DirectWrite/Generated/ReadingDirection.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/RenderingMode.cs b/src/Vortice.Win32.DirectWrite/Generated/RenderingMode.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/RenderingMode.cs rename to src/Vortice.Win32.DirectWrite/Generated/RenderingMode.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/RenderingMode1.cs b/src/Vortice.Win32.DirectWrite/Generated/RenderingMode1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/RenderingMode1.cs rename to src/Vortice.Win32.DirectWrite/Generated/RenderingMode1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/ScriptAnalysis.cs b/src/Vortice.Win32.DirectWrite/Generated/ScriptAnalysis.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/ScriptAnalysis.cs rename to src/Vortice.Win32.DirectWrite/Generated/ScriptAnalysis.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/ScriptProperties.cs b/src/Vortice.Win32.DirectWrite/Generated/ScriptProperties.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/ScriptProperties.cs rename to src/Vortice.Win32.DirectWrite/Generated/ScriptProperties.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/ScriptShapes.cs b/src/Vortice.Win32.DirectWrite/Generated/ScriptShapes.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/ScriptShapes.cs rename to src/Vortice.Win32.DirectWrite/Generated/ScriptShapes.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/ShapingGlyphProperties.cs b/src/Vortice.Win32.DirectWrite/Generated/ShapingGlyphProperties.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/ShapingGlyphProperties.cs rename to src/Vortice.Win32.DirectWrite/Generated/ShapingGlyphProperties.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/ShapingTextProperties.cs b/src/Vortice.Win32.DirectWrite/Generated/ShapingTextProperties.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/ShapingTextProperties.cs rename to src/Vortice.Win32.DirectWrite/Generated/ShapingTextProperties.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/Strikethrough.cs b/src/Vortice.Win32.DirectWrite/Generated/Strikethrough.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/Strikethrough.cs rename to src/Vortice.Win32.DirectWrite/Generated/Strikethrough.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/TextAlignment.cs b/src/Vortice.Win32.DirectWrite/Generated/TextAlignment.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/TextAlignment.cs rename to src/Vortice.Win32.DirectWrite/Generated/TextAlignment.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/TextAntialiasMode.cs b/src/Vortice.Win32.DirectWrite/Generated/TextAntialiasMode.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/TextAntialiasMode.cs rename to src/Vortice.Win32.DirectWrite/Generated/TextAntialiasMode.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/TextMetrics.cs b/src/Vortice.Win32.DirectWrite/Generated/TextMetrics.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/TextMetrics.cs rename to src/Vortice.Win32.DirectWrite/Generated/TextMetrics.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/TextMetrics1.cs b/src/Vortice.Win32.DirectWrite/Generated/TextMetrics1.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/TextMetrics1.cs rename to src/Vortice.Win32.DirectWrite/Generated/TextMetrics1.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/TextRange.cs b/src/Vortice.Win32.DirectWrite/Generated/TextRange.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/TextRange.cs rename to src/Vortice.Win32.DirectWrite/Generated/TextRange.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/TextureType.cs b/src/Vortice.Win32.DirectWrite/Generated/TextureType.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/TextureType.cs rename to src/Vortice.Win32.DirectWrite/Generated/TextureType.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/Trimming.cs b/src/Vortice.Win32.DirectWrite/Generated/Trimming.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/Trimming.cs rename to src/Vortice.Win32.DirectWrite/Generated/Trimming.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/TrimmingGranularity.cs b/src/Vortice.Win32.DirectWrite/Generated/TrimmingGranularity.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/TrimmingGranularity.cs rename to src/Vortice.Win32.DirectWrite/Generated/TrimmingGranularity.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/TypographicFeatures.cs b/src/Vortice.Win32.DirectWrite/Generated/TypographicFeatures.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/TypographicFeatures.cs rename to src/Vortice.Win32.DirectWrite/Generated/TypographicFeatures.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/Underline.cs b/src/Vortice.Win32.DirectWrite/Generated/Underline.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/Underline.cs rename to src/Vortice.Win32.DirectWrite/Generated/Underline.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/UnicodeRange.cs b/src/Vortice.Win32.DirectWrite/Generated/UnicodeRange.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/UnicodeRange.cs rename to src/Vortice.Win32.DirectWrite/Generated/UnicodeRange.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/VerticalGlyphOrientation.cs b/src/Vortice.Win32.DirectWrite/Generated/VerticalGlyphOrientation.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/VerticalGlyphOrientation.cs rename to src/Vortice.Win32.DirectWrite/Generated/VerticalGlyphOrientation.cs diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/WordWrapping.cs b/src/Vortice.Win32.DirectWrite/Generated/WordWrapping.cs similarity index 100% rename from src/Vortice.Win32/Generated/Graphics/DirectWrite/WordWrapping.cs rename to src/Vortice.Win32.DirectWrite/Generated/WordWrapping.cs diff --git a/src/Vortice.Win32/Graphics/DirectWrite/IDWriteFactory.cs b/src/Vortice.Win32.DirectWrite/IDWriteFactory.cs similarity index 100% rename from src/Vortice.Win32/Graphics/DirectWrite/IDWriteFactory.cs rename to src/Vortice.Win32.DirectWrite/IDWriteFactory.cs diff --git a/src/Vortice.Win32.DirectWrite/Vortice.Win32.DirectWrite.csproj b/src/Vortice.Win32.DirectWrite/Vortice.Win32.DirectWrite.csproj new file mode 100644 index 0000000..3835b40 --- /dev/null +++ b/src/Vortice.Win32.DirectWrite/Vortice.Win32.DirectWrite.csproj @@ -0,0 +1,24 @@ + + + + netstandard2.0;netstandard2.1;net6.0;net7.0 + DirectWrite bindings. + + true + 0419;$(NoWarn) + + + + + + + + + + + + + + + + diff --git a/src/Vortice.Win32/Com/Variant.cs b/src/Vortice.Win32/Com/Variant.cs index 588b832..753373d 100644 --- a/src/Vortice.Win32/Com/Variant.cs +++ b/src/Vortice.Win32/Com/Variant.cs @@ -11,9 +11,9 @@ namespace Win32.Com; public unsafe partial struct Variant { private VariantFullType vt; - private ushort reserved1; - private ushort reserved2; - private ushort reserved3; + private readonly ushort reserved1; + private readonly ushort reserved2; + private readonly ushort reserved3; private VariantValue variantValue; /// diff --git a/src/Vortice.Win32/Generated/Graphics/Dxc.xml b/src/Vortice.Win32/Generated/Graphics/Dxc.xml deleted file mode 100644 index 442da29..0000000 --- a/src/Vortice.Win32/Generated/Graphics/Dxc.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/Vortice.Win32/Properties/AssemblyInfo.cs b/src/Vortice.Win32/Properties/AssemblyInfo.cs index fc78b8a..67bcffb 100644 --- a/src/Vortice.Win32/Properties/AssemblyInfo.cs +++ b/src/Vortice.Win32/Properties/AssemblyInfo.cs @@ -4,4 +4,5 @@ [assembly: InternalsVisibleTo("Vortice.Win32.Direct3D12")] [assembly: InternalsVisibleTo("Vortice.Win32.Direct3D11on12")] [assembly: InternalsVisibleTo("Vortice.Win32.Direct2D")] +[assembly: InternalsVisibleTo("Vortice.Win32.DirectWrite")] [assembly: InternalsVisibleTo("Vortice.Win32.Dxc")] diff --git a/src/samples/01-ClearScreen/01-ClearScreen.csproj b/src/samples/01-ClearScreen/01-ClearScreen.csproj index 7d6450d..ea066e9 100644 --- a/src/samples/01-ClearScreen/01-ClearScreen.csproj +++ b/src/samples/01-ClearScreen/01-ClearScreen.csproj @@ -12,6 +12,7 @@ +