Bug 1372357: Remove FixCorruptOleAccRegistration from installer as it is no longer necessary; r=mhowell
authorAaron Klotz <aklotz@mozilla.com>
Mon, 12 Jun 2017 14:52:09 -0600
changeset 366951 168e1fcf6ac48152cef8d52f27ce09aa7d9c2ffd
parent 366950 880a74b4dd4740c750e1373e7861d1632b84e671
child 366952 c38bf53df24b7623043b0d5ac9df80b3d08f9fdd
push id32116
push userphilringnalda@gmail.com
push dateSun, 02 Jul 2017 00:34:50 +0000
treeherdermozilla-central@f71131f619f2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhowell
bugs1372357
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1372357: Remove FixCorruptOleAccRegistration from installer as it is no longer necessary; r=mhowell MozReview-Commit-ID: DptKD4dvDSK
browser/installer/windows/nsis/shared.nsh
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -102,21 +102,16 @@
   ; Fix the distribution.ini file if applicable
   ${FixDistributionsINI}
 
   RmDir /r /REBOOTOK "$INSTDIR\${TO_BE_DELETED}"
 
   ; Register AccessibleHandler.dll with COM (this writes to HKLM)
   ${RegisterAccessibleHandler}
 
-!ifndef HAVE_64BIT_BUILD
-  ; Clean up any IAccessible registry corruption
-  ${FixCorruptOleAccRegistration}
-!endif
-
 !ifdef MOZ_MAINTENANCE_SERVICE
   Call IsUserAdmin
   Pop $R0
   ${If} $R0 == "true"
   ; Only proceed if we have HKLM write access
   ${AndIf} $TmpVal == "HKLM"
     ; We check to see if the maintenance service install was already attempted.
     ; Since the Maintenance service can be installed either x86 or x64,
@@ -922,59 +917,16 @@
 !define AddMaintCertKeys "!insertmacro AddMaintCertKeys"
 !endif
 
 !macro RegisterAccessibleHandler
   ${RegisterDLL} "$INSTDIR\AccessibleHandler.dll"
 !macroend
 !define RegisterAccessibleHandler "!insertmacro RegisterAccessibleHandler"
 
-!ifndef HAVE_64BIT_BUILD
-!define IID_IAccessible "{618736E0-3C3D-11CF-810C-00AA00389B71}"
-!define CLSID_UniversalMarshaler "{00020404-0000-0000-C000-000000000046}"
-!define OleAccTypeLib "{1EA4DBF0-3C3B-11CF-810C-00AA00389B71}"
-!define OleAccTypeLibVersion "1.1"
-Function FixCorruptOleAccRegistration
-  Push $0
-
-  ; Read IAccessible's ProxyStubClsid32. If it is not CLSID_UniversalMarshaler
-  ; then we must be running Windows 10 Creators Update which does not use a
-  ; type library.
-  ReadRegStr $0 HKCR "Interface\${IID_IAccessible}\ProxyStubClsid32" ""
-  ${Unless} "$0" == "${CLSID_UniversalMarshaler}"
-    Pop $0
-    Return
-  ${EndIf}
-
-  Push $1
-
-  ; IAccessible is using the universal marshler, therefore we expect a valid
-  ; TypeLib key to exist
-  ClearErrors
-  ReadRegStr $0 HKCR "Interface\${IID_IAccessible}\TypeLib" ""
-  ReadRegStr $1 HKCR "Interface\${IID_IAccessible}\TypeLib" "Version"
-  ReadRegStr $0 HKCR "TypeLib\$0\$1\0\win32" ""
-  Pop $1
-  ${IfNot} ${Errors}
-  ${AndIf} ${FileExists} "$0"
-    Pop $0
-    Return
-  ${EndIf}
-
-  Pop $0
-
-  ; Some third-party code has previously overridden system typelibs
-  ; with their own but did not clean itself up during uninstall.
-  ; Revert to the system typelib.
-  WriteRegStr HKCR "Interface\${IID_IAccessible}\TypeLib" "" "${OleAccTypeLib}"
-  WriteRegStr HKCR "Interface\${IID_IAccessible}\TypeLib" "Version" "${OleAccTypeLibVersion}"
-FunctionEnd
-!define FixCorruptOleAccRegistration "Call FixCorruptOleAccRegistration"
-!endif
-
 ; Removes various registry entries for reasons noted below (does not use SHCTX).
 !macro RemoveDeprecatedKeys
   StrCpy $0 "SOFTWARE\Classes"
   ; Remove support for launching chrome urls from the shell during install or
   ; update if the DefaultIcon is from firefox.exe (Bug 301073).
   ${RegCleanAppHandler} "chrome"
 
   ; Remove protocol handler registry keys added by the MS shim