- Ros-dev - ReactOS.org

Website Downtime on Monday
by Colin Finck 17 Oct '15

17 Oct '15

Hi all, I will upgrade the Web Server Operating System upcoming Monday (2015/10/19) around 11:00 CEST. During this time, the ReactOS Website and related services will be temporarily offline. As always, I will try to keep the downtime low :) Cheers, Colin

1 0

Re: [ros-dev] [ros-diffs] [sginsberg] 69528: [NTOS] Add super-complicated handling of global pages to KeFlushCurrentTb (pretty much the same code which has been in HalpFlushTLB for the past ~6 years). This should be all tha...
by Alex Ionescu 17 Oct '15

17 Oct '15

This is wrong, wrong, wrong. 1) The feature needs to be enabled on all processors, not just one. There's a reason for that loop. 2) ValidKernelPte/Pde being marked global will make ALL kernel pages global. This is probably not what you want. Best regards, Alex Ionescu On Wed, Oct 14, 2015 at 12:33 PM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Wed Oct 14 19:33:35 2015 > New Revision: 69528 > > URL: http://svn.reactos.org/svn/reactos?rev=69528&view=rev > Log: > [NTOS] > Add super-complicated handling of global pages to KeFlushCurrentTb (pretty > much the same code which has been in HalpFlushTLB for the past ~6 years). > This should be all that is required to make this feature work (everything > else being in place already), and *seems* to work fine but is disabled > under a switch until tested thoroughly. > > Global pages, an important optimization that allows for not flushing the > whole x86 TLB every time CR3 is changed (typically on context switch to a > new process, or during process attach/detach), relies on us doing extra > work whenever we do alter a global page. This is likely where any bugs will > have to be flushed out! > > Fixup Ki386EnableGlobalPage while we are at it -- disable/restore > interrupts properly, and verify PGE-bit isn't set (nothing should have > touched it before this routine, which is responsible for initializing it, > so we shouldn't have to disable it). Fix, but disable, the CPU-sync spin as > well as there should be no particular reason to do this for PGE-enabling > during initialization (no other processor will be messing with PTEs at this > stage, as compared to a call to KeFlushEntireTb). > > Everyone, repeat after me: Global pages are awesome! > > Modified: > trunk/reactos/ntoskrnl/include/ntoskrnl.h > trunk/reactos/ntoskrnl/ke/i386/cpu.c > trunk/reactos/ntoskrnl/ke/i386/patpge.c > trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c > > Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… > > ============================================================================== > --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Wed Oct 14 > 19:33:35 2015 > @@ -98,6 +98,14 @@ > #define ASSERT NT_ASSERT > #endif > > + > +// > +// Switch for enabling global page support > +// > + > +//#define _GLOBAL_PAGES_ARE_AWESOME_ > + > + > /* Internal Headers */ > #include "internal/ntoskrnl.h" > #include "config.h" > > Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… > > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Oct 14 > 19:33:35 2015 > @@ -878,8 +878,37 @@ > NTAPI > KeFlushCurrentTb(VOID) > { > + > +#if !defined(_GLOBAL_PAGES_ARE_AWESOME_) > + > /* Flush the TLB by resetting CR3 */ > __writecr3(__readcr3()); > + > +#else > + > + /* Check if global pages are enabled */ > + if (KeFeatureBits & KF_GLOBAL_PAGE) > + { > + ULONG Cr4; > + > + /* Disable PGE */ > + Cr4 = __readcr4() & ~CR4_PGE; > + __writecr4(Cr4); > + > + /* Flush everything */ > + __writecr3(__readcr3()); > + > + /* Re-enable PGE */ > + __writecr4(Cr4 | CR4_PGE); > + } > + else > + { > + /* No global pages, resetting CR3 is enough */ > + __writecr3(__readcr3()); > + } > + > +#endif > + > } > > VOID > > Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… > > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] Wed Oct 14 > 19:33:35 2015 > @@ -17,40 +17,41 @@ > > /* FUNCTIONS > *****************************************************************/ > > +INIT_SECTION > ULONG_PTR > NTAPI > -INIT_FUNCTION > Ki386EnableGlobalPage(IN ULONG_PTR Context) > { > - PLONG Count = (PLONG)Context; > - ULONG Cr4, Cr3; > + //PLONG Count; > +#if defined(_GLOBAL_PAGES_ARE_AWESOME_) > + ULONG Cr4; > +#endif > + BOOLEAN Enable; > > /* Disable interrupts */ > - _disable(); > - > - /* Decrease CPU Count and loop until it's reached 0 */ > - do {InterlockedDecrement(Count);} while (!*Count); > - > - /* Now check if this is the Boot CPU */ > - if (!KeGetPcr()->Number) > - { > - /* It is.FIXME: Patch KeFlushCurrentTb */ > - } > - > - /* Now get CR4 and make sure PGE is masked out */ > + Enable = KeDisableInterrupts(); > + > + /* Spin until other processors are ready */ > + //Count = (PLONG)Context; > + //InterlockedDecrement(Count); > + //while (*Count) YieldProcessor(); > + > +#if defined(_GLOBAL_PAGES_ARE_AWESOME_) > + > + /* Get CR4 and ensure global pages are disabled */ > Cr4 = __readcr4(); > - __writecr4(Cr4 & ~CR4_PGE); > - > - /* Flush the TLB */ > - Cr3 = __readcr3(); > - __writecr3(Cr3); > + ASSERT(!(Cr4 & CR4_PGE)); > + > + /* Reset CR3 to flush the TLB */ > + __writecr3(__readcr3()); > > /* Now enable PGE */ > - DPRINT("Global page support detected but not yet taken advantage > of\n"); > - //__writecr4(Cr4 | CR4_PGE); > - > - /* Restore interrupts */ > - _enable(); > + __writecr4(Cr4 | CR4_PGE); > + > +#endif > + > + /* Restore interrupts and return */ > + KeRestoreInterrupts(Enable); > return 0; > } > > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Wed Oct 14 > 19:33:35 2015 > @@ -249,15 +249,18 @@ > PMMPFN Pfn1; > ULONG Flags; > > +#if defined(_GLOBAL_PAGES_ARE_AWESOME_) > + > /* Check for global bit */ > -#if 0 > if (KeFeatureBits & KF_GLOBAL_PAGE) > { > /* Set it on the template PTE and PDE */ > ValidKernelPte.u.Hard.Global = TRUE; > ValidKernelPde.u.Hard.Global = TRUE; > } > + > #endif > + > /* Now templates are ready */ > TempPte = ValidKernelPte; > TempPde = ValidKernelPde; > > >

2 2

Re: [ros-dev] [ros-diffs] [pschweitzer] 69507: [WHOOPS] C/P error
by Alex Ionescu 12 Oct '15

12 Oct '15

This is checking for 8-byte alignment on x86, not 16-byte. On Sun, Oct 11, 2015 at 2:51 PM, <pschweitzer(a)svn.reactos.org> wrote: > if (!((ULONG_PTR)Buffers[i] & 0x2)) Best regards, Alex Ionescu

1 0

Re: [ros-dev] [ros-diffs] [sginsberg] 69466: [KERNEL32] Fix bug in CreateFiberEx that made it replace the CONTEXT_FULL bits rather than ORing in CONTEXT_FLOATING_POINT when caller wanted FPU state saved. SwitchToFiber check...
by Alex Ionescu 10 Oct '15

10 Oct '15

How did our Fiber tests ever pass? Best regards, Alex Ionescu On Thu, Oct 8, 2015 at 9:26 AM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Thu Oct 8 16:26:29 2015 > New Revision: 69466 > > URL: http://svn.reactos.org/svn/reactos?rev=69466&view=rev > Log: > [KERNEL32] Fix bug in CreateFiberEx that made it replace the CONTEXT_FULL > bits rather than ORing in CONTEXT_FLOATING_POINT when caller wanted FPU > state saved. SwitchToFiber checks for CONTEXT_FULL OR > CONTEXT_FLOATING_POINT so the save/restore would fail. Moreover, fix > BaseInitializeContext that was not checking CONTEXT_FLOATING_POINT > correctly for some fibers and, as a result, not initializing FPU context > correctly for callers of ConvertThreadToFiberEx. Finally, because trying to > access address 0x6 is generally a bad idea, fix SwitchToFiber to use the > correct shared user data offsets. Misc cleanup all around. Bonus: Sort > TEB/PEB asm offsets and add GDI Batch Count offset, needed soon. > > Modified: > trunk/reactos/dll/win32/kernel32/client/fiber.c > trunk/reactos/dll/win32/kernel32/client/i386/fiber.S > trunk/reactos/dll/win32/kernel32/client/utils.c > trunk/reactos/include/asm/ks386.template.h > trunk/reactos/include/ndk/i386/asm.h > > Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] > (original) > +++ trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] Thu > Oct 8 16:26:29 2015 > @@ -27,10 +27,9 @@ > > VOID > WINAPI > -BaseRundownFls(IN PVOID FlsData) > +BaseRundownFls(_In_ PVOID FlsData) > { > /* No FLS support yet */ > - > } > > /* PUBLIC FUNCTIONS > ***********************************************************/ > @@ -55,16 +54,18 @@ > return FALSE; > } > > - /* this thread won't run a fiber anymore */ > + /* This thread won't run a fiber anymore */ > Teb->HasFiberData = FALSE; > FiberData = Teb->NtTib.FiberData; > Teb->NtTib.FiberData = NULL; > > /* Free the fiber */ > ASSERT(FiberData != NULL); > - RtlFreeHeap(GetProcessHeap(), 0, FiberData); > - > - /* success */ > + RtlFreeHeap(GetProcessHeap(), > + 0, > + FiberData); > + > + /* Success */ > return TRUE; > } > > @@ -73,15 +74,15 @@ > */ > LPVOID > WINAPI > -ConvertThreadToFiberEx(LPVOID lpParameter, > - DWORD dwFlags) > +ConvertThreadToFiberEx(_In_opt_ LPVOID lpParameter, > + _In_ DWORD dwFlags) > { > PTEB Teb; > PFIBER Fiber; > DPRINT1("Converting Thread to Fiber\n"); > > /* Check for invalid flags */ > - if (dwFlags &~ FIBER_FLAG_FLOAT_SWITCH) > + if (dwFlags & ~FIBER_FLAG_FLOAT_SWITCH) > { > /* Fail */ > SetLastError(ERROR_INVALID_PARAMETER); > @@ -98,9 +99,12 @@ > } > > /* Allocate the fiber */ > - Fiber = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(FIBER)); > + Fiber = RtlAllocateHeap(RtlGetProcessHeap(), > + 0, > + sizeof(FIBER)); > if (!Fiber) > { > + /* Fail */ > SetLastError(ERROR_NOT_ENOUGH_MEMORY); > return NULL; > } > @@ -114,13 +118,11 @@ > Fiber->FlsData = Teb->FlsData; > Fiber->GuaranteedStackBytes = Teb->GuaranteedStackBytes; > Fiber->ActivationContextStackPointer = > Teb->ActivationContextStackPointer; > - Fiber->FiberContext.ContextFlags = CONTEXT_FULL; > - > - /* Save FPU State if requested */ > - if (dwFlags & FIBER_FLAG_FLOAT_SWITCH) > - { > - Fiber->FiberContext.ContextFlags |= CONTEXT_FLOATING_POINT; > - } > + > + /* Save FPU State if requested, otherwise just the basic registers */ > + Fiber->FiberContext.ContextFlags = (dwFlags & > FIBER_FLAG_FLOAT_SWITCH) ? > + (CONTEXT_FULL | > CONTEXT_FLOATING_POINT) : > + CONTEXT_FULL; > > /* Associate the fiber to the current thread */ > Teb->NtTib.FiberData = Fiber; > @@ -135,10 +137,11 @@ > */ > LPVOID > WINAPI > -ConvertThreadToFiber(LPVOID lpParameter) > +ConvertThreadToFiber(_In_opt_ LPVOID lpParameter) > { > /* Call the newer function */ > - return ConvertThreadToFiberEx(lpParameter, 0); > + return ConvertThreadToFiberEx(lpParameter, > + 0); > } > > /* > @@ -146,12 +149,16 @@ > */ > LPVOID > WINAPI > -CreateFiber(SIZE_T dwStackSize, > - LPFIBER_START_ROUTINE lpStartAddress, > - LPVOID lpParameter) > +CreateFiber(_In_ SIZE_T dwStackSize, > + _In_ LPFIBER_START_ROUTINE lpStartAddress, > + _In_opt_ LPVOID lpParameter) > { > /* Call the Newer Function */ > - return CreateFiberEx(dwStackSize, 0, 0, lpStartAddress, lpParameter); > + return CreateFiberEx(dwStackSize, > + 0, > + 0, > + lpStartAddress, > + lpParameter); > } > > /* > @@ -159,20 +166,20 @@ > */ > LPVOID > WINAPI > -CreateFiberEx(SIZE_T dwStackCommitSize, > - SIZE_T dwStackReserveSize, > - DWORD dwFlags, > - LPFIBER_START_ROUTINE lpStartAddress, > - LPVOID lpParameter) > +CreateFiberEx(_In_ SIZE_T dwStackCommitSize, > + _In_ SIZE_T dwStackReserveSize, > + _In_ DWORD dwFlags, > + _In_ LPFIBER_START_ROUTINE lpStartAddress, > + _In_opt_ LPVOID lpParameter) > { > PFIBER Fiber; > NTSTATUS Status; > INITIAL_TEB InitialTeb; > - PACTIVATION_CONTEXT_STACK ActivationContextStackPointer = NULL; > + PACTIVATION_CONTEXT_STACK ActivationContextStackPointer; > DPRINT("Creating Fiber\n"); > > /* Check for invalid flags */ > - if (dwFlags &~ FIBER_FLAG_FLOAT_SWITCH) > + if (dwFlags & ~FIBER_FLAG_FLOAT_SWITCH) > { > /* Fail */ > SetLastError(ERROR_INVALID_PARAMETER); > @@ -180,6 +187,7 @@ > } > > /* Allocate the Activation Context Stack */ > + ActivationContextStackPointer = NULL; > Status = > RtlAllocateActivationContextStack(&ActivationContextStackPointer); > if (!NT_SUCCESS(Status)) > { > @@ -189,7 +197,9 @@ > } > > /* Allocate the fiber */ > - Fiber = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(FIBER)); > + Fiber = RtlAllocateHeap(RtlGetProcessHeap(), > + 0, > + sizeof(FIBER)); > if (!Fiber) > { > /* Free the activation context stack */ > @@ -208,7 +218,9 @@ > if (!NT_SUCCESS(Status)) > { > /* Free the fiber */ > - RtlFreeHeap(GetProcessHeap(), 0, Fiber); > + RtlFreeHeap(GetProcessHeap(), > + 0, > + Fiber); > > /* Free the activation context stack */ > RtlFreeActivationContextStack(ActivationContextStackPointer); > @@ -219,7 +231,8 @@ > } > > /* Clear the context */ > - RtlZeroMemory(&Fiber->FiberContext, sizeof(CONTEXT)); > + RtlZeroMemory(&Fiber->FiberContext, > + sizeof(CONTEXT)); > > /* Copy the data into the fiber */ > Fiber->StackBase = InitialTeb.StackBase; > @@ -230,12 +243,13 @@ > Fiber->GuaranteedStackBytes = 0; > Fiber->FlsData = NULL; > Fiber->ActivationContextStackPointer = ActivationContextStackPointer; > - Fiber->FiberContext.ContextFlags = CONTEXT_FULL; > - > - /* Save FPU State if requested */ > - Fiber->FiberContext.ContextFlags = (dwFlags & > FIBER_FLAG_FLOAT_SWITCH) ? CONTEXT_FLOATING_POINT : 0; > - > - /* initialize the context for the fiber */ > + > + /* Save FPU State if requested, otherwise just the basic registers */ > + Fiber->FiberContext.ContextFlags = (dwFlags & > FIBER_FLAG_FLOAT_SWITCH) ? > + (CONTEXT_FULL | > CONTEXT_FLOATING_POINT) : > + CONTEXT_FULL; > + > + /* Initialize the context for the fiber */ > BaseInitializeContext(&Fiber->FiberContext, > lpParameter, > lpStartAddress, > @@ -251,17 +265,24 @@ > */ > VOID > WINAPI > -DeleteFiber(LPVOID lpFiber) > -{ > - SIZE_T Size = 0; > - PFIBER Fiber = (PFIBER)lpFiber; > +DeleteFiber(_In_ LPVOID lpFiber) > +{ > + SIZE_T Size; > + PFIBER Fiber; > PTEB Teb; > > - /* First, exit the thread */ > + /* Are we deleting ourselves? */ > Teb = NtCurrentTeb(); > - if ((Teb->HasFiberData) && (Teb->NtTib.FiberData == Fiber)) > ExitThread(1); > - > - /* Now de-allocate the stack */ > + Fiber = (PFIBER)lpFiber; > + if ((Teb->HasFiberData) && > + (Teb->NtTib.FiberData == Fiber)) > + { > + /* Just exit */ > + ExitThread(1); > + } > + > + /* Not ourselves, de-allocate the stack */ > + Size = 0 ; > NtFreeVirtualMemory(NtCurrentProcess(), > &Fiber->DeallocationStack, > &Size, > @@ -274,7 +295,9 @@ > RtlFreeActivationContextStack(Fiber->ActivationContextStackPointer); > > /* Free the fiber data */ > - RtlFreeHeap(GetProcessHeap(), 0, lpFiber); > + RtlFreeHeap(GetProcessHeap(), > + 0, > + lpFiber); > } > > /* > @@ -284,6 +307,7 @@ > WINAPI > IsThreadAFiber(VOID) > { > + /* Return flag in the TEB */ > return NtCurrentTeb()->HasFiberData; > } > > @@ -349,7 +373,8 @@ > */ > BOOL > WINAPI > -FlsSetValue(DWORD dwFlsIndex, PVOID lpFlsData) > +FlsSetValue(DWORD dwFlsIndex, > + PVOID lpFlsData) > { > PVOID *ppFlsSlots; > TEB *pTeb = NtCurrentTeb(); > > Modified: trunk/reactos/dll/win32/kernel32/client/i386/fiber.S > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/client/i386/fiber.S > [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/client/i386/fiber.S > [iso-8859-1] Thu Oct 8 16:26:29 2015 > @@ -15,21 +15,26 @@ > .code > > PUBLIC _BaseFiberStartup@0 > -.PROC _BaseFiberStartup@0 > - /* Frame pointer is zeroed */ > +FUNC _BaseFiberStartup@0 > FPO 0, 0, 0, 0, 0, FRAME_FPO > + > + /* Note that EBP is already zeroed for us during fiber creation */ > > /* Get the fiber data */ > mov eax, fs:[TEB_FIBER_DATA] > > - push dword ptr [eax+FIBER_CONTEXT_EBX] /* Parameter */ > - push dword ptr [eax+FIBER_CONTEXT_EAX] /* Start Address */ > - call _BaseThreadStartup@8 > -.ENDP > + /* Start the thread with our parameters */ > + push dword ptr [eax+FIBER_CONTEXT_EBX] > + push dword ptr [eax+FIBER_CONTEXT_EAX] > + jmp _BaseThreadStartup@8 > + > +ENDFUNC > > > PUBLIC _SwitchToFiber@4 > -_SwitchToFiber@4: > +FUNC _SwitchToFiber@4 > + FPO 0, 0, 0, 0, 0, FRAME_FPO > + > /* Get the TEB */ > mov edx, fs:[TEB_SELF] > > @@ -51,7 +56,7 @@ > fnstcw [eax+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] > > /* Check if the CPU supports SIMD MXCSR State Save */ > - cmp byte ptr ds:[PF_XMMI_INSTRUCTIONS_AVAILABLE], 1 > + cmp byte ptr ds:[USER_SHARED_DATA + > USER_SHARED_DATA_PROCESSOR_FEATURES + PF_XMMI_INSTRUCTIONS_AVAILABLE], 1 > jnz NoFpuStateSave > stmxcsr [eax+FIBER_CONTEXT_DR6] > > @@ -109,13 +114,13 @@ > StatusWordChanged: > > /* Load the new one */ > - mov word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD], HEX(0FFFF) > + mov word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD], HEX(FFFF) > fldenv [ecx+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] > > ControlWordEqual: > > /* Load the new one */ > - cmp byte ptr ds:[PF_XMMI_INSTRUCTIONS_AVAILABLE], 1 > + cmp byte ptr ds:[USER_SHARED_DATA + > USER_SHARED_DATA_PROCESSOR_FEATURES + PF_XMMI_INSTRUCTIONS_AVAILABLE], 1 > jnz NoFpuStateRestore > ldmxcsr [ecx+FIBER_CONTEXT_DR6] > > @@ -136,6 +141,7 @@ > mov esp, [ecx+FIBER_CONTEXT_ESP] > ret 4 > > +ENDFUNC > > END > /* EOF */ > > 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] Thu > Oct 8 16:26:29 2015 > @@ -548,7 +548,7 @@ > > /* Is FPU state required? */ > Context->ContextFlags |= ContextFlags; > - if (ContextFlags == CONTEXT_FLOATING_POINT) > + if ((ContextFlags & CONTEXT_FLOATING_POINT) == > CONTEXT_FLOATING_POINT) > { > /* Set an initial state */ > Context->FloatSave.ControlWord = 0x27F; > > Modified: trunk/reactos/include/asm/ks386.template.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ks386.template… > > ============================================================================== > --- trunk/reactos/include/asm/ks386.template.h [iso-8859-1] (original) > +++ trunk/reactos/include/asm/ks386.template.h [iso-8859-1] Thu Oct 8 > 16:26:29 2015 > @@ -724,17 +724,20 @@ > > HEADER("TEB"), > OFFSET(TEB_EXCEPTION_LIST, TEB, NtTib.ExceptionList), > +OFFSET(TEB_STACK_BASE, TEB, NtTib.StackBase), > OFFSET(TEB_STACK_LIMIT, TEB, NtTib.StackLimit), > -OFFSET(TEB_STACK_BASE, TEB, NtTib.StackBase), > +OFFSET(TEB_FIBER_DATA, TEB, NtTib.FiberData), > OFFSET(TEB_SELF, TEB, NtTib.Self), > -OFFSET(TEB_FIBER_DATA, TEB, NtTib.FiberData), > OFFSET(TEB_PEB, TEB, ProcessEnvironmentBlock), > OFFSET(TEB_EXCEPTION_CODE, TEB, ExceptionCode), > +OFFSET(TEB_ACTIVATION_CONTEXT_STACK_POINTER, TEB, > ActivationContextStackPointer), > +OFFSET(TEB_DEALLOCATION_STACK, TEB, DeallocationStack), > +OFFSET(TEB_GDI_BATCH_COUNT, TEB, GdiBatchCount), > +OFFSET(TEB_GUARANTEED_STACK_BYTES, TEB, GuaranteedStackBytes), > +OFFSET(TEB_FLS_DATA, TEB, FlsData), > + > +HEADER("PEB"), > OFFSET(PEB_KERNEL_CALLBACK_TABLE, PEB, KernelCallbackTable), > -OFFSET(TEB_FLS_DATA, TEB, FlsData), > -OFFSET(TEB_ACTIVATION_CONTEXT_STACK_POINTER, TEB, > ActivationContextStackPointer), > -OFFSET(TEB_GUARANTEED_STACK_BYTES, TEB, GuaranteedStackBytes), > -OFFSET(TEB_DEALLOCATION_STACK, TEB, DeallocationStack), > > HEADER("Misc"), > CONSTANT(NPX_FRAME_LENGTH), > @@ -754,4 +757,6 @@ > CONSTANT(CONTEXT_ALIGNED_SIZE), > CONSTANT(PROCESSOR_FEATURE_FXSR), > CONSTANT(KUSER_SHARED_SYSCALL_RET), > - > +CONSTANT(USER_SHARED_DATA), > +CONSTANT(USER_SHARED_DATA_PROCESSOR_FEATURES), > + > > Modified: trunk/reactos/include/ndk/i386/asm.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… > > ============================================================================== > --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) > +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Thu Oct 8 > 16:26:29 2015 > @@ -315,13 +315,14 @@ > #define FRAME_EDITED 0xFFF8 > > // > -// KUSER_SHARED_DATA Offsets > +// USER_SHARED_DATA Offsets > // > #ifdef __ASM__ > #define USER_SHARED_DATA 0xFFDF0000 > #endif > #define USER_SHARED_DATA_INTERRUPT_TIME 0x8 > #define USER_SHARED_DATA_SYSTEM_TIME 0x14 > +#define USER_SHARED_DATA_PROCESSOR_FEATURES 0x274 > #define USER_SHARED_DATA_TICK_COUNT 0x320 > > // > > >

1 0

Re: [ros-dev] [ros-diffs] [akhaldi] 69435: [NTVDM] Improve the PCH situation.
by Hermès BÉLUSCA - MAÏTO 04 Oct '15

04 Oct '15

Hi ! I don't think this commit constitutes a nice improvement for NTVDM at its present status: - having the precise list of the used headers in each .c file helped me in knowing at a glance which functionalities a given .c needed, - therefore enabling me to find better places where to put the functions and possibly reduce the number of headers in the future (refactoring). - This broke my numerous local changes regarding e.g. a modularization of the CPU layer in NTVDM, video layer, ... - Finally, stuffing indistinctively *all* the headers (including the private ones like bios32p.h which purpose was to be used in the sources of one module only) inside the PCH ntvdm.h, makes for example BIOS or DOS functions visible inside hardware modules like ps2.h, which is completely illogical when you try to modularize NTVDM at source level, by completely separating hardware emulation from bios code and DOS emulation, etc... . Therefore I will revert your commit tomorrow, while keeping a diff and put it in a JIRA report. Cheers, Hermès. ________________________________________ [ros-diffs] [akhaldi] 69435: [NTVDM] Improve the PCH situation. akhaldi at svn.reactos.org akhaldi at svn.reactos.org Sat Oct 3 21:47:46 UTC 2015 Previous message: [ros-diffs] [spetreolle] 69434: [user32_apitest] 0x%lu does not mean anything correct. Next message: [ros-diffs] [spetreolle] 69436: [ROSTESTS] Fix 0x%lu specifier. Add cmake file for notificationtest. Messages sorted by: [ date ] [ thread ] [ subject ] [ author ] ________________________________________ Author: akhaldi Date: Sat Oct 3 21:47:46 2015 New Revision: 69435 URL: http://svn.reactos.org/svn/reactos?rev=69435&view=rev Log: [NTVDM] Improve the PCH situation.

1 0

Re: [ros-dev] [ros-diffs] [sginsberg] 69393: [NTOS] Fix the Ob wait system calls to only catch the exceptions that are expected to be raised by the Ke wait functions (and not potentially silently catching *any* exception an...
by Pierre Schweitzer 28 Sep '15

28 Sep '15

On 28/09/2015 11:01, sginsberg(a)svn.reactos.org wrote: > Author: sginsberg > Date: Mon Sep 28 09:01:11 2015 > New Revision: 69393 > > URL: http://svn.reactos.org/svn/reactos?rev=69393&view=rev > Log: > [NTOS] Fix the Ob wait system calls to only catch the exceptions that are expected to be raised by the Ke wait functions (and not potentially silently catching *any* exception and corrupting everything in the process). Also fixup some code logic. SEH Mega Fixup 1/??? > > Modified: > trunk/reactos/ntoskrnl/ob/obwait.c > > Modified: trunk/reactos/ntoskrnl/ob/obwait.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=6… > ============================================================================== > --- trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] Mon Sep 28 09:01:11 2015 > @@ -49,12 +49,12 @@ > IN BOOLEAN Alertable, > IN PLARGE_INTEGER TimeOut OPTIONAL) > { > - PKWAIT_BLOCK WaitBlockArray = NULL; > + PKWAIT_BLOCK WaitBlockArray; > HANDLE Handles[MAXIMUM_WAIT_OBJECTS], KernelHandle; > PVOID Objects[MAXIMUM_WAIT_OBJECTS]; > PVOID WaitObjects[MAXIMUM_WAIT_OBJECTS]; > - ULONG i = 0, ReferencedObjects = 0, j; > - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); > + ULONG i, ReferencedObjects, j; > + KPROCESSOR_MODE PreviousMode; > LARGE_INTEGER SafeTimeOut; > BOOLEAN LockInUse; > PHANDLE_TABLE_ENTRY HandleEntry; > @@ -65,31 +65,26 @@ > NTSTATUS Status; > PAGED_CODE(); > > - /* Enter a critical region since we'll play with handles */ > - LockInUse = TRUE; > - KeEnterCriticalRegion(); > - > /* Check for valid Object Count */ > if ((ObjectCount > MAXIMUM_WAIT_OBJECTS) || !(ObjectCount)) > { > /* Fail */ > - Status = STATUS_INVALID_PARAMETER_1; > - goto Quickie; > + return STATUS_INVALID_PARAMETER_1; > } > > /* Check for valid Wait Type */ > if ((WaitType != WaitAll) && (WaitType != WaitAny)) > { > /* Fail */ > - Status = STATUS_INVALID_PARAMETER_3; > - goto Quickie; > - } > - > - /* Enter SEH */ > - _SEH2_TRY > - { > - /* Check if the call came from user mode */ > - if (PreviousMode != KernelMode) > + return STATUS_INVALID_PARAMETER_3; > + } > + > + /* Enter SEH for user mode */ > + PreviousMode = ExGetPreviousMode(); > + if (PreviousMode != KernelMode) > + { > + /* Enter SEH */ > + _SEH2_TRY No, this is plain wrong. This is not because you're in kernel mode that the world is marvelous and callers trustable. A caller can pass you buggy address and you HAVE to wrap the RtlCopyMemory in SEH to make sure that if a buggy address is passed, the whole system isn't brought down (that's the whole purpose of the copy after all!). In case you have a doubt, just put some random: Status = ZwWaitForMultipleObjects(2, (void **)0x42424242, WaitAll, FALSE, NULL); In a kernel component. In w2k3, you'll get Status = STATUS_ACCESS_VIOLATION In ReactOS, with your changes: BSOD. Please before doing random changes that you believe are right: do testing. Alex already told you that. Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

Status Meeting (September 2015)
by Aleksey Bragin 23 Sep '15

23 Sep '15

Hello, Let me invite you to the monthly status meeting taking place last Thursday of a month, 24th of September, 19:00 UTC, as usual. 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. Please send agenda proposals to me before the meeting. Regards, Aleksey Bragin

2 1

Re: [ros-dev] [ros-diffs] [tfaber] 69296: [KMTESTS] - Add missing OBJ_KERNEL_HANDLE - OBJ_KERNEL_HANDLE in user mode has no effect... no reason to make a define around it CORE-10207
by Alex Ionescu 23 Sep '15

23 Sep '15

Actually, in XP, OBJ_KERNEL_HANDLE Did work, and gave you a kernel handle that you could never use. In Windows Vista, it returns a failure code. Not sure about 2003. Best regards, Alex Ionescu On Sat, Sep 19, 2015 at 2:46 PM, <tfaber(a)svn.reactos.org> wrote: > Author: tfaber > Date: Sat Sep 19 21:46:40 2015 > New Revision: 69296 > > URL: http://svn.reactos.org/svn/reactos?rev=69296&view=rev > Log: > [KMTESTS] > - Add missing OBJ_KERNEL_HANDLE > - OBJ_KERNEL_HANDLE in user mode has no effect... no reason to make a > define around it > CORE-10207 > > Modified: > trunk/rostests/kmtests/ntos_io/IoCreateFile.c > trunk/rostests/kmtests/ntos_ke/KeEvent.c > trunk/rostests/kmtests/rtl/RtlRegistry.c > > Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c > URL: > http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoCreateF… > > ============================================================================== > --- trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] > (original) > +++ trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] Sat > Sep 19 21:46:40 2015 > @@ -454,7 +454,7 @@ > ok_eq_hex(IoStatusBlock.Status, 0xFFFFFFFF); > if (Status == STATUS_SUCCESS) > { > - ObCloseHandle(ParentHandle, KernelMode); > + ObCloseHandle(ParentHandle, UserMode); > } > > /* Attempt relative target open */ > @@ -462,7 +462,7 @@ > IoStatusBlock.Information = 0xFFFFFFFF; > InitializeObjectAttributes(&ObjectAttributes, > &SystemRoot, > - OBJ_CASE_INSENSITIVE, > + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, > NULL, NULL); > Status = ZwOpenFile(&SystemRootHandle, > GENERIC_WRITE | GENERIC_READ | SYNCHRONIZE, > @@ -478,7 +478,7 @@ > IoStatusBlock.Information = 0xFFFFFFFF; > InitializeObjectAttributes(&ObjectAttributes, > &Regedit, > - OBJ_CASE_INSENSITIVE, > + OBJ_CASE_INSENSITIVE | > OBJ_KERNEL_HANDLE, > SystemRootHandle, > NULL); > Status = IoCreateFile(&ParentHandle, > > Modified: trunk/rostests/kmtests/ntos_ke/KeEvent.c > URL: > http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeEvent.c… > > ============================================================================== > --- trunk/rostests/kmtests/ntos_ke/KeEvent.c [iso-8859-1] (original) > +++ trunk/rostests/kmtests/ntos_ke/KeEvent.c [iso-8859-1] Sat Sep 19 > 21:46:40 2015 > @@ -155,6 +155,7 @@ > PVOID ThreadObjects[RTL_NUMBER_OF(Threads)]; > LONG State; > PKTHREAD Thread = KeGetCurrentThread(); > + OBJECT_ATTRIBUTES ObjectAttributes; > > LongTimeout.QuadPart = -100 * MILLISECOND; > ShortTimeout.QuadPart = -1 * MILLISECOND; > @@ -165,7 +166,12 @@ > { > Threads[i].Event = Event; > Threads[i].Signal = FALSE; > - Status = PsCreateSystemThread(&Threads[i].Handle, GENERIC_ALL, > NULL, NULL, NULL, WaitForEventThread, &Threads[i]); > + InitializeObjectAttributes(&ObjectAttributes, > + NULL, > + OBJ_KERNEL_HANDLE, > + NULL, > + NULL); > + Status = PsCreateSystemThread(&Threads[i].Handle, GENERIC_ALL, > &ObjectAttributes, NULL, NULL, WaitForEventThread, &Threads[i]); > ok_eq_hex(Status, STATUS_SUCCESS); > Status = ObReferenceObjectByHandle(Threads[i].Handle, > SYNCHRONIZE, *PsThreadType, KernelMode, (PVOID *)&Threads[i].Thread, NULL); > ok_eq_hex(Status, STATUS_SUCCESS); > > Modified: trunk/rostests/kmtests/rtl/RtlRegistry.c > URL: > http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlRegistry.c… > > ============================================================================== > --- trunk/rostests/kmtests/rtl/RtlRegistry.c [iso-8859-1] (original) > +++ trunk/rostests/kmtests/rtl/RtlRegistry.c [iso-8859-1] Sat Sep 19 > 21:46:40 2015 > @@ -7,12 +7,6 @@ > > #define KMT_EMULATE_KERNEL > #include <kmt_test.h> > - > -#ifdef KMT_KERNEL_MODE > -#define KMT_KERNEL_HANDLE OBJ_KERNEL_HANDLE > -#else > -#define KMT_KERNEL_HANDLE 0 > -#endif > > #ifndef RTL_NUMBER_OF > #define RTL_NUMBER_OF(x) (sizeof(x) / sizeof(x[0])) > @@ -212,7 +206,7 @@ > RtlInitUnicodeString(&KeyName, L"\\Registry\\MACHINE\\Software"); > InitializeObjectAttributes(&ObjectAttributes, > &KeyName, > - OBJ_CASE_INSENSITIVE | KMT_KERNEL_HANDLE, > + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, > NULL, > NULL); > Status = ZwOpenKey(&SoftwareHandle, > @@ -225,7 +219,7 @@ > RtlInitUnicodeString(&KeyName, L"RtlRegistryKmtestKey"); > InitializeObjectAttributes(&ObjectAttributes, > &KeyName, > - OBJ_CASE_INSENSITIVE | KMT_KERNEL_HANDLE, > + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, > SoftwareHandle, > NULL); > Status = ZwCreateKey(&KeyHandle, > > >

2 1

Re: [ros-dev] [ros-diffs] [tfaber] 69236: [MSFS] - Use a NULL timeout for infinite waits instead of waiting for 100 ns. CORE-10188 #resolve - Wait for available read data in user mode to handle thread termination - Return S...
by Alex Ionescu 18 Sep '15

18 Sep '15

I'm not convinced on the user->kernel changes Thomas. Best regards, Alex Ionescu On Tue, Sep 15, 2015 at 5:40 AM, <tfaber(a)svn.reactos.org> wrote: > Author: tfaber > Date: Tue Sep 15 09:40:30 2015 > New Revision: 69236 > > URL: http://svn.reactos.org/svn/reactos?rev=69236&view=rev > Log: > [MSFS] > - Use a NULL timeout for infinite waits instead of waiting for 100 ns. > CORE-10188 #resolve > - Wait for available read data in user mode to handle thread termination > - Return STATUS_IO_TIMEOUT also for a zero-length timeout. Fixes Wine tests > - Avoid MmGetSystemAddressForMdl > - Acquiring a mutex is not a UserRequest > > Modified: > trunk/reactos/drivers/filesystems/msfs/msfs.h > trunk/reactos/drivers/filesystems/msfs/rw.c > > Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… > > ============================================================================== > --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] > (original) > +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Tue > Sep 15 09:40:30 2015 > @@ -54,7 +54,7 @@ > > > #define KeLockMutex(x) KeWaitForSingleObject(x, \ > - UserRequest, \ > + Executive, \ > KernelMode, \ > FALSE, \ > NULL); > > Modified: trunk/reactos/drivers/filesystems/msfs/rw.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… > > ============================================================================== > --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Tue Sep 15 > 09:40:30 2015 > @@ -29,6 +29,7 @@ > ULONG LengthRead = 0; > PVOID Buffer; > NTSTATUS Status; > + PLARGE_INTEGER Timeout; > > DPRINT("MsfsRead(DeviceObject %p Irp %p)\n", DeviceObject, Irp); > > @@ -52,16 +53,21 @@ > > Length = IoStack->Parameters.Read.Length; > if (Irp->MdlAddress) > - Buffer = MmGetSystemAddressForMdl (Irp->MdlAddress); > + Buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, > NormalPagePriority); > else > Buffer = Irp->UserBuffer; > > + if (Fcb->TimeOut.QuadPart == -1LL) > + Timeout = NULL; > + else > + Timeout = &Fcb->TimeOut; > + > Status = KeWaitForSingleObject(&Fcb->MessageEvent, > UserRequest, > - KernelMode, > + UserMode, > FALSE, > - &Fcb->TimeOut); > - if (NT_SUCCESS(Status)) > + Timeout); > + if (Status != STATUS_USER_APC) > { > if (Fcb->MessageCount > 0) > { > @@ -84,7 +90,7 @@ > KeClearEvent(&Fcb->MessageEvent); > } > } > - else if (Fcb->TimeOut.QuadPart != 0LL) > + else > { > /* No message found after waiting */ > Status = STATUS_IO_TIMEOUT; > @@ -135,7 +141,7 @@ > > Length = IoStack->Parameters.Write.Length; > if (Irp->MdlAddress) > - Buffer = MmGetSystemAddressForMdl (Irp->MdlAddress); > + Buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, > NormalPagePriority); > else > Buffer = Irp->UserBuffer; > > > >

2 2

Re: [ros-dev] [ros-diffs] [spetreolle] 69186: [TRANSLATIONS] Translate remaining French strings in msgina.dll
by Pierre Schweitzer 16 Sep '15

16 Sep '15

Comments inline. On 11/09/2015 21:30, spetreolle(a)svn.reactos.org wrote: > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… > ============================================================================== > --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Fri Sep 11 19:30:29 2015 > @@ -25,11 +25,11 @@ > FONT 8, "MS Shell Dlg", 400, 0, 1 > BEGIN > CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 > - LTEXT "Utilisateur :", IDC_STATIC, 6, 60, 52, 8 > + LTEXT "Utilisateur:", IDC_STATIC, 6, 60, 52, 8 This is a broken change. > EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL > - LTEXT "Mot de passe :", IDC_STATIC, 6, 78, 52, 8 > + LTEXT "Mot de passe:", IDC_STATIC, 6, 78, 52, 8 This is a broken change. > @@ -68,50 +68,50 @@ > > IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 > STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP > -CAPTION "Unlock Computer" > +CAPTION "DÃ©verrouiller l'ordinateur" > FONT 8, "MS Shell Dlg", 400, 0, 1 > BEGIN > CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 > ICON IDI_LOCKICON, -1, 7, 59, 20, 20 > - LTEXT "This computer is in use and has been locked.", IDC_STATIC, 36, 61, 232, 8 > + LTEXT "Cet ordinateur est actuellement verrouillÃ©.", IDC_STATIC, 36, 61, 232, 8 > LTEXT "Message", IDC_LOCKMSG, 36, 75, 232, 26 > - LTEXT "User name:", IDC_STATIC, 36, 107, 40, 8 > + LTEXT "Utilisateur:", IDC_STATIC, 36, 107, 40, 8 French typography requires a space before and after ':' > EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL > - LTEXT "Password:", IDC_STATIC, 36, 125, 42, 8 > + LTEXT "Mot de passe:", IDC_STATIC, 36, 125, 50, 8 See upper comment. > EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD > PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON > - PUSHBUTTON "Cancel", IDCANCEL, 144, 154, 50, 14 > + PUSHBUTTON "Annuler", IDCANCEL, 144, 154, 50, 14 > END > > IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 > STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP > -CAPTION "Change Password" > +CAPTION "Changer le mot de passe" > FONT 8, "MS Shell Dlg", 400, 0, 1 > BEGIN > CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 > - LTEXT "User name:", IDC_STATIC, 7, 61, 78, 8 > + LTEXT "Utilisateur:", IDC_STATIC, 7, 61, 78, 8 Same here. > EDITTEXT IDC_CHANGEPWD_USERNAME, 90, 59, 127, 12, ES_AUTOHSCROLL > - LTEXT "Log on to:", IDC_STATIC, 7, 78, 78, 8 > + LTEXT "Se connecter Ã :", IDC_STATIC, 7, 78, 78, 8 > COMBOBOX IDC_CHANGEPWD_DOMAIN, 90, 75, 127, 144, CBS_DROPDOWNLIST | CBS_SORT | WS_TABSTOP > - LTEXT "Old Password:", IDC_STATIC, 7, 95, 78, 8 > + LTEXT "Ancien mot de passe:", IDC_STATIC, 7, 95, 78, 8 See upper comment. > EDITTEXT IDC_CHANGEPWD_OLDPWD, 90, 92, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD > - LTEXT "New Password:", IDC_STATIC, 7, 111, 78, 8 > + LTEXT "Nouveau mot de passe:", IDC_STATIC, 7, 111, 78, 8 Same here. > EDITTEXT IDC_CHANGEPWD_NEWPWD1, 90, 109, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD > - LTEXT "Confirm new Password:", IDC_STATIC, 7, 127, 78, 8 > + LTEXT "Confirmez le nouveau mot de passe:", IDC_STATIC, 7, 127, 78, 16 See upper comment. > EDITTEXT IDC_CHANGEPWD_NEWPWD2, 90, 125, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD > PUSHBUTTON "OK", IDOK, 164, 145, 50, 14, BS_DEFPUSHBUTTON > - PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 > + PUSHBUTTON "Annuler", IDCANCEL, 218, 145, 50, 14 > END > > IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 > STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP > -CAPTION "Log Off ReactOS" > +CAPTION "DÃ©connexion de ReactOS" > FONT 8, "MS Shell Dlg", 400, 0, 1 > BEGIN > ICON IDI_LOCKICON, -1, 7, 7, 20, 20 > - LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 > - PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON > - PUSHBUTTON "No", IDNO, 95, 39, 50, 14 > + LTEXT "Ãtes vous sÃ»r de vouloir vous dÃ©connecter?", IDC_STATIC, 35, 16, 146, 8 You need a dash here. > @@ -160,34 +160,34 @@ > IDS_ASKFORUSER "Utilisateur : " > IDS_ASKFORPASSWORD "Mot de passe : " > IDS_FORCELOGOFF "Cela dÃ©connectera l'utilisateur en cours et perdra les donnÃ©es non sauvÃ©es. Continuer ?" > - IDS_LOCKMSG "Seulement %s ou bien un Administrateur peut dÃ©verrouiller cet ordinateur." > - IDS_LOGONMSG "You are logged on as %s." > - IDS_LOGONDATE "Logon date: %s %s" > - IDS_COMPUTERLOCKED "Computer locked" > - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." > - IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." > - IDS_CHANGEPWDTITLE "Change Password" > - IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." > - IDS_PASSWORDCHANGED "Your password has been changed." > - IDS_LOGONTITLE "Logon Message" > - IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." > - IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." > - IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon." > - IDS_PASSWORDEXPIRED "Your password has expired and must be changed." > + IDS_LOCKMSG "Seul %s ou un administrateur peut dÃ©verrouiller cet ordinateur." > + IDS_LOGONMSG "Vous Ãªtes connectÃ© en tant que %s." > + IDS_LOGONDATE "Date de connexion: %s %s" See comment about ':' > + IDS_COMPUTERLOCKED "Ordinateur verrouillÃ©" > + IDS_LOCKEDWRONGPASSWORD "Le mot de passe est incorrect. Entrez Ã nouveau votre mot de passe en respectant les majuscules." > + IDS_LOCKEDWRONGUSER "Cet ordinateur est actuellement verrouillÃ©. Seul %s\\%s ou un administrateur peut dÃ©verrouiller cet ordinateur." > + IDS_CHANGEPWDTITLE "Changer le mot de passe" > + IDS_NONMATCHINGPASSWORDS "Les mots de passe ne correspondent pas. Entrez le mÃªme mot de passe dans les deux zones de texte." > + IDS_PASSWORDCHANGED "Votre mot de passe a Ã©tÃ© changÃ©." > + IDS_LOGONTITLE "Connexion" > + IDS_LOGONWRONGUSERORPWD "Le systÃ¨me ne peut vous connecter. VÃ©rifiez vos noms d'utilisateur et de domaine. Entrez Ã nouveau votre mot de passe en respectant les majuscules." > + IDS_LOGONUSERDISABLED "Votre compte est dÃ©sactivÃ©. Voyez votre administrateur systÃ¨me." Consultez votre ? -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

3 5

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

Visual Studio Support
by Alberto Vaudagna 14 Aug '15

14 Aug '15

Just wonder why no one has yet fixed the compiling errors you get if you use visual studio. All the errors are not code related but linking problem, so I wonder why no body solve all the compiler errors. Thanks, Alberto Vaudagna

3 15

#ReactOS in OpenExpo'15 (Madrid) and other PR stuff
by victor martinez 14 Aug '15

14 Aug '15

Hi guys!I'm proud to confirm that ReactOS project will be shown in OpenExpo'15 in Madrid, 16th June.OpenExpo is one of the greatest open source events in Spain: http://www.openexpo.esWe'll have the opportunity to give a Talk plus some Hacking lab (wish me good luck!). If anyone wants to come, I've one additional free pass. On the other hand, the open source 2/OS project is pushing forward through some Latam guys:https://plus.google.com/112666045931562995118/posts/6k1Xw2yXB7MSeems they're using ReactOS code in their project according with their tweets:https://twitter.com/2osproject/status/578135968219267072(Translation: We're using code of reactos.org and winehq.org, we have had to interact with networking stack with ROS using JAVA)Using Java??? And they seemed to have some issues with ReactOS code:http://twitter.com/2osproject/status/592291632004882433 Keep rockin'!

6 8

Re: [ros-dev] [ros-diffs] [cwittich] 68673: [MSAFD] don't trace an uninitialized UNICODE_STRING
by Thomas Faber 10 Aug '15

10 Aug '15

On 2015-08-10 19:54, cwittich(a)svn.reactos.org wrote: > @@ -40,8 +40,8 @@ > PLIST_ENTRY Helpers; > INT Status; > > - TRACE("AddressFamily %p, SocketType %p, Protocol %p, Group %u, Flags %lx, TransportName %wZ, HelperDllContext %p, HeplperDllData %p, Events %p\n", > - AddressFamily, SocketType, Protocol, Group, Flags, TransportName, HelperDllContext, HelperDllData, Events); > + TRACE("AddressFamily %p, SocketType %p, Protocol %p, Group %u, Flags %lx, HelperDllContext %p, HeplperDllData %p, Events %p\n", > + AddressFamily, SocketType, Protocol, Group, Flags, HelperDllContext, HelperDllData, Events); So change it to %p? This is tracing all function arguments... seems keeping that scheme would be good. (also you could fix the Heplper typo if you're already at it :p)

1 0

Re: [ros-dev] [ros-diffs] [dreimer] 68672: [BROWSEUI] Address is untranslatable by Adam Stachowicz CORE-9977 #resolve #comment Committed (with a Unicode fix), thx ^^
by Thomas Faber 10 Aug '15

10 Aug '15

On 2015-08-10 18:52, dreimer(a)svn.reactos.org wrote: > --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Mon Aug 10 16:52:40 2015 > @@ -93,7 +93,11 @@ > pdbi->ptActual.y = 22; > } > if (pdbi->dwMask & DBIM_TITLE) > - wcscpy(pdbi->wszTitle, L"Address"); > + { > + if (!LoadStringW(_AtlBaseModule.GetResourceInstance(), IDS_ADDRESSBANDLABEL, pdbi->wszTitle, _countof(pdbi->wszTitle))) > + return E_FAIL; > + } As a general rule, try not to use E_FAIL. HRESULT_FROM_WIN32(GetLastError()) would probably be correct here.

1 0

Audio development
by Andrew Greenwood 09 Aug '15

09 Aug '15

Hi everyone, Some of you probably remember me. I was involved with trying to get audio/sound implemented in ReactOS a few years ago. To be honest, my progress was rather poor, I managed to write a few bits of code but never really had a proper understanding of kernel/OS development or CPU/system architectures. Additionally, whilst I could grasp how the multimedia APIs (MME) in NT4 worked, and how they interacted with the drivers (audio device X opens device Y and writes buffered data to it) for Windows 2000 and later, Kernel Streaming was used which partly built on top of the older implementation but added a load of new stuff. This complicated matters as firstly, KS uses COM (which I still struggle to wrap my head around) in kernel-mode, secondly there were multiple components involved between the application and the hardware (wdmaud.drv -> wdmaud.sys -> ks.sys -> portcls.sys -> driver as far as I remember), and finally I really struggled to find example code and thorough documentation describing how it all worked. Ultimately I gave up with that and intended to move to another platform to develop multimedia applications. Not much happened with that. I remember there were complaints from application developers over Kernel Streaming offering poor latency - instead developers would turn to other technologies such as ASIO or DirectSound. So for recent versions of Windows (Vista onwards?) Microsoft implemented a new, user-mode sound system (WASAPI) which again uses COM but is pretty nicely documented, with code samples. Having done a little reading about this, it renewed my interest. It still uses COM, and KS.SYS is still present (I assume for compatibility?) but as a lot of this is implemented in user-space I suspect it'd be easier to develop/test. Aside from this, over the past few years I've also gained a better understanding of topics I didn't know much about previously and I feel more confident at being able to write lower-level stuff that works properly. I've also developed more of a keen interest in how Windows works. So basically I'm considering implementing the current Windows audio system in ReactOS. I'd imagine we don't need to be too concerned about audio drivers themselves (at least, initially) as vendors tend to offer these and it's not like we need sound immediately post-install! The only thing I really lack now is knowledge of how to implement COM classes - at least, outside of using Visual Studio. Anyone got recommended reading or example code for this? Andrew

3 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev