2
0

Remove batch file creation to reduce AV false positives
Some checks failed
Build and Release / build (push) Has been cancelled
Build / build (push) Has been cancelled

- Refactored all process execution to use direct exe calls
- Added ExecuteExeAsync method for direct process execution
- Removed dynamic .bat file creation that triggered Wacatac detection
- All commands now run ControlMyMonitor.exe directly with arguments

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
2026-01-10 02:29:16 -05:00
parent 89c922c265
commit 0c860d19ea
3 changed files with 67 additions and 28 deletions

View File

@@ -15,9 +15,9 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Version>1.1.0</Version> <Version>1.1.1</Version>
<AssemblyVersion>1.1.0.0</AssemblyVersion> <AssemblyVersion>1.1.1.0</AssemblyVersion>
<FileVersion>1.1.0.0</FileVersion> <FileVersion>1.1.1.0</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -41,6 +41,46 @@ internal class ConsoleHelper
return await readTask; return await readTask;
} }
/// <summary>
/// Execute an exe directly with arguments (no cmd.exe or batch file wrapper)
/// </summary>
public static async Task<(string Output, int ExitCode)> ExecuteExeAsync(string exePath, string arguments, int timeoutMs = 5000)
{
var p = new Process
{
StartInfo = new ProcessStartInfo
{
FileName = exePath,
Arguments = arguments,
UseShellExecute = false,
CreateNoWindow = true,
RedirectStandardOutput = true,
RedirectStandardError = true
}
};
p.Start();
var readTask = Task.Run(async () =>
{
var output = await p.StandardOutput.ReadToEndAsync();
await p.WaitForExitAsync();
return (output, p.ExitCode);
});
var completedTask = await Task.WhenAny(readTask, Task.Delay(timeoutMs));
if (completedTask != readTask)
{
try { p.Kill(true); } catch { }
return (string.Empty, -1);
}
var result = await readTask;
p.Close();
return result;
}
public static async Task<string> CmdCommandAsync(params string[] cmds) => public static async Task<string> CmdCommandAsync(params string[] cmds) =>
await CommandAsync(cmdFileName, cmds); await CommandAsync(cmdFileName, cmds);

View File

@@ -17,37 +17,36 @@ public static class CMMCommand
public static async Task ScanMonitor() public static async Task ScanMonitor()
{ {
await BytesToFileAsync(new(CMMexe)); await BytesToFileAsync(new(CMMexe));
await ConsoleHelper.CmdCommandAsync($"{CMMexe} /smonitors {CMMsMonitors}"); await ConsoleHelper.ExecuteExeAsync(CMMexe, $"/smonitors {CMMsMonitors}");
} }
public static Task PowerOn(string monitorSN) public static async Task PowerOn(string monitorSN)
{
return ConsoleHelper.CmdCommandAsync($"{CMMexe} /SetValue {monitorSN} D6 1");
}
public static Task Sleep(string monitorSN)
{ {
return ConsoleHelper.CmdCommandAsync($"{CMMexe} /SetValue {monitorSN} D6 4"); await ConsoleHelper.ExecuteExeAsync(CMMexe, $"/SetValue {monitorSN} D6 1");
}
public static async Task Sleep(string monitorSN)
{
await ConsoleHelper.ExecuteExeAsync(CMMexe, $"/SetValue {monitorSN} D6 4");
} }
private static async Task<string> GetMonitorValue(string monitorSN, string vcpCode = "D6", int maxRetries = 2) private static async Task<string> GetMonitorValue(string monitorSN, string vcpCode = "D6", int maxRetries = 2)
{ {
for (int attempt = 0; attempt <= maxRetries; attempt++) for (int attempt = 0; attempt <= maxRetries; attempt++)
{ {
var cmdFileName = Path.Combine(CMMTmpFolder, $"{Guid.NewGuid()}.bat"); // Execute directly without batch file wrapper
var cmd = $"{CMMexe} /GetValue {monitorSN} {vcpCode}\r\n" + var (output, exitCode) = await ConsoleHelper.ExecuteExeAsync(
$"echo %errorlevel%"; CMMexe,
File.WriteAllText(cmdFileName, cmd); $"/GetValue {monitorSN} {vcpCode}");
var values = await ConsoleHelper.ExecuteCommand(cmdFileName);
try { File.Delete(cmdFileName); } catch { }
// Empty result means timeout - don't retry, monitor is unresponsive // Empty result means timeout - don't retry, monitor is unresponsive
if (string.IsNullOrEmpty(values)) if (string.IsNullOrEmpty(output) && exitCode == -1)
return string.Empty; return string.Empty;
var value = values.Split("\r\n", StringSplitOptions.RemoveEmptyEntries).LastOrDefault(); // Parse output - ControlMyMonitor outputs the value directly
var value = output?.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault()?.Trim();
if (!string.IsNullOrEmpty(value) && value != "0") if (!string.IsNullOrEmpty(value) && exitCode == 0)
return value; return value;
// Only retry on non-timeout failures // Only retry on non-timeout failures
@@ -60,9 +59,9 @@ public static class CMMCommand
#region Brightness (VCP Code 10) #region Brightness (VCP Code 10)
public static Task SetBrightness(string monitorSN, int value) public static async Task SetBrightness(string monitorSN, int value)
{ {
return ConsoleHelper.CmdCommandAsync($"{CMMexe} /SetValue {monitorSN} 10 {value}"); await ConsoleHelper.ExecuteExeAsync(CMMexe, $"/SetValue {monitorSN} 10 {value}");
} }
public static async Task<int?> GetBrightness(string monitorSN) public static async Task<int?> GetBrightness(string monitorSN)
@@ -75,9 +74,9 @@ public static class CMMCommand
#region Contrast (VCP Code 12) #region Contrast (VCP Code 12)
public static Task SetContrast(string monitorSN, int value) public static async Task SetContrast(string monitorSN, int value)
{ {
return ConsoleHelper.CmdCommandAsync($"{CMMexe} /SetValue {monitorSN} 12 {value}"); await ConsoleHelper.ExecuteExeAsync(CMMexe, $"/SetValue {monitorSN} 12 {value}");
} }
public static async Task<int?> GetContrast(string monitorSN) public static async Task<int?> GetContrast(string monitorSN)
@@ -90,9 +89,9 @@ public static class CMMCommand
#region Input Source (VCP Code 60) #region Input Source (VCP Code 60)
public static Task SetInputSource(string monitorSN, int value) public static async Task SetInputSource(string monitorSN, int value)
{ {
return ConsoleHelper.CmdCommandAsync($"{CMMexe} /SetValue {monitorSN} 60 {value}"); await ConsoleHelper.ExecuteExeAsync(CMMexe, $"/SetValue {monitorSN} 60 {value}");
} }
public static async Task<int?> GetInputSource(string monitorSN) public static async Task<int?> GetInputSource(string monitorSN)
@@ -106,7 +105,7 @@ public static class CMMCommand
var options = new List<InputSourceOption>(); var options = new List<InputSourceOption>();
var savePath = Path.Combine(CMMTmpFolder, $"{monitorSN}_vcp.tmp"); var savePath = Path.Combine(CMMTmpFolder, $"{monitorSN}_vcp.tmp");
await ConsoleHelper.CmdCommandAsync($"{CMMexe} /sjson {savePath} {monitorSN}"); await ConsoleHelper.ExecuteExeAsync(CMMexe, $"/sjson {savePath} {monitorSN}");
if (!File.Exists(savePath)) return options; if (!File.Exists(savePath)) return options;
@@ -183,7 +182,7 @@ public static class CMMCommand
static async Task ScanMonitorStatus(string savePath, XMonitor mon) static async Task ScanMonitorStatus(string savePath, XMonitor mon)
{ {
await ConsoleHelper.CmdCommandAsync($"{CMMexe} /sjson {savePath} {mon.MonitorID}"); await ConsoleHelper.ExecuteExeAsync(CMMexe, $"/sjson {savePath} {mon.MonitorID}");
var monitorModel = JsonHelper.JsonFormFile<IEnumerable<SMonitorModel>>(savePath); var monitorModel = JsonHelper.JsonFormFile<IEnumerable<SMonitorModel>>(savePath);
var status = monitorModel.ReadMonitorStatus(); var status = monitorModel.ReadMonitorStatus();