From c9b3ff6b654e785c046e7e6901e985f8d577a69b Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 31 Oct 2020 00:07:17 +0100
Subject: [PATCH] FIRE-30446: Set friendly app name for registered protocols
 and register hop-protocol only for OpenSim installations

---
 .../installers/windows/installer_template.nsi |  41 ++++++++++++++----
 indra/newview/installers/windows/lang_da.nsi  | Bin 12374 -> 12888 bytes
 indra/newview/installers/windows/lang_de.nsi  | Bin 14880 -> 15128 bytes
 .../newview/installers/windows/lang_en-us.nsi | Bin 13738 -> 13988 bytes
 indra/newview/installers/windows/lang_es.nsi  | Bin 14144 -> 14394 bytes
 indra/newview/installers/windows/lang_fr.nsi  | Bin 14896 -> 15144 bytes
 indra/newview/installers/windows/lang_it.nsi  | Bin 13872 -> 14122 bytes
 indra/newview/installers/windows/lang_ja.nsi  | Bin 12012 -> 12264 bytes
 indra/newview/installers/windows/lang_pl.nsi  | Bin 14200 -> 14448 bytes
 .../newview/installers/windows/lang_pt-br.nsi | Bin 14470 -> 14730 bytes
 indra/newview/installers/windows/lang_ru.nsi  | Bin 13772 -> 14022 bytes
 indra/newview/installers/windows/lang_tr.nsi  | Bin 13656 -> 13906 bytes
 indra/newview/installers/windows/lang_zh.nsi  | Bin 11822 -> 12080 bytes
 indra/newview/viewer_manifest.py              |  12 ++++-
 14 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index caebeb1d90..352b457c8b 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -154,6 +154,7 @@ Var SKIP_DIALOGS        # Set from command line in  .onInit. autoinstall GUI and
 # Var SKIP_AUTORUN		# Skip automatic launch of the viewer after install -- <FS:PP> Commented out: Disable autorun
 Var DO_UNINSTALL_V2     # If non-null, path to a previous Viewer 2 installation that will be uninstalled.
 Var NO_STARTMENU        # <FS:Ansariel> Optional start menu entry
+Var FRIENDLY_APP_NAME   # <FS:Ansariel> FIRE-30446: Set FriendlyAppName for protocols
 
 # Function definitions should go before file includes, because calls to
 # DLLs like LangDLL trigger an implicit file include, so if that call is at
@@ -450,6 +451,15 @@ ${Else}
   WriteRegDWORD SHELL_CONTEXT "${MSUNINSTALL_KEY}" "EstimatedSize" "0x00061800"		# 390 MB
 ${EndIf}
 
+# <FS:Ansariel> FIRE-30446: Set FriendlyAppName for protocols
+${If} ${ISOPENSIM} == "1"
+  StrCpy $FRIENDLY_APP_NAME "${INSTNAME} $(ForOpenSimSuffix)"
+${Else}
+  StrCpy $FRIENDLY_APP_NAME "${INSTNAME}"
+${EndIf}
+# </FS:Ansariel>
+
+
 # from FS:Ansariel
 WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "DisplayIcon" '"$INSTDIR\$VIEWER_EXE"'
 
@@ -469,18 +479,26 @@ WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$VIEWER_EXE
 # URL param must be last item passed to viewer, it ignores subsequent params to avoid parameter injection attacks.
 # MAINT-8305: On SLURL click, directly invoke the viewer, not the launcher.
 WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$VIEWER_EXE" -url "%1"'
+# <FS:Ansariel> FIRE-30446: Set FriendlyAppName for protocols
+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open" "FriendlyAppName" "$FRIENDLY_APP_NAME"
+
 WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "(default)" "URL:Second Life"
 WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "URL Protocol" ""
 WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\DefaultIcon" "" '"$INSTDIR\$VIEWER_EXE"'
 
 # URL param must be last item passed to viewer, it ignores subsequent params to avoid parameter injection attacks.
 WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open\command" "" '"$INSTDIR\$VIEWER_EXE" -url "%1"'
+# <FS:Ansariel> FIRE-30446: Set FriendlyAppName for protocols
+WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open" "FriendlyAppName" "$FRIENDLY_APP_NAME"
 
 # <FS:CR> Register hop:// protocol registry info
-WriteRegStr HKEY_CLASSES_ROOT "hop" "(default)" "URL:Second Life"
-WriteRegStr HKEY_CLASSES_ROOT "hop" "URL Protocol" ""
-WriteRegStr HKEY_CLASSES_ROOT "hop\DefaultIcon" "" '"$INSTDIR\$VIEWER_EXE"'
-WriteRegExpandStr HKEY_CLASSES_ROOT "hop\shell\open\command" "" '"$INSTDIR\$VIEWER_EXE" -url "%1"'
+${If} ${ISOPENSIM} == "1"
+  WriteRegStr HKEY_CLASSES_ROOT "hop" "(default)" "URL:Second Life"
+  WriteRegStr HKEY_CLASSES_ROOT "hop" "URL Protocol" ""
+  WriteRegStr HKEY_CLASSES_ROOT "hop\DefaultIcon" "" '"$INSTDIR\$VIEWER_EXE"'
+  WriteRegExpandStr HKEY_CLASSES_ROOT "hop\shell\open\command" "" '"$INSTDIR\$VIEWER_EXE" -url "%1"'
+  WriteRegStr HKEY_CLASSES_ROOT "hop\shell\open" "FriendlyAppName" "$FRIENDLY_APP_NAME"
+${EndIf}
 # </FS:CR>
 
 # <FS:Ansariel> Ask before creating protocol registry entries
@@ -732,8 +750,11 @@ Push $2
     Delete  "$2\AppData\Roaming\Firestorm\plugin_cookies.txt"
     Delete  "$2\AppData\Roaming\Firestorm\typed_locations.txt"
 # Delete files in \Users\<User>\AppData\Local\Firestorm
-    RMDir /r  "$2\AppData\Local\Firestorm"						#Delete the Havok cache folder
-    RMDir /r  "$2\AppData\Local\FirestormOS"						#Delete the OpenSim cache folder
+    ${If} ${ISOPENSIM} == "0"
+        RMDir /r  "$2\AppData\Local\Firestorm"						#Delete the Havok cache folder
+    ${Else}
+        RMDir /r  "$2\AppData\Local\FirestormOS"					#Delete the OpenSim cache folder
+    ${EndIf}
 
   CONTINUE:
     IntOp $0 $0 + 1
@@ -806,12 +827,16 @@ NOFOLDER:
 MessageBox MB_YESNO $(DeleteRegistryKeysMB) IDYES DeleteKeys IDNO NoDelete
 
 DeleteKeys:
-  DeleteRegKey SHELL_CONTEXT "SOFTWARE\Classes\hop" # <FS:Ansariel> Unregister hop:// protocol registry info
   DeleteRegKey SHELL_CONTEXT "SOFTWARE\Classes\x-grid-location-info"
   DeleteRegKey SHELL_CONTEXT "SOFTWARE\Classes\secondlife"
-  DeleteRegKey HKEY_CLASSES_ROOT "hop" # <FS:Ansariel> Unregister hop:// protocol registry info
   DeleteRegKey HKEY_CLASSES_ROOT "x-grid-location-info"
   DeleteRegKey HKEY_CLASSES_ROOT "secondlife"
+  # <FS:Ansariel> Unregister hop:// protocol registry info
+  ${If} ${ISOPENSIM} == "1"
+    DeleteRegKey SHELL_CONTEXT "SOFTWARE\Classes\hop"
+    DeleteRegKey HKEY_CLASSES_ROOT "hop"
+  ${EndIf}
+  # </FS:Ansariel>
 
 NoDelete:
 
diff --git a/indra/newview/installers/windows/lang_da.nsi b/indra/newview/installers/windows/lang_da.nsi
index 8daa818030f3945061a57a0a67da7738196a5180..f803b509ee13754d088070d4364bb2d0420029b5 100644
GIT binary patch
delta 330
zcmcbXa3f^{kM87US~7<I3<V4&44Dl140#NR3^@!648=fxB0~|7RA9(uNCk?Q0$Cus
z1SncL`J%M!WE*WR>0r1zU#KcqxEe!dWk+YA>QtafB|uUENarD&0%T``MM@Yl!17pZ
zojg@b-@gFpz8s+1WUxsPcPapNCW74ta&0L?8W3hOQ~=FP1Nx%~NP~O@a&a(FJQv6>
r1FA0qvJ)rQ%gW2UfmNZZ2}YPR8R&XN>?V~0-2(Cv(3Z`Abt0Jo5fw)u

delta 12
TcmcbSaxGy4kM3qZeJ^GJCGiBA

diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi
index 3b81a616f3d780b94d3219f0f2ba0bc68493039e..a49fb02737ce7c5930c18fee34a1734cb34c5a4c 100755
GIT binary patch
delta 172
zcmZ2bGNWumn9<~IdP;!>3<V5144Dkc42cXSKsuixk3j*56B%+DQh}^uhEj$!Ak1W_
z0P@m+@<l+}AE+x8s45sJo(trc0o4})*@+B!lP_vX%e#Tqp{fc-m^AqykFsJK!yhbW
Rl>%J@atY9$&HhFg*#WTeC*}YE

delta 20
ccmbPHwxDD~n9<}CMzP5^G<Y@_7_VRl09?2T9RL6T

diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index e1ec013626c21c956255fed9653fa04a462dbd38..17cd63d24267ab0934860bc64472c0242b7f16e7 100644
GIT binary patch
delta 163
zcmZ3Ly(D)-o!;a+U4_Z-3?yvx7!nzB8B!S(7>XH68Pb3-lc560OJm4qC<4;{3<W^h
zJceMPcrK7%22@`JWG4c}N+v#(ly?IwL{%1yFlurktEwV)!%7))fX0-7^iRIeB|G_?
LD$nKxdR*)P?06?y

delta 12
TcmZ3IyDED_o!;gOeI0fHCnE(A

diff --git a/indra/newview/installers/windows/lang_es.nsi b/indra/newview/installers/windows/lang_es.nsi
index c7b478a44cec83a221c303187adcd2e84bb23441..9150cbf3fe7eea3d5b28ccb607353b3ae2a99740 100755
GIT binary patch
delta 157
zcmX?*x2s@-h{0qLeTB&_MiRDp42cZ645<tX48;tk3~4}^$xs30r7`3)6ai^}h612$
z9z!rtJQv6>1FA0qvJ-(~B@-V?%DaITqACkU7&ZAKld3#+!%7))fX0+C<WFv7mfx&p
HAjS>=dHW;a

delta 20
ccmdm0a3F7kh{5C)++veosq<_$Fyvwf0A2G3egFUf

diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi
index b221b3c8bea1b29f6c6d4513e2522cc079315246..bbe204eda72677e4558b4abd5a943ed9cd85ca20 100755
GIT binary patch
delta 156
zcmdl`vZ8E5gwbR-Lj^|1$-PSA)_Dwx47m)c3<?az45bWdK$yu;0pz7I<TDfjX@7<S
zpllvPFi<=f$S(t`F9Na?8S*AKa!Sj)fz_d^3PzYTS&&y*5xZHX3^_nkN<jKI2O8aH
F2LLI4BQ5{{

delta 20
ccmZ2cwxMK0gwbRT9<j-Nnmn6}jJL4^09pD6#Q*>R

diff --git a/indra/newview/installers/windows/lang_it.nsi b/indra/newview/installers/windows/lang_it.nsi
index f18f1c9cc53cf3164ee63ef592ccb9a08255f328..ad79c360f45a09d50f635607781a5b917fc28232 100755
GIT binary patch
delta 159
zcmdmxvnp=`i~eL5J%!07h7z`U42cZ645<tX48;tk3~4}^$xs30r7`3)6ai^}h612$
z9z!rtJQv6>1FA0qvJ-(~B@-V?%DaITqACkU7&ZAKr>Y`$!%7))fX0-7^iTfCC%ain
HUyL09l1U_N

delta 20
ccmZ3Lw;^W(i~i&vd}5P#sqt)9FyLYb09<4TS^xk5

diff --git a/indra/newview/installers/windows/lang_ja.nsi b/indra/newview/installers/windows/lang_ja.nsi
index 8b338460eabe4fb087f0dd2100225974569584f2..8584327aca481609f0bab25fb6afdb87ee132e1c 100755
GIT binary patch
delta 184
zcmaD8`yzhBCiTf1)D%J;847?fhar<8nIVy(1W4yI<S{4!aUw%5Ln@F}%uvdZ285Xm
z6+m7ZP`(IA`vY~Q0#yYA#dCrDGNAe*AUhE#Rx<e`tE9XeSS6~uV1!wd8=2G<v71&3
YbPvcaK$|8rYRgW(rNp!Oin;_l0M_a%tN;K2

delta 20
ccmaD6|0Z_BCiTf?%wm&oDe-K+pdrBy0B11>VE_OC

diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi
index acbb136f6f588e78df9818e2158621e00bb8dc18..9ebeb052ea50332ffd76428cb5cdc2676e541cb6 100644
GIT binary patch
delta 176
zcmey7_n}}znZe{1eT7g*h5{hWVaQ}iW=Lcx0n+&lc?=3boXC*NkP2iKGn6u<0bwRX
z1(25plrI9({y<%+Kvls&@mwIk45+>c$W8=`l}vufBq{F(R*9-E7-80AMP_A1?533h
P-2-w9(5B7#2Au2wU<fBP

delta 20
ccmexR@FQ<SnZe{6CSsHQ)Oj{fFnquU0B$D<KmY&$

diff --git a/indra/newview/installers/windows/lang_pt-br.nsi b/indra/newview/installers/windows/lang_pt-br.nsi
index f53da4d6b6f132f9be2e2113ceeaed76964b5043..aad994dfd77606ace6994d02290c00d26d408791 100755
GIT binary patch
delta 172
zcmZoG>?+<MVmNu8u2NtDLjgk$LncEqLn1>7kj`hwV^9F%M21|3R3NLEp_CyF2s0Tf
zfV?!Id=ZfL2kJ@%stN{*=K}d<K=nmHb|ORG<a|zPc{i{+R8_$UlO`K7>MLS5s}$%O
OkV}B}Z00qrWCs8NpCuvy

delta 12
TcmeAwZY$g%Vz^ntsE8c^Av^?N

diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi
index 8be2086b7d5615c71895c9043da0cda7da8f2d3f..e4ffe7654edf1b98cd921de114ae9104c87cd255 100755
GIT binary patch
delta 163
zcmX?;eJppw0=>x#bQLBG7)sdYF(fkNGNdvnFcdSCGNb`vCPM{~m&TCKPz0p?847^1
zc?`io@mwIk45+>c$W8=`l}vmnDeneWh^j0YVbtV}jH-&*4J&2H0UA>R(m(k<kL=`g
Mnmn5i>2a|G0L$zrc>n+a

delta 16
YcmX?>dnS9s0=>!Kc*Hhu&=+F|07(c3LjV8(

diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi
index 374ac85a7bfd431c21cb4d509e446503ac95d28a..31e805a143214172af5d71921cc6f9b8e9630669 100755
GIT binary patch
delta 158
zcmcbSbtz|qj^1P)U4_YW3?!`c7!nzB8B!S(7>XH68Pb3-lc560OJm4qC<4;{3<W^h
zJceMPcrK7%22@`JWG6D@O<t%jE$;?ahpH+VVbbJ{jH<HO%_?Qc0h&@W`5~|3<O`}i
JoBi~-*a6C|B|`uJ

delta 20
ccmcbVb0cemj^5-5X0gc^RCzXg=yS0H09~U8UH||9

diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi
index 27e417abb67ff73f41742e2c1d848a50e7f404a4..375803e51ffe49bc098e71699f5894df1bf4e440 100755
GIT binary patch
delta 160
zcmZ1%vmtK7DYeNF%1V=yl*DZF7!nzB8B!S(7>XH68Pb3-lc560OJm4qC<4;{3<W^h
zJceMPcrK7%22@`JWG4c}N+uVwNXol`Ridg3Mwm7EBD<~<cGF53a)9QPfb~z}l-c}1
H&5s=b_~0bZ

delta 20
ccmdlGw=QPGDYeOLoMMw7DDrH6r|!fK0A8O6A^-pY

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 21e8a27044..5c3004b9f0 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -326,7 +326,13 @@ class ViewerManifest(LLManifest,FSViewerManifest):
 
     def app_name_oneword(self):
         return ''.join(self.app_name().split())
-    
+
+    # <FS:Ansariel> FIRE-30446: Set FriendlyAppName for protocol registrations
+    def friendly_app_name(self):
+        global CHANNEL_VENDOR_BASE
+        return CHANNEL_VENDOR_BASE
+    # </FS:Ansariel>
+
     def icon_path(self):
         # <FS:ND> Add -os for oss builds
         if self.fs_is_opensim():
@@ -841,6 +847,8 @@ class WindowsManifest(ViewerManifest):
         
         substitution_strings['installer_file'] = installer_file
         substitution_strings['is64bit'] = (1 if (self.address_size == 64) else 0)
+        substitution_strings['is_opensim'] = self.fs_is_opensim() # <FS:Ansariel> FIRE-30446: Register hop-protocol for OS version only
+        substitution_strings['friendly_app_name'] = self.friendly_app_name() # <FS:Ansariel> FIRE-30446: Set FriendlyAppName for protocol registrations
 
         version_vars = """
         !define INSTEXE "SLVersionChecker.exe"
@@ -862,6 +870,8 @@ class WindowsManifest(ViewerManifest):
             !define SHORTCUT   "%(app_name)s"
             !define URLNAME   "secondlife"
             !define IS64BIT   "%(is64bit)d"
+            !define ISOPENSIM   "%(is_opensim)d"
+            !define APPNAME   "%(friendly_app_name)s"
             Caption "%(caption)s"
             """