[prev in list] [next in list] [prev in thread] [next in thread]
List: win-pv-devel
Subject: Re: [win-pv-devel] [PATCH 3/6] Untabify the whole XENIFACE project
From: Paul Durrant <Paul.Durrant () citrix ! com>
Date: 2015-10-23 13:40:25
Message-ID: 9AAE0902D5BC7E449B7C8E4E778ABCD02F622FCE () AMSPEX01CL01 ! citrite ! net
[Download RAW message or body]
> -----Original Message-----
> From: win-pv-devel-bounces@lists.xenproject.org [mailto:win-pv-devel-
> bounces@lists.xenproject.org] On Behalf Of Rafal Wojdyla
> Sent: 21 October 2015 06:26
> To: win-pv-devel@lists.xenproject.org
> Subject: [win-pv-devel] [PATCH 3/6] Untabify the whole XENIFACE project
>
> Signed-off-by: Rafal Wojdyla <omeg@invisiblethingslab.com>
Acked-by: Paul Durrant <paul.durrant@citrix.com>
> ---
> include/util.h | 8 +-
> src/xeniface/driver.c | 32 +--
> src/xeniface/driver.h | 2 +-
> src/xeniface/fdo.c | 268 +++++++++++-----------
> src/xeniface/fdo.h | 14 +-
> src/xeniface/ioctls.c | 4 +-
> src/xeniface/log.h | 4 +-
> src/xeniface/thread.c | 2 +-
> src/xeniface/wmi.c | 604 +++++++++++++++++++++++++--------------------
> -----
> src/xeniface/wmi.h | 8 +-
> 10 files changed, 473 insertions(+), 473 deletions(-)
>
> diff --git a/include/util.h b/include/util.h
> index a05fb34..10e5414 100644
> --- a/include/util.h
> +++ b/include/util.h
> @@ -232,10 +232,10 @@ __AllocatePage(
>
> MdlMappedSystemVa = MmMapLockedPagesSpecifyCache(Mdl,
> KernelMode,
> - MmCached,
> - NULL,
> - FALSE,
> -
> NormalPagePriority);
> + MmCached,
> + NULL,
> + FALSE,
> + NormalPagePriority);
>
> status = STATUS_UNSUCCESSFUL;
> if (MdlMappedSystemVa == NULL)
> diff --git a/src/xeniface/driver.c b/src/xeniface/driver.c
> index 1c84467..40b1669 100644
> --- a/src/xeniface/driver.c
> +++ b/src/xeniface/driver.c
> @@ -58,9 +58,9 @@ DriverUnload(
> goto done;
>
>
> - if (DriverParameters.RegistryPath.Buffer != NULL) {
> - ExFreePool(DriverParameters.RegistryPath.Buffer);
> - }
> + if (DriverParameters.RegistryPath.Buffer != NULL) {
> + ExFreePool(DriverParameters.RegistryPath.Buffer);
> + }
>
> done:
> DriverObject = NULL;
> @@ -145,7 +145,7 @@ DriverEntry(
> )
> {
> ULONG Index;
> - NTSTATUS status = STATUS_UNSUCCESSFUL;
> + NTSTATUS status = STATUS_UNSUCCESSFUL;
> ASSERT3P(DriverObject, ==, NULL);
>
> ExInitializeDriverRuntime(DrvRtPoolNxOptIn);
> @@ -156,16 +156,16 @@ DriverEntry(
> MAJOR_VERSION_STR "." MINOR_VERSION_STR "."
> MICRO_VERSION_STR "." BUILD_NUMBER_STR,
> DAY_STR "/" MONTH_STR "/" YEAR_STR);
>
> - DriverParameters.RegistryPath.MaximumLength = RegistryPath-
> >Length + sizeof(UNICODE_NULL);
> - DriverParameters.RegistryPath.Length = RegistryPath->Length;
> - DriverParameters.RegistryPath.Buffer = ExAllocatePoolWithTag
> (PagedPool,
> -
> DriverParameters.RegistryPath.MaximumLength,
> -
> XENIFACE_POOL_TAG);
> - if (NULL == DriverParameters.RegistryPath.Buffer) {
> - status = STATUS_INSUFFICIENT_RESOURCES;
> - goto fail1;
> - }
> - RtlCopyUnicodeString(&DriverParameters.RegistryPath,
> RegistryPath);
> + DriverParameters.RegistryPath.MaximumLength = RegistryPath->Length
> + sizeof(UNICODE_NULL);
> + DriverParameters.RegistryPath.Length = RegistryPath->Length;
> + DriverParameters.RegistryPath.Buffer = ExAllocatePoolWithTag
> (PagedPool,
> + DriverParameters.RegistryPath.MaximumLength,
> + XENIFACE_POOL_TAG);
> + if (NULL == DriverParameters.RegistryPath.Buffer) {
> + status = STATUS_INSUFFICIENT_RESOURCES;
> + goto fail1;
> + }
> + RtlCopyUnicodeString(&DriverParameters.RegistryPath, RegistryPath);
>
>
> DriverObject = _DriverObject;
> @@ -187,6 +187,6 @@ done:
>
> return STATUS_SUCCESS;
> fail1:
> - Error("fail1 (%08x)\n", status);
> - return status;
> + Error("fail1 (%08x)\n", status);
> + return status;
> }
> diff --git a/src/xeniface/driver.h b/src/xeniface/driver.h
> index 00f2d8f..f3c86e8 100644
> --- a/src/xeniface/driver.h
> +++ b/src/xeniface/driver.h
> @@ -51,7 +51,7 @@ extern PDRIVER_OBJECT DriverObject;
> #define MAX_DEVICE_ID_LEN 200
>
> typedef struct _XENIFACE_PARAMETERS {
> - UNICODE_STRING RegistryPath;
> + UNICODE_STRING RegistryPath;
>
> } XENIFACE_PARAMETERS, *PXENIFACE_PARAMETERS;
>
> diff --git a/src/xeniface/fdo.c b/src/xeniface/fdo.c
> index 51bda24..b73dee1 100644
> --- a/src/xeniface/fdo.c
> +++ b/src/xeniface/fdo.c
> @@ -1,31 +1,31 @@
> /* Copyright (c) Citrix Systems Inc.
> * All rights reserved.
> - *
> - * Redistribution and use in source and binary forms,
> - * with or without modification, are permitted provided
> + *
> + * Redistribution and use in source and binary forms,
> + * with or without modification, are permitted provided
> * that the following conditions are met:
> - *
> - * * Redistributions of source code must retain the above
> - * copyright notice, this list of conditions and the
> + *
> + * * Redistributions of source code must retain the above
> + * copyright notice, this list of conditions and the
> * following disclaimer.
> - * * Redistributions in binary form must reproduce the above
> - * copyright notice, this list of conditions and the
> - * following disclaimer in the documentation and/or other
> + * * Redistributions in binary form must reproduce the above
> + * copyright notice, this list of conditions and the
> + * following disclaimer in the documentation and/or other
> * materials provided with the distribution.
> - *
> - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
> - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
> - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
> - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
> + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
> + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
> + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> * SUCH DAMAGE.
> */
>
> @@ -70,7 +70,7 @@ FdoInitialiseXSRegistryEntries(
> ANSI_STRING AnsiValue;
> char *value;
> NTSTATUS status;
> - NT_ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL);
> + NT_ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL);
> status = XENBUS_STORE(Read,
> &Fdo->StoreInterface,
> NULL,
> @@ -113,7 +113,7 @@ FdoInitialiseXSRegistryEntries(
> }
>
> ZwClose(RegHandle);
> -
> +
> RtlFreeUnicodeString(&UnicodeValue);
> XENBUS_STORE(Free, &Fdo->StoreInterface, value);
>
> @@ -140,40 +140,40 @@ failXS:
> #define REGISTRY_THREAD_END_EVENT 1
> #define REGISTRY_EVENTS 2
>
> -static NTSTATUS FdoRegistryThreadHandler(IN PXENIFACE_THREAD Self,
> - IN PVOID
> StartContext) {
> - KEVENT* threadevents[REGISTRY_EVENTS];
> - PXENIFACE_FDO Fdo = (PXENIFACE_FDO)StartContext;
> - NTSTATUS status;
> +static NTSTATUS FdoRegistryThreadHandler(IN PXENIFACE_THREAD Self,
> + IN PVOID StartContext) {
> + KEVENT* threadevents[REGISTRY_EVENTS];
> + PXENIFACE_FDO Fdo = (PXENIFACE_FDO)StartContext;
> + NTSTATUS status;
>
> - PKEVENT Event;
> + PKEVENT Event;
>
> Event = ThreadGetEvent(Self);
>
> - threadevents[REGISTRY_WRITE_EVENT] = &Fdo-
> >registryWriteEvent;
> - threadevents[REGISTRY_THREAD_END_EVENT] = Event;
> + threadevents[REGISTRY_WRITE_EVENT] = &Fdo->registryWriteEvent;
> + threadevents[REGISTRY_THREAD_END_EVENT] = Event;
>
> - for(;;) {
> -
> - status = KeWaitForMultipleObjects(REGISTRY_EVENTS,
> (PVOID *)threadevents, WaitAny, Executive, KernelMode, TRUE, NULL,
> NULL);
> - if ((status>=STATUS_WAIT_0) && (status <
> STATUS_WAIT_0+REGISTRY_EVENTS)) {
> - if (status ==
> STATUS_WAIT_0+REGISTRY_WRITE_EVENT) {
> + for(;;) {
> +
> + status = KeWaitForMultipleObjects(REGISTRY_EVENTS, (PVOID
> *)threadevents, WaitAny, Executive, KernelMode, TRUE, NULL, NULL);
> + if ((status>=STATUS_WAIT_0) && (status <
> STATUS_WAIT_0+REGISTRY_EVENTS)) {
> + if (status == STATUS_WAIT_0+REGISTRY_WRITE_EVENT) {
> XenIfaceDebugPrint(ERROR,"WriteRegistry\n");
> FdoInitialiseXSRegistryEntries(Fdo);
> KeClearEvent(threadevents[REGISTRY_WRITE_EVENT]);
> - }
> - if (status ==
> STATUS_WAIT_0+REGISTRY_THREAD_END_EVENT) {
> - if (ThreadIsAlerted(Self))
> - return STATUS_SUCCESS;
> -
> KeClearEvent(threadevents[REGISTRY_THREAD_END_EVENT]);
> - }
> -
> - }
> - else if (!NT_SUCCESS(status)) {
> - XenIfaceDebugPrint(ERROR, "Registry handler thread
> failed %x\n", status);
> - return status;
> - }
> - }
> + }
> + if (status == STATUS_WAIT_0+REGISTRY_THREAD_END_EVENT) {
> + if (ThreadIsAlerted(Self))
> + return STATUS_SUCCESS;
> + KeClearEvent(threadevents[REGISTRY_THREAD_END_EVENT]);
> + }
> +
> + }
> + else if (!NT_SUCCESS(status)) {
> + XenIfaceDebugPrint(ERROR, "Registry handler thread failed %x\n",
> status);
> + return status;
> + }
> + }
>
> }
>
> @@ -311,7 +311,7 @@ __FdoSetName(
> status = RtlUnicodeStringToAnsiString(&Ansi, &Unicode, FALSE);
> if (!NT_SUCCESS(status))
> goto fail1;
> -
> +
> for (Index = 0; Dx->Name[Index] != '\0'; Index++) {
> if (!isalnum((UCHAR)Dx->Name[Index]))
> Dx->Name[Index] = '_';
> @@ -437,7 +437,7 @@ __FdoForwardIrpSynchronously(
> IN PVOID Context
> )
> {
> - PKEVENT Event = (PKEVENT)Context;
> + PKEVENT Event = (PKEVENT)Context;
>
> UNREFERENCED_PARAMETER(DeviceObject);
> UNREFERENCED_PARAMETER(Irp);
> @@ -595,7 +595,7 @@ __FdoFreeAnsi(
>
> for (Index = 0; Ansi[Index].Buffer != NULL; Index++)
> __FdoFree(Ansi[Index].Buffer);
> -
> +
> __FdoFree(Ansi);
> }
>
> @@ -752,7 +752,7 @@ FdoD3ToD0(
> if (!NT_SUCCESS(status))
> goto fail4;
>
> - Fdo->InterfacesAcquired = TRUE;
> + Fdo->InterfacesAcquired = TRUE;
> KeLowerIrql(Irql);
>
> return STATUS_SUCCESS;
> @@ -760,7 +760,7 @@ FdoD3ToD0(
> fail4:
> Error("fail4\n");
>
> - XENBUS_SHARED_INFO(Release, &Fdo->SharedInfoInterface);
> + XENBUS_SHARED_INFO(Release, &Fdo->SharedInfoInterface);
>
> fail3:
> Error("fail3\n");
> @@ -788,7 +788,7 @@ FdoD0ToD3(
> KIRQL Irql;
>
> ASSERT3U(KeGetCurrentIrql(), ==, PASSIVE_LEVEL);
> - Fdo->InterfacesAcquired = FALSE;
> + Fdo->InterfacesAcquired = FALSE;
> KeRaiseIrql(DISPATCH_LEVEL, &Irql);
>
> XENBUS_SUSPEND(Deregister,
> @@ -796,12 +796,12 @@ FdoD0ToD3(
> Fdo->SuspendCallbackLate);
> Fdo->SuspendCallbackLate = NULL;
>
> - XENBUS_SHARED_INFO(Release, &Fdo->SharedInfoInterface);
> + XENBUS_SHARED_INFO(Release, &Fdo->SharedInfoInterface);
>
> XENBUS_SUSPEND(Release, &Fdo->SuspendInterface);
>
> __FdoD0ToD3(Fdo);
> -
> +
> KeLowerIrql(Irql);
> }
>
> @@ -854,16 +854,16 @@ FdoStartDevice(
> if (!NT_SUCCESS(status))
> goto fail3;
>
> - status = IoSetDeviceInterfaceState(&Fdo->InterfaceName, TRUE);
> - if (!NT_SUCCESS(status))
> - goto fail4;
> + status = IoSetDeviceInterfaceState(&Fdo->InterfaceName, TRUE);
> + if (!NT_SUCCESS(status))
> + goto fail4;
>
>
> - if (__FdoGetDevicePnpState(Fdo) != Stopped) {
> - status = WmiInit(Fdo);
> - if (!NT_SUCCESS(status))
> - goto fail5;
> - }
> + if (__FdoGetDevicePnpState(Fdo) != Stopped) {
> + status = WmiInit(Fdo);
> + if (!NT_SUCCESS(status))
> + goto fail5;
> + }
>
> __FdoSetDevicePnpState(Fdo, Started);
>
> @@ -874,13 +874,13 @@ FdoStartDevice(
> return status;
>
> fail5:
> - Error("fail5\n");
> + Error("fail5\n");
> #pragma warning(suppress : 6031)
> - IoSetDeviceInterfaceState(&Fdo->InterfaceName, FALSE);
> + IoSetDeviceInterfaceState(&Fdo->InterfaceName, FALSE);
>
> fail4:
> - Error("fail4\n");
> - FdoD0ToD3(Fdo);
> + Error("fail4\n");
> + FdoD0ToD3(Fdo);
>
> fail3:
> Error("fail3\n");
> @@ -1008,7 +1008,7 @@ FdoSurpriseRemoval(
> __FdoSetDevicePnpState(Fdo, SurpriseRemovePending);
>
> Irp->IoStatus.Status = STATUS_SUCCESS;
> -#pragma warning(suppress : 6031)
> +#pragma warning(suppress : 6031)
> IoSetDeviceInterfaceState(&Fdo->InterfaceName, FALSE);
> WmiFinalise(Fdo);
>
> @@ -1031,7 +1031,7 @@ FdoRemoveDevice(
> if (__FdoGetDevicePowerState(Fdo) != PowerDeviceD0)
> goto done;
>
> - FdoD0ToD3(Fdo);
> + FdoD0ToD3(Fdo);
>
> __FdoSetSystemPowerState(Fdo, PowerSystemSleeping3);
> FdoS3ToS4(Fdo);
> @@ -1043,7 +1043,7 @@ done:
> __FdoSetDevicePnpState(Fdo, Deleted);
>
> Irp->IoStatus.Status = STATUS_SUCCESS;
> -#pragma warning(suppress : 6031)
> +#pragma warning(suppress : 6031)
> IoSetDeviceInterfaceState(&Fdo->InterfaceName, FALSE);
> WmiFinalise(Fdo);
>
> @@ -1139,7 +1139,7 @@ FdoDeviceUsageNotification(
> if (!NT_SUCCESS(status))
> goto fail1;
>
> - NotDisableable = FALSE;
> + NotDisableable = FALSE;
> for (Type = (DEVICE_USAGE_NOTIFICATION_TYPE)0; Type <=
> DeviceUsageTypeDumpFile; Type++) {
> if (Fdo->Usage[Type] != 0) {
> NotDisableable = TRUE;
> @@ -1151,7 +1151,7 @@ FdoDeviceUsageNotification(
>
> if (Fdo->NotDisableable != NotDisableable) {
> Fdo->NotDisableable = NotDisableable;
> -
> +
> IoInvalidateDeviceState(__FdoGetPhysicalDeviceObject(Fdo));
> }
>
> @@ -1210,8 +1210,8 @@ FdoDispatchPnp(
> MinorFunction = StackLocation->MinorFunction;
>
> Trace("====> (%02x:%s)\n",
> - MinorFunction,
> - PnpMinorFunctionName(MinorFunction));
> + MinorFunction,
> + PnpMinorFunctionName(MinorFunction));
>
> switch (StackLocation->MinorFunction) {
> case IRP_MN_START_DEVICE:
> @@ -1265,9 +1265,9 @@ FdoDispatchPnp(
> }
>
> Trace("<==== (%02x:%s)(%08x)\n",
> - MinorFunction,
> + MinorFunction,
> PnpMinorFunctionName(MinorFunction),
> - status);
> + status);
>
> return status;
> }
> @@ -1299,7 +1299,7 @@ __FdoSetDevicePowerUp(
>
> ASSERT3U(DeviceState, ==, PowerDeviceD0);
> status = FdoD3ToD0(Fdo);
> - SessionsResumeAll(Fdo);
> + SessionsResumeAll(Fdo);
> ASSERT(NT_SUCCESS(status));
>
> done:
> @@ -1332,9 +1332,9 @@ __FdoSetDevicePowerDown(
> ASSERT3U(DeviceState, ==, PowerDeviceD3);
>
> if (__FdoGetDevicePowerState(Fdo) == PowerDeviceD0){
> - SessionsSuspendAll(Fdo);
> + SessionsSuspendAll(Fdo);
> FdoD0ToD3(Fdo);
> - }
> + }
>
> IoSkipCurrentIrpStackLocation(Irp);
> status = IoCallDriver(Fdo->LowerDeviceObject, Irp);
> @@ -1358,7 +1358,7 @@ __FdoSetDevicePower(
> PowerAction = StackLocation->Parameters.Power.ShutdownType;
>
> Trace("====> (%s:%s)\n",
> - PowerDeviceStateName(DeviceState),
> + PowerDeviceStateName(DeviceState),
> PowerActionName(PowerAction));
>
> ASSERT3U(PowerAction, <, PowerActionShutdown);
> @@ -1376,7 +1376,7 @@ __FdoSetDevicePower(
>
> done:
> Trace("<==== (%s:%s)(%08x)\n",
> - PowerDeviceStateName(DeviceState),
> + PowerDeviceStateName(DeviceState),
> PowerActionName(PowerAction),
> status);
> return status;
> @@ -1532,7 +1532,7 @@ __FdoSetSystemPower(
> PowerAction = StackLocation->Parameters.Power.ShutdownType;
>
> Trace("====> (%s:%s)\n",
> - PowerSystemStateName(SystemState),
> + PowerSystemStateName(SystemState),
> PowerActionName(PowerAction));
>
> ASSERT3U(PowerAction, <, PowerActionShutdown);
> @@ -1550,7 +1550,7 @@ __FdoSetSystemPower(
>
> done:
> Trace("<==== (%s:%s)(%08x)\n",
> - PowerSystemStateName(SystemState),
> + PowerSystemStateName(SystemState),
> PowerActionName(PowerAction),
> status);
> return status;
> @@ -1616,7 +1616,7 @@ __FdoQueryDevicePower(
> PowerAction = StackLocation->Parameters.Power.ShutdownType;
>
> Trace("====> (%s:%s)\n",
> - PowerDeviceStateName(DeviceState),
> + PowerDeviceStateName(DeviceState),
> PowerActionName(PowerAction));
>
> ASSERT3U(PowerAction, <, PowerActionShutdown);
> @@ -1634,7 +1634,7 @@ __FdoQueryDevicePower(
>
> done:
> Trace("<==== (%s:%s)(%08x)\n",
> - PowerDeviceStateName(DeviceState),
> + PowerDeviceStateName(DeviceState),
> PowerActionName(PowerAction),
> status);
> return status;
> @@ -1768,7 +1768,7 @@ __FdoQuerySystemPower(
> PowerAction = StackLocation->Parameters.Power.ShutdownType;
>
> Trace("====> (%s:%s)\n",
> - PowerSystemStateName(SystemState),
> + PowerSystemStateName(SystemState),
> PowerActionName(PowerAction));
>
> ASSERT3U(PowerAction, <, PowerActionShutdown);
> @@ -1786,7 +1786,7 @@ __FdoQuerySystemPower(
>
> done:
> Trace("<==== (%s:%s)(%08x)\n",
> - PowerSystemStateName(SystemState),
> + PowerSystemStateName(SystemState),
> PowerActionName(PowerAction),
> status);
>
> @@ -2080,26 +2080,26 @@ FdoDispatch(
> status = FdoDispatchPower(Fdo, Irp);
> break;
>
> - case IRP_MJ_DEVICE_CONTROL:
> - status = XenIFaceIoctl(Fdo, Irp);
> - break;
> + case IRP_MJ_DEVICE_CONTROL:
> + status = XenIFaceIoctl(Fdo, Irp);
> + break;
>
> - case IRP_MJ_SYSTEM_CONTROL:
> - status = XenIfaceSystemControl(Fdo, Irp);
> - break;
> + case IRP_MJ_SYSTEM_CONTROL:
> + status = XenIfaceSystemControl(Fdo, Irp);
> + break;
>
> - case IRP_MJ_READ:
> - case IRP_MJ_WRITE:
> - status = FdoReadWrite(Fdo, Irp);
> - break;
> + case IRP_MJ_READ:
> + case IRP_MJ_WRITE:
> + status = FdoReadWrite(Fdo, Irp);
> + break;
>
> - case IRP_MJ_CREATE:
> - status = FdoCreateFile(Fdo, Irp);
> - break;
> + case IRP_MJ_CREATE:
> + status = FdoCreateFile(Fdo, Irp);
> + break;
>
> - case IRP_MJ_CLOSE:
> - status = FdoClose(Fdo, Irp);
> - break;
> + case IRP_MJ_CLOSE:
> + status = FdoClose(Fdo, Irp);
> + break;
>
> default:
> status = FdoDispatchDefault(Fdo, Irp);
> @@ -2149,7 +2149,7 @@ FdoQueryInterface(
> StackLocation->Parameters.QueryInterface.Size = (USHORT)Size;
> StackLocation->Parameters.QueryInterface.Version = (USHORT)Version;
> StackLocation->Parameters.QueryInterface.Interface = Interface;
> -
> +
> Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
>
> status = IoCallDriver(Fdo->LowerDeviceObject, Irp);
> @@ -2227,7 +2227,7 @@ FdoCreate(
> Dx->SystemPowerState = PowerSystemShutdown;
> Dx->DevicePowerState = PowerDeviceD3;
>
> - FunctionDeviceObject->Flags |= DO_POWER_PAGABLE;
> + FunctionDeviceObject->Flags |= DO_POWER_PAGABLE;
> FunctionDeviceObject->Flags |= DO_BUFFERED_IO;
>
> Fdo = (PXENIFACE_FDO)__FdoAllocate(sizeof (XENIFACE_FDO));
> @@ -2258,12 +2258,12 @@ FdoCreate(
> goto fail5;
>
> #pragma prefast(suppress:6014) // Possibly leaking Fdo->InterfaceName
> - status = IoRegisterDeviceInterface(PhysicalDeviceObject,
> -
> (LPGUID)&GUID_INTERFACE_XENIFACE,
> -
> NULL,
> -
> &Fdo->InterfaceName);
> - if (!NT_SUCCESS(status))
> - goto fail6;
> + status = IoRegisterDeviceInterface(PhysicalDeviceObject,
> + (LPGUID)&GUID_INTERFACE_XENIFACE,
> + NULL,
> + &Fdo->InterfaceName);
> + if (!NT_SUCCESS(status))
> + goto fail6;
>
> status = __FdoSetName(Fdo, Name);
> if (!NT_SUCCESS(status))
> @@ -2300,13 +2300,13 @@ FdoCreate(
> InitializeListHead(&Dx->ListEntry);
> Fdo->References = 1;
>
> - FdoInitialiseXSRegistryEntries(Fdo);
> + FdoInitialiseXSRegistryEntries(Fdo);
>
> - KeInitializeEvent(&Fdo->registryWriteEvent, NotificationEvent,
> FALSE);
> + KeInitializeEvent(&Fdo->registryWriteEvent, NotificationEvent, FALSE);
>
> - status = ThreadCreate(FdoRegistryThreadHandler, Fdo, &Fdo-
> >registryThread);
> - if (!NT_SUCCESS(status))
> - goto fail11;
> + status = ThreadCreate(FdoRegistryThreadHandler, Fdo, &Fdo-
> >registryThread);
> + if (!NT_SUCCESS(status))
> + goto fail11;
>
> Info("%p (%s)\n",
> FunctionDeviceObject,
> @@ -2317,15 +2317,15 @@ FdoCreate(
>
> return STATUS_SUCCESS;
>
> -
> +
> fail11:
> - Error("fail11\n");
> + Error("fail11\n");
>
> RtlZeroMemory(&Fdo->StoreInterface,
> sizeof (XENBUS_STORE_INTERFACE));
>
> fail10:
> - Error("fail10\n");
> + Error("fail10\n");
>
> RtlZeroMemory(&Fdo->SharedInfoInterface,
> sizeof (XENBUS_SHARED_INFO_INTERFACE));
> @@ -2341,8 +2341,8 @@ fail8:
>
> fail7:
> Error("fail7\n");
> - RtlFreeUnicodeString(&Fdo->InterfaceName);
> - RtlZeroMemory(&Fdo->InterfaceName,sizeof(UNICODE_STRING));
> + RtlFreeUnicodeString(&Fdo->InterfaceName);
> + RtlZeroMemory(&Fdo->InterfaceName,sizeof(UNICODE_STRING));
>
> fail6:
> Error("fail6\n");
> @@ -2353,14 +2353,14 @@ fail5:
> ThreadAlert(Fdo->DevicePowerThread);
> ThreadJoin(Fdo->DevicePowerThread);
> Fdo->DevicePowerThread = NULL;
> -
> +
> fail4:
> Error("fail4\n");
>
> ThreadAlert(Fdo->SystemPowerThread);
> ThreadJoin(Fdo->SystemPowerThread);
> Fdo->SystemPowerThread = NULL;
> -
> +
> fail3:
> Error("fail3\n");
>
> @@ -2410,7 +2410,7 @@ FdoDestroy(
>
> RtlZeroMemory(&Fdo->Mutex, sizeof (XENIFACE_MUTEX));
>
> - Fdo->InterfacesAcquired = FALSE;
> + Fdo->InterfacesAcquired = FALSE;
>
> RtlZeroMemory(&Fdo->StoreInterface,
> sizeof (XENBUS_STORE_INTERFACE));
> @@ -2421,7 +2421,7 @@ FdoDestroy(
> RtlZeroMemory(&Fdo->SuspendInterface,
> sizeof (XENBUS_SUSPEND_INTERFACE));
>
> - ThreadAlert(Fdo->registryThread);
> + ThreadAlert(Fdo->registryThread);
> ThreadJoin(Fdo->registryThread);
> Fdo->registryThread = NULL;
>
> @@ -2440,12 +2440,12 @@ FdoDestroy(
> Fdo->PhysicalDeviceObject = NULL;
> Fdo->Dx = NULL;
>
> - RtlZeroMemory(&Fdo->SessionLock, sizeof(FAST_MUTEX));
> - RtlZeroMemory(&Fdo->SessionHead, sizeof(LIST_ENTRY));
> - RtlZeroMemory(&Fdo->registryWriteEvent, sizeof(KEVENT));
> + RtlZeroMemory(&Fdo->SessionLock, sizeof(FAST_MUTEX));
> + RtlZeroMemory(&Fdo->SessionHead, sizeof(LIST_ENTRY));
> + RtlZeroMemory(&Fdo->registryWriteEvent, sizeof(KEVENT));
>
> - RtlFreeUnicodeString(&Fdo->InterfaceName);
> - RtlZeroMemory(&Fdo->InterfaceName,sizeof(UNICODE_STRING));
> + RtlFreeUnicodeString(&Fdo->InterfaceName);
> + RtlZeroMemory(&Fdo->InterfaceName,sizeof(UNICODE_STRING));
>
> ASSERT(IsZeroMemory(Fdo, sizeof (XENIFACE_FDO)));
> __FdoFree(Fdo);
> diff --git a/src/xeniface/fdo.h b/src/xeniface/fdo.h
> index 4416064..c859338 100644
> --- a/src/xeniface/fdo.h
> +++ b/src/xeniface/fdo.h
> @@ -78,13 +78,13 @@ typedef struct _XENIFACE_FDO {
>
> XENBUS_SUSPEND_INTERFACE SuspendInterface;
>
> - XENBUS_SHARED_INFO_INTERFACE SharedInfoInterface;
> + XENBUS_SHARED_INFO_INTERFACE SharedInfoInterface;
>
> PXENBUS_SUSPEND_CALLBACK SuspendCallbackLate;
>
> - BOOLEAN
> InterfacesAcquired;
> + BOOLEAN InterfacesAcquired;
>
> - #define MAX_SESSIONS (65536)
> + #define MAX_SESSIONS (65536)
>
> int WmiReady;
>
> @@ -92,13 +92,13 @@ typedef struct _XENIFACE_FDO {
> FAST_MUTEX SessionLock;
> LIST_ENTRY SessionHead;
>
> - PXENIFACE_THREAD registryThread;
> - KEVENT
> registryWriteEvent;
> + PXENIFACE_THREAD registryThread;
> + KEVENT registryWriteEvent;
>
>
> - UNICODE_STRING
> SuggestedInstanceName;
> + UNICODE_STRING SuggestedInstanceName;
>
> - UNICODE_STRING InterfaceName;
> + UNICODE_STRING InterfaceName;
>
> } XENIFACE_FDO, *PXENIFACE_FDO;
>
> diff --git a/src/xeniface/ioctls.c b/src/xeniface/ioctls.c
> index 3bef9ea..ead7f9b 100644
> --- a/src/xeniface/ioctls.c
> +++ b/src/xeniface/ioctls.c
> @@ -325,9 +325,9 @@ XenIFaceIoctl(
>
> done:
>
> - Irp->IoStatus.Status = status;
> + Irp->IoStatus.Status = status;
>
> - IoCompleteRequest(Irp, IO_NO_INCREMENT);
> + IoCompleteRequest(Irp, IO_NO_INCREMENT);
>
> return status;
> }
> diff --git a/src/xeniface/log.h b/src/xeniface/log.h
> index 375a61f..5524f05 100644
> --- a/src/xeniface/log.h
> +++ b/src/xeniface/log.h
> @@ -142,11 +142,11 @@ __Info(
>
>
> #define XenIfaceDebugPrint(LEVEL, ...) \
> - __XenIfaceDebugPrint(__MODULE__ "|" __FUNCTION__ ": ",LEVEL,
> __VA_ARGS__)
> + __XenIfaceDebugPrint(__MODULE__ "|" __FUNCTION__ ": ",LEVEL,
> __VA_ARGS__)
>
> static __inline VOID
> __XenIfaceDebugPrint (
> - __in const CHAR *Prefix,
> + __in const CHAR *Prefix,
> __in ULONG DebugPrintLevel,
> __in PCCHAR DebugMessage,
> ...
> diff --git a/src/xeniface/thread.c b/src/xeniface/thread.c
> index 51967ed..f008834 100644
> --- a/src/xeniface/thread.c
> +++ b/src/xeniface/thread.c
> @@ -129,7 +129,7 @@ ThreadCreate(
>
> (*Thread) = __ThreadAllocate(sizeof (XENIFACE_THREAD));
>
> - Warning("Create thread %p %p\n", Function, Thread);
> + Warning("Create thread %p %p\n", Function, Thread);
>
> status = STATUS_NO_MEMORY;
> if (*Thread == NULL)
> diff --git a/src/xeniface/wmi.c b/src/xeniface/wmi.c
> index 1bdb834..82592e3 100644
> --- a/src/xeniface/wmi.c
> +++ b/src/xeniface/wmi.c
> @@ -1,31 +1,31 @@
> /* Copyright (c) Citrix Systems Inc.
> * All rights reserved.
> *
> - * Redistribution and use in source and binary forms,
> - * with or without modification, are permitted provided
> + * Redistribution and use in source and binary forms,
> + * with or without modification, are permitted provided
> * that the following conditions are met:
> *
> - * * Redistributions of source code must retain the above
> - * copyright notice, this list of conditions and the
> + * * Redistributions of source code must retain the above
> + * copyright notice, this list of conditions and the
> * following disclaimer.
> - * * Redistributions in binary form must reproduce the above
> - * copyright notice, this list of conditions and the
> - * following disclaimer in the documentation and/or other
> + * * Redistributions in binary form must reproduce the above
> + * copyright notice, this list of conditions and the
> + * following disclaimer in the documentation and/or other
> * materials provided with the distribution.
> *
> - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
> - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
> - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
> - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
> + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
> + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
> + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> * SUCH DAMAGE.
> */
>
> @@ -47,7 +47,7 @@
> #include <version.h>
>
> __drv_raisesIRQL(APC_LEVEL)
> -__drv_savesIRQLGlobal(OldIrql, fdoData->SessionLock)
> +__drv_savesIRQLGlobal(OldIrql, fdoData->SessionLock)
> void LockSessions(
> XENIFACE_FDO* fdoData)
> {
> @@ -93,7 +93,7 @@ NTSTATUS GetAnsiString(ANSI_STRING *ansi, USHORT
> maxlength, LPWSTR location) {
>
> // Rather inconveniently, xenstore needs UTF8 data, WMI works in UTF16
> // and windows doesn't provide conversion functions in any version
> -// prior to Windows 7.
> +// prior to Windows 7.
>
> USHORT Utf32FromUtf16(ULONG *utf32, const WCHAR* utf16) {
> ULONG w;
> @@ -132,22 +132,22 @@ USHORT Utf32FromUtf8(ULONG *utf32, const
> CHAR *utf8) {
> else if ((utf8[0] & 0xE0) == 0xC0) {
> y = utf8[0] & 0x1F;
> x = utf8[1] & 0x3F;
> - *utf32 = (y<<6) | x;
> + *utf32 = (y<<6) | x;
> return 2;
> }
> else if ((utf8[0] & 0xF0) == 0xE0) {
> z = utf8[0] & 0x0F;
> y = utf8[1] & 0x3F;
> x = utf8[2] & 0x3F;
> - *utf32 = (z <<12) | (y<<6) | x;
> + *utf32 = (z <<12) | (y<<6) | x;
> return 3;
> - }
> + }
> else {
> ua = utf8[0] & 0x7;
> ub = (utf8[1] & 0x30) >> 4;
> u = (ua << 2) | ub;
> z = utf8[1] & 0x0f;
> - y = utf8[2] & 0x3f;
> + y = utf8[2] & 0x3f;
> x = utf8[3] & 0x3f;
> *utf32 = (u<<16) | (z <<12) | (y <<6) | x;
> return 4;
> @@ -277,7 +277,7 @@ NTSTATUS GetUTF8String(UTF8_STRING** utf8,
> USHORT bufsize, LPWSTR ustring)
>
> (*utf8)->Length = bytecount;
> (*utf8)->Buffer[bytecount]=0;
> -
> +
> bytecount = 0;
> i=0;
> while (i < bufsize/sizeof(WCHAR)) {
> @@ -305,7 +305,7 @@ void GetCountedUnicodeString(UNICODE_STRING
> *unicode, UCHAR *location)
> USHORT bufsize = *(USHORT*)location;
> LPWSTR ustring = (LPWSTR)(location+sizeof(USHORT));
> GetUnicodeString(unicode, bufsize, ustring);
> -}
> +}
>
> NTSTATUS GetCountedAnsiString(ANSI_STRING *ansi, UCHAR *location)
> {
> @@ -332,7 +332,7 @@ typedef enum {
> WMI_STRINGOFFSET
> } WMI_TYPE;
>
> -int AccessWmiBuffer(PUCHAR Buffer, int readbuffer, ULONG *
> RequiredSize,
> +int AccessWmiBuffer(PUCHAR Buffer, int readbuffer, ULONG *
> RequiredSize,
> size_t BufferSize, ...) {
> va_list vl;
> ULONG_PTR offset;
> @@ -405,7 +405,7 @@ int AccessWmiBuffer(PUCHAR Buffer, int readbuffer,
> ULONG * RequiredSize,
> UCHAR *bufferpos = Buffer + inpos;
> ULONG insize = va_arg(vl, ULONG);
> UCHAR **writebuf = va_arg(vl, UCHAR**);
> - *writebuf = NULL;
> + *writebuf = NULL;
> if (bufferpos+ insize > endbuffer) {;
> overflow = TRUE;
> }
> @@ -460,12 +460,12 @@ int AccessWmiBuffer(PUCHAR Buffer, int
> readbuffer, ULONG * RequiredSize,
> LPWSTR *val;
> offset = (2-((ULONG_PTR)position%2))%2;
> position += offset;
> - if (position + sizeof(WCHAR)*25 > endbuffer)
> + if (position + sizeof(WCHAR)*25 > endbuffer)
> overflow = TRUE;
> - val = va_arg(vl, LPWSTR*);
> - *val = NULL;
> - if (!overflow)
> - *val = (LPWSTR )position;
> + val = va_arg(vl, LPWSTR*);
> + *val = NULL;
> + if (!overflow)
> + *val = (LPWSTR )position;
> position += sizeof(WCHAR)*25;
> }
> break;
> @@ -477,7 +477,7 @@ int AccessWmiBuffer(PUCHAR Buffer, int readbuffer,
> ULONG * RequiredSize,
> break;
> }
> }
> - *RequiredSize = (ULONG)(position - Buffer);
> + *RequiredSize = (ULONG)(position - Buffer);
> va_end(vl);
> if (overflow)
> return FALSE;
> @@ -485,9 +485,9 @@ int AccessWmiBuffer(PUCHAR Buffer, int readbuffer,
> ULONG * RequiredSize,
> }
>
>
> -NTSTATUS
> +NTSTATUS
> WriteCountedUnicodeString(
> - const UNICODE_STRING *ustr,
> + const UNICODE_STRING *ustr,
> UCHAR *location
> )
> {
> @@ -516,7 +516,7 @@ WriteCountedUTF8String(const char * string, UCHAR
> *location) {
> }
> buffer[bytesize/sizeof(WCHAR)] = 0;
>
> - i=0;
> + i=0;
> b=0;
> while (string[i] != 0) {
> i += Utf32FromUtf8(&utf32, &string[i]);
> @@ -533,7 +533,7 @@ NTSTATUS
> WriteCountedString(
> const char * string,
> UCHAR * location
> - )
> + )
> {
> ANSI_STRING ansi;
> UNICODE_STRING unicode;
> @@ -542,7 +542,7 @@ WriteCountedString(
> RtlInitAnsiString(&ansi, string);
>
> status = RtlAnsiStringToUnicodeString(&unicode, &ansi, TRUE);
> - if (NT_SUCCESS(status)) {
> + if (NT_SUCCESS(status)) {
>
> status = WriteCountedUnicodeString(&unicode, location);
> RtlFreeUnicodeString(&unicode);
> @@ -583,7 +583,7 @@ CloneUnicodeString(UNICODE_STRING *dest,
> UNICODE_STRING *src) {
> return status;
> }
>
> -NTSTATUS
> +NTSTATUS
> StringToUnicode(UNICODE_STRING *ustr, const char * str) {
> ANSI_STRING ansi;
> RtlInitAnsiString(&ansi, str);
> @@ -632,7 +632,7 @@ GetInstanceName(UNICODE_STRING *dest,
> XENIFACE_FDO* FdoData, const char *string)
> return status;
> }
> destsz = FdoData->SuggestedInstanceName.Length +
> - sizeof(WCHAR) +
> + sizeof(WCHAR) +
> unicode.Length;
>
> AllocUnicodeStringBuffer(dest, (USHORT)destsz);
> @@ -640,8 +640,8 @@ GetInstanceName(UNICODE_STRING *dest,
> XENIFACE_FDO* FdoData, const char *string)
> RtlFreeUnicodeString(&unicode);
> return STATUS_INSUFFICIENT_RESOURCES;
> }
> - status = RtlUnicodeStringPrintf(dest, L"%s\\%s",
> - FdoData->SuggestedInstanceName.Buffer,
> + status = RtlUnicodeStringPrintf(dest, L"%s\\%s",
> + FdoData->SuggestedInstanceName.Buffer,
> unicode.Buffer);
> if (!NT_SUCCESS(status)) {
> RtlFreeUnicodeString(&unicode);
> @@ -701,14 +701,14 @@ void UnicodeShallowCopy(UNICODE_STRING
> *dest, UNICODE_STRING *src) {
> dest->Buffer = src->Buffer;
> dest->Length = src->Length;
> dest->MaximumLength = src->MaximumLength;
> -}
> +}
>
>
> XenStoreSession*
> -FindSessionLocked(XENIFACE_FDO *fdoData,
> +FindSessionLocked(XENIFACE_FDO *fdoData,
> LONG id) {
> XenStoreSession *session;
> -
> +
> session = (XenStoreSession *)fdoData->SessionHead.Flink;
> while (session != (XenStoreSession *)&fdoData->SessionHead){
> if (session->id == id) {
> @@ -735,7 +735,7 @@ XenStoreWatch *
> SessionFindWatchLocked(XenStoreSession *session,
> UNICODE_STRING *path) {
> XenStoreWatch * watch;
> -
> +
> XenIfaceDebugPrint(TRACE,"Wait for session watch lock\n");
> ExAcquireFastMutex(&session->WatchMapLock);
> XenIfaceDebugPrint(TRACE,"got session watch lock\n");
> @@ -751,11 +751,11 @@ SessionFindWatchLocked(XenStoreSession
> *session,
> XenIfaceDebugPrint(WARNING,"couldn't find watch\n");
> return NULL;
>
> -}
> +}
>
> void FireSuspendEvent(PXENIFACE_FDO fdoData) {
> - XenIfaceDebugPrint(ERROR,"Ready to unsuspend Event\n");
> - KeSetEvent(&fdoData->registryWriteEvent, IO_NO_INCREMENT,
> FALSE);
> + XenIfaceDebugPrint(ERROR,"Ready to unsuspend Event\n");
> + KeSetEvent(&fdoData->registryWriteEvent, IO_NO_INCREMENT, FALSE);
> if (fdoData->WmiReady) {
> XenIfaceDebugPrint(TRACE,"Fire Suspend Event\n");
> WmiFireEvent(fdoData->Dx->DeviceObject,
> @@ -764,7 +764,7 @@ void FireSuspendEvent(PXENIFACE_FDO fdoData) {
> 0,
> NULL);
> }
> -}
> +}
> void FireWatch(XenStoreWatch* watch) {
> UCHAR * eventdata;
> ULONG RequiredSize;
> @@ -774,7 +774,7 @@ void FireWatch(XenStoreWatch* watch) {
> WMI_STRING, GetCountedUnicodeStringSize(&watch->path),
> &sesbuf,
> WMI_DONE);
> -
> +
> eventdata = ExAllocatePoolWithTag(NonPagedPool, RequiredSize,'XIEV');
> if (eventdata!=NULL) {
> AccessWmiBuffer(eventdata, FALSE, &RequiredSize, RequiredSize,
> @@ -782,17 +782,17 @@ void FireWatch(XenStoreWatch* watch) {
> &sesbuf,
> WMI_DONE);
>
> - WriteCountedUnicodeString(&watch->path, sesbuf);
> + WriteCountedUnicodeString(&watch->path, sesbuf);
> }
>
> if (eventdata !=NULL) {
> XenIfaceDebugPrint(TRACE,"Fire Watch Event\n");
> - WmiFireEvent(watch->fdoData->Dx->DeviceObject,
> + WmiFireEvent(watch->fdoData->Dx->DeviceObject,
> (LPGUID)&OBJECT_GUID(XenStoreWatchEvent),
> 0,
> - RequiredSize,
> + RequiredSize,
> eventdata);
> - }
> + }
> }
>
>
> @@ -800,7 +800,7 @@ KSTART_ROUTINE WatchCallbackThread;
> NTSTATUS
> StartWatch(XENIFACE_FDO *fdoData, XenStoreWatch *watch)
> {
> - char *tmppath;
> + char *tmppath;
> ANSI_STRING ansipath;
> NTSTATUS status;
> status = RtlUnicodeStringToAnsiString(&ansipath, &watch->path, TRUE);
> @@ -814,7 +814,7 @@ StartWatch(XENIFACE_FDO *fdoData,
> XenStoreWatch *watch)
> }
> RtlZeroMemory(tmppath, ansipath.Length+1);
> RtlCopyBytes(tmppath,ansipath.Buffer, ansipath.Length);
> -
> +
> status = XENBUS_STORE(WatchAdd, &fdoData->StoreInterface, NULL,
> tmppath, &watch->watchevent, &watch->watchhandle );
> if (!NT_SUCCESS(status)) {
> ExFreePool(tmppath);
> @@ -848,7 +848,7 @@ VOID WatchCallbackThread(__in PVOID StartContext)
> {
> watch = (XenStoreWatch *)watch->listentry.Flink;
> }
> session->mapchanged = FALSE;
> - session->watchevents[i] = &session->SessionChangedEvent;
> + session->watchevents[i] = &session->SessionChangedEvent;
> }
> ExReleaseFastMutex(&session->WatchMapLock);
> XenIfaceDebugPrint(TRACE,"Wait for new event\n");
> @@ -875,7 +875,7 @@ VOID WatchCallbackThread(__in PVOID StartContext)
> {
> if (watch->suspendcount !=XENBUS_SUSPEND(GetCount,
> &watch->fdoData->SuspendInterface)) {
> watch->suspendcount = XENBUS_SUSPEND(GetCount, &watch-
> >fdoData->SuspendInterface);
>
> XenIfaceDebugPrint(WARNING,"SessionSuspendResumeUnwatch %p\n",
> watch->watchhandle);
> -
> +
> XENBUS_STORE(WatchRemove, &watch->fdoData-
> >StoreInterface, watch->watchhandle);
> StartWatch(watch->fdoData, watch);
> }
> @@ -886,13 +886,13 @@ VOID WatchCallbackThread(__in PVOID
> StartContext) {
> }
> else if ( status == STATUS_WAIT_0 + i) {
> ExAcquireFastMutex(&session->WatchMapLock);
> - KeClearEvent(&session->SessionChangedEvent);
> + KeClearEvent(&session->SessionChangedEvent);
> if (session->closing==TRUE) {
> XenIfaceDebugPrint(TRACE,"Trying to end session thread\n");
> if (session->watchcount != 0) {
> XenStoreWatch *watch;
> - for (watch = (XenStoreWatch *)session->watches.Flink;
> - watch!=(XenStoreWatch *)&session->watches;
> + for (watch = (XenStoreWatch *)session->watches.Flink;
> + watch!=(XenStoreWatch *)&session->watches;
> watch=(XenStoreWatch *)session->watches.Flink) {
> FreeUnicodeStringBuffer(&watch->path);
> RemoveEntryList((LIST_ENTRY*)watch);
> @@ -907,7 +907,7 @@ VOID WatchCallbackThread(__in PVOID StartContext)
> {
> //ExReleaseFastMutex(&session->WatchMapLock);
> }
> else {
> -
> +
> ExReleaseFastMutex(&session->WatchMapLock);
> }
> }
> @@ -916,12 +916,12 @@ VOID WatchCallbackThread(__in PVOID
> StartContext) {
> }
>
> NTSTATUS
> -SessionAddWatchLocked(XenStoreSession *session,
> - XENIFACE_FDO* fdoData,
> +SessionAddWatchLocked(XenStoreSession *session,
> + XENIFACE_FDO* fdoData,
> UNICODE_STRING *path,
> XenStoreWatch **watch) {
>
> -
> +
> NTSTATUS status;
> XenStoreWatch *pwatch;
>
> @@ -934,18 +934,18 @@ SessionAddWatchLocked(XenStoreSession
> *session,
> return STATUS_INSUFFICIENT_RESOURCES;
> }
>
> - (*watch)->finished = FALSE;
> + (*watch)->finished = FALSE;
> (*watch)->fdoData = fdoData;
> UnicodeShallowCopy(&(*watch)->path, path);
>
>
> -
> +
> (*watch)->suspendcount = XENBUS_SUSPEND(GetCount, &fdoData-
> >SuspendInterface);
> -
> +
>
> KeInitializeEvent(&(*watch)->watchevent, NotificationEvent, FALSE);
>
> -
> +
> status = StartWatch(fdoData, *watch);
> if ((!NT_SUCCESS(status)) || ((*watch)->watchhandle == NULL)) {
> ExFreePool(*watch);
> @@ -1001,8 +1001,8 @@ void
> SessionRemoveWatchesLocked(XenStoreSession *session) {
>
> XenIfaceDebugPrint(TRACE, "wait remove mutex\n");
> ExAcquireFastMutex(&session->WatchMapLock);
> - for (watch = (XenStoreWatch *)session->watches.Flink;
> - watch!=(XenStoreWatch *)&session->watches;
> + for (watch = (XenStoreWatch *)session->watches.Flink;
> + watch!=(XenStoreWatch *)&session->watches;
> watch=(XenStoreWatch *)watch->listentry.Flink) {
>
> XenIfaceDebugPrint(TRACE, "try remove %p\n",session->watches.Flink
> );
> @@ -1017,7 +1017,7 @@ XenStoreSession*
> FindSessionByInstanceLocked(XENIFACE_FDO *fdoData,
> UNICODE_STRING *instance) {
> XenStoreSession *session;
> -
> +
> session = (XenStoreSession *)fdoData->SessionHead.Flink;
> while (session != (XenStoreSession *)&fdoData->SessionHead) {
> if (CompareUnicodeStrings(instance, &session->instancename)==0) {
> @@ -1059,7 +1059,7 @@ PSTR Xmasprintf(const char *fmt, ...) {
> out = ExAllocatePoolWithTag(NonPagedPool, basesize, 'XenP');
> if (out == NULL)
> return NULL;
> -
> +
> status = RtlStringCbVPrintfExA(out, basesize, NULL, &unused,0, fmt,
> argv);
>
> ExFreePool(out);
> @@ -1075,9 +1075,9 @@ PSTR Xmasprintf(const char *fmt, ...) {
> return out;
> }
>
> -NTSTATUS
> -CreateNewSession(XENIFACE_FDO *fdoData,
> - UNICODE_STRING *stringid,
> +NTSTATUS
> +CreateNewSession(XENIFACE_FDO *fdoData,
> + UNICODE_STRING *stringid,
> ULONG *sessionid) {
> XenStoreSession *session;
> PSTR iname;
> @@ -1093,7 +1093,7 @@ CreateNewSession(XENIFACE_FDO *fdoData,
> if (session == NULL)
> return STATUS_INSUFFICIENT_RESOURCES;
> RtlZeroMemory(session, sizeof(XenStoreSession));
> -
> +
> ExInitializeFastMutex(&session->WatchMapLock);
> session->mapchanged = TRUE;
> status = RtlUnicodeStringToAnsiString(&ansi, stringid, TRUE);
> @@ -1109,7 +1109,7 @@ CreateNewSession(XENIFACE_FDO *fdoData,
> status = STATUS_NO_MEMORY;
> if (iname == NULL) {
> UnlockSessions(fdoData);
> - RtlFreeAnsiString(&ansi);
> + RtlFreeAnsiString(&ansi);
> ExFreePool(session);
> return status;
> }
> @@ -1118,18 +1118,18 @@ CreateNewSession(XENIFACE_FDO *fdoData,
> ExFreePool(iname);
> if (!NT_SUCCESS(status)) {
> UnlockSessions(fdoData);
> - RtlFreeAnsiString(&ansi);
> + RtlFreeAnsiString(&ansi);
> ExFreePool(session);
> return status;
> }
> count++;
> -
> +
> } while (FindSessionByInstanceLocked(fdoData, &session->instancename)
> != NULL);
>
> -
> -
> -
> -
> +
> +
> +
> +
> if (fdoData->SessionHead.Flink==&fdoData->SessionHead) {
> session->id=0;
> }
> @@ -1142,12 +1142,12 @@ CreateNewSession(XENIFACE_FDO *fdoData,
> InsertHeadList((PLIST_ENTRY)&fdoData->SessionHead,
> (PLIST_ENTRY)session);
> *sessionid = session->id;
> UnicodeShallowCopy(&session->stringid, stringid);
> -
> +
> InitializeListHead((PLIST_ENTRY)&session->watches);
> -
> +
> KeInitializeEvent(&session->SessionChangedEvent, NotificationEvent,
> FALSE);
> session->closing = FALSE;
> - if (fdoData->InterfacesAcquired){
> + if (fdoData->InterfacesAcquired){
> XenIfaceDebugPrint(TRACE,"Add session unsuspended\n");
> session->suspended=FALSE;
> }
> @@ -1161,7 +1161,7 @@ CreateNewSession(XENIFACE_FDO *fdoData,
>
> status = PsCreateSystemThread(&hthread, THREAD_ALL_ACCESS, &oa,
> NULL, NULL, WatchCallbackThread, session);
> if (!NT_SUCCESS(status)) {
> - RtlFreeAnsiString(&ansi);
> + RtlFreeAnsiString(&ansi);
> ExFreePool(session);
> return status;
> }
> @@ -1170,17 +1170,17 @@ CreateNewSession(XENIFACE_FDO *fdoData,
> return STATUS_SUCCESS;
> }
>
> -void
> -RemoveSessionLocked(XENIFACE_FDO *fdoData,
> +void
> +RemoveSessionLocked(XENIFACE_FDO *fdoData,
> XenStoreSession *session) {
> -
> +
> XenIfaceDebugPrint(TRACE,"RemoveSessionLocked\n");
> RemoveEntryList((LIST_ENTRY*)session);
> fdoData->Sessions--;
> SessionRemoveWatchesLocked(session);
> if (session->transaction != NULL) {
> - XENBUS_STORE(TransactionEnd, &fdoData->StoreInterface, session-
> >transaction, FALSE);
> - }
> + XENBUS_STORE(TransactionEnd, &fdoData->StoreInterface, session-
> >transaction, FALSE);
> + }
> session->closing = TRUE;
> KeSetEvent(&session->SessionChangedEvent, IO_NO_INCREMENT,
> FALSE);
> KeWaitForSingleObject(session->WatchThread, Executive, KernelMode,
> FALSE, NULL);
> @@ -1191,7 +1191,7 @@ RemoveSessionLocked(XENIFACE_FDO *fdoData,
> }
>
> void
> -RemoveSession(XENIFACE_FDO *fdoData,
> +RemoveSession(XENIFACE_FDO *fdoData,
> XenStoreSession *session) {
> XenIfaceDebugPrint(TRACE,"RemoveSession\n");
> LockSessions(fdoData);
> @@ -1200,15 +1200,15 @@ RemoveSession(XENIFACE_FDO *fdoData,
> }
>
> void SessionsRemoveAll(XENIFACE_FDO *fdoData) {
> - XenIfaceDebugPrint(TRACE,"lock");
> + XenIfaceDebugPrint(TRACE,"lock");
> LockSessions(fdoData);
> - XenIfaceDebugPrint(TRACE,"in lock");
> + XenIfaceDebugPrint(TRACE,"in lock");
> while (fdoData->SessionHead.Flink != &fdoData->SessionHead) {
> RemoveSessionLocked(fdoData, (XenStoreSession *)fdoData-
> >SessionHead.Flink);
> }
> - XenIfaceDebugPrint(TRACE,"unlock");
> + XenIfaceDebugPrint(TRACE,"unlock");
> UnlockSessions(fdoData);
> - XenIfaceDebugPrint(TRACE,"unlocked");
> + XenIfaceDebugPrint(TRACE,"unlocked");
> }
>
>
> @@ -1237,15 +1237,15 @@ void
> SessionUnwatchWatchesLocked(XenStoreSession *session)
> ExReleaseFastMutex(&session->WatchMapLock);
> }
>
> -void SuspendSessionLocked(XENIFACE_FDO *fdoData,
> +void SuspendSessionLocked(XENIFACE_FDO *fdoData,
> XenStoreSession *session) {
> SessionUnwatchWatchesLocked(session);
> if (session->transaction != NULL) {
> XenIfaceDebugPrint(TRACE, "End transaction %p\n",session-
> >transaction);
> -
> - XENBUS_STORE(TransactionEnd, &fdoData->StoreInterface, session-
> >transaction, FALSE);
> +
> + XENBUS_STORE(TransactionEnd, &fdoData->StoreInterface, session-
> >transaction, FALSE);
> session->transaction = NULL;
> - }
> + }
> }
>
>
> @@ -1288,7 +1288,7 @@ void
> SessionRenewWatchesLocked(XenStoreSession *session) {
> ExReleaseFastMutex(&session->WatchMapLock);
> }
>
> -void ResumeSessionLocked(XENIFACE_FDO *fdoData,
> +void ResumeSessionLocked(XENIFACE_FDO *fdoData,
> XenStoreSession *session) {
> SessionRenewWatchesLocked(session);
> }
> @@ -1310,40 +1310,40 @@ void SessionsResumeAll(XENIFACE_FDO
> *fdoData) {
> NTSTATUS
> WmiInit(
> PXENIFACE_FDO FdoData
> - )
> + )
> {
> NTSTATUS status = STATUS_SUCCESS;
> XenIfaceDebugPrint(TRACE,"%s\n",__FUNCTION__);
> XenIfaceDebugPrint(INFO,"DRV: XenIface WMI Initialisation\n");
> -
> -
>
>
> - IoWMISuggestInstanceName(FdoData->PhysicalDeviceObject, NULL,
> FALSE,
> - &FdoData->SuggestedInstanceName);
> +
> +
> + IoWMISuggestInstanceName(FdoData->PhysicalDeviceObject, NULL,
> FALSE,
> + &FdoData->SuggestedInstanceName);
> InitializeListHead(&FdoData->SessionHead);
> FdoData->Sessions = 0;
> ExInitializeFastMutex(&FdoData->SessionLock);
> -
> +
> status = IoWMIRegistrationControl(FdoData->Dx->DeviceObject,
> WMIREG_ACTION_REGISTER);
> FdoData->WmiReady = 1;
> return status;
> }
>
> NTSTATUS
> -WmiFinalise(
> +WmiFinalise(
> PXENIFACE_FDO FdoData
> - )
> + )
> {
> NTSTATUS status = STATUS_SUCCESS;
> - if (FdoData->WmiReady) {
> + if (FdoData->WmiReady) {
> XenIfaceDebugPrint(INFO,"DRV: XenIface WMI Finalisation\n");
> XenIfaceDebugPrint(TRACE,"%s\n",__FUNCTION__);
> SessionsRemoveAll(FdoData);
>
> status =IoWMIRegistrationControl(FdoData->Dx->DeviceObject,
> WMIREG_ACTION_DEREGISTER);
> - RtlFreeUnicodeString(&FdoData->SuggestedInstanceName);
> - RtlZeroBytes(&FdoData->SuggestedInstanceName,
> sizeof(UNICODE_STRING));
> + RtlFreeUnicodeString(&FdoData->SuggestedInstanceName);
> + RtlZeroBytes(&FdoData->SuggestedInstanceName,
> sizeof(UNICODE_STRING));
>
> FdoData->WmiReady = 0;
> }
> @@ -1468,7 +1468,7 @@ SessionExecuteRemoveValue(UCHAR *InBuffer,
> }
>
> status = GetCountedUTF8String(&pathname, upathname);
> - if (!NT_SUCCESS(status))
> + if (!NT_SUCCESS(status))
> return status;
>
> status = STATUS_INSUFFICIENT_RESOURCES;
> @@ -1478,7 +1478,7 @@ SessionExecuteRemoveValue(UCHAR *InBuffer,
> }
> RtlZeroMemory(tmpbuffer, pathname->Length+1);
> RtlCopyBytes(tmpbuffer,pathname->Buffer, pathname->Length);
> -
> +
> status = STATUS_WMI_INSTANCE_NOT_FOUND;
> if ((session = FindSessionByInstanceAndLock(fdoData, instance)) ==
> NULL){
> @@ -1524,7 +1524,7 @@ SessionExecuteRemoveWatch(UCHAR *InBuffer,
> }
>
>
> - XenIfaceDebugPrint(TRACE, "Find Watch\n");
> + XenIfaceDebugPrint(TRACE, "Find Watch\n");
>
> watch = SessionFindWatchLocked(session, &unicpath_notbacked);
>
> @@ -1533,7 +1533,7 @@ SessionExecuteRemoveWatch(UCHAR *InBuffer,
> SessionRemoveWatchLocked(session, watch);
> }
> else {
> - XenIfaceDebugPrint(WARNING, "No Watch\n");
> + XenIfaceDebugPrint(WARNING, "No Watch\n");
> }
> #pragma prefast (suppress:26110)
> ExReleaseFastMutex(&session->WatchMapLock);
> @@ -1541,7 +1541,7 @@ SessionExecuteRemoveWatch(UCHAR *InBuffer,
>
> *byteswritten=0;
>
> -
> +
>
> return STATUS_SUCCESS;
>
> @@ -1586,11 +1586,11 @@ SessionExecuteSetWatch(UCHAR *InBuffer,
> FreeUnicodeStringBuffer(&unicpath_backed);
> return status;
> }
> -
> +
>
> *byteswritten=0;
>
> -
> +
>
> return STATUS_SUCCESS;
>
> @@ -1604,7 +1604,7 @@ SessionExecuteEndSession(UCHAR *InBuffer,
> UNICODE_STRING *instance,
> OUT ULONG_PTR *byteswritten) {
> XenStoreSession *session;
> - XenIfaceDebugPrint(TRACE, "ExecuteEndSession\n");
> + XenIfaceDebugPrint(TRACE, "ExecuteEndSession\n");
> *byteswritten = 0;
> if ((session = FindSessionByInstanceAndLock(fdoData, instance)) ==
> NULL){
> @@ -1633,7 +1633,7 @@ SessionExecuteSetValue(UCHAR *InBuffer,
> char *tmppath;
> char* tmpvalue;
>
> - XenIfaceDebugPrint(TRACE, " Try to write\n");
> + XenIfaceDebugPrint(TRACE, " Try to write\n");
> if (!AccessWmiBuffer(InBuffer, TRUE, &RequiredSize, InBufferSize,
> WMI_STRING, &upathname,
> WMI_STRING, &uvalue,
> @@ -1643,10 +1643,10 @@ SessionExecuteSetValue(UCHAR *InBuffer,
> return STATUS_INSUFFICIENT_RESOURCES;
> }
> status = GetCountedUTF8String(&pathname, upathname);
> - if (!NT_SUCCESS(status))
> + if (!NT_SUCCESS(status))
> return status;
>
> - status = STATUS_INSUFFICIENT_RESOURCES;
> + status = STATUS_INSUFFICIENT_RESOURCES;
> tmppath = ExAllocatePoolWithTag(NonPagedPool, pathname->Length+1,
> 'XenP');
> if (!tmppath) {
> goto fail1;
> @@ -1654,7 +1654,7 @@ SessionExecuteSetValue(UCHAR *InBuffer,
> RtlZeroMemory(tmppath, pathname->Length+1);
> RtlCopyBytes(tmppath,pathname->Buffer, pathname->Length);
> status = GetCountedUTF8String(&value, uvalue);
> - if (!NT_SUCCESS(status)){
> + if (!NT_SUCCESS(status)){
> goto fail2;
> }
> status = STATUS_INSUFFICIENT_RESOURCES;
> @@ -1664,14 +1664,14 @@ SessionExecuteSetValue(UCHAR *InBuffer,
> }
> RtlZeroMemory(tmpvalue, value->Length+1);
> RtlCopyBytes(tmpvalue,value->Buffer, value->Length);
> -
> +
> status = STATUS_WMI_INSTANCE_NOT_FOUND;
> if ((session = FindSessionByInstanceAndLock(fdoData, instance)) ==
> NULL){
> goto fail4;
> }
> status = XENBUS_STORE(Printf, &fdoData->StoreInterface, session-
> >transaction, NULL, tmppath, tmpvalue);
> - XenIfaceDebugPrint(TRACE, " Write %s to %s (%p)\n", tmpvalue,
> tmppath, status);
> + XenIfaceDebugPrint(TRACE, " Write %s to %s (%p)\n", tmpvalue,
> tmppath, status);
> UnlockSessions(fdoData);
>
> fail4:
> @@ -1685,10 +1685,10 @@ fail2:
>
> fail1:
> FreeUTF8String(pathname);
> -
> +
> *byteswritten = 0;
> return status;
> -
> +
> }
> NTSTATUS
> SessionExecuteGetFirstChild(UCHAR *InBuffer,
> @@ -1708,16 +1708,16 @@ SessionExecuteGetFirstChild(UCHAR *InBuffer,
> XenStoreSession *session;
> char *tmppath;
> if (!AccessWmiBuffer(InBuffer, TRUE, &RequiredSize, InBufferSize,
> - WMI_STRING, &uloc,
> + WMI_STRING, &uloc,
> WMI_DONE)){
> return STATUS_INVALID_DEVICE_REQUEST;
> }
> if (!fdoData->InterfacesAcquired) {
> return STATUS_INSUFFICIENT_RESOURCES;
> }
> -
> +
> status = GetCountedUTF8String(&path, uloc);
> -
> +
> if (!NT_SUCCESS(status)) {
> return status;
> }
> @@ -1737,7 +1737,7 @@ SessionExecuteGetFirstChild(UCHAR *InBuffer,
> }
> status = XENBUS_STORE(Directory,&fdoData->StoreInterface, session-
> >transaction, NULL, tmppath, &listresults);
> UnlockSessions(fdoData);
> -
> +
> if (!NT_SUCCESS(status)) {
> goto fail2;
> }
> @@ -1755,14 +1755,14 @@ SessionExecuteGetFirstChild(UCHAR *InBuffer,
> else {
> stringarraysize+=GetCountedUtf8Size("");
> }
> -
> +
> status = STATUS_BUFFER_TOO_SMALL;
> if (!AccessWmiBuffer(InBuffer, FALSE, &RequiredSize, OutBufferSize,
> WMI_STRING, stringarraysize, &valuepos,
> WMI_DONE)){
> goto fail3;
> }
> -
> +
> status = STATUS_SUCCESS;
> if ((listresults != NULL) && (listresults[0] != 0)) {
> PSTR fullpath;
> @@ -1770,8 +1770,8 @@ SessionExecuteGetFirstChild(UCHAR *InBuffer,
> fullpath = Xmasprintf("/%s", listresults);
> }
> else {
> - fullpath = Xmasprintf("%s/%s",
> - path->Buffer, listresults);
> + fullpath = Xmasprintf("%s/%s",
> + path->Buffer, listresults);
> }
>
> if (fullpath == NULL) {
> @@ -1826,16 +1826,16 @@ SessionExecuteGetNextSibling(UCHAR
> *InBuffer,
> int leafoffset;
> char *attemptstring;
> if (!AccessWmiBuffer(InBuffer, TRUE, &RequiredSize, InBufferSize,
> - WMI_STRING, &uloc,
> + WMI_STRING, &uloc,
> WMI_DONE)){
> return STATUS_INVALID_DEVICE_REQUEST;
> }
> if (!fdoData->InterfacesAcquired) {
> return STATUS_INSUFFICIENT_RESOURCES;
> }
> -
> +
> status = GetCountedUTF8String(&path, uloc);
> -
> +
> if (!NT_SUCCESS(status)) {
> return status;
> }
> @@ -1858,7 +1858,7 @@ SessionExecuteGetNextSibling(UCHAR *InBuffer,
> NULL){
> goto fail3;
> }
> -
> +
> leafoffset = 0;
> if (path->Length>1) {
> leafoffset = path->Length;
> @@ -1884,14 +1884,14 @@ SessionExecuteGetNextSibling(UCHAR
> *InBuffer,
>
> status = XENBUS_STORE(Directory,&fdoData->StoreInterface, session-
> >transaction, NULL, tmppath, &listresults);
> UnlockSessions(fdoData);
> -
> +
> if (!NT_SUCCESS(status)) {
> goto fail3;
> }
>
> stringarraysize = 0;
> RtlInitAnsiString(&checkleaf, tmpleaf);
> -
> +
> nextresult = listresults;
>
> while (*nextresult != 0) {
> @@ -1928,14 +1928,14 @@ SessionExecuteGetNextSibling(UCHAR
> *InBuffer,
> else {
> stringarraysize+=GetCountedUtf8Size("");
> }
> -
> +
> status = STATUS_BUFFER_TOO_SMALL;
> if (!AccessWmiBuffer(InBuffer, FALSE, &RequiredSize, OutBufferSize,
> WMI_STRING, stringarraysize, &valuepos,
> WMI_DONE)){
> goto fail4;
> }
> -
> +
> status = STATUS_SUCCESS;
> if (attemptstring != NULL) {
> PSTR fullpath;
> @@ -1943,8 +1943,8 @@ SessionExecuteGetNextSibling(UCHAR *InBuffer,
> fullpath = Xmasprintf("/%s", attemptstring);
> }
> else {
> - fullpath = Xmasprintf("%s/%s",
> - tmppath, attemptstring);
> + fullpath = Xmasprintf("%s/%s",
> + tmppath, attemptstring);
> }
>
> if (fullpath == NULL) {
> @@ -1969,7 +1969,7 @@ fail3:
> ExFreePool(tmpleaf);
>
> fail2:
> - ExFreePool(tmppath);
> + ExFreePool(tmppath);
>
> fail1:
> FreeUTF8String(path);
> @@ -1999,16 +1999,16 @@ SessionExecuteGetChildren(UCHAR *InBuffer,
> XenStoreSession *session;
> char *tmppath;
> if (!AccessWmiBuffer(InBuffer, TRUE, &RequiredSize, InBufferSize,
> - WMI_STRING, &uloc,
> + WMI_STRING, &uloc,
> WMI_DONE)){
> return STATUS_INVALID_DEVICE_REQUEST;
> }
> if (!fdoData->InterfacesAcquired) {
> return STATUS_INSUFFICIENT_RESOURCES;
> }
> -
> +
> status = GetCountedUTF8String(&path, uloc);
> -
> +
> if (!NT_SUCCESS(status)) {
> return status;
> }
> @@ -2028,7 +2028,7 @@ SessionExecuteGetChildren(UCHAR *InBuffer,
> }
> status = XENBUS_STORE(Directory,&fdoData->StoreInterface,session-
> >transaction,NULL, tmppath, &listresults);
> UnlockSessions(fdoData);
> -
> +
> if (!NT_SUCCESS(status)) {
> goto fail2;
> }
> @@ -2046,8 +2046,8 @@ SessionExecuteGetChildren(UCHAR *InBuffer,
> stringarraysize+=GetCountedUtf8Size(nextresults);
> for (;*nextresults!=0;nextresults++);
> nextresults++;
> - }
> -
> + }
> +
> status = STATUS_BUFFER_TOO_SMALL;
> if (!AccessWmiBuffer(InBuffer, FALSE, &RequiredSize, OutBufferSize,
> WMI_UINT32, &noofnodes,
> @@ -2065,8 +2065,8 @@ SessionExecuteGetChildren(UCHAR *InBuffer,
> fullpath = Xmasprintf("/%s", nextresults);
> }
> else {
> - fullpath = Xmasprintf("%s/%s",
> - path->Buffer, nextresults);
> + fullpath = Xmasprintf("%s/%s",
> + path->Buffer, nextresults);
> }
>
> if (fullpath == NULL) {
> @@ -2113,13 +2113,13 @@ SessionExecuteLog(UCHAR *InBuffer,
> NTSTATUS status;
> ANSI_STRING message;
> if (!AccessWmiBuffer(InBuffer, TRUE, &RequiredSize, InBufferSize,
> - WMI_STRING, &uloc,
> + WMI_STRING, &uloc,
> WMI_DONE))
> return STATUS_INVALID_DEVICE_REQUEST;
>
> status = GetCountedAnsiString(&message, uloc);
>
> - if (!NT_SUCCESS(status))
> + if (!NT_SUCCESS(status))
> return status;
>
> XenIfaceDebugPrint(INFO,"USER: %s\n", message.Buffer);
> @@ -2141,7 +2141,7 @@ SessionExecuteStartTransaction(UCHAR *InBuffer,
>
> NTSTATUS status = STATUS_SUCCESS;
> XenStoreSession *session;
> -
> +
> if (!fdoData->InterfacesAcquired) {
> status= STATUS_INSUFFICIENT_RESOURCES;
> goto failnotinitialised;
> @@ -2158,7 +2158,7 @@ SessionExecuteStartTransaction(UCHAR *InBuffer,
> }
>
> XENBUS_STORE(TransactionStart, &fdoData->StoreInterface, &session-
> >transaction);
> -
> +
>
> failtransactionactive:
> UnlockSessions(fdoData);
> @@ -2180,7 +2180,7 @@ SessionExecuteCommitTransaction(UCHAR
> *InBuffer,
>
> NTSTATUS status = STATUS_SUCCESS;
> XenStoreSession *session;
> -
> +
> if (!fdoData->InterfacesAcquired) {
> status= STATUS_INSUFFICIENT_RESOURCES;
> goto failnotinitialised;
> @@ -2197,7 +2197,7 @@ SessionExecuteCommitTransaction(UCHAR
> *InBuffer,
> }
>
> status = XENBUS_STORE(TransactionEnd,&fdoData->StoreInterface,
> session->transaction, TRUE);
> -
> +
> session->transaction = NULL;
>
> failtransactionnotactive:
> @@ -2220,7 +2220,7 @@ SessionExecuteAbortTransaction(UCHAR *InBuffer,
>
> NTSTATUS status = STATUS_SUCCESS;
> XenStoreSession *session;
> -
> +
> if (!fdoData->InterfacesAcquired) {
> status= STATUS_INSUFFICIENT_RESOURCES;
> goto failnotinitialised;
> @@ -2237,7 +2237,7 @@ SessionExecuteAbortTransaction(UCHAR *InBuffer,
> }
>
> status = XENBUS_STORE(TransactionEnd, &fdoData->StoreInterface,
> session->transaction, FALSE);
> -
> +
> session->transaction = NULL;
>
> failtransactionnotactive:
> @@ -2269,18 +2269,18 @@ SessionExecuteGetValue(UCHAR *InBuffer,
>
> *byteswritten = 0;
> if (!AccessWmiBuffer(InBuffer, TRUE, &RequiredSize, InBufferSize,
> - WMI_STRING, &uloc,
> + WMI_STRING, &uloc,
> WMI_DONE))
> return STATUS_INVALID_DEVICE_REQUEST;
> if (!fdoData->InterfacesAcquired) {
> return STATUS_INSUFFICIENT_RESOURCES;
> }
> -
> +
> status = GetCountedUTF8String(&path, uloc);
> -
> - if (!NT_SUCCESS(status))
> +
> + if (!NT_SUCCESS(status))
> return status;;
> -
> +
> status = STATUS_INSUFFICIENT_RESOURCES;
> tmppath = ExAllocatePoolWithTag(NonPagedPool,path-
> >Length+1,'XenP');
> if (!tmppath) {
> @@ -2288,7 +2288,7 @@ SessionExecuteGetValue(UCHAR *InBuffer,
> }
> RtlZeroMemory(tmppath, path->Length+1);
> RtlCopyBytes(tmppath,path->Buffer, path->Length);
> -
> +
>
> status = STATUS_WMI_INSTANCE_NOT_FOUND;
> if ((session = FindSessionByInstanceAndLock(fdoData, instance)) ==
> @@ -2297,10 +2297,10 @@ SessionExecuteGetValue(UCHAR *InBuffer,
> }
> status = XENBUS_STORE(Read, &fdoData->StoreInterface, session-
> >transaction, NULL, tmppath, &value);
> UnlockSessions(fdoData);
> -
> - if (!NT_SUCCESS(status))
> +
> + if (!NT_SUCCESS(status))
> goto fail2;
> -
> +
> status = STATUS_BUFFER_TOO_SMALL;
> if (!AccessWmiBuffer(OutBuffer, FALSE, &RequiredSize, OutBufferSize,
> WMI_STRING, GetCountedUtf8Size(value), &valuepos,
> @@ -2335,7 +2335,7 @@ BaseExecuteAddSession(UCHAR *InBuffer,
> NTSTATUS status;
> *byteswritten = 0;
> if (!AccessWmiBuffer(InBuffer, TRUE, &RequiredSize, InBufferSize,
> - WMI_STRING, &stringid,
> + WMI_STRING, &stringid,
> WMI_DONE)){
> return STATUS_INVALID_DEVICE_REQUEST;
> }
> @@ -2345,12 +2345,12 @@ BaseExecuteAddSession(UCHAR *InBuffer,
> *byteswritten = RequiredSize;
> return STATUS_BUFFER_TOO_SMALL;
> }
> -
> +
> AllocUnicodeStringBuffer(&ustring, *(USHORT*)(stringid));
> if (ustring.Buffer == NULL)
> return STATUS_INSUFFICIENT_RESOURCES;
> status = RtlUnicodeStringCbCopyStringN(&ustring,
> - (LPCWSTR)(stringid+sizeof(USHORT)),
> + (LPCWSTR)(stringid+sizeof(USHORT)),
> *(USHORT*)(stringid));
> if (!NT_SUCCESS(status)) {
> FreeUnicodeStringBuffer(&ustring);
> @@ -2368,7 +2368,7 @@ BaseExecuteAddSession(UCHAR *InBuffer,
> }
>
>
> -NTSTATUS
> +NTSTATUS
> SessionExecuteMethod(UCHAR *Buffer,
> ULONG BufferSize,
> XENIFACE_FDO* fdoData,
> @@ -2397,115 +2397,115 @@ SessionExecuteMethod(UCHAR *Buffer,
> return STATUS_INVALID_DEVICE_REQUEST;
> }
>
> - InBuffer = Buffer + Method->DataBlockOffset;
> + InBuffer = Buffer + Method->DataBlockOffset;
>
> GetCountedUnicodeString(&instance, InstStr);
>
> -
> +
> XenIfaceDebugPrint(TRACE,"Method Id %d\n", Method->MethodId);
> switch (Method->MethodId) {
> - case GetValue:
> - status = SessionExecuteGetValue(InBuffer, Method->SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + case GetValue:
> + status = SessionExecuteGetValue(InBuffer, Method->SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
> - case SetValue:
> - status = SessionExecuteSetValue(InBuffer, Method->SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + case SetValue:
> + status = SessionExecuteSetValue(InBuffer, Method->SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
> - case GetChildren:
> - status = SessionExecuteGetChildren(InBuffer, Method-
> >SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + case GetChildren:
> + status = SessionExecuteGetChildren(InBuffer, Method-
> >SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
> - case SetWatch:
> - status = SessionExecuteSetWatch(InBuffer, Method->SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + case SetWatch:
> + status = SessionExecuteSetWatch(InBuffer, Method->SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
> case EndSession:
> - status = SessionExecuteEndSession(InBuffer, Method->SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + status = SessionExecuteEndSession(InBuffer, Method-
> >SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
> - case RemoveWatch:
> - status = SessionExecuteRemoveWatch(InBuffer, Method-
> >SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + case RemoveWatch:
> + status = SessionExecuteRemoveWatch(InBuffer, Method-
> >SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
> - case RemoveValue:
> - status = SessionExecuteRemoveValue(InBuffer, Method-
> >SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + case RemoveValue:
> + status = SessionExecuteRemoveValue(InBuffer, Method-
> >SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
> case Log:
> - status = SessionExecuteLog(InBuffer, Method->SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + status = SessionExecuteLog(InBuffer, Method->SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
> - case StartTransaction:
> - status = SessionExecuteStartTransaction(InBuffer, Method-
> >SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + case StartTransaction:
> + status = SessionExecuteStartTransaction(InBuffer, Method-
> >SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
> case CommitTransaction:
> - status = SessionExecuteCommitTransaction(InBuffer, Method-
> >SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + status = SessionExecuteCommitTransaction(InBuffer, Method-
> >SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
> case AbortTransaction:
> - status = SessionExecuteAbortTransaction(InBuffer, Method-
> >SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + status = SessionExecuteAbortTransaction(InBuffer, Method-
> >SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
> case GetFirstChild:
> - status = SessionExecuteGetFirstChild(InBuffer, Method-
> >SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + status = SessionExecuteGetFirstChild(InBuffer, Method-
> >SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
> case GetNextSibling:
> - status = SessionExecuteGetNextSibling(InBuffer, Method-
> >SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> + status = SessionExecuteGetNextSibling(InBuffer, Method-
> >SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> fdoData,
> - &instance,
> + &instance,
> byteswritten);
> break;
>
> @@ -2519,11 +2519,11 @@ SessionExecuteMethod(UCHAR *Buffer,
> if (status == STATUS_BUFFER_TOO_SMALL) {
> return NodeTooSmall(Buffer, BufferSize, (ULONG)*byteswritten,
> byteswritten);
> }
> -
> +
> Method->WnodeHeader.BufferSize = (ULONG)*byteswritten;
> return status;
> }
> -NTSTATUS
> +NTSTATUS
> BaseExecuteMethod(UCHAR *Buffer,
> ULONG BufferSize,
> XENIFACE_FDO* fdoData,
> @@ -2540,14 +2540,14 @@ BaseExecuteMethod(UCHAR *Buffer,
> return STATUS_INVALID_DEVICE_REQUEST;
> }
>
> - InBuffer = Buffer + Method->DataBlockOffset;
> + InBuffer = Buffer + Method->DataBlockOffset;
>
> switch (Method->MethodId) {
> - case AddSession:
> - status = BaseExecuteAddSession(InBuffer, Method->SizeDataBlock,
> - Buffer+Method->DataBlockOffset,
> - BufferSize-Method->DataBlockOffset,
> - fdoData,
> + case AddSession:
> + status = BaseExecuteAddSession(InBuffer, Method->SizeDataBlock,
> + Buffer+Method->DataBlockOffset,
> + BufferSize-Method->DataBlockOffset,
> + fdoData,
> byteswritten);
> Method->SizeDataBlock = (ULONG)*byteswritten;
> *byteswritten+=Method->DataBlockOffset;
> @@ -2569,16 +2569,16 @@ WmiExecuteMethod(
> if (IsEqualGUID(stack->Parameters.WMI.DataPath,
> &OBJECT_GUID(XenStoreBase))) {
> return BaseExecuteMethod(stack->Parameters.WMI.Buffer,
> - stack->Parameters.WMI.BufferSize,
> + stack->Parameters.WMI.BufferSize,
> fdoData, byteswritten);
> }
> else if (IsEqualGUID(stack->Parameters.WMI.DataPath,
> &OBJECT_GUID(XenStoreSession))) {
> return SessionExecuteMethod(stack->Parameters.WMI.Buffer,
> - stack->Parameters.WMI.BufferSize,
> + stack->Parameters.WMI.BufferSize,
> fdoData, byteswritten);
> }
> -
> +
> else
> return STATUS_NOT_SUPPORTED;
> }
> @@ -2598,7 +2598,7 @@ GenerateSessionBlock(UCHAR *Buffer,
> ULONG* nameoffsets;
> UCHAR *data;
> UCHAR *names;
> -
> +
>
> LockSessions(fdoData);
>
> @@ -2615,14 +2615,14 @@ GenerateSessionBlock(UCHAR *Buffer,
>
> AccessWmiBuffer((PUCHAR)nodesizerequired, FALSE, &RequiredSize, 0,
> WMI_UINT32, &id,
> - WMI_STRING,
> - GetCountedUnicodeStringSize(&session->stringid),
> + WMI_STRING,
> + GetCountedUnicodeStringSize(&session->stringid),
> &sesbuf,
> WMI_DONE);
> nodesizerequired += RequiredSize;
> -
> +
> AccessWmiBuffer((PUCHAR)namesizerequired, FALSE, &RequiredSize,
> 0,
> - WMI_STRING,
> + WMI_STRING,
> GetCountedUnicodeStringSize(&session->instancename),
> &inamebuf,
> WMI_DONE);
> @@ -2630,7 +2630,7 @@ GenerateSessionBlock(UCHAR *Buffer,
> entries++;
> session = (XenStoreSession *)session->listentry.Flink;
> }
> -
> +
> //perform the access check
> if (!AccessWmiBuffer(Buffer, FALSE, &RequiredSize, BufferSize,
> WMI_BUFFER, sizeof(WNODE_ALL_DATA), &node,
> @@ -2665,21 +2665,21 @@ GenerateSessionBlock(UCHAR *Buffer,
>
> AccessWmiBuffer(datapos, FALSE, &RequiredSize, BufferSize+Buffer-
> datapos,
> WMI_UINT32, &id,
> - WMI_STRING,
> - GetCountedUnicodeStringSize(&session->stringid),
> + WMI_STRING,
> + GetCountedUnicodeStringSize(&session->stringid),
> &sesbuf,
> WMI_DONE);
>
> - node->OffsetInstanceDataAndLength[entrynum].OffsetInstanceData
> =
> + node->OffsetInstanceDataAndLength[entrynum].OffsetInstanceData
> =
> (ULONG)((UCHAR *)id - Buffer);
> - node->OffsetInstanceDataAndLength[entrynum].LengthInstanceData
> =
> + node-
> >OffsetInstanceDataAndLength[entrynum].LengthInstanceData =
> RequiredSize;
> *id = session->id;
> WriteCountedUnicodeString(&session->stringid, sesbuf);
> datapos+=RequiredSize;
>
> AccessWmiBuffer(namepos, FALSE, &RequiredSize,
> BufferSize+Buffer-namepos,
> - WMI_STRING,
> + WMI_STRING,
> GetCountedUnicodeStringSize(&session->instancename),
> &inamebuf,
> WMI_DONE);
> @@ -2773,8 +2773,8 @@ GenerateBaseInstance(
> else {
> *time = 0;
> }
> -
> -
> +
> +
> node->WnodeHeader.BufferSize = node->DataBlockOffset+RequiredSize;
> node->SizeDataBlock = RequiredSize;
>
> @@ -2796,7 +2796,7 @@ GenerateSessionInstance(UCHAR *Buffer,
> ULONG* id;
> XenStoreSession *session;
> UCHAR *sesbuf;
> -
> +
> if (!AccessWmiBuffer(Buffer, TRUE, &RequiredSize, BufferSize,
> WMI_BUFFER, sizeof(WNODE_SINGLE_INSTANCE), &node,
> WMI_DONE))
> @@ -2805,7 +2805,7 @@ GenerateSessionInstance(UCHAR *Buffer,
> }
> if (!AccessWmiBuffer(Buffer, TRUE, &RequiredSize, BufferSize,
> WMI_BUFFER, sizeof(WNODE_SINGLE_INSTANCE), &node,
> - WMI_STRINGOFFSET, node->OffsetInstanceName, &InstStr,
> + WMI_STRINGOFFSET, node->OffsetInstanceName, &InstStr,
> WMI_OFFSET, node->DataBlockOffset, 0, &dbo,
> WMI_DONE))
> {
> @@ -2818,10 +2818,10 @@ GenerateSessionInstance(UCHAR *Buffer,
> UnlockSessions(fdoData);
> return STATUS_WMI_INSTANCE_NOT_FOUND;
> }
> -
> +
> if (!AccessWmiBuffer(dbo, FALSE, &RequiredSize, BufferSize-node-
> >DataBlockOffset,
> WMI_UINT32, &id,
> - WMI_STRING,
> + WMI_STRING,
> GetCountedUnicodeStringSize(&session->stringid),
> &sesbuf,
> WMI_DONE)) {
> @@ -2837,7 +2837,7 @@ GenerateSessionInstance(UCHAR *Buffer,
> node->WnodeHeader.BufferSize = node->DataBlockOffset +
> RequiredSize;
> *byteswritten = node->DataBlockOffset + RequiredSize;
>
> -
> +
>
>
> return STATUS_SUCCESS;
> @@ -2851,17 +2851,17 @@ WmiQueryAllData(
> OUT ULONG_PTR *byteswritten
> )
> {
> -
> - if (IsEqualGUID(stack->Parameters.WMI.DataPath,
> +
> + if (IsEqualGUID(stack->Parameters.WMI.DataPath,
> &OBJECT_GUID(XenStoreBase))) {
> return GenerateBaseBlock( fdoData,
> - stack->Parameters.WMI.Buffer,
> + stack->Parameters.WMI.Buffer,
> stack->Parameters.WMI.BufferSize,
> byteswritten);
> }
> - else if (IsEqualGUID(stack->Parameters.WMI.DataPath,
> + else if (IsEqualGUID(stack->Parameters.WMI.DataPath,
> &OBJECT_GUID(XenStoreSession))) {
> - return GenerateSessionBlock(stack->Parameters.WMI.Buffer,
> + return GenerateSessionBlock(stack->Parameters.WMI.Buffer,
> stack->Parameters.WMI.BufferSize,
> fdoData,
> byteswritten);
> @@ -2882,13 +2882,13 @@ WmiQuerySingleInstance(
> if (IsEqualGUID(stack->Parameters.WMI.DataPath,
> &OBJECT_GUID(XenStoreBase))) {
> return GenerateBaseInstance(fdoData,
> - stack->Parameters.WMI.Buffer,
> + stack->Parameters.WMI.Buffer,
> stack->Parameters.WMI.BufferSize,
> byteswritten);
> }
> else if (IsEqualGUID(stack->Parameters.WMI.DataPath,
> &OBJECT_GUID(XenStoreSession))) {
> - return GenerateSessionInstance(stack->Parameters.WMI.Buffer,
> + return GenerateSessionInstance(stack->Parameters.WMI.Buffer,
> stack->Parameters.WMI.BufferSize,
> fdoData,
> byteswritten);
> @@ -2913,7 +2913,7 @@ WmiRegInfo(
> ULONG RequiredSize;
> int entries = 4;
> const static UNICODE_STRING mofname =
> RTL_CONSTANT_STRING(L"XENIFACEMOF");
> -
> +
> size_t mofnamesz;
>
>
> @@ -2927,12 +2927,12 @@ WmiRegInfo(
> mofnamesz = 0;
> }
> if(!AccessWmiBuffer(stack->Parameters.WMI.Buffer, FALSE,
> - &RequiredSize,
> + &RequiredSize,
> stack->Parameters.WMI.BufferSize,
> WMI_BUFFER, sizeof(WMIREGINFO), (UCHAR **)®info,
> WMI_BUFFER, entries * sizeof(WMIREGGUID), (UCHAR
> **)&guiddata,
> WMI_STRING, mofnamesz, &mofnameptr,
> - WMI_STRING,
> DriverParameters.RegistryPath.Length+sizeof(USHORT),
> + WMI_STRING,
> DriverParameters.RegistryPath.Length+sizeof(USHORT),
> ®path,
> WMI_DONE)){
> reginfo->BufferSize = RequiredSize;
> @@ -2940,7 +2940,7 @@ WmiRegInfo(
> return STATUS_BUFFER_TOO_SMALL;
>
> }
> - if (stack->Parameters.WMI.DataPath == WMIREGISTER) {
> + if (stack->Parameters.WMI.DataPath == WMIREGISTER) {
> reginfo->MofResourceName = (ULONG)((ULONG_PTR)mofnameptr -
> (ULONG_PTR)reginfo);
> WriteCountedUnicodeString(&mofname, mofnameptr);
> reginfo->RegistryPath = (ULONG)((ULONG_PTR)regpath -
> (ULONG_PTR)reginfo);
> @@ -2955,28 +2955,28 @@ WmiRegInfo(
> guid->InstanceCount = 1;
> guid->Guid = OBJECT_GUID(XenStoreBase);
> guid->Flags = WMIREG_FLAG_INSTANCE_PDO;
> - guid->Pdo = (ULONG_PTR)fdoData->PhysicalDeviceObject;
> - ObReferenceObject(fdoData->PhysicalDeviceObject);
> -
> + guid->Pdo = (ULONG_PTR)fdoData->PhysicalDeviceObject;
> + ObReferenceObject(fdoData->PhysicalDeviceObject);
> +
> guid = ®info->WmiRegGuid[1];
> guid->Guid = OBJECT_GUID(XenStoreSession);
> guid->Flags =0;
> -
> +
> guid = ®info->WmiRegGuid[2];
> guid->InstanceCount = 1;
> guid->Guid = OBJECT_GUID(XenStoreWatchEvent);
> guid->Flags = WMIREG_FLAG_INSTANCE_PDO |
> WMIREG_FLAG_EVENT_ONLY_GUID ;
> - guid->Pdo = (ULONG_PTR)fdoData->PhysicalDeviceObject;
> - ObReferenceObject(fdoData->PhysicalDeviceObject);
> + guid->Pdo = (ULONG_PTR)fdoData->PhysicalDeviceObject;
> + ObReferenceObject(fdoData->PhysicalDeviceObject);
>
> guid = ®info->WmiRegGuid[3];
> guid->InstanceCount = 1;
> guid->Guid = OBJECT_GUID(XenStoreUnsuspendedEvent);
> guid->Flags = WMIREG_FLAG_INSTANCE_PDO |
> WMIREG_FLAG_EVENT_ONLY_GUID ;
> - guid->Pdo = (ULONG_PTR)fdoData->PhysicalDeviceObject;
> - ObReferenceObject(fdoData->PhysicalDeviceObject);
> + guid->Pdo = (ULONG_PTR)fdoData->PhysicalDeviceObject;
> + ObReferenceObject(fdoData->PhysicalDeviceObject);
>
>
> *byteswritten = RequiredSize;
> @@ -2990,7 +2990,7 @@ WmiRegInfoEx(
> OUT ULONG_PTR *byteswritten
> )
> {
> -
> +
> XenIfaceDebugPrint(TRACE,"%s\n",__FUNCTION__);
> return WmiRegInfo(fdoData, stack, byteswritten);
> }
> @@ -3006,17 +3006,17 @@ WmiProcessMinorFunction(
> PIO_STACK_LOCATION stack;
> UCHAR MinorFunction;
>
> -
> +
>
> stack = IoGetCurrentIrpStackLocation(Irp);
>
> - if (stack->Parameters.WMI.ProviderId != (ULONG_PTR)fdoData->Dx-
> >DeviceObject) {
> - XenIfaceDebugPrint(TRACE,"ProviderID %p %p", stack-
> >Parameters.WMI.ProviderId, fdoData->PhysicalDeviceObject);
> - return STATUS_NOT_SUPPORTED;
> - }
> - else {
> - XenIfaceDebugPrint(TRACE,"ProviderID Match %p %p",
> stack->Parameters.WMI.ProviderId, fdoData->PhysicalDeviceObject);
> - }
> + if (stack->Parameters.WMI.ProviderId != (ULONG_PTR)fdoData->Dx-
> >DeviceObject) {
> + XenIfaceDebugPrint(TRACE,"ProviderID %p %p", stack-
> >Parameters.WMI.ProviderId, fdoData->PhysicalDeviceObject);
> + return STATUS_NOT_SUPPORTED;
> + }
> + else {
> + XenIfaceDebugPrint(TRACE,"ProviderID Match %p %p", stack-
> >Parameters.WMI.ProviderId, fdoData->PhysicalDeviceObject);
> + }
> MinorFunction = stack->MinorFunction;
>
> switch (MinorFunction)
> @@ -3060,9 +3060,9 @@ NTSTATUS XenIfaceSystemControl(
> status = WmiProcessMinorFunction(fdoData, Irp);
>
> if (status != STATUS_NOT_SUPPORTED) {
> - Irp->IoStatus.Status = status;
> + Irp->IoStatus.Status = status;
> IoCompleteRequest(Irp, IO_NO_INCREMENT);
> -
> +
> }
> else {
> IoSkipCurrentIrpStackLocation(Irp);
> diff --git a/src/xeniface/wmi.h b/src/xeniface/wmi.h
> index ed77af7..a49f1b3 100644
> --- a/src/xeniface/wmi.h
> +++ b/src/xeniface/wmi.h
> @@ -60,15 +60,15 @@ NTSTATUS XenIfaceSystemControl(
> );
>
> void FireSuspendEvent(
> - IN OUT PXENIFACE_FDO fdoData
> - );
> + IN OUT PXENIFACE_FDO fdoData
> + );
>
> void SessionsResumeAll(
> - XENIFACE_FDO *fdoData
> + XENIFACE_FDO *fdoData
> );
>
> void SessionsSuspendAll(
> - XENIFACE_FDO *fdoData
> + XENIFACE_FDO *fdoData
> );
>
> #endif
> --
> 1.8.1.msysgit.1
>
> _______________________________________________
> win-pv-devel mailing list
> win-pv-devel@lists.xenproject.org
> http://lists.xenproject.org/cgi-bin/mailman/listinfo/win-pv-devel
_______________________________________________
win-pv-devel mailing list
win-pv-devel@lists.xenproject.org
http://lists.xenproject.org/cgi-bin/mailman/listinfo/win-pv-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic