progress bar turns red when there's an error now

Author: tomysshadow

FlashpointSecurePlayer/FlashpointSecurePlayer.Designer.cs

@@ -47,14 +47,15 @@ public FlashpointSecurePlayer() {
         }
 
         private void ResetProgressBar() {
-            registryBackupProgressBar.Style = ProgressBarStyle.Blocks;
-            registryBackupProgressBar.Value = 0;
-            SetProgressBarState(registryBackupProgressBar, PBST_NORMAL);
-            registryBackupProgressBar.Style = ProgressBarStyle.Continuous;
+            securePlaybackProgressBar.Style = ProgressBarStyle.Blocks;
+            securePlaybackProgressBar.Value = 0;
+            securePlaybackProgressBar.Style = ProgressBarStyle.Continuous;
+            SetProgressBarState(securePlaybackProgressBar, PBST_NORMAL);
         }
 
         private void ShowOutput() {
-            SetProgressBarState(registryBackupProgressBar, PBST_NORMAL);
+            securePlaybackProgressBar.Style = ProgressBarStyle.Continuous;
+            SetProgressBarState(securePlaybackProgressBar, PBST_NORMAL);
         }
 
         private void ShowOutput(string errorLabelText) {
@@ -64,8 +65,9 @@ private void ShowOutput(string errorLabelText) {
 
         private void ShowError() {
             // TODO: why won't the progress bar change colour
-            SetProgressBarState(registryBackupProgressBar, PBST_ERROR);
-            registryBackupProgressBar.Value = 100;
+            securePlaybackProgressBar.Style = ProgressBarStyle.Continuous;
+            securePlaybackProgressBar.Value = 100;
+            SetProgressBarState(securePlaybackProgressBar, PBST_ERROR);
         }
 
         private void ShowError(string errorLabelText) {
@@ -117,7 +119,7 @@ private async Task ActivateModificationsAsync(string commandLine, ErrorDelegate
                 ModificationsElement modificationsElement = null;
 
                 try {
-                    modificationsElement = GetModificationsElement(true, ModificationsName);
+                    modificationsElement = GetModificationsElement(false, ModificationsName);
                 } catch (System.Configuration.ConfigurationErrorsException) {
                     errorDelegate(Properties.Resources.ConfigurationFailedLoad);
                 }
@@ -251,9 +253,8 @@ private async Task DeactivateModificationsAsync(ErrorDelegate errorDelegate) {
 
                     if (activeModificationsElement != null) {
                         activeModificationsElement.Active = ACTIVE_EXE_CONFIGURATION_NAME;
+                        SetFlashpointSecurePlayerSection(ACTIVE_EXE_CONFIGURATION_NAME);
                     }
-
-                    SetFlashpointSecurePlayerSection(ModificationsName);
                 } catch (System.Configuration.ConfigurationErrorsException) {
                     errorDelegate(Properties.Resources.ConfigurationFailedLoad);
                 }
@@ -304,7 +305,7 @@ private async Task StartSecurePlayback() {
                     return;
                 }
 
-                registryBackupProgressBar.Value = 17;
+                securePlaybackProgressBar.Value = 17;
 
                 // next, uninstall the control
                 // in case it was already installed before this whole process
@@ -317,7 +318,7 @@ private async Task StartSecurePlayback() {
                     return;
                 }
 
-                registryBackupProgressBar.Value = 33;
+                securePlaybackProgressBar.Value = 33;
 
                 try {
                     await RegistryBackup.StartImportAsync(ModificationsName, binaryType).ConfigureAwait(true);
@@ -340,7 +341,7 @@ private async Task StartSecurePlayback() {
                     return;
                 }
 
-                registryBackupProgressBar.Value = 50;
+                securePlaybackProgressBar.Value = 50;
 
                 // a registry backup is running, install the control
                 try {
@@ -350,7 +351,7 @@ private async Task StartSecurePlayback() {
                     return;
                 }
 
-                registryBackupProgressBar.Value = 67;
+                securePlaybackProgressBar.Value = 67;
 
                 try {
                     await RegistryBackup.StopImportAsync().ConfigureAwait(true);
@@ -366,7 +367,7 @@ private async Task StartSecurePlayback() {
                     return;
                 }
 
-                registryBackupProgressBar.Value = 83;
+                securePlaybackProgressBar.Value = 83;
 
                 // the registry backup is stopped, uninstall the control
                 // this will leave the control uninstalled on the system
@@ -379,7 +380,7 @@ private async Task StartSecurePlayback() {
                     return;
                 }
 
-                registryBackupProgressBar.Value = 100;
+                securePlaybackProgressBar.Value = 100;
                 ShowOutput(Properties.Resources.RegistryBackupWasSuccessful);
                 return;
             } else if (!String.IsNullOrEmpty(Server)) {
@@ -404,7 +405,7 @@ await ActivateModificationsAsync(null, delegate (string text) {
 
                 Server serverForm = new Server(new Uri(Server));
 
-                registryBackupProgressBar.Value = 100;
+                securePlaybackProgressBar.Value = 100;
                 Hide();
                 serverForm.Show();
                 return;
@@ -428,7 +429,7 @@ await ActivateModificationsAsync(Software, delegate (string text) {
                     return;
                 }
 
-                registryBackupProgressBar.Value = 50;
+                securePlaybackProgressBar.Value = 50;
 
                 try {
                     // default to zero in case of error
@@ -457,7 +458,7 @@ await ActivateModificationsAsync(Software, delegate (string text) {
                         return;
                     }
 
-                    registryBackupProgressBar.Value = 100;
+                    securePlaybackProgressBar.Value = 100;
                     Hide();
 
                     if (!process.HasExited) {

FlashpointSecurePlayer/FlashpointSecurePlayer.cs

@@ -96,10 +96,10 @@ public enum BINARY_TYPE : uint {
         [DllImport("KERNEL32.DLL")]
         public static extern bool GetBinaryType(string applicationNamePointer, out BINARY_TYPE binaryTypePointer);
 
-        public const int PBM_SETSTATE = 0x0410;
-        public static readonly IntPtr PBST_NORMAL = (IntPtr)0;
-        public static readonly IntPtr PBST_ERROR = (IntPtr)1;
-        public static readonly IntPtr PBST_PAUSED = (IntPtr)2;
+        public const uint PBM_SETSTATE = 0x0410;
+        public static readonly IntPtr PBST_NORMAL = (IntPtr)1;
+        public static readonly IntPtr PBST_ERROR = (IntPtr)2;
+        public static readonly IntPtr PBST_PAUSED = (IntPtr)3;
 
         [DllImport("USER32.DLL", CharSet = CharSet.Auto, SetLastError = false)]
         public static extern IntPtr SendMessage(IntPtr windowHandle, uint message, IntPtr wParam, IntPtr lParam);
@@ -901,7 +901,7 @@ private static Configuration GetActiveEXEConfiguration() {
         }
 
         // where should ConfigurationErrorsExceptions all be caught? Review this
-        private static Configuration GetEXEConfiguration(string name) {
+        private static Configuration GetEXEConfiguration(bool create, string name) {
             // active
             if (String.IsNullOrEmpty(name)) {
                 return GetActiveEXEConfiguration();
@@ -957,12 +957,22 @@ private static Configuration GetEXEConfiguration(string name) {
                 }
             }
 
-            EXEConfiguration = exeConfiguration ?? throw new ConfigurationErrorsException();
+            if (exeConfiguration == null) {
+                throw new ConfigurationErrorsException();
+            }
+
+            if (!create) {
+                if (!exeConfiguration.HasFile) {
+                    throw new ConfigurationErrorsException();
+                }
+            }
+
+            EXEConfiguration = exeConfiguration;
             EXEConfigurationName = name;
             return EXEConfiguration;
         }
 
-        public static FlashpointSecurePlayerSection GetFlashpointSecurePlayerSection(string exeConfigurationName) {
+        public static FlashpointSecurePlayerSection GetFlashpointSecurePlayerSection(bool create, string exeConfigurationName) {
             FlashpointSecurePlayerSection flashpointSecurePlayerSection = null;
             Configuration exeConfiguration = null;
 
@@ -977,7 +987,7 @@ public static FlashpointSecurePlayerSection GetFlashpointSecurePlayerSection(str
                     return Shared.flashpointSecurePlayerSection;
                 }
 
-                exeConfiguration = GetEXEConfiguration(exeConfigurationName);
+                exeConfiguration = GetEXEConfiguration(create, exeConfigurationName);
             }
 
             try {
@@ -1021,7 +1031,7 @@ public static void SetFlashpointSecurePlayerSection(string exeConfigurationName)
             activeEXEConfiguration.Save(ConfigurationSaveMode.Modified);
 
             if (!String.IsNullOrEmpty(exeConfigurationName)) {
-                Configuration exeConfiguration = GetEXEConfiguration(exeConfigurationName);
+                Configuration exeConfiguration = GetEXEConfiguration(true, exeConfigurationName);
                 exeConfiguration.Save(ConfigurationSaveMode.Modified);
             }
 
@@ -1031,7 +1041,7 @@ public static void SetFlashpointSecurePlayerSection(string exeConfigurationName)
         // does not save!
         public static FlashpointSecurePlayerSection.ModificationsElementCollection.ModificationsElement GetModificationsElement(bool createModificationsElement, string exeConfigurationName) {
             // need the section to operate on
-            FlashpointSecurePlayerSection flashpointSecurePlayerSection = GetFlashpointSecurePlayerSection(exeConfigurationName);
+            FlashpointSecurePlayerSection flashpointSecurePlayerSection = GetFlashpointSecurePlayerSection(createModificationsElement, exeConfigurationName);
             // get the element
             FlashpointSecurePlayerSection.ModificationsElementCollection.ModificationsElement modificationsElement = flashpointSecurePlayerSection.Modifications.Get(exeConfigurationName) as FlashpointSecurePlayerSection.ModificationsElementCollection.ModificationsElement;
 
@@ -1063,7 +1073,7 @@ public static FlashpointSecurePlayerSection.ModificationsElementCollection.Modif
         // does not save!
         public static void SetModificationsElement(FlashpointSecurePlayerSection.ModificationsElementCollection.ModificationsElement modificationsElement, string exeConfigurationName) {
             // need the section to operate on
-            FlashpointSecurePlayerSection flashpointSecurePlayerSection = GetFlashpointSecurePlayerSection(exeConfigurationName);
+            FlashpointSecurePlayerSection flashpointSecurePlayerSection = GetFlashpointSecurePlayerSection(true, exeConfigurationName);
             // set it, and forget it
             // it gets replaced if it existed already
             flashpointSecurePlayerSection.Modifications.Set(modificationsElement);

FlashpointSecurePlayer/Program.cs

@@ -131,7 +131,7 @@ Please ensure Flashpoint is not corrupted, was extracted correctly, and is not r
     <value>Connection could not be established with the remote host.</value>
   </data>
   <data name="CurationMissingModificationName" xml:space="preserve">
-    <value>This curation is missing a modification name. If you are not a curator, please report this bug.</value>
+    <value>This curation is missing a modification name.</value>
   </data>
   <data name="EnvironmentVariablesFailed" xml:space="preserve">
     <value>The Environment Variables failed.</value>

FlashpointSecurePlayer/Properties/Resources.Designer.cs

@@ -352,10 +352,10 @@ You may notice that because the Flashpoint Secure Player is effectively capable
  - Currently, ActiveX Controls will be disabled if they are set to be disabled in Internet Options. The previous ActiveX implementation also had this issue, but I will be looking into the possibility of working around this.
  - 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?
 
 # <a name="known-issues"></a>Known Issues
- - The progress bar is intended to become red when an error occurs, but it does not.
  - The compatibility layers have no effect when using Server Mode.
 
 # Questions And Answers