Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[ion] 16268: Large partial cleanup of ntoskrnl internal headers, mostly to delete obsoleted or non-useful headers, to reformat some horrible tab, spaces, etc mixups, and to move to NDK some public structures and remove all the include headers so that the standard one can be added. Note the word partial, meaning more will come in order to fully fix the mess.

by ion＠svn.reactos.com

Large partial cleanup of ntoskrnl internal headers, mostly to delete obsoleted or non-useful headers, to reformat some horrible tab, spaces, etc mixups, and to move to NDK some public structures and remove all the include headers so that the standard one can be added. Note the word partial, meaning more will come in order to fully fix the mess. Added: trunk/reactos/include/ndk/dbgktypes.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/i386/floatsave.h Modified: trunk/reactos/include/ndk/i386/segment.h Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/ntoskrnl/ex/callback.c Modified: trunk/reactos/ntoskrnl/include/internal/arch/ps.h Added: trunk/reactos/ntoskrnl/include/internal/asm.h Deleted: trunk/reactos/ntoskrnl/include/internal/callbacks.h Modified: trunk/reactos/ntoskrnl/include/internal/cc.h Deleted: trunk/reactos/ntoskrnl/include/internal/config.h Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Added: trunk/reactos/ntoskrnl/include/internal/fs.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/fpu.h Deleted: trunk/reactos/ntoskrnl/include/internal/i386/hal.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h Deleted: trunk/reactos/ntoskrnl/include/internal/i386/ps.h Deleted: trunk/reactos/ntoskrnl/include/internal/i386/segment.h Deleted: trunk/reactos/ntoskrnl/include/internal/ifs.h Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/include/internal/kbd.h Modified: trunk/reactos/ntoskrnl/include/internal/kd.h Deleted: trunk/reactos/ntoskrnl/include/internal/kdb.h Deleted: trunk/reactos/ntoskrnl/include/internal/kdbochs.h Deleted: trunk/reactos/ntoskrnl/include/internal/kdgdb.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ldr.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/module.h Modified: trunk/reactos/ntoskrnl/include/internal/nls.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/include/internal/po.h Deleted: trunk/reactos/ntoskrnl/include/internal/pool.h Modified: trunk/reactos/ntoskrnl/include/internal/port.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Deleted: trunk/reactos/ntoskrnl/include/internal/safe.h Modified: trunk/reactos/ntoskrnl/include/internal/se.h Modified: trunk/reactos/ntoskrnl/include/internal/tag.h Deleted: trunk/reactos/ntoskrnl/include/internal/trap.h Modified: trunk/reactos/ntoskrnl/include/internal/v86m.h Modified: trunk/reactos/ntoskrnl/include/internal/xhal.h Modified: trunk/reactos/ntoskrnl/io/disk.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s Modified: trunk/reactos/ntoskrnl/ke/i386/main.S Modified: trunk/reactos/ntoskrnl/ke/i386/stkswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.S Modified: trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Added: trunk/reactos/include/ndk/dbgktypes.h --- trunk/reactos/include/ndk/dbgktypes.h 2005-06-25 16:01:27 UTC (rev 16267) +++ trunk/reactos/include/ndk/dbgktypes.h 2005-06-25 17:01:17 UTC (rev 16268) @@ -0,0 +1,139 @@ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/dbgktypes.h + * PURPOSE: Definitions for User-Mode Kernel Debugging not in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 25/06/05 + */ + +#ifndef _DBGKTYPES_H +#define _DBGKTYPES_H + +/* DEPENDENCIES **************************************************************/ + +/* EXPORTED DATA *************************************************************/ + +/* CONSTANTS *****************************************************************/ +#define DEBUG_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x0F) +#define DEBUG_OBJECT_WAIT_STATE_CHANGE 0x0001 +#define DEBUG_OBJECT_ADD_REMOVE_PROCESS 0x0002 + +/* ENUMERATIONS **************************************************************/ + +typedef enum _DEBUGOBJECTINFOCLASS +{ + DebugObjectUnusedInformation, + DebugObjectKillProcessOnExitInformation +} DEBUGOBJECTINFOCLASS, * PDEBUGOBJECTINFOCLASS; + +/* TYPES *********************************************************************/ + +typedef struct _DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION +{ + ULONG KillProcessOnExit; +} DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION, * +PDEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION; + +typedef struct _DBGK_DEBUG_OBJECT +{ + KEVENT Event; + FAST_MUTEX Mutex; + LIST_ENTRY StateEventListEntry; + union + { + ULONG Flags; + struct + { + UCHAR DebuggerInactive :1; + UCHAR KillProcessOnExit :1; + }; + }; +} DBGK_DEBUG_OBJECT, *PDBGK_DEBUG_OBJECT; + +typedef enum _DBG_STATE +{ + DbgIdle, + DbgReplyPending, + DbgCreateThreadStateChange, + DbgCreateProcessStateChange, + DbgExitThreadStateChange, + DbgExitProcessStateChange, + DbgExceptionStateChange, + DbgBreakpointStateChange, + DbgSingleStepStateChange, + DbgLoadDllStateChange, + DbgUnloadDllStateChange +} DBG_STATE, *PDBG_STATE; + +typedef struct _DBGKM_EXCEPTION +{ + EXCEPTION_RECORD ExceptionRecord; + ULONG FirstChance; +} DBGKM_EXCEPTION, *PDBGKM_EXCEPTION; + +typedef struct _DBGKM_CREATE_THREAD +{ + ULONG SubSystemKey; + PVOID StartAddress; +} DBGKM_CREATE_THREAD, *PDBGKM_CREATE_THREAD; + +typedef struct _DBGKM_CREATE_PROCESS +{ + ULONG SubSystemKey; + HANDLE FileHandle; + PVOID BaseOfImage; + ULONG DebugInfoFileOffset; + ULONG DebugInfoSize; + DBGKM_CREATE_THREAD InitialThread; +} DBGKM_CREATE_PROCESS, *PDBGKM_CREATE_PROCESS; + +typedef struct _DBGKM_EXIT_THREAD +{ + NTSTATUS ExitStatus; +} DBGKM_EXIT_THREAD, *PDBGKM_EXIT_THREAD; + +typedef struct _DBGKM_EXIT_PROCESS +{ + NTSTATUS ExitStatus; +} DBGKM_EXIT_PROCESS, *PDBGKM_EXIT_PROCESS; + +typedef struct _DBGKM_LOAD_DLL +{ + HANDLE FileHandle; + PVOID BaseOfDll; + ULONG DebugInfoFileOffset; + ULONG DebugInfoSize; +} DBGKM_LOAD_DLL, *PDBGKM_LOAD_DLL; + +typedef struct _DBGKM_UNLOAD_DLL +{ + PVOID BaseAddress; +} DBGKM_UNLOAD_DLL, *PDBGKM_UNLOAD_DLL; + +typedef struct _DBGUI_WAIT_STATE_CHANGE +{ + DBG_STATE NewState; + CLIENT_ID AppClientId; + union + { + struct + { + HANDLE HandleToThread; + DBGKM_CREATE_THREAD NewThread; + } CreateThread; + struct + { + HANDLE HandleToProcess; + HANDLE HandleToThread; + DBGKM_CREATE_PROCESS NewProcess; + } CreateProcessInfo; + DBGKM_EXIT_THREAD ExitThread; + DBGKM_EXIT_PROCESS ExitProcess; + DBGKM_EXCEPTION Exception; + DBGKM_LOAD_DLL LoadDll; + DBGKM_UNLOAD_DLL UnloadDll; + } StateInfo; +} DBGUI_WAIT_STATE_CHANGE, * PDBGUI_WAIT_STATE_CHANGE; + +#endif _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-06-25 16:01:27 UTC (rev 16267) +++ trunk/reactos/include/ndk/extypes.h 2005-06-25 17:01:17 UTC (rev 16268) @@ -21,6 +21,12 @@ /* CONSTANTS *****************************************************************/ #define INVALID_HANDLE_VALUE (HANDLE)-1 +/* Callback Object Access Rights */ +#define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x0001) +#define CALLBACK_EXECUTE (STANDARD_RIGHTS_EXECUTE|SYNCHRONIZE|0x0001) +#define CALLBACK_WRITE (STANDARD_RIGHTS_WRITE|SYNCHRONIZE|0x0001) +#define CALLBACK_READ (STANDARD_RIGHTS_READ|SYNCHRONIZE|0x0001) + /* ENUMERATIONS **************************************************************/ /* TYPES *********************************************************************/ @@ -57,6 +63,14 @@ KEVENT RundownEvent; } RUNDOWN_DESCRIPTOR, *PRUNDOWN_DESCRIPTOR; +typedef struct _CALLBACK_OBJECT +{ + ULONG Name; + KSPIN_LOCK Lock; + LIST_ENTRY RegisteredCallbacks; + ULONG AllowMultipleCallbacks; +} CALLBACK_OBJECT , *PCALLBACK_OBJECT; + typedef struct _HANDLE_TABLE_ENTRY { union _____ Modified: trunk/reactos/include/ndk/i386/floatsave.h --- trunk/reactos/include/ndk/i386/floatsave.h 2005-06-25 16:01:27 UTC (rev 16267) +++ trunk/reactos/include/ndk/i386/floatsave.h 2005-06-25 17:01:17 UTC (rev 16268) @@ -1,5 +1,5 @@ -#ifndef __NAPI_I386_FLOATSAVE_H__ -#define __NAPI_I386_FLOATSAVE_H__ +#ifndef _FLOATSAVE_H_ +#define _FLOATSAVE_H_ #define FLOAT_SAVE_CONTROL (0xFFFF037F) #define FLOAT_SAVE_STATUS (0xFFFF0000) _____ Modified: trunk/reactos/include/ndk/i386/segment.h --- trunk/reactos/include/ndk/i386/segment.h 2005-06-25 16:01:27 UTC (rev 16267) +++ trunk/reactos/include/ndk/i386/segment.h 2005-06-25 17:01:17 UTC (rev 16268) @@ -5,8 +5,10 @@ #define KERNEL_DS (0x10) #define USER_CS (0x18 + 0x3) #define USER_DS (0x20 + 0x3) -#define RESERVED_FOR_TSS (0x28) +#define TSS_SELECTOR (0x28) #define PCR_SELECTOR (0x30) #define TEB_SELECTOR (0x38 + 0x3) +#define LDT_SELECTOR (0x48) +#define TRAP_TSS_SELECTOR (0x50) #endif /* _ASM_SEGMENT_H */ _____ Modified: trunk/reactos/include/ndk/iotypes.h --- trunk/reactos/include/ndk/iotypes.h 2005-06-25 16:01:27 UTC (rev 16267) +++ trunk/reactos/include/ndk/iotypes.h 2005-06-25 17:01:17 UTC (rev 16268) @@ -11,6 +11,7 @@ #define _IOTYPES_H /* DEPENDENCIES **************************************************************/ +#include "potypes.h" /* EXPORTED DATA *************************************************************/ extern POBJECT_TYPE NTOSAPI IoAdapterObjectType; @@ -20,13 +21,77 @@ extern POBJECT_TYPE NTOSAPI IoFileObjectType; /* CONSTANTS *****************************************************************/ + +/* Device Object Extension Flags */ #define DOE_UNLOAD_PENDING 0x1 #define DOE_DELETE_PENDING 0x2 #define DOE_REMOVE_PENDING 0x4 #define DOE_REMOVE_PROCESSED 0x8 #define DOE_START_PENDING 0x10 +/* Device Node Flags */ +#define DNF_PROCESSED 0x00000001 +#define DNF_STARTED 0x00000002 +#define DNF_START_FAILED 0x00000004 +#define DNF_ENUMERATED 0x00000008 +#define DNF_DELETED 0x00000010 +#define DNF_MADEUP 0x00000020 +#define DNF_START_REQUEST_PENDING 0x00000040 +#define DNF_NO_RESOURCE_REQUIRED 0x00000080 +#define DNF_INSUFFICIENT_RESOURCES 0x00000100 +#define DNF_RESOURCE_ASSIGNED 0x00000200 +#define DNF_RESOURCE_REPORTED 0x00000400 +#define DNF_HAL_NODE 0x00000800 // ??? +#define DNF_ADDED 0x00001000 +#define DNF_ADD_FAILED 0x00002000 +#define DNF_LEGACY_DRIVER 0x00004000 +#define DNF_STOPPED 0x00008000 +#define DNF_WILL_BE_REMOVED 0x00010000 +#define DNF_NEED_TO_ENUM 0x00020000 +#define DNF_NOT_CONFIGURED 0x00040000 +#define DNF_REINSTALL 0x00080000 +#define DNF_RESOURCE_REQUIREMENTS_NEED_FILTERED 0x00100000 // ??? +#define DNF_DISABLED 0x00200000 +#define DNF_RESTART_OK 0x00400000 +#define DNF_NEED_RESTART 0x00800000 +#define DNF_VISITED 0x01000000 +#define DNF_ASSIGNING_RESOURCES 0x02000000 +#define DNF_BEEING_ENUMERATED 0x04000000 +#define DNF_NEED_ENUMERATION_ONLY 0x08000000 +#define DNF_LOCKED 0x10000000 +#define DNF_HAS_BOOT_CONFIG 0x20000000 +#define DNF_BOOT_CONFIG_RESERVED 0x40000000 +#define DNF_HAS_PROBLEM 0x80000000 // ??? +/* For UserFlags field */ +#define DNUF_DONT_SHOW_IN_UI 0x0002 +#define DNUF_NOT_DISABLEABLE 0x0008 + /* ENUMERATIONS **************************************************************/ +typedef enum _PNP_DEVNODE_STATE +{ + DeviceNodeUnspecified = 0x300, + DeviceNodeUninitialized = 0x301, + DeviceNodeInitialized = 0x302, + DeviceNodeDriversAdded = 0x303, + DeviceNodeResourcesAssigned = 0x304, + DeviceNodeStartPending = 0x305, + DeviceNodeStartCompletion = 0x306, + DeviceNodeStartPostWork = 0x307, + DeviceNodeStarted = 0x308, + DeviceNodeQueryStopped = 0x309, + DeviceNodeStopped = 0x30a, + DeviceNodeRestartCompletion = 0x30b, + DeviceNodeEnumeratePending = 0x30c, + DeviceNodeEnumerateCompletion = 0x30d, + DeviceNodeAwaitingQueuedDeletion = 0x30e, + DeviceNodeAwaitingQueuedRemoval = 0x30f, + DeviceNodeQueryRemoved = 0x310, + DeviceNodeRemovePendingCloses = 0x311, + DeviceNodeRemoved = 0x312, + DeviceNodeDeletePendingCloses = 0x313, + DeviceNodeDeleted = 0x314, + MaxDeviceNodeState = 0x315, +} PNP_DEVNODE_STATE; /* TYPES *********************************************************************/ @@ -52,13 +117,124 @@ typedef struct _IO_TIMER { - USHORT Type; - USHORT TimerEnabled; - LIST_ENTRY IoTimerList; - PIO_TIMER_ROUTINE TimerRoutine; - PVOID Context; - PDEVICE_OBJECT DeviceObject; + USHORT Type; + USHORT TimerEnabled; + LIST_ENTRY IoTimerList; + PIO_TIMER_ROUTINE TimerRoutine; + PVOID Context; + PDEVICE_OBJECT DeviceObject; } IO_TIMER, *PIO_TIMER; +typedef struct _DEVICE_NODE +{ + /* A tree structure. */ + struct _DEVICE_NODE *Parent; + struct _DEVICE_NODE *PrevSibling; + struct _DEVICE_NODE *NextSibling; + struct _DEVICE_NODE *Child; + /* The level of deepness in the tree. */ + UINT Level; + PPO_DEVICE_NOTIFY Notify; + /* State machine. */ + PNP_DEVNODE_STATE State; + PNP_DEVNODE_STATE PreviousState; + PNP_DEVNODE_STATE StateHistory[20]; + UINT StateHistoryEntry; + /* ? */ + INT CompletionStatus; + /* ? */ + PIRP PendingIrp; + /* See DNF_* flags below (WinDBG documentation has WRONG values) */ + ULONG Flags; + /* See DNUF_* flags below (and IRP_MN_QUERY_PNP_DEVICE_STATE) */ + ULONG UserFlags; + /* See CM_PROB_* values are defined in cfg.h */ + ULONG Problem; + /* Pointer to the PDO corresponding to the device node. */ + PDEVICE_OBJECT PhysicalDeviceObject; + /* Resource list as assigned by the PnP arbiter. See IRP_MN_START_DEVICE + and ARBITER_INTERFACE (not documented in DDK, but present in headers). */ + PCM_RESOURCE_LIST ResourceList; + /* Resource list as assigned by the PnP arbiter (translated version). */ + PCM_RESOURCE_LIST ResourceListTranslated; + /* Instance path relative to the Enum key in registry. */ + UNICODE_STRING InstancePath; + /* Name of the driver service. */ + UNICODE_STRING ServiceName; + /* ? */ + PDEVICE_OBJECT DuplicatePDO; + /* See IRP_MN_QUERY_RESOURCE_REQUIREMENTS. */ + PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirements; + /* Information about bus for bus drivers. */ + INTERFACE_TYPE InterfaceType; + ULONG BusNumber; + /* Information about underlying bus for child devices. */ + INTERFACE_TYPE ChildInterfaceType; + ULONG ChildBusNumber; + USHORT ChildBusTypeIndex; + /* ? */ + UCHAR RemovalPolicy; + UCHAR HardwareRemovalPolicy; + LIST_ENTRY TargetDeviceNotify; + LIST_ENTRY DeviceArbiterList; + LIST_ENTRY DeviceTranslatorList; + USHORT NoTranslatorMask; + USHORT QueryTranslatorMask; + USHORT NoArbiterMask; + USHORT QueryArbiterMask; + union + { + struct _DEVICE_NODE *LegacyDeviceNode; + PDEVICE_RELATIONS PendingDeviceRelations; + } OverUsed1; + union + { + struct _DEVICE_NODE *NextResourceDeviceNode; + } OverUsed2; + /* See IRP_MN_QUERY_RESOURCES/IRP_MN_FILTER_RESOURCES. */ + PCM_RESOURCE_LIST BootResources; + /* See the bitfields in DEVICE_CAPABILITIES structure. */ + ULONG CapabilityFlags; + struct + { + ULONG DockStatus; + LIST_ENTRY ListEntry; + WCHAR *SerialNumber; + } DockInfo; + ULONG DisableableDepends; + LIST_ENTRY PendedSetInterfaceState; + LIST_ENTRY LegacyBusListEntry; + ULONG DriverUnloadRetryCount; + struct _DEVICE_NODE *PreviousParent; + ULONG DeletedChidren; + + /* FIXME: Not NT's */ + GUID BusTypeGuid; + ULONG Address; +} DEVICE_NODE, *PDEVICE_NODE; + +typedef struct _DEVOBJ_EXTENSION +{ + CSHORT Type; + USHORT Size; + PDEVICE_OBJECT DeviceObject; + ULONG PowerFlags; + struct DEVICE_OBJECT_POWER_EXTENSION *Dope; + ULONG ExtensionFlags; + struct _DEVICE_NODE *DeviceNode; + PDEVICE_OBJECT AttachedTo; + LONG StartIoCount; + LONG StartIoKey; + ULONG StartIoFlags; + struct _VPB *Vpb; +} DEVOBJ_EXTENSION, *PDEVOBJ_EXTENSION; + +typedef struct _PRIVATE_DRIVER_EXTENSIONS +{ + struct _PRIVATE_DRIVER_EXTENSIONS *Link; + PVOID ClientIdentificationAddress; + CHAR Extension[1]; +} PRIVATE_DRIVER_EXTENSIONS, *PPRIVATE_DRIVER_EXTENSIONS; + #endif _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-06-25 16:01:27 UTC (rev 16267) +++ trunk/reactos/include/ndk/ketypes.h 2005-06-25 17:01:17 UTC (rev 16268) @@ -11,6 +11,8 @@ /* DEPENDENCIES **************************************************************/ #include "haltypes.h" +#include "potypes.h" +#include "mmtypes.h" #include <arc/arc.h> /* CONSTANTS *****************************************************************/ @@ -21,12 +23,6 @@ #define THREAD_WAIT_OBJECTS 4 -/* FIXME: Create an ASM Offset File */ -#define KTSS_ESP0 (0x4) -#define KTSS_CR3 (0x1C) -#define KTSS_EFLAGS (0x24) -#define KTSS_IOMAPBASE (0x66) - /* EXPORTED DATA *************************************************************/ extern CHAR NTOSAPI KeNumberProcessors; extern LOADER_PARAMETER_BLOCK NTOSAPI KeLoaderBlock; @@ -46,13 +42,12 @@ typedef struct _CONFIGURATION_COMPONENT_DATA { - struct _CONFIGURATION_COMPONENT_DATA *Parent; - struct _CONFIGURATION_COMPONENT_DATA *Child; - struct _CONFIGURATION_COMPONENT_DATA *Sibling; - CONFIGURATION_COMPONENT Component; + struct _CONFIGURATION_COMPONENT_DATA *Parent; + struct _CONFIGURATION_COMPONENT_DATA *Child; + struct _CONFIGURATION_COMPONENT_DATA *Sibling; + CONFIGURATION_COMPONENT Component; } CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA; - typedef enum _KAPC_ENVIRONMENT { OriginalApcEnvironment, @@ -68,6 +63,48 @@ ULONG DpcCount; } KDPC_DATA, *PKDPC_DATA; +/* FIXME: Most of these should go to i386 directory */ +typedef struct _FNSAVE_FORMAT +{ + ULONG ControlWord; + ULONG StatusWord; + ULONG TagWord; + ULONG ErrorOffset; + ULONG ErrorSelector; + ULONG DataOffset; + ULONG DataSelector; + UCHAR RegisterArea[80]; +} FNSAVE_FORMAT, *PFNSAVE_FORMAT; + +typedef struct _FXSAVE_FORMAT +{ + USHORT ControlWord; + USHORT StatusWord; + USHORT TagWord; + USHORT ErrorOpcode; + ULONG ErrorOffset; + ULONG ErrorSelector; + ULONG DataOffset; + ULONG DataSelector; + ULONG MXCsr; + ULONG MXCsrMask; + UCHAR RegisterArea[128]; + UCHAR Reserved3[128]; + UCHAR Reserved4[224]; + UCHAR Align16Byte[8]; +} FXSAVE_FORMAT, *PFXSAVE_FORMAT; + +typedef struct _FX_SAVE_AREA +{ + union + { + FNSAVE_FORMAT FnArea; + FXSAVE_FORMAT FxArea; + } U; + ULONG NpxSavedCpu; + ULONG Cr0NpxState; +} FX_SAVE_AREA, *PFX_SAVE_AREA; + typedef struct _KTRAP_FRAME { PVOID DebugEbp; @@ -141,7 +178,231 @@ } HighWord; } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; +typedef struct _KGDTENTRY +{ + USHORT LimitLow; + USHORT BaseLow; + union { + struct { + UCHAR BaseMid; + UCHAR Flags1; + UCHAR Flags2; + UCHAR BaseHi; + } Bytes; + struct { + ULONG BaseMid : 8; + ULONG Type : 5; + ULONG Dpl : 2; + ULONG Pres : 1; + ULONG LimitHi : 4; + ULONG Sys : 1; + ULONG Reserved_0 : 1; + ULONG Default_Big : 1; + ULONG Granularity : 1; + ULONG BaseHi : 8; + } Bits; + } HighWord; +} KGDTENTRY, *PKGDTENTRY; +typedef struct _KIDTENTRY +{ + USHORT Offset; + USHORT Selector; + USHORT Access; + USHORT ExtendedOffset; +} KIDTENTRY, *PKIDTENTRY; + +typedef struct _HARDWARE_PTE_X86 +{ + ULONG Valid : 1; + ULONG Write : 1; + ULONG Owner : 1; + ULONG WriteThrough : 1; + ULONG CacheDisable : 1; + ULONG Accessed : 1; + ULONG Dirty : 1; + ULONG LargePage : 1; + ULONG Global : 1; + ULONG CopyOnWrite : 1; + ULONG Prototype : 1; + ULONG reserved : 1; + ULONG PageFrameNumber : 20; +} HARDWARE_PTE_X86, *PHARDWARE_PTE_X86; + +#pragma pack(push,4) + +/* Fixme: Use correct types? */ +typedef struct _KPROCESSOR_STATE +{ + PCONTEXT ContextFrame; + PVOID SpecialRegisters; +} KPROCESSOR_STATE; + +/* Processor Control Block */ +typedef struct _KPRCB +{ + USHORT MinorVersion; + USHORT MajorVersion; + struct _KTHREAD *CurrentThread; + struct _KTHREAD *NextThread; + struct _KTHREAD *IdleThread; + UCHAR Number; + UCHAR Reserved; + USHORT BuildType; + ULONG SetMember; + UCHAR CpuType; + UCHAR CpuID; + USHORT CpuStep; + KPROCESSOR_STATE ProcessorState; + ULONG KernelReserved[16]; + ULONG HalReserved[16]; + UCHAR PrcbPad0[92]; + PVOID LockQueue[33]; // Used for Queued Spinlocks + struct _KTHREAD *NpxThread; + ULONG InterruptCount; + ULONG KernelTime; + ULONG UserTime; + ULONG DpcTime; + ULONG DebugDpcTime; + ULONG InterruptTime; + ULONG AdjustDpcThreshold; + ULONG PageColor; + UCHAR SkipTick; + UCHAR DebuggerSavedIRQL; + UCHAR Spare1[6]; + struct _KNODE *ParentNode; + ULONG MultiThreadProcessorSet; + struct _KPRCB *MultiThreadSetMaster; + ULONG ThreadStartCount[2]; + ULONG CcFastReadNoWait; + ULONG CcFastReadWait; + ULONG CcFastReadNotPossible; + ULONG CcCopyReadNoWait; + ULONG CcCopyReadWait; + ULONG CcCopyReadNoWaitMiss; + ULONG KeAlignmentFixupCount; + ULONG KeContextSwitches; + ULONG KeDcacheFlushCount; + ULONG KeExceptionDispatchCount; + ULONG KeFirstLevelTbFills; + ULONG KeFloatingEmulationCount; + ULONG KeIcacheFlushCount; + ULONG KeSecondLevelTbFills; + ULONG KeSystemCalls; + ULONG IoReadOperationCount; + ULONG IoWriteOperationCount; + ULONG IoOtherOperationCount; + LARGE_INTEGER IoReadTransferCount; + LARGE_INTEGER IoWriteTransferCount; + LARGE_INTEGER IoOtherTransferCount; + ULONG SpareCounter1[8]; + PP_LOOKASIDE_LIST PPLookasideList[16]; + PP_LOOKASIDE_LIST PPNPagedLookasideList[32]; + PP_LOOKASIDE_LIST PPPagedLookasideList[32]; + ULONG PacketBarrier; + ULONG ReverseStall; + PVOID IpiFrame; + UCHAR PrcbPad2[52]; + PVOID CurrentPacket[3]; + ULONG TargetSet; + ULONG_PTR WorkerRoutine; + ULONG IpiFrozen; + UCHAR PrcbPad3[40]; + ULONG RequestSummary; + struct _KPRCB *SignalDone; + UCHAR PrcbPad4[56]; + struct _KDPC_DATA DpcData[2]; + PVOID DpcStack; + ULONG MaximumDpcQueueDepth; + ULONG DpcRequestRate; + ULONG MinimumDpcRate; + UCHAR DpcInterruptRequested; + UCHAR DpcThreadRequested; + UCHAR DpcRoutineActive; + UCHAR DpcThreadActive; + ULONG PrcbLock; + ULONG DpcLastCount; + ULONG TimerHand; + ULONG TimerRequest; + PVOID DpcThread; + struct _KEVENT *DpcEvent; + UCHAR ThreadDpcEnable; + BOOLEAN QuantumEnd; + UCHAR PrcbPad50; + UCHAR IdleSchedule; + ULONG DpcSetEventRequest; + UCHAR PrcbPad5[18]; + LONG TickOffset; + struct _KDPC* CallDpc; + ULONG PrcbPad7[8]; + LIST_ENTRY WaitListHead; + ULONG ReadySummary; + ULONG SelectNextLast; + LIST_ENTRY DispatcherReadyListHead[32]; + SINGLE_LIST_ENTRY DeferredReadyListHead; + ULONG PrcbPad72[11]; + PVOID ChainedInterruptList; + LONG LookasideIrpFloat; + LONG MmPageFaultCount; + LONG MmCopyOnWriteCount; + LONG MmTransitionCount; + LONG MmCacheTransitionCount; + LONG MmDemandZeroCount; + LONG MmPageReadCount; + LONG MmPageReadIoCount; + LONG MmCacheReadCount; + LONG MmCacheIoCount; + LONG MmDirtyPagesWriteCount; + LONG MmDirtyWriteIoCount; + LONG MmMappedPagesWriteCount; + LONG MmMappedWriteIoCount; + ULONG SpareFields0[1]; + CHAR VendorString[13]; + UCHAR InitialApicId; + UCHAR LogicalProcessorsPerPhysicalProcessor; + ULONG MHz; + ULONG FeatureBits; + LARGE_INTEGER UpdateSignature; + LARGE_INTEGER IsrTime; + LARGE_INTEGER SpareField1; + FX_SAVE_AREA NpxSaveArea; + PROCESSOR_POWER_STATE PowerState; +} KPRCB, *PKPRCB; + +/* + * This is the complete, internal KPCR structure + */ +typedef struct _KIPCR { + KPCR_TIB Tib; /* 00 */ + struct _KPCR *Self; /* 1C */ + struct _KPRCB *Prcb; /* 20 */ + KIRQL Irql; /* 24 */ + ULONG IRR; /* 28 */ + ULONG IrrActive; /* 2C */ + ULONG IDR; /* 30 */ + PVOID KdVersionBlock; /* 34 */ + PUSHORT IDT; /* 38 */ + PUSHORT GDT; /* 3C */ + struct _KTSS *TSS; /* 40 */ + USHORT MajorVersion; /* 44 */ + USHORT MinorVersion; /* 46 */ + KAFFINITY SetMember; /* 48 */ + ULONG StallScaleFactor; /* 4C */ + UCHAR SparedUnused; /* 50 */ + UCHAR Number; /* 51 */ + UCHAR Reserved; /* 52 */ + UCHAR L2CacheAssociativity; /* 53 */ + ULONG VdmAlert; /* 54 */ + ULONG KernelReserved[14]; /* 58 */ + ULONG L2CacheSize; /* 90 */ + ULONG HalReserved[16]; /* 94 */ + ULONG InterruptMode; /* D4 */ + UCHAR KernelReserved2[0x48]; /* D8 */ + KPRCB PrcbData; /* 120 */ +} KIPCR, *PKIPCR; + +#pragma pack(pop) + #include <pshpack1.h> typedef struct _KTSSNOIOPM @@ -239,6 +500,35 @@ } KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; +typedef struct _KNODE +{ + SLIST_HEADER DeadStackList; + SLIST_HEADER PfnDereferenceSListHead; + ULONG ProcessorMask; + ULONG Color; + UCHAR Seed; + UCHAR NodeNumber; + ULONG Flags; + ULONG MmShiftedColor; + ULONG FreeCount[2]; + struct _SINGLE_LIST_ENTRY *PfnDeferredList; +} KNODE, *PKNODE; + +typedef struct _KPROFILE +{ + CSHORT Type; + CSHORT Size; + LIST_ENTRY ListEntry; + PVOID RegionStart; + PVOID RegionEnd; + ULONG BucketShift; + PVOID Buffer; + CSHORT Source; + ULONG Affinity; + BOOLEAN Active; + struct _KPROCESS *Process; +} KPROFILE, *PKPROFILE; + typedef struct _KINTERRUPT { CSHORT Type; @@ -271,36 +561,192 @@ KEVENT HighEvent; } KEVENT_PAIR, *PKEVENT_PAIR; -typedef enum _KOBJECTS { - EventNotificationObject = 0, - EventSynchronizationObject = 1, - MutantObject = 2, - ProcessObject = 3, - QueueObject = 4, - SemaphoreObject = 5, - ThreadObject = 6, - GateObject = 7, - TimerNotificationObject = 8, - TimerSynchronizationObject = 9, - Spare2Object = 10, - Spare3Object = 11, - Spare4Object = 12, - Spare5Object = 13, - Spare6Object = 14, - Spare7Object = 15, - Spare8Object = 16, - Spare9Object = 17, - ApcObject = 18, - DpcObject = 19, - DeviceQueueObject = 20, - EventPairObject = 21, - InterruptObject = 22, - ProfileObject = 23, - ThreadedDpcObject = 24, - MaximumKernelObject = 25 +typedef struct _KEXECUTE_OPTIONS +{ + UCHAR ExecuteDisable:1; + UCHAR ExecuteEnable:1; + UCHAR DisableThunkEmulation:1; + UCHAR Permanent:1; + UCHAR ExecuteDispatchEnable:1; + UCHAR ImageDispatchEnable:1; + UCHAR Spare:2; +} KEXECUTE_OPTIONS, *PKEXECUTE_OPTIONS; + +typedef enum _KOBJECTS +{ + EventNotificationObject = 0, + EventSynchronizationObject = 1, + MutantObject = 2, + ProcessObject = 3, + QueueObject = 4, + SemaphoreObject = 5, + ThreadObject = 6, + GateObject = 7, + TimerNotificationObject = 8, + TimerSynchronizationObject = 9, + Spare2Object = 10, + Spare3Object = 11, + Spare4Object = 12, + Spare5Object = 13, + Spare6Object = 14, + Spare7Object = 15, + Spare8Object = 16, + Spare9Object = 17, + ApcObject = 18, + DpcObject = 19, + DeviceQueueObject = 20, + EventPairObject = 21, + InterruptObject = 22, + ProfileObject = 23, + ThreadedDpcObject = 24, + MaximumKernelObject = 25 } KOBJECTS; -typedef enum _KTHREAD_STATE { +#include <pshpack1.h> + +typedef struct _KTHREAD +{ + /* For waiting on thread exit */ + DISPATCHER_HEADER DispatcherHeader; /* 00 */ + + /* List of mutants owned by the thread */ + LIST_ENTRY MutantListHead; /* 10 */ + PVOID InitialStack; /* 18 */ + ULONG_PTR StackLimit; /* 1C */ + + /* Pointer to the thread's environment block in user memory */ + struct _TEB *Teb; /* 20 */ + + /* Pointer to the thread's TLS array */ + PVOID TlsArray; /* 24 */ + PVOID KernelStack; /* 28 */ + UCHAR DebugActive; /* 2C */ + + /* Thread state (one of THREAD_STATE_xxx constants below) */ + UCHAR State; /* 2D */ + BOOLEAN Alerted[2]; /* 2E */ + UCHAR Iopl; /* 30 */ + UCHAR NpxState; /* 31 */ + CHAR Saturation; /* 32 */ + CHAR Priority; /* 33 */ + KAPC_STATE ApcState; /* 34 */ + ULONG ContextSwitches; /* 4C */ + LONG WaitStatus; /* 50 */ + KIRQL WaitIrql; /* 54 */ + CHAR WaitMode; /* 55 */ + UCHAR WaitNext; /* 56 */ + UCHAR WaitReason; /* 57 */ + union { /* 58 */ + PKWAIT_BLOCK WaitBlockList; /* 58 */ + PKGATE GateObject; /* 58 */ + }; /* 58 */ + LIST_ENTRY WaitListEntry; /* 5C */ + ULONG WaitTime; /* 64 */ + CHAR BasePriority; /* 68 */ + UCHAR DecrementCount; /* 69 */ + UCHAR PriorityDecrement; /* 6A */ + CHAR Quantum; /* 6B */ + KWAIT_BLOCK WaitBlock[4]; /* 6C */ + PVOID LegoData; /* CC */ + union { + struct { + USHORT KernelApcDisable; + USHORT SpecialApcDisable; + }; + ULONG CombinedApcDisable; /* D0 */ + }; + KAFFINITY UserAffinity; /* D4 */ + UCHAR SystemAffinityActive;/* D8 */ + UCHAR PowerState; /* D9 */ + UCHAR NpxIrql; /* DA */ + UCHAR Pad[1]; /* DB */ + PVOID ServiceTable; /* DC */ + PKQUEUE Queue; /* E0 */ + KSPIN_LOCK ApcQueueLock; /* E4 */ + KTIMER Timer; /* E8 */ + LIST_ENTRY QueueListEntry; /* 110 */ + KAFFINITY Affinity; /* 118 */ + UCHAR Preempted; /* 11C */ + UCHAR ProcessReadyQueue; /* 11D */ + UCHAR KernelStackResident; /* 11E */ + UCHAR NextProcessor; /* 11F */ + PVOID CallbackStack; /* 120 */ + struct _W32THREAD *Win32Thread; /* 124 */ + struct _KTRAP_FRAME *TrapFrame; /* 128 */ + PKAPC_STATE ApcStatePointer[2]; /* 12C */ + UCHAR EnableStackSwap; /* 134 */ + UCHAR LargeStack; /* 135 */ + UCHAR ResourceIndex; /* 136 */ + UCHAR PreviousMode; /* 137 */ + ULONG KernelTime; /* 138 */ + ULONG UserTime; /* 13C */ + KAPC_STATE SavedApcState; /* 140 */ + UCHAR Alertable; /* 158 */ + UCHAR ApcStateIndex; /* 159 */ + UCHAR ApcQueueable; /* 15A */ + UCHAR AutoAlignment; /* 15B */ + PVOID StackBase; /* 15C */ + KAPC SuspendApc; /* 160 */ + KSEMAPHORE SuspendSemaphore; /* 190 */ + LIST_ENTRY ThreadListEntry; /* 1A4 */ + CHAR FreezeCount; /* 1AC */ + UCHAR SuspendCount; /* 1AD */ + UCHAR IdealProcessor; /* 1AE */ + UCHAR DisableBoost; /* 1AF */ + UCHAR QuantumReset; /* 1B0 */ +} KTHREAD; + +#include <poppack.h> + +/* + * NAME: KPROCESS + * DESCRIPTION: Internal Kernel Process Structure. + * PORTABILITY: Architecture Dependent. + * KERNEL VERSION: 5.2 + * DOCUMENTATION: http://reactos.com/wiki/index.php/KPROCESS + */ +typedef struct _KPROCESS +{ + DISPATCHER_HEADER Header; /* 000 */ + LIST_ENTRY ProfileListHead; /* 010 */ + PHYSICAL_ADDRESS DirectoryTableBase; /* 018 */ + KGDTENTRY LdtDescriptor; /* 020 */ + KIDTENTRY Int21Descriptor; /* 028 */ + USHORT IopmOffset; /* 030 */ + UCHAR Iopl; /* 032 */ + UCHAR Unused; /* 033 */ + ULONG ActiveProcessors; /* 034 */ + ULONG KernelTime; /* 038 */ + ULONG UserTime; /* 03C */ + LIST_ENTRY ReadyListHead; /* 040 */ + LIST_ENTRY SwapListEntry; /* 048 */ + PVOID VdmTrapcHandler; /* 04C */ + LIST_ENTRY ThreadListHead; /* 050 */ + KSPIN_LOCK ProcessLock; /* 058 */ + KAFFINITY Affinity; /* 05C */ + union { + struct { + ULONG AutoAlignment:1; /* 060.0 */ + ULONG DisableBoost:1; /* 060.1 */ + ULONG DisableQuantum:1; /* 060.2 */ + ULONG ReservedFlags:29; /* 060.3 */ + }; + ULONG ProcessFlags; /* 060 */ + }; + CHAR BasePriority; /* 064 */ + CHAR QuantumReset; /* 065 */ + UCHAR State; /* 066 */ + UCHAR ThreadSeed; /* 067 */ + UCHAR PowerState; /* 068 */ + UCHAR IdealNode; /* 069 */ + UCHAR Visited; /* 06A */ + KEXECUTE_OPTIONS Flags; /* 06B */ + ULONG StackCount; /* 06C */ + LIST_ENTRY ProcessListEntry; /* 070 */ [truncated at 1000 lines; 6372 more skipped]

19 years, 4 months

[hpoussin] 16267: Remove mouse type selection in usetup.

by hpoussin＠svn.reactos.com

Remove mouse type selection in usetup. i8042prt driver is always loaded for keyboard and auto-detects the PS/2 mouse (if any) sermouse driver is loaded if a serial mouse is enumerated by serenum driver Modified: trunk/reactos/bootdata/hiveinst.inf Modified: trunk/reactos/bootdata/txtsetup.sif Modified: trunk/reactos/subsys/system/usetup/settings.c Modified: trunk/reactos/subsys/system/usetup/settings.h Modified: trunk/reactos/subsys/system/usetup/usetup.c _____ Modified: trunk/reactos/bootdata/hiveinst.inf --- trunk/reactos/bootdata/hiveinst.inf 2005-06-25 14:04:56 UTC (rev 16266) +++ trunk/reactos/bootdata/hiveinst.inf 2005-06-25 16:01:27 UTC (rev 16267) @@ -17,15 +17,3 @@ ; VGA miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x000000 01 - - -; -; Mouse driver section -; - -; PS/2 mouse port driver -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Start",0x00010001,0x 00000001 - - -; Serial mouse driver -;HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Start",0x00010001,0 x00000001 _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-06-25 14:04:56 UTC (rev 16266) +++ trunk/reactos/bootdata/txtsetup.sif 2005-06-25 16:01:27 UTC (rev 16267) @@ -96,23 +96,6 @@ 00000809 = kbduk.dll 00000807 = kbdsg.dll -[Mouse] -;<id> = <user friendly name>,<spare>,<service key name> -i8042ps2 = "PS2 Mouse",,i8042prt -;msps2 = "Microsoft PS2 Mouse",,psaux -msser = "Microsoft Serial Mouse",,sermouse -mswhs = "Microsoft Serial Wheel Mouse",,sermouse -none = "No Mouse" - -[Map.Mouse] -;<id> = <pnp id string> -i8042ps2 = "MICROSOFT PS2 MOUSE" -;msps2 = "MICROSOFT PS2 MOUSE" -msser = "MICROSOFT SERIAL MOUSE" -mswhs = "MICROSOFT MOUSE WITH WHEEL" -none = "NO MOUSE" - - [HiveInfs.Install] AddReg=hivecls.inf,AddReg AddReg=hivedef.inf,AddReg _____ Modified: trunk/reactos/subsys/system/usetup/settings.c --- trunk/reactos/subsys/system/usetup/settings.c 2005-06-25 14:04:56 UTC (rev 16266) +++ trunk/reactos/subsys/system/usetup/settings.c 2005-06-25 16:01:27 UTC (rev 16267) @@ -609,386 +609,4 @@ } #endif - -static BOOLEAN -GetMouseIdentifier(PWSTR ControllerType, - PWSTR Identifier, - ULONG IdentifierLength) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - WCHAR Buffer[32]; - HANDLE BusKey; - HANDLE BusInstanceKey; - HANDLE ControllerKey; - HANDLE ControllerInstanceKey; - HANDLE PeripheralKey; - HANDLE PeripheralInstanceKey; - ULONG BusInstance; - ULONG ControllerInstance; - ULONG PeripheralInstance; - ULONG BufferLength; - ULONG ReturnedLength; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - NTSTATUS Status; - - DPRINT("GetMouseIdentifier() called\n"); - - /* Open the bus key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\HARDWARE\\Description\\System\\MultifunctionAdapt er"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&BusKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - BusInstance = 0; - while (TRUE) - { - swprintf(Buffer, L"%lu", BusInstance); - RtlInitUnicodeString(&KeyName, - Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - BusKey, - NULL); - Status = NtOpenKey(&BusInstanceKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - NtClose(BusKey); - return FALSE; - } - - /* Open the controller type key */ - RtlInitUnicodeString(&KeyName, - ControllerType); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - BusInstanceKey, - NULL); - Status = NtOpenKey(&ControllerKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - ControllerInstance = 0; - while (TRUE) - { - /* Open the pointer controller instance key */ - swprintf(Buffer, L"%lu", ControllerInstance); - RtlInitUnicodeString(&KeyName, - Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ControllerKey, - NULL); - Status = NtOpenKey(&ControllerInstanceKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return FALSE; - } - - /* Open the 'PointerPeripheral' key */ - RtlInitUnicodeString(&KeyName, - L"PointerPeripheral"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ControllerInstanceKey, - NULL); - Status = NtOpenKey(&PeripheralKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - PeripheralInstance = 0; - while (TRUE) - { - /* Open the pointer peripheral instance key */ - swprintf(Buffer, L"%lu", PeripheralInstance); - RtlInitUnicodeString(&KeyName, - Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - PeripheralKey, - NULL); - Status = NtOpenKey(&PeripheralInstanceKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - NtClose(PeripheralKey); - NtClose(ControllerInstanceKey); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return FALSE; - } - - /* Get peripheral identifier */ - RtlInitUnicodeString(&KeyName, - L"Identifier"); - - BufferLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + - 256 * sizeof(WCHAR); - ValueInfo = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - BufferLength); - if (ValueInfo == NULL) - { - DPRINT("RtlAllocateHeap() failed\n"); - NtClose(PeripheralInstanceKey); - NtClose(PeripheralKey); - NtClose(ControllerInstanceKey); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return FALSE; - } - - Status = NtQueryValueKey(PeripheralInstanceKey, - &KeyName, - KeyValuePartialInformation, - ValueInfo, - BufferLength, - &ReturnedLength); - if (NT_SUCCESS(Status)) - { - DPRINT("Identifier: %S\n", (PWSTR)ValueInfo->Data); - - BufferLength = min(ValueInfo->DataLength / sizeof(WCHAR), IdentifierLength); - RtlCopyMemory (Identifier, - ValueInfo->Data, - BufferLength * sizeof(WCHAR)); - Identifier[BufferLength] = 0; - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - ValueInfo); - NtClose(PeripheralInstanceKey); - NtClose(PeripheralKey); - NtClose(ControllerInstanceKey); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return TRUE; - } - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - ValueInfo); - - NtClose(PeripheralInstanceKey); - - PeripheralInstance++; - } - - NtClose(PeripheralKey); - } - - NtClose(ControllerInstanceKey); - - ControllerInstance++; - } - - NtClose(ControllerKey); - } - - NtClose(BusInstanceKey); - - BusInstance++; - } - - NtClose(BusKey); - - return FALSE; -} - - -PGENERIC_LIST -CreateMouseDriverList(HINF InfFile) -{ - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - WCHAR MouseIdentifier[128]; - WCHAR MouseKey[32]; - - /* Get the mouse identification */ - if (!GetMouseIdentifier(L"SerialController", MouseIdentifier, 128)) - { - if (!GetMouseIdentifier(L"PointerController", MouseIdentifier, 128)) - { - wcscpy (MouseIdentifier, L"NO MOUSE"); - } - } - - DPRINT("Mouse identifier: '%S'\n", MouseIdentifier); - - /* Search for matching device identifier */ - if (!InfFindFirstLine(InfFile, L"Map.Mouse", NULL, &Context)) - { - /* FIXME: error message */ - return NULL; - } - - do - { - if (!InfGetDataField(&Context, 1, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("InfGetDataField() failed\n"); - return NULL; - } - - DPRINT("KeyValue: %S\n", KeyValue); - if (wcsstr(MouseIdentifier, KeyValue)) - { - if (!InfGetDataField(&Context, 0, &KeyName)) - { - /* FIXME: Handle error! */ - DPRINT("InfGetDataField() failed\n"); - return NULL; - } - - DPRINT("Mouse key: %S\n", KeyName); - wcscpy(MouseKey, KeyName); - } - } - while (InfFindNextLine(&Context, &Context)); - - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!InfFindFirstLine(InfFile, L"Mouse", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!InfGetDataField(&Context, 0, &KeyName)) - { - DPRINT1("InfGetDataField() failed\n"); - break; - } - - if (!InfGetDataField(&Context, 1, &KeyValue)) - { - DPRINT1("InfGetDataField() failed\n"); - break; - } - - UserData = RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - DPRINT1("RtlAllocateHeap() failed\n"); - DestroyGenericList(List, TRUE); - return NULL; - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, MouseKey) ? FALSE : TRUE); - } - while (InfFindNextLine(&Context, &Context)); - - return List; -} - - -BOOLEAN -ProcessMouseRegistry(HINF InfFile, PGENERIC_LIST List) -{ - PGENERIC_LIST_ENTRY Entry; - INFCONTEXT Context; - PWCHAR ServiceName; - ULONG StartValue; - NTSTATUS Status; - - DPRINT("ProcessMouseRegistry() called\n"); - - Entry = GetGenericListEntry(List); - if (Entry == NULL) - { - DPRINT("GetGenericListEntry() failed\n"); - return FALSE; - } - - if (!InfFindFirstLine(InfFile, L"Mouse", Entry->UserData, &Context)) - { - DPRINT("InfFindFirstLine() failed\n"); - return FALSE; - } - - if (!InfGetDataField(&Context, 3, &ServiceName)) - { - DPRINT("InfGetDataField() failed\n"); - return FALSE; - } - - DPRINT("Service name: %S\n", ServiceName); - - StartValue = 1; - Status = RtlWriteRegistryValue(RTL_REGISTRY_SERVICES, - ServiceName, - L"Start", - REG_DWORD, - &StartValue, - sizeof(ULONG)); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - return FALSE; - } - - DPRINT("ProcessMouseRegistry() done\n"); - - return TRUE; -} - - -#if 0 -BOOLEAN -ProcessMouseFiles(PGENERIC_LIST List) -{ - return TRUE; -} -#endif - /* EOF */ _____ Modified: trunk/reactos/subsys/system/usetup/settings.h --- trunk/reactos/subsys/system/usetup/settings.h 2005-06-25 14:04:56 UTC (rev 16266) +++ trunk/reactos/subsys/system/usetup/settings.h 2005-06-25 16:01:27 UTC (rev 16267) @@ -54,12 +54,6 @@ BOOLEAN ProcessKeyboardLayoutFiles(PGENERIC_LIST List); -PGENERIC_LIST -CreateMouseDriverList(HINF InfFile); - -BOOLEAN -ProcessMouseRegistry(HINF InfFile, PGENERIC_LIST List); - #endif /* __SETTINGS_H__ */ /* EOF */ _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-06-25 14:04:56 UTC (rev 16266) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-06-25 16:01:27 UTC (rev 16267) @@ -45,7 +45,6 @@ DISPLAY_SETTINGS_PAGE, KEYBOARD_SETTINGS_PAGE, LAYOUT_SETTINGS_PAGE, - POINTER_SETTINGS_PAGE, SELECT_PARTITION_PAGE, CREATE_PARTITION_PAGE, @@ -117,7 +116,6 @@ static PGENERIC_LIST DisplayList = NULL; static PGENERIC_LIST KeyboardList = NULL; static PGENERIC_LIST LayoutList = NULL; -static PGENERIC_LIST PointerList = NULL; /* FUNCTIONS ****************************************************************/ @@ -938,7 +936,7 @@ static PAGE_NUMBER DeviceSettingsPage(PINPUT_RECORD Ir) { - static ULONG Line = 17; + static ULONG Line = 16; /* Initialize the computer settings list */ if (ComputerList == NULL) @@ -992,42 +990,30 @@ } } - /* Initialize the pointer settings list */ - if (PointerList == NULL) - { - PointerList = CreateMouseDriverList(SetupInf); - if (PointerList == NULL) - { - /* FIXME: report error */ - } - } - SetTextXY(6, 8, "The list below shows the current device settings."); SetTextXY(8, 11, " Computer:"); SetTextXY(8, 12, " Display:"); SetTextXY(8, 13, " Keyboard:"); SetTextXY(8, 14, "Keyboard layout:"); - SetTextXY(8, 15, " Pointer device:"); - SetTextXY(8, 17, " Accept:"); + SetTextXY(8, 16, " Accept:"); SetTextXY(25, 11, GetGenericListEntry(ComputerList)->Text); SetTextXY(25, 12, GetGenericListEntry(DisplayList)->Text); SetTextXY(25, 13, GetGenericListEntry(KeyboardList)->Text); SetTextXY(25, 14, GetGenericListEntry(LayoutList)->Text); - SetTextXY(25, 15, GetGenericListEntry(PointerList)->Text); - SetTextXY(25, 17, "Accept these device settings"); + SetTextXY(25, 16, "Accept these device settings"); InvertTextXY (24, Line, 48, 1); - SetTextXY(6, 20, "You can change the hardware settings by pressing the UP or DOWN keys"); - SetTextXY(6, 21, "to select an entry. Then press the ENTER key to select alternative"); - SetTextXY(6, 22, "settings."); + SetTextXY(6, 19, "You can change the hardware settings by pressing the UP or DOWN keys"); + SetTextXY(6, 20, "to select an entry. Then press the ENTER key to select alternative"); + SetTextXY(6, 21, "settings."); - SetTextXY(6, 24, "When all settings are correct, select \"Accept these device settings\""); - SetTextXY(6, 25, "and press ENTER."); + SetTextXY(6, 23, "When all settings are correct, select \"Accept these device settings\""); + SetTextXY(6, 24, "and press ENTER."); SetStatusText(" ENTER = Continue F3 = Quit"); @@ -1039,9 +1025,9 @@ (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { NormalTextXY (24, Line, 48, 1); - if (Line == 15) - Line = 17; - else if (Line == 17) + if (Line == 14) + Line = 16; + else if (Line == 16) Line = 11; else Line++; @@ -1052,9 +1038,9 @@ { NormalTextXY (24, Line, 48, 1); if (Line == 11) - Line = 17; - else if (Line == 17) - Line = 15; + Line = 16; + else if (Line == 16) + Line = 14; else Line--; InvertTextXY (24, Line, 48, 1); @@ -1076,9 +1062,7 @@ return KEYBOARD_SETTINGS_PAGE; else if (Line == 14) return LAYOUT_SETTINGS_PAGE; - else if (Line == 15) - return POINTER_SETTINGS_PAGE; - else if (Line == 17) + else if (Line == 16) return SELECT_PARTITION_PAGE; } } @@ -1342,69 +1326,6 @@ static PAGE_NUMBER -PointerSettingsPage(PINPUT_RECORD Ir) -{ - SHORT xScreen; - SHORT yScreen; - - SetTextXY(6, 8, "You want to change the pointing device to be installed."); - - SetTextXY(8, 10, "\x07 Press the UP or DOWN key to select the desired pointing"); - SetTextXY(8, 11, " device. Then press ENTER."); - - SetTextXY(8, 13, "\x07 Press the ESC key to return to the previous page without changing"); - SetTextXY(8, 14, " the pointing device."); - - GetScreenSize(&xScreen, &yScreen); - - DrawGenericList(PointerList, - 2, - 18, - xScreen - 3, - yScreen - 3); - - SetStatusText(" ENTER = Continue ESC = Cancel F3 = Quit"); - - SaveGenericListState(PointerList); - - while(TRUE) - { - ConInKey(Ir); - - if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ - { - ScrollDownGenericList(PointerList); - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ - { - ScrollUpGenericList(PointerList); - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ - { - if (ConfirmQuit(Ir) == TRUE) - return QUIT_PAGE; - break; - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ - { - RestoreGenericListState(PointerList); - return DEVICE_SETTINGS_PAGE; - } - else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return DEVICE_SETTINGS_PAGE; - } - } - - return DISPLAY_SETTINGS_PAGE; -} - - -static PAGE_NUMBER SelectPartitionPage(PINPUT_RECORD Ir) { SHORT xScreen; @@ -3320,24 +3241,6 @@ } } - /* Update mouse registry settings */ - SetStatusText(" Updating mouse registry settings..."); - if (!ProcessMouseRegistry(SetupInf, PointerList)) - { - PopupError("Setup failed to update mouse registry settings.", - "ENTER = Reboot computer"); - - while(TRUE) - { - ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } - } - SetStatusText(" Done..."); return BOOT_LOADER_PAGE; @@ -3636,13 +3539,6 @@ LayoutList = NULL; } - /* Destroy pointer device list */ - if (PointerList != NULL) - { - DestroyGenericList(PointerList, TRUE); - PointerList = NULL; - } - SetStatusText(" ENTER = Reboot computer"); while(TRUE) @@ -3838,10 +3734,6 @@ Page = LayoutSettingsPage(&Ir); break; - case POINTER_SETTINGS_PAGE: - Page = PointerSettingsPage(&Ir); - break; - case SELECT_PARTITION_PAGE: Page = SelectPartitionPage(&Ir); break;

19 years, 4 months

[ion] 16266: Build ntoskrnl with NDK, and don't use rosrtl

by ion＠svn.reactos.com

Build ntoskrnl with NDK, and don't use rosrtl Modified: trunk/reactos/include/ntos/ps.h Modified: trunk/reactos/include/ntos/security.h Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/internal/port.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/io/arcname.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/resource.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c Modified: trunk/reactos/ntoskrnl/ldr/init.c Modified: trunk/reactos/ntoskrnl/ldr/loader.c Modified: trunk/reactos/ntoskrnl/ldr/sysdll.c Modified: trunk/reactos/ntoskrnl/lpc/port.c Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ob/wait.c Modified: trunk/reactos/ntoskrnl/ps/locale.c Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/ntoskrnl/rtl/rangelist.c Modified: trunk/reactos/ntoskrnl/rtl/sprintf.c Modified: trunk/reactos/ntoskrnl/rtl/stdlib.c Modified: trunk/reactos/ntoskrnl/rtl/swprintf.c _____ Modified: trunk/reactos/include/ntos/ps.h --- trunk/reactos/include/ntos/ps.h 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/include/ntos/ps.h 2005-06-25 14:04:56 UTC (rev 16266) @@ -136,7 +136,7 @@ (STDCALL *PW32_THREAD_CALLBACK)(struct _ETHREAD *Thread, BOOLEAN Create); -typedef struct _EJOB *PEJOB; +struct _EJOB; NTSTATUS STDCALL PsCreateSystemProcess (PHANDLE ProcessHandle, @@ -189,19 +189,19 @@ PVOID STDCALL PsGetJobLock( - PEJOB Job + struct _EJOB* Job ); PVOID STDCALL PsGetJobSessionId( - PEJOB Job + struct _EJOB* Job ); ULONG STDCALL PsGetJobUIRestrictionsClass( - PEJOB Job + struct _EJOB* Job ); @@ -247,7 +247,7 @@ ); -PEJOB +struct _EJOB* STDCALL PsGetProcessJob( PEPROCESS Process ); @@ -378,7 +378,7 @@ VOID STDCALL PsSetJobUIRestrictionsClass( - PEJOB Job, + struct _EJOB* Job, ULONG UIRestrictionsClass ); _____ Modified: trunk/reactos/include/ntos/security.h --- trunk/reactos/include/ntos/security.h 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/include/ntos/security.h 2005-06-25 14:04:56 UTC (rev 16266) @@ -4,6 +4,7 @@ #include <ntos/ntdef.h> #include <ntos/types.h> +#ifndef __USE_W32API /* Privileges */ #define SE_MIN_WELL_KNOWN_PRIVILEGE (2L) #define SE_CREATE_TOKEN_PRIVILEGE (2L) @@ -31,7 +32,7 @@ #define SE_CHANGE_NOTIFY_PRIVILEGE (23L) #define SE_REMOTE_SHUTDOWN_PRIVILEGE (24L) #define SE_MAX_WELL_KNOWN_PRIVILEGE SE_REMOTE_SHUTDOWN_PRIVILEGE - +#endif /* TOKEN_GROUPS structure */ #ifndef SE_GROUP_MANDATORY #define SE_GROUP_MANDATORY (0x1L) _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-06-25 14:04:56 UTC (rev 16266) @@ -97,7 +97,7 @@ NTSTATUS STDCALL NtQuerySystemEnvironmentValue (IN PUNICODE_STRING VariableName, - OUT PWCHAR ValueBuffer, + OUT PWSTR ValueBuffer, IN ULONG ValueBufferLength, IN OUT PULONG ReturnLength OPTIONAL) { @@ -353,17 +353,17 @@ { return (STATUS_INFO_LENGTH_MISMATCH); } - Sbi->Unknown = 0; - Sbi->MaximumIncrement = KeMaximumIncrement; - Sbi->PhysicalPageSize = PAGE_SIZE; + Sbi->Reserved = 0; + Sbi->TimerResolution = KeMaximumIncrement; + Sbi->PageSize = PAGE_SIZE; Sbi->NumberOfPhysicalPages = MmStats.NrTotalPages; - Sbi->LowestPhysicalPage = 0; /* FIXME */ - Sbi->HighestPhysicalPage = MmStats.NrTotalPages; /* FIXME */ + Sbi->LowestPhysicalPageNumber = 0; /* FIXME */ + Sbi->HighestPhysicalPageNumber = MmStats.NrTotalPages; /* FIXME */ Sbi->AllocationGranularity = MM_VIRTMEM_GRANULARITY; /* hard coded on Intel? */ - Sbi->LowestUserAddress = 0x10000; /* Top of 64k */ - Sbi->HighestUserAddress = (ULONG_PTR)MmHighestUserAddress; - Sbi->ActiveProcessors = KeActiveProcessors; - Sbi->NumberProcessors = KeNumberProcessors; + Sbi->MinimumUserModeAddress = 0x10000; /* Top of 64k */ + Sbi->MaximumUserModeAddress = (ULONG_PTR)MmHighestUserAddress; + Sbi->ActiveProcessorsAffinityMask = KeActiveProcessors; + Sbi->NumberOfProcessors = KeNumberProcessors; return (STATUS_SUCCESS); } @@ -385,8 +385,8 @@ Spi->ProcessorArchitecture = 0; /* Intel Processor */ Spi->ProcessorLevel = Prcb->CpuType; Spi->ProcessorRevision = Prcb->CpuStep; - Spi->Unknown = 0; - Spi->FeatureBits = Prcb->FeatureBits; + Spi->Reserved = 0; + Spi->ProcessorFeatureBits = Prcb->FeatureBits; DPRINT("Arch %d Level %d Rev 0x%x\n", Spi->ProcessorArchitecture, Spi->ProcessorLevel, Spi->ProcessorRevision); @@ -413,21 +413,21 @@ TheIdleProcess = PsIdleProcess; - Spi->IdleTime.QuadPart = TheIdleProcess->Pcb.KernelTime * 100000LL; + Spi->IdleProcessTime.QuadPart = TheIdleProcess->Pcb.KernelTime * 100000LL; - Spi->ReadTransferCount = IoReadTransferCount; - Spi->WriteTransferCount = IoWriteTransferCount; - Spi->OtherTransferCount = IoOtherTransferCount; - Spi->ReadOperationCount = IoReadOperationCount; - Spi->WriteOperationCount = IoWriteOperationCount; - Spi->OtherOperationCount = IoOtherOperationCount; + Spi->IoReadTransferCount = IoReadTransferCount; + Spi->IoWriteTransferCount = IoWriteTransferCount; + Spi->IoOtherTransferCount = IoOtherTransferCount; + Spi->IoReadOperationCount = IoReadOperationCount; + Spi->IoWriteOperationCount = IoWriteOperationCount; + Spi->IoOtherOperationCount = IoOtherOperationCount; Spi->AvailablePages = MmStats.NrFreePages; /* Add up all the used "Commitied" memory + pagefile. Not sure this is right. 8^\ */ - Spi->TotalCommittedPages = MiMemoryConsumers[MC_PPOOL].PagesUsed + + Spi->CommittedPages = MiMemoryConsumers[MC_PPOOL].PagesUsed + MiMemoryConsumers[MC_NPPOOL].PagesUsed+ MiMemoryConsumers[MC_CACHE].PagesUsed+ MiMemoryConsumers[MC_USER].PagesUsed+ @@ -437,79 +437,79 @@ All this make Taskmgr happy but not sure it is the right numbers. This too, fixes some of GlobalMemoryStatusEx numbers. */ - Spi->TotalCommitLimit = MmStats.NrTotalPages + MiFreeSwapPages + + Spi->CommitLimit = MmStats.NrTotalPages + MiFreeSwapPages + MiUsedSwapPages; Spi->PeakCommitment = 0; /* FIXME */ - Spi->PageFaults = 0; /* FIXME */ - Spi->WriteCopyFaults = 0; /* FIXME */ - Spi->TransitionFaults = 0; /* FIXME */ - Spi->CacheTransitionFaults = 0; /* FIXME */ - Spi->DemandZeroFaults = 0; /* FIXME */ - Spi->PagesRead = 0; /* FIXME */ - Spi->PageReadIos = 0; /* FIXME */ - Spi->CacheReads = 0; /* FIXME */ - Spi->CacheIos = 0; /* FIXME */ - Spi->PagefilePagesWritten = 0; /* FIXME */ - Spi->PagefilePageWriteIos = 0; /* FIXME */ - Spi->MappedFilePagesWritten = 0; /* FIXME */ - Spi->MappedFilePageWriteIos = 0; /* FIXME */ + Spi->PageFaultCount = 0; /* FIXME */ + Spi->CopyOnWriteCount = 0; /* FIXME */ + Spi->TransitionCount = 0; /* FIXME */ + Spi->CacheTransitionCount = 0; /* FIXME */ + Spi->DemandZeroCount = 0; /* FIXME */ + Spi->PageReadCount = 0; /* FIXME */ + Spi->PageReadIoCount = 0; /* FIXME */ + Spi->CacheReadCount = 0; /* FIXME */ + Spi->CacheIoCount = 0; /* FIXME */ + Spi->DirtyPagesWriteCount = 0; /* FIXME */ + Spi->DirtyWriteIoCount = 0; /* FIXME */ + Spi->MappedPagesWriteCount = 0; /* FIXME */ + Spi->MappedWriteIoCount = 0; /* FIXME */ - Spi->PagedPoolUsage = MiMemoryConsumers[MC_PPOOL].PagesUsed; + Spi->PagedPoolPages = MiMemoryConsumers[MC_PPOOL].PagesUsed; Spi->PagedPoolAllocs = 0; /* FIXME */ Spi->PagedPoolFrees = 0; /* FIXME */ - Spi->NonPagedPoolUsage = MiMemoryConsumers[MC_NPPOOL].PagesUsed; + Spi->NonPagedPoolPages = MiMemoryConsumers[MC_NPPOOL].PagesUsed; Spi->NonPagedPoolAllocs = 0; /* FIXME */ Spi->NonPagedPoolFrees = 0; /* FIXME */ - Spi->TotalFreeSystemPtes = 0; /* FIXME */ + Spi->FreeSystemPtes = 0; /* FIXME */ - Spi->SystemCodePage = MmStats.NrSystemPages; /* FIXME */ + Spi->ResidentSystemCodePage = MmStats.NrSystemPages; /* FIXME */ Spi->TotalSystemDriverPages = 0; /* FIXME */ Spi->TotalSystemCodePages = 0; /* FIXME */ - Spi->SmallNonPagedLookasideListAllocateHits = 0; /* FIXME */ - Spi->SmallPagedLookasideListAllocateHits = 0; /* FIXME */ - Spi->Reserved3 = 0; /* FIXME */ + Spi->NonPagedPoolLookasideHits = 0; /* FIXME */ + Spi->PagedPoolLookasideHits = 0; /* FIXME */ + Spi->Spare3Count = 0; /* FIXME */ - Spi->MmSystemCachePage = MiMemoryConsumers[MC_CACHE].PagesUsed; - Spi->PagedPoolPage = MmPagedPoolSize; /* FIXME */ + Spi->ResidentSystemCachePage = MiMemoryConsumers[MC_CACHE].PagesUsed; + Spi->ResidentPagedPoolPage = MmPagedPoolSize; /* FIXME */ - Spi->SystemDriverPage = 0; /* FIXME */ - Spi->FastReadNoWait = 0; /* FIXME */ - Spi->FastReadWait = 0; /* FIXME */ - Spi->FastReadResourceMiss = 0; /* FIXME */ - Spi->FastReadNotPossible = 0; /* FIXME */ + Spi->ResidentSystemDriverPage = 0; /* FIXME */ + Spi->CcFastReadNoWait = 0; /* FIXME */ + Spi->CcFastReadWait = 0; /* FIXME */ + Spi->CcFastReadResourceMiss = 0; /* FIXME */ + Spi->CcFastReadNotPossible = 0; /* FIXME */ - Spi->FastMdlReadNoWait = 0; /* FIXME */ - Spi->FastMdlReadWait = 0; /* FIXME */ - Spi->FastMdlReadResourceMiss = 0; /* FIXME */ - Spi->FastMdlReadNotPossible = 0; /* FIXME */ + Spi->CcFastMdlReadNoWait = 0; /* FIXME */ + Spi->CcFastMdlReadWait = 0; /* FIXME */ + Spi->CcFastMdlReadResourceMiss = 0; /* FIXME */ + Spi->CcFastMdlReadNotPossible = 0; /* FIXME */ - Spi->MapDataNoWait = 0; /* FIXME */ - Spi->MapDataWait = 0; /* FIXME */ - Spi->MapDataNoWaitMiss = 0; /* FIXME */ - Spi->MapDataWaitMiss = 0; /* FIXME */ + Spi->CcMapDataNoWait = 0; /* FIXME */ + Spi->CcMapDataWait = 0; /* FIXME */ + Spi->CcMapDataNoWaitMiss = 0; /* FIXME */ + Spi->CcMapDataWaitMiss = 0; /* FIXME */ - Spi->PinMappedDataCount = 0; /* FIXME */ - Spi->PinReadNoWait = 0; /* FIXME */ - Spi->PinReadWait = 0; /* FIXME */ - Spi->PinReadNoWaitMiss = 0; /* FIXME */ - Spi->PinReadWaitMiss = 0; /* FIXME */ - Spi->CopyReadNoWait = 0; /* FIXME */ - Spi->CopyReadWait = 0; /* FIXME */ - Spi->CopyReadNoWaitMiss = 0; /* FIXME */ - Spi->CopyReadWaitMiss = 0; /* FIXME */ + Spi->CcPinMappedDataCount = 0; /* FIXME */ + Spi->CcPinReadNoWait = 0; /* FIXME */ + Spi->CcPinReadWait = 0; /* FIXME */ + Spi->CcPinReadNoWaitMiss = 0; /* FIXME */ + Spi->CcPinReadWaitMiss = 0; /* FIXME */ + Spi->CcCopyReadNoWait = 0; /* FIXME */ + Spi->CcCopyReadWait = 0; /* FIXME */ + Spi->CcCopyReadNoWaitMiss = 0; /* FIXME */ + Spi->CcCopyReadWaitMiss = 0; /* FIXME */ - Spi->MdlReadNoWait = 0; /* FIXME */ - Spi->MdlReadWait = 0; /* FIXME */ - Spi->MdlReadNoWaitMiss = 0; /* FIXME */ - Spi->MdlReadWaitMiss = 0; /* FIXME */ - Spi->ReadAheadIos = 0; /* FIXME */ - Spi->LazyWriteIos = 0; /* FIXME */ - Spi->LazyWritePages = 0; /* FIXME */ - Spi->DataFlushes = 0; /* FIXME */ - Spi->DataPages = 0; /* FIXME */ + Spi->CcMdlReadNoWait = 0; /* FIXME */ + Spi->CcMdlReadWait = 0; /* FIXME */ + Spi->CcMdlReadNoWaitMiss = 0; /* FIXME */ + Spi->CcMdlReadWaitMiss = 0; /* FIXME */ + Spi->CcReadAheadIos = 0; /* FIXME */ + Spi->CcLazyWriteIos = 0; /* FIXME */ + Spi->CcLazyWritePages = 0; /* FIXME */ + Spi->CcDataFlushes = 0; /* FIXME */ + Spi->CcDataPages = 0; /* FIXME */ Spi->ContextSwitches = 0; /* FIXME */ Spi->FirstLevelTbFills = 0; /* FIXME */ Spi->SecondLevelTbFills = 0; /* FIXME */ @@ -1100,39 +1100,39 @@ /* Class 26 - Load Image */ SSI_DEF(SystemLoadImage) { - PSYSTEM_LOAD_IMAGE Sli = (PSYSTEM_LOAD_IMAGE)Buffer; + PSYSTEM_GDI_DRIVER_INFORMATION Sli = (PSYSTEM_GDI_DRIVER_INFORMATION)Buffer; - if (sizeof(SYSTEM_LOAD_IMAGE) != Size) + if (sizeof(SYSTEM_GDI_DRIVER_INFORMATION) != Size) { return(STATUS_INFO_LENGTH_MISMATCH); } - return(LdrpLoadImage(&Sli->ModuleName, - &Sli->ModuleBase, + return(LdrpLoadImage(&Sli->DriverName, + &Sli->ImageAddress, &Sli->SectionPointer, &Sli->EntryPoint, - &Sli->ExportDirectory)); + (PVOID)&Sli->ExportSectionPointer)); } /* Class 27 - Unload Image */ SSI_DEF(SystemUnloadImage) { - PSYSTEM_UNLOAD_IMAGE Sui = (PSYSTEM_UNLOAD_IMAGE)Buffer; + PVOID Sui = (PVOID)Buffer; - if (sizeof(SYSTEM_UNLOAD_IMAGE) != Size) + if (sizeof(PVOID) != Size) { return(STATUS_INFO_LENGTH_MISMATCH); } - return(LdrpUnloadImage(Sui->ModuleBase)); + return(LdrpUnloadImage(Sui)); } /* Class 28 - Time Adjustment Information */ QSI_DEF(SystemTimeAdjustmentInformation) { - if (sizeof (SYSTEM_SET_TIME_ADJUSTMENT) > Size) + if (sizeof (SYSTEM_SET_TIME_ADJUST_INFORMATION) > Size) { - * ReqSize = sizeof (SYSTEM_SET_TIME_ADJUSTMENT); + * ReqSize = sizeof (SYSTEM_SET_TIME_ADJUST_INFORMATION); return (STATUS_INFO_LENGTH_MISMATCH); } /* FIXME: */ @@ -1142,7 +1142,7 @@ SSI_DEF(SystemTimeAdjustmentInformation) { - if (sizeof (SYSTEM_SET_TIME_ADJUSTMENT) > Size) + if (sizeof (SYSTEM_SET_TIME_ADJUST_INFORMATION) > Size) { return (STATUS_INFO_LENGTH_MISMATCH); } @@ -1229,7 +1229,7 @@ DPRINT1("Faking max registry size of 32 MB\n"); srqi->RegistryQuotaAllowed = 0x2000000; srqi->RegistryQuotaUsed = 0x200000; - srqi->Reserved1 = (void*)0x200000; + srqi->PagedPoolSize = 0x200000; return STATUS_SUCCESS; } @@ -1244,14 +1244,14 @@ /* Class 38 - Load And Call Image */ SSI_DEF(SystemLoadAndCallImage) { - PSYSTEM_LOAD_AND_CALL_IMAGE Slci = (PSYSTEM_LOAD_AND_CALL_IMAGE)Buffer; + PUNICODE_STRING Slci = (PUNICODE_STRING)Buffer; - if (sizeof(SYSTEM_LOAD_AND_CALL_IMAGE) != Size) + if (sizeof(UNICODE_STRING) != Size) { return(STATUS_INFO_LENGTH_MISMATCH); } - return(LdrpLoadAndCallImage(&Slci->ModuleName)); + return(LdrpLoadAndCallImage(Slci)); } /* Class 39 - Priority Separation */ @@ -1532,7 +1532,7 @@ /* * Check the request is valid. */ - if ((SystemInformationClass >= SystemInformationClassMin) && + if ((SystemInformationClass >= SystemBasicInformation) && (SystemInformationClass < SystemInformationClassMax)) { if (NULL != CallQS [SystemInformationClass].Query) @@ -1609,7 +1609,7 @@ /* * Check the request is valid. */ - if ( (SystemInformationClass >= SystemInformationClassMin) + if ( (SystemInformationClass >= SystemBasicInformation) && (SystemInformationClass < SystemInformationClassMax) ) { _____ Modified: trunk/reactos/ntoskrnl/ex/win32k.c --- trunk/reactos/ntoskrnl/ex/win32k.c 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/ex/win32k.c 2005-06-25 14:04:56 UTC (rev 16266) @@ -18,25 +18,20 @@ POBJECT_TYPE EXPORTED ExWindowStationObjectType = NULL; POBJECT_TYPE EXPORTED ExDesktopObjectType = NULL; -static GENERIC_MAPPING ExpWindowStationMapping = { - - STANDARD_RIGHTS_READ | WINSTA_ENUMDESKTOPS | WINSTA_ENUMERATE | WINSTA_READATTRIBUTES | WINSTA_READSCREEN, - STANDARD_RIGHTS_WRITE | WINSTA_ACCESSCLIPBOARD | WINSTA_CREATEDESKTOP | WINSTA_WRITEATTRIBUTES, - STANDARD_RIGHTS_EXECUTE | WINSTA_ACCESSGLOBALATOMS | WINSTA_EXITWINDOWS, - STANDARD_RIGHTS_REQUIRED | WINSTA_ACCESSCLIPBOARD | WINSTA_ACCESSGLOBALATOMS | WINSTA_CREATEDESKTOP | - WINSTA_ENUMDESKTOPS | WINSTA_ENUMERATE | WINSTA_EXITWINDOWS | - WINSTA_READATTRIBUTES | WINSTA_READSCREEN | WINSTA_WRITEATTRIBUTES +static GENERIC_MAPPING ExpWindowStationMapping = +{ + STANDARD_RIGHTS_READ, + STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_EXECUTE, + STANDARD_RIGHTS_REQUIRED }; -static GENERIC_MAPPING ExpDesktopMapping = { - - STANDARD_RIGHTS_READ | DESKTOP_ENUMERATE | DESKTOP_READOBJECTS, - STANDARD_RIGHTS_WRITE | DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW | DESKTOP_HOOKCONTROL | - DESKTOP_JOURNALPLAYBACK | DESKTOP_JOURNALRECORD | DESKTOP_WRITEOBJECTS, - STANDARD_RIGHTS_EXECUTE | DESKTOP_SWITCHDESKTOP, - STANDARD_RIGHTS_REQUIRED | DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW | DESKTOP_ENUMERATE | - DESKTOP_HOOKCONTROL | DESKTOP_JOURNALPLAYBACK | DESKTOP_JOURNALRECORD | - DESKTOP_READOBJECTS | DESKTOP_SWITCHDESKTOP | DESKTOP_WRITEOBJECTS +static GENERIC_MAPPING ExpDesktopMapping = +{ + STANDARD_RIGHTS_READ, + STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_EXECUTE, + STANDARD_RIGHTS_REQUIRED }; OB_OPEN_METHOD ExpWindowStationObjectOpen = NULL; _____ Modified: trunk/reactos/ntoskrnl/inbv/inbv.c --- trunk/reactos/ntoskrnl/inbv/inbv.c 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/inbv/inbv.c 2005-06-25 14:04:56 UTC (rev 16266) @@ -37,9 +37,8 @@ { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING BootVidName; + UNICODE_STRING BootVidName = RTL_CONSTANT_STRING(L"\\Device\\BootVid"); - RtlRosInitUnicodeStringFromLiteral(&BootVidName, L"\\Device\\BootVid"); InitializeObjectAttributes(&ObjectAttributes, &BootVidName, 0, _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-06-25 14:04:56 UTC (rev 16266) @@ -576,6 +576,18 @@ STDCALL KeFlushCurrentTb(VOID); +/* REACTOS SPECIFIC */ + +VOID STDCALL +KeRosDumpStackFrames( + PULONG Frame, + ULONG FrameCount); + +ULONG STDCALL +KeRosGetStackFrames( + PULONG Frames, + ULONG FrameCount); + VOID KiSetSystemTime(PLARGE_INTEGER NewSystemTime); _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-25 14:04:56 UTC (rev 16266) @@ -85,6 +85,8 @@ #define MM_LOWEST_USER_ADDRESS (PVOID)0x10000 #endif +#define TEB_BASE (0x7FFDE000) + #define MM_VIRTMEM_GRANULARITY (64 * 1024) /* Although Microsoft says this isn't hardcoded anymore, they won't be able to change it. Stuff depends on it */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-25 14:04:56 UTC (rev 16266) @@ -15,6 +15,40 @@ #define PAGE_LOCKED_FUNCTION PLACE_IN_SECTION("pagelk") #define PAGE_UNLOCKED_FUNCTION PLACE_IN_SECTION("pagepo") +#ifdef _NTOSKRNL_ + +#include "ke.h" +#include "i386/segment.h" +#include "i386/mm.h" +#include "i386/fpu.h" +#include "module.h" +#include "pool.h" +#include "ob.h" +#include "mm.h" +#include "ps.h" +#include "cc.h" +#include "io.h" +#include "po.h" +#include "se.h" +#include "ldr.h" +#include "kd.h" +#include "ex.h" +#include "xhal.h" +#include "v86m.h" +#include "ifs.h" +#include "port.h" +#include "nls.h" +#ifdef KDBG +#include "kdb.h" +#endif +#include "dbgk.h" +#include "trap.h" +#include "safe.h" +#include "tag.h" +#include "test.h" +#include "inbv.h" + + #include <pshpack1.h> /* * Defines a descriptor as it appears in the processor tables @@ -62,6 +96,7 @@ IN PCWSTR Source, IN POOL_TYPE PoolType); +#endif #endif /* __ASM__ */ /* _____ Modified: trunk/reactos/ntoskrnl/include/internal/port.h --- trunk/reactos/ntoskrnl/include/internal/port.h 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/include/internal/port.h 2005-06-25 14:04:56 UTC (rev 16266) @@ -95,6 +95,61 @@ UCHAR MessageData [MAX_MESSAGE_DATA]; } QUEUEDMESSAGE, *PQUEUEDMESSAGE; +typedef struct _LPC_DBG_MESSAGE +{ + LPC_MESSAGE Header; + ULONG Type; + ULONG Status; + union + { + struct + { + EXCEPTION_RECORD ExceptionRecord; + ULONG FirstChance; + } Exception; + struct + { + ULONG Reserved; + PVOID StartAddress; + } CreateThread; + struct + { + ULONG Reserved; + HANDLE FileHandle; + PVOID Base; + ULONG PointerToSymbolTable; + ULONG NumberOfSymbols; + ULONG Reserved2; + PVOID EntryPoint; + } CreateProcess; + struct + { + ULONG ExitCode; + } ExitThread; + struct + { + ULONG ExitCode; + } ExitProcess; + struct + { + HANDLE FileHandle; + PVOID Base; + ULONG PointerToSymbolTable; + ULONG NumberOfSymbols; + } LoadDll; + struct + { + PVOID Base; + } UnloadDll; + } Data; +} LPC_DBG_MESSAGE, *PLPC_DBG_MESSAGE; + +typedef struct _LPC_TERMINATION_MESSAGE +{ + LPC_MESSAGE Header; + LARGE_INTEGER CreationTime; +} LPC_TERMINATION_MESSAGE, *PLPC_TERMINATION_MESSAGE; + /* Code in ntoskrnl/lpc/close.h */ VOID STDCALL _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-06-25 14:04:56 UTC (rev 16266) @@ -542,7 +542,7 @@ UINT PeakJobMemoryUsed; UINT CurrentJobMemoryUsed; FAST_MUTEX MemoryLimitsLock; -} EJOB; +} EJOB, *PEJOB; #include <poppack.h> VOID INIT_FUNCTION PsInitJobManagment(VOID); _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-25 14:04:56 UTC (rev 16266) @@ -5,76 +5,37 @@ /* include the ntoskrnl config.h file */ #include "config.h" - -#include <roskrnl.h> +#include <roscfg.h> + +/* DDK/IFS/NDK Headers */ #include <ddk/ntddk.h> #include <ddk/ntifs.h> #include <ddk/wdmguid.h> - +#include <ndk/ntndk.h> #undef IO_TYPE_FILE #define IO_TYPE_FILE 0x0F5L /* Temp Hack */ + +/* FIXME: Add to ndk, or at least move somewhere else */ +#include <ntos/ntpnp.h> +#include <napi/core.h> -#include <roscfg.h> +/* ReactOS Headers */ #include <reactos/version.h> #include <reactos/resource.h> #include <reactos/bugcodes.h> #include <reactos/rossym.h> -#include <limits.h> -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> + +/* C Headers */ #include <malloc.h> #include <wchar.h> -#include <ntos/minmax.h> -#include <ntos/synch.h> -#include <ntos/keyboard.h> -#include <ntos/ntdef.h> -#include <ntos/ldrtypes.h> -#include <ntos/ntpnp.h> -#include <ddk/ldrfuncs.h> -#include <rosrtl/minmax.h> -#include <rosrtl/string.h> -#include <ntdll/ldr.h> + +/* SEH support with PSEH */ #include <pseh.h> -#include <internal/ctype.h> -#include <internal/ntoskrnl.h> -#include <internal/ke.h> -#include <internal/i386/segment.h> -#include <internal/i386/mm.h> -#include <internal/i386/fpu.h> -#include <internal/module.h> -#include <internal/pool.h> -#include <internal/ob.h> -#include <internal/mm.h> -#include <internal/ps.h> -#include <internal/cc.h> -#include <internal/io.h> -#include <internal/po.h> -#include <internal/se.h> -#include <internal/ldr.h> -#include <internal/kd.h> -#include <internal/ex.h> -#include "internal/xhal.h" -#include <internal/v86m.h> -#include <internal/ifs.h> -#include <internal/port.h> -#include <internal/nls.h> -#ifdef KDBG -#include <internal/kdb.h> -#endif -#include <internal/dbgk.h> -#include <internal/trap.h> -#include <internal/safe.h> -#include <internal/tag.h> -#include <internal/test.h> -#include <internal/inbv.h> -#include <napi/core.h> -#include <napi/dbg.h> -#include <napi/teb.h> -#include <napi/win32.h> -#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif +/* Helper Header */ +#include <reactos/helper.h> +/* Internal Headers */ +#include "internal/ntoskrnl.h" + #endif /* INCLUDE_NTOSKRNL_H */ _____ Modified: trunk/reactos/ntoskrnl/io/arcname.c --- trunk/reactos/ntoskrnl/io/arcname.c 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/io/arcname.c 2005-06-25 14:04:56 UTC (rev 16266) @@ -311,7 +311,7 @@ { OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING LinkName; + UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\SystemRoot"); UNICODE_STRING DeviceName; UNICODE_STRING ArcName; UNICODE_STRING BootPath; @@ -445,9 +445,6 @@ DPRINT("DeviceName: %wZ\n", &DeviceName); /* create the '\SystemRoot' link */ - RtlRosInitUnicodeStringFromLiteral(&LinkName, - L"\\SystemRoot"); - Status = IoCreateSymbolicLink(&LinkName, &DeviceName); ExFreePool(DeviceName.Buffer); _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-06-25 14:04:56 UTC (rev 16266) @@ -72,7 +72,7 @@ static LIST_ENTRY ServiceListHead = {NULL, NULL}; static UNICODE_STRING IopHardwareDatabaseKey = - ROS_STRING_INITIALIZER(L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYS TEM"); + RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM "); POBJECT_TYPE EXPORTED IoDriverObjectType = NULL; @@ -1019,7 +1019,7 @@ RTL_QUERY_REGISTRY_TABLE QueryTable[2]; PKEY_BASIC_INFORMATION KeyInfo = NULL; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING ServicesKeyName; + UNICODE_STRING ServicesKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Se rvices"); UNICODE_STRING SubKeyName; HANDLE KeyHandle; NTSTATUS Status; @@ -1050,9 +1050,6 @@ return(Status); /* Enumerate services and create the service list */ - RtlRosInitUnicodeStringFromLiteral(&ServicesKeyName, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services"); - InitializeObjectAttributes(&ObjectAttributes, &ServicesKeyName, OBJ_CASE_INSENSITIVE, _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/io/file.c 2005-06-25 14:04:56 UTC (rev 16266) @@ -14,9 +14,6 @@ #define NDEBUG #include <internal/debug.h> -/* FIXME: Header mess */ -#undef CreateMailslot - /* GLOBALS *******************************************************************/ extern GENERIC_MAPPING IopFileMapping; @@ -3004,7 +3001,7 @@ STDCALL NtSetQuotaInformationFile(HANDLE FileHandle, PIO_STATUS_BLOCK IoStatusBlock, - PFILE_USER_QUOTA_INFORMATION Buffer, + PFILE_QUOTA_INFORMATION Buffer, ULONG BufferLength) { UNIMPLEMENTED; _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-06-25 14:04:56 UTC (rev 16266) @@ -182,7 +182,7 @@ UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING DirName; - UNICODE_STRING LinkName; + UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\DosDevices"); HANDLE Handle; IopInitDriverImplementation(); @@ -222,7 +222,7 @@ /* * Create the '\Driver' object directory */ - RtlRosInitUnicodeStringFromLiteral(&DirName, L"\\Driver"); + RtlInitUnicodeString(&DirName, L"\\Driver"); InitializeObjectAttributes(&ObjectAttributes, &DirName, 0, @@ -235,7 +235,7 @@ /* * Create the '\FileSystem' object directory */ - RtlRosInitUnicodeStringFromLiteral(&DirName, + RtlInitUnicodeString(&DirName, L"\\FileSystem"); InitializeObjectAttributes(&ObjectAttributes, &DirName, @@ -249,7 +249,7 @@ /* * Create the '\Device' directory */ - RtlRosInitUnicodeStringFromLiteral(&DirName, + RtlInitUnicodeString(&DirName, L"\\Device"); InitializeObjectAttributes(&ObjectAttributes, &DirName, @@ -263,7 +263,7 @@ /* * Create the '\??' directory */ - RtlRosInitUnicodeStringFromLiteral(&DirName, + RtlInitUnicodeString(&DirName, L"\\??"); InitializeObjectAttributes(&ObjectAttributes, &DirName, @@ -277,7 +277,7 @@ /* * Create the '\ArcName' directory */ - RtlRosInitUnicodeStringFromLiteral(&DirName, + RtlInitUnicodeString(&DirName, L"\\ArcName"); InitializeObjectAttributes(&ObjectAttributes, &DirName, @@ -304,9 +304,7 @@ /* * Create link from '\DosDevices' to '\??' directory */ - RtlRosInitUnicodeStringFromLiteral(&LinkName, - L"\\DosDevices"); - RtlRosInitUnicodeStringFromLiteral(&DirName, + RtlInitUnicodeString(&DirName, L"\\??"); IoCreateSymbolicLink(&LinkName, &DirName); _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-06-25 14:04:56 UTC (rev 16266) @@ -10,14 +10,10 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#include <ddk/wdmguid.h> #define NDEBUG #include <internal/debug.h> -/* FIXME: Header mess */ -#undef DeviceCapabilities - /* GLOBALS *******************************************************************/ PDEVICE_NODE IopRootDeviceNode; _____ Modified: trunk/reactos/ntoskrnl/io/resource.c --- trunk/reactos/ntoskrnl/io/resource.c 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/io/resource.c 2005-06-25 14:04:56 UTC (rev 16266) @@ -827,7 +827,7 @@ HANDLE DescriptionKey; /* Open/Create 'RESOURCEMAP' key. */ - RtlRosInitUnicodeStringFromLiteral(&Name, + RtlInitUnicodeString(&Name, L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP"); InitializeObjectAttributes(&ObjectAttributes, &Name, @@ -845,7 +845,7 @@ return(Status); /* Open/Create 'Hardware Abstraction Layer' key */ - RtlRosInitUnicodeStringFromLiteral(&Name, + RtlInitUnicodeString(&Name, L"Hardware Abstraction Layer"); InitializeObjectAttributes(&ObjectAttributes, &Name, @@ -881,7 +881,7 @@ return(Status); /* Add '.Raw' value. */ - RtlRosInitUnicodeStringFromLiteral(&Name, + RtlInitUnicodeString(&Name, L".Raw"); Status = ZwSetValueKey(DescriptionKey, &Name, @@ -896,7 +896,7 @@ } /* Add '.Translated' value. */ - RtlRosInitUnicodeStringFromLiteral(&Name, + RtlInitUnicodeString(&Name, L".Translated"); Status = ZwSetValueKey(DescriptionKey, &Name, _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-06-25 14:04:56 UTC (rev 16266) @@ -508,7 +508,7 @@ LdrModule->FullDllName.Length); KernelName.Buffer[KernelName.Length / sizeof(WCHAR)] = L'\0'; - KdbpSymLoadModuleSymbols(&KernelName, &LdrModule->RosSymInfo); + KdbpSymLoadModuleSymbols(&KernelName, (PROSSYM_INFO*)&LdrModule->RosSymInfo); ExFreePool(KernelName.Buffer); } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-06-25 14:04:56 UTC (rev 16266) @@ -456,8 +456,9 @@ { PKIPCR Pcr = (PKIPCR)KeGetCurrentKPCR(); OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; + UNICODE_STRING KeyName = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Co ntrol\\Session Manager\\Kernel"); + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"FastSystemCallDisable"); HANDLE KeyHandle; ULONG ResultLength; KEY_VALUE_PARTIAL_INFORMATION ValueData; @@ -488,10 +489,6 @@ /* FIXME: Check for Family == 6, Model < 3 and Stepping < 3 and disable */ /* Make sure it's not disabled in registry */ - RtlRosInitUnicodeStringFromLiteral(&KeyName, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Session Manager\\Kernel"); - RtlRosInitUnicodeStringFromLiteral(&ValueName, - L"FastSystemCallDisable"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, _____ Modified: trunk/reactos/ntoskrnl/ldr/init.c --- trunk/reactos/ntoskrnl/ldr/init.c 2005-06-25 14:03:51 UTC (rev 16265) +++ trunk/reactos/ntoskrnl/ldr/init.c 2005-06-25 14:04:56 UTC (rev 16266) @@ -17,78 +17,19 @@ #define NDEBUG #include <internal/debug.h> - -/* - * HACK! No matter what i did, i couldnt get it working when i put these into ntos\rtl.h - * (got redefinition problems, since ntdll\rtl.h somehow include ntos\rtl.h). - * We need to merge ntos\rtl.h and ntdll\rtl.h to get this working. -Gunnar - */ -typedef struct _RTL_PROCESS_INFO -{ - ULONG Size; - HANDLE ProcessHandle; - HANDLE ThreadHandle; - CLIENT_ID ClientId; - SECTION_IMAGE_INFORMATION ImageInfo; -} RTL_PROCESS_INFO, *PRTL_PROCESS_INFO; - -NTSTATUS -STDCALL -RtlCreateUserProcess ( - IN PUNICODE_STRING ImageFileName, - IN ULONG Attributes, - IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters, - IN PSECURITY_DESCRIPTOR ProcessSecutityDescriptor OPTIONAL, - IN PSECURITY_DESCRIPTOR ThreadSecurityDescriptor OPTIONAL, - IN HANDLE ParentProcess OPTIONAL, - IN BOOLEAN CurrentDirectory, - IN HANDLE DebugPort OPTIONAL, - IN HANDLE ExceptionPort OPTIONAL, - OUT PRTL_PROCESS_INFO ProcessInfo [truncated at 1000 lines; 419 more skipped]

19 years, 4 months

[ion] 16265: Forgot this, sorry

by ion＠svn.reactos.com

Forgot this, sorry Modified: trunk/reactos/include/lsass/lsass.h _____ Modified: trunk/reactos/include/lsass/lsass.h --- trunk/reactos/include/lsass/lsass.h 2005-06-25 13:55:24 UTC (rev 16264) +++ trunk/reactos/include/lsass/lsass.h 2005-06-25 14:03:51 UTC (rev 16265) @@ -11,7 +11,6 @@ #ifndef __INCLUDE_LSASS_LSASS_H #define __INCLUDE_LSASS_LSASS_H -#include <ntos.h> #include <ntsecapi.h> #define LSASS_REQUEST_REGISTER_LOGON_PROCESS (1)

19 years, 4 months

[ion] 16264: Build secur32 with NDK

by ion＠svn.reactos.com

Build secur32 with NDK Modified: trunk/reactos/lib/secur32/lsa.c _____ Modified: trunk/reactos/lib/secur32/lsa.c --- trunk/reactos/lib/secur32/lsa.c 2005-06-25 05:01:29 UTC (rev 16263) +++ trunk/reactos/lib/secur32/lsa.c 2005-06-25 13:55:24 UTC (rev 16264) @@ -12,8 +12,9 @@ #include <windows.h> #include <ntsecapi.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <lsass/lsass.h> -#include <string.h> /* GLOBALS *******************************************************************/

19 years, 4 months

[ion] 16263: Fix token structure, add aux_data, fix KeDisconnectInterrupt and add NtBuildNumber (fixes for NDK)

by ion＠svn.reactos.com

Fix token structure, add aux_data, fix KeDisconnectInterrupt and add NtBuildNumber (fixes for NDK) Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/setypes.h _____ Modified: trunk/reactos/include/ndk/kefuncs.h --- trunk/reactos/include/ndk/kefuncs.h 2005-06-24 22:52:21 UTC (rev 16262) +++ trunk/reactos/include/ndk/kefuncs.h 2005-06-25 05:01:29 UTC (rev 16263) @@ -235,7 +235,7 @@ PKINTERRUPT InterruptObject ); -VOID +BOOLEAN STDCALL KeDisconnectInterrupt( PKINTERRUPT InterruptObject _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-06-24 22:52:21 UTC (rev 16262) +++ trunk/reactos/include/ndk/ketypes.h 2005-06-25 05:01:29 UTC (rev 16263) @@ -36,6 +36,7 @@ extern ULONG NTOSAPI KiDmaIoCoherency; /* RISC Architectures only */ extern ULONG NTOSAPI KeMaximumIncrement; extern ULONG NTOSAPI KeMinimumIncrement; +extern ULONG NTOSAPI NtBuildNumber; extern SSDT_ENTRY NTOSAPI KeServiceDescriptorTable[SSDT_MAX_ENTRIES]; extern SSDT_ENTRY NTOSAPI KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES]; _____ Modified: trunk/reactos/include/ndk/setypes.h --- trunk/reactos/include/ndk/setypes.h 2005-06-24 22:52:21 UTC (rev 16262) +++ trunk/reactos/include/ndk/setypes.h 2005-06-25 05:01:29 UTC (rev 16263) @@ -48,39 +48,44 @@ }; } SEP_AUDIT_POLICY, *PSEP_AUDIT_POLICY; -typedef struct _TOKEN -{ - TOKEN_SOURCE TokenSource; /* 0x00 */ - LUID TokenId; /* 0x10 */ - LUID AuthenticationId; /* 0x18 */ - LUID ParentTokenId; /* 0x20 */ - LARGE_INTEGER ExpirationTime; /* 0x28 */ - struct _ERESOURCE *TokenLock; /* 0x30 */ - ULONG Padding; /* 0x34 */ - SEP_AUDIT_POLICY AuditPolicy; /* 0x38 */ - LUID ModifiedId; /* 0x40 */ - ULONG SessionId; /* 0x48 */ - ULONG UserAndGroupCount; /* 0x4C */ - ULONG RestrictedSidCount; /* 0x50 */ - ULONG PrivilegeCount; /* 0x54 */ - ULONG VariableLength; /* 0x58 */ - ULONG DynamicCharged; /* 0x5C */ - ULONG DynamicAvailable; /* 0x60 */ - ULONG DefaultOwnerIndex; /* 0x64 */ - PSID_AND_ATTRIBUTES UserAndGroups; /* 0x68 */ - PSID_AND_ATTRIBUTES RestrictedSids; /* 0x6C */ - PSID PrimaryGroup; /* 0x70 */ - PLUID_AND_ATTRIBUTES Privileges; /* 0x74 */ - PULONG DynamicPart; /* 0x78 */ - PACL DefaultDacl; /* 0x7C */ - TOKEN_TYPE TokenType; /* 0x80 */ - SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; /* 0x84 */ - ULONG TokenFlags; /* 0x88 */ - ULONG TokenInUse; /* 0x8C */ - PVOID ProxyData; /* 0x90 */ - PVOID AuditData; /* 0x94 */ - LUID OriginatingLogonSession; /* 0x98 */ - UCHAR VariablePart[1]; /* 0xA0 */ +#define TOKEN_HAS_TRAVERSE_PRIVILEGE 0x01 +typedef struct _TOKEN { + TOKEN_SOURCE TokenSource; /* 0x00 */ + LUID TokenId; /* 0x10 */ + LUID AuthenticationId; /* 0x18 */ + LUID ParentTokenId; /* 0x20 */ + LARGE_INTEGER ExpirationTime; /* 0x28 */ + struct _ERESOURCE *TokenLock; /* 0x30 */ + SEP_AUDIT_POLICY AuditPolicy; /* 0x38 */ + LUID ModifiedId; /* 0x40 */ + ULONG SessionId; /* 0x48 */ + ULONG UserAndGroupCount; /* 0x4C */ + ULONG RestrictedSidCount; /* 0x50 */ + ULONG PrivilegeCount; /* 0x54 */ + ULONG VariableLength; /* 0x58 */ + ULONG DynamicCharged; /* 0x5C */ + ULONG DynamicAvailable; /* 0x60 */ + ULONG DefaultOwnerIndex; /* 0x64 */ + PSID_AND_ATTRIBUTES UserAndGroups; /* 0x68 */ + PSID_AND_ATTRIBUTES RestrictedSids; /* 0x6C */ + PSID PrimaryGroup; /* 0x70 */ + PLUID_AND_ATTRIBUTES Privileges; /* 0x74 */ + PULONG DynamicPart; /* 0x78 */ + PACL DefaultDacl; /* 0x7C */ + TOKEN_TYPE TokenType; /* 0x80 */ + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; /* 0x84 */ + ULONG TokenFlags; /* 0x88 */ + BOOLEAN TokenInUse; /* 0x8C */ + PVOID ProxyData; /* 0x90 */ + PVOID AuditData; /* 0x94 */ + LUID OriginatingLogonSession; /* 0x98 */ + ULONG VariablePart; /* 0xA0 */ } TOKEN, *PTOKEN; +typedef struct _AUX_DATA +{ + PPRIVILEGE_SET PrivilegeSet; + GENERIC_MAPPING GenericMapping; + ULONG Reserved; +} AUX_DATA, *PAUX_DATA; #endif

19 years, 4 months

[greatlrd] 16262: Brandon Turner <turnerb7@msu.edu>) simple check to fix > and | bug with 'rem' I (greatlord / Magnus Olsen) did small change on his patch so it did null terminate the strings right

