Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

by ion＠svn.reactos.com

Fix rtl/rossym Modified: trunk/reactos/lib/rossym/initkm.c Modified: trunk/reactos/lib/rtl/rtl.h _____ Modified: trunk/reactos/lib/rossym/initkm.c --- trunk/reactos/lib/rossym/initkm.c 2005-06-19 07:11:49 UTC (rev 16078) +++ trunk/reactos/lib/rossym/initkm.c 2005-06-19 07:15:07 UTC (rev 16079) @@ -15,6 +15,7 @@ #define NDEBUG #include <debug.h> +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_ROSSYM TAG('R', 'S', 'Y', 'M') static PVOID _____ Modified: trunk/reactos/lib/rtl/rtl.h --- trunk/reactos/lib/rtl/rtl.h 2005-06-19 07:11:49 UTC (rev 16078) +++ trunk/reactos/lib/rtl/rtl.h 2005-06-19 07:15:07 UTC (rev 16079) @@ -24,6 +24,7 @@ #include <ntos.h> #include <stdio.h> +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) #ifndef HIWORD #define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF))

19 years, 3 months

[ion] 16078: Add NtcurrentThread, ALTERNATIVE_ARCHITECTURE_TYPE, KSYSTEM_TIME, KUSER_SHARED_DATA, REG_CREATED_NEW_KEY, REG_OPENED_EXISTING_KEY, KeRaiseIrqlToSynchLevel to DDK. Remove HANDLE_TABLE_ENTRY_INFO and HANDLE_TABLE_ENTRY from NTIFS. Add NT_PRODUCT_TYPE

by ion＠svn.reactos.com

Add NtcurrentThread, ALTERNATIVE_ARCHITECTURE_TYPE, KSYSTEM_TIME, KUSER_SHARED_DATA, REG_CREATED_NEW_KEY, REG_OPENED_EXISTING_KEY, KeRaiseIrqlToSynchLevel to DDK. Remove HANDLE_TABLE_ENTRY_INFO and HANDLE_TABLE_ENTRY from NTIFS. Add NT_PRODUCT_TYPE Modified: trunk/reactos/include/napi/shared_data.h Modified: trunk/reactos/include/napi/types.h Modified: trunk/reactos/include/ntos/obtypes.h Added: trunk/reactos/include/reactos/helper.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/ntdef.h _____ Modified: trunk/reactos/include/napi/shared_data.h --- trunk/reactos/include/napi/shared_data.h 2005-06-19 07:11:38 UTC (rev 16077) +++ trunk/reactos/include/napi/shared_data.h 2005-06-19 07:11:49 UTC (rev 16078) @@ -13,6 +13,8 @@ #define PF_PAE_ENABLED 9 #define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 +#ifndef __USE_W32API + #ifndef __ASM__ typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE @@ -72,6 +74,7 @@ } KUSER_SHARED_DATA, *PKUSER_SHARED_DATA; #endif +#endif /* Values for DosDeviceDriveType */ #define DOSDEVICE_DRIVE_UNKNOWN 0 _____ Modified: trunk/reactos/include/napi/types.h --- trunk/reactos/include/napi/types.h 2005-06-19 07:11:38 UTC (rev 16077) +++ trunk/reactos/include/napi/types.h 2005-06-19 07:11:49 UTC (rev 16078) @@ -12,8 +12,8 @@ DIRECTORY_CREATE_SUBDIRECTORY, DIRECTORY_ALL_ACCESS, }; -#endif + /* * General type for status information */ @@ -24,7 +24,7 @@ NtProductLanManNt, NtProductServer } NT_PRODUCT_TYPE, *PNT_PRODUCT_TYPE; - +#endif typedef ULARGE_INTEGER TIME, *PTIME; #ifndef __USE_W32API _____ Modified: trunk/reactos/include/ntos/obtypes.h --- trunk/reactos/include/ntos/obtypes.h 2005-06-19 07:11:38 UTC (rev 16077) +++ trunk/reactos/include/ntos/obtypes.h 2005-06-19 07:11:49 UTC (rev 16078) @@ -87,6 +87,8 @@ PVOID SecurityQualityOfService; } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; +#endif + typedef struct _HANDLE_TABLE_ENTRY_INFO { ULONG AuditMask; } HANDLE_TABLE_ENTRY_INFO, *PHANDLE_TABLE_ENTRY_INFO; @@ -105,8 +107,6 @@ } u2; } HANDLE_TABLE_ENTRY, *PHANDLE_TABLE_ENTRY; -#endif /* __USE_W32API */ - typedef struct _HANDLE_TABLE { ULONG Flags; _____ Added: trunk/reactos/include/reactos/helper.h --- trunk/reactos/include/reactos/helper.h 2005-06-19 07:11:38 UTC (rev 16077) +++ trunk/reactos/include/reactos/helper.h 2005-06-19 07:11:49 UTC (rev 16078) @@ -0,0 +1,37 @@ +#ifndef _HELPER_H +#define _HELPER_H + +#define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) +#define ROUNDDOWN(a,b) (((a)/(b))*(b)) +#define ROUND_UP ROUNDUP +#define ROUND_DOWN ROUNDDOWN +#define PAGE_ROUND_DOWN(x) (((ULONG)x)&(~(PAGE_SIZE-1))) +#define PAGE_ROUND_UP(x) ( (((ULONG)x)%PAGE_SIZE) ? ((((ULONG)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG)x) ) +#define ABS_VALUE(V) (((V) < 0) ? -(V) : (V)) +#define RtlRosMin(X,Y) (((X) < (Y))? (X) : (Y)) +#define RtlRosMin3(X,Y,Z) (((X) < (Y)) ? RtlRosMin(X,Z) : RtlRosMin(Y,Z)) +#define KEBUGCHECKEX(a,b,c,d,e) DbgPrint("KeBugCheckEx at %s:%i\n",__FILE__,__LINE__), KeBugCheckEx(a,b,c,d,e) +#define KEBUGCHECK(a) DbgPrint("KeBugCheck at %s:%i\n",__FILE__,__LINE__), KeBugCheck(a) +#define EXPORTED __declspec(dllexport) +#define IMPORTED __declspec(dllimport) +#define LIST_FOR_EACH(entry, head) \ + for(entry = (head)->Flink; entry != (head); entry = entry->Flink) +#define LIST_FOR_EACH_SAFE(tmp_entry, head, ptr, type, field) \ + for ((tmp_entry)=(head)->Flink; (tmp_entry)!=(head) && \ + ((ptr) = CONTAINING_RECORD(tmp_entry,type,field)) && \ + ((tmp_entry) = (tmp_entry)->Flink); ) +#define OPTHDROFFSET(a) ((LPVOID)((BYTE *)a + \ + ((PIMAGE_DOS_HEADER)a)->e_lfanew + \ + sizeof (IMAGE_NT_SIGNATURE) + \ + sizeof (IMAGE_FILE_HEADER))) +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#define RVA(m, b) ((ULONG)b + m) +#define NTSTAT_SEVERITY_SHIFT 30 +#define NTSTAT_SEVERITY_MASK 0x00000003 +#define NTSTAT_FACILITY_SHIFT 16 +#define NTSTAT_FACILITY_MASK 0x00000FFF +#define NTSTAT_CUSTOMER_MASK 0x20000000 +#define NT_SEVERITY(StatCode) (((StatCode) >> NTSTAT_SEVERITY_SHIFT) & NTSTAT_SEVERITY_MASK) +#define NT_FACILITY(StatCode) (((StatCode) >> NTSTAT_FACILITY_SHIFT) & NTSTAT_FACILITY_MASK) +#define NT_CUSTOMER(StatCode) ((StatCode) & NTSTAT_CUSTOMER_MASK) +#endif _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-19 07:11:38 UTC (rev 16077) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-19 07:11:49 UTC (rev 16078) @@ -1250,25 +1250,6 @@ ULONG LastIndexValue; } GENERATE_NAME_CONTEXT, *PGENERATE_NAME_CONTEXT; -typedef struct _HANDLE_TABLE_ENTRY_INFO { - ULONG AuditMask; -} HANDLE_TABLE_ENTRY_INFO, *PHANDLE_TABLE_ENTRY_INFO; - -typedef struct _HANDLE_TABLE_ENTRY { - union { - PVOID Object; - ULONG ObAttributes; - PHANDLE_TABLE_ENTRY_INFO InfoTable; - ULONG_PTR Value; - } u1; - union { - ULONG GrantedAccess; - USHORT GrantedAccessIndex; - LONG NextFreeTableEntry; - } u2; - USHORT CreatorBackTraceIndex; -} HANDLE_TABLE_ENTRY, *PHANDLE_TABLE_ENTRY; - typedef struct _MAPPING_PAIR { ULONGLONG Vcn; ULONGLONG Lcn; _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-19 07:11:38 UTC (rev 16077) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-19 07:11:49 UTC (rev 16078) @@ -122,10 +122,8 @@ /* ** Routines specific to this DDK */ +#define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) -#define TAG(_a, _b, _c, _d) (ULONG) \ - (((_a) << 0) + ((_b) << 8) + ((_c) << 16) + ((_d) << 24)) - static __inline struct _KPCR * KeGetCurrentKPCR( VOID) { @@ -350,7 +348,64 @@ extern NTOSAPI CCHAR KeNumberProcessors; +#define PROCESSOR_FEATURE_MAX 64 +typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE +{ + StandardDesign, + NEC98x86, + EndAlternatives +} ALTERNATIVE_ARCHITECTURE_TYPE; + +typedef struct _KSYSTEM_TIME +{ + ULONG LowPart; + LONG High1Time; + LONG High2Time; +} KSYSTEM_TIME, *PKSYSTEM_TIME; + +typedef struct _KUSER_SHARED_DATA +{ + ULONG TickCountLowDeprecated; + ULONG TickCountMultiplier; + volatile KSYSTEM_TIME InterruptTime; + volatile KSYSTEM_TIME SystemTime; + volatile KSYSTEM_TIME TimeZoneBias; + USHORT ImageNumberLow; + USHORT ImageNumberHigh; + WCHAR NtSystemRoot[ 260 ]; + ULONG MaxStackTraceDepth; + ULONG CryptoExponent; + ULONG TimeZoneId; + ULONG LargePageMinimum; + ULONG Reserved2[ 7 ]; + NT_PRODUCT_TYPE NtProductType; + BOOLEAN ProductTypeIsValid; + ULONG NtMajorVersion; + ULONG NtMinorVersion; + BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; + ULONG Reserved1; + ULONG Reserved3; + volatile ULONG TimeSlip; + ALTERNATIVE_ARCHITECTURE_TYPE AlternativeArchitecture; + LARGE_INTEGER SystemExpirationDate; + ULONG SuiteMask; + BOOLEAN KdDebuggerEnabled; + volatile ULONG ActiveConsoleId; + volatile ULONG DismountCount; + ULONG ComPlusPackage; + ULONG LastSystemRITEventTickCount; + ULONG NumberOfPhysicalPages; + BOOLEAN SafeBootMode; + ULONG TraceLogging; + ULONGLONG Fill0; + ULONGLONG SystemCall[4]; + union { + volatile KSYSTEM_TIME TickCount; + volatile ULONG64 TickCountQuad; + }; +} KUSER_SHARED_DATA, *PKUSER_SHARED_DATA; + /* ** IRP function codes */ @@ -3393,6 +3448,10 @@ MaxKeySetInfoClass } KEY_SET_INFORMATION_CLASS; +#define REG_CREATED_NEW_KEY 0x00000001L +#define REG_OPENED_EXISTING_KEY 0x00000002L + + /* KEY_VALUE_Xxx.Type */ #define REG_NONE 0 @@ -8400,6 +8459,12 @@ DDKAPI KeRaiseIrqlToDpcLevel( VOID); + +NTHALAPI +KIRQL +DDKAPI +KeRaiseIrqlToSynchLevel( + VOID); #define KeLowerIrql(a) KfLowerIrql(a) #define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) _____ Modified: trunk/reactos/w32api/include/ntdef.h --- trunk/reactos/w32api/include/ntdef.h 2005-06-19 07:11:38 UTC (rev 16077) +++ trunk/reactos/w32api/include/ntdef.h 2005-06-19 07:11:49 UTC (rev 16078) @@ -52,6 +52,11 @@ ViewShare = 1, ViewUnmap = 2 } SECTION_INHERIT; +typedef enum _NT_PRODUCT_TYPE { + NtProductWinNt = 1, + NtProductLanManNt, + NtProductServer +} NT_PRODUCT_TYPE, *PNT_PRODUCT_TYPE; #if !defined(_NTSECAPI_H) typedef struct _OBJECT_ATTRIBUTES { ULONG Length;

19 years, 3 months

[ion] 16077: Fix some ntoskrnl things, like using Rtl instead of RosRtl, and undefining ROUND macros

by ion＠svn.reactos.com

Fix some ntoskrnl things, like using Rtl instead of RosRtl, and undefining ROUND macros Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/ex/callback.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ke/spinlock.c _____ Modified: trunk/reactos/ntoskrnl/cc/copy.c --- trunk/reactos/ntoskrnl/cc/copy.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/cc/copy.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -16,8 +16,6 @@ /* GLOBALS *******************************************************************/ -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - static PFN_TYPE CcZeroPage = 0; #define MAX_ZERO_LENGTH (256 * 1024) _____ Modified: trunk/reactos/ntoskrnl/cc/pin.c --- trunk/reactos/ntoskrnl/cc/pin.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/cc/pin.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -16,8 +16,6 @@ /* GLOBALS *******************************************************************/ -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - extern NPAGED_LOOKASIDE_LIST iBcbLookasideList; /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -20,8 +20,6 @@ /* LOCAL MACROS *************************************************************/ -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) - #define ABS_VALUE(V) (((V) < 0) ? -(V) : (V)) BOOLEAN CmiDoVerify = FALSE; _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -650,7 +650,7 @@ DPRINT("Link target '%S'\n", TargetNameBuffer); - RtlRosInitUnicodeStringFromLiteral(&LinkName, + RtlInitUnicodeString(&LinkName, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet"); InitializeObjectAttributes(&ObjectAttributes, &LinkName, @@ -670,7 +670,7 @@ return(Status); } - RtlRosInitUnicodeStringFromLiteral(&LinkValue, + RtlInitUnicodeString(&LinkValue, L"SymbolicLinkValue"); Status = ZwSetValueKey(KeyHandle, &LinkValue, @@ -925,7 +925,7 @@ NTSTATUS Status; /* Create 'ControlSet001' key */ - RtlRosInitUnicodeStringFromLiteral (&ControlSetKeyName, + RtlInitUnicodeString(&ControlSetKeyName, L"\\Registry\\Machine\\SYSTEM\\ControlSet001"); InitializeObjectAttributes (&ObjectAttributes, &ControlSetKeyName, @@ -947,7 +947,7 @@ ZwClose (KeyHandle); /* Link 'CurrentControlSet' to 'ControlSet001' key */ - RtlRosInitUnicodeStringFromLiteral (&ControlSetLinkName, + RtlInitUnicodeString (&ControlSetLinkName, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet"); InitializeObjectAttributes (&ObjectAttributes, &ControlSetLinkName, @@ -967,7 +967,7 @@ return Status; } - RtlRosInitUnicodeStringFromLiteral (&ControlSetValueName, + RtlInitUnicodeString (&ControlSetValueName, L"SymbolicLinkValue"); Status = ZwSetValueKey (KeyHandle, &ControlSetValueName, @@ -1008,7 +1008,7 @@ if (SetupBoot == TRUE) { - RtlRosInitUnicodeStringFromLiteral(&KeyName, + RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\HARDWARE"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -1024,7 +1024,7 @@ return(Status); } - RtlRosInitUnicodeStringFromLiteral(&ValueName, + RtlInitUnicodeString(&ValueName, L"InstallPath"); BufferSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 4096; _____ Modified: trunk/reactos/ntoskrnl/cm/regobj.c --- trunk/reactos/ntoskrnl/cm/regobj.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -674,7 +674,7 @@ PKEY_CELL KeyCell, PUNICODE_STRING TargetPath) { - UNICODE_STRING LinkName = ROS_STRING_INITIALIZER(L"SymbolicLinkValue"); + UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"SymbolicLinkValue"); PVALUE_CELL ValueCell; PDATA_CELL DataCell; NTSTATUS Status; _____ Modified: trunk/reactos/ntoskrnl/ex/callback.c --- trunk/reactos/ntoskrnl/ex/callback.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/ex/callback.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -65,7 +65,7 @@ } /* Initialize the Object */ - RtlRosInitUnicodeStringFromLiteral(&DirName, L"\\Callback" ); + RtlInitUnicodeString(&DirName, L"\\Callback" ); InitializeObjectAttributes( &ObjectAttributes, &DirName, _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-06-19 07:11:38 UTC (rev 16077) @@ -222,19 +222,6 @@ #define IPI_REQUEST_DPC 2 #define IPI_REQUEST_FREEZE 3 -#ifndef __USE_W32API -typedef enum _KTHREAD_STATE { - Initialized, - Ready, - Running, - Standby, - Terminated, - Waiting, - Transition, - DeferredReady, -} THREAD_STATE, *PTHREAD_STATE; -#endif - /* MACROS ************************************************************************ */ #define KeEnterCriticalRegion(X) \ _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-19 07:11:38 UTC (rev 16077) @@ -55,6 +55,13 @@ BOOLEAN CmImportHardwareHive(PCHAR ChunkBase, ULONG ChunkSize); VOID KdInitSystem(ULONG Reserved, PLOADER_PARAMETER_BLOCK LoaderBlock); +BOOLEAN +FASTCALL +RtlpCreateUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PCWSTR Source, + IN POOL_TYPE PoolType); + #endif /* __ASM__ */ /* _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-19 07:11:38 UTC (rev 16077) @@ -74,4 +74,7 @@ #include <napi/teb.h> #include <napi/win32.h> + +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + #endif /* INCLUDE_NTOSKRNL_H */ _____ Modified: trunk/reactos/ntoskrnl/ke/spinlock.c --- trunk/reactos/ntoskrnl/ke/spinlock.c 2005-06-19 07:07:52 UTC (rev 16076) +++ trunk/reactos/ntoskrnl/ke/spinlock.c 2005-06-19 07:11:38 UTC (rev 16077) @@ -62,6 +62,7 @@ { KIRQL oldIrql; + //KeRaiseIrql(Interrupt->SynchronizeIrql, &oldIrql); KeRaiseIrql(Interrupt->SynchLevel, &oldIrql); KiAcquireSpinLock(Interrupt->ActualLock); return oldIrql;

19 years, 3 months

[navaraf] 16076: Use RTL_CONSTANT_STRING instead of ROSRTL macros.

by navaraf＠svn.reactos.com

Use RTL_CONSTANT_STRING instead of ROSRTL macros. Modified: trunk/reactos/lib/kjs/ksrc/b_system.c Modified: trunk/reactos/lib/msafd/misc/dllmain.c Modified: trunk/reactos/lib/secur32/lsa.c _____ Modified: trunk/reactos/lib/kjs/ksrc/b_system.c --- trunk/reactos/lib/kjs/ksrc/b_system.c 2005-06-19 07:03:18 UTC (rev 16075) +++ trunk/reactos/lib/kjs/ksrc/b_system.c 2005-06-19 07:07:52 UTC (rev 16076) @@ -49,7 +49,6 @@ #include "ddk/ntddk.h" #include "jsint.h" #include "kjs.h" -#include <rosrtl/string.h> /* * Types and definitions. _____ Modified: trunk/reactos/lib/msafd/misc/dllmain.c --- trunk/reactos/lib/msafd/misc/dllmain.c 2005-06-19 07:03:18 UTC (rev 16075) +++ trunk/reactos/lib/msafd/misc/dllmain.c 2005-06-19 07:07:52 UTC (rev 16076) @@ -14,7 +14,6 @@ #include <string.h> #include <msafd.h> #include <helpers.h> -#include <rosrtl/string.h> #ifdef DBG //DWORD DebugTraceLevel = DEBUG_ULTRA; _____ Modified: trunk/reactos/lib/secur32/lsa.c --- trunk/reactos/lib/secur32/lsa.c 2005-06-19 07:03:18 UTC (rev 16075) +++ trunk/reactos/lib/secur32/lsa.c 2005-06-19 07:07:52 UTC (rev 16076) @@ -13,7 +13,6 @@ #include <windows.h> #include <ntsecapi.h> #include <lsass/lsass.h> -#include <rosrtl/string.h> #include <string.h> /* GLOBALS *******************************************************************/ @@ -281,7 +280,7 @@ PHANDLE Handle, PLSA_OPERATIONAL_MODE OperationalMode) { - UNICODE_STRING Portname = ROS_STRING_INITIALIZER(L"\\SeLsaCommandPort"); + UNICODE_STRING Portname = RTL_CONSTANT_STRING(L"\\SeLsaCommandPort"); ULONG ConnectInfoLength; NTSTATUS Status; LSASS_REQUEST Request;

19 years, 3 months

[ion] 16075: More NDK Fixes

by ion＠svn.reactos.com

More NDK Fixes Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/ndk/zwtypes.h _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-06-19 04:49:14 UTC (rev 16074) +++ trunk/reactos/include/ndk/extypes.h 2005-06-19 07:03:18 UTC (rev 16075) @@ -14,6 +14,8 @@ /* EXPORTED DATA *************************************************************/ extern POBJECT_TYPE NTOSAPI ExIoCompletionType; +extern NTOSAPI POBJECT_TYPE ExMutantObjectType; +extern NTOSAPI POBJECT_TYPE ExTimerType; /* CONSTANTS *****************************************************************/ @@ -45,5 +47,59 @@ /* TYPES *********************************************************************/ +typedef struct _EX_QUEUE_WORKER_INFO +{ + UCHAR QueueDisabled:1; + UCHAR MakeThreadsAsNecessary:1; + UCHAR WaitMode:1; + ULONG WorkerCount:29; +} EX_QUEUE_WORKER_INFO, *PEX_QUEUE_WORKER_INFO; + +typedef struct _EX_WORK_QUEUE +{ + KQUEUE WorkerQueue; + ULONG DynamicThreadCount; + ULONG WorkItemsProcessed; + ULONG WorkItemsProcessedLastPass; + ULONG QueueDepthLastPass; + EX_QUEUE_WORKER_INFO Info; +} EX_WORK_QUEUE, *PEX_WORK_QUEUE; + +typedef struct _HANDLE_TABLE_ENTRY_INFO +{ + ULONG AuditMask; +} HANDLE_TABLE_ENTRY_INFO, *PHANDLE_TABLE_ENTRY_INFO; + +typedef struct _HANDLE_TABLE_ENTRY +{ + union + { + PVOID Object; + ULONG_PTR ObAttributes; + PHANDLE_TABLE_ENTRY_INFO InfoTable; + ULONG_PTR Value; + } u1; + union + { + ULONG GrantedAccess; + USHORT GrantedAccessIndex; + LONG NextFreeTableEntry; + } u2; +} HANDLE_TABLE_ENTRY, *PHANDLE_TABLE_ENTRY; + +typedef struct _HANDLE_TABLE +{ + ULONG Flags; + LONG HandleCount; + PHANDLE_TABLE_ENTRY **Table; + PEPROCESS QuotaProcess; + HANDLE UniqueProcessId; + LONG FirstFreeTableEntry; + LONG NextIndexNeedingPool; + ERESOURCE HandleTableLock; + LIST_ENTRY HandleTableList; + KEVENT HandleContentionEvent; +} HANDLE_TABLE; + #endif _____ Modified: trunk/reactos/include/ndk/haltypes.h --- trunk/reactos/include/ndk/haltypes.h 2005-06-19 04:49:14 UTC (rev 16074) +++ trunk/reactos/include/ndk/haltypes.h 2005-06-19 07:03:18 UTC (rev 16075) @@ -10,7 +10,7 @@ #define _HALTYPES_H /* DEPENDENCIES **************************************************************/ -#include <ddk/ntdddisk.h> +//#include <ddk/ntdddisk.h> /* EXPORTED DATA *************************************************************/ extern ULONG NTOSAPI KdComPortInUse; @@ -48,7 +48,7 @@ ULONG Reserved; } LOADER_MODULE, *PLOADER_MODULE; -typedef struct _LOADER_PARAMETER_BLOCK +typedef struct _LOADER_PARAMETER_BLOCK { ULONG Flags; ULONG MemLower; @@ -64,6 +64,9 @@ ULONG DrivesAddr; ULONG ConfigTable; ULONG BootLoaderName; + ULONG PageDirectoryStart; + ULONG PageDirectoryEnd; + ULONG KernelBase; } LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; #endif _____ Modified: trunk/reactos/include/ndk/kefuncs.h --- trunk/reactos/include/ndk/kefuncs.h 2005-06-19 04:49:14 UTC (rev 16074) +++ trunk/reactos/include/ndk/kefuncs.h 2005-06-19 07:03:18 UTC (rev 16075) @@ -123,23 +123,23 @@ IN PKTHREAD *Thread OPTIONAL ); -PVOID +PCONFIGURATION_COMPONENT_DATA STDCALL -KeFindConfigurationEntry( - IN PVOID Unknown, - IN ULONG Class, +KeFindConfigurationNextEntry( + IN PCONFIGURATION_COMPONENT_DATA Child, + IN CONFIGURATION_CLASS Class, IN CONFIGURATION_TYPE Type, - IN PULONG RegKey + IN PULONG ComponentKey OPTIONAL, + IN PCONFIGURATION_COMPONENT_DATA *NextLink ); - -PVOID + +PCONFIGURATION_COMPONENT_DATA STDCALL -KeFindConfigurationNextEntry( - IN PVOID Unknown, - IN ULONG Class, +KeFindConfigurationEntry( + IN PCONFIGURATION_COMPONENT_DATA Child, + IN CONFIGURATION_CLASS Class, IN CONFIGURATION_TYPE Type, - IN PULONG RegKey, - IN PVOID *NextLink + IN PULONG ComponentKey OPTIONAL ); VOID _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-06-19 04:49:14 UTC (rev 16074) +++ trunk/reactos/include/ndk/ketypes.h 2005-06-19 07:03:18 UTC (rev 16075) @@ -11,11 +11,22 @@ /* DEPENDENCIES **************************************************************/ #include "haltypes.h" +#include <arc/arc.h> /* CONSTANTS *****************************************************************/ #define SSDT_MAX_ENTRIES 4 #define PROCESSOR_FEATURE_MAX 64 +#define CONTEXT_DEBUGGER (CONTEXT_FULL | CONTEXT_FLOATING_POINT) + +#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; @@ -32,6 +43,15 @@ /* TYPES *********************************************************************/ +typedef struct _CONFIGURATION_COMPONENT_DATA +{ + 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, @@ -120,6 +140,99 @@ } HighWord; } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; + +#include <pshpack1.h> + +typedef struct _KTSSNOIOPM +{ + USHORT PreviousTask; + USHORT Reserved1; + ULONG Esp0; + USHORT Ss0; + USHORT Reserved2; + ULONG Esp1; + USHORT Ss1; + USHORT Reserved3; + ULONG Esp2; + USHORT Ss2; + USHORT Reserved4; + ULONG Cr3; + ULONG Eip; + ULONG Eflags; + ULONG Eax; + ULONG Ecx; + ULONG Edx; + ULONG Ebx; + ULONG Esp; + ULONG Ebp; + ULONG Esi; + ULONG Edi; + USHORT Es; + USHORT Reserved5; + USHORT Cs; + USHORT Reserved6; + USHORT Ss; + USHORT Reserved7; + USHORT Ds; + USHORT Reserved8; + USHORT Fs; + USHORT Reserved9; + USHORT Gs; + USHORT Reserved10; + USHORT Ldt; + USHORT Reserved11; + USHORT Trap; + USHORT IoMapBase; + /* no interrupt redirection map */ + UCHAR IoBitmap[1]; +} KTSSNOIOPM; + +typedef struct _KTSS +{ + USHORT PreviousTask; + USHORT Reserved1; + ULONG Esp0; + USHORT Ss0; + USHORT Reserved2; + ULONG Esp1; + USHORT Ss1; + USHORT Reserved3; + ULONG Esp2; + USHORT Ss2; + USHORT Reserved4; + ULONG Cr3; + ULONG Eip; + ULONG Eflags; + ULONG Eax; + ULONG Ecx; + ULONG Edx; + ULONG Ebx; + ULONG Esp; + ULONG Ebp; + ULONG Esi; + ULONG Edi; + USHORT Es; + USHORT Reserved5; + USHORT Cs; + USHORT Reserved6; + USHORT Ss; + USHORT Reserved7; + USHORT Ds; + USHORT Reserved8; + USHORT Fs; + USHORT Reserved9; + USHORT Gs; + USHORT Reserved10; + USHORT Ldt; + USHORT Reserved11; + USHORT Trap; + USHORT IoMapBase; + /* no interrupt redirection map */ + UCHAR IoBitmap[8193]; +} KTSS; + +#include <poppack.h> + /* i386 Doesn't have Exception Frames */ typedef struct _KEXCEPTION_FRAME { @@ -157,6 +270,43 @@ KEVENT HighEvent; } KEVENT_PAIR, *PKEVENT_PAIR; -/* FIXME: Add KOBJECTS Here */ +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 { + Initialized, + Ready, + Running, + Standby, + Terminated, + Waiting, + Transition, + DeferredReady, +} KTHREAD_STATE, *PKTHREAD_STATE; #endif _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-06-19 04:49:14 UTC (rev 16074) +++ trunk/reactos/include/ndk/rtltypes.h 2005-06-19 07:03:18 UTC (rev 16075) @@ -21,6 +21,9 @@ #define PEB_BASE (0x7FFDF000) +#define EXCEPTION_CONTINUE_SEARCH 0 +#define EXCEPTION_EXECUTE_HANDLER 1 + #define EXCEPTION_UNWINDING 0x02 #define EXCEPTION_EXIT_UNWIND 0x04 #define EXCEPTION_STACK_INVALID 0x8 @@ -93,7 +96,7 @@ { USHORT Length; USHORT Flags; - UCHAR Text[1]; + CHAR Text[1]; } RTL_MESSAGE_RESOURCE_ENTRY, *PRTL_MESSAGE_RESOURCE_ENTRY; typedef struct _RTL_MESSAGE_RESOURCE_BLOCK _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-06-19 04:49:14 UTC (rev 16074) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-06-19 07:03:18 UTC (rev 16075) @@ -2494,6 +2494,18 @@ NTSTATUS STDCALL +NtResumeProcess( + IN HANDLE ProcessHandle +); + +NTSTATUS +STDCALL +ZwResumeProcess( + IN HANDLE ProcessHandle +); + +NTSTATUS +STDCALL NtSaveKey( IN HANDLE KeyHandle, IN HANDLE FileHandle @@ -3246,6 +3258,18 @@ IN PULONG PreviousSuspendCount ); +NTSTATUS +STDCALL +NtSuspendProcess( + IN HANDLE ProcessHandle +); + +NTSTATUS +STDCALL +ZwSuspendProcess( + IN HANDLE ProcessHandle +); + NTSTATUS STDCALL NtTerminateThread( @@ -3482,7 +3506,7 @@ NTSTATUS STDCALL NtDelayExecution( - IN ULONG Alertable, + IN BOOLEAN Alertable, IN LARGE_INTEGER *Interval ); @@ -3603,12 +3627,12 @@ NTSTATUS STDCALL NtRaiseHardError( - IN NTSTATUS Status, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4, - ULONG Unknown5, - ULONG Unknown6 + IN NTSTATUS ErrorStatus, + IN ULONG NumberOfParameters, + IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL, + IN PVOID *Parameters, + IN HARDERROR_RESPONSE_OPTION ResponseOption, + OUT PHARDERROR_RESPONSE Response ); NTSTATUS _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-06-19 04:49:14 UTC (rev 16074) +++ trunk/reactos/include/ndk/zwtypes.h 2005-06-19 07:03:18 UTC (rev 16075) @@ -17,6 +17,8 @@ /* CONSTANTS *****************************************************************/ #define MAX_BUS_NAME 24 +#define EVENT_PAIR_ALL_ACCESS (0x1F0000L) + /* ENUMERATIONS **************************************************************/ typedef enum _PLUGPLAY_BUS_CLASS

19 years, 3 months

[ion] 16074: Fix building issues caused by previous patch

by ion＠svn.reactos.com

Fix building issues caused by previous patch Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/drivers/fs/ms/create.c Modified: trunk/reactos/drivers/fs/np/create.c Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c Modified: trunk/reactos/include/ntdll/rtl.h Modified: trunk/reactos/include/ntos/fstypes.h Modified: trunk/reactos/include/ntos/krnltypes.h Modified: trunk/reactos/include/ntos/zwtypes.h Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/subsys/system/usetup/bootsup.c Modified: trunk/reactos/subsys/system/usetup/partlist.c Modified: trunk/reactos/subsys/system/usetup/usetup.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-06-19 04:49:14 UTC (rev 16074) @@ -7,7 +7,6 @@ */ #include <freeldr.h> -#include <internal/i386/ke.h> #include <reactos/rossym.h> #include "registry.h" _____ Modified: trunk/reactos/drivers/fs/ms/create.c --- trunk/reactos/drivers/fs/ms/create.c 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/drivers/fs/ms/create.c 2005-06-19 04:49:14 UTC (rev 16074) @@ -10,6 +10,7 @@ /* INCLUDES ******************************************************************/ #include <ntifs.h> +#include <ntos/fstypes.h> /* FIXME: NDK */ /* FIXME: The headers are broken! */ #undef CreateMailslot #include "msfs.h" _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/drivers/fs/np/create.c 2005-06-19 04:49:14 UTC (rev 16074) @@ -10,6 +10,7 @@ /* INCLUDES ******************************************************************/ #include <ntifs.h> +#include <ntos/fstypes.h> /* FIXME: NDK */ #include "npfs.h" #define NDEBUG _____ Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c --- trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-06-19 04:49:14 UTC (rev 16074) @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include <ddk/ntdddisk.h> #include <hal.h> #include "halxbox.h" _____ Modified: trunk/reactos/include/ntdll/rtl.h --- trunk/reactos/include/ntdll/rtl.h 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/include/ntdll/rtl.h 2005-06-19 04:49:14 UTC (rev 16074) @@ -7,6 +7,7 @@ #include <ddk/ntifs.h> #include <ntos/types.h> +#include <ntos/zwtypes.h> #include <napi/teb.h> #ifdef __cplusplus _____ Modified: trunk/reactos/include/ntos/fstypes.h --- trunk/reactos/include/ntos/fstypes.h 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/include/ntos/fstypes.h 2005-06-19 04:49:14 UTC (rev 16074) @@ -24,4 +24,25 @@ LARGE_MCB LargeMcb; } MCB, *PMCB; + +typedef struct _MAILSLOT_CREATE_PARAMETERS +{ + ULONG MailslotQuota; + ULONG MaximumMessageSize; + LARGE_INTEGER ReadTimeout; + BOOLEAN TimeoutSpecified; +} MAILSLOT_CREATE_PARAMETERS, *PMAILSLOT_CREATE_PARAMETERS; + +typedef struct _NAMED_PIPE_CREATE_PARAMETERS +{ + ULONG NamedPipeType; + ULONG ReadMode; + ULONG CompletionMode; + ULONG MaximumInstances; + ULONG InboundQuota; + ULONG OutboundQuota; + LARGE_INTEGER DefaultTimeout; + BOOLEAN TimeoutSpecified; +} NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS; + #endif /* __INCLUDE_DDK_FSTYPES_H */ _____ Modified: trunk/reactos/include/ntos/krnltypes.h --- trunk/reactos/include/ntos/krnltypes.h 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/include/ntos/krnltypes.h 2005-06-19 04:49:14 UTC (rev 16074) @@ -14,50 +14,6 @@ extern POBJECT_TYPE EXPORTED ExMutantObjectType; extern POBJECT_TYPE EXPORTED ExTimerType; -typedef struct _SECTION_BASIC_INFORMATION -{ - PVOID BaseAddress; - ULONG Attributes; - LARGE_INTEGER Size; -} SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION; - -typedef struct _SECTION_IMAGE_INFORMATION -{ - ULONG EntryPoint; - ULONG Unknown1; - ULONG_PTR StackReserve; - ULONG_PTR StackCommit; - ULONG Subsystem; - USHORT MinorSubsystemVersion; - USHORT MajorSubsystemVersion; - ULONG Unknown2; - ULONG Characteristics; - USHORT ImageNumber; - BOOLEAN Executable; - UCHAR Unknown3; - ULONG Unknown4[3]; -} SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; - -typedef struct _MAILSLOT_CREATE_PARAMETERS -{ - ULONG MailslotQuota; - ULONG MaximumMessageSize; - LARGE_INTEGER ReadTimeout; - BOOLEAN TimeoutSpecified; -} MAILSLOT_CREATE_PARAMETERS, *PMAILSLOT_CREATE_PARAMETERS; - -typedef struct _NAMED_PIPE_CREATE_PARAMETERS -{ - ULONG NamedPipeType; - ULONG ReadMode; - ULONG CompletionMode; - ULONG MaximumInstances; - ULONG InboundQuota; - ULONG OutboundQuota; - LARGE_INTEGER DefaultTimeout; - BOOLEAN TimeoutSpecified; -} NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS; - /* * PURPOSE: Special timer associated with each device */ _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/include/ntos/zwtypes.h 2005-06-19 04:49:14 UTC (rev 16074) @@ -1120,13 +1120,6 @@ } RETRIEVAL_POINTERS_BUFFER, *PRETRIEVAL_POINTERS_BUFFER; #include <poppack.h> -typedef struct _SECTION_BASIC_INFORMATION -{ - PVOID BaseAddress; - ULONG Attributes; - LARGE_INTEGER Size; -} SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION; - typedef enum _SECTION_INFORMATION_CLASS { SectionBasicInformation, @@ -1180,7 +1173,31 @@ #endif #endif /* __GNUC__ */ +typedef struct _SECTION_BASIC_INFORMATION +{ + PVOID BaseAddress; + ULONG Attributes; + LARGE_INTEGER Size; +} SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION; +typedef struct _SECTION_IMAGE_INFORMATION +{ + ULONG EntryPoint; + ULONG Unknown1; + ULONG_PTR StackReserve; + ULONG_PTR StackCommit; + ULONG Subsystem; + USHORT MinorSubsystemVersion; + USHORT MajorSubsystemVersion; + ULONG Unknown2; + ULONG Characteristics; + USHORT ImageNumber; + BOOLEAN Executable; + UCHAR Unknown3; + ULONG Unknown4[3]; +} SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; + + // event access mask #define EVENT_READ_ACCESS 1 _____ Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h --- trunk/reactos/lib/fslib/vfatlib/vfatlib.h 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.h 2005-06-19 04:49:14 UTC (rev 16074) @@ -8,6 +8,7 @@ #define NTOS_MODE_USER #include <ntos.h> #include <fslib/vfatlib.h> +#include <ddk/ntdddisk.h> #define SECTORSIZE 512 _____ Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h --- trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h 2005-06-19 04:49:14 UTC (rev 16074) @@ -8,6 +8,7 @@ #define NTOS_MODE_USER #include <ntos.h> #include <fslib/vfatlib.h> +#include <ddk/ntdddisk.h> typedef struct _FATX_BOOT_SECTOR { _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-06-19 04:49:14 UTC (rev 16074) @@ -201,6 +201,7 @@ PVOID StartContext, PCONTEXT Context); +#ifdef _NTOSKRNL_ /* FIXME: Move flags above to NDK instead of here */ VOID STDCALL KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, @@ -208,6 +209,7 @@ PVOID StartContext, BOOLEAN UserThread, KTRAP_FRAME TrapFrame); +#endif #ifdef CONFIG_SMP #define LOCK "lock ; " _____ Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2005-06-19 04:49:14 UTC (rev 16074) @@ -26,6 +26,7 @@ #include "precomp.h" #include <ntdll/rtl.h> +#include <ddk/ntdddisk.h> /* FIXME: NDK */ #include "usetup.h" #include "inicache.h" _____ Modified: trunk/reactos/subsys/system/usetup/partlist.c --- trunk/reactos/subsys/system/usetup/partlist.c 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/subsys/system/usetup/partlist.c 2005-06-19 04:49:14 UTC (rev 16074) @@ -26,7 +26,8 @@ */ #include "precomp.h" -#include <ddk/ntddscsi.h> +#include <ddk/ntddscsi.h> /* FIXME: NDK */ +#include <ddk/ntdddisk.h> /* FIXME: NDK */ #include <ntdll/rtl.h> _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-06-19 03:55:48 UTC (rev 16073) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-06-19 04:49:14 UTC (rev 16074) @@ -28,6 +28,7 @@ #include "precomp.h" #include <ntdll/rtl.h> +#include <ddk/ntdddisk.h> /* FIXME: NDK */ #include <ntos/minmax.h> #include <reactos/resource.h>

19 years, 3 months

[ion] 16073: Move Exported functions away from internal/ke.h, move exported data from internal/ex.h, add internal structures to internal/ifs.h, include ntdddisk.h in internal/xhal.h for access to PDRIVE_LAYOUT_INFORMATION, remove DDK function from internal/nls.h, remove KTRAP_FRAME from internal/i386/ke.h, add some more temporary types to krnltypes.h, protect PNP_VETO_TYPE, move EVENT_TRACE_HEADER to DDK, guard disk.h properly, correct DRIVE_LAYOUT_INFORMATION typedef in DDK, add PNP_VETO_TYPE,

by ion＠svn.reactos.com

Move Exported functions away from internal/ke.h, move exported data from internal/ex.h, add internal structures to internal/ifs.h, include ntdddisk.h in internal/xhal.h for access to PDRIVE_LAYOUT_INFORMATION, remove DDK function from internal/nls.h, remove KTRAP_FRAME from internal/i386/ke.h, add some more temporary types to krnltypes.h, protect PNP_VETO_TYPE, move EVENT_TRACE_HEADER to DDK, guard disk.h properly, correct DRIVE_LAYOUT_INFORMATION typedef in DDK, add PNP_VETO_TYPE, NLSTABLEINFO, CPTABLEINFO, remove KDPC_DATA, PP_LOOKASIDE_LIST. remove PROCESSOR_POWER_STATE from ntpoapi, remove MAILSLOT_CREATE_PARAMETERS, NAMED_PIPE_CREATE_PARAMETERS, IO_COMPLETION_INFORMATION_CLASS, PAGEFAULT_HISTORY, SECTION_XXX_INFORMATION, RtlSelfRelativeToAbsoluteSD, ZwQuerySection/Object, ZwQuerySystemInformation, ZwSetInformationObject, ZwSetSystemInformation from IFS Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/ntpoapi.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-19 03:55:34 UTC (rev 16072) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-19 03:55:48 UTC (rev 16073) @@ -530,9 +530,7 @@ typedef struct _KPROCESS *PKPROCESS; typedef struct _KQUEUE *PKQUEUE; typedef struct _KTRAP_FRAME *PKTRAP_FRAME; -typedef struct _MAILSLOT_CREATE_PARAMETERS *PMAILSLOT_CREATE_PARAMETERS; typedef struct _MMWSL *PMMWSL; -typedef struct _NAMED_PIPE_CREATE_PARAMETERS *PNAMED_PIPE_CREATE_PARAMETERS; typedef struct _OBJECT_DIRECTORY *POBJECT_DIRECTORY; typedef struct _PAGEFAULT_HISTORY *PPAGEFAULT_HISTORY; typedef struct _PS_IMPERSONATION_INFORMATION *PPS_IMPERSONATION_INFORMATION; @@ -573,10 +571,6 @@ StorageTypeStream } FILE_STORAGE_TYPE; -typedef enum _IO_COMPLETION_INFORMATION_CLASS { - IoCompletionBasicInformation -} IO_COMPLETION_INFORMATION_CLASS; - typedef enum _OBJECT_INFO_CLASS { ObjectBasicInfo, ObjectNameInfo, @@ -1303,13 +1297,6 @@ LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; -typedef struct _MAILSLOT_CREATE_PARAMETERS { - ULONG MailslotQuota; - ULONG MaximumMessageSize; - LARGE_INTEGER ReadTimeout; - BOOLEAN TimeoutSpecified; -} MAILSLOT_CREATE_PARAMETERS, *PMAILSLOT_CREATE_PARAMETERS; - typedef struct _MBCB { CSHORT NodeTypeCode; CSHORT NodeIsInZone; @@ -1332,17 +1319,6 @@ ULONG Reserved1; } MOVEFILE_DESCRIPTOR, *PMOVEFILE_DESCRIPTOR; -typedef struct _NAMED_PIPE_CREATE_PARAMETERS { - ULONG NamedPipeType; - ULONG ReadMode; - ULONG CompletionMode; - ULONG MaximumInstances; - ULONG InboundQuota; - ULONG OutboundQuota; - LARGE_INTEGER DefaultTimeout; - BOOLEAN TimeoutSpecified; -} NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS; - typedef struct _OBJECT_BASIC_INFO { ULONG Attributes; ACCESS_MASK GrantedAccess; @@ -1383,13 +1359,6 @@ OBJECT_TYPE_INFO ObjectsTypeInfo[1]; } OBJECT_ALL_TYPES_INFO, *POBJECT_ALL_TYPES_INFO; -typedef struct _PAGEFAULT_HISTORY { - ULONG CurrentIndex; - ULONG MaxIndex; - KSPIN_LOCK SpinLock; - PVOID Reserved; - PROCESS_WS_WATCH_INFORMATION WatchInfo[1]; -} PAGEFAULT_HISTORY, *PPAGEFAULT_HISTORY; typedef struct _PATHNAME_BUFFER { ULONG PathNameLength; @@ -1524,28 +1493,6 @@ } SE_EXPORTS, *PSE_EXPORTS; -typedef struct _SECTION_BASIC_INFORMATION { - PVOID BaseAddress; - ULONG Attributes; - LARGE_INTEGER Size; -} SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION; - -typedef struct _SECTION_IMAGE_INFORMATION { - ULONG EntryPoint; - ULONG Unknown1; - ULONG_PTR StackReserve; - ULONG_PTR StackCommit; - ULONG Subsystem; - USHORT MinorSubsystemVersion; - USHORT MajorSubsystemVersion; - ULONG Unknown2; - ULONG Characteristics; - USHORT ImageNumber; - BOOLEAN Executable; - UCHAR Unknown3; - ULONG Unknown4[3]; -} SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; - #if (VER_PRODUCTBUILD >= 2600) typedef struct _SHARED_CACHE_MAP { @@ -3915,30 +3862,9 @@ OUT PLARGE_INTEGER Time ); -#if (VER_PRODUCTBUILD >= 2195) - NTSYSAPI NTSTATUS NTAPI -RtlSelfRelativeToAbsoluteSD ( - IN PSECURITY_DESCRIPTOR_RELATIVE SelfRelativeSD, - OUT PSECURITY_DESCRIPTOR AbsoluteSD, - IN PULONG AbsoluteSDSize, - IN PACL Dacl, - IN PULONG DaclSize, - IN PACL Sacl, - IN PULONG SaclSize, - IN PSID Owner, - IN PULONG OwnerSize, - IN PSID PrimaryGroup, - IN PULONG PrimaryGroupSize -); - -#endif /* (VER_PRODUCTBUILD >= 2195) */ - -NTSYSAPI -NTSTATUS -NTAPI RtlSetGroupSecurityDescriptor ( IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, IN PSID Group, @@ -4703,28 +4629,6 @@ NTSYSAPI NTSTATUS NTAPI -ZwQueryObject ( - IN HANDLE ObjectHandle, - IN OBJECT_INFORMATION_CLASS ObjectInformationClass, - OUT PVOID ObjectInformation, - IN ULONG Length, - OUT PULONG ResultLength -); - -NTSYSAPI -NTSTATUS -NTAPI -ZwQuerySection ( - IN HANDLE SectionHandle, - IN SECTION_INFORMATION_CLASS SectionInformationClass, - OUT PVOID SectionInformation, - IN ULONG SectionInformationLength, - OUT PULONG ResultLength OPTIONAL -); - -NTSYSAPI -NTSTATUS -NTAPI ZwQuerySecurityObject ( IN HANDLE FileHandle, IN SECURITY_INFORMATION SecurityInformation, @@ -4736,16 +4640,6 @@ NTSYSAPI NTSTATUS NTAPI -ZwQuerySystemInformation ( - IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - OUT PVOID SystemInformation, - IN ULONG Length, - OUT PULONG ReturnLength -); - -NTSYSAPI -NTSTATUS -NTAPI ZwQueryVolumeInformationFile ( IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, @@ -4832,16 +4726,6 @@ NTSYSAPI NTSTATUS NTAPI -ZwSetInformationObject ( - IN HANDLE ObjectHandle, - IN OBJECT_INFORMATION_CLASS ObjectInformationClass, - IN PVOID ObjectInformation, - IN ULONG ObjectInformationLength -); - -NTSYSAPI -NTSTATUS -NTAPI ZwSetInformationProcess ( IN HANDLE ProcessHandle, IN PROCESSINFOCLASS ProcessInformationClass, @@ -4865,15 +4749,6 @@ NTSYSAPI NTSTATUS NTAPI -ZwSetSystemInformation ( - IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - IN PVOID SystemInformation, - IN ULONG Length -); - -NTSYSAPI -NTSTATUS -NTAPI ZwSetSystemTime ( IN PLARGE_INTEGER NewTime, OUT PLARGE_INTEGER OldTime OPTIONAL _____ Modified: trunk/reactos/w32api/include/ddk/ntpoapi.h --- trunk/reactos/w32api/include/ddk/ntpoapi.h 2005-06-19 03:55:34 UTC (rev 16072) +++ trunk/reactos/w32api/include/ddk/ntpoapi.h 2005-06-19 03:55:48 UTC (rev 16073) @@ -155,53 +155,6 @@ PROCESSOR_PERF_LEVEL PerfLevel[1]; } PROCESSOR_STATE_HANDLER2, *PPROCESSOR_STATE_HANDLER2; -typedef struct _PROCESSOR_POWER_STATE { - PVOID IdleFunction; - ULONG Idle0KernelTimeLimit; - ULONG Idle0LastTime; - PVOID IdleHandlers; - PVOID IdleState; - ULONG IdleHandlersCount; - ULONGLONG LastCheck; - PROCESSOR_IDLE_TIMES IdleTimes; - ULONG IdleTime1; - ULONG PromotionCheck; - ULONG IdleTime2; - UCHAR CurrentThrottle; - UCHAR ThermalThrottleLimit; - UCHAR CurrentThrottleIndex; - UCHAR ThermalThrottleIndex; - ULONG LastKernelUserTime; - ULONG PerfIdleTime; - ULONG DebugDelta; - ULONG DebugCount; - ULONG LastSysTime; - ULONG TotalIdleStateTime[3]; - ULONG TotalIdleTransitions[3]; - ULONGLONG PreviousC3StateTime; - UCHAR KneeThrottleIndex; - UCHAR ThrottleLimitIndex; - UCHAR PerfStatesCount; - UCHAR ProcessorMinThrottle; - UCHAR ProcessorMaxThrottle; - UCHAR LastBusyPercentage; - UCHAR LastC3Percentage; - UCHAR LastAdjustedBusyPercentage; - ULONG PromotionCount; - ULONG DemotionCount; - ULONG ErrorCount; - ULONG RetryCount; - ULONG Flags; - LARGE_INTEGER PerfCounterFrequency; - ULONG PerfTickCount; - KTIMER PerfTimer; - KDPC PerfDpc; - PROCESSOR_PERF_STATE *PerfStates; - PVOID PerfSetThrottle; - ULONG LastC3KernelUserTime; - ULONG Spare1[1]; -} PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE; - NTOSAPI NTSTATUS DDKAPI _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-19 03:55:34 UTC (rev 16072) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-19 03:55:48 UTC (rev 16073) @@ -181,7 +181,7 @@ typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT; typedef struct _BUS_HANDLER *PBUS_HANDLER; typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; -typedef struct _DRIVE_LAYOUT_INFORMATION *PDRIVE_LAYOUT_INFORMATION; +typedef struct _DRIVE_LAYOUT_INFORMATION; typedef struct _DRIVE_LAYOUT_INFORMATION_EX *PDRIVE_LAYOUT_INFORMATION_EX; typedef struct _NAMED_PIPE_CREATE_PARAMETERS *PNAMED_PIPE_CREATE_PARAMETERS; typedef struct _MAILSLOT_CREATE_PARAMETERS *PMAILSLOT_CREATE_PARAMETERS; @@ -692,6 +692,23 @@ #define PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED 0x00000010 #define PNP_DEVICE_NOT_DISABLEABLE 0x00000020 +typedef enum _PNP_VETO_TYPE +{ + PNP_VetoTypeUnknown, + PNP_VetoLegacyDevice, + PNP_VetoPendingClose, + PNP_VetoWindowsApp, + PNP_VetoWindowsService, + PNP_VetoOutstandingOpen, + PNP_VetoDevice, + PNP_VetoDriver, + PNP_VetoIllegalDeviceRequest, + PNP_VetoInsufficientPower, + PNP_VetoNonDisableable, + PNP_VetoLegacyDriver, + PNP_VetoInsufficientRights +} PNP_VETO_TYPE, *PPNP_VETO_TYPE; + typedef struct _TARGET_DEVICE_CUSTOM_NOTIFICATION { USHORT Version; USHORT Size; @@ -775,7 +792,46 @@ (DDKAPI *PDEVICE_CHANGE_COMPLETE_CALLBACK)( IN PVOID Context); +/* WMI, should go in a WMI header... */ +typedef struct _EVENT_TRACE_HEADER +{ + USHORT Size; + union { + USHORT FieldTypeFlags; + struct { + UCHAR HeaderType; + UCHAR MarkerFlags; + }; + }; + union { + ULONG Version; + struct { + UCHAR Type; + UCHAR Level; + USHORT Version; + } Class; + }; + ULONG ThreadId; + ULONG ProcessId; + LARGE_INTEGER TimeStamp; + union { + GUID Guid; + ULONGLONG GuidPtr; + }; + union { + struct { + ULONG ClientContext; + ULONG Flags; + }; + struct { + ULONG KernelTime; + ULONG UserTime; + }; + ULONG64 ProcessorTime; + }; +} EVENT_TRACE_HEADER, *PEVENT_TRACE_HEADER; + /* ** System structures */ @@ -789,6 +845,33 @@ #define DUPLICATE_SAME_ATTRIBUTES 0x00000004 /* end winnt.h */ +/* Nls Info (ntnls.h) */ +#define MAXIMUM_LEADBYTES 12 + +typedef struct _CPTABLEINFO +{ + USHORT CodePage; + USHORT MaximumCharacterSize; + USHORT DefaultChar; + USHORT UniDefaultChar; + USHORT TransDefaultChar; + USHORT TransUniDefaultChar; + USHORT DBCSCodePage; + UCHAR LeadByte[MAXIMUM_LEADBYTES]; + PUSHORT MultiByteTable; + PVOID WideCharTable; + PUSHORT DBCSRanges; + PUSHORT DBCSOffsets; +} CPTABLEINFO, *PCPTABLEINFO; + +typedef struct _NLSTABLEINFO +{ + CPTABLEINFO OemTableInfo; + CPTABLEINFO AnsiTableInfo; + PUSHORT UpperCaseTable; + PUSHORT LowerCaseTable; +} NLSTABLEINFO, *PNLSTABLEINFO; + typedef struct _OBJECT_NAME_INFORMATION { UNICODE_STRING Name; } OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; @@ -905,13 +988,6 @@ PVOID DpcData; } KDPC, *PKDPC, *RESTRICTED_POINTER PRKDPC; -typedef struct _KDPC_DATA { - LIST_ENTRY DpcListHead; - ULONG DpcLock; - ULONG DpcQueueDepth; - ULONG DpcCount; -} KDPC_DATA, *PKDPC_DATA; - typedef struct _WAIT_CONTEXT_BLOCK { KDEVICE_QUEUE_ENTRY WaitQueueEntry; PDRIVER_CONTROL DeviceRoutine; @@ -2224,7 +2300,7 @@ IN PDEVICE_OBJECT DeviceObject, IN ULONG SectorSize, IN BOOLEAN ReturnRecognizedPartitions, - OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); + OUT struct _DRIVE_LAYOUT_INFORMATION **PartitionBuffer); typedef NTSTATUS (DDKFASTAPI *pHalIoSetPartitionInformation)( @@ -2239,7 +2315,7 @@ IN ULONG SectorSize, IN ULONG SectorsPerTrack, IN ULONG NumberOfHeads, - IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer); + IN struct _DRIVE_LAYOUT_INFORMATION *PartitionBuffer); typedef PBUS_HANDLER (DDKFASTAPI *pHalHandlerForBus)( @@ -3756,11 +3832,6 @@ FAST_MUTEX Obsoleted; } PAGED_LOOKASIDE_LIST, *PPAGED_LOOKASIDE_LIST; -typedef struct _PP_LOOKASIDE_LIST { - struct _GENERAL_LOOKASIDE *P; - struct _GENERAL_LOOKASIDE *L; -} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; - typedef struct _CALLBACK_OBJECT *PCALLBACK_OBJECT; typedef VOID

19 years, 3 months

[ion] 16072: Move Exported functions away from internal/ke.h, move exported data from internal/ex.h, add internal structures to internal/ifs.h, include ntdddisk.h in internal/xhal.h for access to PDRIVE_LAYOUT_INFORMATION, remove DDK function from internal/nls.h, remove KTRAP_FRAME from internal/i386/ke.h, add some more temporary types to krnltypes.h, protect PNP_VETO_TYPE, move EVENT_TRACE_HEADER to DDK, guard disk.h properly, correct DRIVE_LAYOUT_INFORMATION typedef in DDK, add PNP_VETO_TYPE,

by ion＠svn.reactos.com

Move Exported functions away from internal/ke.h, move exported data from internal/ex.h, add internal structures to internal/ifs.h, include ntdddisk.h in internal/xhal.h for access to PDRIVE_LAYOUT_INFORMATION, remove DDK function from internal/nls.h, remove KTRAP_FRAME from internal/i386/ke.h, add some more temporary types to krnltypes.h, protect PNP_VETO_TYPE, move EVENT_TRACE_HEADER to DDK, guard disk.h properly, correct DRIVE_LAYOUT_INFORMATION typedef in DDK, add PNP_VETO_TYPE, NLSTABLEINFO, CPTABLEINFO, remove KDPC_DATA, PP_LOOKASIDE_LIST. remove PROCESSOR_POWER_STATE from ntpoapi, remove MAILSLOT_CREATE_PARAMETERS, NAMED_PIPE_CREATE_PARAMETERS, IO_COMPLETION_INFORMATION_CLASS, PAGEFAULT_HISTORY, SECTION_XXX_INFORMATION, RtlSelfRelativeToAbsoluteSD, ZwQuerySection/Object, ZwQuerySystemInformation, ZwSetInformationObject, ZwSetSystemInformation from IFS Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ntos/disk.h Modified: trunk/reactos/include/ntos/fstypes.h Modified: trunk/reactos/include/ntos/kefuncs.h Modified: trunk/reactos/include/ntos/krnltypes.h Modified: trunk/reactos/include/ntos/ntpnp.h Modified: trunk/reactos/include/ntos/rtltypes.h Modified: trunk/reactos/include/ntos/zw.h Modified: trunk/reactos/include/ntos/zwtypes.h Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h Modified: trunk/reactos/ntoskrnl/include/internal/ifs.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/nls.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/include/internal/xhal.h _____ Modified: trunk/reactos/include/ndk/kefuncs.h --- trunk/reactos/include/ndk/kefuncs.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/include/ndk/kefuncs.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -237,7 +237,8 @@ PKINTERRUPT InterruptObject ); -struct _KPROCESS* +PKPROCESS +STDCALL KeGetCurrentProcess( VOID ); _____ Modified: trunk/reactos/include/ntos/disk.h --- trunk/reactos/include/ntos/disk.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/include/ntos/disk.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -12,7 +12,7 @@ #ifndef __INCLUDE_DISK_H #define __INCLUDE_DISK_H -#ifndef __NTDDDISK_H +#ifndef __USE_W32API #define IOCTL_DISK_BASE FILE_DEVICE_DISK @@ -177,12 +177,9 @@ PARTITION_INFORMATION PartitionEntry[1]; } DRIVE_LAYOUT_INFORMATION; -#ifndef __USE_W32API typedef DRIVE_LAYOUT_INFORMATION *PDRIVE_LAYOUT_INFORMATION; #endif -#endif - #endif /* __INCLUDE_DISK_H */ /* EOF */ _____ Modified: trunk/reactos/include/ntos/fstypes.h --- trunk/reactos/include/ntos/fstypes.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/include/ntos/fstypes.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -24,18 +24,4 @@ LARGE_MCB LargeMcb; } MCB, *PMCB; - -typedef struct _FILE_LOCK_GRANTED { - LIST_ENTRY ListEntry; - FILE_LOCK_INFO Lock; - PVOID UnlockContext; -} FILE_LOCK_GRANTED, *PFILE_LOCK_GRANTED; - - -typedef struct _FILE_LOCK_TOC { - KSPIN_LOCK SpinLock; - LIST_ENTRY GrantedListHead; - LIST_ENTRY PendingListHead; -} FILE_LOCK_TOC, *PFILE_LOCK_TOC; - #endif /* __INCLUDE_DDK_FSTYPES_H */ _____ Modified: trunk/reactos/include/ntos/kefuncs.h --- trunk/reactos/include/ntos/kefuncs.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/include/ntos/kefuncs.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -94,6 +94,12 @@ IN BOOLEAN Unknown, IN BOOLEAN CurrentCpuOnly); +struct _KPROCESS* +STDCALL +KeGetCurrentProcess( + VOID +); + VOID STDCALL KeFlushWriteBuffer( VOID); _____ Modified: trunk/reactos/include/ntos/krnltypes.h --- trunk/reactos/include/ntos/krnltypes.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/include/ntos/krnltypes.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -11,6 +11,53 @@ #define DOE_REMOVE_PROCESSED 0x8 #define DOE_START_PENDING 0x10 +extern POBJECT_TYPE EXPORTED ExMutantObjectType; +extern POBJECT_TYPE EXPORTED ExTimerType; + +typedef struct _SECTION_BASIC_INFORMATION +{ + PVOID BaseAddress; + ULONG Attributes; + LARGE_INTEGER Size; +} SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION; + +typedef struct _SECTION_IMAGE_INFORMATION +{ + ULONG EntryPoint; + ULONG Unknown1; + ULONG_PTR StackReserve; + ULONG_PTR StackCommit; + ULONG Subsystem; + USHORT MinorSubsystemVersion; + USHORT MajorSubsystemVersion; + ULONG Unknown2; + ULONG Characteristics; + USHORT ImageNumber; + BOOLEAN Executable; + UCHAR Unknown3; + ULONG Unknown4[3]; +} SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; + +typedef struct _MAILSLOT_CREATE_PARAMETERS +{ + ULONG MailslotQuota; + ULONG MaximumMessageSize; + LARGE_INTEGER ReadTimeout; + BOOLEAN TimeoutSpecified; +} MAILSLOT_CREATE_PARAMETERS, *PMAILSLOT_CREATE_PARAMETERS; + +typedef struct _NAMED_PIPE_CREATE_PARAMETERS +{ + ULONG NamedPipeType; + ULONG ReadMode; + ULONG CompletionMode; + ULONG MaximumInstances; + ULONG InboundQuota; + ULONG OutboundQuota; + LARGE_INTEGER DefaultTimeout; + BOOLEAN TimeoutSpecified; +} NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS; + /* * PURPOSE: Special timer associated with each device */ @@ -39,6 +86,68 @@ EX_QUEUE_WORKER_INFO Info; } EX_WORK_QUEUE, *PEX_WORK_QUEUE; +typedef struct _KDPC_DATA +{ + LIST_ENTRY DpcListHead; + ULONG DpcLock; + ULONG DpcQueueDepth; + ULONG DpcCount; +} KDPC_DATA, *PKDPC_DATA; + +typedef struct _KTRAP_FRAME +{ + PVOID DebugEbp; + PVOID DebugEip; + PVOID DebugArgMark; + PVOID DebugPointer; + PVOID TempCs; + PVOID TempEip; + ULONG Dr0; + ULONG Dr1; + ULONG Dr2; + ULONG Dr3; + ULONG Dr6; + ULONG Dr7; + USHORT Gs; + USHORT Reserved1; + USHORT Es; + USHORT Reserved2; + USHORT Ds; + USHORT Reserved3; + ULONG Edx; + ULONG Ecx; + ULONG Eax; + ULONG PreviousMode; + PVOID ExceptionList; + USHORT Fs; + USHORT Reserved4; + ULONG Edi; + ULONG Esi; + ULONG Ebx; + ULONG Ebp; + ULONG ErrorCode; + ULONG Eip; + ULONG Cs; + ULONG Eflags; + ULONG Esp; + USHORT Ss; + USHORT Reserved5; + USHORT V86_Es; + USHORT Reserved6; + USHORT V86_Ds; + USHORT Reserved7; + USHORT V86_Fs; + USHORT Reserved8; + USHORT V86_Gs; + USHORT Reserved9; +} KTRAP_FRAME, *PKTRAP_FRAME; + +typedef struct _PP_LOOKASIDE_LIST +{ + struct _GENERAL_LOOKASIDE *P; + struct _GENERAL_LOOKASIDE *L; +} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; + typedef enum _PP_NPAGED_LOOKASIDE_NUMBER { LookasideSmallIrpList = 0, _____ Modified: trunk/reactos/include/ntos/ntpnp.h --- trunk/reactos/include/ntos/ntpnp.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/include/ntos/ntpnp.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -71,6 +71,7 @@ MaxPlugEventCategory } PLUGPLAY_EVENT_CATEGORY; +#ifndef __USE_W32API typedef enum _PNP_VETO_TYPE { PNP_VetoTypeUnknown, PNP_VetoLegacyDevice, @@ -86,6 +87,7 @@ PNP_VetoLegacyDriver, PNP_VetoInsufficientRights, } PNP_VETO_TYPE; +#endif /* * Plug and Play event structure used by NtGetPlugPlayEvent. _____ Modified: trunk/reactos/include/ntos/rtltypes.h --- trunk/reactos/include/ntos/rtltypes.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/include/ntos/rtltypes.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -187,28 +187,6 @@ PVOID StackReserved; } INITIAL_TEB, *PINITIAL_TEB; -#else /* __USE_W32API */ - -#include <ddk/ntifs.h> - -#endif /* __USE_W32API */ - -typedef struct _RTL_HEAP_DEFINITION -{ - ULONG Length; - ULONG Unknown[11]; -} RTL_HEAP_DEFINITION, *PRTL_HEAP_DEFINITION; - -typedef struct _RTL_ATOM_TABLE -{ - ULONG TableSize; - ULONG NumberOfAtoms; - PVOID Lock; /* fast mutex (kernel mode)/ critical section (user mode) */ - PVOID HandleTable; - LIST_ENTRY Slot[0]; -} RTL_ATOM_TABLE, *PRTL_ATOM_TABLE; - - #define MAXIMUM_LEADBYTES 12 typedef struct _CPTABLEINFO @@ -236,6 +214,30 @@ } NLSTABLEINFO, *PNLSTABLEINFO; +#else /* __USE_W32API */ + +#include <ddk/ntifs.h> + +#endif /* __USE_W32API */ + +typedef struct _RTL_HEAP_DEFINITION +{ + ULONG Length; + ULONG Unknown[11]; +} RTL_HEAP_DEFINITION, *PRTL_HEAP_DEFINITION; + +typedef struct _RTL_ATOM_TABLE +{ + ULONG TableSize; + ULONG NumberOfAtoms; + PVOID Lock; /* fast mutex (kernel mode)/ critical section (user mode) */ + PVOID HandleTable; + LIST_ENTRY Slot[0]; +} RTL_ATOM_TABLE, *PRTL_ATOM_TABLE; + + + + #include <pshpack1.h> typedef struct _NLS_FILE_HEADER _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/include/ntos/zw.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -53,44 +53,6 @@ } EVENT_BASIC_INFORMATION, *PEVENT_BASIC_INFORMATION; // wmi trace event data -typedef struct _EVENT_TRACE_HEADER { - USHORT Size; - union { - USHORT FieldTypeFlags; - struct { - UCHAR HeaderType; - UCHAR MarkerFlags; - }; - }; - union { - ULONG Version; - struct { - UCHAR Type; - UCHAR Level; - USHORT Version; - } Class; - }; - ULONG ThreadId; - ULONG ProcessId; - LARGE_INTEGER TimeStamp; - union { - GUID Guid; - ULONGLONG GuidPtr; - }; - union { - struct { - ULONG ClientContext; - ULONG Flags; - }; - struct { - ULONG KernelTime; - ULONG UserTime; - }; - ULONG64 ProcessorTime; - }; -} EVENT_TRACE_HEADER, *PEVENT_TRACE_HEADER; - - typedef struct _FILE_USER_QUOTA_INFORMATION { ULONG NextEntryOffset; ULONG SidLength; _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/include/ntos/zwtypes.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -1793,6 +1793,11 @@ #endif /* __USE_W32API */ +typedef enum _IO_COMPLETION_INFORMATION_CLASS +{ + IoCompletionBasicInformation +} IO_COMPLETION_INFORMATION_CLASS; + /* BEGIN REACTOS ONLY */ typedef enum _TRAVERSE_METHOD { _____ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h --- trunk/reactos/ntoskrnl/include/internal/ex.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/ntoskrnl/include/internal/ex.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -83,9 +83,6 @@ extern ULONG ExpTimeZoneId; extern POBJECT_TYPE ExEventPairObjectType; -extern POBJECT_TYPE EXPORTED ExMutantObjectType; -extern POBJECT_TYPE EXPORTED ExSemaphoreObjectType; -extern POBJECT_TYPE EXPORTED ExTimerType; /* INITIALIZATION FUNCTIONS *************************************************/ _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -111,54 +111,6 @@ #ifndef __ASM__ -typedef struct _KTRAP_FRAME -{ - PVOID DebugEbp; - PVOID DebugEip; - PVOID DebugArgMark; - PVOID DebugPointer; - PVOID TempSegSs; - PVOID TempEsp; - ULONG Dr0; - ULONG Dr1; - ULONG Dr2; - ULONG Dr3; - ULONG Dr6; - ULONG Dr7; - USHORT Gs; - USHORT Reserved1; - USHORT Es; - USHORT Reserved2; - USHORT Ds; - USHORT Reserved3; - ULONG Edx; - ULONG Ecx; - ULONG Eax; - ULONG PreviousMode; - PVOID ExceptionList; - USHORT Fs; - USHORT Reserved4; - ULONG Edi; - ULONG Esi; - ULONG Ebx; - ULONG Ebp; - ULONG ErrorCode; - ULONG Eip; - ULONG Cs; - ULONG Eflags; - ULONG Esp; - USHORT Ss; - USHORT Reserved5; - USHORT V86_Es; - USHORT Reserved6; - USHORT V86_Ds; - USHORT Reserved7; - USHORT V86_Fs; - USHORT Reserved8; - USHORT V86_Gs; - USHORT Reserved9; -} KTRAP_FRAME, *PKTRAP_FRAME; - typedef struct _KIRQ_TRAPFRAME { ULONG Magic; _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h --- trunk/reactos/ntoskrnl/include/internal/i386/ps.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/ntoskrnl/include/internal/i386/ps.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -21,7 +21,7 @@ #ifdef __USE_W32API #ifndef __ASM__ -#include <ddk/ntpoapi.h> +#include <ndk/potypes.h> /* FIXME: TEMP HACK */ #endif #endif _____ Modified: trunk/reactos/ntoskrnl/include/internal/ifs.h --- trunk/reactos/ntoskrnl/include/internal/ifs.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/ntoskrnl/include/internal/ifs.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -4,6 +4,19 @@ /* Look for "FSrt" in mem view */ #define IFS_POOL_TAG 0x74725346 +typedef struct _FILE_LOCK_GRANTED { + LIST_ENTRY ListEntry; + FILE_LOCK_INFO Lock; + PVOID UnlockContext; +} FILE_LOCK_GRANTED, *PFILE_LOCK_GRANTED; + + +typedef struct _FILE_LOCK_TOC { + KSPIN_LOCK SpinLock; + LIST_ENTRY GrantedListHead; + LIST_ENTRY PendingListHead; +} FILE_LOCK_TOC, *PFILE_LOCK_TOC; + VOID STDCALL INIT_FUNCTION FsRtlpInitNotifyImplementation(VOID); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -212,11 +212,6 @@ /* INTERNAL KERNEL FUNCTIONS ************************************************/ -#ifdef __USE_W32API -struct _KPROCESS* STDCALL KeGetCurrentProcess(VOID); -VOID KeSetGdtSelector(ULONG Entry, ULONG Value1, ULONG Value2); -#endif - struct _KIRQ_TRAPFRAME; struct _KPCR; struct _KPRCB; _____ Modified: trunk/reactos/ntoskrnl/include/internal/nls.h --- trunk/reactos/ntoskrnl/include/internal/nls.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/ntoskrnl/include/internal/nls.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -36,8 +36,6 @@ VOID RtlpCreateInitialNlsTables(VOID); VOID RtlpCreateNlsSection(VOID); -WCHAR RtlDowncaseUnicodeChar (IN WCHAR Source); - #endif /* __NTOSKRNL_INCLUDE_INTERNAL_NLS_H */ /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -115,7 +115,7 @@ struct _EPROCESS *ThreadsProcess; /* 218 */ PKSTART_ROUTINE StartAddress; /* 21C */ union { - LPTHREAD_START_ROUTINE Win32StartAddress; /* 220 */ + PTHREAD_START_ROUTINE Win32StartAddress; /* 220 */ ULONG LpcReceivedMessageId; /* 220 */ }; LIST_ENTRY ThreadListEntry; /* 224 */ @@ -239,7 +239,7 @@ ACCESS_MASK GrantedAccess; /* 194 */ ULONG DefaultHardErrorProcessing; /* 198 */ NTSTATUS LastThreadExitStatus; /* 19C */ - PPEB Peb; /* 1A0 */ + struct _PEB* Peb; /* 1A0 */ EX_FAST_REF PrefetchTrace; /* 1A4 */ LARGE_INTEGER ReadOperationCount; /* 1A8 */ LARGE_INTEGER WriteOperationCount; /* 1B0 */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/xhal.h --- trunk/reactos/ntoskrnl/include/internal/xhal.h 2005-06-19 03:25:33 UTC (rev 16071) +++ trunk/reactos/ntoskrnl/include/internal/xhal.h 2005-06-19 03:55:34 UTC (rev 16072) @@ -1,6 +1,8 @@ #ifndef __INCLUDE_INTERNAL_XHAL_H #define __INCLUDE_INTERNAL_XHAL_H +#include <ddk/ntdddisk.h> + NTSTATUS xHalQueryDriveLayout(IN PUNICODE_STRING DeviceName, OUT PDRIVE_LAYOUT_INFORMATION *LayoutInfo);

19 years, 3 months

[ion] 16071: Many fixes to NDK

by ion＠svn.reactos.com

Many fixes to NDK Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/kdtypes.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/ndk/zwtypes.h _____ Modified: trunk/reactos/include/ndk/haltypes.h --- trunk/reactos/include/ndk/haltypes.h 2005-06-19 01:10:08 UTC (rev 16070) +++ trunk/reactos/include/ndk/haltypes.h 2005-06-19 03:25:33 UTC (rev 16071) @@ -32,6 +32,11 @@ #define MB_FLAGS_GRAPHICS_TABLE (0x800) /* ENUMERATIONS **************************************************************/ +typedef enum _FIRMWARE_ENTRY +{ + /*FIXME */ + HalFixMe +} FIRMWARE_ENTRY; /* TYPES *********************************************************************/ @@ -61,12 +66,5 @@ ULONG BootLoaderName; } LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; -typedef struct _DRIVE_LAYOUT_INFORMATION -{ - DWORD PartitionCount; - DWORD Signature; - PARTITION_INFORMATION PartitionEntry[1]; -} DRIVE_LAYOUT_INFORMATION; - #endif _____ Modified: trunk/reactos/include/ndk/iotypes.h --- trunk/reactos/include/ndk/iotypes.h 2005-06-19 01:10:08 UTC (rev 16070) +++ trunk/reactos/include/ndk/iotypes.h 2005-06-19 03:25:33 UTC (rev 16071) @@ -18,18 +18,9 @@ extern POBJECT_TYPE NTOSAPI IoDeviceObjectType; extern POBJECT_TYPE NTOSAPI IoDriverObjectType; extern POBJECT_TYPE NTOSAPI IoFileObjectType; -extern ULONG NTOSAPI IoReadOperationCount; -extern ULONGLONG NTOSAPI IoReadTransferCount; -extern ULONG NTOSAPI IoWriteOperationCount; -extern ULONGLONG NTOSAPI IoWriteTransferCount; -extern KSPIN_LOCK NTOSAPI IoStatisticsLock; /* CONSTANTS *****************************************************************/ -/* I/O Types */ -#define IO_TYPE_DRIVER 4L -#define IO_TYPE_TIMER 9L - /* ENUMERATIONS **************************************************************/ /* TYPES *********************************************************************/ _____ Modified: trunk/reactos/include/ndk/kdtypes.h --- trunk/reactos/include/ndk/kdtypes.h 2005-06-19 01:10:08 UTC (rev 16070) +++ trunk/reactos/include/ndk/kdtypes.h 2005-06-19 03:25:33 UTC (rev 16071) @@ -17,6 +17,17 @@ /* ENUMERATIONS **************************************************************/ +typedef enum _DEBUG_CONTROL_CODE +{ + DebugGetTraceInformation = 1, + DebugSetInternalBreakpoint, + DebugSetSpecialCall, + DebugClearSpecialCalls, + DebugQuerySpecialCalls, + DebugDbgBreakPoint, + DebugDbgLoadSymbols +} DEBUG_CONTROL_CODE; + /* TYPES *********************************************************************/ typedef struct _KD_PORT_INFORMATION _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-06-19 01:10:08 UTC (rev 16070) +++ trunk/reactos/include/ndk/ketypes.h 2005-06-19 03:25:33 UTC (rev 16071) @@ -12,6 +12,10 @@ /* DEPENDENCIES **************************************************************/ #include "haltypes.h" +/* CONSTANTS *****************************************************************/ +#define SSDT_MAX_ENTRIES 4 +#define PROCESSOR_FEATURE_MAX 64 + /* EXPORTED DATA *************************************************************/ extern CHAR NTOSAPI KeNumberProcessors; extern LOADER_PARAMETER_BLOCK NTOSAPI KeLoaderBlock; @@ -24,10 +28,6 @@ extern SSDT_ENTRY NTOSAPI KeServiceDescriptorTable[SSDT_MAX_ENTRIES]; extern SSDT_ENTRY NTOSAPI KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES]; -/* CONSTANTS *****************************************************************/ -#define SSDT_MAX_ENTRIES 4 -#define PROCESSOR_FEATURE_MAX 64 - /* ENUMERATIONS **************************************************************/ /* TYPES *********************************************************************/ @@ -95,6 +95,31 @@ USHORT Reserved9; } KTRAP_FRAME, *PKTRAP_FRAME; +typedef struct _LDT_ENTRY { + WORD LimitLow; + WORD BaseLow; + union { + struct { + BYTE BaseMid; + BYTE Flags1; + BYTE Flags2; + BYTE BaseHi; + } Bytes; + struct { + DWORD BaseMid : 8; + DWORD Type : 5; + DWORD Dpl : 2; + DWORD Pres : 1; + DWORD LimitHi : 4; + DWORD Sys : 1; + DWORD Reserved_0 : 1; + DWORD Default_Big : 1; + DWORD Granularity : 1; + DWORD BaseHi : 8; + } Bits; + } HighWord; +} LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; + /* i386 Doesn't have Exception Frames */ typedef struct _KEXCEPTION_FRAME { @@ -124,6 +149,14 @@ ULONG DispatchCode[106]; } KINTERRUPT, *PKINTERRUPT; +typedef struct _KEVENT_PAIR +{ + CSHORT Type; + CSHORT Size; + KEVENT LowEvent; + KEVENT HighEvent; +} KEVENT_PAIR, *PKEVENT_PAIR; + /* FIXME: Add KOBJECTS Here */ #endif _____ Modified: trunk/reactos/include/ndk/ldrtypes.h --- trunk/reactos/include/ndk/ldrtypes.h 2005-06-19 01:10:08 UTC (rev 16070) +++ trunk/reactos/include/ndk/ldrtypes.h 2005-06-19 03:25:33 UTC (rev 16071) @@ -14,19 +14,6 @@ /* EXPORTED DATA *************************************************************/ /* CONSTANTS *****************************************************************/ -#define IMAGE_SCN_TYPE_REG 0x00000000 -#define IMAGE_SCN_TYPE_DSECT 0x00000001 -#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 -#define IMAGE_SCN_TYPE_GROUP 0x00000004 -#define IMAGE_SCN_TYPE_COPY 0x00000010 - -#define IMAGE_FILE_MACHINE_ARM 0x000001C0 -#define IMAGE_FILE_MACHINE_IA64 0x00000200 -#define IMAGE_FILE_MACHINE_ALPHA64 0x00000284 -#define IMAGE_FILE_MACHINE_AMD64 0x00008664 -#define IMAGE_FILE_MACHINE_M32R 0x00009041 -#define IMAGE_FILE_MACHINE_AXP64 IMAGE_FILE_MACHINE_ALPHA64 - #define RESOURCE_TYPE_LEVEL 0 #define RESOURCE_NAME_LEVEL 1 #define RESOURCE_LANGUAGE_LEVEL 2 _____ Modified: trunk/reactos/include/ndk/potypes.h --- trunk/reactos/include/ndk/potypes.h 2005-06-19 01:10:08 UTC (rev 16070) +++ trunk/reactos/include/ndk/potypes.h 2005-06-19 03:25:33 UTC (rev 16071) @@ -10,6 +10,7 @@ #define _POTYPES_H /* DEPENDENCIES **************************************************************/ +#include <ddk/ntpoapi.h> /* EXPORTED DATA *************************************************************/ @@ -19,28 +20,6 @@ /* TYPES *********************************************************************/ -typedef struct _PROCESSOR_IDLE_TIMES -{ - ULONGLONG StartTime; - ULONGLONG EndTime; - ULONG IdleHandlerReserved[4]; -} PROCESSOR_IDLE_TIMES, *PPROCESSOR_IDLE_TIMES; - -typedef struct _PROCESSOR_PERF_STATE -{ - UCHAR PercentFrequency; - UCHAR MinCapacity; - USHORT Power; - UCHAR IncreaseLevel; - UCHAR DecreaseLevel; - USHORT Flags; - ULONG IncreaseTime; - ULONG DecreaseTime; - ULONG IncreaseCount; - ULONG DecreaseCount; - ULONGLONG PerformanceTime; -} PROCESSOR_PERF_STATE, *PPROCESSOR_PERF_STATE; - typedef struct _PROCESSOR_POWER_STATE { PVOID IdleFunction; _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-06-19 01:10:08 UTC (rev 16070) +++ trunk/reactos/include/ndk/pstypes.h 2005-06-19 03:25:33 UTC (rev 16071) @@ -40,6 +40,9 @@ /* ENUMERATIONS **************************************************************/ +/* FUNCTION TYPES **********************************************/ +typedef DWORD (*STDCALL PTHREAD_START_ROUTINE) (LPVOID); + /* TYPES *********************************************************************/ struct _ETHREAD; @@ -119,6 +122,15 @@ ULONG Buffer[0x136]; } GDI_TEB_BATCH, *PGDI_TEB_BATCH; +typedef struct _INITIAL_TEB +{ + PVOID StackBase; + PVOID StackLimit; + PVOID StackCommit; + PVOID StackCommitMax; + PVOID StackReserved; +} INITIAL_TEB, *PINITIAL_TEB; + typedef struct _TEB { NT_TIB Tib; /* 00h */ @@ -126,7 +138,7 @@ CLIENT_ID Cid; /* 20h */ PVOID ActiveRpcInfo; /* 28h */ PVOID ThreadLocalStoragePointer; /* 2Ch */ - PPEB Peb; /* 30h */ + struct _PEB *Peb; /* 30h */ ULONG LastErrorValue; /* 34h */ ULONG CountOfOwnedCriticalSections; /* 38h */ PVOID CsrClientThread; /* 3Ch */ @@ -171,14 +183,14 @@ PVOID Instrumentation[0x10]; /* F2Ch */ PVOID WinSockData; /* F6Ch */ ULONG GdiBatchCount; /* F70h */ - USHORT Spare2; /* F74h */ + USHORT _Spare2; /* F74h */ BOOLEAN IsFiber; /* F76h */ UCHAR Spare3; /* F77h */ - ULONG Spare4; /* F78h */ - ULONG Spare5; /* F7Ch */ + ULONG _Spare4; /* F78h */ + ULONG _Spare5; /* F7Ch */ PVOID ReservedForOle; /* F80h */ ULONG WaitingOnLoaderLock; /* F84h */ - ULONG Unknown[11]; /* F88h */ + ULONG _Unknown[11]; /* F88h */ PVOID FlsSlots; /* FB4h */ PVOID WineDebugInfo; /* Needed for WINE DLL's */ } TEB, *PTEB; _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-06-19 01:10:08 UTC (rev 16070) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-06-19 03:25:33 UTC (rev 16071) @@ -1,22 +1,3 @@ -/* $Id: rtlfuncs.h,v 1.1.2.2 2004/10/25 02:57:20 ion Exp $ - * - * ReactOS Headers - * Copyright (C) 1998-2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* * PROJECT: ReactOS Native Headers * FILE: include/ndk/rtlfuncs.h @@ -29,20 +10,11 @@ #define _RTLFUNCS_H #include <ndk/rtltypes.h> +#include <ndk/pstypes.h> /*FIXME: REORGANIZE THIS */ /* FIXME: SOME FUNCTIONS MUST BE PROTECTED AGAINST DDK/IFS. */ -typedef NTSTATUS -(*PHEAP_ENUMERATION_ROUTINE)(IN PVOID HeapHandle, - IN PVOID UserParam); - -typedef EXCEPTION_DISPOSITION -(*PEXCEPTION_HANDLER)(struct _EXCEPTION_RECORD*, - PVOID, - struct _CONTEXT*, - PVOID); - #define RtlGetProcessHeap() (NtCurrentPeb()->ProcessHeap) @@ -122,7 +94,7 @@ } ULONG -STDCALL +CDECL DbgPrint( IN PCH Format, IN ...); @@ -222,8 +194,8 @@ BOOLEAN STDCALL RtlEqualUnicodeString ( - PUNICODE_STRING String1, - PUNICODE_STRING String2, + PCUNICODE_STRING String1, + PCUNICODE_STRING String2, BOOLEAN CaseInsensitive ); _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-06-19 01:10:08 UTC (rev 16070) +++ trunk/reactos/include/ndk/rtltypes.h 2005-06-19 03:25:33 UTC (rev 16071) @@ -44,6 +44,17 @@ ExceptionCollidedUnwind } EXCEPTION_DISPOSITION; +/* FUNCTION TYPES ************************************************************/ +typedef NTSTATUS +(*PHEAP_ENUMERATION_ROUTINE)(IN PVOID HeapHandle, + IN PVOID UserParam); + +typedef EXCEPTION_DISPOSITION +(*PEXCEPTION_HANDLER)(struct _EXCEPTION_RECORD*, + PVOID, + struct _CONTEXT*, + PVOID); + /* TYPES *********************************************************************/ typedef unsigned short RTL_ATOM; @@ -151,21 +162,7 @@ CLIENT_ID ClientId; SECTION_IMAGE_INFORMATION ImageInfo; } RTL_PROCESS_INFO, *PRTL_PROCESS_INFO; - -typedef struct _RTL_BITMAP -{ - ULONG SizeOfBitMap; - PULONG Buffer; -} RTL_BITMAP; -typedef RTL_BITMAP *PRTL_BITMAP; -typedef struct _RTL_BITMAP_RUN -{ - ULONG StartingIndex; - ULONG NumberOfBits; -} RTL_BITMAP_RUN; -typedef RTL_BITMAP_RUN *PRTL_BITMAP_RUN; - /* FIXME: This is a Windows Type which which we are not implementing properly The type below however is our own implementation. We will eventually use Windows' */ typedef struct _RTL_ATOM_TABLE @@ -203,6 +200,4 @@ } TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION; #endif -typedef LPTIME_ZONE_INFORMATION PTIME_ZONE_INFORMATION; - #endif _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-06-19 01:10:08 UTC (rev 16070) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-06-19 03:25:33 UTC (rev 16071) @@ -12,6 +12,7 @@ /* DEPENDENCIES **************************************************************/ #include "lpctypes.h" #include "zwtypes.h" +#include "kdtypes.h" /* FUNCTION TYPES ************************************************************/ @@ -1036,7 +1037,8 @@ PLPC_MESSAGE LpcMessage ); -STDCALL +NTSTATUS +STDCALL NtLoadDriver( IN PUNICODE_STRING DriverServiceName ); @@ -2786,7 +2788,7 @@ NtSetQuotaInformationFile( HANDLE FileHandle, PIO_STATUS_BLOCK IoStatusBlock, - PFILE_USER_QUOTA_INFORMATION Buffer, + PFILE_QUOTA_INFORMATION Buffer, ULONG BufferLength ); @@ -2795,7 +2797,7 @@ ZwSetQuotaInformationFile( HANDLE FileHandle, PIO_STATUS_BLOCK IoStatusBlock, - PFILE_USER_QUOTA_INFORMATION Buffer, + PFILE_QUOTA_INFORMATION Buffer, ULONG BufferLength ); @@ -2931,13 +2933,13 @@ NTSTATUS STDCALL NtShutdownSystem( - IN SHUTDOWN_ACTION Action + IN ULONG Action ); NTSTATUS STDCALL ZwShutdownSystem( - IN SHUTDOWN_ACTION Action + IN ULONG Action ); NTSTATUS @@ -3686,10 +3688,10 @@ IN HANDLE TargetProcessHandle, OUT PHANDLE TargetHandle, IN ACCESS_MASK DesiredAccess, - IN BOOLEAN InheritHandle, + IN ULONG HandleAttributes, IN ULONG Options ); - + NTSTATUS STDCALL ZwDuplicateObject( @@ -3698,7 +3700,7 @@ IN HANDLE TargetProcessHandle, OUT PHANDLE TargetHandle, IN ACCESS_MASK DesiredAccess, - IN BOOLEAN InheritHandle, + IN ULONG HandleAttributes, IN ULONG Options ); _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-06-19 01:10:08 UTC (rev 16070) +++ trunk/reactos/include/ndk/zwtypes.h 2005-06-19 03:25:33 UTC (rev 16071) @@ -15,6 +15,7 @@ /* EXPORTED DATA *************************************************************/ /* CONSTANTS *****************************************************************/ +#define MAX_BUS_NAME 24 /* ENUMERATIONS **************************************************************/ @@ -31,6 +32,13 @@ MaxPlugPlayVirtualBusType } PLUGPLAY_VIRTUAL_BUS_TYPE, *PPLUGPLAY_VIRTUAL_BUS_TYPE; +typedef enum _SYSTEM_DOCK_STATE +{ + SystemDockStateUnknown, + SystemUndocked, + SystemDocked +} SYSTEM_DOCK_STATE, *PSYSTEM_DOCK_STATE; + /**** Information Classes ****/ /* * System @@ -79,7 +87,7 @@ SystemPrioritySeperation, SystemPlugPlayBusInformation, SystemDockInformation, - SystemPowerInformation, + _SystemPowerInformation, /* FIXME */ SystemProcessorSpeedInformation, SystemCurrentTimeZoneInformation, SystemLookasideInformation, @@ -307,7 +315,7 @@ /* * Event - * + */ /* Class 0 */ typedef struct _EVENT_BASIC_INFORMATION { @@ -316,6 +324,26 @@ } EVENT_BASIC_INFORMATION, *PEVENT_BASIC_INFORMATION; /* + * Process + */ +/* Class 23 */ +typedef struct _PROCESS_DEVICEMAP_INFORMATION +{ + union + { + struct + { + HANDLE DirectoryHandle; + } Set; + struct + { + ULONG DriveMap; + UCHAR DriveType[32]; + } Query; + }; +} PROCESS_DEVICEMAP_INFORMATION, *PPROCESS_DEVICEMAP_INFORMATION; + +/* * System */ @@ -523,7 +551,7 @@ LARGE_INTEGER DpcTime; LARGE_INTEGER InterruptTime; ULONG InterruptCount; -} SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION, +} SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION, *PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION; /* Class 9 */ typedef struct _SYSTEM_FLAGS_INFORMATION @@ -585,7 +613,7 @@ typedef struct _SYSTEM_BACKTRACE_INFORMATION { /* FIXME */ - ULONG Unknown[4] + ULONG Unknown[4]; ULONG Count; SYSTEM_BACKTRACE_INFORMATION_ENTRY Trace[1]; } SYSTEM_BACKTRACE_INFORMATION, *PSYSTEM_BACKTRACE_INFORMATION; @@ -715,7 +743,8 @@ typedef struct _SYSTEM_VDM_BOP_INFO { /* FIXME */ -} + PVOID Dummy; +} SYSTEM_VDM_BOP_INFO, *PSYSTEM_VDM_BOP_INFO; /* Class 21 */ typedef struct _SYSTEM_CACHE_INFORMATION @@ -908,7 +937,8 @@ } SYSTEM_DOCK_INFORMATION, *PSYSTEM_DOCK_INFORMATION; /* Class 42 */ -typedef struct _SYSTEM_POWER_INFORMATION +/* FIXME: Conflict with WINNT.H */ +typedef struct __SYSTEM_POWER_INFORMATION { BOOLEAN SystemSuspendSupported; BOOLEAN SystemHibernateSupported; @@ -920,18 +950,18 @@ BOOLEAN SystemAcOrDc; BOOLEAN PowerDownDisabled; LARGE_INTEGER SpindownDrives; -} SYSTEM_POWER_INFORMATION, *PSYSTEM_POWER_INFORMATION; +} _SYSTEM_POWER_INFORMATION, *P_SYSTEM_POWER_INFORMATION; /* Class 43 */ typedef struct _SYSTEM_LEGACY_DRIVER_INFORMATION { PNP_VETO_TYPE VetoType; - UNCODE_STRING VetoDriver; + UNICODE_STRING VetoDriver; /* Buffer Follows */ -} SYSTEM_PROCESSOR_SPEED_INFORMATION, *PSYSTEM_PROCESSOR_SPEED_INFORMATION; +} SYSTEM_LEGACY_DRIVER_INFORMATION, *PSYSTEM_LEGACY_DRIVER_INFORMATION; /* Class 44 */ -typedef TIME_ZONE_INFORMATION RTL_TIME_ZONE_INFORMATION; +typedef struct _TIME_ZONE_INFORMATION RTL_TIME_ZONE_INFORMATION; /* Class 45 */ typedef struct _SYSTEM_LOOKASIDE_INFORMATION @@ -948,13 +978,13 @@ } SYSTEM_LOOKASIDE_INFORMATION, *PSYSTEM_LOOKASIDE_INFORMATION; /* Class 46 */ -/* Not a structure. Only a HANDLE for the SlipEvent; +/* Not a structure. Only a HANDLE for the SlipEvent; */ /* Class 47 */ -/* Not a structure. Only a ULONG for the SessionId; +/* Not a structure. Only a ULONG for the SessionId; */ /* Class 48 */ -/* Not a structure. Only a ULONG for the SessionId; +/* Not a structure. Only a ULONG for the SessionId; */ /* Class 49 */ /* FIXME */

19 years, 3 months

[ion] 16070: Remove PAGED_CODE, PAGED_CODE_RTL and RTL_ONSTANT_STRING from ntoskrnl.h. The first and last are in DDK, and the second is not used in the kernel and already defined

by ion＠svn.reactos.com

Remove PAGED_CODE, PAGED_CODE_RTL and RTL_ONSTANT_STRING from ntoskrnl.h. The first and last are in DDK, and the second is not used in the kernel and already defined Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-19 00:28:46 UTC (rev 16069) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-19 01:10:08 UTC (rev 16070) @@ -74,32 +74,4 @@ #include <napi/teb.h> #include <napi/win32.h> -#ifndef RTL_CONSTANT_STRING -#define RTL_CONSTANT_STRING(__SOURCE_STRING__) \ -{ \ - sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ - sizeof(__SOURCE_STRING__), \ - (__SOURCE_STRING__) \ -} -#endif - -#ifdef DBG -#ifndef PAGED_CODE -#define PAGED_CODE() \ - do { \ - if(KeGetCurrentIrql() > APC_LEVEL) { \ - DbgPrint("%s:%i: Pagable code called at IRQL > APC_LEVEL (%d)\n", \ - __FILE__, __LINE__, KeGetCurrentIrql()); \ - KEBUGCHECK(0); \ - } \ - } while(0) -#endif -#define PAGED_CODE_RTL PAGED_CODE -#else -#ifndef PAGED_CODE -#define PAGED_CODE() -#endif -#define PAGED_CODE_RTL() -#endif - #endif /* INCLUDE_NTOSKRNL_H */

19 years, 3 months

← Newer
1
...
26
27
28
29
30
31
32
...
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