Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@ivanpmartell
ivanpmartell committed Aug 29, 2024
1 parent ae582ce commit 7ea279a
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 67 deletions.
27 changes: 11 additions & 16 deletions LittleWarGameClient/Handlers/AudioHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace LittleWarGameClient.Handlers
{
internal class AudioHandler : IAudioSessionEventsHandler
{
private MMDevice? mainDevice;
private readonly MMDevice? mainDevice;
private AudioSessionControl? currentSession;
private readonly string formTitle;

Expand Down Expand Up @@ -89,34 +89,29 @@ private void ChangeTextAndIcon(AudioSessionControl session)

private void AudioSessionManager_OnSessionCreated(object sender, IAudioSessionControl newSession)
{
AudioSessionControl managedControl = new AudioSessionControl(newSession);
AudioSessionControl managedControl = new(newSession);
ChangeTextAndIcon(managedControl);
}

private Process? GetParentProcess(Process process)
{
try
{
using (var query = new ManagementObjectSearcher(
using var query = new ManagementObjectSearcher(
"SELECT * " +
"FROM Win32_Process " +
"WHERE ProcessId=" + process.Id))
"WHERE ProcessId=" + process.Id);
using var processes = query.Get();
var filteredProcesses = processes.OfType<ManagementObject>().FirstOrDefault();
if (filteredProcesses != null)
{
using (var collection = query.Get())
using (filteredProcesses)
{
var mo = collection.OfType<ManagementObject>().FirstOrDefault();
if (mo != null)
{
using (mo)
{
var p = Process.GetProcessById((int)(uint)mo["ParentProcessId"]);
return p;
}
}

var p = Process.GetProcessById((int)(uint)filteredProcesses["ParentProcessId"]);
return p;
}
return null;
}
return null;
}
catch
{
Expand Down
7 changes: 3 additions & 4 deletions LittleWarGameClient/Handlers/SettingsHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,8 @@ internal async Task SaveAsync()
{
try
{
using (FileStream stream = new FileStream(fileName, FileMode.Create, FileAccess.Write, FileShare.None, 4096, true))
{
await settings.SaveToAsync(stream);
}
using FileStream stream = new(fileName, FileMode.Create, FileAccess.Write, FileShare.None, 4096, true);
await settings.SaveToAsync(stream);
}
catch
{
Expand Down Expand Up @@ -212,6 +210,7 @@ public double GetVolume()
}
}

[AttributeUsage(AttributeTargets.Method)]
internal class Hotkey : Attribute
{
public string? FuncToCall { get; set; }
Expand Down
18 changes: 9 additions & 9 deletions LittleWarGameClient/OverlayForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

namespace LittleWarGameClient
{
internal struct Notification
internal readonly record struct Notification
{
internal string message { get; }
internal DateTime postedTime { get; }
internal string Message { get; }
internal DateTime PostedTime { get; }

internal Notification(string msg)
{
this.message = msg;
this.postedTime = DateTime.Now;
Message = msg;
PostedTime = DateTime.Now;
}
}

Expand All @@ -32,10 +32,10 @@ internal static OverlayForm Instance
}

private bool IsGameFormLoaded = false;
private BDictionary<string, Notification> overlayMessages;
private readonly BDictionary<string, Notification> overlayMessages;
internal void AddOverlayMessage(string name, Notification notification)
{
overlayMessages[name] = new Notification(notification.message);
overlayMessages[name] = new Notification(notification.Message);
}

internal bool IsActivated { get; private set; }
Expand Down Expand Up @@ -64,7 +64,7 @@ protected override void OnRender(D2DGraphics g)
var overlayMessageValue = overlayMessages.TryGet(i);
if (overlayMessageValue.HasValue)
{
var notification = overlayMessageValue.Value.Value.message;
var notification = overlayMessageValue.Value.Value.Message;
g.DrawText($" >{notification}", D2DColor.Yellow, Font, 0, (i + 1) * 30);
}
}
Expand All @@ -74,7 +74,7 @@ private void textTimer_Tick(object sender, EventArgs e)
{
for (int i = 0; i < overlayMessages.Count; i++)
{
if (overlayMessages[i].Value.postedTime.AddSeconds(6) < DateTime.Now)
if (overlayMessages[i].Value.PostedTime.AddSeconds(6) < DateTime.Now)
overlayMessages.RemoveAt(i);
}
}
Expand Down
72 changes: 34 additions & 38 deletions LittleWarGameClient/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@ namespace LittleWarGameClient
internal static class Program
{
[DllImport("user32.dll")]
[return: MarshalAs(UnmanagedType.Bool)]
private static extern bool SetForegroundWindow(IntPtr hWnd);
[DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
private static extern void SetForegroundWindow(IntPtr hWnd);

[DllImport("User32.dll")]
[return: MarshalAs(UnmanagedType.Bool)]
private static extern bool EnumWindows(CallBackPtr lpEnumFunc, IntPtr lParam);
[DllImport("user32.dll")]
private static extern void GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);

[DllImport("user32.dll")]
private static extern void EnumWindows(CallBackPtr lpEnumFunc, IntPtr lParam);

private delegate bool CallBackPtr(IntPtr hwnd, int lParam);

private static CallBackPtr callBackPtr = Callback;
private static List<WinStruct> _WinStructList = new List<WinStruct>();
private static readonly CallBackPtr callBackPtr = Callback;
private static List<WinStruct> _WinStructList = new();

internal static bool IsDoubleInstance = false;

Expand All @@ -30,42 +29,38 @@ internal static class Program
static void Main()
{
var args = ParseArguments(Environment.GetCommandLineArgs()[1..]);
Thread splashthread = new Thread(() =>
Thread splashthread = new(() =>
{
SplashScreen.Instance.ShowDialog();
});
splashthread.IsBackground = true;
splashthread.SetApartmentState(ApartmentState.STA);
splashthread.Start();
bool createdNew = true;
string? profileName;
if (!args.TryGetValue("profile", out profileName))
if (!args.TryGetValue("profile", out string? profileName))
profileName = "main";
using (Mutex mutex = new Mutex(true, $"Global\\LittleWarGameClient_{profileName}", out createdNew))
using Mutex mutex = new(true, $"Global\\LittleWarGameClient_{profileName}", out bool createdNew);
if (createdNew)
{
if (createdNew)
{
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
GameForm.InstanceName = profileName;
ApplicationConfiguration.Initialize();
Application.Run(OverlayForm.Instance);
}
else
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
GameForm.InstanceName = profileName;
ApplicationConfiguration.Initialize();
Application.Run(OverlayForm.Instance);
}
else
{
IsDoubleInstance = true;
Process current = Process.GetCurrentProcess();
foreach (Process process in Process.GetProcessesByName(current.ProcessName))
{
IsDoubleInstance = true;
Process current = Process.GetCurrentProcess();
foreach (Process process in Process.GetProcessesByName(current.ProcessName))
if (process.Id != current.Id)
{
if (process.Id != current.Id)
var clientWindows = GetWindows(process.Handle).Where(window => window.WinTitle == $"Littlewargame({profileName})");
if (clientWindows.Any())
{
var clientWindows = GetWindows(process.Handle).Where(window => window.WinTitle == $"Littlewargame({profileName})");
if (clientWindows.Count() > 0)
{
var clientMainWindow = clientWindows.First();
SetForegroundWindow(clientMainWindow.MainWindowHandle);
break;
}
var clientMainWindow = clientWindows.First();
SetForegroundWindow(clientMainWindow.MainWindowHandle);
break;
}
}
}
Expand All @@ -75,7 +70,7 @@ static void Main()
private static Dictionary<string, string> ParseArguments(string[] args)
{
args = Array.ConvertAll(args, d => d.ToLower());
Dictionary<string, string> arguments = new Dictionary<string, string>();
Dictionary<string, string> arguments = new();

for (int i = 0; i < args.Length; i += 2)
{
Expand All @@ -92,9 +87,10 @@ private static Dictionary<string, string> ParseArguments(string[] args)

private static bool Callback(IntPtr hWnd, int lparam)
{
StringBuilder sb = new StringBuilder(256);
int res = GetWindowText(hWnd, sb, 256);
_WinStructList.Add(new WinStruct { MainWindowHandle = hWnd, WinTitle = sb.ToString() });
StringBuilder sb = new(256);
GetWindowText(hWnd, sb, 256);
if (sb.Length > 0)
_WinStructList.Add(new WinStruct { MainWindowHandle = hWnd, WinTitle = sb.ToString() });
return true;
}

Expand Down

0 comments on commit 7ea279a

Please sign in to comment.