Improved

Author: 0x5bfa

src/Files.App.CsWin32/Extras.cs

@@ -40,6 +40,8 @@ public static unsafe nint SetWindowLongPtr(HWND hWnd, WINDOW_LONG_PTR_INDEX nInd
 
 		[DllImport("shell32.dll", EntryPoint = "SHUpdateRecycleBinIcon", CharSet = CharSet.Unicode, SetLastError = true)]
 		public static extern void SHUpdateRecycleBinIcon();
+
+		public const int PixelFormat32bppARGB = 2498570;
 	}
 
 	namespace Extras

src/Files.App.CsWin32/NativeMethods.txt

@@ -219,3 +219,6 @@ DestinationList
 IObjectArray
 GetCurrentProcessExplicitAppUserModelID
 SetCurrentProcessExplicitAppUserModelID
+GdipCreateBitmapFromScan0
+BITMAP
+GetObject

src/Files.App.Storage/Storables/WindowsStorage/WindowsStorableHelpers.Icon.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using System.Drawing;
 using System.Collections.Concurrent;
 using System.Runtime.InteropServices;
 using Windows.Win32;
@@ -20,32 +21,6 @@ public static partial class WindowsStorableHelpers
 		private static (Guid Format, Guid Encorder)[]? GdiEncoders;
 		private static ConcurrentDictionary<(string, int, int), byte[]>? DllIconCache;
 
-		private const int PixelFormat32bppARGB = 2498570; // Added constant for transparency
-
-		[StructLayout(LayoutKind.Sequential)]
-		private struct BITMAP // Added BITMAP structure for bitmap operations
-		{
-			public int bmType;
-			public int bmWidth;
-			public int bmHeight;
-			public int bmWidthBytes;
-			public ushort bmPlanes;
-			public ushort bmBitsPixel;
-			public IntPtr bmBits;
-		}
-
-		[DllImport("gdi32.dll", SetLastError = true)] // Added P/Invoke for GetObject
-		private static extern int GetObject(IntPtr hObject, int nCount, ref BITMAP lpObject);
-
-		[DllImport("gdiplus.dll", SetLastError = true)] // Added P/Invoke for GdipCreateBitmapFromScan0
-		private static extern int GdipCreateBitmapFromScan0(
-			int width,
-			int height,
-			int stride,
-			int pixelFormat,
-			IntPtr scan0,
-			out IntPtr bitmap);
-
 		// Methods
 
 		/// <inheritdoc cref="TryGetThumbnail"/>
@@ -84,48 +59,45 @@ public unsafe static HRESULT TryGetThumbnail(this IWindowsStorable storable, int
 			}
 
 			// Retrieve BITMAP data
-			BITMAP bmp = new BITMAP();
-			if (GetObject((nint)hBitmap.Value, Marshal.SizeOf(typeof(BITMAP)), ref bmp) == 0)
+			BITMAP bmp = default;
+			if (PInvoke.GetObject(hBitmap, sizeof(BITMAP), &bmp) is 0)
 			{
 				if (!hBitmap.IsNull) PInvoke.DeleteObject(hBitmap);
 				return HRESULT.E_FAIL;
 			}
 
 			// Allocate buffer for flipped pixel data
-			IntPtr flippedBits = Marshal.AllocHGlobal(bmp.bmWidthBytes * bmp.bmHeight);
-			byte* src = (byte*)bmp.bmBits;
-			byte* dst = (byte*)flippedBits;
+			byte* flippedBits = (byte*)NativeMemory.AllocZeroed((nuint)(bmp.bmWidthBytes * bmp.bmHeight));
 
 			// Flip the image manually row by row
 			for (int y = 0; y < bmp.bmHeight; y++)
 			{
 				Buffer.MemoryCopy(
-					src + y * bmp.bmWidthBytes,
-					dst + (bmp.bmHeight - y - 1) * bmp.bmWidthBytes,
+					(byte*)bmp.bmBits + y * bmp.bmWidthBytes,
+					flippedBits + (bmp.bmHeight - y - 1) * bmp.bmWidthBytes,
 					bmp.bmWidthBytes,
 					bmp.bmWidthBytes
 				);
 			}
 
 			// Create GpBitmap from the flipped pixel data
-			IntPtr gpBitmapPtr;
-			if (GdipCreateBitmapFromScan0(bmp.bmWidth, bmp.bmHeight, bmp.bmWidthBytes, PixelFormat32bppARGB, flippedBits, out gpBitmapPtr) != 0)
+			GpBitmap* gpBitmap = default;
+			if (PInvoke.GdipCreateBitmapFromScan0(bmp.bmWidth, bmp.bmHeight, bmp.bmWidthBytes, PInvoke.PixelFormat32bppARGB, flippedBits, &gpBitmap) != Status.Ok)
 			{
-				Marshal.FreeHGlobal(flippedBits);
+				if (flippedBits is not null) NativeMemory.Free(flippedBits);
 				if (!hBitmap.IsNull) PInvoke.DeleteObject(hBitmap);
 				return HRESULT.E_FAIL;
 			}
 
-			Marshal.FreeHGlobal(flippedBits);
-
-			GpBitmap* gpBitmap = (GpBitmap*)gpBitmapPtr;
-
-			if (TryConvertGpBitmapToByteArray(gpBitmap, out thumbnailData))
+			if (!TryConvertGpBitmapToByteArray(gpBitmap, out thumbnailData))
 			{
 				if (!hBitmap.IsNull) PInvoke.DeleteObject(hBitmap);
 				return HRESULT.E_FAIL;
 			}
 
+			if (flippedBits is not null) NativeMemory.Free(flippedBits);
+			if (!hBitmap.IsNull) PInvoke.DeleteObject(hBitmap);
+
 			return HRESULT.S_OK;
 		}