From 3f9da136a9e065ff9f2bb46603da505026957866 Mon Sep 17 00:00:00 2001 From: Amer Koleci Date: Fri, 16 Sep 2022 11:26:13 +0200 Subject: [PATCH] Fix typos and improve out params. --- src/Vortice.Win32/Com/IStream.cs | 22 +++---- src/Vortice.Win32/Com/Variant.cs | 4 +- src/Vortice.Win32/Generated/Graphics/Dxgi.cs | 64 +++++++++---------- .../{LargeInterger.cs => LargeInteger.cs} | 2 +- src/Vortice.Win32/Luid.cs | 4 +- .../{ULargeInterger.cs => ULargeInteger.cs} | 2 +- 6 files changed, 49 insertions(+), 49 deletions(-) rename src/Vortice.Win32/{LargeInterger.cs => LargeInteger.cs} (97%) rename src/Vortice.Win32/{ULargeInterger.cs => ULargeInteger.cs} (98%) diff --git a/src/Vortice.Win32/Com/IStream.cs b/src/Vortice.Win32/Com/IStream.cs index ac1650b..e06d56f 100644 --- a/src/Vortice.Win32/Com/IStream.cs +++ b/src/Vortice.Win32/Com/IStream.cs @@ -82,23 +82,23 @@ public unsafe partial struct IStream [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult Seek(LargeInterger dlibMove, uint dwOrigin, LargeInterger* plibNewPosition) + public HResult Seek(LargeInteger dlibMove, uint dwOrigin, LargeInteger* plibNewPosition) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[5]))((IStream*)Unsafe.AsPointer(ref this), dlibMove, dwOrigin, plibNewPosition); + return ((delegate* unmanaged[Stdcall])(lpVtbl[5]))((IStream*)Unsafe.AsPointer(ref this), dlibMove, dwOrigin, plibNewPosition); } [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult SetSize(LargeInterger libNewSize) + public HResult SetSize(LargeInteger libNewSize) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[6]))((IStream*)Unsafe.AsPointer(ref this), libNewSize); + return ((delegate* unmanaged[Stdcall])(lpVtbl[6]))((IStream*)Unsafe.AsPointer(ref this), libNewSize); } [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CopyTo(IStream* pstm, ULargeInterger cb, ULargeInterger* pcbRead, ULargeInterger* pcbWritten) + public HResult CopyTo(IStream* pstm, ULargeInteger cb, ULargeInteger* pcbRead, ULargeInteger* pcbWritten) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[7]))((IStream*)Unsafe.AsPointer(ref this), pstm, cb, pcbRead, pcbWritten); + return ((delegate* unmanaged[Stdcall])(lpVtbl[7]))((IStream*)Unsafe.AsPointer(ref this), pstm, cb, pcbRead, pcbWritten); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -117,22 +117,22 @@ public unsafe partial struct IStream [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(10)] - public HResult LockRegion(ULargeInterger libOffset, ULargeInterger cb, [NativeTypeName("DWORD")] uint dwLockType) + public HResult LockRegion(ULargeInteger libOffset, ULargeInteger cb, uint dwLockType) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[10]))((IStream*)Unsafe.AsPointer(ref this), libOffset, cb, dwLockType); + return ((delegate* unmanaged[Stdcall])(lpVtbl[10]))((IStream*)Unsafe.AsPointer(ref this), libOffset, cb, dwLockType); } [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(11)] - public HResult UnlockRegion(ULargeInterger libOffset, ULargeInterger cb, [NativeTypeName("DWORD")] uint dwLockType) + public HResult UnlockRegion(ULargeInteger libOffset, ULargeInteger cb, uint dwLockType) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[11]))((IStream*)Unsafe.AsPointer(ref this), libOffset, cb, dwLockType); + return ((delegate* unmanaged[Stdcall])(lpVtbl[11]))((IStream*)Unsafe.AsPointer(ref this), libOffset, cb, dwLockType); } ///// //[MethodImpl(MethodImplOptions.AggressiveInlining)] //[VtblIndex(12)] - //public HRESULT Stat(STATSTG* pstatstg, [NativeTypeName("DWORD")] uint grfStatFlag) + //public HRESULT Stat(STATSTG* pstatstg, uint grfStatFlag) //{ // return ((delegate* unmanaged[Stdcall])(lpVtbl[12]))((IStream*)Unsafe.AsPointer(ref this), pstatstg, grfStatFlag); //} diff --git a/src/Vortice.Win32/Com/Variant.cs b/src/Vortice.Win32/Com/Variant.cs index 47a498f..cbd2e40 100644 --- a/src/Vortice.Win32/Com/Variant.cs +++ b/src/Vortice.Win32/Com/Variant.cs @@ -356,8 +356,8 @@ public unsafe partial struct Variant [FieldOffset(0)] public uint uintValue; [FieldOffset(0)] public long longValue; [FieldOffset(0)] public ulong ulongValue; - [FieldOffset(0)] public LargeInterger largeIntergerValue; - [FieldOffset(0)] public ULargeInterger ulargeIntergerValue; + [FieldOffset(0)] public LargeInteger largeIntergerValue; + [FieldOffset(0)] public ULargeInteger ulargeIntergerValue; [FieldOffset(0)] public float floatValue; [FieldOffset(0)] public double doubleValue; [FieldOffset(0)] public short boolValue; diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi.cs index c6634c8..24b03a0 100644 --- a/src/Vortice.Win32/Generated/Graphics/Dxgi.cs +++ b/src/Vortice.Win32/Generated/Graphics/Dxgi.cs @@ -1774,10 +1774,10 @@ public partial struct FrameStatistics public uint SyncRefreshCount; /// - public LargeInterger SyncQPCTime; + public LargeInteger SyncQPCTime; /// - public LargeInterger SyncGPUTime; + public LargeInteger SyncGPUTime; } /// @@ -2004,10 +2004,10 @@ public partial struct OutduplPointerShapeInfo public partial struct OutduplFrameInfo { /// - public LargeInterger LastPresentTime; + public LargeInteger LastPresentTime; /// - public LargeInterger LastMouseUpdateTime; + public LargeInteger LastMouseUpdateTime; /// public uint AccumulatedFrames; @@ -2212,10 +2212,10 @@ public partial struct FrameStatisticsMedia public uint SyncRefreshCount; /// - public LargeInterger SyncQPCTime; + public LargeInteger SyncQPCTime; /// - public LargeInterger SyncGPUTime; + public LargeInteger SyncGPUTime; /// public FramePresentationMode CompositionMode; @@ -3254,9 +3254,9 @@ public unsafe partial struct IDXGIAdapter /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult CheckInterfaceSupport(Guid* InterfaceName, LargeInterger* pUMDVersion) + public HResult CheckInterfaceSupport(Guid* InterfaceName, LargeInteger* pUMDVersion) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[9]))((IDXGIAdapter*)Unsafe.AsPointer(ref this), InterfaceName, pUMDVersion); + return ((delegate* unmanaged[Stdcall])(lpVtbl[9]))((IDXGIAdapter*)Unsafe.AsPointer(ref this), InterfaceName, pUMDVersion); } } @@ -4130,9 +4130,9 @@ public unsafe partial struct IDXGIAdapter1 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult CheckInterfaceSupport(Guid* InterfaceName, LargeInterger* pUMDVersion) + public HResult CheckInterfaceSupport(Guid* InterfaceName, LargeInteger* pUMDVersion) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[5]))((IDXGIAdapter1*)Unsafe.AsPointer(ref this), InterfaceName, pUMDVersion); + return ((delegate* unmanaged[Stdcall])(lpVtbl[5]))((IDXGIAdapter1*)Unsafe.AsPointer(ref this), InterfaceName, pUMDVersion); } /// @@ -5268,9 +5268,9 @@ public unsafe partial struct IDXGISwapChain1 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(24)] - public HResult GetRestrictToOutput(IDXGIOutput* ppRestrictToOutput) + public HResult GetRestrictToOutput(IDXGIOutput** ppRestrictToOutput) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[24]))((IDXGISwapChain1*)Unsafe.AsPointer(ref this), ppRestrictToOutput); + return ((delegate* unmanaged[Stdcall])(lpVtbl[24]))((IDXGISwapChain1*)Unsafe.AsPointer(ref this), ppRestrictToOutput); } /// @@ -5632,9 +5632,9 @@ public unsafe partial struct IDXGIAdapter2 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(6)] - public HResult CheckInterfaceSupport(Guid* InterfaceName, LargeInterger* pUMDVersion) + public HResult CheckInterfaceSupport(Guid* InterfaceName, LargeInteger* pUMDVersion) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[6]))((IDXGIAdapter2*)Unsafe.AsPointer(ref this), InterfaceName, pUMDVersion); + return ((delegate* unmanaged[Stdcall])(lpVtbl[6]))((IDXGIAdapter2*)Unsafe.AsPointer(ref this), InterfaceName, pUMDVersion); } /// @@ -6194,9 +6194,9 @@ public unsafe partial struct IDXGISwapChain2 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(9)] - public HResult GetRestrictToOutput(IDXGIOutput* ppRestrictToOutput) + public HResult GetRestrictToOutput(IDXGIOutput** ppRestrictToOutput) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[9]))((IDXGISwapChain2*)Unsafe.AsPointer(ref this), ppRestrictToOutput); + return ((delegate* unmanaged[Stdcall])(lpVtbl[9]))((IDXGISwapChain2*)Unsafe.AsPointer(ref this), ppRestrictToOutput); } /// @@ -7588,9 +7588,9 @@ public unsafe partial struct IDXGISwapChain3 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(16)] - public HResult GetRestrictToOutput(IDXGIOutput* ppRestrictToOutput) + public HResult GetRestrictToOutput(IDXGIOutput** ppRestrictToOutput) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[16]))((IDXGISwapChain3*)Unsafe.AsPointer(ref this), ppRestrictToOutput); + return ((delegate* unmanaged[Stdcall])(lpVtbl[16]))((IDXGISwapChain3*)Unsafe.AsPointer(ref this), ppRestrictToOutput); } /// @@ -8272,9 +8272,9 @@ public unsafe partial struct IDXGIFactory4 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(26)] - public HResult EnumAdapterByLuid(Luid* AdapterLuid, Guid* riid, void** ppvAdapter) + public HResult EnumAdapterByLuid(Luid AdapterLuid, Guid* riid, void** ppvAdapter) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[26]))((IDXGIFactory4*)Unsafe.AsPointer(ref this), AdapterLuid, riid, ppvAdapter); + return ((delegate* unmanaged[Stdcall])(lpVtbl[26]))((IDXGIFactory4*)Unsafe.AsPointer(ref this), AdapterLuid, riid, ppvAdapter); } /// @@ -8382,9 +8382,9 @@ public unsafe partial struct IDXGIAdapter3 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult CheckInterfaceSupport(Guid* InterfaceName, LargeInterger* pUMDVersion) + public HResult CheckInterfaceSupport(Guid* InterfaceName, LargeInteger* pUMDVersion) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[7]))((IDXGIAdapter3*)Unsafe.AsPointer(ref this), InterfaceName, pUMDVersion); + return ((delegate* unmanaged[Stdcall])(lpVtbl[7]))((IDXGIAdapter3*)Unsafe.AsPointer(ref this), InterfaceName, pUMDVersion); } /// @@ -8922,9 +8922,9 @@ public unsafe partial struct IDXGISwapChain4 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(20)] - public HResult GetRestrictToOutput(IDXGIOutput* ppRestrictToOutput) + public HResult GetRestrictToOutput(IDXGIOutput** ppRestrictToOutput) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[20]))((IDXGISwapChain4*)Unsafe.AsPointer(ref this), ppRestrictToOutput); + return ((delegate* unmanaged[Stdcall])(lpVtbl[20]))((IDXGISwapChain4*)Unsafe.AsPointer(ref this), ppRestrictToOutput); } /// @@ -9350,9 +9350,9 @@ public unsafe partial struct IDXGIFactory5 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult EnumAdapterByLuid(Luid* AdapterLuid, Guid* riid, void** ppvAdapter) + public HResult EnumAdapterByLuid(Luid AdapterLuid, Guid* riid, void** ppvAdapter) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[3]))((IDXGIFactory5*)Unsafe.AsPointer(ref this), AdapterLuid, riid, ppvAdapter); + return ((delegate* unmanaged[Stdcall])(lpVtbl[3]))((IDXGIFactory5*)Unsafe.AsPointer(ref this), AdapterLuid, riid, ppvAdapter); } /// @@ -9700,9 +9700,9 @@ public unsafe partial struct IDXGIAdapter4 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(13)] - public HResult CheckInterfaceSupport(Guid* InterfaceName, LargeInterger* pUMDVersion) + public HResult CheckInterfaceSupport(Guid* InterfaceName, LargeInteger* pUMDVersion) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[13]))((IDXGIAdapter4*)Unsafe.AsPointer(ref this), InterfaceName, pUMDVersion); + return ((delegate* unmanaged[Stdcall])(lpVtbl[13]))((IDXGIAdapter4*)Unsafe.AsPointer(ref this), InterfaceName, pUMDVersion); } /// @@ -10088,9 +10088,9 @@ public unsafe partial struct IDXGIFactory6 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public HResult EnumAdapterByLuid(Luid* AdapterLuid, Guid* riid, void** ppvAdapter) + public HResult EnumAdapterByLuid(Luid AdapterLuid, Guid* riid, void** ppvAdapter) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[4]))((IDXGIFactory6*)Unsafe.AsPointer(ref this), AdapterLuid, riid, ppvAdapter); + return ((delegate* unmanaged[Stdcall])(lpVtbl[4]))((IDXGIFactory6*)Unsafe.AsPointer(ref this), AdapterLuid, riid, ppvAdapter); } /// @@ -10374,9 +10374,9 @@ public unsafe partial struct IDXGIFactory7 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] - public HResult EnumAdapterByLuid(Luid* AdapterLuid, Guid* riid, void** ppvAdapter) + public HResult EnumAdapterByLuid(Luid AdapterLuid, Guid* riid, void** ppvAdapter) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[5]))((IDXGIFactory7*)Unsafe.AsPointer(ref this), AdapterLuid, riid, ppvAdapter); + return ((delegate* unmanaged[Stdcall])(lpVtbl[5]))((IDXGIFactory7*)Unsafe.AsPointer(ref this), AdapterLuid, riid, ppvAdapter); } /// diff --git a/src/Vortice.Win32/LargeInterger.cs b/src/Vortice.Win32/LargeInteger.cs similarity index 97% rename from src/Vortice.Win32/LargeInterger.cs rename to src/Vortice.Win32/LargeInteger.cs index 1819906..fc9398d 100644 --- a/src/Vortice.Win32/LargeInterger.cs +++ b/src/Vortice.Win32/LargeInteger.cs @@ -12,7 +12,7 @@ namespace Win32; [StructLayout(LayoutKind.Explicit)] [NativeTypeName("LARGE_INTEGER")] -public partial struct LargeInterger +public partial struct LargeInteger { [FieldOffset(0)] public _Anonymous_e__Struct Anonymous; diff --git a/src/Vortice.Win32/Luid.cs b/src/Vortice.Win32/Luid.cs index 36fe117..853dd7c 100644 --- a/src/Vortice.Win32/Luid.cs +++ b/src/Vortice.Win32/Luid.cs @@ -54,7 +54,7 @@ public struct Luid : IEquatable public long ToInt64() { - LargeInterger val = new(); + LargeInteger val = new(); val.Anonymous.LowPart = LowPart; val.Anonymous.HighPart = HighPart; return val.QuadPart; @@ -62,7 +62,7 @@ public struct Luid : IEquatable public static Luid FromInt64(long Int64) { - LargeInterger val = new(); + LargeInteger val = new(); val.QuadPart = Int64; Luid luid = new(); diff --git a/src/Vortice.Win32/ULargeInterger.cs b/src/Vortice.Win32/ULargeInteger.cs similarity index 98% rename from src/Vortice.Win32/ULargeInterger.cs rename to src/Vortice.Win32/ULargeInteger.cs index 018973c..f1532ae 100644 --- a/src/Vortice.Win32/ULargeInterger.cs +++ b/src/Vortice.Win32/ULargeInteger.cs @@ -12,7 +12,7 @@ namespace Win32; [StructLayout(LayoutKind.Explicit)] [NativeTypeName("ULARGE_INTEGER")] -public partial struct ULargeInterger +public partial struct ULargeInteger { [FieldOffset(0)] [NativeTypeName("_ULARGE_INTEGER::(anonymous struct at C:/Program Files (x86)/Windows Kits/10/Include/10.0.22621.0/um/winnt.h:895:5)")]