From 67ab6f2692d4020c06a6bc17cc17e2e993718b12 Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Mon, 19 Nov 2018 06:49:20 -0600 Subject: [PATCH 1/3] Disable allowdrop setting for DS4Form --- DS4Windows/DS4Forms/DS4Form.Designer.cs | 1 - DS4Windows/DS4Forms/DS4Form.resx | 56 ++++++++++++------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/DS4Windows/DS4Forms/DS4Form.Designer.cs b/DS4Windows/DS4Forms/DS4Form.Designer.cs index fc80015..dcfd142 100644 --- a/DS4Windows/DS4Forms/DS4Form.Designer.cs +++ b/DS4Windows/DS4Forms/DS4Form.Designer.cs @@ -1367,7 +1367,6 @@ // // DS4Form // - this.AllowDrop = true; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.SystemColors.Window; diff --git a/DS4Windows/DS4Forms/DS4Form.resx b/DS4Windows/DS4Forms/DS4Form.resx index 6524814..02b5bb8 100644 --- a/DS4Windows/DS4Forms/DS4Form.resx +++ b/DS4Windows/DS4Forms/DS4Form.resx @@ -445,10 +445,10 @@ NoControl - 749, 89 + 748, 89 - 144, 22 + 145, 22 50 @@ -574,7 +574,7 @@ NoControl - 709, 89 + 708, 89 34, 22 @@ -604,7 +604,7 @@ NoControl - 709, 117 + 708, 117 34, 22 @@ -703,7 +703,7 @@ None - 592, 33 + 591, 33 111, 21 @@ -730,7 +730,7 @@ NoControl - 709, 61 + 708, 61 34, 22 @@ -757,7 +757,7 @@ None - 592, 61 + 591, 61 111, 21 @@ -781,7 +781,7 @@ None - 592, 89 + 591, 89 111, 21 @@ -808,7 +808,7 @@ NoControl - 709, 33 + 708, 33 34, 22 @@ -835,7 +835,7 @@ None - 592, 117 + 591, 117 111, 21 @@ -868,7 +868,7 @@ NoControl - 593, 7 + 592, 7 109, 15 @@ -976,7 +976,7 @@ NoControl - 438, 7 + 437, 7 51, 15 @@ -1012,7 +1012,7 @@ NoControl - 444, 36 + 443, 36 39, 15 @@ -1048,7 +1048,7 @@ NoControl - 444, 64 + 443, 64 39, 15 @@ -1084,7 +1084,7 @@ NoControl - 444, 92 + 443, 92 39, 15 @@ -1120,7 +1120,7 @@ NoControl - 444, 120 + 443, 120 39, 15 @@ -1243,10 +1243,10 @@ NoControl - 749, 33 + 748, 33 - 144, 22 + 145, 22 50 @@ -1273,10 +1273,10 @@ NoControl - 749, 61 + 748, 61 - 144, 22 + 145, 22 51 @@ -1303,10 +1303,10 @@ NoControl - 749, 117 + 748, 117 - 144, 22 + 145, 22 52 @@ -1336,7 +1336,7 @@ NoControl - 515, 0 + 514, 0 67, 30 @@ -1375,7 +1375,7 @@ NoControl - 541, 37 + 540, 37 15, 14 @@ -1408,7 +1408,7 @@ NoControl - 541, 65 + 540, 65 15, 14 @@ -1441,7 +1441,7 @@ NoControl - 541, 93 + 540, 93 15, 14 @@ -1474,7 +1474,7 @@ NoControl - 541, 121 + 540, 121 15, 14 @@ -1522,7 +1522,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bnLight3" Row="3" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="pBStatus1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbPad1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="bnEditC3" Row="3" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="bnEditC4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="lbPad3" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="cBController1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController3" Row="3" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC1" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController4" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbID" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbBattery" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt1" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt2" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt3" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="pBStatus2" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus3" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus4" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="bnLight1" Row="1" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight2" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight4" Row="4" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="lbLinkProfile" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB1" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Percent,62.29144,Percent,20.02225,Percent,17.68632,Absolute,80,AutoSize,0,AutoSize,0,Absolute,149" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="bnLight3" Row="3" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="pBStatus1" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbPad1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="bnEditC3" Row="3" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="bnEditC4" Row="4" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="lbPad3" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbPad4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="cBController1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC2" Row="2" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController2" Row="2" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="cBController3" Row="3" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="bnEditC1" Row="1" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="cBController4" Row="4" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbSelectedProfile" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="lbID" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lbStatus" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="lbBattery" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt1" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt2" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt3" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="lbBatt4" Row="4" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="pBStatus2" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus3" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="pBStatus4" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="bnLight1" Row="1" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight2" Row="2" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="bnLight4" Row="4" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="lbLinkProfile" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB1" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB2" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB3" Row="3" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="linkCB4" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /></Controls><Columns Styles="Percent,62.29144,Percent,20.02225,Percent,17.68632,Absolute,80,AutoSize,0,AutoSize,0,Absolute,150" /><Rows Styles="AutoSize,0,Percent,25,Percent,25,Percent,25,Percent,25" /></TableLayoutSettings> Fill From 5ef3fc76cfc37488e70c2cb54570940f64adb42f Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Mon, 19 Nov 2018 14:09:54 -0600 Subject: [PATCH 2/3] Version 1.5.16 --- DS4Windows/Properties/AssemblyInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DS4Windows/Properties/AssemblyInfo.cs b/DS4Windows/Properties/AssemblyInfo.cs index 5cd888e..8e260e4 100644 --- a/DS4Windows/Properties/AssemblyInfo.cs +++ b/DS4Windows/Properties/AssemblyInfo.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5.15")] -[assembly: AssemblyFileVersion("1.5.15")] +[assembly: AssemblyVersion("1.5.16")] +[assembly: AssemblyFileVersion("1.5.16")] [assembly: NeutralResourcesLanguage("en")] From 532444de485e87840841942f7f07aaca7217d8b4 Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Mon, 26 Nov 2018 10:04:26 -0600 Subject: [PATCH 3/3] Found a way to make usage check work. Related to issue #498. --- DS4Windows/HidLibrary/HidDevices.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DS4Windows/HidLibrary/HidDevices.cs b/DS4Windows/HidLibrary/HidDevices.cs index c847c86..00125eb 100644 --- a/DS4Windows/HidLibrary/HidDevices.cs +++ b/DS4Windows/HidLibrary/HidDevices.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices; @@ -55,7 +54,8 @@ namespace DS4Windows for (int j = 0; !found && j < devInfoLen; j++) { VidPidInfo tempInfo = devInfo[j]; - if (tempDev.Attributes.VendorId == tempInfo.vid && + if (tempDev.Capabilities.Usage == 0x05 && + tempDev.Attributes.VendorId == tempInfo.vid && tempDev.Attributes.ProductId == tempInfo.pid) { found = true;