Skip to content

Commit

Permalink
Fix issue #1661: Context menu does nothing after pushing "Compare..."…
Browse files Browse the repository at this point in the history
  • Loading branch information
sdottaka committed Feb 27, 2023
1 parent 5b4cf6b commit a66ef5d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions ShellExtension/ShellExtension/ShellExtension.rc
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,18,6,0
PRODUCTVERSION 1,18,6,0
FILEVERSION 1,18,7,0
PRODUCTVERSION 1,18,7,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -71,12 +71,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "https://winmerge.org"
VALUE "FileDescription", "WinMerge Shell Integration library"
VALUE "FileVersion", "1.18.6.0"
VALUE "FileVersion", "1.18.7.0"
VALUE "InternalName", "ShellExtension"
VALUE "LegalCopyright", "Copyright 2003-2023"
VALUE "OriginalFilename", "ShellExtension.DLL"
VALUE "ProductName", "WinMerge Shell Integration library"
VALUE "ProductVersion", "1.18.6.0"
VALUE "ProductVersion", "1.18.7.0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions ShellExtension/WinMergeContextMenu/dllmain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ BOOL APIENTRY DllMain( HMODULE hModule,
return TRUE;
}

class WinMergeExplorerCommandBase : public RuntimeClass<RuntimeClassFlags<ClassicCom>, IExplorerCommand, IObjectWithSite>
class WinMergeExplorerCommandBase : public RuntimeClass<RuntimeClassFlags<WinRtClassicComMix>, IExplorerCommand, IObjectWithSite>
{
public:
WinMergeExplorerCommandBase(WinMergeContextMenu* pContextMenu) : m_pContextMenu(pContextMenu) {}
Expand Down Expand Up @@ -210,7 +210,7 @@ class SubExplorerCommandHandler final : public WinMergeExplorerCommandBase
MenuItem m_menuItem;
};

class EnumCommands : public RuntimeClass<RuntimeClassFlags<ClassicCom>, IEnumExplorerCommand>
class EnumCommands : public RuntimeClass<RuntimeClassFlags<WinRtClassicComMix>, IEnumExplorerCommand>
{
public:
explicit EnumCommands(WinMergeContextMenu* pContextMenu)
Expand Down
2 changes: 1 addition & 1 deletion ShellExtension/WinMergePkg/AppxManifest.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.0" />
<Identity Name="WinMerge" ProcessorArchitecture="neutral" Publisher="${Publisher}" Version="1.0.7.0" />
<Properties>
<DisplayName>WinMerge</DisplayName>
<PublisherDisplayName>winmerge.org</PublisherDisplayName>
Expand Down

0 comments on commit a66ef5d

Please sign in to comment.