minor fix to ActiveX Imports to properly handle Application Hives

Author: tomysshadow

FlashpointSecurePlayer/Properties/AssemblyInfo.cs

@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("BlueMaxima's Flashpoint")]
 [assembly: AssemblyProduct("Flashpoint Secure Player")]
-[assembly: AssemblyCopyright("Copyright © Anthony Kleine 2023")]
+[assembly: AssemblyCopyright("Copyright © Anthony Kleine 2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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("2.2.4.0")]
-[assembly: AssemblyFileVersion("2.2.4.0")]
+[assembly: AssemblyVersion("2.2.5.0")]
+[assembly: AssemblyFileVersion("2.2.5.0")]
 [assembly: NeutralResourcesLanguage("en")]
 

FlashpointSecurePlayer/README.md

@@ -1,4 +1,4 @@
-# Flashpoint Secure Player 2.2.4
+# Flashpoint Secure Player 2.2.5
 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/RegistryStates.cs

@@ -192,6 +192,8 @@ private string GetKeyValueNameFromKernelRegistryString(string kernelRegistryStri
                             keyValueName = "HKEY_CURRENT_USER\\" + keyValueName.Substring(keyValueNameCurrentUser.Length);
                         }
                     }
+                } else {
+                    return null;
                 }
             }
 
@@ -1559,17 +1561,25 @@ private void ModificationAdded(RegistryTraceData registryTraceData) {
             // KeyHandle is meant to be a uint32, so we discard the rest
             // http://learn.microsoft.com/en-us/windows/win32/etw/registry-typegroup1
             ulong safeKeyHandle = registryTraceData.KeyHandle & 0x00000000FFFFFFFF;
+            string keyName = null;
             string value = null;
             RegistryValueKind? valueKind = null;
             RegistryView registryView = modificationsElement.RegistryStates.BinaryType == BINARY_TYPE.SCS_64BIT_BINARY ? RegistryView.Registry64 : RegistryView.Registry32;
 
             if (safeKeyHandle == 0) {
                 // we don't need to queue it, we can just add the key right here
-                registryStateElement.KeyName = GetRedirectedKeyValueName(
+                keyName = GetRedirectedKeyValueName(
                     GetKeyValueNameFromKernelRegistryString(registryStateElement.KeyName),
                     modificationsElement.RegistryStates.BinaryType
                 );
 
+                // for keys that are not REGISTRY\MACHINE or REGISTRY\USER, ignore
+                if (keyName == null) {
+                    ModificationRemoved(registryTraceData);
+                    return;
+                }
+
+                registryStateElement.KeyName = keyName;
                 valueKind = null;
 
                 try {
@@ -1635,11 +1645,17 @@ private void ModificationAdded(RegistryTraceData registryTraceData) {
                 kcbModificationKeyNames.TryGetValue(safeKeyHandle, out string kcbModificationKeyName);
 
                 if (!String.IsNullOrEmpty(kcbModificationKeyName)) {
-                    registryStateElement.KeyName = GetRedirectedKeyValueName(
+                    keyName = GetRedirectedKeyValueName(
                         GetKeyValueNameFromKernelRegistryString(kcbModificationKeyName + "\\" + registryStateElement.KeyName),
                         modificationsElement.RegistryStates.BinaryType
                     );
 
+                    if (keyName == null) {
+                        ModificationRemoved(registryTraceData);
+                        return;
+                    }
+
+                    registryStateElement.KeyName = keyName;
                     valueKind = null;
 
                     try {
@@ -1821,6 +1837,7 @@ private void KCBStopped(RegistryTraceData registryTraceData) {
 
             // we'll be finding these in a second
             RegistryStateElement registryStateElement = null;
+            string keyName = null;
             string value = null;
             RegistryValueKind? valueKind = null;
 
@@ -1843,64 +1860,69 @@ private void KCBStopped(RegistryTraceData registryTraceData) {
                 for (int j = 0; j < registryStateElements.Count; j++) {
                     registryStateElement = registryStateElements[j];
 
-                    registryStateElement.KeyName = GetRedirectedKeyValueName(
+                    keyName = GetRedirectedKeyValueName(
                         GetKeyValueNameFromKernelRegistryString(registryTraceData.KeyName + "\\" + registryStateElement.KeyName),
                         modificationsElement.RegistryStates.BinaryType
                     );
 
-                    valueKind = null;
+                    if (keyName == null) {
+                        modificationsElement.RegistryStates.Remove(registryStateElement.Name);
+                    } else {
+                        registryStateElement.KeyName = keyName;
+                        valueKind = null;
 
-                    try {
-                        value = ReplaceStartupPathEnvironmentVariable(
-                            LengthenValue(
-                                GetValueInRegistryView(
-                                    registryStateElement.KeyName,
-                                    registryStateElement.ValueName,
-                                    out valueKind,
-                                    registryView
-                                ) as string,
+                        try {
+                            value = ReplaceStartupPathEnvironmentVariable(
+                                LengthenValue(
+                                    GetValueInRegistryView(
+                                        registryStateElement.KeyName,
+                                        registryStateElement.ValueName,
+                                        out valueKind,
+                                        registryView
+                                    ) as string,
+
+                                    fullPath,
+                                    pathNames
+                                ),
 
-                                fullPath,
                                 pathNames
-                            ),
-
-                            pathNames
-                        );
-                    } catch (SecurityException ex) {
-                        // value exists but we can't get it
-                        // this shouldn't happen because this task requires elevation
-                        LogExceptionToLauncher(ex);
-                        value = String.Empty;
-                    } catch (UnauthorizedAccessException ex) {
-                        // value exists but we can't get it
-                        // this shouldn't happen because this task requires elevation
-                        LogExceptionToLauncher(ex);
-                        value = String.Empty;
-                    } catch {
-                        // value doesn't exist
-                        value = null;
-                    }
+                            );
+                        } catch (SecurityException ex) {
+                            // value exists but we can't get it
+                            // this shouldn't happen because this task requires elevation
+                            LogExceptionToLauncher(ex);
+                            value = String.Empty;
+                        } catch (UnauthorizedAccessException ex) {
+                            // value exists but we can't get it
+                            // this shouldn't happen because this task requires elevation
+                            LogExceptionToLauncher(ex);
+                            value = String.Empty;
+                        } catch {
+                            // value doesn't exist
+                            value = null;
+                        }
 
-                    registryStateElement.Type = TYPE.VALUE;
-                    registryStateElement.ValueKind = valueKind;
+                        registryStateElement.Type = TYPE.VALUE;
+                        registryStateElement.ValueKind = valueKind;
 
-                    if (value == null) {
-                        try {
-                            if (String.IsNullOrEmpty(registryStateElement.ValueName)
-                                && String.IsNullOrEmpty(TestKeyDeletedInRegistryView(registryStateElement.KeyName, registryView))) {
-                                registryStateElement.Type = TYPE.KEY;
-                                modificationsElement.RegistryStates.Set(registryStateElement);
+                        if (value == null) {
+                            try {
+                                if (String.IsNullOrEmpty(registryStateElement.ValueName)
+                                    && String.IsNullOrEmpty(TestKeyDeletedInRegistryView(registryStateElement.KeyName, registryView))) {
+                                    registryStateElement.Type = TYPE.KEY;
+                                    modificationsElement.RegistryStates.Set(registryStateElement);
+                                }
+                            } catch {
+                                // fail silently
                             }
-                        } catch {
-                            // fail silently
-                        }
 
-                        if (registryStateElement.Type == TYPE.VALUE) {
-                            modificationsElement.RegistryStates.Remove(registryStateElement.Name);
+                            if (registryStateElement.Type == TYPE.VALUE) {
+                                modificationsElement.RegistryStates.Remove(registryStateElement.Name);
+                            }
+                        } else {
+                            registryStateElement.Value = value;
+                            modificationsElement.RegistryStates.Set(registryStateElement);
                         }
-                    } else {
-                        registryStateElement.Value = value;
-                        modificationsElement.RegistryStates.Set(registryStateElement);
                     }
                 }
             }