Completed autogen handle updates

Author: dahall

CodeGen/SafeHandleTemplate.cs

@@ -3,6 +3,7 @@
 #1#public static partial class ParentClassName
 {
 #1#	SummaryText
+	/// <seealso cref="BaseClassName"/>
 	public partial class ClassName : BaseClassName
 	{
 		/// <summary>Initializes a new instance of the <see cref="ClassName"/> class and assigns an existing handle.</summary>

PInvoke/IpHlpApi/IpHlpApi.cs

@@ -9694,7 +9694,6 @@ private static TRet GetTable<TRet>(FunctionHelper.PtrFunc<uint> func, Func<uint,
 	}
 
 	/// <summary>Provides a handle to a notification registration for a timestamp capability change.</summary>
-	[StructLayout(LayoutKind.Sequential)]
 	[AutoHandle]
 	public partial struct HIFTIMESTAMPCHANGE { }
 

PInvoke/ShlwApi/Shlwapi.cs

@@ -5847,54 +5847,6 @@ public static extern Win32Error SHRegQueryUSValue(HUSKEY hUSKey, string pszValue
 	[PInvokeData("shlwapi.h", MSDNShortId = "14af733b-81b4-40a2-b93b-6f387b181f12")]
 	public static extern SHELLPLATFORM WhichPlatform();
 
-	/// <summary>Provides a handle to a user specific registry key.</summary>
-	[StructLayout(LayoutKind.Sequential)]
-	public struct HUSKEY : IHandle
-	{
-		private readonly IntPtr handle;
-
-		/// <summary>Initializes a new instance of the <see cref="HUSKEY"/> struct.</summary>
-		/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
-		public HUSKEY(IntPtr preexistingHandle) => handle = preexistingHandle;
-
-		/// <summary>Returns an invalid handle by instantiating a <see cref="HUSKEY"/> object with <see cref="IntPtr.Zero"/>.</summary>
-		public static HUSKEY NULL => new(IntPtr.Zero);
-
-		/// <summary>Gets a value indicating whether this instance is a null handle.</summary>
-		public readonly bool IsNull => handle == IntPtr.Zero;
-
-		/// <summary>Performs an explicit conversion from <see cref="HUSKEY"/> to <see cref="IntPtr"/>.</summary>
-		/// <param name="h">The handle.</param>
-		/// <returns>The result of the conversion.</returns>
-		public static explicit operator IntPtr(HUSKEY h) => h.handle;
-
-		/// <summary>Performs an implicit conversion from <see cref="IntPtr"/> to <see cref="HUSKEY"/>.</summary>
-		/// <param name="h">The pointer to a handle.</param>
-		/// <returns>The result of the conversion.</returns>
-		public static implicit operator HUSKEY(IntPtr h) => new(h);
-
-		/// <summary>Implements the operator !=.</summary>
-		/// <param name="h1">The first handle.</param>
-		/// <param name="h2">The second handle.</param>
-		/// <returns>The result of the operator.</returns>
-		public static bool operator !=(HUSKEY h1, HUSKEY h2) => !(h1 == h2);
-
-		/// <summary>Implements the operator ==.</summary>
-		/// <param name="h1">The first handle.</param>
-		/// <param name="h2">The second handle.</param>
-		/// <returns>The result of the operator.</returns>
-		public static bool operator ==(HUSKEY h1, HUSKEY h2) => h1.Equals(h2);
-
-		/// <inheritdoc/>
-		public override readonly bool Equals(object? obj) => obj is HUSKEY h && handle == h.handle;
-
-		/// <inheritdoc/>
-		public override int GetHashCode() => handle.GetHashCode();
-
-		/// <inheritdoc/>
-		public readonly IntPtr DangerousGetHandle() => handle;
-	}
-
 	/// <summary>
 	/// <para>Used by the QISearch function to describe a single interface.</para>
 	/// </summary>
@@ -5926,26 +5878,4 @@ public struct QITAB
 		/// </summary>
 		public uint dwOffset;
 	}
-
-	/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="HUSKEY"/> that is disposed using <see cref="SHRegCloseUSKey"/>.</summary>
-	public class SafeHUSKEY : SafeHANDLE
-	{
-		/// <summary>Initializes a new instance of the <see cref="SafeHUSKEY"/> class and assigns an existing handle.</summary>
-		/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
-		/// <param name="ownsHandle">
-		/// <see langword="true"/> to reliably release the handle during the finalization phase; otherwise, <see langword="false"/> (not recommended).
-		/// </param>
-		public SafeHUSKEY(IntPtr preexistingHandle, bool ownsHandle = true) : base(preexistingHandle, ownsHandle) { }
-
-		/// <summary>Initializes a new instance of the <see cref="SafeHUSKEY"/> class.</summary>
-		private SafeHUSKEY() : base() { }
-
-		/// <summary>Performs an implicit conversion from <see cref="SafeHUSKEY"/> to <see cref="HUSKEY"/>.</summary>
-		/// <param name="h">The safe handle instance.</param>
-		/// <returns>The result of the conversion.</returns>
-		public static implicit operator HUSKEY(SafeHUSKEY h) => h.handle;
-
-		/// <inheritdoc/>
-		protected override bool InternalReleaseHandle() => SHRegCloseUSKey(this).Succeeded;
-	}
 }

PInvoke/ShlwApi/Vanara.PInvoke.ShlwApi.csproj

@@ -23,6 +23,9 @@ IQueryAssociations
 </PackageReleaseNotes>
     <PackageReadmeFile>pkgreadme.md</PackageReadmeFile>
   </PropertyGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="handles.csv" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Kernel32\Vanara.PInvoke.Kernel32.csproj" />
   </ItemGroup>

PInvoke/ShlwApi/handles.csv

@@ -0,0 +1,2 @@
+Namespace,ParentClassName,HandleName,InterfaceName,SummaryText,ClassName,BaseClassName,CloseCode,InheritedHandleName
+Vanara.PInvoke,ShlwApi,HUSKEY,IHandle,Provides a handle to a user specific registry key.,SafeHUSKEY,SafeHANDLE,SHRegCloseUSKey(this).Succeeded,

PInvoke/UserEnv/UserEnv.cs

@@ -1619,23 +1619,8 @@ public PROFILEINFO(string? userName, bool allowUI = true)
 	}
 
 	/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="EnterCriticalPolicySection"/> that is disposed using <see cref="LeaveCriticalPolicySection"/>.</summary>
