fix: transparent bg and types

Author: zeyysu

index.d.ts

@@ -1,17 +1,15 @@
-declare module "winicon" {
-  /**
-   * Extracts the associated windows icon from a file and saves it as a PNG.
-   * @param inputPath Absolute path to the file (e.g., `.exe`, `.lnk`)
-   * @param outputPath Absolute path to save the PNG
-   * @param size Size of the icon (e.g., 256)
-   */
-  export function getIcon(inputPath: string, outputPath: string, size: number): void;
+/**
+ * Extracts the associated windows icon from a file and saves it as a PNG.
+ * @param inputPath Absolute path to the file (e.g., `.exe`, `.lnk`)
+ * @param outputPath Absolute path to save the PNG
+ * @param size Size of the icon (e.g., 256)
+ */
+export function getIcon(inputPath: string, outputPath: string, size: number): void;
 
-  /**
-   * Extracts a thumbnail provided by applications using IThumbnailProvider and saves it as a PNG.
-   * @param inputPath Absolute path to the file (e.g., `.pdf`, `.docx`)
-   * @param outputPath Absolute path to save the PNG
-   * @param size Size of the thumbnail
-   */
-  export function getThumbnail(inputPath: string, outputPath: string, size: number): void;
-}
+/**
+ * Extracts a thumbnail provided by applications using IThumbnailProvider and saves it as a PNG.
+ * @param inputPath Absolute path to the file (e.g., `.pdf`, `.docx`)
+ * @param outputPath Absolute path to save the PNG
+ * @param size Size of the thumbnail
+ */
+export function getThumbnail(inputPath: string, outputPath: string, size: number): void;

src/winicon.cc

@@ -35,7 +35,7 @@ HRESULT GetIconImage(const std::wstring& filePath, int size, HBITMAP& hBitmap) {
     }
 
     SIZE sizeStruct = { size, size };
-    hr = pImageFactory->GetImage(sizeStruct, SIIGBF_BIGGERSIZEOK | SIIGBF_ICONONLY, &hBitmap);
+    hr = pImageFactory->GetImage(sizeStruct, SIIGBF_BIGGERSIZEOK | SIIGBF_ICONONLY | SIIGBF_RESIZETOFIT, &hBitmap);
 
     pImageFactory->Release();
     pShellItem->Release();
@@ -63,13 +63,34 @@ HRESULT GetThumbnailImage(const std::wstring& filePath, int size, HBITMAP& hBitm
 }
 
 void SaveBitmapAsPNG(HBITMAP hBitmap, const std::wstring& outputPath) {
-    Bitmap* bmp = Bitmap::FromHBITMAP(hBitmap, nullptr);
-    if (!bmp) return;
+    GdiplusStartupInput gdiplusStartupInput;
+    ULONG_PTR gdiplusToken;
+    GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, nullptr);
+
+    BITMAP bm;
+    GetObject(hBitmap, sizeof(BITMAP), &bm);
+
+    Bitmap bitmap(bm.bmWidth, bm.bmHeight, PixelFormat32bppARGB);
+
+    BitmapData bmpData;
+    Rect rect(0, 0, bm.bmWidth, bm.bmHeight);
+
+    if (bitmap.LockBits(&rect, ImageLockModeWrite, PixelFormat32bppARGB, &bmpData) == Ok) {
+        int bytesPerPixel = 4;
+        BYTE* destData = static_cast<BYTE*>(bmpData.Scan0);
+
+        HDC hdc = GetDC(nullptr);
+        GetDIBits(hdc, hBitmap, 0, bm.bmHeight, destData, (BITMAPINFO*)&bm, DIB_RGB_COLORS);
+        ReleaseDC(nullptr, hdc);
+
+        bitmap.UnlockBits(&bmpData);
+    }
 
     CLSID clsidPng;
     CLSIDFromString(L"{557CF406-1A04-11D3-9A73-0000F81EF32E}", &clsidPng);
-    bmp->Save(outputPath.c_str(), &clsidPng, nullptr);
-    delete bmp;
+    bitmap.Save(outputPath.c_str(), &clsidPng, nullptr);
+
+    GdiplusShutdown(gdiplusToken);
 }
 
 void getImage(const Napi::CallbackInfo& info, bool useThumbnail) {
@@ -138,4 +159,4 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
 
 NODE_API_MODULE(winicon, Init)
 
-#endif
+#endif