Ros-dev

ros-dev@reactos.org

5790 discussions

Re: [ros-dev] [ros-diffs] [sginsberg] 69248: [HAL] Get rid off REGISTERCALL ("regparm(3)" for GCC) and replace with good old NTAPI (stdcall). Such an obsession with avoiding stack usage is not healthy nor makes much sense t...
by Alex Ionescu 16 Sep '15

16 Sep '15

You seem to have a huge misunderstanding of modern processor architecture. Everything you said is false. In fact, this is why x64 uses register passing, as does ARM and every other major architecture except x86. Push/pop operations are extremely expensive and break pipelining. The compiler will then place the parameters in registers anyways after the fact. Suffice it to say though, the original reason these were regparm/fastcall is to easily allow them to be called from assembly at the time. Best regards, Alex Ionescu On Tue, Sep 15, 2015 at 7:03 PM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Tue Sep 15 23:03:42 2015 > New Revision: 69248 > > URL: http://svn.reactos.org/svn/reactos?rev=69248&view=rev > Log: > [HAL] Get rid off REGISTERCALL ("regparm(3)" for GCC) and replace with > good old NTAPI (stdcall). Such an obsession with avoiding stack usage is > not healthy nor makes much sense today (or even a long time before today) > with processors that have a decent L1 cache, whose "cost of access" is > basically the same as to that of a register, and with processors being > capable of recognising basic access patterns to ensure frequently used > memory (read: stack) is in the cache. Slapping FASTCALL/regparm on > frequently used code does not ensure it actually operates faster. You want > to know what really hurts performance (and cache)? Slapping FORCEINLINE on > everything like if it was some kind of asm macro, making code needlessly > bloated. > > Modified: > trunk/reactos/hal/halx86/include/halp.h > trunk/reactos/hal/halx86/up/pic.c > > Modified: trunk/reactos/hal/halx86/include/halp.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… > > ============================================================================== > --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Tue Sep 15 > 23:03:42 2015 > @@ -10,12 +10,6 @@ > #define INIT_SECTION /* Done via alloc_text for MSC */ > #endif > > - > -#ifdef _MSC_VER > -#define REGISTERCALL FASTCALL > -#else > -#define REGISTERCALL __attribute__((regparm(3))) > -#endif > > #ifdef CONFIG_SMP > #define HAL_BUILD_TYPE (DBG ? PRCB_BUILD_DEBUG : 0) > @@ -430,14 +424,14 @@ > > typedef > BOOLEAN > -( REGISTERCALL *PHAL_DISMISS_INTERRUPT)( > +(NTAPI *PHAL_DISMISS_INTERRUPT)( > IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrqGeneric( > IN KIRQL Irql, > IN ULONG Irq, > @@ -445,7 +439,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq15( > IN KIRQL Irql, > IN ULONG Irq, > @@ -453,7 +447,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq13( > IN KIRQL Irql, > IN ULONG Irq, > @@ -461,7 +455,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq07( > IN KIRQL Irql, > IN ULONG Irq, > @@ -469,7 +463,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrqLevel( > IN KIRQL Irql, > IN ULONG Irq, > @@ -477,7 +471,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq15Level( > IN KIRQL Irql, > IN ULONG Irq, > @@ -485,7 +479,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq13Level( > IN KIRQL Irql, > IN ULONG Irq, > @@ -493,7 +487,7 @@ > ); > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq07Level( > IN KIRQL Irql, > IN ULONG Irq, > > Modified: trunk/reactos/hal/halx86/up/pic.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=69… > > ============================================================================== > --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Tue Sep 15 23:03:42 > 2015 > @@ -843,7 +843,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrqGeneric(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -853,7 +853,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq15(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -889,7 +889,7 @@ > > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq13(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -902,7 +902,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq07(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -986,7 +986,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrqLevel(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -996,7 +996,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq15Level(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -1031,7 +1031,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq13Level(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > @@ -1044,7 +1044,7 @@ > } > > BOOLEAN > -REGISTERCALL > +NTAPI > HalpDismissIrq07Level(IN KIRQL Irql, > IN ULONG Irq, > OUT PKIRQL OldIrql) > > >

1 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 69221: [MOUNTMGR] Implement the IOCTL IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED: - Implement WriteRemoteDatabaseEntry() - Implement MountMgrVolumeMountPointCreated()
by Alex Ionescu 16 Sep '15

16 Sep '15

