Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbirr] 15117: - Changed IopCompleteRequest back to the old schematics (rev 14933) with some minor corrections.
by hbirr＠svn.reactos.com 08 May '05

08 May '05

- Changed IopCompleteRequest back to the old schematics (rev 14933) with some minor corrections. - The status results are always set before an event is signaled. - Some checks for ASYNC irp's were wrong (missing brackets, now replaced with SyncIrp). - Don't signal the FO event if it is the same as the UserEvent. - Set the IOSB on error for async irp's with a sync FO (fix bug #609). IMHO, the old schematics is wrong, because on error it is possible that an event isn't signaled if the driver has previous returned STATUS_PENDING. In this case, the caller will wait forever. Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-05-08 06:22:12 UTC (rev 15116) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-08 10:26:34 UTC (rev 15117) @@ -117,6 +117,162 @@ RemoveEntryList(&Irp->ThreadListEntry); InitializeListHead(&Irp->ThreadListEntry); +#if 1 + /* Check for Success but allow failure for Async IRPs */ + if (NT_SUCCESS(Irp->IoStatus.Status) || + (Irp->PendingReturned && + !SyncIrp && + (FileObject == NULL || FileObject->Flags & FO_SYNCHRONOUS_IO))) + { + _SEH_TRY + { + /* Save the IOSB Information */ + *Irp->UserIosb = Irp->IoStatus; + } + _SEH_HANDLE + { + /* Ignore any error */ + } + _SEH_END; + + /* Check if there's an event */ + if (UserEvent) + { + /* Check if we should signal the File Object Event as well */ + if (FileObject) + { + /* If the File Object is SYNC, then we need to signal its event too */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Set the Status */ + FileObject->FinalStatus = Irp->IoStatus.Status; + + /* Signal Event */ + KeSetEvent(&FileObject->Event, 0, FALSE); + } + } + /* Signal the Event */ + KeSetEvent(UserEvent, 0, FALSE); + + /* Dereference the Event if this is an ASYNC IRP */ + if (FileObject && !SyncIrp && UserEvent != &FileObject->Event) + { + ObDereferenceObject(UserEvent); + } + } + else if (FileObject) + { + /* Set the Status */ + FileObject->FinalStatus = Irp->IoStatus.Status; + + /* Signal the File Object Instead */ + KeSetEvent(&FileObject->Event, 0, FALSE); + + } + + /* Now call the User APC if one was requested */ + if (Irp->Overlay.AsynchronousParameters.UserApcRoutine != NULL) + { + KeInitializeApc(&Irp->Tail.Apc, + KeGetCurrentThread(), + CurrentApcEnvironment, + IopFreeIrpKernelApc, + IopAbortIrpKernelApc, + (PKNORMAL_ROUTINE)Irp->Overlay.AsynchronousParameters.UserApcRoutine, + Irp->RequestorMode, + Irp->Overlay.AsynchronousParameters.UserApcContext); + + KeInsertQueueApc(&Irp->Tail.Apc, + Irp->UserIosb, + NULL, + 2); + Irp = NULL; + } + else if (FileObject && FileObject->CompletionContext) + { + /* Call the IO Completion Port if we have one, instead */ + IoSetIoCompletion(FileObject->CompletionContext->Port, + FileObject->CompletionContext->Key, + Irp->Overlay.AsynchronousParameters.UserApcContext, + Irp->IoStatus.Status, + Irp->IoStatus.Information, + FALSE); + Irp = NULL; + } + } + else + { + /* Signal the Events only if PendingReturned and we have a File Object */ + if (FileObject && Irp->PendingReturned) + { + /* Check for SYNC IRP */ + if (SyncIrp) + { + /* Set the status in this case only */ + _SEH_TRY + { + *Irp->UserIosb = Irp->IoStatus; + } + _SEH_HANDLE + { + /* Ignore any error */ + } + _SEH_END; + + /* Signal our event if we have one */ + if (UserEvent) + { + KeSetEvent(UserEvent, 0, FALSE); + } + else + { + /* Signal the File's Event instead */ + KeSetEvent(&FileObject->Event, 0, FALSE); + } + } + else + { +#if 1 + /* FIXME: This is necessary to fix bug #609 */ + _SEH_TRY + { + *Irp->UserIosb = Irp->IoStatus; + } + _SEH_HANDLE + { + /* Ignore any error */ + } + _SEH_END; +#endif + /* We'll report the Status to the File Object, not the IRP */ + FileObject->FinalStatus = Irp->IoStatus.Status; + + /* Signal the File Object ONLY if this was Async */ + KeSetEvent(&FileObject->Event, 0, FALSE); + } + } + + /* Dereference the Event if it's an ASYNC IRP on a File Object */ + if (UserEvent && !SyncIrp && FileObject) + { + if (UserEvent != &FileObject->Event) + { + ObDereferenceObject(UserEvent); + } + } + } + + /* Dereference the File Object */ + if (FileObject) ObDereferenceObject(FileObject); + + if (Irp) + { + /* Free the IRP */ + IoFreeIrp(Irp); + } + +#else + if (NT_SUCCESS(Irp->IoStatus.Status) || Irp->PendingReturned) { _SEH_TRY @@ -198,6 +354,7 @@ /* Dereference the File Object */ ObDereferenceObject(FileObject); } +#endif } /* FUNCTIONS *****************************************************************/

1 0

[ion] 15116: RTL almost builds. Wrapping up and cleaning tomororw
by ion＠svn.reactos.com 08 May '05

08 May '05

RTL almost builds. Wrapping up and cleaning tomororw Modified: branches/new_headers/reactos/include/ddk/ntifs.h Modified: branches/new_headers/reactos/include/ddk/winddk.h Modified: branches/new_headers/reactos/include/ndk/rtlfuncs.h Modified: branches/new_headers/reactos/include/ndk/rtltypes.h Modified: branches/new_headers/reactos/include/ndk/umtypes.h Modified: branches/new_headers/reactos/include/ndk/zwtypes.h Modified: branches/new_headers/reactos/include/winnt.h Modified: branches/new_headers/reactos/lib/rtl/access.c Modified: branches/new_headers/reactos/lib/rtl/acl.c Modified: branches/new_headers/reactos/lib/rtl/bit.c Modified: branches/new_headers/reactos/lib/rtl/bitmap.c Modified: branches/new_headers/reactos/lib/rtl/bootdata.c Modified: branches/new_headers/reactos/lib/rtl/compress.c Modified: branches/new_headers/reactos/lib/rtl/dos8dot3.c Modified: branches/new_headers/reactos/lib/rtl/encode.c Modified: branches/new_headers/reactos/lib/rtl/env.c Modified: branches/new_headers/reactos/lib/rtl/error.c Modified: branches/new_headers/reactos/lib/rtl/exception.c Modified: branches/new_headers/reactos/lib/rtl/generictable.c Modified: branches/new_headers/reactos/lib/rtl/heap.c Modified: branches/new_headers/reactos/lib/rtl/image.c Modified: branches/new_headers/reactos/lib/rtl/largeint.c Modified: branches/new_headers/reactos/lib/rtl/luid.c Modified: branches/new_headers/reactos/lib/rtl/mem.c Modified: branches/new_headers/reactos/lib/rtl/network.c Modified: branches/new_headers/reactos/lib/rtl/nls.c Modified: branches/new_headers/reactos/lib/rtl/ppb.c Modified: branches/new_headers/reactos/lib/rtl/process.c Modified: branches/new_headers/reactos/lib/rtl/random.c Modified: branches/new_headers/reactos/lib/rtl/registry.c Modified: branches/new_headers/reactos/lib/rtl/sd.c Modified: branches/new_headers/reactos/lib/rtl/security.c Modified: branches/new_headers/reactos/lib/rtl/sid.c Modified: branches/new_headers/reactos/lib/rtl/splaytree.c Modified: branches/new_headers/reactos/lib/rtl/thread.c Modified: branches/new_headers/reactos/lib/rtl/time.c Modified: branches/new_headers/reactos/lib/rtl/timezone.c Modified: branches/new_headers/reactos/lib/rtl/unicode.c Modified: branches/new_headers/reactos/lib/rtl/unicodeprefix.c Modified: branches/new_headers/reactos/lib/rtl/version.c _____ Modified: branches/new_headers/reactos/include/ddk/ntifs.h --- branches/new_headers/reactos/include/ddk/ntifs.h 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/include/ddk/ntifs.h 2005-05-08 06:22:12 UTC (rev 15116) @@ -1169,6 +1169,56 @@ ULONG LastIndexValue; } GENERATE_NAME_CONTEXT, *PGENERATE_NAME_CONTEXT; +typedef enum _RTL_GENERIC_COMPARE_RESULTS +{ + GenericLessThan, + GenericGreaterThan, + GenericEqual +} RTL_GENERIC_COMPARE_RESULTS; + +typedef +RTL_GENERIC_COMPARE_RESULTS STDCALL +(*PRTL_GENERIC_COMPARE_ROUTINE)( + struct _RTL_GENERIC_TABLE *Table, + PVOID FirstStruct, + PVOID SecondStruct +); + +typedef +PVOID STDCALL +(*PRTL_GENERIC_ALLOCATE_ROUTINE)( + struct _RTL_GENERIC_TABLE *Table, + LONG ByteSize +); + +typedef +VOID STDCALL +(*PRTL_GENERIC_FREE_ROUTINE)( + struct _RTL_GENERIC_TABLE *Table, + PVOID Buffer +); + +typedef struct _RTL_SPLAY_LINKS { + struct _RTL_SPLAY_LINKS *Parent; + struct _RTL_SPLAY_LINKS *LeftChild; + struct _RTL_SPLAY_LINKS *RightChild; +} RTL_SPLAY_LINKS; +typedef RTL_SPLAY_LINKS *PRTL_SPLAY_LINKS; + +typedef struct _RTL_GENERIC_TABLE +{ + PRTL_SPLAY_LINKS TableRoot; + LIST_ENTRY InsertOrderList; + PLIST_ENTRY OrderedPointer; + ULONG WhichOrderedElement; + ULONG NumberGenericTableElements; + PRTL_GENERIC_COMPARE_ROUTINE CompareRoutine; + PRTL_GENERIC_ALLOCATE_ROUTINE AllocateRoutine; + PRTL_GENERIC_FREE_ROUTINE FreeRoutine; + PVOID TableContext; +} RTL_GENERIC_TABLE; +typedef RTL_GENERIC_TABLE *PRTL_GENERIC_TABLE; + typedef struct _HANDLE_TABLE_ENTRY_INFO { ULONG AuditMask; } HANDLE_TABLE_ENTRY_INFO, *PHANDLE_TABLE_ENTRY_INFO; @@ -1444,28 +1494,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 { _____ Modified: branches/new_headers/reactos/include/ddk/winddk.h --- branches/new_headers/reactos/include/ddk/winddk.h 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/include/ddk/winddk.h 2005-05-08 06:22:12 UTC (rev 15116) @@ -4130,6 +4130,33 @@ extern HAL_DISPATCH HalDispatchTable; #define HALDISPATCH HalDispatchTable +/* Security */ +#define ACCESS_MIN_MS_ACE_TYPE (0x0) +#define ACCESS_ALLOWED_ACE_TYPE (0x0) +#define ACCESS_DENIED_ACE_TYPE (0x1) +#define SYSTEM_AUDIT_ACE_TYPE (0x2) +#define SYSTEM_ALARM_ACE_TYPE (0x3) +#define ACCESS_MAX_MS_V2_ACE_TYPE (0x3) +#define ACCESS_ALLOWED_COMPOUND_ACE_TYPE (0x4) +#define ACCESS_MAX_MS_V3_ACE_TYPE (0x4) +#define ACCESS_MIN_MS_OBJECT_ACE_TYPE (0x5) +#define ACCESS_ALLOWED_OBJECT_ACE_TYPE (0x5) +#define ACCESS_DENIED_OBJECT_ACE_TYPE (0x6) +#define SYSTEM_AUDIT_OBJECT_ACE_TYPE (0x7) +#define SYSTEM_ALARM_OBJECT_ACE_TYPE (0x8) +#define ACCESS_MAX_MS_OBJECT_ACE_TYPE (0x8) +#define ACCESS_MAX_MS_V4_ACE_TYPE (0x8) +#define ACCESS_MAX_MS_ACE_TYPE (0x8) +#define ACCESS_ALLOWED_CALLBACK_ACE_TYPE (0x9) +#define ACCESS_DENIED_CALLBACK_ACE_TYPE (0xA) +#define ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE (0xB) +#define ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE (0xC) +#define SYSTEM_AUDIT_CALLBACK_ACE_TYPE (0xD) +#define SYSTEM_ALARM_CALLBACK_ACE_TYPE (0xE) +#define SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE (0xF) +#define SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE (0x10) +#define ACCESS_MAX_MS_V5_ACE_TYPE (0x10) + /* ** Storage structures */ _____ Modified: branches/new_headers/reactos/include/ndk/rtlfuncs.h --- branches/new_headers/reactos/include/ndk/rtlfuncs.h 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/include/ndk/rtlfuncs.h 2005-05-08 06:22:12 UTC (rev 15116) @@ -109,6 +109,16 @@ InsertTailList(current, &((NewEntry)->ListEntryField));\ } +ULONG +STDCALL +DbgPrint( + IN PCH Format, + IN ...); + +VOID +STDCALL +DbgBreakPoint(VOID); + NTSTATUS STDCALL RtlAbsoluteToSelfRelativeSD ( @@ -168,6 +178,22 @@ PVOID* RemainingSidArea, PULONG RemainingSidAreaSize ); + +LONG +STDCALL +RtlCompareUnicodeString ( + PUNICODE_STRING String1, + PUNICODE_STRING String2, + BOOLEAN CaseInsensitive +); + +BOOLEAN +STDCALL +RtlEqualUnicodeString ( + PUNICODE_STRING String1, + PUNICODE_STRING String2, + BOOLEAN CaseInsensitive +); VOID STDCALL @@ -225,6 +251,21 @@ IN OUT PRTL_ATOM_TABLE *AtomTable ); +NTSTATUS +STDCALL +RtlCreateUserThread ( + IN HANDLE ProcessHandle, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN BOOLEAN CreateSuspended, + IN LONG StackZeroBits, + IN OUT PULONG StackReserve, + IN OUT PULONG StackCommit, + IN PTHREAD_START_ROUTINE StartAddress, + IN PVOID Parameter, + IN OUT PHANDLE ThreadHandle, + IN OUT PCLIENT_ID ClientId +); + BOOLEAN STDCALL RtlCreateUnicodeString( @@ -243,6 +284,18 @@ OUT PULONG FinalUncompressedSize ); +PRTL_USER_PROCESS_PARAMETERS +STDCALL +RtlDeNormalizeProcessParams ( + IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters +); + +PRTL_USER_PROCESS_PARAMETERS +STDCALL +RtlNormalizeProcessParams ( + IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters +); + NTSTATUS STDCALL RtlDeleteAtomFromAtomTable ( @@ -288,7 +341,7 @@ IN PSID Sid2 ); -NTSTATUS +VOID STDCALL RtlFillMemoryUlong ( IN PVOID Destination, @@ -493,6 +546,14 @@ OUT PLARGE_INTEGER Time ); +VOID +STDCALL +RtlSetBits ( + PRTL_BITMAP BitMapHeader, + ULONG StartingIndex, + ULONG NumberToSet +); + #if (VER_PRODUCTBUILD >= 2195) NTSTATUS _____ Modified: branches/new_headers/reactos/include/ndk/rtltypes.h --- branches/new_headers/reactos/include/ndk/rtltypes.h 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/include/ndk/rtltypes.h 2005-05-08 06:22:12 UTC (rev 15116) @@ -28,6 +28,8 @@ #ifndef _RTLTYPES_H #define _RTLTYPES_H +#include "zwtypes.h" + #define MAXIMUM_LEADBYTES 12 #define PPF_NORMALIZED (1) #define PEB_BASE (0x7FFDF000) @@ -128,7 +130,30 @@ typedef EXCEPTION_REGISTRATION EXCEPTION_REGISTRATION_RECORD; typedef PEXCEPTION_REGISTRATION PEXCEPTION_REGISTRATION_RECORD; + +typedef struct _RTL_PROCESS_INFO +{ + ULONG Size; + HANDLE ProcessHandle; + HANDLE ThreadHandle; + 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; + typedef unsigned short RTL_ATOM; typedef unsigned short *PRTL_ATOM; _____ Modified: branches/new_headers/reactos/include/ndk/umtypes.h --- branches/new_headers/reactos/include/ndk/umtypes.h 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/include/ndk/umtypes.h 2005-05-08 06:22:12 UTC (rev 15116) @@ -284,7 +284,16 @@ typedef ULONG WAIT_TYPE; typedef struct _PEB *PPEB; typedef CONST char *PCSZ; +typedef ULONG KPROCESSOR_MODE; +typedef PVOID PTHREAD_START_ROUTINE; +typedef enum _MODE +{ + KernelMode, + UserMode, + MaximumMode +} MODE; + typedef struct _UNICODE_STRING { USHORT Length; USHORT MaximumLength; @@ -743,9 +752,32 @@ }; } KUSER_SHARED_DATA, *PKUSER_SHARED_DATA; -typedef struct _CPTABLEINFO *PCPTABLEINFO; -typedef struct _NLSTABLEINFO *PNLSTABLEINFO; +#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 _VM_COUNTERS { SIZE_T PeakVirtualSize; @@ -779,5 +811,142 @@ } VM_COUNTERS_EX; typedef VM_COUNTERS_EX *PVM_COUNTERS_EX; +typedef struct _COMPRESSED_DATA_INFO +{ + USHORT CompressionFormatAndEngine; + UCHAR CompressionUnitShift; + UCHAR ChunkShift; + UCHAR ClusterShift; + UCHAR Reserved; + USHORT NumberOfChunks; + ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; +} COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; + +typedef struct _GENERATE_NAME_CONTEXT +{ + USHORT Checksum; + BOOLEAN CheckSumInserted; + UCHAR NameLength; + WCHAR NameBuffer[8]; + ULONG ExtensionLength; + WCHAR ExtensionBuffer[4]; + ULONG LastIndexValue; +} GENERATE_NAME_CONTEXT, *PGENERATE_NAME_CONTEXT; + +typedef struct _RTL_SPLAY_LINKS { + struct _RTL_SPLAY_LINKS *Parent; + struct _RTL_SPLAY_LINKS *LeftChild; + struct _RTL_SPLAY_LINKS *RightChild; +} RTL_SPLAY_LINKS; +typedef RTL_SPLAY_LINKS *PRTL_SPLAY_LINKS; + +struct _RTL_AVL_TABLE; +struct _RTL_GENERIC_TABLE; + +typedef enum _TABLE_SEARCH_RESULT{ + TableEmptyTree, + TableFoundNode, + TableInsertAsLeft, + TableInsertAsRight +} TABLE_SEARCH_RESULT; + +typedef +NTSTATUS STDCALL (*PRTL_AVL_MATCH_FUNCTION)( + struct _RTL_AVL_TABLE *Table, + PVOID UserData, + PVOID MatchData +); + +typedef enum _RTL_GENERIC_COMPARE_RESULTS +{ + GenericLessThan, + GenericGreaterThan, + GenericEqual +} RTL_GENERIC_COMPARE_RESULTS; + +typedef +RTL_GENERIC_COMPARE_RESULTS STDCALL +(*PRTL_AVL_COMPARE_ROUTINE) ( + struct _RTL_AVL_TABLE *Table, + PVOID FirstStruct, + PVOID SecondStruct +); + +typedef +RTL_GENERIC_COMPARE_RESULTS STDCALL +(*PRTL_GENERIC_COMPARE_ROUTINE)( + struct _RTL_GENERIC_TABLE *Table, + PVOID FirstStruct, + PVOID SecondStruct +); + +typedef +PVOID STDCALL +(*PRTL_GENERIC_ALLOCATE_ROUTINE) ( + struct _RTL_GENERIC_TABLE *Table, + LONG ByteSize +); + +typedef +VOID STDCALL +(*PRTL_GENERIC_FREE_ROUTINE) ( + struct _RTL_GENERIC_TABLE *Table, + PVOID Buffer +); + +typedef +VOID STDCALL +(*PRTL_AVL_ALLOCATE_ROUTINE) ( + struct _RTL_AVL_TABLE *Table, + LONG ByteSize +); + +typedef +VOID STDCALL +(*PRTL_AVL_FREE_ROUTINE) ( + struct _RTL_AVL_TABLE *Table, + PVOID Buffer +); + +typedef struct _RTL_GENERIC_TABLE +{ + PRTL_SPLAY_LINKS TableRoot; + LIST_ENTRY InsertOrderList; + PLIST_ENTRY OrderedPointer; + ULONG WhichOrderedElement; + ULONG NumberGenericTableElements; + PRTL_GENERIC_COMPARE_ROUTINE CompareRoutine; + PRTL_GENERIC_ALLOCATE_ROUTINE AllocateRoutine; + PRTL_GENERIC_FREE_ROUTINE FreeRoutine; + PVOID TableContext; +} RTL_GENERIC_TABLE; +typedef RTL_GENERIC_TABLE *PRTL_GENERIC_TABLE; + +typedef struct _RTL_BALANCED_LINKS +{ + struct _RTL_BALANCED_LINKS *Parent; + struct _RTL_BALANCED_LINKS *LeftChild; + struct _RTL_BALANCED_LINKS *RightChild; + CHAR Balance; + UCHAR Reserved[3]; +} RTL_BALANCED_LINKS; +typedef RTL_BALANCED_LINKS *PRTL_BALANCED_LINKS; + +typedef struct _RTL_AVL_TABLE +{ + RTL_BALANCED_LINKS BalancedRoot; + PVOID OrderedPointer; + ULONG WhichOrderedElement; + ULONG NumberGenericTableElements; + ULONG DepthOfTree; + PRTL_BALANCED_LINKS RestartKey; + ULONG DeleteCount; + PRTL_AVL_COMPARE_ROUTINE CompareRoutine; + PRTL_AVL_ALLOCATE_ROUTINE AllocateRoutine; + PRTL_AVL_FREE_ROUTINE FreeRoutine; + PVOID TableContext; +} RTL_AVL_TABLE; +typedef RTL_AVL_TABLE *PRTL_AVL_TABLE; + #endif _____ Modified: branches/new_headers/reactos/include/ndk/zwtypes.h --- branches/new_headers/reactos/include/ndk/zwtypes.h 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/include/ndk/zwtypes.h 2005-05-08 06:22:12 UTC (rev 15116) @@ -696,7 +696,7 @@ typedef struct _ATOM_TABLE_INFORMATION { ULONG NumberOfAtoms; - RTL_ATOM Atoms[1]; + USHORT Atoms[1]; } ATOM_TABLE_INFORMATION, *PATOM_TABLE_INFORMATION; // mutant information @@ -933,6 +933,28 @@ // SystemAddVerifier (52) // UNKNOWN +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; + // wait type #define WaitAll 0 _____ Modified: branches/new_headers/reactos/include/winnt.h --- branches/new_headers/reactos/include/winnt.h 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/include/winnt.h 2005-05-08 06:22:12 UTC (rev 15116) @@ -1343,6 +1343,9 @@ } GUID, *REFGUID, *LPGUID; #define SYSTEM_LUID { QuadPart:999 } #endif /* GUID_DEFINED */ + +#define ACCESS_ALLOWED_COMPOUND_ACE_TYPE (0x4) + typedef struct _GENERIC_MAPPING { ACCESS_MASK GenericRead; ACCESS_MASK GenericWrite; @@ -1416,12 +1419,12 @@ } ACL,*PACL; typedef struct _ACL_REVISION_INFORMATION { DWORD AclRevision; -} ACL_REVISION_INFORMATION; +} ACL_REVISION_INFORMATION, *PACL_REVISION_INFORMATION; typedef struct _ACL_SIZE_INFORMATION { DWORD AceCount; DWORD AclBytesInUse; DWORD AclBytesFree; -} ACL_SIZE_INFORMATION; +} ACL_SIZE_INFORMATION, *PACL_SIZE_INFORMATION; /* FIXME: add more machines */ #ifdef _X86_ _____ Modified: branches/new_headers/reactos/lib/rtl/access.c --- branches/new_headers/reactos/lib/rtl/access.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/access.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -9,8 +9,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/acl.c --- branches/new_headers/reactos/lib/rtl/acl.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/acl.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -11,8 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/bit.c --- branches/new_headers/reactos/lib/rtl/bit.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/bit.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -26,9 +26,12 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "rtl.h" +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ****************************************************************/ /* _____ Modified: branches/new_headers/reactos/lib/rtl/bitmap.c --- branches/new_headers/reactos/lib/rtl/bitmap.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/bitmap.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -28,7 +28,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/bootdata.c --- branches/new_headers/reactos/lib/rtl/bootdata.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/bootdata.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -24,7 +24,7 @@ * FILE: lib/rtl/bootdata.c */ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/compress.c --- branches/new_headers/reactos/lib/rtl/compress.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/compress.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -27,12 +27,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> - /* MACROS *******************************************************************/ #define COMPRESSION_FORMAT_MASK 0x00FF _____ Modified: branches/new_headers/reactos/lib/rtl/dos8dot3.c --- branches/new_headers/reactos/lib/rtl/dos8dot3.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/dos8dot3.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -27,8 +27,7 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> -#include <ntos/minmax.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/encode.c --- branches/new_headers/reactos/lib/rtl/encode.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/encode.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -12,9 +12,10 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "rtl.h" -#include <ntdll/ntdll.h> +#define NDEBUG +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: branches/new_headers/reactos/lib/rtl/env.c --- branches/new_headers/reactos/lib/rtl/env.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/env.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -11,14 +11,10 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> -#include <napi/teb.h> -#include <ntos/minmax.h> -#include <string.h> +#include "rtl.h" #define NDEBUG -#include <ntdll/ntdll.h> +#include <debug.h> PPEB STDCALL RtlpCurrentPeb(VOID); /* FUNCTIONS *****************************************************************/ _____ Modified: branches/new_headers/reactos/lib/rtl/error.c --- branches/new_headers/reactos/lib/rtl/error.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/error.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -19,19 +19,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <winerror.h> +#include "rtl.h" #define NDEBUG #include <debug.h> -#ifndef HIWORD -#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF)) -#endif -#ifndef LOWORD -#define LOWORD(l) ((WORD)(l)) -#endif - /* TYPES *******************************************************************/ typedef struct _ERROR_TABLE _____ Modified: branches/new_headers/reactos/lib/rtl/exception.c --- branches/new_headers/reactos/lib/rtl/exception.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/exception.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -15,10 +15,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <windows.h> -#include <string.h> -#include <napi/teb.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/generictable.c --- branches/new_headers/reactos/lib/rtl/generictable.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/generictable.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -24,7 +24,7 @@ * FILE: lib/rtl/genertictbl.c */ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/heap.c --- branches/new_headers/reactos/lib/rtl/heap.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/heap.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -12,11 +12,7 @@ * require it. */ -#include <string.h> -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> -#include <ntos/heap.h> -#include <ntos/minmax.h> +#include "rtl.h" #define NDEBUG #include <debug.h> @@ -29,7 +25,6 @@ #define TRACE_ON(x) (1) #endif - static RTL_CRITICAL_SECTION RtlpProcessHeapsListLock; _____ Modified: branches/new_headers/reactos/lib/rtl/image.c --- branches/new_headers/reactos/lib/rtl/image.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/image.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -9,11 +9,10 @@ * 17/03/2000 Created */ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG -#include <ntdll/ntdll.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: branches/new_headers/reactos/lib/rtl/largeint.c --- branches/new_headers/reactos/lib/rtl/largeint.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/largeint.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/luid.c --- branches/new_headers/reactos/lib/rtl/luid.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/luid.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -11,8 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/mem.c --- branches/new_headers/reactos/lib/rtl/mem.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/mem.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -12,8 +12,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <string.h> +#include "rtl.h" #define NDEBUG #include <debug.h> @@ -84,7 +83,7 @@ return (ULONG)((PCHAR)ptr - (PCHAR)Source); } - +#undef RtlFillMemory /* * @implemented */ @@ -100,7 +99,6 @@ } - /* * @implemented */ @@ -124,7 +122,7 @@ } - +#undef RtlMoveMemory /* * @implemented */ @@ -156,6 +154,7 @@ UNIMPLEMENTED; } +#undef RtlZeroMemory /* * @implemented */ _____ Modified: branches/new_headers/reactos/lib/rtl/network.c --- branches/new_headers/reactos/lib/rtl/network.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/network.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -24,8 +24,7 @@ * FILE: lib/rtl/network.c */ -#include <ddk/ntddk.h> -#include <stdio.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/nls.c --- branches/new_headers/reactos/lib/rtl/nls.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/nls.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -13,7 +13,7 @@ */ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/ppb.c --- branches/new_headers/reactos/lib/rtl/ppb.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/ppb.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -11,14 +11,10 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/ldr.h> -#include <napi/teb.h> -#include <ntdll/base.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG -#include <ntdll/ntdll.h> +#include <debug.h> /* MACROS ****************************************************************/ _____ Modified: branches/new_headers/reactos/lib/rtl/process.c --- branches/new_headers/reactos/lib/rtl/process.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/process.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -11,14 +11,10 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> -#include <napi/i386/segment.h> -#include <ntdll/ldr.h> -#include <ntdll/base.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG -#include <ntdll/ntdll.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: branches/new_headers/reactos/lib/rtl/random.c --- branches/new_headers/reactos/lib/rtl/random.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/random.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -26,8 +26,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/registry.c --- branches/new_headers/reactos/lib/rtl/registry.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/registry.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -18,12 +18,10 @@ /* INCLUDES ****************************************************************/ #define __NTDRIVER__ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> -#include <ntos/minmax.h> +#include "rtl.h" #define NDEBUG -#include <ntdll/ntdll.h> +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: branches/new_headers/reactos/lib/rtl/sd.c --- branches/new_headers/reactos/lib/rtl/sd.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/sd.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -11,9 +11,10 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "rtl.h" -#include <ntdll/ntdll.h> +#define NDEBUG +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: branches/new_headers/reactos/lib/rtl/security.c --- branches/new_headers/reactos/lib/rtl/security.c 2005-05-08 05:14:46 UTC (rev 15115) +++ branches/new_headers/reactos/lib/rtl/security.c 2005-05-08 06:22:12 UTC (rev 15116) @@ -9,8 +9,7 @@ * 21/11/2001 Created */ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: branches/new_headers/reactos/lib/rtl/sid.c --- branches/new_headers/reactos/lib/rtl/sid.c 2005-05-08 05:14:46 UTC (rev 15115) [truncated at 1001 lines; 135 more skipped]

1 0

[ion] 15115: Make rtl use a single header. Helps for PCH and will help for the new Headers (no need to change each file)
by ion＠svn.reactos.com 08 May '05

08 May '05

Make rtl use a single header. Helps for PCH and will help for the new Headers (no need to change each file) Modified: trunk/reactos/include/funcs.h Modified: trunk/reactos/lib/rtl/access.c Modified: trunk/reactos/lib/rtl/acl.c Modified: trunk/reactos/lib/rtl/bit.c Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bootdata.c Modified: trunk/reactos/lib/rtl/compress.c Modified: trunk/reactos/lib/rtl/dos8dot3.c Modified: trunk/reactos/lib/rtl/encode.c Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/lib/rtl/error.c Modified: trunk/reactos/lib/rtl/exception.c Modified: trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/largeint.c Modified: trunk/reactos/lib/rtl/luid.c Modified: trunk/reactos/lib/rtl/mem.c Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/nls.c Modified: trunk/reactos/lib/rtl/ppb.c Modified: trunk/reactos/lib/rtl/process.c Modified: trunk/reactos/lib/rtl/random.c Modified: trunk/reactos/lib/rtl/registry.c Added: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/security.c Modified: trunk/reactos/lib/rtl/sid.c Modified: trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/rtl/time.c Modified: trunk/reactos/lib/rtl/timezone.c Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicodeprefix.c Modified: trunk/reactos/lib/rtl/version.c _____ Modified: trunk/reactos/include/funcs.h --- trunk/reactos/include/funcs.h 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/include/funcs.h 2005-05-08 05:14:46 UTC (rev 15115) @@ -2087,10 +2087,12 @@ NTSTATUS STDCALL LdrLockLoaderLock(ULONG flags, ULONG *result, ULONG *magic); NTSTATUS STDCALL LdrUnlockLoaderLock(ULONG flags, ULONG magic); -NTSTATUS STDCALL RtlDuplicateUnicodeString( - int add_nul, - const UNICODE_STRING *source, - UNICODE_STRING *destination); +NTSTATUS STDCALL +RtlDuplicateUnicodeString( + INT AddNull, + IN PUNICODE_STRING SourceString, + PUNICODE_STRING DestinationString); + NTSTATUS STDCALL RtlFindCharInUnicodeString( int flags, const UNICODE_STRING *main_str, _____ Modified: trunk/reactos/lib/rtl/access.c --- trunk/reactos/lib/rtl/access.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/access.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -9,8 +9,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/acl.c --- trunk/reactos/lib/rtl/acl.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/acl.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -11,8 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/bit.c --- trunk/reactos/lib/rtl/bit.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/bit.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -26,9 +26,12 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "rtl.h" +#define NDEBUG +#include <debug.h> + /* FUNCTIONS ****************************************************************/ /* _____ Modified: trunk/reactos/lib/rtl/bitmap.c --- trunk/reactos/lib/rtl/bitmap.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/bitmap.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -28,7 +28,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/bootdata.c --- trunk/reactos/lib/rtl/bootdata.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/bootdata.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -24,7 +24,7 @@ * FILE: lib/rtl/bootdata.c */ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/compress.c --- trunk/reactos/lib/rtl/compress.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/compress.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -27,12 +27,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> - /* MACROS *******************************************************************/ #define COMPRESSION_FORMAT_MASK 0x00FF _____ Modified: trunk/reactos/lib/rtl/dos8dot3.c --- trunk/reactos/lib/rtl/dos8dot3.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/dos8dot3.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -27,8 +27,7 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> -#include <ntos/minmax.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/encode.c --- trunk/reactos/lib/rtl/encode.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/encode.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -12,9 +12,10 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "rtl.h" -#include <ntdll/ntdll.h> +#define NDEBUG +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/rtl/env.c --- trunk/reactos/lib/rtl/env.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/env.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -11,14 +11,10 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> -#include <napi/teb.h> -#include <ntos/minmax.h> -#include <string.h> +#include "rtl.h" #define NDEBUG -#include <ntdll/ntdll.h> +#include <debug.h> PPEB STDCALL RtlpCurrentPeb(VOID); /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/lib/rtl/error.c --- trunk/reactos/lib/rtl/error.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/error.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -19,19 +19,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <winerror.h> +#include "rtl.h" #define NDEBUG #include <debug.h> -#ifndef HIWORD -#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF)) -#endif -#ifndef LOWORD -#define LOWORD(l) ((WORD)(l)) -#endif - /* TYPES *******************************************************************/ typedef struct _ERROR_TABLE _____ Modified: trunk/reactos/lib/rtl/exception.c --- trunk/reactos/lib/rtl/exception.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/exception.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -15,10 +15,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <windows.h> -#include <string.h> -#include <napi/teb.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/generictable.c --- trunk/reactos/lib/rtl/generictable.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/generictable.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -24,7 +24,7 @@ * FILE: lib/rtl/genertictbl.c */ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/heap.c --- trunk/reactos/lib/rtl/heap.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/heap.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -12,11 +12,7 @@ * require it. */ -#include <string.h> -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> -#include <ntos/heap.h> -#include <ntos/minmax.h> +#include "rtl.h" #define NDEBUG #include <debug.h> @@ -29,7 +25,6 @@ #define TRACE_ON(x) (1) #endif - static RTL_CRITICAL_SECTION RtlpProcessHeapsListLock; _____ Modified: trunk/reactos/lib/rtl/image.c --- trunk/reactos/lib/rtl/image.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/image.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -9,11 +9,10 @@ * 17/03/2000 Created */ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG -#include <ntdll/ntdll.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/lib/rtl/largeint.c --- trunk/reactos/lib/rtl/largeint.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/largeint.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/luid.c --- trunk/reactos/lib/rtl/luid.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/luid.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -11,8 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/mem.c --- trunk/reactos/lib/rtl/mem.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/mem.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -12,8 +12,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <string.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/network.c --- trunk/reactos/lib/rtl/network.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/network.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -24,8 +24,7 @@ * FILE: lib/rtl/network.c */ -#include <ddk/ntddk.h> -#include <stdio.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/nls.c --- trunk/reactos/lib/rtl/nls.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/nls.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -13,7 +13,7 @@ */ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/ppb.c --- trunk/reactos/lib/rtl/ppb.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/ppb.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -11,14 +11,10 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/ldr.h> -#include <napi/teb.h> -#include <ntdll/base.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG -#include <ntdll/ntdll.h> +#include <debug.h> /* MACROS ****************************************************************/ _____ Modified: trunk/reactos/lib/rtl/process.c --- trunk/reactos/lib/rtl/process.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/process.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -11,14 +11,10 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> -#include <napi/i386/segment.h> -#include <ntdll/ldr.h> -#include <ntdll/base.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG -#include <ntdll/ntdll.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/lib/rtl/random.c --- trunk/reactos/lib/rtl/random.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/random.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -26,8 +26,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/registry.c --- trunk/reactos/lib/rtl/registry.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/registry.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -18,12 +18,10 @@ /* INCLUDES ****************************************************************/ #define __NTDRIVER__ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> -#include <ntos/minmax.h> +#include "rtl.h" #define NDEBUG -#include <ntdll/ntdll.h> +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Added: trunk/reactos/lib/rtl/rtl.h --- trunk/reactos/lib/rtl/rtl.h 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/rtl.h 2005-05-08 05:14:46 UTC (rev 15115) @@ -0,0 +1,33 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/rtl/rtl.h + * PURPOSE: Run-Time Libary Header + * PROGRAMMER: Alex Ionescu + */ + +/* INCLUDES ******************************************************************/ + +#include <ddk/ntddk.h> +#include <windows.h> +#include <ntdll/rtl.h> +#include <napi/teb.h> +#include <ntos/minmax.h> +#include <string.h> +#include <napi/i386/segment.h> +#include <ntdll/ldr.h> +#include <ntdll/base.h> +#include <ntdll/rtl.h> +#include <rosrtl/thread.h> +#include <winerror.h> +#include <stdio.h> + +#define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) +#ifndef HIWORD +#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF)) +#endif +#ifndef LOWORD +#define LOWORD(l) ((WORD)(l)) +#endif + +/* EOF */ _____ Modified: trunk/reactos/lib/rtl/sd.c --- trunk/reactos/lib/rtl/sd.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/sd.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -11,9 +11,10 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#include "rtl.h" -#include <ntdll/ntdll.h> +#define NDEBUG +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/rtl/security.c --- trunk/reactos/lib/rtl/security.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/security.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -9,8 +9,7 @@ * 21/11/2001 Created */ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/sid.c --- trunk/reactos/lib/rtl/sid.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/sid.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -10,13 +10,9 @@ */ /* INCLUDES *****************************************************************/ - #define __NTDRIVER__ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> -#include <string.h> +#include "rtl.h" - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/splaytree.c --- trunk/reactos/lib/rtl/splaytree.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/splaytree.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -24,7 +24,7 @@ * FILE: lib/rtl/splaytree.c */ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/thread.c --- trunk/reactos/lib/rtl/thread.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/thread.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -18,10 +18,10 @@ /* INCLUDES *****************************************************************/ -#include <ntos.h> +#include "rtl.h" #define NDEBUG -#include <ntdll/ntdll.h> +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/rtl/time.c --- trunk/reactos/lib/rtl/time.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/time.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -12,8 +12,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/timezone.c --- trunk/reactos/lib/rtl/timezone.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/timezone.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -11,15 +11,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntos/registry.h> -#include <ntos/time.h> -#include <ntdll/rtl.h> +#include "rtl.h" #define NDEBUG #include <debug.h> - /* FUNCTIONS *****************************************************************/ /* _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/unicode.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -19,17 +19,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - - #define __NTDRIVER__ -#include <ddk/ntddk.h> +#include "rtl.h" -#include <ntdll/rtl.h> - -#include <ntos/minmax.h> -#define __NO_CTYPE_INLINES -#include <ctype.h> - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -24,7 +24,7 @@ * FILE: lib/rtl/unicodeprfx.c */ -#include <ddk/ntddk.h> +#include "rtl.h" #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/rtl/version.c --- trunk/reactos/lib/rtl/version.c 2005-05-08 04:41:15 UTC (rev 15114) +++ trunk/reactos/lib/rtl/version.c 2005-05-08 05:14:46 UTC (rev 15115) @@ -29,12 +29,9 @@ */ /* INCLUDES *****************************************************************/ - #define __USE_W32API +#include "rtl.h" -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> - #define NDEBUG #include <debug.h>

1 0

[ion] 15114: Get more libs to compile. Only rtl left
by ion＠svn.reactos.com 08 May '05

08 May '05

Get more libs to compile. Only rtl left Modified: branches/new_headers/reactos/include/ndk/zwtypes.h Modified: branches/new_headers/reactos/lib/epsapi/enum/drivers.c Modified: branches/new_headers/reactos/lib/epsapi/enum/modules.c Modified: branches/new_headers/reactos/lib/epsapi/enum/processes.c Modified: branches/new_headers/reactos/lib/libwine/debug.c _____ Modified: branches/new_headers/reactos/include/ndk/zwtypes.h --- branches/new_headers/reactos/include/ndk/zwtypes.h 2005-05-08 04:32:40 UTC (rev 15113) +++ branches/new_headers/reactos/include/ndk/zwtypes.h 2005-05-08 04:41:15 UTC (rev 15114) @@ -527,37 +527,67 @@ PVOID Buffer; /* same format as in SystemProcessInformation */ } SYSTEM_SESSION_PROCESSES_INFORMATION, * PSYSTEM_SESSION_PROCESSES_INFORMATION; -typedef struct _SYSTEM_THREADS { - LARGE_INTEGER KernelTime; - LARGE_INTEGER UserTime; - LARGE_INTEGER CreateTime; - ULONG WaitTime; - PVOID StartAddress; - CLIENT_ID ClientId; - KPRIORITY Priority; - KPRIORITY BasePriority; - ULONG ContextSwitchCount; - THREAD_STATE State; - KWAIT_REASON WaitReason; -} SYSTEM_THREADS, *PSYSTEM_THREADS; +typedef struct _SYSTEM_THREAD_INFORMATION +{ + LARGE_INTEGER KernelTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER CreateTime; + ULONG WaitTime; + PVOID StartAddress; + CLIENT_ID ClientId; + KPRIORITY Priority; + LONG BasePriority; + ULONG ContextSwitches; + ULONG ThreadState; + ULONG WaitReason; +} SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION; -typedef struct _SYSTEM_PROCESSES { - ULONG NextEntryDelta; - ULONG ThreadCount; - ULONG Reserved1[6]; - LARGE_INTEGER CreateTime; - LARGE_INTEGER UserTime; - LARGE_INTEGER KernelTime; - UNICODE_STRING ProcessName; - KPRIORITY BasePriority; - ULONG ProcessId; - ULONG InheritedFromProcessId; - ULONG HandleCount; - ULONG Reserved2[2]; - VM_COUNTERS VmCounters; - IO_COUNTERS IoCounters; - SYSTEM_THREADS Threads[1]; -} SYSTEM_PROCESSES, *PSYSTEM_PROCESSES; +typedef struct _SYSTEM_PROCESS_INFORMATION +{ + ULONG NextEntryOffset; + ULONG NumberOfThreads; + LARGE_INTEGER SpareLi1; + LARGE_INTEGER SpareLi2; + LARGE_INTEGER SpareLi3; + LARGE_INTEGER CreateTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER KernelTime; + UNICODE_STRING ImageName; + KPRIORITY BasePriority; + HANDLE UniqueProcessId; + HANDLE InheritedFromUniqueProcessId; + ULONG HandleCount; + ULONG SessionId; + ULONG PageDirectoryFrame; + + /* + * This part corresponds to VM_COUNTERS_EX. + * NOTE: *NOT* THE SAME AS VM_COUNTERS! + */ + ULONG PeakVirtualSize; + ULONG VirtualSize; + ULONG PageFaultCount; + ULONG PeakWorkingSetSize; + ULONG WorkingSetSize; + ULONG QuotaPeakPagedPoolUsage; + ULONG QuotaPagedPoolUsage; + ULONG QuotaPeakNonPagedPoolUsage; + ULONG QuotaNonPagedPoolUsage; + ULONG PagefileUsage; + ULONG PeakPagefileUsage; + ULONG PrivateUsage; + + /* This part corresponds to IO_COUNTERS */ + LARGE_INTEGER ReadOperationCount; + LARGE_INTEGER WriteOperationCount; + LARGE_INTEGER OtherOperationCount; + LARGE_INTEGER ReadTransferCount; + LARGE_INTEGER WriteTransferCount; + LARGE_INTEGER OtherTransferCount; + + /* Finally, the array of Threads */ + SYSTEM_THREAD_INFORMATION TH[1]; +} SYSTEM_PROCESS_INFORMATION, *PSYSTEM_PROCESS_INFORMATION; // memory information typedef enum _MEMORY_INFORMATION_CLASS { _____ Modified: branches/new_headers/reactos/lib/epsapi/enum/drivers.c --- branches/new_headers/reactos/lib/epsapi/enum/drivers.c 2005-05-08 04:32:40 UTC (rev 15113) +++ branches/new_headers/reactos/lib/epsapi/enum/drivers.c 2005-05-08 04:41:15 UTC (rev 15114) @@ -13,15 +13,16 @@ * isolated in its own library to clear the confusion * and improve reusability */ +#include <windows.h> +#include <stddef.h> -#include <stddef.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> #define NDEBUG -#include <debug.h> +#include <reactos/debug.h> -#include <epsapi.h> +#include <reactos/epsapi.h> NTSTATUS NTAPI PsaEnumerateSystemModules(IN PSYSMOD_ENUM_ROUTINE Callback, _____ Modified: branches/new_headers/reactos/lib/epsapi/enum/modules.c --- branches/new_headers/reactos/lib/epsapi/enum/modules.c 2005-05-08 04:32:40 UTC (rev 15113) +++ branches/new_headers/reactos/lib/epsapi/enum/modules.c 2005-05-08 04:41:15 UTC (rev 15114) @@ -19,13 +19,15 @@ * and improve reusability */ +#include <windows.h> + #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> #define NDEBUG -#include <debug.h> +#include <reactos/debug.h> -#include <epsapi.h> +#include <reactos/epsapi.h> NTSTATUS NTAPI PsaEnumerateProcessModules(IN HANDLE ProcessHandle, _____ Modified: branches/new_headers/reactos/lib/epsapi/enum/processes.c --- branches/new_headers/reactos/lib/epsapi/enum/processes.c 2005-05-08 04:32:40 UTC (rev 15113) +++ branches/new_headers/reactos/lib/epsapi/enum/processes.c 2005-05-08 04:41:15 UTC (rev 15114) @@ -30,13 +30,17 @@ * isolated in its own library to clear the confusion * and improve reusability */ - -#include <ddk/ntddk.h> -#include <debug.h> +#include <windows.h> #include <stddef.h> -#include <epsapi.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#define NDEBUG +#include <reactos/debug.h> + +#include <reactos/epsapi.h> + NTSTATUS NTAPI PsaCaptureProcessesAndThreads(OUT PSYSTEM_PROCESS_INFORMATION *ProcessesAndThreads) { _____ Modified: branches/new_headers/reactos/lib/libwine/debug.c --- branches/new_headers/reactos/lib/libwine/debug.c 2005-05-08 04:32:40 UTC (rev 15113) +++ branches/new_headers/reactos/lib/libwine/debug.c 2005-05-08 04:41:15 UTC (rev 15114) @@ -19,6 +19,8 @@ */ #include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <stdlib.h> #include <stdio.h> #include <tchar.h>

1 0

[ion] 15113: Get rosrtl to compile, add some more stuff missing in headers.
by ion＠svn.reactos.com 08 May '05

08 May '05

Get rosrtl to compile, add some more stuff missing in headers. Modified: branches/new_headers/reactos/include/ddk/winddk.h Modified: branches/new_headers/reactos/include/ndk/pstypes.h Modified: branches/new_headers/reactos/include/ndk/umtypes.h Modified: branches/new_headers/reactos/include/ndk/zwtypes.h Modified: branches/new_headers/reactos/lib/rosrtl/file/sparse.c Modified: branches/new_headers/reactos/lib/rosrtl/misc/devmode.c Modified: branches/new_headers/reactos/lib/rosrtl/misc/logfont.c Modified: branches/new_headers/reactos/lib/rosrtl/recmutex/recmutex.c Modified: branches/new_headers/reactos/lib/rosrtl/registry/registry.c Modified: branches/new_headers/reactos/lib/rosrtl/string/append.c Modified: branches/new_headers/reactos/lib/rosrtl/thread/create.c Modified: branches/new_headers/reactos/lib/rosrtl/thread/exit.c Modified: branches/new_headers/reactos/lib/rosrtl/thread/i386/context.c Modified: branches/new_headers/reactos/lib/rosrtl/thread/linearstack.c Modified: branches/new_headers/reactos/lib/rosrtl/thread/priv.c Modified: branches/new_headers/reactos/lib/rosrtl/thread/stack.c _____ Modified: branches/new_headers/reactos/include/ddk/winddk.h --- branches/new_headers/reactos/include/ddk/winddk.h 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/include/ddk/winddk.h 2005-05-08 04:32:40 UTC (rev 15113) @@ -3863,6 +3863,39 @@ MaxThreadInfoClass } THREADINFOCLASS; +typedef struct _VM_COUNTERS +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; +} VM_COUNTERS; +typedef VM_COUNTERS *PVM_COUNTERS; + +typedef struct _VM_COUNTERS_EX +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; + SIZE_T PrivateUsage; +} VM_COUNTERS_EX; +typedef VM_COUNTERS_EX *PVM_COUNTERS_EX; + #define ES_SYSTEM_REQUIRED 0x00000001 #define ES_DISPLAY_REQUIRED 0x00000002 #define ES_USER_PRESENT 0x00000004 @@ -4341,6 +4374,32 @@ ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; +#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; + NTOSAPI KIRQL DDKAPI _____ Modified: branches/new_headers/reactos/include/ndk/pstypes.h --- branches/new_headers/reactos/include/ndk/pstypes.h 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/include/ndk/pstypes.h 2005-05-08 04:32:40 UTC (rev 15113) @@ -1,22 +1,3 @@ -/* $Id: pstypes.h,v 1.1.2.1 2004/10/25 01:24:07 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/pstypes.h @@ -57,6 +38,8 @@ #define THREAD_ALERT 0x4 #define USER_SHARED_DATA (0x7FFE0000) +struct _ETHREAD; + typedef struct _RTL_USER_PROCESS_PARAMETERS { ULONG AllocationSize; ULONG Size; _____ Modified: branches/new_headers/reactos/include/ndk/umtypes.h --- branches/new_headers/reactos/include/ndk/umtypes.h 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/include/ndk/umtypes.h 2005-05-08 04:32:40 UTC (rev 15113) @@ -743,7 +743,41 @@ }; } KUSER_SHARED_DATA, *PKUSER_SHARED_DATA; +typedef struct _CPTABLEINFO *PCPTABLEINFO; +typedef struct _NLSTABLEINFO *PNLSTABLEINFO; +typedef struct _VM_COUNTERS +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; +} VM_COUNTERS; +typedef VM_COUNTERS *PVM_COUNTERS; +typedef struct _VM_COUNTERS_EX +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; + SIZE_T PrivateUsage; +} VM_COUNTERS_EX; +typedef VM_COUNTERS_EX *PVM_COUNTERS_EX; + #endif _____ Modified: branches/new_headers/reactos/include/ndk/zwtypes.h --- branches/new_headers/reactos/include/ndk/zwtypes.h 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/include/ndk/zwtypes.h 2005-05-08 04:32:40 UTC (rev 15113) @@ -35,34 +35,6 @@ typedef unsigned short LANGID; typedef LANGID *PLANGID; -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; -#ifndef _WINBASE_H -typedef LDT_ENTRY *PLDT_ENTRY,*LPLDT_ENTRY; -#endif - typedef enum _THREAD_STATE { StateInitialized, StateReady, _____ Modified: branches/new_headers/reactos/lib/rosrtl/file/sparse.c --- branches/new_headers/reactos/lib/rosrtl/file/sparse.c 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/lib/rosrtl/file/sparse.c 2005-05-08 04:32:40 UTC (rev 15113) @@ -1,7 +1,6 @@ #include <windows.h> -#include <ddk/ntifs.h> -#include <string.h> -#include <rosrtl/sparse.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> /* * Utility to convert a file to a sparse file _____ Modified: branches/new_headers/reactos/lib/rosrtl/misc/devmode.c --- branches/new_headers/reactos/lib/rosrtl/misc/devmode.c 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/lib/rosrtl/misc/devmode.c 2005-05-08 04:32:40 UTC (rev 15113) @@ -1,6 +1,5 @@ #include <windows.h> -#include <string.h> -#include <rosrtl/devmode.h> +#include <reactos/rosrtl/devmode.h> #define SIZEOF_DEVMODEA_300 124 #define SIZEOF_DEVMODEA_400 148 _____ Modified: branches/new_headers/reactos/lib/rosrtl/misc/logfont.c --- branches/new_headers/reactos/lib/rosrtl/misc/logfont.c 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/lib/rosrtl/misc/logfont.c 2005-05-08 04:32:40 UTC (rev 15113) @@ -1,6 +1,5 @@ #include <windows.h> -#include <string.h> -#include <rosrtl/logfont.h> +#include <reactos/rosrtl/logfont.h> void RosRtlLogFontA2W ( LPLOGFONTW pW, const LOGFONTA *pA ) _____ Modified: branches/new_headers/reactos/lib/rosrtl/recmutex/recmutex.c --- branches/new_headers/reactos/lib/rosrtl/recmutex/recmutex.c 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/lib/rosrtl/recmutex/recmutex.c 2005-05-08 04:32:40 UTC (rev 15113) @@ -1,7 +1,7 @@ -#define NTOS_MODE_USER -#include <ntos.h> -#include <rosrtl/recmutex.h> +#include <ddk/ntddk.h> +#include <reactos/rosrtl/recmutex.h> + VOID RecursiveMutexInit( PRECURSIVE_MUTEX RecMutex ) { RtlZeroMemory( RecMutex, sizeof(*RecMutex) ); KeInitializeSpinLock( &RecMutex->SpinLock ); _____ Modified: branches/new_headers/reactos/lib/rosrtl/registry/registry.c --- branches/new_headers/reactos/lib/rosrtl/registry/registry.c 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/lib/rosrtl/registry/registry.c 2005-05-08 04:32:40 UTC (rev 15113) @@ -1,6 +1,7 @@ +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> -#include <rosrtl/string.h> +#include <ndk/ntndk.h> +#include <reactos/rosrtl/string.h> /* * Utility function to read a value from the registry more easily. _____ Modified: branches/new_headers/reactos/lib/rosrtl/string/append.c --- branches/new_headers/reactos/lib/rosrtl/string/append.c 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/lib/rosrtl/string/append.c 2005-05-08 04:32:40 UTC (rev 15113) @@ -1,5 +1,6 @@ +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> /* * Utility to copy and append two unicode strings. _____ Modified: branches/new_headers/reactos/lib/rosrtl/thread/create.c --- branches/new_headers/reactos/lib/rosrtl/thread/create.c 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/lib/rosrtl/thread/create.c 2005-05-08 04:32:40 UTC (rev 15113) @@ -3,15 +3,11 @@ /* */ -#include <stdarg.h> +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> +#include <reactos/rosrtl/thread.h> -#define NDEBUG -#include <ntdll/ntdll.h> - -#include <rosrtl/thread.h> - NTSTATUS STDCALL RtlRosCreateUserThread ( _____ Modified: branches/new_headers/reactos/lib/rosrtl/thread/exit.c --- branches/new_headers/reactos/lib/rosrtl/thread/exit.c 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/lib/rosrtl/thread/exit.c 2005-05-08 04:32:40 UTC (rev 15113) @@ -3,14 +3,11 @@ /* */ +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> +#include <reactos/rosrtl/thread.h> -#define NDEBUG -#include <ntdll/ntdll.h> - -#include <rosrtl/thread.h> - static VOID NTAPI RtlRosExitUserThread_Stage2 ( IN ULONG_PTR Status _____ Modified: branches/new_headers/reactos/lib/rosrtl/thread/i386/context.c --- branches/new_headers/reactos/lib/rosrtl/thread/i386/context.c 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/lib/rosrtl/thread/i386/context.c 2005-05-08 04:32:40 UTC (rev 15113) @@ -3,16 +3,11 @@ /* */ -#include <string.h> - +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> +#include <reactos/rosrtl/thread.h> -#include <napi/i386/segment.h> -#include <napi/i386/floatsave.h> - -#include <rosrtl/thread.h> - NTSTATUS NTAPI RtlRosInitializeContext ( _____ Modified: branches/new_headers/reactos/lib/rosrtl/thread/linearstack.c --- branches/new_headers/reactos/lib/rosrtl/thread/linearstack.c 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/lib/rosrtl/thread/linearstack.c 2005-05-08 04:32:40 UTC (rev 15113) @@ -3,11 +3,11 @@ /* */ +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> +#include <reactos/rosrtl/thread.h> -#include <rosrtl/thread.h> - NTSTATUS NTAPI RtlpRosValidateLinearUserStack ( IN PVOID StackBase, _____ Modified: branches/new_headers/reactos/lib/rosrtl/thread/priv.c --- branches/new_headers/reactos/lib/rosrtl/thread/priv.c 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/lib/rosrtl/thread/priv.c 2005-05-08 04:32:40 UTC (rev 15113) @@ -1,6 +1,4 @@ #include <windows.h> -#include <string.h> -#include <rosrtl/priv.h> /* * Utility to copy and enable thread privileges _____ Modified: branches/new_headers/reactos/lib/rosrtl/thread/stack.c --- branches/new_headers/reactos/lib/rosrtl/thread/stack.c 2005-05-08 04:22:15 UTC (rev 15112) +++ branches/new_headers/reactos/lib/rosrtl/thread/stack.c 2005-05-08 04:32:40 UTC (rev 15113) @@ -3,14 +3,14 @@ /* */ +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> +#include <ndk/ntndk.h> +#include <reactos/rosrtl/thread.h> #define NDEBUG -#include <ntdll/ntdll.h> +#include <reactos/debug.h> -#include <rosrtl/thread.h> - NTSTATUS NTAPI RtlRosCreateStack ( IN HANDLE ProcessHandle,

1 0

[sedwards] 15112: remove whitespace from end of lines
by sedwards＠svn.reactos.com 08 May '05

08 May '05

remove whitespace from end of lines Modified: trunk/reactos/apps/utils/cat/cat.c Modified: trunk/reactos/apps/utils/driver/load/load.c Modified: trunk/reactos/apps/utils/driver/unload/unload.c Modified: trunk/reactos/apps/utils/net/arp/trace.c Modified: trunk/reactos/apps/utils/net/finger/finger.c Modified: trunk/reactos/apps/utils/net/finger/net.c Modified: trunk/reactos/apps/utils/net/ftp/fake.c Modified: trunk/reactos/apps/utils/net/ftp/ruserpass.c Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c Modified: trunk/reactos/apps/utils/net/ipconfig/trace.c Modified: trunk/reactos/apps/utils/net/netstat/netstat.c Modified: trunk/reactos/apps/utils/net/netstat/trace.c Modified: trunk/reactos/apps/utils/net/ping/ping.c Modified: trunk/reactos/apps/utils/net/roshttpd/include/list.h Modified: trunk/reactos/apps/utils/net/route/route.c Modified: trunk/reactos/apps/utils/net/telnet/resource/tnmsg.h Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h Modified: trunk/reactos/apps/utils/net/telnet/src/keytrans.h Modified: trunk/reactos/apps/utils/net/telnet/src/stl_bids.h Modified: trunk/reactos/apps/utils/net/telnet/src/tconsole.h Modified: trunk/reactos/apps/utils/net/telnet/src/tkeydef.h Modified: trunk/reactos/apps/utils/net/telnet/src/tnclass.h Modified: trunk/reactos/apps/utils/net/telnet/src/tnmisc.h Modified: trunk/reactos/apps/utils/net/telnet/src/tnmsg.h Modified: trunk/reactos/apps/utils/net/tracert/tracert.c Modified: trunk/reactos/apps/utils/net/whois/whois.c Modified: trunk/reactos/apps/utils/nts2w32err/nts2w32err.c Modified: trunk/reactos/apps/utils/objdir/objdir.c Modified: trunk/reactos/apps/utils/patchnv4/patchnv4.c Modified: trunk/reactos/apps/utils/pesum/pesum.c Modified: trunk/reactos/apps/utils/pice/loader/terminal.h Modified: trunk/reactos/apps/utils/pice/module/dblflt.h Modified: trunk/reactos/apps/utils/pice/module/disassembler.c Modified: trunk/reactos/apps/utils/pice/module/disassembler.h Modified: trunk/reactos/apps/utils/pice/module/disassemblerdata.h Modified: trunk/reactos/apps/utils/pice/module/gpfault.h Modified: trunk/reactos/apps/utils/pice/module/hercules.h Modified: trunk/reactos/apps/utils/pice/module/hooks.h Modified: trunk/reactos/apps/utils/pice/module/init.h Modified: trunk/reactos/apps/utils/pice/module/pci_ids.h Modified: trunk/reactos/apps/utils/pice/module/pgflt.h Modified: trunk/reactos/apps/utils/pice/module/pice_ver.h Modified: trunk/reactos/apps/utils/pice/module/regs.h Modified: trunk/reactos/apps/utils/pice/module/remods.h Modified: trunk/reactos/apps/utils/pice/module/scancodes.h Modified: trunk/reactos/apps/utils/pice/module/serial.h Modified: trunk/reactos/apps/utils/pice/module/serial_port.h Modified: trunk/reactos/apps/utils/pice/module/stab_gnu.h Modified: trunk/reactos/apps/utils/pice/module/symbols.c Modified: trunk/reactos/apps/utils/pice/module/syscall.h Modified: trunk/reactos/apps/utils/pice/module/trace.h Modified: trunk/reactos/apps/utils/pice/module/vga.h Modified: trunk/reactos/apps/utils/ps/ps.c Modified: trunk/reactos/apps/utils/rosperf/rosperf.c Modified: trunk/reactos/apps/utils/sc/command.c Modified: trunk/reactos/apps/utils/sc/main.h Modified: trunk/reactos/apps/utils/sdkparse/assert.h Modified: trunk/reactos/apps/utils/sdkparse/test.h Modified: trunk/reactos/apps/utils/stats/stats.c Modified: trunk/reactos/apps/utils/tickcount/tickcount.c Modified: trunk/reactos/apps/utils/winetest/gui.c Modified: trunk/reactos/apps/utils/winetest/main.c _____ Modified: trunk/reactos/apps/utils/cat/cat.c --- trunk/reactos/apps/utils/cat/cat.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/cat/cat.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -6,7 +6,7 @@ int i; FILE* in; char ch; - + for (i=1; i<argc; i++) { in = fopen(argv[i],"r"); @@ -15,7 +15,7 @@ printf("Failed to open file %s\n", argv[i]); return(0); } - + while ((ch = fgetc(in)) != EOF) { putchar(ch); _____ Modified: trunk/reactos/apps/utils/driver/load/load.c --- trunk/reactos/apps/utils/driver/load/load.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/driver/load/load.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -1,6 +1,6 @@ /* * Load a device driver - */ + */ #include <windows.h> #include <ntos/zw.h> _____ Modified: trunk/reactos/apps/utils/driver/unload/unload.c --- trunk/reactos/apps/utils/driver/unload/unload.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/driver/unload/unload.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -1,6 +1,6 @@ /* * Unload a device driver - */ + */ #include <windows.h> #include <ntos/zw.h> _____ Modified: trunk/reactos/apps/utils/net/arp/trace.c --- trunk/reactos/apps/utils/net/arp/trace.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/arp/trace.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////// ///// // Diagnostic Trace // -#include <stdio.h> +#include <stdio.h> #include <stdarg.h> #define WIN32_LEAN_AND_MEAN #include <windows.h> _____ Modified: trunk/reactos/apps/utils/net/finger/finger.c --- trunk/reactos/apps/utils/net/finger/finger.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/finger/finger.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -161,10 +161,10 @@ fprintf(stderr, "Warning: Can't do local finger\n"); } - /* Start winsock */ + /* Start winsock */ wVersionRequested = MAKEWORD( 1, 1 ); iErr = WSAStartup( wVersionRequested, &wsaData ); - if ( iErr != 0 ) + if ( iErr != 0 ) { /* Tell the user that we couldn't find a usable */ /* WinSock DLL. */ _____ Modified: trunk/reactos/apps/utils/net/finger/net.c --- trunk/reactos/apps/utils/net/finger/net.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/finger/net.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -115,7 +115,7 @@ * Otherwise, all high bits are stripped; if it isn't printable and * it isn't a space, we can simply set the 7th bit. Every ASCII * character with bit 7 set is printable. - */ + */ lastc = 0; while (recv(s, &c, 1, 0) == 1) { c &= 0x7f; _____ Modified: trunk/reactos/apps/utils/net/ftp/fake.c --- trunk/reactos/apps/utils/net/ftp/fake.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/ftp/fake.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -142,7 +142,7 @@ buffer[1] = '\0'; if(SOCKET_ERROR==send(s, buffer, 1, 0)) { - int iret=WSAGetLastError (); + int iret=WSAGetLastError (); fprintf(stdout,"fputcSocket: %d\n",iret); return 0; } @@ -154,9 +154,9 @@ { int iret; while(len) { - if(SOCKET_ERROR==(iret=send(s, buffer, len, 0))) + if(SOCKET_ERROR==(iret=send(s, buffer, len, 0))) { - iret=WSAGetLastError (); + iret=WSAGetLastError (); fprintf(stdout,"fputcSocket: %d\n",iret); return 0; } @@ -187,7 +187,7 @@ if (count == 1) { string[i] = buffer[0]; - + if (i == MAX_ASCII - 3) { count = 0; _____ Modified: trunk/reactos/apps/utils/net/ftp/ruserpass.c --- trunk/reactos/apps/utils/net/ftp/ruserpass.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/ftp/ruserpass.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -126,7 +126,7 @@ case LOGIN: if (token()) - if (*aname == 0) { + if (*aname == 0) { *aname = malloc((unsigned) strlen(tokval) + 1); (void) strcpy(*aname, tokval); } else { @@ -237,7 +237,7 @@ char *cp; int c; struct toktab *t; - + if (feof(cfile)) return (0); while ((c = getc(cfile)) != EOF && _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -132,13 +132,13 @@ } /* typedef struct _IP_ADAPTER_INDEX_MAP { - ULONG Index; // adapter index - WCHAR Name[MAX_ADAPTER_NAME]; // name of the adapter + ULONG Index; // adapter index + WCHAR Name[MAX_ADAPTER_NAME]; // name of the adapter } IP_ADAPTER_INDEX_MAP, * PIP_ADAPTER_INDEX_MAP; typedef struct _IP_INTERFACE_INFO { - LONG NumAdapters; // number of adapters in array - IP_ADAPTER_INDEX_MAP Adapter[1]; // adapter indices and names + LONG NumAdapters; // number of adapters in array + IP_ADAPTER_INDEX_MAP Adapter[1]; // adapter indices and names } IP_INTERFACE_INFO,*PIP_INTERFACE_INFO; */ result = GetInterfaceInfo(pIfTable, &dwOutBufLen); @@ -194,7 +194,7 @@ IP_ADDR_STRING PrimaryWinsServer; IP_ADDR_STRING SecondaryWinsServer; a time_t LeaseObtained; -b time_t LeaseExpires; +b time_t LeaseExpires; } IP_ADAPTER_INFO, *PIP_ADAPTER_INFO; */ /* _____ Modified: trunk/reactos/apps/utils/net/ipconfig/trace.c --- trunk/reactos/apps/utils/net/ipconfig/trace.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/ipconfig/trace.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////// ///// // Diagnostic Trace // -#include <stdio.h> +#include <stdio.h> #include <stdarg.h> #define WIN32_LEAN_AND_MEAN #include <windows.h> _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.c --- trunk/reactos/apps/utils/net/netstat/netstat.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/netstat/netstat.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -52,7 +52,7 @@ VOID PrintError(DWORD ErrorCode) { LPVOID lpMsgBuf; - + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpMsgBuf, 0, NULL); @@ -66,21 +66,21 @@ GetTcpStatistics(&TcpStatsMIB); _tprintf(_T("TCP/IP Statistics\t\n")); - _tprintf(_T(" time-out algorithm:\t\t%d\n"), TcpStatsMIB.dwRtoAlgorithm); - _tprintf(_T(" minimum time-out:\t\t%d\n"), TcpStatsMIB.dwRtoMin); - _tprintf(_T(" maximum time-out:\t\t%d\n"), TcpStatsMIB.dwRtoMax); - _tprintf(_T(" maximum connections:\t\t%d\n"), TcpStatsMIB.dwMaxConn); - _tprintf(_T(" active opens:\t\t\t%d\n"), TcpStatsMIB.dwActiveOpens); - _tprintf(_T(" passive opens:\t\t\t%d\n"), TcpStatsMIB.dwPassiveOpens); - _tprintf(_T(" failed attempts:\t\t%d\n"), TcpStatsMIB.dwAttemptFails); - _tprintf(_T(" established connections reset:\t%d\n"), TcpStatsMIB.dwEstabResets); - _tprintf(_T(" established connections:\t%d\n"), TcpStatsMIB.dwCurrEstab); - _tprintf(_T(" segments received:\t\t%d\n"), TcpStatsMIB.dwInSegs); - _tprintf(_T(" segment sent:\t\t\t%d\n"), TcpStatsMIB.dwOutSegs); - _tprintf(_T(" segments retransmitted:\t\t%d\n"), TcpStatsMIB.dwRetransSegs); - _tprintf(_T(" incoming errors:\t\t%d\n"), TcpStatsMIB.dwInErrs); - _tprintf(_T(" outgoing resets:\t\t%d\n"), TcpStatsMIB.dwOutRsts); - _tprintf(_T(" cumulative connections:\t\t%d\n"), TcpStatsMIB.dwNumConns); + _tprintf(_T(" time-out algorithm:\t\t%d\n"), TcpStatsMIB.dwRtoAlgorithm); + _tprintf(_T(" minimum time-out:\t\t%d\n"), TcpStatsMIB.dwRtoMin); + _tprintf(_T(" maximum time-out:\t\t%d\n"), TcpStatsMIB.dwRtoMax); + _tprintf(_T(" maximum connections:\t\t%d\n"), TcpStatsMIB.dwMaxConn); + _tprintf(_T(" active opens:\t\t\t%d\n"), TcpStatsMIB.dwActiveOpens); + _tprintf(_T(" passive opens:\t\t\t%d\n"), TcpStatsMIB.dwPassiveOpens); + _tprintf(_T(" failed attempts:\t\t%d\n"), TcpStatsMIB.dwAttemptFails); + _tprintf(_T(" established connections reset:\t%d\n"), TcpStatsMIB.dwEstabResets); + _tprintf(_T(" established connections:\t%d\n"), TcpStatsMIB.dwCurrEstab); + _tprintf(_T(" segments received:\t\t%d\n"), TcpStatsMIB.dwInSegs); + _tprintf(_T(" segment sent:\t\t\t%d\n"), TcpStatsMIB.dwOutSegs); + _tprintf(_T(" segments retransmitted:\t\t%d\n"), TcpStatsMIB.dwRetransSegs); + _tprintf(_T(" incoming errors:\t\t%d\n"), TcpStatsMIB.dwInErrs); + _tprintf(_T(" outgoing resets:\t\t%d\n"), TcpStatsMIB.dwOutRsts); + _tprintf(_T(" cumulative connections:\t\t%d\n"), TcpStatsMIB.dwNumConns); } static void ShowUdpStatistics() @@ -90,7 +90,7 @@ _tprintf(_T("UDP Statistics\t\n")); _tprintf(_T(" received datagrams:\t\t\t%d\n"), UDPStatsMIB.dwInDatagrams); - _tprintf(_T(" datagrams for which no port exists:\t%d\n"), UDPStatsMIB.dwNoPorts); + _tprintf(_T(" datagrams for which no port exists:\t%d\n"), UDPStatsMIB.dwNoPorts); _tprintf(_T(" errors on received datagrams:\t\t%d\n"), UDPStatsMIB.dwInErrors); _tprintf(_T(" sent datagrams:\t\t\t\t%d\n"), UDPStatsMIB.dwOutDatagrams); _tprintf(_T(" number of entries in listener table:\t%d\n"), UDPStatsMIB.dwNumAddrs); @@ -102,27 +102,27 @@ GetIpStatistics(&IPStatsMIB); _tprintf(_T("IP Statistics\t\n")); - _tprintf(_T(" IP forwarding enabled or disabled:\t%d\n"), IPStatsMIB.dwForwarding); - _tprintf(_T(" default time-to-live:\t\t\t%d\n"), IPStatsMIB.dwDefaultTTL); - _tprintf(_T(" datagrams received:\t\t\t%d\n"), IPStatsMIB.dwInReceives); - _tprintf(_T(" received header errors:\t\t\t%d\n"), IPStatsMIB.dwInHdrErrors); - _tprintf(_T(" received address errors:\t\t%d\n"), IPStatsMIB.dwInAddrErrors); - _tprintf(_T(" datagrams forwarded:\t\t\t%d\n"), IPStatsMIB.dwForwDatagrams); - _tprintf(_T(" datagrams with unknown protocol:\t%d\n"), IPStatsMIB.dwInUnknownProtos); - _tprintf(_T(" received datagrams discarded:\t\t%d\n"), IPStatsMIB.dwInDiscards); - _tprintf(_T(" received datagrams delivered:\t\t%d\n"), IPStatsMIB.dwInDelivers); - _tprintf(_T(" sent datagrams discarded:\t\t%d\n"), IPStatsMIB.dwOutDiscards); - _tprintf(_T(" datagrams for which no route exists:\t%d\n"), IPStatsMIB.dwOutNoRoutes); - _tprintf(_T(" datagrams for which frags didn't arrive:%d\n"), IPStatsMIB.dwReasmTimeout); - _tprintf(_T(" datagrams requiring reassembly:\t\t%d\n"), IPStatsMIB.dwReasmReqds); - _tprintf(_T(" successful reassemblies:\t\t%d\n"), IPStatsMIB.dwReasmOks); - _tprintf(_T(" failed reassemblies:\t\t\t%d\n"), IPStatsMIB.dwReasmFails); - _tprintf(_T(" successful fragmentations:\t\t%d\n"), IPStatsMIB.dwFragOks); - _tprintf(_T(" failed fragmentations:\t\t\t%d\n"), IPStatsMIB.dwFragFails); - _tprintf(_T(" datagrams fragmented:\t\t\t%d\n"), IPStatsMIB.dwFragCreates); - _tprintf(_T(" number of interfaces on computer:\t%d\n"), IPStatsMIB.dwNumIf); - _tprintf(_T(" number of IP address on computer:\t%d\n"), IPStatsMIB.dwNumAddr); - _tprintf(_T(" number of routes in routing table:\t%d\n"), IPStatsMIB.dwNumRoutes); + _tprintf(_T(" IP forwarding enabled or disabled:\t%d\n"), IPStatsMIB.dwForwarding); + _tprintf(_T(" default time-to-live:\t\t\t%d\n"), IPStatsMIB.dwDefaultTTL); + _tprintf(_T(" datagrams received:\t\t\t%d\n"), IPStatsMIB.dwInReceives); + _tprintf(_T(" received header errors:\t\t\t%d\n"), IPStatsMIB.dwInHdrErrors); + _tprintf(_T(" received address errors:\t\t%d\n"), IPStatsMIB.dwInAddrErrors); + _tprintf(_T(" datagrams forwarded:\t\t\t%d\n"), IPStatsMIB.dwForwDatagrams); + _tprintf(_T(" datagrams with unknown protocol:\t%d\n"), IPStatsMIB.dwInUnknownProtos); + _tprintf(_T(" received datagrams discarded:\t\t%d\n"), IPStatsMIB.dwInDiscards); + _tprintf(_T(" received datagrams delivered:\t\t%d\n"), IPStatsMIB.dwInDelivers); + _tprintf(_T(" sent datagrams discarded:\t\t%d\n"), IPStatsMIB.dwOutDiscards); + _tprintf(_T(" datagrams for which no route exists:\t%d\n"), IPStatsMIB.dwOutNoRoutes); + _tprintf(_T(" datagrams for which frags didn't arrive:%d\n"), IPStatsMIB.dwReasmTimeout); + _tprintf(_T(" datagrams requiring reassembly:\t\t%d\n"), IPStatsMIB.dwReasmReqds); + _tprintf(_T(" successful reassemblies:\t\t%d\n"), IPStatsMIB.dwReasmOks); + _tprintf(_T(" failed reassemblies:\t\t\t%d\n"), IPStatsMIB.dwReasmFails); + _tprintf(_T(" successful fragmentations:\t\t%d\n"), IPStatsMIB.dwFragOks); + _tprintf(_T(" failed fragmentations:\t\t\t%d\n"), IPStatsMIB.dwFragFails); + _tprintf(_T(" datagrams fragmented:\t\t\t%d\n"), IPStatsMIB.dwFragCreates); + _tprintf(_T(" number of interfaces on computer:\t%d\n"), IPStatsMIB.dwNumIf); + _tprintf(_T(" number of IP address on computer:\t%d\n"), IPStatsMIB.dwNumAddr); + _tprintf(_T(" number of routes in routing table:\t%d\n"), IPStatsMIB.dwNumRoutes); } static void ShowNetworkParams() @@ -262,20 +262,20 @@ // Translate port numbers into their text equivalent if there is one // PCHAR -GetPortName(DWORD Flags, UINT port, PCHAR proto, PCHAR name, int namelen) +GetPortName(DWORD Flags, UINT port, PCHAR proto, PCHAR name, int namelen) { struct servent *psrvent; if (Flags & FLAG_SHOW_NUMBERS) { sprintf(name, "%d", htons((WORD)port)); return name; - } + } // Try to translate to a name if (psrvent = getservbyport(port, proto)) { strcpy(name, psrvent->s_name ); } else { sprintf(name, "%d", htons((WORD)port)); - } + } return name; } @@ -286,7 +286,7 @@ // Translate IP addresses into their name-resolved form if possible. // PCHAR -GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen) +GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen) { // struct hostent *phostent; UINT nipaddr; @@ -294,7 +294,7 @@ // Does the user want raw numbers? nipaddr = htonl(ipaddr); if (Flags & FLAG_SHOW_NUMBERS ) { - sprintf(name, "%d.%d.%d.%d", + sprintf(name, "%d.%d.%d.%d", (nipaddr >> 24) & 0xFF, (nipaddr >> 16) & 0xFF, (nipaddr >> 8) & 0xFF, @@ -307,7 +307,7 @@ // Try to translate to a name if (!ipaddr) { if (!local) { - sprintf(name, "%d.%d.%d.%d", + sprintf(name, "%d.%d.%d.%d", (nipaddr >> 24) & 0xFF, (nipaddr >> 16) & 0xFF, (nipaddr >> 8) & 0xFF, @@ -339,7 +339,7 @@ sprintf(name, "%d.%d.%d.%d", i1,i2,i3,i4); #else - sprintf(name, "%d.%d.%d.%d", + sprintf(name, "%d.%d.%d.%d", ((nipaddr >> 24) & 0x000000FF), ((nipaddr >> 16) & 0x000000FF), ((nipaddr >> 8) & 0x000000FF), @@ -360,10 +360,10 @@ // // GetOptions -// +// // Parses the command line arguments. // -BOOLEAN +BOOLEAN GetOptions(int argc, char *argv[], PDWORD pFlags) { int i, j; @@ -466,12 +466,12 @@ for (i = 0; i < tcpTable->dwNumEntries; i++) { if (flags & FLAG_SHOW_ALL_ENDPOINTS || tcpTable->table[i].dwState == MIB_TCP_STATE_ESTAB) { - sprintf(localaddr, "%s:%s", - GetIpHostName(flags, TRUE, tcpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), + sprintf(localaddr, "%s:%s", + GetIpHostName(flags, TRUE, tcpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), GetPortName(flags, tcpTable->table[i].dwLocalPort, "tcp", localport, PORTNAMELEN)); sprintf(remoteaddr, "%s:%s", - GetIpHostName(flags, FALSE, tcpTable->table[i].dwRemoteAddr, remotename, HOSTNAMELEN), - tcpTable->table[i].dwRemoteAddr ? + GetIpHostName(flags, FALSE, tcpTable->table[i].dwRemoteAddr, remotename, HOSTNAMELEN), + tcpTable->table[i].dwRemoteAddr ? GetPortName(flags, tcpTable->table[i].dwRemotePort, "tcp", remoteport, PORTNAMELEN): "0"); printf("%4s\tState: %s\n", "[TCP]", TcpState[tcpTable->table[i].dwState]); @@ -481,14 +481,14 @@ // Dump the UDP table if (flags & FLAG_SHOW_ALL_ENDPOINTS) { for (i = 0; i < udpTable->dwNumEntries; i++) { - sprintf(localaddr, "%s:%s", - GetIpHostName(flags, TRUE, udpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), + sprintf(localaddr, "%s:%s", + GetIpHostName(flags, TRUE, udpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), GetPortName(flags, udpTable->table[i].dwLocalPort, "tcp", localport, PORTNAMELEN)); printf("%4s", "[UDP]"); printf(" Local: %s\n Remote: %s\n", localaddr, "*.*.*.*:*"); } } - } + } printf("\n"); return 0; } _____ Modified: trunk/reactos/apps/utils/net/netstat/trace.c --- trunk/reactos/apps/utils/net/netstat/trace.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/netstat/trace.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////// ///// // Diagnostic Trace // -#include <stdio.h> +#include <stdio.h> #include <stdarg.h> #define WIN32_LEAN_AND_MEAN #include <windows.h> _____ Modified: trunk/reactos/apps/utils/net/ping/ping.c --- trunk/reactos/apps/utils/net/ping/ping.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/ping/ping.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -306,10 +306,10 @@ PHOSTENT phe; wVersionRequested = MAKEWORD(2, 2); - + Status = WSAStartup(wVersionRequested, &WsaData); if (Status != 0) { - printf("Could not initialize winsock dll.\n"); + printf("Could not initialize winsock dll.\n"); return FALSE; } @@ -327,9 +327,9 @@ if (phe == NULL) { printf("Unknown host %s.\n", TargetName); return FALSE; - } + } } - + if (phe != NULL) { CopyMemory(&Target.sin_addr, phe->h_addr, phe->h_length); } else { @@ -341,7 +341,7 @@ } else { Target.sin_family = AF_INET; } - + TargetIP = inet_ntoa(Target.sin_addr); CurrentSeqNum = 0; SentCount = 0; @@ -391,7 +391,7 @@ LARGE_INTEGER LargeTime; LargeTime.QuadPart = Time.QuadPart / TicksPerMs.QuadPart; - + _i64toa(LargeTime.QuadPart, Convstr, 10); strcpy(String, Convstr); strcat(String, "ms"); @@ -449,7 +449,7 @@ } - printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), + printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL); if (RelativeTime.QuadPart < MinRTT.QuadPart) { MinRTT.QuadPart = RelativeTime.QuadPart; @@ -586,7 +586,7 @@ printf("\nPinging %s [%s] with %d bytes of data:\n\n", TargetName, TargetIP, DataSize); - + Count = 0; while ((NeverStop) || (Count < PingCount)) { Ping(); _____ Modified: trunk/reactos/apps/utils/net/roshttpd/include/list.h --- trunk/reactos/apps/utils/net/roshttpd/include/list.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/roshttpd/include/list.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -25,7 +25,7 @@ CListNode *GetPrev(); private: PVOID Element; - CListNode *Next; + CListNode *Next; CListNode *Prev; static HANDLE hHeap; static INT nRef; @@ -37,7 +37,7 @@ CList(); ~CList(); CList& operator=(CList&); - + CIterator<Item> *CreateIterator() const; LONG Count() const; Item& Get(const LONG index) const; @@ -82,7 +82,7 @@ // Default destructor template <class Item> CList<Item>::~CList() -{ +{ RemoveAll(); delete Trailer; delete Header; @@ -157,7 +157,7 @@ tmp = node->GetNext(); delete node; node = tmp; - } + } Header->SetNext(Trailer); Trailer->SetPrev(Header); NodeCount = 0; _____ Modified: trunk/reactos/apps/utils/net/route/route.c --- trunk/reactos/apps/utils/net/route/route.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/route/route.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -20,7 +20,7 @@ #define IN_ADDR_OF(x) *((struct in_addr *)&(x)) int usage() { - fprintf( stderr, + fprintf( stderr, "route usage:\n" "route print\n" " prints the route table\n" @@ -35,7 +35,7 @@ PMIB_IPFORWARDTABLE IpForwardTable; DWORD Error; ULONG Size = 0; - char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF], + char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF], Index[IPBUF], Metric[IPBUF]; int i; @@ -46,7 +46,7 @@ } if( Error == ERROR_SUCCESS ) { - printf( "%-16s%-16s%-16s%-10s%-10s\n", + printf( "%-16s%-16s%-16s%-10s%-10s\n", "Destination", "Netmask", "Gateway", @@ -63,7 +63,7 @@ inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i]. dwForwardNextHop) ) ); - printf( "%-16s%-16s%-16s%-10d%-10d\n", + printf( "%-16s%-16s%-16s%-10d%-10d\n", Destination, Netmask, Gateway, @@ -80,7 +80,7 @@ } } -int convert_add_cmd_line( PMIB_IPFORWARDROW RowToAdd, +int convert_add_cmd_line( PMIB_IPFORWARDROW RowToAdd, int argc, char **argv ) { int i; @@ -106,7 +106,7 @@ DWORD Error; if( argc < 2 || !convert_add_cmd_line( &RowToAdd, argc, argv ) ) { - fprintf( stderr, + fprintf( stderr, "route add usage:\n" "route add <target> [mask <mask>] <gw> [metric <m>]\n" " Adds a route to the IP route table.\n" @@ -116,10 +116,10 @@ " <m> is the metric to use (lower is preferred)\n" ); return 1; } - - if( (Error = CreateIpForwardEntry( &RowToAdd )) == ERROR_SUCCESS ) + + if( (Error = CreateIpForwardEntry( &RowToAdd )) == ERROR_SUCCESS ) return 0; - + fprintf( stderr, "Route addition failed\n" ); return Error; } @@ -129,7 +129,7 @@ DWORD Error; if( argc < 2 || !convert_add_cmd_line( &RowToDel, argc, argv ) ) { - fprintf( stderr, + fprintf( stderr, "route delete usage:\n" "route delete <target> <gw>\n" " Removes a route from the IP route table.\n" @@ -137,21 +137,21 @@ " <gw> is the gateway to remove the route from.\n" ); return 1; } - - if( (Error = DeleteIpForwardEntry( &RowToDel )) == ERROR_SUCCESS ) + + if( (Error = DeleteIpForwardEntry( &RowToDel )) == ERROR_SUCCESS ) return 0; - + fprintf( stderr, "Route addition failed\n" ); return Error; } int main( int argc, char **argv ) { if( argc < 2 ) return usage(); - else if( !strcasecmp( argv[1], "print" ) ) + else if( !strcasecmp( argv[1], "print" ) ) return print_routes(); - else if( !strcasecmp( argv[1], "add" ) ) + else if( !strcasecmp( argv[1], "add" ) ) return add_route( argc-2, argv+2 ); - else if( !strcasecmp( argv[1], "delete" ) ) + else if( !strcasecmp( argv[1], "delete" ) ) return del_route( argc-2, argv+2 ); else return usage(); } _____ Modified: trunk/reactos/apps/utils/net/telnet/resource/tnmsg.h --- trunk/reactos/apps/utils/net/telnet/resource/tnmsg.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/resource/tnmsg.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -97,7 +97,7 @@ #define MSG_WSANO_DATA 0x2AFC // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 _____ Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h --- trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -49,7 +49,7 @@ void SaveCurY(int iY); void resetTabStops(); - + int iSavedCurX; int iSavedCurY; unsigned char iSavedAttributes; @@ -77,7 +77,7 @@ TANSIParser(TConsole &Console, KeyTranslator &RefKeyTrans, TScroller &RefScroller, TNetwork &NetHandler, TCharmap &RefCharmap); ~TANSIParser(); - + char* ParseBuffer(char* pszBuffer, char* pszBufferEnd); static int StripBuffer(char* pszBuffer, char* pszBufferEnd, int width); }; _____ Modified: trunk/reactos/apps/utils/net/telnet/src/keytrans.h --- trunk/reactos/apps/utils/net/telnet/src/keytrans.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/keytrans.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -93,5 +93,5 @@ int currentKeyMap, mainKeyMap; // AVS }; - + #endif // __KEYTRANS_H _____ Modified: trunk/reactos/apps/utils/net/telnet/src/stl_bids.h --- trunk/reactos/apps/utils/net/telnet/src/stl_bids.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/stl_bids.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -29,36 +29,36 @@ growable(delta), lowerbound(lower) { vector<T>::reserve(upper-lower + 1);} - + ~TArrayAsVector( ) { // This call is unnecessary? (Paul Brannan 5/7/98) // vector<T>::~vector( ); } - + int Add(const T& item) { if(!growable && vector<T>::size( ) == vector<T>::capacity( )) return 0; else insert(vector<T>::end( ), item); return 1; } - + int AddAt(const T& item, size_type index) { if(!growable && ((vector<T>::size( ) == vector<T>::capacity( )) || (ZeroBase(index > vector<T>::capacity( )) ))) return 0; if(ZeroBase(index) > vector<T>::capacity( )) // out of bounds - { insert(vector<T>::end( ), + { insert(vector<T>::end( ), ZeroBase(index) - vector<T>::size( ), T( )); insert(vector<T>::end( ), item); } else { insert(vector<T>::begin( ) + ZeroBase(index), item); } return 1; } - + size_type ArraySize( ) { return vector<T>::capacity( ); } - + size_type BoundBase(size_type location) const { if(location == UINT_MAX) return INT_MAX; @@ -66,44 +66,44 @@ return location + lowerbound; } void Detach(size_type index) { erase(vector<T>::begin( ) + ZeroBase(index)); } - + void Detach(const T& item) { Destroy(Find(item)); } - + void Destroy(size_type index) { erase(vector<T>::begin( ) + ZeroBase(index)); } - + void Destroy(const T& item) { Destroy(Find(item)); } - + size_type Find(const T& item) const - { const_iterator location = find(vector<T>::begin( ), + { const_iterator location = find(vector<T>::begin( ), vector<T>::end( ), item); if(location != vector<T>::end( )) - return BoundBase(size_type(location - + return BoundBase(size_type(location - vector<T>::begin( ))); else return INT_MAX; } - + size_type GetItemsInContainer( ) { return vector<T>::size( ); } - + void Grow(size_type index) { if( index < lowerbound ) - Reallocate(ArraySize( ) + (index - + Reallocate(ArraySize( ) + (index - lowerbound)); else if( index >= BoundBase(vector<T>::size( ))) Reallocate(ZeroBase(index) ); } - + int HasMember(const T& item) { if(Find(item) != INT_MAX) return 1; else return 0; } - + int IsEmpty( ) { return vector<T>::empty( ); } - + int IsFull( ) { if(growable) return 0; @@ -111,42 +111,42 @@ return 1; else return 0; } - + size_type LowerBound( ) { return lowerbound; } - + T& operator[] (size_type index) { return vector<T>:: operator[](ZeroBase(index)); } - + const T& operator[] (size_type index) const { return vector<T>:: operator[](ZeroBase(index)); } - + void Flush( ) { vector<T>::clear(); } - - void Reallocate(size_type sz, + + void Reallocate(size_type sz, size_type offset = 0) { if(offset) insert(vector<T>::begin( ), offset, T( )); vector<T>::reserve(sz); erase(vector<T>::end( ) - offset, vector<T>::end( )); } - + void RemoveEntry(size_type index) { Detach(index); } - + void SetData(size_type index, const T& item) { (*this)[index] = item; } - + size_type UpperBound( ) { return BoundBase(vector<T>::capacity( )) - 1; } - + size_type ZeroBase(size_type index) const { return index - lowerbound; } - + // The assignment operator is not inherited (Paul Brannan 5/25/98) TArrayAsVector& operator=(const TArrayAsVector& v) { vector<T>::operator=(v); _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tconsole.h --- trunk/reactos/apps/utils/net/telnet/src/tconsole.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/tconsole.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -25,9 +25,9 @@ * | . | | | * | . | <-- OR --> | | * | . | | | - * CON_LEFT | . | CON_RIGHT | + * CON_LEFT | . | CON_RIGHT | * (=0) | . | (=CON_ | CON_LINES - * |..............* | WIDTH) | + * |..............* | WIDTH) | * | (CON_CUR_X, | | | * | CON_CUR_Y) | | | * | | | | @@ -77,15 +77,15 @@ void SetCursorPosition(int x, int y); void SetCursorSize(int pct); void MoveCursorPosition(int x, int y); - + // Screen mode/size routines int GetWidth() {return CON_COLS;} int GetHeight() {return CON_LINES;} void SetExtendedMode(int iFunction, BOOL bEnable); void SetWindowSize(int width, int height); // Set the size of the window, // but not the buffer - - // Color/attribute routines + + // Color/attribute routines void SetAttrib(unsigned char wAttr) {wAttributes = wAttr;} unsigned char GetAttrib() {return wAttributes;} void Normal(); // Reset all attributes @@ -130,13 +130,13 @@ void index(); void reverse_index(); void setLineWrap(bool bEnabled){ - if(!ini.get_lock_linewrap()) + if(!ini.get_lock_linewrap()) ini.set_value("Wrap_Line", bEnabled ? "true" : "false"); } bool getLineWrap() {return ini.get_wrapline();} // Insert/delete characters/lines - void InsertLine(int numlines); // Added by Titus von Boxberg 30/3/97 + void InsertLine(int numlines); // Added by Titus von Boxberg 30/3/97 void InsertCharacter(int numchar); // " void DeleteCharacter(int numchar); // " void InsertMode(int i) {insert_mode = i;} @@ -148,7 +148,7 @@ HANDLE hConsole; CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; - + unsigned char wAttributes; unsigned char fg, bg; unsigned char defaultfg, defaultbg; @@ -157,7 +157,7 @@ bool blink; bool underline; bool reverse; - + int iScrollStart; int iScrollEnd; int insert_mode; _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tkeydef.h --- trunk/reactos/apps/utils/net/telnet/src/tkeydef.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/tkeydef.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -39,20 +39,20 @@ KeyDefType uKeyDef; DWORD vk_code; DWORD dwState; - + public: TKeyDef(); TKeyDef(char *def, DWORD state, DWORD code); TKeyDef(optype op, DWORD state, DWORD code); TKeyDef(const TKeyDef &t); - + char *operator=(char *def); DWORD operator=(DWORD code); TKeyDef& operator=(const TKeyDef &t); const optype& operator=(optype op); - + ~TKeyDef(); - + #ifdef __BORLANDC__ int operator==(TKeyDef &t); #else @@ -61,7 +61,7 @@ friend bool operator==(const TKeyDef &t1, const TKeyDef &t2); friend bool operator<(const TKeyDef &t1, const TKeyDef &t2); #endif - + const char *GetszKey() { return uKeyDef.szKeyDef; } const KeyDefType GetKeyDef() { return uKeyDef; } DWORD GetCodeKey() { return vk_code; } _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tnclass.h --- trunk/reactos/apps/utils/net/telnet/src/tnclass.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/tnclass.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -26,7 +26,7 @@ int Open(const char *szHost, const char *strPort = "23"); int Close(); // close current connection int Resume(); // resume current session - + // changes to the keymap profile in the file int LoadKeyMap( const char * file, const char * name); void DisplayKeyMap(); // display available keymaps @@ -35,7 +35,7 @@ SOCKET Connect(); void telSetConsoleTitle(const char * szHost); void DoInit(); - + SOCKET Socket; char strPort[32]; // int iPort; char szHost[127]; _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tnmisc.h --- trunk/reactos/apps/utils/net/telnet/src/tnmisc.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/tnmisc.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -2,7 +2,7 @@ #define __TNMISC_H // Process-related functions -BOOL CreateHiddenConsoleProcess(LPCTSTR szChildName, PROCESS_INFORMATION* ppi, +BOOL CreateHiddenConsoleProcess(LPCTSTR szChildName, PROCESS_INFORMATION* ppi, LPHANDLE phInWrite, LPHANDLE phOutRead, LPHANDLE phErrRead); BOOL SpawnProcess(char *cmd_line, PROCESS_INFORMATION *pi); _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tnmsg.h --- trunk/reactos/apps/utils/net/telnet/src/tnmsg.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/tnmsg.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -97,7 +97,7 @@ #define MSG_WSANO_DATA 0x2AFC // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.c --- trunk/reactos/apps/utils/net/tracert/tracert.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/tracert/tracert.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -222,7 +222,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> - [truncated at 1000 lines; 1095 more skipped]

1 0

[sedwards] 15111: remove whitespace from end of lines
by sedwards＠svn.reactos.com 08 May '05

08 May '05

remove whitespace from end of lines Modified: trunk/reactos/subsys/csrss/api/handle.c Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/api/wapi.c Modified: trunk/reactos/subsys/csrss/csrss.c Modified: trunk/reactos/subsys/csrss/include/api.h Modified: trunk/reactos/subsys/csrss/init.c Modified: trunk/reactos/subsys/csrss/print.c Modified: trunk/reactos/subsys/csrss/video.c Modified: trunk/reactos/subsys/csrss/win32csr/conio.c Modified: trunk/reactos/subsys/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsys/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/subsys/ntvdm/ntvdm.c Modified: trunk/reactos/subsys/smss/init.c Modified: trunk/reactos/subsys/smss/smapi.c Modified: trunk/reactos/subsys/smss/smss.c Modified: trunk/reactos/subsys/smss/smss.h Modified: trunk/reactos/subsys/system/autochk/autochk.c Modified: trunk/reactos/subsys/system/cmd/alias.c Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/beep.c Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/cls.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmdinput.c Modified: trunk/reactos/subsys/system/cmd/cmdtable.c Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/date.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/dirstack.c Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/error.c Modified: trunk/reactos/subsys/system/cmd/for.c Modified: trunk/reactos/subsys/system/cmd/free.c Modified: trunk/reactos/subsys/system/cmd/goto.c Modified: trunk/reactos/subsys/system/cmd/history.c Modified: trunk/reactos/subsys/system/cmd/if.c Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/label.c Modified: trunk/reactos/subsys/system/cmd/memory.c Modified: trunk/reactos/subsys/system/cmd/misc.c Modified: trunk/reactos/subsys/system/cmd/move.c Modified: trunk/reactos/subsys/system/cmd/msgbox.c Modified: trunk/reactos/subsys/system/cmd/path.c Modified: trunk/reactos/subsys/system/cmd/pause.c Modified: trunk/reactos/subsys/system/cmd/prompt.c Modified: trunk/reactos/subsys/system/cmd/ren.c Modified: trunk/reactos/subsys/system/cmd/screen.c Modified: trunk/reactos/subsys/system/cmd/set.c Modified: trunk/reactos/subsys/system/cmd/shift.c Modified: trunk/reactos/subsys/system/cmd/start.c Modified: trunk/reactos/subsys/system/cmd/strtoclr.c Modified: trunk/reactos/subsys/system/cmd/time.c Modified: trunk/reactos/subsys/system/cmd/timer.c Modified: trunk/reactos/subsys/system/cmd/title.c Modified: trunk/reactos/subsys/system/cmd/type.c Modified: trunk/reactos/subsys/system/cmd/ver.c Modified: trunk/reactos/subsys/system/cmd/verify.c Modified: trunk/reactos/subsys/system/cmd/vol.c Modified: trunk/reactos/subsys/system/cmd/window.c Modified: trunk/reactos/subsys/system/dhcp/adapter.c Modified: trunk/reactos/subsys/system/dhcp/api.c Modified: trunk/reactos/subsys/system/dhcp/dhclient.c Modified: trunk/reactos/subsys/system/dhcp/dhcpmain.c Modified: trunk/reactos/subsys/system/dhcp/dispatch.c Modified: trunk/reactos/subsys/system/dhcp/memory.c Modified: trunk/reactos/subsys/system/dhcp/pipe.c Modified: trunk/reactos/subsys/system/dhcp/socket.c Modified: trunk/reactos/subsys/system/dhcp/tree.c Modified: trunk/reactos/subsys/system/dhcp/util.c Modified: trunk/reactos/subsys/system/explorer/explorer_intres.h Modified: trunk/reactos/subsys/system/explorer/i386-stub-win32.c Modified: trunk/reactos/subsys/system/explorer/shell/pane.h Modified: trunk/reactos/subsys/system/explorer/shell/webchild.h Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.h Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.h Modified: trunk/reactos/subsys/system/explorer/utility/dragdropimpl.h Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h Modified: trunk/reactos/subsys/system/explorer/utility/window.h Modified: trunk/reactos/subsys/system/format/format.c Modified: trunk/reactos/subsys/system/ibrowser/utility/window.h Modified: trunk/reactos/subsys/system/ibrowser/webchild.h Modified: trunk/reactos/subsys/system/lsass/lsass.c Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/edit.c Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/hexedit.c Modified: trunk/reactos/subsys/system/regedit/listview.c Modified: trunk/reactos/subsys/system/regedit/main.c Modified: trunk/reactos/subsys/system/regedit/security.c Modified: trunk/reactos/subsys/system/regedit/security.h [truncated at 100 lines; 57 more skipped] _____ Modified: trunk/reactos/subsys/csrss/api/handle.c --- trunk/reactos/subsys/csrss/api/handle.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/api/handle.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -150,18 +150,18 @@ } NewBlock = RtlAllocateHeap(CsrssApiHeap, HEAP_ZERO_MEMORY, - (ProcessData->HandleTableSize + 64) * + (ProcessData->HandleTableSize + 64) * sizeof(HANDLE)); if (NewBlock == NULL) { return(STATUS_UNSUCCESSFUL); } - RtlCopyMemory(NewBlock, + RtlCopyMemory(NewBlock, ProcessData->HandleTable, ProcessData->HandleTableSize * sizeof(HANDLE)); RtlFreeHeap( CsrssApiHeap, 0, ProcessData->HandleTable ); ProcessData->HandleTable = (Object_t **)NewBlock; - ProcessData->HandleTable[i] = Object; + ProcessData->HandleTable[i] = Object; *Handle = (HANDLE)(((i + 1) << 2) | 0x3); InterlockedIncrement( &Object->ReferenceCount ); ProcessData->HandleTableSize = ProcessData->HandleTableSize + 64; _____ Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/api/process.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -42,7 +42,7 @@ PCSRSS_PROCESS_DATA pProcessData; hash = (ULONG_PTR)ProcessId % (sizeof(ProcessData) / sizeof(*ProcessData)); - + LOCK; pProcessData = ProcessData[hash]; @@ -64,7 +64,7 @@ NTSTATUS Status; hash = (ULONG_PTR)ProcessId % (sizeof(ProcessData) / sizeof(*ProcessData)); - + LOCK; pProcessData = ProcessData[hash]; @@ -123,9 +123,9 @@ ULONG hash; int c; PCSRSS_PROCESS_DATA pProcessData, pPrevProcessData = NULL; - + hash = (ULONG_PTR)Pid % (sizeof(ProcessData) / sizeof(*ProcessData)); - + LOCK; pProcessData = ProcessData[hash]; @@ -304,7 +304,7 @@ { return(Reply->Status = STATUS_INVALID_PARAMETER); } - + Reply->Data.GetShutdownParametersReply.Level = ProcessData->ShutdownLevel; Reply->Data.GetShutdownParametersReply.Flags = ProcessData->ShutdownFlags; @@ -322,7 +322,7 @@ { return(Reply->Status = STATUS_INVALID_PARAMETER); } - + ProcessData->ShutdownLevel = Request->Data.SetShutdownParametersRequest.Level; ProcessData->ShutdownFlags = Request->Data.SetShutdownParametersRequest.Flags; _____ Modified: trunk/reactos/subsys/csrss/api/wapi.c --- trunk/reactos/subsys/csrss/api/wapi.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/api/wapi.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -1,5 +1,5 @@ /* $Id$ - * + * * reactos/subsys/csrss/api/wapi.c * * CSRSS port message processing @@ -113,11 +113,11 @@ PCSRSS_API_REQUEST Request; PCSRSS_PROCESS_DATA ProcessData; PCSRSS_API_REPLY Reply; - + DPRINT("CSR: %s called", __FUNCTION__); Reply = NULL; - + for (;;) { Status = NtReplyWaitReceivePort(ServerPort, @@ -129,7 +129,7 @@ DPRINT1("CSR: NtReplyWaitReceivePort failed\n"); break; } - + if (LpcRequest.Header.MessageType == LPC_PORT_CLOSED) { CsrFreeProcessData( LpcRequest.Header.ClientId.UniqueProcess ); @@ -138,14 +138,14 @@ Request = (PCSRSS_API_REQUEST)&LpcRequest; Reply = (PCSRSS_API_REPLY)&LpcReply; - + ProcessData = CsrGetProcessData(LpcRequest.Header.ClientId.UniqueProcess); if (ProcessData == NULL) { DPRINT1("CSR: Message %d: Unable to find data for process 0x%x\n", LpcRequest.Header.MessageType, LpcRequest.Header.ClientId.UniqueProcess); break; - } + } CsrApiCallHandler(ProcessData, Request, Reply); @@ -171,9 +171,9 @@ HANDLE ServerPort = (HANDLE) 0; HANDLE ServerThread = (HANDLE) 0; PCSRSS_PROCESS_DATA ProcessData = NULL; - + CsrInitProcessData(); - + DPRINT("CSR: %s called", __FUNCTION__); for (;;) @@ -207,18 +207,18 @@ Status = STATUS_UNSUCCESSFUL; break; } - + ProcessData->CsrSectionViewBase = LpcRead.ViewBase; ProcessData->CsrSectionViewSize = LpcRead.ViewSize; - + Status = NtCompleteConnectPort(ServerPort); if (!NT_SUCCESS(Status)) { DPRINT1("CSR: NtCompleteConnectPort() failed\n"); break; } - + Status = RtlCreateUserThread(NtCurrentProcess(), NULL, FALSE, @@ -292,7 +292,7 @@ } else { DPRINT("-- 3\n"); PLPC_MESSAGE Reply = NULL; - /* + /* * Tell the init thread the SM gave the * green light for boostrapping. */ _____ Modified: trunk/reactos/subsys/csrss/csrss.c --- trunk/reactos/subsys/csrss/csrss.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/csrss.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -1,9 +1,9 @@ /* $Id$ * * csrss.c - Client/Server Runtime subsystem - * + * * ReactOS Operating System - * + * * -------------------------------------------------------------------- * * This software is free software; you can redistribute it and/or @@ -19,10 +19,10 @@ * You should have received a copy of the GNU General Public License * along with this software; see the file COPYING.LIB. If not, write * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. + * MA 02139, USA. * * -------------------------------------------------------------------- - * + * * 19990417 (Emanuele Aliberti) * Do nothing native application skeleton * 19990528 (Emanuele Aliberti) @@ -64,7 +64,7 @@ INT i = 0; INT afterlastspace = 0; - + DPRINT("CSR: %s called\n", __FUNCTION__); RtlZeroMemory (Argument, sizeof (COMMAND_LINE_ARGUMENT)); @@ -123,20 +123,20 @@ Argument->Vector [Argument->Count - 1] = & (Argument->Buffer.Buffer [afterlastspace]); } - return STATUS_SUCCESS; + return STATUS_SUCCESS; } /********************************************************************** * NAME PRIVATE * CsrpFreeCommandLine/2 */ - + static VOID STDCALL CsrpFreeCommandLine (HANDLE ProcessHeap, PCOMMAND_LINE_ARGUMENT Argument) { DPRINT("CSR: %s called\n", __FUNCTION__); - + RtlFreeHeap (ProcessHeap, 0, Argument->Vector); @@ -177,7 +177,7 @@ *================================================================*/ if (CsrServerInitialization (CmdLineArg.Count, CmdLineArg.Vector) == TRUE) { - CsrpFreeCommandLine (Peb->ProcessHeap, & CmdLineArg); + CsrpFreeCommandLine (Peb->ProcessHeap, & CmdLineArg); /* * Terminate the current thread only. */ @@ -187,7 +187,7 @@ { DisplayString (L"CSR: CsrServerInitialization failed.\n"); - CsrpFreeCommandLine (Peb->ProcessHeap, & CmdLineArg); + CsrpFreeCommandLine (Peb->ProcessHeap, & CmdLineArg); /* * Tell the SM we failed. */ _____ Modified: trunk/reactos/subsys/csrss/include/api.h --- trunk/reactos/subsys/csrss/include/api.h 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/include/api.h 2005-05-08 04:07:56 UTC (rev 15111) @@ -47,7 +47,7 @@ LIST_ENTRY ProcessEntry; PCONTROLDISPATCHER CtrlDispatcher; } CSRSS_PROCESS_DATA, *PCSRSS_PROCESS_DATA; - + typedef VOID (STDCALL *CSR_CLEANUP_OBJECT_PROC)(Object_t *Object); typedef struct tagCSRSS_OBJECT_DEFINITION _____ Modified: trunk/reactos/subsys/csrss/init.c --- trunk/reactos/subsys/csrss/init.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/init.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -1,5 +1,5 @@ /* $Id$ - * + * * reactos/subsys/csrss/init.c * * Initialize the CSRSS subsystem server process. @@ -397,7 +397,7 @@ FALSE, NULL); NtClose (hBootstrapOk); - return Status; + return Status; } /********************************************************************** @@ -533,7 +533,7 @@ Status = InitRoutine[i].EntryPoint(ArgumentCount,ArgumentArray); if(!NT_SUCCESS(Status)) { - DPRINT1("CSR: %s: failed to %s (Status=%08lx)\n", + DPRINT1("CSR: %s: failed to %s (Status=%08lx)\n", __FUNCTION__, InitRoutine[i].ErrorMessage, Status); _____ Modified: trunk/reactos/subsys/csrss/print.c --- trunk/reactos/subsys/csrss/print.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/print.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -1,9 +1,9 @@ /* $Id$ * * smss.c - Session Manager - * + * * ReactOS Operating System - * + * * -------------------------------------------------------------------- * * This software is free software; you can redistribute it and/or @@ -19,10 +19,10 @@ * You should have received a copy of the GNU General Public License * along with this software; see the file COPYING.LIB. If not, write * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. + * MA 02139, USA. * * -------------------------------------------------------------------- - * + * * 19990529 (Emanuele Aliberti) * Compiled successfully with egcs 1.1.2 */ @@ -34,7 +34,7 @@ VOID STDCALL DisplayString(LPCWSTR lpwString) { UNICODE_STRING us; - + RtlInitUnicodeString (&us, lpwString); ZwDisplayString (&us); } @@ -45,11 +45,11 @@ va_list ap; UNICODE_STRING UnicodeString; ANSI_STRING AnsiString; - + va_start(ap, fmt); vsprintf(buffer, fmt, ap); va_end(ap); - + RtlInitAnsiString (&AnsiString, buffer); RtlAnsiStringToUnicodeString (&UnicodeString, &AnsiString, _____ Modified: trunk/reactos/subsys/csrss/video.c --- trunk/reactos/subsys/csrss/video.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/video.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -31,7 +31,7 @@ 0, NULL, NULL); - Status = ZwOpenSection(&PhysMemHandle, SECTION_ALL_ACCESS, + Status = ZwOpenSection(&PhysMemHandle, SECTION_ALL_ACCESS, &ObjectAttributes); if (!NT_SUCCESS(Status)) { @@ -102,13 +102,13 @@ DbgPrint("NtVdmControl failed (status %x)\n", Status); return(0); } - + /* * Copy the real mode IVT into the right place */ NullAddress = (PVOID)0x0; /* Workaround for GCC 3.4 */ memcpy(NullAddress, IVT, 1024); - + /* * Get the BDA from the kernel */ @@ -118,7 +118,7 @@ DbgPrint("NtVdmControl failed (status %x)\n", Status); return(0); } - + /* * Copy the BDA into the right place */ _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-05-08 03:09:14 UTC (rev 15110) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-05-08 04:07:56 UTC (rev 15111) @@ -75,7 +75,7 @@ ConioConsoleCtrlEvent(DWORD Event, PCSRSS_PROCESS_DATA ProcessData) { HANDLE Thread; - + DPRINT("ConioConsoleCtrlEvent Parent ProcessId = %x\n", ProcessData->ProcessId); if (ProcessData->CtrlDispatcher) @@ -105,7 +105,7 @@ { DWORD Offset = 2 * (Buff->CurrentY * Buff->MaxX); UINT Pos; - + for (Pos = 0; Pos < Buff->MaxX; Pos++) { /* Fill the cell: Offset is incremented by the macro */ @@ -154,9 +154,9 @@ Console->Title.MaximumLength = Console->Title.Length = 0; Console->Title.Buffer = NULL; - + RtlCreateUnicodeString(&Console->Title, L"Command Prompt"); - + Console->Header.ReferenceCount = 0; Console->WaitingChars = 0; Console->WaitingLines = 0; @@ -302,7 +302,7 @@ return Status; } ProcessData->CtrlDispatcher = Request->Data.AllocConsoleRequest.CtrlDispatcher; - DPRINT("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); + DPRINT("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ProcessEntry); return STATUS_SUCCESS; @@ -329,7 +329,7 @@ { ConioDeleteConsole((Object_t *) Console); } - + return STATUS_SUCCESS; } @@ -513,9 +513,9 @@ ULONG nNumberOfCharsToRead, CharSize; PCSRSS_CONSOLE Console; NTSTATUS Status; - + DPRINT("CsrReadConsole\n"); - + CharSize = (Request->Data.ReadConsoleRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); /* truncate length to CSRSS_MAX_READ_CONSOLE_REQUEST */ @@ -785,7 +785,7 @@ DstY = (DstRegion->top + ScreenBuffer->ShowY) % ScreenBuffer->MaxY; SrcOffset = (SrcY * ScreenBuffer->MaxX + SrcRegion->left + ScreenBuffer->ShowX) * 2; DstOffset = (DstY * ScreenBuffer->MaxX + DstRegion->left + ScreenBuffer->ShowX) * 2; - + for (i = SrcRegion->top; i <= SrcRegion->bottom; i++) { RtlCopyMemory( @@ -827,7 +827,7 @@ DWORD Delta; ULONG i; CHAR Char; - + if(bUnicode) ConsoleUnicodeCharToAnsiChar(Console, &Char, &CharInfo->Char.UnicodeChar); else @@ -875,7 +875,7 @@ ULONG CharSize = (Request->Data.WriteConsoleRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); DPRINT("CsrWriteConsole\n"); - + Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; @@ -997,7 +997,7 @@ /* process Ctrl-C and Ctrl-Break */ if (Console->Mode & ENABLE_PROCESSED_INPUT && KeyEventRecord->InputEvent.Event.KeyEvent.bKeyDown && - ((KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode == VK_PAUSE) || + ((KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode == VK_PAUSE) || (KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode == 'C')) && (KeyEventRecord->InputEvent.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))) { @@ -1043,10 +1043,10 @@ else if (Console->ActiveBuffer->ShowY != Console->ActiveBuffer->CurrentY) /* only scroll down if there is room to scroll down into */ { - if (Console->ActiveBuffer->ShowY % Console->ActiveBuffer->MaxY != + if (Console->ActiveBuffer->ShowY % Console->ActiveBuffer->MaxY != Console->ActiveBuffer->CurrentY) { - if (((Console->ActiveBuffer->CurrentY + 1) % Console->ActiveBuffer->MaxY) != + if (((Console->ActiveBuffer->CurrentY + 1) % Console->ActiveBuffer->MaxY) != (Console->ActiveBuffer->ShowY + Console->ActiveBuffer->MaxY) % Console->ActiveBuffer->MaxY) { @@ -1222,7 +1222,7 @@ RepeatCount = 1; VirtualScanCode = (msg->lParam >> 16) & 0xff; - Down = msg->message == WM_KEYDOWN || msg->message == WM_CHAR || + Down = msg->message == WM_KEYDOWN || msg->message == WM_CHAR || msg->message == WM_SYSKEYDOWN || msg->message == WM_SYSCHAR; GetKeyboardState(KeyState); @@ -1232,9 +1232,9 @@ { VirtualKeyCode = LastVirtualKey; UnicodeChar = msg->wParam; - } + } else - { + { WCHAR Chars[2]; INT RetChars = 0; @@ -1253,7 +1253,7 @@ { AsciiChar = 0; } - + er.EventType = KEY_EVENT; er.Event.KeyEvent.bKeyDown = Down; er.Event.KeyEvent.wRepeatCount = RepeatCount; @@ -1263,7 +1263,7 @@ er.Event.KeyEvent.wVirtualScanCode = VirtualScanCode; if (TextMode) - { + { if (0 != (ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) && VK_TAB == VirtualKeyCode) { @@ -1283,7 +1283,7 @@ } } - if (NULL == Console) + if (NULL == Console) { return; } @@ -1294,9 +1294,9 @@ { return; } - + ConInRec->InputEvent = er; - ConInRec->Fake = UnicodeChar && + ConInRec->Fake = UnicodeChar && (msg->message != WM_CHAR && msg->message != WM_SYSCHAR && msg->message != WM_KEYUP && msg->message != WM_SYSKEYUP); ConInRec->NotChar = (msg->message != WM_CHAR && msg->message != WM_SYSCHAR); @@ -1314,7 +1314,7 @@ VirtualKeyCode, (AsciiChar >= ' ') ? AsciiChar : '.', ShiftState); - + if (! ConInRec->Fake || ! ConInRec->NotChar) { /* FIXME - convert to ascii */ @@ -1339,7 +1339,7 @@ PrivateCsrssRegisterPrimitive(); /* This call turns on the input system in win32k */ PrivateCsrssAcquireOrReleaseInputOwnership(FALSE); - + while (TRUE) { GetMessageW(&msg, 0, 0, 0); @@ -1362,7 +1362,7 @@ NTSTATUS Status; PCSRSS_SCREEN_BUFFER Buff; PCONSOLE_SCREEN_BUFFER_INFO pInfo; - + DPRINT("CsrGetScreenBufferInfo\n"); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); @@ -1399,7 +1399,7 @@ PCSRSS_SCREEN_BUFFER Buff; LONG OldCursorX, OldCursorY; LONG NewCursorX, NewCursorY; - + DPRINT("CsrSetCursor\n"); Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -1491,7 +1491,7 @@ Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; - + CharSize = (Request->Data.WriteConsoleOutputCharRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); if (Request->Header.DataSize @@ -1576,7 +1576,7 @@ RECT UpdateRect; DPRINT("CsrFillOutputChar\n"); - + Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; @@ -1643,13 +1643,13 @@ NTSTATUS Status; BOOLEAN Done = FALSE; ConsoleInput *Input; - + DPRINT("CsrReadInputEvent\n"); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; Reply->Data.ReadInputReply.Event = ProcessData->ConsoleEvent; - + Status = ConioLockConsole(ProcessData, Request->Data.ReadInputRequest.ConsoleHandle, &Console); if (! NT_SUCCESS(Status)) { @@ -1668,7 +1668,7 @@ Reply->Data.ReadInputReply.MoreEvents = TRUE; break; } - + RemoveEntryList(&Input->ListEntry); if (!Done && !Input->Fake) @@ -1693,7 +1693,7 @@ } HeapFree(Win32CsrApiHeap, 0, Input); } - + if (Done) { Status = STATUS_SUCCESS; @@ -1725,7 +1725,7 @@ RECT UpdateRect; DPRINT("CsrWriteConsoleOutputAttrib\n"); - + Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; @@ -1812,7 +1812,7 @@ { return Reply->Status = Status; } - + Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; Status = ConioLockScreenBuffer(ProcessData, Request->Data.FillOutputAttribRequest.ConsoleHandle, &Buff); @@ -1866,7 +1866,7 @@ { PCSRSS_SCREEN_BUFFER Buff; NTSTATUS Status; - + DPRINT("CsrGetCursorInfo\n"); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); @@ -1890,7 +1890,7 @@ DWORD Size; BOOL Visible; NTSTATUS Status; - + DPRINT("CsrSetCursorInfo\n"); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); @@ -1951,7 +1951,7 @@ NTSTATUS Status; PCSRSS_CONSOLE Console; PCSRSS_SCREEN_BUFFER Buff; - LONG OldCursorX, OldCursorY; + LONG OldCursorX, OldCursorY; DPRINT("CsrSetTextAttrib\n"); @@ -2069,7 +2069,7 @@ PCSRSS_CONSOLE Console; PCSRSS_SCREEN_BUFFER Buff; NTSTATUS Status; - + DPRINT("CsrCreateScreenBuffer\n"); if (ProcessData == NULL) @@ -2186,7 +2186,7 @@ Status = ConioLockConsole(ProcessData, Request->Data.SetTitleRequest.Console, &Console); if(! NT_SUCCESS(Status)) { - Reply->Status = Status; + Reply->Status = Status; } else { @@ -2211,7 +2211,7 @@ { NTSTATUS Status; PCSRSS_CONSOLE Console; - + DPRINT("CsrGetTitle\n"); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); @@ -2224,7 +2224,7 @@ DPRINT1("Can't get console\n"); return Reply->Status = Status; } - + /* Copy title of the console to the user title buffer */ RtlZeroMemory(&Reply->Data.GetTitleReply, sizeof(CSRSS_GET_TITLE_REPLY)); Reply->Data.GetTitleReply.ConsoleHandle = Request->Data.GetTitleRequest.ConsoleHandle; @@ -2281,7 +2281,7 @@ BufferCoord = Request->Data.WriteConsoleOutputRequest.BufferCoord; CharInfo = Request->Data.WriteConsoleOutputRequest.CharInfo; if (((PVOID)CharInfo < ProcessData->CsrSectionViewBase) || - (((PVOID)CharInfo + PSize) > + (((PVOID)CharInfo + PSize) > (ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { ConioUnlockScreenBuffer(Buff); @@ -2510,9 +2510,9 @@ Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = Reply->Header.MessageSize - LPC_MESSAGE_BASE_SIZE; ReadBuffer = Reply->Data.ReadConsoleOutputCharReply.String; - + CharSize = (Request->Data.ReadConsoleOutputCharRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); - + Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { @@ -2531,7 +2531,7 @@ for (i = 0; i < Request->Data.ReadConsoleOutputCharRequest.NumCharsToRead; ++i) { Char = Buff->Buffer[(Xpos * 2) + (Ypos * 2 * Buff->MaxX)]; - + if(Request->Data.ReadConsoleOutputCharRequest.Unicode) { ConsoleAnsiCharToUnicodeChar(Console, (WCHAR*)ReadBuffer, &Char); @@ -2566,7 +2566,7 @@ { ConioUnlockConsole(Console); } - + Reply->Data.ReadConsoleOutputCharReply.CharsRead = (DWORD)((ULONG_PTR)ReadBuffer - (ULONG_PTR)Reply->Data.ReadConsoleOutputCharReply.String) / CharSize; return Reply->Status; @@ -2636,7 +2636,7 @@ PLIST_ENTRY CurrentItem; DWORD NumEvents; ConsoleInput *Input; - + DPRINT("CsrGetNumberOfConsoleInputEvents\n"); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); @@ -2647,10 +2647,10 @@ { return Reply->Status = Status; } - + CurrentItem = Console->InputEvents.Flink; NumEvents = 0; - + /* If there are any events ... */ while (CurrentItem != &Console->InputEvents) { @@ -2663,10 +2663,10 @@ } ConioUnlockConsole(Console); - + Reply->Status = STATUS_SUCCESS; Reply->Data.GetNumInputEventsReply.NumInputEvents = NumEvents; - + return Reply->Status; } @@ -2681,22 +2681,22 @@ PINPUT_RECORD InputRecord; ConsoleInput* Item; UINT NumItems; - + DPRINT("CsrPeekConsoleInput\n"); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; - + Status = ConioLockConsole(ProcessData, Request->Data.GetNumInputEventsRequest.ConsoleHandle, &Console); if(! NT_SUCCESS(Status)) { return Reply->Status = Status; } - + InputRecord = Request->Data.PeekConsoleInputRequest.InputRecord; Length = Request->Data.PeekConsoleInputRequest.Length; Size = Length * sizeof(INPUT_RECORD); - + if (((PVOID)InputRecord < ProcessData->CsrSectionViewBase) || (((PVOID)InputRecord + Size) > (ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { @@ -2704,13 +2704,13 @@ Reply->Status = STATUS_ACCESS_VIOLATION; return Reply->Status ; } - + NumItems = 0; - + if (! IsListEmpty(&Console->InputEvents)) { CurrentItem = Console->InputEvents.Flink; - + while (CurrentItem != &Console->InputEvents && NumItems < Length) { Item = CONTAINING_RECORD(CurrentItem, ConsoleInput, ListEntry); @@ -2720,7 +2720,7 @@ CurrentItem = CurrentItem->Flink; continue; } - + ++NumItems; *InputRecord = Item->InputEvent; @@ -2728,7 +2728,7 @@ { ConioInputEventToAnsi(Console, InputRecord); } - + InputRecord++; CurrentItem = CurrentItem->Flink; } @@ -2758,18 +2758,18 @@ RECT ScreenRect; DWORD i, Y, X, Offset; UINT CodePage; - + DPRINT("CsrReadConsoleOutput\n"); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; - + Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputRequest.ConsoleHandle, &Buff); if (! NT_SUCCESS(Status)) { return Reply->Status = Status; } - + CharInfo = Request->Data.ReadConsoleOutputRequest.CharInfo; ReadRegion.left = Request->Data.ReadConsoleOutputRequest.ReadRegion.Left; ReadRegion.top = Request->Data.ReadConsoleOutputRequest.ReadRegion.Top; @@ -2782,7 +2782,7 @@ /* FIXME: Is this correct? */ CodePage = ProcessData->Console->OutputCodePage; - + if (((PVOID)CharInfo < ProcessData->CsrSectionViewBase) || (((PVOID)CharInfo + Size) > (ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { @@ -2790,7 +2790,7 @@ Reply->Status = STATUS_ACCESS_VIOLATION; return Reply->Status ; } - + SizeY = RtlRosMin(BufferSize.Y - BufferCoord.Y, ConioRectHeight(&ReadRegion)); SizeX = RtlRosMin(BufferSize.X - BufferCoord.X, ConioRectWidth(&ReadRegion)); ReadRegion.bottom = ReadRegion.top + SizeY; @@ -2807,7 +2807,7 @@ for (i = 0, Y = ReadRegion.top; Y < ReadRegion.bottom; ++i, ++Y) { CurCharInfo = CharInfo + (i * BufferSize.X); - + Offset = (((Y + Buff->ShowY) % Buff->MaxY) * Buff->MaxX + ReadRegion.left) * 2; for (X = ReadRegion.left; X < ReadRegion.right; ++X) { @@ -2827,13 +2827,13 @@ } ConioUnlockScreenBuffer(Buff); - + Reply->Status = STATUS_SUCCESS; Reply->Data.ReadConsoleOutputReply.ReadRegion.Right = ReadRegion.left + SizeX - 1; Reply->Data.ReadConsoleOutputReply.ReadRegion.Bottom = ReadRegion.top + SizeY - 1; Reply->Data.ReadConsoleOutputReply.ReadRegion.Left = ReadRegion.left; Reply->Data.ReadConsoleOutputReply.ReadRegion.Top = ReadRegion.top; - + return Reply->Status; } @@ -2847,22 +2847,22 @@ DWORD Size; DWORD i; ConsoleInput* Record; - + DPRINT("CsrWriteConsoleInput\n"); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; - + Status = ConioLockConsole(ProcessData, Request->Data.WriteConsoleInputRequest.ConsoleHandle, &Console); if (! NT_SUCCESS(Status)) { return Reply->Status = Status; } - + InputRecord = Request->Data.WriteConsoleInputRequest.InputRecord; Length = Request->Data.WriteConsoleInputRequest.Length; Size = Length * sizeof(INPUT_RECORD); - + if (((PVOID)InputRecord < ProcessData->CsrSectionViewBase) || (((PVOID)InputRecord + Size) > (ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { @@ -2870,7 +2870,7 @@ Reply->Status = STATUS_ACCESS_VIOLATION; return Reply->Status ; } - + for (i = 0; i < Length; i++) { Record = HeapAlloc(Win32CsrApiHeap, 0, sizeof(ConsoleInput)); @@ -2892,7 +2892,7 @@ } ConioUnlockConsole(Console); - + Reply->Status = STATUS_SUCCESS; Reply->Data.WriteConsoleInputReply.Length = i; @@ -2928,7 +2928,7 @@ Console->HardwareState = ConsoleHwState; } - return STATUS_SUCCESS; + return STATUS_SUCCESS; } return STATUS_INVALID_PARAMETER_3; /* Client: (handle, set_get, [mode]) */ @@ -2938,12 +2938,12 @@ { PCSRSS_CONSOLE Console; NTSTATUS Status; - + DPRINT("CsrHardwareStateProperty\n"); Reply->Header.MessageSize = sizeof(CSRSS_API_REPLY); Reply->Header.DataSize = sizeof(CSRSS_API_REPLY) - LPC_MESSAGE_BASE_SIZE; - + Status = ConioLockConsole(ProcessData, Request->Data.ConsoleHardwareStateRequest.ConsoleHandle, &Console); @@ -2958,7 +2958,7 @@ case CONSOLE_HARDWARE_STATE_GET: Reply->Data.ConsoleHardwareStateReply.State = Console->HardwareState; break; [truncated at 1000 lines; 10086 more skipped]

1 0

[weiden] 15110: more fixes for GCC4
by weiden＠svn.reactos.com 08 May '05

08 May '05

more fixes for GCC4 Modified: trunk/reactos/lib/advapi32/reg/reg.c Modified: trunk/reactos/lib/mesa32/src/main/texcompress_s3tc.c Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/tools/wrc/lex.yy.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-05-08 02:30:45 UTC (rev 15109) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-05-08 03:09:14 UTC (rev 15110) @@ -618,7 +618,7 @@ InitializeObjectAttributes(&ObjectAttributes, &SubKeyName, OBJ_CASE_INSENSITIVE, - (HANDLE)ParentKey, + ParentKey, NULL); Status = NtOpenKey (&TargetKey, @@ -668,7 +668,7 @@ InitializeObjectAttributes (&ObjectAttributes, &SubKeyName, OBJ_CASE_INSENSITIVE, - (HANDLE)ParentKey, + ParentKey, NULL); Status = NtOpenKey (&TargetKey, DELETE, @@ -1178,7 +1178,7 @@ if (len > *count) status = STATUS_BUFFER_OVERFLOW; else { - RtlUnicodeToMultiByteN( data, len, NULL, (WCHAR *)(buf_ptr + info->DataOffset), + RtlUnicodeToMultiByteN( (PCHAR)data, len, NULL, (WCHAR *)(buf_ptr + info->DataOffset), total_size - info->DataOffset ); /* if the type is REG_SZ and data is not 0-terminated * and there is enough space in the buffer NT appends a \0 */ @@ -3179,7 +3179,7 @@ NULL, 0, REG_SZ, - lpData, + (CONST BYTE*)lpData, strlen(lpData) + 1); if (hSubKey != hKey) _____ Modified: trunk/reactos/lib/mesa32/src/main/texcompress_s3tc.c --- trunk/reactos/lib/mesa32/src/main/texcompress_s3tc.c 2005-05-08 02:30:45 UTC (rev 15109) +++ trunk/reactos/lib/mesa32/src/main/texcompress_s3tc.c 2005-05-08 03:09:14 UTC (rev 15110) @@ -286,7 +286,7 @@ GLint i, GLint j, GLint k, GLfloat *texel ) { /* just sample as GLchan and convert to float here */ - GLchan rgba[4]; + GLchan rgba[4] = {0, 0, 0, 0}; fetch_texel_2d_rgb_dxt1(texImage, i, j, k, rgba); texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]); texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]); @@ -308,7 +308,7 @@ GLint i, GLint j, GLint k, GLfloat *texel ) { /* just sample as GLchan and convert to float here */ - GLchan rgba[4]; + GLchan rgba[4] = {0, 0, 0, 0}; fetch_texel_2d_rgba_dxt1(texImage, i, j, k, rgba); texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]); texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]); @@ -330,7 +330,7 @@ GLint i, GLint j, GLint k, GLfloat *texel ) { /* just sample as GLchan and convert to float here */ - GLchan rgba[4]; + GLchan rgba[4] = {0, 0, 0, 0}; fetch_texel_2d_rgba_dxt3(texImage, i, j, k, rgba); texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]); texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]); @@ -352,7 +352,7 @@ GLint i, GLint j, GLint k, GLfloat *texel ) { /* just sample as GLchan and convert to float here */ - GLchan rgba[4]; + GLchan rgba[4] = {0, 0, 0, 0}; fetch_texel_2d_rgba_dxt5(texImage, i, j, k, rgba); texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]); texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-05-08 02:30:45 UTC (rev 15109) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-05-08 03:09:14 UTC (rev 15110) @@ -224,7 +224,7 @@ ULONGLONG Filler; /* 158 */ }; ULONG Session; /* 160 */ - UCHAR ImageFileName[16]; /* 164 */ + CHAR ImageFileName[16]; /* 164 */ LIST_ENTRY JobLinks; /* 174 */ PVOID LockedPagesList; /* 17C */ LIST_ENTRY ThreadListHead; /* 184 */ _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-05-08 02:30:45 UTC (rev 15109) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-05-08 03:09:14 UTC (rev 15110) @@ -690,7 +690,7 @@ HANDLE ThreadId; PCHAR ptr = &Data[0]; - GspHex2Long (&ptr, (PULONG) &uThreadId); + GspHex2Long (&ptr, (PLONG) &uThreadId); ThreadId = (HANDLE)uThreadId; if (!NT_SUCCESS (PsLookupThreadByThreadId (ThreadId, &ThreadInfo))) _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-05-08 02:30:45 UTC (rev 15109) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-05-08 03:09:14 UTC (rev 15110) @@ -455,7 +455,6 @@ */ while (InputThreadsRunning) { - KEY_EVENT_RECORD KeyEvent; BOOLEAN NumKeys = 1; KEYBOARD_INPUT_DATA KeyInput; KEYBOARD_INPUT_DATA NextKeyInput; @@ -663,7 +662,7 @@ &hWnd, &id)) { - if (KeyEvent.bKeyDown) + if (!(KeyInput.Flags & KEY_BREAK)) { DPRINT("Hot key pressed (hWnd %lx, id %d)\n", hWnd, id); MsqPostHotKeyMessage (Thread, _____ Modified: trunk/reactos/tools/wrc/lex.yy.c --- trunk/reactos/tools/wrc/lex.yy.c 2005-05-08 02:30:45 UTC (rev 15109) +++ trunk/reactos/tools/wrc/lex.yy.c 2005-05-08 03:09:14 UTC (rev 15110) @@ -7474,8 +7474,11 @@ char *fname; yy_pop_state(); lineno = (int)strtol(yytext, &cptr, 10); +#if 0 + /* ignore malformed line numbers by gcc: # 0 "<built-in>" */ if(!lineno) yyerror("Malformed '#...' line-directive; invalid linenumber"); +#endif fname = strchr(cptr, '"'); if(!fname) yyerror("Malformed '#...' line-directive; missing filename");

1 0

[weiden] 15109: Don't declare constants as export and later define it as static. This is not allowed by GCC4.
by weiden＠svn.reactos.com 08 May '05

08 May '05

Don't declare constants as export and later define it as static. This is not allowed by GCC4. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-05-08 02:16:32 UTC (rev 15108) +++ trunk/reactos/tools/widl/ChangeLog 2005-05-08 02:30:45 UTC (rev 15109) @@ -1,5 +1,13 @@ ChangeLog +2004-05-08 weiden + + tools/widl/client.c + tools/widl/proxy.c + tools/widl/server.c + +Generate code GCC4.x accepts. + 2005-04-18 navaraf tools/widl/parser.y _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-05-08 02:16:32 UTC (rev 15108) +++ trunk/reactos/tools/widl/client.c 2005-05-08 02:30:45 UTC (rev 15109) @@ -141,7 +141,7 @@ unsigned int type_offset = 2; int in_attr, out_attr; - print_client("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); + print_client("const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_client("{\n"); indent++; print_client("0,\n"); @@ -285,7 +285,7 @@ int string_attr; int ptr_attr, ref_attr, unique_attr; - print_client("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); + print_client("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_client("{\n"); indent++; print_client("0,\n"); @@ -1501,7 +1501,7 @@ { char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); + print_client("const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_client("{\n"); indent++; print_client("(void __RPC_FAR *)& %s___RpcClientInterface,\n", iface->name); _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-05-08 02:16:32 UTC (rev 15108) +++ trunk/reactos/tools/widl/server.c 2005-05-08 02:30:45 UTC (rev 15109) @@ -146,7 +146,7 @@ unsigned int type_offset = 2; int in_attr, out_attr; - print_server("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); + print_server("const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_server("{\n"); indent++; print_server("0,\n"); @@ -282,7 +282,7 @@ int string_attr; int ptr_attr, ref_attr, unique_attr; - print_server("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); + print_server("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_server("{\n"); indent++; print_server("0,\n"); @@ -1466,7 +1466,7 @@ static void write_stubdescriptor(type_t *iface) { - print_server("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); + print_server("const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_server("{\n"); indent++; print_server("(void __RPC_FAR *)& %s___RpcServerInterface,\n", iface->name);

1 0

[sedwards] 15108: remove whitespace from end of lines
by sedwards＠svn.reactos.com 08 May '05

08 May '05

remove whitespace from end of lines Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c Modified: trunk/reactos/drivers/bus/acpi/ospm/bn.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c Modified: trunk/reactos/drivers/bus/acpi/ospm/include/bm.h Modified: trunk/reactos/drivers/bus/acpi/ospm/include/bn.h Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c Modified: trunk/reactos/drivers/bus/acpi/ospm/pdo.c Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c Modified: trunk/reactos/drivers/bus/pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/pci.c Modified: trunk/reactos/drivers/bus/pci/pcidef.h Modified: trunk/reactos/drivers/bus/pci/pdo.c Modified: trunk/reactos/drivers/bus/serenum/detect.c Modified: trunk/reactos/drivers/bus/serenum/fdo.c Modified: trunk/reactos/drivers/bus/serenum/misc.c Modified: trunk/reactos/drivers/bus/serenum/pdo.c Modified: trunk/reactos/drivers/bus/serenum/serenum.c Modified: trunk/reactos/drivers/bus/serenum/serenum.h Modified: trunk/reactos/drivers/dd/blue/blue.c Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c Modified: trunk/reactos/drivers/dd/bootvid/bootvid.h Modified: trunk/reactos/drivers/dd/debugout/debugout.c Modified: trunk/reactos/drivers/dd/green/createclose.c Modified: trunk/reactos/drivers/dd/green/dispatch.c Modified: trunk/reactos/drivers/dd/green/green.c Modified: trunk/reactos/drivers/dd/green/green.h Modified: trunk/reactos/drivers/dd/green/keyboard.c Modified: trunk/reactos/drivers/dd/green/misc.c Modified: trunk/reactos/drivers/dd/green/pnp.c Modified: trunk/reactos/drivers/dd/green/screen.c Modified: trunk/reactos/drivers/dd/mpu401/mpu401.c Modified: trunk/reactos/drivers/dd/mpu401/portio.c Modified: trunk/reactos/drivers/dd/null/null.c Modified: trunk/reactos/drivers/dd/parallel/parallel.c Modified: trunk/reactos/drivers/dd/parallel/parallel.h Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.c Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c Modified: trunk/reactos/drivers/dd/serial/cleanup.c Modified: trunk/reactos/drivers/dd/serial/close.c Modified: trunk/reactos/drivers/dd/serial/create.c Modified: trunk/reactos/drivers/dd/serial/devctrl.c Modified: trunk/reactos/drivers/dd/serial/info.c Modified: trunk/reactos/drivers/dd/serial/legacy.c Modified: trunk/reactos/drivers/dd/serial/misc.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/power.c Modified: trunk/reactos/drivers/dd/serial/rw.c Modified: trunk/reactos/drivers/dd/serial/serial.c Modified: trunk/reactos/drivers/dd/serial/serial.h Modified: trunk/reactos/drivers/dd/sndblst/portio.c Modified: trunk/reactos/drivers/dd/sndblst/sndblst.c Modified: trunk/reactos/drivers/dd/sound/dsp.c Modified: trunk/reactos/drivers/dd/sound/mixer.c Modified: trunk/reactos/drivers/dd/sound/sb16.c Modified: trunk/reactos/drivers/dd/sound/sb16.h Modified: trunk/reactos/drivers/dd/sound/sound.c Modified: trunk/reactos/drivers/dd/sound/wave.c Modified: trunk/reactos/drivers/dd/sound/wave.h Modified: trunk/reactos/drivers/dd/test/test.c Modified: trunk/reactos/drivers/fs/cdfs/cdfs.c Modified: trunk/reactos/drivers/fs/cdfs/cleanup.c Modified: trunk/reactos/drivers/fs/cdfs/close.c Modified: trunk/reactos/drivers/fs/cdfs/common.c Modified: trunk/reactos/drivers/fs/cdfs/create.c Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c Modified: trunk/reactos/drivers/fs/cdfs/fcb.c Modified: trunk/reactos/drivers/fs/cdfs/finfo.c Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c Modified: trunk/reactos/drivers/fs/cdfs/misc.c Modified: trunk/reactos/drivers/fs/cdfs/rw.c Modified: trunk/reactos/drivers/fs/ext2/attr.c Modified: trunk/reactos/drivers/fs/ext2/blockdev.c Modified: trunk/reactos/drivers/fs/ext2/dir.c Modified: trunk/reactos/drivers/fs/ext2/ext2fs.h Modified: trunk/reactos/drivers/fs/ext2/file.c Modified: trunk/reactos/drivers/fs/ext2/inode.c Modified: trunk/reactos/drivers/fs/ext2/quota.c Modified: trunk/reactos/drivers/fs/ext2/rw.c Modified: trunk/reactos/drivers/fs/ext2/security.c Modified: trunk/reactos/drivers/fs/ext2/super.c Modified: trunk/reactos/drivers/fs/fs_rec/fat.c Modified: trunk/reactos/drivers/fs/minix/bitops.c Modified: trunk/reactos/drivers/fs/minix/block.c Modified: trunk/reactos/drivers/fs/minix/blockdev.c Modified: trunk/reactos/drivers/fs/minix/cache.c Modified: trunk/reactos/drivers/fs/minix/dir.c Modified: trunk/reactos/drivers/fs/minix/inode.c Modified: trunk/reactos/drivers/fs/minix/minix.h Modified: trunk/reactos/drivers/fs/minix/mount.c Modified: trunk/reactos/drivers/fs/minix/rw.c Modified: trunk/reactos/drivers/fs/ms/create.c Modified: trunk/reactos/drivers/fs/ms/finfo.c [truncated at 100 lines; 288 more skipped] _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c --- trunk/reactos/drivers/bus/acpi/ospm/acpisys.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/acpisys.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -16,7 +16,7 @@ #ifdef ALLOC_PRAGMA -// Make the initialization routines discardable, so that they +// Make the initialization routines discardable, so that they // don't waste space #pragma alloc_text(init, DriverEntry) @@ -27,8 +27,8 @@ NTSTATUS STDCALL ACPIDispatchDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { PIO_STACK_LOCATION IrpSp; NTSTATUS Status; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/bn.c --- trunk/reactos/drivers/bus/acpi/ospm/bn.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/bn.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -176,7 +176,7 @@ * ------------- * Either fixed-feature or generic (namespace) types. */ - if (strncmp(device->id.hid, BN_HID_POWER_BUTTON, + if (strncmp(device->id.hid, BN_HID_POWER_BUTTON, sizeof(BM_DEVICE_HID)) == 0) { if (device->id.type == BM_TYPE_FIXED_BUTTON) { @@ -185,7 +185,7 @@ /* Register for fixed-feature events. */ status = acpi_install_fixed_event_handler( - ACPI_EVENT_POWER_BUTTON, bn_notify_fixed, + ACPI_EVENT_POWER_BUTTON, bn_notify_fixed, (void*)button); } else { @@ -201,7 +201,7 @@ * ------------- * Either fixed-feature or generic (namespace) types. */ - else if (strncmp( device->id.hid, BN_HID_SLEEP_BUTTON, + else if (strncmp( device->id.hid, BN_HID_SLEEP_BUTTON, sizeof(BM_DEVICE_HID)) == 0) { if (device->id.type == BM_TYPE_FIXED_BUTTON) { @@ -210,7 +210,7 @@ /* Register for fixed-feature events. */ status = acpi_install_fixed_event_handler( - ACPI_EVENT_SLEEP_BUTTON, bn_notify_fixed, + ACPI_EVENT_SLEEP_BUTTON, bn_notify_fixed, (void*)button); } else { @@ -224,7 +224,7 @@ * LID Switch? * ----------- */ - else if (strncmp( device->id.hid, BN_HID_LID_SWITCH, + else if (strncmp( device->id.hid, BN_HID_LID_SWITCH, sizeof(BM_DEVICE_HID)) == 0) { button->type = BN_TYPE_LID_SWITCH; @@ -360,7 +360,7 @@ */ MEMCPY(criteria.hid, BN_HID_LID_SWITCH, sizeof(BN_HID_LID_SWITCH)); status = bm_register_driver(&criteria, &driver); - + if (status == AE_NOT_FOUND) status = AE_OK; @@ -457,13 +457,13 @@ case BN_TYPE_POWER_BUTTON_FIXED: DEBUG_PRINT(ACPI_INFO, ("Fixed-feature button status change event detected.\n")); - /*bm_generate_event(button->device_handle, BN_PROC_ROOT, + /*bm_generate_event(button->device_handle, BN_PROC_ROOT, BN_PROC_POWER_BUTTON, BN_NOTIFY_STATUS_CHANGE, 0);*/ break; case BN_TYPE_SLEEP_BUTTON_FIXED: DEBUG_PRINT(ACPI_INFO, ("Fixed-feature button status change event detected.\n")); - /*bm_generate_event(button->device_handle, BN_PROC_ROOT, + /*bm_generate_event(button->device_handle, BN_PROC_ROOT, BN_PROC_SLEEP_BUTTON, BN_NOTIFY_STATUS_CHANGE, 0);*/ break; @@ -507,11 +507,11 @@ case BM_NOTIFY_DEVICE_ADDED: status = bn_add_device(device_handle, context); break; - + case BM_NOTIFY_DEVICE_REMOVED: status = bn_remove_device(context); break; - + case BN_NOTIFY_STATUS_CHANGE: DEBUG_PRINT(ACPI_INFO, ("Button status change event detected.\n")); @@ -525,7 +525,7 @@ case BN_TYPE_POWER_BUTTON: case BN_TYPE_POWER_BUTTON_FIXED: - /*bm_generate_event(device_handle, BN_PROC_ROOT, + /*bm_generate_event(device_handle, BN_PROC_ROOT, BN_PROC_POWER_BUTTON, notify_type, 0);*/ break; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -214,7 +214,7 @@ * Evaluate _STA: * -------------- */ - status = bm_evaluate_simple_integer(device->acpi_handle, "_STA", + status = bm_evaluate_simple_integer(device->acpi_handle, "_STA", &(device->status)); return status; @@ -263,12 +263,12 @@ } if (info.valid & ACPI_VALID_UID) { - MEMCPY((void*)device->id.uid, (void*)info.unique_id, + MEMCPY((void*)device->id.uid, (void*)info.unique_id, sizeof(BM_DEVICE_UID)); } if (info.valid & ACPI_VALID_HID) { - MEMCPY((void*)device->id.hid, (void*)info.hardware_id, + MEMCPY((void*)device->id.hid, (void*)info.hardware_id, sizeof(BM_DEVICE_HID)); } @@ -311,7 +311,7 @@ /* * Presence of _DCK indicates a docking station. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_DCK", &acpi_handle))) { device->flags |= BM_FLAGS_DOCKING_STATION; } @@ -320,7 +320,7 @@ * Presence of _EJD and/or _EJx indicates 'ejectable'. * TODO: _EJx... */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_EJD", &acpi_handle))) { device->flags |= BM_FLAGS_EJECTABLE; } @@ -328,9 +328,9 @@ /* * Presence of _PR0 or _PS0 indicates 'power manageable'. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR0", &acpi_handle)) || - ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS0", &acpi_handle))) { device->flags |= BM_FLAGS_POWER_CONTROL; } @@ -338,7 +338,7 @@ /* * Presence of _CRS indicates 'configurable'. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_CRS", &acpi_handle))) { device->flags |= BM_FLAGS_CONFIGURABLE; } @@ -351,9 +351,9 @@ /* * Presence of _HID or _ADR indicates 'identifiable'. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_HID", &acpi_handle)) || - ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_ADR", &acpi_handle))) { device->flags |= BM_FLAGS_IDENTIFIABLE; } @@ -361,7 +361,7 @@ /* * Presence of _STA indicates 'dynamic status'. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_STA", &acpi_handle))) { device->flags |= BM_FLAGS_DYNAMIC_STATUS; } @@ -428,7 +428,7 @@ /* * Device Type: * ------------ - */ + */ switch (acpi_type) { case INTERNAL_TYPE_SCOPE: device->id.type = BM_TYPE_SCOPE; @@ -481,7 +481,7 @@ /* * Power Management: * ----------------- - * If this node doesn't provide direct power control + * If this node doesn't provide direct power control * then we inherit PM capabilities from its parent. * * TODO: Inherit! @@ -572,8 +572,8 @@ if (ACPI_SUCCESS(status)) { /* - * TODO: This is a hack to get around the problem - * identifying scope objects. Scopes + * TODO: This is a hack to get around the problem + * identifying scope objects. Scopes * somehow need to be uniquely identified. */ status = acpi_get_type(child_handle, &acpi_type); @@ -621,7 +621,7 @@ else { level--; child_handle = parent_handle; - acpi_get_parent(parent_handle, + acpi_get_parent(parent_handle, &parent_handle); if (parent) { @@ -683,7 +683,7 @@ node->device.acpi_handle = ACPI_ROOT_OBJECT; node->device.id.type = BM_TYPE_FIXED_BUTTON; if (device_hid) { - MEMCPY((void*)node->device.id.hid, device_hid, + MEMCPY((void*)node->device.id.hid, device_hid, sizeof(node->device.id.hid)); } node->device.flags = BM_FLAGS_FIXED_FEATURE; @@ -950,14 +950,14 @@ */ DEBUG_PRINT(ACPI_INFO, ("Registering for all device notifications.\n")); - status = acpi_install_notify_handler(ACPI_ROOT_OBJECT, + status = acpi_install_notify_handler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, &bm_notify, NULL); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_ERROR, ("Unable to register for standard notifications.\n")); return_ACPI_STATUS(status); } - status = acpi_install_notify_handler(ACPI_ROOT_OBJECT, + status = acpi_install_notify_handler(ACPI_ROOT_OBJECT, ACPI_DEVICE_NOTIFY, &bm_notify, NULL); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_ERROR, ("Unable to register for device-specific notifications.\n")); @@ -1019,13 +1019,13 @@ DEBUG_PRINT(ACPI_INFO, ("Unregistering for device notifications.\n")); - status = acpi_remove_notify_handler(ACPI_ROOT_OBJECT, + status = acpi_remove_notify_handler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, &bm_notify); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_ERROR, ("Unable to un-register for standard notifications.\n")); } - status = acpi_remove_notify_handler(ACPI_ROOT_OBJECT, + status = acpi_remove_notify_handler(ACPI_ROOT_OBJECT, ACPI_DEVICE_NOTIFY, &bm_notify); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_ERROR, ("Unable to un-register for device-specific notifications.\n")); _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -63,13 +63,13 @@ DEBUG_PRINT(ACPI_INFO, ("Sending notify [0x%02x] to device [0x%02x].\n", notify_type, node->device.handle)); - if (!(node->device.flags & BM_FLAGS_DRIVER_CONTROL) || + if (!(node->device.flags & BM_FLAGS_DRIVER_CONTROL) || !(node->driver.notify)) { DEBUG_PRINT(ACPI_WARN, ("No driver installed for device [0x%02x].\n", node->device.handle)); return_ACPI_STATUS(AE_NOT_EXIST); } - status = node->driver.notify(notify_type, node->device.handle, + status = node->driver.notify(notify_type, node->device.handle, &(node->driver.context)); return_ACPI_STATUS(status); @@ -130,7 +130,7 @@ if (ACPI_FAILURE(status)) { return_ACPI_STATUS(status); } - + if (old_status == node->device.status) { return_ACPI_STATUS(AE_OK); } @@ -138,12 +138,12 @@ if (status_change) { *status_change = TRUE; } - + /* * Device Insertion? * ----------------- */ - if ((device->status & BM_STATUS_PRESENT) && + if ((device->status & BM_STATUS_PRESENT) && !(old_status & BM_STATUS_PRESENT)) { /* TODO: Make sure driver is loaded, and if not, load. */ status = bm_generate_notify(node, BM_NOTIFY_DEVICE_ADDED); @@ -153,7 +153,7 @@ * Device Removal? * --------------- */ - else if (!(device->status & BM_STATUS_PRESENT) && + else if (!(device->status & BM_STATUS_PRESENT) && (old_status & BM_STATUS_PRESENT)) { /* TODO: Unload driver if last device instance. */ status = bm_generate_notify(node, BM_NOTIFY_DEVICE_REMOVED); @@ -247,7 +247,7 @@ /* * Device-Specific or Standard? * ---------------------------- - * Device-specific notifies are forwarded to the control module's + * Device-specific notifies are forwarded to the control module's * notify() function for processing. Standard notifies are handled * internally. */ _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -72,21 +72,21 @@ /* * Calculate Power State: * ---------------------- - * Try to infer the devices's power state by checking the state of - * the devices's power resources. We start by evaluating _PR0 - * (resource requirements at D0) and work through _PR1 and _PR2. - * We know the current devices power state when all resources (for - * a give Dx state) are ON. If no power resources are on then the + * Try to infer the devices's power state by checking the state of + * the devices's power resources. We start by evaluating _PR0 + * (resource requirements at D0) and work through _PR1 and _PR2. + * We know the current devices power state when all resources (for + * a give Dx state) are ON. If no power resources are on then the * device is assumed to be off (D3). */ for (i=ACPI_STATE_D0; i<ACPI_STATE_D3; i++) { - status = bm_evaluate_reference_list(device->acpi_handle, + status = bm_evaluate_reference_list(device->acpi_handle, object_name, &pr_list); if (ACPI_SUCCESS(status)) { - status = bm_pr_list_get_state(&pr_list, + status = bm_pr_list_get_state(&pr_list, &list_state); if (ACPI_SUCCESS(status)) { @@ -137,7 +137,7 @@ device->power.state = ACPI_STATE_UNKNOWN; if (device->flags & BM_FLAGS_POWER_STATE) { - status = bm_evaluate_simple_integer(device->acpi_handle, + status = bm_evaluate_simple_integer(device->acpi_handle, "_PSC", &(device->power.state)); } else { @@ -204,24 +204,24 @@ /* * Get Resources: * -------------- - * Get the power resources associated with the device's current + * Get the power resources associated with the device's current * and target power states. */ if (device->power.state != ACPI_STATE_UNKNOWN) { object_name[3] = '0' + device->power.state; - bm_evaluate_reference_list(device->acpi_handle, + bm_evaluate_reference_list(device->acpi_handle, object_name, &current_list); } object_name[3] = '0' + state; - bm_evaluate_reference_list(device->acpi_handle, object_name, + bm_evaluate_reference_list(device->acpi_handle, object_name, &target_list); /* * Transition Resources: * --------------------- - * Transition all power resources referenced by this device to - * the correct power state (taking into consideration sequencing + * Transition all power resources referenced by this device to + * the correct power state (taking into consideration sequencing * and dependencies to other devices). */ if (current_list.count || target_list.count) { @@ -234,7 +234,7 @@ /* * Execute _PSx: * ------------- - * Execute the _PSx method corresponding to the target Dx state, + * Execute the _PSx method corresponding to the target Dx state, * if it exists. */ object_name[2] = 'S'; @@ -287,17 +287,17 @@ * Power Management Flags: * ----------------------- */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PSC", + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PSC", &acpi_handle))) { device->power.flags |= BM_FLAGS_POWER_STATE; } - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_IRC", + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_IRC", &acpi_handle))) { device->power.flags |= BM_FLAGS_INRUSH_CURRENT; } - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PRW", + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PRW", &acpi_handle))) { device->power.flags |= BM_FLAGS_WAKE_CAPABLE; } @@ -317,22 +317,22 @@ * Figure out which Dx states are supported by this device for the * S0 (working) state. Note that D0 and D3 are required (assumed). */ - device->power.dx_supported[ACPI_STATE_S0] = BM_FLAGS_D0_SUPPORT | + device->power.dx_supported[ACPI_STATE_S0] = BM_FLAGS_D0_SUPPORT | BM_FLAGS_D3_SUPPORT; - if ((ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR1", - &acpi_handle))) || - (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS1", + if ((ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR1", + &acpi_handle))) || + (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS1", &acpi_handle)))) { - device->power.dx_supported[ACPI_STATE_S0] |= + device->power.dx_supported[ACPI_STATE_S0] |= BM_FLAGS_D1_SUPPORT; } - if ((ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR2", - &acpi_handle))) || - (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS2", + if ((ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR2", + &acpi_handle))) || + (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS2", &acpi_handle)))) { - device->power.dx_supported[ACPI_STATE_S0] |= + device->power.dx_supported[ACPI_STATE_S0] |= BM_FLAGS_D2_SUPPORT; } @@ -352,28 +352,28 @@ /* * Evalute _SxD: * ------------- - * Which returns the highest (power) Dx state supported in - * this system (Sx) state. We convert this value to a bit + * Which returns the highest (power) Dx state supported in + * this system (Sx) state. We convert this value to a bit * mask of supported states (conceptually simpler). */ - status = bm_evaluate_simple_integer(device->acpi_handle, + status = bm_evaluate_simple_integer(device->acpi_handle, object_name, &dx_supported); if (ACPI_SUCCESS(status)) { switch (dx_supported) { case 0: - device->power.dx_supported[i] |= + device->power.dx_supported[i] |= BM_FLAGS_D0_SUPPORT; /* fall through */ case 1: - device->power.dx_supported[i] |= + device->power.dx_supported[i] |= BM_FLAGS_D1_SUPPORT; /* fall through */ case 2: - device->power.dx_supported[i] |= + device->power.dx_supported[i] |= BM_FLAGS_D2_SUPPORT; /* fall through */ case 3: - device->power.dx_supported[i] |= + device->power.dx_supported[i] |= BM_FLAGS_D3_SUPPORT; break; } @@ -381,12 +381,12 @@ /* * Validate: * --------- - * Mask of any states that _Sx_d falsely advertises - * (e.g.claims D1 support but neither _PR2 or _PS2 - * exist). In other words, S1-S5 can't offer a Dx + * Mask of any states that _Sx_d falsely advertises + * (e.g.claims D1 support but neither _PR2 or _PS2 + * exist). In other words, S1-S5 can't offer a Dx * state that isn't supported by S0. */ - device->power.dx_supported[i] &= + device->power.dx_supported[i] &= device->power.dx_supported[ACPI_STATE_S0]; } _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -27,7 +27,7 @@ * TODO: * ----- * 1. Sequencing of power resource list transitions. - * 2. Global serialization of power resource transtions (see ACPI + * 2. Global serialization of power resource transtions (see ACPI * spec section 7.1.2/7.1.3). * 3. Better error handling. */ @@ -51,13 +51,13 @@ BM_NOTIFY notify_type, BM_HANDLE device_handle, void **context); - + ACPI_STATUS bm_pr_request ( BM_REQUEST *request, void *context); - + /*********************************************************************** ***** * Internal Functions ************************************************************************ ****/ @@ -133,7 +133,7 @@ pr->state = ACPI_STATE_UNKNOWN; - /* + /* * Evaluate _STA: * -------------- * Evalute _STA to determine whether the power resource is ON or OFF. @@ -151,7 +151,7 @@ } /* - * Mask off all bits but the first as some systems return non-standard + * Mask off all bits but the first as some systems return non-standard * values (e.g. 0x51). */ switch (device_status & 0x01) { @@ -269,7 +269,7 @@ * ----------------------------- * The current state of a list of power resources is ON if all * power resources are currently in the ON state. In other words, - * if any power resource in the list is OFF then the collection + * if any power resource in the list is OFF then the collection * isn't fully ON. */ for (i = 0; i < pr_list->count; i++) { @@ -328,13 +328,13 @@ /* * Reference Target: * ----------------- - * Reference all resources for the target power state first (so - * the device doesn't get turned off while transitioning). Power + * Reference all resources for the target power state first (so + * the device doesn't get turned off while transitioning). Power * resources that aren't on (new reference count of 1) are turned on. */ for (i = 0; i < target_list->count; i++) { - status = bm_get_device_context(target_list->handles[i], + status = bm_get_device_context(target_list->handles[i], (BM_DRIVER_CONTEXT*)(&pr)); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_WARN, ("Invalid reference to power resource [0x%02X].\n", target_list->handles[i])); @@ -355,12 +355,12 @@ * Dereference Current: * -------------------- * Dereference all resources for the current power state. Power - * resources no longer referenced (new reference count of 0) are + * resources no longer referenced (new reference count of 0) are * turned off. */ for (i = 0; i < current_list->count; i++) { - status = bm_get_device_context(current_list->handles[i], + status = bm_get_device_context(current_list->handles[i], (BM_DRIVER_CONTEXT*)(&pr)); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_WARN, ("Invalid reference to power resource [0x%02X].\n", target_list->handles[i])); @@ -434,7 +434,7 @@ pr->device_handle = device->handle; pr->acpi_handle = device->acpi_handle; - /* + /* * Get information on this power resource. */ status = acpi_evaluate_object(pr->acpi_handle, NULL, NULL, &buffer); _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -62,7 +62,7 @@ DEBUG_PRINT(ACPI_INFO, ("Sending request [0x%02x] to device [0x%02x].\n", request->command, node->device.handle)); - if (!(node->device.flags & BM_FLAGS_DRIVER_CONTROL) || + if (!(node->device.flags & BM_FLAGS_DRIVER_CONTROL) || !(node->driver.request)) { DEBUG_PRINT(ACPI_WARN, ("No driver installed for device [0x%02x].\n", node->device.handle)); return_ACPI_STATUS(AE_NOT_EXIST); @@ -137,7 +137,7 @@ if (ACPI_FAILURE(status)) { break; } - status = bm_copy_to_buffer(&(request->buffer), + status = bm_copy_to_buffer(&(request->buffer), &(device->power.state), sizeof(BM_POWER_STATE)); break; @@ -145,7 +145,7 @@ { BM_POWER_STATE *power_state = NULL; - status = bm_cast_buffer(&(request->buffer), + status = bm_cast_buffer(&(request->buffer), (void**)&power_state, sizeof(BM_POWER_STATE)); if (ACPI_FAILURE(status)) { break; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -57,7 +57,7 @@ return AE_BAD_PARAMETER; } - /* + /* * Present? * -------- * We're only going to match on devices that are present. @@ -67,22 +67,22 @@ return AE_NOT_FOUND; } - /* + /* * type? */ if (criteria->type && !(criteria->type & device->id.type)) { return AE_NOT_FOUND; } - /* + /* * hid? */ - if ((criteria->hid[0]) && (0 != STRNCMP(criteria->hid, + if ((criteria->hid[0]) && (0 != STRNCMP(criteria->hid, device->id.hid, sizeof(BM_DEVICE_HID)))) { return AE_NOT_FOUND; } - /* + /* * adr? */ if ((criteria->adr) && (criteria->adr != device->id.adr)) { @@ -149,7 +149,7 @@ if (node->scope.head) { status = bm_compare(&(node->device), criteria); if (ACPI_SUCCESS(status)) { - results->handles[results->count++] = + results->handles[results->count++] = node->device.handle; } node = node->scope.head; @@ -163,16 +163,16 @@ else { status = bm_compare(&(node->device), criteria); if (ACPI_SUCCESS(status)) { - results->handles[results->count++] = + results->handles[results->count++] = node->device.handle; } /* * Locate Next Device: * ------------------- - * The next node is either a peer at this level - * (node->next is valid), or we work are way back - * up the tree until we either find a non-parsed + * The next node is either a peer at this level + * (node->next is valid), or we work are way back + * up the tree until we either find a non-parsed * peer or hit the top (node->parent is NULL). */ while (!node->next && node->parent) { _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -199,7 +199,7 @@ if (!package || (package->type != ACPI_TYPE_PACKAGE) || (package->package.count == 0) || !package_format || - (package_format->length < 1) || + (package_format->length < 1) || (!package_format->pointer) || !buffer) { return_ACPI_STATUS(AE_BAD_PARAMETER); } @@ -228,7 +228,7 @@ tail_offset += sizeof(ACPI_INTEGER); break; case 'S': - size_required += sizeof(u8*) + + size_required += sizeof(u8*) + sizeof(ACPI_INTEGER) + 1; tail_offset += sizeof(ACPI_INTEGER); break; @@ -243,12 +243,12 @@ case ACPI_TYPE_BUFFER: switch (format[i]) { case 'S': - size_required += sizeof(u8*) + + size_required += sizeof(u8*) + element->string.length + 1; tail_offset += sizeof(u8*); break; case 'B': - size_required += sizeof(u8*) + + size_required += sizeof(u8*) + element->buffer.length; tail_offset += sizeof(u8*); break; @@ -293,14 +293,14 @@ case ACPI_TYPE_INTEGER: switch (format[i]) { case 'N': - *((ACPI_INTEGER*)head) = + *((ACPI_INTEGER*)head) = element->integer.value; head += sizeof(ACPI_INTEGER); break; case 'S': pointer = (u8**)head; *pointer = tail; - *((ACPI_INTEGER*)tail) = + *((ACPI_INTEGER*)tail) = element->integer.value; head += sizeof(ACPI_INTEGER*); tail += sizeof(ACPI_INTEGER); @@ -320,7 +320,7 @@ case 'S': pointer = (u8**)head; *pointer = tail; - memcpy(tail, element->string.pointer, + memcpy(tail, element->string.pointer, element->string.length); head += sizeof(u8*); tail += element->string.length; @@ -331,7 +331,7 @@ case 'B': pointer = (u8**)head; *pointer = tail; - memcpy(tail, element->buffer.pointer, + memcpy(tail, element->buffer.pointer, element->buffer.length); head += sizeof(u8*); tail += element->buffer.length; @@ -361,11 +361,11 @@ * PARAMETERS: <TBD> * * RETURN: AE_OK - * AE_BUFFER_OVERFLOW Evaluated object returned data, but + * AE_BUFFER_OVERFLOW Evaluated object returned data, but * caller did not provide buffer. * * DESCRIPTION: Helper for acpi_evaluate_object that handles buffer - * allocation. Note that the caller is responsible for + * allocation. Note that the caller is responsible for * freeing buffer->pointer! * ************************************************************************ ****/ @@ -389,8 +389,8 @@ /* * Evalute Object: * --------------- - * The first attempt is just to get the size of the object data - * (that is unless there's no return data, e.g. _INI); the second + * The first attempt is just to get the size of the object data + * (that is unless there's no return data, e.g. _INI); the second * gets the data. */ status = acpi_evaluate_object(acpi_handle, pathname, arguments, buffer); @@ -407,14 +407,14 @@ } /* Re-evaluate -- this time it should work */ - status = acpi_evaluate_object(acpi_handle, pathname, + status = acpi_evaluate_object(acpi_handle, pathname, arguments, buffer); } if (ACPI_FAILURE(status)) { DEBUG_EVAL_ERROR(ACPI_WARN, acpi_handle, pathname, status); if (buffer && buffer->pointer) { - acpi_os_free(buffer->pointer); + acpi_os_free(buffer->pointer); buffer->pointer = NULL; buffer->length = 0; } @@ -467,7 +467,7 @@ * Validate Data: * -------------- */ - status = bm_cast_buffer(&buffer, (void**)&element, + status = bm_cast_buffer(&buffer, (void**)&element, sizeof(ACPI_OBJECT)); if (ACPI_FAILURE(status)) { DEBUG_EVAL_ERROR(ACPI_WARN, acpi_handle, pathname, status); @@ -535,7 +535,7 @@ * Validate Package: * ----------------- */ - status = bm_cast_buffer(&buffer, (void**)&package, + status = bm_cast_buffer(&buffer, (void**)&package, sizeof(ACPI_OBJECT)); if (ACPI_FAILURE(status)) { DEBUG_EVAL_ERROR(ACPI_WARN, acpi_handle, pathname, status); @@ -571,7 +571,7 @@ * Resolve reference string (e.g. "\_PR_.CPU_") to an * ACPI_HANDLE. */ - status = acpi_get_handle(acpi_handle, + status = acpi_get_handle(acpi_handle, element->string.pointer, &reference_handle); if (ACPI_FAILURE(status)) { status = AE_BAD_DATA; @@ -583,7 +583,7 @@ /* * Resolve ACPI_HANDLE to BM_HANDLE. */ - status = bm_get_handle(reference_handle, + status = bm_get_handle(reference_handle, &(reference_list->handles[i])); if (ACPI_FAILURE(status)) { status = AE_BAD_DATA; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -79,7 +79,7 @@ if (!BM_NODE_PRESENT(node->parent)) { return_ACPI_STATUS(AE_OK); } - + /* * Dynamic Status? * --------------- @@ -94,7 +94,7 @@ * Evaluate _STA: * -------------- */ - status = bm_evaluate_simple_integer(node->device.acpi_handle, "_STA", + status = bm_evaluate_simple_integer(node->device.acpi_handle, "_STA", &(node->device.status)); if (ACPI_SUCCESS(status)) { *device_status = node->device.status; @@ -232,7 +232,7 @@ /* * Install driver: * ---------------- - * For each match, record the driver information and execute the + * For each match, record the driver information and execute the * driver's Notify() funciton (if present) to notify the driver * of the device's presence. */ @@ -247,7 +247,7 @@ DEBUG_PRINT(ACPI_INFO, ("Registering driver for device [0x%02x].\n", node->device.handle)); /* Notify driver of new device. */ - status = driver->notify(BM_NOTIFY_DEVICE_ADDED, + status = driver->notify(BM_NOTIFY_DEVICE_ADDED, node->device.handle, &(node->driver.context)); if (ACPI_SUCCESS(status)) { node->driver.notify = driver->notify; @@ -319,7 +319,7 @@ DEBUG_PRINT(ACPI_INFO, ("Unregistering driver for device [0x%02x].\n", node->device.handle)); /* Notify driver of device removal. */ - status = node->driver.notify(BM_NOTIFY_DEVICE_REMOVED, + status = node->driver.notify(BM_NOTIFY_DEVICE_REMOVED, node->device.handle, &(node->driver.context)); node->device.flags &= ~BM_FLAGS_DRIVER_CONTROL; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -128,7 +128,7 @@ RESOURCE* resource; ULONG i; KIRQL Dirql; - + /* Count number of resources */ Done = FALSE; resource = resources; @@ -161,7 +161,7 @@ } resource = (RESOURCE *) ((NATIVE_UINT) resource + (NATIVE_UINT) resource->length); } - + /* Allocate memory */ *ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); ResourceList = (PCM_RESOURCE_LIST)ExAllocatePool(PagedPool, *ResourceListSize); @@ -175,7 +175,7 @@ ResourceList->List[0].PartialResourceList.Revision = 1; ResourceList->List[0].PartialResourceList.Count = NumberOfResources; ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors; - + /* Fill resources list structure */ Done = FALSE; resource = resources; @@ -189,7 +189,7 @@ for (i = 0; i < irq_data->number_of_interrupts; i++) { ResourceDescriptor->Type = CmResourceTypeInterrupt; - + ResourceDescriptor->ShareDisposition = (irq_data->shared_exclusive == SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); ResourceDescriptor->Flags = @@ -253,7 +253,7 @@ } resource = (RESOURCE *) ((NATIVE_UINT) resource + (NATIVE_UINT) resource->length); } - + acpi_rs_dump_resource_list(resource); return TRUE; } _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/include/bm.h --- trunk/reactos/drivers/bus/acpi/ospm/include/bm.h 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/include/bm.h 2005-05-08 02:16:32 UTC (rev 15108) @@ -158,7 +158,7 @@ #define BM_HID_SLEEP_BUTTON "PNP0C0E" /* - * BM_DEVICE_CID: + * BM_DEVICE_CID: * The compatibility ID can be a string with 44 characters * The extra pad is in case there is a change. It also * provides 8 byte alignment for the BM_DEVICE_ID structure. @@ -564,7 +564,7 @@ ACPI_STATUS [truncated at 1000 lines; 39227 more skipped]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs