Delete HBITMAP

small fixes
harborsiem · Nov 5, 2023 · 4bff53b · 4bff53b
1 parent acd7970
commit 4bff53b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/Ribbon/Interop/RibbonCOMInterfaces.cs b/Ribbon/Interop/RibbonCOMInterfaces.cs
@@ -768,7 +768,7 @@ public interface IUIImageFromBitmap
         HRESULT CreateImage(IntPtr bitmap, Ownership options, [Out, MarshalAs(UnmanagedType.Interface)] out IUIImage image);
     }
 
-    //following types and interfaces are in UIRibbon since Windows 8, not used yet
+    //following types and interfaces are in UIRibbon since Windows 8
     /// <summary>
     /// Identifies the types of events associated with a Ribbon.
     /// UI_EVENTTYPE enum

diff --git a/Ribbon/Interop/StreamAdapter.cs b/Ribbon/Interop/StreamAdapter.cs
@@ -42,7 +42,6 @@ public StreamAdapter(Stream stream)
         /// <param name="streamCopy"></param>
         public void Clone(out IStream streamCopy)
         {
-            streamCopy = null;
             throw new NotSupportedException();
         }
 

diff --git a/Ribbon/Ribbon.cs b/Ribbon/Ribbon.cs
@@ -1272,6 +1272,7 @@ public static unsafe Bitmap GetBitmap(IUIImage uiImage)
             {
                 managedBitmap = Bitmap.FromHbitmap(hBitmap);
             }
+            //PInvoke.DeleteObject(hBitmap); //Maybe not a good idea
             return managedBitmap;
         }
 

diff --git a/RibbonTools/Misc/AlphaBitmap.cs b/RibbonTools/Misc/AlphaBitmap.cs
@@ -197,9 +197,9 @@ public unsafe static Bitmap FromHbitmap(IntPtr hBitmap)
             }
             else
             {
-                //NativeMethods.DeleteObject((IntPtr)(void*)&bitmapStruct);
                 managedBitmap = Bitmap.FromHbitmap(hBitmap);
             }
+            NativeMethods.DeleteObject(hBitmap);
             return managedBitmap;
         }