Skip to content

Commit

Permalink
additional invariant culture checks for lower case
Browse files Browse the repository at this point in the history
  • Loading branch information
Orbmu2k committed Mar 26, 2023
1 parent 70c63b1 commit 3c74a9b
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion nspector/Common/DrsDecrypterService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void DecryptSettingIfNeeded(string profileName, ref NVDRS_SETTING setting

private string FormatInternalSettingKey(string profileName, uint settingId)
{
return profileName + settingId.ToString("X8").ToLower();
return profileName + settingId.ToString("X8").ToLowerInvariant();
}

public bool IsInternalSetting(string profileName, uint settingId)
Expand Down
4 changes: 2 additions & 2 deletions nspector/Common/DrsScannerService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ private void AddScannedSettingToCache(NVDRS_PROFILE profile, NVDRS_SETTING setti

public string FindProfilesUsingApplication(string applicationName)
{
string lowerApplicationName = applicationName.ToLower();
string lowerApplicationName = applicationName.ToLowerInvariant();
string tmpfile = TempFile.GetTempFileName();

try
Expand All @@ -219,7 +219,7 @@ public string FindProfilesUsingApplication(string applicationName)
string scope = m.Result("${scope}");
foreach (Match ms in Regex.Matches(scope, "Executable\\s\\\"(?<app>.*?)\\\"", RegexOptions.Singleline))
{
if (ms.Result("${app}").ToLower() == lowerApplicationName)
if (ms.Result("${app}").ToLowerInvariant() == lowerApplicationName)
{
matchingProfiles.Add(m.Result("${profile}"));
}
Expand Down
2 changes: 1 addition & 1 deletion nspector/Common/DrsUtil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static string GetDwordString(uint dword)
public static uint ParseDwordByInputSafe(string input)
{
uint result = 0;
if (input.ToLower().StartsWith("0x"))
if (input.ToLowerInvariant().StartsWith("0x"))
{
try
{
Expand Down
6 changes: 3 additions & 3 deletions nspector/Common/Helper/ShortcutResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static string ResolveExecuteable(string filename, out string profileName)

try
{
switch (fileInfo.Extension.ToLower())
switch (fileInfo.Extension.ToLowerInvariant())
{
case ".lnk": return ResolveFromShellLinkFile(fileInfo.FullName);
case ".url": return ResolveFromUrlFile(fileInfo.FullName);
Expand All @@ -54,7 +54,7 @@ private static string ResolveFromShellLinkFile(string filename)
}

var targetInfo = new FileInfo(shellLink.Target);
if (targetInfo.Name.ToLower() == SteamAppResolver.SteamExeName)
if (targetInfo.Name.ToLowerInvariant() == SteamAppResolver.SteamExeName)
{
if (shellLink.Arguments.Contains(SteamAppResolver.SteamArgumentPattern))
{
Expand All @@ -63,7 +63,7 @@ private static string ResolveFromShellLinkFile(string filename)
}
}

if (targetInfo.Extension.ToLower().Equals(".exe"))
if (targetInfo.Extension.ToLowerInvariant().Equals(".exe"))
{
return targetInfo.Name;
}
Expand Down
2 changes: 1 addition & 1 deletion nspector/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ static void Main(string[] args)
if (argFileIndex != -1)
{

if (new FileInfo(args[argFileIndex]).Extension.ToLower() == ".nip")
if (new FileInfo(args[argFileIndex]).Extension.ToLowerInvariant() == ".nip")
{
try
{
Expand Down
2 changes: 1 addition & 1 deletion nspector/frmBitEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private void SplitBitsFromUnknownSettings()
{
for (int f = 0; f < filters.Length; f++)
{
if (settingProfileNames[p].ToLower().Contains(filters[f].ToLower()))
if (settingProfileNames[p].ToLowerInvariant().Contains(filters[f].ToLower()))
{
profileNames += settingProfileNames[p] + ",";
}
Expand Down
6 changes: 3 additions & 3 deletions nspector/frmDrvSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,7 @@ private void lvSettings_OnDropFilesNative(string[] files)
if (files.Length == 1)
{
var fileInfo = new FileInfo(files[0]);
if (fileInfo.Extension.ToLower().Equals(".nip"))
if (fileInfo.Extension.ToLowerInvariant().Equals(".nip"))
{
ImportProfiles(fileInfo.FullName);
return;
Expand Down Expand Up @@ -1295,11 +1295,11 @@ private void SearchSetting()
string inputString = "";
if (InputBox.Show("Search Setting", "Please enter setting name:", ref inputString, new List<string>(), "", 2048) == System.Windows.Forms.DialogResult.OK)
{
var lowerInput = inputString.Trim().ToLower();
var lowerInput = inputString.Trim().ToLowerInvariant();
lvSettings.BeginUpdate();
foreach(ListViewItem itm in lvSettings.Items)
{
if (!itm.Text.ToLower().Contains(lowerInput))
if (!itm.Text.ToLowerInvariant().Contains(lowerInput))
{
itm.Remove();
}
Expand Down

0 comments on commit 3c74a9b

Please sign in to comment.