-	public class SafeCriticalPolicySectionHandle : SafeHANDLE
-	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SafeCriticalPolicySectionHandle"/> class and assigns an existing handle.
-		/// </summary>
-		/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
-		/// <param name="ownsHandle">
-		/// <see langword="true"/> to reliably release the handle during the finalization phase; otherwise, <see langword="false"/> (not recommended).
-		/// </param>
-		public SafeCriticalPolicySectionHandle(IntPtr preexistingHandle, bool ownsHandle = true) : base(preexistingHandle, ownsHandle) { }
-
-		/// <summary>Initializes a new instance of the <see cref="SafeCriticalPolicySectionHandle"/> class.</summary>
-		private SafeCriticalPolicySectionHandle() : base() { }
-
-		/// <inheritdoc/>
-		protected override bool InternalReleaseHandle() => LeaveCriticalPolicySection(handle);
-	}
+	[AutoSafeHandle("LeaveCriticalPolicySection(handle)")]
+	public partial class SafeCriticalPolicySectionHandle { }
 
 	private class EnvBlockMarshaler : ICustomMarshaler
 	{

PInvoke/UxTheme/UXTHEME.cs

@@ -3745,23 +3745,6 @@ public RECT? ClipRectangle
 	}
 
 	/// <summary>Represents a safe handle for a theme. Use in place of HTHEME.</summary>
-	public class SafeHTHEME : SafeHANDLE
-	{
-		/// <summary>Initializes a new instance of the <see cref="SafeHTHEME"/> class.</summary>
-		/// <param name="hTheme">The h theme.</param>
-		/// <param name="ownsHandle">if set to <c>true</c> [owns handle].</param>
-		public SafeHTHEME(IntPtr hTheme, bool ownsHandle = true) : base(hTheme, ownsHandle) { }
-
-		private SafeHTHEME() : base()
-		{
-		}
-
-		/// <summary>Performs an implicit conversion from <see cref="SafeHTHEME"/> to <see cref="HTHEME"/>.</summary>
-		/// <param name="h">The safe handle instance.</param>
-		/// <returns>The result of the conversion.</returns>
-		public static implicit operator HTHEME(SafeHTHEME h) => h.handle;
-
-		/// <inheritdoc/>
-		protected override bool InternalReleaseHandle() => CloseThemeData(this).Succeeded;
-	}
+	[AutoSafeHandle("CloseThemeData(this).Succeeded", typeof(HTHEME))]
+	public partial class SafeHTHEME { }
 }

