Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ea] 13785: Fix FsRtlNotifyInitializeSync signature.
by ea＠svn.reactos.com 28 Feb '05

28 Feb '05

Fix FsRtlNotifyInitializeSync signature. Modified: trunk/reactos/include/ddk/fsfuncs.h _____ Modified: trunk/reactos/include/ddk/fsfuncs.h --- trunk/reactos/include/ddk/fsfuncs.h 2005-02-28 21:10:39 UTC (rev 13784) +++ trunk/reactos/include/ddk/fsfuncs.h 2005-02-28 21:59:47 UTC (rev 13785) @@ -617,7 +617,7 @@ ); VOID STDCALL -FsRtlNotifyInitializeSync(IN OUT PNOTIFY_SYNC NotifySync); +FsRtlNotifyInitializeSync(IN OUT PNOTIFY_SYNC *NotifySync); NTSTATUS STDCALL FsRtlNotifyVolumeEvent(IN PFILE_OBJECT FileObject,

1 0

[blight] 13784: Patch by tinus: clean up long lines of = outputted by freeldr build.
by blight＠svn.reactos.com 28 Feb '05

28 Feb '05

Patch by tinus: clean up long lines of = outputted by freeldr build. Modified: trunk/reactos/boot/freeldr/bootsect/Makefile Modified: trunk/reactos/boot/freeldr/fdebug/Makefile Modified: trunk/reactos/boot/freeldr/freeldr/Makefile Modified: trunk/reactos/boot/freeldr/install/Makefile Modified: trunk/reactos/boot/freeldr/tools/Makefile _____ Modified: trunk/reactos/boot/freeldr/bootsect/Makefile --- trunk/reactos/boot/freeldr/bootsect/Makefile 2005-02-28 21:07:30 UTC (rev 13783) +++ trunk/reactos/boot/freeldr/bootsect/Makefile 2005-02-28 21:10:39 UTC (rev 13784) @@ -32,26 +32,26 @@ @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) dosmbr.bin : dosmbr.asm - @echo ===================================================== Assembling dosmbr + @echo freeldr: Assembling dosmbr @$(NASM_CMD) $(NFLAGS) -o dosmbr.bin -f bin dosmbr.asm fat.bin : fat.asm $(BIN2C) - @echo ===================================================== Assembling fat + @echo freeldr: Assembling fat @$(NASM_CMD) $(NFLAGS) -o fat.bin -f bin fat.asm @$(BIN2C) fat.bin fat.h fat_data fat32.bin : fat32.asm $(BIN2C) - @echo ===================================================== Assembling fat32 + @echo freeldr: Assembling fat32 @$(NASM_CMD) $(NFLAGS) -o fat32.bin -f bin fat32.asm @$(BIN2C) fat32.bin fat32.h fat32_data isoboot.bin : isoboot.asm - @echo ===================================================== Assembling isoboot + @echo freeldr: Assembling isoboot @$(NASM_CMD) $(NFLAGS) -o isoboot.bin -f bin isoboot.asm ext2.bin : ext2.asm - @echo ===================================================== Assembling ext2 + @echo freeldr: Assembling ext2 @$(NASM_CMD) $(NFLAGS) -o ext2.bin -f bin ext2.asm @$(BIN2C) ext2.bin ext2.h ext2_data @@ -77,4 +77,4 @@ clean: @-$(RM) *.bin @-$(RM) *.h - @echo Clean ALL done. + @echo freeldr: Clean ALL done. _____ Modified: trunk/reactos/boot/freeldr/fdebug/Makefile --- trunk/reactos/boot/freeldr/fdebug/Makefile 2005-02-28 21:07:30 UTC (rev 13783) +++ trunk/reactos/boot/freeldr/fdebug/Makefile 2005-02-28 21:10:39 UTC (rev 13784) @@ -30,23 +30,23 @@ all: fdebug.exe fdebug.exe: $(OBJS) - @echo ===================================================== LINKING fdebug + @echo freeldr: LINKING fdebug $(CC) $(FLAGS) -o fdebug.exe $(OBJS) -lgdi32 -lcomdlg32 -Wl,--subsystem,windows fdebug.res: fdebug.rc resource.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(RC) -o fdebug.res fdebug.rc -O coff fdebug.o: fdebug.c rs232.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(CC) $(FLAGS) -o fdebug.o -c fdebug.c rs232.o: rs232.c rs232.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(CC) $(FLAGS) -o rs232.o -c rs232.c clean: @-$(RM) *.o @-$(RM) *.res @-$(RM) *.exe - @echo Clean ALL done. + @echo freeldr: Clean ALL done. _____ Modified: trunk/reactos/boot/freeldr/freeldr/Makefile --- trunk/reactos/boot/freeldr/freeldr/Makefile 2005-02-28 21:07:30 UTC (rev 13783) +++ trunk/reactos/boot/freeldr/freeldr/Makefile 2005-02-28 21:10:39 UTC (rev 13784) @@ -57,7 +57,7 @@ @-$(RM) setupldr.sys @-$(RM) setupldr.map @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) - @echo Clean ALL done. + @echo freeldr: Clean ALL done. ############################################# @@ -259,11 +259,11 @@ all : freeldr.sys setupldr.sys - @echo Make ALL done. + @echo freeldr: Make ALL done. freeldr.sys : $(ALL_OBJS) $(PATH_TO_TOP)/dk/w32/lib/librossym.a - @echo ===================================================== LINKING $@ + @echo freeldr: LINKING $@ @$(LD) $(LFLAGS) -o freeldr.exe $(F_OBJS) $(PATH_TO_TOP)/dk/w32/lib/librossym.a ifeq ($(FULL_MAP),yes) @$(OBJDUMP) -d -S freeldr.exe > freeldr.map @@ -274,7 +274,7 @@ setupldr.sys : $(ALL_OBJS) - @echo ===================================================== LINKING $@ + @echo freeldr: LINKING $@ @$(LD) $(LFLAGS) -Map setupldr.map -o setupldr.exe $(S_OBJS) ifeq ($(FULL_MAP),yes) @$(OBJDUMP) -d -S setupldr.exe > setupldr.map @@ -285,15 +285,15 @@ %.o :: %.c - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* @$(CC) $(CFLAGS) -o $@ -c $< @$(DEPTOOL) $*.d %.o :: %.S - @echo ===================================================== Assembling $* + @echo freeldr: Assembling $* @$(CC) $(CFLAGS) -o $@ -c $< @$(DEPTOOL) $*.d %.o :: %.asm - @echo ===================================================== Assembling $* + @echo freeldr: Assembling $* @$(NASM_CMD) $(NASMFLAGS) -o $@ $< _____ Modified: trunk/reactos/boot/freeldr/install/Makefile --- trunk/reactos/boot/freeldr/install/Makefile 2005-02-28 21:07:30 UTC (rev 13783) +++ trunk/reactos/boot/freeldr/install/Makefile 2005-02-28 21:10:39 UTC (rev 13784) @@ -35,18 +35,18 @@ @$(MAKE) --no-print-directory -C ../bootsect install.exe: $(OBJS) - @echo ===================================================== LINKING install + @echo freeldr: LINKING install $(CC) $(FLAGS) -o install.exe $(OBJS) install.o: install.c install.h volume.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(CC) $(FLAGS) -o install.o -c install.c volume.o: volume.c volume.h install.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(CC) $(FLAGS) -o volume.o -c volume.c clean: @-$(RM) *.o @-$(RM) *.exe - @echo Clean ALL done. + @echo freeldr: Clean ALL done. _____ Modified: trunk/reactos/boot/freeldr/tools/Makefile --- trunk/reactos/boot/freeldr/tools/Makefile 2005-02-28 21:07:30 UTC (rev 13783) +++ trunk/reactos/boot/freeldr/tools/Makefile 2005-02-28 21:10:39 UTC (rev 13784) @@ -25,16 +25,16 @@ bin2c$(EXE_POSTFIX) all : $(TOOLS) - @echo Tools are up to date. + @echo freeldr: Tools are up to date. % :: all %$(EXE_POSTFIX): %.c - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* @$(HOST_CC) -Wall -O3 -o $@ $< .PHONY : clean clean: @-$(RM) $(TOOLS) - @echo Clean ALL done. + @echo freeldr: Clean ALL done.

1 0

[frik85] 13783: fix spelling mistake
by frik85＠svn.reactos.com 28 Feb '05

28 Feb '05

fix spelling mistake Modified: trunk/reactos/lib/cpl/desk/de.rc _____ Modified: trunk/reactos/lib/cpl/desk/de.rc --- trunk/reactos/lib/cpl/desk/de.rc 2005-02-28 21:00:59 UTC (rev 13782) +++ trunk/reactos/lib/cpl/desk/de.rc 2005-02-28 21:07:30 UTC (rev 13783) @@ -49,7 +49,7 @@ STRINGTABLE BEGIN IDS_CPLNAME "Anzeige" - IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und des Bildschrimschoners an." + IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und des Bildschirmschoners an." IDS_NONE "(Keine)" IDS_CENTER "Zentriert"

1 0

[gdalsnes] 13782: init. work on a notify-directory impl.
by gdalsnes＠svn.reactos.com 28 Feb '05

28 Feb '05

init. work on a notify-directory impl. Modified: trunk/reactos/ntoskrnl/fs/notify.c _____ Modified: trunk/reactos/ntoskrnl/fs/notify.c --- trunk/reactos/ntoskrnl/fs/notify.c 2005-02-28 20:43:23 UTC (rev 13781) +++ trunk/reactos/ntoskrnl/fs/notify.c 2005-02-28 21:00:59 UTC (rev 13782) @@ -5,14 +5,126 @@ * FILE: ntoskrnl/fs/notify.c * PURPOSE: No purpose listed. * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Gunnar Dalsnes */ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +PAGED_LOOKASIDE_LIST NotifyEntryLookaside; + +typedef struct _NOTIFY_ENTRY +{ + LIST_ENTRY ListEntry; + PSTRING FullDirectoryName; + BOOLEAN WatchTree; + BOOLEAN IgnoreBuffer; + ULONG CompletionFilter; + LIST_ENTRY IrpQueue; + PVOID Fcb; + PCHECK_FOR_TRAVERSE_ACCESS TraverseCallback; + PSECURITY_SUBJECT_CONTEXT SubjectContext; + PVOID FsContext; + LIST_ENTRY BufferedChangesList; +} NOTIFY_ENTRY, *PNOTIFY_ENTRY; + +typedef struct _BUFFERED_CHANGE +{ + LIST_ENTRY ListEntry; + ULONG Action; + USHORT NameLen; + WCHAR RelativeName[1]; + +} BUFFERED_CHANGE, *PBUFFERED_CHANGE; + + /********************************************************************** + * NAME PRIVATE + * FsRtlpInitNotifyImplementation + * + */ +VOID +STDCALL INIT_FUNCTION +FsRtlpInitNotifyImplementation(VOID) +{ + ExInitializePagedLookasideList( &NotifyEntryLookaside, + NULL, + NULL, + 0, + sizeof(NOTIFY_ENTRY), + 0 /* FSRTL_NOTIFY_TAG*/, + 0 + ); + + +} + + + + + +/********************************************************************** + * NAME PRIVATE + * FsRtlpNotifyCancelRoutine + * + */ +static +VOID +STDCALL +FsRtlpNotifyCancelRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp + ) +{ + PFAST_MUTEX Lock; + + //don't need this since we have our own sync. protecting irp cancellation + IoReleaseCancelSpinLock(Irp->CancelIrql); + + Lock = (PFAST_MUTEX)Irp->Tail.Overlay.DriverContext[3]; + + ExAcquireFastMutex(Lock ); + + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + ExReleaseFastMutex(Lock); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + +} + + + +static +PNOTIFY_ENTRY +FASTCALL +FsRtlpFindNotifyEntry( + PLIST_ENTRY NotifyList, + PVOID FsContext + ) +{ + PLIST_ENTRY EnumEntry; + PNOTIFY_ENTRY NotifyEntry; + + LIST_FOR_EACH(EnumEntry, NotifyList) + { + NotifyEntry = CONTAINING_RECORD(EnumEntry, NOTIFY_ENTRY, ListEntry); + + if (NotifyEntry->FsContext == FsContext) + { + return NotifyEntry; + } + } + + return NULL; +} + +/********************************************************************** * NAME EXPORTED * FsRtlNotifyChangeDirectory@28 * @@ -57,7 +169,8 @@ * FsRtlNotifyCleanup@12 * * DESCRIPTION - * + * Called by FSD when all handles to FileObject (identified by FsContext) are closed + * * ARGUMENTS * * RETURN VALUE @@ -72,6 +185,64 @@ IN PVOID FsContext ) { + PNOTIFY_ENTRY NotifyEntry; + LIST_ENTRY CompletedListHead; + PLIST_ENTRY TmpEntry; + PBUFFERED_CHANGE BufferedChange; + PIRP Irp; + + InitializeListHead(&CompletedListHead); + + ExAcquireFastMutex((PFAST_MUTEX)NotifySync); + + NotifyEntry = FsRtlpFindNotifyEntry(NotifyList, FsContext); + + if (NotifyEntry) + { + /* free buffered changes */ + while (!IsListEmpty(&NotifyEntry->BufferedChangesList)) + { + TmpEntry = RemoveHeadList(&NotifyEntry->BufferedChangesList); + BufferedChange = CONTAINING_RECORD(TmpEntry , BUFFERED_CHANGE, ListEntry); + ExFreePool(BufferedChange); + } + + /* cancel(?) pending irps */ + while (!IsListEmpty(&NotifyEntry->IrpQueue)) + { + TmpEntry = RemoveHeadList(&NotifyEntry->IrpQueue); + Irp = CONTAINING_RECORD(TmpEntry , IRP, Tail.Overlay.ListEntry); + + /* irp cancelation bolilerplate */ + if (!IoSetCancelRoutine(Irp, NULL)) + { + //The cancel routine will be called. When we release the lock it will complete the irp. + InitializeListHead(&Irp->Tail.Overlay.ListEntry); + continue; + } + + Irp->IoStatus.Status = STATUS_NOTIFY_CLEANUP; /* FIXME: correct status? */ + Irp->IoStatus.Information = 0; + + /* avoid holding lock while completing irp */ + InsertTailList(&CompletedListHead, &Irp->Tail.Overlay.ListEntry); + } + + /* Unlink and free the NotifyStruct */ + RemoveEntryList(&NotifyEntry->ListEntry); + ExFreeToPagedLookasideList(&NotifyEntryLookaside, NotifyEntry); + } + + ExReleaseFastMutex((PFAST_MUTEX)NotifySync); + + /* complete defered irps */ + while (!IsListEmpty(&CompletedListHead)) + { + TmpEntry = RemoveHeadList(&CompletedListHead); + Irp = CONTAINING_RECORD(TmpEntry , IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + } @@ -119,6 +290,75 @@ } + +static +VOID +FASTCALL +FsRtlpWatchedDirectoryWasDeleted( + IN PNOTIFY_SYNC NotifySync, + IN PLIST_ENTRY NotifyList, + IN PVOID Fcb + ) +{ + LIST_ENTRY CompletedListHead; + PLIST_ENTRY EnumEntry, TmpEntry; + PNOTIFY_ENTRY NotifyEntry; + PBUFFERED_CHANGE BufferedChange; + PIRP Irp; + + InitializeListHead(&CompletedListHead); + + ExAcquireFastMutex((PFAST_MUTEX)NotifySync); + + LIST_FOR_EACH_SAFE(EnumEntry, NotifyList, NotifyEntry, NOTIFY_ENTRY, ListEntry ) + { + if (NotifyEntry->Fcb == Fcb) + { + RemoveEntryList(&NotifyEntry->ListEntry); + + /* free buffered changes */ + while (!IsListEmpty(&NotifyEntry->BufferedChangesList)) + { + TmpEntry = RemoveHeadList(&NotifyEntry->BufferedChangesList); + BufferedChange = CONTAINING_RECORD(TmpEntry , BUFFERED_CHANGE, ListEntry); + ExFreePool(BufferedChange); + } + + /* cancel(?) pending irps */ + while (!IsListEmpty(&NotifyEntry->IrpQueue)) + { + TmpEntry = RemoveHeadList(&NotifyEntry->IrpQueue); + Irp = CONTAINING_RECORD(TmpEntry , IRP, Tail.Overlay.ListEntry); + + /* irp cancelation bolilerplate */ + if (!IoSetCancelRoutine(Irp, NULL)) + { + //The cancel routine will be called. When we release the lock it will complete the irp. + InitializeListHead(&Irp->Tail.Overlay.ListEntry); + continue; + } + + Irp->IoStatus.Status = STATUS_NOTIFY_CLEANUP; /* FIXME: correct status? */ + Irp->IoStatus.Information = 0; + + /* avoid holding lock while completing irp */ + InsertTailList(&CompletedListHead, &Irp->Tail.Overlay.ListEntry); + } + } + } + + ExReleaseFastMutex((PFAST_MUTEX)NotifySync); + + /* complete defered irps */ + while (!IsListEmpty(&CompletedListHead)) + { + TmpEntry = RemoveHeadList(&CompletedListHead); + Irp = CONTAINING_RECORD(TmpEntry , IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + +} + /********************************************************************** * NAME EXPORTED * FsRtlNotifyFullChangeDirectory@40 @@ -137,23 +377,185 @@ IN PNOTIFY_SYNC NotifySync, IN PLIST_ENTRY NotifyList, IN PVOID FsContext, - IN PSTRING FullDirectoryName, - IN BOOLEAN WatchTree, - IN BOOLEAN IgnoreBuffer, - IN ULONG CompletionFilter, - IN PIRP NotifyIrp, - IN PCHECK_FOR_TRAVERSE_ACCESS TraverseCallback OPTIONAL, + IN PSTRING FullDirectoryName, + IN BOOLEAN WatchTree, + IN BOOLEAN IgnoreBuffer, + IN ULONG CompletionFilter, + IN PIRP NotifyIrp, + IN PCHECK_FOR_TRAVERSE_ACCESS TraverseCallback OPTIONAL, IN PSECURITY_SUBJECT_CONTEXT SubjectContext OPTIONAL ) { -#if defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1300) - DbgPrint("%s()\n", __FUNCTION__); -#else - DbgPrint("FsRtlNotifyFullChangeDirectory()\n"); -#endif + PIO_STACK_LOCATION IrpStack; + PNOTIFY_ENTRY NotifyEntry; + PBUFFERED_CHANGE BufferedChange; + PLIST_ENTRY TmpEntry; + + if (!NotifyIrp) + { + /* all other params are ignored if NotifyIrp == NULL */ + FsRtlpWatchedDirectoryWasDeleted(NotifySync, NotifyList, FsContext); + return; + } + + ExAcquireFastMutex((PFAST_MUTEX)NotifySync); + + IrpStack = IoGetCurrentIrpStackLocation(NotifyIrp); + if (IrpStack->FileObject->Flags & FO_CLEANUP_COMPLETE) + { + ExReleaseFastMutex((PFAST_MUTEX)NotifySync); + + NotifyIrp->IoStatus.Information = 0; + NotifyIrp->IoStatus.Status = STATUS_NOTIFY_CLEANUP; + IoCompleteRequest(NotifyIrp, IO_NO_INCREMENT); + return; + } + + NotifyEntry = FsRtlpFindNotifyEntry(NotifyList, FsContext); + + if (!NotifyEntry) + { + /* No NotifyStruct for this FileObject existed */ + + NotifyEntry = ExAllocateFromPagedLookasideList(&NotifyEntryLookaside); + + NotifyEntry->FsContext = FsContext; + NotifyEntry->FullDirectoryName = FullDirectoryName; + NotifyEntry->WatchTree = WatchTree; + NotifyEntry->IgnoreBuffer = IgnoreBuffer; + NotifyEntry->CompletionFilter = CompletionFilter; + NotifyEntry->TraverseCallback = TraverseCallback; + NotifyEntry->SubjectContext = SubjectContext; + NotifyEntry->Fcb = IrpStack->FileObject->FsContext; + InitializeListHead(&NotifyEntry->IrpQueue); + InitializeListHead(&NotifyEntry->BufferedChangesList); + + InsertTailList(NotifyList, &NotifyEntry->ListEntry); + } + + /* + * FIXME: this NotifyStruct allready have values for WatchTree, CompletionFilter etc. + * What if the WatchTree, CompletionFilter etc. params are different from + * those in the NotifyStruct? Should the params be ignored or should the params overwrite + * the "old" values in the NotifyStruct?? + * STATUS: Currently we ignore these params for subsequesnt request. + * + * -Gunnar + */ + + if (IsListEmpty(&NotifyEntry->BufferedChangesList)) + { + /* No changes are pending. Queue the irp */ + + /* Irp cancelation boilerplate */ + IoSetCancelRoutine(NotifyIrp, FsRtlpNotifyCancelRoutine); + if (NotifyIrp->Cancel && IoSetCancelRoutine(NotifyIrp, NULL)) + { + //irp was canceled + ExReleaseFastMutex((PFAST_MUTEX)NotifySync); + + NotifyIrp->IoStatus.Status = STATUS_CANCELLED; + NotifyIrp->IoStatus.Information = 0; + + IoCompleteRequest(NotifyIrp, IO_NO_INCREMENT); + return; + } + + IoMarkIrpPending(NotifyIrp); + + //FIXME: any point in setting irp status/information before queueing? + + /* save NotifySych for use in the cancel routine */ + NotifyIrp->Tail.Overlay.DriverContext[3] = NotifySync; + InsertTailList(&NotifyEntry->IrpQueue, &NotifyIrp->Tail.Overlay.ListEntry); + + ExReleaseFastMutex((PFAST_MUTEX)NotifySync); + return; + } + + + + + /* + typedef struct _FILE_NOTIFY_INFORMATION { + ULONG NextEntryOffset; + ULONG Action; + ULONG NameLength; + WCHAR Name[1]; + } FILE_NOTIFY_INFORMATION, *PFILE_NOTIFY_INFORMATION; + */ + + /* Buffered changes exist */ + + + /* Copy as much buffered data as available/the buffer can hold */ + while (!IsListEmpty(&NotifyEntry->BufferedChangesList)) + { + TmpEntry = RemoveHeadList(&NotifyEntry->BufferedChangesList); + BufferedChange = CONTAINING_RECORD(TmpEntry, BUFFERED_CHANGE, ListEntry); + + /* FIXME: + Fill user-buffer with recorded events until full. If user buffer is too small to hold even + a single record or can only hold some of the events, what should we do???????????? + */ + + /* FIXME: implement this (copy data to user) */ + +// BufferedChange->Action = Action; +// RecordedChange->Name +// RecordedChange->NameLength + + ExFreePool(BufferedChange); + + + } + + ExReleaseFastMutex((PFAST_MUTEX)NotifySync); + + NotifyIrp->IoStatus.Information = 0; //<- FIXME + NotifyIrp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(NotifyIrp, IO_NO_INCREMENT); } + +static +PIRP +FASTCALL +FsRtlpGetNextIrp(PNOTIFY_ENTRY NotifyEntry) +{ + PIRP Irp; + PLIST_ENTRY TmpEntry; + + /* Loop to get a non-canceled irp */ + while (!IsListEmpty(&NotifyEntry->IrpQueue)) + { + /* If we have queued irp(s) we can't possibly have buffered changes too */ + ASSERT(IsListEmpty(&NotifyEntry->BufferedChangesList)); + + TmpEntry = RemoveHeadList(&NotifyEntry->IrpQueue); + Irp = CONTAINING_RECORD(TmpEntry , IRP, Tail.Overlay.ListEntry); + + /* irp cancelation bolilerplate */ + if (!IoSetCancelRoutine(Irp, NULL)) + { + //The cancel routine will be called. When we release the lock it will complete the irp. + InitializeListHead(&Irp->Tail.Overlay.ListEntry); + continue; + } + + /* Finally we got a non-canceled irp */ + return Irp; + } + + return NULL; +} + + + + + + /********************************************************************** * NAME EXPORTED * FsRtlNotifyFullReportChange@36 @@ -172,7 +574,7 @@ IN PNOTIFY_SYNC NotifySync, IN PLIST_ENTRY NotifyList, IN PSTRING FullTargetName, - IN USHORT TargetNameOffset, + IN USHORT TargetNameOffset, /* in bytes */ IN PSTRING StreamName OPTIONAL, IN PSTRING NormalizedParentName OPTIONAL, IN ULONG FilterMatch, @@ -180,6 +582,80 @@ IN PVOID TargetContext ) { + UNICODE_STRING FullDirName; + UNICODE_STRING TargetName; + PLIST_ENTRY EnumEntry; + PNOTIFY_ENTRY NotifyEntry; + PBUFFERED_CHANGE BufferedChange; + PIRP Irp; + LIST_ENTRY CompletedListHead; + + InitializeListHead(&CompletedListHead); + + FullDirName.Buffer = (WCHAR*)FullTargetName->Buffer; + FullDirName.MaximumLength = FullDirName.Length = TargetNameOffset - sizeof(WCHAR); + + TargetName.Buffer = (WCHAR*)(FullTargetName->Buffer + TargetNameOffset); + TargetName.MaximumLength = TargetName.Length = FullTargetName->Length - TargetNameOffset; + + + ExAcquireFastMutex((PFAST_MUTEX)NotifySync); + + LIST_FOR_EACH_SAFE(EnumEntry, NotifyList, NotifyEntry, NOTIFY_ENTRY, ListEntry ) + { + /* rule out some easy cases */ + /* FIXME: short vs. long names??? */ + if (FilterMatch != NotifyEntry->CompletionFilter) continue; + + if (FullDirName.Length < NotifyEntry->FullDirectoryName->Length) continue; + + if (!NotifyEntry->WatchTree && FullDirName.Length != NotifyEntry->FullDirectoryName->Length) continue; + + if (wcsncmp((WCHAR*)NotifyEntry->FullDirectoryName->Buffer, + FullDirName.Buffer, + NotifyEntry->FullDirectoryName->Length/sizeof(WCHAR)) != 0) continue; + + /* Found a valid change */ + + if ((Irp = FsRtlpGetNextIrp(NotifyEntry))) + { + //FIXME: copy data to user + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + /* avoid holding lock while completing irp */ + InsertTailList(&CompletedListHead, &Irp->Tail.Overlay.ListEntry); + } + else + { + /* No irp in queue. Buffer changes */ + /* FIXME: how much stuff should we buffer? + -Should we alloc with quotas? + -Should we use a hardcoded limit? + -Should we use a time-out? (drop changes if they are not retrieved in x seconds? + */ + BufferedChange = ExAllocatePool(PagedPool, FIELD_OFFSET(BUFFERED_CHANGE, RelativeName) + TargetName.Length); + + BufferedChange->Action = Action; + BufferedChange->NameLen = TargetName.Length; + memcpy(BufferedChange->RelativeName, TargetName.Buffer, TargetName.Length); + + InsertTailList(&NotifyEntry->BufferedChangesList, &BufferedChange->ListEntry); + } + } + + ExReleaseFastMutex((PFAST_MUTEX)NotifySync); + + /* complete defered irps */ + while (!IsListEmpty(&CompletedListHead)) + { + EnumEntry = RemoveHeadList(&CompletedListHead); + Irp = CONTAINING_RECORD(EnumEntry, IRP, Tail.Overlay.ListEntry); + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + } @@ -198,25 +674,11 @@ VOID STDCALL FsRtlNotifyInitializeSync ( - IN PNOTIFY_SYNC NotifySync + IN PNOTIFY_SYNC *NotifySync ) { -#if 0 - *NotifySync = NULL; - *NotifySync = ExAllocatePoolWithTag ( - 0x10, // PoolType??? - sizeof (NOTIFY_SYNC), // NumberOfBytes = 0x28 - FSRTL_TAG - ); - - *NotifySync->Unknown0 = 1; - *NotifySync->Unknown2 = 0; - *NotifySync->Unknown3 = 1; - *NotifySync->Unknown4 = 4; - *NotifySync->Unknown5 = 0; - *NotifySync->Unknown9 = 0; - *NotifySync->Unknown10 = 0; -#endif + *NotifySync = ExAllocatePoolWithTag(NonPagedPool, sizeof(FAST_MUTEX), 0/*FSRTL_NOTIFY_TAG*/ ); + ExInitializeFastMutex((PFAST_MUTEX)*NotifySync); } @@ -246,11 +708,11 @@ NotifySync, NotifyList, FullTargetName, - (FullTargetName->Length - *FileNamePartLength), /*?*/ + (FullTargetName->Length - *FileNamePartLength), NULL, NULL, FilterMatch, - 0, /* Action ? */ + 0, NULL ); } @@ -276,16 +738,10 @@ VOID STDCALL FsRtlNotifyUninitializeSync ( - IN OUT PNOTIFY_SYNC NotifySync + IN PNOTIFY_SYNC NotifySync ) { -#if 0 - if (NULL != *NotifySync) - { - ExFreePool (*NotifySync); - *NotifySync = NULL; - } -#endif + ExFreePool (NotifySync); } /**********************************************************************

1 0

[hbirr] 13781: Fixed german resource script for desk.cpl.
by hbirr＠svn.reactos.com 28 Feb '05

28 Feb '05

Fixed german resource script for desk.cpl. Modified: trunk/reactos/lib/cpl/desk/de.rc Modified: trunk/reactos/lib/cpl/desk/desk.rc _____ Modified: trunk/reactos/lib/cpl/desk/de.rc --- trunk/reactos/lib/cpl/desk/de.rc 2005-02-28 19:46:39 UTC (rev 13780) +++ trunk/reactos/lib/cpl/desk/de.rc 2005-02-28 20:43:23 UTC (rev 13781) @@ -1,46 +1,5 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "&Optionen" - BEGIN - MENUITEM "&Eigenschaften", IDC_PROPERTIES - MENUITEM "Erweiterte Ein&stellungen", IDC_ADVANCED_CONTROLS - MENUITEM SEPARATOR - MENUITEM "&Beenden", IDC_EXIT - END - POPUP "&?" - BEGIN - MENUITEM "&Hilfethemen", IDC_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&Info", IDC_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SNDVOL32 "Lautstõrke Einstellungen" - IDS_NOMIXERDEVICES "Es sind keine aktivien Mixer vorhanden! Die Anwendung wird jetzt beendet." -END - -IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Eigenschaften" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&Mixer:", -1, 7,8,48,9 - COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Lautstõrke regeln f³r:", -1, 7,25,211,77 - PUSHBUTTON "Wie&dergabe", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Aufnahme", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "A&ndere:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED - COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - - PUSHBUTTON "OK", IDOK, 114,226,50,14 - PUSHBUTTON "Abbrechen", IDCANCEL, 168,226,50,14 -END -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Desktop" @@ -95,5 +54,5 @@ IDS_NONE "(Keine)" IDS_CENTER "Zentriert" IDS_STRETCH "Gestreckt" - IDS_TILE "Nebeneinnander" + IDS_TILE "Nebeneinander" END _____ Modified: trunk/reactos/lib/cpl/desk/desk.rc --- trunk/reactos/lib/cpl/desk/desk.rc 2005-02-28 19:46:39 UTC (rev 13780) +++ trunk/reactos/lib/cpl/desk/desk.rc 2005-02-28 20:43:23 UTC (rev 13781) @@ -13,5 +13,5 @@ IDC_DESK_ICON ICON "resources/applet.ico" #include "en.rc" -//#include "de.rc" +#include "de.rc"

1 0

[sedwards] 13780: and remove regedt32 from the install CD
by sedwards＠svn.reactos.com 28 Feb '05

28 Feb '05

and remove regedt32 from the install CD Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-02-28 19:45:54 UTC (rev 13779) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-02-28 19:46:39 UTC (rev 13780) @@ -149,7 +149,6 @@ subsys\system\format\format.exe 1 subsys\system\notepad\notepad.exe 1 subsys\system\regedit\regedit.exe 4 -subsys\system\regedt32\regedt32.exe 1 subsys\system\regsvr32\regsvr32.exe 1 subsys\system\reporterror\reporterror.exe 1 subsys\system\rundll32\rundll32.exe 1

1 0

[sedwards] 13779: disable buggy German resource script for desk.cpl. Remove regedt32 as even Microsoft sees having two registry editors is pointless.
by sedwards＠svn.reactos.com 28 Feb '05

28 Feb '05

disable buggy German resource script for desk.cpl. Remove regedt32 as even Microsoft sees having two registry editors is pointless. Modified: trunk/reactos/Makefile Modified: trunk/reactos/lib/cpl/desk/desk.rc Deleted: trunk/reactos/subsys/system/regedt32/ _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-02-28 18:16:48 UTC (rev 13778) +++ trunk/reactos/Makefile 2005-02-28 19:45:54 UTC (rev 13779) @@ -103,7 +103,7 @@ # System applications # autochk cmd format services setup usetup welcome winlogon msiexec -SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regedt32 regsvr32 \ +SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regsvr32 \ reporterror services setup taskmgr userinit usetup welcome vmwinst rundll32 \ winlogon regedit winefile notepad reactos lsass _____ Modified: trunk/reactos/lib/cpl/desk/desk.rc --- trunk/reactos/lib/cpl/desk/desk.rc 2005-02-28 18:16:48 UTC (rev 13778) +++ trunk/reactos/lib/cpl/desk/desk.rc 2005-02-28 19:45:54 UTC (rev 13779) @@ -13,5 +13,5 @@ IDC_DESK_ICON ICON "resources/applet.ico" #include "en.rc" -#include "de.rc" +//#include "de.rc"

1 0

[ion] 13778: testing...
by ion＠svn.reactos.com 28 Feb '05

28 Feb '05

testing... Modified: branches/alex_devel_branch/reactos/config _____ Modified: branches/alex_devel_branch/reactos/config --- branches/alex_devel_branch/reactos/config 2005-02-28 17:40:15 UTC (rev 13777) +++ branches/alex_devel_branch/reactos/config 2005-02-28 18:16:48 UTC (rev 13778) @@ -15,7 +15,7 @@ # be optimze for. # -OARCH := i486 +OARCH := pentium2 # # Whether to compile in the kernel debugger @@ -30,7 +30,7 @@ # # Whether to compile with optimizations # -OPTIMIZED := 0 +OPTIMIZED := 1 # # Whether to compile a multiprocessor or single processor version

1 0

[ion] 13777: Reverting to 13775. Sorry for the mess. This is dedicated to Jane! 19934415.
by ion＠svn.reactos.com 28 Feb '05

28 Feb '05

Reverting to 13775. Sorry for the mess. This is dedicated to Jane! 19934415. Modified: trunk/reactos/config Modified: trunk/reactos/drivers/storage/floppy/floppy.c Modified: trunk/reactos/include/ddk/extypes.h Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/include/ddk/ketypes.h Modified: trunk/reactos/include/ntos/zwtypes.h Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/cm/registry.c Deleted: trunk/reactos/ntoskrnl/ex/error.c Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/rundown.c Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/ex/work.c Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/internal/id.h Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/nls.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/io/bootlog.c Modified: trunk/reactos/ntoskrnl/io/create.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/wmi.c Added: trunk/reactos/ntoskrnl/ke/alert.c Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/catch.c Added: trunk/reactos/ntoskrnl/ke/critical.c Modified: trunk/reactos/ntoskrnl/ke/dpc.c Added: trunk/reactos/ntoskrnl/ke/error.c Modified: trunk/reactos/ntoskrnl/ke/event.c Modified: trunk/reactos/ntoskrnl/ke/i386/tskswitch.S Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/ke/mutex.c Modified: trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/ntoskrnl/ke/sem.c Modified: trunk/reactos/ntoskrnl/ke/timer.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc Deleted: trunk/reactos/ntoskrnl/ob/wait.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/rtl/nls.c Modified: trunk/reactos/tools/nci/sysfuncs.lst _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-02-28 16:44:38 UTC (rev 13776) +++ trunk/reactos/config 2005-02-28 17:40:15 UTC (rev 13777) @@ -15,7 +15,7 @@ # be optimze for. # -OARCH := pentium2 +OARCH := i486 # # Whether to compile in the kernel debugger @@ -30,7 +30,7 @@ # # Whether to compile with optimizations # -OPTIMIZED := 1 +OPTIMIZED := 0 # # Whether to compile a multiprocessor or single processor version _____ Modified: trunk/reactos/drivers/storage/floppy/floppy.c --- trunk/reactos/drivers/storage/floppy/floppy.c 2005-02-28 16:44:38 UTC (rev 13776) +++ trunk/reactos/drivers/storage/floppy/floppy.c 2005-02-28 17:40:15 UTC (rev 13777) @@ -58,7 +58,7 @@ /* Queue thread management */ static KEVENT QueueThreadTerminate; -static PVOID QueueThreadObject; +static PVOID ThreadObject; static VOID NTAPI MotorStopDpcFunc(PKDPC UnusedDpc, @@ -378,8 +378,8 @@ KdPrint(("floppy: unloading\n")); KeSetEvent(&QueueThreadTerminate, 0, FALSE); - KeWaitForSingleObject(QueueThreadObject, Executive, KernelMode, FALSE, 0); - ObDereferenceObject(QueueThreadObject); + KeWaitForSingleObject(ThreadObject, Executive, KernelMode, FALSE, 0); + ObDereferenceObject(ThreadObject); for(i = 0; i < gNumberOfControllers; i++) { @@ -1152,7 +1152,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - if(ObReferenceObjectByHandle(ThreadHandle, STANDARD_RIGHTS_ALL, NULL, KernelMode, &QueueThreadObject, NULL) != STATUS_SUCCESS) + if(ObReferenceObjectByHandle(ThreadHandle, STANDARD_RIGHTS_ALL, NULL, KernelMode, &ThreadObject, NULL) != STATUS_SUCCESS) { KdPrint(("floppy: Unable to reference returned thread handle; failing init\n")); return STATUS_UNSUCCESSFUL; _____ Modified: trunk/reactos/include/ddk/extypes.h --- trunk/reactos/include/ddk/extypes.h 2005-02-28 16:44:38 UTC (rev 13776) +++ trunk/reactos/include/ddk/extypes.h 2005-02-28 17:40:15 UTC (rev 13777) @@ -30,23 +30,6 @@ MaximumWorkQueue } WORK_QUEUE_TYPE; -typedef struct _EX_QUEUE_WORKER_INFO { - UCHAR QueueDisabled:1; - UCHAR MakeThreadsAsNecessary:1; - UCHAR WaitMode:1; - ULONG WorkerCount:29; -} EX_QUEUE_WORKER_INFO, *PEX_QUEUE_WORKER_INFO; - -typedef struct _EX_WORK_QUEUE { - KQUEUE WorkerQueue; - ULONG DynamicThreadCount; - ULONG WorkItemsProcessed; - ULONG WorkItemsProcessedLastPass; - ULONG QueueDepthLastPass; - EX_QUEUE_WORKER_INFO Info; -} EX_WORK_QUEUE, *PEX_WORK_QUEUE; - - typedef ULONG_PTR ERESOURCE_THREAD, *PERESOURCE_THREAD; typedef struct _OWNER_ENTRY @@ -257,10 +240,6 @@ PVOID Argument1, PVOID Argument2); -extern struct _OBJECT_TYPE EXPORTED *ExMutantObjectType; -extern struct _OBJECT_TYPE EXPORTED *ExSemaphoreObjectType; -extern struct _OBJECT_TYPE EXPORTED *ExTimerType; - #endif /* __INCLUDE_DDK_EXTYPES_H */ /* EOF */ _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-02-28 16:44:38 UTC (rev 13776) +++ trunk/reactos/include/ddk/iotypes.h 2005-02-28 17:40:15 UTC (rev 13777) @@ -886,8 +886,6 @@ #endif #define IO_TYPE_DRIVER 4L -#define IO_TYPE_FILE 0x0F5L - #define DRVO_UNLOAD_INVOKED 0x1L #define DRVO_LEGACY_DRIVER 0x2L #define DRVO_BUILTIN_DRIVER 0x4L _____ Modified: trunk/reactos/include/ddk/ketypes.h --- trunk/reactos/include/ddk/ketypes.h 2005-02-28 16:44:38 UTC (rev 13776) +++ trunk/reactos/include/ddk/ketypes.h 2005-02-28 17:40:15 UTC (rev 13777) @@ -36,34 +36,23 @@ struct _DISPATCHER_HEADER; -typedef enum _KOBJECTS { - EventNotificationObject = 0, - EventSynchronizationObject = 1, - MutantObject = 2, - ProcessObject = 3, - QueueObject = 4, - SemaphoreObject = 5, - ThreadObject = 6, - GateObject = 7, - TimerNotificationObject = 8, - TimerSynchronizationObject = 9, - Spare2Object = 10, - Spare3Object = 11, - Spare4Object = 12, - Spare5Object = 13, - Spare6Object = 14, - Spare7Object = 15, - Spare8Object = 16, - Spare9Object = 17, - ApcObject = 18, - DpcObject = 19, - DeviceQueueObject = 20, - EventPairObject = 21, - InterruptObject = 22, - ProfileObject = 23, - ThreadedDpcObject = 24, - MaximumKernelObject = 25 -} KOBJECTS; +typedef enum _KERNEL_OBJECTS { + KNotificationEvent = 0, + KSynchronizationEvent = 1, + KMutant = 2, + KProcess = 3, + KQueue = 4, + KSemaphore = 5, + KThread = 6, + KNotificationTimer = 8, + KSynchronizationTimer = 9, + KApc = 18, + KDpc = 19, + KDeviceQueue = 20, + KEventPair = 21, + KInterrupt = 22, + KProfile = 23 +} KERNEL_OBJECTS; #include <pshpack1.h> _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-02-28 16:44:38 UTC (rev 13776) +++ trunk/reactos/include/ntos/zwtypes.h 2005-02-28 17:40:15 UTC (rev 13777) @@ -1262,9 +1262,9 @@ typedef struct _MUTANT_BASIC_INFORMATION { - LONG CurrentCount; - BOOLEAN OwnedByCaller; - BOOLEAN AbandonedState; + LONG Count; + BOOLEAN Owned; + BOOLEAN Abandoned; } MUTANT_BASIC_INFORMATION, *PMUTANT_BASIC_INFORMATION; _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-02-28 16:44:38 UTC (rev 13776) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-02-28 17:40:15 UTC (rev 13777) @@ -225,6 +225,7 @@ NtSetEvent@8 NtSetHighEventPair@4 NtSetHighWaitLowEventPair@4 +NtSetHighWaitLowThread@0 NtSetInformationFile@20 NtSetInformationJobObject@16 NtSetInformationKey@16 @@ -237,6 +238,7 @@ NtSetLdtEntries@24 NtSetLowEventPair@4 NtSetLowWaitHighEventPair@4 +NtSetLowWaitHighThread@0 NtSetSecurityObject@12 NtSetSystemEnvironmentValue@8 NtSetSystemInformation@12 @@ -847,6 +849,7 @@ ZwSetEvent@8 ZwSetHighEventPair@4 ZwSetHighWaitLowEventPair@4 +ZwSetHighWaitLowThread@0 ZwSetInformationFile@20 ZwSetInformationKey@16 ZwSetInformationObject@16 @@ -858,6 +861,7 @@ ZwSetLdtEntries@24 ZwSetLowEventPair@4 ZwSetLowWaitHighEventPair@4 +ZwSetLowWaitHighThread@0 ZwSetSecurityObject@12 ZwSetSystemEnvironmentValue@8 ZwSetSystemInformation@12 _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-02-28 16:44:38 UTC (rev 13776) +++ trunk/reactos/ntoskrnl/Makefile 2005-02-28 17:40:15 UTC (rev 13777) @@ -101,8 +101,10 @@ ke/bug.o \ ke/catch.o \ ke/clock.o \ + ke/critical.o \ ke/dpc.o \ ke/device.o \ + ke/error.o \ ke/event.o \ ke/kqueue.o \ ke/kthread.o \ @@ -116,6 +118,7 @@ ke/spinlock.o \ ke/timer.o \ ke/wait.o \ + ke/alert.o # Memory Manager (Mm) OBJECTS_MM = \ @@ -216,8 +219,7 @@ ob/object.o \ ob/sdcache.o \ ob/security.o \ - ob/symlink.o \ - ob/wait.o + ob/symlink.o # Process Manager (Ps) OBJECTS_PS = \ @@ -240,7 +242,6 @@ OBJECTS_EX = \ ex/btree.o \ ex/callback.o \ - ex/error.o \ ex/event.o \ ex/evtpair.o \ ex/fmutex.o \ _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-02-28 16:44:38 UTC (rev 13776) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-02-28 17:40:15 UTC (rev 13777) @@ -241,30 +241,7 @@ CmiCheckByName(Verbose, L"User"); } -VOID -INIT_FUNCTION -STDCALL -CmInitHives(BOOLEAN SetupBoot) -{ - PCHAR BaseAddress; - - /* Load Registry Hives */ - BaseAddress = (PCHAR)CachedModules[SystemRegistry]->ModStart; - CmImportSystemHive(BaseAddress, - CachedModules[SystemRegistry]->ModEnd - (ULONG_PTR)BaseAddress); - - BaseAddress = (PCHAR)CachedModules[HardwareRegistry]->ModStart; - CmImportHardwareHive(BaseAddress, - CachedModules[HardwareRegistry]->ModEnd - (ULONG_PTR)BaseAddress); - - /* Create dummy keys if no hardware hive was found */ - CmImportHardwareHive (NULL, 0); - - /* Initialize volatile registry settings */ - if (SetupBoot == FALSE) CmInit2((PCHAR)KeLoaderBlock.CommandLine); -} - VOID INIT_FUNCTION CmInitializeRegistry(VOID) { _____ Deleted: trunk/reactos/ntoskrnl/ex/error.c --- trunk/reactos/ntoskrnl/ex/error.c 2005-02-28 16:44:38 UTC (rev 13776) +++ trunk/reactos/ntoskrnl/ex/error.c 2005-02-28 17:40:15 UTC (rev 13777) @@ -1,163 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ex/error.c - * PURPOSE: Error Functions and Status/Exception Dispatching/Raising - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - Created File - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* GLOBALS ****************************************************************/ - -BOOLEAN ExReadyForErrors = FALSE; -PEPORT ExpDefaultErrorPort = NULL; -PEPROCESS ExpDefaultErrorPortProcess = NULL; - -/* FUNCTIONS ****************************************************************/ - -/* - * @implemented - */ -VOID -STDCALL -ExRaiseAccessViolation(VOID) -{ - /* Raise the Right Status */ - ExRaiseStatus (STATUS_ACCESS_VIOLATION); -} - -/* - * @implemented - */ -VOID -STDCALL -ExRaiseDatatypeMisalignment (VOID) -{ - /* Raise the Right Status */ - ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); -} - -/* - * @implemented - */ -VOID -STDCALL -ExRaiseStatus(IN NTSTATUS Status) -{ - EXCEPTION_RECORD ExceptionRecord; - - DPRINT("ExRaiseStatus(%x)\n", Status); - - /* Set up an Exception Record */ - ExceptionRecord.ExceptionRecord = NULL; - ExceptionRecord.NumberParameters = 0; - ExceptionRecord.ExceptionCode = Status; - ExceptionRecord.ExceptionFlags = 0; - - /* Call the Rtl Function */ - RtlRaiseException(&ExceptionRecord); -} - -/* - * @implemented - */ -VOID -STDCALL -ExRaiseException (PEXCEPTION_RECORD ExceptionRecord) -{ - /* Call the Rtl function */ - RtlRaiseException(ExceptionRecord); -} - -/* - * @implemented - */ -BOOLEAN -STDCALL -ExSystemExceptionFilter(VOID) -{ - return KeGetPreviousMode() != KernelMode ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; -} - -/* - * @unimplemented - */ -VOID -STDCALL -ExRaiseHardError(IN NTSTATUS ErrorStatus, - IN ULONG NumberOfParameters, - IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL, - IN PVOID *Parameters, - IN HARDERROR_RESPONSE_OPTION ResponseOption, - OUT PHARDERROR_RESPONSE Response) -{ - UNIMPLEMENTED; -} - -NTSTATUS -STDCALL -NtRaiseHardError(IN NTSTATUS ErrorStatus, - IN ULONG NumberOfParameters, - IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL, - IN PVOID *Parameters, - IN HARDERROR_RESPONSE_OPTION ResponseOption, - OUT PHARDERROR_RESPONSE Response) -{ - DPRINT1("Hard error %x\n", ErrorStatus); - - /* Call the Executive Function (WE SHOULD PUT SEH HERE/CAPTURE!) */ - ExRaiseHardError(ErrorStatus, - NumberOfParameters, - UnicodeStringParameterMask, - Parameters, - ResponseOption, - Response); - - /* Return Success */ - return STATUS_SUCCESS; -} - -NTSTATUS -STDCALL -NtSetDefaultHardErrorPort(IN HANDLE PortHandle) -{ - - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_UNSUCCESSFUL; - - /* Check if we have the Privilege */ - if(!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) { - - DPRINT1("NtSetDefaultHardErrorPort: Caller requires the SeTcbPrivilege privilege!\n"); - return STATUS_PRIVILEGE_NOT_HELD; - } - - /* Only called once during bootup, make sure we weren't called yet */ - if(!ExReadyForErrors) { - - Status = ObReferenceObjectByHandle(PortHandle, - 0, - LpcPortObjectType, - PreviousMode, - (PVOID*)&ExpDefaultErrorPort, - NULL); - - /* Check for Success */ - if(NT_SUCCESS(Status)) { - - /* Save the data */ - ExpDefaultErrorPortProcess = PsGetCurrentProcess(); - ExReadyForErrors = TRUE; - } - } - - return Status; -} - -/* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-02-28 16:44:38 UTC (rev 13776) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-02-28 17:40:15 UTC (rev 13777) @@ -19,286 +19,300 @@ POBJECT_TYPE EXPORTED ExEventObjectType = NULL; static GENERIC_MAPPING ExpEventMapping = { - STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE, - STANDARD_RIGHTS_WRITE | SYNCHRONIZE | EVENT_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | EVENT_QUERY_STATE, - EVENT_ALL_ACCESS}; + STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE, + STANDARD_RIGHTS_WRITE | SYNCHRONIZE | EVENT_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | EVENT_QUERY_STATE, + EVENT_ALL_ACCESS}; -static const INFORMATION_CLASS_INFO ExEventInfoClass[] = { - - /* EventBasicInformation */ - ICI_SQ_SAME( sizeof(EVENT_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY), +static const INFORMATION_CLASS_INFO ExEventInfoClass[] = +{ + ICI_SQ_SAME( sizeof(EVENT_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* EventBasicInformation */ }; /* FUNCTIONS *****************************************************************/ -VOID -INIT_FUNCTION +NTSTATUS STDCALL +NtpCreateEvent(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + POBJECT_ATTRIBUTES ObjectAttributes) +{ + DPRINT("NtpCreateEvent(ObjectBody %x, Parent %x, RemainingPath %S)\n", + ObjectBody, Parent, RemainingPath); + + if (RemainingPath != NULL && wcschr(RemainingPath+1, '\\') != NULL) + { + return(STATUS_UNSUCCESSFUL); + } + + return(STATUS_SUCCESS); +} + + +VOID INIT_FUNCTION ExpInitializeEventImplementation(VOID) { - /* Create the Event Object Type */ - ExEventObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlpCreateUnicodeString(&ExEventObjectType->TypeName, L"Event", NonPagedPool); - ExEventObjectType->Tag = TAG('E', 'V', 'T', 'T'); - ExEventObjectType->PeakObjects = 0; - ExEventObjectType->PeakHandles = 0; - ExEventObjectType->TotalObjects = 0; - ExEventObjectType->TotalHandles = 0; - ExEventObjectType->PagedPoolCharge = 0; - ExEventObjectType->NonpagedPoolCharge = sizeof(KEVENT); - ExEventObjectType->Mapping = &ExpEventMapping; - ExEventObjectType->Dump = NULL; - ExEventObjectType->Open = NULL; - ExEventObjectType->Close = NULL; - ExEventObjectType->Delete = NULL; - ExEventObjectType->Parse = NULL; - ExEventObjectType->Security = NULL; - ExEventObjectType->QueryName = NULL; - ExEventObjectType->OkayToClose = NULL; - ExEventObjectType->Create = NULL; - ExEventObjectType->DuplicationNotify = NULL; - ObpCreateTypeObject(ExEventObjectType); + ExEventObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); + + RtlpCreateUnicodeString(&ExEventObjectType->TypeName, L"Event", NonPagedPool); + + ExEventObjectType->Tag = TAG('E', 'V', 'T', 'T'); + ExEventObjectType->PeakObjects = 0; + ExEventObjectType->PeakHandles = 0; + ExEventObjectType->TotalObjects = 0; + ExEventObjectType->TotalHandles = 0; + ExEventObjectType->PagedPoolCharge = 0; + ExEventObjectType->NonpagedPoolCharge = sizeof(KEVENT); + ExEventObjectType->Mapping = &ExpEventMapping; + ExEventObjectType->Dump = NULL; + ExEventObjectType->Open = NULL; + ExEventObjectType->Close = NULL; + ExEventObjectType->Delete = NULL; + ExEventObjectType->Parse = NULL; + ExEventObjectType->Security = NULL; + ExEventObjectType->QueryName = NULL; + ExEventObjectType->OkayToClose = NULL; + ExEventObjectType->Create = NtpCreateEvent; + ExEventObjectType->DuplicationNotify = NULL; + + ObpCreateTypeObject(ExEventObjectType); } + /* * @implemented */ -NTSTATUS -STDCALL +NTSTATUS STDCALL NtClearEvent(IN HANDLE EventHandle) { - PKEVENT Event; - NTSTATUS Status; - - PAGED_CODE(); + PKEVENT Event; + NTSTATUS Status; - /* Reference the Object */ + PAGED_CODE(); + Status = ObReferenceObjectByHandle(EventHandle, - EVENT_MODIFY_STATE, - ExEventObjectType, - ExGetPreviousMode(), - (PVOID*)&Event, - NULL); + EVENT_MODIFY_STATE, + ExEventObjectType, + ExGetPreviousMode(), + (PVOID*)&Event, + NULL); + if(NT_SUCCESS(Status)) + { + KeClearEvent(Event); + ObDereferenceObject(Event); + } - /* Check for Success */ - if(NT_SUCCESS(Status)) { - - /* Clear the Event and Dereference */ - KeClearEvent(Event); - ObDereferenceObject(Event); - } - - /* Return Status */ - return Status; + return Status; } /* * @implemented */ -NTSTATUS -STDCALL +NTSTATUS STDCALL NtCreateEvent(OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN EVENT_TYPE EventType, - IN BOOLEAN InitialState) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN EVENT_TYPE EventType, + IN BOOLEAN InitialState) { - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PKEVENT Event; - HANDLE hEvent; - NTSTATUS Status = STATUS_SUCCESS; + KPROCESSOR_MODE PreviousMode; + PKEVENT Event; + HANDLE hEvent; + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); + PAGED_CODE(); - /* Check Output Safety */ - if(PreviousMode == UserMode) { - - _SEH_TRY { - - ProbeForWrite(EventHandle, - sizeof(HANDLE), - sizeof(ULONG)); - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode == UserMode) + { + _SEH_TRY + { + ProbeForWrite(EventHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - if(!NT_SUCCESS(Status)) return Status; - } - - /* Create the Object */ - Status = ObCreateObject(PreviousMode, - ExEventObjectType, - ObjectAttributes, - PreviousMode, - NULL, - sizeof(KEVENT), - 0, - 0, - (PVOID*)&Event); - - /* Check for Success */ - if(NT_SUCCESS(Status)) { - - /* Initalize the Event */ - KeInitializeEvent(Event, - EventType, - InitialState); - - /* Insert it */ - Status = ObInsertObject((PVOID)Event, - NULL, - DesiredAccess, - 0, - NULL, - &hEvent); - ObDereferenceObject(Event); + if(!NT_SUCCESS(Status)) + { + return Status; + } + } - /* Check for success and return handle */ - if(NT_SUCCESS(Status)) { - - _SEH_TRY { - - *EventHandle = hEvent; - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; - } - } - - /* Return Status */ - return Status; + Status = ObCreateObject(PreviousMode, + ExEventObjectType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(KEVENT), + 0, + 0, + (PVOID*)&Event); + if(NT_SUCCESS(Status)) + { + KeInitializeEvent(Event, + EventType, + InitialState); + + + Status = ObInsertObject((PVOID)Event, + NULL, + DesiredAccess, + 0, + NULL, + &hEvent); + ObDereferenceObject(Event); + + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { + *EventHandle = hEvent; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } + + return Status; } + /* * @implemented */ -NTSTATUS -STDCALL +NTSTATUS STDCALL NtOpenEvent(OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) { - HANDLE hEvent; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; + HANDLE hEvent; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - DPRINT("NtOpenEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); + PAGED_CODE(); + + DPRINT("NtOpenEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); - /* Check Output Safety */ - if(PreviousMode == UserMode) { - - _SEH_TRY { - - ProbeForWrite(EventHandle, - sizeof(HANDLE), - sizeof(ULONG)); - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode == UserMode) + { + _SEH_TRY + { + ProbeForWrite(EventHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - if(!NT_SUCCESS(Status)) return Status; - } - - /* Open the Object */ - Status = ObOpenObjectByName(ObjectAttributes, - ExEventObjectType, - NULL, - PreviousMode, - DesiredAccess, - NULL, - &hEvent); + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + + Status = ObOpenObjectByName(ObjectAttributes, + ExEventObjectType, + NULL, + PreviousMode, + DesiredAccess, + NULL, + &hEvent); - /* Check for success and return handle */ - if(NT_SUCCESS(Status)) { - - _SEH_TRY { - - *EventHandle = hEvent; - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; - } + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { + *EventHandle = hEvent; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } - /* Return status */ - return Status; + return Status; } + /* * @implemented */ -NTSTATUS -STDCALL +NTSTATUS STDCALL NtPulseEvent(IN HANDLE EventHandle, - OUT PLONG PreviousState OPTIONAL) + OUT PLONG PreviousState OPTIONAL) { - PKEVENT Event; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; + PKEVENT Event; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - DPRINT("NtPulseEvent(EventHandle 0%x PreviousState 0%x)\n", - EventHandle, PreviousState); + PAGED_CODE(); - /* Check buffer validity */ - if(PreviousState && PreviousMode == UserMode) { - - _SEH_TRY { - - ProbeForWrite(PreviousState, - sizeof(LONG), - sizeof(ULONG)); - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; + DPRINT("NtPulseEvent(EventHandle 0%x PreviousState 0%x)\n", + EventHandle, PreviousState); - if(!NT_SUCCESS(Status)) return Status; - } - - /* Open the Object */ - Status = ObReferenceObjectByHandle(EventHandle, - EVENT_MODIFY_STATE, - ExEventObjectType, - PreviousMode, - (PVOID*)&Event, - NULL); - - /* Check for success */ - if(NT_SUCCESS(Status)) { - - /* Pulse the Event */ - LONG Prev = KePulseEvent(Event, EVENT_INCREMENT, FALSE); - ObDereferenceObject(Event); + PreviousMode = ExGetPreviousMode(); + + if(PreviousState != NULL && PreviousMode == UserMode) + { + _SEH_TRY + { + ProbeForWrite(PreviousState, + sizeof(LONG), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - /* Return it */ - if(PreviousState) { - - _SEH_TRY { - - *PreviousState = Prev; - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; - } + if(!NT_SUCCESS(Status)) + { + return Status; + } } - /* Return Status */ + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_MODIFY_STATE, + ExEventObjectType, + PreviousMode, + (PVOID*)&Event, + NULL); + if(NT_SUCCESS(Status)) + { + LONG Prev = KePulseEvent(Event, EVENT_INCREMENT, FALSE); + ObDereferenceObject(Event); + + if(PreviousState != NULL) + { + _SEH_TRY + { + *PreviousState = Prev; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } + return Status; } @@ -306,202 +320,230 @@ /* * @implemented */ -NTSTATUS -STDCALL +NTSTATUS STDCALL NtQueryEvent(IN HANDLE EventHandle, - IN EVENT_INFORMATION_CLASS EventInformationClass, [truncated at 1000 lines; 13561 more skipped]

1 0

[ion] 13776: Test commit. Not official branch release -- it will follow shortly in 15 minutes. If this ends up in HEAD i will revert immediately (i have svn switched so it shouldn't)
by ion＠svn.reactos.com 28 Feb '05

28 Feb '05

Test commit. Not official branch release -- it will follow shortly in 15 minutes. If this ends up in HEAD i will revert immediately (i have svn switched so it shouldn't) Modified: trunk/reactos/config Modified: trunk/reactos/drivers/storage/floppy/floppy.c Modified: trunk/reactos/include/ddk/extypes.h Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/include/ddk/ketypes.h Modified: trunk/reactos/include/ntos/zwtypes.h Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/cm/registry.c Added: trunk/reactos/ntoskrnl/ex/error.c Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/rundown.c Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/ex/work.c Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/internal/id.h Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/nls.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/io/bootlog.c Modified: trunk/reactos/ntoskrnl/io/create.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/wmi.c Deleted: trunk/reactos/ntoskrnl/ke/alert.c Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/catch.c Deleted: trunk/reactos/ntoskrnl/ke/critical.c Modified: trunk/reactos/ntoskrnl/ke/dpc.c Deleted: trunk/reactos/ntoskrnl/ke/error.c Modified: trunk/reactos/ntoskrnl/ke/event.c Modified: trunk/reactos/ntoskrnl/ke/i386/tskswitch.S Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/ke/mutex.c Modified: trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/ntoskrnl/ke/sem.c Modified: trunk/reactos/ntoskrnl/ke/timer.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc Added: trunk/reactos/ntoskrnl/ob/wait.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/rtl/nls.c Modified: trunk/reactos/tools/nci/sysfuncs.lst _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-02-28 14:38:02 UTC (rev 13775) +++ trunk/reactos/config 2005-02-28 16:44:38 UTC (rev 13776) @@ -15,7 +15,7 @@ # be optimze for. # -OARCH := i486 +OARCH := pentium2 # # Whether to compile in the kernel debugger @@ -30,7 +30,7 @@ # # Whether to compile with optimizations # -OPTIMIZED := 0 +OPTIMIZED := 1 # # Whether to compile a multiprocessor or single processor version _____ Modified: trunk/reactos/drivers/storage/floppy/floppy.c --- trunk/reactos/drivers/storage/floppy/floppy.c 2005-02-28 14:38:02 UTC (rev 13775) +++ trunk/reactos/drivers/storage/floppy/floppy.c 2005-02-28 16:44:38 UTC (rev 13776) @@ -58,7 +58,7 @@ /* Queue thread management */ static KEVENT QueueThreadTerminate; -static PVOID ThreadObject; +static PVOID QueueThreadObject; static VOID NTAPI MotorStopDpcFunc(PKDPC UnusedDpc, @@ -378,8 +378,8 @@ KdPrint(("floppy: unloading\n")); KeSetEvent(&QueueThreadTerminate, 0, FALSE); - KeWaitForSingleObject(ThreadObject, Executive, KernelMode, FALSE, 0); - ObDereferenceObject(ThreadObject); + KeWaitForSingleObject(QueueThreadObject, Executive, KernelMode, FALSE, 0); + ObDereferenceObject(QueueThreadObject); for(i = 0; i < gNumberOfControllers; i++) { @@ -1152,7 +1152,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - if(ObReferenceObjectByHandle(ThreadHandle, STANDARD_RIGHTS_ALL, NULL, KernelMode, &ThreadObject, NULL) != STATUS_SUCCESS) + if(ObReferenceObjectByHandle(ThreadHandle, STANDARD_RIGHTS_ALL, NULL, KernelMode, &QueueThreadObject, NULL) != STATUS_SUCCESS) { KdPrint(("floppy: Unable to reference returned thread handle; failing init\n")); return STATUS_UNSUCCESSFUL; _____ Modified: trunk/reactos/include/ddk/extypes.h --- trunk/reactos/include/ddk/extypes.h 2005-02-28 14:38:02 UTC (rev 13775) +++ trunk/reactos/include/ddk/extypes.h 2005-02-28 16:44:38 UTC (rev 13776) @@ -30,6 +30,23 @@ MaximumWorkQueue } WORK_QUEUE_TYPE; +typedef struct _EX_QUEUE_WORKER_INFO { + UCHAR QueueDisabled:1; + UCHAR MakeThreadsAsNecessary:1; + UCHAR WaitMode:1; + ULONG WorkerCount:29; +} EX_QUEUE_WORKER_INFO, *PEX_QUEUE_WORKER_INFO; + +typedef struct _EX_WORK_QUEUE { + KQUEUE WorkerQueue; + ULONG DynamicThreadCount; + ULONG WorkItemsProcessed; + ULONG WorkItemsProcessedLastPass; + ULONG QueueDepthLastPass; + EX_QUEUE_WORKER_INFO Info; +} EX_WORK_QUEUE, *PEX_WORK_QUEUE; + + typedef ULONG_PTR ERESOURCE_THREAD, *PERESOURCE_THREAD; typedef struct _OWNER_ENTRY @@ -240,6 +257,10 @@ PVOID Argument1, PVOID Argument2); +extern struct _OBJECT_TYPE EXPORTED *ExMutantObjectType; +extern struct _OBJECT_TYPE EXPORTED *ExSemaphoreObjectType; +extern struct _OBJECT_TYPE EXPORTED *ExTimerType; + #endif /* __INCLUDE_DDK_EXTYPES_H */ /* EOF */ _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-02-28 14:38:02 UTC (rev 13775) +++ trunk/reactos/include/ddk/iotypes.h 2005-02-28 16:44:38 UTC (rev 13776) @@ -886,6 +886,8 @@ #endif #define IO_TYPE_DRIVER 4L +#define IO_TYPE_FILE 0x0F5L + #define DRVO_UNLOAD_INVOKED 0x1L #define DRVO_LEGACY_DRIVER 0x2L #define DRVO_BUILTIN_DRIVER 0x4L _____ Modified: trunk/reactos/include/ddk/ketypes.h --- trunk/reactos/include/ddk/ketypes.h 2005-02-28 14:38:02 UTC (rev 13775) +++ trunk/reactos/include/ddk/ketypes.h 2005-02-28 16:44:38 UTC (rev 13776) @@ -36,23 +36,34 @@ struct _DISPATCHER_HEADER; -typedef enum _KERNEL_OBJECTS { - KNotificationEvent = 0, - KSynchronizationEvent = 1, - KMutant = 2, - KProcess = 3, - KQueue = 4, - KSemaphore = 5, - KThread = 6, - KNotificationTimer = 8, - KSynchronizationTimer = 9, - KApc = 18, - KDpc = 19, - KDeviceQueue = 20, - KEventPair = 21, - KInterrupt = 22, - KProfile = 23 -} KERNEL_OBJECTS; +typedef enum _KOBJECTS { + EventNotificationObject = 0, + EventSynchronizationObject = 1, + MutantObject = 2, + ProcessObject = 3, + QueueObject = 4, + SemaphoreObject = 5, + ThreadObject = 6, + GateObject = 7, + TimerNotificationObject = 8, + TimerSynchronizationObject = 9, + Spare2Object = 10, + Spare3Object = 11, + Spare4Object = 12, + Spare5Object = 13, + Spare6Object = 14, + Spare7Object = 15, + Spare8Object = 16, + Spare9Object = 17, + ApcObject = 18, + DpcObject = 19, + DeviceQueueObject = 20, + EventPairObject = 21, + InterruptObject = 22, + ProfileObject = 23, + ThreadedDpcObject = 24, + MaximumKernelObject = 25 +} KOBJECTS; #include <pshpack1.h> _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-02-28 14:38:02 UTC (rev 13775) +++ trunk/reactos/include/ntos/zwtypes.h 2005-02-28 16:44:38 UTC (rev 13776) @@ -1262,9 +1262,9 @@ typedef struct _MUTANT_BASIC_INFORMATION { - LONG Count; - BOOLEAN Owned; - BOOLEAN Abandoned; + LONG CurrentCount; + BOOLEAN OwnedByCaller; + BOOLEAN AbandonedState; } MUTANT_BASIC_INFORMATION, *PMUTANT_BASIC_INFORMATION; _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-02-28 14:38:02 UTC (rev 13775) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-02-28 16:44:38 UTC (rev 13776) @@ -225,7 +225,6 @@ NtSetEvent@8 NtSetHighEventPair@4 NtSetHighWaitLowEventPair@4 -NtSetHighWaitLowThread@0 NtSetInformationFile@20 NtSetInformationJobObject@16 NtSetInformationKey@16 @@ -238,7 +237,6 @@ NtSetLdtEntries@24 NtSetLowEventPair@4 NtSetLowWaitHighEventPair@4 -NtSetLowWaitHighThread@0 NtSetSecurityObject@12 NtSetSystemEnvironmentValue@8 NtSetSystemInformation@12 @@ -849,7 +847,6 @@ ZwSetEvent@8 ZwSetHighEventPair@4 ZwSetHighWaitLowEventPair@4 -ZwSetHighWaitLowThread@0 ZwSetInformationFile@20 ZwSetInformationKey@16 ZwSetInformationObject@16 @@ -861,7 +858,6 @@ ZwSetLdtEntries@24 ZwSetLowEventPair@4 ZwSetLowWaitHighEventPair@4 -ZwSetLowWaitHighThread@0 ZwSetSecurityObject@12 ZwSetSystemEnvironmentValue@8 ZwSetSystemInformation@12 _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-02-28 14:38:02 UTC (rev 13775) +++ trunk/reactos/ntoskrnl/Makefile 2005-02-28 16:44:38 UTC (rev 13776) @@ -101,10 +101,8 @@ ke/bug.o \ ke/catch.o \ ke/clock.o \ - ke/critical.o \ ke/dpc.o \ ke/device.o \ - ke/error.o \ ke/event.o \ ke/kqueue.o \ ke/kthread.o \ @@ -118,7 +116,6 @@ ke/spinlock.o \ ke/timer.o \ ke/wait.o \ - ke/alert.o # Memory Manager (Mm) OBJECTS_MM = \ @@ -219,7 +216,8 @@ ob/object.o \ ob/sdcache.o \ ob/security.o \ - ob/symlink.o + ob/symlink.o \ + ob/wait.o # Process Manager (Ps) OBJECTS_PS = \ @@ -242,6 +240,7 @@ OBJECTS_EX = \ ex/btree.o \ ex/callback.o \ + ex/error.o \ ex/event.o \ ex/evtpair.o \ ex/fmutex.o \ _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-02-28 14:38:02 UTC (rev 13775) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-02-28 16:44:38 UTC (rev 13776) @@ -241,7 +241,30 @@ CmiCheckByName(Verbose, L"User"); } +VOID +INIT_FUNCTION +STDCALL +CmInitHives(BOOLEAN SetupBoot) +{ + PCHAR BaseAddress; + + /* Load Registry Hives */ + BaseAddress = (PCHAR)CachedModules[SystemRegistry]->ModStart; + CmImportSystemHive(BaseAddress, + CachedModules[SystemRegistry]->ModEnd - (ULONG_PTR)BaseAddress); + + BaseAddress = (PCHAR)CachedModules[HardwareRegistry]->ModStart; + CmImportHardwareHive(BaseAddress, + CachedModules[HardwareRegistry]->ModEnd - (ULONG_PTR)BaseAddress); + + /* Create dummy keys if no hardware hive was found */ + CmImportHardwareHive (NULL, 0); + + /* Initialize volatile registry settings */ + if (SetupBoot == FALSE) CmInit2((PCHAR)KeLoaderBlock.CommandLine); +} + VOID INIT_FUNCTION CmInitializeRegistry(VOID) { _____ Added: trunk/reactos/ntoskrnl/ex/error.c --- trunk/reactos/ntoskrnl/ex/error.c 2005-02-28 14:38:02 UTC (rev 13775) +++ trunk/reactos/ntoskrnl/ex/error.c 2005-02-28 16:44:38 UTC (rev 13776) @@ -0,0 +1,163 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ex/error.c + * PURPOSE: Error Functions and Status/Exception Dispatching/Raising + * + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - Created File + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +/* GLOBALS ****************************************************************/ + +BOOLEAN ExReadyForErrors = FALSE; +PEPORT ExpDefaultErrorPort = NULL; +PEPROCESS ExpDefaultErrorPortProcess = NULL; + +/* FUNCTIONS ****************************************************************/ + +/* + * @implemented + */ +VOID +STDCALL +ExRaiseAccessViolation(VOID) +{ + /* Raise the Right Status */ + ExRaiseStatus (STATUS_ACCESS_VIOLATION); +} + +/* + * @implemented + */ +VOID +STDCALL +ExRaiseDatatypeMisalignment (VOID) +{ + /* Raise the Right Status */ + ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); +} + +/* + * @implemented + */ +VOID +STDCALL +ExRaiseStatus(IN NTSTATUS Status) +{ + EXCEPTION_RECORD ExceptionRecord; + + DPRINT("ExRaiseStatus(%x)\n", Status); + + /* Set up an Exception Record */ + ExceptionRecord.ExceptionRecord = NULL; + ExceptionRecord.NumberParameters = 0; + ExceptionRecord.ExceptionCode = Status; + ExceptionRecord.ExceptionFlags = 0; + + /* Call the Rtl Function */ + RtlRaiseException(&ExceptionRecord); +} + +/* + * @implemented + */ +VOID +STDCALL +ExRaiseException (PEXCEPTION_RECORD ExceptionRecord) +{ + /* Call the Rtl function */ + RtlRaiseException(ExceptionRecord); +} + +/* + * @implemented + */ +BOOLEAN +STDCALL +ExSystemExceptionFilter(VOID) +{ + return KeGetPreviousMode() != KernelMode ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} + +/* + * @unimplemented + */ +VOID +STDCALL +ExRaiseHardError(IN NTSTATUS ErrorStatus, + IN ULONG NumberOfParameters, + IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL, + IN PVOID *Parameters, + IN HARDERROR_RESPONSE_OPTION ResponseOption, + OUT PHARDERROR_RESPONSE Response) +{ + UNIMPLEMENTED; +} + +NTSTATUS +STDCALL +NtRaiseHardError(IN NTSTATUS ErrorStatus, + IN ULONG NumberOfParameters, + IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL, + IN PVOID *Parameters, + IN HARDERROR_RESPONSE_OPTION ResponseOption, + OUT PHARDERROR_RESPONSE Response) +{ + DPRINT1("Hard error %x\n", ErrorStatus); + + /* Call the Executive Function (WE SHOULD PUT SEH HERE/CAPTURE!) */ + ExRaiseHardError(ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + Parameters, + ResponseOption, + Response); + + /* Return Success */ + return STATUS_SUCCESS; +} + +NTSTATUS +STDCALL +NtSetDefaultHardErrorPort(IN HANDLE PortHandle) +{ + + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_UNSUCCESSFUL; + + /* Check if we have the Privilege */ + if(!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) { + + DPRINT1("NtSetDefaultHardErrorPort: Caller requires the SeTcbPrivilege privilege!\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* Only called once during bootup, make sure we weren't called yet */ + if(!ExReadyForErrors) { + + Status = ObReferenceObjectByHandle(PortHandle, + 0, + LpcPortObjectType, + PreviousMode, + (PVOID*)&ExpDefaultErrorPort, + NULL); + + /* Check for Success */ + if(NT_SUCCESS(Status)) { + + /* Save the data */ + ExpDefaultErrorPortProcess = PsGetCurrentProcess(); + ExReadyForErrors = TRUE; + } + } + + return Status; +} + +/* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-02-28 14:38:02 UTC (rev 13775) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-02-28 16:44:38 UTC (rev 13776) @@ -19,300 +19,286 @@ POBJECT_TYPE EXPORTED ExEventObjectType = NULL; static GENERIC_MAPPING ExpEventMapping = { - STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE, - STANDARD_RIGHTS_WRITE | SYNCHRONIZE | EVENT_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | EVENT_QUERY_STATE, - EVENT_ALL_ACCESS}; + STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE, + STANDARD_RIGHTS_WRITE | SYNCHRONIZE | EVENT_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | EVENT_QUERY_STATE, + EVENT_ALL_ACCESS}; -static const INFORMATION_CLASS_INFO ExEventInfoClass[] = -{ - ICI_SQ_SAME( sizeof(EVENT_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* EventBasicInformation */ +static const INFORMATION_CLASS_INFO ExEventInfoClass[] = { + + /* EventBasicInformation */ + ICI_SQ_SAME( sizeof(EVENT_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY), }; /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL -NtpCreateEvent(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - POBJECT_ATTRIBUTES ObjectAttributes) -{ - DPRINT("NtpCreateEvent(ObjectBody %x, Parent %x, RemainingPath %S)\n", - ObjectBody, Parent, RemainingPath); - - if (RemainingPath != NULL && wcschr(RemainingPath+1, '\\') != NULL) - { - return(STATUS_UNSUCCESSFUL); - } - - return(STATUS_SUCCESS); -} - - -VOID INIT_FUNCTION +VOID +INIT_FUNCTION ExpInitializeEventImplementation(VOID) { - ExEventObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - - RtlpCreateUnicodeString(&ExEventObjectType->TypeName, L"Event", NonPagedPool); - - ExEventObjectType->Tag = TAG('E', 'V', 'T', 'T'); - ExEventObjectType->PeakObjects = 0; - ExEventObjectType->PeakHandles = 0; - ExEventObjectType->TotalObjects = 0; - ExEventObjectType->TotalHandles = 0; - ExEventObjectType->PagedPoolCharge = 0; - ExEventObjectType->NonpagedPoolCharge = sizeof(KEVENT); - ExEventObjectType->Mapping = &ExpEventMapping; - ExEventObjectType->Dump = NULL; - ExEventObjectType->Open = NULL; - ExEventObjectType->Close = NULL; - ExEventObjectType->Delete = NULL; - ExEventObjectType->Parse = NULL; - ExEventObjectType->Security = NULL; - ExEventObjectType->QueryName = NULL; - ExEventObjectType->OkayToClose = NULL; - ExEventObjectType->Create = NtpCreateEvent; - ExEventObjectType->DuplicationNotify = NULL; - - ObpCreateTypeObject(ExEventObjectType); + /* Create the Event Object Type */ + ExEventObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); + RtlpCreateUnicodeString(&ExEventObjectType->TypeName, L"Event", NonPagedPool); + ExEventObjectType->Tag = TAG('E', 'V', 'T', 'T'); + ExEventObjectType->PeakObjects = 0; + ExEventObjectType->PeakHandles = 0; + ExEventObjectType->TotalObjects = 0; + ExEventObjectType->TotalHandles = 0; + ExEventObjectType->PagedPoolCharge = 0; + ExEventObjectType->NonpagedPoolCharge = sizeof(KEVENT); + ExEventObjectType->Mapping = &ExpEventMapping; + ExEventObjectType->Dump = NULL; + ExEventObjectType->Open = NULL; + ExEventObjectType->Close = NULL; + ExEventObjectType->Delete = NULL; + ExEventObjectType->Parse = NULL; + ExEventObjectType->Security = NULL; + ExEventObjectType->QueryName = NULL; + ExEventObjectType->OkayToClose = NULL; + ExEventObjectType->Create = NULL; + ExEventObjectType->DuplicationNotify = NULL; + ObpCreateTypeObject(ExEventObjectType); } - /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtClearEvent(IN HANDLE EventHandle) { - PKEVENT Event; - NTSTATUS Status; + PKEVENT Event; + NTSTATUS Status; + + PAGED_CODE(); - PAGED_CODE(); - + /* Reference the Object */ Status = ObReferenceObjectByHandle(EventHandle, - EVENT_MODIFY_STATE, - ExEventObjectType, - ExGetPreviousMode(), - (PVOID*)&Event, - NULL); - if(NT_SUCCESS(Status)) - { - KeClearEvent(Event); - ObDereferenceObject(Event); - } + EVENT_MODIFY_STATE, + ExEventObjectType, + ExGetPreviousMode(), + (PVOID*)&Event, + NULL); - return Status; + /* Check for Success */ + if(NT_SUCCESS(Status)) { + + /* Clear the Event and Dereference */ + KeClearEvent(Event); + ObDereferenceObject(Event); + } + + /* Return Status */ + return Status; } /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtCreateEvent(OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN EVENT_TYPE EventType, - IN BOOLEAN InitialState) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN EVENT_TYPE EventType, + IN BOOLEAN InitialState) { - KPROCESSOR_MODE PreviousMode; - PKEVENT Event; - HANDLE hEvent; - NTSTATUS Status = STATUS_SUCCESS; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PKEVENT Event; + HANDLE hEvent; + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); + PAGED_CODE(); - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode == UserMode) - { - _SEH_TRY - { - ProbeForWrite(EventHandle, - sizeof(HANDLE), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + /* Check Output Safety */ + if(PreviousMode == UserMode) { + + _SEH_TRY { + + ProbeForWrite(EventHandle, + 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 */ + Status = ObCreateObject(PreviousMode, + ExEventObjectType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(KEVENT), + 0, + 0, + (PVOID*)&Event); + + /* Check for Success */ + if(NT_SUCCESS(Status)) { + + /* Initalize the Event */ + KeInitializeEvent(Event, + EventType, + InitialState); + + /* Insert it */ + Status = ObInsertObject((PVOID)Event, + NULL, + DesiredAccess, + 0, + NULL, + &hEvent); + ObDereferenceObject(Event); - Status = ObCreateObject(PreviousMode, - ExEventObjectType, - ObjectAttributes, - PreviousMode, - NULL, - sizeof(KEVENT), - 0, - 0, - (PVOID*)&Event); - if(NT_SUCCESS(Status)) - { - KeInitializeEvent(Event, - EventType, - InitialState); - - - Status = ObInsertObject((PVOID)Event, - NULL, - DesiredAccess, - 0, - NULL, - &hEvent); - ObDereferenceObject(Event); - - if(NT_SUCCESS(Status)) - { - _SEH_TRY - { - *EventHandle = hEvent; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - } - - return Status; + /* Check for success and return handle */ + if(NT_SUCCESS(Status)) { + + _SEH_TRY { + + *EventHandle = hEvent; + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; + } + } + + /* Return Status */ + return Status; } - /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtOpenEvent(OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) { - HANDLE hEvent; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + HANDLE hEvent; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - - DPRINT("NtOpenEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); + PAGED_CODE(); + DPRINT("NtOpenEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode == UserMode) - { - _SEH_TRY - { - ProbeForWrite(EventHandle, - sizeof(HANDLE), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + /* Check Output Safety */ + if(PreviousMode == UserMode) { + + _SEH_TRY { + + ProbeForWrite(EventHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - Status = ObOpenObjectByName(ObjectAttributes, - ExEventObjectType, - NULL, - PreviousMode, - DesiredAccess, - NULL, - &hEvent); + if(!NT_SUCCESS(Status)) return Status; + } + + /* Open the Object */ + Status = ObOpenObjectByName(ObjectAttributes, + ExEventObjectType, + NULL, + PreviousMode, + DesiredAccess, + NULL, + &hEvent); - if(NT_SUCCESS(Status)) - { - _SEH_TRY - { - *EventHandle = hEvent; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } + /* Check for success and return handle */ + if(NT_SUCCESS(Status)) { + + _SEH_TRY { + + *EventHandle = hEvent; + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; + } - return Status; + /* Return status */ + return Status; } - /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtPulseEvent(IN HANDLE EventHandle, - OUT PLONG PreviousState OPTIONAL) + OUT PLONG PreviousState OPTIONAL) { - PKEVENT Event; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + PKEVENT Event; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); + PAGED_CODE(); + DPRINT("NtPulseEvent(EventHandle 0%x PreviousState 0%x)\n", + EventHandle, PreviousState); - DPRINT("NtPulseEvent(EventHandle 0%x PreviousState 0%x)\n", - EventHandle, PreviousState); + /* Check buffer validity */ + if(PreviousState && PreviousMode == UserMode) { + + _SEH_TRY { + + ProbeForWrite(PreviousState, + sizeof(LONG), + sizeof(ULONG)); + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; - PreviousMode = ExGetPreviousMode(); - - if(PreviousState != NULL && PreviousMode == UserMode) - { - _SEH_TRY - { - ProbeForWrite(PreviousState, - sizeof(LONG), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + if(!NT_SUCCESS(Status)) return Status; + } + + /* Open the Object */ + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_MODIFY_STATE, + ExEventObjectType, + PreviousMode, + (PVOID*)&Event, + NULL); + + /* Check for success */ + if(NT_SUCCESS(Status)) { + + /* Pulse the Event */ + LONG Prev = KePulseEvent(Event, EVENT_INCREMENT, FALSE); + ObDereferenceObject(Event); - if(!NT_SUCCESS(Status)) - { - return Status; - } + /* Return it */ + if(PreviousState) { + + _SEH_TRY { + + *PreviousState = Prev; + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; + } } - Status = ObReferenceObjectByHandle(EventHandle, - EVENT_MODIFY_STATE, - ExEventObjectType, - PreviousMode, - (PVOID*)&Event, - NULL); - if(NT_SUCCESS(Status)) - { - LONG Prev = KePulseEvent(Event, EVENT_INCREMENT, FALSE); - ObDereferenceObject(Event); - - if(PreviousState != NULL) - { - _SEH_TRY - { - *PreviousState = Prev; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - } - + /* Return Status */ return Status; } @@ -320,230 +306,202 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtQueryEvent(IN HANDLE EventHandle, - IN EVENT_INFORMATION_CLASS EventInformationClass, [truncated at 1000 lines; 13871 more skipped]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs