Skip to content

Commit

Permalink
Installer: Currently, WinMergeContextMenu.dll does not work in some e…
Browse files Browse the repository at this point in the history
…nvironments on Windows 11 preview version, and I cannot determine at the moment whether the problem is in the OS or in WinMergeContextMenu.dll.

For now, I have decided to give up on registering WinMergeContextMenu.dll as the default.
  • Loading branch information
sdottaka committed Sep 18, 2021
1 parent 630f902 commit d6ffbc9
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Installer/InnoSetup/WinMerge.iss
Expand Up @@ -1039,6 +1039,10 @@ Function IsWindows11OrLater(): Boolean;
Var
OSVersion: TWindowsVersion;
Begin
// Currently, WinMergeContextMenu.dll does not work in some environments on Windows 11 preview version, and I cannot determine at the moment whether the problem is in the OS or in WinMergeContextMenu.dll.
// For now, I have decided to give up on registering WinMergeContextMenu.dll as the default.
Result := false;
{
GetWindowsVersionEx(OSVersion);
if OSVersion.Major > 10 then
Result := true
Expand All @@ -1048,4 +1052,5 @@ Begin
Result := true
else
Result := false;
}
End;
5 changes: 5 additions & 0 deletions Installer/InnoSetup/WinMergeARM64.is6.iss
Expand Up @@ -1036,6 +1036,10 @@ Function IsWindows11OrLater(): Boolean;
Var
OSVersion: TWindowsVersion;
Begin
// Currently, WinMergeContextMenu.dll does not work in some environments on Windows 11 preview version, and I cannot determine at the moment whether the problem is in the OS or in WinMergeContextMenu.dll.
// For now, I have decided to give up on registering WinMergeContextMenu.dll as the default.
Result := false;
{
GetWindowsVersionEx(OSVersion);
if OSVersion.Major > 10 then
Result := true
Expand All @@ -1045,4 +1049,5 @@ Begin
Result := true
else
Result := false;
}
End;
5 changes: 5 additions & 0 deletions Installer/InnoSetup/WinMergeX64.is6.iss
Expand Up @@ -1035,6 +1035,10 @@ Function IsWindows11OrLater(): Boolean;
Var
OSVersion: TWindowsVersion;
Begin
// Currently, WinMergeContextMenu.dll does not work in some environments on Windows 11 preview version, and I cannot determine at the moment whether the problem is in the OS or in WinMergeContextMenu.dll.
// For now, I have decided to give up on registering WinMergeContextMenu.dll as the default.
Result := false;
{
GetWindowsVersionEx(OSVersion);
if OSVersion.Major > 10 then
Result := true
Expand All @@ -1044,4 +1048,5 @@ Begin
Result := true
else
Result := false;
}
End;
5 changes: 5 additions & 0 deletions Installer/InnoSetup/WinMergeX64.iss
Expand Up @@ -1019,6 +1019,10 @@ Function IsWindows11OrLater(): Boolean;
Var
OSVersion: TWindowsVersion;
Begin
// Currently, WinMergeContextMenu.dll does not work in some environments on Windows 11 preview version, and I cannot determine at the moment whether the problem is in the OS or in WinMergeContextMenu.dll.
// For now, I have decided to give up on registering WinMergeContextMenu.dll as the default.
Result := false;
{
GetWindowsVersionEx(OSVersion);
if OSVersion.Major > 10 then
Result := true
Expand All @@ -1028,4 +1032,5 @@ Begin
Result := true
else
Result := false;
}
End;
5 changes: 5 additions & 0 deletions Installer/InnoSetup/WinMergeX64NonAdmin.iss
Expand Up @@ -1017,6 +1017,10 @@ Function IsWindows11OrLater(): Boolean;
Var
OSVersion: TWindowsVersion;
Begin
// Currently, WinMergeContextMenu.dll does not work in some environments on Windows 11 preview version, and I cannot determine at the moment whether the problem is in the OS or in WinMergeContextMenu.dll.
// For now, I have decided to give up on registering WinMergeContextMenu.dll as the default.
Result := false;
{
GetWindowsVersionEx(OSVersion);
if OSVersion.Major > 10 then
Result := true
Expand All @@ -1026,4 +1030,5 @@ Begin
Result := true
else
Result := false;
}
End;

0 comments on commit d6ffbc9

Please sign in to comment.