PInvoke/UxTheme/UXTHEME_BufferedPaint.cs

@@ -474,102 +474,6 @@ public BP_ANIMATIONPARAMS(BP_ANIMATIONSTYLE animStyle, int dur = 0)
 		public static BP_ANIMATIONPARAMS Empty => new() { cbSize = (uint)Marshal.SizeOf(typeof(BP_ANIMATIONPARAMS)) };
 	}
 
-	/// <summary>Provides a handle to an animation buffer.</summary>
-	[StructLayout(LayoutKind.Sequential)]
-	public struct HANIMATIONBUFFER : IHandle
-	{
-		private IntPtr handle;
-
-		/// <summary>Initializes a new instance of the <see cref="HANIMATIONBUFFER"/> struct.</summary>
-		/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
-		public HANIMATIONBUFFER(IntPtr preexistingHandle) => handle = preexistingHandle;
-
-		/// <summary>Returns an invalid handle by instantiating a <see cref="HANIMATIONBUFFER"/> object with <see cref="IntPtr.Zero"/>.</summary>
-		public static HANIMATIONBUFFER NULL => new(IntPtr.Zero);
-
-		/// <summary>Gets a value indicating whether this instance is a null handle.</summary>
-		public bool IsNull => handle == IntPtr.Zero;
-
-		/// <summary>Performs an explicit conversion from <see cref="HANIMATIONBUFFER"/> to <see cref="IntPtr"/>.</summary>
-		/// <param name="h">The handle.</param>
-		/// <returns>The result of the conversion.</returns>
-		public static explicit operator IntPtr(HANIMATIONBUFFER h) => h.handle;
-
-		/// <summary>Performs an implicit conversion from <see cref="IntPtr"/> to <see cref="HANIMATIONBUFFER"/>.</summary>
-		/// <param name="h">The pointer to a handle.</param>
-		/// <returns>The result of the conversion.</returns>
-		public static implicit operator HANIMATIONBUFFER(IntPtr h) => new(h);
-
-		/// <summary>Implements the operator !=.</summary>
-		/// <param name="h1">The first handle.</param>
-		/// <param name="h2">The second handle.</param>
-		/// <returns>The result of the operator.</returns>
-		public static bool operator !=(HANIMATIONBUFFER h1, HANIMATIONBUFFER h2) => !(h1 == h2);
-
-		/// <summary>Implements the operator ==.</summary>
-		/// <param name="h1">The first handle.</param>
-		/// <param name="h2">The second handle.</param>
-		/// <returns>The result of the operator.</returns>
-		public static bool operator ==(HANIMATIONBUFFER h1, HANIMATIONBUFFER h2) => h1.Equals(h2);
-
-		/// <inheritdoc/>
-		public override bool Equals(object? obj) => obj is HANIMATIONBUFFER h && handle == h.handle;
-
-		/// <inheritdoc/>
-		public override int GetHashCode() => handle.GetHashCode();
-
-		/// <inheritdoc/>
-		public IntPtr DangerousGetHandle() => handle;
-	}
-
-	/// <summary>Provides a handle to a paint buffer.</summary>
-	[StructLayout(LayoutKind.Sequential)]
-	public struct HPAINTBUFFER : IHandle
-	{
-		private IntPtr handle;
-
-		/// <summary>Initializes a new instance of the <see cref="HPAINTBUFFER"/> struct.</summary>
-		/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
-		public HPAINTBUFFER(IntPtr preexistingHandle) => handle = preexistingHandle;
-
-		/// <summary>Returns an invalid handle by instantiating a <see cref="HPAINTBUFFER"/> object with <see cref="IntPtr.Zero"/>.</summary>
-		public static HPAINTBUFFER NULL => new(IntPtr.Zero);
-
-		/// <summary>Gets a value indicating whether this instance is a null handle.</summary>
-		public bool IsNull => handle == IntPtr.Zero;
-
-		/// <summary>Performs an explicit conversion from <see cref="HPAINTBUFFER"/> to <see cref="IntPtr"/>.</summary>
-		/// <param name="h">The handle.</param>
-		/// <returns>The result of the conversion.</returns>
-		public static explicit operator IntPtr(HPAINTBUFFER h) => h.handle;
-
-		/// <summary>Performs an implicit conversion from <see cref="IntPtr"/> to <see cref="HPAINTBUFFER"/>.</summary>
-		/// <param name="h">The pointer to a handle.</param>
-		/// <returns>The result of the conversion.</returns>
-		public static implicit operator HPAINTBUFFER(IntPtr h) => new(h);
-
-		/// <summary>Implements the operator !=.</summary>
-		/// <param name="h1">The first handle.</param>
-		/// <param name="h2">The second handle.</param>
-		/// <returns>The result of the operator.</returns>
-		public static bool operator !=(HPAINTBUFFER h1, HPAINTBUFFER h2) => !(h1 == h2);
-
-		/// <summary>Implements the operator ==.</summary>
-		/// <param name="h1">The first handle.</param>
-		/// <param name="h2">The second handle.</param>
-		/// <returns>The result of the operator.</returns>
-		public static bool operator ==(HPAINTBUFFER h1, HPAINTBUFFER h2) => h1.Equals(h2);
-
-		/// <inheritdoc/>
-		public override bool Equals(object? obj) => obj is HPAINTBUFFER h && handle == h.handle;
-
-		/// <inheritdoc/>
-		public override int GetHashCode() => handle.GetHashCode();
-
-		/// <inheritdoc/>
-		public IntPtr DangerousGetHandle() => handle;
-	}
-
 	/// <summary>Defines paint operation parameters for <c>BeginBufferedPaint</c>.</summary>
 	// typedef struct _BP_PAINTPARAMS { DWORD cbSize; DWORD dwFlags; const RECT *prcExclude; const BLENDFUNCTION *pBlendFunction;}
 	// BP_PAINTPARAMS, *PBP_PAINTPARAMS; https://msdn.microsoft.com/en-us/library/windows/desktop/bb773228(v=vs.85).aspx
@@ -665,52 +569,38 @@ public class BufferedPaintBlock : IDisposable
 	}
 
 	/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="HANIMATIONBUFFER"/> that is disposed using <see cref="EndBufferedAnimation"/>.</summary>
-	public class SafeHANIMATIONBUFFER : SafeHANDLE
+	/// <remarks>Initializes a new instance of the <see cref="SafeHANIMATIONBUFFER"/> class and assigns an existing handle.</remarks>
+	/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
+	/// <param name="updateTargetDC">The value to pass <see cref="EndBufferedAnimation"/> when closing this handle.</param>
+	/// <param name="ownsHandle">
+	/// <see langword="true"/> to reliably release the handle during the finalization phase; otherwise, <see langword="false"/> (not recommended).
+	/// </param>
+	public class SafeHANIMATIONBUFFER(IntPtr preexistingHandle, bool updateTargetDC = true, bool ownsHandle = true) : SafeHANDLE(preexistingHandle, ownsHandle)
 	{
-		private readonly bool fUpdateTarget = true;
-
-		/// <summary>Initializes a new instance of the <see cref="SafeHANIMATIONBUFFER"/> class and assigns an existing handle.</summary>
-		/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
-		/// <param name="updateTargetDC">The value to pass <see cref="EndBufferedAnimation"/> when closing this handle.</param>
-		/// <param name="ownsHandle">
-		/// <see langword="true"/> to reliably release the handle during the finalization phase; otherwise, <see langword="false"/> (not recommended).
-		/// </param>
-		public SafeHANIMATIONBUFFER(IntPtr preexistingHandle, bool updateTargetDC = true, bool ownsHandle = true) : base(preexistingHandle, ownsHandle) => fUpdateTarget = updateTargetDC;
-
-		/// <summary>Initializes a new instance of the <see cref="SafeHANIMATIONBUFFER"/> class.</summary>
-		private SafeHANIMATIONBUFFER() : base() { }
-
 		/// <summary>Performs an implicit conversion from <see cref="SafeHANIMATIONBUFFER"/> to <see cref="HANIMATIONBUFFER"/>.</summary>
 		/// <param name="h">The safe handle instance.</param>
 		/// <returns>The result of the conversion.</returns>
 		public static implicit operator HANIMATIONBUFFER(SafeHANIMATIONBUFFER h) => h.handle;
 
 		/// <inheritdoc/>
-		protected override bool InternalReleaseHandle() => EndBufferedAnimation(this, fUpdateTarget).Succeeded;
+		protected override bool InternalReleaseHandle() => EndBufferedAnimation(this, updateTargetDC).Succeeded;
 	}
 
 	/// <summary>Provides a <see cref="SafeHandle"/> for <see cref="HPAINTBUFFER"/> that is disposed using <see cref="EndBufferedPaint"/>.</summary>
