Fix refcounting

goatcorp · Nov 27, 2023 · b0a1a1e · b0a1a1e
1 parent be0cc2d
commit b0a1a1e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Dalamud/ImGuiScene/Helpers/WicEasy.cs b/Dalamud/ImGuiScene/Helpers/WicEasy.cs
@@ -93,10 +93,10 @@ public ComPtr<IWICBitmapSource> CreateBitmapSource(IStream* stream)
             WICDecodeOptions.WICDecodeMetadataCacheOnDemand,
             decoder.GetAddressOf()).ThrowHr();
 
-        IWICBitmapFrameDecode* result;
-        decoder.Get()->GetFrame(0, &result).ThrowHr();
+        var result = default(ComPtr<IWICBitmapSource>);
         // Note: IWICBitmapSource is an ancestor of IWICBitmapFrameDecode; pointer casting is well-defined.
-        return (IWICBitmapSource*)result;
+        decoder.Get()->GetFrame(0, (IWICBitmapFrameDecode**)result.GetAddressOf()).ThrowHr();
+        return result;
     }
 
     /// <summary>
@@ -108,7 +108,7 @@ public ComPtr<IWICBitmapSource> CreateBitmapSource(IStream* stream)
     public ComPtr<IWICBitmapSource> ConvertPixelFormat(IWICBitmapSource* source, in Guid newPixelFormat)
     {
         using var converter = default(ComPtr<IWICFormatConverter>);
-        this.Factory->CreateFormatConverter(converter.ReleaseAndGetAddressOf()).ThrowHr();
+        this.Factory->CreateFormatConverter(converter.GetAddressOf()).ThrowHr();
         fixed (Guid* format = &newPixelFormat)
         {
             converter.Get()->Initialize(
@@ -120,8 +120,10 @@ public ComPtr<IWICBitmapSource> ConvertPixelFormat(IWICBitmapSource* source, in
                 WICBitmapPaletteType.WICBitmapPaletteTypeMedianCut).ThrowHr();
         }
 
+        // Avoid increasing refcount; using a constructor of ComPtr<T> will call AddRef.
+        var res = default(ComPtr<IWICBitmapSource>);
         // Note: IWICBitmapSource is an ancestor of IWICFormatConverter; pointer casting is well-defined.
-        var res = new ComPtr<IWICBitmapSource>((IWICBitmapSource*)converter.Get());
+        res.Attach((IWICBitmapSource*)converter.Get());
         converter.Detach();
         return res;
     }