minor various cleanup

Author: tomysshadow

FlashpointSecurePlayer/EnvironmentVariables.cs

@@ -56,6 +56,10 @@ private string GetValue(EnvironmentVariablesElement environmentVariablesElement)
                 throw new InvalidEnvironmentVariablesException("Failed to get the \"" + environmentVariablesElement.Name + "\" Environment Variable.");
             }
 
+            if (value == null) {
+                return value;
+            }
+
             Regex regex = null;
 
             try {
@@ -71,8 +75,7 @@ private string GetValue(EnvironmentVariablesElement environmentVariablesElement)
                 LogExceptionToLauncher(ex);
                 throw new InvalidEnvironmentVariablesException("The Regex Match timed out.");
             } catch (Exception ex) {
-                // value was not defined
-                // fail silently
+                // match failed?
                 LogExceptionToLauncher(ex);
             }
             return value;

FlashpointSecurePlayer/FlashpointSecurePlayerGUI.cs

@@ -1350,7 +1350,9 @@ private void FlashpointSecurePlayer_Load(object sender, EventArgs e) {
                 }
 
                 if (ModificationsRevertMethod == MODIFICATIONS_REVERT_METHOD.DELETE_ALL) {
-                    if (MessageBox.Show(Properties.Resources.ForceDeleteAllWarning, Properties.Resources.FlashpointSecurePlayer, MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No) {
+                    DialogResult dialogResult = MessageBox.Show(Properties.Resources.ForceDeleteAllWarning, Properties.Resources.FlashpointSecurePlayer, MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
+
+                    if (dialogResult == DialogResult.No) {
                         ModificationsRevertMethod = MODIFICATIONS_REVERT_METHOD.CRASH_RECOVERY;
                         Application.Exit();
                         return;

FlashpointSecurePlayer/Shared.cs

@@ -2075,7 +2075,9 @@ public static bool TestInternetURI(Uri uri) {
 
             // the URI Scheme is always lowercase
             string scheme = uri.Scheme;
-            return scheme == URI_SCHEME_HTTP || scheme == URI_SCHEME_HTTPS || scheme == URI_SCHEME_FTP;
+            return scheme.Equals(URI_SCHEME_HTTP, StringComparison.Ordinal)
+                || scheme.Equals(URI_SCHEME_HTTPS, StringComparison.Ordinal)
+                || scheme.Equals(URI_SCHEME_FTP, StringComparison.Ordinal);
         }
 
         /*
@@ -2089,7 +2091,7 @@ public static StringBuilder GetWindowsVersionName(bool edition = false, bool ser
                     versionName.Append("95");
                     break;
                     case 10:
-                    if (operatingSystem.Version.Revision.ToString() == "2222A") {
+                    if (operatingSystem.Version.Revision.ToString().Equals("2222A", StringComparison.Ordinal)) {
                         versionName.Append("98 SE");
                     } else {
                         versionName.Append("98");