- Ros-dev - ReactOS.org

Re: [ros-dev] [ros-diffs] [pschweitzer] 64752: [NTFS] Implement NtfsDateTimeToFileTime() which convert epoch time (1970) to Windows time (1601)

by Thomas Faber

On 2014-10-15 22:23, pschweitzer(a)svn.reactos.org wrote: > +/* See: > + -> http://msdn.microsoft.com/en-us/library/ms724228 > + -> http://bos.asmhackers.net/docs/filesystems/ntfs/standard.html#layout > + */ > +VOID > +NtfsDateTimeToFileTime(ULONGLONG NtfsTime, > + PLARGE_INTEGER SystemTime) > +{ > + > + SystemTime->QuadPart = NtfsTime + 116444736000000000; > +} Doesn't NTFS use FILETIME directly? I thought that's the reason it's called "file time" in the first place. ;) Wikipedia says "Date range: 1 January 1601 – 28 May 60056 (File times are 64-bit numbers counting 100-nanosecond intervals (ten million per second) since 1601, which is 58,000+ years)" and your link doesn't seem to disagree.

10 years, 11 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [tfaber] 64695: [ROSAUTOTEST] - DbgPrint expects a format string! ROSTESTS-145 #resolve

by Colin Finck

tfaber(a)svn.reactos.org wrote: > - DbgPrint(DbgString); > + OutputDebugStringA(DbgString); FYI, we had OutputDebugStringA there in the first place, but I changed it to DbgPrint in r40147. IIRC, output from DbgPrint was directly sent to the debug port while OutputDebugStringA buffers the data first. This is especially bad, when a test crashes the OS and we lose several kilobytes of log data before they are printed out. Probably, a DbgPrint("%s", DbgString) is the better alternative here. - Colin

10 years, 11 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 64658: [NTDLL] Don't assert that the caller of exported APIs passes correct parameters.

by Alex Ionescu

Windows does. Why shouldn't we? It's a non-documented API. Best regards, Alex Ionescu On Sat, Oct 11, 2014 at 1:52 AM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Sat Oct 11 08:52:33 2014 > New Revision: 64658 > > URL: http://svn.reactos.org/svn/reactos?rev=64658&view=rev > Log: > [NTDLL] > Don't assert that the caller of exported APIs passes correct parameters. > > Modified: > trunk/reactos/dll/ntdll/ldr/ldrapi.c > > Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… > > ============================================================================== > --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) > +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sat Oct 11 > 08:52:33 2014 > @@ -209,9 +209,6 @@ > /* A normal failure */ > return STATUS_INVALID_PARAMETER_3; > } > - > - /* Do or Do Not. There is no Try */ > - ASSERT((Disposition != NULL) || !(Flags & > LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY)); > > /* If the flag is set, make sure we have a valid pointer to use */ > if ((Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY) && !(Disposition)) > > >

10 years, 11 months

3
3
0 0

Re: [ros-dev] [ros-diffs] [tfaber] 64665: [NTOS:KE] - Implement KiRaiseSecurityCheckFailure[Handler] to handle int 0x29 (__fastfail). Based on patch by Timo Kreuzer. (Yes, this is a Windows 8 feature. However all it does is...

by Alex Ionescu

Now improve the LIST_ENTRY Macros to use it :) Best regards, Alex Ionescu On Sat, Oct 11, 2014 at 6:15 AM, <tfaber(a)svn.reactos.org> wrote: > Author: tfaber > Date: Sat Oct 11 13:15:10 2014 > New Revision: 64665 > > URL: http://svn.reactos.org/svn/reactos?rev=64665&view=rev > Log: > [NTOS:KE] > - Implement KiRaiseSecurityCheckFailure[Handler] to handle int 0x29 > (__fastfail). Based on patch by Timo Kreuzer. > (Yes, this is a Windows 8 feature. However all it does is improve the > debugging experience, and we have a need for that) > CORE-8419 > > Modified: > trunk/reactos/include/reactos/mc/bugcodes.mc > trunk/reactos/ntoskrnl/ke/i386/trap.s > trunk/reactos/ntoskrnl/ke/i386/traphdlr.c > > Modified: trunk/reactos/include/reactos/mc/bugcodes.mc > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… > > ============================================================================== > --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] > (original) > +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Sat > Oct 11 13:15:10 2014 > @@ -1128,7 +1128,7 @@ > Run a system diagnostic utility supplied by your hardware manufacturer. > In particular, run a memory check, and check for faulty or mismatched > memory. Try changing video adapters. > - > + > Disable or remove any newly installed hardware and drivers. Disable or > remove any newly installed software. If you need to use Safe Mode to > remove or disable components, restart your computer, press F8 to select > @@ -1322,7 +1322,7 @@ > SymbolicName=DRIVER_CORRUPTED_EXPOOL > Language=English > A device driver has pool. > - > + > Check to make sure any new hardware or software is properly installed. > If this is a new installation, ask your hardware or software manufacturer > for any ReactOS updates you might need. > @@ -1478,7 +1478,7 @@ > must not contain such items. Usually this is memory being freed. This > is usually caused by a device driver that has not cleaned up properly > before freeing memory. > - > + > If Parameter1 == 1, an attempt was made to queue an executive worker item > with a usermode execution routine. > . > @@ -1570,3 +1570,11 @@ > Language=English > An attempt was made to execute to non-executable memory. > . > + > +MessageId=0x139 > +Severity=Success > +Facility=System > +SymbolicName=KERNEL_SECURITY_CHECK_FAILURE > +Language=English > +A critical kernel security check failed. > +. > > Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… > > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Sat Oct 11 > 13:15:10 2014 > @@ -59,9 +59,11 @@ > idt _KiTrap11, INT_32_DPL0 /* INT 11: Align Check Exception > (#AC) */ > idt _KiTrap0F, INT_32_DPL0 /* INT 12: Machine Check Exception > (#MC)*/ > idt _KiTrap0F, INT_32_DPL0 /* INT 13: SIMD FPU Exception (#XF) > */ > -REPEAT 22 > -idt _KiTrap0F, INT_32_DPL0 /* INT 14-29: UNDEFINED INTERRUPTS > */ > +REPEAT 21 > +idt _KiTrap0F, INT_32_DPL0 /* INT 14-28: UNDEFINED INTERRUPTS > */ > ENDR > +idt _KiRaiseSecurityCheckFailure, INT_32_DPL3 > + /* INT 29: Handler for __fastfail > */ > idt _KiGetTickCount, INT_32_DPL3 /* INT 2A: Get Tick Count Handler > */ > idt _KiCallbackReturn, INT_32_DPL3 /* INT 2B: User-Mode Callback Return > */ > idt _KiRaiseAssertion, INT_32_DPL3 /* INT 2C: Debug Assertion Handler > */ > @@ -113,6 +115,7 @@ > TRAP_ENTRY KiTrap10, KI_PUSH_FAKE_ERROR_CODE > TRAP_ENTRY KiTrap11, KI_PUSH_FAKE_ERROR_CODE > TRAP_ENTRY KiTrap13, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiRaiseSecurityCheckFailure, KI_PUSH_FAKE_ERROR_CODE > TRAP_ENTRY KiGetTickCount, KI_PUSH_FAKE_ERROR_CODE > TRAP_ENTRY KiCallbackReturn, KI_PUSH_FAKE_ERROR_CODE > TRAP_ENTRY KiRaiseAssertion, KI_PUSH_FAKE_ERROR_CODE > > 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] Sat Oct 11 > 13:15:10 2014 > @@ -1462,6 +1462,46 @@ > > VOID > FASTCALL > +KiRaiseSecurityCheckFailureHandler(IN PKTRAP_FRAME TrapFrame) > +{ > + /* Save trap frame */ > + KiEnterTrap(TrapFrame); > + > + /* Decrement EIP to point to the INT29 instruction (2 bytes, not 1 > like INT3) */ > + TrapFrame->Eip -= 2; > + > + /* Check if this is a user trap */ > + if (KiUserTrap(TrapFrame)) > + { > + /* Dispatch exception to user mode */ > + KiDispatchException1Args(STATUS_STACK_BUFFER_OVERRUN, > + TrapFrame->Eip, > + TrapFrame->Ecx, > + TrapFrame); > + } > + else > + { > + EXCEPTION_RECORD ExceptionRecord; > + > + /* Bugcheck the system */ > + ExceptionRecord.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; > + ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; > + ExceptionRecord.ExceptionRecord = NULL; > + ExceptionRecord.ExceptionAddress = (PVOID)TrapFrame->Eip; > + ExceptionRecord.NumberParameters = 1; > + ExceptionRecord.ExceptionInformation[0] = TrapFrame->Ecx; > + > + KeBugCheckWithTf(KERNEL_SECURITY_CHECK_FAILURE, > + TrapFrame->Ecx, > + (ULONG_PTR)TrapFrame, > + (ULONG_PTR)&ExceptionRecord, > + 0, > + TrapFrame); > + } > +} > + > +VOID > +FASTCALL > KiGetTickCountHandler(IN PKTRAP_FRAME TrapFrame) > { > UNIMPLEMENTED_DBGBREAK(); > > >

10 years, 11 months

2
2
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 64591: [NTOSKRNL] - Improve the random address base code in MiCreatePebOrTeb to actually make sense and not rely on retarded hacks implicitly hardcoding the PEB size in pages into the ra...

by Alex Ionescu

