Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[cgutman] 45907: - Transition the physical device into D0 state when we receive IRP_MN_START_DEVICE - Actually do the power state transtion when a PDO receives IRP_MN_SET_POWER for DevicePowerState - Fill the DEVICE_CHARACTERISTICS struct based on values in the acpi_device struct - Lots of unhacking
by cgutman＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cgutman Date: Sat Mar 6 07:03:04 2010 New Revision: 45907 URL: http://svn.reactos.org/svn/reactos?rev=45907&view=rev Log: - Transition the physical device into D0 state when we receive IRP_MN_START_DEVICE - Actually do the power state transtion when a PDO receives IRP_MN_SET_POWER for DevicePowerState - Fill the DEVICE_CHARACTERISTICS struct based on values in the acpi_device struct - Lots of unhacking Modified: trunk/reactos/drivers/bus/acpi/buspdo.c trunk/reactos/drivers/bus/acpi/power.c Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Sat Mar 6 07:03:04 2010 @@ -32,8 +32,13 @@ ) { NTSTATUS status; + struct acpi_device *device = NULL; + POWER_STATE state; PAGED_CODE (); + + if (DeviceData->AcpiHandle) + acpi_bus_get_device(DeviceData->AcpiHandle, &device); // @@ -51,6 +56,15 @@ // required to allow others to access this device. // Power up the device. // + if (device && !ACPI_SUCCESS(acpi_power_transition(device, ACPI_STATE_D0))) + { + DPRINT1("Device %x failed to start!\n", device); + status = STATUS_UNSUCCESSFUL; + break; + } + + state.DeviceState = PowerDeviceD0; + PoSetPowerState(DeviceData->Common.Self, DevicePowerState, state); DeviceData->Common.DevicePowerState = PowerDeviceD0; SET_NEW_PNP_STATE(DeviceData->Common, Started); status = STATUS_SUCCESS; @@ -62,7 +76,16 @@ // Here we shut down the device and give up and unmap any resources // we acquired for the device. // - + if (device && !ACPI_SUCCESS(acpi_power_transition(device, ACPI_STATE_D3))) + { + DPRINT1("Device %x failed to stop!\n", device); + status = STATUS_UNSUCCESSFUL; + break; + } + + state.DeviceState = PowerDeviceD3; + PoSetPowerState(DeviceData->Common.Self, DevicePowerState, state); + DeviceData->Common.DevicePowerState = PowerDeviceD3; SET_NEW_PNP_STATE(DeviceData->Common, Stopped); status = STATUS_SUCCESS; break; @@ -102,6 +125,8 @@ // We did receive a query-stop, so restore. // RESTORE_PREVIOUS_PNP_STATE(DeviceData->Common); + if (device) + acpi_power_transition(device, ACPI_STATE_D0); } status = STATUS_SUCCESS;// We must not fail this IRP. break; @@ -212,9 +237,6 @@ return status; } -// -// FIX ME FIX ME FIX ME !!! -// NTSTATUS Bus_PDO_QueryDeviceCaps( PPDO_DEVICE_DATA DeviceData, @@ -223,10 +245,13 @@ PIO_STACK_LOCATION stack; PDEVICE_CAPABILITIES deviceCapabilities; - DEVICE_CAPABILITIES parentCapabilities; - NTSTATUS status; + struct acpi_device *device = NULL; + ULONG i; PAGED_CODE (); + + if (DeviceData->AcpiHandle) + acpi_bus_get_device(DeviceData->AcpiHandle, &device); stack = IoGetCurrentIrpStackLocation (Irp); @@ -245,131 +270,80 @@ return STATUS_UNSUCCESSFUL; } - // - // Get the device capabilities of the parent - // - status = Bus_GetDeviceCapabilities( - FDO_FROM_PDO(DeviceData)->NextLowerDriver, &parentCapabilities); - if (!NT_SUCCESS(status)) { - - DPRINT("\tQueryDeviceCaps failed\n"); - return status; - + deviceCapabilities->D1Latency = 0; + deviceCapabilities->D2Latency = 0; + deviceCapabilities->D3Latency = 0; + + deviceCapabilities->DeviceState[PowerSystemWorking] = PowerDeviceD0; + deviceCapabilities->DeviceState[PowerSystemSleeping1] = PowerDeviceD3; + deviceCapabilities->DeviceState[PowerSystemSleeping2] = PowerDeviceD3; + deviceCapabilities->DeviceState[PowerSystemSleeping3] = PowerDeviceD3; + + for (i = 0; i < ACPI_D_STATE_COUNT && device; i++) + { + if (!device->power.states[i].flags.valid) + continue; + + switch (i) + { + case ACPI_STATE_D0: + deviceCapabilities->DeviceState[PowerSystemWorking] = PowerDeviceD0; + break; + + case ACPI_STATE_D1: + deviceCapabilities->DeviceState[PowerSystemSleeping1] = PowerDeviceD1; + deviceCapabilities->D1Latency = device->power.states[i].latency; + break; + + case ACPI_STATE_D2: + deviceCapabilities->DeviceState[PowerSystemSleeping2] = PowerDeviceD2; + deviceCapabilities->D2Latency = device->power.states[i].latency; + break; + + case ACPI_STATE_D3: + deviceCapabilities->DeviceState[PowerSystemSleeping3] = PowerDeviceD3; + deviceCapabilities->D3Latency = device->power.states[i].latency; + break; + } } - - // - // The entries in the DeviceState array are based on the capabilities - // of the parent devnode. These entries signify the highest-powered - // state that the device can support for the corresponding system - // state. A driver can specify a lower (less-powered) state than the - // bus driver. For eg: Suppose the acpi bus controller supports - // D0, D2, and D3; and the acpi Device supports D0, D1, D2, and D3. - // Following the above rule, the device cannot specify D1 as one of - // it's power state. A driver can make the rules more restrictive - // but cannot loosen them. - // First copy the parent's S to D state mapping - // - - RtlCopyMemory( - deviceCapabilities->DeviceState, - parentCapabilities.DeviceState, - (PowerSystemShutdown + 1) * sizeof(DEVICE_POWER_STATE) - ); - - // - // Adjust the caps to what your device supports. - // Our device just supports D0 and D3. - // - - deviceCapabilities->DeviceState[PowerSystemWorking] = PowerDeviceD0; - - if (deviceCapabilities->DeviceState[PowerSystemSleeping1] != PowerDeviceD0) - deviceCapabilities->DeviceState[PowerSystemSleeping1] = PowerDeviceD1; - - if (deviceCapabilities->DeviceState[PowerSystemSleeping2] != PowerDeviceD0) - deviceCapabilities->DeviceState[PowerSystemSleeping2] = PowerDeviceD3; - - if (deviceCapabilities->DeviceState[PowerSystemSleeping3] != PowerDeviceD0) - deviceCapabilities->DeviceState[PowerSystemSleeping3] = PowerDeviceD3; // We can wake the system from D1 deviceCapabilities->DeviceWake = PowerDeviceD1; - // - // Specifies whether the device hardware supports the D1 and D2 - // power state. Set these bits explicitly. - // - - deviceCapabilities->DeviceD1 = TRUE; // Yes we can - deviceCapabilities->DeviceD2 = FALSE; - - // - // Specifies whether the device can respond to an external wake - // signal while in the D0, D1, D2, and D3 state. - // Set these bits explicitly. - // + + deviceCapabilities->DeviceD1 = + (deviceCapabilities->DeviceState[PowerSystemSleeping1] == PowerDeviceD1) ? TRUE : FALSE; + deviceCapabilities->DeviceD2 = + (deviceCapabilities->DeviceState[PowerSystemSleeping2] == PowerDeviceD2) ? TRUE : FALSE; deviceCapabilities->WakeFromD0 = FALSE; deviceCapabilities->WakeFromD1 = TRUE; //Yes we can deviceCapabilities->WakeFromD2 = FALSE; deviceCapabilities->WakeFromD3 = FALSE; - - // We have no latencies - - deviceCapabilities->D1Latency = 0; - deviceCapabilities->D2Latency = 0; - deviceCapabilities->D3Latency = 0; - - // Ejection supported - - deviceCapabilities->EjectSupported = TRUE; - - // - // This flag specifies whether the device's hardware is disabled. - // The PnP Manager only checks this bit right after the device is - // enumerated. Once the device is started, this bit is ignored. - // - deviceCapabilities->HardwareDisabled = FALSE; - - // - // Out simulated device can be physically removed. - // - deviceCapabilities->Removable = TRUE; - // - // Setting it to TURE prevents the warning dialog from appearing - // whenever the device is surprise removed. - // - deviceCapabilities->SurpriseRemovalOK = TRUE; - - // We don't support system-wide unique IDs. - - deviceCapabilities->UniqueID = FALSE; - - // - // Specify whether the Device Manager should suppress all - // installation pop-ups except required pop-ups such as - // "no compatible drivers found." - // + if (device) + { + deviceCapabilities->EjectSupported = device->flags.ejectable; + deviceCapabilities->HardwareDisabled = !device->status.enabled; + deviceCapabilities->Removable = device->flags.removable; + deviceCapabilities->SurpriseRemovalOK = device->flags.suprise_removal_ok; + deviceCapabilities->UniqueID = device->flags.unique_id; + deviceCapabilities->NoDisplayInUI = !device->status.show_in_ui; + deviceCapabilities->Address = device->pnp.bus_address; + } + else + { + deviceCapabilities->EjectSupported = FALSE; + deviceCapabilities->HardwareDisabled = FALSE; + deviceCapabilities->Removable = FALSE; + deviceCapabilities->SurpriseRemovalOK = FALSE; + deviceCapabilities->UniqueID = FALSE; + deviceCapabilities->NoDisplayInUI = FALSE; + deviceCapabilities->Address = 0; + } deviceCapabilities->SilentInstall = FALSE; - - // - // Specifies an address indicating where the device is located - // on its underlying bus. The interpretation of this number is - // bus-specific. If the address is unknown or the bus driver - // does not support an address, the bus driver leaves this - // member at its default value of 0xFFFFFFFF. In this example - // the location address is same as instance id. - // - - //deviceCapabilities->Address = DeviceData->SerialNo; - - // - // UINumber specifies a number associated with the device that can - // be displayed in the user interface. - // - //deviceCapabilities->UINumber = DeviceData->SerialNo; + deviceCapabilities->UINumber = (ULONG)-1; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/bus/acpi/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] Sat Mar 6 07:03:04 2010 @@ -123,10 +123,15 @@ PIO_STACK_LOCATION stack; POWER_STATE powerState; POWER_STATE_TYPE powerType; + ULONG error; + struct acpi_device *device; stack = IoGetCurrentIrpStackLocation (Irp); powerType = stack->Parameters.Power.Type; powerState = stack->Parameters.Power.State; + + if (PdoData->AcpiHandle) + acpi_bus_get_device(PdoData->AcpiHandle, &device); switch (stack->MinorFunction) { case IRP_MN_SET_POWER: @@ -139,9 +144,43 @@ switch (powerType) { case DevicePowerState: - PoSetPowerState (PdoData->Common.Self, powerType, powerState); - PdoData->Common.DevicePowerState = powerState.DeviceState; - status = STATUS_SUCCESS; + if (!device) + { + PdoData->Common.DevicePowerState = powerState.DeviceState; + status = STATUS_SUCCESS; + break; + } + + switch (powerState.DeviceState) + { + case PowerDeviceD0: + error = acpi_power_transition(device, ACPI_STATE_D0); + break; + + case PowerDeviceD1: + error = acpi_power_transition(device, ACPI_STATE_D1); + break; + + case PowerDeviceD2: + error = acpi_power_transition(device, ACPI_STATE_D2); + break; + + case PowerDeviceD3: + error = acpi_power_transition(device, ACPI_STATE_D3); + break; + + default: + error = 0; + break; + } + + if (ACPI_SUCCESS(error)) + { + PdoData->Common.DevicePowerState = powerState.DeviceState; + status = STATUS_SUCCESS; + } + else + status = STATUS_UNSUCCESSFUL; break; case SystemPowerState:

1 0

[jimtabor] 45906: - [User32 Wine Test] Disable cancel mode test.
by jimtabor＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: jimtabor Date: Sat Mar 6 03:52:25 2010 New Revision: 45906 URL: http://svn.reactos.org/svn/reactos?rev=45906&view=rev Log: - [User32 Wine Test] Disable cancel mode test. Modified: trunk/rostests/winetests/user32/menu.c Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Sat Mar 6 03:52:25 2010 @@ -3218,7 +3218,7 @@ test_menu_hilitemenuitem(); test_menu_trackpopupmenu(); - test_menu_cancelmode(); +// test_menu_cancelmode(); test_menu_maxdepth(); test_menu_circref(); }

1 0

[tkreuzer] 45905: - Add PMDLX - MmProbeAndLockProcessPages is win2k, not XP - update CM_PARTIAL_RESOURCE_DESCRIPTOR - comment out some ExInterlocked functions for x86
by tkreuzer＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: tkreuzer Date: Sat Mar 6 03:21:20 2010 New Revision: 45905 URL: http://svn.reactos.org/svn/reactos?rev=45905&view=rev Log: - Add PMDLX - MmProbeAndLockProcessPages is win2k, not XP - update CM_PARTIAL_RESOURCE_DESCRIPTOR - comment out some ExInterlocked functions for x86 Modified: branches/header-work/include/ddk/wdm.h branches/header-work/include/ddk/winddk.h 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 6 03:21:20 2010 @@ -1794,6 +1794,7 @@ ULONG ByteCount; ULONG ByteOffset; } MDL, *PMDL; +typedef MDL *PMDLX; typedef enum _MEMORY_CACHING_TYPE_ORIG { MmFrameBufferCached = 2 @@ -1997,8 +1998,9 @@ VOID NTAPI MmBuildMdlForNonPagedPool( - IN OUT PMDL MemoryDescriptorList); - + IN OUT PMDLX MemoryDescriptorList); + +//DECLSPEC_DEPRECATED_DDK NTKERNELAPI PMDL NTAPI @@ -2126,6 +2128,15 @@ NTKERNELAPI VOID NTAPI +MmProbeAndLockProcessPages( + IN OUT PMDL MemoryDescriptorList, + IN PEPROCESS Process, + IN KPROCESSOR_MODE AccessMode, + IN LOCK_OPERATION Operation); + +NTKERNELAPI +VOID +NTAPI MmUnmapLockedPages( IN PVOID BaseAddress, IN PMDL MemoryDescriptorList); @@ -2169,15 +2180,6 @@ IN ULONG PoolTag, IN PMDL MemoryDescriptorList, IN MEMORY_CACHING_TYPE CacheType); - -NTKERNELAPI -VOID -NTAPI -MmProbeAndLockProcessPages( - IN OUT PMDL MemoryDescriptorList, - IN PEPROCESS Process, - IN KPROCESSOR_MODE AccessMode, - IN LOCK_OPERATION Operation); NTKERNELAPI NTSTATUS @@ -2793,7 +2795,12 @@ ULONG Length; } Port; struct { +#if defined(NT_PROCESSOR_GROUPS) + USHORT Level; + USHORT Group; +#else ULONG Level; +#endif ULONG Vector; KAFFINITY Affinity; } Interrupt; @@ -2801,17 +2808,26 @@ struct { __GNU_EXTENSION union { struct { +#if defined(NT_PROCESSOR_GROUPS) + USHORT Group; +#else USHORT Reserved; +#endif USHORT MessageCount; ULONG Vector; KAFFINITY Affinity; } Raw; struct { +#if defined(NT_PROCESSOR_GROUPS) + USHORT Level; + USHORT Group; +#else ULONG Level; +#endif ULONG Vector; KAFFINITY Affinity; } Translated; - }; + } DUMMYUNIONNAME; } MessageInterrupt; #endif struct { Modified: branches/header-work/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.… ============================================================================== --- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Sat Mar 6 03:21:20 2010 @@ -3650,6 +3650,7 @@ IN OUT PLARGE_INTEGER Remainder); #endif +#ifndef _X86_ NTKERNELAPI INTERLOCKED_RESULT NTAPI @@ -3671,6 +3672,7 @@ ExInterlockedIncrementLong( IN PLONG Addend, IN PKSPIN_LOCK Lock); +#endif NTHALAPI VOID

1 0

[tkreuzer] 45904: [WDM] - KPROCESSOR_MODE is CCHAR - add PF_XSAVE_ENABLED, SEC_COMMIT - KeSaveFloatingPointState and KeRestoreFloatingPointState are x86 only
by tkreuzer＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: tkreuzer Date: Sat Mar 6 02:07:32 2010 New Revision: 45904 URL: http://svn.reactos.org/svn/reactos?rev=45904&view=rev Log: [WDM] - KPROCESSOR_MODE is CCHAR - add PF_XSAVE_ENABLED, SEC_COMMIT - KeSaveFloatingPointState and KeRestoreFloatingPointState are x86 only Modified: branches/header-work/include/ddk/wdm.h 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 6 02:07:32 2010 @@ -281,7 +281,7 @@ ******************************************************************************/ typedef UCHAR KIRQL, *PKIRQL; -typedef UCHAR KPROCESSOR_MODE; +typedef CCHAR KPROCESSOR_MODE; typedef LONG KPRIORITY; typedef ULONG EXECUTION_STATE; @@ -310,6 +310,7 @@ #define PF_COMPARE_EXCHANGE128 14 #define PF_COMPARE64_EXCHANGE128 15 #define PF_CHANNELS_ENABLED 16 +#define PF_XSAVE_ENABLED 17 #define MAXIMUM_SUPPORTED_EXTENSION 512 #define MAXIMUM_WAIT_OBJECTS 64 @@ -1002,17 +1003,48 @@ * Kernel Functions * ******************************************************************************/ -#if (NTDDI_VERSION >= NTDDI_WIN2K) && defined(SINGLE_GROUP_LEGACY_API) +NTKERNELAPI +VOID +NTAPI +KeInitializeEvent( + OUT PRKEVENT Event, + IN EVENT_TYPE Type, + IN BOOLEAN State); + +NTKERNELAPI +VOID +NTAPI +KeClearEvent( + IN OUT PRKEVENT Event); + +#if (NTDDI_VERSION >= NTDDI_WIN2K) + +#if defined(SINGLE_GROUP_LEGACY_API) +NTKERNELAPI +VOID +NTAPI +KeRevertToUserAffinityThread(VOID); + +NTKERNELAPI +VOID +NTAPI +KeSetSystemAffinityThread( + IN KAFFINITY Affinity); + +NTKERNELAPI +VOID +NTAPI +KeSetTargetProcessorDpc( + IN PRKDPC Dpc, + IN CCHAR Number); + NTKERNELAPI KAFFINITY -KeQueryActiveProcessors ( +KeQueryActiveProcessors( VOID); #endif #if !defined(_M_AMD64) - -#if (NTDDI_VERSION >= NTDDI_WIN2K) - NTKERNELAPI ULONGLONG NTAPI @@ -1024,12 +1056,7 @@ NTAPI KeQuerySystemTime( OUT PLARGE_INTEGER CurrentTime); - -#endif - -#endif // !_M_AMD64 - -#if (NTDDI_VERSION >= NTDDI_WIN2K) +#endif /* !_M_AMD64 */ NTKERNELAPI DECLSPEC_NORETURN @@ -1312,6 +1339,7 @@ #if (NTDDI_VERSION >= NTDDI_WINXP) +// _DECL_HAL_KE_IMPORT VOID FASTCALL KeAcquireInStackQueuedSpinLock ( @@ -1399,6 +1427,7 @@ #endif +#if defined(_X86_) NTKERNELAPI NTSTATUS NTAPI @@ -1410,6 +1439,7 @@ NTAPI KeRestoreFloatingPointState( IN PKFLOATING_SAVE FloatSave); +#endif #if defined(_IA64_) FORCEINLINE @@ -1424,34 +1454,6 @@ VOID NTAPI KeFlushWriteBuffer(VOID); -#endif - -NTKERNELAPI -VOID -NTAPI -KeClearEvent( - IN OUT PRKEVENT Event); - -#if (NTDDI_VERSION >= NTDDI_WIN2K) && defined(SINGLE_GROUP_LEGACY_API) - -NTKERNELAPI -VOID -NTAPI -KeRevertToUserAffinityThread(VOID); - -NTKERNELAPI -VOID -NTAPI -KeSetSystemAffinityThread( - IN KAFFINITY Affinity); - -NTKERNELAPI -VOID -NTAPI -KeSetTargetProcessorDpc( - IN PRKDPC Dpc, - IN CCHAR Number); - #endif /* @@ -1605,14 +1607,6 @@ KeGetCurrentThread( VOID); #endif - -NTKERNELAPI -VOID -NTAPI -KeInitializeEvent( - OUT PRKEVENT Event, - IN EVENT_TYPE Type, - IN BOOLEAN State); /* * VOID @@ -1776,7 +1770,8 @@ #define MEM_LARGE_PAGES 0x20000000 #define MEM_4MB_PAGES 0x80000000 -#define SEC_RESERVE 0x4000000 +#define SEC_RESERVE 0x4000000 +#define SEC_COMMIT 0x8000000 #define SEC_LARGE_PAGES 0x80000000 /* Section map options */

