Bug 1531724 - Revert SupportUTF8 registry setting from bug 1521007. r+a=me
authorJorg K <jorgk@jorgk.com>
Fri, 01 Mar 2019 21:02:13 +0100
changeset 34372 92296df5e4dc4608ecbd3694af659dd164871c5d
parent 34371 be2271f3fd5236dfc01d810e1fe67ce5405bcfab
child 34373 b687193bb451cf1109421df9087f90465dda2ed5
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
bugs1531724, 1521007
Bug 1531724 - Revert SupportUTF8 registry setting from bug 1521007. r+a=me
mail/installer/windows/nsis/shared.nsh
suite/installer/windows/nsis/shared.nsh
--- a/mail/installer/windows/nsis/shared.nsh
+++ b/mail/installer/windows/nsis/shared.nsh
@@ -353,17 +353,17 @@
   ${GetLongPath} "$INSTDIR\uninstall\helper.exe" $7
   ${GetLongPath} "$INSTDIR\mozMapi32_InUse.dll" $6
 
   StrCpy $0 "Software\Clients\Mail\${ClientsRegName}"
 
   WriteRegStr ${RegKey} "$0" "" "${ClientsRegName}"
   WriteRegStr ${RegKey} "$0\DefaultIcon" "" "$8,0"
   WriteRegStr ${RegKey} "$0" "DLLPath" "$6"
-  WriteRegDWORD ${RegKey} "$0" "SupportUTF8" 1
+  WriteRegDWORD ${RegKey} "$0" "SupportUTF8" 0
 
   ; The MapiProxy dll can exist in multiple installs of the application.
   ; Registration occurs as follows with the last action to occur being the one
   ; that wins:
   ; On install and software update when helper.exe runs with the /PostUpdate
   ; argument. On setting the application as the system's default application
   ; using Window's "Set program access and defaults".
 
--- a/suite/installer/windows/nsis/shared.nsh
+++ b/suite/installer/windows/nsis/shared.nsh
@@ -462,17 +462,17 @@
   ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
   ${GetLongPath} "$INSTDIR\uninstall\helper.exe" $7
   ${GetLongPath} "$INSTDIR\mozMapi32_InUse.dll" $6
 
   StrCpy $0 "Software\Clients\Mail\${BrandFullNameInternal}"
   WriteRegStr HKLM "$0" "" "${BrandFullNameInternal}"
   WriteRegStr HKLM "$0\DefaultIcon" "" "$8,0"
   WriteRegStr HKLM "$0" "DLLPath" "$6"
-  WriteRegDWORD HKLM "$0" "SupportUTF8" 1
+  WriteRegDWORD HKLM "$0" "SupportUTF8" 0
 
   ; The MapiProxy dll can be used by multiple applications but
   ; is only registered for the last application installed. When the last
   ; application installed is uninstalled MapiProxy.dll will no longer be
   ; registered.
   !ifndef NO_LOG
     ${LogHeader} "DLL Registration"
   !endif