Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 16129: Fixed incorrect SetNamedPipeHandleState implementation to use the actual APIs/Structures it should and added one of the missing ones to NTIFS.
by ion＠svn.reactos.com 20 Jun '05

20 Jun '05

Fixed incorrect SetNamedPipeHandleState implementation to use the actual APIs/Structures it should and added one of the missing ones to NTIFS. Modified: trunk/reactos/drivers/fs/np/finfo.c Modified: trunk/reactos/drivers/fs/np/fsctrl.c Modified: trunk/reactos/include/napi/npipe.h Modified: trunk/reactos/lib/kernel32/file/find.c Modified: trunk/reactos/lib/kernel32/file/npipe.c Modified: trunk/reactos/w32api/include/ddk/ntifs.h _____ Modified: trunk/reactos/drivers/fs/np/finfo.c --- trunk/reactos/drivers/fs/np/finfo.c 2005-06-19 23:59:40 UTC (rev 16128) +++ trunk/reactos/drivers/fs/np/finfo.c 2005-06-20 01:52:47 UTC (rev 16129) @@ -17,26 +17,100 @@ /* FUNCTIONS *****************************************************************/ -static NTSTATUS +static +NTSTATUS +NpfsSetPipeInformation(PDEVICE_OBJECT DeviceObject, + PNPFS_FCB Fcb, + PFILE_PIPE_INFORMATION Info, + PULONG BufferLength) +{ + PNPFS_PIPE Pipe; + PFILE_PIPE_INFORMATION Request; + DPRINT("NpfsSetPipeInformation()\n"); + + /* Get the Pipe and data */ + Pipe = Fcb->Pipe; + Request = (PFILE_PIPE_INFORMATION)Info; + + /* Set Pipe Data */ + Pipe->ReadMode = Request->ReadMode; + Pipe->CompletionMode = Request->CompletionMode; + + /* Return Success */ + return STATUS_SUCCESS; +} + +static +NTSTATUS +NpfsSetPipeRemoteInformation(PDEVICE_OBJECT DeviceObject, + PNPFS_FCB Fcb, + PFILE_PIPE_INFORMATION Info, + PULONG BufferLength) +{ + PNPFS_PIPE Pipe; + PFILE_PIPE_REMOTE_INFORMATION Request; + DPRINT("NpfsSetPipeRemoteInformation()\n"); + + /* Get the Pipe and data */ + Pipe = Fcb->Pipe; + Request = (PFILE_PIPE_REMOTE_INFORMATION)Info; + + /* Set the Settings */ + Pipe->TimeOut = Request->CollectDataTime; + Pipe->InboundQuota = Request->MaximumCollectionCount; + + /* Return Success */ + return STATUS_SUCCESS; +} + +static +NTSTATUS NpfsQueryPipeInformation(PDEVICE_OBJECT DeviceObject, - PNPFS_FCB Fcb, - PFILE_PIPE_INFORMATION Info, - PULONG BufferLength) + PNPFS_FCB Fcb, + PFILE_PIPE_INFORMATION Info, + PULONG BufferLength) { - PNPFS_PIPE Pipe; + PNPFS_PIPE Pipe; + DPRINT("NpfsQueryPipeInformation()\n"); - DPRINT("NpfsQueryPipeInformation()\n"); + /* Get the Pipe */ + Pipe = Fcb->Pipe; + + /* Clear Info */ + RtlZeroMemory(Info, sizeof(FILE_PIPE_INFORMATION)); - Pipe = Fcb->Pipe; + /* Return Info */ + Info->CompletionMode = Pipe->CompletionMode; + Info->ReadMode = Pipe->ReadMode; + + /* Return success */ + *BufferLength -= sizeof(FILE_PIPE_INFORMATION); + return STATUS_SUCCESS; +} - RtlZeroMemory(Info, - sizeof(FILE_PIPE_INFORMATION)); +static +NTSTATUS +NpfsQueryPipeRemoteInformation(PDEVICE_OBJECT DeviceObject, + PNPFS_FCB Fcb, + PFILE_PIPE_REMOTE_INFORMATION Info, + PULONG BufferLength) +{ + PNPFS_PIPE Pipe; + DPRINT("NpfsQueryPipeRemoteInformation()\n"); -// Info->PipeMode = -// Info->CompletionMode = + /* Get the Pipe */ + Pipe = Fcb->Pipe; + + /* Clear Info */ + RtlZeroMemory(Info, sizeof(FILE_PIPE_REMOTE_INFORMATION)); - *BufferLength -= sizeof(FILE_PIPE_INFORMATION); - return STATUS_SUCCESS; + /* Return Info */ + Info->MaximumCollectionCount = Pipe->InboundQuota; + Info->CollectDataTime = Pipe->TimeOut; + + /* Return success */ + *BufferLength -= sizeof(FILE_PIPE_REMOTE_INFORMATION); + return STATUS_SUCCESS; } @@ -128,7 +202,10 @@ break; case FilePipeRemoteInformation: - Status = STATUS_NOT_IMPLEMENTED; + Status = NpfsQueryPipeRemoteInformation(DeviceObject, + Fcb, + SystemBuffer, + &BufferLength); break; default: @@ -176,27 +253,35 @@ DPRINT("SystemBuffer %p\n", SystemBuffer); DPRINT("BufferLength %lu\n", BufferLength); - switch (FileInformationClass) + switch (FileInformationClass) { - case FilePipeInformation: - Status = STATUS_NOT_IMPLEMENTED; - break; - case FilePipeLocalInformation: - Status = STATUS_NOT_IMPLEMENTED; - break; - case FilePipeRemoteInformation: - Status = STATUS_NOT_IMPLEMENTED; - break; - default: - Status = STATUS_NOT_SUPPORTED; + case FilePipeInformation: + /* Call the handler */ + Status = NpfsSetPipeInformation(DeviceObject, + Fcb, + SystemBuffer, + &BufferLength); + break; + + case FilePipeLocalInformation: + Status = STATUS_NOT_IMPLEMENTED; + break; + + case FilePipeRemoteInformation: + /* Call the handler */ + Status = NpfsSetPipeRemoteInformation(DeviceObject, + Fcb, + SystemBuffer, + &BufferLength); + break; + default: + Status = STATUS_NOT_SUPPORTED; } - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - - return Status; + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } /* EOF */ _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-06-19 23:59:40 UTC (rev 16128) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-06-20 01:52:47 UTC (rev 16129) @@ -272,12 +272,12 @@ PNPFS_PIPE Pipe; PLIST_ENTRY current_entry; PNPFS_FCB ServerFcb; - PNPFS_WAIT_PIPE WaitPipe; + PFILE_PIPE_WAIT_FOR_BUFFER WaitPipe; NTSTATUS Status; DPRINT("NpfsWaitPipe\n"); - WaitPipe = (PNPFS_WAIT_PIPE)Irp->AssociatedIrp.SystemBuffer; + WaitPipe = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer; Pipe = Fcb->Pipe; if (Fcb->PipeState != 0) @@ -326,84 +326,8 @@ * RETURNS: * Status of operation */ -static NTSTATUS -NpfsGetState(PIRP Irp, - PIO_STACK_LOCATION IrpSp) -{ - PNPFS_GET_STATE Reply; - PNPFS_PIPE Pipe; - PNPFS_FCB Fcb; - /* Validate parameters */ - if (IrpSp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(NPFS_GET_STATE)) - { - DPRINT("Status (0x%X).\n", STATUS_INVALID_PARAMETER); - return STATUS_INVALID_PARAMETER; - } - - Fcb = IrpSp->FileObject->FsContext; - Reply = (PNPFS_GET_STATE)Irp->AssociatedIrp.SystemBuffer; - Pipe = Fcb->Pipe; - - Reply->WriteModeMessage = (Pipe->WriteMode == FILE_PIPE_MESSAGE_MODE); - Reply->ReadModeMessage = (Pipe->ReadMode == FILE_PIPE_MESSAGE_MODE); - Reply->NonBlocking = (Pipe->CompletionMode == FILE_PIPE_QUEUE_OPERATION); - Reply->InBufferSize = Pipe->InboundQuota; - Reply->OutBufferSize = Pipe->OutboundQuota; - Reply->Timeout = Pipe->TimeOut; - - Irp->IoStatus.Information = sizeof(NPFS_GET_STATE); - - DPRINT("Status (0x%X).\n", STATUS_SUCCESS); - - return STATUS_SUCCESS; -} - - /* - * FUNCTION: Set state of a pipe - * ARGUMENTS: - * Irp = Pointer to I/O request packet - * IrpSp = Pointer to current stack location of Irp - * RETURNS: - * Status of operation - */ -static NTSTATUS -NpfsSetState(PIRP Irp, - PIO_STACK_LOCATION IrpSp) -{ - PNPFS_SET_STATE Request; - PNPFS_PIPE Pipe; - PNPFS_FCB Fcb; - - /* Validate parameters */ - if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(NPFS_SET_STATE)) - { - DPRINT("Status (0x%X).\n", STATUS_INVALID_PARAMETER); - return STATUS_INVALID_PARAMETER; - } - - Fcb = IrpSp->FileObject->FsContext; - Request = (PNPFS_SET_STATE)Irp->AssociatedIrp.SystemBuffer; - Pipe = Fcb->Pipe; - - Pipe->WriteMode = - Request->WriteModeMessage ? FILE_PIPE_MESSAGE_MODE : FILE_PIPE_BYTE_STREAM_MODE; - Pipe->ReadMode = - Request->WriteModeMessage ? FILE_PIPE_MESSAGE_MODE : FILE_PIPE_BYTE_STREAM_MODE; - Pipe->CompletionMode = - Request->NonBlocking ? FILE_PIPE_QUEUE_OPERATION : FILE_PIPE_COMPLETE_OPERATION; - Pipe->InboundQuota = Request->InBufferSize; - Pipe->OutboundQuota = Request->OutBufferSize; - Pipe->TimeOut = Request->Timeout; - - DPRINT("Status (0x%X).\n", STATUS_SUCCESS); - - return STATUS_SUCCESS; -} - - -/* * FUNCTION: Peek at a pipe (get information about messages) * ARGUMENTS: * Irp = Pointer to I/O request packet @@ -520,16 +444,6 @@ Status = STATUS_NOT_IMPLEMENTED; break; - case FSCTL_PIPE_GET_STATE: - DPRINT("Get state\n"); - Status = NpfsGetState(Irp, (PIO_STACK_LOCATION)IoStack); - break; - - case FSCTL_PIPE_SET_STATE: - DPRINT("Set state\n"); - Status = NpfsSetState(Irp, (PIO_STACK_LOCATION)IoStack); - break; - case FSCTL_PIPE_INTERNAL_READ: DPRINT("Internal read\n"); Status = STATUS_NOT_IMPLEMENTED; _____ Modified: trunk/reactos/include/napi/npipe.h --- trunk/reactos/include/napi/npipe.h 2005-06-19 23:59:40 UTC (rev 16128) +++ trunk/reactos/include/napi/npipe.h 2005-06-20 01:52:47 UTC (rev 16129) @@ -35,12 +35,6 @@ #define FSCTL_PIPE_QUERY_CLIENT_PROCESS \ CTL_CODE(FILE_DEVICE_NAMED_PIPE, 9, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_PIPE_GET_STATE \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 10, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define FSCTL_PIPE_SET_STATE \ - CTL_CODE(FILE_DEVICE_NAMED_PIPE, 11, METHOD_BUFFERED, FILE_ANY_ACCESS) - #define FSCTL_PIPE_INTERNAL_READ \ CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2045, METHOD_BUFFERED, FILE_READ_DATA) @@ -54,46 +48,6 @@ CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2048, METHOD_BUFFERED, FILE_READ_DATA) -typedef struct _NPFS_WAIT_PIPE -{ - LARGE_INTEGER Timeout; -} NPFS_WAIT_PIPE, *PNPFS_WAIT_PIPE; - -#ifdef __GNUC__ /* robd */ -typedef struct _NPFS_LISTEN -{ -} NPFS_LISTEN, *PNPFS_LISTEN; -#endif - -typedef struct _NPFS_SET_STATE -{ - BOOLEAN WriteModeMessage; - BOOLEAN ReadModeMessage; - BOOLEAN NonBlocking; - ULONG InBufferSize; - ULONG OutBufferSize; - LARGE_INTEGER Timeout; -} NPFS_SET_STATE, *PNPFS_SET_STATE; - -typedef struct _NPFS_GET_STATE -{ - BOOLEAN WriteModeMessage; - BOOLEAN ReadModeMessage; - BOOLEAN NonBlocking; - ULONG InBufferSize; - ULONG OutBufferSize; - LARGE_INTEGER Timeout; -} NPFS_GET_STATE, *PNPFS_GET_STATE; - -typedef struct _FILE_PIPE_PEEK_BUFFER -{ - ULONG NamedPipeState; - ULONG ReadDataAvailable; - ULONG NumberOfMessages; - ULONG MessageLength; - CHAR Data[1]; -} FILE_PIPE_PEEK_BUFFER, *PFILE_PIPE_PEEK_BUFFER; - #define FILE_PIPE_BYTE_STREAM_TYPE 0x00000000 #define FILE_PIPE_MESSAGE_TYPE 0x00000001 _____ Modified: trunk/reactos/lib/kernel32/file/find.c --- trunk/reactos/lib/kernel32/file/find.c 2005-06-19 23:59:40 UTC (rev 16128) +++ trunk/reactos/lib/kernel32/file/find.c 2005-06-20 01:52:47 UTC (rev 16129) @@ -28,7 +28,7 @@ typedef struct _KERNEL32_FIND_FILE_DATA { HANDLE DirectoryHandle; - PFILE_BOTH_DIRECTORY_INFORMATION pFileInfo; + PFILE_BOTH_DIR_INFORMATION pFileInfo; } KERNEL32_FIND_FILE_DATA, *PKERNEL32_FIND_FILE_DATA; _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-06-19 23:59:40 UTC (rev 16128) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-06-20 01:52:47 UTC (rev 16129) @@ -243,7 +243,7 @@ BOOL r; NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; - NPFS_WAIT_PIPE WaitPipe; + FILE_PIPE_WAIT_FOR_BUFFER WaitPipe; HANDLE FileHandle; IO_STATUS_BLOCK Iosb; @@ -371,112 +371,93 @@ /* * @implemented */ -BOOL STDCALL +BOOL +STDCALL SetNamedPipeHandleState(HANDLE hNamedPipe, - LPDWORD lpMode, - LPDWORD lpMaxCollectionCount, - LPDWORD lpCollectDataTimeout) + LPDWORD lpMode, + LPDWORD lpMaxCollectionCount, + LPDWORD lpCollectDataTimeout) { - NPFS_GET_STATE GetState; - NPFS_SET_STATE SetState; - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; - Status = NtFsControlFile(hNamedPipe, - NULL, - NULL, - NULL, - &Iosb, - FSCTL_PIPE_GET_STATE, - NULL, - 0, - &GetState, - sizeof(NPFS_GET_STATE)); - if (Status == STATUS_PENDING) - { - Status = NtWaitForSingleObject(hNamedPipe, - FALSE, - NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } - } + /* Check if the Mode is being changed */ + if (lpMode) + { + FILE_PIPE_INFORMATION Settings; - if (lpMode != NULL) - { - if ((*lpMode) & PIPE_READMODE_MESSAGE) - { - SetState.ReadModeMessage = TRUE; - } - else - { - SetState.ReadModeMessage = FALSE; - } - if ((*lpMode) & PIPE_NOWAIT) - { - SetState.NonBlocking = TRUE; - } - else - { - SetState.NonBlocking = FALSE; - } - SetState.WriteModeMessage = GetState.WriteModeMessage; - } - else - { - SetState.ReadModeMessage = GetState.ReadModeMessage; - SetState.WriteModeMessage = GetState.WriteModeMessage; - SetState.NonBlocking = SetState.NonBlocking; - } + /* Set the Completion Mode */ + Settings.CompletionMode = (*lpMode & PIPE_NOWAIT) ? + FILE_PIPE_COMPLETE_OPERATION : FILE_PIPE_QUEUE_OPERATION; - if (lpMaxCollectionCount != NULL) - { - SetState.InBufferSize = *lpMaxCollectionCount; - } - else - { - SetState.InBufferSize = GetState.InBufferSize; - } + /* Set the Read Mode */ + Settings.ReadMode = (*lpMode & PIPE_READMODE_MESSAGE) ? + FILE_PIPE_MESSAGE_MODE: FILE_PIPE_BYTE_STREAM_MODE; - SetState.OutBufferSize = GetState.OutBufferSize; + /* Send the changes to the Driver */ + Status = NtSetInformationFile(hNamedPipe, + &Iosb, + &Settings, + sizeof(FILE_PIPE_INFORMATION), + FilePipeInformation); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return(FALSE); + } + } + + /* Check if the Collection count or Timeout are being changed */ + if (lpMaxCollectionCount || lpCollectDataTimeout) + { + FILE_PIPE_REMOTE_INFORMATION RemoteSettings; - if (lpCollectDataTimeout != NULL) - { - SetState.Timeout.QuadPart = (*lpCollectDataTimeout) * -10000LL; - } - else - { - SetState.Timeout = GetState.Timeout; - } + /* Setting one without the other would delete it, so we read old one */ + if (!lpMaxCollectionCount || !lpCollectDataTimeout) + { + Status = NtQueryInformationFile(hNamedPipe, + &Iosb, + &RemoteSettings, + sizeof(FILE_PIPE_REMOTE_INFORMATION), + FilePipeRemoteInformation); - Status = NtFsControlFile(hNamedPipe, - NULL, - NULL, - NULL, - &Iosb, - FSCTL_PIPE_SET_STATE, - &SetState, - sizeof(NPFS_SET_STATE), - NULL, - 0); - if (Status == STATUS_PENDING) - { - Status = NtWaitForSingleObject(hNamedPipe, - FALSE, - NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } - } + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return(FALSE); + } + } - return(TRUE); -} + /* Now set the new settings */ + RemoteSettings.MaximumCollectionCount = (lpMaxCollectionCount) ? + *lpMaxCollectionCount : + RemoteSettings.MaximumCollectionCount; + if (lpCollectDataTimeout) + { + /* Convert it to Quad */ + RemoteSettings.CollectDataTime.QuadPart = -(LONGLONG) + UInt32x32To64(10000, + *lpCollectDataTimeout); + } + /* Tell the driver to change them */ + Status = NtSetInformationFile(hNamedPipe, + &Iosb, + &RemoteSettings, + sizeof(FILE_PIPE_REMOTE_INFORMATION), + FilePipeRemoteInformation); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return(FALSE); + } + } + + /* All done */ + return TRUE; +} + /* * @implemented */ _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-19 23:59:40 UTC (rev 16128) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-20 01:52:47 UTC (rev 16129) @@ -1124,6 +1124,15 @@ ULONG NumberRequests; } FILE_PIPE_EVENT_BUFFER, *PFILE_PIPE_EVENT_BUFFER; +typedef struct _FILE_PIPE_PEEK_BUFFER +{ + ULONG NamedPipeState; + ULONG ReadDataAvailable; + ULONG NumberOfMessages; + ULONG MessageLength; + CHAR Data[1]; +} FILE_PIPE_PEEK_BUFFER, *PFILE_PIPE_PEEK_BUFFER; + typedef struct _FILE_PIPE_INFORMATION { ULONG ReadMode; ULONG CompletionMode;

1 0

[ion] 16128: Add missing stuff to NDK
by ion＠svn.reactos.com 19 Jun '05

19 Jun '05

Add missing stuff to NDK Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/include/reactos/helper.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-06-19 22:53:49 UTC (rev 16127) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-06-19 23:59:40 UTC (rev 16128) @@ -332,6 +332,22 @@ PSID Sid ); +NTSTATUS +STDCALL +RtlAllocateAndInitializeSid ( + IN PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, + IN UCHAR SubAuthorityCount, + IN ULONG SubAuthority0, + IN ULONG SubAuthority1, + IN ULONG SubAuthority2, + IN ULONG SubAuthority3, + IN ULONG SubAuthority4, + IN ULONG SubAuthority5, + IN ULONG SubAuthority6, + IN ULONG SubAuthority7, + OUT PSID *Sid +); + PVOID STDCALL RtlAllocateHeap ( @@ -461,6 +477,10 @@ IN PSID Source ); +VOID STDCALL +RtlCopyUnicodeString(PUNICODE_STRING DestinationString, + PUNICODE_STRING SourceString); + NTSTATUS STDCALL RtlCreateAcl( @@ -489,6 +509,19 @@ NTSTATUS STDCALL +RtlCreateSecurityDescriptor( + PSECURITY_DESCRIPTOR SecurityDescriptor, + ULONG Revision +); + +NTSTATUS STDCALL +RtlCreateSecurityDescriptorRelative( + PSECURITY_DESCRIPTOR_RELATIVE SecurityDescriptor, + ULONG Revision +); + +NTSTATUS +STDCALL RtlCreateUserThread ( IN HANDLE ProcessHandle, IN PSECURITY_DESCRIPTOR SecurityDescriptor, @@ -617,6 +650,14 @@ ULONG MbSize ); +BOOLEAN +STDCALL +RtlPrefixUnicodeString ( + PUNICODE_STRING String1, + PUNICODE_STRING String2, + BOOLEAN CaseInsensitive + ); + CHAR STDCALL RtlUpperChar (CHAR Source); @@ -650,6 +691,14 @@ POEM_STRING AnsiString ); +NTSTATUS +STDCALL +RtlOemStringToUnicodeString ( + PUNICODE_STRING DestinationString, + POEM_STRING SourceString, + BOOLEAN AllocateDestinationString + ); + PVOID STDCALL RtlImageDirectoryEntryToData ( @@ -720,6 +769,12 @@ IN PUNICODE_STRING UnicodeString ); +ULONG +STDCALL +RtlUnicodeStringToOemSize ( + IN PUNICODE_STRING UnicodeString + ); + NTSTATUS STDCALL RtlUnicodeStringToAnsiString ( @@ -764,6 +819,12 @@ OUT PRTL_MESSAGE_RESOURCE_ENTRY *MessageResourceEntry ); +VOID +STDCALL +RtlFreeAnsiString ( + IN PANSI_STRING AnsiString +); + BOOLEAN STDCALL RtlFreeHeap ( @@ -772,6 +833,12 @@ IN PVOID P ); +PVOID +STDCALL +RtlFreeSid ( + IN PSID Sid +); + VOID STDCALL RtlFreeUnicodeString( @@ -902,6 +969,12 @@ IN OUT PUNICODE_STRING DestinationString, IN PCWSTR SourceString); +VOID +STDCALL +RtlInitAnsiString ( + PANSI_STRING DestinationString, + PCSZ SourceString + ); BOOLEAN STDCALL @@ -985,6 +1058,15 @@ NTSTATUS STDCALL +RtlSetDaclSecurityDescriptor ( + PSECURITY_DESCRIPTOR SecurityDescriptor, + BOOLEAN DaclPresent, + PACL Dacl, + BOOLEAN DaclDefaulted +); + +NTSTATUS +STDCALL RtlSetGroupSecurityDescriptor ( IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, IN PSID Group, _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-06-19 22:53:49 UTC (rev 16127) +++ trunk/reactos/include/ndk/umtypes.h 2005-06-19 23:59:40 UTC (rev 16128) @@ -165,6 +165,25 @@ #define RTL_QUERY_REGISTRY_DIRECT 0x00000020 #define RTL_QUERY_REGISTRY_DELETE 0x00000040 +/* File Result Flags */ +#define FILE_SUPERSEDED 0x00000000 +#define FILE_OPENED 0x00000001 +#define FILE_CREATED 0x00000002 +#define FILE_OVERWRITTEN 0x00000003 +#define FILE_EXISTS 0x00000004 +#define FILE_DOES_NOT_EXIST 0x00000005 + +/* Pipe Flags */ +#define FILE_PIPE_BYTE_STREAM_MODE 0x00000000 +#define FILE_PIPE_MESSAGE_MODE 0x00000001 +#define FILE_PIPE_QUEUE_OPERATION 0x00000000 +#define FILE_PIPE_COMPLETE_OPERATION 0x00000001 +#define FILE_PIPE_INBOUND 0x00000000 +#define FILE_PIPE_OUTBOUND 0x00000001 +#define FILE_PIPE_FULL_DUPLEX 0x00000002 +#define FILE_PIPE_CLIENT_END 0x00000000 +#define FILE_PIPE_SERVER_END 0x00000001 + /* Device Charactertics */ #define FILE_REMOVABLE_MEDIA 0x00000001 @@ -749,6 +768,31 @@ LARGE_INTEGER BeyondFinalZero; } FILE_ZERO_DATA_INFORMATION, *PFILE_ZERO_DATA_INFORMATION; +typedef struct _FILE_EA_INFORMATION +{ + ULONG EaSize; +} FILE_EA_INFORMATION, *PFILE_EA_INFORMATION; + +typedef struct _FILE_COMPRESSION_INFORMATION +{ + LARGE_INTEGER CompressedFileSize; + USHORT CompressionFormat; + UCHAR CompressionUnitShift; + UCHAR ChunkShift; + UCHAR ClusterShift; + UCHAR Reserved[3]; +} FILE_COMPRESSION_INFORMATION, *PFILE_COMPRESSION_INFORMATION; + +typedef struct _FILE_POSITION_INFORMATION +{ + LARGE_INTEGER CurrentByteOffset; +} FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION; + +typedef struct _FILE_DISPOSITION_INFORMATION +{ + BOOLEAN DeleteFile; +} FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; + typedef struct FILE_ALLOCATED_RANGE_BUFFER { LARGE_INTEGER FileOffset; @@ -766,6 +810,112 @@ SID Sid; } FILE_QUOTA_INFORMATION, *PFILE_QUOTA_INFORMATION; +typedef struct _FILE_INTERNAL_INFORMATION +{ + LARGE_INTEGER IndexNumber; +} FILE_INTERNAL_INFORMATION, *PFILE_INTERNAL_INFORMATION; + +typedef struct _FILE_RENAME_INFORMATION +{ + BOOLEAN ReplaceIfExists; + HANDLE RootDirectory; + ULONG FileNameLength; + WCHAR FileName[1]; +} FILE_RENAME_INFORMATION, *PFILE_RENAME_INFORMATION; + +typedef struct _FILE_PIPE_INFORMATION +{ + ULONG ReadMode; + ULONG CompletionMode; +} FILE_PIPE_INFORMATION, *PFILE_PIPE_INFORMATION; + +typedef struct _FILE_PIPE_LOCAL_INFORMATION +{ + ULONG NamedPipeType; + ULONG NamedPipeConfiguration; + ULONG MaximumInstances; + ULONG CurrentInstances; + ULONG InboundQuota; + ULONG ReadDataAvailable; + ULONG OutboundQuota; + ULONG WriteQuotaAvailable; + ULONG NamedPipeState; + ULONG NamedPipeEnd; +} FILE_PIPE_LOCAL_INFORMATION, *PFILE_PIPE_LOCAL_INFORMATION; + +typedef struct _FILE_PIPE_REMOTE_INFORMATION +{ + LARGE_INTEGER CollectDataTime; + ULONG MaximumCollectionCount; +} FILE_PIPE_REMOTE_INFORMATION, *PFILE_PIPE_REMOTE_INFORMATION; + +typedef struct _FILE_MAILSLOT_QUERY_INFORMATION +{ + ULONG MaximumMessageSize; + ULONG MailslotQuota; + ULONG NextMessageSize; + ULONG MessagesAvailable; + LARGE_INTEGER ReadTimeout; +} FILE_MAILSLOT_QUERY_INFORMATION, *PFILE_MAILSLOT_QUERY_INFORMATION; + +typedef struct _FILE_MAILSLOT_SET_INFORMATION +{ + LARGE_INTEGER ReadTimeout; +} FILE_MAILSLOT_SET_INFORMATION, *PFILE_MAILSLOT_SET_INFORMATION; + +typedef struct _FILE_BOTH_DIR_INFORMATION +{ + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + CCHAR ShortNameLength; + WCHAR ShortName[12]; + WCHAR FileName[1]; +} FILE_BOTH_DIR_INFORMATION, *PFILE_BOTH_DIR_INFORMATION; + +typedef struct _FILE_COMPLETION_INFORMATION +{ + HANDLE Port; + PVOID Key; +} FILE_COMPLETION_INFORMATION, *PFILE_COMPLETION_INFORMATION; + +typedef struct _FILE_LINK_INFORMATION +{ + BOOLEAN ReplaceIfExists; + HANDLE RootDirectory; + ULONG FileNameLength; + WCHAR FileName[1]; +} FILE_LINK_INFORMATION, *PFILE_LINK_INFORMATION; + +typedef struct _FILE_NAME_INFORMATION +{ + ULONG FileNameLength; + WCHAR FileName[1]; +} FILE_NAME_INFORMATION, *PFILE_NAME_INFORMATION; + +typedef struct _FILE_ALLOCATION_INFORMATION +{ + LARGE_INTEGER AllocationSize; +} FILE_ALLOCATION_INFORMATION, *PFILE_ALLOCATION_INFORMATION; + +typedef struct _FILE_END_OF_FILE_INFORMATION +{ + LARGE_INTEGER EndOfFile; +} FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION; + +typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION +{ + LARGE_INTEGER ValidDataLength; +} FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION; + /* * File System */ @@ -775,6 +925,15 @@ ULONG Characteristics; } FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION; +typedef struct _FILE_FS_VOLUME_INFORMATION +{ + LARGE_INTEGER VolumeCreationTime; + ULONG VolumeSerialNumber; + ULONG VolumeLabelLength; + BOOLEAN SupportsObjects; + WCHAR VolumeLabel[1]; +} FILE_FS_VOLUME_INFORMATION, *PFILE_FS_VOLUME_INFORMATION; + /* * Registry Key Value */ @@ -845,7 +1004,24 @@ ULONG InheritedFromUniqueProcessId; } PROCESS_BASIC_INFORMATION, *PPROCESS_BASIC_INFORMATION; +/* File Pipe Structures for the FSCTLs */ +typedef struct _FILE_PIPE_WAIT_FOR_BUFFER +{ + LARGE_INTEGER Timeout; + ULONG NameLength; + BOOLEAN TimeoutSpecified; + WCHAR Name[1]; +} FILE_PIPE_WAIT_FOR_BUFFER, *PFILE_PIPE_WAIT_FOR_BUFFER; +typedef struct _FILE_PIPE_PEEK_BUFFER +{ + ULONG NamedPipeState; + ULONG ReadDataAvailable; + ULONG NumberOfMessages; + ULONG MessageLength; + CHAR Data[1]; +} FILE_PIPE_PEEK_BUFFER, *PFILE_PIPE_PEEK_BUFFER; + /* The Kerner/User Shared Data Structure */ typedef struct _KUSER_SHARED_DATA { _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-06-19 22:53:49 UTC (rev 16127) +++ trunk/reactos/include/ndk/zwtypes.h 2005-06-19 23:59:40 UTC (rev 16128) @@ -281,6 +281,15 @@ } ATOM_TABLE_INFORMATION, *PATOM_TABLE_INFORMATION; /* + * Object Directory + */ +typedef struct _OBJECT_DIRECTORY_INFORMATION +{ + UNICODE_STRING ObjectName; + UNICODE_STRING ObjectTypeName; +} OBJECT_DIRECTORY_INFORMATION, *POBJECT_DIRECTORY_INFORMATION; + +/* * Memory */ _____ Modified: trunk/reactos/include/reactos/helper.h --- trunk/reactos/include/reactos/helper.h 2005-06-19 22:53:49 UTC (rev 16127) +++ trunk/reactos/include/reactos/helper.h 2005-06-19 23:59:40 UTC (rev 16128) @@ -34,4 +34,11 @@ #define NT_SEVERITY(StatCode) (((StatCode) >> NTSTAT_SEVERITY_SHIFT) & NTSTAT_SEVERITY_MASK) #define NT_FACILITY(StatCode) (((StatCode) >> NTSTAT_FACILITY_SHIFT) & NTSTAT_FACILITY_MASK) #define NT_CUSTOMER(StatCode) ((StatCode) & NTSTAT_CUSTOMER_MASK) +#define RELATIVE_TIME(wait) (-(wait)) +#define NANOS_TO_100NS(nanos) (((LONGLONG)(nanos)) / 100) +#define MICROS_TO_100NS(micros) (((LONGLONG)(micros)) * NANOS_TO_100NS(1000)) +#define MILLIS_TO_100NS(milli) (((LONGLONG)(milli)) * MICROS_TO_100NS(1000)) +#define SECONDS_TO_100NS(seconds) (((LONGLONG)(seconds)) * MILLIS_TO_100NS(1000)) +#define MINUTES_TO_100NS(minutes) (((LONGLONG)(minutes)) * SECONDS_TO_100NS(60)) +#define HOURS_TO_100NS(hours) (((LONGLONG)(hours)) * MINUTES_TO_100NS(60)) #endif

1 0

[ion] 16127: Ditto for HAL
by ion＠svn.reactos.com 19 Jun '05

19 Jun '05

Ditto for HAL Modified: trunk/reactos/hal/hal/hal.c Modified: trunk/reactos/hal/halx86/generic/adapter.c Modified: trunk/reactos/hal/halx86/generic/beep.c Modified: trunk/reactos/hal/halx86/generic/bus.c Modified: trunk/reactos/hal/halx86/generic/display.c Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/hal/halx86/generic/drive.c Modified: trunk/reactos/hal/halx86/generic/enum.c Modified: trunk/reactos/hal/halx86/generic/fmutex.c Modified: trunk/reactos/hal/halx86/generic/halinit.c Modified: trunk/reactos/hal/halx86/generic/ipi.c Modified: trunk/reactos/hal/halx86/generic/irql.c Modified: trunk/reactos/hal/halx86/generic/isa.c Modified: trunk/reactos/hal/halx86/generic/kdbg.c Modified: trunk/reactos/hal/halx86/generic/mca.c Modified: trunk/reactos/hal/halx86/generic/misc.c Modified: trunk/reactos/hal/halx86/generic/pci.c Modified: trunk/reactos/hal/halx86/generic/portio.c Modified: trunk/reactos/hal/halx86/generic/processor.c Modified: trunk/reactos/hal/halx86/generic/reboot.c Modified: trunk/reactos/hal/halx86/generic/resource.c Modified: trunk/reactos/hal/halx86/generic/spinlock.c Modified: trunk/reactos/hal/halx86/generic/sysbus.c Modified: trunk/reactos/hal/halx86/generic/sysinfo.c Modified: trunk/reactos/hal/halx86/generic/time.c Modified: trunk/reactos/hal/halx86/generic/timer.c Modified: trunk/reactos/hal/halx86/include/hal.h Modified: trunk/reactos/hal/halx86/mp/apic.c Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c Modified: trunk/reactos/hal/halx86/mp/ioapic.c Modified: trunk/reactos/hal/halx86/mp/ipi_mp.c Modified: trunk/reactos/hal/halx86/mp/mpconfig.c Modified: trunk/reactos/hal/halx86/mp/mpsirql.c Modified: trunk/reactos/hal/halx86/mp/processor_mp.c Modified: trunk/reactos/hal/halx86/mp/resource_mp.c Modified: trunk/reactos/hal/halx86/up/halinit_up.c Modified: trunk/reactos/hal/halx86/xbox/font.c Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c Modified: trunk/reactos/hal/halx86/xbox/pci_xbox.c _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/hal/hal.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -14,8 +14,9 @@ #include <ddk/ntddk.h> #include <roscfg.h> +#include <internal/debug.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> typedef struct _LOADER_PARAMETER_BLOCK *PLOADER_PARAMETER_BLOCK; typedef struct _KD_PORT_INFORMATION *PKD_PORT_INFORMATION; _____ Modified: trunk/reactos/hal/halx86/generic/adapter.c --- trunk/reactos/hal/halx86/generic/adapter.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/adapter.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -13,8 +13,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* Hmm, needed for KDBG := 1. Why? */ extern POBJECT_TYPE IMPORTED IoAdapterObjectType; _____ Modified: trunk/reactos/hal/halx86/generic/beep.c --- trunk/reactos/hal/halx86/generic/beep.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/beep.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -10,8 +10,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* CONSTANTS *****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/bus.c --- trunk/reactos/hal/halx86/generic/bus.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/bus.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -15,8 +15,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/display.c --- trunk/reactos/hal/halx86/generic/display.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/display.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -121,8 +121,9 @@ * since there is already support for them via the VideoPortInt10 routine. */ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> #define SCREEN_SYNCHRONIZATION _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* Adapters for each channel */ PADAPTER_OBJECT HalpEisaAdapter[8]; _____ Modified: trunk/reactos/hal/halx86/generic/drive.c --- trunk/reactos/hal/halx86/generic/drive.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/drive.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/enum.c --- trunk/reactos/hal/halx86/generic/enum.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/enum.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> VOID HalpStartEnumerator (VOID) _____ Modified: trunk/reactos/hal/halx86/generic/fmutex.c --- trunk/reactos/hal/halx86/generic/fmutex.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/fmutex.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -12,8 +12,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/halinit.c --- trunk/reactos/hal/halx86/generic/halinit.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/halinit.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* GLOBALS *****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/ipi.c --- trunk/reactos/hal/halx86/generic/ipi.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/ipi.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/irql.c --- trunk/reactos/hal/halx86/generic/irql.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/irql.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* GLOBALS ******************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/isa.c --- trunk/reactos/hal/halx86/generic/isa.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/isa.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -11,8 +11,9 @@ /* INCLUDES ***************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/kdbg.c --- trunk/reactos/hal/halx86/generic/kdbg.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/kdbg.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -12,8 +12,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> #define DEFAULT_BAUD_RATE 19200 _____ Modified: trunk/reactos/hal/halx86/generic/mca.c --- trunk/reactos/hal/halx86/generic/mca.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/mca.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -32,8 +32,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/misc.c --- trunk/reactos/hal/halx86/generic/misc.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/misc.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/pci.c --- trunk/reactos/hal/halx86/generic/pci.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/pci.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -18,8 +18,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* MACROS ******************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/portio.c --- trunk/reactos/hal/halx86/generic/portio.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/portio.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -9,8 +9,9 @@ * Created 18/10/99 */ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/processor.c --- trunk/reactos/hal/halx86/generic/processor.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/processor.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -14,8 +14,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/reboot.c --- trunk/reactos/hal/halx86/generic/reboot.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/reboot.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -9,8 +9,9 @@ * Created 11/10/99 */ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> static VOID _____ Modified: trunk/reactos/hal/halx86/generic/resource.c --- trunk/reactos/hal/halx86/generic/resource.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/resource.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/spinlock.c --- trunk/reactos/hal/halx86/generic/spinlock.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/spinlock.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -17,8 +17,9 @@ /* INCLUDES ****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* Hmm, needed for KDBG := 1. Why? */ #undef KeGetCurrentIrql _____ Modified: trunk/reactos/hal/halx86/generic/sysbus.c --- trunk/reactos/hal/halx86/generic/sysbus.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/sysbus.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/sysinfo.c --- trunk/reactos/hal/halx86/generic/sysinfo.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/sysinfo.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -10,8 +10,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> _____ Modified: trunk/reactos/hal/halx86/generic/time.c --- trunk/reactos/hal/halx86/generic/time.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/time.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -8,8 +8,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* MACROS and CONSTANTS ******************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/timer.c --- trunk/reactos/hal/halx86/generic/timer.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/generic/timer.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -32,8 +32,9 @@ /* INCLUDES ***************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* GLOBALS ******************************************************************/ _____ Modified: trunk/reactos/hal/halx86/include/hal.h --- trunk/reactos/hal/halx86/include/hal.h 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/include/hal.h 2005-06-19 22:53:49 UTC (rev 16127) @@ -50,9 +50,6 @@ OUT PVOID *Object ); -/* Debug Header */ -#include <debug.h> - /* Internal HAL Headers */ #include "apic.h" #include "bus.h" _____ Modified: trunk/reactos/hal/halx86/mp/apic.c --- trunk/reactos/hal/halx86/mp/apic.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/mp/apic.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -27,8 +27,9 @@ /* INCLUDE ***********************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> #include <internal/ntoskrnl.h> /* GLOBALS ***********************************************************************/ _____ Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c --- trunk/reactos/hal/halx86/mp/halinit_mp.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/mp/halinit_mp.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/hal/halx86/mp/ioapic.c --- trunk/reactos/hal/halx86/mp/ioapic.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/mp/ioapic.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include <hal.h> +#define NDEBUG +#include <debug.h> /* GLOBALS *****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/mp/ipi_mp.c --- trunk/reactos/hal/halx86/mp/ipi_mp.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/mp/ipi_mp.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/mp/mpconfig.c --- trunk/reactos/hal/halx86/mp/mpconfig.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/mp/mpconfig.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include <hal.h> +#define NDEBUG +#include <debug.h> /* GLOBALS ******************************************************************/ _____ Modified: trunk/reactos/hal/halx86/mp/mpsirql.c --- trunk/reactos/hal/halx86/mp/mpsirql.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/mp/mpsirql.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* GLOBALS ******************************************************************/; _____ Modified: trunk/reactos/hal/halx86/mp/processor_mp.c --- trunk/reactos/hal/halx86/mp/processor_mp.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/mp/processor_mp.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -14,8 +14,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/mp/resource_mp.c --- trunk/reactos/hal/halx86/mp/resource_mp.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/mp/resource_mp.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/up/halinit_up.c --- trunk/reactos/hal/halx86/up/halinit_up.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/up/halinit_up.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #define NDEBUG -#include <hal.h> +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/hal/halx86/xbox/font.c --- trunk/reactos/hal/halx86/xbox/font.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/xbox/font.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -14,8 +14,9 @@ #include <ddk/ntddk.h> #include "halxbox.h" +#include <internal/debug.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> BYTE XboxFont8x16[256 * 16] = { _____ Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c --- trunk/reactos/hal/halx86/xbox/halinit_xbox.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -15,8 +15,9 @@ #include <hal.h> #include "halxbox.h" +#include <internal/debug.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml --- trunk/reactos/hal/halx86/xbox/halxbox.xml 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/xbox/halxbox.xml 2005-06-19 22:53:49 UTC (rev 16127) @@ -1,4 +1,4 @@ -<module name="halxbox" type="kernelmodedll"> +<module name="halxbox" type="kernelmodedll" warnings="true"> <importlibrary definition="../../hal/hal.def" /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> _____ Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c --- trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -15,8 +15,9 @@ #include <ddk/ntdddisk.h> #include "halxbox.h" +#include <internal/debug.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> #define XBOX_SIGNATURE_SECTOR 3 #define XBOX_SIGNATURE ('B' | ('R' << 8) | ('F' << 16) | ('R' << 24)) _____ Modified: trunk/reactos/hal/halx86/xbox/pci_xbox.c --- trunk/reactos/hal/halx86/xbox/pci_xbox.c 2005-06-19 22:50:59 UTC (rev 16126) +++ trunk/reactos/hal/halx86/xbox/pci_xbox.c 2005-06-19 22:53:49 UTC (rev 16127) @@ -22,8 +22,9 @@ #include <bus.h> #include "halxbox.h" +#include <internal/debug.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* VARIABLES ***************************************************************/

1 0

[ion] 16126: Blight is cool. oh, right..this is a commt message. err.. oh. include debug.h per-file isntead of globally, or else this breaks NDEBUG
by ion＠svn.reactos.com 19 Jun '05

19 Jun '05

Blight is cool. oh, right..this is a commt message. err.. oh. include debug.h per-file isntead of globally, or else this breaks NDEBUG Modified: trunk/reactos/lib/ntdll/csr/capture.c Modified: trunk/reactos/lib/ntdll/csr/lpc.c Modified: trunk/reactos/lib/ntdll/csr/probe.c Modified: trunk/reactos/lib/ntdll/csr/thread.c Modified: trunk/reactos/lib/ntdll/dbg/brkpoint.c Modified: trunk/reactos/lib/ntdll/dbg/debug.c Modified: trunk/reactos/lib/ntdll/dbg/print.c Modified: trunk/reactos/lib/ntdll/inc/ntdll.h Modified: trunk/reactos/lib/ntdll/ldr/elf.c Modified: trunk/reactos/lib/ntdll/ldr/res.c Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c Modified: trunk/reactos/lib/ntdll/main/dllmain.c Modified: trunk/reactos/lib/ntdll/rtl/apc.c Modified: trunk/reactos/lib/ntdll/rtl/atom.c Modified: trunk/reactos/lib/ntdll/rtl/callback.c Modified: trunk/reactos/lib/ntdll/rtl/crc32.c Modified: trunk/reactos/lib/ntdll/rtl/critical.c Modified: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c Modified: trunk/reactos/lib/ntdll/rtl/exception.c Modified: trunk/reactos/lib/ntdll/rtl/handle.c Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Modified: trunk/reactos/lib/ntdll/rtl/math.c Modified: trunk/reactos/lib/ntdll/rtl/message.c Modified: trunk/reactos/lib/ntdll/rtl/misc.c Modified: trunk/reactos/lib/ntdll/rtl/path.c Modified: trunk/reactos/lib/ntdll/rtl/process.c Modified: trunk/reactos/lib/ntdll/rtl/propvar.c Modified: trunk/reactos/lib/ntdll/rtl/rangelist.c Modified: trunk/reactos/lib/ntdll/rtl/resource.c Modified: trunk/reactos/lib/ntdll/rtl/teb.c Modified: trunk/reactos/lib/ntdll/rtl/timerqueue.c Modified: trunk/reactos/lib/ntdll/rtl/trace.c Modified: trunk/reactos/lib/ntdll/stdio/sprintf.c Modified: trunk/reactos/lib/ntdll/stdio/sscanf.c Modified: trunk/reactos/lib/ntdll/stdio/swprintf.c Modified: trunk/reactos/lib/ntdll/stdlib/mbstowcs.c Modified: trunk/reactos/lib/ntdll/stdlib/wcstombs.c _____ Modified: trunk/reactos/lib/ntdll/csr/capture.c --- trunk/reactos/lib/ntdll/csr/capture.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/csr/capture.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -8,8 +8,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/csr/lpc.c --- trunk/reactos/lib/ntdll/csr/lpc.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/csr/lpc.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -13,8 +13,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/csr/probe.c --- trunk/reactos/lib/ntdll/csr/probe.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/csr/probe.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -8,8 +8,9 @@ * DATE: 2001-06-17 */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* * @implemented _____ Modified: trunk/reactos/lib/ntdll/csr/thread.c --- trunk/reactos/lib/ntdll/csr/thread.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/csr/thread.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -6,8 +6,9 @@ * PURPOSE: CSRSS threads API */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* * @implemented _____ Modified: trunk/reactos/lib/ntdll/dbg/brkpoint.c --- trunk/reactos/lib/ntdll/dbg/brkpoint.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/dbg/brkpoint.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/dbg/debug.c --- trunk/reactos/lib/ntdll/dbg/debug.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/dbg/debug.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> #include <rosrtl/thread.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/dbg/print.c --- trunk/reactos/lib/ntdll/dbg/print.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/dbg/print.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -9,8 +9,9 @@ * Created 28/12/1999 */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/inc/ntdll.h --- trunk/reactos/lib/ntdll/inc/ntdll.h 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/inc/ntdll.h 2005-06-19 22:50:59 UTC (rev 16126) @@ -21,6 +21,5 @@ #include <ntdll/rtl.h> #include <ntdll/ldr.h> #include <ntdll/ntdll.h> -#include <debug.h> /* FIXME REMOVE THIS */ /* EOF */ _____ Modified: trunk/reactos/lib/ntdll/ldr/elf.c --- trunk/reactos/lib/ntdll/ldr/elf.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/ldr/elf.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -42,8 +42,9 @@ * John Polstra <jdp(a)polstra.com>. */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> #if 0 _____ Modified: trunk/reactos/lib/ntdll/ldr/res.c --- trunk/reactos/lib/ntdll/ldr/res.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/ldr/res.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -23,8 +23,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* PROTOTYPES ****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -10,8 +10,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> #include <win32k/callback.h> VOID RtlInitializeHeapManager (VOID); _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -19,8 +19,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> #define LDRP_PROCESS_CREATION_TIME 0x8000000 _____ Modified: trunk/reactos/lib/ntdll/main/dllmain.c --- trunk/reactos/lib/ntdll/main/dllmain.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/main/dllmain.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -7,8 +7,9 @@ * PROGRAMMER: */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> BOOL WINAPI DllMainCRTStartup(HINSTANCE hinstDll, DWORD fdwReason, _____ Modified: trunk/reactos/lib/ntdll/rtl/apc.c --- trunk/reactos/lib/ntdll/rtl/apc.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/apc.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -26,8 +26,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/atom.c --- trunk/reactos/lib/ntdll/rtl/atom.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/atom.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* LOCAL TYPES ***************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/callback.c --- trunk/reactos/lib/ntdll/rtl/callback.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/callback.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* TYPES *********************************************************************/ typedef NTSTATUS (STDCALL *KERNEL_CALLBACK_FUNCTION)(PVOID Argument, _____ Modified: trunk/reactos/lib/ntdll/rtl/crc32.c --- trunk/reactos/lib/ntdll/rtl/crc32.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/crc32.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -17,8 +17,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ /* CRC polynomial 0xedb88320 */ _____ Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -12,8 +12,9 @@ /* INCLUDES ******************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c --- trunk/reactos/lib/ntdll/rtl/dbgbuffer.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/dbgbuffer.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -31,8 +31,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/exception.c --- trunk/reactos/lib/ntdll/rtl/exception.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/exception.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -14,8 +14,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> static RTL_CRITICAL_SECTION RtlpVectoredExceptionLock; static LIST_ENTRY RtlpVectoredExceptionHead; _____ Modified: trunk/reactos/lib/ntdll/rtl/handle.c --- trunk/reactos/lib/ntdll/rtl/handle.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/handle.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -9,8 +9,9 @@ /* INCLUDES ******************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c --- trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -9,8 +9,9 @@ * */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/math.c --- trunk/reactos/lib/ntdll/rtl/math.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/math.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -17,8 +17,9 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> double atan (double __x); double ceil (double __x); _____ Modified: trunk/reactos/lib/ntdll/rtl/message.c --- trunk/reactos/lib/ntdll/rtl/message.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/message.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> #include <ddk/ldrfuncs.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/misc.c --- trunk/reactos/lib/ntdll/rtl/misc.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/misc.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /********************************************************************** * NAME EXPORTED _____ Modified: trunk/reactos/lib/ntdll/rtl/path.c --- trunk/reactos/lib/ntdll/rtl/path.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/path.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -10,8 +10,9 @@ /* INCLUDES ******************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* DEFINITONS and MACROS ******************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/process.c --- trunk/reactos/lib/ntdll/rtl/process.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/process.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -11,8 +11,9 @@ /* INCLUDES ****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/propvar.c --- trunk/reactos/lib/ntdll/rtl/propvar.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/propvar.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -5,8 +5,9 @@ * FILE: lib/ntdll/csr/propvar.c * PURPOSE: CSRSS properties and variants API */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* * @unimplemented _____ Modified: trunk/reactos/lib/ntdll/rtl/rangelist.c --- trunk/reactos/lib/ntdll/rtl/rangelist.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/rangelist.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -26,8 +26,9 @@ /* INCLUDES ****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> typedef struct _RTL_RANGE_ENTRY { _____ Modified: trunk/reactos/lib/ntdll/rtl/resource.c --- trunk/reactos/lib/ntdll/rtl/resource.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/resource.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -18,8 +18,9 @@ * The code is based on information published in WDJ January 1999 issue. */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/teb.c --- trunk/reactos/lib/ntdll/rtl/teb.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/teb.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -6,8 +6,9 @@ * PURPOSE: */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> PTEB STDCALL _____ Modified: trunk/reactos/lib/ntdll/rtl/timerqueue.c --- trunk/reactos/lib/ntdll/rtl/timerqueue.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/timerqueue.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -26,8 +26,9 @@ /* INCLUDES ****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); _____ Modified: trunk/reactos/lib/ntdll/rtl/trace.c --- trunk/reactos/lib/ntdll/rtl/trace.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/rtl/trace.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -26,8 +26,9 @@ /* INCLUDES *****************************************************************/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/stdio/sprintf.c --- trunk/reactos/lib/ntdll/stdio/sprintf.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/stdio/sprintf.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -24,8 +24,9 @@ #include <ctype.h> #include <limits.h> +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> #define ZEROPAD 1 /* pad with zero */ _____ Modified: trunk/reactos/lib/ntdll/stdio/sscanf.c --- trunk/reactos/lib/ntdll/stdio/sscanf.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/stdio/sscanf.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -1,7 +1,8 @@ /**/ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> #include <stdio.h> /* helper function for *scanf. Returns the value of character c in the _____ Modified: trunk/reactos/lib/ntdll/stdio/swprintf.c --- trunk/reactos/lib/ntdll/stdio/swprintf.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/stdio/swprintf.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -22,8 +22,9 @@ * Wirzenius wrote this portably, Torvalds fucked it up :-) */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> #include <wchar.h> #include <limits.h> _____ Modified: trunk/reactos/lib/ntdll/stdlib/mbstowcs.c --- trunk/reactos/lib/ntdll/stdlib/mbstowcs.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/stdlib/mbstowcs.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -6,8 +6,9 @@ * PURPOSE: converts a multi byte string to a unicode string */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> #include <stdlib.h> #include <string.h> /* _____ Modified: trunk/reactos/lib/ntdll/stdlib/wcstombs.c --- trunk/reactos/lib/ntdll/stdlib/wcstombs.c 2005-06-19 22:32:51 UTC (rev 16125) +++ trunk/reactos/lib/ntdll/stdlib/wcstombs.c 2005-06-19 22:50:59 UTC (rev 16126) @@ -6,8 +6,9 @@ * PURPOSE: converts a unicode string to a multi byte string */ +#include <ntdll.h> #define NDEBUG -#include <ntdll.h> +#include <debug.h> #include <stdlib.h> #include <string.h>

1 0

[navaraf] 16125: TIME -> LARGE_INTEGER
by navaraf＠svn.reactos.com 19 Jun '05

19 Jun '05

TIME -> LARGE_INTEGER Modified: trunk/reactos/lib/kernel32/file/copy.c _____ Modified: trunk/reactos/lib/kernel32/file/copy.c --- trunk/reactos/lib/kernel32/file/copy.c 2005-06-19 22:19:11 UTC (rev 16124) +++ trunk/reactos/lib/kernel32/file/copy.c 2005-06-19 22:32:51 UTC (rev 16125) @@ -157,7 +157,7 @@ static NTSTATUS SetLastWriteTime( HANDLE FileHandle, - TIME LastWriteTime + LARGE_INTEGER LastWriteTime ) { NTSTATUS errCode = STATUS_SUCCESS; @@ -268,7 +268,7 @@ } else { - TIME t; + LARGE_INTEGER t; t.QuadPart = FileBasic.LastWriteTime.QuadPart; errCode = SetLastWriteTime(FileHandleDest, t);

1 0

[hpoussin] 16124: Implement IRP_MJ_CLEANUP for UHCI controller
by hpoussin＠svn.reactos.com 19 Jun '05

19 Jun '05

Implement IRP_MJ_CLEANUP for UHCI controller Added: trunk/reactos/drivers/usb/cromwell/uhci/cleanup.c Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci.c Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci.h Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci.xml _____ Added: trunk/reactos/drivers/usb/cromwell/uhci/cleanup.c --- trunk/reactos/drivers/usb/cromwell/uhci/cleanup.c 2005-06-19 22:13:41 UTC (rev 16123) +++ trunk/reactos/drivers/usb/cromwell/uhci/cleanup.c 2005-06-19 22:19:11 UTC (rev 16124) @@ -0,0 +1,24 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS UHCI controller driver (Cromwell type) + * FILE: drivers/usb/cromwell/uhci/cleanup.c + * PURPOSE: IRP_MJ_CLEANUP operations + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) + */ + +#define NDEBUG +#include "uhci.h" + +NTSTATUS STDCALL +UhciCleanup( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("UHCI: IRP_MJ_CLEANUP\n"); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} Property changes on: trunk/reactos/drivers/usb/cromwell/uhci/cleanup.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci.c --- trunk/reactos/drivers/usb/cromwell/uhci/uhci.c 2005-06-19 22:13:41 UTC (rev 16123) +++ trunk/reactos/drivers/usb/cromwell/uhci/uhci.c 2005-06-19 22:19:11 UTC (rev 16124) @@ -245,6 +245,15 @@ } static NTSTATUS STDCALL +DispatchCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + if (((POHCI_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) + return UhciCleanup(DeviceObject, Irp); + else + return IrpStub(DeviceObject, Irp); +} + +static NTSTATUS STDCALL DispatchDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { if (((POHCI_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) @@ -289,6 +298,7 @@ DriverObject->MajorFunction[IRP_MJ_CREATE] = DispatchCreate; DriverObject->MajorFunction[IRP_MJ_CLOSE] = DispatchClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = DispatchCleanup; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DispatchDeviceControl; DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; DriverObject->MajorFunction[IRP_MJ_POWER] = DispatchPower; _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci.h --- trunk/reactos/drivers/usb/cromwell/uhci/uhci.h 2005-06-19 22:13:41 UTC (rev 16123) +++ trunk/reactos/drivers/usb/cromwell/uhci/uhci.h 2005-06-19 22:19:11 UTC (rev 16124) @@ -12,9 +12,9 @@ #define USB_UHCI_TAG TAG('u','s','b','u') -/* create.c */ +/* cleanup.c */ NTSTATUS STDCALL -UhciCreate( +UhciCleanup( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); @@ -24,6 +24,12 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +/* create.c */ +NTSTATUS STDCALL +UhciCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + /* fdo.c */ NTSTATUS STDCALL UhciPnpFdo( _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci.xml --- trunk/reactos/drivers/usb/cromwell/uhci/uhci.xml 2005-06-19 22:13:41 UTC (rev 16123) +++ trunk/reactos/drivers/usb/cromwell/uhci/uhci.xml 2005-06-19 22:19:11 UTC (rev 16124) @@ -7,6 +7,7 @@ <library>ntoskrnl</library> <library>hal</library> <library>usbcore</library> + <file>cleanup.c</file> <file>close.c</file> <file>create.c</file> <file>fdo.c</file>

1 0

[navaraf] 16123: - Don't include ntddk.h from most of the DDK headers and move the includes out of the "extern C" blocks.
by navaraf＠svn.reactos.com 19 Jun '05

19 Jun '05

- Don't include ntddk.h from most of the DDK headers and move the includes out of the "extern C" blocks. - Fix order of STDCALL in few callback defintions. - Get the sources to build again with these changes. Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h Modified: trunk/reactos/drivers/video/miniport/vga/initvga.c Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.h Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h Modified: trunk/reactos/drivers/video/videoprt/videoprt.h Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c Modified: trunk/reactos/include/win32k/driver.h Modified: trunk/reactos/lib/gdi32/include/precomp.h Modified: trunk/reactos/lib/opengl32/teb.h Modified: trunk/reactos/w32api/include/ddk/batclass.h Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h Modified: trunk/reactos/w32api/include/ddk/d4drvif.h Modified: trunk/reactos/w32api/include/ddk/d4iface.h Modified: trunk/reactos/w32api/include/ddk/ddkmapi.h Modified: trunk/reactos/w32api/include/ddk/hidclass.h Modified: trunk/reactos/w32api/include/ddk/hidpi.h Modified: trunk/reactos/w32api/include/ddk/mcd.h Modified: trunk/reactos/w32api/include/ddk/miniport.h Modified: trunk/reactos/w32api/include/ddk/minitape.h Modified: trunk/reactos/w32api/include/ddk/mountdev.h Modified: trunk/reactos/w32api/include/ddk/mountmgr.h Modified: trunk/reactos/w32api/include/ddk/ndis.h Modified: trunk/reactos/w32api/include/ddk/ndistapi.h Modified: trunk/reactos/w32api/include/ddk/ndiswan.h Modified: trunk/reactos/w32api/include/ddk/ntagp.h Modified: trunk/reactos/w32api/include/ddk/ntapi.h Modified: trunk/reactos/w32api/include/ddk/ntdd8042.h Modified: trunk/reactos/w32api/include/ddk/ntddbeep.h Modified: trunk/reactos/w32api/include/ddk/ntddcdrm.h Modified: trunk/reactos/w32api/include/ddk/ntddcdvd.h Modified: trunk/reactos/w32api/include/ddk/ntddchgr.h Modified: trunk/reactos/w32api/include/ddk/ntdddisk.h Modified: trunk/reactos/w32api/include/ddk/ntddk.h Modified: trunk/reactos/w32api/include/ddk/ntddkbd.h Modified: trunk/reactos/w32api/include/ddk/ntddmou.h Modified: trunk/reactos/w32api/include/ddk/ntddndis.h Modified: trunk/reactos/w32api/include/ddk/ntddpar.h Modified: trunk/reactos/w32api/include/ddk/ntddpcm.h Modified: trunk/reactos/w32api/include/ddk/ntddscsi.h Modified: trunk/reactos/w32api/include/ddk/ntddser.h Modified: trunk/reactos/w32api/include/ddk/ntddstor.h Modified: trunk/reactos/w32api/include/ddk/ntddtape.h Modified: trunk/reactos/w32api/include/ddk/ntddtdi.h Modified: trunk/reactos/w32api/include/ddk/ntddvdeo.h Modified: trunk/reactos/w32api/include/ddk/ntddvol.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/ntpoapi.h Modified: trunk/reactos/w32api/include/ddk/parallel.h Modified: trunk/reactos/w32api/include/ddk/pfhook.h Modified: trunk/reactos/w32api/include/ddk/poclass.h Modified: trunk/reactos/w32api/include/ddk/scsi.h Modified: trunk/reactos/w32api/include/ddk/scsiscan.h Modified: trunk/reactos/w32api/include/ddk/scsiwmi.h Modified: trunk/reactos/w32api/include/ddk/srb.h Modified: trunk/reactos/w32api/include/ddk/storport.h Modified: trunk/reactos/w32api/include/ddk/tdi.h Modified: trunk/reactos/w32api/include/ddk/tdiinfo.h Modified: trunk/reactos/w32api/include/ddk/tdikrnl.h Modified: trunk/reactos/w32api/include/ddk/tvout.h Modified: trunk/reactos/w32api/include/ddk/upssvc.h Modified: trunk/reactos/w32api/include/ddk/usb.h Modified: trunk/reactos/w32api/include/ddk/usb100.h Modified: trunk/reactos/w32api/include/ddk/usbcamdi.h Modified: trunk/reactos/w32api/include/ddk/usbdi.h Modified: trunk/reactos/w32api/include/ddk/usbioctl.h Modified: trunk/reactos/w32api/include/ddk/usbiodef.h Modified: trunk/reactos/w32api/include/ddk/usbscan.h Modified: trunk/reactos/w32api/include/ddk/usbuser.h Modified: trunk/reactos/w32api/include/ddk/video.h Modified: trunk/reactos/w32api/include/ddk/videoagp.h Modified: trunk/reactos/w32api/include/ddk/win2k.h Modified: trunk/reactos/w32api/include/ddk/winddi.h Modified: trunk/reactos/w32api/include/ddk/ws2san.h Modified: trunk/reactos/w32api/include/ddk/xfilter.h _____ Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -23,6 +23,7 @@ #include <windef.h> #include <wingdi.h> +#include <ddk/ntddk.h> #include <ddk/winddi.h> #include <ddk/ntddvdeo.h> _____ Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-06-19 22:13:41 UTC (rev 16123) @@ -1,3 +1,4 @@ +#include <ddk/ntddk.h> #include <ddk/ntddvdeo.h> #include <ddk/winddi.h> #include <ntos/minmax.h> _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -23,9 +23,7 @@ /* INCLUDES *******************************************************************/ -#include "stddef.h" -#include "windef.h" -#include "wingdi.h" +#include <ddk/ntddk.h> #include <ddk/miniport.h> #include <ddk/video.h> #include <ddk/ntddvdeo.h> _____ Modified: trunk/reactos/drivers/video/miniport/vga/initvga.c --- trunk/reactos/drivers/video/miniport/vga/initvga.c 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/drivers/video/miniport/vga/initvga.c 2005-06-19 22:13:41 UTC (rev 16123) @@ -1,3 +1,4 @@ +#include <ddk/ntddk.h> #include <ddk/miniport.h> #include <ddk/video.h> #include "vgavideo.h" _____ Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.h --- trunk/reactos/drivers/video/miniport/vga/vgamp.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -23,6 +23,7 @@ /* INCLUDES *******************************************************************/ +#include <ddk/ntddk.h> #include <ddk/miniport.h> #include <ddk/video.h> #include <ddk/ntddvdeo.h> _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -24,9 +24,7 @@ /* INCLUDES *******************************************************************/ -#include "stddef.h" -#include "windef.h" -#include "wingdi.h" +#include <ddk/ntddk.h> #include <ddk/miniport.h> #include <ddk/video.h> #include <ddk/ntddvdeo.h> _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.h --- trunk/reactos/drivers/video/videoprt/videoprt.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/drivers/video/videoprt/videoprt.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -24,6 +24,7 @@ #ifndef VIDEOPRT_H #define VIDEOPRT_H +#include <ddk/ntddk.h> #include <ddk/miniport.h> #include <ddk/video.h> #include <ddk/ntddvdeo.h> _____ Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c --- trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-06-19 22:13:41 UTC (rev 16123) @@ -11,8 +11,8 @@ /* INCLUDES *****************************************************************/ +#include <hal.h> #include <ddk/ntdddisk.h> -#include <hal.h> #include "halxbox.h" #define NDEBUG _____ Modified: trunk/reactos/include/win32k/driver.h --- trunk/reactos/include/win32k/driver.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/include/win32k/driver.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -2,6 +2,7 @@ #ifndef __WIN32K_DRIVER_H #define __WIN32K_DRIVER_H +#include <ddk/ntddk.h> #include <ddk/winddi.h> typedef BOOL (STDCALL *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); _____ Modified: trunk/reactos/lib/gdi32/include/precomp.h --- trunk/reactos/lib/gdi32/include/precomp.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/lib/gdi32/include/precomp.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -1,8 +1,9 @@ #include <wine/windef.h> #include <windows.h> #include <ddraw.h> +#include <string.h> +#include <ddk/ntddk.h> #include <ddentry.h> -#include <string.h> #include <win32k/kapi.h> #include <ddk/prntfont.h> #include <rosrtl/logfont.h> _____ Modified: trunk/reactos/lib/opengl32/teb.h --- trunk/reactos/lib/opengl32/teb.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/lib/opengl32/teb.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,7 +27,7 @@ #else/*_MSC_VER*/ -#include <ntos/types.h> -#include <napi/teb.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #endif/*_MSC_VER*/ _____ Modified: trunk/reactos/w32api/include/ddk/batclass.h --- trunk/reactos/w32api/include/ddk/batclass.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/batclass.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #if defined(_BATTERYCLASS_) #define BCLASSAPI DECLSPEC_EXPORT #else _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,20 +27,18 @@ #pragma GCC system_header #endif +#include "cfg.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" - #if defined(_CFGMGR32_) #define CMAPI DECLSPEC_EXPORT #else #define CMAPI DECLSPEC_IMPORT #endif -#include "cfg.h" - #include <pshpack1.h> #define CR_SUCCESS 0x00000000 _____ Modified: trunk/reactos/w32api/include/ddk/d4drvif.h --- trunk/reactos/w32api/include/ddk/d4drvif.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/d4drvif.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "d4iface.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "d4iface.h" - #define FILE_DEVICE_DOT4 0x3a #define IOCTL_DOT4_USER_BASE 2049 _____ Modified: trunk/reactos/w32api/include/ddk/d4iface.h --- trunk/reactos/w32api/include/ddk/d4iface.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/d4iface.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #define DOT4_MAX_CHANNELS 128 #define NO_TIMEOUT 0 _____ Modified: trunk/reactos/w32api/include/ddk/ddkmapi.h --- trunk/reactos/w32api/include/ddk/ddkmapi.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ddkmapi.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #if defined(_DXAPI_) #define DXAPI DECLSPEC_EXPORT #else _____ Modified: trunk/reactos/w32api/include/ddk/hidclass.h --- trunk/reactos/w32api/include/ddk/hidclass.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/hidclass.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "hidpi.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "hidpi.h" - #define HID_REVISION 0x00000001 DEFINE_GUID (GUID_DEVINTERFACE_HID, \ _____ Modified: trunk/reactos/w32api/include/ddk/hidpi.h --- trunk/reactos/w32api/include/ddk/hidpi.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/hidpi.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "hidusage.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "hidusage.h" - #if defined(_HIDPI_) #define HIDAPI DECLSPEC_EXPORT #else _____ Modified: trunk/reactos/w32api/include/ddk/mcd.h --- trunk/reactos/w32api/include/ddk/mcd.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/mcd.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,15 +27,14 @@ #pragma GCC system_header #endif -#ifdef __cplusplus -extern "C" { -#endif - -#include "ntddk.h" #include "srb.h" #include "scsi.h" #include "ntddchgr.h" +#ifdef __cplusplus +extern "C" { +#endif + #if defined(_MCD_) #define CHANGERAPI DECLSPEC_EXPORT #else _____ Modified: trunk/reactos/w32api/include/ddk/miniport.h --- trunk/reactos/w32api/include/ddk/miniport.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/miniport.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #define EMULATOR_READ_ACCESS 0x01 #define EMULATOR_WRITE_ACCESS 0x02 _____ Modified: trunk/reactos/w32api/include/ddk/minitape.h --- trunk/reactos/w32api/include/ddk/minitape.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/minitape.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -32,8 +32,6 @@ #pragma pack(push,4) -#include "ntddk.h" - #define MEDIA_ERASEABLE 0x00000001 #define MEDIA_WRITE_ONCE 0x00000002 #define MEDIA_READ_ONLY 0x00000004 _____ Modified: trunk/reactos/w32api/include/ddk/mountdev.h --- trunk/reactos/w32api/include/ddk/mountdev.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/mountdev.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "mountmgr.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "mountmgr.h" - #define IOCTL_MOUNTDEV_QUERY_DEVICE_NAME \ CTL_CODE(MOUNTDEVCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) _____ Modified: trunk/reactos/w32api/include/ddk/mountmgr.h --- trunk/reactos/w32api/include/ddk/mountmgr.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/mountmgr.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - DEFINE_GUID(MOUNTDEV_MOUNTED_DEVICE_GUID, 0x53f5630d, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); _____ Modified: trunk/reactos/w32api/include/ddk/ndis.h --- trunk/reactos/w32api/include/ddk/ndis.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ndis.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -36,16 +36,16 @@ #pragma GCC system_header #endif -#ifdef __cplusplus -extern "C" { -#endif - #include "ntddk.h" #include "ntddndis.h" #include "netpnp.h" #include "netevent.h" #include <winsock2.h> +#ifdef __cplusplus +extern "C" { +#endif + #if defined(NDIS_WRAPPER) #define NDISAPI DECLSPEC_EXPORT #else _____ Modified: trunk/reactos/w32api/include/ddk/ndistapi.h --- trunk/reactos/w32api/include/ddk/ndistapi.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ndistapi.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,12 +27,12 @@ #pragma GCC system_header #endif +#include "ndis.h" + #ifdef __cplusplus extern "C" { #endif -#include "ndis.h" - #ifndef NDIS_TAPI_CURRENT_VERSION #define NDIS_TAPI_CURRENT_VERSION 0x00010003 #endif _____ Modified: trunk/reactos/w32api/include/ddk/ndiswan.h --- trunk/reactos/w32api/include/ddk/ndiswan.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ndiswan.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,12 +27,12 @@ #pragma GCC system_header #endif +#include "ndis.h" + #ifdef __cplusplus extern "C" { #endif -#include "ndis.h" - #define NDIS_USE_WAN_WRAPPER 0x00000001 #define NDIS_STATUS_TAPI_INDICATION ((NDIS_STATUS)0x40010080L) _____ Modified: trunk/reactos/w32api/include/ddk/ntagp.h --- trunk/reactos/w32api/include/ddk/ntagp.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntagp.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,14 +27,12 @@ #pragma GCC system_header #endif +#include "video.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "video.h" - - #define AGP_BUS_INTERFACE_V1 1L #define AGP_BUS_INTERFACE_V2 2L _____ Modified: trunk/reactos/w32api/include/ddk/ntapi.h --- trunk/reactos/w32api/include/ddk/ntapi.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntapi.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -30,15 +30,15 @@ #pragma GCC system_header #endif -#ifdef __cplusplus -extern "C" { -#endif - #include <stdarg.h> #include <winbase.h> #include "ntddk.h" #include "ntpoapi.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef struct _PEB *PPEB; /* FIXME: Unknown definitions */ _____ Modified: trunk/reactos/w32api/include/ddk/ntdd8042.h --- trunk/reactos/w32api/include/ddk/ntdd8042.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntdd8042.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,14 +27,13 @@ #pragma GCC system_header #endif +#include "ntddkbd.h" +#include "ntddmou.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "ntddkbd.h" -#include "ntddmou.h" - #define IOCTL_INTERNAL_I8042_CONTROLLER_WRITE_BUFFER \ CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0FF2, METHOD_NEITHER, FILE_ANY_ACCESS) _____ Modified: trunk/reactos/w32api/include/ddk/ntddbeep.h --- trunk/reactos/w32api/include/ddk/ntddbeep.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddbeep.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #define DD_BEEP_DEVICE_NAME "\\Device\\Beep" #define DD_BEEP_DEVICE_NAME_U L"\\Device\\Beep" _____ Modified: trunk/reactos/w32api/include/ddk/ntddcdrm.h --- trunk/reactos/w32api/include/ddk/ntddcdrm.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddcdrm.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "ntddstor.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "ntddstor.h" - #define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM #define IOCTL_CDROM_CHECK_VERIFY \ _____ Modified: trunk/reactos/w32api/include/ddk/ntddcdvd.h --- trunk/reactos/w32api/include/ddk/ntddcdvd.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddcdvd.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "ntddstor.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "ntddstor.h" - #define IOCTL_DVD_BASE FILE_DEVICE_DVD #define IOCTL_DVD_END_SESSION \ _____ Modified: trunk/reactos/w32api/include/ddk/ntddchgr.h --- trunk/reactos/w32api/include/ddk/ntddchgr.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddchgr.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "ntddstor.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "ntddstor.h" - #define DD_CHANGER_DEVICE_NAME "\\Device\\Changer" #define DD_CHANGER_DEVICE_NAME_U L"\\Device\\Changer" _____ Modified: trunk/reactos/w32api/include/ddk/ntdddisk.h --- trunk/reactos/w32api/include/ddk/ntdddisk.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntdddisk.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "ntddstor.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "ntddstor.h" - #define DD_DISK_DEVICE_NAME "\\Device\\UNKNOWN" #define DD_DISK_DEVICE_NAME_U L"\\Device\\UNKNOWN" _____ Modified: trunk/reactos/w32api/include/ddk/ntddk.h --- trunk/reactos/w32api/include/ddk/ntddk.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddk.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,10 +31,6 @@ #pragma GCC system_header #endif -#ifdef __cplusplus -extern "C" { -#endif - #include <stdarg.h> #include <windef.h> #include <ntdef.h> @@ -79,8 +75,4 @@ /* Definitions only in Windows NT 4 */ #include "winnt4.h" -#ifdef __cplusplus -} -#endif - #endif /* __NTDDK_H */ _____ Modified: trunk/reactos/w32api/include/ddk/ntddkbd.h --- trunk/reactos/w32api/include/ddk/ntddkbd.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddkbd.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #define DD_KEYBOARD_DEVICE_NAME "\\Device\\KeyboardClass" #define DD_KEYBOARD_DEVICE_NAME_U L"\\Device\\KeyboardClass" _____ Modified: trunk/reactos/w32api/include/ddk/ntddmou.h --- trunk/reactos/w32api/include/ddk/ntddmou.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddmou.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #define DD_MOUSE_DEVICE_NAME "\\Device\\PointerClass" #define DD_MOUSE_DEVICE_NAME_U L"\\Device\\PointerClass" _____ Modified: trunk/reactos/w32api/include/ddk/ntddndis.h --- trunk/reactos/w32api/include/ddk/ntddndis.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddndis.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -29,8 +29,6 @@ #pragma pack(push,4) -#include "ntddk.h" - #ifdef __cplusplus extern "C" { #endif _____ Modified: trunk/reactos/w32api/include/ddk/ntddpar.h --- trunk/reactos/w32api/include/ddk/ntddpar.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddpar.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - /* Parallel port device GUIDs */ DEFINE_GUID (GUID_DEVINTERFACE_PARALLEL, _____ Modified: trunk/reactos/w32api/include/ddk/ntddpcm.h --- trunk/reactos/w32api/include/ddk/ntddpcm.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddpcm.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #define IOCTL_PCMCIA_BASE FILE_DEVICE_CONTROLLER #define DD_PCMCIA_DEVICE_NAME "\\\\.\\Pcmcia" _____ Modified: trunk/reactos/w32api/include/ddk/ntddscsi.h --- trunk/reactos/w32api/include/ddk/ntddscsi.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddscsi.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #define DD_SCSI_DEVICE_NAME "\\Device\\ScsiPort" #define DD_SCSI_DEVICE_NAME_U L"\\Device\\ScsiPort" _____ Modified: trunk/reactos/w32api/include/ddk/ntddser.h --- trunk/reactos/w32api/include/ddk/ntddser.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddser.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - /* GUIDs */ DEFINE_GUID(GUID_DEVINTERFACE_COMPORT, _____ Modified: trunk/reactos/w32api/include/ddk/ntddstor.h --- trunk/reactos/w32api/include/ddk/ntddstor.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddstor.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE #define IOCTL_STORAGE_CHECK_VERIFY \ _____ Modified: trunk/reactos/w32api/include/ddk/ntddtape.h --- trunk/reactos/w32api/include/ddk/ntddtape.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddtape.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "ntddstor.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "ntddstor.h" - #define DD_TAPE_DEVICE_NAME "\\Device\\Tape" #define DD_TAPE_DEVICE_NAME_U L"\\Device\\Tape" _____ Modified: trunk/reactos/w32api/include/ddk/ntddtdi.h --- trunk/reactos/w32api/include/ddk/ntddtdi.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddtdi.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #define DD_TDI_DEVICE_NAME "\\Device\\UNKNOWN" #define DD_TDI_DEVICE_NAME_U L"\\Device\\UNKNOWN" _____ Modified: trunk/reactos/w32api/include/ddk/ntddvdeo.h --- trunk/reactos/w32api/include/ddk/ntddvdeo.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddvdeo.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,9 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - - #define VIDEO_DEVICE_NAME "DISPLAY%d" #define WVIDEO_DEVICE_NAME L"DISPLAY%d" _____ Modified: trunk/reactos/w32api/include/ddk/ntddvol.h --- trunk/reactos/w32api/include/ddk/ntddvol.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntddvol.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #define IOCTL_VOLUME_BASE ((ULONG) 'V') #define IOCTL_VOLUME_LOGICAL_TO_PHYSICAL \ _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -28,13 +28,13 @@ #pragma GCC system_header #endif +#include "ntddk.h" +#include "ntapi.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "ntapi.h" - #pragma pack(push,4) #define VER_PRODUCTBUILD 10000 _____ Modified: trunk/reactos/w32api/include/ddk/ntpoapi.h --- trunk/reactos/w32api/include/ddk/ntpoapi.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/ntpoapi.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "batclass.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "batclass.h" - #define POWER_PERF_SCALE 100 #define PERF_LEVEL_TO_PERCENT(x) (((x) * 1000) / (POWER_PERF_SCALE * 10)) #define PERCENT_TO_PERF_LEVEL(x) (((x) * POWER_PERF_SCALE * 10) / 1000) _____ Modified: trunk/reactos/w32api/include/ddk/parallel.h --- trunk/reactos/w32api/include/ddk/parallel.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/parallel.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "ntddpar.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "ntddpar.h" - #define DD_PARALLEL_PORT_BASE_NAME "ParallelPort" #define DD_PARALLEL_PORT_BASE_NAME_U L"ParallelPort" _____ Modified: trunk/reactos/w32api/include/ddk/pfhook.h --- trunk/reactos/w32api/include/ddk/pfhook.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/pfhook.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #define DD_IPFLTRDRVR_DEVICE_NAME L"\\Device\\IPFILTERDRIVER" #define INVALID_PF_IF_INDEX 0xffffffff _____ Modified: trunk/reactos/w32api/include/ddk/poclass.h --- trunk/reactos/w32api/include/ddk/poclass.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/poclass.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "batclass.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "batclass.h" - DEFINE_GUID(GUID_CLASS_INPUT, 0x4D1E55B2L, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30); _____ Modified: trunk/reactos/w32api/include/ddk/scsi.h --- trunk/reactos/w32api/include/ddk/scsi.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/scsi.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - typedef union _CDB { struct _CDB6GENERIC { UCHAR OperationCode; _____ Modified: trunk/reactos/w32api/include/ddk/scsiscan.h --- trunk/reactos/w32api/include/ddk/scsiscan.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/scsiscan.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #define IOCTL_SCSISCAN_CMD \ CTL_CODE(FILE_DEVICE_SCANNER, SCSISCAN_CMD_CODE, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) _____ Modified: trunk/reactos/w32api/include/ddk/scsiwmi.h --- trunk/reactos/w32api/include/ddk/scsiwmi.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/scsiwmi.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,16 +27,14 @@ #pragma GCC system_header #endif +#include "srb.h" + #ifdef __cplusplus extern "C" { #endif #pragma pack(push,4) -#include "ntddk.h" -#include "srb.h" - - typedef struct _SCSIWMI_REQUEST_CONTEXT { PVOID UserContext; ULONG BufferSize; _____ Modified: trunk/reactos/w32api/include/ddk/srb.h --- trunk/reactos/w32api/include/ddk/srb.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/srb.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - #if defined(_SCSIPORT_) #define SCSIPORTAPI DECLSPEC_EXPORT #else _____ Modified: trunk/reactos/w32api/include/ddk/storport.h --- trunk/reactos/w32api/include/ddk/storport.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/storport.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "srb.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "srb.h" - #if defined(_STORPORT_) #define STORPORTAPI DECLSPEC_EXPORT #else _____ Modified: trunk/reactos/w32api/include/ddk/tdi.h --- trunk/reactos/w32api/include/ddk/tdi.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/tdi.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,15 +27,14 @@ #pragma GCC system_header #endif -#ifdef __cplusplus -extern "C" { -#endif - -#include "ntddk.h" #include "ntddtdi.h" #include "tdistat.h" #include "netpnp.h" +#ifdef __cplusplus +extern "C" { +#endif + /* Basic types */ typedef LONG TDI_STATUS; _____ Modified: trunk/reactos/w32api/include/ddk/tdiinfo.h --- trunk/reactos/w32api/include/ddk/tdiinfo.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/tdiinfo.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif -#include "ntddk.h" - typedef struct TDIEntityID { ULONG tei_entity; ULONG tei_instance; _____ Modified: trunk/reactos/w32api/include/ddk/tdikrnl.h --- trunk/reactos/w32api/include/ddk/tdikrnl.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/tdikrnl.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -27,13 +27,12 @@ #pragma GCC system_header #endif +#include "tdi.h" + #ifdef __cplusplus extern "C" { #endif -#include "ntddk.h" -#include "tdi.h" - #if defined(_TDI_) #define TDIKRNLAPI DECLSPEC_EXPORT #else _____ Modified: trunk/reactos/w32api/include/ddk/tvout.h --- trunk/reactos/w32api/include/ddk/tvout.h 2005-06-19 22:11:09 UTC (rev 16122) +++ trunk/reactos/w32api/include/ddk/tvout.h 2005-06-19 22:13:41 UTC (rev 16123) @@ -31,8 +31,6 @@ extern "C" { #endif [truncated at 1000 lines; 663 more skipped]

1 0

[hpoussin] 16122: Implement IOCTL_GET_HCD_DRIVERKEY_NAME
by hpoussin＠svn.reactos.com 19 Jun '05

19 Jun '05

Implement IOCTL_GET_HCD_DRIVERKEY_NAME Better check for arguments in IOCTL_* Let IOCTL_USB_GET_ROOT_HUB_NAME use the right structure type Initialize wrapper around linux code after setting the device extension field Modified: trunk/reactos/drivers/usb/cromwell/uhci/fdo.c _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/fdo.c --- trunk/reactos/drivers/usb/cromwell/uhci/fdo.c 2005-06-19 22:05:50 UTC (rev 16121) +++ trunk/reactos/drivers/usb/cromwell/uhci/fdo.c 2005-06-19 22:11:09 UTC (rev 16122) @@ -31,10 +31,10 @@ DeviceExtension->pdev = dev; /* Initialize generic linux structure */ - init_wrapper(dev); dev->irq = DeviceExtension->InterruptVector; dev->dev_ext = (PVOID)DeviceExtension; dev->slot_name = ExAllocatePoolWithTag(NonPagedPool, 128, USB_UHCI_TAG); // 128 max len for slot name + init_wrapper(dev); strcpy(dev->dev.name, "UnivHCI PCI-USB Controller"); strcpy(dev->slot_name, "UHCD PCI Slot"); @@ -326,12 +326,11 @@ { case IOCTL_GET_HCD_DRIVERKEY_NAME: { - DPRINT1("UHCI: IOCTL_GET_HCD_DRIVERKEY_NAME does not return correct string\n"); - /* FIXME: should return sth like {36FC9E60-C465-11CF-8056-444553540000}\0000 */ + DPRINT("UHCI: IOCTL_GET_HCD_DRIVERKEY_NAME\n"); if (LengthOut < sizeof(USB_HCD_DRIVERKEY_NAME)) - { Status = STATUS_BUFFER_TOO_SMALL; - } + else if (BufferOut == NULL) + Status = STATUS_INVALID_PARAMETER; else { PUSB_HCD_DRIVERKEY_NAME StringDescriptor; @@ -339,7 +338,7 @@ StringDescriptor = (PUSB_HCD_DRIVERKEY_NAME)BufferOut; Status = IoGetDeviceProperty( ((POHCI_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PhysicalDeviceO bject, - DevicePropertyDeviceDescription, + DevicePropertyDriverKeyName, LengthOut - FIELD_OFFSET(USB_HCD_DRIVERKEY_NAME, DriverKeyName), StringDescriptor->DriverKeyName, &StringSize); @@ -356,43 +355,36 @@ case IOCTL_USB_GET_ROOT_HUB_NAME: { DPRINT("UHCI: IOCTL_USB_GET_ROOT_HUB_NAME\n"); - if (LengthOut < sizeof(USB_HCD_DRIVERKEY_NAME)) - { + if (LengthOut < sizeof(USB_ROOT_HUB_NAME)) Status = STATUS_BUFFER_TOO_SMALL; - } + else if (BufferOut == NULL) + Status = STATUS_INVALID_PARAMETER; else { - PUSB_HCD_DRIVERKEY_NAME StringDescriptor; + PUSB_ROOT_HUB_NAME StringDescriptor; PUNICODE_STRING RootHubInterfaceName; - StringDescriptor = (PUSB_HCD_DRIVERKEY_NAME)BufferOut; + StringDescriptor = (PUSB_ROOT_HUB_NAME)BufferOut; DeviceObject = ((POHCI_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->RootHubPdo; RootHubInterfaceName = &((POHCI_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->HcdInterfaceNa me; - StringDescriptor->ActualLength = RootHubInterfaceName->Length + sizeof(WCHAR) + FIELD_OFFSET(USB_HCD_DRIVERKEY_NAME, DriverKeyName); + StringDescriptor->ActualLength = RootHubInterfaceName->Length + sizeof(WCHAR) + FIELD_OFFSET(USB_ROOT_HUB_NAME, RootHubName); if (StringDescriptor->ActualLength <= LengthOut) { /* Copy root hub name */ RtlCopyMemory( - StringDescriptor->DriverKeyName, + StringDescriptor->RootHubName, RootHubInterfaceName->Buffer, RootHubInterfaceName->Length); - StringDescriptor->DriverKeyName[RootHubInterfaceName->Length / sizeof(WCHAR)] = '\0'; - DPRINT("UHCI: IOCTL_USB_GET_ROOT_HUB_NAME returns '%S'\n", StringDescriptor->DriverKeyName); + StringDescriptor->RootHubName[RootHubInterfaceName->Length / sizeof(WCHAR)] = UNICODE_NULL; + DPRINT("UHCI: IOCTL_USB_GET_ROOT_HUB_NAME returns '%S'\n", StringDescriptor->RootHubName); Information = StringDescriptor->ActualLength; } else - Information = sizeof(USB_HCD_DRIVERKEY_NAME); + Information = sizeof(USB_ROOT_HUB_NAME); Status = STATUS_SUCCESS; } break; } - - /*case IOCTL_USB_GET_NODE_INFORMATION: - { - DPRINT1("UHCI: IOCTL_USB_GET_NODE_INFORMATION\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - }*/ case IOCTL_USB_GET_NODE_CONNECTION_INFORMATION: { DPRINT1("UHCI: IOCTL_USB_GET_NODE_CONNECTION_INFORMATION\n");

1 0

[ion] 16121: Build RTL with NDK
by ion＠svn.reactos.com 19 Jun '05

19 Jun '05

Build RTL with NDK Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/timezone.c Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/lib/rtl/rtl.h --- trunk/reactos/lib/rtl/rtl.h 2005-06-19 22:05:18 UTC (rev 16120) +++ trunk/reactos/lib/rtl/rtl.h 2005-06-19 22:05:50 UTC (rev 16121) @@ -8,29 +8,22 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> -#include <ddk/ntifs.h> +/* PSDK/NDK Headers */ #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 <ntos.h> -#include <stdio.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) -#ifndef HIWORD -#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF)) -#endif -#ifndef LOWORD -#define LOWORD(l) ((WORD)(l)) -#endif +/* Helper Header */ +#include <reactos/helper.h> +/* LIBSUPP Header */ +#include "libsupp.h" + +/* FIXME: Move this somewhere else, maybe */ +#ifdef DBG +extern VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line); +#define PAGED_CODE_RTL() CHECK_PAGED_CODE_RTL(__FILE__, __LINE__) +#else +#define PAGED_CODE_RTL() +#endif /* EOF */ _____ Modified: trunk/reactos/lib/rtl/timezone.c --- trunk/reactos/lib/rtl/timezone.c 2005-06-19 22:05:18 UTC (rev 16120) +++ trunk/reactos/lib/rtl/timezone.c 2005-06-19 22:05:50 UTC (rev 16121) @@ -22,7 +22,7 @@ * @implemented */ NTSTATUS STDCALL -RtlQueryTimeZoneInformation(PTIME_ZONE_INFORMATION TimeZoneInformation) +RtlQueryTimeZoneInformation(LPTIME_ZONE_INFORMATION TimeZoneInformation) { RTL_QUERY_REGISTRY_TABLE QueryTable[8]; UNICODE_STRING StandardName; @@ -86,7 +86,7 @@ * @implemented */ NTSTATUS STDCALL -RtlSetTimeZoneInformation(PTIME_ZONE_INFORMATION TimeZoneInformation) +RtlSetTimeZoneInformation(LPTIME_ZONE_INFORMATION TimeZoneInformation) { ULONG Length; NTSTATUS Status; _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-06-19 22:05:18 UTC (rev 16120) +++ trunk/reactos/lib/rtl/unicode.c 2005-06-19 22:05:50 UTC (rev 16121) @@ -21,6 +21,7 @@ */ #define __NTDRIVER__ #include "rtl.h" +#include <rosrtl/string.h> #define NDEBUG #include <debug.h>

1 0

[ion] 16120: Move internal rtlp functions out of ntos and into internal rosrtl header
by ion＠svn.reactos.com 19 Jun '05

19 Jun '05

Move internal rtlp functions out of ntos and into internal rosrtl header Modified: trunk/reactos/include/ntos/rtl.h Modified: trunk/reactos/include/rosrtl/string.h _____ Modified: trunk/reactos/include/ntos/rtl.h --- trunk/reactos/include/ntos/rtl.h 2005-06-19 21:50:05 UTC (rev 16119) +++ trunk/reactos/include/ntos/rtl.h 2005-06-19 22:05:18 UTC (rev 16120) @@ -4,6 +4,9 @@ #ifndef __DDK_RTL_H #define __DDK_RTL_H +/* RTLP Functions */ +#include <rosrtl/string.h> + #if defined(__NTOSKRNL__) || defined(__NTDRIVER__) || defined(__NTHAL__) || defined(__NTDLL__) || defined (__NTAPP__) #include <stddef.h> @@ -2760,109 +2763,7 @@ RtlxUnicodeStringToOemSize ( IN PUNICODE_STRING UnicodeString ); - -NTSTATUS -FASTCALL -RtlpOemStringToCountedUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToOemString ( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpDowncaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpAnsiStringToUnicodeString( - IN OUT PUNICODE_STRING DestinationString, - IN PANSI_STRING SourceString, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpOemStringToUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -BOOLEAN -FASTCALL -RtlpCreateUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCWSTR Source, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS STDCALL -RtlpDuplicateUnicodeString( - INT AddNull, - IN PUNICODE_STRING SourceString, - PUNICODE_STRING DestinationString, - POOL_TYPE PoolType); - /* Register io functions */ UCHAR _____ Modified: trunk/reactos/include/rosrtl/string.h --- trunk/reactos/include/rosrtl/string.h 2005-06-19 21:50:05 UTC (rev 16119) +++ trunk/reactos/include/rosrtl/string.h 2005-06-19 22:05:18 UTC (rev 16120) @@ -42,6 +42,108 @@ #define ROS_EMPTY_STRING {0, 0, NULL} +NTSTATUS +FASTCALL +RtlpOemStringToCountedUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN POEM_STRING OemSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUpcaseUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PCUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUpcaseUnicodeStringToAnsiString( + IN OUT PANSI_STRING AnsiDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUpcaseUnicodeStringToCountedOemString( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUpcaseUnicodeStringToOemString ( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpDowncaseUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpAnsiStringToUnicodeString( + IN OUT PUNICODE_STRING DestinationString, + IN PANSI_STRING SourceString, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUnicodeStringToAnsiString( + IN OUT PANSI_STRING AnsiDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpOemStringToUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN POEM_STRING OemSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUnicodeStringToOemString( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +BOOLEAN +FASTCALL +RtlpCreateUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PCWSTR Source, + IN POOL_TYPE PoolType); + +NTSTATUS +FASTCALL +RtlpUnicodeStringToCountedOemString( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString, + IN POOL_TYPE PoolType); + +NTSTATUS STDCALL +RtlpDuplicateUnicodeString( + INT AddNull, + IN PUNICODE_STRING SourceString, + PUNICODE_STRING DestinationString, + POOL_TYPE PoolType); + NTSTATUS NTAPI RosAppendUnicodeString( PUNICODE_STRING ResultFirst, PUNICODE_STRING Second, BOOL Deallocate );

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