1 0

[akhaldi] 45903: - Remove ntddk include from ntoskrnl.h - NTIFS : tagTOKEN_TYPE -> _TOKEN_TYPE - Remove redundant MmFlushImageSection definition from winddk - Add _BUS_HANDLER struct forwarder - Guard ifssupp.h with #ifndef _NTIFS_ condition - Add WAIT_TYPE, LOGICAL and PLOGICAL definitions to ntdef.h and get rid of the incorrect ones in winddk.h - Group related *_POWER_* definitions - Move PKSYNCHRONIZE_ROUTINE and POOL_TYPE to the kernel types section - PDEVICE_OBJECT DeviceObject -> struct _D
by akhaldi＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: akhaldi Date: Sat Mar 6 01:59:29 2010 New Revision: 45903 URL: http://svn.reactos.org/svn/reactos?rev=45903&view=rev Log: - Remove ntddk include from ntoskrnl.h - NTIFS : tagTOKEN_TYPE -> _TOKEN_TYPE - Remove redundant MmFlushImageSection definition from winddk - Add _BUS_HANDLER struct forwarder - Guard ifssupp.h with #ifndef _NTIFS_ condition - Add WAIT_TYPE, LOGICAL and PLOGICAL definitions to ntdef.h and get rid of the incorrect ones in winddk.h - Group related *_POWER_* definitions - Move PKSYNCHRONIZE_ROUTINE and POOL_TYPE to the kernel types section - PDEVICE_OBJECT DeviceObject -> struct _DEVICE_OBJECT *DeviceObject in some cases - PIRP Irp -> struct _IRP *Irp in some cases Modified: branches/header-work/include/ddk/ntifs.h branches/header-work/include/ddk/wdm.h branches/header-work/include/ddk/winddk.h branches/header-work/include/ndk/ifssupp.h branches/header-work/include/psdk/ntdef.h branches/header-work/ntoskrnl/include/ntoskrnl.h Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Sat Mar 6 01:59:29 2010 @@ -47,7 +47,7 @@ #include <ntnls.h> #include <ntstatus.h> #include <bugcodes.h> -#include <ntiologc.h> +/* FIXME : #include <ntiologc.h> */ #ifndef FlagOn #define FlagOn(_F,_SF) ((_F) & (_SF)) @@ -64,17 +64,6 @@ #ifndef ClearFlag #define ClearFlag(_F,_SF) ((_F) &= ~(_SF)) #endif - -typedef struct _BUS_HANDLER *PBUS_HANDLER; -typedef struct _CALLBACK_OBJECT *PCALLBACK_OBJECT; -typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT; -typedef struct _IO_TIMER *PIO_TIMER; -typedef struct _KINTERRUPT *PKINTERRUPT; -typedef struct _KPROCESS *PKPROCESS ,*PRKPROCESS, *PEPROCESS; -typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD, *PETHREAD; -typedef struct _OBJECT_TYPE *POBJECT_TYPE; -typedef struct _PEB *PPEB; -typedef struct _ACL *PACL; #define PsGetCurrentProcess IoGetCurrentProcess @@ -1032,7 +1021,8 @@ ULONG PrivilegeCount; LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY]; } TOKEN_PRIVILEGES,*PTOKEN_PRIVILEGES,*LPTOKEN_PRIVILEGES; -typedef enum tagTOKEN_TYPE { + +typedef enum _TOKEN_TYPE { TokenPrimary = 1, TokenImpersonation } TOKEN_TYPE,*PTOKEN_TYPE; @@ -6393,5 +6383,3 @@ #ifdef __cplusplus } #endif - -#endif /* _NTIFS_ */ 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 6 01:59:29 2010 @@ -78,7 +78,6 @@ typedef struct _HAL_DISPATCH_TABLE *PHAL_DISPATCH_TABLE; typedef struct _HAL_PRIVATE_DISPATCH_TABLE *PHAL_PRIVATE_DISPATCH_TABLE; typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT; -typedef struct _BUS_HANDLER *PBUS_HANDLER; typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; typedef struct _CALLBACK_OBJECT *PCALLBACK_OBJECT; typedef struct _ETHREAD *PETHREAD; @@ -284,6 +283,8 @@ typedef UCHAR KIRQL, *PKIRQL; typedef UCHAR KPROCESSOR_MODE; typedef LONG KPRIORITY; + +typedef ULONG EXECUTION_STATE; typedef enum _MODE { KernelMode, @@ -901,6 +902,28 @@ ULONG Period; } KTIMER, *PKTIMER, *RESTRICTED_POINTER PRKTIMER; +typedef BOOLEAN +(DDKAPI *PKSYNCHRONIZE_ROUTINE)( + IN PVOID SynchronizeContext); + +typedef enum _POOL_TYPE { + NonPagedPool, + PagedPool, + NonPagedPoolMustSucceed, + DontUseThisType, + NonPagedPoolCacheAligned, + PagedPoolCacheAligned, + NonPagedPoolCacheAlignedMustS, + MaxPoolType, + NonPagedPoolSession = 32, + PagedPoolSession, + NonPagedPoolMustSucceedSession, + DontUseThisTypeSession, + NonPagedPoolCacheAlignedSession, + PagedPoolCacheAlignedSession, + NonPagedPoolCacheAlignedMustSSession +} POOL_TYPE; + typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE { StandardDesign, @@ -2019,7 +2042,7 @@ LOGICAL NTAPI MmIsDriverVerifying( - IN PDRIVER_OBJECT DriverObject); + IN struct _DRIVER_OBJECT *DriverObject); NTKERNELAPI PVOID @@ -2063,7 +2086,7 @@ VOID NTAPI MmProbeAndLockPages( - IN OUT PMDLX MemoryDescriptorList, + IN OUT PMDL MemoryDescriptorList, IN KPROCESSOR_MODE AccessMode, IN LOCK_OPERATION Operation); @@ -2096,7 +2119,7 @@ VOID NTAPI MmUnlockPages( - IN OUT PMDLX MemoryDescriptorList); + IN OUT PMDL MemoryDescriptorList); NTKERNELAPI VOID @@ -2165,7 +2188,7 @@ NTSTATUS NTAPI MmProtectMdlSystemAddress( - IN PMDLX MemoryDescriptorList, + IN PMDL MemoryDescriptorList, IN ULONG NewProtect); NTKERNELAPI @@ -2174,7 +2197,7 @@ MmUnmapReservedMapping( IN PVOID BaseAddress, IN ULONG PoolTag, - IN PMDLX MemoryDescriptorList); + IN PMDL MemoryDescriptorList); #endif @@ -2529,6 +2552,24 @@ PowerDeviceMaximum } DEVICE_POWER_STATE, *PDEVICE_POWER_STATE; +typedef union _POWER_STATE { + SYSTEM_POWER_STATE SystemState; + DEVICE_POWER_STATE DeviceState; +} POWER_STATE, *PPOWER_STATE; + +typedef enum _POWER_STATE_TYPE { + SystemPowerState = 0, + DevicePowerState +} POWER_STATE_TYPE, *PPOWER_STATE_TYPE; + +typedef VOID +(DDKAPI *PREQUEST_POWER_COMPLETE)( + IN struct _DEVICE_OBJECT *DeviceObject, + IN UCHAR MinorFunction, + IN POWER_STATE PowerState, + IN PVOID Context, + IN struct _IO_STATUS_BLOCK *IoStatus); + /****************************************************************************** * Power Management Support Functions * ******************************************************************************/ @@ -2541,14 +2582,14 @@ NTSTATUS NTAPI PoCallDriver( - IN PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp); + IN struct _DEVICE_OBJECT *DeviceObject, + IN OUT struct _IRP *Irp); NTKERNELAPI PULONG NTAPI PoRegisterDeviceForIdleDetection( - IN PDEVICE_OBJECT DeviceObject, + IN struct _DEVICE_OBJECT *DeviceObject, IN ULONG ConservationIdleTime, IN ULONG PerformanceIdleTime, IN DEVICE_POWER_STATE State); @@ -2564,18 +2605,18 @@ NTSTATUS NTAPI PoRequestPowerIrp( - IN PDEVICE_OBJECT DeviceObject, + IN struct _DEVICE_OBJECT *DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, IN PREQUEST_POWER_COMPLETE CompletionFunction OPTIONAL, IN PVOID Context OPTIONAL, - OUT PIRP *Irp OPTIONAL); + OUT struct _IRP *Irp OPTIONAL); NTKERNELAPI POWER_STATE NTAPI PoSetPowerState( - IN PDEVICE_OBJECT DeviceObject, + IN struct _DEVICE_OBJECT *DeviceObject, IN POWER_STATE_TYPE Type, IN POWER_STATE State); @@ -2589,7 +2630,7 @@ VOID NTAPI PoStartNextPowerIrp( - IN OUT PIRP Irp); + IN OUT struct _IRP *Irp); NTKERNELAPI VOID @@ -5128,16 +5169,6 @@ #define IO_REPARSE 0x0 #define IO_REMOUNT 0x1 -typedef union _POWER_STATE { - SYSTEM_POWER_STATE SystemState; - DEVICE_POWER_STATE DeviceState; -} POWER_STATE, *PPOWER_STATE; - -typedef enum _POWER_STATE_TYPE { - SystemPowerState = 0, - DevicePowerState -} POWER_STATE_TYPE, *PPOWER_STATE_TYPE; - typedef struct _IO_STATUS_BLOCK { _ANONYMOUS_UNION union { NTSTATUS Status; @@ -5145,14 +5176,6 @@ } DUMMYUNIONNAME; ULONG_PTR Information; } IO_STATUS_BLOCK, *PIO_STATUS_BLOCK; - -typedef VOID -(DDKAPI *PREQUEST_POWER_COMPLETE)( - IN PDEVICE_OBJECT DeviceObject, - IN UCHAR MinorFunction, - IN POWER_STATE PowerState, - IN PVOID Context, - IN PIO_STATUS_BLOCK IoStatus); typedef struct _PCI_SLOT_NUMBER { union { @@ -6705,10 +6728,6 @@ (DDKAPI *PIO_TIMER_ROUTINE)( IN struct _DEVICE_OBJECT *DeviceObject, IN PVOID Context); - -typedef BOOLEAN -(DDKAPI *PKSYNCHRONIZE_ROUTINE)( - IN PVOID SynchronizeContext); typedef struct _IO_SECURITY_CONTEXT { PSECURITY_QUALITY_OF_SERVICE SecurityQos; @@ -8675,24 +8694,6 @@ #define PORT_MAXIMUM_MESSAGE_LENGTH 256 #endif -typedef enum _POOL_TYPE { - NonPagedPool, - PagedPool, - NonPagedPoolMustSucceed, - DontUseThisType, - NonPagedPoolCacheAligned, - PagedPoolCacheAligned, - NonPagedPoolCacheAlignedMustS, - MaxPoolType, - NonPagedPoolSession = 32, - PagedPoolSession, - NonPagedPoolMustSucceedSession, - DontUseThisTypeSession, - NonPagedPoolCacheAlignedSession, - PagedPoolCacheAlignedSession, - NonPagedPoolCacheAlignedMustSSession -} POOL_TYPE; - typedef enum _SUITE_TYPE { SmallBusiness, Enterprise, @@ -10123,9 +10124,6 @@ LT_LOWEST_LATENCY } LATENCY_TIME; - -typedef ULONG EXECUTION_STATE; - /* Constants */ #define NtCurrentProcess() ( (HANDLE)(LONG_PTR) -1 ) #define ZwCurrentProcess() NtCurrentProcess() Modified: branches/header-work/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.… ============================================================================== --- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Sat Mar 6 01:59:29 2010 @@ -79,17 +79,17 @@ struct _KTSS; struct _DRIVE_LAYOUT_INFORMATION_EX; struct _LOADER_PARAMETER_BLOCK; - +struct _BUS_HANDLER; + +typedef struct _BUS_HANDLER *PBUS_HANDLER; #if 1 /* FIXME: Unknown definitions */ struct _SET_PARTITION_INFORMATION_EX; -typedef ULONG WAIT_TYPE; #define WaitAll 0 #define WaitAny 1 typedef HANDLE TRACEHANDLE; typedef PVOID PWMILIB_CONTEXT; -typedef ULONG LOGICAL; #endif /* @@ -3042,13 +3042,6 @@ IN ULONG NumberOfBytes); NTKERNELAPI -BOOLEAN -NTAPI -MmFlushImageSection( - IN PSECTION_OBJECT_POINTERS SectionObjectPointer, - IN MMFLUSH_TYPE FlushType); - -NTKERNELAPI VOID NTAPI MmFreeNonCachedMemory( @@ -3903,7 +3896,7 @@ INTERLOCKED_RESULT FASTCALL Exfi386InterlockedIncrementLong( - IN PLONG Addend); + IN OUT PLONG volatile Addend); NTKERNELAPI INTERLOCKED_RESULT Modified: branches/header-work/include/ndk/ifssupp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ndk/ifssupp… ============================================================================== --- branches/header-work/include/ndk/ifssupp.h [iso-8859-1] (original) +++ branches/header-work/include/ndk/ifssupp.h [iso-8859-1] Sat Mar 6 01:59:29 2010 @@ -21,11 +21,13 @@ #define TOKEN_SOURCE_LENGTH 8 +#ifndef _NTIFS_ typedef enum _TOKEN_TYPE { TokenPrimary = 1, TokenImpersonation } TOKEN_TYPE, *PTOKEN_TYPE; + typedef PVOID PRTL_HEAP_PARAMETERS; typedef PVOID PFS_FILTER_CALLBACKS; @@ -260,5 +262,7 @@ #define HEAP_CREATE_ENABLE_TRACING 0x00020000 #define HEAP_CREATE_ENABLE_EXECUTE 0x00040000 +#endif + #endif // !NTOS_MODE_USER #endif // _NTIFS_ Modified: branches/header-work/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ntdef.… ============================================================================== --- branches/header-work/include/psdk/ntdef.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ntdef.h [iso-8859-1] Sat Mar 6 01:59:29 2010 @@ -96,6 +96,11 @@ NotificationTimer, SynchronizationTimer } TIMER_TYPE; + +typedef enum _WAIT_TYPE { + WaitAll, + WaitAny +} WAIT_TYPE; // // FIXME @@ -371,6 +376,9 @@ typedef ULONG FLONG; typedef UCHAR BOOLEAN; typedef BOOLEAN *PBOOLEAN; + +typedef ULONG LOGICAL; +typedef ULONG *PLOGICAL; // // Signed Types Modified: branches/header-work/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/nt… ============================================================================== --- branches/header-work/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ branches/header-work/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Sat Mar 6 01:59:29 2010 @@ -24,7 +24,6 @@ #undef DECLSPEC_IMPORT #define DECLSPEC_IMPORT #include <ntifs.h> -#include <ntddk.h> #include <wdmguid.h> #include <arc/arc.h> #undef NTHALAPI

