From 42e38ad91a997d62eb176910b3b1399c132fc037 Mon Sep 17 00:00:00 2001 From: Frank Wein Date: Thu, 11 Nov 2010 21:09:25 +0100 Subject: [PATCH] Bug 609106 - Add plugin-container.exe to ShimInclusionList via installer, r=rstrong, a2.0=bsmedberg --- browser/installer/windows/nsis/installer.nsi | 2 ++ browser/installer/windows/nsis/uninstaller.nsi | 3 +++ 2 files changed, 5 insertions(+) diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi index 3915450f16a..78a46383189 100755 --- a/browser/installer/windows/nsis/installer.nsi +++ b/browser/installer/windows/nsis/installer.nsi @@ -369,6 +369,8 @@ Section "-Application" APP_IDX StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\$R9" ${CreateRegKey} "$TmpVal" "$0" 0 + StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe" + ${CreateRegKey} "$TmpVal" "$0" 0 ${If} $TmpVal == "HKLM" ; Set the permitted LSP Categories for WinVista and above diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi index be054e3b29f..14fd4cadf89 100755 --- a/browser/installer/windows/nsis/uninstaller.nsi +++ b/browser/installer/windows/nsis/uninstaller.nsi @@ -298,6 +298,9 @@ Section "Uninstall" StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\${FileMainEXE}" DeleteRegKey HKLM "$0" DeleteRegKey HKCU "$0" + StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe" + DeleteRegKey HKLM "$0" + DeleteRegKey HKCU "$0" StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=firefox" DeleteRegKey HKLM "$0" DeleteRegKey HKCU "$0"