Bug 1545362 - Remove the SupportUTF8 registry value in HKLM\SOFTWARE\Clients\Mail\Mozilla Thunderbird. r+a=jorgk
authorRichard Marti <richard.marti@gmail.com>
Thu, 18 Apr 2019 14:09:25 +0200
changeset 32191 531b287058d3307aeb92a80051badbac99a50f63
parent 32190 7787632227e0da0b59c1ee1a946ce1d048b9199f
child 32192 6fba52b75d2ec7bd5ac0f349be5d866ba9f5b9bd
push id188
push usermozilla@jorgk.com
push dateTue, 30 Apr 2019 18:38:30 +0000
treeherdercomm-esr60@43f5186b8b6e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1545362
Bug 1545362 - Remove the SupportUTF8 registry value in HKLM\SOFTWARE\Clients\Mail\Mozilla Thunderbird. r+a=jorgk
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
@@ -356,17 +356,16 @@
   ${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" 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".
 
@@ -820,16 +819,21 @@
   DeleteRegKey HKLM "$0\Mozilla Thunderbird.Url.mailto"
   DeleteRegValue HKLM "Software\RegisteredApplications" "Mozilla Thunderbird"
 
   ; Remove the app compatibility registry key
   StrCpy $0 "Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
   DeleteRegValue HKLM "$0" "$INSTDIR\${FileMainEXE}"
   DeleteRegValue HKCU "$0" "$INSTDIR\${FileMainEXE}"
 
+  ; Remove the SupportUTF8 registry value as it causes MAPI issues on some locales
+  ; with non-ASCII characters in file names.
+  StrCpy $0 "Software\Clients\Mail\${ClientsRegName}"
+  DeleteRegValue HKLM $0 "SupportUTF8"
+
 !macroend
 !define RemoveDeprecatedKeys "!insertmacro RemoveDeprecatedKeys"
 
 ; Adds a pinned shortcut to Task Bar on update for Windows 7 and above if this
 ; macro has never been called before and the application is default (see
 ; PinToTaskBar for more details).
 ; Since defaults handling is handled by Windows in Win8 and later, we always
 ; attempt to pin a taskbar on that OS.  If Windows sets the defaults at
--- a/suite/installer/windows/nsis/shared.nsh
+++ b/suite/installer/windows/nsis/shared.nsh
@@ -462,17 +462,16 @@
   ${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" 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
@@ -787,16 +786,21 @@
   ${EndUnless}
 
   ; Delete gopher from the user's UrlAssociations if it points to SeamonkeyURL.
   StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher"
   ReadRegStr $2 HKCU "$0\UserChoice" "Progid"
   ${If} "$2" == "SeamonkeyURL"
     DeleteRegKey HKCU "$0"
   ${EndIf}
+
+  ; Remove the SupportUTF8 registry value as it causes MAPI issues on some locales
+  ; with non-ASCII characters in file names.
+  StrCpy $0 "Software\Clients\Mail\${ClientsRegName}"
+  DeleteRegValue HKLM $0 "SupportUTF8"
 !macroend
 !define RemoveDeprecatedKeys "!insertmacro RemoveDeprecatedKeys"
 
 ; Removes various directories and files for reasons noted below.
 !macro RemoveDeprecatedFiles
   ; Remove the Java Console extension (bug 1165156)
   FindFirst $0 $1 "$INSTDIR\extensions\{CAFEEFAC-00*-0000-*-ABCDEFFEDCBA}"
   loopDirs: