fix compatibility settings detection being unreliable

Author: tomysshadow

FlashpointSecurePlayer/EnvironmentVariables.cs

@@ -21,7 +21,9 @@ public void Activate(string name, string server, string applicationMutexName) {
             base.Activate(name);
             ModificationsElement modificationsElement = GetModificationsElement(true, Name);
             string value = null;
+            List<string> values = null;
             string compatibilityLayerValue = null;
+            List<string> compatibilityLayerValues = new List<string>();
 
             try {
                 compatibilityLayerValue = Environment.GetEnvironmentVariable(COMPATIBILITY_LAYER_NAME);
@@ -31,10 +33,6 @@ public void Activate(string name, string server, string applicationMutexName) {
                 throw new TaskRequiresElevationException();
             }
 
-            if (compatibilityLayerValue != null) {
-                compatibilityLayerValue = compatibilityLayerValue.ToUpper();
-            }
-
             EnvironmentVariablesElement environmentVariablesElement = null;
 
             for (int i = 0;i < modificationsElement.EnvironmentVariables.Count;i++) {
@@ -54,15 +52,23 @@ public void Activate(string name, string server, string applicationMutexName) {
                     throw new TaskRequiresElevationException();
                 }
 
-                if (value != null) {
-                    value = value.ToUpper();
-                }
-
                 // if this is the compatibility layer variable
                 // and the value is not what we want to set it to
                 // and we're in server mode...
-                if (environmentVariablesElement.Name == COMPATIBILITY_LAYER_NAME && value != compatibilityLayerValue && !String.IsNullOrEmpty(server)) {
-                    throw new CompatibilityLayersException();
+                if (environmentVariablesElement.Name == COMPATIBILITY_LAYER_NAME && !String.IsNullOrEmpty(server)) {
+                    values = new List<string>();
+
+                    if (compatibilityLayerValue != null) {
+                        compatibilityLayerValues = compatibilityLayerValue.ToUpper().Split(' ').ToList();
+                    }
+
+                    if (value != null) {
+                        values = value.ToUpper().Split(' ').ToList();
+                    }
+                    
+                    if (values.Except(compatibilityLayerValues).Any()) {
+                        throw new CompatibilityLayersException();
+                    }
                 }
             }
         }
@@ -81,7 +87,9 @@ public void Deactivate(string server) {
             }
 
             string value = null;
+            List<string> values = null;
             string compatibilityLayerValue = null;
+            List<string> compatibilityLayerValues = new List<string>();
 
             try {
                 compatibilityLayerValue = Environment.GetEnvironmentVariable(COMPATIBILITY_LAYER_NAME);
@@ -92,7 +100,7 @@ public void Deactivate(string server) {
             }
 
             if (compatibilityLayerValue != null) {
-                compatibilityLayerValue = compatibilityLayerValue.ToUpper();
+                compatibilityLayerValues = compatibilityLayerValue.ToUpper().Split(' ').ToList();
             }
 
             EnvironmentVariablesElement environmentVariablesElement = null;
@@ -105,15 +113,16 @@ public void Deactivate(string server) {
                 }
 
                 value = environmentVariablesElement.Value;
+                values = new List<string>();
 
                 if (value != null) {
-                    value = value.ToUpper();
+                    values = value.ToUpper().Split(' ').ToList();
                 }
 
                 // if this isn't the compatibility layer variable
                 // or the value isn't what we want to set it to
                 // or we're not in server mode...
-                if (environmentVariablesElement.Name != COMPATIBILITY_LAYER_NAME || value != compatibilityLayerValue && String.IsNullOrEmpty(server)) {
+                if (environmentVariablesElement.Name != COMPATIBILITY_LAYER_NAME || values.Except(compatibilityLayerValues).Any() || String.IsNullOrEmpty(server)) {
                     try {
                         Environment.SetEnvironmentVariable(environmentVariablesElement.Name, null);
                     } catch (ArgumentException) {

FlashpointSecurePlayer/Properties/AssemblyInfo.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.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
 [assembly: NeutralResourcesLanguage("en")]
 

FlashpointSecurePlayer/README.md

@@ -1,4 +1,4 @@
-# Flashpoint Secure Player 1.0.3
+# Flashpoint Secure Player 1.0.4
 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)

FlashpointSecurePlayer/RegistryBackups.cs

@@ -1348,7 +1348,7 @@ private void KCBStopped(RegistryTraceData registryTraceData) {
             // we want to take care of any queued registry timeline events
             // an event entails the date and time of the registry modification
             if (ModificationsQueue.ContainsKey(safeKeyHandle)) {
-                while (ModificationsQueue[safeKeyHandle].Count > 0) {
+                while (ModificationsQueue[safeKeyHandle].Any()) {
                     // get the first event
                     queuedModification = ModificationsQueue[safeKeyHandle].First();
 

FlashpointSecurePlayer/SingleInstance.cs

@@ -116,9 +116,9 @@ public void Activate(string name, string commandLine) {
                     processesByNameStrict = processesByName;
                 }
 
-                if (processesByNameStrict.Count > 0) {
+                if (processesByNameStrict.Any()) {
                     DialogResult? dialogResult = ShowClosableMessageBox(Task.Run(delegate () {
-                        while (processesByNameStrict.Count > 0) {
+                        while (processesByNameStrict.Any()) {
                             if (!processesByNameStrict[0].HasExited) {
                                 processesByNameStrict[0].WaitForExit();
                             }
@@ -132,7 +132,7 @@ public void Activate(string name, string commandLine) {
                         throw new InvalidModificationException();
                     }
                 }
-            } while (processesByNameStrict.Count > 0);
+            } while (processesByNameStrict.Any());
         }
     }
 }