From 13e7ac082ec799bee6331986bae2e75699780bbd Mon Sep 17 00:00:00 2001 From: Amer Koleci Date: Mon, 1 Jul 2024 16:16:53 +0200 Subject: [PATCH] Update bindings to use char* instead of ushort*, separated Dxc native packages to Vortice.Dxc.Native, bump version to 2.2.1 --- .github/workflows/build.yml | 2 +- Directory.Build.props | 13 +- Directory.Build.targets | 22 +-- Vortice.Win32.sln | 6 + samples/01-ClearScreen/01-ClearScreen.csproj | 9 +- src/Generator/Program.cs | 13 +- src/Vortice.Dxc.Native/LICENCE-MIT.txt | 21 +++ src/Vortice.Dxc.Native/LICENSE-LLVM.txt | 43 +++++ src/Vortice.Dxc.Native/LICENSE-MS.txt | 158 ++++++++++++++++++ .../Vortice.Dxc.Native.csproj | 29 ++++ src/Vortice.Dxc.Native/_._ | 0 .../build/net461/Vortice.Dxc.Native.targets | 22 +++ .../linux-x64/native/libdxcompiler.so | Bin .../runtimes/linux-x64/native/libdxil.so | Bin .../runtimes/win-arm64/native/dxcompiler.dll | Bin .../runtimes/win-arm64/native/dxil.dll | Bin .../runtimes/win-x64/native/dxcompiler.dll | Bin .../runtimes/win-x64/native/dxil.dll | Bin .../Graphics.Direct2D.Apis.Functions.cs | 52 +++--- .../Generated/Graphics.Direct2D.Structs.cs | 2 +- .../Generated/ID2D1DeviceContext.cs | 6 +- .../Generated/ID2D1DeviceContext1.cs | 4 +- .../Generated/ID2D1DeviceContext2.cs | 4 +- .../Generated/ID2D1DeviceContext3.cs | 4 +- .../Generated/ID2D1DeviceContext4.cs | 4 +- .../Generated/ID2D1DeviceContext5.cs | 4 +- .../Generated/ID2D1DeviceContext6.cs | 4 +- .../Generated/ID2D1DeviceContext7.cs | 4 +- .../Generated/ID2D1Effect.cs | 16 +- .../Generated/ID2D1EffectContext.cs | 6 +- .../Generated/ID2D1EffectContext1.cs | 4 +- .../Generated/ID2D1EffectContext2.cs | 4 +- .../Generated/ID2D1Factory1.cs | 6 +- .../Generated/ID2D1Factory2.cs | 4 +- .../Generated/ID2D1Factory3.cs | 4 +- .../Generated/ID2D1Factory4.cs | 4 +- .../Generated/ID2D1Factory5.cs | 4 +- .../Generated/ID2D1Factory6.cs | 4 +- .../Generated/ID2D1Factory7.cs | 4 +- .../Generated/ID2D1Factory8.cs | 4 +- .../Generated/ID2D1Properties.cs | 24 +-- .../Generated/ID2D1SvgDocument.cs | 12 +- .../Generated/ID2D1SvgElement.cs | 78 ++++----- .../Generated/ID2D1SvgPaint.cs | 12 +- .../Generated/IWICImagingFactory2.cs | 4 +- .../ID2D1Properties.cs | 12 +- .../Graphics.Direct3D.Dxc.Apis.Functions.cs | 8 +- .../Graphics.Direct3D.Dxc.Structs.cs | 8 +- .../Generated/IDxcBlobUtf16.cs | 7 +- .../Generated/IDxcCompiler.cs | 12 +- .../Generated/IDxcCompiler2.cs | 14 +- .../Generated/IDxcCompiler3.cs | 6 +- .../Generated/IDxcCompilerArgs.cs | 12 +- .../Generated/IDxcIncludeHandler.cs | 6 +- .../Generated/IDxcLibrary.cs | 6 +- .../Generated/IDxcLinker.cs | 12 +- .../Generated/IDxcOptimizer.cs | 6 +- .../Generated/IDxcOptimizerPass.cs | 24 +-- .../Generated/IDxcPdbUtils.cs | 6 +- .../Generated/IDxcUtils.cs | 12 +- ...Vortice.Win32.Graphics.Direct3D.Dxc.csproj | 4 - .../Graphics.Direct3D.Fxc.Apis.Functions.cs | 84 +++++----- .../Graphics.Direct3D11.Apis.Functions.cs | 8 +- .../Generated/ID3D11Device1.cs | 6 +- .../Generated/ID3D11Device2.cs | 4 +- .../Generated/ID3D11Device3.cs | 4 +- .../Generated/ID3D11Device4.cs | 4 +- .../Generated/ID3D11Device5.cs | 4 +- .../Generated/ID3D11DeviceContext2.cs | 12 +- .../Generated/ID3D11DeviceContext3.cs | 8 +- .../Generated/ID3D11DeviceContext4.cs | 8 +- .../Generated/ID3D11Fence.cs | 6 +- .../Generated/ID3DUserDefinedAnnotation.cs | 12 +- .../ID3DUserDefinedAnnotation.cs | 8 +- .../Graphics.Direct3D11on12.Apis.Functions.cs | 4 +- src/Vortice.Win32.Graphics.Direct3D12/Apis.cs | 2 +- .../BarrierGroup.Manual.cs | 2 +- .../BarrierSubresourceRange.Manual.cs | 2 +- .../BlendDescription.cs | 2 +- src/Vortice.Win32.Graphics.Direct3D12/Box.cs | 2 +- .../ClearValue.cs | 2 +- .../CommandQueueDescription.cs | 2 +- .../CpuDescriptorHandle.cs | 2 +- .../DepthStencilDescription.cs | 2 +- .../DepthStencilDescription1.cs | 2 +- .../DepthStencilOperationDescription.cs | 2 +- .../DepthStencilValue.cs | 2 +- .../DepthStencilViewDescription.cs | 2 +- .../DescriptorRange.cs | 2 +- .../DescriptorRange1.cs | 2 +- .../Graphics.Direct3D12.Apis.Functions.cs | 32 ++-- .../Generated/Graphics.Direct3D12.Structs.cs | 46 ++--- .../Generated/ID3D12CommandAllocator.cs | 4 +- .../Generated/ID3D12CommandList.cs | 4 +- .../Generated/ID3D12CommandQueue.cs | 4 +- .../Generated/ID3D12CommandSignature.cs | 4 +- .../Generated/ID3D12DescriptorHeap.cs | 4 +- .../Generated/ID3D12Device.cs | 16 +- .../Generated/ID3D12Device1.cs | 12 +- .../Generated/ID3D12Device10.cs | 12 +- .../Generated/ID3D12Device11.cs | 12 +- .../Generated/ID3D12Device12.cs | 12 +- .../Generated/ID3D12Device13.cs | 12 +- .../Generated/ID3D12Device14.cs | 18 +- .../Generated/ID3D12Device2.cs | 12 +- .../Generated/ID3D12Device3.cs | 12 +- .../Generated/ID3D12Device4.cs | 12 +- .../Generated/ID3D12Device5.cs | 12 +- .../Generated/ID3D12Device6.cs | 12 +- .../Generated/ID3D12Device7.cs | 12 +- .../Generated/ID3D12Device8.cs | 12 +- .../Generated/ID3D12Device9.cs | 12 +- .../Generated/ID3D12DeviceChild.cs | 4 +- .../Generated/ID3D12DeviceConfiguration1.cs | 6 +- .../Generated/ID3D12Fence.cs | 4 +- .../Generated/ID3D12Fence1.cs | 4 +- .../Generated/ID3D12GraphicsCommandList.cs | 4 +- .../Generated/ID3D12GraphicsCommandList1.cs | 4 +- .../Generated/ID3D12GraphicsCommandList10.cs | 4 +- .../Generated/ID3D12GraphicsCommandList2.cs | 4 +- .../Generated/ID3D12GraphicsCommandList3.cs | 4 +- .../Generated/ID3D12GraphicsCommandList4.cs | 4 +- .../Generated/ID3D12GraphicsCommandList5.cs | 4 +- .../Generated/ID3D12GraphicsCommandList6.cs | 4 +- .../Generated/ID3D12GraphicsCommandList7.cs | 4 +- .../Generated/ID3D12GraphicsCommandList8.cs | 4 +- .../Generated/ID3D12GraphicsCommandList9.cs | 4 +- .../Generated/ID3D12Heap.cs | 4 +- .../Generated/ID3D12Heap1.cs | 4 +- .../Generated/ID3D12LifetimeTracker.cs | 4 +- .../Generated/ID3D12MetaCommand.cs | 4 +- .../Generated/ID3D12Object.cs | 6 +- .../Generated/ID3D12Pageable.cs | 4 +- .../Generated/ID3D12PipelineLibrary.cs | 22 +-- .../Generated/ID3D12PipelineLibrary1.cs | 22 +-- .../Generated/ID3D12PipelineState.cs | 4 +- .../ID3D12ProtectedResourceSession.cs | 4 +- .../ID3D12ProtectedResourceSession1.cs | 4 +- .../Generated/ID3D12ProtectedSession.cs | 4 +- .../Generated/ID3D12QueryHeap.cs | 4 +- .../Generated/ID3D12Resource.cs | 4 +- .../Generated/ID3D12Resource1.cs | 4 +- .../Generated/ID3D12Resource2.cs | 4 +- .../Generated/ID3D12RootSignature.cs | 4 +- .../Generated/ID3D12ShaderCacheSession.cs | 4 +- .../Generated/ID3D12StateObject.cs | 4 +- .../Generated/ID3D12StateObjectProperties.cs | 12 +- .../Generated/ID3D12StateObjectProperties1.cs | 14 +- .../Generated/ID3D12WorkGraphProperties.cs | 13 +- .../GpuDescriptorHandle.cs | 2 +- .../HeapDescription.cs | 2 +- .../HeapProperties.cs | 2 +- .../ID3D12Device.cs | 2 +- .../ID3D12GraphicsCommandList.cs | 2 +- .../ID3D12Object.cs | 6 +- .../IndexBufferView.cs | 2 +- .../MeshShaderPipelineStateDescription.cs | 2 +- .../MipRegion.cs | 2 +- .../QueryHeapDescription.Manual.cs | 2 +- .../Range.cs | 2 +- .../RangeUInt64.cs | 2 +- .../RasterizerDescription.cs | 2 +- .../RenderPassBeginningAccess.cs | 2 +- ...enderPassBeginningAccessClearParameters.cs | 2 +- .../RenderPassDepthStencilDescription.cs | 2 +- .../RenderPassEndingAccess.cs | 2 +- ...RenderPassEndingAccessResolveParameters.cs | 2 +- .../RenderPassRenderTargetDescription.cs | 2 +- .../RenderTargetViewDescription.cs | 2 +- .../ResourceBarrier.cs | 2 +- .../ResourceDescription.cs | 2 +- .../ResourceDescription1.cs | 2 +- .../RootConstants.cs | 2 +- .../RootDescriptor.cs | 2 +- .../RootDescriptor1.cs | 2 +- .../RootDescriptorTable.cs | 2 +- .../RootDescriptorTable1.cs | 2 +- .../RootParameter1.cs | 2 +- .../RootSignatureDescription.cs | 2 +- .../RootSignatureDescription1.cs | 2 +- .../SamplerDescription.cs | 2 +- .../ShaderBytecode.cs | 2 +- .../StaticSamplerDescription.cs | 2 +- .../StaticSamplerDescription1.cs | 110 ++++++++++++ .../SubresourceFootprint.cs | 2 +- .../SubresourceRangeUInt64.cs | 2 +- .../TextureCopyLocation.cs | 2 +- .../VersionedRootSignatureDescription.cs | 2 +- .../VertexBufferView.cs | 2 +- ...aphics.DirectComposition.Apis.Functions.cs | 44 ++--- .../Graphics.DirectWrite.Apis.Functions.cs | 4 +- .../Generated/Graphics.DirectWrite.Structs.cs | 12 +- .../Generated/IDWriteFactory.cs | 18 +- .../Generated/IDWriteFactory1.cs | 12 +- .../Generated/IDWriteFactory2.cs | 12 +- .../Generated/IDWriteFactory3.cs | 18 +- .../Generated/IDWriteFactory4.cs | 16 +- .../Generated/IDWriteFactory5.cs | 22 +-- .../Generated/IDWriteFactory6.cs | 26 +-- .../Generated/IDWriteFactory7.cs | 24 +-- .../Generated/IDWriteFactory8.cs | 24 +-- .../Generated/IDWriteFontCollection.cs | 6 +- .../Generated/IDWriteFontCollection1.cs | 4 +- .../Generated/IDWriteFontCollection2.cs | 10 +- .../Generated/IDWriteFontCollection3.cs | 8 +- .../Generated/IDWriteFontFallback.cs | 6 +- .../Generated/IDWriteFontFallback1.cs | 10 +- .../Generated/IDWriteFontFallbackBuilder.cs | 6 +- .../Generated/IDWriteFontSet.cs | 12 +- .../Generated/IDWriteFontSet1.cs | 8 +- .../Generated/IDWriteFontSet2.cs | 8 +- .../Generated/IDWriteFontSet3.cs | 14 +- .../Generated/IDWriteFontSet4.cs | 18 +- .../Generated/IDWriteFontSetBuilder2.cs | 6 +- .../Generated/IDWriteLocalFontFileLoader.cs | 6 +- .../Generated/IDWriteLocalizedStrings.cs | 18 +- .../Generated/IDWriteRemoteFontFileLoader.cs | 6 +- .../Generated/IDWriteStringList.cs | 12 +- .../Generated/IDWriteTextAnalyzer.cs | 18 +- .../Generated/IDWriteTextAnalyzer1.cs | 18 +- .../Generated/IDWriteTextAnalyzer2.cs | 28 ++-- .../Generated/IDWriteTextFormat.cs | 12 +- .../Generated/IDWriteTextFormat1.cs | 8 +- .../Generated/IDWriteTextFormat2.cs | 8 +- .../Generated/IDWriteTextFormat3.cs | 8 +- .../Generated/IDWriteTextLayout.cs | 32 ++-- .../Generated/IDWriteTextLayout1.cs | 24 +-- .../Generated/IDWriteTextLayout2.cs | 24 +-- .../Generated/IDWriteTextLayout3.cs | 24 +-- .../Generated/IDWriteTextLayout4.cs | 24 +-- .../IDWriteFactory.cs | 10 +- .../Generated/Graphics.Dxgi.Apis.Functions.cs | 24 +-- .../Generated/IDXGIResource1.cs | 6 +- .../Graphics.Imaging.Apis.Functions.cs | 36 ++-- .../Generated/IWICBitmapCodecInfo.cs | 52 +++--- .../Generated/IWICBitmapDecoderInfo.cs | 40 ++--- .../Generated/IWICBitmapEncoderInfo.cs | 40 ++--- .../Generated/IWICColorContext.cs | 6 +- .../Generated/IWICComponentFactory.cs | 4 +- .../Generated/IWICComponentInfo.cs | 24 +-- .../Generated/IWICFormatConverterInfo.cs | 16 +- .../Generated/IWICImagingFactory.cs | 6 +- .../Generated/IWICMetadataHandlerInfo.cs | 28 ++-- .../Generated/IWICMetadataQueryReader.cs | 12 +- .../Generated/IWICMetadataQueryWriter.cs | 20 +-- .../Generated/IWICMetadataReaderInfo.cs | 24 +-- .../Generated/IWICMetadataWriterInfo.cs | 24 +-- .../Generated/IWICPixelFormatInfo.cs | 16 +- .../Generated/IWICPixelFormatInfo2.cs | 16 +- .../Generated/IWICStream.cs | 6 +- .../IWICImagingFactory.cs | 2 +- .../Generated/IXAudio2.cs | 6 +- .../Media.Audio.XAudio2.Apis.Functions.cs | 20 +-- .../X3DAudio/Apis.cs | 11 +- 254 files changed, 1568 insertions(+), 1171 deletions(-) create mode 100644 src/Vortice.Dxc.Native/LICENCE-MIT.txt create mode 100644 src/Vortice.Dxc.Native/LICENSE-LLVM.txt create mode 100644 src/Vortice.Dxc.Native/LICENSE-MS.txt create mode 100644 src/Vortice.Dxc.Native/Vortice.Dxc.Native.csproj create mode 100644 src/Vortice.Dxc.Native/_._ create mode 100644 src/Vortice.Dxc.Native/build/net461/Vortice.Dxc.Native.targets rename src/{Vortice.Win32.Graphics.Direct3D.Dxc => Vortice.Dxc.Native}/runtimes/linux-x64/native/libdxcompiler.so (100%) rename src/{Vortice.Win32.Graphics.Direct3D.Dxc => Vortice.Dxc.Native}/runtimes/linux-x64/native/libdxil.so (100%) rename src/{Vortice.Win32.Graphics.Direct3D.Dxc => Vortice.Dxc.Native}/runtimes/win-arm64/native/dxcompiler.dll (100%) rename src/{Vortice.Win32.Graphics.Direct3D.Dxc => Vortice.Dxc.Native}/runtimes/win-arm64/native/dxil.dll (100%) rename src/{Vortice.Win32.Graphics.Direct3D.Dxc => Vortice.Dxc.Native}/runtimes/win-x64/native/dxcompiler.dll (100%) rename src/{Vortice.Win32.Graphics.Direct3D.Dxc => Vortice.Dxc.Native}/runtimes/win-x64/native/dxil.dll (100%) create mode 100644 src/Vortice.Win32.Graphics.Direct3D12/StaticSamplerDescription1.cs diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b33c35d..5002453 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: global-json-file: ./global.json - name: Pack - run: dotnet pack Vortice.Win32.sln --configuration Release --output artifacts + run: dotnet pack Vortice.Win32.sln --configuration Release - name: Publish to NuGet if: github.event_name == 'push' diff --git a/Directory.Build.props b/Directory.Build.props index 32d8f3e..342e49e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,9 @@ + + $(MSBuildThisFileDirectory) + $(MSBuildThisFileDirectory)src/ + + https://github.com/amerkoleci/Vortice.Win32 git @@ -6,7 +11,7 @@ - 2.2.0 + 2.2.1 @@ -18,11 +23,8 @@ false embedded strict - true $(MSBuildThisFileDirectory)NuGet.config - true - - + true true $(NoWarn);AD0001;CS1591;CS1701;CA2252; @@ -38,6 +40,7 @@ MIT true $(RepositoryUrl) + $(MSBuildThisFileDirectory)artifacts/ diff --git a/Directory.Build.targets b/Directory.Build.targets index 92f345e..b0f0ea8 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,18 +1,20 @@ + + + + - - - true - - + + + + <_Parameter1>false + + + - true - true - true - true - true + true diff --git a/Vortice.Win32.sln b/Vortice.Win32.sln index 668e4e5..13f79ef 100644 --- a/Vortice.Win32.sln +++ b/Vortice.Win32.sln @@ -46,6 +46,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Dire EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Media.Audio.XAudio2", "src\Vortice.Win32.Media.Audio.XAudio2\Vortice.Win32.Media.Audio.XAudio2.csproj", "{6458F6C9-12ED-407E-A91D-9F155362E8E9}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Dxc.Native", "src\Vortice.Dxc.Native\Vortice.Dxc.Native.csproj", "{3C579D3B-8239-4707-B906-253181EF52B4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -108,6 +110,10 @@ Global {6458F6C9-12ED-407E-A91D-9F155362E8E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {6458F6C9-12ED-407E-A91D-9F155362E8E9}.Release|Any CPU.ActiveCfg = Release|Any CPU {6458F6C9-12ED-407E-A91D-9F155362E8E9}.Release|Any CPU.Build.0 = Release|Any CPU + {3C579D3B-8239-4707-B906-253181EF52B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3C579D3B-8239-4707-B906-253181EF52B4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C579D3B-8239-4707-B906-253181EF52B4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3C579D3B-8239-4707-B906-253181EF52B4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/01-ClearScreen/01-ClearScreen.csproj b/samples/01-ClearScreen/01-ClearScreen.csproj index e076672..21d51da 100644 --- a/samples/01-ClearScreen/01-ClearScreen.csproj +++ b/samples/01-ClearScreen/01-ClearScreen.csproj @@ -5,6 +5,7 @@ true false ClearScreen + true @@ -21,14 +22,14 @@ - - + + - - + + diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs index a4aeefb..16c657a 100644 --- a/src/Generator/Program.cs +++ b/src/Generator/Program.cs @@ -66,7 +66,7 @@ public static class Program { "Foundation.LRESULT", "nint" }, { "Foundation.WPARAM", "nuint" }, { "Foundation.PSTR", "sbyte*" }, - { "Foundation.PWSTR", "ushort*" }, + { "Foundation.PWSTR", "char*" }, { "Foundation.CHAR", "byte" }, { "Foundation.COLORREF", "uint" }, @@ -1843,14 +1843,14 @@ public static class Program if (string.IsNullOrEmpty(function.DllImport) == false) { - functionSuffix = "static extern "; + functionSuffix = "static partial "; string dllImport = function.DllImport; if (dllImport == "XAudio2_8.dll") { dllImport = "xaudio2_9"; } - writer.WriteLine($"[DllImport(\"{dllImport}\", ExactSpelling = true)]"); + writer.WriteLine($"[LibraryImport(\"{dllImport}\")]"); } StringBuilder argumentBuilder = new(); @@ -2399,14 +2399,14 @@ public static class Program Dictionary> methodsToGenerate) { string csTypeName = comType.Name; - List namespaces = new(); + List namespaces = []; if (comType.Name == "ID2D1GeometrySink") { namespaces.Add("Win32.Graphics.Direct2D.Common"); } - using var writer = new CodeWriter( + using CodeWriter writer = new( Path.Combine(folder, $"{csTypeName}.cs"), apiName, docFileName, @@ -2523,7 +2523,7 @@ public static class Program vtblIndex = 8; bool needNewLine = false; - List> interfaceMethods = new(); + List> interfaceMethods = []; foreach (KeyValuePair> methodPair in methodsToGenerate) { string docName = methodPair.Key; @@ -3365,6 +3365,7 @@ public static class Program case "ulong": case "float": case "double": + case "char": return true; case "nint": diff --git a/src/Vortice.Dxc.Native/LICENCE-MIT.txt b/src/Vortice.Dxc.Native/LICENCE-MIT.txt new file mode 100644 index 0000000..63447fd --- /dev/null +++ b/src/Vortice.Dxc.Native/LICENCE-MIT.txt @@ -0,0 +1,21 @@ +Copyright (c) Microsoft Corporation. + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/src/Vortice.Dxc.Native/LICENSE-LLVM.txt b/src/Vortice.Dxc.Native/LICENSE-LLVM.txt new file mode 100644 index 0000000..d2edb2f --- /dev/null +++ b/src/Vortice.Dxc.Native/LICENSE-LLVM.txt @@ -0,0 +1,43 @@ +============================================================================== +LLVM Release License +============================================================================== +University of Illinois/NCSA +Open Source License + +Copyright (c) 2003-2015 University of Illinois at Urbana-Champaign. +All rights reserved. + +Developed by: + + LLVM Team + + University of Illinois at Urbana-Champaign + + http://llvm.org + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal with +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + + * Neither the names of the LLVM Team, University of Illinois at + Urbana-Champaign, nor the names of its contributors may be used to + endorse or promote products derived from this Software without specific + prior written permission. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE +SOFTWARE. diff --git a/src/Vortice.Dxc.Native/LICENSE-MS.txt b/src/Vortice.Dxc.Native/LICENSE-MS.txt new file mode 100644 index 0000000..6c9c3c6 --- /dev/null +++ b/src/Vortice.Dxc.Native/LICENSE-MS.txt @@ -0,0 +1,158 @@ +MICROSOFT SOFTWARE LICENSE TERMS + +MICROSOFT DIRECTX SHADER COMPILER + +These license terms are an agreement between you and Microsoft +Corporation (or one of its affiliates). They apply to the software named +above and any Microsoft services or software updates (except to the +extent such services or updates are accompanied by new or additional +terms, in which case those different terms apply prospectively and do +not alter your or Microsoft’s rights relating to pre-updated software or +services). IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS +BELOW. BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. + +INSTALLATION AND USE RIGHTS. + +General. Subject to the terms of this agreement, you may install and use any number of copies of the software, and solely for use on Windows. + +Included Microsoft Applications. The software may include other Microsoft applications. These license terms apply to those included applications, if any, unless other license terms are provided with the other Microsoft applications. + +Microsoft Platforms. The software may include components from Microsoft Windows. These components are governed by separate agreements and their own product support policies, as described in the license terms found in the installation directory for that component or in the “Licenses” folder accompanying the software. + +Third Party Components. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. + +DATA. + +Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products and services. You may opt-out of many of these scenarios, but not all, as described in the product documentation.  There are also some features in the software that may enable you to collect data from users of your applications. If you use these features to enable data collection in your applications, you must comply with applicable law, including providing appropriate notices to users of your applications. You can learn more about data collection and use in the help documentation and the privacy statement at https://aka.ms/privacy. Your use of the software operates as your consent to these practices. + +Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection Regulation Terms of the Online Services Terms to all customers effective May 25, 2018, at https://docs.microsoft.com/en-us/legal/gdpr. + +DISTRIBUTABLE CODE. The software may contain code you are permitted to distribute (i.e. make available for third parties) in applications you develop, as described in this Section. + +Distribution Rights. The code and test files described below are distributable if included with the software. + +Distributables. You may copy and distribute the object code form of the software listed in the distributables file list in the software; and + +Third Party Distribution. You may permit distributors of your applications to copy and distribute any of this distributable code you elect to distribute with your applications. + +Distribution Requirements. For any code you distribute, you must: + +add significant primary functionality to it in your applications; + +i. require distributors and external end users to agree to terms that protect it and Microsoft at least as much as this agreement; and + +ii. indemnify, defend, and hold harmless Microsoft from any claims, including attorneys’ fees, related to the distribution or use of your applications, except to the extent that any claim is based solely on the unmodified distributable code. + +Distribution Restrictions. You may not: + +use Microsoft’s trademarks or trade dress in your application in any way that suggests your application comes from or is endorsed by Microsoft; or modify or distribute the source code of any distributable code so that any part of it becomes subject to any license that requires that the distributable code, any other part of the software, or any of Microsoft’s other intellectual property be disclosed or distributed in source code form, or that others have the right to modify it. + +SCOPE OF LICENSE. The software is licensed, not sold. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you will not (and have no right to): + +work around any technical limitations in the software that only allow you to use it in certain ways; + +reverse engineer, decompile or disassemble the software, or otherwise attempt to derive the source code for the software, except and to the extent required by third party licensing terms governing use of certain open source components that may be included in the software; + +remove, minimize, block, or modify any notices of Microsoft or its suppliers in the software; + +use the software in any way that is against the law or to create or propagate malware; or + +share, publish, distribute, or lease the software (except for any distributable code, subject to the terms above), provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. + +EXPORT RESTRICTIONS. You must comply with all domestic and international export laws and regulations that apply to the software, which include restrictions on destinations, end users, and end use. For further information on export restrictions, visit https://aka.ms/exporting. + +SUPPORT SERVICES. Microsoft is not obligated under this agreement to provide any support services for the software. Any support provided is “as is”, “with all faults”, and without warranty of any kind. + +UPDATES. The software may periodically check for updates, and download and install them for you. You may obtain updates only from Microsoft or authorized sources. Microsoft may need to update your system to provide you with updates. You agree to receive these automatic updates without any additional notice. Updates may not include or support all existing software features, services, or peripheral devices. + +ENTIRE AGREEMENT. This agreement, and any other terms Microsoft may provide for supplements, updates, or third-party applications, is the entire agreement for the software. + +APPLICABLE LAW AND PLACE TO RESOLVE DISPUTES. If you acquired the software in the United States or Canada, the laws of the state or province where you live (or, if a business, where your principal place of business is located) govern the interpretation of this agreement, claims for its breach, and all other claims (including consumer protection, unfair competition, and tort claims), regardless of conflict of laws principles. If you acquired the software in any other country, its laws apply. If U.S. federal jurisdiction exists, you and Microsoft consent to exclusive jurisdiction and venue in the federal court in King County, Washington for all disputes heard in court. If not, you and Microsoft consent to exclusive jurisdiction and venue in the Superior Court of King County, Washington for all disputes heard in court. + +CONSUMER RIGHTS; REGIONAL VARIATIONS. This agreement describes certain legal rights. You may have other rights, including consumer rights, under the laws of your state or country. Separate and apart from your relationship with Microsoft, you may also have rights with respect to the party from which you acquired the software. This agreement does not change those other rights if the laws of your state or country do not permit it to do so. For example, if you acquired the software in one of the below regions, or mandatory country law applies, then the following provisions apply to you: + +a. Australia. You have statutory guarantees under the Australian + Consumer Law and nothing in this agreement is intended to affect + those rights. + +b. Canada. If you acquired this software in Canada, you may stop + receiving updates by turning off the automatic update feature, + disconnecting your device from the Internet (if and when you + re-connect to the Internet, however, the software will resume + checking for and installing updates), or uninstalling the software. + The product documentation, if any, may also specify how to turn off + updates for your specific device or software. + +c. Germany and Austria. + + i. Warranty. The properly licensed software will perform substantially + as described in any Microsoft materials that accompany the software. + However, Microsoft gives no contractual guarantee in relation to the + licensed software. + + ii. Limitation of Liability. In case of intentional conduct, gross + negligence, claims based on the Product Liability Act, as well as, in + case of death or personal or physical injury, Microsoft is liable + according to the statutory law. + +Subject to the foregoing clause ii., Microsoft will only be liable for slight negligence if Microsoft is in breach of such material contractual obligations, the fulfillment of which facilitate the due performance of this agreement, the breach of which would endanger the purpose of this agreement and the compliance with which a party may constantly trust in (so-called "cardinal obligations"). In other cases of slight negligence, Microsoft will not be liable for slight negligence. + +DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS IS.” YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES, OR CONDITIONS. TO THE EXTENT PERMITTED UNDER APPLICABLE LAWS, MICROSOFT EXCLUDES ALL IMPLIED WARRANTIES, INCLUDING MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. + +LIMITATION ON AND EXCLUSION OF DAMAGES. IF YOU HAVE ANY BASIS FOR RECOVERING DAMAGES DESPITE THE PRECEDING DISCLAIMER OF WARRANTY, YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT, OR INCIDENTAL DAMAGES. + +This limitation applies to (a) anything related to the software, +services, content (including code) on third party Internet sites, or +third party applications; and (b) claims for breach of contract, +warranty, guarantee, or condition; strict liability, negligence, or +other tort; or any other claim; in each case to the extent permitted by +applicable law. + +It also applies even if Microsoft knew or should have known about the +possibility of the damages. The above limitation or exclusion may not +apply to you because your state, province, or country may not allow the +exclusion or limitation of incidental, consequential, or other damages. + +Please note: As this software is distributed in Canada, some of the +clauses in this agreement are provided below in French. + +Remarque: Ce logiciel étant distribué au Canada, certaines des clauses +dans ce contrat sont fournies ci-dessous en français. + +EXONÉRATION DE GARANTIE. Le logiciel visé par une licence est offert « +tel quel ». Toute utilisation de ce logiciel est à votre seule risque et +péril. Microsoft n’accorde aucune autre garantie expresse. Vous pouvez +bénéficier de droits additionnels en vertu du droit local sur la +protection des consommateurs, que ce contrat ne peut modifier. La ou +elles sont permises par le droit locale, les garanties implicites de +qualité marchande, d’adéquation à un usage particulier et d’absence de +contrefaçon sont exclues. + +LIMITATION DES DOMMAGES-INTÉRÊTS ET EXCLUSION DE RESPONSABILITÉ POUR LES +DOMMAGES. Vous pouvez obtenir de Microsoft et de ses fournisseurs une +indemnisation en cas de dommages directs uniquement à hauteur de 5,00 $ +US. Vous ne pouvez prétendre à aucune indemnisation pour les autres +dommages, y compris les dommages spéciaux, indirects ou accessoires et +pertes de bénéfices. + +Cette limitation concerne: + +• tout ce qui est relié au logiciel, aux services ou au contenu (y +compris le code) figurant sur des sites Internet tiers ou dans des +programmes tiers; et + +• les réclamations au titre de violation de contrat ou de garantie, ou +au titre de responsabilité stricte, de négligence ou d’une autre faute +dans la limite autorisée par la loi en vigueur. + +Elle s’applique également, même si Microsoft connaissait ou devrait +connaître l’éventualité d’un tel dommage. Si votre pays n’autorise pas +l’exclusion ou la limitation de responsabilité pour les dommages +indirects, accessoires ou de quelque nature que ce soit, il se peut que +la limitation ou l’exclusion ci-dessus ne s’appliquera pas à votre +égard. + +EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. +Vous pourriez avoir d’autres droits prévus par les lois de votre pays. +Le présent contrat ne modifie pas les droits que vous confèrent les lois +de votre pays si celles-ci ne le permettent pas. diff --git a/src/Vortice.Dxc.Native/Vortice.Dxc.Native.csproj b/src/Vortice.Dxc.Native/Vortice.Dxc.Native.csproj new file mode 100644 index 0000000..e15ee2a --- /dev/null +++ b/src/Vortice.Dxc.Native/Vortice.Dxc.Native.csproj @@ -0,0 +1,29 @@ + + + + netstandard2.0;net4.6.1;net8.0 + Dxc native libraries + 1.0.0 + false + true + + LICENSE-MS.txt + https://github.com/microsoft/DirectXShaderCompiler + README.md + + + + + + + + + + + + + + + + + diff --git a/src/Vortice.Dxc.Native/_._ b/src/Vortice.Dxc.Native/_._ new file mode 100644 index 0000000..e69de29 diff --git a/src/Vortice.Dxc.Native/build/net461/Vortice.Dxc.Native.targets b/src/Vortice.Dxc.Native/build/net461/Vortice.Dxc.Native.targets new file mode 100644 index 0000000..a074b3b --- /dev/null +++ b/src/Vortice.Dxc.Native/build/net461/Vortice.Dxc.Native.targets @@ -0,0 +1,22 @@ + + + + <_Vortice_Dxc_Native_IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true + <_Vortice_Dxc_Native_NativeRuntime Condition=" '$(_Vortice_Dxc_Native_NativeRuntime)' == '' And '$(_Vortice_Dxc_Native_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'true' Or '$(PlatformTarget)' == 'x86')">win-x86 + <_Vortice_Dxc_Native_NativeRuntime Condition=" '$(_Vortice_Dxc_Native_NativeRuntime)' == '' And '$(_Vortice_Dxc_Native_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">win-x64 + <_Vortice_Dxc_Native_NativeRuntime Condition=" '$(_Vortice_Dxc_Native_NativeRuntime)' == '' And '$(_Vortice_Dxc_Native_IsWindows)' == 'true' And '$(PlatformTarget)' == 'ARM'">win-arm + <_Vortice_Dxc_Native_NativeRuntime Condition=" '$(_Vortice_Dxc_Native_NativeRuntime)' == '' And '$(_Vortice_Dxc_Native_IsWindows)' == 'true' And '$(PlatformTarget)' == 'ARM64'">win-arm64 + + + + %(Filename)%(Extension) + Always + False + + + %(Filename)%(Extension) + Always + False + + + diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/runtimes/linux-x64/native/libdxcompiler.so b/src/Vortice.Dxc.Native/runtimes/linux-x64/native/libdxcompiler.so similarity index 100% rename from src/Vortice.Win32.Graphics.Direct3D.Dxc/runtimes/linux-x64/native/libdxcompiler.so rename to src/Vortice.Dxc.Native/runtimes/linux-x64/native/libdxcompiler.so diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/runtimes/linux-x64/native/libdxil.so b/src/Vortice.Dxc.Native/runtimes/linux-x64/native/libdxil.so similarity index 100% rename from src/Vortice.Win32.Graphics.Direct3D.Dxc/runtimes/linux-x64/native/libdxil.so rename to src/Vortice.Dxc.Native/runtimes/linux-x64/native/libdxil.so diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/runtimes/win-arm64/native/dxcompiler.dll b/src/Vortice.Dxc.Native/runtimes/win-arm64/native/dxcompiler.dll similarity index 100% rename from src/Vortice.Win32.Graphics.Direct3D.Dxc/runtimes/win-arm64/native/dxcompiler.dll rename to src/Vortice.Dxc.Native/runtimes/win-arm64/native/dxcompiler.dll diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/runtimes/win-arm64/native/dxil.dll b/src/Vortice.Dxc.Native/runtimes/win-arm64/native/dxil.dll similarity index 100% rename from src/Vortice.Win32.Graphics.Direct3D.Dxc/runtimes/win-arm64/native/dxil.dll rename to src/Vortice.Dxc.Native/runtimes/win-arm64/native/dxil.dll diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/runtimes/win-x64/native/dxcompiler.dll b/src/Vortice.Dxc.Native/runtimes/win-x64/native/dxcompiler.dll similarity index 100% rename from src/Vortice.Win32.Graphics.Direct3D.Dxc/runtimes/win-x64/native/dxcompiler.dll rename to src/Vortice.Dxc.Native/runtimes/win-x64/native/dxcompiler.dll diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/runtimes/win-x64/native/dxil.dll b/src/Vortice.Dxc.Native/runtimes/win-x64/native/dxil.dll similarity index 100% rename from src/Vortice.Win32.Graphics.Direct3D.Dxc/runtimes/win-x64/native/dxil.dll rename to src/Vortice.Dxc.Native/runtimes/win-x64/native/dxil.dll diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/Graphics.Direct2D.Apis.Functions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Graphics.Direct2D.Apis.Functions.cs index 7ae78cc..286753e 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/Graphics.Direct2D.Apis.Functions.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/Graphics.Direct2D.Apis.Functions.cs @@ -12,54 +12,54 @@ namespace Win32.Graphics.Direct2D; public static unsafe partial class Apis { /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern HResult D2D1CreateFactory(FactoryType factoryType, Guid* riid, FactoryOptions* pFactoryOptions, void** ppIFactory); + [LibraryImport("d2d1.dll")] + public static partial HResult D2D1CreateFactory(FactoryType factoryType, Guid* riid, FactoryOptions* pFactoryOptions, void** ppIFactory); /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern void D2D1MakeRotateMatrix(float angle, Vector2 center, Matrix3x2* matrix); + [LibraryImport("d2d1.dll")] + public static partial void D2D1MakeRotateMatrix(float angle, Vector2 center, Matrix3x2* matrix); /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern void D2D1MakeSkewMatrix(float angleX, float angleY, Vector2 center, Matrix3x2* matrix); + [LibraryImport("d2d1.dll")] + public static partial void D2D1MakeSkewMatrix(float angleX, float angleY, Vector2 center, Matrix3x2* matrix); /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern Bool32 D2D1IsMatrixInvertible(Matrix3x2* matrix); + [LibraryImport("d2d1.dll")] + public static partial Bool32 D2D1IsMatrixInvertible(Matrix3x2* matrix); /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern Bool32 D2D1InvertMatrix(Matrix3x2* matrix); + [LibraryImport("d2d1.dll")] + public static partial Bool32 D2D1InvertMatrix(Matrix3x2* matrix); /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern HResult D2D1CreateDevice(Graphics.Dxgi.IDXGIDevice* dxgiDevice, CreationProperties* creationProperties, ID2D1Device** d2dDevice); + [LibraryImport("d2d1.dll")] + public static partial HResult D2D1CreateDevice(Graphics.Dxgi.IDXGIDevice* dxgiDevice, CreationProperties* creationProperties, ID2D1Device** d2dDevice); /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern HResult D2D1CreateDeviceContext(Graphics.Dxgi.IDXGISurface* dxgiSurface, CreationProperties* creationProperties, ID2D1DeviceContext** d2dDeviceContext); + [LibraryImport("d2d1.dll")] + public static partial HResult D2D1CreateDeviceContext(Graphics.Dxgi.IDXGISurface* dxgiSurface, CreationProperties* creationProperties, ID2D1DeviceContext** d2dDeviceContext); /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern Color4 D2D1ConvertColorSpace(ColorSpace sourceColorSpace, ColorSpace destinationColorSpace, Color4* color); + [LibraryImport("d2d1.dll")] + public static partial Color4 D2D1ConvertColorSpace(ColorSpace sourceColorSpace, ColorSpace destinationColorSpace, Color4* color); /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern void D2D1SinCos(float angle, float* s, float* c); + [LibraryImport("d2d1.dll")] + public static partial void D2D1SinCos(float angle, float* s, float* c); /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern float D2D1Tan(float angle); + [LibraryImport("d2d1.dll")] + public static partial float D2D1Tan(float angle); /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern float D2D1Vec3Length(float x, float y, float z); + [LibraryImport("d2d1.dll")] + public static partial float D2D1Vec3Length(float x, float y, float z); /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern float D2D1ComputeMaximumScaleFactor(Matrix3x2* matrix); + [LibraryImport("d2d1.dll")] + public static partial float D2D1ComputeMaximumScaleFactor(Matrix3x2* matrix); /// - [DllImport("d2d1.dll", ExactSpelling = true)] - public static extern void D2D1GetGradientMeshInteriorPointsFromCoonsPatch(Vector2* pPoint0, Vector2* pPoint1, Vector2* pPoint2, Vector2* pPoint3, Vector2* pPoint4, Vector2* pPoint5, Vector2* pPoint6, Vector2* pPoint7, Vector2* pPoint8, Vector2* pPoint9, Vector2* pPoint10, Vector2* pPoint11, Vector2* pTensorPoint11, Vector2* pTensorPoint12, Vector2* pTensorPoint21, Vector2* pTensorPoint22); + [LibraryImport("d2d1.dll")] + public static partial void D2D1GetGradientMeshInteriorPointsFromCoonsPatch(Vector2* pPoint0, Vector2* pPoint1, Vector2* pPoint2, Vector2* pPoint3, Vector2* pPoint4, Vector2* pPoint5, Vector2* pPoint6, Vector2* pPoint7, Vector2* pPoint8, Vector2* pPoint9, Vector2* pPoint10, Vector2* pPoint11, Vector2* pTensorPoint11, Vector2* pTensorPoint12, Vector2* pTensorPoint21, Vector2* pTensorPoint22); } diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/Graphics.Direct2D.Structs.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Graphics.Direct2D.Structs.cs index 404258d..e0878b3 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/Graphics.Direct2D.Structs.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/Graphics.Direct2D.Structs.cs @@ -487,7 +487,7 @@ public partial struct CreationProperties public partial struct PropertyBinding { /// - public unsafe ushort* propertyName; + public unsafe char* propertyName; /// public unsafe delegate* unmanaged[Stdcall] setFunction; diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext.cs index ec9db4b..279c09b 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext.cs @@ -532,9 +532,9 @@ public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext) + public HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), filename, colorContext); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), filename, colorContext); } /// @@ -797,7 +797,7 @@ public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface, HResult CreateColorContext(ColorSpace space, byte* profile, uint profileSize, ID2D1ColorContext** colorContext); [VtblIndex(60)] - HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext); + HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext); [VtblIndex(61)] HResult CreateColorContextFromWicColorContext(Graphics.Imaging.IWICColorContext* wicColorContext, ID2D1ColorContext** colorContext); diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext1.cs index 0570b13..d919efe 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext1.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext1.cs @@ -532,9 +532,9 @@ public unsafe partial struct ID2D1DeviceContext1 : ID2D1DeviceContext1.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext) + public HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), filename, colorContext); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), filename, colorContext); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext2.cs index f001046..7227abb 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext2.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext2.cs @@ -532,9 +532,9 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext) + public HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), filename, colorContext); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), filename, colorContext); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext3.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext3.cs index 76cab15..1b12db7 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext3.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext3.cs @@ -532,9 +532,9 @@ public unsafe partial struct ID2D1DeviceContext3 : ID2D1DeviceContext3.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext) + public HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), filename, colorContext); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), filename, colorContext); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext4.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext4.cs index f329203..96e277f 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext4.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext4.cs @@ -532,9 +532,9 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext) + public HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), filename, colorContext); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), filename, colorContext); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext5.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext5.cs index 65d5055..6fe9245 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext5.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext5.cs @@ -532,9 +532,9 @@ public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext) + public HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), filename, colorContext); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), filename, colorContext); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext6.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext6.cs index 291e59d..303464f 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext6.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext6.cs @@ -532,9 +532,9 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext) + public HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), filename, colorContext); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), filename, colorContext); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext7.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext7.cs index 2b8d74c..6efee4c 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext7.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext7.cs @@ -532,9 +532,9 @@ public unsafe partial struct ID2D1DeviceContext7 : ID2D1DeviceContext7.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext) + public HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext7*)Unsafe.AsPointer(ref this), filename, colorContext); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[60]))((ID2D1DeviceContext7*)Unsafe.AsPointer(ref this), filename, colorContext); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Effect.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Effect.cs index e9a297c..a130d52 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Effect.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Effect.cs @@ -81,9 +81,9 @@ public unsafe partial struct ID2D1Effect : ID2D1Effect.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public HResult GetPropertyName(uint index, char** name, uint nameCount) + public HResult GetPropertyName(uint index, char* name, uint nameCount) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((ID2D1Effect*)Unsafe.AsPointer(ref this), index, name, nameCount); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((ID2D1Effect*)Unsafe.AsPointer(ref this), index, name, nameCount); } /// @@ -105,17 +105,17 @@ public unsafe partial struct ID2D1Effect : ID2D1Effect.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public uint GetPropertyIndex(ushort* name) + public uint GetPropertyIndex(char* name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((ID2D1Effect*)Unsafe.AsPointer(ref this), name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((ID2D1Effect*)Unsafe.AsPointer(ref this), name); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult SetValueByName(ushort* name, PropertyType type, byte* data, uint dataSize) + public HResult SetValueByName(char* name, PropertyType type, byte* data, uint dataSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((ID2D1Effect*)Unsafe.AsPointer(ref this), name, type, data, dataSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((ID2D1Effect*)Unsafe.AsPointer(ref this), name, type, data, dataSize); } /// @@ -129,9 +129,9 @@ public unsafe partial struct ID2D1Effect : ID2D1Effect.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetValueByName(ushort* name, PropertyType type, byte* data, uint dataSize) + public HResult GetValueByName(char* name, PropertyType type, byte* data, uint dataSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((ID2D1Effect*)Unsafe.AsPointer(ref this), name, type, data, dataSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((ID2D1Effect*)Unsafe.AsPointer(ref this), name, type, data, dataSize); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext.cs index 11a5674..ba34bc5 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext.cs @@ -209,9 +209,9 @@ public unsafe partial struct ID2D1EffectContext : ID2D1EffectContext.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(20)] - public HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext) + public HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[20]))((ID2D1EffectContext*)Unsafe.AsPointer(ref this), filename, colorContext); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[20]))((ID2D1EffectContext*)Unsafe.AsPointer(ref this), filename, colorContext); } /// @@ -292,7 +292,7 @@ public unsafe partial struct ID2D1EffectContext : ID2D1EffectContext.Interface, HResult CreateColorContext(ColorSpace space, byte* profile, uint profileSize, ID2D1ColorContext** colorContext); [VtblIndex(20)] - HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext); + HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext); [VtblIndex(21)] HResult CreateColorContextFromWicColorContext(Graphics.Imaging.IWICColorContext* wicColorContext, ID2D1ColorContext** colorContext); diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext1.cs index 6b503bd..5807000 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext1.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext1.cs @@ -209,9 +209,9 @@ public unsafe partial struct ID2D1EffectContext1 : ID2D1EffectContext1.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(20)] - public HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext) + public HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[20]))((ID2D1EffectContext1*)Unsafe.AsPointer(ref this), filename, colorContext); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[20]))((ID2D1EffectContext1*)Unsafe.AsPointer(ref this), filename, colorContext); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext2.cs index 84d4470..6a0cb1a 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext2.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext2.cs @@ -209,9 +209,9 @@ public unsafe partial struct ID2D1EffectContext2 : ID2D1EffectContext2.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(20)] - public HResult CreateColorContextFromFilename(ushort* filename, ID2D1ColorContext** colorContext) + public HResult CreateColorContextFromFilename(char* filename, ID2D1ColorContext** colorContext) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[20]))((ID2D1EffectContext2*)Unsafe.AsPointer(ref this), filename, colorContext); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[20]))((ID2D1EffectContext2*)Unsafe.AsPointer(ref this), filename, colorContext); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory1.cs index bc5e8b6..4ab3ed7 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory1.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory1.cs @@ -233,9 +233,9 @@ public unsafe partial struct ID2D1Factory1 : ID2D1Factory1.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(23)] - public HResult RegisterEffectFromString(Guid* classId, ushort* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) + public HResult RegisterEffectFromString(Guid* classId, char* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) { - return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory1*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); + return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory1*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); } /// @@ -283,7 +283,7 @@ public unsafe partial struct ID2D1Factory1 : ID2D1Factory1.Interface, INativeGui HResult RegisterEffectFromStream(Guid* classId, Com.IStream* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory); [VtblIndex(23)] - HResult RegisterEffectFromString(Guid* classId, ushort* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory); + HResult RegisterEffectFromString(Guid* classId, char* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory); [VtblIndex(24)] HResult UnregisterEffect(Guid* classId); diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory2.cs index 23e8a81..07ceb66 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory2.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory2.cs @@ -233,9 +233,9 @@ public unsafe partial struct ID2D1Factory2 : ID2D1Factory2.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(23)] - public HResult RegisterEffectFromString(Guid* classId, ushort* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) + public HResult RegisterEffectFromString(Guid* classId, char* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) { - return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory2*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); + return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory2*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory3.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory3.cs index 6596fe0..b38af63 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory3.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory3.cs @@ -233,9 +233,9 @@ public unsafe partial struct ID2D1Factory3 : ID2D1Factory3.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(23)] - public HResult RegisterEffectFromString(Guid* classId, ushort* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) + public HResult RegisterEffectFromString(Guid* classId, char* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) { - return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory3*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); + return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory3*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory4.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory4.cs index 5e75df8..c2fa8fc 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory4.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory4.cs @@ -233,9 +233,9 @@ public unsafe partial struct ID2D1Factory4 : ID2D1Factory4.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(23)] - public HResult RegisterEffectFromString(Guid* classId, ushort* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) + public HResult RegisterEffectFromString(Guid* classId, char* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) { - return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory4*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); + return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory4*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory5.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory5.cs index 94a48d4..0f41c82 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory5.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory5.cs @@ -233,9 +233,9 @@ public unsafe partial struct ID2D1Factory5 : ID2D1Factory5.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(23)] - public HResult RegisterEffectFromString(Guid* classId, ushort* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) + public HResult RegisterEffectFromString(Guid* classId, char* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) { - return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory5*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); + return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory5*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory6.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory6.cs index 80f1983..dd48a15 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory6.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory6.cs @@ -233,9 +233,9 @@ public unsafe partial struct ID2D1Factory6 : ID2D1Factory6.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(23)] - public HResult RegisterEffectFromString(Guid* classId, ushort* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) + public HResult RegisterEffectFromString(Guid* classId, char* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) { - return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory6*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); + return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory6*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory7.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory7.cs index 14ef6ed..8b131e5 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory7.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory7.cs @@ -233,9 +233,9 @@ public unsafe partial struct ID2D1Factory7 : ID2D1Factory7.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(23)] - public HResult RegisterEffectFromString(Guid* classId, ushort* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) + public HResult RegisterEffectFromString(Guid* classId, char* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) { - return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory7*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); + return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory7*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory8.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory8.cs index a2b4b44..2261553 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory8.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory8.cs @@ -233,9 +233,9 @@ public unsafe partial struct ID2D1Factory8 : ID2D1Factory8.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(23)] - public HResult RegisterEffectFromString(Guid* classId, ushort* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) + public HResult RegisterEffectFromString(Guid* classId, char* propertyXml, PropertyBinding* bindings, uint bindingsCount, delegate* unmanaged[Stdcall] effectFactory) { - return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory8*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); + return ((delegate* unmanaged[MemberFunction], int>)(lpVtbl[23]))((ID2D1Factory8*)Unsafe.AsPointer(ref this), classId, propertyXml, bindings, bindingsCount, effectFactory); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Properties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Properties.cs index 97f023b..03211eb 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Properties.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Properties.cs @@ -81,9 +81,9 @@ public unsafe partial struct ID2D1Properties : ID2D1Properties.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public HResult GetPropertyName(uint index, char** name, uint nameCount) + public HResult GetPropertyName(uint index, char* name, uint nameCount) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((ID2D1Properties*)Unsafe.AsPointer(ref this), index, name, nameCount); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((ID2D1Properties*)Unsafe.AsPointer(ref this), index, name, nameCount); } /// @@ -105,17 +105,17 @@ public unsafe partial struct ID2D1Properties : ID2D1Properties.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public uint GetPropertyIndex(ushort* name) + public uint GetPropertyIndex(char* name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((ID2D1Properties*)Unsafe.AsPointer(ref this), name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((ID2D1Properties*)Unsafe.AsPointer(ref this), name); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult SetValueByName(ushort* name, PropertyType type, byte* data, uint dataSize) + public HResult SetValueByName(char* name, PropertyType type, byte* data, uint dataSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((ID2D1Properties*)Unsafe.AsPointer(ref this), name, type, data, dataSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((ID2D1Properties*)Unsafe.AsPointer(ref this), name, type, data, dataSize); } /// @@ -129,9 +129,9 @@ public unsafe partial struct ID2D1Properties : ID2D1Properties.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetValueByName(ushort* name, PropertyType type, byte* data, uint dataSize) + public HResult GetValueByName(char* name, PropertyType type, byte* data, uint dataSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((ID2D1Properties*)Unsafe.AsPointer(ref this), name, type, data, dataSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((ID2D1Properties*)Unsafe.AsPointer(ref this), name, type, data, dataSize); } /// @@ -164,7 +164,7 @@ public unsafe partial struct ID2D1Properties : ID2D1Properties.Interface, INativ uint GetPropertyCount(); [VtblIndex(4)] - HResult GetPropertyName(uint index, char** name, uint nameCount); + HResult GetPropertyName(uint index, char* name, uint nameCount); [VtblIndex(5)] uint GetPropertyNameLength(uint index); @@ -173,16 +173,16 @@ public unsafe partial struct ID2D1Properties : ID2D1Properties.Interface, INativ PropertyType GetType(uint index); [VtblIndex(7)] - uint GetPropertyIndex(ushort* name); + uint GetPropertyIndex(char* name); [VtblIndex(8)] - HResult SetValueByName(ushort* name, PropertyType type, byte* data, uint dataSize); + HResult SetValueByName(char* 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); + HResult GetValueByName(char* name, PropertyType type, byte* data, uint dataSize); [VtblIndex(11)] HResult GetValue(uint index, PropertyType type, byte* data, uint dataSize); diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgDocument.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgDocument.cs index cb7fa72..2209d9f 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgDocument.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgDocument.cs @@ -114,9 +114,9 @@ public unsafe partial struct ID2D1SvgDocument : ID2D1SvgDocument.Interface, INat /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult FindElementById(ushort* id, ID2D1SvgElement** svgElement) + public HResult FindElementById(char* id, ID2D1SvgElement** svgElement) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((ID2D1SvgDocument*)Unsafe.AsPointer(ref this), id, svgElement); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((ID2D1SvgDocument*)Unsafe.AsPointer(ref this), id, svgElement); } /// @@ -138,9 +138,9 @@ public unsafe partial struct ID2D1SvgDocument : ID2D1SvgDocument.Interface, INat /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(11)] - public HResult CreatePaint(SvgPaintType paintType, Color4* color, ushort* id, ID2D1SvgPaint** paint) + public HResult CreatePaint(SvgPaintType paintType, Color4* color, char* id, ID2D1SvgPaint** paint) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((ID2D1SvgDocument*)Unsafe.AsPointer(ref this), paintType, color, id, paint); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((ID2D1SvgDocument*)Unsafe.AsPointer(ref this), paintType, color, id, paint); } /// @@ -182,7 +182,7 @@ public unsafe partial struct ID2D1SvgDocument : ID2D1SvgDocument.Interface, INat void GetRoot(ID2D1SvgElement** root); [VtblIndex(8)] - HResult FindElementById(ushort* id, ID2D1SvgElement** svgElement); + HResult FindElementById(char* id, ID2D1SvgElement** svgElement); [VtblIndex(9)] HResult Serialize(Com.IStream* outputXmlStream, ID2D1SvgElement* subtree); @@ -191,7 +191,7 @@ public unsafe partial struct ID2D1SvgDocument : ID2D1SvgDocument.Interface, INat HResult Deserialize(Com.IStream* inputXmlStream, ID2D1SvgElement** subtree); [VtblIndex(11)] - HResult CreatePaint(SvgPaintType paintType, Color4* color, ushort* id, ID2D1SvgPaint** paint); + HResult CreatePaint(SvgPaintType paintType, Color4* color, char* id, ID2D1SvgPaint** paint); [VtblIndex(12)] HResult CreateStrokeDashArray(SvgLength* dashes, uint dashesCount, ID2D1SvgStrokeDashArray** strokeDashArray); diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgElement.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgElement.cs index 821e1d5..5486e76 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgElement.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgElement.cs @@ -89,9 +89,9 @@ public unsafe partial struct ID2D1SvgElement : ID2D1SvgElement.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult GetTagName(char** name, uint nameCount) + public HResult GetTagName(char* name, uint nameCount) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, nameCount); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, nameCount); } /// @@ -193,17 +193,17 @@ public unsafe partial struct ID2D1SvgElement : ID2D1SvgElement.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(18)] - public HResult CreateChild(ushort* tagName, ID2D1SvgElement** newChild) + public HResult CreateChild(char* tagName, ID2D1SvgElement** newChild) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[18]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), tagName, newChild); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[18]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), tagName, newChild); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(19)] - public Bool32 IsAttributeSpecified(ushort* name, Bool32* inherited) + public Bool32 IsAttributeSpecified(char* name, Bool32* inherited) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[19]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, inherited); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[19]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, inherited); } /// @@ -217,9 +217,9 @@ public unsafe partial struct ID2D1SvgElement : ID2D1SvgElement.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(21)] - public HResult GetSpecifiedAttributeName(uint index, char** name, uint nameCount, Bool32* inherited) + public HResult GetSpecifiedAttributeName(uint index, char* name, uint nameCount, Bool32* inherited) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), index, name, nameCount, inherited); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), index, name, nameCount, inherited); } /// @@ -233,9 +233,9 @@ public unsafe partial struct ID2D1SvgElement : ID2D1SvgElement.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(23)] - public HResult RemoveAttribute(ushort* name) + public HResult RemoveAttribute(char* name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[23]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[23]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name); } /// @@ -249,9 +249,9 @@ public unsafe partial struct ID2D1SvgElement : ID2D1SvgElement.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(25)] - public HResult GetTextValue(char** name, uint nameCount) + public HResult GetTextValue(char* name, uint nameCount) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[25]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, nameCount); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[25]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, nameCount); } /// @@ -265,57 +265,57 @@ public unsafe partial struct ID2D1SvgElement : ID2D1SvgElement.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(27)] - public HResult SetAttributeValue(ushort* name, ID2D1SvgAttribute* value) + public HResult SetAttributeValue(char* name, ID2D1SvgAttribute* value) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, value); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, value); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(28)] - public HResult SetAttributeValue(ushort* name, SvgAttributePodType type, void* value, uint valueSizeInBytes) + public HResult SetAttributeValue(char* name, SvgAttributePodType type, void* value, uint valueSizeInBytes) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[28]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, type, value, valueSizeInBytes); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[28]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, type, value, valueSizeInBytes); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(29)] - public HResult SetAttributeValue(ushort* name, SvgAttributeStringType type, ushort* value) + public HResult SetAttributeValue(char* name, SvgAttributeStringType type, char* value) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[29]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, type, value); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[29]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, type, value); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(30)] - public HResult GetAttributeValue(ushort* name, Guid* riid, void** value) + public HResult GetAttributeValue(char* name, Guid* riid, void** value) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[30]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, riid, value); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[30]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, riid, value); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult GetAttributeValue(ushort* name, SvgAttributePodType type, void* value, uint valueSizeInBytes) + public HResult GetAttributeValue(char* name, SvgAttributePodType type, void* value, uint valueSizeInBytes) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, type, value, valueSizeInBytes); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, type, value, valueSizeInBytes); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(32)] - public HResult GetAttributeValue(ushort* name, SvgAttributeStringType type, char** value, uint valueCount) + public HResult GetAttributeValue(char* name, SvgAttributeStringType type, char* value, uint valueCount) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[32]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, type, value, valueCount); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[32]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, type, value, valueCount); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult GetAttributeValueLength(ushort* name, SvgAttributeStringType type, uint* valueLength) + public HResult GetAttributeValueLength(char* name, SvgAttributeStringType type, uint* valueLength) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, type, valueLength); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID2D1SvgElement*)Unsafe.AsPointer(ref this), name, type, valueLength); } public interface Interface : ID2D1Resource.Interface @@ -324,7 +324,7 @@ public unsafe partial struct ID2D1SvgElement : ID2D1SvgElement.Interface, INativ void GetDocument(ID2D1SvgDocument** document); [VtblIndex(5)] - HResult GetTagName(char** name, uint nameCount); + HResult GetTagName(char* name, uint nameCount); [VtblIndex(6)] uint GetTagNameLength(); @@ -363,52 +363,52 @@ public unsafe partial struct ID2D1SvgElement : ID2D1SvgElement.Interface, INativ HResult RemoveChild(ID2D1SvgElement* oldChild); [VtblIndex(18)] - HResult CreateChild(ushort* tagName, ID2D1SvgElement** newChild); + HResult CreateChild(char* tagName, ID2D1SvgElement** newChild); [VtblIndex(19)] - Bool32 IsAttributeSpecified(ushort* name, Bool32* inherited); + Bool32 IsAttributeSpecified(char* name, Bool32* inherited); [VtblIndex(20)] uint GetSpecifiedAttributeCount(); [VtblIndex(21)] - HResult GetSpecifiedAttributeName(uint index, char** name, uint nameCount, Bool32* inherited); + HResult GetSpecifiedAttributeName(uint index, char* name, uint nameCount, Bool32* inherited); [VtblIndex(22)] HResult GetSpecifiedAttributeNameLength(uint index, uint* nameLength, Bool32* inherited); [VtblIndex(23)] - HResult RemoveAttribute(ushort* name); + HResult RemoveAttribute(char* name); [VtblIndex(24)] HResult SetTextValue(char* name, uint nameCount); [VtblIndex(25)] - HResult GetTextValue(char** name, uint nameCount); + HResult GetTextValue(char* name, uint nameCount); [VtblIndex(26)] uint GetTextValueLength(); [VtblIndex(27)] - HResult SetAttributeValue(ushort* name, ID2D1SvgAttribute* value); + HResult SetAttributeValue(char* name, ID2D1SvgAttribute* value); [VtblIndex(28)] - HResult SetAttributeValue(ushort* name, SvgAttributePodType type, void* value, uint valueSizeInBytes); + HResult SetAttributeValue(char* name, SvgAttributePodType type, void* value, uint valueSizeInBytes); [VtblIndex(29)] - HResult SetAttributeValue(ushort* name, SvgAttributeStringType type, ushort* value); + HResult SetAttributeValue(char* name, SvgAttributeStringType type, char* value); [VtblIndex(30)] - HResult GetAttributeValue(ushort* name, Guid* riid, void** value); + HResult GetAttributeValue(char* name, Guid* riid, void** value); [VtblIndex(31)] - HResult GetAttributeValue(ushort* name, SvgAttributePodType type, void* value, uint valueSizeInBytes); + HResult GetAttributeValue(char* name, SvgAttributePodType type, void* value, uint valueSizeInBytes); [VtblIndex(32)] - HResult GetAttributeValue(ushort* name, SvgAttributeStringType type, char** value, uint valueCount); + HResult GetAttributeValue(char* name, SvgAttributeStringType type, char* value, uint valueCount); [VtblIndex(33)] - HResult GetAttributeValueLength(ushort* name, SvgAttributeStringType type, uint* valueLength); + HResult GetAttributeValueLength(char* name, SvgAttributeStringType type, uint* valueLength); } } diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgPaint.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgPaint.cs index 66898bc..e834e7e 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgPaint.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgPaint.cs @@ -129,17 +129,17 @@ public unsafe partial struct ID2D1SvgPaint : ID2D1SvgPaint.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult SetId(ushort* id) + public HResult SetId(char* id) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((ID2D1SvgPaint*)Unsafe.AsPointer(ref this), id); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((ID2D1SvgPaint*)Unsafe.AsPointer(ref this), id); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(11)] - public HResult GetId(char** id, uint idCount) + public HResult GetId(char* id, uint idCount) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((ID2D1SvgPaint*)Unsafe.AsPointer(ref this), id, idCount); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((ID2D1SvgPaint*)Unsafe.AsPointer(ref this), id, idCount); } /// @@ -165,10 +165,10 @@ public unsafe partial struct ID2D1SvgPaint : ID2D1SvgPaint.Interface, INativeGui void GetColor(Color4** color); [VtblIndex(10)] - HResult SetId(ushort* id); + HResult SetId(char* id); [VtblIndex(11)] - HResult GetId(char** id, uint idCount); + HResult GetId(char* id, uint idCount); [VtblIndex(12)] uint GetIdLength(); diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs index 14d50f4..a4ae512 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs @@ -73,9 +73,9 @@ public unsafe partial struct IWICImagingFactory2 : IWICImagingFactory2.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult CreateDecoderFromFilename(ushort* wzFilename, Guid* pguidVendor, NativeFileAccess dwDesiredAccess, Graphics.Imaging.WICDecodeOptions metadataOptions, Graphics.Imaging.IWICBitmapDecoder** ppIDecoder) + public HResult CreateDecoderFromFilename(char* wzFilename, Guid* pguidVendor, NativeFileAccess dwDesiredAccess, Graphics.Imaging.WICDecodeOptions metadataOptions, Graphics.Imaging.IWICBitmapDecoder** ppIDecoder) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IWICImagingFactory2*)Unsafe.AsPointer(ref this), wzFilename, pguidVendor, dwDesiredAccess, metadataOptions, ppIDecoder); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IWICImagingFactory2*)Unsafe.AsPointer(ref this), wzFilename, pguidVendor, dwDesiredAccess, metadataOptions, ppIDecoder); } /// diff --git a/src/Vortice.Win32.Graphics.Direct2D/ID2D1Properties.cs b/src/Vortice.Win32.Graphics.Direct2D/ID2D1Properties.cs index e4ff291..42e9299 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/ID2D1Properties.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/ID2D1Properties.cs @@ -24,7 +24,7 @@ public static unsafe partial class ID2D1PropertiesExtensions { fixed (T* dataPtr = data) { - return self.SetValueByName((ushort*)namePtr, PropertyType.Unknown, (byte*)dataPtr, (uint)(data.Length * sizeof(T))); + return self.SetValueByName(namePtr, PropertyType.Unknown, (byte*)dataPtr, (uint)(data.Length * sizeof(T))); } } } @@ -34,11 +34,11 @@ public static unsafe partial class ID2D1PropertiesExtensions { fixed (char* namePtr = name) { - return self.SetValueByName((ushort*)namePtr, PropertyType.Unknown, data, dataSize); + return self.SetValueByName(namePtr, PropertyType.Unknown, data, dataSize); } } - public static HResult SetValueByName(ref this TD2D1Properties self, ushort* name, byte* data, uint dataSize) + public static HResult SetValueByName(ref this TD2D1Properties self, char* name, byte* data, uint dataSize) where TD2D1Properties : unmanaged, ID2D1Properties.Interface { return self.SetValueByName(name, PropertyType.Unknown, data, dataSize); @@ -49,7 +49,7 @@ public static unsafe partial class ID2D1PropertiesExtensions { fixed (char* namePtr = name) { - return self.GetValueByName((ushort*)namePtr, PropertyType.Unknown, data, dataSize); + return self.GetValueByName(namePtr, PropertyType.Unknown, data, dataSize); } } @@ -61,12 +61,12 @@ public static unsafe partial class ID2D1PropertiesExtensions { fixed (T* dataPtr = data) { - return self.GetValueByName((ushort*)namePtr, PropertyType.Unknown, (byte*)dataPtr, (uint)(data.Length * sizeof(T))); + return self.GetValueByName(namePtr, PropertyType.Unknown, (byte*)dataPtr, (uint)(data.Length * sizeof(T))); } } } - public static HResult GetValueByName(ref this TD2D1Properties self, ushort* name, byte* data, uint dataSize) + public static HResult GetValueByName(ref this TD2D1Properties self, char* name, byte* data, uint dataSize) where TD2D1Properties : unmanaged, ID2D1Properties.Interface { return self.GetValueByName(name, PropertyType.Unknown, data, dataSize); diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/Graphics.Direct3D.Dxc.Apis.Functions.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/Graphics.Direct3D.Dxc.Apis.Functions.cs index 1f60f53..6fb7c38 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/Graphics.Direct3D.Dxc.Apis.Functions.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/Graphics.Direct3D.Dxc.Apis.Functions.cs @@ -11,9 +11,9 @@ namespace Win32.Graphics.Direct3D.Dxc; public static unsafe partial class Apis { - [DllImport("dxcompiler.dll", ExactSpelling = true)] - public static extern HResult DxcCreateInstance(Guid* rclsid, Guid* riid, void** ppv); + [LibraryImport("dxcompiler.dll")] + public static partial HResult DxcCreateInstance(Guid* rclsid, Guid* riid, void** ppv); - [DllImport("dxcompiler.dll", ExactSpelling = true)] - public static extern HResult DxcCreateInstance2(Com.IMalloc* pMalloc, Guid* rclsid, Guid* riid, void** ppv); + [LibraryImport("dxcompiler.dll")] + public static partial HResult DxcCreateInstance2(Com.IMalloc* pMalloc, Guid* rclsid, Guid* riid, void** ppv); } diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/Graphics.Direct3D.Dxc.Structs.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/Graphics.Direct3D.Dxc.Structs.cs index 06905b5..55a074d 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/Graphics.Direct3D.Dxc.Structs.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/Graphics.Direct3D.Dxc.Structs.cs @@ -30,15 +30,15 @@ public partial struct DxcBuffer /// DxcDefine public partial struct DxcDefine { - public unsafe ushort* Name; + public unsafe char* Name; - public unsafe ushort* Value; + public unsafe char* Value; } /// DxcArgPair public partial struct DxcArgPair { - public unsafe ushort* pName; + public unsafe char* pName; - public unsafe ushort* pValue; + public unsafe char* pValue; } diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcBlobUtf16.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcBlobUtf16.cs index 38720bb..97a86e5 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcBlobUtf16.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcBlobUtf16.cs @@ -95,9 +95,10 @@ public unsafe partial struct IDxcBlobUtf16 : IDxcBlobUtf16.Interface, INativeGui [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public ushort* GetStringPointer() + public char* GetStringPointer() { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IDxcBlobUtf16*)Unsafe.AsPointer(ref this)); + char* result; + return *((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IDxcBlobUtf16*)Unsafe.AsPointer(ref this), &result); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -110,7 +111,7 @@ public unsafe partial struct IDxcBlobUtf16 : IDxcBlobUtf16.Interface, INativeGui public interface Interface : IDxcBlobEncoding.Interface { [VtblIndex(6)] - ushort* GetStringPointer(); + char* GetStringPointer(); [VtblIndex(7)] nuint GetStringLength(); diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler.cs index 39576d3..5e43d7c 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler.cs @@ -71,16 +71,16 @@ public unsafe partial struct IDxcCompiler : IDxcCompiler.Interface, INativeGuid [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult Compile(IDxcBlob* pSource, ushort* pSourceName, ushort* pEntryPoint, ushort* pTargetProfile, ushort** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult) + public HResult Compile(IDxcBlob* pSource, char* pSourceName, char* pEntryPoint, char* pTargetProfile, char** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcCompiler*)Unsafe.AsPointer(ref this), pSource, pSourceName, pEntryPoint, pTargetProfile, pArguments, argCount, pDefines, defineCount, pIncludeHandler, ppResult); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcCompiler*)Unsafe.AsPointer(ref this), pSource, pSourceName, pEntryPoint, pTargetProfile, pArguments, argCount, pDefines, defineCount, pIncludeHandler, ppResult); } [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public HResult Preprocess(IDxcBlob* pSource, ushort* pSourceName, ushort** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult) + public HResult Preprocess(IDxcBlob* pSource, char* pSourceName, char** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IDxcCompiler*)Unsafe.AsPointer(ref this), pSource, pSourceName, pArguments, argCount, pDefines, defineCount, pIncludeHandler, ppResult); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IDxcCompiler*)Unsafe.AsPointer(ref this), pSource, pSourceName, pArguments, argCount, pDefines, defineCount, pIncludeHandler, ppResult); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -93,10 +93,10 @@ public unsafe partial struct IDxcCompiler : IDxcCompiler.Interface, INativeGuid public interface Interface : IUnknown.Interface { [VtblIndex(3)] - HResult Compile(IDxcBlob* pSource, ushort* pSourceName, ushort* pEntryPoint, ushort* pTargetProfile, ushort** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult); + HResult Compile(IDxcBlob* pSource, char* pSourceName, char* pEntryPoint, char* pTargetProfile, char** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult); [VtblIndex(4)] - HResult Preprocess(IDxcBlob* pSource, ushort* pSourceName, ushort** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult); + HResult Preprocess(IDxcBlob* pSource, char* pSourceName, char** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult); [VtblIndex(5)] HResult Disassemble(IDxcBlob* pSource, IDxcBlobEncoding** ppDisassembly); diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler2.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler2.cs index 21cc7e3..8f5df81 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler2.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler2.cs @@ -72,17 +72,17 @@ public unsafe partial struct IDxcCompiler2 : IDxcCompiler2.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult Compile(IDxcBlob* pSource, ushort* pSourceName, ushort* pEntryPoint, ushort* pTargetProfile, ushort** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult) + public HResult Compile(IDxcBlob* pSource, char* pSourceName, char* pEntryPoint, char* pTargetProfile, char** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcCompiler2*)Unsafe.AsPointer(ref this), pSource, pSourceName, pEntryPoint, pTargetProfile, pArguments, argCount, pDefines, defineCount, pIncludeHandler, ppResult); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcCompiler2*)Unsafe.AsPointer(ref this), pSource, pSourceName, pEntryPoint, pTargetProfile, pArguments, argCount, pDefines, defineCount, pIncludeHandler, ppResult); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public HResult Preprocess(IDxcBlob* pSource, ushort* pSourceName, ushort** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult) + public HResult Preprocess(IDxcBlob* pSource, char* pSourceName, char** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IDxcCompiler2*)Unsafe.AsPointer(ref this), pSource, pSourceName, pArguments, argCount, pDefines, defineCount, pIncludeHandler, ppResult); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IDxcCompiler2*)Unsafe.AsPointer(ref this), pSource, pSourceName, pArguments, argCount, pDefines, defineCount, pIncludeHandler, ppResult); } /// @@ -95,15 +95,15 @@ public unsafe partial struct IDxcCompiler2 : IDxcCompiler2.Interface, INativeGui [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult CompileWithDebug(IDxcBlob* pSource, ushort* pSourceName, ushort* pEntryPoint, ushort* pTargetProfile, ushort** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult, ushort** ppDebugBlobName, IDxcBlob** ppDebugBlob) + public HResult CompileWithDebug(IDxcBlob* pSource, char* pSourceName, char* pEntryPoint, char* pTargetProfile, char** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult, char** ppDebugBlobName, IDxcBlob** ppDebugBlob) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IDxcCompiler2*)Unsafe.AsPointer(ref this), pSource, pSourceName, pEntryPoint, pTargetProfile, pArguments, argCount, pDefines, defineCount, pIncludeHandler, ppResult, ppDebugBlobName, ppDebugBlob); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IDxcCompiler2*)Unsafe.AsPointer(ref this), pSource, pSourceName, pEntryPoint, pTargetProfile, pArguments, argCount, pDefines, defineCount, pIncludeHandler, ppResult, ppDebugBlobName, ppDebugBlob); } public interface Interface : IDxcCompiler.Interface { [VtblIndex(6)] - HResult CompileWithDebug(IDxcBlob* pSource, ushort* pSourceName, ushort* pEntryPoint, ushort* pTargetProfile, ushort** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult, ushort** ppDebugBlobName, IDxcBlob** ppDebugBlob); + HResult CompileWithDebug(IDxcBlob* pSource, char* pSourceName, char* pEntryPoint, char* pTargetProfile, char** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcIncludeHandler* pIncludeHandler, IDxcOperationResult** ppResult, char** ppDebugBlobName, IDxcBlob** ppDebugBlob); } } diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler3.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler3.cs index 6b517e8..14bbf78 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler3.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler3.cs @@ -71,9 +71,9 @@ public unsafe partial struct IDxcCompiler3 : IDxcCompiler3.Interface, INativeGui [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult Compile(DxcBuffer* pSource, ushort** pArguments, uint argCount, IDxcIncludeHandler* pIncludeHandler, Guid* riid, void** ppResult) + public HResult Compile(DxcBuffer* pSource, char** pArguments, uint argCount, IDxcIncludeHandler* pIncludeHandler, Guid* riid, void** ppResult) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcCompiler3*)Unsafe.AsPointer(ref this), pSource, pArguments, argCount, pIncludeHandler, riid, ppResult); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcCompiler3*)Unsafe.AsPointer(ref this), pSource, pArguments, argCount, pIncludeHandler, riid, ppResult); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -86,7 +86,7 @@ public unsafe partial struct IDxcCompiler3 : IDxcCompiler3.Interface, INativeGui public interface Interface : IUnknown.Interface { [VtblIndex(3)] - HResult Compile(DxcBuffer* pSource, ushort** pArguments, uint argCount, IDxcIncludeHandler* pIncludeHandler, Guid* riid, void** ppResult); + HResult Compile(DxcBuffer* pSource, char** pArguments, uint argCount, IDxcIncludeHandler* pIncludeHandler, Guid* riid, void** ppResult); [VtblIndex(4)] HResult Disassemble(DxcBuffer* pObject, Guid* riid, void** ppResult); diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompilerArgs.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompilerArgs.cs index d64c810..889ddc4 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompilerArgs.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompilerArgs.cs @@ -71,9 +71,9 @@ public unsafe partial struct IDxcCompilerArgs : IDxcCompilerArgs.Interface, INat [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public ushort** GetArguments() + public char** GetArguments() { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcCompilerArgs*)Unsafe.AsPointer(ref this)); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcCompilerArgs*)Unsafe.AsPointer(ref this)); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -85,9 +85,9 @@ public unsafe partial struct IDxcCompilerArgs : IDxcCompilerArgs.Interface, INat [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult AddArguments(ushort** pArguments, uint argCount) + public HResult AddArguments(char** pArguments, uint argCount) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDxcCompilerArgs*)Unsafe.AsPointer(ref this), pArguments, argCount); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDxcCompilerArgs*)Unsafe.AsPointer(ref this), pArguments, argCount); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -107,13 +107,13 @@ public unsafe partial struct IDxcCompilerArgs : IDxcCompilerArgs.Interface, INat public interface Interface : IUnknown.Interface { [VtblIndex(3)] - ushort** GetArguments(); + char** GetArguments(); [VtblIndex(4)] uint GetCount(); [VtblIndex(5)] - HResult AddArguments(ushort** pArguments, uint argCount); + HResult AddArguments(char** pArguments, uint argCount); [VtblIndex(6)] HResult AddArgumentsUTF8(sbyte** pArguments, uint argCount); diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcIncludeHandler.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcIncludeHandler.cs index 255efe4..cfe97ba 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcIncludeHandler.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcIncludeHandler.cs @@ -71,15 +71,15 @@ public unsafe partial struct IDxcIncludeHandler : IDxcIncludeHandler.Interface, [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult LoadSource(ushort* pFilename, IDxcBlob** ppIncludeSource) + public HResult LoadSource(char* pFilename, IDxcBlob** ppIncludeSource) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcIncludeHandler*)Unsafe.AsPointer(ref this), pFilename, ppIncludeSource); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcIncludeHandler*)Unsafe.AsPointer(ref this), pFilename, ppIncludeSource); } public interface Interface : IUnknown.Interface { [VtblIndex(3)] - HResult LoadSource(ushort* pFilename, IDxcBlob** ppIncludeSource); + HResult LoadSource(char* pFilename, IDxcBlob** ppIncludeSource); } } diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcLibrary.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcLibrary.cs index 46ace57..5dd2d44 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcLibrary.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcLibrary.cs @@ -85,9 +85,9 @@ public unsafe partial struct IDxcLibrary : IDxcLibrary.Interface, INativeGuid [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult CreateBlobFromFile(ushort* pFileName, DxcCp* codePage, IDxcBlobEncoding** pBlobEncoding) + public HResult CreateBlobFromFile(char* pFileName, DxcCp* codePage, IDxcBlobEncoding** pBlobEncoding) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDxcLibrary*)Unsafe.AsPointer(ref this), pFileName, codePage, pBlobEncoding); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDxcLibrary*)Unsafe.AsPointer(ref this), pFileName, codePage, pBlobEncoding); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -148,7 +148,7 @@ public unsafe partial struct IDxcLibrary : IDxcLibrary.Interface, INativeGuid HResult CreateBlobFromBlob(IDxcBlob* pBlob, uint offset, uint length, IDxcBlob** ppResult); [VtblIndex(5)] - HResult CreateBlobFromFile(ushort* pFileName, DxcCp* codePage, IDxcBlobEncoding** pBlobEncoding); + HResult CreateBlobFromFile(char* pFileName, DxcCp* codePage, IDxcBlobEncoding** pBlobEncoding); [VtblIndex(6)] HResult CreateBlobWithEncodingFromPinned(void* pText, uint size, DxcCp codePage, IDxcBlobEncoding** pBlobEncoding); diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcLinker.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcLinker.cs index fdbdc1a..47cdeb4 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcLinker.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcLinker.cs @@ -71,25 +71,25 @@ public unsafe partial struct IDxcLinker : IDxcLinker.Interface, INativeGuid [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult RegisterLibrary(ushort* pLibName, IDxcBlob* pLib) + public HResult RegisterLibrary(char* pLibName, IDxcBlob* pLib) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcLinker*)Unsafe.AsPointer(ref this), pLibName, pLib); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcLinker*)Unsafe.AsPointer(ref this), pLibName, pLib); } [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public HResult Link(ushort* pEntryName, ushort* pTargetProfile, ushort** pLibNames, uint libCount, ushort** pArguments, uint argCount, IDxcOperationResult** ppResult) + public HResult Link(char* pEntryName, char* pTargetProfile, char** pLibNames, uint libCount, char** pArguments, uint argCount, IDxcOperationResult** ppResult) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IDxcLinker*)Unsafe.AsPointer(ref this), pEntryName, pTargetProfile, pLibNames, libCount, pArguments, argCount, ppResult); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IDxcLinker*)Unsafe.AsPointer(ref this), pEntryName, pTargetProfile, pLibNames, libCount, pArguments, argCount, ppResult); } public interface Interface : IUnknown.Interface { [VtblIndex(3)] - HResult RegisterLibrary(ushort* pLibName, IDxcBlob* pLib); + HResult RegisterLibrary(char* pLibName, IDxcBlob* pLib); [VtblIndex(4)] - HResult Link(ushort* pEntryName, ushort* pTargetProfile, ushort** pLibNames, uint libCount, ushort** pArguments, uint argCount, IDxcOperationResult** ppResult); + HResult Link(char* pEntryName, char* pTargetProfile, char** pLibNames, uint libCount, char** pArguments, uint argCount, IDxcOperationResult** ppResult); } } diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOptimizer.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOptimizer.cs index c34c9dd..558c03d 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOptimizer.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOptimizer.cs @@ -85,9 +85,9 @@ public unsafe partial struct IDxcOptimizer : IDxcOptimizer.Interface, INativeGui [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult RunOptimizer(IDxcBlob* pBlob, ushort** ppOptions, uint optionCount, IDxcBlob** pOutputModule, IDxcBlobEncoding** ppOutputText) + public HResult RunOptimizer(IDxcBlob* pBlob, char** ppOptions, uint optionCount, IDxcBlob** pOutputModule, IDxcBlobEncoding** ppOutputText) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDxcOptimizer*)Unsafe.AsPointer(ref this), pBlob, ppOptions, optionCount, pOutputModule, ppOutputText); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDxcOptimizer*)Unsafe.AsPointer(ref this), pBlob, ppOptions, optionCount, pOutputModule, ppOutputText); } public interface Interface : IUnknown.Interface @@ -99,7 +99,7 @@ public unsafe partial struct IDxcOptimizer : IDxcOptimizer.Interface, INativeGui HResult GetAvailablePass(uint index, IDxcOptimizerPass** ppResult); [VtblIndex(5)] - HResult RunOptimizer(IDxcBlob* pBlob, ushort** ppOptions, uint optionCount, IDxcBlob** pOutputModule, IDxcBlobEncoding** ppOutputText); + HResult RunOptimizer(IDxcBlob* pBlob, char** ppOptions, uint optionCount, IDxcBlob** pOutputModule, IDxcBlobEncoding** ppOutputText); } } diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOptimizerPass.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOptimizerPass.cs index e78ebac..907cb49 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOptimizerPass.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOptimizerPass.cs @@ -71,16 +71,16 @@ public unsafe partial struct IDxcOptimizerPass : IDxcOptimizerPass.Interface, IN [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult GetOptionName(ushort** ppResult) + public HResult GetOptionName(char** ppResult) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcOptimizerPass*)Unsafe.AsPointer(ref this), ppResult); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDxcOptimizerPass*)Unsafe.AsPointer(ref this), ppResult); } [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public HResult GetDescription(ushort** ppResult) + public HResult GetDescription(char** ppResult) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IDxcOptimizerPass*)Unsafe.AsPointer(ref this), ppResult); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IDxcOptimizerPass*)Unsafe.AsPointer(ref this), ppResult); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -92,34 +92,34 @@ public unsafe partial struct IDxcOptimizerPass : IDxcOptimizerPass.Interface, IN [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult GetOptionArgName(uint argIndex, ushort** ppResult) + public HResult GetOptionArgName(uint argIndex, char** ppResult) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IDxcOptimizerPass*)Unsafe.AsPointer(ref this), argIndex, ppResult); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IDxcOptimizerPass*)Unsafe.AsPointer(ref this), argIndex, ppResult); } [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult GetOptionArgDescription(uint argIndex, ushort** ppResult) + public HResult GetOptionArgDescription(uint argIndex, char** ppResult) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDxcOptimizerPass*)Unsafe.AsPointer(ref this), argIndex, ppResult); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDxcOptimizerPass*)Unsafe.AsPointer(ref this), argIndex, ppResult); } public interface Interface : IUnknown.Interface { [VtblIndex(3)] - HResult GetOptionName(ushort** ppResult); + HResult GetOptionName(char** ppResult); [VtblIndex(4)] - HResult GetDescription(ushort** ppResult); + HResult GetDescription(char** ppResult); [VtblIndex(5)] HResult GetOptionArgCount(uint* pCount); [VtblIndex(6)] - HResult GetOptionArgName(uint argIndex, ushort** ppResult); + HResult GetOptionArgName(uint argIndex, char** ppResult); [VtblIndex(7)] - HResult GetOptionArgDescription(uint argIndex, ushort** ppResult); + HResult GetOptionArgDescription(uint argIndex, char** ppResult); } } diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcPdbUtils.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcPdbUtils.cs index 210edfc..ad12ea0 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcPdbUtils.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcPdbUtils.cs @@ -232,9 +232,9 @@ public unsafe partial struct IDxcPdbUtils : IDxcPdbUtils.Interface, INativeGuid [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(26)] - public HResult OverrideRootSignature(ushort* pRootSignature) + public HResult OverrideRootSignature(char* pRootSignature) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[26]))((IDxcPdbUtils*)Unsafe.AsPointer(ref this), pRootSignature); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[26]))((IDxcPdbUtils*)Unsafe.AsPointer(ref this), pRootSignature); } public interface Interface : IUnknown.Interface @@ -309,7 +309,7 @@ public unsafe partial struct IDxcPdbUtils : IDxcPdbUtils.Interface, INativeGuid HResult OverrideArgs(DxcArgPair* pArgPairs, uint uNumArgPairs); [VtblIndex(26)] - HResult OverrideRootSignature(ushort* pRootSignature); + HResult OverrideRootSignature(char* pRootSignature); } } diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcUtils.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcUtils.cs index a0c88ff..7f8e121 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcUtils.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcUtils.cs @@ -99,9 +99,9 @@ public unsafe partial struct IDxcUtils : IDxcUtils.Interface, INativeGuid [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult LoadFile(ushort* pFileName, DxcCp* pCodePage, IDxcBlobEncoding** pBlobEncoding) + public HResult LoadFile(char* pFileName, DxcCp* pCodePage, IDxcBlobEncoding** pBlobEncoding) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDxcUtils*)Unsafe.AsPointer(ref this), pFileName, pCodePage, pBlobEncoding); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDxcUtils*)Unsafe.AsPointer(ref this), pFileName, pCodePage, pBlobEncoding); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -148,9 +148,9 @@ public unsafe partial struct IDxcUtils : IDxcUtils.Interface, INativeGuid [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(14)] - public HResult BuildArguments(ushort* pSourceName, ushort* pEntryPoint, ushort* pTargetProfile, ushort** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcCompilerArgs** ppArgs) + public HResult BuildArguments(char* pSourceName, char* pEntryPoint, char* pTargetProfile, char** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcCompilerArgs** ppArgs) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IDxcUtils*)Unsafe.AsPointer(ref this), pSourceName, pEntryPoint, pTargetProfile, pArguments, argCount, pDefines, defineCount, ppArgs); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IDxcUtils*)Unsafe.AsPointer(ref this), pSourceName, pEntryPoint, pTargetProfile, pArguments, argCount, pDefines, defineCount, ppArgs); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -175,7 +175,7 @@ public unsafe partial struct IDxcUtils : IDxcUtils.Interface, INativeGuid HResult CreateBlob(void* pData, uint size, DxcCp codePage, IDxcBlobEncoding** pBlobEncoding); [VtblIndex(7)] - HResult LoadFile(ushort* pFileName, DxcCp* pCodePage, IDxcBlobEncoding** pBlobEncoding); + HResult LoadFile(char* pFileName, DxcCp* pCodePage, IDxcBlobEncoding** pBlobEncoding); [VtblIndex(8)] HResult CreateReadOnlyStreamFromBlob(IDxcBlob* pBlob, Com.IStream** ppStream); @@ -196,7 +196,7 @@ public unsafe partial struct IDxcUtils : IDxcUtils.Interface, INativeGuid HResult CreateReflection(DxcBuffer* pData, Guid* iid, void** ppvReflection); [VtblIndex(14)] - HResult BuildArguments(ushort* pSourceName, ushort* pEntryPoint, ushort* pTargetProfile, ushort** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcCompilerArgs** ppArgs); + HResult BuildArguments(char* pSourceName, char* pEntryPoint, char* pTargetProfile, char** pArguments, uint argCount, DxcDefine* pDefines, uint defineCount, IDxcCompilerArgs** ppArgs); [VtblIndex(15)] HResult GetPDBContents(IDxcBlob* pPDBBlob, IDxcBlob** ppHash, IDxcBlob** ppContainer); diff --git a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Vortice.Win32.Graphics.Direct3D.Dxc.csproj b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Vortice.Win32.Graphics.Direct3D.Dxc.csproj index f77b91b..81fb2ab 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Dxc/Vortice.Win32.Graphics.Direct3D.Dxc.csproj +++ b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Vortice.Win32.Graphics.Direct3D.Dxc.csproj @@ -7,10 +7,6 @@ $(NoWarn);CS0419;IDE0017 - - - - diff --git a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/Graphics.Direct3D.Fxc.Apis.Functions.cs b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/Graphics.Direct3D.Fxc.Apis.Functions.cs index 7b9f9b5..cf89c99 100644 --- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/Graphics.Direct3D.Fxc.Apis.Functions.cs +++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/Graphics.Direct3D.Fxc.Apis.Functions.cs @@ -12,86 +12,86 @@ namespace Win32.Graphics.Direct3D.Fxc; public static unsafe partial class Apis { /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DReadFileToBlob(ushort* pFileName, Graphics.Direct3D.ID3DBlob** ppContents); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DReadFileToBlob(char* pFileName, Graphics.Direct3D.ID3DBlob** ppContents); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DWriteBlobToFile(Graphics.Direct3D.ID3DBlob* pBlob, ushort* pFileName, Bool32 bOverwrite); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DWriteBlobToFile(Graphics.Direct3D.ID3DBlob* pBlob, char* pFileName, Bool32 bOverwrite); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DCompile(void* pSrcData, nuint SrcDataSize, sbyte* pSourceName, Graphics.Direct3D.ShaderMacro* pDefines, Graphics.Direct3D.ID3DInclude* pInclude, sbyte* pEntrypoint, sbyte* pTarget, CompileFlags Flags1, uint Flags2, Graphics.Direct3D.ID3DBlob** ppCode, Graphics.Direct3D.ID3DBlob** ppErrorMsgs); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DCompile(void* pSrcData, nuint SrcDataSize, sbyte* pSourceName, Graphics.Direct3D.ShaderMacro* pDefines, Graphics.Direct3D.ID3DInclude* pInclude, sbyte* pEntrypoint, sbyte* pTarget, CompileFlags Flags1, uint Flags2, Graphics.Direct3D.ID3DBlob** ppCode, Graphics.Direct3D.ID3DBlob** ppErrorMsgs); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DCompile2(void* pSrcData, nuint SrcDataSize, sbyte* pSourceName, Graphics.Direct3D.ShaderMacro* pDefines, Graphics.Direct3D.ID3DInclude* pInclude, sbyte* pEntrypoint, sbyte* pTarget, CompileFlags Flags1, uint Flags2, uint SecondaryDataFlags, void* pSecondaryData, nuint SecondaryDataSize, Graphics.Direct3D.ID3DBlob** ppCode, Graphics.Direct3D.ID3DBlob** ppErrorMsgs); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DCompile2(void* pSrcData, nuint SrcDataSize, sbyte* pSourceName, Graphics.Direct3D.ShaderMacro* pDefines, Graphics.Direct3D.ID3DInclude* pInclude, sbyte* pEntrypoint, sbyte* pTarget, CompileFlags Flags1, uint Flags2, uint SecondaryDataFlags, void* pSecondaryData, nuint SecondaryDataSize, Graphics.Direct3D.ID3DBlob** ppCode, Graphics.Direct3D.ID3DBlob** ppErrorMsgs); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DCompileFromFile(ushort* pFileName, Graphics.Direct3D.ShaderMacro* pDefines, Graphics.Direct3D.ID3DInclude* pInclude, sbyte* pEntrypoint, sbyte* pTarget, CompileFlags Flags1, uint Flags2, Graphics.Direct3D.ID3DBlob** ppCode, Graphics.Direct3D.ID3DBlob** ppErrorMsgs); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DCompileFromFile(char* pFileName, Graphics.Direct3D.ShaderMacro* pDefines, Graphics.Direct3D.ID3DInclude* pInclude, sbyte* pEntrypoint, sbyte* pTarget, CompileFlags Flags1, uint Flags2, Graphics.Direct3D.ID3DBlob** ppCode, Graphics.Direct3D.ID3DBlob** ppErrorMsgs); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DPreprocess(void* pSrcData, nuint SrcDataSize, sbyte* pSourceName, Graphics.Direct3D.ShaderMacro* pDefines, Graphics.Direct3D.ID3DInclude* pInclude, Graphics.Direct3D.ID3DBlob** ppCodeText, Graphics.Direct3D.ID3DBlob** ppErrorMsgs); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DPreprocess(void* pSrcData, nuint SrcDataSize, sbyte* pSourceName, Graphics.Direct3D.ShaderMacro* pDefines, Graphics.Direct3D.ID3DInclude* pInclude, Graphics.Direct3D.ID3DBlob** ppCodeText, Graphics.Direct3D.ID3DBlob** ppErrorMsgs); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DGetDebugInfo(void* pSrcData, nuint SrcDataSize, Graphics.Direct3D.ID3DBlob** ppDebugInfo); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DGetDebugInfo(void* pSrcData, nuint SrcDataSize, Graphics.Direct3D.ID3DBlob** ppDebugInfo); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DReflect(void* pSrcData, nuint SrcDataSize, Guid* pInterface, void** ppReflector); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DReflect(void* pSrcData, nuint SrcDataSize, Guid* pInterface, void** ppReflector); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DReflectLibrary(void* pSrcData, nuint SrcDataSize, Guid* riid, void** ppReflector); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DReflectLibrary(void* pSrcData, nuint SrcDataSize, Guid* riid, void** ppReflector); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DDisassemble(void* pSrcData, nuint SrcDataSize, DisasmFlags Flags, sbyte* szComments, Graphics.Direct3D.ID3DBlob** ppDisassembly); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DDisassemble(void* pSrcData, nuint SrcDataSize, DisasmFlags Flags, sbyte* szComments, Graphics.Direct3D.ID3DBlob** ppDisassembly); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DDisassembleRegion(void* pSrcData, nuint SrcDataSize, uint Flags, sbyte* szComments, nuint StartByteOffset, nuint NumInsts, nuint* pFinishByteOffset, Graphics.Direct3D.ID3DBlob** ppDisassembly); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DDisassembleRegion(void* pSrcData, nuint SrcDataSize, uint Flags, sbyte* szComments, nuint StartByteOffset, nuint NumInsts, nuint* pFinishByteOffset, Graphics.Direct3D.ID3DBlob** ppDisassembly); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DGetTraceInstructionOffsets(void* pSrcData, nuint SrcDataSize, uint Flags, nuint StartInstIndex, nuint NumInsts, nuint* pOffsets, nuint* pTotalInsts); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DGetTraceInstructionOffsets(void* pSrcData, nuint SrcDataSize, uint Flags, nuint StartInstIndex, nuint NumInsts, nuint* pOffsets, nuint* pTotalInsts); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DGetInputSignatureBlob(void* pSrcData, nuint SrcDataSize, Graphics.Direct3D.ID3DBlob** ppSignatureBlob); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DGetInputSignatureBlob(void* pSrcData, nuint SrcDataSize, Graphics.Direct3D.ID3DBlob** ppSignatureBlob); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DGetOutputSignatureBlob(void* pSrcData, nuint SrcDataSize, Graphics.Direct3D.ID3DBlob** ppSignatureBlob); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DGetOutputSignatureBlob(void* pSrcData, nuint SrcDataSize, Graphics.Direct3D.ID3DBlob** ppSignatureBlob); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DGetInputAndOutputSignatureBlob(void* pSrcData, nuint SrcDataSize, Graphics.Direct3D.ID3DBlob** ppSignatureBlob); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DGetInputAndOutputSignatureBlob(void* pSrcData, nuint SrcDataSize, Graphics.Direct3D.ID3DBlob** ppSignatureBlob); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DStripShader(void* pShaderBytecode, nuint BytecodeLength, uint uStripFlags, Graphics.Direct3D.ID3DBlob** ppStrippedBlob); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DStripShader(void* pShaderBytecode, nuint BytecodeLength, uint uStripFlags, Graphics.Direct3D.ID3DBlob** ppStrippedBlob); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DGetBlobPart(void* pSrcData, nuint SrcDataSize, BlobPart Part, uint Flags, Graphics.Direct3D.ID3DBlob** ppPart); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DGetBlobPart(void* pSrcData, nuint SrcDataSize, BlobPart Part, uint Flags, Graphics.Direct3D.ID3DBlob** ppPart); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DSetBlobPart(void* pSrcData, nuint SrcDataSize, BlobPart Part, uint Flags, void* pPart, nuint PartSize, Graphics.Direct3D.ID3DBlob** ppNewShader); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DSetBlobPart(void* pSrcData, nuint SrcDataSize, BlobPart Part, uint Flags, void* pPart, nuint PartSize, Graphics.Direct3D.ID3DBlob** ppNewShader); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DCreateBlob(nuint Size, Graphics.Direct3D.ID3DBlob** ppBlob); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DCreateBlob(nuint Size, Graphics.Direct3D.ID3DBlob** ppBlob); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DCompressShaders(uint uNumShaders, ShaderData* pShaderData, CompressShaderFlags uFlags, Graphics.Direct3D.ID3DBlob** ppCompressedData); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DCompressShaders(uint uNumShaders, ShaderData* pShaderData, CompressShaderFlags uFlags, Graphics.Direct3D.ID3DBlob** ppCompressedData); /// - [DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)] - public static extern HResult D3DDecompressShaders(void* pSrcData, nuint SrcDataSize, uint uNumShaders, uint uStartIndex, uint* pIndices, uint uFlags, Graphics.Direct3D.ID3DBlob** ppShaders, uint* pTotalShaders); + [LibraryImport("D3DCOMPILER_47.dll")] + public static partial HResult D3DDecompressShaders(void* pSrcData, nuint SrcDataSize, uint uNumShaders, uint uStartIndex, uint* pIndices, uint uFlags, Graphics.Direct3D.ID3DBlob** ppShaders, uint* pTotalShaders); } diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/Graphics.Direct3D11.Apis.Functions.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Graphics.Direct3D11.Apis.Functions.cs index 6078920..82ad286 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/Graphics.Direct3D11.Apis.Functions.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Graphics.Direct3D11.Apis.Functions.cs @@ -12,10 +12,10 @@ namespace Win32.Graphics.Direct3D11; public static unsafe partial class Apis { /// - [DllImport("d3d11.dll", ExactSpelling = true)] - public static extern HResult D3D11CreateDevice(Graphics.Dxgi.IDXGIAdapter* pAdapter, Graphics.Direct3D.DriverType DriverType, nint Software, CreateDeviceFlags Flags, Graphics.Direct3D.FeatureLevel* pFeatureLevels, uint FeatureLevels, uint SDKVersion, ID3D11Device** ppDevice, Graphics.Direct3D.FeatureLevel* pFeatureLevel, ID3D11DeviceContext** ppImmediateContext); + [LibraryImport("d3d11.dll")] + public static partial HResult D3D11CreateDevice(Graphics.Dxgi.IDXGIAdapter* pAdapter, Graphics.Direct3D.DriverType DriverType, nint Software, CreateDeviceFlags Flags, Graphics.Direct3D.FeatureLevel* pFeatureLevels, uint FeatureLevels, uint SDKVersion, ID3D11Device** ppDevice, Graphics.Direct3D.FeatureLevel* pFeatureLevel, ID3D11DeviceContext** ppImmediateContext); /// - [DllImport("d3d11.dll", ExactSpelling = true)] - public static extern HResult D3D11CreateDeviceAndSwapChain(Graphics.Dxgi.IDXGIAdapter* pAdapter, Graphics.Direct3D.DriverType DriverType, nint Software, CreateDeviceFlags Flags, Graphics.Direct3D.FeatureLevel* pFeatureLevels, uint FeatureLevels, uint SDKVersion, Graphics.Dxgi.SwapChainDescription* pSwapChainDesc, Graphics.Dxgi.IDXGISwapChain** ppSwapChain, ID3D11Device** ppDevice, Graphics.Direct3D.FeatureLevel* pFeatureLevel, ID3D11DeviceContext** ppImmediateContext); + [LibraryImport("d3d11.dll")] + public static partial HResult D3D11CreateDeviceAndSwapChain(Graphics.Dxgi.IDXGIAdapter* pAdapter, Graphics.Direct3D.DriverType DriverType, nint Software, CreateDeviceFlags Flags, Graphics.Direct3D.FeatureLevel* pFeatureLevels, uint FeatureLevels, uint SDKVersion, Graphics.Dxgi.SwapChainDescription* pSwapChainDesc, Graphics.Dxgi.IDXGISwapChain** ppSwapChain, ID3D11Device** ppDevice, Graphics.Direct3D.FeatureLevel* pFeatureLevel, ID3D11DeviceContext** ppImmediateContext); } diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device1.cs index 13a3513..1b7288b 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device1.cs @@ -441,9 +441,9 @@ public unsafe partial struct ID3D11Device1 : ID3D11Device1.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(49)] - public HResult OpenSharedResourceByName(ushort* lpName, uint dwDesiredAccess, Guid* returnedInterface, void** ppResource) + public HResult OpenSharedResourceByName(char* lpName, uint dwDesiredAccess, Guid* returnedInterface, void** ppResource) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[49]))((ID3D11Device1*)Unsafe.AsPointer(ref this), lpName, dwDesiredAccess, returnedInterface, ppResource); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[49]))((ID3D11Device1*)Unsafe.AsPointer(ref this), lpName, dwDesiredAccess, returnedInterface, ppResource); } public interface Interface : ID3D11Device.Interface @@ -467,7 +467,7 @@ public unsafe partial struct ID3D11Device1 : ID3D11Device1.Interface, INativeGui HResult OpenSharedResource1(Handle hResource, Guid* returnedInterface, void** ppResource); [VtblIndex(49)] - HResult OpenSharedResourceByName(ushort* lpName, uint dwDesiredAccess, Guid* returnedInterface, void** ppResource); + HResult OpenSharedResourceByName(char* lpName, uint dwDesiredAccess, Guid* returnedInterface, void** ppResource); } } diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device2.cs index ec26686..fc0c7e9 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device2.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device2.cs @@ -441,9 +441,9 @@ public unsafe partial struct ID3D11Device2 : ID3D11Device2.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(49)] - public HResult OpenSharedResourceByName(ushort* lpName, uint dwDesiredAccess, Guid* returnedInterface, void** ppResource) + public HResult OpenSharedResourceByName(char* lpName, uint dwDesiredAccess, Guid* returnedInterface, void** ppResource) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[49]))((ID3D11Device2*)Unsafe.AsPointer(ref this), lpName, dwDesiredAccess, returnedInterface, ppResource); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[49]))((ID3D11Device2*)Unsafe.AsPointer(ref this), lpName, dwDesiredAccess, returnedInterface, ppResource); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device3.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device3.cs index 3e8ec52..f226f5a 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device3.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device3.cs @@ -441,9 +441,9 @@ public unsafe partial struct ID3D11Device3 : ID3D11Device3.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(49)] - public HResult OpenSharedResourceByName(ushort* lpName, uint dwDesiredAccess, Guid* returnedInterface, void** ppResource) + public HResult OpenSharedResourceByName(char* lpName, uint dwDesiredAccess, Guid* returnedInterface, void** ppResource) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[49]))((ID3D11Device3*)Unsafe.AsPointer(ref this), lpName, dwDesiredAccess, returnedInterface, ppResource); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[49]))((ID3D11Device3*)Unsafe.AsPointer(ref this), lpName, dwDesiredAccess, returnedInterface, ppResource); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device4.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device4.cs index c55bb3a..58bcfac 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device4.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device4.cs @@ -441,9 +441,9 @@ public unsafe partial struct ID3D11Device4 : ID3D11Device4.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(49)] - public HResult OpenSharedResourceByName(ushort* lpName, uint dwDesiredAccess, Guid* returnedInterface, void** ppResource) + public HResult OpenSharedResourceByName(char* lpName, uint dwDesiredAccess, Guid* returnedInterface, void** ppResource) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[49]))((ID3D11Device4*)Unsafe.AsPointer(ref this), lpName, dwDesiredAccess, returnedInterface, ppResource); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[49]))((ID3D11Device4*)Unsafe.AsPointer(ref this), lpName, dwDesiredAccess, returnedInterface, ppResource); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device5.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device5.cs index 993c09f..588b568 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device5.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device5.cs @@ -441,9 +441,9 @@ public unsafe partial struct ID3D11Device5 : ID3D11Device5.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(49)] - public HResult OpenSharedResourceByName(ushort* lpName, uint dwDesiredAccess, Guid* returnedInterface, void** ppResource) + public HResult OpenSharedResourceByName(char* lpName, uint dwDesiredAccess, Guid* returnedInterface, void** ppResource) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[49]))((ID3D11Device5*)Unsafe.AsPointer(ref this), lpName, dwDesiredAccess, returnedInterface, ppResource); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[49]))((ID3D11Device5*)Unsafe.AsPointer(ref this), lpName, dwDesiredAccess, returnedInterface, ppResource); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs index 85eed45..83dc07d 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs @@ -1177,17 +1177,17 @@ public unsafe partial struct ID3D11DeviceContext2 : ID3D11DeviceContext2.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(141)] - public void SetMarkerInt(ushort* pLabel, int Data) + public void SetMarkerInt(char* pLabel, int Data) { - ((delegate* unmanaged[MemberFunction])(lpVtbl[141]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), pLabel, Data); + ((delegate* unmanaged[MemberFunction])(lpVtbl[141]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), pLabel, Data); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(142)] - public void BeginEventInt(ushort* pLabel, int Data) + public void BeginEventInt(char* pLabel, int Data) { - ((delegate* unmanaged[MemberFunction])(lpVtbl[142]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), pLabel, Data); + ((delegate* unmanaged[MemberFunction])(lpVtbl[142]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), pLabel, Data); } /// @@ -1222,10 +1222,10 @@ public unsafe partial struct ID3D11DeviceContext2 : ID3D11DeviceContext2.Interfa Bool32 IsAnnotationEnabled(); [VtblIndex(141)] - void SetMarkerInt(ushort* pLabel, int Data); + void SetMarkerInt(char* pLabel, int Data); [VtblIndex(142)] - void BeginEventInt(ushort* pLabel, int Data); + void BeginEventInt(char* pLabel, int Data); [VtblIndex(143)] void EndEvent(); diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs index 9c182c5..33af7e4 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs @@ -1177,17 +1177,17 @@ public unsafe partial struct ID3D11DeviceContext3 : ID3D11DeviceContext3.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(141)] - public void SetMarkerInt(ushort* pLabel, int Data) + public void SetMarkerInt(char* pLabel, int Data) { - ((delegate* unmanaged[MemberFunction])(lpVtbl[141]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), pLabel, Data); + ((delegate* unmanaged[MemberFunction])(lpVtbl[141]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), pLabel, Data); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(142)] - public void BeginEventInt(ushort* pLabel, int Data) + public void BeginEventInt(char* pLabel, int Data) { - ((delegate* unmanaged[MemberFunction])(lpVtbl[142]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), pLabel, Data); + ((delegate* unmanaged[MemberFunction])(lpVtbl[142]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), pLabel, Data); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs index 27fc5d3..44948cb 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs @@ -1177,17 +1177,17 @@ public unsafe partial struct ID3D11DeviceContext4 : ID3D11DeviceContext4.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(141)] - public void SetMarkerInt(ushort* pLabel, int Data) + public void SetMarkerInt(char* pLabel, int Data) { - ((delegate* unmanaged[MemberFunction])(lpVtbl[141]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), pLabel, Data); + ((delegate* unmanaged[MemberFunction])(lpVtbl[141]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), pLabel, Data); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(142)] - public void BeginEventInt(ushort* pLabel, int Data) + public void BeginEventInt(char* pLabel, int Data) { - ((delegate* unmanaged[MemberFunction])(lpVtbl[142]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), pLabel, Data); + ((delegate* unmanaged[MemberFunction])(lpVtbl[142]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), pLabel, Data); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Fence.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Fence.cs index 4c7db76..22e04c1 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Fence.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Fence.cs @@ -105,9 +105,9 @@ public unsafe partial struct ID3D11Fence : ID3D11Fence.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CreateSharedHandle(Security.SECURITY_ATTRIBUTES* pAttributes, uint dwAccess, ushort* lpName, Handle* pHandle) + public HResult CreateSharedHandle(Security.SECURITY_ATTRIBUTES* pAttributes, uint dwAccess, char* lpName, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((ID3D11Fence*)Unsafe.AsPointer(ref this), pAttributes, dwAccess, lpName, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((ID3D11Fence*)Unsafe.AsPointer(ref this), pAttributes, dwAccess, lpName, pHandle); } /// @@ -129,7 +129,7 @@ public unsafe partial struct ID3D11Fence : ID3D11Fence.Interface, INativeGuid public interface Interface : ID3D11DeviceChild.Interface { [VtblIndex(7)] - HResult CreateSharedHandle(Security.SECURITY_ATTRIBUTES* pAttributes, uint dwAccess, ushort* lpName, Handle* pHandle); + HResult CreateSharedHandle(Security.SECURITY_ATTRIBUTES* pAttributes, uint dwAccess, char* lpName, Handle* pHandle); [VtblIndex(8)] ulong GetCompletedValue(); diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3DUserDefinedAnnotation.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3DUserDefinedAnnotation.cs index 3d80439..bd41aca 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3DUserDefinedAnnotation.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3DUserDefinedAnnotation.cs @@ -73,9 +73,9 @@ public unsafe partial struct ID3DUserDefinedAnnotation : ID3DUserDefinedAnnotati /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public int BeginEvent(ushort* Name) + public int BeginEvent(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((ID3DUserDefinedAnnotation*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((ID3DUserDefinedAnnotation*)Unsafe.AsPointer(ref this), Name); } /// @@ -89,9 +89,9 @@ public unsafe partial struct ID3DUserDefinedAnnotation : ID3DUserDefinedAnnotati /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public void SetMarker(ushort* Name) + public void SetMarker(char* Name) { - ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((ID3DUserDefinedAnnotation*)Unsafe.AsPointer(ref this), Name); + ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((ID3DUserDefinedAnnotation*)Unsafe.AsPointer(ref this), Name); } /// @@ -105,13 +105,13 @@ public unsafe partial struct ID3DUserDefinedAnnotation : ID3DUserDefinedAnnotati public interface Interface : IUnknown.Interface { [VtblIndex(3)] - int BeginEvent(ushort* Name); + int BeginEvent(char* Name); [VtblIndex(4)] int EndEvent(); [VtblIndex(5)] - void SetMarker(ushort* Name); + void SetMarker(char* Name); [VtblIndex(6)] Bool32 GetStatus(); diff --git a/src/Vortice.Win32.Graphics.Direct3D11/ID3DUserDefinedAnnotation.cs b/src/Vortice.Win32.Graphics.Direct3D11/ID3DUserDefinedAnnotation.cs index e3c9701..04867d0 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/ID3DUserDefinedAnnotation.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/ID3DUserDefinedAnnotation.cs @@ -9,7 +9,7 @@ unsafe partial struct ID3DUserDefinedAnnotation { fixed (char* namePtr = name) { - return BeginEvent((ushort*)namePtr); + return BeginEvent(namePtr); } } @@ -17,7 +17,7 @@ unsafe partial struct ID3DUserDefinedAnnotation { fixed (char* namePtr = name) { - return BeginEvent((ushort*)namePtr); + return BeginEvent(namePtr); } } @@ -25,7 +25,7 @@ unsafe partial struct ID3DUserDefinedAnnotation { fixed (char* namePtr = name) { - SetMarker((ushort*)namePtr); + SetMarker(namePtr); } } @@ -33,7 +33,7 @@ unsafe partial struct ID3DUserDefinedAnnotation { fixed (char* namePtr = name) { - SetMarker((ushort*)namePtr); + SetMarker(namePtr); } } } diff --git a/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/Graphics.Direct3D11on12.Apis.Functions.cs b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/Graphics.Direct3D11on12.Apis.Functions.cs index b698b5e..6d8820a 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/Graphics.Direct3D11on12.Apis.Functions.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/Graphics.Direct3D11on12.Apis.Functions.cs @@ -12,6 +12,6 @@ namespace Win32.Graphics.Direct3D11on12; public static unsafe partial class Apis { /// - [DllImport("d3d11.dll", ExactSpelling = true)] - public static extern HResult D3D11On12CreateDevice(IUnknown* pDevice, Graphics.Direct3D11.CreateDeviceFlags Flags, Graphics.Direct3D.FeatureLevel* pFeatureLevels, uint FeatureLevels, IUnknown** ppCommandQueues, uint NumQueues, uint NodeMask, Graphics.Direct3D11.ID3D11Device** ppDevice, Graphics.Direct3D11.ID3D11DeviceContext** ppImmediateContext, Graphics.Direct3D.FeatureLevel* pChosenFeatureLevel); + [LibraryImport("d3d11.dll")] + public static partial HResult D3D11On12CreateDevice(IUnknown* pDevice, Graphics.Direct3D11.CreateDeviceFlags Flags, Graphics.Direct3D.FeatureLevel* pFeatureLevels, uint FeatureLevels, IUnknown** ppCommandQueues, uint NumQueues, uint NodeMask, Graphics.Direct3D11.ID3D11Device** ppDevice, Graphics.Direct3D11.ID3D11DeviceContext** ppImmediateContext, Graphics.Direct3D.FeatureLevel* pChosenFeatureLevel); } diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Apis.cs b/src/Vortice.Win32.Graphics.Direct3D12/Apis.cs index 115d5cf..5dfa218 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Apis.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Apis.cs @@ -2,7 +2,7 @@ // Ported from d3dx12.h in DirectX-Graphics-Samples commit a7a87f1853b5540f10920518021d91ae641033fb // Original source is Copyright Microsoft. All rights reserved. Licensed under the MIT License (MIT). -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Direct3D; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/BarrierGroup.Manual.cs b/src/Vortice.Win32.Graphics.Direct3D12/BarrierGroup.Manual.cs index b76c43c..cd70a0c 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/BarrierGroup.Manual.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/BarrierGroup.Manual.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/BarrierSubresourceRange.Manual.cs b/src/Vortice.Win32.Graphics.Direct3D12/BarrierSubresourceRange.Manual.cs index eb2efcd..d05c3ba 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/BarrierSubresourceRange.Manual.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/BarrierSubresourceRange.Manual.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/BlendDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/BlendDescription.cs index 8d9e94a..eee0791 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/BlendDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/BlendDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using static Win32.Graphics.Direct3D12.Apis; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Box.cs b/src/Vortice.Win32.Graphics.Direct3D12/Box.cs index 70b9b4d..811d673 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Box.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Box.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/ClearValue.cs b/src/Vortice.Win32.Graphics.Direct3D12/ClearValue.cs index 2e0ddc2..6d6b1b9 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/ClearValue.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/ClearValue.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/CommandQueueDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/CommandQueueDescription.cs index 08f7f39..2d6aa8b 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/CommandQueueDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/CommandQueueDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using static Win32.Graphics.Direct3D12.Apis; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/CpuDescriptorHandle.cs b/src/Vortice.Win32.Graphics.Direct3D12/CpuDescriptorHandle.cs index 0895a5f..bd9a6b3 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/CpuDescriptorHandle.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/CpuDescriptorHandle.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilDescription.cs index b8b2849..8f51860 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using static Win32.Graphics.Direct3D12.Apis; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilDescription1.cs index ddbd235..0924894 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilDescription1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilDescription1.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using static Win32.Graphics.Direct3D12.Apis; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilOperationDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilOperationDescription.cs index 4b08390..16dfc8d 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilOperationDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilOperationDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilValue.cs b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilValue.cs index ea34510..95da4d0 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilValue.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilValue.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilViewDescription.cs index 7a448ed..98b6f53 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilViewDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilViewDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/DescriptorRange.cs b/src/Vortice.Win32.Graphics.Direct3D12/DescriptorRange.cs index c427612..24d130a 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/DescriptorRange.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/DescriptorRange.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using static Win32.Graphics.Direct3D12.Apis; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/DescriptorRange1.cs b/src/Vortice.Win32.Graphics.Direct3D12/DescriptorRange1.cs index 503b75b..d23177e 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/DescriptorRange1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/DescriptorRange1.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using static Win32.Graphics.Direct3D12.Apis; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Apis.Functions.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Apis.Functions.cs index c842f14..9055a1f 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Apis.Functions.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Apis.Functions.cs @@ -12,34 +12,34 @@ namespace Win32.Graphics.Direct3D12; public static unsafe partial class Apis { /// - [DllImport("d3d12.dll", ExactSpelling = true)] - public static extern HResult D3D12SerializeRootSignature(RootSignatureDescription* pRootSignature, RootSignatureVersion Version, Graphics.Direct3D.ID3DBlob** ppBlob, Graphics.Direct3D.ID3DBlob** ppErrorBlob); + [LibraryImport("d3d12.dll")] + public static partial HResult D3D12SerializeRootSignature(RootSignatureDescription* pRootSignature, RootSignatureVersion Version, Graphics.Direct3D.ID3DBlob** ppBlob, Graphics.Direct3D.ID3DBlob** ppErrorBlob); /// - [DllImport("d3d12.dll", ExactSpelling = true)] - public static extern HResult D3D12CreateRootSignatureDeserializer(void* pSrcData, nuint SrcDataSizeInBytes, Guid* pRootSignatureDeserializerInterface, void** ppRootSignatureDeserializer); + [LibraryImport("d3d12.dll")] + public static partial HResult D3D12CreateRootSignatureDeserializer(void* pSrcData, nuint SrcDataSizeInBytes, Guid* pRootSignatureDeserializerInterface, void** ppRootSignatureDeserializer); /// - [DllImport("d3d12.dll", ExactSpelling = true)] - public static extern HResult D3D12SerializeVersionedRootSignature(VersionedRootSignatureDescription* pRootSignature, Graphics.Direct3D.ID3DBlob** ppBlob, Graphics.Direct3D.ID3DBlob** ppErrorBlob); + [LibraryImport("d3d12.dll")] + public static partial HResult D3D12SerializeVersionedRootSignature(VersionedRootSignatureDescription* pRootSignature, Graphics.Direct3D.ID3DBlob** ppBlob, Graphics.Direct3D.ID3DBlob** ppErrorBlob); /// - [DllImport("d3d12.dll", ExactSpelling = true)] - public static extern HResult D3D12CreateVersionedRootSignatureDeserializer(void* pSrcData, nuint SrcDataSizeInBytes, Guid* pRootSignatureDeserializerInterface, void** ppRootSignatureDeserializer); + [LibraryImport("d3d12.dll")] + public static partial HResult D3D12CreateVersionedRootSignatureDeserializer(void* pSrcData, nuint SrcDataSizeInBytes, Guid* pRootSignatureDeserializerInterface, void** ppRootSignatureDeserializer); /// - [DllImport("d3d12.dll", ExactSpelling = true)] - public static extern HResult D3D12CreateDevice(IUnknown* pAdapter, Graphics.Direct3D.FeatureLevel MinimumFeatureLevel, Guid* riid, void** ppDevice); + [LibraryImport("d3d12.dll")] + public static partial HResult D3D12CreateDevice(IUnknown* pAdapter, Graphics.Direct3D.FeatureLevel MinimumFeatureLevel, Guid* riid, void** ppDevice); /// - [DllImport("d3d12.dll", ExactSpelling = true)] - public static extern HResult D3D12GetDebugInterface(Guid* riid, void** ppvDebug); + [LibraryImport("d3d12.dll")] + public static partial HResult D3D12GetDebugInterface(Guid* riid, void** ppvDebug); /// - [DllImport("d3d12.dll", ExactSpelling = true)] - public static extern HResult D3D12EnableExperimentalFeatures(uint NumFeatures, Guid* pIIDs, void* pConfigurationStructs, uint* pConfigurationStructSizes); + [LibraryImport("d3d12.dll")] + public static partial HResult D3D12EnableExperimentalFeatures(uint NumFeatures, Guid* pIIDs, void* pConfigurationStructs, uint* pConfigurationStructSizes); /// - [DllImport("d3d12.dll", ExactSpelling = true)] - public static extern HResult D3D12GetInterface(Guid* rclsid, Guid* riid, void** ppvDebug); + [LibraryImport("d3d12.dll")] + public static partial HResult D3D12GetInterface(Guid* rclsid, Guid* riid, void** ppvDebug); } diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Structs.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Structs.cs index 9914763..4826e9e 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Structs.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Structs.cs @@ -3747,7 +3747,7 @@ public partial struct ProtectedResourceSessionDescription public partial struct MetaCommandParameterDescription { /// - public unsafe ushort* Name; + public unsafe char* Name; /// public MetaCommandParameterType Type; @@ -3770,7 +3770,7 @@ public partial struct MetaCommandDescription public Guid Id; /// - public unsafe ushort* Name; + public unsafe char* Name; /// public GraphicsStates InitializationDirtyState; @@ -3792,7 +3792,7 @@ public partial struct ProgramIdentifier public partial struct NodeId { /// - public unsafe ushort* Name; + public unsafe char* Name; /// public uint ArrayIndex; @@ -3892,10 +3892,10 @@ public partial struct DepthStencilFormat public partial struct ExportDescription { /// - public unsafe ushort* Name; + public unsafe char* Name; /// - public unsafe ushort* ExportToRename; + public unsafe char* ExportToRename; /// public ExportFlags Flags; @@ -3940,7 +3940,7 @@ public partial struct SubObjectToExportsAssociation public uint NumExports; /// - public unsafe ushort** pExports; + public unsafe char** pExports; } /// @@ -3948,13 +3948,13 @@ public partial struct SubObjectToExportsAssociation public partial struct DxilSubObjectToExportsAssociation { /// - public unsafe ushort* SubobjectToAssociate; + public unsafe char* SubobjectToAssociate; /// public uint NumExports; /// - public unsafe ushort** pExports; + public unsafe char** pExports; } /// @@ -3962,19 +3962,19 @@ public partial struct DxilSubObjectToExportsAssociation public partial struct HitGroupDescription { /// - public unsafe ushort* HitGroupExport; + public unsafe char* HitGroupExport; /// public HitGroupType Type; /// - public unsafe ushort* AnyHitShaderImport; + public unsafe char* AnyHitShaderImport; /// - public unsafe ushort* ClosestHitShaderImport; + public unsafe char* ClosestHitShaderImport; /// - public unsafe ushort* IntersectionShaderImport; + public unsafe char* IntersectionShaderImport; } /// @@ -4130,7 +4130,7 @@ public partial struct CommonComputeNodeOverrides public partial struct ShaderNode { /// - public unsafe ushort* Shader; + public unsafe char* Shader; /// public NodeOverridesType OverridesType; @@ -4233,7 +4233,7 @@ public partial struct Node public partial struct WorkGraphDescription { /// - public unsafe ushort* ProgramName; + public unsafe char* ProgramName; /// public WorkGraphFlags Flags; @@ -4256,13 +4256,13 @@ public partial struct WorkGraphDescription public partial struct GenericProgramDescription { /// - public unsafe ushort* ProgramName; + public unsafe char* ProgramName; /// public uint NumExports; /// - public unsafe ushort** pExports; + public unsafe char** pExports; /// public uint NumSubobjects; @@ -4634,13 +4634,13 @@ public partial struct AutoBreadcrumbNode public unsafe byte* pCommandListDebugNameA; /// - public unsafe ushort* pCommandListDebugNameW; + public unsafe char* pCommandListDebugNameW; /// public unsafe byte* pCommandQueueDebugNameA; /// - public unsafe ushort* pCommandQueueDebugNameW; + public unsafe char* pCommandQueueDebugNameW; /// public unsafe ID3D12GraphicsCommandList* pCommandList; @@ -4669,7 +4669,7 @@ public partial struct DredBreadcrumbContext public uint BreadcrumbIndex; /// - public unsafe ushort* pContextString; + public unsafe char* pContextString; } /// @@ -4680,13 +4680,13 @@ public partial struct AutoBreadcrumbNode1 public unsafe byte* pCommandListDebugNameA; /// - public unsafe ushort* pCommandListDebugNameW; + public unsafe char* pCommandListDebugNameW; /// public unsafe byte* pCommandQueueDebugNameA; /// - public unsafe ushort* pCommandQueueDebugNameW; + public unsafe char* pCommandQueueDebugNameW; /// public unsafe ID3D12GraphicsCommandList* pCommandList; @@ -4732,7 +4732,7 @@ public partial struct DredAllocationNode public unsafe byte* ObjectNameA; /// - public unsafe ushort* ObjectNameW; + public unsafe char* ObjectNameW; /// public DredAllocationType AllocationType; @@ -4749,7 +4749,7 @@ public partial struct DredAllocationNode1 public unsafe byte* ObjectNameA; /// - public unsafe ushort* ObjectNameW; + public unsafe char* ObjectNameW; /// public DredAllocationType AllocationType; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandAllocator.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandAllocator.cs index ca8c4c3..dcac7d4 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandAllocator.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandAllocator.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12CommandAllocator : ID3D12CommandAllocator.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12CommandAllocator*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12CommandAllocator*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandList.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandList.cs index e3be7bb..dfe8b98 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandList.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandList.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12CommandList : ID3D12CommandList.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12CommandList*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12CommandList*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandQueue.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandQueue.cs index d395fdd..c74dd98 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandQueue.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandQueue.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12CommandQueue : ID3D12CommandQueue.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12CommandQueue*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12CommandQueue*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandSignature.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandSignature.cs index d1d59f4..c753107 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandSignature.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandSignature.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12CommandSignature : ID3D12CommandSignature.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12CommandSignature*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12CommandSignature*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DescriptorHeap.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DescriptorHeap.cs index a150c7b..9ef8d2f 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DescriptorHeap.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DescriptorHeap.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12DescriptorHeap : ID3D12DescriptorHeap.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12DescriptorHeap*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12DescriptorHeap*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device.cs index 18d1f5d..5fee66f 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device : ID3D12Device.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device : ID3D12Device.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device : ID3D12Device.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// @@ -476,13 +476,13 @@ public unsafe partial struct ID3D12Device : ID3D12Device.Interface, INativeGuid HResult CreateReservedResource(ResourceDescription* pDesc, ResourceStates InitialState, ClearValue* pOptimizedClearValue, Guid* riid, void** ppvResource); [VtblIndex(31)] - HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle); + HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle); [VtblIndex(32)] HResult OpenSharedHandle(Handle NTHandle, Guid* riid, void** ppvObj); [VtblIndex(33)] - HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle); + HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle); [VtblIndex(34)] HResult MakeResident(uint NumObjects, ID3D12Pageable** ppObjects); diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device1.cs index 580cb8f..25f4248 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device1.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device1 : ID3D12Device1.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device1*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device1*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device1 : ID3D12Device1.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device1 : ID3D12Device1.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device1*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device1*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device10.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device10.cs index 545d94b..4ad7f73 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device10.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device10.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device10 : ID3D12Device10.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device10*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device10*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device10 : ID3D12Device10.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device10*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device10*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device10 : ID3D12Device10.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device10*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device10*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device11.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device11.cs index 317a4f8..c2d56e8 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device11.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device11.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device11 : ID3D12Device11.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device11*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device11*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device11 : ID3D12Device11.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device11*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device11*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device11 : ID3D12Device11.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device11*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device11*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device12.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device12.cs index d150642..4d3edcf 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device12.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device12.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device12 : ID3D12Device12.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device12*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device12*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device12 : ID3D12Device12.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device12*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device12*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device12 : ID3D12Device12.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device12*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device12*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device13.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device13.cs index 631f433..bb2c673 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device13.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device13.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device13 : ID3D12Device13.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device13*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device13*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device13 : ID3D12Device13.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device13*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device13*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device13 : ID3D12Device13.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device13*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device13*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device14.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device14.cs index 1e9f0db..a904366 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device14.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device14.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device14 : ID3D12Device14.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device14*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device14*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device14 : ID3D12Device14.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device14*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device14*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device14 : ID3D12Device14.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device14*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device14*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// @@ -711,15 +711,15 @@ public unsafe partial struct ID3D12Device14 : ID3D12Device14.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(82)] - public HResult CreateRootSignatureFromSubobjectInLibrary(uint nodeMask, void* pLibraryBlob, nuint blobLengthInBytes, ushort* subobjectName, Guid* riid, void** ppvRootSignature) + public HResult CreateRootSignatureFromSubobjectInLibrary(uint nodeMask, void* pLibraryBlob, nuint blobLengthInBytes, char* subobjectName, Guid* riid, void** ppvRootSignature) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[82]))((ID3D12Device14*)Unsafe.AsPointer(ref this), nodeMask, pLibraryBlob, blobLengthInBytes, subobjectName, riid, ppvRootSignature); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[82]))((ID3D12Device14*)Unsafe.AsPointer(ref this), nodeMask, pLibraryBlob, blobLengthInBytes, subobjectName, riid, ppvRootSignature); } public interface Interface : ID3D12Device13.Interface { [VtblIndex(82)] - HResult CreateRootSignatureFromSubobjectInLibrary(uint nodeMask, void* pLibraryBlob, nuint blobLengthInBytes, ushort* subobjectName, Guid* riid, void** ppvRootSignature); + HResult CreateRootSignatureFromSubobjectInLibrary(uint nodeMask, void* pLibraryBlob, nuint blobLengthInBytes, char* subobjectName, Guid* riid, void** ppvRootSignature); } } diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device2.cs index f38ce95..c0e6f1b 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device2.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device2.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device2 : ID3D12Device2.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device2*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device2*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device2 : ID3D12Device2.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device2 : ID3D12Device2.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device2*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device2*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device3.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device3.cs index a695a96..efa95f5 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device3.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device3.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device3 : ID3D12Device3.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device3*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device3*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device3 : ID3D12Device3.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device3 : ID3D12Device3.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device3*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device3*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device4.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device4.cs index 54dcd20..5672d63 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device4.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device4.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device4 : ID3D12Device4.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device4*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device4*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device4 : ID3D12Device4.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device4 : ID3D12Device4.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device4*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device4*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device5.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device5.cs index 1bf2c54..74413ba 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device5.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device5.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device5 : ID3D12Device5.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device5*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device5*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device5 : ID3D12Device5.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device5 : ID3D12Device5.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device5*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device5*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device6.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device6.cs index 6abe369..8ac5bdb 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device6.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device6.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device6 : ID3D12Device6.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device6*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device6*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device6 : ID3D12Device6.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device6 : ID3D12Device6.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device6*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device6*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device7.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device7.cs index c73c7b5..e152b0f 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device7.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device7.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device7 : ID3D12Device7.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device7*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device7*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device7 : ID3D12Device7.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device7 : ID3D12Device7.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device7*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device7*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device8.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device8.cs index b6d1da5..c918ad2 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device8.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device8.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device8 : ID3D12Device8.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device8*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device8*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device8 : ID3D12Device8.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device8 : ID3D12Device8.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device8*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device8*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device9.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device9.cs index 2a930cc..1cec46a 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device9.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device9.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Device9 : ID3D12Device9.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device9*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Device9*)Unsafe.AsPointer(ref this), Name); } /// @@ -299,9 +299,9 @@ public unsafe partial struct ID3D12Device9 : ID3D12Device9.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle) + public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, char* Name, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle); } /// @@ -315,9 +315,9 @@ public unsafe partial struct ID3D12Device9 : ID3D12Device9.Interface, INativeGui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(33)] - public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle) + public HResult OpenSharedHandleByName(char* Name, uint Access, Handle* pNTHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device9*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[33]))((ID3D12Device9*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceChild.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceChild.cs index ad1c7aa..4683cc3 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceChild.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceChild.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12DeviceChild : ID3D12DeviceChild.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12DeviceChild*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12DeviceChild*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceConfiguration1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceConfiguration1.cs index 38902c2..c401b72 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceConfiguration1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceConfiguration1.cs @@ -106,15 +106,15 @@ public unsafe partial struct ID3D12DeviceConfiguration1 : ID3D12DeviceConfigurat /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CreateVersionedRootSignatureDeserializerFromSubobjectInLibrary(void* pLibraryBlob, nuint Size, ushort* RootSignatureSubobjectName, Guid* riid, void** ppvDeserializer) + public HResult CreateVersionedRootSignatureDeserializerFromSubobjectInLibrary(void* pLibraryBlob, nuint Size, char* RootSignatureSubobjectName, Guid* riid, void** ppvDeserializer) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((ID3D12DeviceConfiguration1*)Unsafe.AsPointer(ref this), pLibraryBlob, Size, RootSignatureSubobjectName, riid, ppvDeserializer); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((ID3D12DeviceConfiguration1*)Unsafe.AsPointer(ref this), pLibraryBlob, Size, RootSignatureSubobjectName, riid, ppvDeserializer); } public interface Interface : ID3D12DeviceConfiguration.Interface { [VtblIndex(7)] - HResult CreateVersionedRootSignatureDeserializerFromSubobjectInLibrary(void* pLibraryBlob, nuint Size, ushort* RootSignatureSubobjectName, Guid* riid, void** ppvDeserializer); + HResult CreateVersionedRootSignatureDeserializerFromSubobjectInLibrary(void* pLibraryBlob, nuint Size, char* RootSignatureSubobjectName, Guid* riid, void** ppvDeserializer); } } diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Fence.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Fence.cs index 2a31e66..0f92ff4 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Fence.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Fence.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Fence : ID3D12Fence.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Fence*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Fence*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Fence1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Fence1.cs index 3b052f0..e028876 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Fence1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Fence1.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Fence1 : ID3D12Fence1.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Fence1*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Fence1*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs index 4b7742a..5271a08 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12GraphicsCommandList : ID3D12GraphicsCommandLi /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs index 71c1563..dee0076 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12GraphicsCommandList1 : ID3D12GraphicsCommandL /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList10.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList10.cs index b2fb21b..93fbfe1 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList10.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList10.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12GraphicsCommandList10 : ID3D12GraphicsCommand /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList10*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList10*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs index e862fef..0cd70ac 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12GraphicsCommandList2 : ID3D12GraphicsCommandL /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs index 3d0a7da..8e0ac71 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12GraphicsCommandList3 : ID3D12GraphicsCommandL /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs index 05449b5..af2a7af 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12GraphicsCommandList4 : ID3D12GraphicsCommandL /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs index 860a7b0..7f91d07 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12GraphicsCommandList5 : ID3D12GraphicsCommandL /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs index c1f79c6..faed9b9 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12GraphicsCommandList6 : ID3D12GraphicsCommandL /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList7.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList7.cs index b387fc9..7bd43ca 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList7.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList7.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12GraphicsCommandList7 : ID3D12GraphicsCommandL /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList8.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList8.cs index 0313223..7345fad 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList8.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList8.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12GraphicsCommandList8 : ID3D12GraphicsCommandL /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList8*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList8*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList9.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList9.cs index 42f5ad4..7c353b6 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList9.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList9.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12GraphicsCommandList9 : ID3D12GraphicsCommandL /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList9*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12GraphicsCommandList9*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Heap.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Heap.cs index 12bdf19..ca9ac67 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Heap.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Heap.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Heap : ID3D12Heap.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Heap*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Heap*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Heap1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Heap1.cs index f55bbdd..03e12d9 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Heap1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Heap1.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Heap1 : ID3D12Heap1.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Heap1*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Heap1*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12LifetimeTracker.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12LifetimeTracker.cs index 61e1fc7..d2daeef 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12LifetimeTracker.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12LifetimeTracker.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12LifetimeTracker : ID3D12LifetimeTracker.Inter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12LifetimeTracker*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12LifetimeTracker*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12MetaCommand.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12MetaCommand.cs index d2443b3..dbca102 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12MetaCommand.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12MetaCommand.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12MetaCommand : ID3D12MetaCommand.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12MetaCommand*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12MetaCommand*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Object.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Object.cs index 866497c..9948604 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Object.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Object.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Object : ID3D12Object.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Object*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Object*)Unsafe.AsPointer(ref this), Name); } public interface Interface : IUnknown.Interface @@ -114,7 +114,7 @@ public unsafe partial struct ID3D12Object : ID3D12Object.Interface, INativeGuid HResult SetPrivateDataInterface(Guid* guid, IUnknown* pData); [VtblIndex(6)] - HResult SetName(ushort* Name); + HResult SetName(char* Name); } } diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Pageable.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Pageable.cs index 193b713..6117c04 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Pageable.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Pageable.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Pageable : ID3D12Pageable.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Pageable*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Pageable*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineLibrary.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineLibrary.cs index 4fbba0e..888ba83 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineLibrary.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineLibrary.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12PipelineLibrary : ID3D12PipelineLibrary.Inter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12PipelineLibrary*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12PipelineLibrary*)Unsafe.AsPointer(ref this), Name); } /// @@ -113,25 +113,25 @@ public unsafe partial struct ID3D12PipelineLibrary : ID3D12PipelineLibrary.Inter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult StorePipeline(ushort* pName, ID3D12PipelineState* pPipeline) + public HResult StorePipeline(char* pName, ID3D12PipelineState* pPipeline) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((ID3D12PipelineLibrary*)Unsafe.AsPointer(ref this), pName, pPipeline); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((ID3D12PipelineLibrary*)Unsafe.AsPointer(ref this), pName, pPipeline); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult LoadGraphicsPipeline(ushort* pName, GraphicsPipelineStateDescription* pDesc, Guid* riid, void** ppPipelineState) + public HResult LoadGraphicsPipeline(char* pName, GraphicsPipelineStateDescription* pDesc, Guid* riid, void** ppPipelineState) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((ID3D12PipelineLibrary*)Unsafe.AsPointer(ref this), pName, pDesc, riid, ppPipelineState); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((ID3D12PipelineLibrary*)Unsafe.AsPointer(ref this), pName, pDesc, riid, ppPipelineState); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult LoadComputePipeline(ushort* pName, ComputePipelineStateDescription* pDesc, Guid* riid, void** ppPipelineState) + public HResult LoadComputePipeline(char* pName, ComputePipelineStateDescription* pDesc, Guid* riid, void** ppPipelineState) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((ID3D12PipelineLibrary*)Unsafe.AsPointer(ref this), pName, pDesc, riid, ppPipelineState); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((ID3D12PipelineLibrary*)Unsafe.AsPointer(ref this), pName, pDesc, riid, ppPipelineState); } /// @@ -153,13 +153,13 @@ public unsafe partial struct ID3D12PipelineLibrary : ID3D12PipelineLibrary.Inter public interface Interface : ID3D12DeviceChild.Interface { [VtblIndex(8)] - HResult StorePipeline(ushort* pName, ID3D12PipelineState* pPipeline); + HResult StorePipeline(char* pName, ID3D12PipelineState* pPipeline); [VtblIndex(9)] - HResult LoadGraphicsPipeline(ushort* pName, GraphicsPipelineStateDescription* pDesc, Guid* riid, void** ppPipelineState); + HResult LoadGraphicsPipeline(char* pName, GraphicsPipelineStateDescription* pDesc, Guid* riid, void** ppPipelineState); [VtblIndex(10)] - HResult LoadComputePipeline(ushort* pName, ComputePipelineStateDescription* pDesc, Guid* riid, void** ppPipelineState); + HResult LoadComputePipeline(char* pName, ComputePipelineStateDescription* pDesc, Guid* riid, void** ppPipelineState); [VtblIndex(11)] nuint GetSerializedSize(); diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineLibrary1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineLibrary1.cs index 4975bfd..3683712 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineLibrary1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineLibrary1.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12PipelineLibrary1 : ID3D12PipelineLibrary1.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12PipelineLibrary1*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12PipelineLibrary1*)Unsafe.AsPointer(ref this), Name); } /// @@ -113,25 +113,25 @@ public unsafe partial struct ID3D12PipelineLibrary1 : ID3D12PipelineLibrary1.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult StorePipeline(ushort* pName, ID3D12PipelineState* pPipeline) + public HResult StorePipeline(char* pName, ID3D12PipelineState* pPipeline) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((ID3D12PipelineLibrary1*)Unsafe.AsPointer(ref this), pName, pPipeline); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((ID3D12PipelineLibrary1*)Unsafe.AsPointer(ref this), pName, pPipeline); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult LoadGraphicsPipeline(ushort* pName, GraphicsPipelineStateDescription* pDesc, Guid* riid, void** ppPipelineState) + public HResult LoadGraphicsPipeline(char* pName, GraphicsPipelineStateDescription* pDesc, Guid* riid, void** ppPipelineState) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((ID3D12PipelineLibrary1*)Unsafe.AsPointer(ref this), pName, pDesc, riid, ppPipelineState); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((ID3D12PipelineLibrary1*)Unsafe.AsPointer(ref this), pName, pDesc, riid, ppPipelineState); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult LoadComputePipeline(ushort* pName, ComputePipelineStateDescription* pDesc, Guid* riid, void** ppPipelineState) + public HResult LoadComputePipeline(char* pName, ComputePipelineStateDescription* pDesc, Guid* riid, void** ppPipelineState) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((ID3D12PipelineLibrary1*)Unsafe.AsPointer(ref this), pName, pDesc, riid, ppPipelineState); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((ID3D12PipelineLibrary1*)Unsafe.AsPointer(ref this), pName, pDesc, riid, ppPipelineState); } /// @@ -153,15 +153,15 @@ public unsafe partial struct ID3D12PipelineLibrary1 : ID3D12PipelineLibrary1.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(13)] - public HResult LoadPipeline(ushort* pName, PipelineStateStreamDescription* pDesc, Guid* riid, void** ppPipelineState) + public HResult LoadPipeline(char* pName, PipelineStateStreamDescription* pDesc, Guid* riid, void** ppPipelineState) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((ID3D12PipelineLibrary1*)Unsafe.AsPointer(ref this), pName, pDesc, riid, ppPipelineState); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((ID3D12PipelineLibrary1*)Unsafe.AsPointer(ref this), pName, pDesc, riid, ppPipelineState); } public interface Interface : ID3D12PipelineLibrary.Interface { [VtblIndex(13)] - HResult LoadPipeline(ushort* pName, PipelineStateStreamDescription* pDesc, Guid* riid, void** ppPipelineState); + HResult LoadPipeline(char* pName, PipelineStateStreamDescription* pDesc, Guid* riid, void** ppPipelineState); } } diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineState.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineState.cs index e313544..69b8048 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineState.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineState.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12PipelineState : ID3D12PipelineState.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12PipelineState*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12PipelineState*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedResourceSession.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedResourceSession.cs index f85454a..c3eabc0 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedResourceSession.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedResourceSession.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12ProtectedResourceSession : ID3D12ProtectedRes /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12ProtectedResourceSession*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12ProtectedResourceSession*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedResourceSession1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedResourceSession1.cs index a144722..0cfbf96 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedResourceSession1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedResourceSession1.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12ProtectedResourceSession1 : ID3D12ProtectedRe /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12ProtectedResourceSession1*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12ProtectedResourceSession1*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedSession.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedSession.cs index 4e90bf7..df03f61 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedSession.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedSession.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12ProtectedSession : ID3D12ProtectedSession.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12ProtectedSession*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12ProtectedSession*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12QueryHeap.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12QueryHeap.cs index a14a195..c7e2369 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12QueryHeap.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12QueryHeap.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12QueryHeap : ID3D12QueryHeap.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12QueryHeap*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12QueryHeap*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource.cs index 2f05765..6e4bb01 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Resource : ID3D12Resource.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Resource*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Resource*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource1.cs index fe29e51..4ae04db 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource1.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Resource1 : ID3D12Resource1.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Resource1*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Resource1*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource2.cs index 948677a..e212c46 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource2.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource2.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12Resource2 : ID3D12Resource2.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Resource2*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12Resource2*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12RootSignature.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12RootSignature.cs index fc35131..89f016b 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12RootSignature.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12RootSignature.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12RootSignature : ID3D12RootSignature.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12RootSignature*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12RootSignature*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderCacheSession.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderCacheSession.cs index 9f318e2..11a3100 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderCacheSession.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderCacheSession.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12ShaderCacheSession : ID3D12ShaderCacheSession /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12ShaderCacheSession*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12ShaderCacheSession*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObject.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObject.cs index 55572ca..5178307 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObject.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObject.cs @@ -97,9 +97,9 @@ public unsafe partial struct ID3D12StateObject : ID3D12StateObject.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetName(ushort* Name) + public HResult SetName(char* Name) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12StateObject*)Unsafe.AsPointer(ref this), Name); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((ID3D12StateObject*)Unsafe.AsPointer(ref this), Name); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObjectProperties.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObjectProperties.cs index 708da7e..631826c 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObjectProperties.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObjectProperties.cs @@ -73,17 +73,17 @@ public unsafe partial struct ID3D12StateObjectProperties : ID3D12StateObjectProp /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public void* GetShaderIdentifier(ushort* pExportName) + public void* GetShaderIdentifier(char* pExportName) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((ID3D12StateObjectProperties*)Unsafe.AsPointer(ref this), pExportName); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((ID3D12StateObjectProperties*)Unsafe.AsPointer(ref this), pExportName); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public ulong GetShaderStackSize(ushort* pExportName) + public ulong GetShaderStackSize(char* pExportName) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((ID3D12StateObjectProperties*)Unsafe.AsPointer(ref this), pExportName); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((ID3D12StateObjectProperties*)Unsafe.AsPointer(ref this), pExportName); } /// @@ -105,10 +105,10 @@ public unsafe partial struct ID3D12StateObjectProperties : ID3D12StateObjectProp public interface Interface : IUnknown.Interface { [VtblIndex(3)] - void* GetShaderIdentifier(ushort* pExportName); + void* GetShaderIdentifier(char* pExportName); [VtblIndex(4)] - ulong GetShaderStackSize(ushort* pExportName); + ulong GetShaderStackSize(char* pExportName); [VtblIndex(5)] ulong GetPipelineStackSize(); diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObjectProperties1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObjectProperties1.cs index 7f2a2ce..aef6d92 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObjectProperties1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObjectProperties1.cs @@ -73,17 +73,17 @@ public unsafe partial struct ID3D12StateObjectProperties1 : ID3D12StateObjectPro /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public void* GetShaderIdentifier(ushort* pExportName) + public void* GetShaderIdentifier(char* pExportName) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((ID3D12StateObjectProperties1*)Unsafe.AsPointer(ref this), pExportName); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((ID3D12StateObjectProperties1*)Unsafe.AsPointer(ref this), pExportName); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public ulong GetShaderStackSize(ushort* pExportName) + public ulong GetShaderStackSize(char* pExportName) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((ID3D12StateObjectProperties1*)Unsafe.AsPointer(ref this), pExportName); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((ID3D12StateObjectProperties1*)Unsafe.AsPointer(ref this), pExportName); } /// @@ -105,16 +105,16 @@ public unsafe partial struct ID3D12StateObjectProperties1 : ID3D12StateObjectPro /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public ProgramIdentifier GetProgramIdentifier(ushort* pProgramName) + public ProgramIdentifier GetProgramIdentifier(char* pProgramName) { ProgramIdentifier result; - return *((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((ID3D12StateObjectProperties1*)Unsafe.AsPointer(ref this), &result, pProgramName); + return *((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((ID3D12StateObjectProperties1*)Unsafe.AsPointer(ref this), &result, pProgramName); } public interface Interface : ID3D12StateObjectProperties.Interface { [VtblIndex(7)] - ProgramIdentifier GetProgramIdentifier(ushort* pProgramName); + ProgramIdentifier GetProgramIdentifier(char* pProgramName); } } diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12WorkGraphProperties.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12WorkGraphProperties.cs index 2c54435..ec3a182 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12WorkGraphProperties.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12WorkGraphProperties.cs @@ -81,17 +81,18 @@ public unsafe partial struct ID3D12WorkGraphProperties : ID3D12WorkGraphProperti /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public ushort* GetProgramName(uint WorkGraphIndex) + public char* GetProgramName(uint WorkGraphIndex) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((ID3D12WorkGraphProperties*)Unsafe.AsPointer(ref this), WorkGraphIndex); + char* result; + return *((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((ID3D12WorkGraphProperties*)Unsafe.AsPointer(ref this), &result, WorkGraphIndex); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public uint GetWorkGraphIndex(ushort* pProgramName) + public uint GetWorkGraphIndex(char* pProgramName) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((ID3D12WorkGraphProperties*)Unsafe.AsPointer(ref this), pProgramName); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((ID3D12WorkGraphProperties*)Unsafe.AsPointer(ref this), pProgramName); } /// @@ -182,10 +183,10 @@ public unsafe partial struct ID3D12WorkGraphProperties : ID3D12WorkGraphProperti uint GetNumWorkGraphs(); [VtblIndex(4)] - ushort* GetProgramName(uint WorkGraphIndex); + char* GetProgramName(uint WorkGraphIndex); [VtblIndex(5)] - uint GetWorkGraphIndex(ushort* pProgramName); + uint GetWorkGraphIndex(char* pProgramName); [VtblIndex(6)] uint GetNumNodes(uint WorkGraphIndex); diff --git a/src/Vortice.Win32.Graphics.Direct3D12/GpuDescriptorHandle.cs b/src/Vortice.Win32.Graphics.Direct3D12/GpuDescriptorHandle.cs index a7e0410..0693c16 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/GpuDescriptorHandle.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/GpuDescriptorHandle.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/HeapDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/HeapDescription.cs index 3cf62b9..9128d32 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/HeapDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/HeapDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/HeapProperties.cs b/src/Vortice.Win32.Graphics.Direct3D12/HeapProperties.cs index aeeecfb..f412c88 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/HeapProperties.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/HeapProperties.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/ID3D12Device.cs b/src/Vortice.Win32.Graphics.Direct3D12/ID3D12Device.cs index d5f7a13..af73e05 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/ID3D12Device.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/ID3D12Device.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Direct3D; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/ID3D12GraphicsCommandList.cs b/src/Vortice.Win32.Graphics.Direct3D12/ID3D12GraphicsCommandList.cs index 4070b15..dc7f72a 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/ID3D12GraphicsCommandList.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/ID3D12GraphicsCommandList.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using static Win32.Graphics.Direct3D12.Apis; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/ID3D12Object.cs b/src/Vortice.Win32.Graphics.Direct3D12/ID3D12Object.cs index 6683288..720c86b 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/ID3D12Object.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/ID3D12Object.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; @@ -10,7 +10,7 @@ public static unsafe class ID3D12ObjectExtensions { fixed (char* namePtr = name) { - _ = self.SetName((ushort*)namePtr); + _ = self.SetName(namePtr); } } @@ -19,7 +19,7 @@ public static unsafe class ID3D12ObjectExtensions { fixed (char* namePtr = name) { - _ = self.SetName((ushort*)namePtr); + _ = self.SetName(namePtr); } } } diff --git a/src/Vortice.Win32.Graphics.Direct3D12/IndexBufferView.cs b/src/Vortice.Win32.Graphics.Direct3D12/IndexBufferView.cs index b844fbd..981a5c1 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/IndexBufferView.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/IndexBufferView.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/MeshShaderPipelineStateDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/MeshShaderPipelineStateDescription.cs index e3d1bdb..416276c 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/MeshShaderPipelineStateDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/MeshShaderPipelineStateDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/MipRegion.cs b/src/Vortice.Win32.Graphics.Direct3D12/MipRegion.cs index 4ee9b08..33c9dad 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/MipRegion.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/MipRegion.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/QueryHeapDescription.Manual.cs b/src/Vortice.Win32.Graphics.Direct3D12/QueryHeapDescription.Manual.cs index 7cc85b9..1c270c1 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/QueryHeapDescription.Manual.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/QueryHeapDescription.Manual.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Range.cs b/src/Vortice.Win32.Graphics.Direct3D12/Range.cs index 7644dcf..7235641 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/Range.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/Range.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RangeUInt64.cs b/src/Vortice.Win32.Graphics.Direct3D12/RangeUInt64.cs index 49f775e..9604ba9 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RangeUInt64.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RangeUInt64.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RasterizerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/RasterizerDescription.cs index 9c4c0b0..607fa61 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RasterizerDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RasterizerDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using static Win32.Graphics.Direct3D12.Apis; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RenderPassBeginningAccess.cs b/src/Vortice.Win32.Graphics.Direct3D12/RenderPassBeginningAccess.cs index cfff16e..5dbff17 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RenderPassBeginningAccess.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RenderPassBeginningAccess.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RenderPassBeginningAccessClearParameters.cs b/src/Vortice.Win32.Graphics.Direct3D12/RenderPassBeginningAccessClearParameters.cs index c17b8a7..4f85a0d 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RenderPassBeginningAccessClearParameters.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RenderPassBeginningAccessClearParameters.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RenderPassDepthStencilDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/RenderPassDepthStencilDescription.cs index a16882f..e175b01 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RenderPassDepthStencilDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RenderPassDepthStencilDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RenderPassEndingAccess.cs b/src/Vortice.Win32.Graphics.Direct3D12/RenderPassEndingAccess.cs index 9bd7720..c068020 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RenderPassEndingAccess.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RenderPassEndingAccess.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RenderPassEndingAccessResolveParameters.cs b/src/Vortice.Win32.Graphics.Direct3D12/RenderPassEndingAccessResolveParameters.cs index e49c3d7..11ca0ea 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RenderPassEndingAccessResolveParameters.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RenderPassEndingAccessResolveParameters.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RenderPassRenderTargetDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/RenderPassRenderTargetDescription.cs index 47e2991..361d455 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RenderPassRenderTargetDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RenderPassRenderTargetDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RenderTargetViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/RenderTargetViewDescription.cs index f49f8ac..f19cd19 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RenderTargetViewDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RenderTargetViewDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/ResourceBarrier.cs b/src/Vortice.Win32.Graphics.Direct3D12/ResourceBarrier.cs index 323ed50..4c576f7 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/ResourceBarrier.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/ResourceBarrier.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using static Win32.Graphics.Direct3D12.Apis; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/ResourceDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/ResourceDescription.cs index d1040ff..49b99ae 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/ResourceDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/ResourceDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/ResourceDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D12/ResourceDescription1.cs index ee1bb84..d6ea533 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/ResourceDescription1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/ResourceDescription1.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RootConstants.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootConstants.cs index c301f2c..84c8726 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RootConstants.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RootConstants.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptor.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptor.cs index f075038..537954f 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptor.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptor.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptor1.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptor1.cs index f437d2e..1a54580 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptor1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptor1.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptorTable.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptorTable.cs index af7d44a..c590f8f 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptorTable.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptorTable.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptorTable1.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptorTable1.cs index c257dd8..2f82ac8 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptorTable1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptorTable1.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RootParameter1.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootParameter1.cs index a175900..d71e356 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RootParameter1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RootParameter1.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RootSignatureDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootSignatureDescription.cs index 6375b02..d5944d9 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RootSignatureDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RootSignatureDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/RootSignatureDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootSignatureDescription1.cs index e61fafc..bce9e91 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/RootSignatureDescription1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/RootSignatureDescription1.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/SamplerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/SamplerDescription.cs index a86f28e..834b21a 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/SamplerDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/SamplerDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using static Win32.Graphics.Direct3D12.Apis; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/ShaderBytecode.cs b/src/Vortice.Win32.Graphics.Direct3D12/ShaderBytecode.cs index eff5e37..a8d147f 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/ShaderBytecode.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/ShaderBytecode.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Direct3D; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/StaticSamplerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/StaticSamplerDescription.cs index 5907e81..33da9ed 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/StaticSamplerDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/StaticSamplerDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using static Win32.Graphics.Direct3D12.Apis; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/StaticSamplerDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D12/StaticSamplerDescription1.cs new file mode 100644 index 0000000..7ddabbf --- /dev/null +++ b/src/Vortice.Win32.Graphics.Direct3D12/StaticSamplerDescription1.cs @@ -0,0 +1,110 @@ +// Copyright (c) Amer Koleci and contributors. +// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. + +using static Win32.Graphics.Direct3D12.Apis; + +namespace Win32.Graphics.Direct3D12; + +public unsafe partial struct StaticSamplerDescription1 +{ + /// + /// Initializes a new instance of the struct. + /// + /// Sampler description + /// The shader visibility + /// The shader register + /// The register space + /// + /// The value + public StaticSamplerDescription1( + in SamplerDescription samplerDescription, + ShaderVisibility shaderVisibility, + uint shaderRegister, + uint registerSpace = 0, + SamplerFlags flags = SamplerFlags.None, + StaticBorderColor borderColor = StaticBorderColor.OpaqueWhite) : this() + { + ShaderVisibility = shaderVisibility; + ShaderRegister = shaderRegister; + RegisterSpace = registerSpace; + BorderColor = borderColor; + Filter = samplerDescription.Filter; + AddressU = samplerDescription.AddressU; + AddressV = samplerDescription.AddressV; + AddressW = samplerDescription.AddressW; + MinLOD = samplerDescription.MinLOD; + MaxLOD = samplerDescription.MaxLOD; + MipLODBias = samplerDescription.MipLODBias; + MaxAnisotropy = samplerDescription.MaxAnisotropy; + ComparisonFunc = samplerDescription.ComparisonFunc; + Flags = flags; + } + + public StaticSamplerDescription1( + uint shaderRegister, + Filter filter = Filter.Anisotropic, + TextureAddressMode addressU = TextureAddressMode.Wrap, + TextureAddressMode addressV = TextureAddressMode.Wrap, + TextureAddressMode addressW = TextureAddressMode.Wrap, + float mipLODBias = 0, + uint maxAnisotropy = 16, + ComparisonFunction comparisonFunc = ComparisonFunction.LessEqual, + StaticBorderColor borderColor = StaticBorderColor.OpaqueWhite, + float minLOD = 0, + float maxLOD = D3D12_FLOAT32_MAX, + ShaderVisibility shaderVisibility = ShaderVisibility.All, + uint registerSpace = 0, + SamplerFlags flags = SamplerFlags.None) + { + Init(out this, shaderRegister, filter, addressU, addressV, addressW, mipLODBias, maxAnisotropy, comparisonFunc, borderColor, minLOD, maxLOD, shaderVisibility, registerSpace, flags); + } + + public static void Init(out StaticSamplerDescription1 samplerDesc, + uint shaderRegister, + Filter filter = Filter.Anisotropic, + TextureAddressMode addressU = TextureAddressMode.Wrap, + TextureAddressMode addressV = TextureAddressMode.Wrap, + TextureAddressMode addressW = TextureAddressMode.Wrap, + float mipLODBias = 0, + uint maxAnisotropy = 16, + ComparisonFunction comparisonFunc = ComparisonFunction.LessEqual, + StaticBorderColor borderColor = StaticBorderColor.OpaqueWhite, + float minLOD = 0, + float maxLOD = D3D12_FLOAT32_MAX, + ShaderVisibility shaderVisibility = ShaderVisibility.All, + uint registerSpace = 0, + SamplerFlags flags = SamplerFlags.None) + { + samplerDesc.ShaderRegister = shaderRegister; + samplerDesc.Filter = filter; + samplerDesc.AddressU = addressU; + samplerDesc.AddressV = addressV; + samplerDesc.AddressW = addressW; + samplerDesc.MipLODBias = mipLODBias; + samplerDesc.MaxAnisotropy = maxAnisotropy; + samplerDesc.ComparisonFunc = comparisonFunc; + samplerDesc.BorderColor = borderColor; + samplerDesc.MinLOD = minLOD; + samplerDesc.MaxLOD = maxLOD; + samplerDesc.ShaderVisibility = shaderVisibility; + samplerDesc.RegisterSpace = registerSpace; + samplerDesc.Flags = flags; + } + + public void Init(uint shaderRegister, + Filter filter = Filter.Anisotropic, + TextureAddressMode addressU = TextureAddressMode.Wrap, + TextureAddressMode addressV = TextureAddressMode.Wrap, + TextureAddressMode addressW = TextureAddressMode.Wrap, + float mipLODBias = 0, uint maxAnisotropy = 16, + ComparisonFunction comparisonFunc = ComparisonFunction.LessEqual, + StaticBorderColor borderColor = StaticBorderColor.OpaqueWhite, + float minLOD = 0, + float maxLOD = D3D12_FLOAT32_MAX, + ShaderVisibility shaderVisibility = ShaderVisibility.All, + uint registerSpace = 0, + SamplerFlags flags = SamplerFlags.None) + { + Init(out this, shaderRegister, filter, addressU, addressV, addressW, mipLODBias, maxAnisotropy, comparisonFunc, borderColor, minLOD, maxLOD, shaderVisibility, registerSpace, flags); + } +} diff --git a/src/Vortice.Win32.Graphics.Direct3D12/SubresourceFootprint.cs b/src/Vortice.Win32.Graphics.Direct3D12/SubresourceFootprint.cs index edee862..8ae3ec3 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/SubresourceFootprint.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/SubresourceFootprint.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/SubresourceRangeUInt64.cs b/src/Vortice.Win32.Graphics.Direct3D12/SubresourceRangeUInt64.cs index 64e93b6..8fecf61 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/SubresourceRangeUInt64.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/SubresourceRangeUInt64.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/TextureCopyLocation.cs b/src/Vortice.Win32.Graphics.Direct3D12/TextureCopyLocation.cs index 2d9fc11..8a0458b 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/TextureCopyLocation.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/TextureCopyLocation.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/VersionedRootSignatureDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/VersionedRootSignatureDescription.cs index bca596e..93b32c3 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/VersionedRootSignatureDescription.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/VersionedRootSignatureDescription.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using Win32.Graphics.Dxgi.Common; diff --git a/src/Vortice.Win32.Graphics.Direct3D12/VertexBufferView.cs b/src/Vortice.Win32.Graphics.Direct3D12/VertexBufferView.cs index 2f47ae9..5d25f1e 100644 --- a/src/Vortice.Win32.Graphics.Direct3D12/VertexBufferView.cs +++ b/src/Vortice.Win32.Graphics.Direct3D12/VertexBufferView.cs @@ -1,4 +1,4 @@ -// Copyright Amer Koleci and Contributors. +// Copyright (c) Amer Koleci and contributors. // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. namespace Win32.Graphics.Direct3D12; diff --git a/src/Vortice.Win32.Graphics.DirectComposition/Generated/Graphics.DirectComposition.Apis.Functions.cs b/src/Vortice.Win32.Graphics.DirectComposition/Generated/Graphics.DirectComposition.Apis.Functions.cs index f76ecaf..5db8a23 100644 --- a/src/Vortice.Win32.Graphics.DirectComposition/Generated/Graphics.DirectComposition.Apis.Functions.cs +++ b/src/Vortice.Win32.Graphics.DirectComposition/Generated/Graphics.DirectComposition.Apis.Functions.cs @@ -12,46 +12,46 @@ namespace Win32.Graphics.DirectComposition; public static unsafe partial class Apis { /// - [DllImport("dcomp.dll", ExactSpelling = true)] - public static extern HResult DCompositionCreateDevice(Graphics.Dxgi.IDXGIDevice* dxgiDevice, Guid* iid, void** dcompositionDevice); + [LibraryImport("dcomp.dll")] + public static partial HResult DCompositionCreateDevice(Graphics.Dxgi.IDXGIDevice* dxgiDevice, Guid* iid, void** dcompositionDevice); /// - [DllImport("dcomp.dll", ExactSpelling = true)] - public static extern HResult DCompositionCreateDevice2(IUnknown* renderingDevice, Guid* iid, void** dcompositionDevice); + [LibraryImport("dcomp.dll")] + public static partial HResult DCompositionCreateDevice2(IUnknown* renderingDevice, Guid* iid, void** dcompositionDevice); /// - [DllImport("dcomp.dll", ExactSpelling = true)] - public static extern HResult DCompositionCreateDevice3(IUnknown* renderingDevice, Guid* iid, void** dcompositionDevice); + [LibraryImport("dcomp.dll")] + public static partial HResult DCompositionCreateDevice3(IUnknown* renderingDevice, Guid* iid, void** dcompositionDevice); /// - [DllImport("dcomp.dll", ExactSpelling = true)] - public static extern HResult DCompositionCreateSurfaceHandle(uint desiredAccess, Security.SECURITY_ATTRIBUTES* securityAttributes, Handle* surfaceHandle); + [LibraryImport("dcomp.dll")] + public static partial HResult DCompositionCreateSurfaceHandle(uint desiredAccess, Security.SECURITY_ATTRIBUTES* securityAttributes, Handle* surfaceHandle); /// - [DllImport("dcomp.dll", ExactSpelling = true)] - public static extern HResult DCompositionAttachMouseWheelToHwnd(IDCompositionVisual* visual, nint hwnd, Bool32 enable); + [LibraryImport("dcomp.dll")] + public static partial HResult DCompositionAttachMouseWheelToHwnd(IDCompositionVisual* visual, nint hwnd, Bool32 enable); /// - [DllImport("dcomp.dll", ExactSpelling = true)] - public static extern HResult DCompositionAttachMouseDragToHwnd(IDCompositionVisual* visual, nint hwnd, Bool32 enable); + [LibraryImport("dcomp.dll")] + public static partial HResult DCompositionAttachMouseDragToHwnd(IDCompositionVisual* visual, nint hwnd, Bool32 enable); /// - [DllImport("dcomp.dll", ExactSpelling = true)] - public static extern HResult DCompositionGetFrameId(CompositionFrameIdType frameIdType, ulong* frameId); + [LibraryImport("dcomp.dll")] + public static partial HResult DCompositionGetFrameId(CompositionFrameIdType frameIdType, ulong* frameId); /// - [DllImport("dcomp.dll", ExactSpelling = true)] - public static extern HResult DCompositionGetStatistics(ulong frameId, CompositionFrameStats* frameStats, uint targetIdCount, CompositionTargetId* targetIds, uint* actualTargetIdCount); + [LibraryImport("dcomp.dll")] + public static partial HResult DCompositionGetStatistics(ulong frameId, CompositionFrameStats* frameStats, uint targetIdCount, CompositionTargetId* targetIds, uint* actualTargetIdCount); /// - [DllImport("dcomp.dll", ExactSpelling = true)] - public static extern HResult DCompositionGetTargetStatistics(ulong frameId, CompositionTargetId* targetId, CompositionTargetStats* targetStats); + [LibraryImport("dcomp.dll")] + public static partial HResult DCompositionGetTargetStatistics(ulong frameId, CompositionTargetId* targetId, CompositionTargetStats* targetStats); /// - [DllImport("dcomp.dll", ExactSpelling = true)] - public static extern HResult DCompositionBoostCompositorClock(Bool32 enable); + [LibraryImport("dcomp.dll")] + public static partial HResult DCompositionBoostCompositorClock(Bool32 enable); /// - [DllImport("dcomp.dll", ExactSpelling = true)] - public static extern uint DCompositionWaitForCompositorClock(uint count, Handle* handles, uint timeoutInMs); + [LibraryImport("dcomp.dll")] + public static partial uint DCompositionWaitForCompositorClock(uint count, Handle* handles, uint timeoutInMs); } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/Graphics.DirectWrite.Apis.Functions.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Graphics.DirectWrite.Apis.Functions.cs index ebd311d..1e31dbd 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/Graphics.DirectWrite.Apis.Functions.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Graphics.DirectWrite.Apis.Functions.cs @@ -12,6 +12,6 @@ namespace Win32.Graphics.DirectWrite; public static unsafe partial class Apis { /// - [DllImport("DWrite.dll", ExactSpelling = true)] - public static extern HResult DWriteCreateFactory(FactoryType factoryType, Guid* iid, void** factory); + [LibraryImport("DWrite.dll")] + public static partial HResult DWriteCreateFactory(FactoryType factoryType, Guid* iid, void** factory); } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/Graphics.DirectWrite.Structs.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Graphics.DirectWrite.Structs.cs index 9502d35..1aecbb8 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/Graphics.DirectWrite.Structs.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Graphics.DirectWrite.Structs.cs @@ -356,10 +356,10 @@ public partial struct GlyphRun public partial struct GlyphRunDescription { /// - public unsafe ushort* localeName; + public unsafe char* localeName; /// - public unsafe ushort* @string; + public unsafe char* @string; /// public uint stringLength; @@ -394,7 +394,7 @@ public partial struct Underline public FlowDirection flowDirection; /// - public unsafe ushort* localeName; + public unsafe char* localeName; /// public MeasuringMode measuringMode; @@ -420,7 +420,7 @@ public partial struct Strikethrough public FlowDirection flowDirection; /// - public unsafe ushort* localeName; + public unsafe char* localeName; /// public MeasuringMode measuringMode; @@ -712,10 +712,10 @@ public partial struct FontProperty public FontPropertyId propertyId; /// - public unsafe ushort* propertyValue; + public unsafe char* propertyValue; /// - public unsafe ushort* localeName; + public unsafe char* localeName; } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory.cs index 931169f..d504a19 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory.cs @@ -105,9 +105,9 @@ public unsafe partial struct IDWriteFactory : IDWriteFactory.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CreateFontFileReference(ushort* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) + public HResult CreateFontFileReference(char* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); } /// @@ -169,9 +169,9 @@ public unsafe partial struct IDWriteFactory : IDWriteFactory.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, ushort* localeName, IDWriteTextFormat** textFormat) + public HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, char* localeName, IDWriteTextFormat** textFormat) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); } /// @@ -225,9 +225,9 @@ public unsafe partial struct IDWriteFactory : IDWriteFactory.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(22)] - public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, ushort* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) + public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, char* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); } /// @@ -253,7 +253,7 @@ public unsafe partial struct IDWriteFactory : IDWriteFactory.Interface, INativeG HResult UnregisterFontCollectionLoader(IDWriteFontCollectionLoader* fontCollectionLoader); [VtblIndex(7)] - HResult CreateFontFileReference(ushort* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile); + HResult CreateFontFileReference(char* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile); [VtblIndex(8)] HResult CreateCustomFontFileReference(void* fontFileReferenceKey, uint fontFileReferenceKeySize, IDWriteFontFileLoader* fontFileLoader, IDWriteFontFile** fontFile); @@ -277,7 +277,7 @@ public unsafe partial struct IDWriteFactory : IDWriteFactory.Interface, INativeG HResult UnregisterFontFileLoader(IDWriteFontFileLoader* fontFileLoader); [VtblIndex(15)] - HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, ushort* localeName, IDWriteTextFormat** textFormat); + HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, char* localeName, IDWriteTextFormat** textFormat); [VtblIndex(16)] HResult CreateTypography(IDWriteTypography** typography); @@ -298,7 +298,7 @@ public unsafe partial struct IDWriteFactory : IDWriteFactory.Interface, INativeG HResult CreateTextAnalyzer(IDWriteTextAnalyzer** textAnalyzer); [VtblIndex(22)] - HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, ushort* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution); + HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, char* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution); [VtblIndex(23)] HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis); diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory1.cs index 2e9201e..251e0ee 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory1.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory1.cs @@ -105,9 +105,9 @@ public unsafe partial struct IDWriteFactory1 : IDWriteFactory1.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CreateFontFileReference(ushort* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) + public HResult CreateFontFileReference(char* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory1*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory1*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); } /// @@ -169,9 +169,9 @@ public unsafe partial struct IDWriteFactory1 : IDWriteFactory1.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, ushort* localeName, IDWriteTextFormat** textFormat) + public HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, char* localeName, IDWriteTextFormat** textFormat) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory1*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory1*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); } /// @@ -225,9 +225,9 @@ public unsafe partial struct IDWriteFactory1 : IDWriteFactory1.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(22)] - public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, ushort* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) + public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, char* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory1*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory1*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory2.cs index 1ddf05b..83bd668 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory2.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory2.cs @@ -105,9 +105,9 @@ public unsafe partial struct IDWriteFactory2 : IDWriteFactory2.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CreateFontFileReference(ushort* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) + public HResult CreateFontFileReference(char* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); } /// @@ -169,9 +169,9 @@ public unsafe partial struct IDWriteFactory2 : IDWriteFactory2.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, ushort* localeName, IDWriteTextFormat** textFormat) + public HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, char* localeName, IDWriteTextFormat** textFormat) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); } /// @@ -225,9 +225,9 @@ public unsafe partial struct IDWriteFactory2 : IDWriteFactory2.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(22)] - public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, ushort* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) + public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, char* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory3.cs index a239df8..ea95cb1 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory3.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory3.cs @@ -105,9 +105,9 @@ public unsafe partial struct IDWriteFactory3 : IDWriteFactory3.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CreateFontFileReference(ushort* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) + public HResult CreateFontFileReference(char* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); } /// @@ -169,9 +169,9 @@ public unsafe partial struct IDWriteFactory3 : IDWriteFactory3.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, ushort* localeName, IDWriteTextFormat** textFormat) + public HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, char* localeName, IDWriteTextFormat** textFormat) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); } /// @@ -225,9 +225,9 @@ public unsafe partial struct IDWriteFactory3 : IDWriteFactory3.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(22)] - public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, ushort* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) + public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, char* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); } /// @@ -321,9 +321,9 @@ public unsafe partial struct IDWriteFactory3 : IDWriteFactory3.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(34)] - public HResult CreateFontFaceReference(ushort* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference) + public HResult CreateFontFaceReference(char* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[34]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, faceIndex, fontSimulations, fontFaceReference); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[34]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, faceIndex, fontSimulations, fontFaceReference); } /// @@ -378,7 +378,7 @@ public unsafe partial struct IDWriteFactory3 : IDWriteFactory3.Interface, INativ HResult CreateFontFaceReference(IDWriteFontFile* fontFile, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference); [VtblIndex(34)] - HResult CreateFontFaceReference(ushort* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference); + HResult CreateFontFaceReference(char* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference); [VtblIndex(35)] HResult GetSystemFontSet(IDWriteFontSet** fontSet); diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory4.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory4.cs index edf75d8..db1331e 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory4.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory4.cs @@ -105,9 +105,9 @@ public unsafe partial struct IDWriteFactory4 : IDWriteFactory4.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CreateFontFileReference(ushort* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) + public HResult CreateFontFileReference(char* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); } /// @@ -169,9 +169,9 @@ public unsafe partial struct IDWriteFactory4 : IDWriteFactory4.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, ushort* localeName, IDWriteTextFormat** textFormat) + public HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, char* localeName, IDWriteTextFormat** textFormat) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); } /// @@ -225,9 +225,9 @@ public unsafe partial struct IDWriteFactory4 : IDWriteFactory4.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(22)] - public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, ushort* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) + public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, char* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); } /// @@ -321,9 +321,9 @@ public unsafe partial struct IDWriteFactory4 : IDWriteFactory4.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(34)] - public HResult CreateFontFaceReference(ushort* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference) + public HResult CreateFontFaceReference(char* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[34]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, faceIndex, fontSimulations, fontFaceReference); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[34]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, faceIndex, fontSimulations, fontFaceReference); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory5.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory5.cs index 66d9c73..3c2d794 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory5.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory5.cs @@ -105,9 +105,9 @@ public unsafe partial struct IDWriteFactory5 : IDWriteFactory5.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CreateFontFileReference(ushort* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) + public HResult CreateFontFileReference(char* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); } /// @@ -169,9 +169,9 @@ public unsafe partial struct IDWriteFactory5 : IDWriteFactory5.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, ushort* localeName, IDWriteTextFormat** textFormat) + public HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, char* localeName, IDWriteTextFormat** textFormat) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); } /// @@ -225,9 +225,9 @@ public unsafe partial struct IDWriteFactory5 : IDWriteFactory5.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(22)] - public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, ushort* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) + public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, char* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); } /// @@ -321,9 +321,9 @@ public unsafe partial struct IDWriteFactory5 : IDWriteFactory5.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(34)] - public HResult CreateFontFaceReference(ushort* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference) + public HResult CreateFontFaceReference(char* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[34]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, faceIndex, fontSimulations, fontFaceReference); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[34]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, faceIndex, fontSimulations, fontFaceReference); } /// @@ -409,9 +409,9 @@ public unsafe partial struct IDWriteFactory5 : IDWriteFactory5.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(45)] - public HResult CreateHttpFontFileLoader(ushort* referrerUrl, ushort* extraHeaders, IDWriteRemoteFontFileLoader** newLoader) + public HResult CreateHttpFontFileLoader(char* referrerUrl, char* extraHeaders, IDWriteRemoteFontFileLoader** newLoader) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[45]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), referrerUrl, extraHeaders, newLoader); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[45]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), referrerUrl, extraHeaders, newLoader); } /// @@ -439,7 +439,7 @@ public unsafe partial struct IDWriteFactory5 : IDWriteFactory5.Interface, INativ HResult CreateInMemoryFontFileLoader(IDWriteInMemoryFontFileLoader** newLoader); [VtblIndex(45)] - HResult CreateHttpFontFileLoader(ushort* referrerUrl, ushort* extraHeaders, IDWriteRemoteFontFileLoader** newLoader); + HResult CreateHttpFontFileLoader(char* referrerUrl, char* extraHeaders, IDWriteRemoteFontFileLoader** newLoader); [VtblIndex(46)] ContainerType AnalyzeContainerType(void* fileData, uint fileDataSize); diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory6.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory6.cs index 88564d0..ecf8c4e 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory6.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory6.cs @@ -105,9 +105,9 @@ public unsafe partial struct IDWriteFactory6 : IDWriteFactory6.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CreateFontFileReference(ushort* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) + public HResult CreateFontFileReference(char* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); } /// @@ -169,9 +169,9 @@ public unsafe partial struct IDWriteFactory6 : IDWriteFactory6.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, ushort* localeName, IDWriteTextFormat** textFormat) + public HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, char* localeName, IDWriteTextFormat** textFormat) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); } /// @@ -225,9 +225,9 @@ public unsafe partial struct IDWriteFactory6 : IDWriteFactory6.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(22)] - public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, ushort* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) + public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, char* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); } /// @@ -321,9 +321,9 @@ public unsafe partial struct IDWriteFactory6 : IDWriteFactory6.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(34)] - public HResult CreateFontFaceReference(ushort* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference) + public HResult CreateFontFaceReference(char* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[34]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, faceIndex, fontSimulations, fontFaceReference); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[34]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, faceIndex, fontSimulations, fontFaceReference); } /// @@ -409,9 +409,9 @@ public unsafe partial struct IDWriteFactory6 : IDWriteFactory6.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(45)] - public HResult CreateHttpFontFileLoader(ushort* referrerUrl, ushort* extraHeaders, IDWriteRemoteFontFileLoader** newLoader) + public HResult CreateHttpFontFileLoader(char* referrerUrl, char* extraHeaders, IDWriteRemoteFontFileLoader** newLoader) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[45]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), referrerUrl, extraHeaders, newLoader); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[45]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), referrerUrl, extraHeaders, newLoader); } /// @@ -481,9 +481,9 @@ public unsafe partial struct IDWriteFactory6 : IDWriteFactory6.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(54)] - public HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontAxisValue* fontAxisValues, uint fontAxisValueCount, float fontSize, ushort* localeName, IDWriteTextFormat3** textFormat) + public HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontAxisValue* fontAxisValues, uint fontAxisValueCount, float fontSize, char* localeName, IDWriteTextFormat3** textFormat) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[54]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontAxisValues, fontAxisValueCount, fontSize, localeName, textFormat); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[54]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontAxisValues, fontAxisValueCount, fontSize, localeName, textFormat); } public interface Interface : IDWriteFactory5.Interface @@ -507,7 +507,7 @@ public unsafe partial struct IDWriteFactory6 : IDWriteFactory6.Interface, INativ HResult CreateFontSetBuilder(IDWriteFontSetBuilder2** fontSetBuilder); [VtblIndex(54)] - HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontAxisValue* fontAxisValues, uint fontAxisValueCount, float fontSize, ushort* localeName, IDWriteTextFormat3** textFormat); + HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontAxisValue* fontAxisValues, uint fontAxisValueCount, float fontSize, char* localeName, IDWriteTextFormat3** textFormat); } } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory7.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory7.cs index 98c26ff..693610e 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory7.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory7.cs @@ -105,9 +105,9 @@ public unsafe partial struct IDWriteFactory7 : IDWriteFactory7.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CreateFontFileReference(ushort* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) + public HResult CreateFontFileReference(char* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); } /// @@ -169,9 +169,9 @@ public unsafe partial struct IDWriteFactory7 : IDWriteFactory7.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, ushort* localeName, IDWriteTextFormat** textFormat) + public HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, char* localeName, IDWriteTextFormat** textFormat) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); } /// @@ -225,9 +225,9 @@ public unsafe partial struct IDWriteFactory7 : IDWriteFactory7.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(22)] - public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, ushort* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) + public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, char* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); } /// @@ -321,9 +321,9 @@ public unsafe partial struct IDWriteFactory7 : IDWriteFactory7.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(34)] - public HResult CreateFontFaceReference(ushort* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference) + public HResult CreateFontFaceReference(char* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[34]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, faceIndex, fontSimulations, fontFaceReference); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[34]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, faceIndex, fontSimulations, fontFaceReference); } /// @@ -409,9 +409,9 @@ public unsafe partial struct IDWriteFactory7 : IDWriteFactory7.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(45)] - public HResult CreateHttpFontFileLoader(ushort* referrerUrl, ushort* extraHeaders, IDWriteRemoteFontFileLoader** newLoader) + public HResult CreateHttpFontFileLoader(char* referrerUrl, char* extraHeaders, IDWriteRemoteFontFileLoader** newLoader) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[45]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), referrerUrl, extraHeaders, newLoader); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[45]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), referrerUrl, extraHeaders, newLoader); } /// @@ -481,9 +481,9 @@ public unsafe partial struct IDWriteFactory7 : IDWriteFactory7.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(54)] - public HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontAxisValue* fontAxisValues, uint fontAxisValueCount, float fontSize, ushort* localeName, IDWriteTextFormat3** textFormat) + public HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontAxisValue* fontAxisValues, uint fontAxisValueCount, float fontSize, char* localeName, IDWriteTextFormat3** textFormat) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[54]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontAxisValues, fontAxisValueCount, fontSize, localeName, textFormat); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[54]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontAxisValues, fontAxisValueCount, fontSize, localeName, textFormat); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory8.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory8.cs index d1b4136..d5e51c4 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory8.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory8.cs @@ -105,9 +105,9 @@ public unsafe partial struct IDWriteFactory8 : IDWriteFactory8.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CreateFontFileReference(ushort* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) + public HResult CreateFontFileReference(char* filePath, ulong* lastWriteTime, IDWriteFontFile** fontFile) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory8*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteFactory8*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, fontFile); } /// @@ -169,9 +169,9 @@ public unsafe partial struct IDWriteFactory8 : IDWriteFactory8.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, ushort* localeName, IDWriteTextFormat** textFormat) + public HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontWeight fontWeight, FontStyle fontStyle, FontStretch fontStretch, float fontSize, char* localeName, IDWriteTextFormat** textFormat) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory8*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IDWriteFactory8*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, localeName, textFormat); } /// @@ -225,9 +225,9 @@ public unsafe partial struct IDWriteFactory8 : IDWriteFactory8.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(22)] - public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, ushort* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) + public HResult CreateNumberSubstitution(NumberSubstitutionMethod substitutionMethod, char* localeName, Bool32 ignoreUserOverride, IDWriteNumberSubstitution** numberSubstitution) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory8*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IDWriteFactory8*)Unsafe.AsPointer(ref this), substitutionMethod, localeName, ignoreUserOverride, numberSubstitution); } /// @@ -321,9 +321,9 @@ public unsafe partial struct IDWriteFactory8 : IDWriteFactory8.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(34)] - public HResult CreateFontFaceReference(ushort* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference) + public HResult CreateFontFaceReference(char* filePath, ulong* lastWriteTime, uint faceIndex, FontSimulations fontSimulations, IDWriteFontFaceReference** fontFaceReference) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[34]))((IDWriteFactory8*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, faceIndex, fontSimulations, fontFaceReference); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[34]))((IDWriteFactory8*)Unsafe.AsPointer(ref this), filePath, lastWriteTime, faceIndex, fontSimulations, fontFaceReference); } /// @@ -409,9 +409,9 @@ public unsafe partial struct IDWriteFactory8 : IDWriteFactory8.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(45)] - public HResult CreateHttpFontFileLoader(ushort* referrerUrl, ushort* extraHeaders, IDWriteRemoteFontFileLoader** newLoader) + public HResult CreateHttpFontFileLoader(char* referrerUrl, char* extraHeaders, IDWriteRemoteFontFileLoader** newLoader) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[45]))((IDWriteFactory8*)Unsafe.AsPointer(ref this), referrerUrl, extraHeaders, newLoader); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[45]))((IDWriteFactory8*)Unsafe.AsPointer(ref this), referrerUrl, extraHeaders, newLoader); } /// @@ -481,9 +481,9 @@ public unsafe partial struct IDWriteFactory8 : IDWriteFactory8.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(54)] - public HResult CreateTextFormat(ushort* fontFamilyName, IDWriteFontCollection* fontCollection, FontAxisValue* fontAxisValues, uint fontAxisValueCount, float fontSize, ushort* localeName, IDWriteTextFormat3** textFormat) + public HResult CreateTextFormat(char* fontFamilyName, IDWriteFontCollection* fontCollection, FontAxisValue* fontAxisValues, uint fontAxisValueCount, float fontSize, char* localeName, IDWriteTextFormat3** textFormat) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[54]))((IDWriteFactory8*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontAxisValues, fontAxisValueCount, fontSize, localeName, textFormat); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[54]))((IDWriteFactory8*)Unsafe.AsPointer(ref this), fontFamilyName, fontCollection, fontAxisValues, fontAxisValueCount, fontSize, localeName, textFormat); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection.cs index 8a5b8ef..c6c4c36 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection.cs @@ -89,9 +89,9 @@ public unsafe partial struct IDWriteFontCollection : IDWriteFontCollection.Inter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult FindFamilyName(ushort* familyName, uint* index, Bool32* exists) + public HResult FindFamilyName(char* familyName, uint* index, Bool32* exists) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDWriteFontCollection*)Unsafe.AsPointer(ref this), familyName, index, exists); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDWriteFontCollection*)Unsafe.AsPointer(ref this), familyName, index, exists); } /// @@ -111,7 +111,7 @@ public unsafe partial struct IDWriteFontCollection : IDWriteFontCollection.Inter HResult GetFontFamily(uint index, IDWriteFontFamily** fontFamily); [VtblIndex(5)] - HResult FindFamilyName(ushort* familyName, uint* index, Bool32* exists); + HResult FindFamilyName(char* familyName, uint* index, Bool32* exists); [VtblIndex(6)] HResult GetFontFromFontFace(IDWriteFontFace* fontFace, IDWriteFont** font); diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection1.cs index 2653e8a..7d7d80e 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection1.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection1.cs @@ -89,9 +89,9 @@ public unsafe partial struct IDWriteFontCollection1 : IDWriteFontCollection1.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult FindFamilyName(ushort* familyName, uint* index, Bool32* exists) + public HResult FindFamilyName(char* familyName, uint* index, Bool32* exists) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDWriteFontCollection1*)Unsafe.AsPointer(ref this), familyName, index, exists); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDWriteFontCollection1*)Unsafe.AsPointer(ref this), familyName, index, exists); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection2.cs index ff2bfdd..d69e067 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection2.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection2.cs @@ -89,9 +89,9 @@ public unsafe partial struct IDWriteFontCollection2 : IDWriteFontCollection2.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult FindFamilyName(ushort* familyName, uint* index, Bool32* exists) + public HResult FindFamilyName(char* familyName, uint* index, Bool32* exists) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDWriteFontCollection2*)Unsafe.AsPointer(ref this), familyName, index, exists); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDWriteFontCollection2*)Unsafe.AsPointer(ref this), familyName, index, exists); } /// @@ -129,9 +129,9 @@ public unsafe partial struct IDWriteFontCollection2 : IDWriteFontCollection2.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetMatchingFonts(ushort* familyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, IDWriteFontList2** fontList) + public HResult GetMatchingFonts(char* familyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, IDWriteFontList2** fontList) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IDWriteFontCollection2*)Unsafe.AsPointer(ref this), familyName, fontAxisValues, fontAxisValueCount, fontList); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IDWriteFontCollection2*)Unsafe.AsPointer(ref this), familyName, fontAxisValues, fontAxisValueCount, fontList); } /// @@ -156,7 +156,7 @@ public unsafe partial struct IDWriteFontCollection2 : IDWriteFontCollection2.Int HResult GetFontFamily(uint index, IDWriteFontFamily2** fontFamily); [VtblIndex(10)] - HResult GetMatchingFonts(ushort* familyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, IDWriteFontList2** fontList); + HResult GetMatchingFonts(char* familyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, IDWriteFontList2** fontList); [VtblIndex(11)] FontFamilyModel GetFontFamilyModel(); diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection3.cs index 22b9a38..20587ee 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection3.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection3.cs @@ -89,9 +89,9 @@ public unsafe partial struct IDWriteFontCollection3 : IDWriteFontCollection3.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult FindFamilyName(ushort* familyName, uint* index, Bool32* exists) + public HResult FindFamilyName(char* familyName, uint* index, Bool32* exists) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDWriteFontCollection3*)Unsafe.AsPointer(ref this), familyName, index, exists); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDWriteFontCollection3*)Unsafe.AsPointer(ref this), familyName, index, exists); } /// @@ -129,9 +129,9 @@ public unsafe partial struct IDWriteFontCollection3 : IDWriteFontCollection3.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetMatchingFonts(ushort* familyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, IDWriteFontList2** fontList) + public HResult GetMatchingFonts(char* familyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, IDWriteFontList2** fontList) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IDWriteFontCollection3*)Unsafe.AsPointer(ref this), familyName, fontAxisValues, fontAxisValueCount, fontList); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IDWriteFontCollection3*)Unsafe.AsPointer(ref this), familyName, fontAxisValues, fontAxisValueCount, fontList); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallback.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallback.cs index e3b7f82..7804c53 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallback.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallback.cs @@ -73,15 +73,15 @@ public unsafe partial struct IDWriteFontFallback : IDWriteFontFallback.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult MapCharacters(IDWriteTextAnalysisSource* analysisSource, uint textPosition, uint textLength, IDWriteFontCollection* baseFontCollection, ushort* baseFamilyName, FontWeight baseWeight, FontStyle baseStyle, FontStretch baseStretch, uint* mappedLength, IDWriteFont** mappedFont, float* scale) + public HResult MapCharacters(IDWriteTextAnalysisSource* analysisSource, uint textPosition, uint textLength, IDWriteFontCollection* baseFontCollection, char* baseFamilyName, FontWeight baseWeight, FontStyle baseStyle, FontStretch baseStretch, uint* mappedLength, IDWriteFont** mappedFont, float* scale) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDWriteFontFallback*)Unsafe.AsPointer(ref this), analysisSource, textPosition, textLength, baseFontCollection, baseFamilyName, baseWeight, baseStyle, baseStretch, mappedLength, mappedFont, scale); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDWriteFontFallback*)Unsafe.AsPointer(ref this), analysisSource, textPosition, textLength, baseFontCollection, baseFamilyName, baseWeight, baseStyle, baseStretch, mappedLength, mappedFont, scale); } public interface Interface : IUnknown.Interface { [VtblIndex(3)] - HResult MapCharacters(IDWriteTextAnalysisSource* analysisSource, uint textPosition, uint textLength, IDWriteFontCollection* baseFontCollection, ushort* baseFamilyName, FontWeight baseWeight, FontStyle baseStyle, FontStretch baseStretch, uint* mappedLength, IDWriteFont** mappedFont, float* scale); + HResult MapCharacters(IDWriteTextAnalysisSource* analysisSource, uint textPosition, uint textLength, IDWriteFontCollection* baseFontCollection, char* baseFamilyName, FontWeight baseWeight, FontStyle baseStyle, FontStretch baseStretch, uint* mappedLength, IDWriteFont** mappedFont, float* scale); } } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallback1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallback1.cs index cb94252..b9826e2 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallback1.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallback1.cs @@ -73,23 +73,23 @@ public unsafe partial struct IDWriteFontFallback1 : IDWriteFontFallback1.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult MapCharacters(IDWriteTextAnalysisSource* analysisSource, uint textPosition, uint textLength, IDWriteFontCollection* baseFontCollection, ushort* baseFamilyName, FontWeight baseWeight, FontStyle baseStyle, FontStretch baseStretch, uint* mappedLength, IDWriteFont** mappedFont, float* scale) + public HResult MapCharacters(IDWriteTextAnalysisSource* analysisSource, uint textPosition, uint textLength, IDWriteFontCollection* baseFontCollection, char* baseFamilyName, FontWeight baseWeight, FontStyle baseStyle, FontStretch baseStretch, uint* mappedLength, IDWriteFont** mappedFont, float* scale) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDWriteFontFallback1*)Unsafe.AsPointer(ref this), analysisSource, textPosition, textLength, baseFontCollection, baseFamilyName, baseWeight, baseStyle, baseStretch, mappedLength, mappedFont, scale); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDWriteFontFallback1*)Unsafe.AsPointer(ref this), analysisSource, textPosition, textLength, baseFontCollection, baseFamilyName, baseWeight, baseStyle, baseStretch, mappedLength, mappedFont, scale); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public HResult MapCharacters(IDWriteTextAnalysisSource* analysisSource, uint textPosition, uint textLength, IDWriteFontCollection* baseFontCollection, ushort* baseFamilyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, uint* mappedLength, float* scale, IDWriteFontFace5** mappedFontFace) + public HResult MapCharacters(IDWriteTextAnalysisSource* analysisSource, uint textPosition, uint textLength, IDWriteFontCollection* baseFontCollection, char* baseFamilyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, uint* mappedLength, float* scale, IDWriteFontFace5** mappedFontFace) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IDWriteFontFallback1*)Unsafe.AsPointer(ref this), analysisSource, textPosition, textLength, baseFontCollection, baseFamilyName, fontAxisValues, fontAxisValueCount, mappedLength, scale, mappedFontFace); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IDWriteFontFallback1*)Unsafe.AsPointer(ref this), analysisSource, textPosition, textLength, baseFontCollection, baseFamilyName, fontAxisValues, fontAxisValueCount, mappedLength, scale, mappedFontFace); } public interface Interface : IDWriteFontFallback.Interface { [VtblIndex(4)] - HResult MapCharacters(IDWriteTextAnalysisSource* analysisSource, uint textPosition, uint textLength, IDWriteFontCollection* baseFontCollection, ushort* baseFamilyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, uint* mappedLength, float* scale, IDWriteFontFace5** mappedFontFace); + HResult MapCharacters(IDWriteTextAnalysisSource* analysisSource, uint textPosition, uint textLength, IDWriteFontCollection* baseFontCollection, char* baseFamilyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, uint* mappedLength, float* scale, IDWriteFontFace5** mappedFontFace); } } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallbackBuilder.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallbackBuilder.cs index 7bde81c..c4c3067 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallbackBuilder.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallbackBuilder.cs @@ -73,9 +73,9 @@ public unsafe partial struct IDWriteFontFallbackBuilder : IDWriteFontFallbackBui /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult AddMapping(UnicodeRange* ranges, uint rangesCount, ushort** targetFamilyNames, uint targetFamilyNamesCount, IDWriteFontCollection* fontCollection, ushort* localeName, ushort* baseFamilyName, float scale) + public HResult AddMapping(UnicodeRange* ranges, uint rangesCount, ushort** targetFamilyNames, uint targetFamilyNamesCount, IDWriteFontCollection* fontCollection, char* localeName, char* baseFamilyName, float scale) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDWriteFontFallbackBuilder*)Unsafe.AsPointer(ref this), ranges, rangesCount, targetFamilyNames, targetFamilyNamesCount, fontCollection, localeName, baseFamilyName, scale); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IDWriteFontFallbackBuilder*)Unsafe.AsPointer(ref this), ranges, rangesCount, targetFamilyNames, targetFamilyNamesCount, fontCollection, localeName, baseFamilyName, scale); } /// @@ -97,7 +97,7 @@ public unsafe partial struct IDWriteFontFallbackBuilder : IDWriteFontFallbackBui public interface Interface : IUnknown.Interface { [VtblIndex(3)] - HResult AddMapping(UnicodeRange* ranges, uint rangesCount, ushort** targetFamilyNames, uint targetFamilyNamesCount, IDWriteFontCollection* fontCollection, ushort* localeName, ushort* baseFamilyName, float scale); + HResult AddMapping(UnicodeRange* ranges, uint rangesCount, ushort** targetFamilyNames, uint targetFamilyNamesCount, IDWriteFontCollection* fontCollection, char* localeName, char* baseFamilyName, float scale); [VtblIndex(4)] HResult AddMappings(IDWriteFontFallback* fontFallback); diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet.cs index 5acb4a4..31aface 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet.cs @@ -113,9 +113,9 @@ public unsafe partial struct IDWriteFontSet : IDWriteFontSet.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetPropertyValues(FontPropertyId propertyID, ushort* preferredLocaleNames, IDWriteStringList** values) + public HResult GetPropertyValues(FontPropertyId propertyID, char* preferredLocaleNames, IDWriteStringList** values) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteFontSet*)Unsafe.AsPointer(ref this), propertyID, preferredLocaleNames, values); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteFontSet*)Unsafe.AsPointer(ref this), propertyID, preferredLocaleNames, values); } /// @@ -137,9 +137,9 @@ public unsafe partial struct IDWriteFontSet : IDWriteFontSet.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(11)] - public HResult GetMatchingFonts(ushort* familyName, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, IDWriteFontSet** filteredSet) + public HResult GetMatchingFonts(char* familyName, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, IDWriteFontSet** filteredSet) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteFontSet*)Unsafe.AsPointer(ref this), familyName, fontWeight, fontStretch, fontStyle, filteredSet); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteFontSet*)Unsafe.AsPointer(ref this), familyName, fontWeight, fontStretch, fontStyle, filteredSet); } /// @@ -168,7 +168,7 @@ public unsafe partial struct IDWriteFontSet : IDWriteFontSet.Interface, INativeG HResult GetPropertyValues(FontPropertyId propertyID, IDWriteStringList** values); [VtblIndex(8)] - HResult GetPropertyValues(FontPropertyId propertyID, ushort* preferredLocaleNames, IDWriteStringList** values); + HResult GetPropertyValues(FontPropertyId propertyID, char* preferredLocaleNames, IDWriteStringList** values); [VtblIndex(9)] HResult GetPropertyValues(uint listIndex, FontPropertyId propertyId, Bool32* exists, IDWriteLocalizedStrings** values); @@ -177,7 +177,7 @@ public unsafe partial struct IDWriteFontSet : IDWriteFontSet.Interface, INativeG HResult GetPropertyOccurrenceCount(FontProperty* property, uint* propertyOccurrenceCount); [VtblIndex(11)] - HResult GetMatchingFonts(ushort* familyName, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, IDWriteFontSet** filteredSet); + HResult GetMatchingFonts(char* familyName, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, IDWriteFontSet** filteredSet); [VtblIndex(12)] HResult GetMatchingFonts(FontProperty* properties, uint propertyCount, IDWriteFontSet** filteredSet); diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet1.cs index 8837077..1ff4c2f 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet1.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet1.cs @@ -113,9 +113,9 @@ public unsafe partial struct IDWriteFontSet1 : IDWriteFontSet1.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetPropertyValues(FontPropertyId propertyID, ushort* preferredLocaleNames, IDWriteStringList** values) + public HResult GetPropertyValues(FontPropertyId propertyID, char* preferredLocaleNames, IDWriteStringList** values) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteFontSet1*)Unsafe.AsPointer(ref this), propertyID, preferredLocaleNames, values); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteFontSet1*)Unsafe.AsPointer(ref this), propertyID, preferredLocaleNames, values); } /// @@ -137,9 +137,9 @@ public unsafe partial struct IDWriteFontSet1 : IDWriteFontSet1.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(11)] - public HResult GetMatchingFonts(ushort* familyName, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, IDWriteFontSet** filteredSet) + public HResult GetMatchingFonts(char* familyName, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, IDWriteFontSet** filteredSet) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteFontSet1*)Unsafe.AsPointer(ref this), familyName, fontWeight, fontStretch, fontStyle, filteredSet); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteFontSet1*)Unsafe.AsPointer(ref this), familyName, fontWeight, fontStretch, fontStyle, filteredSet); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet2.cs index d9b5a91..1c7f366 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet2.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet2.cs @@ -113,9 +113,9 @@ public unsafe partial struct IDWriteFontSet2 : IDWriteFontSet2.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetPropertyValues(FontPropertyId propertyID, ushort* preferredLocaleNames, IDWriteStringList** values) + public HResult GetPropertyValues(FontPropertyId propertyID, char* preferredLocaleNames, IDWriteStringList** values) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteFontSet2*)Unsafe.AsPointer(ref this), propertyID, preferredLocaleNames, values); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteFontSet2*)Unsafe.AsPointer(ref this), propertyID, preferredLocaleNames, values); } /// @@ -137,9 +137,9 @@ public unsafe partial struct IDWriteFontSet2 : IDWriteFontSet2.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(11)] - public HResult GetMatchingFonts(ushort* familyName, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, IDWriteFontSet** filteredSet) + public HResult GetMatchingFonts(char* familyName, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, IDWriteFontSet** filteredSet) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteFontSet2*)Unsafe.AsPointer(ref this), familyName, fontWeight, fontStretch, fontStyle, filteredSet); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteFontSet2*)Unsafe.AsPointer(ref this), familyName, fontWeight, fontStretch, fontStyle, filteredSet); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet3.cs index 542d9b0..9aa5db9 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet3.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet3.cs @@ -113,9 +113,9 @@ public unsafe partial struct IDWriteFontSet3 : IDWriteFontSet3.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetPropertyValues(FontPropertyId propertyID, ushort* preferredLocaleNames, IDWriteStringList** values) + public HResult GetPropertyValues(FontPropertyId propertyID, char* preferredLocaleNames, IDWriteStringList** values) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteFontSet3*)Unsafe.AsPointer(ref this), propertyID, preferredLocaleNames, values); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteFontSet3*)Unsafe.AsPointer(ref this), propertyID, preferredLocaleNames, values); } /// @@ -137,9 +137,9 @@ public unsafe partial struct IDWriteFontSet3 : IDWriteFontSet3.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(11)] - public HResult GetMatchingFonts(ushort* familyName, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, IDWriteFontSet** filteredSet) + public HResult GetMatchingFonts(char* familyName, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, IDWriteFontSet** filteredSet) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteFontSet3*)Unsafe.AsPointer(ref this), familyName, fontWeight, fontStretch, fontStyle, filteredSet); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteFontSet3*)Unsafe.AsPointer(ref this), familyName, fontWeight, fontStretch, fontStyle, filteredSet); } /// @@ -281,9 +281,9 @@ public unsafe partial struct IDWriteFontSet3 : IDWriteFontSet3.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(29)] - public HResult GetFontSourceName(uint listIndex, char** stringBuffer, uint stringBufferSize) + public HResult GetFontSourceName(uint listIndex, char* stringBuffer, uint stringBufferSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[29]))((IDWriteFontSet3*)Unsafe.AsPointer(ref this), listIndex, stringBuffer, stringBufferSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[29]))((IDWriteFontSet3*)Unsafe.AsPointer(ref this), listIndex, stringBuffer, stringBufferSize); } public interface Interface : IDWriteFontSet2.Interface @@ -295,7 +295,7 @@ public unsafe partial struct IDWriteFontSet3 : IDWriteFontSet3.Interface, INativ uint GetFontSourceNameLength(uint listIndex); [VtblIndex(29)] - HResult GetFontSourceName(uint listIndex, char** stringBuffer, uint stringBufferSize); + HResult GetFontSourceName(uint listIndex, char* stringBuffer, uint stringBufferSize); } } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet4.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet4.cs index c35d926..f453124 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet4.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet4.cs @@ -113,9 +113,9 @@ public unsafe partial struct IDWriteFontSet4 : IDWriteFontSet4.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetPropertyValues(FontPropertyId propertyID, ushort* preferredLocaleNames, IDWriteStringList** values) + public HResult GetPropertyValues(FontPropertyId propertyID, char* preferredLocaleNames, IDWriteStringList** values) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteFontSet4*)Unsafe.AsPointer(ref this), propertyID, preferredLocaleNames, values); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteFontSet4*)Unsafe.AsPointer(ref this), propertyID, preferredLocaleNames, values); } /// @@ -137,9 +137,9 @@ public unsafe partial struct IDWriteFontSet4 : IDWriteFontSet4.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(11)] - public HResult GetMatchingFonts(ushort* familyName, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, IDWriteFontSet** filteredSet) + public HResult GetMatchingFonts(char* familyName, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, IDWriteFontSet** filteredSet) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteFontSet4*)Unsafe.AsPointer(ref this), familyName, fontWeight, fontStretch, fontStyle, filteredSet); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteFontSet4*)Unsafe.AsPointer(ref this), familyName, fontWeight, fontStretch, fontStyle, filteredSet); } /// @@ -281,9 +281,9 @@ public unsafe partial struct IDWriteFontSet4 : IDWriteFontSet4.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(29)] - public HResult GetFontSourceName(uint listIndex, char** stringBuffer, uint stringBufferSize) + public HResult GetFontSourceName(uint listIndex, char* stringBuffer, uint stringBufferSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[29]))((IDWriteFontSet4*)Unsafe.AsPointer(ref this), listIndex, stringBuffer, stringBufferSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[29]))((IDWriteFontSet4*)Unsafe.AsPointer(ref this), listIndex, stringBuffer, stringBufferSize); } /// @@ -297,9 +297,9 @@ public unsafe partial struct IDWriteFontSet4 : IDWriteFontSet4.Interface, INativ /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult GetMatchingFonts(ushort* familyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, FontSimulations allowedSimulations, IDWriteFontSet4** matchingFonts) + public HResult GetMatchingFonts(char* familyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, FontSimulations allowedSimulations, IDWriteFontSet4** matchingFonts) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((IDWriteFontSet4*)Unsafe.AsPointer(ref this), familyName, fontAxisValues, fontAxisValueCount, allowedSimulations, matchingFonts); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((IDWriteFontSet4*)Unsafe.AsPointer(ref this), familyName, fontAxisValues, fontAxisValueCount, allowedSimulations, matchingFonts); } public interface Interface : IDWriteFontSet3.Interface @@ -308,7 +308,7 @@ public unsafe partial struct IDWriteFontSet4 : IDWriteFontSet4.Interface, INativ uint ConvertWeightStretchStyleToFontAxisValues(FontAxisValue* inputAxisValues, uint inputAxisCount, FontWeight fontWeight, FontStretch fontStretch, FontStyle fontStyle, float fontSize, FontAxisValue* outputAxisValues); [VtblIndex(31)] - HResult GetMatchingFonts(ushort* familyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, FontSimulations allowedSimulations, IDWriteFontSet4** matchingFonts); + HResult GetMatchingFonts(char* familyName, FontAxisValue* fontAxisValues, uint fontAxisValueCount, FontSimulations allowedSimulations, IDWriteFontSet4** matchingFonts); } } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSetBuilder2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSetBuilder2.cs index ce8b06b..050725b 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSetBuilder2.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSetBuilder2.cs @@ -121,9 +121,9 @@ public unsafe partial struct IDWriteFontSetBuilder2 : IDWriteFontSetBuilder2.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult AddFontFile(ushort* filePath) + public HResult AddFontFile(char* filePath) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IDWriteFontSetBuilder2*)Unsafe.AsPointer(ref this), filePath); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IDWriteFontSetBuilder2*)Unsafe.AsPointer(ref this), filePath); } public interface Interface : IDWriteFontSetBuilder1.Interface @@ -132,7 +132,7 @@ public unsafe partial struct IDWriteFontSetBuilder2 : IDWriteFontSetBuilder2.Int HResult AddFont(IDWriteFontFile* fontFile, uint fontFaceIndex, FontSimulations fontSimulations, FontAxisValue* fontAxisValues, uint fontAxisValueCount, FontAxisRange* fontAxisRanges, uint fontAxisRangeCount, FontProperty* properties, uint propertyCount); [VtblIndex(9)] - HResult AddFontFile(ushort* filePath); + HResult AddFontFile(char* filePath); } } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteLocalFontFileLoader.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteLocalFontFileLoader.cs index 41ad526..37f8f46 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteLocalFontFileLoader.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteLocalFontFileLoader.cs @@ -89,9 +89,9 @@ public unsafe partial struct IDWriteLocalFontFileLoader : IDWriteLocalFontFileLo /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult GetFilePathFromKey(void* fontFileReferenceKey, uint fontFileReferenceKeySize, char** filePath, uint filePathSize) + public HResult GetFilePathFromKey(void* fontFileReferenceKey, uint fontFileReferenceKeySize, char* filePath, uint filePathSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDWriteLocalFontFileLoader*)Unsafe.AsPointer(ref this), fontFileReferenceKey, fontFileReferenceKeySize, filePath, filePathSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDWriteLocalFontFileLoader*)Unsafe.AsPointer(ref this), fontFileReferenceKey, fontFileReferenceKeySize, filePath, filePathSize); } /// @@ -108,7 +108,7 @@ public unsafe partial struct IDWriteLocalFontFileLoader : IDWriteLocalFontFileLo HResult GetFilePathLengthFromKey(void* fontFileReferenceKey, uint fontFileReferenceKeySize, uint* filePathLength); [VtblIndex(5)] - HResult GetFilePathFromKey(void* fontFileReferenceKey, uint fontFileReferenceKeySize, char** filePath, uint filePathSize); + HResult GetFilePathFromKey(void* fontFileReferenceKey, uint fontFileReferenceKeySize, char* filePath, uint filePathSize); [VtblIndex(6)] HResult GetLastWriteTimeFromKey(void* fontFileReferenceKey, uint fontFileReferenceKeySize, ulong* lastWriteTime); diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteLocalizedStrings.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteLocalizedStrings.cs index 1f02058..1c36f13 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteLocalizedStrings.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteLocalizedStrings.cs @@ -81,9 +81,9 @@ public unsafe partial struct IDWriteLocalizedStrings : IDWriteLocalizedStrings.I /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public HResult FindLocaleName(ushort* localeName, uint* index, Bool32* exists) + public HResult FindLocaleName(char* localeName, uint* index, Bool32* exists) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IDWriteLocalizedStrings*)Unsafe.AsPointer(ref this), localeName, index, exists); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IDWriteLocalizedStrings*)Unsafe.AsPointer(ref this), localeName, index, exists); } /// @@ -97,9 +97,9 @@ public unsafe partial struct IDWriteLocalizedStrings : IDWriteLocalizedStrings.I /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult GetLocaleName(uint index, char** localeName, uint size) + public HResult GetLocaleName(uint index, char* localeName, uint size) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IDWriteLocalizedStrings*)Unsafe.AsPointer(ref this), index, localeName, size); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IDWriteLocalizedStrings*)Unsafe.AsPointer(ref this), index, localeName, size); } /// @@ -113,9 +113,9 @@ public unsafe partial struct IDWriteLocalizedStrings : IDWriteLocalizedStrings.I /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetString(uint index, char** stringBuffer, uint size) + public HResult GetString(uint index, char* stringBuffer, uint size) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteLocalizedStrings*)Unsafe.AsPointer(ref this), index, stringBuffer, size); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteLocalizedStrings*)Unsafe.AsPointer(ref this), index, stringBuffer, size); } public interface Interface : IUnknown.Interface @@ -124,19 +124,19 @@ public unsafe partial struct IDWriteLocalizedStrings : IDWriteLocalizedStrings.I uint GetCount(); [VtblIndex(4)] - HResult FindLocaleName(ushort* localeName, uint* index, Bool32* exists); + HResult FindLocaleName(char* localeName, uint* index, Bool32* exists); [VtblIndex(5)] HResult GetLocaleNameLength(uint index, uint* length); [VtblIndex(6)] - HResult GetLocaleName(uint index, char** localeName, uint size); + HResult GetLocaleName(uint index, char* localeName, uint size); [VtblIndex(7)] HResult GetStringLength(uint index, uint* length); [VtblIndex(8)] - HResult GetString(uint index, char** stringBuffer, uint size); + HResult GetString(uint index, char* stringBuffer, uint size); } } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRemoteFontFileLoader.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRemoteFontFileLoader.cs index c246aed..a123b5f 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRemoteFontFileLoader.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRemoteFontFileLoader.cs @@ -97,9 +97,9 @@ public unsafe partial struct IDWriteRemoteFontFileLoader : IDWriteRemoteFontFile /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult CreateFontFileReferenceFromUrl(IDWriteFactory* factory, ushort* baseUrl, ushort* fontFileUrl, IDWriteFontFile** fontFile) + public HResult CreateFontFileReferenceFromUrl(IDWriteFactory* factory, char* baseUrl, char* fontFileUrl, IDWriteFontFile** fontFile) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IDWriteRemoteFontFileLoader*)Unsafe.AsPointer(ref this), factory, baseUrl, fontFileUrl, fontFile); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IDWriteRemoteFontFileLoader*)Unsafe.AsPointer(ref this), factory, baseUrl, fontFileUrl, fontFile); } public interface Interface : IDWriteFontFileLoader.Interface @@ -111,7 +111,7 @@ public unsafe partial struct IDWriteRemoteFontFileLoader : IDWriteRemoteFontFile HResult GetLocalityFromKey(void* fontFileReferenceKey, uint fontFileReferenceKeySize, Locality* locality); [VtblIndex(6)] - HResult CreateFontFileReferenceFromUrl(IDWriteFactory* factory, ushort* baseUrl, ushort* fontFileUrl, IDWriteFontFile** fontFile); + HResult CreateFontFileReferenceFromUrl(IDWriteFactory* factory, char* baseUrl, char* fontFileUrl, IDWriteFontFile** fontFile); } } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteStringList.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteStringList.cs index 73dc4c6..fd4bb83 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteStringList.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteStringList.cs @@ -89,9 +89,9 @@ public unsafe partial struct IDWriteStringList : IDWriteStringList.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult GetLocaleName(uint listIndex, char** localeName, uint size) + public HResult GetLocaleName(uint listIndex, char* localeName, uint size) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDWriteStringList*)Unsafe.AsPointer(ref this), listIndex, localeName, size); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IDWriteStringList*)Unsafe.AsPointer(ref this), listIndex, localeName, size); } /// @@ -105,9 +105,9 @@ public unsafe partial struct IDWriteStringList : IDWriteStringList.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult GetString(uint listIndex, char** stringBuffer, uint stringBufferSize) + public HResult GetString(uint listIndex, char* stringBuffer, uint stringBufferSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteStringList*)Unsafe.AsPointer(ref this), listIndex, stringBuffer, stringBufferSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteStringList*)Unsafe.AsPointer(ref this), listIndex, stringBuffer, stringBufferSize); } public interface Interface : IUnknown.Interface @@ -119,13 +119,13 @@ public unsafe partial struct IDWriteStringList : IDWriteStringList.Interface, IN HResult GetLocaleNameLength(uint listIndex, uint* length); [VtblIndex(5)] - HResult GetLocaleName(uint listIndex, char** localeName, uint size); + HResult GetLocaleName(uint listIndex, char* localeName, uint size); [VtblIndex(6)] HResult GetStringLength(uint listIndex, uint* length); [VtblIndex(7)] - HResult GetString(uint listIndex, char** stringBuffer, uint stringBufferSize); + HResult GetString(uint listIndex, char* stringBuffer, uint stringBufferSize); } } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer.cs index 6864227..cefe687 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer.cs @@ -105,25 +105,25 @@ public unsafe partial struct IDWriteTextAnalyzer : IDWriteTextAnalyzer.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult GetGlyphs(char* textString, uint textLength, IDWriteFontFace* fontFace, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, IDWriteNumberSubstitution* numberSubstitution, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, uint maxGlyphCount, ushort* clusterMap, ShapingTextProperties* textProps, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint* actualGlyphCount) + public HResult GetGlyphs(char* textString, uint textLength, IDWriteFontFace* fontFace, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, char* localeName, IDWriteNumberSubstitution* numberSubstitution, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, uint maxGlyphCount, ushort* clusterMap, ShapingTextProperties* textProps, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint* actualGlyphCount) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteTextAnalyzer*)Unsafe.AsPointer(ref this), textString, textLength, fontFace, isSideways, isRightToLeft, scriptAnalysis, localeName, numberSubstitution, features, featureRangeLengths, featureRanges, maxGlyphCount, clusterMap, textProps, glyphIndices, glyphProps, actualGlyphCount); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteTextAnalyzer*)Unsafe.AsPointer(ref this), textString, textLength, fontFace, isSideways, isRightToLeft, scriptAnalysis, localeName, numberSubstitution, features, featureRangeLengths, featureRanges, maxGlyphCount, clusterMap, textProps, glyphIndices, glyphProps, actualGlyphCount); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets) + public HResult GetGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, char* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteTextAnalyzer*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteTextAnalyzer*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetGdiCompatibleGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets) + public HResult GetGdiCompatibleGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, char* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IDWriteTextAnalyzer*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, pixelsPerDip, transform, useGdiNatural, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IDWriteTextAnalyzer*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, pixelsPerDip, transform, useGdiNatural, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets); } public interface Interface : IUnknown.Interface @@ -141,13 +141,13 @@ public unsafe partial struct IDWriteTextAnalyzer : IDWriteTextAnalyzer.Interface HResult AnalyzeLineBreakpoints(IDWriteTextAnalysisSource* analysisSource, uint textPosition, uint textLength, IDWriteTextAnalysisSink* analysisSink); [VtblIndex(7)] - HResult GetGlyphs(char* textString, uint textLength, IDWriteFontFace* fontFace, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, IDWriteNumberSubstitution* numberSubstitution, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, uint maxGlyphCount, ushort* clusterMap, ShapingTextProperties* textProps, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint* actualGlyphCount); + HResult GetGlyphs(char* textString, uint textLength, IDWriteFontFace* fontFace, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, char* localeName, IDWriteNumberSubstitution* numberSubstitution, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, uint maxGlyphCount, ushort* clusterMap, ShapingTextProperties* textProps, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint* actualGlyphCount); [VtblIndex(8)] - HResult GetGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets); + HResult GetGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, char* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets); [VtblIndex(9)] - HResult GetGdiCompatibleGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets); + HResult GetGdiCompatibleGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, char* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets); } } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer1.cs index e5e9bd1..623bd82 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer1.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer1.cs @@ -105,25 +105,25 @@ public unsafe partial struct IDWriteTextAnalyzer1 : IDWriteTextAnalyzer1.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult GetGlyphs(char* textString, uint textLength, IDWriteFontFace* fontFace, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, IDWriteNumberSubstitution* numberSubstitution, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, uint maxGlyphCount, ushort* clusterMap, ShapingTextProperties* textProps, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint* actualGlyphCount) + public HResult GetGlyphs(char* textString, uint textLength, IDWriteFontFace* fontFace, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, char* localeName, IDWriteNumberSubstitution* numberSubstitution, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, uint maxGlyphCount, ushort* clusterMap, ShapingTextProperties* textProps, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint* actualGlyphCount) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), textString, textLength, fontFace, isSideways, isRightToLeft, scriptAnalysis, localeName, numberSubstitution, features, featureRangeLengths, featureRanges, maxGlyphCount, clusterMap, textProps, glyphIndices, glyphProps, actualGlyphCount); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), textString, textLength, fontFace, isSideways, isRightToLeft, scriptAnalysis, localeName, numberSubstitution, features, featureRangeLengths, featureRanges, maxGlyphCount, clusterMap, textProps, glyphIndices, glyphProps, actualGlyphCount); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets) + public HResult GetGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, char* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetGdiCompatibleGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets) + public HResult GetGdiCompatibleGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, char* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, pixelsPerDip, transform, useGdiNatural, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, pixelsPerDip, transform, useGdiNatural, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets); } /// @@ -137,9 +137,9 @@ public unsafe partial struct IDWriteTextAnalyzer1 : IDWriteTextAnalyzer1.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(11)] - public HResult GetBaseline(IDWriteFontFace* fontFace, Baseline baseline, Bool32 isVertical, Bool32 isSimulationAllowed, ScriptAnalysis scriptAnalysis, ushort* localeName, int* baselineCoordinate, Bool32* exists) + public HResult GetBaseline(IDWriteFontFace* fontFace, Baseline baseline, Bool32 isVertical, Bool32 isSimulationAllowed, ScriptAnalysis scriptAnalysis, char* localeName, int* baselineCoordinate, Bool32* exists) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), fontFace, baseline, isVertical, isSimulationAllowed, scriptAnalysis, localeName, baselineCoordinate, exists); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), fontFace, baseline, isVertical, isSimulationAllowed, scriptAnalysis, localeName, baselineCoordinate, exists); } /// @@ -204,7 +204,7 @@ public unsafe partial struct IDWriteTextAnalyzer1 : IDWriteTextAnalyzer1.Interfa HResult ApplyCharacterSpacing(float leadingSpacing, float trailingSpacing, float minimumAdvanceWidth, uint textLength, uint glyphCount, ushort* clusterMap, float* glyphAdvances, GlyphOffset* glyphOffsets, ShapingGlyphProperties* glyphProperties, float* modifiedGlyphAdvances, GlyphOffset* modifiedGlyphOffsets); [VtblIndex(11)] - HResult GetBaseline(IDWriteFontFace* fontFace, Baseline baseline, Bool32 isVertical, Bool32 isSimulationAllowed, ScriptAnalysis scriptAnalysis, ushort* localeName, int* baselineCoordinate, Bool32* exists); + HResult GetBaseline(IDWriteFontFace* fontFace, Baseline baseline, Bool32 isVertical, Bool32 isSimulationAllowed, ScriptAnalysis scriptAnalysis, char* localeName, int* baselineCoordinate, Bool32* exists); [VtblIndex(12)] HResult AnalyzeVerticalGlyphOrientation(IDWriteTextAnalysisSource1* analysisSource, uint textPosition, uint textLength, IDWriteTextAnalysisSink1* analysisSink); diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer2.cs index 51c37ca..43f82da 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer2.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer2.cs @@ -105,25 +105,25 @@ public unsafe partial struct IDWriteTextAnalyzer2 : IDWriteTextAnalyzer2.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult GetGlyphs(char* textString, uint textLength, IDWriteFontFace* fontFace, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, IDWriteNumberSubstitution* numberSubstitution, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, uint maxGlyphCount, ushort* clusterMap, ShapingTextProperties* textProps, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint* actualGlyphCount) + public HResult GetGlyphs(char* textString, uint textLength, IDWriteFontFace* fontFace, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, char* localeName, IDWriteNumberSubstitution* numberSubstitution, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, uint maxGlyphCount, ushort* clusterMap, ShapingTextProperties* textProps, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint* actualGlyphCount) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), textString, textLength, fontFace, isSideways, isRightToLeft, scriptAnalysis, localeName, numberSubstitution, features, featureRangeLengths, featureRanges, maxGlyphCount, clusterMap, textProps, glyphIndices, glyphProps, actualGlyphCount); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), textString, textLength, fontFace, isSideways, isRightToLeft, scriptAnalysis, localeName, numberSubstitution, features, featureRangeLengths, featureRanges, maxGlyphCount, clusterMap, textProps, glyphIndices, glyphProps, actualGlyphCount); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets) + public HResult GetGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, char* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetGdiCompatibleGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets) + public HResult GetGdiCompatibleGlyphPlacements(char* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, char* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, pixelsPerDip, transform, useGdiNatural, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, pixelsPerDip, transform, useGdiNatural, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets); } /// @@ -137,9 +137,9 @@ public unsafe partial struct IDWriteTextAnalyzer2 : IDWriteTextAnalyzer2.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(11)] - public HResult GetBaseline(IDWriteFontFace* fontFace, Baseline baseline, Bool32 isVertical, Bool32 isSimulationAllowed, ScriptAnalysis scriptAnalysis, ushort* localeName, int* baselineCoordinate, Bool32* exists) + public HResult GetBaseline(IDWriteFontFace* fontFace, Baseline baseline, Bool32 isVertical, Bool32 isSimulationAllowed, ScriptAnalysis scriptAnalysis, char* localeName, int* baselineCoordinate, Bool32* exists) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, baseline, isVertical, isSimulationAllowed, scriptAnalysis, localeName, baselineCoordinate, exists); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[11]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, baseline, isVertical, isSimulationAllowed, scriptAnalysis, localeName, baselineCoordinate, exists); } /// @@ -209,17 +209,17 @@ public unsafe partial struct IDWriteTextAnalyzer2 : IDWriteTextAnalyzer2.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(20)] - public HResult GetTypographicFeatures(IDWriteFontFace* fontFace, ScriptAnalysis scriptAnalysis, ushort* localeName, uint maxTagCount, uint* actualTagCount, FontFeatureTag* tags) + public HResult GetTypographicFeatures(IDWriteFontFace* fontFace, ScriptAnalysis scriptAnalysis, char* localeName, uint maxTagCount, uint* actualTagCount, FontFeatureTag* tags) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[20]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, scriptAnalysis, localeName, maxTagCount, actualTagCount, tags); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[20]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, scriptAnalysis, localeName, maxTagCount, actualTagCount, tags); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(21)] - public HResult CheckTypographicFeature(IDWriteFontFace* fontFace, ScriptAnalysis scriptAnalysis, ushort* localeName, FontFeatureTag featureTag, uint glyphCount, ushort* glyphIndices, byte* featureApplies) + public HResult CheckTypographicFeature(IDWriteFontFace* fontFace, ScriptAnalysis scriptAnalysis, char* localeName, FontFeatureTag featureTag, uint glyphCount, ushort* glyphIndices, byte* featureApplies) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, scriptAnalysis, localeName, featureTag, glyphCount, glyphIndices, featureApplies); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, scriptAnalysis, localeName, featureTag, glyphCount, glyphIndices, featureApplies); } public interface Interface : IDWriteTextAnalyzer1.Interface @@ -228,10 +228,10 @@ public unsafe partial struct IDWriteTextAnalyzer2 : IDWriteTextAnalyzer2.Interfa HResult GetGlyphOrientationTransform(GlyphOrientationAngle glyphOrientationAngle, Bool32 isSideways, float originX, float originY, Matrix3x2* transform); [VtblIndex(20)] - HResult GetTypographicFeatures(IDWriteFontFace* fontFace, ScriptAnalysis scriptAnalysis, ushort* localeName, uint maxTagCount, uint* actualTagCount, FontFeatureTag* tags); + HResult GetTypographicFeatures(IDWriteFontFace* fontFace, ScriptAnalysis scriptAnalysis, char* localeName, uint maxTagCount, uint* actualTagCount, FontFeatureTag* tags); [VtblIndex(21)] - HResult CheckTypographicFeature(IDWriteFontFace* fontFace, ScriptAnalysis scriptAnalysis, ushort* localeName, FontFeatureTag featureTag, uint glyphCount, ushort* glyphIndices, byte* featureApplies); + HResult CheckTypographicFeature(IDWriteFontFace* fontFace, ScriptAnalysis scriptAnalysis, char* localeName, FontFeatureTag featureTag, uint glyphCount, ushort* glyphIndices, byte* featureApplies); } } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat.cs index 8ca6d99..e8630eb 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat.cs @@ -217,9 +217,9 @@ public unsafe partial struct IDWriteTextFormat : IDWriteTextFormat.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(21)] - public HResult GetFontFamilyName(char** fontFamilyName, uint nameSize) + public HResult GetFontFamilyName(char* fontFamilyName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextFormat*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextFormat*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); } /// @@ -265,9 +265,9 @@ public unsafe partial struct IDWriteTextFormat : IDWriteTextFormat.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(27)] - public HResult GetLocaleName(char** localeName, uint nameSize) + public HResult GetLocaleName(char* localeName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextFormat*)Unsafe.AsPointer(ref this), localeName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextFormat*)Unsafe.AsPointer(ref this), localeName, nameSize); } public interface Interface : IUnknown.Interface @@ -327,7 +327,7 @@ public unsafe partial struct IDWriteTextFormat : IDWriteTextFormat.Interface, IN uint GetFontFamilyNameLength(); [VtblIndex(21)] - HResult GetFontFamilyName(char** fontFamilyName, uint nameSize); + HResult GetFontFamilyName(char* fontFamilyName, uint nameSize); [VtblIndex(22)] FontWeight GetFontWeight(); @@ -345,7 +345,7 @@ public unsafe partial struct IDWriteTextFormat : IDWriteTextFormat.Interface, IN uint GetLocaleNameLength(); [VtblIndex(27)] - HResult GetLocaleName(char** localeName, uint nameSize); + HResult GetLocaleName(char* localeName, uint nameSize); } } diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat1.cs index 025c881..2b0e526 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat1.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat1.cs @@ -217,9 +217,9 @@ public unsafe partial struct IDWriteTextFormat1 : IDWriteTextFormat1.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(21)] - public HResult GetFontFamilyName(char** fontFamilyName, uint nameSize) + public HResult GetFontFamilyName(char* fontFamilyName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextFormat1*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextFormat1*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); } /// @@ -265,9 +265,9 @@ public unsafe partial struct IDWriteTextFormat1 : IDWriteTextFormat1.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(27)] - public HResult GetLocaleName(char** localeName, uint nameSize) + public HResult GetLocaleName(char* localeName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextFormat1*)Unsafe.AsPointer(ref this), localeName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextFormat1*)Unsafe.AsPointer(ref this), localeName, nameSize); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat2.cs index 4ca606e..852ee47 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat2.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat2.cs @@ -217,9 +217,9 @@ public unsafe partial struct IDWriteTextFormat2 : IDWriteTextFormat2.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(21)] - public HResult GetFontFamilyName(char** fontFamilyName, uint nameSize) + public HResult GetFontFamilyName(char* fontFamilyName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextFormat2*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextFormat2*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); } /// @@ -265,9 +265,9 @@ public unsafe partial struct IDWriteTextFormat2 : IDWriteTextFormat2.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(27)] - public HResult GetLocaleName(char** localeName, uint nameSize) + public HResult GetLocaleName(char* localeName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextFormat2*)Unsafe.AsPointer(ref this), localeName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextFormat2*)Unsafe.AsPointer(ref this), localeName, nameSize); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat3.cs index dec7e3c..1a04109 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat3.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat3.cs @@ -217,9 +217,9 @@ public unsafe partial struct IDWriteTextFormat3 : IDWriteTextFormat3.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(21)] - public HResult GetFontFamilyName(char** fontFamilyName, uint nameSize) + public HResult GetFontFamilyName(char* fontFamilyName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextFormat3*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextFormat3*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); } /// @@ -265,9 +265,9 @@ public unsafe partial struct IDWriteTextFormat3 : IDWriteTextFormat3.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(27)] - public HResult GetLocaleName(char** localeName, uint nameSize) + public HResult GetLocaleName(char* localeName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextFormat3*)Unsafe.AsPointer(ref this), localeName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextFormat3*)Unsafe.AsPointer(ref this), localeName, nameSize); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout.cs index 0b113d7..dd85794 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout.cs @@ -217,9 +217,9 @@ public unsafe partial struct IDWriteTextLayout : IDWriteTextLayout.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(21)] - public HResult GetFontFamilyName(char** fontFamilyName, uint nameSize) + public HResult GetFontFamilyName(char* fontFamilyName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); } /// @@ -265,9 +265,9 @@ public unsafe partial struct IDWriteTextLayout : IDWriteTextLayout.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(27)] - public HResult GetLocaleName(char** localeName, uint nameSize) + public HResult GetLocaleName(char* localeName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), localeName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), localeName, nameSize); } /// @@ -297,9 +297,9 @@ public unsafe partial struct IDWriteTextLayout : IDWriteTextLayout.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange textRange) + public HResult SetFontFamilyName(char* fontFamilyName, TextRange textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontFamilyName, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontFamilyName, textRange); } /// @@ -377,9 +377,9 @@ public unsafe partial struct IDWriteTextLayout : IDWriteTextLayout.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(41)] - public HResult SetLocaleName(ushort* localeName, TextRange textRange) + public HResult SetLocaleName(char* localeName, TextRange textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[41]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), localeName, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[41]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), localeName, textRange); } /// @@ -417,9 +417,9 @@ public unsafe partial struct IDWriteTextLayout : IDWriteTextLayout.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(46)] - public HResult GetFontFamilyName(uint currentPosition, char** fontFamilyName, uint nameSize, TextRange* textRange) + public HResult GetFontFamilyName(uint currentPosition, char* fontFamilyName, uint nameSize, TextRange* textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[46]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), currentPosition, fontFamilyName, nameSize, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[46]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), currentPosition, fontFamilyName, nameSize, textRange); } /// @@ -505,9 +505,9 @@ public unsafe partial struct IDWriteTextLayout : IDWriteTextLayout.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(57)] - public HResult GetLocaleName(uint currentPosition, char** localeName, uint nameSize, TextRange* textRange) + public HResult GetLocaleName(uint currentPosition, char* localeName, uint nameSize, TextRange* textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[57]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), currentPosition, localeName, nameSize, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[57]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), currentPosition, localeName, nameSize, textRange); } /// @@ -594,7 +594,7 @@ public unsafe partial struct IDWriteTextLayout : IDWriteTextLayout.Interface, IN HResult SetFontCollection(IDWriteFontCollection* fontCollection, TextRange textRange); [VtblIndex(31)] - HResult SetFontFamilyName(ushort* fontFamilyName, TextRange textRange); + HResult SetFontFamilyName(char* fontFamilyName, TextRange textRange); [VtblIndex(32)] HResult SetFontWeight(FontWeight fontWeight, TextRange textRange); @@ -624,7 +624,7 @@ public unsafe partial struct IDWriteTextLayout : IDWriteTextLayout.Interface, IN HResult SetTypography(IDWriteTypography* typography, TextRange textRange); [VtblIndex(41)] - HResult SetLocaleName(ushort* localeName, TextRange textRange); + HResult SetLocaleName(char* localeName, TextRange textRange); [VtblIndex(42)] float GetMaxWidth(); @@ -639,7 +639,7 @@ public unsafe partial struct IDWriteTextLayout : IDWriteTextLayout.Interface, IN HResult GetFontFamilyNameLength(uint currentPosition, uint* nameLength, TextRange* textRange); [VtblIndex(46)] - HResult GetFontFamilyName(uint currentPosition, char** fontFamilyName, uint nameSize, TextRange* textRange); + HResult GetFontFamilyName(uint currentPosition, char* fontFamilyName, uint nameSize, TextRange* textRange); [VtblIndex(47)] HResult GetFontWeight(uint currentPosition, FontWeight* fontWeight, TextRange* textRange); @@ -672,7 +672,7 @@ public unsafe partial struct IDWriteTextLayout : IDWriteTextLayout.Interface, IN HResult GetLocaleNameLength(uint currentPosition, uint* nameLength, TextRange* textRange); [VtblIndex(57)] - HResult GetLocaleName(uint currentPosition, char** localeName, uint nameSize, TextRange* textRange); + HResult GetLocaleName(uint currentPosition, char* localeName, uint nameSize, TextRange* textRange); [VtblIndex(58)] HResult Draw(void* clientDrawingContext, IDWriteTextRenderer* renderer, float originX, float originY); diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout1.cs index 6717eef..f04f124 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout1.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout1.cs @@ -217,9 +217,9 @@ public unsafe partial struct IDWriteTextLayout1 : IDWriteTextLayout1.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(21)] - public HResult GetFontFamilyName(char** fontFamilyName, uint nameSize) + public HResult GetFontFamilyName(char* fontFamilyName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); } /// @@ -265,9 +265,9 @@ public unsafe partial struct IDWriteTextLayout1 : IDWriteTextLayout1.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(27)] - public HResult GetLocaleName(char** localeName, uint nameSize) + public HResult GetLocaleName(char* localeName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), localeName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), localeName, nameSize); } /// @@ -297,9 +297,9 @@ public unsafe partial struct IDWriteTextLayout1 : IDWriteTextLayout1.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange textRange) + public HResult SetFontFamilyName(char* fontFamilyName, TextRange textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontFamilyName, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontFamilyName, textRange); } /// @@ -377,9 +377,9 @@ public unsafe partial struct IDWriteTextLayout1 : IDWriteTextLayout1.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(41)] - public HResult SetLocaleName(ushort* localeName, TextRange textRange) + public HResult SetLocaleName(char* localeName, TextRange textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[41]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), localeName, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[41]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), localeName, textRange); } /// @@ -417,9 +417,9 @@ public unsafe partial struct IDWriteTextLayout1 : IDWriteTextLayout1.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(46)] - public HResult GetFontFamilyName(uint currentPosition, char** fontFamilyName, uint nameSize, TextRange* textRange) + public HResult GetFontFamilyName(uint currentPosition, char* fontFamilyName, uint nameSize, TextRange* textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[46]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), currentPosition, fontFamilyName, nameSize, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[46]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), currentPosition, fontFamilyName, nameSize, textRange); } /// @@ -505,9 +505,9 @@ public unsafe partial struct IDWriteTextLayout1 : IDWriteTextLayout1.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(57)] - public HResult GetLocaleName(uint currentPosition, char** localeName, uint nameSize, TextRange* textRange) + public HResult GetLocaleName(uint currentPosition, char* localeName, uint nameSize, TextRange* textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[57]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), currentPosition, localeName, nameSize, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[57]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), currentPosition, localeName, nameSize, textRange); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout2.cs index 1d3c3bf..ec30518 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout2.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout2.cs @@ -217,9 +217,9 @@ public unsafe partial struct IDWriteTextLayout2 : IDWriteTextLayout2.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(21)] - public HResult GetFontFamilyName(char** fontFamilyName, uint nameSize) + public HResult GetFontFamilyName(char* fontFamilyName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); } /// @@ -265,9 +265,9 @@ public unsafe partial struct IDWriteTextLayout2 : IDWriteTextLayout2.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(27)] - public HResult GetLocaleName(char** localeName, uint nameSize) + public HResult GetLocaleName(char* localeName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), localeName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), localeName, nameSize); } /// @@ -297,9 +297,9 @@ public unsafe partial struct IDWriteTextLayout2 : IDWriteTextLayout2.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange textRange) + public HResult SetFontFamilyName(char* fontFamilyName, TextRange textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontFamilyName, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontFamilyName, textRange); } /// @@ -377,9 +377,9 @@ public unsafe partial struct IDWriteTextLayout2 : IDWriteTextLayout2.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(41)] - public HResult SetLocaleName(ushort* localeName, TextRange textRange) + public HResult SetLocaleName(char* localeName, TextRange textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[41]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), localeName, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[41]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), localeName, textRange); } /// @@ -417,9 +417,9 @@ public unsafe partial struct IDWriteTextLayout2 : IDWriteTextLayout2.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(46)] - public HResult GetFontFamilyName(uint currentPosition, char** fontFamilyName, uint nameSize, TextRange* textRange) + public HResult GetFontFamilyName(uint currentPosition, char* fontFamilyName, uint nameSize, TextRange* textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[46]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), currentPosition, fontFamilyName, nameSize, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[46]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), currentPosition, fontFamilyName, nameSize, textRange); } /// @@ -505,9 +505,9 @@ public unsafe partial struct IDWriteTextLayout2 : IDWriteTextLayout2.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(57)] - public HResult GetLocaleName(uint currentPosition, char** localeName, uint nameSize, TextRange* textRange) + public HResult GetLocaleName(uint currentPosition, char* localeName, uint nameSize, TextRange* textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[57]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), currentPosition, localeName, nameSize, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[57]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), currentPosition, localeName, nameSize, textRange); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout3.cs index ac434ff..7ef1bcc 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout3.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout3.cs @@ -217,9 +217,9 @@ public unsafe partial struct IDWriteTextLayout3 : IDWriteTextLayout3.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(21)] - public HResult GetFontFamilyName(char** fontFamilyName, uint nameSize) + public HResult GetFontFamilyName(char* fontFamilyName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); } /// @@ -265,9 +265,9 @@ public unsafe partial struct IDWriteTextLayout3 : IDWriteTextLayout3.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(27)] - public HResult GetLocaleName(char** localeName, uint nameSize) + public HResult GetLocaleName(char* localeName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), localeName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), localeName, nameSize); } /// @@ -297,9 +297,9 @@ public unsafe partial struct IDWriteTextLayout3 : IDWriteTextLayout3.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange textRange) + public HResult SetFontFamilyName(char* fontFamilyName, TextRange textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontFamilyName, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontFamilyName, textRange); } /// @@ -377,9 +377,9 @@ public unsafe partial struct IDWriteTextLayout3 : IDWriteTextLayout3.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(41)] - public HResult SetLocaleName(ushort* localeName, TextRange textRange) + public HResult SetLocaleName(char* localeName, TextRange textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[41]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), localeName, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[41]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), localeName, textRange); } /// @@ -417,9 +417,9 @@ public unsafe partial struct IDWriteTextLayout3 : IDWriteTextLayout3.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(46)] - public HResult GetFontFamilyName(uint currentPosition, char** fontFamilyName, uint nameSize, TextRange* textRange) + public HResult GetFontFamilyName(uint currentPosition, char* fontFamilyName, uint nameSize, TextRange* textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[46]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), currentPosition, fontFamilyName, nameSize, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[46]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), currentPosition, fontFamilyName, nameSize, textRange); } /// @@ -505,9 +505,9 @@ public unsafe partial struct IDWriteTextLayout3 : IDWriteTextLayout3.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(57)] - public HResult GetLocaleName(uint currentPosition, char** localeName, uint nameSize, TextRange* textRange) + public HResult GetLocaleName(uint currentPosition, char* localeName, uint nameSize, TextRange* textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[57]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), currentPosition, localeName, nameSize, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[57]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), currentPosition, localeName, nameSize, textRange); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout4.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout4.cs index bac5056..d785ce0 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout4.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout4.cs @@ -217,9 +217,9 @@ public unsafe partial struct IDWriteTextLayout4 : IDWriteTextLayout4.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(21)] - public HResult GetFontFamilyName(char** fontFamilyName, uint nameSize) + public HResult GetFontFamilyName(char* fontFamilyName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[21]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontFamilyName, nameSize); } /// @@ -265,9 +265,9 @@ public unsafe partial struct IDWriteTextLayout4 : IDWriteTextLayout4.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(27)] - public HResult GetLocaleName(char** localeName, uint nameSize) + public HResult GetLocaleName(char* localeName, uint nameSize) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), localeName, nameSize); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[27]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), localeName, nameSize); } /// @@ -297,9 +297,9 @@ public unsafe partial struct IDWriteTextLayout4 : IDWriteTextLayout4.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(31)] - public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange textRange) + public HResult SetFontFamilyName(char* fontFamilyName, TextRange textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontFamilyName, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[31]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontFamilyName, textRange); } /// @@ -377,9 +377,9 @@ public unsafe partial struct IDWriteTextLayout4 : IDWriteTextLayout4.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(41)] - public HResult SetLocaleName(ushort* localeName, TextRange textRange) + public HResult SetLocaleName(char* localeName, TextRange textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[41]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), localeName, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[41]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), localeName, textRange); } /// @@ -417,9 +417,9 @@ public unsafe partial struct IDWriteTextLayout4 : IDWriteTextLayout4.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(46)] - public HResult GetFontFamilyName(uint currentPosition, char** fontFamilyName, uint nameSize, TextRange* textRange) + public HResult GetFontFamilyName(uint currentPosition, char* fontFamilyName, uint nameSize, TextRange* textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[46]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), currentPosition, fontFamilyName, nameSize, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[46]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), currentPosition, fontFamilyName, nameSize, textRange); } /// @@ -505,9 +505,9 @@ public unsafe partial struct IDWriteTextLayout4 : IDWriteTextLayout4.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(57)] - public HResult GetLocaleName(uint currentPosition, char** localeName, uint nameSize, TextRange* textRange) + public HResult GetLocaleName(uint currentPosition, char* localeName, uint nameSize, TextRange* textRange) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[57]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), currentPosition, localeName, nameSize, textRange); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[57]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), currentPosition, localeName, nameSize, textRange); } /// diff --git a/src/Vortice.Win32.Graphics.DirectWrite/IDWriteFactory.cs b/src/Vortice.Win32.Graphics.DirectWrite/IDWriteFactory.cs index 8d0ffb7..5e24cc8 100644 --- a/src/Vortice.Win32.Graphics.DirectWrite/IDWriteFactory.cs +++ b/src/Vortice.Win32.Graphics.DirectWrite/IDWriteFactory.cs @@ -19,7 +19,7 @@ public unsafe partial struct IDWriteFactory fixed (char* fontFamilyNamePtr = fontFamilyName) { ThrowIfFailed(CreateTextFormat( - (ushort*)fontFamilyNamePtr, + fontFamilyNamePtr, null, fontWeight, fontStyle, @@ -47,13 +47,13 @@ public unsafe partial struct IDWriteFactory fixed (char* localeNamePtr = localeName) { ThrowIfFailed(CreateTextFormat( - (ushort*)fontFamilyNamePtr, + fontFamilyNamePtr, null, fontWeight, fontStyle, fontStretch, fontSize, - (ushort*)localeNamePtr, + localeNamePtr, textFormat.GetAddressOf()) ); } @@ -78,13 +78,13 @@ public unsafe partial struct IDWriteFactory fixed (char* localeNamePtr = localeName) { ThrowIfFailed(CreateTextFormat( - (ushort*)fontFamilyNamePtr, + fontFamilyNamePtr, fontCollection, fontWeight, fontStyle, fontStretch, fontSize, - (ushort*)localeNamePtr, + localeNamePtr, textFormat.GetAddressOf())); } diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Apis.Functions.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Apis.Functions.cs index cbc9f72..c4fee0a 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Apis.Functions.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Apis.Functions.cs @@ -12,26 +12,26 @@ namespace Win32.Graphics.Dxgi; public static unsafe partial class Apis { /// - [DllImport("dxgi.dll", ExactSpelling = true)] - public static extern HResult CreateDXGIFactory(Guid* riid, void** ppFactory); + [LibraryImport("dxgi.dll")] + public static partial HResult CreateDXGIFactory(Guid* riid, void** ppFactory); /// - [DllImport("dxgi.dll", ExactSpelling = true)] - public static extern HResult CreateDXGIFactory1(Guid* riid, void** ppFactory); + [LibraryImport("dxgi.dll")] + public static partial HResult CreateDXGIFactory1(Guid* riid, void** ppFactory); /// - [DllImport("dxgi.dll", ExactSpelling = true)] - public static extern HResult CreateDXGIFactory2(CreateFactoryFlags Flags, Guid* riid, void** ppFactory); + [LibraryImport("dxgi.dll")] + public static partial HResult CreateDXGIFactory2(CreateFactoryFlags Flags, Guid* riid, void** ppFactory); /// - [DllImport("dxgi.dll", ExactSpelling = true)] - public static extern HResult DXGIGetDebugInterface1(uint Flags, Guid* riid, void** pDebug); + [LibraryImport("dxgi.dll")] + public static partial HResult DXGIGetDebugInterface1(uint Flags, Guid* riid, void** pDebug); /// - [DllImport("dxgi.dll", ExactSpelling = true)] - public static extern HResult DXGIDeclareAdapterRemovalSupport(); + [LibraryImport("dxgi.dll")] + public static partial HResult DXGIDeclareAdapterRemovalSupport(); /// - [DllImport("dxgi.dll", ExactSpelling = true)] - public static extern HResult DXGIDisableVBlankVirtualization(); + [LibraryImport("dxgi.dll")] + public static partial HResult DXGIDisableVBlankVirtualization(); } diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIResource1.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIResource1.cs index 1fd94ce..ccf617f 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIResource1.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIResource1.cs @@ -153,9 +153,9 @@ public unsafe partial struct IDXGIResource1 : IDXGIResource1.Interface, INativeG /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(13)] - public HResult CreateSharedHandle(Security.SECURITY_ATTRIBUTES* pAttributes, uint dwAccess, ushort* lpName, Handle* pHandle) + public HResult CreateSharedHandle(Security.SECURITY_ATTRIBUTES* pAttributes, uint dwAccess, char* lpName, Handle* pHandle) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IDXGIResource1*)Unsafe.AsPointer(ref this), pAttributes, dwAccess, lpName, pHandle); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IDXGIResource1*)Unsafe.AsPointer(ref this), pAttributes, dwAccess, lpName, pHandle); } public interface Interface : IDXGIResource.Interface @@ -164,7 +164,7 @@ public unsafe partial struct IDXGIResource1 : IDXGIResource1.Interface, INativeG HResult CreateSubresourceSurface(uint index, IDXGISurface2** ppSurface); [VtblIndex(13)] - HResult CreateSharedHandle(Security.SECURITY_ATTRIBUTES* pAttributes, uint dwAccess, ushort* lpName, Handle* pHandle); + HResult CreateSharedHandle(Security.SECURITY_ATTRIBUTES* pAttributes, uint dwAccess, char* lpName, Handle* pHandle); } } diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/Graphics.Imaging.Apis.Functions.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/Graphics.Imaging.Apis.Functions.cs index 29b8b35..3b970af 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/Graphics.Imaging.Apis.Functions.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/Graphics.Imaging.Apis.Functions.cs @@ -12,38 +12,38 @@ namespace Win32.Graphics.Imaging; public static unsafe partial class Apis { /// - [DllImport("WindowsCodecs.dll", ExactSpelling = true)] - public static extern HResult WICConvertBitmapSource(Guid* dstFormat, IWICBitmapSource* pISrc, IWICBitmapSource** ppIDst); + [LibraryImport("WindowsCodecs.dll")] + public static partial HResult WICConvertBitmapSource(Guid* dstFormat, IWICBitmapSource* pISrc, IWICBitmapSource** ppIDst); /// - [DllImport("WindowsCodecs.dll", ExactSpelling = true)] - public static extern HResult WICCreateBitmapFromSection(uint width, uint height, Guid* pixelFormat, Handle hSection, uint stride, uint offset, IWICBitmap** ppIBitmap); + [LibraryImport("WindowsCodecs.dll")] + public static partial HResult WICCreateBitmapFromSection(uint width, uint height, Guid* pixelFormat, Handle hSection, uint stride, uint offset, IWICBitmap** ppIBitmap); /// - [DllImport("WindowsCodecs.dll", ExactSpelling = true)] - public static extern HResult WICCreateBitmapFromSectionEx(uint width, uint height, Guid* pixelFormat, Handle hSection, uint stride, uint offset, WICSectionAccessLevel desiredAccessLevel, IWICBitmap** ppIBitmap); + [LibraryImport("WindowsCodecs.dll")] + public static partial HResult WICCreateBitmapFromSectionEx(uint width, uint height, Guid* pixelFormat, Handle hSection, uint stride, uint offset, WICSectionAccessLevel desiredAccessLevel, IWICBitmap** ppIBitmap); /// - [DllImport("WindowsCodecs.dll", ExactSpelling = true)] - public static extern HResult WICMapGuidToShortName(Guid* guid, uint cchName, char** wzName, uint* pcchActual); + [LibraryImport("WindowsCodecs.dll")] + public static partial HResult WICMapGuidToShortName(Guid* guid, uint cchName, char* wzName, uint* pcchActual); /// - [DllImport("WindowsCodecs.dll", ExactSpelling = true)] - public static extern HResult WICMapShortNameToGuid(ushort* wzName, Guid* pguid); + [LibraryImport("WindowsCodecs.dll")] + public static partial HResult WICMapShortNameToGuid(char* wzName, Guid* pguid); /// - [DllImport("WindowsCodecs.dll", ExactSpelling = true)] - public static extern HResult WICMapSchemaToName(Guid* guidMetadataFormat, ushort* pwzSchema, uint cchName, char** wzName, uint* pcchActual); + [LibraryImport("WindowsCodecs.dll")] + public static partial HResult WICMapSchemaToName(Guid* guidMetadataFormat, char* pwzSchema, uint cchName, char* wzName, uint* pcchActual); /// - [DllImport("WindowsCodecs.dll", ExactSpelling = true)] - public static extern HResult WICMatchMetadataContent(Guid* guidContainerFormat, Guid* pguidVendor, Com.IStream* pIStream, Guid* pguidMetadataFormat); + [LibraryImport("WindowsCodecs.dll")] + public static partial HResult WICMatchMetadataContent(Guid* guidContainerFormat, Guid* pguidVendor, Com.IStream* pIStream, Guid* pguidMetadataFormat); /// - [DllImport("WindowsCodecs.dll", ExactSpelling = true)] - public static extern HResult WICSerializeMetadataContent(Guid* guidContainerFormat, IWICMetadataWriter* pIWriter, uint dwPersistOptions, Com.IStream* pIStream); + [LibraryImport("WindowsCodecs.dll")] + public static partial HResult WICSerializeMetadataContent(Guid* guidContainerFormat, IWICMetadataWriter* pIWriter, uint dwPersistOptions, Com.IStream* pIStream); /// - [DllImport("WindowsCodecs.dll", ExactSpelling = true)] - public static extern HResult WICGetMetadataContentSize(Guid* guidContainerFormat, IWICMetadataWriter* pIWriter, ulong* pcbSize); + [LibraryImport("WindowsCodecs.dll")] + public static partial HResult WICGetMetadataContentSize(Guid* guidContainerFormat, IWICMetadataWriter* pIWriter, ulong* pcbSize); } diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapCodecInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapCodecInfo.cs index e8ae64e..9bff4ed 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapCodecInfo.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapCodecInfo.cs @@ -97,9 +97,9 @@ public unsafe partial struct IWICBitmapCodecInfo : IWICBitmapCodecInfo.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult GetAuthor(uint cchAuthor, char** wzAuthor, uint* pcchActual) + public HResult GetAuthor(uint cchAuthor, char* wzAuthor, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); } /// @@ -113,25 +113,25 @@ public unsafe partial struct IWICBitmapCodecInfo : IWICBitmapCodecInfo.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetVersion(uint cchVersion, char** wzVersion, uint* pcchActual) + public HResult GetVersion(uint cchVersion, char* wzVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetSpecVersion(uint cchSpecVersion, char** wzSpecVersion, uint* pcchActual) + public HResult GetSpecVersion(uint cchSpecVersion, char* wzSpecVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetFriendlyName(uint cchFriendlyName, char** wzFriendlyName, uint* pcchActual) + public HResult GetFriendlyName(uint cchFriendlyName, char* wzFriendlyName, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); } /// @@ -153,41 +153,41 @@ public unsafe partial struct IWICBitmapCodecInfo : IWICBitmapCodecInfo.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(13)] - public HResult GetColorManagementVersion(uint cchColorManagementVersion, char** wzColorManagementVersion, uint* pcchActual) + public HResult GetColorManagementVersion(uint cchColorManagementVersion, char* wzColorManagementVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchColorManagementVersion, wzColorManagementVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchColorManagementVersion, wzColorManagementVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(14)] - public HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char** wzDeviceManufacturer, uint* pcchActual) + public HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char* wzDeviceManufacturer, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult GetDeviceModels(uint cchDeviceModels, char** wzDeviceModels, uint* pcchActual) + public HResult GetDeviceModels(uint cchDeviceModels, char* wzDeviceModels, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchDeviceModels, wzDeviceModels, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchDeviceModels, wzDeviceModels, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(16)] - public HResult GetMimeTypes(uint cchMimeTypes, char** wzMimeTypes, uint* pcchActual) + public HResult GetMimeTypes(uint cchMimeTypes, char* wzMimeTypes, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[16]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchMimeTypes, wzMimeTypes, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[16]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchMimeTypes, wzMimeTypes, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(17)] - public HResult GetFileExtensions(uint cchFileExtensions, char** wzFileExtensions, uint* pcchActual) + public HResult GetFileExtensions(uint cchFileExtensions, char* wzFileExtensions, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[17]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchFileExtensions, wzFileExtensions, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[17]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), cchFileExtensions, wzFileExtensions, pcchActual); } /// @@ -225,9 +225,9 @@ public unsafe partial struct IWICBitmapCodecInfo : IWICBitmapCodecInfo.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(22)] - public HResult MatchesMimeType(ushort* wzMimeType, Bool32* pfMatches) + public HResult MatchesMimeType(char* wzMimeType, Bool32* pfMatches) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), wzMimeType, pfMatches); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IWICBitmapCodecInfo*)Unsafe.AsPointer(ref this), wzMimeType, pfMatches); } public interface Interface : IWICComponentInfo.Interface @@ -239,19 +239,19 @@ public unsafe partial struct IWICBitmapCodecInfo : IWICBitmapCodecInfo.Interface HResult GetPixelFormats(uint cFormats, Guid* pguidPixelFormats, uint* pcActual); [VtblIndex(13)] - HResult GetColorManagementVersion(uint cchColorManagementVersion, char** wzColorManagementVersion, uint* pcchActual); + HResult GetColorManagementVersion(uint cchColorManagementVersion, char* wzColorManagementVersion, uint* pcchActual); [VtblIndex(14)] - HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char** wzDeviceManufacturer, uint* pcchActual); + HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char* wzDeviceManufacturer, uint* pcchActual); [VtblIndex(15)] - HResult GetDeviceModels(uint cchDeviceModels, char** wzDeviceModels, uint* pcchActual); + HResult GetDeviceModels(uint cchDeviceModels, char* wzDeviceModels, uint* pcchActual); [VtblIndex(16)] - HResult GetMimeTypes(uint cchMimeTypes, char** wzMimeTypes, uint* pcchActual); + HResult GetMimeTypes(uint cchMimeTypes, char* wzMimeTypes, uint* pcchActual); [VtblIndex(17)] - HResult GetFileExtensions(uint cchFileExtensions, char** wzFileExtensions, uint* pcchActual); + HResult GetFileExtensions(uint cchFileExtensions, char* wzFileExtensions, uint* pcchActual); [VtblIndex(18)] HResult DoesSupportAnimation(Bool32* pfSupportAnimation); @@ -266,7 +266,7 @@ public unsafe partial struct IWICBitmapCodecInfo : IWICBitmapCodecInfo.Interface HResult DoesSupportMultiframe(Bool32* pfSupportMultiframe); [VtblIndex(22)] - HResult MatchesMimeType(ushort* wzMimeType, Bool32* pfMatches); + HResult MatchesMimeType(char* wzMimeType, Bool32* pfMatches); } } diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapDecoderInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapDecoderInfo.cs index 3cbf111..f647eec 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapDecoderInfo.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapDecoderInfo.cs @@ -97,9 +97,9 @@ public unsafe partial struct IWICBitmapDecoderInfo : IWICBitmapDecoderInfo.Inter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult GetAuthor(uint cchAuthor, char** wzAuthor, uint* pcchActual) + public HResult GetAuthor(uint cchAuthor, char* wzAuthor, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); } /// @@ -113,25 +113,25 @@ public unsafe partial struct IWICBitmapDecoderInfo : IWICBitmapDecoderInfo.Inter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetVersion(uint cchVersion, char** wzVersion, uint* pcchActual) + public HResult GetVersion(uint cchVersion, char* wzVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetSpecVersion(uint cchSpecVersion, char** wzSpecVersion, uint* pcchActual) + public HResult GetSpecVersion(uint cchSpecVersion, char* wzSpecVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetFriendlyName(uint cchFriendlyName, char** wzFriendlyName, uint* pcchActual) + public HResult GetFriendlyName(uint cchFriendlyName, char* wzFriendlyName, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); } /// @@ -153,41 +153,41 @@ public unsafe partial struct IWICBitmapDecoderInfo : IWICBitmapDecoderInfo.Inter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(13)] - public HResult GetColorManagementVersion(uint cchColorManagementVersion, char** wzColorManagementVersion, uint* pcchActual) + public HResult GetColorManagementVersion(uint cchColorManagementVersion, char* wzColorManagementVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchColorManagementVersion, wzColorManagementVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchColorManagementVersion, wzColorManagementVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(14)] - public HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char** wzDeviceManufacturer, uint* pcchActual) + public HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char* wzDeviceManufacturer, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult GetDeviceModels(uint cchDeviceModels, char** wzDeviceModels, uint* pcchActual) + public HResult GetDeviceModels(uint cchDeviceModels, char* wzDeviceModels, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchDeviceModels, wzDeviceModels, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchDeviceModels, wzDeviceModels, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(16)] - public HResult GetMimeTypes(uint cchMimeTypes, char** wzMimeTypes, uint* pcchActual) + public HResult GetMimeTypes(uint cchMimeTypes, char* wzMimeTypes, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[16]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchMimeTypes, wzMimeTypes, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[16]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchMimeTypes, wzMimeTypes, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(17)] - public HResult GetFileExtensions(uint cchFileExtensions, char** wzFileExtensions, uint* pcchActual) + public HResult GetFileExtensions(uint cchFileExtensions, char* wzFileExtensions, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[17]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchFileExtensions, wzFileExtensions, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[17]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), cchFileExtensions, wzFileExtensions, pcchActual); } /// @@ -225,9 +225,9 @@ public unsafe partial struct IWICBitmapDecoderInfo : IWICBitmapDecoderInfo.Inter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(22)] - public HResult MatchesMimeType(ushort* wzMimeType, Bool32* pfMatches) + public HResult MatchesMimeType(char* wzMimeType, Bool32* pfMatches) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), wzMimeType, pfMatches); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IWICBitmapDecoderInfo*)Unsafe.AsPointer(ref this), wzMimeType, pfMatches); } /// diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapEncoderInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapEncoderInfo.cs index 871f4f9..ca22b61 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapEncoderInfo.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapEncoderInfo.cs @@ -97,9 +97,9 @@ public unsafe partial struct IWICBitmapEncoderInfo : IWICBitmapEncoderInfo.Inter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult GetAuthor(uint cchAuthor, char** wzAuthor, uint* pcchActual) + public HResult GetAuthor(uint cchAuthor, char* wzAuthor, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); } /// @@ -113,25 +113,25 @@ public unsafe partial struct IWICBitmapEncoderInfo : IWICBitmapEncoderInfo.Inter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetVersion(uint cchVersion, char** wzVersion, uint* pcchActual) + public HResult GetVersion(uint cchVersion, char* wzVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetSpecVersion(uint cchSpecVersion, char** wzSpecVersion, uint* pcchActual) + public HResult GetSpecVersion(uint cchSpecVersion, char* wzSpecVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetFriendlyName(uint cchFriendlyName, char** wzFriendlyName, uint* pcchActual) + public HResult GetFriendlyName(uint cchFriendlyName, char* wzFriendlyName, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); } /// @@ -153,41 +153,41 @@ public unsafe partial struct IWICBitmapEncoderInfo : IWICBitmapEncoderInfo.Inter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(13)] - public HResult GetColorManagementVersion(uint cchColorManagementVersion, char** wzColorManagementVersion, uint* pcchActual) + public HResult GetColorManagementVersion(uint cchColorManagementVersion, char* wzColorManagementVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchColorManagementVersion, wzColorManagementVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchColorManagementVersion, wzColorManagementVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(14)] - public HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char** wzDeviceManufacturer, uint* pcchActual) + public HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char* wzDeviceManufacturer, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult GetDeviceModels(uint cchDeviceModels, char** wzDeviceModels, uint* pcchActual) + public HResult GetDeviceModels(uint cchDeviceModels, char* wzDeviceModels, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchDeviceModels, wzDeviceModels, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchDeviceModels, wzDeviceModels, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(16)] - public HResult GetMimeTypes(uint cchMimeTypes, char** wzMimeTypes, uint* pcchActual) + public HResult GetMimeTypes(uint cchMimeTypes, char* wzMimeTypes, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[16]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchMimeTypes, wzMimeTypes, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[16]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchMimeTypes, wzMimeTypes, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(17)] - public HResult GetFileExtensions(uint cchFileExtensions, char** wzFileExtensions, uint* pcchActual) + public HResult GetFileExtensions(uint cchFileExtensions, char* wzFileExtensions, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[17]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchFileExtensions, wzFileExtensions, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[17]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), cchFileExtensions, wzFileExtensions, pcchActual); } /// @@ -225,9 +225,9 @@ public unsafe partial struct IWICBitmapEncoderInfo : IWICBitmapEncoderInfo.Inter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(22)] - public HResult MatchesMimeType(ushort* wzMimeType, Bool32* pfMatches) + public HResult MatchesMimeType(char* wzMimeType, Bool32* pfMatches) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), wzMimeType, pfMatches); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[22]))((IWICBitmapEncoderInfo*)Unsafe.AsPointer(ref this), wzMimeType, pfMatches); } /// diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICColorContext.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICColorContext.cs index 5a6e874..6b7839f 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICColorContext.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICColorContext.cs @@ -73,9 +73,9 @@ public unsafe partial struct IWICColorContext : IWICColorContext.Interface, INat /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult InitializeFromFilename(ushort* wzFilename) + public HResult InitializeFromFilename(char* wzFilename) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IWICColorContext*)Unsafe.AsPointer(ref this), wzFilename); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IWICColorContext*)Unsafe.AsPointer(ref this), wzFilename); } /// @@ -121,7 +121,7 @@ public unsafe partial struct IWICColorContext : IWICColorContext.Interface, INat public interface Interface : IUnknown.Interface { [VtblIndex(3)] - HResult InitializeFromFilename(ushort* wzFilename); + HResult InitializeFromFilename(char* wzFilename); [VtblIndex(4)] HResult InitializeFromMemory(byte* pbBuffer, uint cbBufferSize); diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICComponentFactory.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICComponentFactory.cs index 6a6d52e..cc82f9b 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICComponentFactory.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICComponentFactory.cs @@ -73,9 +73,9 @@ public unsafe partial struct IWICComponentFactory : IWICComponentFactory.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult CreateDecoderFromFilename(ushort* wzFilename, Guid* pguidVendor, NativeFileAccess dwDesiredAccess, WICDecodeOptions metadataOptions, IWICBitmapDecoder** ppIDecoder) + public HResult CreateDecoderFromFilename(char* wzFilename, Guid* pguidVendor, NativeFileAccess dwDesiredAccess, WICDecodeOptions metadataOptions, IWICBitmapDecoder** ppIDecoder) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IWICComponentFactory*)Unsafe.AsPointer(ref this), wzFilename, pguidVendor, dwDesiredAccess, metadataOptions, ppIDecoder); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IWICComponentFactory*)Unsafe.AsPointer(ref this), wzFilename, pguidVendor, dwDesiredAccess, metadataOptions, ppIDecoder); } /// diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICComponentInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICComponentInfo.cs index 800bded..28bedb8 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICComponentInfo.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICComponentInfo.cs @@ -97,9 +97,9 @@ public unsafe partial struct IWICComponentInfo : IWICComponentInfo.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult GetAuthor(uint cchAuthor, char** wzAuthor, uint* pcchActual) + public HResult GetAuthor(uint cchAuthor, char* wzAuthor, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICComponentInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICComponentInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); } /// @@ -113,25 +113,25 @@ public unsafe partial struct IWICComponentInfo : IWICComponentInfo.Interface, IN /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetVersion(uint cchVersion, char** wzVersion, uint* pcchActual) + public HResult GetVersion(uint cchVersion, char* wzVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICComponentInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICComponentInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetSpecVersion(uint cchSpecVersion, char** wzSpecVersion, uint* pcchActual) + public HResult GetSpecVersion(uint cchSpecVersion, char* wzSpecVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICComponentInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICComponentInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetFriendlyName(uint cchFriendlyName, char** wzFriendlyName, uint* pcchActual) + public HResult GetFriendlyName(uint cchFriendlyName, char* wzFriendlyName, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICComponentInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICComponentInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); } public interface Interface : IUnknown.Interface @@ -146,19 +146,19 @@ public unsafe partial struct IWICComponentInfo : IWICComponentInfo.Interface, IN HResult GetSigningStatus(uint* pStatus); [VtblIndex(6)] - HResult GetAuthor(uint cchAuthor, char** wzAuthor, uint* pcchActual); + HResult GetAuthor(uint cchAuthor, char* wzAuthor, uint* pcchActual); [VtblIndex(7)] HResult GetVendorGUID(Guid* pguidVendor); [VtblIndex(8)] - HResult GetVersion(uint cchVersion, char** wzVersion, uint* pcchActual); + HResult GetVersion(uint cchVersion, char* wzVersion, uint* pcchActual); [VtblIndex(9)] - HResult GetSpecVersion(uint cchSpecVersion, char** wzSpecVersion, uint* pcchActual); + HResult GetSpecVersion(uint cchSpecVersion, char* wzSpecVersion, uint* pcchActual); [VtblIndex(10)] - HResult GetFriendlyName(uint cchFriendlyName, char** wzFriendlyName, uint* pcchActual); + HResult GetFriendlyName(uint cchFriendlyName, char* wzFriendlyName, uint* pcchActual); } } diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICFormatConverterInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICFormatConverterInfo.cs index d5c1e99..4aa7aa6 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICFormatConverterInfo.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICFormatConverterInfo.cs @@ -97,9 +97,9 @@ public unsafe partial struct IWICFormatConverterInfo : IWICFormatConverterInfo.I /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult GetAuthor(uint cchAuthor, char** wzAuthor, uint* pcchActual) + public HResult GetAuthor(uint cchAuthor, char* wzAuthor, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICFormatConverterInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICFormatConverterInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); } /// @@ -113,25 +113,25 @@ public unsafe partial struct IWICFormatConverterInfo : IWICFormatConverterInfo.I /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetVersion(uint cchVersion, char** wzVersion, uint* pcchActual) + public HResult GetVersion(uint cchVersion, char* wzVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICFormatConverterInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICFormatConverterInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetSpecVersion(uint cchSpecVersion, char** wzSpecVersion, uint* pcchActual) + public HResult GetSpecVersion(uint cchSpecVersion, char* wzSpecVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICFormatConverterInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICFormatConverterInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetFriendlyName(uint cchFriendlyName, char** wzFriendlyName, uint* pcchActual) + public HResult GetFriendlyName(uint cchFriendlyName, char* wzFriendlyName, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICFormatConverterInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICFormatConverterInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); } /// diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICImagingFactory.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICImagingFactory.cs index 938d098..9b9f7ff 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICImagingFactory.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICImagingFactory.cs @@ -73,9 +73,9 @@ public unsafe partial struct IWICImagingFactory : IWICImagingFactory.Interface, /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult CreateDecoderFromFilename(ushort* wzFilename, Guid* pguidVendor, NativeFileAccess dwDesiredAccess, WICDecodeOptions metadataOptions, IWICBitmapDecoder** ppIDecoder) + public HResult CreateDecoderFromFilename(char* wzFilename, Guid* pguidVendor, NativeFileAccess dwDesiredAccess, WICDecodeOptions metadataOptions, IWICBitmapDecoder** ppIDecoder) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IWICImagingFactory*)Unsafe.AsPointer(ref this), wzFilename, pguidVendor, dwDesiredAccess, metadataOptions, ppIDecoder); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[3]))((IWICImagingFactory*)Unsafe.AsPointer(ref this), wzFilename, pguidVendor, dwDesiredAccess, metadataOptions, ppIDecoder); } /// @@ -273,7 +273,7 @@ public unsafe partial struct IWICImagingFactory : IWICImagingFactory.Interface, public interface Interface : IUnknown.Interface { [VtblIndex(3)] - HResult CreateDecoderFromFilename(ushort* wzFilename, Guid* pguidVendor, NativeFileAccess dwDesiredAccess, WICDecodeOptions metadataOptions, IWICBitmapDecoder** ppIDecoder); + HResult CreateDecoderFromFilename(char* wzFilename, Guid* pguidVendor, NativeFileAccess dwDesiredAccess, WICDecodeOptions metadataOptions, IWICBitmapDecoder** ppIDecoder); [VtblIndex(4)] HResult CreateDecoderFromStream(Com.IStream* pIStream, Guid* pguidVendor, WICDecodeOptions metadataOptions, IWICBitmapDecoder** ppIDecoder); diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataHandlerInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataHandlerInfo.cs index debf79d..8dd904f 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataHandlerInfo.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataHandlerInfo.cs @@ -97,9 +97,9 @@ public unsafe partial struct IWICMetadataHandlerInfo : IWICMetadataHandlerInfo.I /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult GetAuthor(uint cchAuthor, char** wzAuthor, uint* pcchActual) + public HResult GetAuthor(uint cchAuthor, char* wzAuthor, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICMetadataHandlerInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICMetadataHandlerInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); } /// @@ -113,25 +113,25 @@ public unsafe partial struct IWICMetadataHandlerInfo : IWICMetadataHandlerInfo.I /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetVersion(uint cchVersion, char** wzVersion, uint* pcchActual) + public HResult GetVersion(uint cchVersion, char* wzVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICMetadataHandlerInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICMetadataHandlerInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetSpecVersion(uint cchSpecVersion, char** wzSpecVersion, uint* pcchActual) + public HResult GetSpecVersion(uint cchSpecVersion, char* wzSpecVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICMetadataHandlerInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICMetadataHandlerInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetFriendlyName(uint cchFriendlyName, char** wzFriendlyName, uint* pcchActual) + public HResult GetFriendlyName(uint cchFriendlyName, char* wzFriendlyName, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICMetadataHandlerInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICMetadataHandlerInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); } /// @@ -153,17 +153,17 @@ public unsafe partial struct IWICMetadataHandlerInfo : IWICMetadataHandlerInfo.I /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(13)] - public HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char** wzDeviceManufacturer, uint* pcchActual) + public HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char* wzDeviceManufacturer, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IWICMetadataHandlerInfo*)Unsafe.AsPointer(ref this), cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IWICMetadataHandlerInfo*)Unsafe.AsPointer(ref this), cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(14)] - public HResult GetDeviceModels(uint cchDeviceModels, char** wzDeviceModels, uint* pcchActual) + public HResult GetDeviceModels(uint cchDeviceModels, char* wzDeviceModels, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IWICMetadataHandlerInfo*)Unsafe.AsPointer(ref this), cchDeviceModels, wzDeviceModels, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IWICMetadataHandlerInfo*)Unsafe.AsPointer(ref this), cchDeviceModels, wzDeviceModels, pcchActual); } /// @@ -199,10 +199,10 @@ public unsafe partial struct IWICMetadataHandlerInfo : IWICMetadataHandlerInfo.I HResult GetContainerFormats(uint cContainerFormats, Guid* pguidContainerFormats, uint* pcchActual); [VtblIndex(13)] - HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char** wzDeviceManufacturer, uint* pcchActual); + HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char* wzDeviceManufacturer, uint* pcchActual); [VtblIndex(14)] - HResult GetDeviceModels(uint cchDeviceModels, char** wzDeviceModels, uint* pcchActual); + HResult GetDeviceModels(uint cchDeviceModels, char* wzDeviceModels, uint* pcchActual); [VtblIndex(15)] HResult DoesRequireFullStream(Bool32* pfRequiresFullStream); diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataQueryReader.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataQueryReader.cs index f2e3e0f..1d26efa 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataQueryReader.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataQueryReader.cs @@ -81,17 +81,17 @@ public unsafe partial struct IWICMetadataQueryReader : IWICMetadataQueryReader.I /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public HResult GetLocation(uint cchMaxLength, char** wzNamespace, uint* pcchActualLength) + public HResult GetLocation(uint cchMaxLength, char* wzNamespace, uint* pcchActualLength) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IWICMetadataQueryReader*)Unsafe.AsPointer(ref this), cchMaxLength, wzNamespace, pcchActualLength); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IWICMetadataQueryReader*)Unsafe.AsPointer(ref this), cchMaxLength, wzNamespace, pcchActualLength); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult GetMetadataByName(ushort* wzName, Com.Variant** pvarValue) + public HResult GetMetadataByName(char* wzName, Com.Variant** pvarValue) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IWICMetadataQueryReader*)Unsafe.AsPointer(ref this), wzName, pvarValue); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IWICMetadataQueryReader*)Unsafe.AsPointer(ref this), wzName, pvarValue); } /// @@ -108,10 +108,10 @@ public unsafe partial struct IWICMetadataQueryReader : IWICMetadataQueryReader.I HResult GetContainerFormat(Guid* pguidContainerFormat); [VtblIndex(4)] - HResult GetLocation(uint cchMaxLength, char** wzNamespace, uint* pcchActualLength); + HResult GetLocation(uint cchMaxLength, char* wzNamespace, uint* pcchActualLength); [VtblIndex(5)] - HResult GetMetadataByName(ushort* wzName, Com.Variant** pvarValue); + HResult GetMetadataByName(char* wzName, Com.Variant** pvarValue); [VtblIndex(6)] HResult GetEnumerator(Com.IEnumString** ppIEnumString); diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataQueryWriter.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataQueryWriter.cs index cbcacdd..b9ef29a 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataQueryWriter.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataQueryWriter.cs @@ -81,17 +81,17 @@ public unsafe partial struct IWICMetadataQueryWriter : IWICMetadataQueryWriter.I /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public HResult GetLocation(uint cchMaxLength, char** wzNamespace, uint* pcchActualLength) + public HResult GetLocation(uint cchMaxLength, char* wzNamespace, uint* pcchActualLength) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IWICMetadataQueryWriter*)Unsafe.AsPointer(ref this), cchMaxLength, wzNamespace, pcchActualLength); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[4]))((IWICMetadataQueryWriter*)Unsafe.AsPointer(ref this), cchMaxLength, wzNamespace, pcchActualLength); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult GetMetadataByName(ushort* wzName, Com.Variant** pvarValue) + public HResult GetMetadataByName(char* wzName, Com.Variant** pvarValue) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IWICMetadataQueryWriter*)Unsafe.AsPointer(ref this), wzName, pvarValue); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[5]))((IWICMetadataQueryWriter*)Unsafe.AsPointer(ref this), wzName, pvarValue); } /// @@ -105,26 +105,26 @@ public unsafe partial struct IWICMetadataQueryWriter : IWICMetadataQueryWriter.I /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult SetMetadataByName(ushort* wzName, Com.Variant* pvarValue) + public HResult SetMetadataByName(char* wzName, Com.Variant* pvarValue) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IWICMetadataQueryWriter*)Unsafe.AsPointer(ref this), wzName, pvarValue); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IWICMetadataQueryWriter*)Unsafe.AsPointer(ref this), wzName, pvarValue); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult RemoveMetadataByName(ushort* wzName) + public HResult RemoveMetadataByName(char* wzName) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICMetadataQueryWriter*)Unsafe.AsPointer(ref this), wzName); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICMetadataQueryWriter*)Unsafe.AsPointer(ref this), wzName); } public interface Interface : IWICMetadataQueryReader.Interface { [VtblIndex(7)] - HResult SetMetadataByName(ushort* wzName, Com.Variant* pvarValue); + HResult SetMetadataByName(char* wzName, Com.Variant* pvarValue); [VtblIndex(8)] - HResult RemoveMetadataByName(ushort* wzName); + HResult RemoveMetadataByName(char* wzName); } } diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataReaderInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataReaderInfo.cs index 85e2090..0de7de0 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataReaderInfo.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataReaderInfo.cs @@ -97,9 +97,9 @@ public unsafe partial struct IWICMetadataReaderInfo : IWICMetadataReaderInfo.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult GetAuthor(uint cchAuthor, char** wzAuthor, uint* pcchActual) + public HResult GetAuthor(uint cchAuthor, char* wzAuthor, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICMetadataReaderInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICMetadataReaderInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); } /// @@ -113,25 +113,25 @@ public unsafe partial struct IWICMetadataReaderInfo : IWICMetadataReaderInfo.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetVersion(uint cchVersion, char** wzVersion, uint* pcchActual) + public HResult GetVersion(uint cchVersion, char* wzVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICMetadataReaderInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICMetadataReaderInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetSpecVersion(uint cchSpecVersion, char** wzSpecVersion, uint* pcchActual) + public HResult GetSpecVersion(uint cchSpecVersion, char* wzSpecVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICMetadataReaderInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICMetadataReaderInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetFriendlyName(uint cchFriendlyName, char** wzFriendlyName, uint* pcchActual) + public HResult GetFriendlyName(uint cchFriendlyName, char* wzFriendlyName, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICMetadataReaderInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICMetadataReaderInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); } /// @@ -153,17 +153,17 @@ public unsafe partial struct IWICMetadataReaderInfo : IWICMetadataReaderInfo.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(13)] - public HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char** wzDeviceManufacturer, uint* pcchActual) + public HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char* wzDeviceManufacturer, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IWICMetadataReaderInfo*)Unsafe.AsPointer(ref this), cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IWICMetadataReaderInfo*)Unsafe.AsPointer(ref this), cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(14)] - public HResult GetDeviceModels(uint cchDeviceModels, char** wzDeviceModels, uint* pcchActual) + public HResult GetDeviceModels(uint cchDeviceModels, char* wzDeviceModels, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IWICMetadataReaderInfo*)Unsafe.AsPointer(ref this), cchDeviceModels, wzDeviceModels, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IWICMetadataReaderInfo*)Unsafe.AsPointer(ref this), cchDeviceModels, wzDeviceModels, pcchActual); } /// diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataWriterInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataWriterInfo.cs index fbd8a76..2fa9149 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataWriterInfo.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataWriterInfo.cs @@ -97,9 +97,9 @@ public unsafe partial struct IWICMetadataWriterInfo : IWICMetadataWriterInfo.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult GetAuthor(uint cchAuthor, char** wzAuthor, uint* pcchActual) + public HResult GetAuthor(uint cchAuthor, char* wzAuthor, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICMetadataWriterInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICMetadataWriterInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); } /// @@ -113,25 +113,25 @@ public unsafe partial struct IWICMetadataWriterInfo : IWICMetadataWriterInfo.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetVersion(uint cchVersion, char** wzVersion, uint* pcchActual) + public HResult GetVersion(uint cchVersion, char* wzVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICMetadataWriterInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICMetadataWriterInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetSpecVersion(uint cchSpecVersion, char** wzSpecVersion, uint* pcchActual) + public HResult GetSpecVersion(uint cchSpecVersion, char* wzSpecVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICMetadataWriterInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICMetadataWriterInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetFriendlyName(uint cchFriendlyName, char** wzFriendlyName, uint* pcchActual) + public HResult GetFriendlyName(uint cchFriendlyName, char* wzFriendlyName, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICMetadataWriterInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICMetadataWriterInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); } /// @@ -153,17 +153,17 @@ public unsafe partial struct IWICMetadataWriterInfo : IWICMetadataWriterInfo.Int /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(13)] - public HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char** wzDeviceManufacturer, uint* pcchActual) + public HResult GetDeviceManufacturer(uint cchDeviceManufacturer, char* wzDeviceManufacturer, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IWICMetadataWriterInfo*)Unsafe.AsPointer(ref this), cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[13]))((IWICMetadataWriterInfo*)Unsafe.AsPointer(ref this), cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(14)] - public HResult GetDeviceModels(uint cchDeviceModels, char** wzDeviceModels, uint* pcchActual) + public HResult GetDeviceModels(uint cchDeviceModels, char* wzDeviceModels, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IWICMetadataWriterInfo*)Unsafe.AsPointer(ref this), cchDeviceModels, wzDeviceModels, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[14]))((IWICMetadataWriterInfo*)Unsafe.AsPointer(ref this), cchDeviceModels, wzDeviceModels, pcchActual); } /// diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPixelFormatInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPixelFormatInfo.cs index 6c3526f..71de620 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPixelFormatInfo.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPixelFormatInfo.cs @@ -97,9 +97,9 @@ public unsafe partial struct IWICPixelFormatInfo : IWICPixelFormatInfo.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult GetAuthor(uint cchAuthor, char** wzAuthor, uint* pcchActual) + public HResult GetAuthor(uint cchAuthor, char* wzAuthor, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICPixelFormatInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICPixelFormatInfo*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); } /// @@ -113,25 +113,25 @@ public unsafe partial struct IWICPixelFormatInfo : IWICPixelFormatInfo.Interface /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetVersion(uint cchVersion, char** wzVersion, uint* pcchActual) + public HResult GetVersion(uint cchVersion, char* wzVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICPixelFormatInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICPixelFormatInfo*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetSpecVersion(uint cchSpecVersion, char** wzSpecVersion, uint* pcchActual) + public HResult GetSpecVersion(uint cchSpecVersion, char* wzSpecVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICPixelFormatInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICPixelFormatInfo*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetFriendlyName(uint cchFriendlyName, char** wzFriendlyName, uint* pcchActual) + public HResult GetFriendlyName(uint cchFriendlyName, char* wzFriendlyName, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICPixelFormatInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICPixelFormatInfo*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); } /// diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPixelFormatInfo2.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPixelFormatInfo2.cs index 6937489..84b0f9b 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPixelFormatInfo2.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPixelFormatInfo2.cs @@ -97,9 +97,9 @@ public unsafe partial struct IWICPixelFormatInfo2 : IWICPixelFormatInfo2.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult GetAuthor(uint cchAuthor, char** wzAuthor, uint* pcchActual) + public HResult GetAuthor(uint cchAuthor, char* wzAuthor, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICPixelFormatInfo2*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[6]))((IWICPixelFormatInfo2*)Unsafe.AsPointer(ref this), cchAuthor, wzAuthor, pcchActual); } /// @@ -113,25 +113,25 @@ public unsafe partial struct IWICPixelFormatInfo2 : IWICPixelFormatInfo2.Interfa /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetVersion(uint cchVersion, char** wzVersion, uint* pcchActual) + public HResult GetVersion(uint cchVersion, char* wzVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICPixelFormatInfo2*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[8]))((IWICPixelFormatInfo2*)Unsafe.AsPointer(ref this), cchVersion, wzVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetSpecVersion(uint cchSpecVersion, char** wzSpecVersion, uint* pcchActual) + public HResult GetSpecVersion(uint cchSpecVersion, char* wzSpecVersion, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICPixelFormatInfo2*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[9]))((IWICPixelFormatInfo2*)Unsafe.AsPointer(ref this), cchSpecVersion, wzSpecVersion, pcchActual); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult GetFriendlyName(uint cchFriendlyName, char** wzFriendlyName, uint* pcchActual) + public HResult GetFriendlyName(uint cchFriendlyName, char* wzFriendlyName, uint* pcchActual) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICPixelFormatInfo2*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[10]))((IWICPixelFormatInfo2*)Unsafe.AsPointer(ref this), cchFriendlyName, wzFriendlyName, pcchActual); } /// diff --git a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICStream.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICStream.cs index 717fd7b..747ef46 100644 --- a/src/Vortice.Win32.Graphics.Imaging/Generated/IWICStream.cs +++ b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICStream.cs @@ -81,9 +81,9 @@ public unsafe partial struct IWICStream : IWICStream.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(15)] - public HResult InitializeFromFilename(ushort* wzFileName, uint dwDesiredAccess) + public HResult InitializeFromFilename(char* wzFileName, uint dwDesiredAccess) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IWICStream*)Unsafe.AsPointer(ref this), wzFileName, dwDesiredAccess); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[15]))((IWICStream*)Unsafe.AsPointer(ref this), wzFileName, dwDesiredAccess); } /// @@ -108,7 +108,7 @@ public unsafe partial struct IWICStream : IWICStream.Interface, INativeGuid HResult InitializeFromIStream(Com.IStream* pIStream); [VtblIndex(15)] - HResult InitializeFromFilename(ushort* wzFileName, uint dwDesiredAccess); + HResult InitializeFromFilename(char* wzFileName, uint dwDesiredAccess); [VtblIndex(16)] HResult InitializeFromMemory(byte* pbBuffer, uint cbBufferSize); diff --git a/src/Vortice.Win32.Graphics.Imaging/IWICImagingFactory.cs b/src/Vortice.Win32.Graphics.Imaging/IWICImagingFactory.cs index 9dbb3a4..6347de9 100644 --- a/src/Vortice.Win32.Graphics.Imaging/IWICImagingFactory.cs +++ b/src/Vortice.Win32.Graphics.Imaging/IWICImagingFactory.cs @@ -27,7 +27,7 @@ public unsafe partial struct IWICImagingFactory fixed (char* filenamePtr = filename) { ThrowIfFailed(CreateDecoderFromFilename( - (ushort*)filenamePtr, + filenamePtr, null, nativeAccess, metadataOptions, diff --git a/src/Vortice.Win32.Media.Audio.XAudio2/Generated/IXAudio2.cs b/src/Vortice.Win32.Media.Audio.XAudio2/Generated/IXAudio2.cs index 0caa024..b68abaf 100644 --- a/src/Vortice.Win32.Media.Audio.XAudio2/Generated/IXAudio2.cs +++ b/src/Vortice.Win32.Media.Audio.XAudio2/Generated/IXAudio2.cs @@ -105,9 +105,9 @@ public unsafe partial struct IXAudio2 : IXAudio2.Interface, INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CreateMasteringVoice(IXAudio2MasteringVoice** ppMasteringVoice, uint InputChannels, uint InputSampleRate, uint Flags, ushort* szDeviceId, EffectChain* pEffectChain, Media.Audio.AudioStreamCategory StreamCategory) + public HResult CreateMasteringVoice(IXAudio2MasteringVoice** ppMasteringVoice, uint InputChannels, uint InputSampleRate, uint Flags, char* szDeviceId, EffectChain* pEffectChain, Media.Audio.AudioStreamCategory StreamCategory) { - return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IXAudio2*)Unsafe.AsPointer(ref this), ppMasteringVoice, InputChannels, InputSampleRate, Flags, szDeviceId, pEffectChain, StreamCategory); + return ((delegate* unmanaged[MemberFunction])(lpVtbl[7]))((IXAudio2*)Unsafe.AsPointer(ref this), ppMasteringVoice, InputChannels, InputSampleRate, Flags, szDeviceId, pEffectChain, StreamCategory); } /// @@ -165,7 +165,7 @@ public unsafe partial struct IXAudio2 : IXAudio2.Interface, INativeGuid HResult CreateSubmixVoice(IXAudio2SubmixVoice** ppSubmixVoice, uint InputChannels, uint InputSampleRate, uint Flags, uint ProcessingStage, VoiceSends* pSendList, EffectChain* pEffectChain); [VtblIndex(7)] - HResult CreateMasteringVoice(IXAudio2MasteringVoice** ppMasteringVoice, uint InputChannels, uint InputSampleRate, uint Flags, ushort* szDeviceId, EffectChain* pEffectChain, Media.Audio.AudioStreamCategory StreamCategory); + HResult CreateMasteringVoice(IXAudio2MasteringVoice** ppMasteringVoice, uint InputChannels, uint InputSampleRate, uint Flags, char* szDeviceId, EffectChain* pEffectChain, Media.Audio.AudioStreamCategory StreamCategory); [VtblIndex(8)] HResult StartEngine(); diff --git a/src/Vortice.Win32.Media.Audio.XAudio2/Generated/Media.Audio.XAudio2.Apis.Functions.cs b/src/Vortice.Win32.Media.Audio.XAudio2/Generated/Media.Audio.XAudio2.Apis.Functions.cs index 1e11092..f1b71ab 100644 --- a/src/Vortice.Win32.Media.Audio.XAudio2/Generated/Media.Audio.XAudio2.Apis.Functions.cs +++ b/src/Vortice.Win32.Media.Audio.XAudio2/Generated/Media.Audio.XAudio2.Apis.Functions.cs @@ -12,22 +12,22 @@ namespace Win32.Media.Audio.XAudio2; public static unsafe partial class Apis { /// - [DllImport("xaudio2_9", ExactSpelling = true)] - public static extern HResult CreateFX(Guid* clsid, IUnknown** pEffect, void* pInitDat, uint InitDataByteSize); + [LibraryImport("xaudio2_9")] + public static partial HResult CreateFX(Guid* clsid, IUnknown** pEffect, void* pInitDat, uint InitDataByteSize); /// - [DllImport("xaudio2_9", ExactSpelling = true)] - public static extern HResult XAudio2CreateWithVersionInfo(IXAudio2** ppXAudio2, uint Flags, uint XAudio2Processor, uint ntddiVersion); + [LibraryImport("xaudio2_9")] + public static partial HResult XAudio2CreateWithVersionInfo(IXAudio2** ppXAudio2, uint Flags, uint XAudio2Processor, uint ntddiVersion); /// - [DllImport("xaudio2_9", ExactSpelling = true)] - public static extern HResult CreateAudioVolumeMeter(IUnknown** ppApo); + [LibraryImport("xaudio2_9")] + public static partial HResult CreateAudioVolumeMeter(IUnknown** ppApo); /// - [DllImport("xaudio2_9", ExactSpelling = true)] - public static extern HResult CreateAudioReverb(IUnknown** ppApo); + [LibraryImport("xaudio2_9")] + public static partial HResult CreateAudioReverb(IUnknown** ppApo); /// - [DllImport("HrtfApo.dll", ExactSpelling = true)] - public static extern HResult CreateHrtfApo(HrtfApoInit* init, IXAPO** xApo); + [LibraryImport("HrtfApo.dll")] + public static partial HResult CreateHrtfApo(HrtfApoInit* init, IXAPO** xApo); } diff --git a/src/Vortice.Win32.Media.Audio.XAudio2/X3DAudio/Apis.cs b/src/Vortice.Win32.Media.Audio.XAudio2/X3DAudio/Apis.cs index 7adfe4e..067b9dc 100644 --- a/src/Vortice.Win32.Media.Audio.XAudio2/X3DAudio/Apis.cs +++ b/src/Vortice.Win32.Media.Audio.XAudio2/X3DAudio/Apis.cs @@ -15,9 +15,12 @@ public static unsafe partial class Apis X3DAudioCalculate(Instance, pListener, pEmitter, (uint)Flags, pDSPSettings); } - [DllImport("xaudio2_9", ExactSpelling = true)] - public static extern HResult X3DAudioInitialize(uint SpeakerChannelMask, float SpeedOfSound, out X3DAudioHandle Instance); + [LibraryImport("xaudio2_9")] + public static partial HResult X3DAudioInitialize(uint SpeakerChannelMask, float SpeedOfSound, out X3DAudioHandle Instance); - [DllImport("xaudio2_9", ExactSpelling = true)] - public static extern void X3DAudioCalculate(in X3DAudioHandle Instance, X3DAudioListener* pListener, X3DAudioEmitter* pEmitter, uint Flags, X3DAudioDSPSettings* pDSPSettings); + [LibraryImport("xaudio2_9")] + public static partial void X3DAudioCalculate(in X3DAudioHandle Instance, X3DAudioListener* pListener, X3DAudioEmitter* pEmitter, uint Flags, X3DAudioDSPSettings* pDSPSettings); + + [LibraryImport("xaudio2_9")] + public static partial void X3DAudioCalculate(X3DAudioHandle* Instance, X3DAudioListener* pListener, X3DAudioEmitter* pEmitter, uint Flags, X3DAudioDSPSettings* pDSPSettings); }