-	public class SafeHPAINTBUFFER : SafeHANDLE
+	/// <remarks>Initializes a new instance of the <see cref="SafeHPAINTBUFFER"/> class and assigns an existing handle.</remarks>
+	/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
+	/// <param name="updateTargetDC">The value to pass <see cref="EndBufferedPaint"/> when closing this handle.</param>
+	/// <param name="ownsHandle">
+	/// <see langword="true"/> to reliably release the handle during the finalization phase; otherwise, <see langword="false"/> (not recommended).
+	/// </param>
+	public class SafeHPAINTBUFFER(IntPtr preexistingHandle, bool updateTargetDC = true, bool ownsHandle = true) : SafeHANDLE(preexistingHandle, ownsHandle)
 	{
-		private readonly bool fUpdateTarget = true;
-
-		/// <summary>Initializes a new instance of the <see cref="SafeHPAINTBUFFER"/> class and assigns an existing handle.</summary>
-		/// <param name="preexistingHandle">An <see cref="IntPtr"/> object that represents the pre-existing handle to use.</param>
-		/// <param name="updateTargetDC">The value to pass <see cref="EndBufferedPaint"/> when closing this handle.</param>
-		/// <param name="ownsHandle">
-		/// <see langword="true"/> to reliably release the handle during the finalization phase; otherwise, <see langword="false"/> (not recommended).
-		/// </param>
-		public SafeHPAINTBUFFER(IntPtr preexistingHandle, bool updateTargetDC = true, bool ownsHandle = true) : base(preexistingHandle, ownsHandle) => fUpdateTarget = updateTargetDC;
-
-		/// <summary>Initializes a new instance of the <see cref="SafeHPAINTBUFFER"/> class.</summary>
-		private SafeHPAINTBUFFER() : base() { }
-
 		/// <summary>Performs an implicit conversion from <see cref="SafeHPAINTBUFFER"/> to <see cref="HPAINTBUFFER"/>.</summary>
 		/// <param name="h">The safe handle instance.</param>
 		/// <returns>The result of the conversion.</returns>
 		public static implicit operator HPAINTBUFFER(SafeHPAINTBUFFER h) => h.handle;
 
 		/// <inheritdoc/>
-		protected override bool InternalReleaseHandle() => EndBufferedPaint(this, fUpdateTarget).Succeeded;
+		protected override bool InternalReleaseHandle() => EndBufferedPaint(this, updateTargetDC).Succeeded;
 	}
 }

PInvoke/UxTheme/Vanara.PInvoke.UxTheme.csproj

@@ -20,6 +20,9 @@ BP_ANIMATIONPARAMS BP_PAINTPARAMS DTBGOPTS DTTOPTS HANIMATIONBUFFER HPAINTBUFFER
 </PackageReleaseNotes>
     <PackageReadmeFile>pkgreadme.md</PackageReadmeFile>
   </PropertyGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="handles.csv" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\User32\Vanara.PInvoke.User32.csproj" />
   </ItemGroup>

PInvoke/UxTheme/handles.csv

@@ -0,0 +1,3 @@
+Namespace,ParentClassName,HandleName,InterfaceName,SummaryText,ClassName,BaseClassName,CloseCode,InheritedHandleName
+Vanara.PInvoke,UxTheme,HANIMATIONBUFFER,IHandle,Provides a handle to an animation buffer.,,,,
+Vanara.PInvoke,UxTheme,HPAINTBUFFER,IHandle,Provides a handle to a paint buffer.,,,,