mirror of
https://github.com/cemu-project/DS4Windows.git
synced 2025-02-17 00:16:20 +01:00
Version 1.4.0.71
Rumble motors swapped to be correct Bug fixes, including crashes and a small windows when minimized on Win7
This commit is contained in:
parent
0f4297bd9e
commit
b43ee4f4e3
@ -425,7 +425,7 @@ namespace DS4Control
|
|||||||
|
|
||||||
if (processingData[ind].Rumble[1] == 0x08)
|
if (processingData[ind].Rumble[1] == 0x08)
|
||||||
{
|
{
|
||||||
setRumble(Small, Big, ind);
|
setRumble(Big, Small, ind);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -665,8 +665,6 @@ namespace DS4Control
|
|||||||
Global.getShiftCustomKey(device, customButton.Key) == 0 &&
|
Global.getShiftCustomKey(device, customButton.Key) == 0 &&
|
||||||
Global.getShiftCustomButton(device, customButton.Key) == X360Controls.None))
|
Global.getShiftCustomButton(device, customButton.Key) == X360Controls.None))
|
||||||
{
|
{
|
||||||
if (customButton.Key == DS4Controls.Square)
|
|
||||||
Console.WriteLine("hello");
|
|
||||||
DS4KeyType keyType = Global.getCustomKeyType(device, customButton.Key);
|
DS4KeyType keyType = Global.getCustomKeyType(device, customButton.Key);
|
||||||
int keyvalue = 0;
|
int keyvalue = 0;
|
||||||
switch (customButton.Value)
|
switch (customButton.Value)
|
||||||
|
@ -132,6 +132,7 @@ namespace ScpServer
|
|||||||
nUDIdleDisconnect.Value = Math.Round((decimal)(Global.getIdleDisconnectTimeout(device) / 60d), 1);
|
nUDIdleDisconnect.Value = Math.Round((decimal)(Global.getIdleDisconnectTimeout(device) / 60d), 1);
|
||||||
cBIdleDisconnect.Checked = Global.getIdleDisconnectTimeout(device) > 0;
|
cBIdleDisconnect.Checked = Global.getIdleDisconnectTimeout(device) > 0;
|
||||||
numUDMouseSens.Value = Global.getButtonMouseSensitivity(device);
|
numUDMouseSens.Value = Global.getButtonMouseSensitivity(device);
|
||||||
|
cBMouseAccel.Checked = Global.getMouseAccel(device);
|
||||||
// Force update of color choosers
|
// Force update of color choosers
|
||||||
alphacolor = Math.Max(redBar.Value, Math.Max(greenBar.Value, blueBar.Value));
|
alphacolor = Math.Max(redBar.Value, Math.Max(greenBar.Value, blueBar.Value));
|
||||||
reg = Color.FromArgb(color.red, color.green, color.blue);
|
reg = Color.FromArgb(color.red, color.green, color.blue);
|
||||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
|||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("1.4.0.7")]
|
[assembly: AssemblyVersion("1.4.0.71")]
|
||||||
[assembly: AssemblyFileVersion("1.4.0.7")]
|
[assembly: AssemblyFileVersion("1.4.0.71")]
|
||||||
|
1
DS4Tool/ScpForm.Designer.cs
generated
1
DS4Tool/ScpForm.Designer.cs
generated
@ -889,7 +889,6 @@
|
|||||||
this.Controls.Add(this.pnlButton);
|
this.Controls.Add(this.pnlButton);
|
||||||
this.Name = "ScpForm";
|
this.Name = "ScpForm";
|
||||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ScpForm_Closing);
|
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ScpForm_Closing);
|
||||||
this.Load += new System.EventHandler(this.Form_Load);
|
|
||||||
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.ScpForm_DragDrop);
|
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.ScpForm_DragDrop);
|
||||||
this.DragEnter += new System.Windows.Forms.DragEventHandler(this.ScpForm_DragEnter);
|
this.DragEnter += new System.Windows.Forms.DragEventHandler(this.ScpForm_DragEnter);
|
||||||
this.Resize += new System.EventHandler(this.Form_Resize);
|
this.Resize += new System.EventHandler(this.Form_Resize);
|
||||||
|
@ -93,50 +93,7 @@ namespace ScpServer
|
|||||||
if (File.Exists(appdatapath + "\\Profiles.xml"))
|
if (File.Exists(appdatapath + "\\Profiles.xml"))
|
||||||
tt.SetToolTip(linkUninstall, Properties.Resources.IfRemovingDS4Windows);
|
tt.SetToolTip(linkUninstall, Properties.Resources.IfRemovingDS4Windows);
|
||||||
tt.SetToolTip(cBSwipeProfiles, Properties.Resources.TwoFingerSwipe);
|
tt.SetToolTip(cBSwipeProfiles, Properties.Resources.TwoFingerSwipe);
|
||||||
}
|
|
||||||
|
|
||||||
public static string GetTopWindowName()
|
|
||||||
{
|
{
|
||||||
IntPtr hWnd = GetForegroundWindow();
|
|
||||||
uint lpdwProcessId;
|
|
||||||
GetWindowThreadProcessId(hWnd, out lpdwProcessId);
|
|
||||||
|
|
||||||
IntPtr hProcess = OpenProcess(0x0410, false, lpdwProcessId);
|
|
||||||
|
|
||||||
StringBuilder text = new StringBuilder(1000);
|
|
||||||
GetModuleFileNameEx(hProcess, IntPtr.Zero, text, text.Capacity);
|
|
||||||
|
|
||||||
CloseHandle(hProcess);
|
|
||||||
|
|
||||||
return text.ToString();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnPowerChange(object s, PowerModeChangedEventArgs e)
|
|
||||||
{
|
|
||||||
switch (e.Mode)
|
|
||||||
{
|
|
||||||
case PowerModes.Resume:
|
|
||||||
if (btnStartStop.Text == Properties.Resources.StartText && wasrunning)
|
|
||||||
{
|
|
||||||
DS4LightBar.shuttingdown = false;
|
|
||||||
wasrunning = false;
|
|
||||||
btnStartStop_Clicked();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case PowerModes.Suspend:
|
|
||||||
if (btnStartStop.Text == Properties.Resources.StopText)
|
|
||||||
{
|
|
||||||
DS4LightBar.shuttingdown = true;
|
|
||||||
btnStartStop_Clicked();
|
|
||||||
wasrunning = true;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void Form_Load(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
SetupArrays();
|
|
||||||
var AppCollectionThread = new System.Threading.Thread(() => CheckDrivers());
|
var AppCollectionThread = new System.Threading.Thread(() => CheckDrivers());
|
||||||
AppCollectionThread.IsBackground = true;
|
AppCollectionThread.IsBackground = true;
|
||||||
AppCollectionThread.Start();
|
AppCollectionThread.Start();
|
||||||
@ -221,7 +178,7 @@ namespace ScpServer
|
|||||||
startMinimizedCheckBox.CheckedChanged += startMinimizedCheckBox_CheckedChanged;
|
startMinimizedCheckBox.CheckedChanged += startMinimizedCheckBox_CheckedChanged;
|
||||||
if (startMinimizedCheckBox.Checked)
|
if (startMinimizedCheckBox.Checked)
|
||||||
this.WindowState = FormWindowState.Minimized;
|
this.WindowState = FormWindowState.Minimized;
|
||||||
Form_Resize(sender, e);
|
Form_Resize(null, null);
|
||||||
RefreshProfiles();
|
RefreshProfiles();
|
||||||
for (int i = 0; i < 4; i++)
|
for (int i = 0; i < 4; i++)
|
||||||
{
|
{
|
||||||
@ -276,6 +233,46 @@ namespace ScpServer
|
|||||||
linkUninstall.Visible = false;
|
linkUninstall.Visible = false;
|
||||||
StartWindowsCheckBox.Checked = File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "\\DS4Windows.lnk");
|
StartWindowsCheckBox.Checked = File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "\\DS4Windows.lnk");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string GetTopWindowName()
|
||||||
|
{
|
||||||
|
IntPtr hWnd = GetForegroundWindow();
|
||||||
|
uint lpdwProcessId;
|
||||||
|
GetWindowThreadProcessId(hWnd, out lpdwProcessId);
|
||||||
|
|
||||||
|
IntPtr hProcess = OpenProcess(0x0410, false, lpdwProcessId);
|
||||||
|
|
||||||
|
StringBuilder text = new StringBuilder(1000);
|
||||||
|
GetModuleFileNameEx(hProcess, IntPtr.Zero, text, text.Capacity);
|
||||||
|
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
|
||||||
|
return text.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnPowerChange(object s, PowerModeChangedEventArgs e)
|
||||||
|
{
|
||||||
|
switch (e.Mode)
|
||||||
|
{
|
||||||
|
case PowerModes.Resume:
|
||||||
|
if (btnStartStop.Text == Properties.Resources.StartText && wasrunning)
|
||||||
|
{
|
||||||
|
DS4LightBar.shuttingdown = false;
|
||||||
|
wasrunning = false;
|
||||||
|
btnStartStop_Clicked();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case PowerModes.Suspend:
|
||||||
|
if (btnStartStop.Text == Properties.Resources.StopText)
|
||||||
|
{
|
||||||
|
DS4LightBar.shuttingdown = true;
|
||||||
|
btnStartStop_Clicked();
|
||||||
|
wasrunning = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void test_Tick(object sender, EventArgs e)
|
private void test_Tick(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
@ -552,14 +549,14 @@ namespace ScpServer
|
|||||||
{
|
{
|
||||||
this.Hide();
|
this.Hide();
|
||||||
this.ShowInTaskbar = false;
|
this.ShowInTaskbar = false;
|
||||||
this.FormBorderStyle = FormBorderStyle.SizableToolWindow;
|
//this.FormBorderStyle = FormBorderStyle.SizableToolWindow;
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (FormWindowState.Normal == this.WindowState)
|
else if (FormWindowState.Normal == this.WindowState)
|
||||||
{
|
{
|
||||||
this.Show();
|
this.Show();
|
||||||
this.ShowInTaskbar = true;
|
this.ShowInTaskbar = true;
|
||||||
this.FormBorderStyle = FormBorderStyle.Sizable;
|
//this.FormBorderStyle = FormBorderStyle.Sizable;
|
||||||
}
|
}
|
||||||
chData.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
|
chData.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user