more logging

Author: tomysshadow

FlashpointSecurePlayer/EnvironmentVariables.cs

@@ -61,17 +61,20 @@ private string GetValue(EnvironmentVariablesElement environmentVariablesElement)
 
             try {
                 regex = new Regex(environmentVariablesElement.Find);
-            } catch (ArgumentException) {
+            } catch (Exception ex) {
+                LogExceptionToLauncher(ex);
                 throw new InvalidEnvironmentVariablesException("The Regex Pattern \"" + environmentVariablesElement.Find + "\" is invalid.");
             }
 
             try {
                 value = regex.Replace(value, environmentVariablesElement.Replace);
-            } catch (ArgumentNullException) {
+            } catch (RegexMatchTimeoutException ex) {
+                LogExceptionToLauncher(ex);
+                throw new InvalidEnvironmentVariablesException("The Regex Match timed out.");
+            } catch (Exception ex) {
                 // value was not defined
                 // fail silently
-            } catch (RegexMatchTimeoutException) {
-                throw new InvalidEnvironmentVariablesException("The Regex Match timed out.");
+                LogExceptionToLauncher(ex);
             }
             return value;
         }

FlashpointSecurePlayer/Shared.cs

@@ -2249,12 +2249,15 @@ public static async Task<Uri> DownloadAsync(string name) {
                 }
             } catch (Exceptions.DownloadFailedException) {
                 throw;
-            } catch (ArgumentException) {
-                throw new Exceptions.DownloadFailedException("The download failed because the download name \"" + name + "\" is invalid.");
-            } catch (HttpRequestException) {
+            } catch (HttpRequestException ex) {
+                Exceptions.LogExceptionToLauncher(ex);
                 throw new Exceptions.DownloadFailedException("The download failed because the HTTP Request is invalid.");
-            } catch (InvalidOperationException) {
+            } catch (InvalidOperationException ex) {
+                Exceptions.LogExceptionToLauncher(ex);
                 throw new Exceptions.DownloadFailedException("The download failed because the address \"" + name + "\" was not understood.");
+            } catch (Exception ex) {
+                Exceptions.LogExceptionToLauncher(ex);
+                throw new Exceptions.DownloadFailedException("The download failed because the download name \"" + name + "\" is invalid.");
             } finally {
                 downloadSemaphoreSlim.Release();
             }
@@ -2364,10 +2367,12 @@ private static Configuration GetEXEConfiguration(bool create, string name) {
                     //throw new ConfigurationErrorsException("The EXE Configuration failed to download.");
                 } catch (ConfigurationErrorsException) {
                     // fail silently
-                } catch (IOException) {
+                } catch (IOException ex2) {
+                    Exceptions.LogExceptionToLauncher(ex2);
                     throw new ConfigurationErrorsException("The EXE Configuration is in use.");
                 }
-            } catch (IOException) {
+            } catch (IOException ex2) {
+                Exceptions.LogExceptionToLauncher(ex2);
                 throw new ConfigurationErrorsException("The EXE Configuration is in use.");
             }