fix problem backing up

Author: tomysshadow

FlashpointSecurePlayer/FlashpointSecurePlayer.cs

@@ -116,7 +116,7 @@ private async Task ActivateModificationsAsync(string commandLine, ErrorDelegate
                 ProgressManager.CurrentGoal.Start(7);
 
                 try {
-                    await DownloadEXEConfiguration(ModificationsName).ConfigureAwait(true);
+                    await DownloadFlashpointSecurePlayerSection(ModificationsName).ConfigureAwait(true);
                     ModificationsElement modificationsElement = null;
 
                     try {

FlashpointSecurePlayer/FlashpointSecurePlayer.csproj

@@ -91,6 +91,7 @@
     <Compile Include="Modifications.cs" />
     <Compile Include="ProgressManager.cs" />
     <Compile Include="RunAsAdministrator.cs" />
+    <Compile Include="Shared.cs" />
     <Compile Include="SingleInstance.cs" />
     <Compile Include="ProcessSync.cs" />
     <Compile Include="RegistryBackups.cs" />

FlashpointSecurePlayer/Program.cs

@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.9.0")]
-[assembly: AssemblyFileVersion("1.0.9.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 [assembly: NeutralResourcesLanguage("en")]
 

FlashpointSecurePlayer/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-# Flashpoint Secure Player 1.0.9
+# Flashpoint Secure Player 1.1.0
 This player attempts to solve common compatibility or portability issues posed by browser plugins on Windows for the purpose of playback in BlueMaxima's Flashpoint.
 
 It is compatible with Windows 7, Windows 8, Windows 8.1 and Windows 10, and requires .NET Framework 4.5. If you are on Windows 8.1 or Windows 10, or if you are on Windows 7/8 and have updates enabled, you already have .NET Framework 4.5. Otherwise, you may [download .NET Framework 4.5.](http://www.microsoft.com/en-us/download/details.aspx?id=30653)
@@ -241,7 +241,7 @@ Here is a `modifications` element which temporarily changes the Unity directory.
 </modification>
 ```
 
-The `type` attribute of the `registryBackup` element specifies whether the element represents a `KEY` or `VALUE`. If not specified, the default is `KEY`. The `keyName` and `valueName` attributes specify the location of the registry key and value. The `valueKind` attribute specifies the kind of value that will be set. Currently, only `String` (REG_SZ) is supported. If the `type` attribute is `KEY`, the `valueName`, `value`, and `valueKind` attributes are ignored.
+The `type` attribute of the `registryBackup` element specifies whether the element represents a `KEY` or `VALUE`. If not specified, the default is `KEY`. The `keyName` and `valueName` attributes specify the location of the registry key and value. The `valueKind` attribute specifies the kind of value that will be set. If the `type` attribute is `KEY`, the `valueName`, `value`, and `valueKind` attributes are ignored.
 
 There is no way to delete a registry key or value, only set them. The player may set a `_deleted` attribute, which is for internal use by the player only, and is ignored outside of the active configuration file (see the section about [Crash Recovery](#crash-recovery) below.)
 
@@ -335,9 +335,7 @@ You may notice that because the Flashpoint Secure Player is effectively capable
 - ActiveX/unregisterAll.bat
 
 # Planned Features
- - Currently, only the registry value kind of String (REG_SZ) is supported. Other value kinds such as Binary (REG_BINARY) and MultiStrings (REG_MULTI_SZ) will be supported in a future version.
  - Currently, there is no way to edit configuration files other than manually, and a generic "configuration file failed to load" error occurs when there is a syntax error. It would be nice to have a seperate visual editor for configuration files.
- - Generally speaking, more specific error reporting would be nice.
  - Old CPU Simulator integration?
 
 # Questions And Answers

FlashpointSecurePlayer/README.md

@@ -446,9 +446,11 @@ private object GetValueInRegistryView(string keyName, string valueName, Registry
                 return null;
             }
 
+            object value = null;
+
             try {
                 try {
-                    return registryKey.GetValue(valueName, null, RegistryValueOptions.DoNotExpandEnvironmentNames);
+                    value = registryKey.GetValue(valueName, null, RegistryValueOptions.DoNotExpandEnvironmentNames);
                 } catch (ArgumentNullException) {
                     // value name is null
                     return null;
@@ -465,6 +467,19 @@ private object GetValueInRegistryView(string keyName, string valueName, Registry
                     // we don't have read rights to the key
                     throw new SecurityException("The user cannot read from the value " + valueName + ".");
                 }
+
+                RegistryValueKind? valueKind = GetValueKindInRegistryView(keyName, valueName, registryView);
+
+                switch (valueKind) {
+                    case RegistryValueKind.Binary:
+                    value = Convert.ToBase64String(value as byte[]);
+                    break;
+                    case RegistryValueKind.MultiString:
+                    value = String.Join("\0", value as string[]);
+                    break;
+                }
+
+                return value;
             } finally {
                 if (registryKey != null) {
                     registryKey.Close();
@@ -476,19 +491,33 @@ private void SetValueInRegistryView(string keyName, string valueName, object val
             RegistryKey registryKey = CreateKeyInRegistryView(keyName, RegistryKeyPermissionCheck.ReadWriteSubTree, registryView);
 
             try {
+                switch (valueKind) {
+                    case RegistryValueKind.Binary:
+                    value = Convert.FromBase64String(value as string);
+                    break;
+                    case RegistryValueKind.MultiString:
+                    try {
+                        value = (value as string).Split('\0');
+                    } catch (NullReferenceException) {
+                        // value is not a string
+                        throw new ArgumentException("The value " + valueName + " is not a string.");
+                    }
+                    break;
+                }
+
                 try {
                     registryKey.SetValue(valueName, value, valueKind);
                 } catch (NullReferenceException) {
                     // registry key is null
-                    throw new ArgumentException("The key " + keyName + " is null.");
+                    throw new ArgumentException("The value " + valueName + " is null.");
                 } catch (ObjectDisposedException) {
                     // key is closed (could not be opened)
-                    throw new ArgumentException("The key " + keyName + " is closed.");
+                    throw new ArgumentException("The value " + valueName + " is closed.");
                 } catch (IOException) {
                     // key represents a root node
-                    throw new ArgumentException("The key " + keyName + " represents a root node.");
+                    throw new ArgumentException("The value " + valueName + " represents a root node.");
                 } catch (UnauthorizedAccessException) {
-                    throw new SecurityException("The key " + keyName + " cannot be accessed by the user.");
+                    throw new SecurityException("The value " + valueName + " cannot be accessed by the user.");
                 }
             } finally {
                 if (registryKey != null) {
@@ -925,6 +954,10 @@ public async Task StopImportAsync() {
                         case TYPE.VALUE:
                         try {
                             SetValueInRegistryView(keyName, registryBackupElement.ValueName, RemoveVariablesFromLengthenedValue(registryBackupElement.Value), registryBackupElement.ValueKind.GetValueOrDefault(), registryView);
+                        } catch (FormatException) {
+                            // value marked for deletion
+                            Deactivate();
+                            throw new RegistryBackupFailedException("The value " + registryBackupElement.ValueName + " must be Base64.");
                         } catch (InvalidOperationException) {
                             // value marked for deletion
                             Deactivate();