The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-12-02 14:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed suspend detection routine to use WMI. Removed use of Microsoft.Win32 namespace.

Browse Source
This commit is contained in:
Travis Nickles 2019-01-04 00:49:55 -06:00
parent 4f92a57617
commit 56517e4751
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -6,7 +6,6 @@ using System.Reflection;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Drawing; using System.Drawing;
using Microsoft.Win32;
using System.Diagnostics; using System.Diagnostics;
using System.Xml; using System.Xml;
using System.Text; using System.Text;
@ -18,6 +17,7 @@ using TaskRunner = System.Threading.Tasks.Task;
using NonFormTimer = System.Timers.Timer; using NonFormTimer = System.Timers.Timer;
using static DS4Windows.Global; using static DS4Windows.Global;
using System.Security; using System.Security;
using System.Management;
namespace DS4Windows namespace DS4Windows
{ {
@ -56,7 +56,7 @@ namespace DS4Windows
bool runningBat; bool runningBat;
private bool changingService; private bool changingService;
private IntPtr regHandle = new IntPtr(); private IntPtr regHandle = new IntPtr();
private static DS4Form instance; private ManagementEventWatcher managementEvWatcher;
Dictionary<Control, string> hoverTextDict = new Dictionary<Control, string>(); Dictionary<Control, string> hoverTextDict = new Dictionary<Control, string>();
// 0 index is used for application version text. 1 - 4 indices are used for controller status // 0 index is used for application version text. 1 - 4 indices are used for controller status
string[] notifyText = new string[5] string[] notifyText = new string[5]
@ -126,7 +126,13 @@ namespace DS4Windows
linkedProfileCB = new CheckBox[4] { linkCB1, linkCB2, linkCB3, linkCB4 }; linkedProfileCB = new CheckBox[4] { linkCB1, linkCB2, linkCB3, linkCB4 };
SystemEvents.PowerModeChanged += OnPowerChange; WqlEventQuery q = new WqlEventQuery();
ManagementScope scope = new ManagementScope("root\\CIMV2");
q.EventClassName = "Win32_PowerManagementEvent";
managementEvWatcher = new ManagementEventWatcher(scope, q);
managementEvWatcher.EventArrived += PowerEventArrive;
managementEvWatcher.Start();
tSOptions.Visible = false; tSOptions.Visible = false;
TaskRunner.Run(() => CheckDrivers()); TaskRunner.Run(() => CheckDrivers());
@ -378,7 +384,6 @@ namespace DS4Windows
} }
} }
instance = this;
this.Resize += Form_Resize; this.Resize += Form_Resize;
this.LocationChanged += TrackLocationChanged; this.LocationChanged += TrackLocationChanged;
if (!(StartMinimized || mini)) if (!(StartMinimized || mini))
@ -529,33 +534,37 @@ namespace DS4Windows
return text.ToString(); return text.ToString();
} }
private static void OnPowerChange(object s, PowerModeChangedEventArgs e) private void PowerEventArrive(object sender, EventArrivedEventArgs e)
{ {
switch (e.Mode) short evType = Convert.ToInt16(e.NewEvent.GetPropertyValue("EventType"));
switch (evType)
{ {
case PowerModes.Resume: case 4:
{ {
if (instance.btnStartStop.Text == Properties.Resources.StartText && instance.wasrunning) if (btnStartStop.Text == Properties.Resources.StartText && wasrunning)
{ {
DS4LightBar.shuttingdown = false; DS4LightBar.shuttingdown = false;
instance.wasrunning = false; wasrunning = false;
Program.rootHub.suspending = false; Program.rootHub.suspending = false;
instance.BtnStartStop_Clicked(); BtnStartStop_Clicked();
} }
break; break;
} }
case PowerModes.Suspend: case 7:
{ {
if (instance.btnStartStop.Text == Properties.Resources.StopText) if (btnStartStop.Text == Properties.Resources.StopText)
{ {
DS4LightBar.shuttingdown = true; DS4LightBar.shuttingdown = true;
Program.rootHub.suspending = true; Program.rootHub.suspending = true;
instance.BtnStartStop_Clicked(); BtnStartStop_Clicked();
instance.wasrunning = true; wasrunning = true;
} }
break; break;
} }
default: break; default:
break;
} }
} }
@ -1794,7 +1803,6 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
private void StartWindowsCheckBox_CheckedChanged(object sender, EventArgs e) private void StartWindowsCheckBox_CheckedChanged(object sender, EventArgs e)
{ {
bool isChecked = StartWindowsCheckBox.Checked; bool isChecked = StartWindowsCheckBox.Checked;
RegistryKey KeyLoc = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
if (isChecked && !File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "\\DS4Windows.lnk")) if (isChecked && !File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "\\DS4Windows.lnk"))
{ {
appShortcutToStartup(); appShortcutToStartup();
@ -1804,8 +1812,6 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
File.Delete(Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "\\DS4Windows.lnk"); File.Delete(Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "\\DS4Windows.lnk");
} }
KeyLoc.DeleteValue("DS4Tool", false);
if (isChecked) if (isChecked)
{ {
runStartupPanel.Visible = true; runStartupPanel.Visible = true;

1
DS4Windows/DS4Windows.csproj
View File

@ -123,6 +123,7 @@
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Management" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>