Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[ekohl] 13826: Support asynchronous (aka overlapped) connect, read and write requests.

by ekohl＠svn.reactos.com

Support asynchronous (aka overlapped) connect, read and write requests. Modified: trunk/reactos/drivers/fs/np/create.c Modified: trunk/reactos/drivers/fs/np/fsctrl.c Modified: trunk/reactos/drivers/fs/np/npfs.h Modified: trunk/reactos/drivers/fs/np/rw.c _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-03-05 11:38:48 UTC (rev 13825) +++ trunk/reactos/drivers/fs/np/create.c 2005-03-05 12:08:50 UTC (rev 13826) @@ -48,17 +48,18 @@ NpfsFindListeningServerInstance(PNPFS_PIPE Pipe) { PLIST_ENTRY CurrentEntry; - PNPFS_FCB ServerFcb; + PNPFS_WAITER_ENTRY Waiter; - CurrentEntry = Pipe->ServerFcbListHead.Flink; - while (CurrentEntry != &Pipe->ServerFcbListHead) + CurrentEntry = Pipe->WaiterListHead.Flink; + while (CurrentEntry != &Pipe->WaiterListHead) { - ServerFcb = CONTAINING_RECORD(CurrentEntry, NPFS_FCB, FcbListEntry); - if (ServerFcb->PipeState == FILE_PIPE_LISTENING_STATE) + Waiter = CONTAINING_RECORD(CurrentEntry, NPFS_WAITER_ENTRY, Entry); + if (Waiter->Fcb->PipeState == FILE_PIPE_LISTENING_STATE) { - DPRINT("Server found! Fcb %p\n", ServerFcb); - return ServerFcb; + DPRINT("Server found! Fcb %p\n", Waiter->Fcb); + return Waiter->Fcb; } + CurrentEntry = CurrentEntry->Flink; } @@ -66,6 +67,35 @@ } +static VOID +NpfsSignalAndRemoveListeningServerInstance(PNPFS_PIPE Pipe, + PNPFS_FCB Fcb) +{ + PLIST_ENTRY CurrentEntry; + PNPFS_WAITER_ENTRY Waiter; + + CurrentEntry = Pipe->WaiterListHead.Flink; + while (CurrentEntry != &Pipe->WaiterListHead) + { + Waiter = CONTAINING_RECORD(CurrentEntry, NPFS_WAITER_ENTRY, Entry); + if (Waiter->Fcb == Fcb) + { + DPRINT("Server found! Fcb %p\n", Waiter->Fcb); + + KeSetEvent(Waiter->Irp->UserEvent, 0, FALSE); + Waiter->Irp->UserIosb->Status = FILE_PIPE_CONNECTED_STATE; + Waiter->Irp->UserIosb->Information = 0; + IoCompleteRequest(Waiter->Irp, IO_NO_INCREMENT); + + RemoveEntryList(&Waiter->Entry); + ExFreePool(Waiter); + return; + } + CurrentEntry = CurrentEntry->Flink; + } +} + + NTSTATUS STDCALL NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -206,9 +236,8 @@ ClientFcb->PipeState = FILE_PIPE_CONNECTED_STATE; ServerFcb->PipeState = FILE_PIPE_CONNECTED_STATE; - /* Wake server thread */ - DPRINT("Setting the ConnectEvent for %x\n", ServerFcb); - KeSetEvent(&ServerFcb->ConnectEvent, 0, FALSE); + /* Signal the server thread and remove it from the waiter list */ + NpfsSignalAndRemoveListeningServerInstance(Pipe, ServerFcb); } KeUnlockMutex(&Pipe->FcbListLock); @@ -318,6 +347,7 @@ InitializeListHead(&Pipe->ServerFcbListHead); InitializeListHead(&Pipe->ClientFcbListHead); + InitializeListHead(&Pipe->WaiterListHead); KeInitializeMutex(&Pipe->FcbListLock, 0); Pipe->PipeType = Buffer->NamedPipeType; _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-03-05 11:38:48 UTC (rev 13825) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-03-05 12:08:50 UTC (rev 13826) @@ -18,9 +18,67 @@ /* FUNCTIONS *****************************************************************/ +static VOID +NpfsListeningCancelRoutine(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PNPFS_WAITER_ENTRY Waiter; + + DPRINT1("NpfsListeningCancelRoutine() called\n"); + /* FIXME: Not tested. */ + + Waiter = Irp->Tail.Overlay.DriverContext[0]; + + RemoveEntryList(&Waiter->Entry); + ExFreePool(Waiter); + + IoReleaseCancelSpinLock(Irp->CancelIrql); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + + static NTSTATUS -NpfsConnectPipe(PNPFS_FCB Fcb) +NpfsAddListeningServerInstance(PIRP Irp, + PNPFS_FCB Fcb) { + PNPFS_WAITER_ENTRY Entry; + KIRQL OldIrql; + + Entry = ExAllocatePool(NonPagedPool, sizeof(NPFS_WAITER_ENTRY)); + if (Entry == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Entry->Irp = Irp; + Entry->Fcb = Fcb; + InsertTailList(&Fcb->Pipe->WaiterListHead, &Entry->Entry); + + IoAcquireCancelSpinLock(&OldIrql); + if (!Irp->Cancel) + { + Irp->Tail.Overlay.DriverContext[0] = Entry; + IoMarkIrpPending(Irp); + IoSetCancelRoutine(Irp, NpfsListeningCancelRoutine); + IoReleaseCancelSpinLock(OldIrql); + return STATUS_PENDING; + } + /* IRP has already been cancelled */ + IoReleaseCancelSpinLock(OldIrql); + + DPRINT1("FIXME: Remove waiter entry!\n"); + RemoveEntryList(&Entry->Entry); + ExFreePool(Entry); + + return STATUS_CANCELLED; +} + + +static NTSTATUS +NpfsConnectPipe(PIRP Irp, + PNPFS_FCB Fcb) +{ PNPFS_PIPE Pipe; PLIST_ENTRY current_entry; PNPFS_FCB ClientFcb; @@ -88,29 +146,18 @@ current_entry = current_entry->Flink; } - KeUnlockMutex(&Pipe->FcbListLock); - /* no listening client fcb found */ DPRINT("No listening client fcb found -- waiting for client\n"); Fcb->PipeState = FILE_PIPE_LISTENING_STATE; - Status = KeWaitForSingleObject(&Fcb->ConnectEvent, - UserRequest, - KernelMode, - FALSE, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("KeWaitForSingleObject() failed (Status %lx)\n", Status); - return Status; - } + Status = NpfsAddListeningServerInstance(Irp, Fcb); - Fcb->PipeState = FILE_PIPE_CONNECTED_STATE; + KeUnlockMutex(&Pipe->FcbListLock); - DPRINT("Client Fcb: %p\n", Fcb->OtherSide); + DPRINT("NpfsConnectPipe() done (Status %lx)\n", Status); - return STATUS_PIPE_CONNECTED; + return Status; } @@ -327,7 +374,6 @@ } - NTSTATUS STDCALL NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -366,7 +412,7 @@ case FSCTL_PIPE_LISTEN: DPRINT("Connecting pipe %wZ\n", &Pipe->PipeName); - Status = NpfsConnectPipe(Fcb); + Status = NpfsConnectPipe(Irp, Fcb); break; case FSCTL_PIPE_PEEK: @@ -439,12 +485,15 @@ Status = STATUS_UNSUCCESSFUL; } - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return(Status); + return Status; } _____ Modified: trunk/reactos/drivers/fs/np/npfs.h --- trunk/reactos/drivers/fs/np/npfs.h 2005-03-05 11:38:48 UTC (rev 13825) +++ trunk/reactos/drivers/fs/np/npfs.h 2005-03-05 12:08:50 UTC (rev 13826) @@ -19,6 +19,7 @@ KMUTEX FcbListLock; LIST_ENTRY ServerFcbListHead; LIST_ENTRY ClientFcbListHead; + LIST_ENTRY WaiterListHead; ULONG PipeType; ULONG ReadMode; ULONG WriteMode; @@ -52,7 +53,15 @@ KSPIN_LOCK DataListLock; /* Data queue lock */ } NPFS_FCB, *PNPFS_FCB; +typedef struct _NPFS_WAITER_ENTRY +{ + LIST_ENTRY Entry; + PIRP Irp; + PNPFS_PIPE Pipe; + PNPFS_FCB Fcb; +} NPFS_WAITER_ENTRY, *PNPFS_WAITER_ENTRY; + extern NPAGED_LOOKASIDE_LIST NpfsPipeDataLookasideList; _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-03-05 11:38:48 UTC (rev 13825) +++ trunk/reactos/drivers/fs/np/rw.c 2005-03-05 12:08:50 UTC (rev 13826) @@ -101,7 +101,6 @@ /* FIXME: check if in blocking mode */ if (Fcb->ReadDataAvailable == 0) { - KeResetEvent(&Fcb->Event); if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE) { KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); @@ -167,6 +166,7 @@ if (Length == 0) { KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); + KeResetEvent(&Fcb->Event); break; } } @@ -187,8 +187,19 @@ #endif Information = CopyLength; - Fcb->ReadDataAvailable = 0; - Fcb->WriteQuotaAvailable = Fcb->MaxDataLength; + + if (Fcb->ReadDataAvailable > Length) + { + memmove(Fcb->Data, Fcb->Data + Length, + Fcb->ReadDataAvailable - Length); + Fcb->ReadDataAvailable -= Length; + Status = STATUS_MORE_ENTRIES; + } + else + { + Fcb->ReadDataAvailable = 0; + Fcb->WriteQuotaAvailable = Fcb->MaxDataLength; + } } if (Information > 0) @@ -197,6 +208,7 @@ { KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); } + KeResetEvent(&Fcb->Event); break; } } @@ -291,7 +303,6 @@ { if (ReaderFcb->WriteQuotaAvailable == 0) { - KeResetEvent(&Fcb->Event); KeSetEvent(&ReaderFcb->Event, IO_NO_INCREMENT, FALSE); KeReleaseSpinLock(&ReaderFcb->DataListLock, OldIrql); if (Fcb->PipeState != FILE_PIPE_CONNECTED_STATE) @@ -355,6 +366,7 @@ if (Length == 0) { KeSetEvent(&ReaderFcb->Event, IO_NO_INCREMENT, FALSE); + KeResetEvent(&Fcb->Event); break; } } @@ -374,6 +386,7 @@ if (Information > 0) { KeSetEvent(&ReaderFcb->Event, IO_NO_INCREMENT, FALSE); + KeResetEvent(&Fcb->Event); break; } }

19 years, 6 months

[navaraf] 13824: - Implement NtCancelIoFile.

by navaraf＠svn.reactos.com

- Implement NtCancelIoFile. - Queue the IRP to correct thread in IoQueueThreadIrp. - Cancel I/O requests when thread is about to be terminated. - Do not queue close requests to thread IRP list. Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/io/cancel.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-03-05 05:13:38 UTC (rev 13823) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-03-05 11:27:15 UTC (rev 13824) @@ -426,6 +426,11 @@ VOID IopSaveBootLogToFile(VOID); +/* cancel.c */ + +VOID STDCALL +IoCancelThreadIo(PETHREAD Thread); + /* errlog.c */ NTSTATUS _____ Modified: trunk/reactos/ntoskrnl/io/cancel.c --- trunk/reactos/ntoskrnl/io/cancel.c 2005-03-05 05:13:38 UTC (rev 13823) +++ trunk/reactos/ntoskrnl/io/cancel.c 2005-03-05 11:27:15 UTC (rev 13824) @@ -20,14 +20,183 @@ /* FUNCTIONS *****************************************************************/ +/** + * @name NtCancelIoFile + * + * Cancel all pending I/O operations in the current thread for specified + * file object. + * + * @param FileHandle + * Handle to file object to cancel requests for. No specific + * access rights are needed. + * @param IoStatusBlock + * Pointer to status block which is filled with final completition + * status on successful return. + * + * @return Status. + * + * @implemented + */ + NTSTATUS STDCALL -NtCancelIoFile (IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock) +NtCancelIoFile( + IN HANDLE FileHandle, + OUT PIO_STATUS_BLOCK IoStatusBlock) { - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); + NTSTATUS Status; + PFILE_OBJECT FileObject; + PETHREAD Thread; + PLIST_ENTRY IrpEntry; + PIRP Irp; + KIRQL OldIrql; + BOOLEAN OurIrpsInList = FALSE; + LARGE_INTEGER Interval; + + if ((ULONG_PTR)IoStatusBlock >= MmUserProbeAddress && + KeGetPreviousMode() == UserMode) + return STATUS_ACCESS_VIOLATION; + + Status = ObReferenceObjectByHandle(FileHandle, 0, IoFileObjectType, + KeGetPreviousMode(), (PVOID*)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) + return Status; + + /* IRP cancellations are synchronized at APC_LEVEL. */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* + * Walk the list of active IRPs and cancel the ones that belong to + * our file object. + */ + + Thread = PsGetCurrentThread(); + for (IrpEntry = Thread->IrpList.Flink; + IrpEntry != &Thread->IrpList; + IrpEntry = IrpEntry->Flink) + { + Irp = CONTAINING_RECORD(IrpEntry, IRP, ThreadListEntry); + if (Irp->Tail.Overlay.OriginalFileObject == FileObject) + { + IoCancelIrp(Irp); + /* Don't break here, we want to cancel all IRPs for the file object. */ + OurIrpsInList = TRUE; + } + } + + KfLowerIrql(OldIrql); + + while (OurIrpsInList) + { + OurIrpsInList = FALSE; + + /* Wait a short while and then look if all our IRPs were completed. */ + Interval.QuadPart = -1000000; /* 100 milliseconds */ + KeDelayExecutionThread(KernelMode, FALSE, &Interval); + + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* + * Look in the list if all IRPs for the specified file object + * are completed (or cancelled). If someone sends a new IRP + * for our file object while we're here we can happily loop + * forever. + */ + + for (IrpEntry = Thread->IrpList.Flink; + IrpEntry != &Thread->IrpList; + IrpEntry = IrpEntry->Flink) + { + Irp = CONTAINING_RECORD(IrpEntry, IRP, ThreadListEntry); + if (Irp->Tail.Overlay.OriginalFileObject == FileObject) + { + OurIrpsInList = TRUE; + break; + } + } + + KfLowerIrql(OldIrql); + } + + _SEH_TRY + { + IoStatusBlock->Status = STATUS_SUCCESS; + IoStatusBlock->Information = 0; + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = STATUS_UNSUCCESSFUL; + } + _SEH_END; + + ObDereferenceObject(FileObject); + + return Status; } +/** + * @name IoCancelThreadIo + * + * Cancel all pending I/O request associated with specified thread. + * + * @param Thread + * Thread to cancel requests for. + */ + +VOID STDCALL +IoCancelThreadIo(PETHREAD Thread) +{ + PLIST_ENTRY IrpEntry; + PIRP Irp; + KIRQL OldIrql; + ULONG Retries = 3000; + LARGE_INTEGER Interval; + + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* + * Start by cancelling all the IRPs in the current thread queue. + */ + + for (IrpEntry = Thread->IrpList.Flink; + IrpEntry != &Thread->IrpList; + IrpEntry = IrpEntry->Flink) + { + Irp = CONTAINING_RECORD(IrpEntry, IRP, ThreadListEntry); + IoCancelIrp(Irp); + } + + /* + * Wait till all the IRPs are completed or cancelled. + */ + + while (!IsListEmpty(&Thread->IrpList)) + { + KfLowerIrql(OldIrql); + + /* Wait a short while and then look if all our IRPs were completed. */ + Interval.QuadPart = -1000000; /* 100 milliseconds */ + KeDelayExecutionThread(KernelMode, FALSE, &Interval); + + /* + * Don't stay here forever if some broken driver doesn't complete + * the IRP. + */ + + if (Retries-- == 0) + { + /* FIXME: Handle this gracefully. */ + DPRINT1("Thread with dead IRPs!"); + ASSERT(FALSE); + } + + OldIrql = KfRaiseIrql(APC_LEVEL); + } + + KfLowerIrql(OldIrql); +} + /* * @implemented */ _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-03-05 05:13:38 UTC (rev 13823) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-03-05 11:27:15 UTC (rev 13824) @@ -105,15 +105,24 @@ UserMode); #endif KeResetEvent( &FileObject->Event ); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_CLOSE, - FileObject->DeviceObject, - NULL, - 0, - NULL, - &FileObject->Event, - NULL); + + Irp = IoAllocateIrp(FileObject->DeviceObject->StackSize, TRUE); + if (Irp == NULL) + { + /* + * FIXME: This case should eventually be handled. We should wait + * until enough memory is available to allocate the IRP. + */ + ASSERT(FALSE); + } + + Irp->UserEvent = &FileObject->Event; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->Flags |= IRP_CLOSE_OPERATION; + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_CLOSE; + StackPtr->DeviceObject = FileObject->DeviceObject; StackPtr->FileObject = FileObject; Status = IoCallDriver(FileObject->DeviceObject, Irp); _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-03-05 05:13:38 UTC (rev 13823) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-03-05 11:27:15 UTC (rev 13824) @@ -268,7 +268,6 @@ return(NULL); } - RtlZeroMemory(Irp, IoSizeOfIrp(StackSize)); IoInitializeIrp(Irp, IoSizeOfIrp(StackSize), StackSize); @@ -364,6 +363,9 @@ ULONG MasterIrpCount; PIRP MasterIrp = Irp->AssociatedIrp.MasterIrp; + /* This should never happen! */ + ASSERT(IsListEmpty(&Irp->ThreadListEntry)); + MasterIrpCount = InterlockedDecrement(&MasterIrp->AssociatedIrp.IrpCount); while ((Mdl = Irp->MdlAddress)) { @@ -386,6 +388,9 @@ /* Windows NT File System Internals, page 165 */ if (Irp->Flags & (IRP_PAGING_IO|IRP_CLOSE_OPERATION)) { + /* This should never happen! */ + ASSERT(IsListEmpty(&Irp->ThreadListEntry)); + /* * If MDL_IO_PAGE_READ is set, then the caller is responsible * for deallocating of the mdl. @@ -582,19 +587,19 @@ VOID STDCALL IoQueueThreadIrp(IN PIRP Irp) { -/* undefine this when (if ever) implementing irp cancellation */ -#if 0 - KIRQL oldIrql; + KIRQL OldIrql; - oldIrql = KfRaiseIrql(APC_LEVEL); + OldIrql = KfRaiseIrql(APC_LEVEL); - /* Synchronous irp's are queued to requestor thread. If they are not completed - when the thread exits, they are canceled (cleaned up). - -Gunnar */ - InsertTailList(&PsGetCurrentThread()->IrpList, &Irp->ThreadListEntry); + /* + * Synchronous irp's are queued to requestor thread. If they are not + * completed when the thread exits, they are canceled (cleaned up). + * - Gunnar + */ + + InsertTailList(&Irp->Tail.Overlay.Thread->IrpList, &Irp->ThreadListEntry); - KfLowerIrql(oldIrql); -#endif + KfLowerIrql(OldIrql); } _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-03-05 05:13:38 UTC (rev 13823) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-03-05 11:27:15 UTC (rev 13824) @@ -158,6 +158,9 @@ PsLockProcess(CurrentProcess, FALSE); + /* Cancel I/O for the thread. */ + IoCancelThreadIo(CurrentThread); + /* Remove the thread from the thread list of its process */ RemoveEntryList(&CurrentThread->ThreadListEntry); Last = IsListEmpty(&CurrentProcess->ThreadListHead);

19 years, 6 months

[royce] 13823: per-module clean rules, make cabman more *nix/msys friendly

by royce＠svn.reactos.com

per-module clean rules, make cabman more *nix/msys friendly This fix made it so I was able to successfully build a 22.4MB ReactOS.iso from the xmlbuildsystem branch! ( now to test it... ) Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/Makefile Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabinet.cxx Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabinet.h Modified: branches/xmlbuildsystem/reactos/tools/cabman/main.cxx Modified: branches/xmlbuildsystem/reactos/tools/cdmake/Makefile Modified: branches/xmlbuildsystem/reactos/tools/nci/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Modified: branches/xmlbuildsystem/reactos/tools/wmc/makefile _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-05 00:21:38 UTC (rev 13822) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-05 05:13:38 UTC (rev 13823) @@ -71,5 +71,7 @@ include$(SEP)reactos$(SEP)errcodes.h lib$(SEP)kernel32$(SEP)errcodes.rc: $(WMC_TARGET) lib$(SEP)kernel32$(SEP)kernel32.mc $(WMC_TARGET) -H include$(SEP)reactos$(SEP)errcodes.h -o lib$(SEP)kernel32$(SEP)errcodes.rc lib$(SEP)kernel32$(SEP)kernel32.mc -clean:: +.PHONY: makefile_auto_clean +makefile_auto_clean: -@$(rm) Makefile.auto $(PREAUTO) 2>$(NUL) +clean: makefile_auto_clean _____ Modified: branches/xmlbuildsystem/reactos/tools/Makefile --- branches/xmlbuildsystem/reactos/tools/Makefile 2005-03-05 00:21:38 UTC (rev 13822) +++ branches/xmlbuildsystem/reactos/tools/Makefile 2005-03-05 05:13:38 UTC (rev 13823) @@ -19,11 +19,12 @@ $(RMKDIR_OBJECTS): %.o : %.c ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $< -o $@ -clean:: +.PHONY: rmkdir_clean +rmkdir_clean: -@$(rm) $(RMKDIR_TARGET) $(RMKDIR_OBJECTS) 2>$(NUL) +clean: rmkdir_clean - BUILDNO_BASE = tools BUILDNO_TARGET = \ @@ -45,8 +46,10 @@ $(BUILDNO_OBJECTS): %.o : %.c ${host_gcc} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ -clean:: +.PHONY: buildno_clean +buildno_clean: -@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL) +clean: buildno_clean include$(SEP)reactos$(SEP)buildno.h: $(BUILDNO_TARGET) $(EXEPREFIX)$(BUILDNO_TARGET) include$(SEP)reactos$(SEP)buildno.h _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabinet.cxx --- branches/xmlbuildsystem/reactos/tools/cabman/cabinet.cxx 2005-03-05 00:21:38 UTC (rev 13822) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabinet.cxx 2005-03-05 05:13:38 UTC (rev 13823) @@ -34,7 +34,7 @@ #define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) static bool _ReadFileData(FILEHANDLE handle, void* buffer, unsigned long size, unsigned long* bytesread) { - return ReadFile(handle, buffer, size, bytesread, NULL); + return ReadFile(handle, buffer, size, bytesread, NULL) != 0; } #else #define GetSizeOfFile(handle) _GetSizeOfFile(handle) @@ -70,7 +70,7 @@ 0, // No sharing NULL, // No security CREATE_ALWAYS, // Create or overwrite - FILE_ATTRIBUTE_NORMAL, // Normal file + FILE_ATTRIBUTE_NORMAL, // Normal file NULL); // No attribute template if (FileHandle == INVALID_HANDLE_VALUE) { DPRINT(MID_TRACE, ("ERROR OPENING '%d'.\n", (unsigned int)GetLastError())); @@ -143,7 +143,7 @@ if ((FileHandle = tmpfile()) == NULL) return CAB_STATUS_CANNOT_CREATE; /* - FileHandle = fopen(FullName, "w+b"); + FileHandle = fopen(FullName, "w+b"); if (FileHandle == NULL) { DPRINT(MID_TRACE, ("ERROR '%d'.\n", (unsigned int)errno)); return CAB_STATUS_CANNOT_CREATE; @@ -297,9 +297,15 @@ * FUNCTION: Default constructor */ { + *CabinetName = '\0'; + *CabinetPrev = '\0'; + *DiskPrev = '\0'; + *CabinetNext = '\0'; + *DiskNext = '\0'; + *DestPath = '\0'; + *CabinetReservedFile = '\0'; + FileOpen = false; - strcpy(DestPath, ""); - strcpy(CabinetReservedFile, ""); CabinetReservedFileBuffer = NULL; CabinetReservedFileSize = 0; @@ -521,19 +527,19 @@ #if defined(WIN32) FileHandle = CreateFile(ConvertPath(FileName, true), // Open this file - GENERIC_READ, // Open for reading - FILE_SHARE_READ, // Share for reading - NULL, // No security - OPEN_EXISTING, // Existing file only - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template + GENERIC_READ, // Open for reading + FILE_SHARE_READ, // Share for reading + NULL, // No security + OPEN_EXISTING, // Existing file only + FILE_ATTRIBUTE_NORMAL, // Normal file + NULL); // No attribute template if (FileHandle == INVALID_HANDLE_VALUE) { DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); return false; } #else /* !WIN32 */ - - FileHandle = fopen(ConvertPath(FileName, true), "rb"); + + FileHandle = fopen(ConvertPath(FileName, true), "rb"); if (FileHandle == NULL) { DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); return false; @@ -614,19 +620,19 @@ #if defined(WIN32) FileHandle = CreateFile(CabinetName, // Open this file - GENERIC_READ, // Open for reading - FILE_SHARE_READ, // Share for reading - NULL, // No security - OPEN_EXISTING, // Existing file only - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - + GENERIC_READ, // Open for reading + FILE_SHARE_READ, // Share for reading + NULL, // No security + OPEN_EXISTING, // Existing file only + FILE_ATTRIBUTE_NORMAL, // Normal file + NULL); // No attribute template + if (FileHandle == INVALID_HANDLE_VALUE) { DPRINT(MID_TRACE, ("Cannot open file.\n")); return CAB_STATUS_CANNOT_OPEN; } #else /* !WIN32 */ - FileHandle = fopen(CabinetName, "rb"); + FileHandle = fopen(CabinetName, "rb"); if (FileHandle == NULL) { DPRINT(MID_TRACE, ("Cannot open file.\n")); return CAB_STATUS_CANNOT_OPEN; @@ -694,7 +700,7 @@ strcpy(CabinetPrev, ""); strcpy(DiskPrev, ""); } - + if ((CABHeader.Flags & CAB_FLAG_HASNEXT) > 0) { /* Read name of next cabinet */ Status = ReadString(CabinetNext, 256); @@ -818,7 +824,7 @@ OnDiskChange(CabinetNext, DiskNext); Status = Open(); - if (Status != CAB_STATUS_SUCCESS) + if (Status != CAB_STATUS_SUCCESS) return Status; Search->Next = FileListHead; @@ -925,7 +931,7 @@ } } #else /* !WIN32 */ - DestFile = fopen(DestName, "rb"); + DestFile = fopen(DestName, "rb"); if (DestFile != NULL) { fclose(DestFile); /* If file exists, ask to overwrite file */ @@ -961,7 +967,7 @@ if (!Buffer) { CloseFile(DestFile); DPRINT(MIN_TRACE, ("Insufficient memory.\n")); - return CAB_STATUS_NOMEMORY; + return CAB_STATUS_NOMEMORY; } /* Call OnExtract event handler */ @@ -1007,7 +1013,7 @@ do { DPRINT(MAX_TRACE, ("Size (%lu bytes).\n", Size)); - if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) != + if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesRead != sizeof(CFDATA))) { CloseFile(DestFile); FreeMemory(Buffer); @@ -1027,7 +1033,7 @@ DPRINT(MAX_TRACE, ("Read: (0x%lX,0x%lX).\n", (long unsigned int)CurrentBuffer, (long unsigned int)Buffer)); - if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != + if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead)) { CloseFile(DestFile); FreeMemory(Buffer); @@ -1068,7 +1074,7 @@ OnDiskChange(CabinetNext, DiskNext); Status = Open(); - if (Status != CAB_STATUS_SUCCESS) + if (Status != CAB_STATUS_SUCCESS) return Status; /* The first data block of the file will not be @@ -1140,7 +1146,7 @@ CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + CurrentDataNode->Data.CompSize)); - if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) != + if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesRead != sizeof(CFDATA))) { CloseFile(DestFile); FreeMemory(Buffer); @@ -1274,7 +1280,7 @@ InputBuffer = AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough if ((!OutputBuffer) || (!InputBuffer)) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); - return CAB_STATUS_NOMEMORY; + return CAB_STATUS_NOMEMORY; } CurrentIBuffer = InputBuffer; CurrentIBufferSize = 0; @@ -1417,14 +1423,14 @@ FILE_SHARE_READ, // Share for reading NULL, // No security OPEN_EXISTING, // File must exist - FILE_ATTRIBUTE_NORMAL, // Normal file + FILE_ATTRIBUTE_NORMAL, // Normal file NULL); // No attribute template if (SourceFile == INVALID_HANDLE_VALUE) { DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); return CAB_STATUS_NOFILE; } #else /* !WIN32 */ - SourceFile = fopen(FileNode->FileName, "rb"); + SourceFile = fopen(FileNode->FileName, "rb"); if (SourceFile == NULL) { DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); return CAB_STATUS_NOFILE; @@ -1447,7 +1453,7 @@ FileNode->File.FileOffset = CurrentFolderNode->UncompOffset; CurrentFolderNode->UncompOffset += TotalBytesLeft; - FileNode->File.FileControlID = NextFolderNumber - 1; + FileNode->File.FileControlID = (unsigned short)(NextFolderNumber - 1); CurrentFolderNode->Commit = true; PrevCabinetNumber = CurrentDiskNumber; @@ -1543,7 +1549,7 @@ ContinueFile = true; CreateNewDisk = false; - DPRINT(MAX_TRACE, ("First on new disk. CurrentIBufferSize (%lu) CurrentOBufferSize (%lu).\n", + DPRINT(MAX_TRACE, ("First on new disk. CurrentIBufferSize (%lu) CurrentOBufferSize (%lu).\n", CurrentIBufferSize, CurrentOBufferSize)); if ((CurrentIBufferSize > 0) || (CurrentOBufferSize > 0)) { @@ -1635,7 +1641,7 @@ } } #else /* !WIN32 */ - FileHandle = fopen(CabinetName, "rb"); + FileHandle = fopen(CabinetName, "rb"); if (FileHandle != NULL) { fclose(FileHandle); /* If file exists, ask to overwrite file */ @@ -1655,7 +1661,7 @@ } #endif - WriteCabinetHeader(MoreDisks); + WriteCabinetHeader(MoreDisks != 0); Status = WriteFolderEntries(); if (Status != CAB_STATUS_SUCCESS) @@ -1770,14 +1776,14 @@ FILE_SHARE_READ, // Share for reading NULL, // No security OPEN_EXISTING, // File must exist - FILE_ATTRIBUTE_NORMAL, // Normal file + FILE_ATTRIBUTE_NORMAL, // Normal file NULL); // No attribute template if (SrcFile == INVALID_HANDLE_VALUE) { DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); return CAB_STATUS_CANNOT_OPEN; } #else /* !WIN32 */ - SrcFile = fopen(FileNode->FileName, "rb"); + SrcFile = fopen(FileNode->FileName, "rb"); if (SrcFile == NULL) { DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); return CAB_STATUS_CANNOT_OPEN; @@ -2545,8 +2551,8 @@ CABHeader.FileCount = 0; // Not known yet CABHeader.Flags = 0; // Not known yet - CABHeader.CabinetNumber = CurrentDiskNumber; - + CABHeader.CabinetNumber = (unsigned short)CurrentDiskNumber; + if ((CurrentDiskNumber > 0) && (OnCabinetName(PrevCabinetNumber, CabinetPrev))) { CABHeader.Flags |= CAB_FLAG_HASPREV; if (!OnDiskLabel(PrevCabinetNumber, DiskPrev)) @@ -2672,7 +2678,7 @@ /* Write per-cabinet reserved area if present */ if (CABHeader.Flags & CAB_FLAG_RESERVE) { unsigned long ReservedSize; - + ReservedSize = CabinetReservedFileSize & 0xffff; ReservedSize |= (0 << 16); /* Folder reserved area size */ ReservedSize |= (0 << 24); /* Folder reserved area size */ @@ -2846,7 +2852,7 @@ /* The file could end in the last (split) block and should therefore appear in the next disk too */ - + if ((File->File.FileOffset + File->File.FileSize >= LastBlockStart) && (File->File.FileControlID <= CAB_FILE_MAX_FOLDER) && (BlockIsSplit)) { File->File.FileControlID = CAB_FILE_SPLIT; @@ -2914,7 +2920,7 @@ DataNode = FolderNode->DataListHead; if (DataNode != NULL) Status = ScratchFile->Seek(DataNode->ScratchFilePosition); - + while (DataNode != NULL) { DPRINT(MAX_TRACE, ("Reading block at (0x%lX) CompSize (%d) UncompSize (%d).\n", DataNode->ScratchFilePosition, _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabinet.h --- branches/xmlbuildsystem/reactos/tools/cabman/cabinet.h 2005-03-05 00:21:38 UTC (rev 13822) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabinet.h 2005-03-05 05:13:38 UTC (rev 13823) @@ -58,6 +58,10 @@ extern unsigned long DebugTraceLevel; +#ifdef _MSC_VER +#define __FUNCTION__ "" +#endif//_MSC_VER + #define DPRINT(_t_, _x_) \ if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/main.cxx --- branches/xmlbuildsystem/reactos/tools/cabman/main.cxx 2005-03-05 00:21:38 UTC (rev 13822) +++ branches/xmlbuildsystem/reactos/tools/cabman/main.cxx 2005-03-05 05:13:38 UTC (rev 13823) @@ -189,9 +189,9 @@ */ { printf("ReactOS Cabinet Manager - Version %s\n\n", CM_VERSION); - printf("CABMAN [/D | /E] [/A] [/L dir] cabinet [filename ...]\n"); - printf("CABMAN /C dirfile [/I] [/RC file]\n"); - printf("CABMAN /S cabinet filename\n"); + printf("CABMAN [-D | -E] [-A] [-L dir] cabinet [filename ...]\n"); + printf("CABMAN -C dirfile [-I] [-RC file]\n"); + printf("CABMAN -S cabinet filename\n"); printf(" cabinet Cabinet file.\n"); printf(" filename Name of the file to extract from the cabinet.\n"); printf(" Wild cards and multiple filenames\n"); @@ -199,18 +199,18 @@ printf(" dirfile Name of the directive file to use.\n"); - printf(" /A Process ALL cabinets. Follows cabinet chain\n"); + printf(" -A Process ALL cabinets. Follows cabinet chain\n"); printf(" starting in first cabinet mentioned.\n"); - printf(" /C Create cabinet.\n"); - printf(" /D Display cabinet directory.\n"); - printf(" /E Extract files from cabinet.\n"); - printf(" /I Don't create the cabinet, only the .inf file.\n"); - printf(" /L dir Location to place extracted or generated files\n"); + printf(" -C Create cabinet.\n"); + printf(" -D Display cabinet directory.\n"); + printf(" -E Extract files from cabinet.\n"); + printf(" -I Don't create the cabinet, only the .inf file.\n"); + printf(" -L dir Location to place extracted or generated files\n"); printf(" (default is current directory).\n"); - printf(" /N Don't create the .inf file, only the cabinet.\n"); - printf(" /RC Specify file to put in cabinet reserved area\n"); + printf(" -N Don't create the .inf file, only the cabinet.\n"); + printf(" -RC Specify file to put in cabinet reserved area\n"); printf(" (size must be less than 64KB).\n"); - printf(" /S Create simple cabinet.\n"); + printf(" -S Create simple cabinet.\n"); } bool CCABManager::ParseCmdline(int argc, char* argv[]) @@ -230,7 +230,7 @@ ShowUsage = (argc < 2); for (i = 1; i < argc; i++) { - if (argv[i][0] == '/') { + if (argv[i][0] == '-') { switch (argv[i][1]) { case 'a': case 'A': ProcessAll = true; break; @@ -404,7 +404,7 @@ } return true; } else - printf("Cannot not open file: %s\n", GetCabinetName()); + printf("Cannot open file: %s\n", GetCabinetName()); return false; } @@ -443,7 +443,7 @@ } return true; } else - printf("Cannot not open file: %s.\n", GetCabinetName()); + printf("Cannot open file: %s.\n", GetCabinetName()); return false; } _____ Modified: branches/xmlbuildsystem/reactos/tools/cdmake/Makefile --- branches/xmlbuildsystem/reactos/tools/cdmake/Makefile 2005-03-05 00:21:38 UTC (rev 13822) +++ branches/xmlbuildsystem/reactos/tools/cdmake/Makefile 2005-03-05 05:13:38 UTC (rev 13823) @@ -20,5 +20,7 @@ $(CDMAKE_OBJECTS): %.o : %.c ${host_gcc} $(CDMAKE_CFLAGS) -c $< -o $@ -clean:: +.PHONY: cdmake_clean +cdmake_clean: -@$(rm) $(CDMAKE_TARGET) $(CDMAKE_OBJECTS) 2>$(NUL) +clean: cdmake_clean _____ Modified: branches/xmlbuildsystem/reactos/tools/nci/makefile --- branches/xmlbuildsystem/reactos/tools/nci/makefile 2005-03-05 00:21:38 UTC (rev 13822) +++ branches/xmlbuildsystem/reactos/tools/nci/makefile 2005-03-05 05:13:38 UTC (rev 13823) @@ -19,8 +19,10 @@ $(NCI_OBJECTS): %.o : %.c ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ -clean:: +.PHONY: nci_clean +nci_clean: -@$(rm) $(NCI_TARGET) $(NCI_OBJECTS) 2>$(NUL) +clean: nci_clean # WIN32K.SYS WIN32K_SVC_DB = $(NCI_BASE)$(SEP)w32ksvc.db @@ -53,5 +55,7 @@ $(WIN32K_GDI_STUBS) \ $(WIN32K_USER_STUBS) -clean:: +.PHONY: nci_service_files_clean +nci_service_files_clean: -@$(rm) $(NCI_SERVICE_FILES) 2>$(NUL) +clean: nci_service_files_clean _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-05 00:21:38 UTC (rev 13822) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-05 05:13:38 UTC (rev 13823) @@ -1029,14 +1029,16 @@ clean_files.push_back ( ar_target ); GetCleanTargets ( clean_files, module.files, module.ifs ); - fprintf ( fMakefile, "clean::\n\t-@$(rm)" ); + fprintf ( fMakefile, ".PHONY: %s_clean\n", module.name.c_str() ); + fprintf ( fMakefile, "%s_clean:\n\t-@$(rm)", module.name.c_str() ); for ( size_t i = 0; i < clean_files.size(); i++ ) { if ( 9==(i%10) ) fprintf ( fMakefile, " 2>$(NUL)\n\t-@$(rm)" ); fprintf ( fMakefile, " %s", clean_files[i].c_str() ); } - fprintf ( fMakefile, " 2>$(NUL)\n\n" ); + fprintf ( fMakefile, " 2>$(NUL)\n" ); + fprintf ( fMakefile, "clean: %s_clean\n\n", module.name.c_str() ); } void @@ -2100,11 +2102,11 @@ cdDirectories.c_str (), cdFiles.c_str () ); fprintf ( fMakefile, - "\t${cabman} /C %s /L %s /I\n", + "\t${cabman} -C %s -L %s -I\n", reactosDff.c_str (), bootcdReactos.c_str () ); fprintf ( fMakefile, - "\t${cabman} /C %s /RC %s /L %s /N\n", + "\t${cabman} -C %s -RC %s -L %s -N\n", reactosDff.c_str (), reactosInf.c_str (), bootcdReactos.c_str () ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-03-05 00:21:38 UTC (rev 13822) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-03-05 05:13:38 UTC (rev 13823) @@ -104,5 +104,7 @@ rbuild_test: $(RBUILD_TEST_TARGET) $(RBUILD_TEST_TARGET) -clean:: +.PHONY: rbuild_clean +rbuild_clean: -@$(rm) $(RBUILD_TARGET) $(RBUILD_OBJECTS) $(RBUILD_TEST_TARGET) $(RBUILD_TEST_OBJECTS) 2>$(NUL) +clean: rbuild_clean _____ Modified: branches/xmlbuildsystem/reactos/tools/wmc/makefile --- branches/xmlbuildsystem/reactos/tools/wmc/makefile 2005-03-05 00:21:38 UTC (rev 13822) +++ branches/xmlbuildsystem/reactos/tools/wmc/makefile 2005-03-05 05:13:38 UTC (rev 13823) @@ -26,5 +26,7 @@ $(WMC_OBJECTS): %.o : %.c ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@ -clean:: +.PHONY: wmc_clean +wmc_clean: -@$(rm) $(WMC_TARGET) $(WMC_OBJECTS) 2>$(NUL) +clean: wmc_clean

19 years, 6 months

[jimtabor] 13822: Added comments about systemHandleInfo.

by jimtabor＠svn.reactos.com

Added comments about systemHandleInfo. Modified: trunk/reactos/ntoskrnl/ob/handle.c _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-03-04 20:56:32 UTC (rev 13821) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-03-05 00:21:38 UTC (rev 13822) @@ -1089,6 +1089,11 @@ // pshi->HandleValue; +/* + This will never work with ROS! M$, I guess uses 0 -> 65535. + Ros uses 0 -> 4294967295! + */ + P = (ULONG) Process->UniqueProcessId; pshi->UniqueProcessId = (USHORT) P;

19 years, 6 months

[ion] 13821: Add SEH to more functions, clean up some things, initialize profiling stuff (not yet enabled), and fix Registry Object re/defrecenging bug (Jim -- please retest). Thanks to Thomas for Security fixes and Iocompletion SEH + CM fix.

by ion＠svn.reactos.com

Add SEH to more functions, clean up some things, initialize profiling stuff (not yet enabled), and fix Registry Object re/defrecenging bug (Jim -- please retest). Thanks to Thomas for Security fixes and Iocompletion SEH + CM fix. Modified: branches/alex_devel_branch/reactos/include/ddk/setypes.h Modified: branches/alex_devel_branch/reactos/include/ntos/security.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/cm/regobj.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/event.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/evtpair.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/init.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/mutant.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/profile.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/sem.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/timer.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ob.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/se.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/iocomp.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/kd/kdebug.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/profile.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ob/object.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/thread.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/se/acl.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/se/luid.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/se/sd.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/se/sid.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/se/token.c Modified: branches/alex_devel_branch/reactos/w32api/include/ddk/ntifs.h Modified: branches/alex_devel_branch/reactos/w32api/include/winnt.h _____ Modified: branches/alex_devel_branch/reactos/include/ddk/setypes.h --- branches/alex_devel_branch/reactos/include/ddk/setypes.h 2005-03-04 19:07:02 UTC (rev 13820) +++ branches/alex_devel_branch/reactos/include/ddk/setypes.h 2005-03-04 20:56:32 UTC (rev 13821) @@ -98,37 +98,36 @@ } SEP_AUDIT_POLICY, *PSEP_AUDIT_POLICY; typedef struct _TOKEN { - TOKEN_SOURCE TokenSource; /* 0x00 */ - LUID TokenId; /* 0x10 */ - LUID AuthenticationId; /* 0x18 */ - LUID ParentTokenId; /* 0x20 */ - LARGE_INTEGER ExpirationTime; /* 0x28 */ - struct _ERESOURCE *TokenLock; /* 0x30 */ - ULONG Padding; /* 0x34 */ - SEP_AUDIT_POLICY AuditPolicy; /* 0x38 */ - LUID ModifiedId; /* 0x40 */ - ULONG SessionId; /* 0x48 */ - ULONG UserAndGroupCount; /* 0x4C */ - ULONG RestrictedSidCount; /* 0x50 */ - ULONG PrivilegeCount; /* 0x54 */ - ULONG VariableLength; /* 0x58 */ - ULONG DynamicCharged; /* 0x5C */ - ULONG DynamicAvailable; /* 0x60 */ - ULONG DefaultOwnerIndex; /* 0x64 */ - PSID_AND_ATTRIBUTES UserAndGroups; /* 0x68 */ - PSID_AND_ATTRIBUTES RestrictedSids; /* 0x6C */ - PSID PrimaryGroup; /* 0x70 */ - PLUID_AND_ATTRIBUTES Privileges; /* 0x74 */ - PULONG DynamicPart; /* 0x78 */ - PACL DefaultDacl; /* 0x7C */ - TOKEN_TYPE TokenType; /* 0x80 */ - SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; /* 0x84 */ - ULONG TokenFlags; /* 0x88 */ - ULONG TokenInUse; /* 0x8C */ - PVOID ProxyData; /* 0x90 */ - PVOID AuditData; /* 0x94 */ - LUID OriginatingLogonSession; /* 0x98 */ - UCHAR VariablePart[1]; /* 0xA0 */ + TOKEN_SOURCE TokenSource; /* 0x00 */ + LUID TokenId; /* 0x10 */ + LUID AuthenticationId; /* 0x18 */ + LUID ParentTokenId; /* 0x20 */ + LARGE_INTEGER ExpirationTime; /* 0x28 */ + struct _ERESOURCE *TokenLock; /* 0x30 */ + SEP_AUDIT_POLICY AuditPolicy; /* 0x38 */ + LUID ModifiedId; /* 0x40 */ + ULONG SessionId; /* 0x48 */ + ULONG UserAndGroupCount; /* 0x4C */ + ULONG RestrictedSidCount; /* 0x50 */ + ULONG PrivilegeCount; /* 0x54 */ + ULONG VariableLength; /* 0x58 */ + ULONG DynamicCharged; /* 0x5C */ + ULONG DynamicAvailable; /* 0x60 */ + ULONG DefaultOwnerIndex; /* 0x64 */ + PSID_AND_ATTRIBUTES UserAndGroups; /* 0x68 */ + PSID_AND_ATTRIBUTES RestrictedSids; /* 0x6C */ + PSID PrimaryGroup; /* 0x70 */ + PLUID_AND_ATTRIBUTES Privileges; /* 0x74 */ + PULONG DynamicPart; /* 0x78 */ + PACL DefaultDacl; /* 0x7C */ + TOKEN_TYPE TokenType; /* 0x80 */ + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; /* 0x84 */ + ULONG TokenFlags; /* 0x88 */ + BOOLEAN TokenInUse; /* 0x8C */ + PVOID ProxyData; /* 0x90 */ + PVOID AuditData; /* 0x94 */ + LUID OriginatingLogonSession; /* 0x98 */ + ULONG VariablePart; /* 0xA0 */ } TOKEN, *PTOKEN; typedef PVOID PACCESS_TOKEN; _____ Modified: branches/alex_devel_branch/reactos/include/ntos/security.h --- branches/alex_devel_branch/reactos/include/ntos/security.h 2005-03-04 19:07:02 UTC (rev 13820) +++ branches/alex_devel_branch/reactos/include/ntos/security.h 2005-03-04 20:56:32 UTC (rev 13821) @@ -153,8 +153,9 @@ #define TOKEN_ADJUST_PRIVILEGES (0x0020L) #define TOKEN_ADJUST_GROUPS (0x0040L) #define TOKEN_ADJUST_DEFAULT (0x0080L) +#define TOKEN_ADJUST_SESSIONID (0x0100L) -#define TOKEN_ALL_ACCESS (0xf00ffL) +#define TOKEN_ALL_ACCESS (0xf01ffL) #define TOKEN_READ (0x20008L) #define TOKEN_WRITE (0x200e0L) #define TOKEN_EXECUTE (0x20000L) @@ -339,6 +340,20 @@ SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY]; } TOKEN_GROUPS, *PTOKEN_GROUPS, *LPTOKEN_GROUPS; +typedef struct _TOKEN_GROUPS_AND_PRIVILEGES +{ + ULONG SidCount; + ULONG SidLength; + PSID_AND_ATTRIBUTES Sids; + ULONG RestrictedSidCount; + ULONG RestrictedSidLength; + PSID_AND_ATTRIBUTES RestrictedSids; + ULONG PrivilegeCount; + ULONG PrivilegeLength; + PLUID_AND_ATTRIBUTES Privileges; + LUID AuthenticationId; +} TOKEN_GROUPS_AND_PRIVILEGES, *PTOKEN_GROUPS_AND_PRIVILEGES; + typedef struct _TOKEN_PRIVILEGES { DWORD PrivilegeCount; _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/cm/regobj.c --- branches/alex_devel_branch/reactos/ntoskrnl/cm/regobj.c 2005-03-04 19:07:02 UTC (rev 13820) +++ branches/alex_devel_branch/reactos/ntoskrnl/cm/regobj.c 2005-03-04 20:56:32 UTC (rev 13821) @@ -212,11 +212,6 @@ return(STATUS_REPARSE); } } - - ObReferenceObjectByPointer(FoundObject, - STANDARD_RIGHTS_REQUIRED, - NULL, - UserMode); } DPRINT("CmiObjectParse: %s\n", FoundObject->Name); _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/event.c --- branches/alex_devel_branch/reactos/ntoskrnl/ex/event.c 2005-03-04 19:07:02 UTC (rev 13820) +++ branches/alex_devel_branch/reactos/ntoskrnl/ex/event.c 2005-03-04 20:56:32 UTC (rev 13821) @@ -1,11 +1,11 @@ -/* $Id:$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/nt/event.c * PURPOSE: Named event support * - * PROGRAMMERS: Philip Susi and David Welch + * PROGRAMMERS: Alex Ionescu(alex(a)relsoft.net) - Fixed bugs/commented + * Philip Susi and David Welch */ /* INCLUDES *****************************************************************/ @@ -38,7 +38,7 @@ { /* Create the Event Object Type */ ExEventObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlpCreateUnicodeString(&ExEventObjectType->TypeName, L"Event", NonPagedPool); + RtlInitUnicodeString(&ExEventObjectType->TypeName, L"Event"); ExEventObjectType->Tag = TAG('E', 'V', 'T', 'T'); ExEventObjectType->PeakObjects = 0; ExEventObjectType->PeakHandles = 0; @@ -73,14 +73,14 @@ PAGED_CODE(); /* Reference the Object */ - Status = ObReferenceObjectByHandle(EventHandle, - EVENT_MODIFY_STATE, - ExEventObjectType, - ExGetPreviousMode(), - (PVOID*)&Event, - NULL); + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_MODIFY_STATE, + ExEventObjectType, + ExGetPreviousMode(), + (PVOID*)&Event, + NULL); - /* Check for Success */ + /* Check for Success */ if(NT_SUCCESS(Status)) { /* Clear the Event and Dereference */ @@ -110,9 +110,10 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); + DPRINT("NtCreateEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); /* Check Output Safety */ - if(PreviousMode == UserMode) { + if(PreviousMode != KernelMode) { _SEH_TRY { @@ -188,11 +189,11 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); + PAGED_CODE(); DPRINT("NtOpenEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); /* Check Output Safety */ - if(PreviousMode == UserMode) { + if(PreviousMode != KernelMode) { _SEH_TRY { @@ -315,10 +316,13 @@ OUT PULONG ReturnLength OPTIONAL) { PKEVENT Event; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PEVENT_BASIC_INFORMATION BasicInfo = (PEVENT_BASIC_INFORMATION)EventInformation; + PAGED_CODE(); + DPRINT("NtQueryEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, EventInformationClass); + /* Check buffers and class validity */ DefaultQueryInfoBufferCheck(EventInformationClass, ExEventInfoClass, @@ -381,7 +385,6 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtResetEvent(EventHandle 0%x PreviousState 0%x)\n", EventHandle, PreviousState); @@ -449,10 +452,9 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); + DPRINT("NtSetEvent(EventHandle 0%x PreviousState 0%x)\n", + EventHandle, PreviousState); - DPRINT1("NtSetEvent(EventHandle 0%x PreviousState 0%x)\n", - EventHandle, PreviousState); - /* Check buffer validity */ if(PreviousState != NULL && PreviousMode == UserMode) { _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/evtpair.c --- branches/alex_devel_branch/reactos/ntoskrnl/ex/evtpair.c 2005-03-04 19:07:02 UTC (rev 13820) +++ branches/alex_devel_branch/reactos/ntoskrnl/ex/evtpair.c 2005-03-04 20:56:32 UTC (rev 13821) @@ -4,7 +4,8 @@ * FILE: ntoskrnl/ex/evtpair.c * PURPOSE: Support for event pairs * - * PROGRAMMERS: Alex Ionescu (Commented, reorganized, removed Thread Pair, used KeInitializeEventPair, added SEH) + * PROGRAMMERS: Alex Ionescu (Commented, reorganized, removed Thread Pair, used + * KeInitializeEventPair, added SEH) * David Welch (welch(a)mcmail.com) * Skywing (skywing(a)valhallalegends.com) */ @@ -34,7 +35,7 @@ { /* Create the Event Pair Object Type */ ExEventPairObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlpCreateUnicodeString(&ExEventPairObjectType->TypeName, L"EventPair", NonPagedPool); + RtlInitUnicodeString(&ExEventPairObjectType->TypeName, L"EventPair"); ExEventPairObjectType->Tag = TAG('E', 'v', 'P', 'a'); ExEventPairObjectType->PeakObjects = 0; ExEventPairObjectType->PeakHandles = 0; @@ -67,7 +68,8 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - DPRINT1("NtCreateEventPair: %x\n", EventPairHandle); + PAGED_CODE(); + DPRINT("NtCreateEventPair: %x\n", EventPairHandle); /* Check Output Safety */ if(PreviousMode == UserMode) { @@ -87,7 +89,7 @@ } /* Create the Object */ - DPRINT1("Creating EventPair\n"); + DPRINT("Creating EventPair\n"); Status = ObCreateObject(PreviousMode, ExEventPairObjectType, ObjectAttributes, @@ -102,7 +104,7 @@ if(NT_SUCCESS(Status)) { /* Initalize the Event */ - DPRINT1("Initializing EventPair\n"); + DPRINT("Initializing EventPair\n"); KeInitializeEventPair(EventPair); /* Insert it */ @@ -133,7 +135,6 @@ return Status; } - NTSTATUS STDCALL NtOpenEventPair(OUT PHANDLE EventPairHandle, @@ -143,6 +144,8 @@ HANDLE hEventPair; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); /* Check Output Safety */ if(PreviousMode == UserMode) { @@ -196,8 +199,9 @@ PKEVENT_PAIR EventPair; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; - - DPRINT1("NtSetHighEventPair(EventPairHandle %x)\n", EventPairHandle); + + PAGED_CODE(); + DPRINT("NtSetHighEventPair(EventPairHandle %x)\n", EventPairHandle); /* Open the Object */ Status = ObReferenceObjectByHandle(EventPairHandle, @@ -221,7 +225,6 @@ return Status; } - NTSTATUS STDCALL NtSetHighWaitLowEventPair(IN HANDLE EventPairHandle) @@ -229,9 +232,10 @@ PKEVENT_PAIR EventPair; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; - - DPRINT1("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); + PAGED_CODE(); + DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); + /* Open the Object */ Status = ObReferenceObjectByHandle(EventPairHandle, SYNCHRONIZE, @@ -266,8 +270,12 @@ NtSetLowEventPair(IN HANDLE EventPairHandle) { PKEVENT_PAIR EventPair; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + KPROCESSOR_MODE PreviousMode; NTSTATUS Status; + + PAGED_CODE(); + + PreviousMode = ExGetPreviousMode(); DPRINT1("NtSetHighEventPair(EventPairHandle %x)\n", EventPairHandle); @@ -300,9 +308,10 @@ PKEVENT_PAIR EventPair; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; - - DPRINT1("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); + PAGED_CODE(); + DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); + /* Open the Object */ Status = ObReferenceObjectByHandle(EventPairHandle, SYNCHRONIZE, @@ -340,9 +349,10 @@ PKEVENT_PAIR EventPair; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; - - DPRINT1("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); + PAGED_CODE(); + DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); + /* Open the Object */ Status = ObReferenceObjectByHandle(EventPairHandle, SYNCHRONIZE, @@ -376,9 +386,10 @@ PKEVENT_PAIR EventPair; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; - - DPRINT1("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); + PAGED_CODE(); + DPRINT("NtSetHighWaitLowEventPair(EventPairHandle %x)\n", EventPairHandle); + /* Open the Object */ Status = ObReferenceObjectByHandle(EventPairHandle, SYNCHRONIZE, @@ -386,7 +397,7 @@ PreviousMode, (PVOID*)&EventPair, NULL); - + /* Check for Success */ if(NT_SUCCESS(Status)) { _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/init.c --- branches/alex_devel_branch/reactos/ntoskrnl/ex/init.c 2005-03-04 19:07:02 UTC (rev 13820) +++ branches/alex_devel_branch/reactos/ntoskrnl/ex/init.c 2005-03-04 20:56:32 UTC (rev 13821) @@ -27,6 +27,9 @@ extern ULONG_PTR LastKernelAddress; extern LOADER_MODULE KeLoaderModules[64]; extern PRTL_MESSAGE_RESOURCE_DATA KiBugCodeMessages; +extern LIST_ENTRY KiProfileListHead; +extern LIST_ENTRY KiProfileSourceListHead; +extern KSPIN_LOCK KiProfileLock; /* FUNCTIONS ****************************************************************/ @@ -408,13 +411,18 @@ /* Initialize the kernel debugger */ KdInitSystem (1, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); - + /* Initialize the Dispatcher, Clock and Bug Check Mechanisms. */ KeInit2(); /* Bring back the IRQL to Passive */ KeLowerIrql(PASSIVE_LEVEL); + /* Initialize Profiling */ + InitializeListHead(&KiProfileListHead); + InitializeListHead(&KiProfileSourceListHead); + KeInitializeSpinLock(&KiProfileLock); + /* Cache the Bugcheck Message Strings. Prepare the Lookup Data */ ResourceInfo.Type = 11; ResourceInfo.Name = 1; _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/mutant.c --- branches/alex_devel_branch/reactos/ntoskrnl/ex/mutant.c 2005-03-04 19:07:02 UTC (rev 13820) +++ branches/alex_devel_branch/reactos/ntoskrnl/ex/mutant.c 2005-03-04 20:56:32 UTC (rev 13821) @@ -4,8 +4,7 @@ * FILE: ntoskrnl/ex/mutant.c * PURPOSE: Executive Management of Mutants * - * PROGRAMMERS: - * Alex Ionescu - Fix tab/space mismatching, tiny fixes to query function and + * PROGRAMMERS: Alex Ionescu - Fix tab/space mismatching, tiny fixes to query function and * add more debug output. * David Welch (welch(a)cwcom.net) */ @@ -55,7 +54,7 @@ ExMutantObjectType = ExAllocatePoolWithTag(NonPagedPool, sizeof(OBJECT_TYPE), TAG('M', 't', 'n', 't')); /* Create the Object Type */ - RtlpCreateUnicodeString(&ExMutantObjectType->TypeName, L"Mutant", NonPagedPool); + RtlInitUnicodeString(&ExMutantObjectType->TypeName, L"Mutant"); ExMutantObjectType->Tag = TAG('M', 't', 'n', 't'); ExMutantObjectType->PeakObjects = 0; ExMutantObjectType->PeakHandles = 0; @@ -92,6 +91,7 @@ PKMUTANT Mutant; NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); DPRINT("NtCreateMutant(0x%x, 0x%x, 0x%x)\n", MutantHandle, DesiredAccess, ObjectAttributes); /* Check Output Safety */ @@ -157,7 +157,6 @@ return Status; } - /* * @implemented */ @@ -171,8 +170,7 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - + PAGED_CODE(); DPRINT("NtOpenMutant(0x%x, 0x%x, 0x%x)\n", MutantHandle, DesiredAccess, ObjectAttributes); /* Check Output Safety */ @@ -235,6 +233,8 @@ NTSTATUS Status = STATUS_SUCCESS; PMUTANT_BASIC_INFORMATION BasicInfo = (PMUTANT_BASIC_INFORMATION)MutantInformation; + PAGED_CODE(); + /* Check buffers and parameters */ DefaultQueryInfoBufferCheck(MutantInformationClass, ExMutantInfoClass, @@ -245,11 +245,9 @@ &Status); if(!NT_SUCCESS(Status)) { - DPRINT1("NtQueryMutant() failed, Status: 0x%x\n", Status); + DPRINT("NtQueryMutant() failed, Status: 0x%x\n", Status); return Status; } - - PAGED_CODE(); /* Open the Object */ Status = ObReferenceObjectByHandle(MutantHandle, @@ -264,7 +262,7 @@ _SEH_TRY { /* Fill out the Basic Information Requested */ - DPRINT1("Returning Mutant Information\n"); + DPRINT("Returning Mutant Information\n"); BasicInfo->CurrentCount = KeReadStateMutant(Mutant); BasicInfo->OwnedByCaller = (Mutant->OwnerThread == KeGetCurrentThread()); BasicInfo->AbandonedState = Mutant->Abandoned; @@ -300,7 +298,6 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtReleaseMutant(MutantHandle 0%x PreviousCount 0%x)\n", MutantHandle, PreviousCount); @@ -333,9 +330,11 @@ /* Check for Success and release if such */ if(NT_SUCCESS(Status)) { + LONG Prev; + /* Save the Old State */ - DPRINT1("Releasing Mutant\n"); - LONG Prev = KeReleaseMutant(Mutant, MUTANT_INCREMENT, FALSE, FALSE); + DPRINT("Releasing Mutant\n"); + Prev = KeReleaseMutant(Mutant, MUTANT_INCREMENT, FALSE, FALSE); ObDereferenceObject(Mutant); /* Return it */ _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/profile.c --- branches/alex_devel_branch/reactos/ntoskrnl/ex/profile.c 2005-03-04 19:07:02 UTC (rev 13820) +++ branches/alex_devel_branch/reactos/ntoskrnl/ex/profile.c 2005-03-04 20:56:32 UTC (rev 13821) @@ -80,7 +80,7 @@ /* Create the Object Type */ ExProfileObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlpCreateUnicodeString(&ExProfileObjectType->TypeName, L"Profile", NonPagedPool); + RtlInitUnicodeString(&ExProfileObjectType->TypeName, L"Profile"); ExProfileObjectType->Tag = TAG('P', 'R', 'O', 'F'); ExProfileObjectType->PeakObjects = 0; ExProfileObjectType->PeakHandles = 0; @@ -121,7 +121,7 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - + /* Easy way out */ if(BufferSize == 0) return STATUS_INVALID_PARAMETER_7; @@ -234,9 +234,9 @@ OUT PLARGE_INTEGER PerformanceFrequency OPTIONAL) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + LARGE_INTEGER PerfFrequency; NTSTATUS Status = STATUS_SUCCESS; - LARGE_INTEGER PerfFrequency; - + /* Check the Parameters for validity */ if(PreviousMode != KernelMode) { @@ -287,7 +287,7 @@ NTSTATUS Status; PAGED_CODE(); - + /* Get the Object */ Status = ObReferenceObjectByHandle(ProfileHandle, PROFILE_CONTROL, @@ -405,9 +405,9 @@ NtQueryIntervalProfile(IN KPROFILE_SOURCE ProfileSource, OUT PULONG Interval) { - KPROCESSOR_MODE PreviousMode= ExGetPreviousMode(); + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + ULONG ReturnInterval; NTSTATUS Status = STATUS_SUCCESS; - ULONG ReturnInterval; PAGED_CODE(); _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/sem.c --- branches/alex_devel_branch/reactos/ntoskrnl/ex/sem.c 2005-03-04 19:07:02 UTC (rev 13820) +++ branches/alex_devel_branch/reactos/ntoskrnl/ex/sem.c 2005-03-04 20:56:32 UTC (rev 13821) @@ -37,7 +37,7 @@ /* Create the Semaphore Object */ ExSemaphoreObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - RtlpCreateUnicodeString(&ExSemaphoreObjectType->TypeName, L"Semaphore", NonPagedPool); + RtlInitUnicodeString(&ExSemaphoreObjectType->TypeName, L"Semaphore"); ExSemaphoreObjectType->Tag = TAG('S', 'E', 'M', 'T'); ExSemaphoreObjectType->PeakObjects = 0; ExSemaphoreObjectType->PeakHandles = 0; @@ -78,7 +78,7 @@ PAGED_CODE(); /* Check Output Safety */ - if(PreviousMode == UserMode) { + if(PreviousMode != KernelMode) { _SEH_TRY { @@ -148,7 +148,6 @@ return Status; } - /* * @implemented */ @@ -221,11 +220,10 @@ { PKSEMAPHORE Semaphore; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PSEMAPHORE_BASIC_INFORMATION BasicInfo = (PSEMAPHORE_BASIC_INFORMATION)SemaphoreInformation; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - + /* Check buffers and class validity */ DefaultQueryInfoBufferCheck(SemaphoreInformationClass, ExSemaphoreInfoClass, @@ -254,7 +252,9 @@ _SEH_TRY { - /* Return the basic information */ + PSEMAPHORE_BASIC_INFORMATION BasicInfo = (PSEMAPHORE_BASIC_INFORMATION)SemaphoreInformation; + + /* Return the basic information */ BasicInfo->CurrentCount = KeReadStateSemaphore(Semaphore); BasicInfo->MaximumCount = Semaphore->Limit; @@ -284,12 +284,12 @@ IN LONG ReleaseCount, OUT PLONG PreviousCount OPTIONAL) { - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PKSEMAPHORE Semaphore; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - + /* Check buffer validity */ if(PreviousCount != NULL && PreviousMode == UserMode) { _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/timer.c --- branches/alex_devel_branch/reactos/ntoskrnl/ex/timer.c 2005-03-04 19:07:02 UTC (rev 13820) +++ branches/alex_devel_branch/reactos/ntoskrnl/ex/timer.c 2005-03-04 20:56:32 UTC (rev 13821) @@ -1,5 +1,4 @@ -/* $Id: nttimer.c 12779 2005-01-04 04:45:00Z gdalsnes $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/timer.c @@ -124,9 +123,9 @@ PVOID* SystemArguemnt2) { PETIMER Timer; + KIRQL OldIrql; PETHREAD CurrentThread = PsGetCurrentThread(); - KIRQL OldIrql; - + /* We need to find out which Timer we are */ Timer = CONTAINING_RECORD(Apc, ETIMER, TimerApc); DPRINT("ExpTimerApcKernelRoutine(Apc: %x. Timer: %x)\n", Apc, Timer); @@ -176,7 +175,7 @@ ExTimerType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); /* Create the Executive Timer Object */ - RtlpCreateUnicodeString(&ExTimerType->TypeName, L"Timer", NonPagedPool); + RtlInitUnicodeString(&ExTimerType->TypeName, L"Timer"); ExTimerType->Tag = TAG('T', 'I', 'M', 'T'); ExTimerType->PeakObjects = 0; ExTimerType->PeakHandles = 0; @@ -209,7 +208,7 @@ OUT PBOOLEAN CurrentState OPTIONAL) { PETIMER Timer; - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); BOOLEAN State; KIRQL OldIrql; PETHREAD TimerThread; @@ -217,9 +216,6 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - DPRINT("NtCancelTimer(0x%x, 0x%x)\n", TimerHandle, CurrentState); /* Check Parameter Validity */ @@ -301,10 +297,15 @@ /* Make sure it's safe to write to the handle */ if(CurrentState != NULL) { + _SEH_TRY { + *CurrentState = State; + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; } } @@ -323,28 +324,27 @@ { PETIMER Timer; HANDLE hTimer; - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - DPRINT("NtCreateTimer(Handle: %x, Type: %d)\n", TimerHandle, TimerType); /* Check Parameter Validity */ if (PreviousMode != KernelMode) { + _SEH_TRY { + ProbeForWrite(TimerHandle, sizeof(HANDLE), sizeof(ULONG)); } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; - if(!NT_SUCCESS(Status)) { - return Status; - } + if(!NT_SUCCESS(Status)) return Status; } /* Create the Object */ @@ -388,9 +388,13 @@ /* Make sure it's safe to write to the handle */ _SEH_TRY { + *TimerHandle = hTimer; + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; } @@ -406,28 +410,28 @@ IN POBJECT_ATTRIBUTES ObjectAttributes) { HANDLE hTimer; - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - DPRINT("NtOpenTimer(TimerHandle: %x)\n", TimerHandle); /* Check Parameter Validity */ if (PreviousMode != KernelMode) { + _SEH_TRY { + ProbeForWrite(TimerHandle, sizeof(HANDLE), sizeof(ULONG)); + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; - if(!NT_SUCCESS(Status)) { - return Status; - } + if(!NT_SUCCESS(Status)) return Status; } /* Open the Timer */ @@ -444,9 +448,13 @@ /* Make sure it's safe to write to the handle */ _SEH_TRY { + *TimerHandle = hTimer; + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; } @@ -464,14 +472,11 @@ OUT PULONG ReturnLength OPTIONAL) { PETIMER Timer; - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PTIMER_BASIC_INFORMATION BasicInfo = (PTIMER_BASIC_INFORMATION)TimerInformation; PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - DPRINT("NtQueryTimer(TimerHandle: %x, Class: %d)\n", TimerHandle, TimerInformationClass); /* Check Validity */ @@ -501,7 +506,7 @@ /* Return the Basic Information */ _SEH_TRY { - + /* FIXME: Interrupt correction based on Interrupt Time */ DPRINT("Returning Information for Timer: %x. Time Remaining: %d\n", Timer, Timer->KeTimer.DueTime.QuadPart); BasicInfo->TimeRemaining.QuadPart = Timer->KeTimer.DueTime.QuadPart; @@ -511,7 +516,8 @@ } _SEH_HANDLE { - Status = _SEH_GetExceptionCode(); + Status = _SEH_GetExceptionCode(); + } _SEH_END; /* Dereference Object */ @@ -535,41 +541,40 @@ PETIMER Timer; KIRQL OldIrql; BOOLEAN State; - KPROCESSOR_MODE PreviousMode; - PETHREAD CurrentThread; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PETHREAD CurrentThread = PsGetCurrentThread(); LARGE_INTEGER TimerDueTime; PETHREAD TimerThread; BOOLEAN KillTimer = FALSE; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - CurrentThread = PsGetCurrentThread(); - DPRINT("NtSetTimer(TimerHandle: %x, DueTime: %d, Apc: %x, Period: %d)\n", TimerHandle, DueTime->QuadPart, TimerApcRoutine, Period); /* Check Parameter Validity */ if (PreviousMode != KernelMode) { + _SEH_TRY { + ProbeForRead(DueTime, sizeof(LARGE_INTEGER), sizeof(ULONG)); TimerDueTime = *DueTime; if(PreviousState != NULL) { + ProbeForWrite(PreviousState, sizeof(BOOLEAN), sizeof(BOOLEAN)); } } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; - if(!NT_SUCCESS(Status)) { - return Status; - } + if(!NT_SUCCESS(Status)) return Status; } /* Get the Timer Object */ @@ -685,10 +690,15 @@ /* Make sure it's safe to write to the handle */ if(PreviousState != NULL) { + _SEH_TRY { + *PreviousState = State; + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; } } _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ob.h --- branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ob.h 2005-03-04 19:07:02 UTC (rev 13820) +++ branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ob.h 2005-03-04 20:56:32 UTC (rev 13821) @@ -326,7 +326,7 @@ HANDLE RootDirectory; ULONG Attributes; PSECURITY_DESCRIPTOR SecurityDescriptor; - /* PVOID SecurityQualityOfService; */ + PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService; } CAPTURED_OBJECT_ATTRIBUTES, *PCAPTURED_OBJECT_ATTRIBUTES; NTSTATUS _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/se.h --- branches/alex_devel_branch/reactos/ntoskrnl/include/internal/se.h 2005-03-04 19:07:02 UTC (rev 13820) +++ branches/alex_devel_branch/reactos/ntoskrnl/include/internal/se.h 2005-03-04 20:56:32 UTC (rev 13821) @@ -148,7 +148,61 @@ ULONG PrivilegeControl, KPROCESSOR_MODE PreviousMode); +NTSTATUS +SepCaptureSecurityQualityOfService(IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN KPROCESSOR_MODE AccessMode, + IN POOL_TYPE PoolType, + IN BOOLEAN CaptureIfKernel, + OUT PSECURITY_QUALITY_OF_SERVICE *CapturedSecurityQualityOfService, + OUT PBOOLEAN Present); +VOID +SepReleaseSecurityQualityOfService(IN PSECURITY_QUALITY_OF_SERVICE CapturedSecurityQualityOfService OPTIONAL, + IN KPROCESSOR_MODE AccessMode, + IN BOOLEAN CaptureIfKernel); + +NTSTATUS +SepCaptureSid(IN PSID InputSid, + IN KPROCESSOR_MODE AccessMode, + IN POOL_TYPE PoolType, + IN BOOLEAN CaptureIfKernel, + OUT PSID *CapturedSid); + +VOID +SepReleaseSid(IN PSID CapturedSid, + IN KPROCESSOR_MODE AccessMode, + IN BOOLEAN CaptureIfKernel); + +NTSTATUS +SepCaptureAcl(IN PACL InputAcl, + IN KPROCESSOR_MODE AccessMode, + IN POOL_TYPE PoolType, + IN BOOLEAN CaptureIfKernel, + OUT PACL *CapturedAcl); + +VOID +SepReleaseAcl(IN PACL CapturedAcl, + IN KPROCESSOR_MODE AccessMode, + IN BOOLEAN CaptureIfKernel); + +#define SepAcquireTokenLockExclusive(Token) \ + do { \ + KeEnterCriticalRegion(); \ + ExAcquireResourceExclusive(((PTOKEN)Token)->TokenLock, TRUE); \ + while(0) + +#define SepAcquireTokenLockShared(Token) \ + do { \ + KeEnterCriticalRegion(); \ + ExAcquireResourceShared(((PTOKEN)Token)->TokenLock, TRUE); \ + while(0) + +#define SepReleaseTokenLock(Token) \ + do { \ + ExReleaseResource(((PTOKEN)Token)->TokenLock); \ + KeLeaveCriticalRegion(); \ [truncated at 1000 lines; 2559 more skipped]

19 years, 6 months

[royce] 13820: disable warning about missing file ( make handles this situation correctly regardless )

by royce＠svn.reactos.com

disable warning about missing file ( make handles this situation correctly regardless ) Modified: branches/xmlbuildsystem/reactos/Makefile _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-04 18:51:17 UTC (rev 13819) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-04 19:07:02 UTC (rev 13820) @@ -51,7 +51,7 @@ endif include tools/Makefile -include Makefile.auto +-include Makefile.auto PREAUTO := \ include$(SEP)reactos$(SEP)buildno.h \

19 years, 6 months

[royce] 13819: let make do some more work for us

by royce＠svn.reactos.com

let make do some more work for us Modified: branches/xmlbuildsystem/reactos/Makefile _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-04 17:26:51 UTC (rev 13818) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-04 18:51:17 UTC (rev 13819) @@ -51,7 +51,7 @@ endif include tools/Makefile --include Makefile.auto +include Makefile.auto PREAUTO := \ include$(SEP)reactos$(SEP)buildno.h \ @@ -62,7 +62,7 @@ Makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(CDMAKE_TARGET) $(RBUILD_TARGET) $(PREAUTO) tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw - $(MAKE) $(MAKECMDGOALS) +# $(MAKE) $(MAKECMDGOALS) include$(SEP)reactos$(SEP)bugcodes.h ntoskrnl$(SEP)bugcodes.rc: $(WMC_TARGET) ntoskrnl$(SEP)ntoskrnl.mc

19 years, 6 months

[fireball] 13818: New ReactOS icon by Mindflyer. Just give ros a fresh look :)

by fireball＠svn.reactos.com

New ReactOS icon by Mindflyer. Just give ros a fresh look :) Modified: trunk/reactos/lib/user32/resources/oic_reactos.ico _____ Modified: trunk/reactos/lib/user32/resources/oic_reactos.ico (Binary files differ)

19 years, 6 months

[fireball] 13817: New StartMenu and ReactOS icons by Mindflyer

by fireball＠svn.reactos.com

New StartMenu and ReactOS icons by Mindflyer Modified: trunk/reactos/subsys/system/explorer/res/reactos.ico Modified: trunk/reactos/subsys/system/explorer/res/startmenu.ico _____ Modified: trunk/reactos/subsys/system/explorer/res/reactos.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/startmenu.ico (Binary files differ)

19 years, 6 months

[arty] 13816: Suggested by d_layer: Remove -Wconversion. I had planted these flags here

by arty＠svn.reactos.com

Suggested by d_layer: Remove -Wconversion. I had planted these flags here because they were used in the original makefile from before the import. I was trying to remove the warnings in a hurry and didn't think to check. Modified: trunk/reactos/lib/adns/Makefile Modified: trunk/reactos/lib/adns/adns_win32/adns_win32.h _____ Modified: trunk/reactos/lib/adns/Makefile --- trunk/reactos/lib/adns/Makefile 2005-03-04 09:43:34 UTC (rev 13815) +++ trunk/reactos/lib/adns/Makefile 2005-03-04 11:40:10 UTC (rev 13816) @@ -7,7 +7,7 @@ TARGET_NAME = adns TARGET_CFLAGS = \ - -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ + -O3 -Wall -Wwrite-strings -Wpointer-arith \ -Wstrict-prototypes -Wmissing-prototypes -Wall -DADNS_JGAA_WIN32 -D__USE_W32API -D__REACTOS__ # require os code to explicitly request A/W version of structs/functions _____ Modified: trunk/reactos/lib/adns/adns_win32/adns_win32.h --- trunk/reactos/lib/adns/adns_win32/adns_win32.h 2005-03-04 09:43:34 UTC (rev 13815) +++ trunk/reactos/lib/adns/adns_win32/adns_win32.h 2005-03-04 11:40:10 UTC (rev 13816) @@ -157,34 +157,5 @@ #include "timercmp.h" /* arty added: mingw headers don't seem to have it */ -/* - * <rant> - * These fix the following warning in GCC: - * warning: passing arg 1 of `ntohs' with different width due to prototype - * - * Even if you declare an unsigned char or unsigned short variable and pass - * it to htons or ntohs, this warning will be generated. I believe this is - * a gcc bug. You can try to reproduce the bug like this: - * - * u_short foo(u_short bar) { - * return htons(bar); - * } - * - * Using the reactos compiler settings this generates the error. Unless I'm - * missing something, the active prototypes for htons and ntohs are: - * - * u_short PASCAL htons(u_short); - * u_short PASCAL ntohs(u_short); - * - * From winsock2.h. Since the function above has exactly the same signature - * as htons except for the required PASCAL (__stdcall) decoration, gcc is - * erroneously detecting a narrowed value. - * </rant> - */ -#ifdef __REACTOS__ -#define htons(x) ((((x)&0xff)<<8)|(((x)>>8)&0xff)) -#define ntohs(x) htons(x) -#endif - #endif /* ADNS_WIN32_H_INCLUDED */

19 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005