1 0

[akhaldi] 45902: [NTIFS] - Group related definitions - Correct ACCESS_MAX_MS_V5_ACE_TYPE definition - Add SYSTEM_MANDATORY_LABEL_ACE_TYPE, SUCCESSFUL_ACCESS_ACE_FLAG, FAILED_ACCESS_ACE_FLAG, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, SYSTEM_MANDATORY_LABEL_NO_READ_UP, SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP and SYSTEM_MANDATORY_LABEL_VALID_MASK definitions
by akhaldi＠svn.reactos.org 05 Mar '10

05 Mar '10

Author: akhaldi Date: Sat Mar 6 00:11:56 2010 New Revision: 45902 URL: http://svn.reactos.org/svn/reactos?rev=45902&view=rev Log: [NTIFS] - Group related definitions - Correct ACCESS_MAX_MS_V5_ACE_TYPE definition - Add SYSTEM_MANDATORY_LABEL_ACE_TYPE, SUCCESSFUL_ACCESS_ACE_FLAG, FAILED_ACCESS_ACE_FLAG, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, SYSTEM_MANDATORY_LABEL_NO_READ_UP, SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP and SYSTEM_MANDATORY_LABEL_VALID_MASK definitions Modified: branches/header-work/include/ddk/ntifs.h Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Sat Mar 6 00:11:56 2010 @@ -231,63 +231,93 @@ #define SECURITY_WINDOWSMOBILE_ID_BASE_RID (0x00000070L) -#pragma pack(push,4) - -#ifndef VER_PRODUCTBUILD -#define VER_PRODUCTBUILD 10000 -#endif - -#define EX_PUSH_LOCK ULONG_PTR -#define PEX_PUSH_LOCK PULONG_PTR - -#include "csq.h" - -#ifdef _NTOSKRNL_ -extern PUCHAR FsRtlLegalAnsiCharacterArray; -#else -extern DECLSPEC_IMPORT PUCHAR FsRtlLegalAnsiCharacterArray; -#endif -extern PACL SePublicDefaultDacl; -extern PACL SeSystemDefaultDacl; - -extern KSPIN_LOCK IoStatisticsLock; -extern ULONG IoReadOperationCount; -extern ULONG IoWriteOperationCount; -extern ULONG IoOtherOperationCount; -extern LARGE_INTEGER IoReadTransferCount; -extern LARGE_INTEGER IoWriteTransferCount; -extern LARGE_INTEGER IoOtherTransferCount; - -typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE; - -typedef enum _SECURITY_LOGON_TYPE -{ - UndefinedLogonType = 0, - Interactive = 2, - Network, - Batch, - Service, - Proxy, - Unlock, - NetworkCleartext, - NewCredentials, -#if (_WIN32_WINNT >= 0x0501) - RemoteInteractive, - CachedInteractive, -#endif -#if (_WIN32_WINNT >= 0x0502) - CachedRemoteInteractive, - CachedUnlock -#endif -} SECURITY_LOGON_TYPE, *PSECURITY_LOGON_TYPE; - -#define ANSI_DOS_STAR ('<') -#define ANSI_DOS_QM ('>') -#define ANSI_DOS_DOT ('"') - -#define DOS_STAR (L'<') -#define DOS_QM (L'>') -#define DOS_DOT (L'"') +/* Well-known domain relative sub-authority values (RIDs) */ + +#define DOMAIN_GROUP_RID_ENTERPRISE_READONLY_DOMAIN_CONTROLLERS (0x000001F2L) + +#define FOREST_USER_RID_MAX (0x000001F3L) + +/* Well-known users */ + +#define DOMAIN_USER_RID_ADMIN (0x000001F4L) +#define DOMAIN_USER_RID_GUEST (0x000001F5L) +#define DOMAIN_USER_RID_KRBTGT (0x000001F6L) + +#define DOMAIN_USER_RID_MAX (0x000003E7L) + +/* Well-known groups */ + +#define DOMAIN_GROUP_RID_ADMINS (0x00000200L) +#define DOMAIN_GROUP_RID_USERS (0x00000201L) +#define DOMAIN_GROUP_RID_GUESTS (0x00000202L) +#define DOMAIN_GROUP_RID_COMPUTERS (0x00000203L) +#define DOMAIN_GROUP_RID_CONTROLLERS (0x00000204L) +#define DOMAIN_GROUP_RID_CERT_ADMINS (0x00000205L) +#define DOMAIN_GROUP_RID_SCHEMA_ADMINS (0x00000206L) +#define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS (0x00000207L) +#define DOMAIN_GROUP_RID_POLICY_ADMINS (0x00000208L) +#define DOMAIN_GROUP_RID_READONLY_CONTROLLERS (0x00000209L) + +/* Well-known aliases */ + +#define DOMAIN_ALIAS_RID_ADMINS (0x00000220L) +#define DOMAIN_ALIAS_RID_USERS (0x00000221L) +#define DOMAIN_ALIAS_RID_GUESTS (0x00000222L) +#define DOMAIN_ALIAS_RID_POWER_USERS (0x00000223L) + +#define DOMAIN_ALIAS_RID_ACCOUNT_OPS (0x00000224L) +#define DOMAIN_ALIAS_RID_SYSTEM_OPS (0x00000225L) +#define DOMAIN_ALIAS_RID_PRINT_OPS (0x00000226L) +#define DOMAIN_ALIAS_RID_BACKUP_OPS (0x00000227L) + +#define DOMAIN_ALIAS_RID_REPLICATOR (0x00000228L) +#define DOMAIN_ALIAS_RID_RAS_SERVERS (0x00000229L) +#define DOMAIN_ALIAS_RID_PREW2KCOMPACCESS (0x0000022AL) +#define DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS (0x0000022BL) +#define DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS (0x0000022CL) +#define DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS (0x0000022DL) + +#define DOMAIN_ALIAS_RID_MONITORING_USERS (0x0000022EL) +#define DOMAIN_ALIAS_RID_LOGGING_USERS (0x0000022FL) +#define DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS (0x00000230L) +#define DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS (0x00000231L) +#define DOMAIN_ALIAS_RID_DCOM_USERS (0x00000232L) +#define DOMAIN_ALIAS_RID_IUSERS (0x00000238L) +#define DOMAIN_ALIAS_RID_CRYPTO_OPERATORS (0x00000239L) +#define DOMAIN_ALIAS_RID_CACHEABLE_PRINCIPALS_GROUP (0x0000023BL) +#define DOMAIN_ALIAS_RID_NON_CACHEABLE_PRINCIPALS_GROUP (0x0000023CL) +#define DOMAIN_ALIAS_RID_EVENT_LOG_READERS_GROUP (0x0000023DL) +#define DOMAIN_ALIAS_RID_CERTSVC_DCOM_ACCESS_GROUP (0x0000023EL) + +#define SECURITY_MANDATORY_LABEL_AUTHORITY {0,0,0,0,0,16} +#define SECURITY_MANDATORY_UNTRUSTED_RID (0x00000000L) +#define SECURITY_MANDATORY_LOW_RID (0x00001000L) +#define SECURITY_MANDATORY_MEDIUM_RID (0x00002000L) +#define SECURITY_MANDATORY_HIGH_RID (0x00003000L) +#define SECURITY_MANDATORY_SYSTEM_RID (0x00004000L) +#define SECURITY_MANDATORY_PROTECTED_PROCESS_RID (0x00005000L) + +/* SECURITY_MANDATORY_MAXIMUM_USER_RID is the highest RID that + can be set by a usermode caller.*/ + +#define SECURITY_MANDATORY_MAXIMUM_USER_RID SECURITY_MANDATORY_SYSTEM_RID + +#define MANDATORY_LEVEL_TO_MANDATORY_RID(IL) (IL * 0x1000) + +/* Allocate the System Luid. The first 1000 LUIDs are reserved. + Use #999 here (0x3e7 = 999) */ + +#define SYSTEM_LUID { 0x3e7, 0x0 } +#define ANONYMOUS_LOGON_LUID { 0x3e6, 0x0 } +#define LOCALSERVICE_LUID { 0x3e5, 0x0 } +#define NETWORKSERVICE_LUID { 0x3e4, 0x0 } +#define IUSER_LUID { 0x3e3, 0x0 } + +typedef struct _ACE_HEADER { + UCHAR AceType; + UCHAR AceFlags; + USHORT AceSize; +} ACE_HEADER, *PACE_HEADER; /* also in winnt.h */ #define ACCESS_MIN_MS_ACE_TYPE (0x0) @@ -314,7 +344,147 @@ #define SYSTEM_ALARM_CALLBACK_ACE_TYPE (0xE) #define SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE (0xF) #define SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE (0x10) -#define ACCESS_MAX_MS_V5_ACE_TYPE (0x10) +#define ACCESS_MAX_MS_V5_ACE_TYPE (0x11) +#define SYSTEM_MANDATORY_LABEL_ACE_TYPE (0x11) + +/* The following are the inherit flags that go into the AceFlags field + of an Ace header. */ + +#define OBJECT_INHERIT_ACE (0x1) +#define CONTAINER_INHERIT_ACE (0x2) +#define NO_PROPAGATE_INHERIT_ACE (0x4) +#define INHERIT_ONLY_ACE (0x8) +#define INHERITED_ACE (0x10) +#define VALID_INHERIT_FLAGS (0x1F) + +#define SUCCESSFUL_ACCESS_ACE_FLAG (0x40) +#define FAILED_ACCESS_ACE_FLAG (0x80) + +typedef struct _ACCESS_ALLOWED_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG SidStart; +} ACCESS_ALLOWED_ACE, *PACCESS_ALLOWED_ACE; + +typedef struct _ACCESS_DENIED_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG SidStart; +} ACCESS_DENIED_ACE, *PACCESS_DENIED_ACE; + +typedef struct _SYSTEM_AUDIT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG SidStart; +} SYSTEM_AUDIT_ACE, *PSYSTEM_AUDIT_ACE; + +typedef struct _SYSTEM_ALARM_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG SidStart; +} SYSTEM_ALARM_ACE, *PSYSTEM_ALARM_ACE; + +typedef struct _SYSTEM_MANDATORY_LABEL_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG SidStart; +} SYSTEM_MANDATORY_LABEL_ACE, *PSYSTEM_MANDATORY_LABEL_ACE; + +#define SYSTEM_MANDATORY_LABEL_NO_WRITE_UP 0x1 +#define SYSTEM_MANDATORY_LABEL_NO_READ_UP 0x2 +#define SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP 0x4 +#define SYSTEM_MANDATORY_LABEL_VALID_MASK (SYSTEM_MANDATORY_LABEL_NO_WRITE_UP | \ + SYSTEM_MANDATORY_LABEL_NO_READ_UP | \ + SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP) + +#define SECURITY_DESCRIPTOR_MIN_LENGTH (sizeof(SECURITY_DESCRIPTOR)) + +typedef USHORT SECURITY_DESCRIPTOR_CONTROL,*PSECURITY_DESCRIPTOR_CONTROL; + +#define SE_OWNER_DEFAULTED 0x0001 +#define SE_GROUP_DEFAULTED 0x0002 +#define SE_DACL_PRESENT 0x0004 +#define SE_DACL_DEFAULTED 0x0008 +#define SE_SACL_PRESENT 0x0010 +#define SE_SACL_DEFAULTED 0x0020 +#define SE_DACL_UNTRUSTED 0x0040 +#define SE_SERVER_SECURITY 0x0080 +#define SE_DACL_AUTO_INHERIT_REQ 0x0100 +#define SE_SACL_AUTO_INHERIT_REQ 0x0200 +#define SE_DACL_AUTO_INHERITED 0x0400 +#define SE_SACL_AUTO_INHERITED 0x0800 +#define SE_DACL_PROTECTED 0x1000 +#define SE_SACL_PROTECTED 0x2000 +#define SE_RM_CONTROL_VALID 0x4000 +#define SE_SELF_RELATIVE 0x8000 + +typedef struct _SECURITY_DESCRIPTOR_RELATIVE { + UCHAR Revision; + UCHAR Sbz1; + SECURITY_DESCRIPTOR_CONTROL Control; + ULONG Owner; + ULONG Group; + ULONG Sacl; + ULONG Dacl; +} SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; + +#pragma pack(push,4) + +#ifndef VER_PRODUCTBUILD +#define VER_PRODUCTBUILD 10000 +#endif + +#define EX_PUSH_LOCK ULONG_PTR +#define PEX_PUSH_LOCK PULONG_PTR + +#include "csq.h" + +#ifdef _NTOSKRNL_ +extern PUCHAR FsRtlLegalAnsiCharacterArray; +#else +extern DECLSPEC_IMPORT PUCHAR FsRtlLegalAnsiCharacterArray; +#endif +extern PACL SePublicDefaultDacl; +extern PACL SeSystemDefaultDacl; + +extern KSPIN_LOCK IoStatisticsLock; +extern ULONG IoReadOperationCount; +extern ULONG IoWriteOperationCount; +extern ULONG IoOtherOperationCount; +extern LARGE_INTEGER IoReadTransferCount; +extern LARGE_INTEGER IoWriteTransferCount; +extern LARGE_INTEGER IoOtherTransferCount; + +typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE; + +typedef enum _SECURITY_LOGON_TYPE +{ + UndefinedLogonType = 0, + Interactive = 2, + Network, + Batch, + Service, + Proxy, + Unlock, + NetworkCleartext, + NewCredentials, +#if (_WIN32_WINNT >= 0x0501) + RemoteInteractive, + CachedInteractive, +#endif +#if (_WIN32_WINNT >= 0x0502) + CachedRemoteInteractive, + CachedUnlock +#endif +} SECURITY_LOGON_TYPE, *PSECURITY_LOGON_TYPE; + +#define ANSI_DOS_STAR ('<') +#define ANSI_DOS_QM ('>') +#define ANSI_DOS_DOT ('"') + +#define DOS_STAR (L'<') +#define DOS_QM (L'>') +#define DOS_DOT (L'"') #define COMPRESSION_FORMAT_NONE (0x0000) #define COMPRESSION_FORMAT_DEFAULT (0x0001) @@ -594,23 +764,6 @@ #define VACB_MAPPING_GRANULARITY (0x40000) #define VACB_OFFSET_SHIFT (18) - -#define SE_OWNER_DEFAULTED 0x0001 -#define SE_GROUP_DEFAULTED 0x0002 -#define SE_DACL_PRESENT 0x0004 -#define SE_DACL_DEFAULTED 0x0008 -#define SE_SACL_PRESENT 0x0010 -#define SE_SACL_DEFAULTED 0x0020 -#define SE_DACL_UNTRUSTED 0x0040 -#define SE_SERVER_SECURITY 0x0080 -#define SE_DACL_AUTO_INHERIT_REQ 0x0100 -#define SE_SACL_AUTO_INHERIT_REQ 0x0200 -#define SE_DACL_AUTO_INHERITED 0x0400 -#define SE_SACL_AUTO_INHERITED 0x0800 -#define SE_DACL_PROTECTED 0x1000 -#define SE_SACL_PROTECTED 0x2000 -#define SE_RM_CONTROL_VALID 0x4000 -#define SE_SELF_RELATIVE 0x8000 #ifndef _WINNT_H #define _AUDIT_EVENT_TYPE_HACK 0 @@ -836,97 +989,6 @@ USHORT NumberOfChunks; ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; } COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; - -// -// Well-known domain relative sub-authority values (RIDs) -// -#define DOMAIN_GROUP_RID_ENTERPRISE_READONLY_DOMAIN_CONTROLLERS (0x000001F2L) - -#define FOREST_USER_RID_MAX (0x000001F3L) - -// -// Well-known users -// -#define DOMAIN_USER_RID_ADMIN (0x000001F4L) -#define DOMAIN_USER_RID_GUEST (0x000001F5L) -#define DOMAIN_USER_RID_KRBTGT (0x000001F6L) - -#define DOMAIN_USER_RID_MAX (0x000003E7L) - -// -// Well-known groups -// -#define DOMAIN_GROUP_RID_ADMINS (0x00000200L) -#define DOMAIN_GROUP_RID_USERS (0x00000201L) -#define DOMAIN_GROUP_RID_GUESTS (0x00000202L) -#define DOMAIN_GROUP_RID_COMPUTERS (0x00000203L) -#define DOMAIN_GROUP_RID_CONTROLLERS (0x00000204L) -#define DOMAIN_GROUP_RID_CERT_ADMINS (0x00000205L) -#define DOMAIN_GROUP_RID_SCHEMA_ADMINS (0x00000206L) -#define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS (0x00000207L) -#define DOMAIN_GROUP_RID_POLICY_ADMINS (0x00000208L) -#define DOMAIN_GROUP_RID_READONLY_CONTROLLERS (0x00000209L) - -// -// Well-known aliases -// -#define DOMAIN_ALIAS_RID_ADMINS (0x00000220L) -#define DOMAIN_ALIAS_RID_USERS (0x00000221L) -#define DOMAIN_ALIAS_RID_GUESTS (0x00000222L) -#define DOMAIN_ALIAS_RID_POWER_USERS (0x00000223L) - -#define DOMAIN_ALIAS_RID_ACCOUNT_OPS (0x00000224L) -#define DOMAIN_ALIAS_RID_SYSTEM_OPS (0x00000225L) -#define DOMAIN_ALIAS_RID_PRINT_OPS (0x00000226L) -#define DOMAIN_ALIAS_RID_BACKUP_OPS (0x00000227L) - -#define DOMAIN_ALIAS_RID_REPLICATOR (0x00000228L) -#define DOMAIN_ALIAS_RID_RAS_SERVERS (0x00000229L) -#define DOMAIN_ALIAS_RID_PREW2KCOMPACCESS (0x0000022AL) -#define DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS (0x0000022BL) -#define DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS (0x0000022CL) -#define DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS (0x0000022DL) - -#define DOMAIN_ALIAS_RID_MONITORING_USERS (0x0000022EL) -#define DOMAIN_ALIAS_RID_LOGGING_USERS (0x0000022FL) -#define DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS (0x00000230L) -#define DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS (0x00000231L) -#define DOMAIN_ALIAS_RID_DCOM_USERS (0x00000232L) -#define DOMAIN_ALIAS_RID_IUSERS (0x00000238L) -#define DOMAIN_ALIAS_RID_CRYPTO_OPERATORS (0x00000239L) -#define DOMAIN_ALIAS_RID_CACHEABLE_PRINCIPALS_GROUP (0x0000023BL) -#define DOMAIN_ALIAS_RID_NON_CACHEABLE_PRINCIPALS_GROUP (0x0000023CL) -#define DOMAIN_ALIAS_RID_EVENT_LOG_READERS_GROUP (0x0000023DL) -#define DOMAIN_ALIAS_RID_CERTSVC_DCOM_ACCESS_GROUP (0x0000023EL) - - -#define SECURITY_MANDATORY_LABEL_AUTHORITY {0,0,0,0,0,16} -#define SECURITY_MANDATORY_UNTRUSTED_RID (0x00000000L) -#define SECURITY_MANDATORY_LOW_RID (0x00001000L) -#define SECURITY_MANDATORY_MEDIUM_RID (0x00002000L) -#define SECURITY_MANDATORY_HIGH_RID (0x00003000L) -#define SECURITY_MANDATORY_SYSTEM_RID (0x00004000L) -#define SECURITY_MANDATORY_PROTECTED_PROCESS_RID (0x00005000L) - -// -// SECURITY_MANDATORY_MAXIMUM_USER_RID is the highest RID that -// can be set by a usermode caller. -// -#define SECURITY_MANDATORY_MAXIMUM_USER_RID SECURITY_MANDATORY_SYSTEM_RID - -#define MANDATORY_LEVEL_TO_MANDATORY_RID(IL) (IL * 0x1000) - -// -// Allocate the System Luid. The first 1000 LUIDs are reserved. -// Use #999 here (0x3e7 = 999) -// -#define SYSTEM_LUID { 0x3e7, 0x0 } -#define ANONYMOUS_LOGON_LUID { 0x3e6, 0x0 } -#define LOCALSERVICE_LUID { 0x3e5, 0x0 } -#define NETWORKSERVICE_LUID { 0x3e4, 0x0 } -#define IUSER_LUID { 0x3e3, 0x0 } - - typedef struct _TOKEN_SOURCE { CHAR SourceName[TOKEN_SOURCE_LENGTH]; @@ -989,7 +1051,7 @@ typedef struct _TOKEN_USER { SID_AND_ATTRIBUTES User; } TOKEN_USER, *PTOKEN_USER; -typedef USHORT SECURITY_DESCRIPTOR_CONTROL,*PSECURITY_DESCRIPTOR_CONTROL; + typedef struct _SECURITY_DESCRIPTOR { UCHAR Revision; UCHAR Sbz1; @@ -1000,23 +1062,12 @@ PACL Dacl; } SECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR; -#define SECURITY_DESCRIPTOR_MIN_LENGTH (sizeof(SECURITY_DESCRIPTOR)) - typedef struct _OBJECT_TYPE_LIST { USHORT Level; USHORT Sbz; GUID *ObjectType; } OBJECT_TYPE_LIST, *POBJECT_TYPE_LIST; - -typedef struct _SECURITY_DESCRIPTOR_RELATIVE { - UCHAR Revision; - UCHAR Sbz1; - SECURITY_DESCRIPTOR_CONTROL Control; - ULONG Owner; - ULONG Group; - ULONG Sacl; - ULONG Dacl; -} SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; + typedef enum _TOKEN_INFORMATION_CLASS { TokenUser=1,TokenGroups,TokenPrivileges,TokenOwner, TokenPrimaryGroup,TokenDefaultDacl,TokenSource,TokenType, @@ -2168,59 +2219,6 @@ TOKEN_CONTROL ClientTokenControl; } SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; -// -// The following are the inherit flags that go into the AceFlags field -// of an Ace header. -// -#define OBJECT_INHERIT_ACE (0x1) -#define CONTAINER_INHERIT_ACE (0x2) -#define NO_PROPAGATE_INHERIT_ACE (0x4) -#define INHERIT_ONLY_ACE (0x8) -#define INHERITED_ACE (0x10) -#define VALID_INHERIT_FLAGS (0x1F) - -typedef struct _ACE_HEADER -{ - UCHAR AceType; - UCHAR AceFlags; - USHORT AceSize; -} ACE_HEADER, *PACE_HEADER; - -typedef struct _ACCESS_ALLOWED_ACE -{ - ACE_HEADER Header; - ACCESS_MASK Mask; - ULONG SidStart; -} ACCESS_ALLOWED_ACE, *PACCESS_ALLOWED_ACE; - -typedef struct _ACCESS_DENIED_ACE -{ - ACE_HEADER Header; - ACCESS_MASK Mask; - ULONG SidStart; -} ACCESS_DENIED_ACE, *PACCESS_DENIED_ACE; - -typedef struct _SYSTEM_AUDIT_ACE -{ - ACE_HEADER Header; - ACCESS_MASK Mask; - ULONG SidStart; -} SYSTEM_AUDIT_ACE, *PSYSTEM_AUDIT_ACE; - -typedef struct _SYSTEM_ALARM_ACE -{ - ACE_HEADER Header; - ACCESS_MASK Mask; - ULONG SidStart; -} SYSTEM_ALARM_ACE, *PSYSTEM_ALARM_ACE; - -typedef struct _SYSTEM_MANDATORY_LABEL_ACE -{ - ACE_HEADER Header; - ACCESS_MASK Mask; - ULONG SidStart; -} SYSTEM_MANDATORY_LABEL_ACE, *PSYSTEM_MANDATORY_LABEL_ACE; - typedef struct _TUNNEL { FAST_MUTEX Mutex; PRTL_SPLAY_LINKS Cache;

1 0

[jimtabor] 45901: - [Win32k] Fix DrawMenuBar.
by jimtabor＠svn.reactos.org 05 Mar '10

05 Mar '10

Author: jimtabor Date: Sat Mar 6 00:10:16 2010 New Revision: 45901 URL: http://svn.reactos.org/svn/reactos?rev=45901&view=rev Log: - [Win32k] Fix DrawMenuBar. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sat Mar 6 00:10:16 2010 @@ -490,28 +490,17 @@ case HWNDLOCK_ROUTINE_DRAWMENUBAR: { - PMENU_OBJECT Menu; DPRINT("HWNDLOCK_ROUTINE_DRAWMENUBAR\n"); - Ret = FALSE; - if (!((Wnd->style & (WS_CHILD | WS_POPUP)) != WS_CHILD)) - break; - - if(!(Menu = UserGetMenuObject((HMENU)(DWORD_PTR) Wnd->IDMenu))) - break; - - Menu->MenuInfo.WndOwner = hWnd; - Menu->MenuInfo.Height = 0; - - co_WinPosSetWindowPos( Window, - HWND_DESKTOP, - 0,0,0,0, - SWP_NOSIZE| - SWP_NOMOVE| - SWP_NOZORDER| - SWP_NOACTIVATE| - SWP_FRAMECHANGED ); - Ret = TRUE; + if ((Wnd->style & (WS_CHILD | WS_POPUP)) != WS_CHILD) + co_WinPosSetWindowPos( Window, + HWND_DESKTOP, + 0,0,0,0, + SWP_NOSIZE| + SWP_NOMOVE| + SWP_NOZORDER| + SWP_NOACTIVATE| + SWP_FRAMECHANGED ); break; }

1 0

[akhaldi] 45900: [NTIFS] - Group related definitions - Add SID_AND_ATTRIBUTES_HASH struct - Add SID_HASH_SIZE, SID_HASH_ENTRY, *PSID_HASH_ENTRY, SECURITY_LOCAL_LOGON_RID, SECURITY_CRED_TYPE_BASE_RID, SECURITY_CRED_TYPE_RID_COUNT, SECURITY_CRED_TYPE_THIS_ORG_CERT_RID, SECURITY_USERMODEDRIVERHOST_ID_BASE_RID, SECURITY_USERMODEDRIVERHOST_ID_RID_COUNT, SECURITY_CLOUD_INFRASTRUCTURE_SERVICES_ID_BASE_RID, SECURITY_CLOUD_INFRASTRUCTURE_SERVICES_ID_RID_COUNT, SECURITY_WMIHOST_ID_BASE_RID, SECURITY_WMIHO
by akhaldi＠svn.reactos.org 05 Mar '10

05 Mar '10

Author: akhaldi Date: Fri Mar 5 23:51:28 2010 New Revision: 45900 URL: http://svn.reactos.org/svn/reactos?rev=45900&view=rev Log: [NTIFS] - Group related definitions - Add SID_AND_ATTRIBUTES_HASH struct - Add SID_HASH_SIZE, SID_HASH_ENTRY, *PSID_HASH_ENTRY, SECURITY_LOCAL_LOGON_RID, SECURITY_CRED_TYPE_BASE_RID, SECURITY_CRED_TYPE_RID_COUNT, SECURITY_CRED_TYPE_THIS_ORG_CERT_RID, SECURITY_USERMODEDRIVERHOST_ID_BASE_RID, SECURITY_USERMODEDRIVERHOST_ID_RID_COUNT, SECURITY_CLOUD_INFRASTRUCTURE_SERVICES_ID_BASE_RID, SECURITY_CLOUD_INFRASTRUCTURE_SERVICES_ID_RID_COUNT, SECURITY_WMIHOST_ID_BASE_RID, SECURITY_WMIHOST_ID_RID_COUNT, SECURITY_TASK_ID_BASE_RID, SECURITY_NFS_ID_BASE_RID, SECURITY_COM_ID_BASE_RID, SECURITY_VIRTUALACCOUNT_ID_RID_COUNT and SECURITY_WINDOWSMOBILE_ID_BASE_RID definitions Modified: branches/header-work/include/ddk/ntifs.h Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Fri Mar 5 23:51:28 2010 @@ -123,6 +123,113 @@ SidTypeComputer, SidTypeLabel } SID_NAME_USE, *PSID_NAME_USE; + +typedef struct _SID_AND_ATTRIBUTES { + PSID Sid; + ULONG Attributes; +} SID_AND_ATTRIBUTES, *PSID_AND_ATTRIBUTES; +typedef SID_AND_ATTRIBUTES SID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY]; +typedef SID_AND_ATTRIBUTES_ARRAY *PSID_AND_ATTRIBUTES_ARRAY; + +#define SID_HASH_SIZE 32 +typedef ULONG_PTR SID_HASH_ENTRY, *PSID_HASH_ENTRY; + +typedef struct _SID_AND_ATTRIBUTES_HASH { + ULONG SidCount; + PSID_AND_ATTRIBUTES SidAttr; + SID_HASH_ENTRY Hash[SID_HASH_SIZE]; +} SID_AND_ATTRIBUTES_HASH, *PSID_AND_ATTRIBUTES_HASH; + +/* Universal well-known SIDs */ + +#define SECURITY_NULL_SID_AUTHORITY {0,0,0,0,0,0} +#define SECURITY_WORLD_SID_AUTHORITY {0,0,0,0,0,1} +#define SECURITY_LOCAL_SID_AUTHORITY {0,0,0,0,0,2} +#define SECURITY_CREATOR_SID_AUTHORITY {0,0,0,0,0,3} +#define SECURITY_NON_UNIQUE_AUTHORITY {0,0,0,0,0,4} +#define SECURITY_RESOURCE_MANAGER_AUTHORITY {0,0,0,0,0,9} + +#define SECURITY_NULL_RID (0x00000000L) +#define SECURITY_WORLD_RID (0x00000000L) +#define SECURITY_LOCAL_RID (0x00000000L) +#define SECURITY_LOCAL_LOGON_RID (0x00000001L) + +#define SECURITY_CREATOR_OWNER_RID (0x00000000L) +#define SECURITY_CREATOR_GROUP_RID (0x00000001L) +#define SECURITY_CREATOR_OWNER_SERVER_RID (0x00000002L) +#define SECURITY_CREATOR_GROUP_SERVER_RID (0x00000003L) +#define SECURITY_CREATOR_OWNER_RIGHTS_RID (0x00000004L) + +/* NT well-known SIDs */ + +#define SECURITY_NT_AUTHORITY {0,0,0,0,0,5} + +#define SECURITY_DIALUP_RID (0x00000001L) +#define SECURITY_NETWORK_RID (0x00000002L) +#define SECURITY_BATCH_RID (0x00000003L) +#define SECURITY_INTERACTIVE_RID (0x00000004L) +#define SECURITY_LOGON_IDS_RID (0x00000005L) +#define SECURITY_LOGON_IDS_RID_COUNT (3L) +#define SECURITY_SERVICE_RID (0x00000006L) +#define SECURITY_ANONYMOUS_LOGON_RID (0x00000007L) +#define SECURITY_PROXY_RID (0x00000008L) +#define SECURITY_ENTERPRISE_CONTROLLERS_RID (0x00000009L) +#define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID +#define SECURITY_PRINCIPAL_SELF_RID (0x0000000AL) +#define SECURITY_AUTHENTICATED_USER_RID (0x0000000BL) +#define SECURITY_RESTRICTED_CODE_RID (0x0000000CL) +#define SECURITY_TERMINAL_SERVER_RID (0x0000000DL) +#define SECURITY_REMOTE_LOGON_RID (0x0000000EL) +#define SECURITY_THIS_ORGANIZATION_RID (0x0000000FL) +#define SECURITY_IUSER_RID (0x00000011L) +#define SECURITY_LOCAL_SYSTEM_RID (0x00000012L) +#define SECURITY_LOCAL_SERVICE_RID (0x00000013L) +#define SECURITY_NETWORK_SERVICE_RID (0x00000014L) +#define SECURITY_NT_NON_UNIQUE (0x00000015L) +#define SECURITY_NT_NON_UNIQUE_SUB_AUTH_COUNT (3L) +#define SECURITY_ENTERPRISE_READONLY_CONTROLLERS_RID (0x00000016L) + +#define SECURITY_BUILTIN_DOMAIN_RID (0x00000020L) +#define SECURITY_WRITE_RESTRICTED_CODE_RID (0x00000021L) + + +#define SECURITY_PACKAGE_BASE_RID (0x00000040L) +#define SECURITY_PACKAGE_RID_COUNT (2L) +#define SECURITY_PACKAGE_NTLM_RID (0x0000000AL) +#define SECURITY_PACKAGE_SCHANNEL_RID (0x0000000EL) +#define SECURITY_PACKAGE_DIGEST_RID (0x00000015L) + +#define SECURITY_CRED_TYPE_BASE_RID (0x00000041L) +#define SECURITY_CRED_TYPE_RID_COUNT (2L) +#define SECURITY_CRED_TYPE_THIS_ORG_CERT_RID (0x00000001L) + +#define SECURITY_MIN_BASE_RID (0x00000050L) +#define SECURITY_SERVICE_ID_BASE_RID (0x00000050L) +#define SECURITY_SERVICE_ID_RID_COUNT (6L) +#define SECURITY_RESERVED_ID_BASE_RID (0x00000051L) +#define SECURITY_APPPOOL_ID_BASE_RID (0x00000052L) +#define SECURITY_APPPOOL_ID_RID_COUNT (6L) +#define SECURITY_VIRTUALSERVER_ID_BASE_RID (0x00000053L) +#define SECURITY_VIRTUALSERVER_ID_RID_COUNT (6L) +#define SECURITY_USERMODEDRIVERHOST_ID_BASE_RID (0x00000054L) +#define SECURITY_USERMODEDRIVERHOST_ID_RID_COUNT (6L) +#define SECURITY_CLOUD_INFRASTRUCTURE_SERVICES_ID_BASE_RID (0x00000055L) +#define SECURITY_CLOUD_INFRASTRUCTURE_SERVICES_ID_RID_COUNT (6L) +#define SECURITY_WMIHOST_ID_BASE_RID (0x00000056L) +#define SECURITY_WMIHOST_ID_RID_COUNT (6L) +#define SECURITY_TASK_ID_BASE_RID (0x00000057L) +#define SECURITY_NFS_ID_BASE_RID (0x00000058L) +#define SECURITY_COM_ID_BASE_RID (0x00000059L) +#define SECURITY_VIRTUALACCOUNT_ID_RID_COUNT (6L) + +#define SECURITY_MAX_BASE_RID (0x0000006FL) + +#define SECURITY_MAX_ALWAYS_FILTERED (0x000003E7L) +#define SECURITY_MIN_NEVER_FILTERED (0x000003E8L) + +#define SECURITY_OTHER_ORGANIZATION_RID (0x000003E8L) + +#define SECURITY_WINDOWSMOBILE_ID_BASE_RID (0x00000070L) #pragma pack(push,4) @@ -729,103 +836,6 @@ USHORT NumberOfChunks; ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; } COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; - -typedef struct _SID_AND_ATTRIBUTES { - PSID Sid; - ULONG Attributes; -} SID_AND_ATTRIBUTES, *PSID_AND_ATTRIBUTES; -typedef SID_AND_ATTRIBUTES SID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY]; -typedef SID_AND_ATTRIBUTES_ARRAY *PSID_AND_ATTRIBUTES_ARRAY; - - - -// -// Universal well-known SIDs -// -#define SECURITY_NULL_SID_AUTHORITY {0,0,0,0,0,0} -#define SECURITY_WORLD_SID_AUTHORITY {0,0,0,0,0,1} -#define SECURITY_LOCAL_SID_AUTHORITY {0,0,0,0,0,2} -#define SECURITY_CREATOR_SID_AUTHORITY {0,0,0,0,0,3} -#define SECURITY_NON_UNIQUE_AUTHORITY {0,0,0,0,0,4} -#define SECURITY_RESOURCE_MANAGER_AUTHORITY {0,0,0,0,0,9} - -#define SECURITY_NULL_RID (0x00000000L) -#define SECURITY_WORLD_RID (0x00000000L) -#define SECURITY_LOCAL_RID (0x00000000L) - -#define SECURITY_CREATOR_OWNER_RID (0x00000000L) -#define SECURITY_CREATOR_GROUP_RID (0x00000001L) - -#define SECURITY_CREATOR_OWNER_SERVER_RID (0x00000002L) -#define SECURITY_CREATOR_GROUP_SERVER_RID (0x00000003L) - -#define SECURITY_CREATOR_OWNER_RIGHTS_RID (0x00000004L) - - - -// -// NT well-known SIDs -// -#define SECURITY_NT_AUTHORITY {0,0,0,0,0,5} - -#define SECURITY_DIALUP_RID (0x00000001L) -#define SECURITY_NETWORK_RID (0x00000002L) -#define SECURITY_BATCH_RID (0x00000003L) -#define SECURITY_INTERACTIVE_RID (0x00000004L) -#define SECURITY_LOGON_IDS_RID (0x00000005L) -#define SECURITY_LOGON_IDS_RID_COUNT (3L) -#define SECURITY_SERVICE_RID (0x00000006L) -#define SECURITY_ANONYMOUS_LOGON_RID (0x00000007L) -#define SECURITY_PROXY_RID (0x00000008L) -#define SECURITY_ENTERPRISE_CONTROLLERS_RID (0x00000009L) -#define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID -#define SECURITY_PRINCIPAL_SELF_RID (0x0000000AL) -#define SECURITY_AUTHENTICATED_USER_RID (0x0000000BL) -#define SECURITY_RESTRICTED_CODE_RID (0x0000000CL) -#define SECURITY_TERMINAL_SERVER_RID (0x0000000DL) -#define SECURITY_REMOTE_LOGON_RID (0x0000000EL) -#define SECURITY_THIS_ORGANIZATION_RID (0x0000000FL) -#define SECURITY_IUSER_RID (0x00000011L) -#define SECURITY_LOCAL_SYSTEM_RID (0x00000012L) -#define SECURITY_LOCAL_SERVICE_RID (0x00000013L) -#define SECURITY_NETWORK_SERVICE_RID (0x00000014L) - -#define SECURITY_NT_NON_UNIQUE (0x00000015L) -#define SECURITY_NT_NON_UNIQUE_SUB_AUTH_COUNT (3L) - -#define SECURITY_ENTERPRISE_READONLY_CONTROLLERS_RID (0x00000016L) - -#define SECURITY_BUILTIN_DOMAIN_RID (0x00000020L) -#define SECURITY_WRITE_RESTRICTED_CODE_RID (0x00000021L) - - -#define SECURITY_PACKAGE_BASE_RID (0x00000040L) -#define SECURITY_PACKAGE_RID_COUNT (2L) -#define SECURITY_PACKAGE_NTLM_RID (0x0000000AL) -#define SECURITY_PACKAGE_SCHANNEL_RID (0x0000000EL) -#define SECURITY_PACKAGE_DIGEST_RID (0x00000015L) - -#define SECURITY_MIN_BASE_RID (0x00000050L) - -#define SECURITY_SERVICE_ID_BASE_RID (0x00000050L) -#define SECURITY_SERVICE_ID_RID_COUNT (6L) - -#define SECURITY_RESERVED_ID_BASE_RID (0x00000051L) - -#define SECURITY_APPPOOL_ID_BASE_RID (0x00000052L) -#define SECURITY_APPPOOL_ID_RID_COUNT (6L) - -#define SECURITY_VIRTUALSERVER_ID_BASE_RID (0x00000053L) -#define SECURITY_VIRTUALSERVER_ID_RID_COUNT (6L) - -#define SECURITY_MAX_BASE_RID (0x0000006FL) - -#define SECURITY_MAX_ALWAYS_FILTERED (0x000003E7L) -#define SECURITY_MIN_NEVER_FILTERED (0x000003E8L) - -#define SECURITY_OTHER_ORGANIZATION_RID (0x000003E8L) - - // // Well-known domain relative sub-authority values (RIDs)

1 0

[tkreuzer] 45899: add _WDMDDK_ include guard
by tkreuzer＠svn.reactos.org 05 Mar '10

05 Mar '10

Author: tkreuzer Date: Fri Mar 5 23:50:11 2010 New Revision: 45899 URL: http://svn.reactos.org/svn/reactos?rev=45899&view=rev Log: add _WDMDDK_ include guard Modified: branches/header-work/include/ddk/wdm.h 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] Fri Mar 5 23:50:11 2010 @@ -1,4 +1,7 @@ #pragma once + +#ifndef _WDMDDK_ +#define _WDMDDK_ /* Dependencies */ #define NT_INCLUDED @@ -10449,3 +10452,5 @@ #ifdef __cplusplus } #endif + +#endif /* !_WDMDDK_ */

1 0

[akhaldi] 45898: [NTIFS] - Introduce #pragma once - Add missing includes - Add some struct forwarders - Add PsGetCurrentProcess, KeNumberProcessors, LSA_UNICODE_STRING, *PLSA_UNICODE_STRING, LSA_OBJECT_ATTRIBUTES and *PLSA_OBJECT_ATTRIBUTES definitions - Add SID_NAME_USE enum - Group related definitions
by akhaldi＠svn.reactos.org 05 Mar '10

05 Mar '10

Author: akhaldi Date: Fri Mar 5 23:36:10 2010 New Revision: 45898 URL: http://svn.reactos.org/svn/reactos?rev=45898&view=rev Log: [NTIFS] - Introduce #pragma once - Add missing includes - Add some struct forwarders - Add PsGetCurrentProcess, KeNumberProcessors, LSA_UNICODE_STRING, *PLSA_UNICODE_STRING, LSA_OBJECT_ATTRIBUTES and *PLSA_OBJECT_ATTRIBUTES definitions - Add SID_NAME_USE enum - Group related definitions Modified: branches/header-work/include/ddk/ntifs.h Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Fri Mar 5 23:36:10 2010 @@ -20,8 +20,9 @@ * */ -#ifndef _NTIFS_ -#define _NTIFS_ +#pragma once + +#define _NTIFS_INCLUDED_ #define _GNU_NTIFS_ /* Helper macro to enable gcc's extension. */ @@ -33,15 +34,96 @@ #endif #endif -#define NTKERNELAPI DECLSPEC_IMPORT - -#include <ntddk.h> - -#define _NTIFS_INCLUDED_ #ifdef __cplusplus extern "C" { #endif +#define NTKERNELAPI DECLSPEC_IMPORT +#define NTHALAPI DECLSPEC_IMPORT + +#include <ntddk.h> +#include <excpt.h> +#include <ntdef.h> +#include <ntnls.h> +#include <ntstatus.h> +#include <bugcodes.h> +#include <ntiologc.h> + +#ifndef FlagOn +#define FlagOn(_F,_SF) ((_F) & (_SF)) +#endif + +#ifndef BooleanFlagOn +#define BooleanFlagOn(F,SF) ((BOOLEAN)(((F) & (SF)) != 0)) +#endif + +#ifndef SetFlag +#define SetFlag(_F,_SF) ((_F) |= (_SF)) +#endif + +#ifndef ClearFlag +#define ClearFlag(_F,_SF) ((_F) &= ~(_SF)) +#endif + +typedef struct _BUS_HANDLER *PBUS_HANDLER; +typedef struct _CALLBACK_OBJECT *PCALLBACK_OBJECT; +typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT; +typedef struct _IO_TIMER *PIO_TIMER; +typedef struct _KINTERRUPT *PKINTERRUPT; +typedef struct _KPROCESS *PKPROCESS ,*PRKPROCESS, *PEPROCESS; +typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD, *PETHREAD; +typedef struct _OBJECT_TYPE *POBJECT_TYPE; +typedef struct _PEB *PPEB; +typedef struct _ACL *PACL; + +#define PsGetCurrentProcess IoGetCurrentProcess + +#if (NTDDI_VERSION >= NTDDI_VISTA) +extern NTSYSAPI volatile CCHAR KeNumberProcessors; +#elif (NTDDI_VERSION >= NTDDI_WINXP) +extern NTSYSAPI CCHAR KeNumberProcessors; +#else +extern PCCHAR KeNumberProcessors; +#endif + +typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; +typedef STRING LSA_STRING, *PLSA_STRING; +typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; + +#ifndef SID_IDENTIFIER_AUTHORITY_DEFINED +#define SID_IDENTIFIER_AUTHORITY_DEFINED +typedef struct _SID_IDENTIFIER_AUTHORITY { + UCHAR Value[6]; +} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY; +#endif + +#ifndef SID_DEFINED +#define SID_DEFINED +typedef struct _SID { + UCHAR Revision; + UCHAR SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + ULONG SubAuthority[ANYSIZE_ARRAY]; +} SID, *PISID; +#endif + +#define SID_REVISION 1 +#define SID_MAX_SUB_AUTHORITIES 15 +#define SID_RECOMMENDED_SUB_AUTHORITIES 1 + +typedef enum _SID_NAME_USE { + SidTypeUser = 1, + SidTypeGroup, + SidTypeDomain, + SidTypeAlias, + SidTypeWellKnownGroup, + SidTypeDeletedAccount, + SidTypeInvalid, + SidTypeUnknown, + SidTypeComputer, + SidTypeLabel +} SID_NAME_USE, *PSID_NAME_USE; + #pragma pack(push,4) #ifndef VER_PRODUCTBUILD @@ -51,23 +133,6 @@ #define EX_PUSH_LOCK ULONG_PTR #define PEX_PUSH_LOCK PULONG_PTR - -#ifndef FlagOn -#define FlagOn(_F,_SF) ((_F) & (_SF)) -#endif - -#ifndef BooleanFlagOn -#define BooleanFlagOn(F,SF) ((BOOLEAN)(((F) & (SF)) != 0)) -#endif - -#ifndef SetFlag -#define SetFlag(_F,_SF) ((_F) |= (_SF)) -#endif - -#ifndef ClearFlag -#define ClearFlag(_F,_SF) ((_F) &= ~(_SF)) -#endif - #include "csq.h" #ifdef _NTOSKRNL_ @@ -86,7 +151,6 @@ extern LARGE_INTEGER IoWriteTransferCount; extern LARGE_INTEGER IoOtherTransferCount; -typedef STRING LSA_STRING, *PLSA_STRING; typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE; typedef enum _SECURITY_LOGON_TYPE @@ -378,10 +442,6 @@ #define SECURITY_WORLD_SID_AUTHORITY {0,0,0,0,0,1} #define SECURITY_WORLD_RID (0x00000000L) - -#define SID_REVISION 1 -#define SID_MAX_SUB_AUTHORITIES 15 -#define SID_RECOMMENDED_SUB_AUTHORITIES 1 #define TOKEN_ASSIGN_PRIMARY (0x0001) #define TOKEN_DUPLICATE (0x0002) @@ -670,16 +730,6 @@ ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; } COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; -typedef struct _SID_IDENTIFIER_AUTHORITY { - UCHAR Value[6]; -} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY; - -typedef struct _SID { - UCHAR Revision; - UCHAR SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - ULONG SubAuthority[ANYSIZE_ARRAY]; -} SID, *PISID; typedef struct _SID_AND_ATTRIBUTES { PSID Sid; ULONG Attributes;

1 0

← Newer
1
...
70
71
72
73
74
75
76
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2010