27 Mar
2010
27 Mar
'10
10:45 a.m.
Author: tkreuzer
Date: Sat Mar 27 11:45:04 2010
New Revision: 46487
URL: http://svn.reactos.org/svn/reactos?rev=46487&view=rev
Log:
More formatting fixe
Modified:
branches/header-work/include/ddk/ntddk.h
branches/header-work/include/ddk/wdm.h
branches/header-work/include/psdk/devioctl.h
branches/header-work/include/xdk/cmfuncs.h
branches/header-work/include/xdk/cmtypes.h
branches/header-work/include/xdk/exfuncs.h
branches/header-work/include/xdk/extypes.h
branches/header-work/include/xdk/halfuncs.h
branches/header-work/include/xdk/haltypes.h
branches/header-work/include/xdk/iofuncs.h
Modified: branches/header-work/include/ddk/ntddk.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h…
==============================================================================
--- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Sat Mar 27 11:45:04 2010
@@ -110,7 +110,6 @@
} ZONE_HEADER, *PZONE_HEADER;
#define PROTECTED_POOL 0x80000000
-
/******************************************************************************
* I/O Manager Types *
@@ -3238,6 +3237,7 @@
/******************************************************************************
* Executive Functions *
******************************************************************************/
+
static __inline PVOID
ExAllocateFromZone(
IN PZONE_HEADER Zone)
@@ -3330,8 +3330,6 @@
IN ULONG Value);
#endif
-
-
#if (NTDDI_VERSION >= NTDDI_WIN2K)
NTKERNELAPI
NTSTATUS
@@ -3377,9 +3375,7 @@
NTAPI
ExRaiseDatatypeMisalignment(VOID);
-
#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
-
/* Hardware Abstraction Layer Functions */
@@ -3653,10 +3649,10 @@
#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
-
/******************************************************************************
* I/O Manager Functions *
******************************************************************************/
+
/*
* VOID IoAssignArcName(
* IN PUNICODE_STRING ArcName,
@@ -3682,9 +3678,8 @@
DriverContext->Size = sizeof(IO_DRIVER_CREATE_CONTEXT);
}
-
-
#if (NTDDI_VERSION >= NTDDI_WIN2K)
+
#if !(defined(USE_DMA_MACROS) && (defined(_NTDDK_) || defined(_NTDRIVER_)) ||
defined(_WDM_INCLUDED_))
NTKERNELAPI
NTSTATUS
@@ -3903,6 +3898,7 @@
#endif /* (NTDDI_VERSION >= NTDDI_WIN2KSP3) */
#if (NTDDI_VERSION >= NTDDI_WINXP)
+
NTKERNELAPI
NTSTATUS
FASTCALL
@@ -4016,8 +4012,8 @@
IN PDEVICE_OBJECT TargetDevice,
OUT PDEVICE_OBJECT *AttachedToDeviceObject);
+
#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */
-
#if (NTDDI_VERSION >= NTDDI_WS03)
NTKERNELAPI
@@ -4095,9 +4091,7 @@
IoIsFileObjectIgnoringSharing(
IN PFILE_OBJECT FileObject);
-
#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */
-
#if (NTDDI_VERSION >= NTDDI_WIN7)
NTSTATUS
@@ -4105,9 +4099,7 @@
IoSetFileObjectIgnoreSharing(
IN PFILE_OBJECT FileObject);
-
#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
-
/******************************************************************************
* Kernel Debugger Functions *
Modified: branches/header-work/include/ddk/wdm.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r…
==============================================================================
--- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Sat Mar 27 11:45:04 2010
@@ -1966,7 +1966,6 @@
#else
#define IF_NTOS_DEBUG(FlagName) if(FALSE)
#endif
-
/******************************************************************************
* Security Manager Types *
@@ -11183,7 +11182,6 @@
* I/O Manager Functions *
******************************************************************************/
-
/*
* NTSTATUS
* IoAcquireRemoveLock(
@@ -12378,7 +12376,6 @@
#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
-
#if (NTDDI_VERSION >= NTDDI_WINXP)
NTKERNELAPI
@@ -12538,6 +12535,7 @@
IN ULONG Version,
IN ULONG ValueBufferSize,
IN PVOID ValueBuffer);
+
#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */
#if (NTDDI_VERSION >= NTDDI_WINXPSP1)
@@ -12550,7 +12548,6 @@
#endif
#if (NTDDI_VERSION >= NTDDI_WS03)
-
NTKERNELAPI
NTSTATUS
NTAPI
@@ -12573,9 +12570,7 @@
IN PVOID InsertContext OPTIONAL);
#endif /* (NTDDI_VERSION >= NTDDI_WS03) */
-
#if (NTDDI_VERSION >= NTDDI_VISTA)
-
NTKERNELAPI
NTSTATUS
NTAPI
@@ -12724,7 +12719,6 @@
#endif
#if (NTDDI_VERSION >= NTDDI_WIN7)
-
NTKERNELAPI
NTSTATUS
NTAPI
@@ -13408,7 +13402,6 @@
}
#if (NTDDI_VERSION >= NTDDI_WIN2K)
-
NTKERNELAPI
VOID
FASTCALL
@@ -14068,7 +14061,6 @@
}
}
-
/******************************************************************************
* Object Manager Functions *
******************************************************************************/
@@ -14664,6 +14656,7 @@
}
#endif /* USE_DMA_MACROS ... */
+
#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
#ifndef _NTTMAPI_
Modified: branches/header-work/include/psdk/devioctl.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/devioc…
==============================================================================
--- branches/header-work/include/psdk/devioctl.h [iso-8859-1] (original)
+++ branches/header-work/include/psdk/devioctl.h [iso-8859-1] Sat Mar 27 11:45:04 2010
@@ -24,7 +24,6 @@
#ifndef _DEVIOCTL_
#define _DEVIOCTL_
-
#define FILE_DEVICE_BEEP 0x00000001
@@ -98,14 +97,12 @@
/* DEVICE_OBJECT.DeviceType */
#define DEVICE_TYPE ULONG
-
#define CTL_CODE(DeviceType, Function, Method, Access) \
(((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) |
(Method))
#define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16)
#define METHOD_FROM_CTL_CODE(ctrlCode) ((ULONG)(ctrlCode & 3))
-
#define METHOD_BUFFERED 0
#define METHOD_IN_DIRECT 1
@@ -115,12 +112,10 @@
#define METHOD_DIRECT_TO_HARDWARE METHOD_IN_DIRECT
#define METHOD_DIRECT_FROM_HARDWARE METHOD_OUT_DIRECT
-
#define FILE_ANY_ACCESS 0x00000000
#define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS
#define FILE_READ_ACCESS 0x00000001
#define FILE_WRITE_ACCESS 0x00000002
-
#endif /*_DEVIOCTL_ */
Modified: branches/header-work/include/xdk/cmfuncs.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/cmfuncs…
==============================================================================
--- branches/header-work/include/xdk/cmfuncs.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/cmfuncs.h [iso-8859-1] Sat Mar 27 11:45:04 2010
@@ -66,5 +66,5 @@
#endif // NTDDI_VERSION >= NTDDI_VISTA
-$endif
+$endif (_WDMDDK_)
Modified: branches/header-work/include/xdk/cmtypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/cmtypes…
==============================================================================
--- branches/header-work/include/xdk/cmtypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/cmtypes.h [iso-8859-1] Sat Mar 27 11:45:04 2010
@@ -1005,9 +1005,8 @@
CM_SERVICE_VIRTUAL_DISK_BOOT_LOAD | \
CM_SERVICE_USB_DISK_BOOT_LOAD)
-$endif
+$endif (_WDMDDK_)
$if (_NTDDK_)
-
typedef struct _KEY_NAME_INFORMATION {
ULONG NameLength;
WCHAR Name[1];
@@ -1045,4 +1044,4 @@
UCHAR IRQMap[16];
} CM_PCCARD_DEVICE_DATA, *PCM_PCCARD_DEVICE_DATA;
-$endif /* _NTDDK_ */
+$endif (_NTDDK_)
Modified: branches/header-work/include/xdk/exfuncs.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/exfuncs…
==============================================================================
--- branches/header-work/include/xdk/exfuncs.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/exfuncs.h [iso-8859-1] Sat Mar 27 11:45:04 2010
@@ -1,6 +1,7 @@
/******************************************************************************
* Executive Functions *
******************************************************************************/
+
$if (_NTDDK_)
static __inline PVOID
ExAllocateFromZone(
@@ -94,8 +95,7 @@
IN ULONG Value);
#endif
-$endif
-
+$endif (_NTDDK_)
$if (_WDMDDK_)
#define ExInterlockedIncrementLong(Addend,Lock) Exfi386InterlockedIncrementLong(Addend)
#define ExInterlockedDecrementLong(Addend,Lock) Exfi386InterlockedDecrementLong(Addend)
@@ -325,8 +325,8 @@
KeInitializeEvent(&FastMutex->Event, SynchronizationEvent, FALSE);
return;
}
-$endif
-
+
+$endif (_WDMDDK_)
#if (NTDDI_VERSION >= NTDDI_WIN2K)
$if (_NTDDK_)
NTKERNELAPI
@@ -372,8 +372,8 @@
VOID
NTAPI
ExRaiseDatatypeMisalignment(VOID);
-$endif
-
+
+$endif (_NTDDK_)
$if (_WDMDDK_)
NTKERNELAPI
VOID
@@ -750,8 +750,8 @@
NTAPI
ExUnregisterCallback(
IN OUT PVOID CbRegistration);
-$endif
-
+
+$endif (_WDMDDK_)
#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
$if (_WDMDDK_)
@@ -1036,5 +1036,4 @@
}
}
-$endif
-
+$endif (_WDMDDK_)
Modified: branches/header-work/include/xdk/extypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/extypes…
==============================================================================
--- branches/header-work/include/xdk/extypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/extypes.h [iso-8859-1] Sat Mar 27 11:45:04 2010
@@ -1,8 +1,8 @@
/******************************************************************************
* Executive Types *
******************************************************************************/
+
$if (_WDMDDK_)
-
#define EX_RUNDOWN_ACTIVE 0x1
#define EX_RUNDOWN_COUNT_SHIFT 0x1
#define EX_RUNDOWN_COUNT_INC (1 << EX_RUNDOWN_COUNT_SHIFT)
@@ -268,9 +268,8 @@
#define IF_NTOS_DEBUG(FlagName) if(FALSE)
#endif
-$endif /* _WDMDDK_ */
+$endif (_WDMDDK_)
$if (_NTDDK_)
-
typedef struct _ZONE_SEGMENT_HEADER {
SINGLE_LIST_ENTRY SegmentList;
PVOID Reserved;
@@ -285,5 +284,4 @@
#define PROTECTED_POOL 0x80000000
-$endif /* _NTDDK_ */
-
+$endif (_NTDDK_)
Modified: branches/header-work/include/xdk/halfuncs.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/halfunc…
==============================================================================
--- branches/header-work/include/xdk/halfuncs.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/halfuncs.h [iso-8859-1] Sat Mar 27 11:45:04 2010
@@ -3,8 +3,8 @@
#if (NTDDI_VERSION >= NTDDI_WIN2K)
#if defined(USE_DMA_MACROS) && !defined(_NTHAL_) && (defined(_NTDDK_) ||
defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_)
+
$if (_WDMDDK_)
-
FORCEINLINE
PVOID
NTAPI
@@ -69,9 +69,8 @@
return alignment;
}
-$endif
+$endif (_WDMDDK_)
$if (_NTDDK_)
-
/* Nothing here */
#else /* USE_DMA_MACROS ... */
@@ -141,10 +140,10 @@
IN ULONG NumberOfMapRegisters,
IN PDRIVER_CONTROL ExecutionRoutine);
-$endif /* _NTDDK_ */
+$endif (_NTDDK_)
#endif /* USE_DMA_MACROS ... */
+
$if (_NTDDK_)
-
#if !defined(NO_LEGACY_DRIVERS)
NTHALAPI
NTSTATUS
@@ -273,10 +272,10 @@
IN PSCATTER_GATHER_LIST ScatterGather,
IN BOOLEAN WriteToDevice);
-$endif /* _NTDDK_ */
+$endif (_NTDDK_)
#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
+
$if (_NTDDK_)
-
#if (NTDDI_VERSION >= NTDDI_WINXP)
NTKERNELAPI
VOID
@@ -342,5 +341,4 @@
#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
-$endif /* _NTDDK_ */
-
+$endif (_NTDDK_)
Modified: branches/header-work/include/xdk/haltypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/haltype…
==============================================================================
--- branches/header-work/include/xdk/haltypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/haltypes.h [iso-8859-1] Sat Mar 27 11:45:04 2010
@@ -547,5 +547,5 @@
#define HAL_PLATFORM_DISABLE_UC_MAIN_MEMORY 0x08L
#define HAL_PLATFORM_ENABLE_WRITE_COMBINING_MMIO 0x10L
#define HAL_PLATFORM_ACPI_TABLES_CACHED 0x20L
-$endif
-
+
+$endif (_NTDDK_)
Modified: branches/header-work/include/xdk/iofuncs.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iofuncs…
==============================================================================
--- branches/header-work/include/xdk/iofuncs.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/iofuncs.h [iso-8859-1] Sat Mar 27 11:45:04 2010
@@ -1,6 +1,7 @@
/******************************************************************************
* I/O Manager Functions *
******************************************************************************/
+
$if (_NTDDK_)
/*
* VOID IoAssignArcName(
@@ -26,9 +27,8 @@
RtlZeroMemory(DriverContext, sizeof(IO_DRIVER_CREATE_CONTEXT));
DriverContext->Size = sizeof(IO_DRIVER_CREATE_CONTEXT);
}
-$endif
-
-
+
+$endif (_NTDDK_)
$if (_WDMDDK_)
/*
* NTSTATUS
@@ -571,9 +571,10 @@
WriteToDevice);
}
#endif
-$endif
-
+
+$endif (_WDMDDK_)
#if (NTDDI_VERSION >= NTDDI_WIN2K)
+
$if (_NTDDK_)
#if !(defined(USE_DMA_MACROS) && (defined(_NTDDK_) || defined(_NTDRIVER_)) ||
defined(_WDM_INCLUDED_))
NTKERNELAPI
@@ -772,8 +773,8 @@
NTAPI
IoSetThreadHardErrorMode(
IN BOOLEAN EnableHardErrors);
-$endif
-
+
+$endif (_NTDDK_)
$if (_WDMDDK_)
NTKERNELAPI
VOID
@@ -1423,7 +1424,7 @@
IoSetTopLevelIrp(
IN PIRP Irp OPTIONAL);
-$endif
+$endif (_WDMDDK_)
#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
$if (_NTDDK_)
@@ -1443,9 +1444,10 @@
IN BOOLEAN Remote);
#endif /* (NTDDI_VERSION >= NTDDI_WIN2KSP3) */
-$endif
-
+
+$endif (_NTDDK_)
#if (NTDDI_VERSION >= NTDDI_WINXP)
+
$if (_NTDDK_)
NTKERNELAPI
NTSTATUS
@@ -1559,8 +1561,8 @@
IN PDEVICE_OBJECT SourceDevice,
IN PDEVICE_OBJECT TargetDevice,
OUT PDEVICE_OBJECT *AttachedToDeviceObject);
-$endif
-
+
+$endif (_NTDDK_)
$if (_WDMDDK_)
NTKERNELAPI
NTSTATUS
@@ -1719,7 +1721,8 @@
IN ULONG Version,
IN ULONG ValueBufferSize,
IN PVOID ValueBuffer);
-$endif
+$endif (_WDMDDK_)
+
#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */
$if (_WDMDDK_)
@@ -1731,8 +1734,8 @@
IN PIRP Irp,
IN ULONG RequiredAccess);
#endif
-$endif
-
+
+$endif (_WDMDDK_)
#if (NTDDI_VERSION >= NTDDI_WS03)
$if (_NTDDK_)
NTKERNELAPI
@@ -1740,8 +1743,8 @@
FASTCALL
IoGetPagingIoPriority(
IN PIRP Irp);
-$endif
-
+
+$endif (_NTDDK_)
$if (_WDMDDK_)
NTKERNELAPI
NTSTATUS
@@ -1763,7 +1766,7 @@
IN PIRP Irp,
IN PIO_CSQ_IRP_CONTEXT Context OPTIONAL,
IN PVOID InsertContext OPTIONAL);
-$endif
+$endif (_WDMDDK_)
#endif /* (NTDDI_VERSION >= NTDDI_WS03) */
$if (_NTDDK_)
@@ -1777,8 +1780,8 @@
IN OUT PULONG AddressSpace,
OUT PPHYSICAL_ADDRESS TranslatedAddress);
#endif
-$endif
-
+
+$endif (_NTDDK_)
#if (NTDDI_VERSION >= NTDDI_VISTA)
$if (_NTDDK_)
NTKERNELAPI
@@ -1835,8 +1838,8 @@
NTAPI
IoIsFileObjectIgnoringSharing(
IN PFILE_OBJECT FileObject);
-$endif
-
+
+$endif (_NTDDK_)
$if (_WDMDDK_)
NTKERNELAPI
NTSTATUS
@@ -1970,8 +1973,8 @@
PVOID Data,
PULONG RequiredSize,
PDEVPROPTYPE Type);
-$endif
-
+
+$endif (_WDMDDK_)
#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */
$if (_WDMDDK_)
@@ -1986,16 +1989,16 @@
IN PDEVICE_OBJECT SparePdo,
IN ULONG Flags);
#endif
-$endif
-
+
+$endif (_WDMDDK_)
#if (NTDDI_VERSION >= NTDDI_WIN7)
$if (_NTDDK_)
NTSTATUS
NTAPI
IoSetFileObjectIgnoreSharing(
IN PFILE_OBJECT FileObject);
-$endif
-
+
+$endif (_NTDDK_)
$if (_WDMDDK_)
NTKERNELAPI
NTSTATUS
@@ -2038,8 +2041,8 @@
IoGetDeviceNumaNode(
IN PDEVICE_OBJECT Pdo,
OUT PUSHORT NodeNumber);
-$endif
-
+
+$endif (_WDMDDK_)
#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
$if (_WDMDDK_)
@@ -2280,5 +2283,5 @@
DeviceObject );
}
#endif
-$endif
-
+
+$endif (_WDMDDK_)