Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RHEL-69075: Formatting vioinput driver with clang-format [HLK-SANITY] #1245

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+1,172 −1,329
Open

RHEL-69075: Formatting vioinput driver with clang-format [HLK-SANITY] #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00c444d
RHEL-69075: clang-format for vioinput folder
Jedoku Jan 9, 2025
6e99148
RHEL-69075: broken style fix for vioinput driver
Jedoku Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 23 additions & 28 deletions vioinput/hidpassthrough/hidpassthrough.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,43 +34,35 @@
#include "pdo.h"

static DRIVER_ADD_DEVICE HidPassthroughAddDevice;
static DRIVER_UNLOAD HidPassthroughUnload;
static DRIVER_UNLOAD HidPassthroughUnload;

static _Dispatch_type_(IRP_MJ_POWER) DRIVER_DISPATCH HidPassthroughDispatchPower;
static _Dispatch_type_(IRP_MJ_OTHER) DRIVER_DISPATCH HidPassthroughDispatch;

DRIVER_INITIALIZE DriverEntry;

static NTSTATUS
HidPassthroughAddDevice(_In_ PDRIVER_OBJECT DriverObject,
_In_ PDEVICE_OBJECT FunctionalDeviceObject)
static NTSTATUS HidPassthroughAddDevice(_In_ PDRIVER_OBJECT DriverObject, _In_ PDEVICE_OBJECT FunctionalDeviceObject)
{
UNREFERENCED_PARAMETER(DriverObject);
FunctionalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;

return STATUS_SUCCESS;
}

static void
HidPassthroughUnload(_In_ PDRIVER_OBJECT DriverObject)
static void HidPassthroughUnload(_In_ PDRIVER_OBJECT DriverObject)
{
UNREFERENCED_PARAMETER(DriverObject);
}

static NTSTATUS
HidPassthroughDispatch(_In_ PDEVICE_OBJECT DeviceObject,
_Inout_ PIRP Irp)
static NTSTATUS HidPassthroughDispatch(_In_ PDEVICE_OBJECT DeviceObject, _Inout_ PIRP Irp)
{
PHID_DEVICE_EXTENSION ext = DeviceObject->DeviceExtension;

IoCopyCurrentIrpStackLocationToNext(Irp);
return IoCallDriver(ext->NextDeviceObject, Irp);
}


static NTSTATUS
HidPassthroughDispatchPower(_In_ PDEVICE_OBJECT DeviceObject,
_Inout_ PIRP Irp)
static NTSTATUS HidPassthroughDispatchPower(_In_ PDEVICE_OBJECT DeviceObject, _Inout_ PIRP Irp)
{
PHID_DEVICE_EXTENSION ext = DeviceObject->DeviceExtension;

Expand All @@ -79,10 +71,8 @@ HidPassthroughDispatchPower(_In_ PDEVICE_OBJECT DeviceObject,
return PoCallDriver(ext->NextDeviceObject, Irp);
}

_Dispatch_type_(IRP_MJ_INTERNAL_DEVICE_CONTROL)
static NTSTATUS
HidPassthroughDispatchIoctl(_In_ PDEVICE_OBJECT DeviceObject,
_Inout_ PIRP Irp)
_Dispatch_type_(IRP_MJ_INTERNAL_DEVICE_CONTROL) static NTSTATUS HidPassthroughDispatchIoctl(_In_ PDEVICE_OBJECT DeviceObject,
_Inout_ PIRP Irp)
{
PHID_DEVICE_EXTENSION ext = DeviceObject->DeviceExtension;
PPDO_EXTENSION ext_pdo = (PPDO_EXTENSION)ext->PhysicalDeviceObject->DeviceExtension;
Expand All @@ -92,8 +82,7 @@ HidPassthroughDispatchIoctl(_In_ PDEVICE_OBJECT DeviceObject,
}

NTSTATUS
DriverEntry (_In_ PDRIVER_OBJECT DriverObject,
_In_ PUNICODE_STRING RegistryPath)
DriverEntry(_In_ PDRIVER_OBJECT DriverObject, _In_ PUNICODE_STRING RegistryPath)
{
HID_MINIDRIVER_REGISTRATION hid;
int i;
Expand All @@ -104,21 +93,27 @@ DriverEntry (_In_ PDRIVER_OBJECT DriverObject,
* IRP_MJ_INTERNAL_DEVICE_CONTROL is forwarded to the
* parent device to handle HID IOCTLs.
*/
for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) {
if (i == IRP_MJ_INTERNAL_DEVICE_CONTROL) {
DriverObject->MajorFunction[i] = HidPassthroughDispatchIoctl;
} else if (i == IRP_MJ_POWER) {
DriverObject->MajorFunction[i] = HidPassthroughDispatchPower;
} else {
DriverObject->MajorFunction[i] = HidPassthroughDispatch;
for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++)
{
if (i == IRP_MJ_INTERNAL_DEVICE_CONTROL)
{
DriverObject->MajorFunction[i] = HidPassthroughDispatchIoctl;
}
else if (i == IRP_MJ_POWER)
{
DriverObject->MajorFunction[i] = HidPassthroughDispatchPower;
}
else
{
DriverObject->MajorFunction[i] = HidPassthroughDispatch;
}
}

DriverObject->DriverExtension->AddDevice = HidPassthroughAddDevice;
DriverObject->DriverUnload = HidPassthroughUnload;
DriverObject->DriverUnload = HidPassthroughUnload;

RtlZeroMemory(&hid, sizeof(HID_MINIDRIVER_REGISTRATION));
hid.Revision = HID_REVISION;
hid.Revision = HID_REVISION;
hid.DriverObject = DriverObject;
hid.RegistryPath = RegistryPath;

Expand Down
6 changes: 3 additions & 3 deletions vioinput/hidpassthrough/pdo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#pragma once
#include <wdm.h>

#define PDO_EXTENSION_V1 1
#define PDO_EXTENSION_V1 1
#define PDO_EXTENSION_VERSION PDO_EXTENSION_V1

typedef struct _tagPdoExtension
Expand All @@ -17,8 +17,8 @@ typedef struct _tagPdoExtension
* It doesn't hurt to add a version field in case we need to extend it
* in the future.
*/
ULONG Version;
ULONG Version;

/* Pointer to the bus FDO that enumerated the PDO */
PDEVICE_OBJECT BusFdo;
PDEVICE_OBJECT BusFdo;
} PDO_EXTENSION, *PPDO_EXTENSION;
10 changes: 2 additions & 8 deletions vioinput/sys/Array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@ BOOLEAN DynamicArrayReserve(PDYNAMIC_ARRAY pArray, SIZE_T cbSize)
// initial allocation
pArray->Size = 0;
pArray->MaxSize = cbSize;
pArray->Ptr = ExAllocatePoolUninitialized(
NonPagedPool,
pArray->MaxSize,
VIOINPUT_DRIVER_MEMORY_TAG);
pArray->Ptr = ExAllocatePoolUninitialized(NonPagedPool, pArray->MaxSize, VIOINPUT_DRIVER_MEMORY_TAG);
if (pArray->Ptr == NULL)
{
// mark as failed
Expand All @@ -69,10 +66,7 @@ BOOLEAN DynamicArrayReserve(PDYNAMIC_ARRAY pArray, SIZE_T cbSize)
{
pArray->MaxSize *= 2;
}
pArray->Ptr = ExAllocatePoolUninitialized(
NonPagedPool,
pArray->MaxSize,
VIOINPUT_DRIVER_MEMORY_TAG);
pArray->Ptr = ExAllocatePoolUninitialized(NonPagedPool, pArray->MaxSize, VIOINPUT_DRIVER_MEMORY_TAG);
if (pArray->Ptr == NULL)
{
// mark as failed
Expand Down
Loading