zobally/USBDK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UsbDk: Eliminate camelCase notation from interface definitions

Browse source 
This is a cosmetic change that unifies naming convention
in UsbDk public API.

WARNING: This change breaks compilation of client code.

Signed-off-by: Dmitry Fleytman <dfleytma@redhat.com>
This commit is contained in:
Dmitry Fleytman 2015-11-18 11:42:51 +02:00
parent b3c36ea439
commit d5f12a4699
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

26
UsbDk/RedirectorStrategy.cpp
View file

@ -211,8 +211,8 @@ NTSTATUS CUsbDkRedirectorStrategy::IoInCallerContextRW(CRedirectorRequest &WdfRe
}
PUSBDK_REDIRECTOR_REQUEST_CONTEXT context = WdfRequest.Context();
context->EndpointAddress = TransferRequest->endpointAddress;
context->TransferType = static_cast<USB_DK_TRANSFER_TYPE>(TransferRequest->transferType);
context->EndpointAddress = TransferRequest->EndpointAddress;
context->TransferType = static_cast<USB_DK_TRANSFER_TYPE>(TransferRequest->TransferType);
status = WdfRequest.FetchOutputObject(context->BytesTransferred);
if (!NT_SUCCESS(status))
@ -274,7 +274,7 @@ NTSTATUS CUsbDkRedirectorStrategy::IoInCallerContextRWIsoTransfer(CRedirectorReq
#pragma warning(push)
#pragma warning(disable:4244) //Unsafe conversions on 32 bit
status = WdfRequest.LockUserBufferForWrite(reinterpret_cast<PVOID>(TransferRequest.Result.isochronousResultsArray),
status = WdfRequest.LockUserBufferForWrite(reinterpret_cast<PVOID>(TransferRequest.Result.IsochronousResultsArray),
sizeof(USB_DK_ISO_TRANSFER_RESULT) * TransferRequest.IsochronousPacketsArraySize, context->LockedIsochronousResultsArray);
#pragma warning(pop)
if (!NT_SUCCESS(status))
@ -294,8 +294,8 @@ NTSTATUS CUsbDkRedirectorStrategy::IoInCallerContextRWControlTransfer(CRedirecto
{
#pragma warning(push)
#pragma warning(disable:4244) //Unsafe conversions on 32 bit
ProbeForRead(static_cast<PVOID>(TransferRequest.buffer), sizeof(WDF_USB_CONTROL_SETUP_PACKET), 1);
context->SetupPacket = *static_cast<PWDF_USB_CONTROL_SETUP_PACKET>(TransferRequest.buffer);
ProbeForRead(static_cast<PVOID>(TransferRequest.Buffer), sizeof(WDF_USB_CONTROL_SETUP_PACKET), 1);
context->SetupPacket = *static_cast<PWDF_USB_CONTROL_SETUP_PACKET>(TransferRequest.Buffer);
#pragma warning(pop)
}
__except (EXCEPTION_EXECUTE_HANDLER)
@ -304,13 +304,13 @@ NTSTATUS CUsbDkRedirectorStrategy::IoInCallerContextRWControlTransfer(CRedirecto
return STATUS_ACCESS_VIOLATION;
}
size_t bufferLength = static_cast<size_t>(TransferRequest.bufferLength) - sizeof(WDF_USB_CONTROL_SETUP_PACKET);
size_t bufferLength = static_cast<size_t>(TransferRequest.BufferLength) - sizeof(WDF_USB_CONTROL_SETUP_PACKET);
if (context->SetupPacket.Packet.bm.Request.Dir == BMREQUEST_HOST_TO_DEVICE) // write
{
#pragma warning(push)
#pragma warning(disable:4244) //Unsafe conversions on 32 bit
status = WdfRequest.LockUserBufferForRead(static_cast<PVOID>(static_cast<PWDF_USB_CONTROL_SETUP_PACKET>(TransferRequest.buffer) + 1),
status = WdfRequest.LockUserBufferForRead(static_cast<PVOID>(static_cast<PWDF_USB_CONTROL_SETUP_PACKET>(TransferRequest.Buffer) + 1),
bufferLength, context->LockedBuffer);
#pragma warning(pop)
if (!NT_SUCCESS(status))
@ -322,7 +322,7 @@ NTSTATUS CUsbDkRedirectorStrategy::IoInCallerContextRWControlTransfer(CRedirecto
{
#pragma warning(push)
#pragma warning(disable:4244) //Unsafe conversions on 32 bit
status = WdfRequest.LockUserBufferForWrite(static_cast<PVOID>(static_cast<PWDF_USB_CONTROL_SETUP_PACKET>(TransferRequest.buffer) + 1),
status = WdfRequest.LockUserBufferForWrite(static_cast<PVOID>(static_cast<PWDF_USB_CONTROL_SETUP_PACKET>(TransferRequest.Buffer) + 1),
bufferLength, context->LockedBuffer);
#pragma warning(pop)
if (!NT_SUCCESS(status))
@ -351,7 +351,7 @@ void CUsbDkRedirectorStrategy::IoInCallerContext(WDFDEVICE Device, WDFREQUEST Re
[](const CRedirectorRequest &WdfRequest, const USB_DK_TRANSFER_REQUEST &Transfer, WDFMEMORY &LockedMemory)
#pragma warning(push)
#pragma warning(disable:4244) //Unsafe conversions on 32 bit
{ return WdfRequest.LockUserBufferForWrite(Transfer.buffer, Transfer.bufferLength, LockedMemory); });
{ return WdfRequest.LockUserBufferForWrite(Transfer.Buffer, Transfer.BufferLength, LockedMemory); });
#pragma warning(pop)
break;
case IOCTL_USBDK_DEVICE_WRITE_PIPE:
@ -359,7 +359,7 @@ void CUsbDkRedirectorStrategy::IoInCallerContext(WDFDEVICE Device, WDFREQUEST Re
[](const CRedirectorRequest &WdfRequest, const USB_DK_TRANSFER_REQUEST &Transfer, WDFMEMORY &LockedMemory)
#pragma warning(push)
#pragma warning(disable:4244) //Unsafe conversions on 32 bit
{ return WdfRequest.LockUserBufferForRead(Transfer.buffer, Transfer.bufferLength, LockedMemory); });
{ return WdfRequest.LockUserBufferForRead(Transfer.Buffer, Transfer.BufferLength, LockedMemory); });
#pragma warning(pop)
break;
default:
@ -631,9 +631,9 @@ void CUsbDkRedirectorStrategy::IsoRWCompletion(WDFREQUEST Request, WDFIOTARGET,
for (ULONG i = 0; i < urb->UrbIsochronousTransfer.NumberOfPackets; i++)
{
IsoPacketResult[i].actualLength = urb->UrbIsochronousTransfer.IsoPacket[i].Length;
IsoPacketResult[i].transferResult = urb->UrbIsochronousTransfer.IsoPacket[i].Status;
*Context->BytesTransferred += IsoPacketResult[i].actualLength;
IsoPacketResult[i].ActualLength = urb->UrbIsochronousTransfer.IsoPacket[i].Length;
IsoPacketResult[i].TransferResult = urb->UrbIsochronousTransfer.IsoPacket[i].Status;
*Context->BytesTransferred += IsoPacketResult[i].ActualLength;
}
auto status = CompletionParams->IoStatus.Status;

16
UsbDk/UsbDkData.h
View file

@ -53,22 +53,22 @@ typedef struct tag_USB_DK_CONFIG_DESCRIPTOR_REQUEST
typedef struct tag_USB_DK_ISO_TRANSFER_RESULT
{
ULONG64 actualLength;
ULONG64 transferResult;
ULONG64 ActualLength;
ULONG64 TransferResult;
} USB_DK_ISO_TRANSFER_RESULT, *PUSB_DK_ISO_TRANSFER_RESULT;
typedef struct tag_USB_DK_TRANSFER_RESULT
{
ULONG64 bytesTransferred;
PVOID64 isochronousResultsArray; // array of USB_DK_ISO_TRANSFER_RESULT
ULONG64 BytesTransferred;
PVOID64 IsochronousResultsArray; // array of USB_DK_ISO_TRANSFER_RESULT
} USB_DK_TRANSFER_RESULT, *PUSB_DK_TRANSFER_RESULT;
typedef struct tag_USB_DK_TRANSFER_REQUEST
{
ULONG64 endpointAddress;
PVOID64 buffer;
ULONG64 bufferLength;
ULONG64 transferType;
ULONG64 EndpointAddress;
PVOID64 Buffer;
ULONG64 BufferLength;
ULONG64 TransferType;
ULONG64 IsochronousPacketsArraySize;
PVOID64 IsochronousPacketsArray;

2
UsbDkHelper/RedirectorAccess.cpp
View file

@ -33,7 +33,7 @@ TransferResult UsbDkRedirectorAccess::TransactPipe(USB_DK_TRANSFER_REQUEST &Requ
auto res = Ioctl(OpCode, false,
&Request, sizeof(Request),
&Request.Result.bytesTransferred, sizeof(Request.Result.bytesTransferred),
&Request.Result.BytesTransferred, sizeof(Request.Result.BytesTransferred),
&BytesTransferredDummy, Overlapped);
return res;