install: Delegate OCX registry changes to registry server

CleanFlashInstaller/InstallForm.cs

@@ -72,7 +72,7 @@ If you ever change your mind, check out Clean Flash Player's website!";
             HideAllPanels();
             string text;
 
-            if (pepperBox.Checked || netscapeBox.Checked || activeXBox.Checked) {
+            if (pepperBox.Checked || netscapeBox.Checked || activeXBox.Checked || playerBox.Checked) {
                 List<string> browsers = new List<string>();
 
                 if (pepperBox.Checked) {

CleanFlashInstaller/Installer.cs

@@ -79,7 +79,6 @@ namespace CleanFlashInstaller {
             if (flags.IsSet(InstallFlags.ACTIVEX)) {
                 form.UpdateProgressLabel("Installing 32-bit Flash Player for Internet Explorer...", true);
                 ExtractArchive("flash_ocx_32.zip", flash32Path);
-                registryToApply.Add(Properties.Resources.installOCX);
             }
             if (flags.IsSet(InstallFlags.PLAYER)) {
                 form.UpdateProgressLabel("Installing 32-bit Standalone Flash Player...", true);
@@ -112,7 +111,6 @@ namespace CleanFlashInstaller {
                 if (flags.IsSet(InstallFlags.ACTIVEX)) {
                     form.UpdateProgressLabel("Installing 64-bit Flash Player for Internet Explorer...", true);
                     ExtractArchive("flash_ocx_64.zip", flash64Path);
-                    registryToApply.Add(Properties.Resources.installOCX64);
                 }
             }
 

CleanFlashInstaller/Properties/Resources.Designer.cs

@@ -145,61 +145,6 @@ namespace CleanFlashInstaller.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to [HKEY_LOCAL_MACHINE\Software\Macromedia\FlashPlayer]
-        ///&quot;CurrentVersion&quot;=&quot;${VERSION_COMMA}&quot;
-        ///
-        ///[HKEY_LOCAL_MACHINE\Software\Macromedia\FlashPlayer\SafeVersions]
-        ///&quot;20.0&quot;=dword:ffffffff
-        ///&quot;21.0&quot;=dword:ffffffff
-        ///&quot;22.0&quot;=dword:ffffffff
-        ///&quot;23.0&quot;=dword:ffffffff
-        ///&quot;24.0&quot;=dword:ffffffff
-        ///&quot;25.0&quot;=dword:ffffffff
-        ///&quot;26.0&quot;=dword:ffffffff
-        ///&quot;27.0&quot;=dword:ffffffff
-        ///&quot;28.0&quot;=dword:ffffffff
-        ///&quot;19.0&quot;=dword:ffffffff
-        ///&quot;30.0&quot;=dword:ffffffff
-        ///&quot;31.0&quot;=dword:ffffffff
-        ///&quot;32.0&quot;=dword:ffffffff
-        ///&quot;33.0&quot;=dword:ffffffff
-        ///&quot;34.0&quot;=dword:00000089
-        ///&quot;16.0&quot;= [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string installOCX {
-            get {
-                return ResourceManager.GetString("installOCX", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to [HKEY_LOCAL_MACHINE\Software\Wow6432Node\Macromedia\FlashPlayer]
-        ///&quot;CurrentVersion&quot;=&quot;${VERSION_COMMA}&quot;
-        ///
-        ///[HKEY_LOCAL_MACHINE\Software\Wow6432Node\Macromedia\FlashPlayer\SafeVersions]
-        ///&quot;28.0&quot;=dword:ffffffff
-        ///&quot;27.0&quot;=dword:ffffffff
-        ///&quot;26.0&quot;=dword:ffffffff
-        ///&quot;21.0&quot;=dword:ffffffff
-        ///&quot;24.0&quot;=dword:ffffffff
-        ///&quot;7.0&quot;=dword:ffffffff
-        ///&quot;6.0&quot;=dword:ffffffff
-        ///&quot;30.0&quot;=dword:ffffffff
-        ///&quot;29.0&quot;=dword:ffffffff
-        ///&quot;31.0&quot;=dword:ffffffff
-        ///&quot;32.0&quot;=dword:ffffffff
-        ///&quot;8.0&quot;=dword:ffffffff
-        ///&quot;11.0&quot;=dword:ffffffff
-        ///&quot;10.0&quot;=dword:ffffffff
-        ///&quot;13.0&quot;=dw [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string installOCX64 {
-            get {
-                return ResourceManager.GetString("installOCX64", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to [HKEY_LOCAL_MACHINE\Software\Macromedia\FlashPlayerPepper]
         ///&quot;UninstallerPath&quot;=-

CleanFlashInstaller/Properties/Resources.resx

@@ -196,100 +196,6 @@
 
 [HKEY_LOCAL_MACHINE\Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\FlashPlayerPlugin_${VERSION_PATH}.exe]
 "DisableExceptionChainValidation"=dword:00000000</value>
-  </data>
-  <data name="installOCX" xml:space="preserve">
-    <value>[HKEY_LOCAL_MACHINE\Software\Macromedia\FlashPlayer]
-"CurrentVersion"="${VERSION_COMMA}"
-
-[HKEY_LOCAL_MACHINE\Software\Macromedia\FlashPlayer\SafeVersions]
-"20.0"=dword:ffffffff
-"21.0"=dword:ffffffff
-"22.0"=dword:ffffffff
-"23.0"=dword:ffffffff
-"24.0"=dword:ffffffff
-"25.0"=dword:ffffffff
-"26.0"=dword:ffffffff
-"27.0"=dword:ffffffff
-"28.0"=dword:ffffffff
-"19.0"=dword:ffffffff
-"30.0"=dword:ffffffff
-"31.0"=dword:ffffffff
-"32.0"=dword:ffffffff
-"33.0"=dword:ffffffff
-"34.0"=dword:00000089
-"16.0"=dword:ffffffff
-"13.0"=dword:ffffffff
-"15.0"=dword:ffffffff
-"14.0"=dword:ffffffff
-"18.0"=dword:ffffffff
-"29.0"=dword:ffffffff
-"17.0"=dword:ffffffff
-"6.0"=dword:ffffffff
-"8.0"=dword:ffffffff
-"9.0"=dword:ffffffff
-"10.0"=dword:ffffffff
-"11.0"=dword:ffffffff
-"12.0"=dword:ffffffff
-"7.0"=dword:ffffffff
-
-[HKEY_LOCAL_MACHINE\Software\Macromedia\FlashPlayerActiveX]
-"Version"="${VERSION}"
-"PlayerPath"="${FLASH_64_PATH}\\Flash${ARCH}_${VERSION_PATH}.ocx"
-"UninstallerPath"=-
-"isScriptDebugger"=dword:00000000
-"isMSI"=dword:00000000
-"isPartner"=dword:00000001
-"isESR"=dword:00000000
-
-[HKEY_LOCAL_MACHINE\Software\Macromedia\FlashPlayerActiveXReleaseType]
-"Release"=dword:00000001</value>
-  </data>
-  <data name="installOCX64" xml:space="preserve">
-    <value>[HKEY_LOCAL_MACHINE\Software\Wow6432Node\Macromedia\FlashPlayer]
-"CurrentVersion"="${VERSION_COMMA}"
-
-[HKEY_LOCAL_MACHINE\Software\Wow6432Node\Macromedia\FlashPlayer\SafeVersions]
-"28.0"=dword:ffffffff
-"27.0"=dword:ffffffff
-"26.0"=dword:ffffffff
-"21.0"=dword:ffffffff
-"24.0"=dword:ffffffff
-"7.0"=dword:ffffffff
-"6.0"=dword:ffffffff
-"30.0"=dword:ffffffff
-"29.0"=dword:ffffffff
-"31.0"=dword:ffffffff
-"32.0"=dword:ffffffff
-"8.0"=dword:ffffffff
-"11.0"=dword:ffffffff
-"10.0"=dword:ffffffff
-"13.0"=dword:ffffffff
-"12.0"=dword:ffffffff
-"15.0"=dword:ffffffff
-"14.0"=dword:ffffffff
-"17.0"=dword:ffffffff
-"16.0"=dword:ffffffff
-"19.0"=dword:ffffffff
-"18.0"=dword:ffffffff
-"25.0"=dword:ffffffff
-"20.0"=dword:ffffffff
-"22.0"=dword:ffffffff
-"34.0"=dword:00000089
-"23.0"=dword:ffffffff
-"33.0"=dword:ffffffff
-"9.0"=dword:ffffffff
-
-[HKEY_LOCAL_MACHINE\Software\Wow6432Node\Macromedia\FlashPlayerActiveX]
-"isMSI"=dword:00000000
-"isESR"=dword:00000000
-"isScriptDebugger"=dword:00000000
-"UninstallerPath"=-
-"PlayerPath"="${FLASH_32_PATH}\\Flash32_${VERSION_PATH}.ocx"
-"Version"="${VERSION}"
-"isPartner"=dword:00000001
-
-[HKEY_LOCAL_MACHINE\Software\Wow6432Node\Macromedia\FlashPlayerActiveXReleaseType]
-"Release"=dword:00000001</value>
   </data>
   <data name="installPP" xml:space="preserve">
     <value>[HKEY_LOCAL_MACHINE\Software\Macromedia\FlashPlayerPepper]