handle not opening subkey for same value optimization

Author: tomysshadow

FlashpointSecurePlayer/RegistryStates.cs

@@ -248,11 +248,15 @@ private RegistryKey CreateKeyInRegistryView(string keyName, RegistryKeyPermissio
         }
 
         private void SetKeyInRegistryView(string keyName, RegistryView registryView) {
-            using (RegistryKey registryKey = CreateKeyInRegistryView(keyName, RegistryKeyPermissionCheck.Default, registryView)) {
-                if (registryKey == null) {
-                    // key is invalid
-                    throw new ArgumentException("The key \"" + keyName + "\" is invalid.");
+            try {
+                using (RegistryKey registryKey = CreateKeyInRegistryView(keyName, RegistryKeyPermissionCheck.Default, registryView)) {
+                    if (registryKey == null) {
+                        // key is invalid
+                        throw new ArgumentException("The key \"" + keyName + "\" is invalid.");
+                    }
                 }
+            } catch (UnauthorizedAccessException) {
+                // key exists and we can't set it
             }
         }
 
@@ -314,45 +318,45 @@ private object GetValueInRegistryView(string keyName, string valueName, out Regi
         }
 
         private void SetValueInRegistryView(string keyName, string valueName, object value, RegistryValueKind valueKind, RegistryView registryView) {
-            using (RegistryKey registryKey = CreateKeyInRegistryView(keyName, RegistryKeyPermissionCheck.ReadWriteSubTree, registryView)) {
-                if (registryKey == null) {
-                    // key is invalid
-                    throw new ArgumentException("The key \"" + keyName + "\" is invalid.");
+            switch (valueKind) {
+                case RegistryValueKind.Binary:
+                if (value is string binaryValue) {
+                    value = Convert.FromBase64String(binaryValue);
                 }
+                break;
+                case RegistryValueKind.MultiString:
+                if (value is string multiStringValue) {
+                    value = multiStringValue.Split('\0');
+                }
+                break;
+            }
 
-                switch (valueKind) {
-                    case RegistryValueKind.Binary:
-                    if (value is string binaryValue) {
-                        value = Convert.FromBase64String(binaryValue);
-                    }
-                    break;
-                    case RegistryValueKind.MultiString:
-                    if (value is string multiStringValue) {
-                        value = multiStringValue.Split('\0');
+            try {
+                using (RegistryKey registryKey = CreateKeyInRegistryView(keyName, RegistryKeyPermissionCheck.ReadWriteSubTree, registryView)) {
+                    if (registryKey == null) {
+                        // key is invalid
+                        throw new ArgumentException("The key \"" + keyName + "\" is invalid.");
                     }
-                    break;
-                }
 
-                try {
                     registryKey.SetValue(valueName, value, valueKind);
-                } catch {
-                    try {
-                        object _value = GetValueInRegistryView(keyName, valueName, out RegistryValueKind? _valueKind, registryView);
-
-                        // if it's an exact string match, don't worry about it
-                        if (valueKind == _valueKind) {
-                            if (value is string valueString
-                                && _value is string _valueString) {
-                                if (valueString.Equals(_valueString, StringComparison.Ordinal)) {
-                                    return;
-                                }
+                }
+            } catch (UnauthorizedAccessException) {
+                try {
+                    object _value = GetValueInRegistryView(keyName, valueName, out RegistryValueKind? _valueKind, registryView);
+
+                    // if it's an exact string match, don't worry about it
+                    if (valueKind == _valueKind) {
+                        if (value is string valueString
+                            && _value is string _valueString) {
+                            if (valueString.Equals(_valueString, StringComparison.Ordinal)) {
+                                return;
                             }
                         }
-                    } catch {
-                        // fail silently
                     }
-                    throw;
+                } catch {
+                    // fail silently
                 }
+                throw;
             }
         }
 
@@ -363,7 +367,7 @@ private void DeleteValueInRegistryView(string keyName, string valueName, Registr
                     return;
                 }
 
-                registryKey.DeleteValue(valueName);
+                registryKey.DeleteValue(valueName, false);
             }
         }
 
@@ -373,7 +377,6 @@ private void DeleteValueInRegistryView(string keyName, string valueName, Registr
                     // key does not exist
                     return null;
                 }
-
                 return registryKey.GetValueKind(valueName);
             }
         }
@@ -1015,9 +1018,6 @@ public override void Activate(string templateName) {
                                     // key doesn't exist and we can't set it
                                     LogExceptionToLauncher(ex);
                                     throw new TaskRequiresElevationException("Setting the key \"" + keyName + "\" requires elevation.");
-                                } catch (UnauthorizedAccessException ex) {
-                                    // key exists and we can't set it
-                                    LogExceptionToLauncher(ex);
                                 } catch (InvalidOperationException ex) {
                                     // key marked for deletion
                                     LogExceptionToLauncher(ex);