Where't the unit test proving your 'improved' algorithm matches XP SP2/SRV03 SP1? Best regards, Alex Ionescu On Tue, Oct 7, 2014 at 5:31 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Wed Oct 8 00:31:35 2014 > New Revision: 64591 > > URL: http://svn.reactos.org/svn/reactos?rev=64591&view=rev > Log: > [NTOSKRNL] > - Improve the random address base code in MiCreatePebOrTeb to actually > make sense and not rely on retarded hacks implicitly hardcoding the PEB > size in pages into the random value generation. > > Modified: > trunk/reactos/ntoskrnl/mm/ARM3/procsup.c > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Wed Oct 8 > 00:31:35 2014 > @@ -48,13 +48,13 @@ > NTAPI > MiCreatePebOrTeb(IN PEPROCESS Process, > IN ULONG Size, > - OUT PULONG_PTR Base) > + OUT PULONG_PTR BaseAddress) > { > PETHREAD Thread = PsGetCurrentThread(); > PMMVAD_LONG Vad; > NTSTATUS Status; > - ULONG RandomCoeff; > - ULONG_PTR StartAddress, EndAddress; > + ULONG_PTR HighestAddress, RandomBase; > + ULONG AlignedSize; > LARGE_INTEGER CurrentTime; > TABLE_SEARCH_RESULT Result = TableFoundNode; > PMMADDRESS_NODE Parent; > @@ -83,25 +83,30 @@ > /* Check if this is a PEB creation */ > if (Size == sizeof(PEB)) > { > - /* Start at the highest valid address */ > - StartAddress = (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1; > - > - /* Select the random coefficient */ > + /* Create a random value to select one page in a 64k region */ > KeQueryTickCount(&CurrentTime); > - CurrentTime.LowPart &= ((64 * _1KB) >> PAGE_SHIFT) - 1; > - if (CurrentTime.LowPart <= 1) CurrentTime.LowPart = 2; > - RandomCoeff = CurrentTime.LowPart << PAGE_SHIFT; > - > - /* Select the highest valid address minus the random coefficient > */ > - StartAddress -= RandomCoeff; > - EndAddress = StartAddress + ROUND_TO_PAGES(Size) - 1; > + CurrentTime.LowPart &= (_64K / PAGE_SIZE) - 1; > + > + /* Calculate a random base address */ > + RandomBase = (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1; > + RandomBase -= CurrentTime.LowPart << PAGE_SHIFT; > + > + /* Make sure the base address is not too high */ > + AlignedSize = ROUND_TO_PAGES(Size); > + if ((RandomBase + AlignedSize) > > (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1) > + { > + RandomBase = (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1 - > AlignedSize; > + } > + > + /* Calculate the highest allowed address */ > + HighestAddress = RandomBase + AlignedSize - 1; > > /* Try to find something below the random upper margin */ > Result = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), > - EndAddress, > + HighestAddress, > PAGE_SIZE, > &Process->VadRoot, > - Base, > + BaseAddress, > &Parent); > } > > @@ -113,7 +118,7 @@ > > (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, > PAGE_SIZE, > &Process->VadRoot, > - Base, > + BaseAddress, > &Parent); > /* Bail out, if still nothing free was found */ > if (Result == TableFoundNode) > @@ -125,12 +130,12 @@ > } > > /* Validate that it came from the VAD ranges */ > - ASSERT(*Base >= (ULONG_PTR)MI_LOWEST_VAD_ADDRESS); > + ASSERT(*BaseAddress >= (ULONG_PTR)MI_LOWEST_VAD_ADDRESS); > > /* Build the rest of the VAD now */ > - Vad->StartingVpn = (*Base) >> PAGE_SHIFT; > - Vad->EndingVpn = ((*Base) + Size - 1) >> PAGE_SHIFT; > - Vad->u3.Secured.StartVpn = *Base; > + Vad->StartingVpn = (*BaseAddress) >> PAGE_SHIFT; > + Vad->EndingVpn = ((*BaseAddress) + Size - 1) >> PAGE_SHIFT; > + Vad->u3.Secured.StartVpn = *BaseAddress; > Vad->u3.Secured.EndVpn = (Vad->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE > - 1); > Vad->u1.Parent = NULL; > > @@ -146,7 +151,7 @@ > Vad->ControlArea = NULL; // For Memory-Area hack > Vad->FirstPrototypePte = NULL; > DPRINT("VAD: %p\n", Vad); > - DPRINT("Allocated PEB/TEB at: 0x%p for %16s\n", *Base, > Process->ImageFileName); > + DPRINT("Allocated PEB/TEB at: 0x%p for %16s\n", *BaseAddress, > Process->ImageFileName); > MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); > > /* Release the working set */ > > >

10 years, 11 months

2
2
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 64537: [NTOS/MM] - Do not assert in case of stack overflow, just let the page fault handler raise STATUS_STACK_OVERFLOW

by Alex Ionescu

The ASSERT is there because of the missing functionality. Please see the comment just above. Best regards, Alex Ionescu On Sun, Oct 5, 2014 at 2:57 AM, <jgardou(a)svn.reactos.org> wrote: > Author: jgardou > Date: Sun Oct 5 09:57:02 2014 > New Revision: 64537 > > URL: http://svn.reactos.org/svn/reactos?rev=64537&view=rev > Log: > [NTOS/MM] > - Do not assert in case of stack overflow, just let the page fault > handler raise STATUS_STACK_OVERFLOW > > Modified: > trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c > > 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] Sun Oct 5 > 09:57:02 2014 > @@ -82,7 +82,6 @@ > { > /* We don't -- Windows would try to make this guard page valid > now */ > DPRINT1("Close to our death...\n"); > - ASSERT(FALSE); > return STATUS_STACK_OVERFLOW; > } > > > >

10 years, 11 months

2
4
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 64593: [NTOSKRNL] Modify MiCreatePebOrTeb to use MiInsertVadEx instead of doing everything "by hand". No, this does not "change Windows behavior". The TEB creation works exactly as befor...

by Alex Ionescu

Why do you think PEB creation cannot fail in the first place? Best regards, Alex Ionescu On Tue, Oct 7, 2014 at 5:31 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Wed Oct 8 00:31:49 2014 > New Revision: 64593 > > URL: http://svn.reactos.org/svn/reactos?rev=64593&view=rev > Log: > [NTOSKRNL] > Modify MiCreatePebOrTeb to use MiInsertVadEx instead of doing everything > "by hand". No, this does not "change Windows behavior". The TEB creation > works exactly as before, and the only difference in the PEB creation is > that if the first attempt fails, we will no longer try again from the top > of the address space. But since this cannot fail in the first place, at > least not due to the VA range not being free, another attempt would be > pointless anyway! > > Modified: > trunk/reactos/ntoskrnl/mm/ARM3/procsup.c > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Wed Oct 8 > 00:31:49 2014 > @@ -50,14 +50,11 @@ > IN ULONG Size, > OUT PULONG_PTR BaseAddress) > { > - PETHREAD Thread = PsGetCurrentThread(); > PMMVAD_LONG Vad; > NTSTATUS Status; > ULONG_PTR HighestAddress, RandomBase; > ULONG AlignedSize; > LARGE_INTEGER CurrentTime; > - TABLE_SEARCH_RESULT Result = TableFoundNode; > - PMMADDRESS_NODE Parent; > > /* Allocate a VAD */ > Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); > @@ -70,6 +67,7 @@ > Vad->u.VadFlags.PrivateMemory = TRUE; > Vad->u.VadFlags.Protection = MM_READWRITE; > Vad->u.VadFlags.NoChange = TRUE; > + Vad->u1.Parent = NULL; > > /* Setup the secondary flags to make it a secured, writable, long VAD > */ > Vad->u2.LongFlags2 = 0; > @@ -77,10 +75,11 @@ > Vad->u2.VadFlags2.LongVad = TRUE; > Vad->u2.VadFlags2.ReadOnly = FALSE; > > - /* Lock the process address space */ > - KeAcquireGuardedMutex(&Process->AddressCreationLock); > + Vad->ControlArea = NULL; // For Memory-Area hack > + Vad->FirstPrototypePte = NULL; > > /* Check if this is a PEB creation */ > + ASSERT(sizeof(TEB) != sizeof(PEB)); > if (Size == sizeof(PEB)) > { > /* Create a random value to select one page in a 64k region */ > @@ -100,68 +99,27 @@ > > /* Calculate the highest allowed address */ > HighestAddress = RandomBase + AlignedSize - 1; > - > - /* Try to find something below the random upper margin */ > - Result = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), > - HighestAddress, > - PAGE_SIZE, > - &Process->VadRoot, > - BaseAddress, > - &Parent); > - } > - > - /* Check for success. TableFoundNode means nothing free. */ > - if (Result == TableFoundNode) > - { > - /* For TEBs, or if a PEB location couldn't be found, scan the VAD > root */ > - Result = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), > - > (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, > - PAGE_SIZE, > - &Process->VadRoot, > - BaseAddress, > - &Parent); > - /* Bail out, if still nothing free was found */ > - if (Result == TableFoundNode) > - { > - KeReleaseGuardedMutex(&Process->AddressCreationLock); > - ExFreePoolWithTag(Vad, 'ldaV'); > - return STATUS_NO_MEMORY; > - } > - } > - > - /* Validate that it came from the VAD ranges */ > - ASSERT(*BaseAddress >= (ULONG_PTR)MI_LOWEST_VAD_ADDRESS); > - > - /* Build the rest of the VAD now */ > - Vad->StartingVpn = (*BaseAddress) >> PAGE_SHIFT; > - Vad->EndingVpn = ((*BaseAddress) + Size - 1) >> PAGE_SHIFT; > - Vad->u3.Secured.StartVpn = *BaseAddress; > - Vad->u3.Secured.EndVpn = (Vad->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE > - 1); > - Vad->u1.Parent = NULL; > - > - /* FIXME: Should setup VAD bitmap */ > - Status = STATUS_SUCCESS; > - > - /* Pretend as if we own the working set */ > - MiLockProcessWorkingSetUnsafe(Process, Thread); > - > - /* Insert the VAD */ > - ASSERT(Vad->EndingVpn >= Vad->StartingVpn); > - Process->VadRoot.NodeHint = Vad; > - Vad->ControlArea = NULL; // For Memory-Area hack > - Vad->FirstPrototypePte = NULL; > - DPRINT("VAD: %p\n", Vad); > - DPRINT("Allocated PEB/TEB at: 0x%p for %16s\n", *BaseAddress, > Process->ImageFileName); > - MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); > - > - /* Release the working set */ > - MiUnlockProcessWorkingSetUnsafe(Process, Thread); > - > - /* Release the address space lock */ > - KeReleaseGuardedMutex(&Process->AddressCreationLock); > - > - /* Return the status */ > - return Status; > + } > + else > + { > + HighestAddress = (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; > + } > + > + *BaseAddress = 0; > + Status = MiInsertVadEx((PMMVAD)Vad, > + BaseAddress, > + BYTES_TO_PAGES(Size), > + HighestAddress, > + PAGE_SIZE, > + MEM_TOP_DOWN); > + if (!NT_SUCCESS(Status)) > + { > + ExFreePoolWithTag(Vad, 'ldaV'); > + return STATUS_NO_MEMORY; > + } > + > + /* Success */ > + return STATUS_SUCCESS; > } > > VOID > > >

10 years, 11 months

3
2
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 64595: [NTOSKRNL] Fix a status code

by Alex Ionescu

Would be great to have JIRA issues associated to such fixes as well as a test proving the change is correct. For example, are you merely assuming that you should return "STATUS_NO_MEMORY", or do you know for a fact that STATUS_CONFLICTING_ADDRESSES is the wrong code here? Best regards, Alex Ionescu On Wed, Oct 8, 2014 at 12:38 AM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Wed Oct 8 07:38:56 2014 > New Revision: 64595 > > URL: http://svn.reactos.org/svn/reactos?rev=64595&view=rev > Log: > [NTOSKRNL] > Fix a status code > > Modified: > trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Wed Oct 8 > 07:38:56 2014 > @@ -261,7 +261,7 @@ > { > DPRINT1("Not enough free space to insert this VAD node!\n"); > KeReleaseGuardedMutex(&CurrentProcess->AddressCreationLock); > - return STATUS_CONFLICTING_ADDRESSES; > + return STATUS_NO_MEMORY; > } > > ASSERT(StartingAddress != 0); > > >

10 years, 11 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 64589: [NTOSKRNL] Implement MiInsertVadEx, replacing duplicated code from NtAllocateVirtualMemory and MiMapViewOfDataSection

by Alex Ionescu

I think it would be really great that instead of combining functions together for "removing code duplication" and not even bothering to think why there's a reason why the code was duplicated, people would work on actual improvements like Jerome or Pierre, instead of re-factoring code that works just to make it 'simpler'. Especially since this introduced a few bugs which had to be later fixed. There's a million bugs in ReactOS, including in the memory manager, so fixing those seems to make more sense than refactoring. Just my 2 cents. Best regards, Alex Ionescu On Tue, Oct 7, 2014 at 5:31 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Wed Oct 8 00:31:17 2014 > New Revision: 64589 > > URL: http://svn.reactos.org/svn/reactos?rev=64589&view=rev > Log: > [NTOSKRNL] > Implement MiInsertVadEx, replacing duplicated code from > NtAllocateVirtualMemory and MiMapViewOfDataSection > > Modified: > trunk/reactos/ntoskrnl/mm/ARM3/miarm.h > trunk/reactos/ntoskrnl/mm/ARM3/section.c > trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c > trunk/reactos/ntoskrnl/mm/ARM3/virtual.c > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Oct 8 > 00:31:17 2014 > @@ -2144,6 +2144,16 @@ > IN PEPROCESS Process > ); > > +NTSTATUS > +NTAPI > +MiInsertVadEx( > + _Inout_ PMMVAD Vad, > + _In_ ULONG_PTR *BaseAddress, > + _In_ SIZE_T ViewSize, > + _In_ ULONG_PTR HighestAddress, > + _In_ ULONG_PTR Alignment, > + _In_ ULONG AllocationType); > + > VOID > NTAPI > MiInsertBasedSection( > > 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] Wed Oct 8 > 00:31:17 2014 > @@ -1252,9 +1252,7 @@ > IN ULONG AllocationType) > { > PMMVAD_LONG Vad; > - PETHREAD Thread = PsGetCurrentThread(); > - PMMSUPPORT AddressSpace; > - ULONG_PTR StartAddress, EndingAddress; > + ULONG_PTR StartAddress; > ULONG_PTR ViewSizeInPages; > PSUBSECTION Subsection; > PSEGMENT Segment; > @@ -1263,8 +1261,6 @@ > ULONG QuotaCharge = 0, QuotaExcess = 0; > PMMPTE PointerPte, LastPte; > MMPTE TempPte; > - PMMADDRESS_NODE Parent; > - TABLE_SEARCH_RESULT Result; > DPRINT("Mapping ARM3 data section\n"); > > /* Get the segment for this section */ > @@ -1361,6 +1357,7 @@ > > /* Write all the data required in the VAD for handling a fault */ > Vad->ControlArea = ControlArea; > + Vad->u.VadFlags.CommitCharge = 0; > Vad->u.VadFlags.Protection = ProtectionMask; > Vad->u2.VadFlags2.FileOffset = (ULONG)(SectionOffset->QuadPart >> 16); > Vad->u2.VadFlags2.Inherit = (InheritDisposition == ViewShare); > @@ -1437,100 +1434,23 @@ > StartAddress = 0; > } > > - /* Lock the address space and make sure the process is alive */ > - AddressSpace = MmGetCurrentAddressSpace(); > - MmLockAddressSpace(AddressSpace); > - if (Process->VmDeleted) > - { > - MmUnlockAddressSpace(AddressSpace); > - ExFreePoolWithTag(Vad, 'ldaV'); > - DPRINT1("The process is dying\n"); > - return STATUS_PROCESS_IS_TERMINATING; > - } > - > - /* Did the caller specify an address? */ > - if (StartAddress == 0) > - { > - /* ARM3 does not support these flags yet */ > - ASSERT(Process->VmTopDown == 0); > - ASSERT(ZeroBits == 0); > - > - /* Which way should we search? */ > - if (AllocationType & MEM_TOP_DOWN) > - { > - /* No, find an address top-down */ > - Result = MiFindEmptyAddressRangeDownTree(*ViewSize, > - > (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, > - _64K, > - &Process->VadRoot, > - &StartAddress, > - &Parent); > - } > - else > - { > - /* No, find an address bottom-up */ > - Result = MiFindEmptyAddressRangeInTree(*ViewSize, > - _64K, > - &Process->VadRoot, > - &Parent, > - &StartAddress); > - } > - > - /* Check if we found a suitable location */ > - if (Result == TableFoundNode) > - { > - DPRINT1("Not enough free space to insert this section!\n"); > - MmUnlockAddressSpace(AddressSpace); > - MiDereferenceControlArea(ControlArea); > - ExFreePoolWithTag(Vad, 'ldaV'); > - return STATUS_CONFLICTING_ADDRESSES; > - } > - > - /* Get the ending address, which is the last piece we need for > the VAD */ > - EndingAddress = StartAddress + (ViewSizeInPages * PAGE_SIZE) - 1; > - } > - else > - { > - /* Get the ending address, which is the last piece we need for > the VAD */ > - EndingAddress = StartAddress + (ViewSizeInPages * PAGE_SIZE) - 1; > - > - /* Make sure it doesn't conflict with an existing allocation */ > - Result = MiCheckForConflictingNode(StartAddress >> PAGE_SHIFT, > - EndingAddress >> PAGE_SHIFT, > - &Process->VadRoot, > - &Parent); > - if (Result == TableFoundNode) > - { > - DPRINT1("Conflict with SEC_BASED or manually based > section!\n"); > - MmUnlockAddressSpace(AddressSpace); > - MiDereferenceControlArea(ControlArea); > - ExFreePoolWithTag(Vad, 'ldaV'); > - return STATUS_CONFLICTING_ADDRESSES; > - } > - } > - > - /* Now set the VAD address */ > - Vad->StartingVpn = StartAddress >> PAGE_SHIFT; > - Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; > - > - /* Pretend as if we own the working set */ > - MiLockProcessWorkingSetUnsafe(Process, Thread); > - > /* Insert the VAD */ > - Process->VadRoot.NodeHint = Vad; > - MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); > - > - /* Release the working set */ > - MiUnlockProcessWorkingSetUnsafe(Process, Thread); > - > - /* Unlock the address space */ > - MmUnlockAddressSpace(AddressSpace); > + Status = MiInsertVadEx((PMMVAD)Vad, > + &StartAddress, > + ViewSizeInPages * PAGE_SIZE, > + MAXULONG_PTR >> ZeroBits, > + MM_VIRTMEM_GRANULARITY, > + AllocationType); > + if (!NT_SUCCESS(Status)) > + { > + return Status; > + } > > /* Windows stores this for accounting purposes, do so as well */ > if (!Segment->u2.FirstMappedVa) Segment->u2.FirstMappedVa = > (PVOID)StartAddress; > > /* Finally, let the caller know where, and for what size, the view > was mapped */ > - *ViewSize = (ULONG_PTR)EndingAddress - (ULONG_PTR)StartAddress + 1; > + *ViewSize = ViewSizeInPages * PAGE_SIZE; > *BaseAddress = (PVOID)StartAddress; > DPRINT("Start and region: 0x%p, 0x%p\n", *BaseAddress, *ViewSize); > return STATUS_SUCCESS; > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Wed Oct 8 > 00:31:17 2014 > @@ -193,6 +193,138 @@ > MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); > } > > +NTSTATUS > +NTAPI > +MiInsertVadEx( > + _Inout_ PMMVAD Vad, > + _In_ ULONG_PTR *BaseAddress, > + _In_ SIZE_T ViewSize, > + _In_ ULONG_PTR HighestAddress, > + _In_ ULONG_PTR Alignment, > + _In_ ULONG AllocationType) > +{ > + ULONG_PTR StartingAddress, EndingAddress; > + PEPROCESS CurrentProcess; > + PETHREAD CurrentThread; > + TABLE_SEARCH_RESULT Result; > + PMMADDRESS_NODE Parent; > + > + /* Align the view size to pages */ > + ViewSize = ALIGN_UP_BY(ViewSize, PAGE_SIZE); > + > + /* Get the current process */ > + CurrentProcess = PsGetCurrentProcess(); > + > + /* Acquire the address creation lock and make sure the process is > alive */ > + KeAcquireGuardedMutex(&CurrentProcess->AddressCreationLock); > + if (CurrentProcess->VmDeleted) > + { > + KeReleaseGuardedMutex(&CurrentProcess->AddressCreationLock); > + DPRINT1("The process is dying\n"); > + return STATUS_PROCESS_IS_TERMINATING; > + } > + > + /* Did the caller specify an address? */ > + if (*BaseAddress == 0) > + { > + /* Make sure HighestAddress is not too large */ > + HighestAddress = min(HighestAddress, > (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS); > + > + /* Which way should we search? */ > + if ((AllocationType & MEM_TOP_DOWN) || CurrentProcess->VmTopDown) > + { > + /* Find an address top-down */ > + Result = MiFindEmptyAddressRangeDownTree(ViewSize, > + HighestAddress, > + Alignment, > + > &CurrentProcess->VadRoot, > + &StartingAddress, > + &Parent); > + } > + else > + { > + /* Find an address bottom-up */ > + Result = MiFindEmptyAddressRangeInTree(ViewSize, > + Alignment, > + > &CurrentProcess->VadRoot, > + &Parent, > + &StartingAddress); > + } > + > + /* Get the ending address, which is the last piece we need for > the VAD */ > + EndingAddress = StartingAddress + ViewSize - 1; > + > + /* Check if we found a suitable location */ > + if ((Result == TableFoundNode) || (EndingAddress > > HighestAddress)) > + { > + DPRINT1("Not enough free space to insert this VAD node!\n"); > + KeReleaseGuardedMutex(&CurrentProcess->AddressCreationLock); > + return STATUS_CONFLICTING_ADDRESSES; > + } > + > + ASSERT(StartingAddress != 0); > + ASSERT(StartingAddress < (ULONG_PTR)HighestAddress); > + ASSERT(EndingAddress > StartingAddress); > + } > + else > + { > + /* Calculate the starting and ending address */ > + StartingAddress = ALIGN_DOWN_BY(*BaseAddress, Alignment); > + EndingAddress = StartingAddress + ViewSize - 1; > + > + /* Make sure it doesn't conflict with an existing allocation */ > + Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, > + EndingAddress >> PAGE_SHIFT, > + &CurrentProcess->VadRoot, > + &Parent); > + if (Result == TableFoundNode) > + { > + DPRINT1("Given address conflicts with existing node\n"); > + KeReleaseGuardedMutex(&CurrentProcess->AddressCreationLock); > + return STATUS_CONFLICTING_ADDRESSES; > + } > + } > + > + /* Now set the VAD address */ > + Vad->StartingVpn = StartingAddress >> PAGE_SHIFT; > + Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; > + > + /* Check if the VAD is to be secured */ > + if (Vad->u2.VadFlags2.OneSecured) > + { > + /* This *must* be a long VAD! */ > + ASSERT(Vad->u2.VadFlags2.LongVad); > + > + /* Yeah this is retarded, I didn't invent it! */ > + ((PMMVAD_LONG)Vad)->u3.Secured.StartVpn = StartingAddress; > + ((PMMVAD_LONG)Vad)->u3.Secured.EndVpn = EndingAddress; > + } > + > + /* Lock the working set */ > + CurrentThread = PsGetCurrentThread(); > + MiLockProcessWorkingSetUnsafe(CurrentProcess, CurrentThread); > + > + /* Insert the VAD */ > + CurrentProcess->VadRoot.NodeHint = Vad; > + MiInsertNode(&CurrentProcess->VadRoot, (PVOID)Vad, Parent, Result); > + > + /* Release the working set */ > + MiUnlockProcessWorkingSetUnsafe(CurrentProcess, CurrentThread); > + > + /* Update the process' virtual size, and peak virtual size */ > + CurrentProcess->VirtualSize += ViewSize; > + if (CurrentProcess->VirtualSize > CurrentProcess->PeakVirtualSize) > + { > + CurrentProcess->PeakVirtualSize = CurrentProcess->VirtualSize; > + } > + > + /* Unlock the address space */ > + KeReleaseGuardedMutex(&CurrentProcess->AddressCreationLock); > + > + *BaseAddress = StartingAddress; > + return STATUS_SUCCESS; > +} > + > VOID > NTAPI > MiInsertBasedSection(IN PSECTION Section) > > 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] Wed Oct 8 > 00:31:17 2014 > @@ -4304,12 +4304,12 @@ > { > PEPROCESS Process; > PMEMORY_AREA MemoryArea; > - PFN_NUMBER PageCount; > PMMVAD Vad = NULL, FoundVad; > NTSTATUS Status; > PMMSUPPORT AddressSpace; > PVOID PBaseAddress; > - ULONG_PTR PRegionSize, StartingAddress, EndingAddress, HighestAddress; > + ULONG_PTR PRegionSize, StartingAddress, EndingAddress; > + ULONG_PTR HighestAddress = (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; > PEPROCESS CurrentProcess = PsGetCurrentProcess(); > KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); > PETHREAD CurrentThread = PsGetCurrentThread(); > @@ -4319,7 +4319,6 @@ > MMPTE TempPte; > PMMPTE PointerPte, PointerPde, LastPte; > TABLE_SEARCH_RESULT Result; > - PMMADDRESS_NODE Parent; > PAGED_CODE(); > > /* Check for valid Zero bits */ > @@ -4544,7 +4543,6 @@ > // This is a blind commit, all we need is the region size > // > PRegionSize = ROUND_TO_PAGES(PRegionSize); > - PageCount = BYTES_TO_PAGES(PRegionSize); > EndingAddress = 0; > StartingAddress = 0; > > @@ -4563,13 +4561,6 @@ > goto FailPathNoLock; > } > } > - else > - { > - // > - // Use the highest VAD address as maximum > - // > - HighestAddress = (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; > - } > } > else > { > @@ -4579,8 +4570,8 @@ > // fall based on the aligned address and the passed in region > size > // > EndingAddress = ((ULONG_PTR)PBaseAddress + PRegionSize - 1) | > (PAGE_SIZE - 1); > - StartingAddress = ROUND_DOWN((ULONG_PTR)PBaseAddress, _64K); > - PageCount = BYTES_TO_PAGES(EndingAddress - StartingAddress); > + PRegionSize = EndingAddress + 1 - > ROUND_DOWN((ULONG_PTR)PBaseAddress, _64K); > + StartingAddress = (ULONG_PTR)PBaseAddress; > } > > // > @@ -4594,7 +4585,7 @@ > goto FailPathNoLock; > } > > - Vad->u.LongFlags = 0; > + RtlZeroMemory(Vad, sizeof(MMVAD_LONG)); > if (AllocationType & MEM_COMMIT) Vad->u.VadFlags.MemCommit = 1; > Vad->u.VadFlags.Protection = ProtectionMask; > Vad->u.VadFlags.PrivateMemory = 1; > @@ -4602,124 +4593,24 @@ > Vad->ControlArea = NULL; // For Memory-Area hack > > // > - // Lock the address space and make sure the process isn't already > dead > - // > - AddressSpace = MmGetCurrentAddressSpace(); > - MmLockAddressSpace(AddressSpace); > - if (Process->VmDeleted) > - { > - Status = STATUS_PROCESS_IS_TERMINATING; > - goto FailPath; > - } > - > - // > - // Did we have a base address? If no, find a valid address that > is 64KB > - // aligned in the VAD tree. Otherwise, make sure that the address > range > - // which was passed in isn't already conflicting with an existing > address > - // range. > - // > - if (!PBaseAddress) > - { > - /* Which way should we search? */ > - if ((AllocationType & MEM_TOP_DOWN) || Process->VmTopDown) > - { > - /* Find an address top-down */ > - Result = MiFindEmptyAddressRangeDownTree(PRegionSize, > - HighestAddress, > - _64K, > - > &Process->VadRoot, > - &StartingAddress, > - &Parent); > - } > - else > - { > - /* Find an address bottom-up */ > - Result = MiFindEmptyAddressRangeInTree(PRegionSize, > - _64K, > - &Process->VadRoot, > - &Parent, > - &StartingAddress); > - } > - > - if (Result == TableFoundNode) > - { > - Status = STATUS_NO_MEMORY; > - goto FailPath; > - } > - > - // > - // Now we know where the allocation ends. Make sure it > doesn't end up > - // somewhere in kernel mode. > - // > - ASSERT(StartingAddress != 0); > - ASSERT(StartingAddress < (ULONG_PTR)MM_HIGHEST_USER_ADDRESS); > - EndingAddress = (StartingAddress + PRegionSize - 1) | > (PAGE_SIZE - 1); > - ASSERT(EndingAddress > StartingAddress); > - if (EndingAddress > HighestAddress) > - { > - Status = STATUS_NO_MEMORY; > - goto FailPath; > - } > - } > - else > - { > - /* Make sure it doesn't conflict with an existing allocation > */ > - Result = MiCheckForConflictingNode(StartingAddress >> > PAGE_SHIFT, > - EndingAddress >> > PAGE_SHIFT, > - &Process->VadRoot, > - &Parent); > - if (Result == TableFoundNode) > - { > - // > - // The address specified is in conflict! > - // > - Status = STATUS_CONFLICTING_ADDRESSES; > - goto FailPath; > - } > - } > - > - // > - // Write out the VAD fields for this allocation > - // > - Vad->StartingVpn = StartingAddress >> PAGE_SHIFT; > - Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; > - > - // > - // FIXME: Should setup VAD bitmap > - // > - Status = STATUS_SUCCESS; > - > - // > - // Lock the working set and insert the VAD into the process VAD > tree > - // > - MiLockProcessWorkingSetUnsafe(Process, CurrentThread); > - Process->VadRoot.NodeHint = Vad; > - MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); > - MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); > - > - // > - // Make sure the actual region size is at least as big as the > - // requested region size and update the value > - // > - ASSERT(PRegionSize <= (EndingAddress + 1 - StartingAddress)); > - PRegionSize = (EndingAddress + 1 - StartingAddress); > - > - // > - // Update the virtual size of the process, and if this is now the > highest > - // virtual size we have ever seen, update the peak virtual size > to reflect > - // this. > - // > - Process->VirtualSize += PRegionSize; > - if (Process->VirtualSize > Process->PeakVirtualSize) > - { > - Process->PeakVirtualSize = Process->VirtualSize; > - } > - > - // > - // Release address space and detach and dereference the target > process if > + // Insert the VAD > + // > + Status = MiInsertVadEx(Vad, > + &StartingAddress, > + PRegionSize, > + HighestAddress, > + MM_VIRTMEM_GRANULARITY, > + AllocationType); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("Failed to insert the VAD!\n"); > + goto FailPathNoLock; > + } > + > + // > + // Detach and dereference the target process if > // it was different from the current process > // > - MmUnlockAddressSpace(AddressSpace); > if (Attached) KeUnstackDetachProcess(&ApcState); > if (ProcessHandle != NtCurrentProcess()) > ObDereferenceObject(Process); > > > >

10 years, 11 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [aandrejevic] 64656: [FAST486] Update the copyright year. Implement the first batch of FPU instructions. These are still experimental.

by Timo Kreuzer

Seriously? Am 11.10.2014 01:07, schrieb aandrejevic(a)svn.reactos.org: > + /* Count the leading zeros */ > + while (!(Data->Mantissa & (1 << (63 - LeadingZeros)))) LeadingZeros++;

10 years, 11 months

1
0
0 0

Re: [ros-dev] EPIC: ReactOS@Samsung Galaxy S III mini

by Love Nystrom

@Timo Yes of course.. It was a fleeting idea it would be cute to run on a computer 5x10x1 cm. ;-) I didn't realize the ARM branch was in poor condition though. But it stands to reason.. Porting Intel assembly to ARM assembly and considering all the archiectural differences is/would be a gargantuan job. Keep up the good work.. Love On 2014-10-09 19.00, ros-dev-request(a)reactos.org wrote: > Guys, I don't want to spoil your hopes, but native ARM support is far > away from being usable. It doesn't even compile. There is no native ARM! > And there won't be for ages, until we have a really knowledged ARM > hacker, with the kernel and hardware knowledge of Alex, who would invest > a huge lot of time into getting it up and running. So unless we want to > hire someone fulltime for at least half a year, who would probably like > to be paid a normal software engineer wage, which we cannot afford, we > won't have ARM support anytime soon. > x64 is a much more reasonable task, mostly lacking stuff in Mm. > And that will still require a lot of work. > And I have more than enough other things to do

10 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 64617: [NTFS] - Add a directory entry into FCB which will be a copy of the $FILE_NAME attribute of the FILE record. Though, it won't contain the name itself (in the FCB instead), so k...

by Thomas Faber

On 2014-10-08 21:32, pschweitzer(a)svn.reactos.org wrote: > + MftRecord = ExAllocatePoolWithTag(NonPagedPool, > + Vcb->NtfsInfo.BytesPerFileRecord, > + TAG_NTFS); > + if (MftRecord == NULL) > + { > + return NULL; > + } > + > + if (!NT_SUCCESS(ReadFileRecord(Vcb, NTFS_FILE_ROOT, MftRecord))) > + { > + return NULL; > + } > + > + FileName = GetFileNameFromRecord(MftRecord); > + if (!FileName) > + { > + return NULL; > + } > > Fcb = NtfsCreateFCB(L"\\", Vcb); > - > -// memset(Fcb->entry.Filename, ' ', 11); > - > -// Fcb->Entry.DataLengthL = Vcb->CdInfo.RootSize; > -// Fcb->Entry.ExtentLocationL = Vcb->CdInfo.RootStart; > -// Fcb->Entry.FileFlags = 0x02; // FILE_ATTRIBUTE_DIRECTORY; > + if (!Fcb) > + { > + return NULL; > + } These failure cases look like they're all at least leaking MftRecord :p

10 years, 11 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 64525: [KERNEL32] - Always allocate a guard page at the bottom of the stack. It doesn't depend on it being reserved or committed, it just has to be here.

by Alex Ionescu

Hi, This code changes Windows behavior. Best regards, Alex Ionescu On Sat, Oct 4, 2014 at 1:25 PM, <jgardou(a)svn.reactos.org> wrote: > Author: jgardou > Date: Sat Oct 4 20:25:35 2014 > New Revision: 64525 > > URL: http://svn.reactos.org/svn/reactos?rev=64525&view=rev > Log: > [KERNEL32] > - Always allocate a guard page at the bottom of the stack. > It doesn't depend on it being reserved or committed, it just has to be > here. > > Modified: > trunk/reactos/dll/win32/kernel32/client/utils.c > > Modified: trunk/reactos/dll/win32/kernel32/client/utils.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] > (original) > +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sat > Oct 4 20:25:35 2014 > @@ -358,7 +358,6 @@ > NTSTATUS Status; > PIMAGE_NT_HEADERS Headers; > ULONG_PTR Stack; > - BOOLEAN UseGuard; > ULONG PageSize, Dummy, AllocationGranularity; > SIZE_T StackReserveHeader, StackCommitHeader, GuardPageSize, > GuaranteedStackCommit; > DPRINT("BaseCreateStack (hProcess: %p, Max: %lx, Current: %lx)\n", > @@ -426,18 +425,6 @@ > /* Update the Stack Position */ > Stack += StackReserve - StackCommit; > > - /* Check if we will need a guard page */ > - if (StackReserve > StackCommit) > - { > - Stack -= PageSize; > - StackCommit += PageSize; > - UseGuard = TRUE; > - } > - else > - { > - UseGuard = FALSE; > - } > - > /* Allocate memory for the stack */ > Status = NtAllocateVirtualMemory(hProcess, > (PVOID*)&Stack, > @@ -457,25 +444,21 @@ > InitialTeb->StackLimit = (PVOID)Stack; > > /* Create a guard page */ > - if (UseGuard) > - { > - /* Set the guard page */ > - GuardPageSize = PAGE_SIZE; > - Status = NtProtectVirtualMemory(hProcess, > - (PVOID*)&Stack, > - &GuardPageSize, > - PAGE_GUARD | PAGE_READWRITE, > - &Dummy); > - if (!NT_SUCCESS(Status)) > - { > - DPRINT1("Failure to set guard page\n"); > - return Status; > - } > - > - /* Update the Stack Limit keeping in mind the Guard Page */ > - InitialTeb->StackLimit = > (PVOID)((ULONG_PTR)InitialTeb->StackLimit + > - GuardPageSize); > - } > + GuardPageSize = PageSize; > + Status = NtProtectVirtualMemory(hProcess, > + (PVOID*)&Stack, > + &GuardPageSize, > + PAGE_GUARD | PAGE_READWRITE, > + &Dummy); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("Failure to set guard page\n"); > + return Status; > + } > + > + /* Update the Stack Limit keeping in mind the Guard Page */ > + InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit + > + GuardPageSize); > > /* We are done! */ > return STATUS_SUCCESS; > > >

10 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 64449: [DLLEXPORT_TEST] Fix a typo

by Thomas Faber

On 2014-10-02 09:30, tkreuzer(a)svn.reactos.org wrote: > -add_executable(dllimport_test > +add_library(dllimport_test > dllimport_framedyn.cpp) Isn't the point of this test to check for linker errors?

10 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 64396: [NTOS/CM] - Add NtQueryKey(KeyNameInformation) implementation. CORE-8581 #resolve

by Timo Kreuzer

A few remarks: - There should be only one SEH, not for performance, but since the KeyNameInfo->NameLength = 0; needs to be in SEH as well - The function duplicates a lot of code from CmpConstructName, possibly even incomplete - There was already an implementation in the kernel-fun branch Unrelated to your code, just something I spotted in that file: - CmpQueryKeyData cannot be wrapped in SEH (it would cause reference leaks on exception), but is wrapped in SEH in CmEnumerateKey - CmpQueryKeyData does not use SEH, but is called with user mode pointers from CmQueryKey Timo Am 29.09.2014 18:27, schrieb jgardou(a)svn.reactos.org: > Author: jgardou > Date: Mon Sep 29 16:27:16 2014 > New Revision: 64396 > > URL: http://svn.reactos.org/svn/reactos?rev=64396&view=rev > Log: > [NTOS/CM] > - Add NtQueryKey(KeyNameInformation) implementation. > CORE-8581 #resolve > >

10 years, 11 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 64392: [NDK] - Fix KEY_NAME_INFORMATION structure

by Timo Kreuzer

Wow, ... IMO we should autogenerate a header for usermode stuff from XDK, instead of using NDK. Am 29.09.2014 15:32, schrieb jgardou(a)svn.reactos.org: > Author: jgardou > Date: Mon Sep 29 13:32:44 2014 > New Revision: 64392 > > URL: http://svn.reactos.org/svn/reactos?rev=64392&view=rev > Log: > [NDK] > - Fix KEY_NAME_INFORMATION structure > > Modified: > trunk/reactos/include/ndk/cmtypes.h > > Modified: trunk/reactos/include/ndk/cmtypes.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmtypes.h?rev=… > ============================================================================== > --- trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] (original) > +++ trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] Mon Sep 29 13:32:44 2014 > @@ -296,6 +296,7 @@ > > typedef struct _KEY_NAME_INFORMATION > { > + ULONG NameLength; > WCHAR Name[1]; > } KEY_NAME_INFORMATION, *PKEY_NAME_INFORMATION; > > > >

10 years, 11 months

1
0
0 0

EPIC: ReactOS@Samsung Galaxy S III mini

by Alexander Rechitskiy

10 years, 11 months

3
2
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 64311: [WIN32K] - Simplify IntRemoveWindowProp - Complain loudly if a NULL list entry sneaks into a window property list. CORE-8562

by Jérôme Gardou

Uh oh, seems like I screwed up these two. The spec2def part of this commit should indeed belong to r64312. Le 26/09/2014 14:43, jgardou(a)svn.reactos.org a écrit : > Author: jgardou > Date: Fri Sep 26 12:43:12 2014 > New Revision: 64311 > > URL: http://svn.reactos.org/svn/reactos?rev=64311&view=rev > Log: > [WIN32K] > - Simplify IntRemoveWindowProp > - Complain loudly if a NULL list entry sneaks into a window property list. > CORE-8562 > > Modified: > trunk/reactos/tools/spec2def/spec2def.c > trunk/reactos/win32ss/user/ntuser/prop.c > > Modified: trunk/reactos/tools/spec2def/spec2def.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… > ============================================================================== > --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) > +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Fri Sep 26 12:43:12 2014 > @@ -38,6 +38,7 @@ > typedef int (*PFNOUTLINE)(FILE *, EXPORT *); > int gbMSComp = 0; > int gbImportLib = 0; > +int gbTracing = 0; > int giArch = ARCH_X86; > char *pszArchString = "i386"; > char *pszArchString2; > @@ -52,6 +53,9 @@ > FL_STUB = 2, > FL_NONAME = 4, > FL_ORDINAL = 8, > + FL_NORELAY = 16, > + FL_RET64 = 32, > + FL_REGISTER = 64, > }; > > enum > @@ -161,52 +165,126 @@ > OutputHeader_stub(FILE *file) > { > fprintf(file, "/* This file is autogenerated, do not edit. */\n\n" > - "#include <stubs.h>\n\n"); > + "#include <stubs.h>\n"); > + > + if (gbTracing) > + { > + fprintf(file, "#include <wine/debug.h>\n"); > + fprintf(file, "#include <inttypes.h>\n"); > + fprintf(file, "WINE_DECLARE_DEBUG_CHANNEL(relay);\n"); > + } > + > + fprintf(file, "\n"); > } > > int > OutputLine_stub(FILE *file, EXPORT *pexp) > { > int i; > + int bRelay = 0; > + int bInPrototype; > > if (pexp->nCallingConvention != CC_STUB && > - (pexp->uFlags & FL_STUB) == 0) return 0; > - > - fprintf(file, "int "); > - if ((giArch == ARCH_X86) && > - pexp->nCallingConvention == CC_STDCALL) > - { > - fprintf(file, "__stdcall "); > - } > - > - /* Check for C++ */ > - if (pexp->strName.buf[0] == '?') > - { > - fprintf(file, "stub_function%d(", pexp->nNumber); > + (pexp->uFlags & FL_STUB) == 0) > + { > + /* Only relay trace stdcall C functions */ > + if (!gbTracing || (pexp->nCallingConvention != CC_STDCALL) > + || (pexp->uFlags & FL_NORELAY) > + || (pexp->strName.buf[0] == '?')) > + { > + return 0; > + } > + bRelay = 1; > + } > + > + /* Declare the "real" function */ > + if (bRelay) > + { > + fprintf(file, "extern "); > + bInPrototype = 1; > + } > + > + do > + { > + if (pexp->uFlags & FL_REGISTER) > + { > + /* FIXME: Not sure this is right */ > + fprintf(file, "void "); > + } > + else if (pexp->uFlags & FL_RET64) > + { > + fprintf(file, "__int64 "); > + } > + else > + { > + fprintf(file, "int "); > + } > + > + if ((giArch == ARCH_X86) && > + pexp->nCallingConvention == CC_STDCALL) > + { > + fprintf(file, "__stdcall "); > + } > + > + /* Check for C++ */ > + if (pexp->strName.buf[0] == '?') > + { > + fprintf(file, "stub_function%d(", pexp->nNumber); > + } > + else > + { > + if (!bRelay || bInPrototype) > + fprintf(file, "%.*s(", pexp->strName.len, pexp->strName.buf); > + else > + fprintf(file, "$relaytrace$%.*s(", pexp->strName.len, pexp->strName.buf); > + } > + > + for (i = 0; i < pexp->nArgCount; i++) > + { > + if (i != 0) fprintf(file, ", "); > + switch (pexp->anArgs[i]) > + { > + case ARG_LONG: fprintf(file, "long"); break; > + case ARG_PTR: fprintf(file, "void*"); break; > + case ARG_STR: fprintf(file, "char*"); break; > + case ARG_WSTR: fprintf(file, "wchar_t*"); break; > + case ARG_DBL: fprintf(file, "double"); break; > + case ARG_INT64 : fprintf(file, "__int64"); break; > + case ARG_INT128 : fprintf(file, "__int128"); break; > + case ARG_FLOAT: fprintf(file, "float"); break; > + } > + fprintf(file, " a%d", i); > + } > + > + if (bInPrototype) > + { > + fprintf(file, ");\n\n"); > + } > + } while (bInPrototype--); > + > + if (!bRelay) > + { > + fprintf(file, ")\n{\n\tDbgPrint(\"WARNING: calling stub %.*s(", > + pexp->strName.len, pexp->strName.buf); > } > else > { > - fprintf(file, "%.*s(", pexp->strName.len, pexp->strName.buf); > - } > - > - for (i = 0; i < pexp->nArgCount; i++) > - { > - if (i != 0) fprintf(file, ", "); > - switch (pexp->anArgs[i]) > - { > - case ARG_LONG: fprintf(file, "long"); break; > - case ARG_PTR: fprintf(file, "void*"); break; > - case ARG_STR: fprintf(file, "char*"); break; > - case ARG_WSTR: fprintf(file, "wchar_t*"); break; > - case ARG_DBL: > - case ARG_INT64 : fprintf(file, "__int64"); break; > - case ARG_INT128 : fprintf(file, "__int128"); break; > - case ARG_FLOAT: fprintf(file, "float"); break; > - } > - fprintf(file, " a%d", i); > - } > - fprintf(file, ")\n{\n\tDbgPrint(\"WARNING: calling stub %.*s(", > - pexp->strName.len, pexp->strName.buf); > + fprintf(file, ")\n{\n"); > + if (pexp->uFlags & FL_REGISTER) > + { > + /* No return value */ > + } > + else if (pexp->uFlags & FL_RET64) > + { > + fprintf(file, "\t__int64 retval;\n"); > + } > + else > + { > + fprintf(file, "\tint retval;\n"); > + } > + fprintf(file, "\tif(TRACE_ON(relay))\n\t\tDPRINTF(\"%s: %.*s(", > + pszDllName, pexp->strName.len, pexp->strName.buf); > + } > > for (i = 0; i < pexp->nArgCount; i++) > { > @@ -246,8 +324,42 @@ > { > fprintf(file, "\t__wine_spec_unimplemented_stub(\"%s\", __FUNCTION__);\n", pszDllName); > } > - > - fprintf(file, "\treturn 0;\n}\n\n"); > + else if (bRelay) > + { > + if (pexp->uFlags & FL_REGISTER) > + { > + fprintf(file,"\t"); > + } > + else > + { > + fprintf(file, "\tretval = "); > + } > + fprintf(file, "%.*s(", pexp->strName.len, pexp->strName.buf); > + > + for (i = 0; i < pexp->nArgCount; i++) > + { > + if (i != 0) fprintf(file, ", "); > + fprintf(file, "a%d", i); > + } > + fprintf(file, ");\n"); > + } > + > + if (!bRelay) > + fprintf(file, "\treturn 0;\n}\n\n"); > + else if ((pexp->uFlags & FL_REGISTER) == 0) > + { > + if (pexp->uFlags & FL_RET64) > + { > + fprintf(file, "\tif(TRACE_ON(relay))\n\t\t(\"%s: %.*s: retval = %%\"PRIx64\"\\n\", retval);\n", > + pszDllName, pexp->strName.len, pexp->strName.buf); > + } > + else > + { > + fprintf(file, "\tTRACE_(relay)(\"%.*s: retval = 0x%%lx\\n\", retval);\n", > + pexp->strName.len, pexp->strName.buf); > + } > + fprintf(file, "\treturn retval;\n}\n\n"); > + } > > return 1; > } > @@ -458,11 +570,18 @@ > /* C++ stubs are forwarded to C stubs */ > fprintf(fileDest, "=stub_function%d", pexp->nNumber); > } > + else if (gbTracing && ((pexp->uFlags & FL_NORELAY) == 0) && (pexp->nCallingConvention == CC_STDCALL) && > + (pexp->strName.buf[0] != '?')) > + { > + /* Redirect it to the relay-tracing trampoline */ > + fprintf(fileDest, "=$relaytrace$%.*s", pexp->strName.len, pexp->strName.buf); > + } > } > > void > OutputLine_def_GCC(FILE *fileDest, EXPORT *pexp) > { > + int bTracing = 0; > /* Print the function name, with decoration for export libs */ > PrintName(fileDest, pexp, &pexp->strName, gbImportLib); > DbgPrint("Generating def line for '%.*s'\n", pexp->strName.len, pexp->strName.buf); > @@ -482,6 +601,19 @@ > { > /* C++ stubs are forwarded to C stubs */ > fprintf(fileDest, "=stub_function%d", pexp->nNumber); > + } > + else if (gbTracing && ((pexp->uFlags & FL_NORELAY) == 0) && (pexp->nCallingConvention == CC_STDCALL) && > + (pexp->strName.buf[0] != '?')) > + { > + /* Redirect it to the relay-tracing trampoline */ > + char buf[256]; > + STRING strTarget; > + fprintf(fileDest, "="); > + sprintf(buf, "$relaytrace$%.*s", pexp->strName.len, pexp->strName.buf); > + strTarget.buf = buf; > + strTarget.len = pexp->strName.len + 12; > + PrintName(fileDest, pexp, &strTarget, 1); > + bTracing = 1; > } > > /* Special handling for stdcall and fastcall */ > @@ -500,7 +632,7 @@ > fprintf(fileDest, "==%.*s", pexp->strName.len, pexp->strName.buf); > } > } > - else if (!pexp->strTarget.buf) > + else if ((!pexp->strTarget.buf) && !(bTracing)) > { > /* Write a forwarder to the actual decorated symbol */ > fprintf(fileDest, "="); > @@ -694,11 +826,17 @@ > { > exp.uFlags |= FL_STUB; > } > - else if (CompareToken(pc, "-norelay") || > - CompareToken(pc, "-register") || > - CompareToken(pc, "-ret64")) > - { > - /* silently ignore these */ > + else if (CompareToken(pc, "-norelay")) > + { > + exp.uFlags |= FL_NORELAY; > + } > + else if (CompareToken(pc, "-ret64")) > + { > + exp.uFlags |= FL_RET64; > + } > + else if (CompareToken(pc, "-register")) > + { > + exp.uFlags |= FL_REGISTER; > } > else > { > @@ -862,6 +1000,9 @@ > fprintf(stderr, "error: line %d, additional tokens after ')'\n", nLine); > return -17; > } > + > + /* Don't relay-trace forwarded functions */ > + exp.uFlags |= FL_NORELAY; > } > else > { > @@ -886,16 +1027,17 @@ > > void usage(void) > { > - printf("syntax: spec2pdef [<options> ...] <spec file>\n" > + printf("syntax: spec2def [<options> ...] <spec file>\n" > "Possible options:\n" > - " -h --help prints this screen\n" > - " -l=<file> generates an asm lib stub\n" > - " -d=<file> generates a def file\n" > - " -s=<file> generates a stub file\n" > - " --ms msvc compatibility\n" > - " -n=<name> name of the dll\n" > - " --implib generate a def file for an import library\n" > - " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n"); > + " -h --help prints this screen\n" > + " -l=<file> generates an asm lib stub\n" > + " -d=<file> generates a def file\n" > + " -s=<file> generates a stub file\n" > + " --ms msvc compatibility\n" > + " -n=<name> name of the dll\n" > + " --implib generate a def file for an import library\n" > + " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n" > + " --with-tracing generates wine-like \"+relay\" trace trampolines. (necessitates -s)\n"); > } > > int main(int argc, char *argv[]) > @@ -945,6 +1087,15 @@ > { > gbMSComp = 1; > } > + else if ((strcasecmp(argv[i], "--with-tracing") == 0)) > + { > + if (!pszStubFileName) > + { > + fprintf(stderr, "Error: cannot use --with-tracing without -s option.\n"); > + return -1; > + } > + gbTracing = 1; > + } > else if (argv[i][1] == 'a' && argv[i][2] == '=') > { > pszArchString = argv[i] + 3; > > Modified: trunk/reactos/win32ss/user/ntuser/prop.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… > ============================================================================== > --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) > +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Fri Sep 26 12:43:12 2014 > @@ -19,9 +19,18 @@ > int i; > > ListEntry = Window->PropListHead.Flink; > + > for (i = 0; i < Window->PropListItems; i++ ) > { > Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); > + > + if (ListEntry == NULL) > + { > + ERR("Corrupted (or uninitialized?) property list for window %p. Prop count %d. Atom %d.\n", > + Window, Window->PropListItems, Atom); > + return NULL; > + } > + > if (Property->Atom == Atom) > { > return(Property); > @@ -84,16 +93,14 @@ > { > PLIST_ENTRY ListEntry; > PPROPERTY Property; > - int i, Count = Window->PropListItems; > - > - ListEntry = Window->PropListHead.Flink; > - for (i = 0; i < Count; i++ ) > - { > - Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); > - ListEntry = ListEntry->Flink; > - RemoveEntryList(&Property->PropListEntry); > - UserHeapFree(Property); > - Window->PropListItems--; > + > + while (!IsListEmpty(&Window->PropListHead)) > + { > + ListEntry = Window->PropListHead.Flink; > + Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); > + RemoveEntryList(&Property->PropListEntry); > + UserHeapFree(Property); > + Window->PropListItems--; > } > return; > } > >

10 years, 11 months

1
0
0 0

Re: [ros-dev] Video of our ReactOS presentation online

by Daniel Reimer

As PDF in Foxit Reader. But yeah ^^ Von Samsung Mobile gesendet <div>-------- Ursprüngliche Nachricht --------</div><div>Von: Hermès BÉLUSCA - MAÏTO <hermes.belusca(a)sfr.fr> </div><div>Datum:24.09.2014 20:13 (GMT+01:00) </div><div>An: 'ReactOS Development List' <ros-dev(a)reactos.org> </div><div>Cc: </div><div>Betreff: Re: [ros-dev] Video of our ReactOS presentation online </div><div> </div>Also, were you actually running your powerpoint presentation *in* ROS ?! :D De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Hermès BÉLUSCA - MAÏTO Envoyé : mercredi 24 septembre 2014 19:37 À : 'ReactOS Development List' Objet : Re: [ros-dev] Video of our ReactOS presentation online Wow !! 43 minuten of video ^^ H. De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Colin Finck Envoyé : mardi 23 septembre 2014 22:17 À : ros-dev(a)reactos.org Objet : [ros-dev] Video of our ReactOS presentation online Hi all, As the question usually arises: The video of Daniel's and my ReactOS presentation at Kieler Linux Tage is online: http://youtu.be/oQsKzW_Rx3k Do whatever you want with it ;) This is probably the first ever ReactOS presentation held using ReactOS itself! And it worked like a charm! We also met an author of German news site heise.de there, who wants to publish an article about the current state ReactOS soon. Cheers, Colin

10 years, 11 months

1
0
0 0

Status Meeting (September 2014)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place 25th of September, 19:00 UTC. If there are any proposals regarding moving the meeting date/time - please send them today. IRC service will only be started shortly before the meeting. Your participation passwords and server address will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. If someone still is not getting passwords sent before a meeting - please email Pierre before the meeting started to get one. Please send agenda proposals to me before the meeting, so that we can start with a proposed agenda. Proposed agenda points so far: - Agile missing in Jira (looks like an incompatible version) - new on-demand builders (Clang, VC, x64, arm, branch, patch) - testbot on a win 2003 machine Let me know if any of those is already resolved. Thanks! Regards, Aleksey Bragin

10 years, 11 months

2
1
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 64176: [GDI32] - Fix up values got from win32k in GetOutlineTextMetrics and do not fail if the provided buffersize is only sizeof(OUTLINETEXTMETRICW). CORE-8507 #resolve

by Timo Kreuzer

Am 17.09.2014 11:54, schrieb jgardou(a)svn.reactos.org: > Author: jgardou > Date: Wed Sep 17 09:54:14 2014 > New Revision: 64176 > > URL: http://svn.reactos.org/svn/reactos?rev=64176&view=rev > Log: > [GDI32] > - Fix up values got from win32k in GetOutlineTextMetrics and do not fail if the provided buffersize is only sizeof(OUTLINETEXTMETRICW). > CORE-8507 #resolve > > Modified: > trunk/reactos/win32ss/gdi/gdi32/objects/font.c > > Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… > ============================================================================== > --- trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] (original) > +++ trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] Wed Sep 17 09:54:14 2014 > @@ -9,8 +9,19 @@ > > #include <precomp.h> > > +#include <math.h> > + > #define NDEBUG > #include <debug.h> > + > +/* Rounds a floating point number to integer. The world-to-viewport > + * transformation process is done in floating point internally. This function > + * is then used to round these coordinates to integer values. > + */ > +static __inline INT GDI_ROUND(FLOAT val) > +{ > + return (int)floor(val + 0.5); > +} roundf() is the appropriate function here. The older MS crt headers don't have the *round*() functions, but VS 2013 headers seem to have them (according MSDN). I propose adding them inside some #ifdef, instead of reimplementing them in different places. For the other functions: strange coding style. Is this taken from wine?

10 years, 12 months

2
1
0 0

Topics for next meeting

by Timo Kreuzer

Hi, I'd like to propose some topics for the next meeting: - Agile missing in Jira (looks like an incompatible version) - new on-demand builders (Clang, VC, x64, arm, branch, patch) - testbot on a win 2003 machine Timo

10 years, 12 months

3
2
0 0

Re: [ros-dev] [ros-diffs] [akhaldi] 64151: [XDK][DDK] * Handle the rest of cases about the order of pragma and symbol declaration.

by Jérôme Gardou

This breaks KDGDB compilation (and most probable KDCOM too if one would want to compile it using GCC) drivers/base/kdgdb/gdb_send.c:77: référence indéfinie vers « __imp__KdDebuggerNotPresent » Le 14/09/2014 17:49, akhaldi(a)svn.reactos.org a écrit : > Author: akhaldi > Date: Sun Sep 14 15:49:35 2014 > New Revision: 64151 > > URL: http://svn.reactos.org/svn/reactos?rev=64151&view=rev > Log: > [XDK][DDK] > * Handle the rest of cases about the order of pragma and symbol declaration. > > Modified: > trunk/reactos/include/ddk/ntddk.h > trunk/reactos/include/ddk/ntifs.h > trunk/reactos/include/ddk/wdm.h > trunk/reactos/include/xdk/fsrtlfuncs.h > trunk/reactos/include/xdk/haltypes.h > trunk/reactos/include/xdk/kdfuncs.h > trunk/reactos/include/xdk/ketypes.h > trunk/reactos/include/xdk/mmtypes.h > trunk/reactos/include/xdk/ntifs.template.h > > Modified: trunk/reactos/include/ddk/ntddk.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=64… > ============================================================================== > --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) > +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Sun Sep 14 15:49:35 2014 > @@ -1670,8 +1670,8 @@ > extern HAL_DISPATCH HalDispatchTable; > #define HALDISPATCH (&HalDispatchTable) > #else > +__CREATE_NTOS_DATA_IMPORT_ALIAS(HalDispatchTable) > extern PHAL_DISPATCH HalDispatchTable; > -__CREATE_NTOS_DATA_IMPORT_ALIAS(HalDispatchTable) > #define HALDISPATCH HalDispatchTable > #endif > > > Modified: trunk/reactos/include/ddk/ntifs.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=64… > ============================================================================== > --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) > +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Sep 14 15:49:35 2014 > @@ -8396,8 +8396,8 @@ > extern const UCHAR * const FsRtlLegalAnsiCharacterArray; > #define LEGAL_ANSI_CHARACTER_ARRAY FsRtlLegalAnsiCharacterArray > #else > +__CREATE_NTOS_DATA_IMPORT_ALIAS(FsRtlLegalAnsiCharacterArray) > extern const UCHAR * const *FsRtlLegalAnsiCharacterArray; > -__CREATE_NTOS_DATA_IMPORT_ALIAS(FsRtlLegalAnsiCharacterArray) > #define LEGAL_ANSI_CHARACTER_ARRAY (*FsRtlLegalAnsiCharacterArray) > #endif > > @@ -10993,8 +10993,8 @@ > extern PUSHORT NlsOemLeadByteInfo; > #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo > #else > +__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsOemLeadByteInfo) > extern PUSHORT *NlsOemLeadByteInfo; > -__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsOemLeadByteInfo) > #define NLS_OEM_LEAD_BYTE_INFO (*NlsOemLeadByteInfo) > #endif > > > Modified: trunk/reactos/include/ddk/wdm.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6415… > ============================================================================== > --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) > +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Sep 14 15:49:35 2014 > @@ -1661,8 +1661,8 @@ > #elif (NTDDI_VERSION >= NTDDI_WINXP) > extern NTSYSAPI CCHAR KeNumberProcessors; > #else > +__CREATE_NTOS_DATA_IMPORT_ALIAS(KeNumberProcessors) > extern PCCHAR KeNumberProcessors; > -__CREATE_NTOS_DATA_IMPORT_ALIAS(KeNumberProcessors) > #endif > > > @@ -1815,8 +1815,8 @@ > } MM_SYSTEMSIZE; > > #ifndef _NTSYSTEM_ > +__CREATE_NTOS_DATA_IMPORT_ALIAS(Mm64BitPhysicalAddress) > extern PBOOLEAN Mm64BitPhysicalAddress; > -__CREATE_NTOS_DATA_IMPORT_ALIAS(Mm64BitPhysicalAddress) > #endif > extern NTKERNELAPI PVOID MmBadPointer; > > > Modified: trunk/reactos/include/xdk/fsrtlfuncs.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/fsrtlfuncs.h?r… > ============================================================================== > --- trunk/reactos/include/xdk/fsrtlfuncs.h [iso-8859-1] (original) > +++ trunk/reactos/include/xdk/fsrtlfuncs.h [iso-8859-1] Sun Sep 14 15:49:35 2014 > @@ -1584,8 +1584,8 @@ > extern const UCHAR * const FsRtlLegalAnsiCharacterArray; > #define LEGAL_ANSI_CHARACTER_ARRAY FsRtlLegalAnsiCharacterArray > #else > +__CREATE_NTOS_DATA_IMPORT_ALIAS(FsRtlLegalAnsiCharacterArray) > extern const UCHAR * const *FsRtlLegalAnsiCharacterArray; > -__CREATE_NTOS_DATA_IMPORT_ALIAS(FsRtlLegalAnsiCharacterArray) > #define LEGAL_ANSI_CHARACTER_ARRAY (*FsRtlLegalAnsiCharacterArray) > #endif > > > Modified: trunk/reactos/include/xdk/haltypes.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/haltypes.h?rev… > ============================================================================== > --- trunk/reactos/include/xdk/haltypes.h [iso-8859-1] (original) > +++ trunk/reactos/include/xdk/haltypes.h [iso-8859-1] Sun Sep 14 15:49:35 2014 > @@ -273,8 +273,8 @@ > extern HAL_DISPATCH HalDispatchTable; > #define HALDISPATCH (&HalDispatchTable) > #else > +__CREATE_NTOS_DATA_IMPORT_ALIAS(HalDispatchTable) > extern PHAL_DISPATCH HalDispatchTable; > -__CREATE_NTOS_DATA_IMPORT_ALIAS(HalDispatchTable) > #define HALDISPATCH HalDispatchTable > #endif > > > Modified: trunk/reactos/include/xdk/kdfuncs.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kdfuncs.h?rev=… > ============================================================================== > --- trunk/reactos/include/xdk/kdfuncs.h [iso-8859-1] (original) > +++ trunk/reactos/include/xdk/kdfuncs.h [iso-8859-1] Sun Sep 14 15:49:35 2014 > @@ -125,11 +125,11 @@ > extern BOOLEAN KdDebuggerNotPresent; > #define KD_DEBUGGER_NOT_PRESENT KdDebuggerNotPresent > #else > +__CREATE_NTOS_DATA_IMPORT_ALIAS(KdDebuggerEnabled) > extern BOOLEAN *KdDebuggerEnabled; > -__CREATE_NTOS_DATA_IMPORT_ALIAS(KdDebuggerEnabled) > #define KD_DEBUGGER_ENABLED (*KdDebuggerEnabled) > +__CREATE_NTOS_DATA_IMPORT_ALIAS(KdDebuggerNotPresent) > extern BOOLEAN *KdDebuggerNotPresent; > -__CREATE_NTOS_DATA_IMPORT_ALIAS(KdDebuggerNotPresent) > #define KD_DEBUGGER_NOT_PRESENT (*KdDebuggerNotPresent) > #endif > > > Modified: trunk/reactos/include/xdk/ketypes.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… > ============================================================================== > --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) > +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Sun Sep 14 15:49:35 2014 > @@ -986,8 +986,8 @@ > #elif (NTDDI_VERSION >= NTDDI_WINXP) > extern NTSYSAPI CCHAR KeNumberProcessors; > #else > +__CREATE_NTOS_DATA_IMPORT_ALIAS(KeNumberProcessors) > extern PCCHAR KeNumberProcessors; > -__CREATE_NTOS_DATA_IMPORT_ALIAS(KeNumberProcessors) > #endif > > $endif (_WDMDDK_) > > Modified: trunk/reactos/include/xdk/mmtypes.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/mmtypes.h?rev=… > ============================================================================== > --- trunk/reactos/include/xdk/mmtypes.h [iso-8859-1] (original) > +++ trunk/reactos/include/xdk/mmtypes.h [iso-8859-1] Sun Sep 14 15:49:35 2014 > @@ -148,8 +148,8 @@ > } MM_SYSTEMSIZE; > > #ifndef _NTSYSTEM_ > +__CREATE_NTOS_DATA_IMPORT_ALIAS(Mm64BitPhysicalAddress) > extern PBOOLEAN Mm64BitPhysicalAddress; > -__CREATE_NTOS_DATA_IMPORT_ALIAS(Mm64BitPhysicalAddress) > #endif > extern NTKERNELAPI PVOID MmBadPointer; > > > Modified: trunk/reactos/include/xdk/ntifs.template.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntifs.template… > ============================================================================== > --- trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] (original) > +++ trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] Sun Sep 14 15:49:35 2014 > @@ -1128,8 +1128,8 @@ > extern PUSHORT NlsOemLeadByteInfo; > #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo > #else > +__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsOemLeadByteInfo) > extern PUSHORT *NlsOemLeadByteInfo; > -__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsOemLeadByteInfo) > #define NLS_OEM_LEAD_BYTE_INFO (*NlsOemLeadByteInfo) > #endif > > >

11 years

1
0
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 64121: [KDGDB] - introduce KDGDB, a KDCOM-like DLL, wrapping the KD protocol and the GDB remote protocol together. It is not fully functional, but for now it permits source-level debuggin...

by Timo Kreuzer

Awesome stuff! Am 11.09.2014 22:55, schrieb jgardou(a)svn.reactos.org: > Author: jgardou > Date: Thu Sep 11 20:55:42 2014 > New Revision: 64121 > > URL: http://svn.reactos.org/svn/reactos?rev=64121&view=rev > Log: > [KDGDB] > - introduce KDGDB, a KDCOM-like DLL, wrapping the KD protocol and the GDB remote protocol together. > It is not fully functional, but for now it permits source-level debugging in some modules. More will be added as I feel the need and find the time to work a bit more on it. (That is, unless an angel comes and resume the work) > To use it, set GDB and _WINKD_ to TRUE in your CMakeCache.txt. Using separate debug symbols is also a good idea. > >

11 years

5
11
0 0

Re: [ros-dev] [ros-diffs] [jgardou] 64127: [KDGDB] - Add a callback mechanism permitting to "simulate" KD send <-> receive loop without having to actually communicate to GDB - Use that to update the program counter when con...

by Timo Kreuzer

while(1); is not really a good solution. It should be something that is visible in GDB. But I fear that a KeBugCheck() won't work here, since it will rely on a working KD connection. Maybe a KD_ASSERT() macro, that calls KdAssert() on failure or something, resets the GDB connection somehow, issues a debug print and then halts. Am 12.09.2014 22:23, schrieb jgardou(a)svn.reactos.org: > Author: jgardou > Date: Fri Sep 12 20:23:08 2014 > New Revision: 64127 > > URL: http://svn.reactos.org/svn/reactos?rev=64127&view=rev > Log: > [KDGDB] > - Add a callback mechanism permitting to "simulate" KD send <-> receive loop without having to actually communicate to GDB > - Use that to update the program counter when cont'ing a breakpoint > Now cont'ing an assertion failure is possible, since we actually get beyond the int 3 instruction > > Modified: > trunk/reactos/drivers/base/kdgdb/gdb_input.c > trunk/reactos/drivers/base/kdgdb/kdgdb.h > trunk/reactos/drivers/base/kdgdb/kdpacket.c > > +) > +{ > + DBGKD_MANIPULATE_STATE64* State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; > + > + /* We just confirm that all went well */ > + if ((PacketType != PACKET_TYPE_KD_STATE_MANIPULATE) > + || (State->ApiNumber != DbgKdSetContextApi) > + || (State->ReturnStatus != STATUS_SUCCESS)) > + { > + /* Should we bugcheck ? */ > + while (1); > + } > +} > + > +static > +KDSTATUS > +SetContext( > + _Out_ DBGKD_MANIPULATE_STATE64* State, > + _Out_ PSTRING MessageData, > + _Out_ PULONG MessageLength, > + _Inout_ PKD_CONTEXT KdContext, > + _In_opt_ KDP_MANIPULATESTATE_HANDLER ManipulateStateHandler > +) > +{ > + State->ApiNumber = DbgKdSetContextApi; > + State->Processor = CurrentStateChange.Processor; > + State->ReturnStatus = STATUS_SUCCESS; > + State->ProcessorLevel = CurrentStateChange.ProcessorLevel; > + MessageData->Length = sizeof(CurrentContext); > + > + if (MessageData->MaximumLength < sizeof(CurrentContext)) > + { > + while (1); > + } > + >

11 years

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev