Merge branch 'jay' into vigem-udpserver

This commit is contained in:
Travis Nickles 2018-10-11 03:41:11 -05:00
commit 2ef6fe312f
2 changed files with 338 additions and 333 deletions

View File

@ -705,6 +705,8 @@ namespace DS4Windows
uint HamSeed = 2351727372; uint HamSeed = 2351727372;
private unsafe void performDs4Input() private unsafe void performDs4Input()
{
unchecked
{ {
firstActive = DateTime.UtcNow; firstActive = DateTime.UtcNow;
NativeMethods.HidD_SetNumInputBuffers(hDevice.safeReadHandle.DangerousGetHandle(), 2); NativeMethods.HidD_SetNumInputBuffers(hDevice.safeReadHandle.DangerousGetHandle(), 2);
@ -1089,6 +1091,7 @@ namespace DS4Windows
error = string.Empty; error = string.Empty;
cState.CopyTo(pState); cState.CopyTo(pState);
}
lock (eventQueueLock) lock (eventQueueLock)
{ {

View File

@ -1,8 +1,10 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Security;
using Microsoft.Win32.SafeHandles; using Microsoft.Win32.SafeHandles;
namespace DS4Windows namespace DS4Windows
{ {
[SuppressUnmanagedCodeSecurity]
internal static class NativeMethods internal static class NativeMethods
{ {
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]