The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-01-11 15:59:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jay' into vigem-udpserver

Browse Source
This commit is contained in:
Travis Nickles 2018-10-16 23:08:43 -05:00
commit 149f4a3e25
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -62,8 +62,9 @@ namespace DS4Windows
{ "DS4Windows v" + FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion, { "DS4Windows v" + FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion,
string.Empty, string.Empty, string.Empty, string.Empty }; string.Empty, string.Empty, string.Empty, string.Empty };
internal const string UPDATER_VERSION = "1.2.8.0"; private const string UPDATER_VERSION = "1.2.8.0";
internal static int WM_QUERYENDSESSION = 0x11; private const int WM_QUERYENDSESSION = 0x11;
private const int WM_CLOSE = 0x10;
internal string updaterExe = Environment.Is64BitProcess ? "DS4Updater.exe" : "DS4Updater_x86.exe"; internal string updaterExe = Environment.Is64BitProcess ? "DS4Updater.exe" : "DS4Updater_x86.exe";
[DllImport("user32.dll")] [DllImport("user32.dll")]
@ -1041,43 +1042,56 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
private const int DBT_DEVICEREMOVECOMPLETE = 0x8004; private const int DBT_DEVICEREMOVECOMPLETE = 0x8004;
protected override void WndProc(ref Message m) protected override void WndProc(ref Message m)
{ {
if (m.Msg == ScpDevice.WM_CREATE) switch (m.Msg)
{ {
Guid hidGuid = new Guid(); case ScpDevice.WM_CREATE:
NativeMethods.HidD_GetHidGuid(ref hidGuid);
IntPtr outHandle = new IntPtr();
bool result = ScpDevice.RegisterNotify(this.Handle, hidGuid, ref outHandle);
if (!result)
{ {
ScpForm_Closing(this, Guid hidGuid = new Guid();
new FormClosingEventArgs(CloseReason.ApplicationExitCall, false)); NativeMethods.HidD_GetHidGuid(ref hidGuid);
} IntPtr outHandle = new IntPtr();
} bool result = ScpDevice.RegisterNotify(this.Handle, hidGuid, ref outHandle);
else if (m.Msg == ScpDevice.WM_DEVICECHANGE) if (!result)
{
if (runHotPlug)
{
Int32 Type = m.WParam.ToInt32();
if (Type == DBT_DEVICEARRIVAL ||
Type == DBT_DEVICEREMOVECOMPLETE)
{ {
lock (hotplugCounterLock) ScpForm_Closing(this,
new FormClosingEventArgs(CloseReason.ApplicationExitCall, false));
}
break;
}
case ScpDevice.WM_DEVICECHANGE:
{
if (runHotPlug)
{
Int32 Type = m.WParam.ToInt32();
if (Type == DBT_DEVICEARRIVAL ||
Type == DBT_DEVICEREMOVECOMPLETE)
{ {
hotplugCounter++; lock (hotplugCounterLock)
} {
hotplugCounter++;
}
if (!inHotPlug) if (!inHotPlug)
{ {
inHotPlug = true; inHotPlug = true;
TaskRunner.Run(() => { Thread.Sleep(1500); InnerHotplug2(); }); TaskRunner.Run(() => { Thread.Sleep(1500); InnerHotplug2(); });
}
} }
} }
break;
} }
case WM_CLOSE:
{
ScpDevice.UnregisterNotify(Handle);
break;
}
case WM_QUERYENDSESSION:
{
systemShutdown = true;
break;
}
default: break;
} }
if (m.Msg == WM_QUERYENDSESSION)
systemShutdown = true;
// If this is WM_QUERYENDSESSION, the closing event should be // If this is WM_QUERYENDSESSION, the closing event should be
// raised in the base WndProc. // raised in the base WndProc.
base.WndProc(ref m); base.WndProc(ref m);