by greatlrd＠svn.reactos.com

Brandon Turner <turnerb7(a)msu.edu>) simple check to fix > and | bug with 'rem' I (greatlord / Magnus Olsen) did small change on his patch so it did null terminate the strings right Modified: trunk/reactos/subsys/system/cmd/redir.c _____ Modified: trunk/reactos/subsys/system/cmd/redir.c --- trunk/reactos/subsys/system/cmd/redir.c 2005-06-24 20:58:18 UTC (rev 16261) +++ trunk/reactos/subsys/system/cmd/redir.c 2005-06-24 22:52:21 UTC (rev 16262) @@ -20,6 +20,9 @@ * * 26-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) * Added new error AND output redirection "&>" and "&>>". + * + * 24-Jun-2005 (Brandon Turner <turnerb7(a)msu.edu>) + * simple check to fix > and | bug with 'rem' */ #include "precomp.h" @@ -54,6 +57,23 @@ LPTSTR dp = s; LPTSTR sp = s; +#ifdef INCLUDE_CMD_REM + + TCHAR * line = s; + + while (_istspace (*line)) + line++; + + /*first thing first. check to see if this is "rem" and hope out*/ + if(!_tcsncmp (line, _T("rem "), 4)) + { + lpnFlags = 0; + *ifn=('\0'); + *ofn=('\0'); + *efn=_T('\0'); + return 1; + } +#endif /* find and remove all the redirections first */ while (*sp) {

19 years, 4 months

[ion] 16261: Add missing privileges to winddk

by ion＠svn.reactos.com

Add missing privileges to winddk Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-24 19:39:47 UTC (rev 16260) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-24 20:58:18 UTC (rev 16261) @@ -3014,6 +3014,39 @@ LUID_AND_ATTRIBUTES Privilege[INITIAL_PRIVILEGE_COUNT]; } INITIAL_PRIVILEGE_SET, * PINITIAL_PRIVILEGE_SET; +#define SE_MIN_WELL_KNOWN_PRIVILEGE 2 +#define SE_CREATE_TOKEN_PRIVILEGE 2 +#define SE_ASSIGNPRIMARYTOKEN_PRIVILEGE 3 +#define SE_LOCK_MEMORY_PRIVILEGE 4 +#define SE_INCREASE_QUOTA_PRIVILEGE 5 +#define SE_UNSOLICITED_INPUT_PRIVILEGE 6 +#define SE_MACHINE_ACCOUNT_PRIVILEGE 6 +#define SE_TCB_PRIVILEGE 7 +#define SE_SECURITY_PRIVILEGE 8 +#define SE_TAKE_OWNERSHIP_PRIVILEGE 9 +#define SE_LOAD_DRIVER_PRIVILEGE 10 +#define SE_SYSTEM_PROFILE_PRIVILEGE 11 +#define SE_SYSTEMTIME_PRIVILEGE 12 +#define SE_PROF_SINGLE_PROCESS_PRIVILEGE 13 +#define SE_INC_BASE_PRIORITY_PRIVILEGE 14 +#define SE_CREATE_PAGEFILE_PRIVILEGE 15 +#define SE_CREATE_PERMANENT_PRIVILEGE 16 +#define SE_BACKUP_PRIVILEGE 17 +#define SE_RESTORE_PRIVILEGE 18 +#define SE_SHUTDOWN_PRIVILEGE 19 +#define SE_DEBUG_PRIVILEGE 20 +#define SE_AUDIT_PRIVILEGE 21 +#define SE_SYSTEM_ENVIRONMENT_PRIVILEGE 22 +#define SE_CHANGE_NOTIFY_PRIVILEGE 23 +#define SE_REMOTE_SHUTDOWN_PRIVILEGE 24 +#define SE_UNDOCK_PRIVILEGE 25 +#define SE_SYNC_AGENT_PRIVILEGE 26 +#define SE_ENABLE_DELEGATION_PRIVILEGE 27 +#define SE_MANAGE_VOLUME_PRIVILEGE 28 +#define SE_IMPERSONATE_PRIVILEGE 29 +#define SE_CREATE_GLOBAL_PRIVILEGE 30 +#define SE_MAX_WELL_KNOWN_PRIVILEGE SE_CREATE_GLOBAL_PRIVILEGE + typedef struct _SECURITY_SUBJECT_CONTEXT { PACCESS_TOKEN ClientToken; SECURITY_IMPERSONATION_LEVEL ImpersonationLevel;

19 years, 4 months

[chorns] 16260: Search current directory first for #include "".

by chorns＠svn.reactos.com

Search current directory first for #include "". Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp Modified: trunk/reactos/tools/rbuild/include.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp --- trunk/reactos/tools/rbuild/automaticdependency.cpp 2005-06-24 18:28:22 UTC (rev 16259) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp 2005-06-24 19:39:47 UTC (rev 16260) @@ -85,6 +85,7 @@ bool SourceFile::ReadInclude ( string& filename, + bool& searchCurrentDirectory, bool& includeNext) { while ( p < end ) @@ -117,6 +118,7 @@ register char ch = *p; if ( ch == '<' || ch == '"' ) { + searchCurrentDirectory = (ch == '"'); p++; filename.resize ( MAX_PATH ); int i = 0; @@ -138,6 +140,7 @@ p++; } filename = ""; + searchCurrentDirectory = false; includeNext = false; return false; } @@ -230,14 +233,17 @@ { string includedFilename ( "" ); + bool searchCurrentDirectory; bool includeNext; while ( ReadInclude ( includedFilename, + searchCurrentDirectory, includeNext ) ) { string resolvedFilename ( "" ); bool locatedFile = automaticDependency->LocateIncludedFile ( this, module, includedFilename, + searchCurrentDirectory, includeNext, resolvedFilename ); if ( locatedFile ) @@ -321,8 +327,8 @@ bool AutomaticDependency::LocateIncludedFile ( const string& directory, - const string& includedFilename, - string& resolvedFilename ) + const string& includedFilename, + string& resolvedFilename ) { string normalizedFilename = NormalizeFilename ( directory + SSEP + includedFilename ); FILE* f = fopen ( normalizedFilename.c_str (), "rb" ); @@ -347,37 +353,44 @@ filename.length () - index - 1); } +void +AutomaticDependency::GetIncludeDirectories ( vector<Include*>& includes, + Module& module, + Include& currentDirectory, + bool searchCurrentDirectory ) +{ + if ( searchCurrentDirectory ) + includes.push_back( &currentDirectory ); + for ( size_t i = 0; i < module.non_if_data.includes.size (); i++ ) + includes.push_back( module.non_if_data.includes[i] ); + for ( size_t i = 0; i < module.project.non_if_data.includes.size (); i++ ) + includes.push_back( module.project.non_if_data.includes[i] ); +} + bool AutomaticDependency::LocateIncludedFile ( SourceFile* sourceFile, - Module& module, - const string& includedFilename, - bool includeNext, - string& resolvedFilename ) + Module& module, + const string& includedFilename, + bool searchCurrentDirectory, + bool includeNext, + string& resolvedFilename ) { - size_t i, j; - const vector<Include*>* pincludes; - for ( i = 0; i < 2; i++ ) + vector<Include*> includes; + Include currentDirectory ( module.project, ".", sourceFile->directoryPart ); + GetIncludeDirectories ( includes, module, currentDirectory, searchCurrentDirectory ); + for ( size_t j = 0; j < includes.size (); j++ ) { - if ( !i ) - pincludes = &module.non_if_data.includes; - else - pincludes = &module.project.non_if_data.includes; - const vector<Include*>& includes = *pincludes; - for ( j = 0; j < includes.size (); j++ ) + Include& include = *includes[j]; + if ( LocateIncludedFile ( include.directory, + includedFilename, + resolvedFilename ) ) { - Include& include = *includes[j]; - if ( LocateIncludedFile ( include.directory, - includedFilename, - resolvedFilename ) ) - { - if ( includeNext && stricmp ( resolvedFilename.c_str (), - sourceFile->filename.c_str () ) == 0 ) - continue; - return true; - } + if ( includeNext && stricmp ( resolvedFilename.c_str (), + sourceFile->filename.c_str () ) == 0 ) + continue; + return true; } } - resolvedFilename = ""; return false; } @@ -422,15 +435,15 @@ void AutomaticDependency::CheckAutomaticDependencies ( Module& module, - bool verbose ) + bool verbose ) { CheckAutomaticDependencies ( module, verbose, true ); } void AutomaticDependency::CheckAutomaticDependencies ( Module& module, - bool verbose, - bool parseFiles ) + bool verbose, + bool parseFiles ) { if ( parseFiles ) ParseFiles ( module ); _____ Modified: trunk/reactos/tools/rbuild/include.cpp --- trunk/reactos/tools/rbuild/include.cpp 2005-06-24 18:28:22 UTC (rev 16259) +++ trunk/reactos/tools/rbuild/include.cpp 2005-06-24 19:39:47 UTC (rev 16260) @@ -6,31 +6,35 @@ using std::string; using std::vector; -Include::Include ( const Project& project_, - const XMLElement& includeNode ) - : project (project_), - module (NULL), - node (includeNode) +Include::Include ( const Project& project, + const XMLElement* includeNode ) + : project ( project ), + module ( NULL ), + node ( includeNode ) { - Initialize(); } -Include::Include ( const Project& project_, - const Module* module_, - const XMLElement& includeNode ) - : project (project_), - module (module_), - node (includeNode) +Include::Include ( const Project& project, + const Module* module, + const XMLElement* includeNode ) + : project ( project ), + module ( module ), + node ( includeNode ) { - Initialize(); } -Include::~Include () +Include::Include ( const Project& project, + string directory, + string basePath ) + : project ( project ), + module ( NULL ), + node ( NULL ) { + this->directory = NormalizeFilename ( basePath + SSEP + directory ); + this->basePath = NormalizeFilename ( basePath ); } -void -Include::Initialize() +Include::~Include () { } @@ -38,13 +42,13 @@ Include::ProcessXML() { const XMLAttribute* att; - att = node.GetAttribute ( "base", - false ); + att = node->GetAttribute ( "base", + false ); if ( att ) { if ( !module ) throw InvalidBuildFileException ( - node.location, + node->location, "'base' attribute illegal from global <include>" ); bool referenceResolved = false; if ( att->value == project.name ) @@ -63,11 +67,11 @@ } if ( !referenceResolved ) throw InvalidBuildFileException ( - node.location, + node->location, "<include> attribute 'base' references non-existant project or module '%s'", att->value.c_str() ); - directory = FixSeparator ( basePath + "/" + node.value ); + directory = NormalizeFilename ( basePath + SSEP + node->value ); } else - directory = FixSeparator ( node.value ); + directory = NormalizeFilename ( node->value ); } _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-06-24 18:28:22 UTC (rev 16259) +++ trunk/reactos/tools/rbuild/module.cpp 2005-06-24 19:39:47 UTC (rev 16260) @@ -367,7 +367,7 @@ } else if ( e.name == "include" ) { - Include* include = new Include ( project, this, e ); + Include* include = new Include ( project, this, &e ); if ( pIf ) pIf->data.includes.push_back ( include ); else _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-06-24 18:28:22 UTC (rev 16259) +++ trunk/reactos/tools/rbuild/project.cpp 2005-06-24 19:39:47 UTC (rev 16260) @@ -290,7 +290,7 @@ } else if ( e.name == "include" ) { - Include* include = new Include ( *this, e ); + Include* include = new Include ( *this, &e ); if ( pIf ) pIf->data.includes.push_back ( include ); else _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-06-24 18:28:22 UTC (rev 16259) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-06-24 19:39:47 UTC (rev 16260) @@ -253,19 +253,21 @@ public: const Project& project; const Module* module; - const XMLElement& node; + const XMLElement* node; std::string directory; std::string basePath; Include ( const Project& project, - const XMLElement& includeNode ); + const XMLElement* includeNode ); Include ( const Project& project, const Module* module, - const XMLElement& includeNode ); + const XMLElement* includeNode ); + Include ( const Project& project, + std::string directory, + std::string basePath ); ~Include (); void ProcessXML(); private: - void Initialize(); }; @@ -556,6 +558,7 @@ void Open (); void SkipWhitespace (); bool ReadInclude ( std::string& filename, + bool& searchCurrentDirectory, bool& includeNext ); bool IsIncludedFrom ( const std::string& normalizedFilename ); SourceFile* GetParentSourceFile (); @@ -583,6 +586,7 @@ bool LocateIncludedFile ( SourceFile* sourceFile, Module& module, const std::string& includedFilename, + bool searchCurrentDirectory, bool includeNext, std::string& resolvedFilename ); SourceFile* RetrieveFromCacheOrParse ( Module& module, @@ -597,6 +601,10 @@ bool parseFiles ); void CheckAutomaticDependenciesForFile ( SourceFile* sourceFile ); private: + void GetIncludeDirectories ( std::vector<Include*>& includes, + Module& module, + Include& currentDirectory, + bool searchCurrentDirectory ); void GetModuleFiles ( Module& module, std::vector<File*>& files ) const; void ParseFiles ();

19 years, 4 months

[hpoussin] 16259: Change STATUS error codes to winerror ones

by hpoussin＠svn.reactos.com

Change STATUS error codes to winerror ones Modified: trunk/reactos/lib/kernel32/misc/comm.c _____ Modified: trunk/reactos/lib/kernel32/misc/comm.c --- trunk/reactos/lib/kernel32/misc/comm.c 2005-06-24 18:19:40 UTC (rev 16258) +++ trunk/reactos/lib/kernel32/misc/comm.c 2005-06-24 18:28:22 UTC (rev 16259) @@ -953,7 +953,7 @@ if( (NULL == lpdwSize) || (NULL == lpCC) ) { DPRINT("GetCommConfig() - invalid parameter\n"); - SetLastError(STATUS_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); ReturnValue = FALSE; } else @@ -975,8 +975,8 @@ lpCC->dwProviderOffset = (ULONG_PTR)&lpCC->wcProviderData[0] - (ULONG_PTR)lpCC; } if( (lpCC->dwProviderSize+lpCC->dwSize) > *lpdwSize ) { - DPRINT("GetCommConfig() - STATUS_BUFFER_TOO_SMALL\n"); - SetLastError(STATUS_BUFFER_TOO_SMALL); + DPRINT("GetCommConfig() - ERROR_INSUFFICIENT_BUFFER\n"); + SetLastError(ERROR_INSUFFICIENT_BUFFER); ReturnValue = FALSE; } else { RtlCopyMemory(lpCC->wcProviderData, lpComPort->wcProvChar, lpCC->dwProviderSize); @@ -1225,7 +1225,7 @@ if(NULL == lpCC) { DPRINT("SetCommConfig() - invalid parameter\n"); - SetLastError(STATUS_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); ReturnValue = FALSE; } else

19 years, 4 months

← Newer
1
...
7
8
9
10
11
12
13
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005