change PathNames to be non-static

Author: tomysshadow

FlashpointSecurePlayer/RegistryStates.cs

@@ -56,9 +56,12 @@ public enum TYPE {
         private const int IMPORT_TIMEOUT = 60;
         private const string IMPORT_RESUME = "FLASHPOINTSECUREPLAYERREGISTRYSTATEIMPORTRESUME";
         private const string IMPORT_PAUSE = "FLASHPOINTSECUREPLAYERREGISTRYSTATEIMPORTPAUSE";
+
         private readonly object activationLock = new object();
         private readonly object deactivationLock = new object();
+
         private string fullPath = null;
+        private PathNames pathNames = null;
         private EventWaitHandle resumeEventWaitHandle = new ManualResetEvent(false);
         private Dictionary<ulong, SortedList<DateTime, RegistryStateElement>> modificationsQueue = null;
         private Dictionary<ulong, string> kcbModificationKeyNames = null;
@@ -770,6 +773,7 @@ public async Task StartImportAsync(string templateName, BINARY_TYPE binaryType)
 
             try {
                 modificationsElement.RegistryStates.BinaryType = binaryType;
+                pathNames = new PathNames();
                 resumeEventWaitHandle.Reset();
                 modificationsQueue = new Dictionary<ulong, SortedList<DateTime, RegistryStateElement>>();
                 kcbModificationKeyNames = new Dictionary<ulong, string>();
@@ -824,9 +828,11 @@ public async Task StartImportAsync(string templateName, BINARY_TYPE binaryType)
                 } catch {
                     kernelSession.Dispose();
                     kernelSession = null;
+                    pathNames = null;
                     ImportStarted = false;
                 }
             } catch {
+                pathNames = null;
                 ImportStarted = false;
             }
         }
@@ -878,6 +884,7 @@ private async Task StopImportAsync(bool sync) {
             } finally {
                 kernelSession.Dispose();
                 kernelSession = null;
+                pathNames = null;
                 ImportStarted = false;
             }
         }
@@ -1376,7 +1383,7 @@ private void ModificationAdded(RegistryTraceData registryTraceData) {
                 value = null;
 
                 try {
-                    value = ReplaceStartupPathEnvironmentVariable(LengthenValue(GetValueInRegistryView(registryStateElement.KeyName, registryStateElement.ValueName, registryView), fullPath));
+                    value = ReplaceStartupPathEnvironmentVariable(LengthenValue(GetValueInRegistryView(registryStateElement.KeyName, registryStateElement.ValueName, registryView), fullPath, pathNames), pathNames);
                 } catch (ArgumentException) {
                     // value doesn't exist
                     value = null;
@@ -1416,7 +1423,7 @@ private void ModificationAdded(RegistryTraceData registryTraceData) {
                 value = null;
 
                 try {
-                    value = ReplaceStartupPathEnvironmentVariable(LengthenValue(GetValueInRegistryView(registryStateElement.KeyName, registryStateElement.ValueName, registryView), fullPath));
+                    value = ReplaceStartupPathEnvironmentVariable(LengthenValue(GetValueInRegistryView(registryStateElement.KeyName, registryStateElement.ValueName, registryView), fullPath, pathNames), pathNames);
                 } catch {
                     // we have permission to access the key at this point so this must not be important
                 }
@@ -1591,7 +1598,7 @@ private void KCBStopped(RegistryTraceData registryTraceData) {
 
                     // value
                     try {
-                        value = ReplaceStartupPathEnvironmentVariable(LengthenValue(GetValueInRegistryView(registryStateElement.KeyName, registryStateElement.ValueName, registryView), fullPath));
+                        value = ReplaceStartupPathEnvironmentVariable(LengthenValue(GetValueInRegistryView(registryStateElement.KeyName, registryStateElement.ValueName, registryView), fullPath, pathNames), pathNames);
                     } catch (ArgumentException) {
                         // value doesn't exist
                         value = null;

FlashpointSecurePlayer/Shared.cs

@@ -1933,7 +1933,7 @@ private static Configuration ActiveEXEConfiguration {
             }
         }
 
-        private static class PathNames {
+        public class PathNames {
             public class PathNamesShort {
                 private readonly Dictionary<string, string> pathNamesShort = new Dictionary<string, string>();
 
@@ -1976,8 +1976,8 @@ public string this[string shortPath] {
                 }
             }
 
-            public static PathNamesShort Short { get; } = new PathNamesShort();
-            public static PathNamesLong Long { get; } = new PathNamesLong();
+            public PathNamesShort Short { get; } = new PathNamesShort();
+            public PathNamesLong Long { get; } = new PathNamesLong();
         }
 
         private const string URI_SCHEME_HTTP = "http";
@@ -2797,7 +2797,7 @@ public static string RemoveTrailingSlash(string path) {
             //return path.TrimEnd('\\');
         }
 
-        public static object LengthenValue(object value, string path) {
+        public static object LengthenValue(object value, string path, PathNames pathNames) {
             // since it's a value we'll just check it exists
             if (!(value is string valueString)) {
                 return value;
@@ -2815,8 +2815,14 @@ public static object LengthenValue(object value, string path) {
                 return value;
             }
 
+            if (pathNames == null
+                || pathNames.Short == null
+                || pathNames.Long == null) {
+                pathNames = new PathNames();
+            }
+
             // get the short path
-            string shortPathName = PathNames.Short[path];
+            string shortPathName = pathNames.Short[path];
 
             if (String.IsNullOrEmpty(shortPathName)) {
                 return value;
@@ -2828,7 +2834,7 @@ public static object LengthenValue(object value, string path) {
             }
 
             // get the long path
-            string longPathName = PathNames.Long[path];
+            string longPathName = pathNames.Long[path];
 
             if (String.IsNullOrEmpty(longPathName)) {
                 return value;
@@ -2839,7 +2845,7 @@ public static object LengthenValue(object value, string path) {
 
         // find path in registry value
         // string must begin with path
-        public static object ReplaceStartupPathEnvironmentVariable(object lengthenedValue) {
+        public static object ReplaceStartupPathEnvironmentVariable(object lengthenedValue, PathNames pathNames) {
             // since it's a value we'll just check it exists
             if (!(lengthenedValue is string lengthenedValueString)) {
                 return lengthenedValue;
@@ -2852,8 +2858,13 @@ public static object ReplaceStartupPathEnvironmentVariable(object lengthenedValu
             if (lengthenedValueString.Length > MAX_PATH + MAX_PATH + FP_STARTUP_PATH.Length) {
                 return lengthenedValue;
             }
-            
-            string longStartupPathName = PathNames.Long[Application.StartupPath];
+
+            if (pathNames == null
+                || pathNames.Long == null) {
+                pathNames = new PathNames();
+            }
+
+            string longStartupPathName = pathNames.Long[Application.StartupPath];
 
             if (String.IsNullOrEmpty(longStartupPathName)) {
                 return lengthenedValue;