From 3d9f7a3b0459dbc170a0d04280cc0c6c8b2a55f1 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Mon, 17 Jun 2013 23:08:55 +0900
Subject: [PATCH] Bug 882624 - Remove "URL Protocol" from FirefoxURL key.
 r=bbondy

---
 browser/installer/windows/nsis/installer.nsi      | 2 +-
 browser/installer/windows/nsis/shared.nsh         | 4 ++--
 toolkit/mozapps/installer/windows/nsis/common.nsh | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
index 7b83e8f5714..b292b7ad224 100755
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -341,7 +341,7 @@ Section "-Application" APP_IDX
   ${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" \
                                  "${AppRegName} Document" ""
   ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" "${AppRegName} URL" \
-                                 "true"
+                                 "delete"
 
   ; For pre win8, the following keys should only be set if we can write to HKLM.
   ; For post win8, the keys below get set in both HKLM and HKCU.
diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh
index df93b178c5c..4773d693558 100755
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -412,7 +412,7 @@ FunctionEnd
                                  "${AppRegName} HTML Document" ""
 
   ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" "${AppRegName} URL" \
-                                 "true"
+                                 "delete"
   Call RegisterCEH
 
   ; An empty string is used for the 4th & 5th params because the following
@@ -650,7 +650,7 @@ FunctionEnd
   ${IsHandlerForInstallDir} "FirefoxURL" $R9
   ${If} "$R9" == "true"
     ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" \
-                                   "${AppRegName} URL" "true"
+                                   "${AppRegName} URL" "delete"
   ${EndIf}
 
   ; An empty string is used for the 4th & 5th params because the following
diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh
index 8fa9c1c9b47..de13e1ba9af 100755
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -1495,6 +1495,8 @@
 
       StrCmp "$R9" "true" +1 +2
       WriteRegStr SHCTX "$R3\$R5" "URL Protocol" ""
+      StrCmp "$R9" "delete" +1 +2
+      DeleteRegValue SHCTX "$R3\$R5" "URL Protocol"
       StrCpy $R4 ""
       ReadRegDWord $R4 SHCTX "$R3\$R5" "EditFlags"
       StrCmp $R4 "" +1 +3  ; Only add EditFlags if a value doesn't exist