Ros-dev

ros-dev@reactos.org

5788 discussions

Re: [ros-dev] [ros-diffs] [pschweitzer] 69507: [WHOOPS] C/P error

by Alex Ionescu

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

9 years, 3 months

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

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 > > // > > >

9 years, 3 months

Re: [ros-dev] [ros-diffs] [akhaldi] 69435: [NTVDM] Improve the PCH situation.

by Hermès BÉLUSCA - MAÏTO

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.

9 years, 3 months

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

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.

9 years, 3 months

Status Meeting (September 2015)

by Aleksey Bragin

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

9 years, 3 months

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

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, > > >

9 years, 3 months

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

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; > > > >

9 years, 3 months

Re: [ros-dev] [ros-diffs] [spetreolle] 69186: [TRANSLATIONS] Translate remaining French strings in msgina.dll

by Pierre Schweitzer

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.

9 years, 3 months

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

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) > > >

9 years, 3 months

Re: [ros-dev] [ros-diffs] [pschweitzer] 69221: [MOUNTMGR] Implement the IOCTL IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED: - Implement WriteRemoteDatabaseEntry() - Implement MountMgrVolumeMountPointCreated()

by Alex Ionescu

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 > */ > > >

9 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev