Removed call to DeleteObject for HBITMAP handle because some extensio…

…ns (e.g. TortoiseHg) use a bitmap cache which will crash if the bitmap is deleted
RolandoMagico · Nov 30, 2020 · 103ea71 · 103ea71
1 parent a684dc7
commit 103ea71
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 4 deletions.
diff --git a/Source/Common/ExplorerContextMenuEntry.cpp b/Source/Common/ExplorerContextMenuEntry.cpp
@@ -59,7 +59,6 @@ namespace ContextQuickie
 
   ExplorerContextMenuEntry::ExplorerContextMenuEntry()
   {
-
   }
 
   ExplorerContextMenuEntry::ExplorerContextMenuEntry(IContextMenu* contextMenu, HMENU menu, int32_t index)
@@ -154,7 +153,9 @@ namespace ContextQuickie
 
     if (this->BitmapHandle != nullptr)
     {
-      DeleteObject((HBITMAP)this->BitmapHandle);
+      // Do not delete the bitmap object. 
+      // Some extensions (e.g. TortoiseHg) use a bitmap cache which will crash if the bitmap is deleted
+      // DeleteObject(this->BitmapHandle);
     }
 
     if (this->Text != nullptr)

diff --git a/Source/ExplorerContextMenu.Console/ExplorerContextMenu.Console.cpp b/Source/ExplorerContextMenu.Console/ExplorerContextMenu.Console.cpp
@@ -63,8 +63,16 @@ int wmain(int argc, wchar_t* argv[], wchar_t* envp[])
   }
 
   set<wstring> whitelist;
-  // 7-Zip: whitelist.insert(L"{23170F69-40C1-278A-1000-000100020000}");
-  // Notepad++: whitelist.insert(L"{B298D29A-A6ED-11DE-BA8C-A68E55D89593}");
+
+  // 7-Zip: 
+  // whitelist.insert(L"{23170F69-40C1-278A-1000-000100020000}");
+
+  // Notepad++: 
+  // whitelist.insert(L"{B298D29A-A6ED-11DE-BA8C-A68E55D89593}");
+
+  // TortoiseHg:
+  whitelist.insert(L"{46605027-5B8C-4DCE-BFE0-051B7972D64C}");
+
   ExplorerContextMenu contextMenu(paths, true, whitelist);
   contextMenu.PrintMenu();
   return 0;

diff --git a/Source/ExplorerContextMenu.Console/bin/Release/x64/ExplorerContextMenu.Console.exe b/Source/ExplorerContextMenu.Console/bin/Release/x64/ExplorerContextMenu.Console.exe
diff --git a/Source/ExplorerContextMenu.Console/bin/Release/x86/ExplorerContextMenu.Console.exe b/Source/ExplorerContextMenu.Console/bin/Release/x86/ExplorerContextMenu.Console.exe
diff --git a/Source/ExplorerContextMenu.Java/bin/Release/x64/ExplorerContextMenu.Java.64.dll b/Source/ExplorerContextMenu.Java/bin/Release/x64/ExplorerContextMenu.Java.64.dll
diff --git a/Source/ExplorerContextMenu.Java/bin/Release/x86/ExplorerContextMenu.Java.32.dll b/Source/ExplorerContextMenu.Java/bin/Release/x86/ExplorerContextMenu.Java.32.dll
diff --git a/Source/ExplorerContextMenu.Net/bin/Release/x64/ExplorerContextMenu.Net.dll b/Source/ExplorerContextMenu.Net/bin/Release/x64/ExplorerContextMenu.Net.dll
diff --git a/Source/ExplorerContextMenu.Net/bin/Release/x86/ExplorerContextMenu.Net.dll b/Source/ExplorerContextMenu.Net/bin/Release/x86/ExplorerContextMenu.Net.dll