commit 522b8aec56e35ba1cbb7d0b6904ecf4f4be1d54a
parent 24437e6b4aab6f1bc14fe241929508d80be9868f
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Tue, 14 Oct 2025 22:50:48 +0000
Bug 1994090 - Remove unused ReadRegQWORD and WriteRegQWORD NSIS installer functions. r=cdupuis,nrishel
Their only usage was removed in bug 1543807.
Differential Revision: https://phabricator.services.mozilla.com/D268475
Diffstat:
1 file changed, 0 insertions(+), 68 deletions(-)
diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -8787,71 +8787,3 @@
Pop $1
Pop $0
!macroend
-
-Function WriteRegQWORD
- ; Stack contents:
- ; VALUE, VALUE_NAME, SUBKEY, ROOTKEY
- Exch $3 ; $3, VALUE_NAME, SUBKEY, ROOTKEY
- Exch 1 ; VALUE_NAME, $3, SUBKEY, ROOTKEY
- Exch $2 ; $2, $3, SUBKEY, ROOTKEY
- Exch 2 ; SUBKEY, $3, $2, ROOTKEY
- Exch $1 ; $1, $3, $2, ROOTKEY
- Exch 3 ; ROOTKEY, $3, $2, $1
- Exch $0 ; $0, $3, $2, $1
- System::Call "advapi32::RegSetKeyValueW(p r0, w r1, w r2, i 11, *l r3, i 8) i.r0"
- ${IfNot} $0 = 0
- SetErrors
- ${EndIf}
- Pop $0
- Pop $3
- Pop $2
- Pop $1
-FunctionEnd
-!macro WriteRegQWORD ROOTKEY SUBKEY VALUE_NAME VALUE
- ${If} "${ROOTKEY}" == "HKCR"
- Push 0x80000000
- ${ElseIf} "${ROOTKEY}" == "HKCU"
- Push 0x80000001
- ${ElseIf} "${ROOTKEY}" == "HKLM"
- Push 0x80000002
- ${Endif}
- Push "${SUBKEY}"
- Push "${VALUE_NAME}"
- System::Int64Op ${VALUE} + 0 ; The result is pushed on the stack
- Call WriteRegQWORD
-!macroend
-!define WriteRegQWORD "!insertmacro WriteRegQWORD"
-
-Function ReadRegQWORD
- ; Stack contents:
- ; VALUE_NAME, SUBKEY, ROOTKEY
- Exch $2 ; $2, SUBKEY, ROOTKEY
- Exch 1 ; SUBKEY, $2, ROOTKEY
- Exch $1 ; $1, $2, ROOTKEY
- Exch 2 ; ROOTKEY, $2, $1
- Exch $0 ; $0, $2, $1
- System::Call "advapi32::RegGetValueW(p r0, w r1, w r2, i 0x48, p 0, *l s, *i 8) i.r0"
- ${IfNot} $0 = 0
- SetErrors
- ${EndIf}
- ; VALUE, $0, $2, $1
- Exch 3 ; $1, $0, $2, VALUE
- Pop $1 ; $0, $2, VALUE
- Pop $0 ; $2, VALUE
- Pop $2 ; VALUE
-FunctionEnd
-!macro ReadRegQWORD DEST ROOTKEY SUBKEY VALUE_NAME
- ${If} "${ROOTKEY}" == "HKCR"
- Push 0x80000000
- ${ElseIf} "${ROOTKEY}" == "HKCU"
- Push 0x80000001
- ${ElseIf} "${ROOTKEY}" == "HKLM"
- Push 0x80000002
- ${Endif}
- Push "${SUBKEY}"
- Push "${VALUE_NAME}"
- Call ReadRegQWORD
- Pop ${DEST}
-!macroend
-!define ReadRegQWORD "!insertmacro ReadRegQWORD"
-