diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs
index b4c3c23..4e7511d 100644
--- a/src/Generator/Program.cs
+++ b/src/Generator/Program.cs
@@ -1503,17 +1503,11 @@ public static class Program
foreach (ApiStructField field in structType.Fields)
{
if (field.Name.EndsWith("_FORCE_DWORD"))
+ {
continue;
+ }
- string fieldValueName;
- if (nestedType)
- {
- fieldValueName = field.Name;
- }
- else
- {
- fieldValueName = GetPrettyFieldName(field.Name, structPrefix, false);
- }
+ string fieldValueName = field.Name;
if (structType.Name == "D3D11_OMAC")
{
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D.Dxc.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D.Dxc.cs
index 46bd461..11ef166 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D.Dxc.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D.Dxc.cs
@@ -393,7 +393,7 @@ public partial struct DxcShaderHash
public DxcHashFlags Flags;
///
- public unsafe fixed byte Hashdigest[16];
+ public unsafe fixed byte HashDigest[16];
}
///
@@ -426,10 +426,10 @@ public partial struct DxcDefine
public partial struct DxcArgPair
{
///
- public unsafe ushort* Pname;
+ public unsafe ushort* pName;
///
- public unsafe ushort* Pvalue;
+ public unsafe ushort* pValue;
}
#endregion Structs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging.cs b/src/Vortice.Win32/Generated/Graphics/Imaging.cs
index 7d930a4..0636b78 100644
--- a/src/Vortice.Win32/Generated/Graphics/Imaging.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Imaging.cs
@@ -7479,7 +7479,7 @@ public partial struct WICBitmapPattern
public unsafe byte* Mask;
///
- public Bool32 Endofstream;
+ public Bool32 EndOfStream;
}
///
@@ -7487,13 +7487,13 @@ public partial struct WICBitmapPattern
public partial struct WICImageParameters
{
///
- public Graphics.Direct2D.Common.PixelFormat Pixelformat;
+ public Graphics.Direct2D.Common.PixelFormat PixelFormat;
///
- public float Dpix;
+ public float DpiX;
///
- public float Dpiy;
+ public float DpiY;
///
public float Top;
@@ -7502,10 +7502,10 @@ public partial struct WICImageParameters
public float Left;
///
- public uint Pixelwidth;
+ public uint PixelWidth;
///
- public uint Pixelheight;
+ public uint PixelHeight;
}
///
@@ -7530,13 +7530,13 @@ public partial struct WICBitmapPlane
public Guid Format;
///
- public unsafe byte* Pbbuffer;
+ public unsafe byte* pbBuffer;
///
- public uint Cbstride;
+ public uint cbStride;
///
- public uint Cbbuffersize;
+ public uint cbBufferSize;
}
///
@@ -7550,22 +7550,22 @@ public partial struct WICJpegFrameHeader
public uint Height;
///
- public WICJpegTransferMatrix Transfermatrix;
+ public WICJpegTransferMatrix TransferMatrix;
///
- public WICJpegScanType Scantype;
+ public WICJpegScanType ScanType;
///
- public uint Ccomponents;
+ public uint cComponents;
///
- public uint Componentidentifiers;
+ public uint ComponentIdentifiers;
///
- public uint Samplefactors;
+ public uint SampleFactors;
///
- public uint Quantizationtableindices;
+ public uint QuantizationTableIndices;
}
///
@@ -7573,28 +7573,28 @@ public partial struct WICJpegFrameHeader
public partial struct WICJpegScanHeader
{
///
- public uint Ccomponents;
+ public uint cComponents;
///
- public uint Restartinterval;
+ public uint RestartInterval;
///
- public uint Componentselectors;
+ public uint ComponentSelectors;
///
- public uint Huffmantableindices;
+ public uint HuffmanTableIndices;
///
- public byte Startspectralselection;
+ public byte StartSpectralSelection;
///
- public byte Endspectralselection;
+ public byte EndSpectralSelection;
///
- public byte Successiveapproximationhigh;
+ public byte SuccessiveApproximationHigh;
///
- public byte Successiveapproximationlow;
+ public byte SuccessiveApproximationLow;
}
///
@@ -7602,58 +7602,58 @@ public partial struct WICJpegScanHeader
public partial struct WICRawCapabilitiesInfo
{
///
- public uint Cbsize;
+ public uint cbSize;
///
- public uint Codecmajorversion;
+ public uint CodecMajorVersion;
///
- public uint Codecminorversion;
+ public uint CodecMinorVersion;
///
- public WICRawCapabilities Exposurecompensationsupport;
+ public WICRawCapabilities ExposureCompensationSupport;
///
- public WICRawCapabilities Contrastsupport;
+ public WICRawCapabilities ContrastSupport;
///
- public WICRawCapabilities Rgbwhitepointsupport;
+ public WICRawCapabilities RGBWhitePointSupport;
///
- public WICRawCapabilities Namedwhitepointsupport;
+ public WICRawCapabilities NamedWhitePointSupport;
///
- public uint Namedwhitepointsupportmask;
+ public uint NamedWhitePointSupportMask;
///
- public WICRawCapabilities Kelvinwhitepointsupport;
+ public WICRawCapabilities KelvinWhitePointSupport;
///
- public WICRawCapabilities Gammasupport;
+ public WICRawCapabilities GammaSupport;
///
- public WICRawCapabilities Tintsupport;
+ public WICRawCapabilities TintSupport;
///
- public WICRawCapabilities Saturationsupport;
+ public WICRawCapabilities SaturationSupport;
///
- public WICRawCapabilities Sharpnesssupport;
+ public WICRawCapabilities SharpnessSupport;
///
- public WICRawCapabilities Noisereductionsupport;
+ public WICRawCapabilities NoiseReductionSupport;
///
- public WICRawCapabilities Destinationcolorprofilesupport;
+ public WICRawCapabilities DestinationColorProfileSupport;
///
- public WICRawCapabilities Tonecurvesupport;
+ public WICRawCapabilities ToneCurveSupport;
///
- public WICRawRotationCapabilities Rotationsupport;
+ public WICRawRotationCapabilities RotationSupport;
///
- public WICRawCapabilities Rendermodesupport;
+ public WICRawCapabilities RenderModeSupport;
}
///
@@ -7672,12 +7672,12 @@ public partial struct WICRawToneCurvePoint
public partial struct WICRawToneCurve
{
///
- public uint Cpoints;
+ public uint cPoints;
///
- public Apoints__FixedBuffer Apoints;
+ public aPoints__FixedBuffer aPoints;
- public unsafe struct Apoints__FixedBuffer
+ public unsafe struct aPoints__FixedBuffer
{
public WICRawToneCurvePoint e0;
@@ -7714,19 +7714,19 @@ public partial struct WICDdsParameters
public uint Depth;
///
- public uint Miplevels;
+ public uint MipLevels;
///
- public uint Arraysize;
+ public uint ArraySize;
///
- public Graphics.Dxgi.Common.Format Dxgiformat;
+ public Graphics.Dxgi.Common.Format DxgiFormat;
///
public WICDdsDimension Dimension;
///
- public WICDdsAlphaMode Alphamode;
+ public WICDdsAlphaMode AlphaMode;
}
///
@@ -7734,16 +7734,16 @@ public partial struct WICDdsParameters
public partial struct WICDdsFormatInfo
{
///
- public Graphics.Dxgi.Common.Format Dxgiformat;
+ public Graphics.Dxgi.Common.Format DxgiFormat;
///
- public uint Bytesperblock;
+ public uint BytesPerBlock;
///
- public uint Blockwidth;
+ public uint BlockWidth;
///
- public uint Blockheight;
+ public uint BlockHeight;
}
///
@@ -7763,7 +7763,7 @@ public partial struct WICMetadataPattern
public unsafe byte* Mask;
///
- public ULargeInteger Dataoffset;
+ public ULargeInteger DataOffset;
}
///
@@ -7780,7 +7780,7 @@ public partial struct WICMetadataHeader
public unsafe byte* Header;
///
- public ULargeInteger Dataoffset;
+ public ULargeInteger DataOffset;
}
#endregion Structs
diff --git a/src/Vortice.Win32/Vortice.Win32.csproj b/src/Vortice.Win32/Vortice.Win32.csproj
index 8d103e7..2e9b4d2 100644
--- a/src/Vortice.Win32/Vortice.Win32.csproj
+++ b/src/Vortice.Win32/Vortice.Win32.csproj
@@ -3,7 +3,7 @@
netstandard2.0;net6.0;
Windows API low level bindings.
- 1.4.0
+ 1.4.1
true