tor-browser

commit 08dc28102939c36fc773018ec27918e2d8b7459a
parent d7e368500ce41c3894ff8ca51ce6039aafe46c46
Author: Max Christian Pohle <mpohle@mozilla.com>
Date:   Thu, 23 Oct 2025 11:50:11 +0000

Bug 1995769 - Enable the new uninstall registry key on Windows 11, r=bytesized,browser-installer-reviewers

The uninstall key gets rewritten for installations to the default
installation directory: The version number, architecture and language
are removed from the key in order to improve compatibility with
third-party tools.

Differential Revision: https://phabricator.services.mozilla.com/D269637

Diffstat:
M
browser/installer/windows/nsis/postupdate_helper.nsh
 | 
2
--
M
browser/installer/windows/nsis/test_stub.nsi
 | 
11
-----------

2 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/browser/installer/windows/nsis/postupdate_helper.nsh b/browser/installer/windows/nsis/postupdate_helper.nsh
@@ -5,7 +5,6 @@
 !include "LogicLib.nsh"
 
 !define buildNumWin10 10240 ; First Win10 version
-!define buildNumWin11 22000 ; First Win11 version
 
 ; Depending on the installation type (as admin or not) we have different
 ; default installation directories, one of which we push onto the stack as the
@@ -132,7 +131,6 @@ Function getUninstallKey
   Pop $0
 
   ${If} $3 >= ${buildNumWin10}
-  ${AndIf} $3 < ${buildNumWin11}
     ClearErrors
 
     ; Determine the path to the user configured target directory.
diff --git a/browser/installer/windows/nsis/test_stub.nsi b/browser/installer/windows/nsis/test_stub.nsi
@@ -367,17 +367,6 @@ Function TestUninstallRegKey
     ClearErrors
 
     ; ----
-    ; The same test again, but this time simulate Windows 11. The path is
-    ; supposed to contain a version number. This restriction is expected to be
-    ; removed in the future.
-    Push ${buildNumWin11}
-    Call getUninstallKey
-    Pop $INSTDIR ; reuse INSTDIR for the return value
-    !insertmacro AssertEqual INSTDIR \
-        "Software\Microsoft\Windows\CurrentVersion\Uninstall\${BrandFullNameInternal} ${AppVersion} (${ARCH} ${AB_CD})"
-    ClearErrors
-
-    ; ----
     ; Special case: The maximal supported path length here is 1024 chars, in
     ; which case the return value for the path comparison is an error value.
     ; Since this error value will never match the default path name, we expect