diff --git a/ViGEmBus.rc b/ViGEmBus.rc index 3304e5f..77cb42b 100644 --- a/ViGEmBus.rc +++ b/ViGEmBus.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,14,2,0 - PRODUCTVERSION 1,14,2,0 + FILEVERSION 1,14,3,0 + PRODUCTVERSION 1,14,3,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Benjamin Höglinger-Stelzer" VALUE "FileDescription", "Virtual Gamepad Emulation Bus Driver" -VALUE "FileVersion", "1.14.2.0" +VALUE "FileVersion", "1.14.3.0" VALUE "InternalName", "Virtual Gamepad Emulation Bus Driver" VALUE "LegalCopyright", "Copyright (C) Benjamin Höglinger-Stelzer 2016" VALUE "OriginalFilename", "vigembus.sys" VALUE "ProductName", "Virtual Gamepad Emulation Bus Driver" -VALUE "ProductVersion", "1.14.2.0" +VALUE "ProductVersion", "1.14.3.0" END END BLOCK "VarFileInfo" diff --git a/ViGEmBus.vcxproj b/ViGEmBus.vcxproj index df75d99..a76c9c0 100644 --- a/ViGEmBus.vcxproj +++ b/ViGEmBus.vcxproj @@ -182,7 +182,7 @@ - 1.14.2.0 + 1.14.3.0 $(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies) @@ -190,7 +190,7 @@ - 1.14.2.0 + 1.14.3.0 $(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies) @@ -198,7 +198,7 @@ - 1.14.2.0 + 1.14.3.0 $(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies) @@ -206,7 +206,7 @@ - 1.14.2.0 + 1.14.3.0 $(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies) @@ -214,7 +214,7 @@ - 1.14.2.0 + 1.14.3.0 $(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies) @@ -222,7 +222,7 @@ - 1.14.2.0 + 1.14.3.0 $(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies) @@ -230,7 +230,7 @@ - 1.14.2.0 + 1.14.3.0 $(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies) @@ -238,7 +238,7 @@ - 1.14.2.0 + 1.14.3.0 $(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies) diff --git a/Xusb.h b/Xusb.h index 459ad3f..76b8536 100644 --- a/Xusb.h +++ b/Xusb.h @@ -91,11 +91,6 @@ typedef struct _XUSB_DEVICE_DATA // WDFQUEUE HoldingUsbInRequests; - // - // Lock for queue for incoming control interrupt transfer - // - WDFSPINLOCK HoldingUsbInRequestsLock; - } XUSB_DEVICE_DATA, *PXUSB_DEVICE_DATA; WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(XUSB_DEVICE_DATA, XusbGetData) diff --git a/usbpdo.c b/usbpdo.c index 4a230b6..469912b 100644 --- a/usbpdo.c +++ b/usbpdo.c @@ -514,9 +514,7 @@ NTSTATUS UsbPdo_BulkOrInterruptTransfer(PURB urb, WDFDEVICE Device, WDFREQUEST R if (XUSB_IS_CONTROL_PIPE(pTransfer)) { - WdfSpinLockAcquire(xusb->HoldingUsbInRequestsLock); status = WdfRequestForwardToIoQueue(Request, xusb->HoldingUsbInRequests); - WdfSpinLockRelease(xusb->HoldingUsbInRequestsLock); return (NT_SUCCESS(status)) ? STATUS_PENDING : status; } diff --git a/xusb.c b/xusb.c index 25bb378..7bda9e0 100644 --- a/xusb.c +++ b/xusb.c @@ -228,14 +228,6 @@ NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device, PPDO_IDENTIFICATION_DESCRIPTION return status; } - // Create lock for queue - status = WdfSpinLockCreate(&attributes, &xusb->HoldingUsbInRequestsLock); - if (!NT_SUCCESS(status)) - { - KdPrint((DRIVERNAME "WdfSpinLockCreate (HoldingUsbInRequestsLock) failed 0x%x\n", status)); - return status; - } - return STATUS_SUCCESS; }