Lol, make sure not to implement the huge vulnerability Microsoft patched two months ago (win2k->xp-style database migration). Best regards, Alex Ionescu On Sun, Sep 13, 2015 at 6:52 PM, <pschweitzer(a)svn.reactos.org> wrote: > Author: pschweitzer > Date: Sun Sep 13 22:52:07 2015 > New Revision: 69221 > > URL: http://svn.reactos.org/svn/reactos?rev=69221&view=rev > Log: > [MOUNTMGR] > Implement the IOCTL IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED: > - Implement WriteRemoteDatabaseEntry() > - Implement MountMgrVolumeMountPointCreated() > > Modified: > trunk/reactos/drivers/filters/mountmgr/database.c > trunk/reactos/drivers/filters/mountmgr/device.c > trunk/reactos/drivers/filters/mountmgr/mntmgr.h > trunk/reactos/drivers/filters/mountmgr/mountmgr.c > > Modified: trunk/reactos/drivers/filters/mountmgr/database.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… > > ============================================================================== > --- trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] > (original) > +++ trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] Sun > Sep 13 22:52:07 2015 > @@ -192,6 +192,39 @@ > } > > return Entry; > +} > + > +/* > + * @implemented > + */ > +NTSTATUS > +WriteRemoteDatabaseEntry(IN HANDLE Database, > + IN LONG Offset, > + IN PDATABASE_ENTRY Entry) > +{ > + NTSTATUS Status; > + LARGE_INTEGER ByteOffset; > + IO_STATUS_BLOCK IoStatusBlock; > + > + ByteOffset.QuadPart = Offset; > + Status = ZwWriteFile(Database, > + NULL, > + NULL, > + NULL, > + &IoStatusBlock, > + Entry, > + Entry->EntrySize, > + &ByteOffset, > + NULL); > + if (NT_SUCCESS(Status)) > + { > + if (IoStatusBlock.Information < Entry->EntrySize) > + { > + Status = STATUS_INSUFFICIENT_RESOURCES; > + } > + } > + > + return Status; > } > > /* > > Modified: trunk/reactos/drivers/filters/mountmgr/device.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… > > ============================================================================== > --- trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] > (original) > +++ trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] Sun > Sep 13 22:52:07 2015 > @@ -1688,15 +1688,242 @@ > return Status; > } > > +/* > + * @implemented > + */ > NTSTATUS > MountMgrVolumeMountPointCreated(IN PDEVICE_EXTENSION DeviceExtension, > IN PIRP Irp, > IN NTSTATUS LockStatus) > { > - UNREFERENCED_PARAMETER(DeviceExtension); > - UNREFERENCED_PARAMETER(Irp); > - UNREFERENCED_PARAMETER(LockStatus); > - return STATUS_NOT_IMPLEMENTED; > + LONG Offset; > + BOOLEAN Found; > + NTSTATUS Status; > + HANDLE RemoteDatabase; > + PMOUNTDEV_UNIQUE_ID UniqueId; > + PDATABASE_ENTRY DatabaseEntry; > + PASSOCIATED_DEVICE_ENTRY AssociatedEntry; > + PDEVICE_INFORMATION DeviceInformation, TargetDeviceInformation; > + UNICODE_STRING LinkTarget, SourceDeviceName, SourceSymbolicName, > TargetVolumeName, VolumeName, DbName; > + > + /* Initialize string */ > + LinkTarget.Length = 0; > + LinkTarget.MaximumLength = 0xC8; > + LinkTarget.Buffer = AllocatePool(LinkTarget.MaximumLength); > + if (LinkTarget.Buffer == NULL) > + { > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + /* If the mount point was created, then, it changed! > + * Also use it to query some information > + */ > + Status = MountMgrVolumeMountPointChanged(DeviceExtension, Irp, > LockStatus, &SourceDeviceName, &SourceSymbolicName, &TargetVolumeName); > + /* Pending means DB are under synchronization, bail out */ > + if (Status == STATUS_PENDING) > + { > + FreePool(LinkTarget.Buffer); > + FreePool(SourceDeviceName.Buffer); > + FreePool(SourceSymbolicName.Buffer); > + return STATUS_PENDING; > + } > + else if (!NT_SUCCESS(Status)) > + { > + FreePool(LinkTarget.Buffer); > + return Status; > + } > + > + /* Query the device information */ > + Status = FindDeviceInfo(DeviceExtension, &SourceDeviceName, FALSE, > &DeviceInformation); > + if (!NT_SUCCESS(Status)) > + { > + /* If it failed, first try to get volume name */ > + Status = QueryVolumeName(0, NULL, &SourceDeviceName, &LinkTarget, > &VolumeName); > + if (!NT_SUCCESS(Status)) > + { > + /* Then, try to read the symlink */ > + Status = MountMgrQuerySymbolicLink(&SourceDeviceName, > &LinkTarget); > + if (!NT_SUCCESS(Status)) > + { > + FreePool(LinkTarget.Buffer); > + FreePool(SourceDeviceName.Buffer); > + FreePool(SourceSymbolicName.Buffer); > + return Status; > + } > + } > + else > + { > + FreePool(VolumeName.Buffer); > + } > + > + FreePool(SourceDeviceName.Buffer); > + > + SourceDeviceName.Length = LinkTarget.Length; > + SourceDeviceName.MaximumLength = LinkTarget.MaximumLength; > + SourceDeviceName.Buffer = LinkTarget.Buffer; > + > + /* Now that we have the correct source, reattempt to query > information */ > + Status = FindDeviceInfo(DeviceExtension, &SourceDeviceName, > FALSE, &DeviceInformation); > + if (!NT_SUCCESS(Status)) > + { > + FreePool(SourceDeviceName.Buffer); > + FreePool(SourceSymbolicName.Buffer); > + return Status; > + } > + } > + > + FreePool(SourceDeviceName.Buffer); > + > + /* Get information about target device */ > + Status = FindDeviceInfo(DeviceExtension, &TargetVolumeName, FALSE, > &TargetDeviceInformation); > + if (!NT_SUCCESS(Status)) > + { > + FreePool(SourceSymbolicName.Buffer); > + return Status; > + } > + > + /* Notify if not disabled */ > + if (!TargetDeviceInformation->SkipNotifications) > + { > + PostOnlineNotification(DeviceExtension, > &TargetDeviceInformation->SymbolicName); > + } > + > + /* Open the remote database */ > + RemoteDatabase = OpenRemoteDatabase(DeviceInformation, TRUE); > + if (RemoteDatabase == 0) > + { > + FreePool(SourceSymbolicName.Buffer); > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + /* Browse all the entries */ > + Offset = 0; > + Found = FALSE; > + for (;;) > + { > + DatabaseEntry = GetRemoteDatabaseEntry(RemoteDatabase, Offset); > + if (DatabaseEntry == NULL) > + { > + break; > + } > + > + /* Try to find ourselves */ > + DbName.MaximumLength = DatabaseEntry->SymbolicNameLength; > + DbName.Length = DbName.MaximumLength; > + DbName.Buffer = (PWSTR)((ULONG_PTR)DatabaseEntry + > DatabaseEntry->SymbolicNameOffset); > + if (RtlEqualUnicodeString(&TargetVolumeName, &DbName, TRUE)) > + { > + ++DatabaseEntry->DatabaseOffset; > + Status = WriteRemoteDatabaseEntry(RemoteDatabase, Offset, > DatabaseEntry); > + FreePool(DatabaseEntry); > + Found = TRUE; > + break; > + } > + > + Offset += DatabaseEntry->EntrySize; > + FreePool(DatabaseEntry); > + } > + > + /* We couldn't find ourselves, we'll have to add ourselves */ > + if (!Found) > + { > + ULONG EntrySize; > + PUNIQUE_ID_REPLICATE UniqueIdReplicate; > + > + /* Query the device unique ID */ > + Status = QueryDeviceInformation(&TargetVolumeName, NULL, > &UniqueId, NULL, NULL, NULL, NULL, NULL); > + if (!NT_SUCCESS(Status)) > + { > + FreePool(SourceSymbolicName.Buffer); > + CloseRemoteDatabase(RemoteDatabase); > + return Status; > + } > + > + /* Allocate a database entry */ > + EntrySize = UniqueId->UniqueIdLength + TargetVolumeName.Length + > sizeof(DATABASE_ENTRY); > + DatabaseEntry = AllocatePool(EntrySize); > + if (DatabaseEntry == NULL) > + { > + FreePool(UniqueId); > + FreePool(SourceSymbolicName.Buffer); > + CloseRemoteDatabase(RemoteDatabase); > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + /* Fill it in */ > + DatabaseEntry->EntrySize = EntrySize; > + DatabaseEntry->DatabaseOffset = 1; > + DatabaseEntry->SymbolicNameOffset = sizeof(DATABASE_ENTRY); > + DatabaseEntry->SymbolicNameLength = TargetVolumeName.Length; > + DatabaseEntry->UniqueIdOffset = TargetVolumeName.Length + > sizeof(DATABASE_ENTRY); > + DatabaseEntry->UniqueIdLength = UniqueId->UniqueIdLength; > + RtlCopyMemory((PVOID)((ULONG_PTR)DatabaseEntry + > sizeof(DATABASE_ENTRY)), TargetVolumeName.Buffer, > DatabaseEntry->SymbolicNameLength); > + RtlCopyMemory((PVOID)((ULONG_PTR)DatabaseEntry + > DatabaseEntry->UniqueIdOffset), UniqueId->UniqueId, > UniqueId->UniqueIdLength); > + > + /* And write it down */ > + Status = AddRemoteDatabaseEntry(RemoteDatabase, DatabaseEntry); > + FreePool(DatabaseEntry); > + if (!NT_SUCCESS(Status)) > + { > + FreePool(UniqueId); > + FreePool(SourceSymbolicName.Buffer); > + CloseRemoteDatabase(RemoteDatabase); > + return Status; > + } > + > + /* And now, allocate an Unique ID item */ > + UniqueIdReplicate = AllocatePool(sizeof(UNIQUE_ID_REPLICATE)); > + if (UniqueIdReplicate == NULL) > + { > + FreePool(UniqueId); > + FreePool(SourceSymbolicName.Buffer); > + CloseRemoteDatabase(RemoteDatabase); > + return Status; > + } > + > + /* To associate it with the device */ > + UniqueIdReplicate->UniqueId = UniqueId; > + InsertTailList(&DeviceInformation->ReplicatedUniqueIdsListHead, > &UniqueIdReplicate->ReplicatedUniqueIdsListEntry); > + } > + > + /* We're done with the remote database */ > + CloseRemoteDatabase(RemoteDatabase); > + > + /* Check we were find writing the entry */ > + if (!NT_SUCCESS(Status)) > + { > + FreePool(SourceSymbolicName.Buffer); > + return Status; > + } > + > + /* This is the end, allocate an associated entry */ > + AssociatedEntry = AllocatePool(sizeof(ASSOCIATED_DEVICE_ENTRY)); > + if (AssociatedEntry == NULL) > + { > + FreePool(SourceSymbolicName.Buffer); > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + /* Initialize its source name string */ > + AssociatedEntry->String.Length = SourceSymbolicName.Length; > + AssociatedEntry->String.MaximumLength = > AssociatedEntry->String.Length + sizeof(UNICODE_NULL); > + AssociatedEntry->String.Buffer = > AllocatePool(AssociatedEntry->String.MaximumLength); > + if (AssociatedEntry->String.Buffer == NULL) > + { > + FreePool(AssociatedEntry); > + FreePool(SourceSymbolicName.Buffer); > + return STATUS_INSUFFICIENT_RESOURCES; > + } > + > + /* Copy data & insert in list */ > + RtlCopyMemory(AssociatedEntry->String.Buffer, > SourceSymbolicName.Buffer, SourceSymbolicName.Length); > + AssociatedEntry->String.Buffer[SourceSymbolicName.Length / > sizeof(WCHAR)] = UNICODE_NULL; > + AssociatedEntry->DeviceInformation = DeviceInformation; > + InsertTailList(&TargetDeviceInformation->AssociatedDevicesHead, > &AssociatedEntry->AssociatedDevicesEntry); > + > + /* We're done! */ > + FreePool(SourceSymbolicName.Buffer); > + return STATUS_SUCCESS; > } > > NTSTATUS > > Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… > > ============================================================================== > --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] > (original) > +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Sun > Sep 13 22:52:07 2015 > @@ -298,6 +298,36 @@ > OUT PUNICODE_STRING VolumeName > ); > > +HANDLE > +OpenRemoteDatabase( > + IN PDEVICE_INFORMATION DeviceInformation, > + IN BOOLEAN MigrateDatabase > +); > + > +PDATABASE_ENTRY > +GetRemoteDatabaseEntry( > + IN HANDLE Database, > + IN LONG StartingOffset > +); > + > +NTSTATUS > +WriteRemoteDatabaseEntry( > + IN HANDLE Database, > + IN LONG Offset, > + IN PDATABASE_ENTRY Entry > +); > + > +NTSTATUS > +CloseRemoteDatabase( > + IN HANDLE Database > +); > + > +NTSTATUS > +AddRemoteDatabaseEntry( > + IN HANDLE Database, > + IN PDATABASE_ENTRY Entry > +); > + > /* device.c */ > > DRIVER_DISPATCH MountMgrDeviceControl; > @@ -458,4 +488,10 @@ > IN BOOLEAN MarkOffline > ); > > +NTSTATUS > +MountMgrQuerySymbolicLink( > + IN PUNICODE_STRING SymbolicName, > + IN OUT PUNICODE_STRING LinkTarget > +); > + > #endif /* _MNTMGR_H_ */ > > Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… > > ============================================================================== > --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] > (original) > +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Sun > Sep 13 22:52:07 2015 > @@ -48,7 +48,6 @@ > * - MountMgrQueryDosVolumePaths > * - MountMgrQueryVolumePaths > * - MountMgrValidateBackPointer > - * - MountMgrVolumeMountPointCreated > * - MountMgrVolumeMountPointDeleted > * - ReconcileThisDatabaseWithMasterWorker > */ > > >

3 3

Re: [ros-dev] [ros-diffs] [ion] 69180: [CDFS_NEW] - Resurrect back 7 years later (revert commit 34622). - Add correct MS-PL (Public) License. Not added to build/used, but I need some of the headers/data structures in here. ...
by Colin Finck 11 Sep '15

11 Sep '15

ion(a)svn.reactos.org wrote: > - Add correct MS-PL (Public) License. Not added to build/used, but I > need some of the headers/data structures in here. > - Source: https://github.com/Microsoft/Windows-driver-samples/blob/master/filesys/cdfs Yay! No more messing around with DDK licenses! Someone should take the other samples there and replace our DDK-inspired components (e.g. classpnp and disk) by these ones licensed under MS-PL. Cheers, Colin

1 0

Re: [ros-dev] [ros-diffs] [hbelusca] 69139: OMGWTFBBQ!!!! We can now boot our ISOs on UEFI systems!! Thanks gigaherz for the "fatten" utility!, and others for testing. [CDMAKE] - Add multi-boot CD support, following El-Tori...
by Colin Finck 09 Sep '15

09 Sep '15

hbelusca(a)svn.reactos.org wrote: > +// FIXME! FIXME! Do it in a portable way!! > typedef unsigned char BYTE; > typedef unsigned short WORD; > typedef unsigned long DWORD; Try using our include/host/typedefs.h, which provides the most popular Windows type definitions in a portable way. - Colin

2 1

Re: [ros-dev] [ros-diffs] [cwittich] 69079: [MODE] use ARRAYSIZE, don't include windows.h, fix two possible out-of-bounds reads CID 1206872 CID 1206873
by Colin Finck 07 Sep '15

07 Sep '15

cwittich(a)svn.reactos.org wrote: > Modified: trunk/reactos/base/applications/cmdutils/mode/mode.c What is that tool for anyway? Windows has a 16-bit "mode.com" for compatibility and I believe the actual "mode" command is built-in into cmd.exe these days. Cheers, Colin

3 3

Re: [ros-dev] [ros-diffs] [hbelusca] 68975: [VSSAPI] Compile the THISCALL calling convention support only for x86. On x64, we are automatically in THISCALL. Also I suggest we turn this file (and maybe also /lib/sdk/crt/exce...
by Thomas Faber 04 Sep '15

04 Sep '15

On 2015-09-04 03:14, hbelusca(a)svn.reactos.org wrote: > Also I suggest we turn this file (and maybe also /lib/sdk/crt/except/i386/cpp.s) into a "msvc-thiscall.c" as it is already done in some other DLLs (like in ole32, riched20). ole32 and riched20 don't export mangled names. MSVC ignores redirects for them in the def file so it needs to be assembly (or C++ code).

2 1

Re: [ros-dev] [ros-diffs] [sginsberg] 68888: - Remove all NT_ASSERT from the kernel and replace with good old ASSERT, for ease of debugging, especially for tests run on the build servers. There is no need to use NT_ASSERT i...
by Thomas Faber 01 Sep '15

01 Sep '15

I would understand a commit that does the exact opposite; I don't understand this one. How exactly is ASSERT easier to debug? NT_ASSERT on GCC should essentially be the same as ASSERT On MSVC/Windbg you get lots of advantages: - you can ignore specific asserts - you can set different event filters for asserts vs other breakpoints in the debugger - the assert becomes a single instruction instead of a function call, which means you can easily overwrite it with something else, or do a "Set Instruction Pointer" without doing two "Step Out"s first - You could change what KiRaiseAssertionHandler does to change behavior, or probably even catch STATUS_ASSERTION_FAILURE exceptions in code. This could e.g. allow assertions not to cause bugchecks if you didn't select Debug mode in freeldr On 2015-09-01 03:45, sginsberg(a)svn.reactos.org wrote: > Author: sginsberg > Date: Tue Sep 1 01:45:59 2015 > New Revision: 68888 > > URL: http://svn.reactos.org/svn/reactos?rev=68888&view=rev > Log: > - Remove all NT_ASSERT from the kernel and replace with good old ASSERT, for ease of debugging, especially for tests run on the build servers. There is no need to use NT_ASSERT in the kernel. > - The fish is long gone. > > Modified: > trunk/reactos/ntoskrnl/cc/copy.c > trunk/reactos/ntoskrnl/config/cmapi.c > trunk/reactos/ntoskrnl/config/cmparse.c > trunk/reactos/ntoskrnl/ex/handle.c > trunk/reactos/ntoskrnl/ex/win32k.c > trunk/reactos/ntoskrnl/io/iomgr/deviface.c > trunk/reactos/ntoskrnl/io/iomgr/driver.c > trunk/reactos/ntoskrnl/ke/arm/usercall.c > trunk/reactos/ntoskrnl/ke/i386/traphdlr.c > trunk/reactos/ntoskrnl/lpc/send.c > trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c > trunk/reactos/ntoskrnl/mm/ARM3/section.c > trunk/reactos/ntoskrnl/mm/ARM3/session.c > trunk/reactos/ntoskrnl/mm/ARM3/virtual.c > trunk/reactos/ntoskrnl/mm/arm/page.c > trunk/reactos/ntoskrnl/ob/oblife.c > trunk/reactos/ntoskrnl/se/accesschk.c > trunk/reactos/ntoskrnl/se/acl.c > trunk/reactos/ntoskrnl/se/audit.c > trunk/reactos/ntoskrnl/se/priv.c > trunk/reactos/ntoskrnl/se/sd.c > trunk/reactos/ntoskrnl/se/sid.c > trunk/reactos/ntoskrnl/wmi/wmidrv.c > > Modified: trunk/reactos/ntoskrnl/cc/copy.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=688… > ============================================================================== > --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -453,7 +453,7 @@ > TRUE, > Buffer, > IoStatus); > - NT_ASSERT(Success == TRUE); > + ASSERT(Success == TRUE); > } > > /* > @@ -479,7 +479,7 @@ > Length, > TRUE, > Buffer); > - NT_ASSERT(Success == TRUE); > + ASSERT(Success == TRUE); > } > > /* > > Modified: trunk/reactos/ntoskrnl/config/cmapi.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -606,7 +606,7 @@ > } > > /* Copy the class data */ > - NT_ASSERT(Length >= Offset); > + ASSERT(Length >= Offset); > RtlCopyMemory(Info->KeyFullInformation.Class, > ClassData, > min(Node->ClassLength, Length - Offset)); > > Modified: trunk/reactos/ntoskrnl/config/cmparse.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… > ============================================================================== > --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -24,7 +24,7 @@ > { > BOOLEAN NameValid = TRUE; > > - NT_ASSERT(RemainingName->Length % sizeof(WCHAR) == 0); > + ASSERT(RemainingName->Length % sizeof(WCHAR) == 0); > > /* Check if there's nothing left in the name */ > if (!(RemainingName->Buffer) || > > Modified: trunk/reactos/ntoskrnl/ex/handle.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=6… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -85,7 +85,7 @@ > > default: > > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > Entry = NULL; > } > > > Modified: trunk/reactos/ntoskrnl/ex/win32k.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=6… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -77,7 +77,7 @@ > if (SessionEntry == NULL) > { > /* The requested session does not even exist! */ > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > return STATUS_NOT_FOUND; > } > > @@ -92,7 +92,7 @@ > > /* Cleanup and return */ > MmQuitNextSession(SessionEntry); > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > return Status; > } > } > > Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -876,7 +876,7 @@ > } > > /* Add final NULL to ReturnBuffer */ > - NT_ASSERT(ReturnBuffer.Length <= ReturnBuffer.MaximumLength); > + ASSERT(ReturnBuffer.Length <= ReturnBuffer.MaximumLength); > if (ReturnBuffer.Length >= ReturnBuffer.MaximumLength) > { > PWSTR NewBuffer; > > Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -934,7 +934,7 @@ > > NextEntry = NextEntry->Flink; > } > - NT_ASSERT(NextEntry != &PsLoadedModuleList); > + ASSERT(NextEntry != &PsLoadedModuleList); > > /* > * Initialize the driver > @@ -1374,7 +1374,7 @@ > /* Set the unload invoked flag and call the unload routine */ > DriverObject->Flags |= DRVO_UNLOAD_INVOKED; > Status = IopLoadUnloadDriver(NULL, &DriverObject); > - NT_ASSERT(Status == STATUS_SUCCESS); > + ASSERT(Status == STATUS_SUCCESS); > > /* Mark the driver object temporary, so it could be deleted later */ > ObMakeTemporaryObject(DriverObject); > @@ -1874,7 +1874,7 @@ > { > PLOAD_UNLOAD_PARAMS LoadParams = Parameter; > > - NT_ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); > + ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); > LoadParams->Status = IopLoadUnloadDriver(LoadParams->RegistryPath, > &LoadParams->DriverObject); > KeSetEvent(&LoadParams->Event, 0, FALSE); > > Modified: trunk/reactos/ntoskrnl/ke/arm/usercall.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/usercall.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -312,7 +312,7 @@ > OUT PVOID *Result, > OUT PULONG ResultLength) > { > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > return STATUS_NOT_IMPLEMENTED; > } > > @@ -322,7 +322,7 @@ > IN PVOID *OutputBuffer, > IN PULONG OutputLength) > { > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > return STATUS_NOT_IMPLEMENTED; > } > > @@ -333,7 +333,7 @@ > _In_ ULONG ResultLength, > _In_ NTSTATUS CallbackStatus) > { > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > return STATUS_NOT_IMPLEMENTED; > } > > > Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -1537,7 +1537,7 @@ > Thread = KeGetCurrentThread(); > Thread->TrapFrame = TrapFrame; > Thread->PreviousMode = KiUserTrap(TrapFrame); > - NT_ASSERT(Thread->PreviousMode != KernelMode); > + ASSERT(Thread->PreviousMode != KernelMode); > > /* Pass the register parameters to NtCallbackReturn. > Result pointer is in ecx, result length in edx, status in eax */ > > Modified: trunk/reactos/ntoskrnl/lpc/send.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=68… > ============================================================================== > --- trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -793,7 +793,7 @@ > MessageType = LocalLpcRequest.u2.s2.Type; > > /* Due to the above probe, we know that TotalLength is positive */ > - NT_ASSERT(LocalLpcRequest.u1.s1.TotalLength >= 0); > + ASSERT(LocalLpcRequest.u1.s1.TotalLength >= 0); > > /* Validate the length */ > if ((((ULONG)(USHORT)LocalLpcRequest.u1.s1.DataLength + sizeof(PORT_MESSAGE)) > > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -189,7 +189,7 @@ > /* Check if this is a guard page */ > if ((ProtectionMask & MM_PROTECT_SPECIAL) == MM_GUARDPAGE) > { > - NT_ASSERT(ProtectionMask != MM_DECOMMIT); > + ASSERT(ProtectionMask != MM_DECOMMIT); > > /* Attached processes can't expand their stack */ > if (KeIsAttachedProcess()) return STATUS_ACCESS_VIOLATION; > @@ -200,7 +200,7 @@ > > /* Remove the guard page bit, and return a guard page violation */ > TempPte.u.Soft.Protection = ProtectionMask & ~MM_GUARDPAGE; > - NT_ASSERT(TempPte.u.Long != 0); > + ASSERT(TempPte.u.Long != 0); > MI_WRITE_INVALID_PTE(PointerPte, TempPte); > return STATUS_GUARD_PAGE_VIOLATION; > } > @@ -1080,7 +1080,7 @@ > } > > /* There is no such thing as a decommitted prototype PTE */ > - NT_ASSERT(TempPte.u.Long != MmDecommittedPte.u.Long); > + ASSERT(TempPte.u.Long != MmDecommittedPte.u.Long); > > /* Check for access rights on the PTE proper */ > PteContents = *PointerPte; > @@ -1420,7 +1420,7 @@ > /* Resolve */ > Status = MiResolveTransitionFault(Address, PointerPte, Process, LockIrql, &InPageBlock); > > - NT_ASSERT(NT_SUCCESS(Status)); > + ASSERT(NT_SUCCESS(Status)); > > /* And now release the lock and leave*/ > KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); > @@ -2069,7 +2069,7 @@ > if ((ProtectionCode & MM_PROTECT_SPECIAL) == MM_GUARDPAGE) > { > /* The VAD protection cannot be MM_DECOMMIT! */ > - NT_ASSERT(ProtectionCode != MM_DECOMMIT); > + ASSERT(ProtectionCode != MM_DECOMMIT); > > /* Remove the bit */ > TempPte.u.Soft.Protection = ProtectionCode & ~MM_GUARDPAGE; > @@ -2185,7 +2185,7 @@ > /* Write the prototype PTE */ > TempPte = PrototypePte; > TempPte.u.Soft.Protection = ProtectionCode; > - NT_ASSERT(TempPte.u.Long != 0); > + ASSERT(TempPte.u.Long != 0); > MI_WRITE_INVALID_PTE(PointerPte, TempPte); > } > else > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -1121,7 +1121,7 @@ > Status = MiSessionCommitPageTables(Base, > (PVOID)((ULONG_PTR)Base + > Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE)); > - NT_ASSERT(NT_SUCCESS(Status)); > + ASSERT(NT_SUCCESS(Status)); > } > > /* Create the actual prototype PTEs for this mapping */ > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -930,7 +930,7 @@ > > /* The parameter is the actual process! */ > EntryProcess = SessionEntry; > - NT_ASSERT(EntryProcess != NULL); > + ASSERT(EntryProcess != NULL); > > /* Sanity checks */ > ASSERT(KeGetCurrentIrql() <= APC_LEVEL); > @@ -998,7 +998,7 @@ > > /* The parameter is the actual process! */ > EntryProcess = SessionEntry; > - NT_ASSERT(EntryProcess != NULL); > + ASSERT(EntryProcess != NULL); > > /* Sanity checks */ > ASSERT(KeGetCurrentIrql() <= APC_LEVEL); > @@ -1039,7 +1039,7 @@ > > /* The parameter is the actual process! */ > EntryProcess = SessionEntry; > - NT_ASSERT(EntryProcess != NULL); > + ASSERT(EntryProcess != NULL); > > /* Sanity checks */ > ASSERT(KeGetCurrentIrql () <= APC_LEVEL); > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -7,7 +7,6 @@ > */ > > /* INCLUDES *******************************************************************/ > -/* So long, and Thanks for All the Fish */ > > #include <ntoskrnl.h> > #define NDEBUG > @@ -431,7 +430,7 @@ > /* Make the page free. For prototypes, it will be made free when deleting the section object */ > if (Pfn1->u2.ShareCount == 0) > { > - NT_ASSERT(Pfn1->u3.e2.ReferenceCount == 0); > + ASSERT(Pfn1->u3.e2.ReferenceCount == 0); > > /* And it should be in standby or modified list */ > ASSERT((Pfn1->u3.e1.PageLocation == ModifiedPageList) || (Pfn1->u3.e1.PageLocation == StandbyPageList)); > @@ -1887,7 +1886,7 @@ > { > DPRINT1("MmQuerySectionView failed. MemoryArea=%p (%p-%p), BaseAddress=%p\n", > MemoryArea, MA_GetStartingAddress(MemoryArea), MA_GetEndingAddress(MemoryArea), BaseAddress); > - NT_ASSERT(NT_SUCCESS(Status)); > + ASSERT(NT_SUCCESS(Status)); > } > } > else > @@ -4856,7 +4855,7 @@ > // > TempPte.u.Long = 0; > TempPte.u.Soft.Protection = ProtectionMask; > - NT_ASSERT(TempPte.u.Long != 0); > + ASSERT(TempPte.u.Long != 0); > > // > // Get the PTE, PDE and the last PTE for this address range > > Modified: trunk/reactos/ntoskrnl/mm/arm/page.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -301,14 +301,14 @@ > PVOID Address, > SWAPENTRY* SwapEntry) > { > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > } > > BOOLEAN > NTAPI > MmIsDisabledPage(PEPROCESS Process, PVOID Address) > { > - NT_ASSERT(FALSE); > + ASSERT(FALSE); > return FALSE; > } > > @@ -317,6 +317,6 @@ > INIT_FUNCTION > MiInitializeSessionSpaceLayout(VOID) > { > - NT_ASSERT(FALSE); > -} > - > + ASSERT(FALSE); > +} > + > > Modified: trunk/reactos/ntoskrnl/ob/oblife.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=6… > ============================================================================== > --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -1245,7 +1245,7 @@ > /* Set the index and the entry into the object type array */ > LocalObjectType->Index = ObpTypeObjectType->TotalNumberOfObjects; > > - NT_ASSERT(LocalObjectType->Index != 0); > + ASSERT(LocalObjectType->Index != 0); > > if (LocalObjectType->Index < 32) > { > > Modified: trunk/reactos/ntoskrnl/se/accesschk.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/accesschk.c?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -465,7 +465,7 @@ > > PAGED_CODE(); > > - NT_ASSERT(AccessMode != KernelMode); > + ASSERT(AccessMode != KernelMode); > > if (SecurityDescriptor == NULL) > return FALSE; > > Modified: trunk/reactos/ntoskrnl/se/acl.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/acl.c?rev=6888… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -439,10 +439,10 @@ > PSID Sid; > BOOLEAN WriteTwoAces; > > - NT_ASSERT(RtlValidAcl(AclSource)); > - NT_ASSERT(AclSource->AclSize % sizeof(ULONG) == 0); > - NT_ASSERT(AclSource->Sbz1 == 0); > - NT_ASSERT(AclSource->Sbz2 == 0); > + ASSERT(RtlValidAcl(AclSource)); > + ASSERT(AclSource->AclSize % sizeof(ULONG) == 0); > + ASSERT(AclSource->Sbz1 == 0); > + ASSERT(AclSource->Sbz2 == 0); > > Written = 0; > if (*AclLength >= Written + sizeof(ACL)) > @@ -457,18 +457,18 @@ > CurrentSource = (PUCHAR)(AclSource + 1); > for (i = 0; i < AclSource->AceCount; i++) > { > - NT_ASSERT((ULONG_PTR)CurrentDest % sizeof(ULONG) == 0); > - NT_ASSERT((ULONG_PTR)CurrentSource % sizeof(ULONG) == 0); > + ASSERT((ULONG_PTR)CurrentDest % sizeof(ULONG) == 0); > + ASSERT((ULONG_PTR)CurrentSource % sizeof(ULONG) == 0); > AceDest = (PACCESS_ALLOWED_ACE)CurrentDest; > AceSource = (PACCESS_ALLOWED_ACE)CurrentSource; > > /* These all have the same structure */ > - NT_ASSERT(AceSource->Header.AceType == ACCESS_ALLOWED_ACE_TYPE || > + ASSERT(AceSource->Header.AceType == ACCESS_ALLOWED_ACE_TYPE || > AceSource->Header.AceType == ACCESS_DENIED_ACE_TYPE || > AceSource->Header.AceType == SYSTEM_AUDIT_ACE_TYPE); > > - NT_ASSERT(AceSource->Header.AceSize % sizeof(ULONG) == 0); > - NT_ASSERT(AceSource->Header.AceSize >= sizeof(*AceSource)); > + ASSERT(AceSource->Header.AceSize % sizeof(ULONG) == 0); > + ASSERT(AceSource->Header.AceSize >= sizeof(*AceSource)); > if (!SepShouldPropagateAce(AceSource->Header.AceFlags, > &AceFlags, > IsInherited, > @@ -482,7 +482,7 @@ > AceSize = AceSource->Header.AceSize; > Mask = AceSource->Mask; > Sid = (PSID)&AceSource->SidStart; > - NT_ASSERT(AceSize >= FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + RtlLengthSid(Sid)); > + ASSERT(AceSize >= FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + RtlLengthSid(Sid)); > > WriteTwoAces = FALSE; > /* Map effective ACE to specific rights */ > @@ -598,7 +598,7 @@ > *IsInherited, > IsDirectoryObject, > GenericMapping); > - NT_ASSERT(Status == STATUS_BUFFER_TOO_SMALL); > + ASSERT(Status == STATUS_BUFFER_TOO_SMALL); > > /* Use the parent ACL only if it's not empty */ > if (*AclLength != sizeof(ACL)) > @@ -633,7 +633,7 @@ > *IsInherited, > IsDirectoryObject, > GenericMapping); > - NT_ASSERT(Status == STATUS_BUFFER_TOO_SMALL); > + ASSERT(Status == STATUS_BUFFER_TOO_SMALL); > } > return Acl; > } > > Modified: trunk/reactos/ntoskrnl/se/audit.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=68… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -644,7 +644,7 @@ > _SEH2_TRY > { > /* Loop all result entries (only 1 when no list was requested) */ > - NT_ASSERT(UseResultList || (ResultListLength == 1)); > + ASSERT(UseResultList || (ResultListLength == 1)); > for (i = 0; i < ResultListLength; i++) > { > AccessStatusList[i] = SafeAccessStatusList[i]; > > Modified: trunk/reactos/ntoskrnl/se/priv.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=688… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -129,7 +129,7 @@ > SepReleaseTokenLock(Token); > > /* When we reached this point, we did not find all privileges */ > - NT_ASSERT(Required > 0); > + ASSERT(Required > 0); > return FALSE; > } > > > Modified: trunk/reactos/ntoskrnl/se/sd.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=68888… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -864,7 +864,7 @@ > Control |= (ObjectSd->Control & SE_OWNER_DEFAULTED); > } > OwnerLength = Owner ? RtlLengthSid(Owner) : 0; > - NT_ASSERT(OwnerLength % sizeof(ULONG) == 0); > + ASSERT(OwnerLength % sizeof(ULONG) == 0); > > /* Get group and group size */ > if (SecurityInformation & GROUP_SECURITY_INFORMATION) > @@ -878,7 +878,7 @@ > Control |= (ObjectSd->Control & SE_GROUP_DEFAULTED); > } > GroupLength = Group ? RtlLengthSid(Group) : 0; > - NT_ASSERT(GroupLength % sizeof(ULONG) == 0); > + ASSERT(GroupLength % sizeof(ULONG) == 0); > > /* Get DACL and DACL size */ > if (SecurityInformation & DACL_SECURITY_INFORMATION) > @@ -1211,7 +1211,7 @@ > } > } > OwnerLength = RtlLengthSid(Owner); > - NT_ASSERT(OwnerLength % sizeof(ULONG) == 0); > + ASSERT(OwnerLength % sizeof(ULONG) == 0); > > /* Inherit the Group SID */ > if (ExplicitDescriptor != NULL) > @@ -1248,7 +1248,7 @@ > return STATUS_INVALID_PRIMARY_GROUP; > } > GroupLength = RtlLengthSid(Group); > - NT_ASSERT(GroupLength % sizeof(ULONG) == 0); > + ASSERT(GroupLength % sizeof(ULONG) == 0); > > /* Inherit the DACL */ > DaclLength = 0; > @@ -1283,7 +1283,7 @@ > GenericMapping); > if (DaclPresent) > Control |= SE_DACL_PRESENT; > - NT_ASSERT(DaclLength % sizeof(ULONG) == 0); > + ASSERT(DaclLength % sizeof(ULONG) == 0); > > /* Inherit the SACL */ > SaclLength = 0; > @@ -1318,7 +1318,7 @@ > GenericMapping); > if (SaclPresent) > Control |= SE_SACL_PRESENT; > - NT_ASSERT(SaclLength % sizeof(ULONG) == 0); > + ASSERT(SaclLength % sizeof(ULONG) == 0); > > /* Allocate and initialize the new security descriptor */ > Length = sizeof(SECURITY_DESCRIPTOR_RELATIVE) + > @@ -1356,7 +1356,7 @@ > SaclIsInherited, > IsDirectoryObject, > GenericMapping); > - NT_ASSERT(Status == STATUS_SUCCESS); > + ASSERT(Status == STATUS_SUCCESS); > Descriptor->Sacl = Current; > Current += SaclLength; > } > @@ -1371,7 +1371,7 @@ > DaclIsInherited, > IsDirectoryObject, > GenericMapping); > - NT_ASSERT(Status == STATUS_SUCCESS); > + ASSERT(Status == STATUS_SUCCESS); > Descriptor->Dacl = Current; > Current += DaclLength; > } > > Modified: trunk/reactos/ntoskrnl/se/sid.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=6888… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -499,8 +499,8 @@ > RtlCopyMemory(CurrentDest, SrcSidAndAttributes[i].Sid, SidLength); > > /* Sanity checks */ > - NT_ASSERT(RtlLengthSid(SidAndAttributes[i].Sid) == SidLength); > - NT_ASSERT(RtlValidSid(SidAndAttributes[i].Sid)); > + ASSERT(RtlLengthSid(SidAndAttributes[i].Sid) == SidLength); > + ASSERT(RtlValidSid(SidAndAttributes[i].Sid)); > > /* Update the current destination address */ > CurrentDest += ALIGN_UP_BY(SidLength, sizeof(ULONG)); > > Modified: trunk/reactos/ntoskrnl/wmi/wmidrv.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmidrv.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Tue Sep 1 01:45:59 2015 > @@ -125,7 +125,7 @@ > _Out_ PWSTR ObjectNameBuffer, > _In_ KPROCESSOR_MODE AccessMode) > { > - NT_ASSERT(AccessMode != KernelMode); > + ASSERT(AccessMode != KernelMode); > > _SEH2_TRY > { > >

2 2

Re: [ros-dev] [ros-diffs] [bfreisen] 68792: [HHPCOMP] Improve functionality of Windows MSVC build. Based on a WIP patch by Michael Fritscher. See CORE-10019.
by Thomas Faber 23 Aug '15

23 Aug '15

On 2015-08-22 13:16, bfreisen(a)svn.reactos.org wrote: > [HHPCOMP] > Improve functionality of Windows MSVC build. Based on a WIP patch by Michael Fritscher. > See CORE-10019. > +/* if O_BINARY is not defined, the system is probably not expecting any such flag */ > +#ifndef O_BINARY > +#define O_BINARY 0 > +#endif > - chm->fd = creat(filename, 0644); > + chm->fd = open(filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0644); Hmm... fopen wouldn't have this problem ;)

1 0

Re: [ros-dev] [ros-diffs] [hbelusca] 68754: [NTVDM]: Initialize the PSP' memory control block owner name with the file name (without extension, and up to 8 chars) of the started program.
by Thomas Faber 19 Aug '15

19 Aug '15

On 2015-08-18 14:26, hbelusca(a)svn.reactos.org wrote: > [NTVDM]: Initialize the PSP' memory control block owner name with the file name (without extension, and up to 8 chars) of the started program. Shouldn't that use GetShortPathName to make sure the program can find itself on disk? :p

4 4

Follow-up on Hackfest
by Colin Finck 15 Aug '15

15 Aug '15

Hi all, First of all, let me thank everybody who could make it to Aachen for Hackfest! Thanks also go to all the others on IRC, Twitter, etc. who supported us during that time! It was a pleasure to have you all here and simply a great week! :) Now let's spread the word even more, so that everyone can get an idea of our Hackfest: Hackfest report =============== Aleksey suggested (and volunteered!) to write a report about our Hackfest for the website. He wants someone to help him though. Victor, as you did a pretty great job at live streaming every day, would you help Aleksey here? If there are other volunteers, just raise your voice :) Photos ====== I've created a folder "ReactOS Hackfest 2015" in the "Developers" file section on IServ. You already find all my photos there (among them, first group photos from Saturday). Please share your photos as well, either by uploading through the website or through SFTP (WinSCP is a great tool for this). If you're not in the "Developers" section, but participated in the Hackfest, please tell either Christoph, Pierre or me and we will add you. Cheers, Colin

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev