Merge f1fb569983 into 2ba051b59b

Although the issue refers to deselecting MovingPixelsState, the same
crash could happen when canceling/finishing WritingTextState or
MovingSelectionState. This fixes the crash for all these states.

src/app/ui/editor/editor.cpp

@@ -58,6 +58,7 @@
 #include "app/util/tile_flags_utils.h"
 #include "base/chrono.h"
 #include "base/convert_to.h"
+#include "base/scoped_value.h"
 #include "doc/doc.h"
 #include "doc/mask_boundaries.h"
 #include "doc/slice.h"
@@ -266,6 +267,23 @@ void Editor::setStateInternal(const EditorStatePtr& newState)
 {
   m_brushPreview.hide();
 
+  // Some onLeaveState impls (like the ones from MovingPixelsState,
+  // WritingTextState, MovingSelectionState) might generate a
+  // Tx/Transaction::commit(), which will add a new undo state,
+  // triggering a sprite change scripting event
+  // (SpriteEvents::onAddUndoState). This event could be handled by an
+  // extension and that extension might want to save the current
+  // sprite (e.g. calling Sprite_saveCopyAs, the kind of extension
+  // that takes snapshots after each sprite change). That will be a
+  // new Context::executeCommand() for the save command, generating a
+  // BeforeCommandExecution signal, getting back to onLeaveState
+  // again. In that case, we just ignore the reentry as the first
+  // onLeaveState should handle everything (to avoid an stack
+  // overflow/infinite recursion).
+  if (m_leavingState)
+    return;
+  base::ScopedValue leaving(m_leavingState, true);
+
   // Fire before change state event, set the state, and fire after
   // change state event.
   EditorState::LeaveAction leaveAction = m_state->onLeaveState(this, newState.get());

src/app/ui/editor/editor.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2024  Igara Studio S.A.
+// Copyright (C) 2018-2025  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -458,6 +458,13 @@ private:
 
   DocView* m_docView;
 
+  // Special flag to avoid re-entering a new state when we are leaving
+  // the current one. This avoids an infinite onLeaveState() recursion
+  // in some special cases when an extension (third-party code)
+  // creates a new sprite change in the same sprite change scripting
+  // event.
+  bool m_leavingState = false;
+
   // Last known mouse position received by this editor when the
   // mouse button was pressed. Used for auto-scrolling. To get the
   // current mouse position on the editor you can use

src/desktop/osx/CMakeLists.txt

@@ -1,37 +1,13 @@
 # Desktop Integration
-# Copyright (c) 2022  Igara Studio S.A.
+# Copyright (c) 2022-2025  Igara Studio S.A.
 
-find_library(QUARTZ_LIBRARY Quartz)
+find_library(QUICKLOOK_LIBRARY QuickLookThumbnailing)
 
-add_library(AsepriteThumbnailer SHARED
-  main.mm
-  thumbnail.mm)
+add_library(AsepriteThumbnailer MODULE
+  appex/thumbnails.mm)
 
 target_link_libraries(AsepriteThumbnailer
-  laf-base
   dio-lib
   render-lib
-  ${QUARTZ_LIBRARY})
-
-set_target_properties(AsepriteThumbnailer PROPERTIES
-  FRAMEWORK TRUE
-  MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist")
-
-add_custom_command(
-  OUTPUT ${CMAKE_BINARY_DIR}/lib/AsepriteThumbnailer.qlgenerator
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-  COMMAND ${CMAKE_COMMAND} -E make_directory lib/AsepriteThumbnailer.qlgenerator
-  COMMAND ${CMAKE_COMMAND} -E make_directory lib/AsepriteThumbnailer.qlgenerator/Contents
-  COMMAND ${CMAKE_COMMAND} -E make_directory lib/AsepriteThumbnailer.qlgenerator/Contents/MacOS
-  COMMAND ${CMAKE_COMMAND} -E copy
-             lib/AsepriteThumbnailer.framework/Versions/A/AsepriteThumbnailer
-             lib/AsepriteThumbnailer.qlgenerator/Contents/MacOS
-  COMMAND ${CMAKE_COMMAND} -E copy
-             lib/AsepriteThumbnailer.framework/Versions/A/Resources/Info.plist
-             lib/AsepriteThumbnailer.qlgenerator/Contents
-  BYPRODUCTS ${CMAKE_BINARY_DIR}/lib/AsepriteThumbnailer.qlgenerator/Contents/MacOS/AsepriteThumbnailer
-             ${CMAKE_BINARY_DIR}/lib/AsepriteThumbnailer.qlgenerator/Contents/Info.plist
-  DEPENDS AsepriteThumbnailer)
-
-add_custom_target(AsepriteThumbnailer.qlgenerator
-  DEPENDS ${CMAKE_BINARY_DIR}/lib/AsepriteThumbnailer.qlgenerator)
+  ${QUICKLOOK_LIBRARY}
+  )

src/desktop/osx/Info.plist

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleDocumentTypes</key>
-        <array>
-                <dict>
-                        <key>CFBundleTypeRole</key>
-                        <string>QLGenerator</string>
-                        <key>LSItemContentTypes</key>
-                        <array>
-                                <string>dyn.ah62d4rv4ge80c65f</string>
-                                <string>dyn.ah62d4rv4ge80c65fsb3gw7df</string>
-                        </array>
-                </dict>
-        </array>
-        <key>CFBundleExecutable</key>
-        <string>AsepriteThumbnailer</string>
-        <key>CFBundleIdentifier</key>
-        <string>org.aseprite.AsepriteThumbnailer</string>
-        <key>CFBundleName</key>
-        <string>AsepriteThumbnailer</string>
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>6.0</string>
-        <key>CFBundlePackageType</key>
-        <string>XPC!</string>
-        <key>CFBundleShortVersionString</key>
-        <string>1.0</string>
-        <key>CFBundleVersion</key>
-        <string>1.0</string>
-        <key>CFPlugInFactories</key>
-        <dict>
-                <key>A5E9417E-6E7A-4B2D-85A4-84E114D7A960</key>
-                <string>QuickLookGeneratorPluginFactory</string>
-        </dict>
-        <key>CFPlugInTypes</key>
-        <dict>
-                <key>5E2D9680-5022-40FA-B806-43349622E5B9</key>
-                <array>
-                        <string>A5E9417E-6E7A-4B2D-85A4-84E114D7A960</string>
-                </array>
-        </dict>
-        <key>CFPlugInUnloadFunction</key>
-        <string></string>
-        <key>QLThumbnailMinimumSize</key>
-        <real>32</real>
-        <key>QLPreviewWidth</key>
-        <real>256</real>
-        <key>QLPreviewHeight</key>
-        <real>256</real>
-        <key>QLNeedsToBeRunInMainThread</key>
-        <true/>
-        <key>QLSupportsConcurrentRequests</key>
-        <false/>
-        <key>NSHumanReadableCopyright</key>
-        <string>Copyright © Igara Studio S.A. All rights reserved.</string>
-</dict>
-</plist>

src/desktop/osx/app/Info.plist

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>UTExportedTypeDeclarations</key>
+  <array>
+    <dict>
+      <key>UTTypeIdentifier</key>
+      <string>org.aseprite.aseprite.sprite</string>
+      <key>UTTypeDescription</key>
+      <string>Aseprite Sprite</string>
+      <key>UTTypeConformsTo</key>
+      <array>
+          <string>public.image</string>
+      </array>
+      <key>UTTypeTagSpecification</key>
+      <dict>
+        <key>public.filename-extension</key>
+        <array>
+          <string>aseprite</string>
+          <string>ase</string>
+        </array>
+        <key>public.mime-type</key>
+        <string>image/aseprite</string>
+      </dict>
+    </dict>
+  </array>
+  <key>CFBundleIdentifier</key>
+  <string>org.aseprite.aseprite</string>
+  <key>CFBundleVersion</key>
+  <string>1.3.dev</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.3.dev</string>
+  <key>BuildMachineOSBuild</key>
+  <string>24C101</string>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>English</string>
+  <key>CFBundleExecutable</key>
+  <string>aseprite</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleLongVersionString</key>
+  <string>1.3.dev</string>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleSupportedPlatforms</key>
+  <array>
+          <string>MacOSX</string>
+  </array>
+  <key>CSResourcesFileMapped</key>
+  <true/>
+  <key>LSHasPlugIns</key>
+  <true/>
+  <key>DTCompiler</key>
+  <string>com.apple.compilers.llvm.clang.1_0</string>
+  <key>DTPlatformBuild</key>
+  <string>24C94</string>
+  <key>DTPlatformName</key>
+  <string>macosx</string>
+  <key>DTPlatformVersion</key>
+  <string>15.2</string>
+  <key>DTSDKBuild</key>
+  <string>24C94</string>
+  <key>DTSDKName</key>
+  <string>macosx15.2</string>
+  <key>DTXcode</key>
+  <string>1620</string>
+  <key>DTXcodeBuild</key>
+  <string>16C5032a</string>
+  <key>LSMinimumSystemVersion</key>
+  <string>10.15</string>
+</dict>
+</plist>

src/desktop/osx/app/Info.plist.in

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>UTExportedTypeDeclarations</key>
+  <array>
+    <dict>
+      <key>UTTypeIdentifier</key>
+      <string>$ASEPRITE_BUNDLE_ID.sprite</string>
+      <key>UTTypeDescription</key>
+      <string>Aseprite Sprite</string>
+      <key>UTTypeConformsTo</key>
+      <array>
+          <string>public.image</string>
+      </array>
+      <key>UTTypeTagSpecification</key>
+      <dict>
+        <key>public.filename-extension</key>
+        <array>
+          <string>aseprite</string>
+          <string>ase</string>
+        </array>
+        <key>public.mime-type</key>
+        <string>image/aseprite</string>
+      </dict>
+    </dict>
+  </array>
+  <key>CFBundleIdentifier</key>
+  <string>$ASEPRITE_BUNDLE_ID</string>
+  <key>CFBundleVersion</key>
+  <string>$VERSION</string>
+  <key>CFBundleShortVersionString</key>
+  <string>$VERSION</string>
+  <key>CFBundleExecutable</key>
+  <string>aseprite</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>CFBundleSupportedPlatforms</key>
+  <array>
+          <string>MacOSX</string>
+  </array>
+  <key>CSResourcesFileMapped</key>
+  <true/>
+  <key>LSHasPlugIns</key>
+  <true/>
+  <key>LSMinimumSystemVersion</key>
+  <string>10.15</string>
+</dict>
+</plist>

src/desktop/osx/app/aseprite.entitlements

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
+        <key>com.apple.security.files.user-selected.read-write</key>
+        <true/>
+        <key>com.apple.security.files.download.read-write</key>
+        <true/>
+        <key>com.apple.security.files.pictures.read-write</key>
+        <true/>
+        <key>com.apple.security.files.movies.read-write</key>
+        <true/>
+        <key>com.apple.security.files.music.read-write</key>
+        <true/>
+</dict>
+</plist>

src/desktop/osx/appex/Info.plist

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>CFBundleDisplayName</key>
+        <string>AsepriteThumbnailer</string>
+        <key>CFBundleExecutable</key>
+        <string>AsepriteThumbnailer</string>
+        <key>CFBundleIdentifier</key>
+        <string>org.aseprite.aseprite.AsepriteThumbnailer</string>
+        <key>CFBundlePackageType</key>
+        <string>XPC!</string>
+        <key>CFBundleVersion</key>
+        <string>1.3.dev</string>
+        <key>CFBundleShortVersionString</key>
+        <string>1.3.dev</string>
+        <key>NSExtension</key>
+        <dict>
+                <key>NSExtensionAttributes</key>
+                <dict>
+                        <key>QLSupportedContentTypes</key>
+                        <array>
+                            <string>org.aseprite.aseprite.sprite</string>
+                        </array>
+                        <key>QLThumbnailMinimumDimension</key>
+                        <integer>32</integer>
+                </dict>
+                <key>NSExtensionPointIdentifier</key>
+                <string>com.apple.quicklook.thumbnail</string>
+                <key>NSExtensionPrincipalClass</key>
+                <string>ThumbnailProvider</string>
+        </dict>
+</dict>
+</plist>

src/desktop/osx/appex/Info.plist.in

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>CFBundleDisplayName</key>
+        <string>AsepriteThumbnailer</string>
+        <key>CFBundleExecutable</key>
+        <string>AsepriteThumbnailer</string>
+        <key>CFBundleIdentifier</key>
+        <string>${THUMBNAILS_BUNDLE_ID}</string>
+        <key>CFBundlePackageType</key>
+        <string>XPC!</string>
+        <key>CFBundleVersion</key>
+        <string>${VERSION}</string>
+        <key>CFBundleShortVersionString</key>
+        <string>${VERSION}</string>
+        <key>NSExtension</key>
+        <dict>
+                <key>NSExtensionAttributes</key>
+                <dict>
+                        <key>QLSupportedContentTypes</key>
+                        <array>
+                            <string>${ASEPRITE_BUNDLE_ID}.sprite</string>
+                        </array>
+                        <key>QLThumbnailMinimumDimension</key>
+                        <integer>32</integer>
+                </dict>
+                <key>NSExtensionPointIdentifier</key>
+                <string>com.apple.quicklook.thumbnail</string>
+                <key>NSExtensionPrincipalClass</key>
+                <string>ThumbnailProvider</string>
+        </dict>
+</dict>
+</plist>

src/desktop/osx/appex/thumbnails.entitlements

@@ -2,9 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-    <key>com.apple.security.files.user-selected.read-only</key>
-    <true/>
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
 </dict>
 </plist>

src/desktop/osx/appex/thumbnails.mm

@@ -1,11 +1,10 @@
-// Desktop Integration
-// Copyright (c) 2022  Igara Studio S.A.
+// Aseprite
+// Copyright (c) 2025  Igara Studio S.A.
 //
-// This file is released under the terms of the MIT license.
-// Read LICENSE.txt for more information.
-
-#include "thumbnail.h"
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
 
+#include "app/file_system.h"
 #include "dio/decode_delegate.h"
 #include "dio/decode_file.h"
 #include "dio/file_interface.h"
@@ -13,10 +12,7 @@
 #include "render/render.h"
 
 #include <Cocoa/Cocoa.h>
-
-#include <algorithm>
-
-namespace desktop {
+#include <QuickLookThumbnailing/QuickLookThumbnailing.h>
 
 namespace {
 
@@ -38,13 +34,13 @@ class StreamAdaptor : public dio::FileInterface {
 public:
   StreamAdaptor(NSData* data) : m_data(data), m_ok(m_data != nullptr), m_pos(0) {}
 
-  bool ok() const { return m_ok; }
+  bool ok() const override { return m_ok; }
 
-  size_t tell() { return m_pos; }
+  size_t tell() override { return m_pos; }
 
-  void seek(size_t absPos) { m_pos = absPos; }
+  void seek(size_t absPos) override { m_pos = absPos; }
 
-  uint8_t read8()
+  uint8_t read8() override
   {
     if (!m_ok)
       return 0;
@@ -57,7 +53,7 @@ public:
     }
   }
 
-  size_t readBytes(uint8_t* buf, size_t n)
+  size_t readBytes(uint8_t* buf, size_t n) override
   {
     if (!m_ok)
       return 0;
@@ -75,21 +71,16 @@ public:
     }
   }
 
-  void write8(uint8_t value)
-  {
-    // Do nothing, we don't write in the file
-  }
+  void write8(uint8_t value) override {};
 
   NSData* m_data;
   bool m_ok;
   size_t m_pos;
 };
 
-} // anonymous namespace
-
-CGImageRef get_thumbnail(CFURLRef url, CFDictionaryRef options, CGSize maxSize)
+CGImageRef get_thumbnail(CFURLRef url, CGSize maxSize)
 {
-  auto data = [[NSData alloc] initWithContentsOfURL:(NSURL*)url];
+  auto data = [[NSData alloc] initWithContentsOfURL:(__bridge NSURL*)url];
   if (!data)
     return nullptr;
 
@@ -152,4 +143,52 @@ CGImageRef get_thumbnail(CFURLRef url, CFDictionaryRef options, CGSize maxSize)
   return img;
 }
 
-} // namespace desktop
+} // namespace
+
+@interface ThumbnailProvider : QLThumbnailProvider
+@end
+
+@implementation ThumbnailProvider
+
+- (void)provideThumbnailForFileRequest:(QLFileThumbnailRequest*)request
+                     completionHandler:
+                       (void (^)(QLThumbnailReply* _Nullable, NSError* _Nullable))handler
+{
+  CFURLRef url = (__bridge CFURLRef)(request.fileURL);
+  CGSize maxSize = request.maximumSize;
+  CGImageRef cgImage = get_thumbnail(url, maxSize);
+  if (!cgImage) {
+    handler(nil, nil);
+    return;
+  }
+  CGSize imageSize = CGSizeMake(CGImageGetWidth(cgImage), CGImageGetHeight(cgImage));
+  handler([QLThumbnailReply replyWithContextSize:maxSize
+                      currentContextDrawingBlock:^BOOL {
+                        CGContextRef ctx = [[NSGraphicsContext currentContext] CGContext];
+                        CGContextSaveGState(ctx);
+                        CGFloat scale = MIN(maxSize.width / imageSize.width,
+                                            maxSize.height / imageSize.height);
+                        CGSize scaledSize = CGSizeMake(imageSize.width * scale,
+                                                       imageSize.height * scale);
+                        CGRect drawRect = CGRectMake((maxSize.width - scaledSize.width) / 2,
+                                                     (maxSize.height - scaledSize.height) / 2,
+                                                     scaledSize.width,
+                                                     scaledSize.height);
+                        CGContextDrawImage(ctx, drawRect, cgImage);
+                        CGContextRestoreGState(ctx);
+                        CGImageRelease(cgImage);
+                        return YES;
+                      }],
+          nil);
+}
+
+@end
+
+// This constructor ensures that the ThumbnailProvider class is explicitly referenced
+// during linking. Without this, the linker may discard the symbol, preventing the QuickLook
+// from discovering the provider. This is required to ensure the symbol
+// OBJC_CLASS_$_ThumbnailProvider is exported correctly from the .appex binary.
+__attribute__((constructor)) static void forceExportThumbnailProvider()
+{
+  [ThumbnailProvider class];
+}

src/desktop/osx/main.mm

@@ -1,234 +0,0 @@
-// Desktop Integration
-// Copyright (c) 2022  Igara Studio S.A.
-//
-// This file is released under the terms of the MIT license.
-// Read LICENSE.txt for more information.
-
-#include <CoreFoundation/CFPlugInCOM.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreServices/CoreServices.h>
-#include <QuickLook/QuickLook.h>
-
-#include "base/debug.h"
-#include "thumbnail.h"
-
-// Just as a side note: We're using the same UUID as the Windows
-// Aseprite thumbnailer.
-//
-// If you're going to use this code, remember to change this UUID and
-// change it in the Info.plist file.
-#define PLUGIN_ID "A5E9417E-6E7A-4B2D-85A4-84E114D7A960"
-
-static HRESULT Plugin_QueryInterface(void*, REFIID, LPVOID*);
-static ULONG Plugin_AddRef(void*);
-static ULONG Plugin_Release(void*);
-static OSStatus Plugin_GenerateThumbnailForURL(void*,
-                                               QLThumbnailRequestRef,
-                                               CFURLRef,
-                                               CFStringRef,
-                                               CFDictionaryRef,
-                                               CGSize);
-static void Plugin_CancelThumbnailGeneration(void*, QLThumbnailRequestRef);
-static OSStatus Plugin_GeneratePreviewForURL(void*,
-                                             QLPreviewRequestRef,
-                                             CFURLRef,
-                                             CFStringRef,
-                                             CFDictionaryRef);
-static void Plugin_CancelPreviewGeneration(void*, QLPreviewRequestRef);
-
-static QLGeneratorInterfaceStruct Plugin_vtbl = { // kQLGeneratorTypeID interface
-  // IUnknown
-  nullptr, // void* reserved
-  Plugin_QueryInterface,
-  Plugin_AddRef,
-  Plugin_Release,
-  // QLGeneratorInterface
-  Plugin_GenerateThumbnailForURL,
-  Plugin_CancelThumbnailGeneration,
-  Plugin_GeneratePreviewForURL,
-  Plugin_CancelPreviewGeneration
-};
-
-// TODO it would be nice to create a C++ smart pointer/wrapper for CFUUIDRef type
-
-struct Plugin {
-  QLGeneratorInterfaceStruct* interface; // Must be a pointer
-  CFUUIDRef factoryID;
-  ULONG refCount = 1; // Starts with one reference when it's created
-
-  Plugin(CFUUIDRef factoryID)
-    : interface(new QLGeneratorInterfaceStruct(Plugin_vtbl))
-    , factoryID(factoryID)
-  {
-    CFPlugInAddInstanceForFactory(factoryID);
-  }
-
-  ~Plugin()
-  {
-    delete interface;
-    if (factoryID) {
-      CFPlugInRemoveInstanceForFactory(factoryID);
-      CFRelease(factoryID);
-    }
-  }
-
-  // IUnknown impl
-
-  HRESULT QueryInterface(REFIID iid, LPVOID* ppv)
-  {
-    CFUUIDRef interfaceID = CFUUIDCreateFromUUIDBytes(kCFAllocatorDefault, iid);
-
-    if (CFEqual(interfaceID, kQLGeneratorCallbacksInterfaceID)) {
-      *ppv = this;
-      AddRef();
-      CFRelease(interfaceID);
-      return S_OK;
-    }
-    else {
-      *ppv = nullptr;
-      CFRelease(interfaceID);
-      return E_NOINTERFACE;
-    }
-  }
-
-  ULONG AddRef() { return ++refCount; }
-
-  ULONG Release()
-  {
-    if (refCount == 1) {
-      delete this;
-      return 0;
-    }
-    else {
-      ASSERT(refCount != 0);
-      return --refCount;
-    }
-  }
-
-  // QLGeneratorInterfaceStruct impl
-
-  static OSStatus GenerateThumbnailForURL(QLThumbnailRequestRef thumbnail,
-                                          CFURLRef url,
-                                          CFStringRef contentTypeUTI,
-                                          CFDictionaryRef options,
-                                          CGSize maxSize)
-  {
-    CGImageRef image = desktop::get_thumbnail(url, options, maxSize);
-    if (!image)
-      return -1;
-
-    QLThumbnailRequestSetImage(thumbnail, image, nullptr);
-    CGImageRelease(image);
-    return 0;
-  }
-
-  static void CancelThumbnailGeneration(QLThumbnailRequestRef thumbnail)
-  {
-    // TODO
-  }
-
-  OSStatus GeneratePreviewForURL(QLPreviewRequestRef preview,
-                                 CFURLRef url,
-                                 CFStringRef contentTypeUTI,
-                                 CFDictionaryRef options)
-  {
-    CGImageRef image = desktop::get_thumbnail(url, options, CGSizeMake(0, 0));
-    if (!image)
-      return -1;
-
-    int w = CGImageGetWidth(image);
-    int h = CGImageGetHeight(image);
-    int wh = std::min(w, h);
-    if (wh < 128) {
-      w = 128 * w / wh;
-      h = 128 * h / wh;
-    }
-
-    CGContextRef cg = QLPreviewRequestCreateContext(preview, CGSizeMake(w, h), YES, options);
-    CGContextSetInterpolationQuality(cg, kCGInterpolationNone);
-    CGContextDrawImage(cg, CGRectMake(0, 0, w, h), image);
-    QLPreviewRequestFlushContext(preview, cg);
-    CGImageRelease(image);
-    CGContextRelease(cg);
-    return 0;
-  }
-
-  void CancelPreviewGeneration(QLPreviewRequestRef preview)
-  {
-    // TODO
-  }
-};
-
-static HRESULT Plugin_QueryInterface(void* p, REFIID iid, LPVOID* ppv)
-{
-  ASSERT(p);
-  return reinterpret_cast<Plugin*>(p)->QueryInterface(iid, ppv);
-}
-
-static ULONG Plugin_AddRef(void* p)
-{
-  ASSERT(p);
-  return reinterpret_cast<Plugin*>(p)->AddRef();
-}
-
-static ULONG Plugin_Release(void* p)
-{
-  ASSERT(p);
-  return reinterpret_cast<Plugin*>(p)->Release();
-}
-
-static OSStatus Plugin_GenerateThumbnailForURL(void* p,
-                                               QLThumbnailRequestRef thumbnail,
-                                               CFURLRef url,
-                                               CFStringRef contentTypeUTI,
-                                               CFDictionaryRef options,
-                                               CGSize maxSize)
-{
-  ASSERT(p);
-  return reinterpret_cast<Plugin*>(p)->GenerateThumbnailForURL(thumbnail,
-                                                               url,
-                                                               contentTypeUTI,
-                                                               options,
-                                                               maxSize);
-}
-
-static void Plugin_CancelThumbnailGeneration(void* p, QLThumbnailRequestRef thumbnail)
-{
-  ASSERT(p);
-  reinterpret_cast<Plugin*>(p)->CancelThumbnailGeneration(thumbnail);
-}
-
-static OSStatus Plugin_GeneratePreviewForURL(void* p,
-                                             QLPreviewRequestRef preview,
-                                             CFURLRef url,
-                                             CFStringRef contentTypeUTI,
-                                             CFDictionaryRef options)
-{
-  ASSERT(p);
-  return reinterpret_cast<Plugin*>(p)->GeneratePreviewForURL(preview, url, contentTypeUTI, options);
-}
-
-static void Plugin_CancelPreviewGeneration(void* p, QLPreviewRequestRef preview)
-{
-  ASSERT(p);
-  reinterpret_cast<Plugin*>(p)->CancelPreviewGeneration(preview);
-}
-
-// This is the only public entry point of the framework/plugin (the
-// "QuickLookGeneratorPluginFactory" name is specified in the
-// Info.list file): the factory of objects. Similar than the Win32 COM
-// IClassFactory::CreateInstance()
-//
-// This function is used to create an instance of an object of
-// kQLGeneratorTypeID type, which should implement the
-// QLGeneratorInterfaceStruct interface.
-extern "C" void* QuickLookGeneratorPluginFactory(CFAllocatorRef allocator, CFUUIDRef typeID)
-{
-  if (CFEqual(typeID, kQLGeneratorTypeID)) {
-    CFUUIDRef uuid = CFUUIDCreateFromString(kCFAllocatorDefault, CFSTR(PLUGIN_ID));
-    auto plugin = new Plugin(uuid);
-    CFRelease(uuid);
-    return plugin;
-  }
-  return nullptr; // Unknown typeID
-}

src/desktop/osx/thumbnail.h

@@ -1,19 +0,0 @@
-// Desktop Integration
-// Copyright (c) 2022  Igara Studio S.A.
-//
-// This file is released under the terms of the MIT license.
-// Read LICENSE.txt for more information.
-
-#ifndef DESKTOP_THUMBNAIL_H_INCLUDED
-#define DESKTOP_THUMBNAIL_H_INCLUDED
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreGraphics/CoreGraphics.h>
-
-namespace desktop {
-
-CGImageRef get_thumbnail(CFURLRef url, CFDictionaryRef options, CGSize maxSize);
-
-} // namespace desktop
-
-#endif