ShellExtension:

- Re-enable the extended menu, as Windows 11 Build 22499 appears to have resolved the stability issue with WinMerge's extended menu behavior.
- Bump revision to 1.8.3.0

Author: sdottaka

ShellExtension/ShellExtension/ShellExtension.rc

@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,18,2,0
- PRODUCTVERSION 1,18,2,0
+ FILEVERSION 1,18,3,0
+ PRODUCTVERSION 1,18,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "https://winmerge.org"
             VALUE "FileDescription", "WinMerge Shell Integration library"
-            VALUE "FileVersion", "1.18.2.0"
+            VALUE "FileVersion", "1.18.3.0"
             VALUE "InternalName", "ShellExtension"
             VALUE "LegalCopyright", "Copyright 2003-2021"
             VALUE "OriginalFilename", "ShellExtension.DLL"
             VALUE "ProductName", "WinMerge Shell Integration library"
-            VALUE "ProductVersion", "1.18.2.0"
+            VALUE "ProductVersion", "1.18.3.0"
         END
     END
     BLOCK "VarFileInfo"

ShellExtension/WinMergeContextMenu/dllmain.cpp

@@ -309,14 +309,11 @@ class __declspec(uuid("90340779-F37E-468E-9728-A2593498ED32")) WinMergeFileDirEx
     const int Verb() override { return WinMergeContextMenu::CMD_COMPARE; }
     const EXPCMDFLAGS Flags() override
     {
-        // Due to stability issues, the advanced menu is currently disabled.
-        return ECF_DEFAULT;
-        /*
-        if ((m_contextMenu.GetContextMenuEnabled() & (WinMergeContextMenu::EXT_ENABLED | WinMergeContextMenu::EXT_ADVANCED)) == (WinMergeContextMenu::EXT_ENABLED | WinMergeContextMenu::EXT_ADVANCED))
+        if ((m_contextMenu.GetContextMenuEnabled() & (WinMergeContextMenu::EXT_ENABLED | WinMergeContextMenu::EXT_ADVANCED))
+            == (WinMergeContextMenu::EXT_ENABLED | WinMergeContextMenu::EXT_ADVANCED) && m_contextMenu.GetMenuItemList().size() > 1)
             return ECF_HASSUBCOMMANDS;
         else
             return ECF_DEFAULT;
-         */
     }
     const EXPCMDSTATE State(_In_opt_ IShellItemArray* selection) override
     {

ShellExtension/WinMergePkg/AppxManifest.xml.in

@@ -12,7 +12,7 @@
   xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
   xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
   IgnorableNamespaces="uap uap2 uap3 rescap desktop desktop4 desktop5 desktop6 uap10 com">
-  <Identity Name="WinMerge" ProcessorArchitecture="neutral" Publisher="${Publisher}" Version="1.0.3.0" />
+  <Identity Name="WinMerge" ProcessorArchitecture="neutral" Publisher="${Publisher}" Version="1.0.4.0" />
   <Properties>
     <DisplayName>WinMerge</DisplayName>
     <PublisherDisplayName>winmerge.org</PublisherDisplayName>