Ros-dev October 2015

ros-dev@reactos.org

8 participants
9 discussions

by Colin Finck

Hi all, After Victor's commit of so many files to our press-media repository, I think we should establish some binding rules for it: * There is no need to have a single file in X different formats in the repository. Let's only keep it there in the best format. In particular, that means: Vector formats > Dynamic raster formats > Static raster formats E.g.: AI/SVG > PSD/TIFF > PNG The only exception to the rule can be made if one of the better formats is highly proprietary (like AI). In that case, an additional SVG file or (as a last resort) high-resolution PNG file may accompany it. I don't consider PSD proprietary anymore, because almost every Open-Source and Closed-Source graphics tool can work with them. Totally uncompressed formats (like BMP) have no reason to stay in the repository at all when better compressed formats (like PNG) are available. I would make the only exception to e.g. the BIOS logo for the MiniPC, because this one needs to be a BMP with special settings for technical reasons. * Only directly ReactOS-related media whose copyright is clarified should go there. Third-party graphics can pose a serious legal trouble. Additionally, Stock graphics can be found on many platforms. There is no need to let press-media become a repository for this. As long as there are no objections or additions, I would like Victor to remove some redundant files according to these rules. Cheers, Colin

8 years, 10 months

Status meeting today

by Alex Bragin

I am in traffic in the very centre of Moscow right now and most probably won't be on time for the meeting start. Please start the meeting without me, and first topic of agenda which I would like you to start with is the release plans. I will join you ASAP Regards, Aleksey

8 years, 10 months

Status Meeting (October 2015)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place last Thursday of a month, 29th of October, 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

8 years, 10 months

Re: [ros-dev] [ros-diffs] [pschweitzer] 69683: [CRT] Fix NTDLL implementation of mbstowcs() and wcstombs() so that they return length in caracters and not in bytes. This fixes last failing *to* CRT apitests CORE-10390

by Michael Fritscher

Hi, > Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/mbstowc… > ============================================================================== > --- trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] (original) > +++ trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] Sun Oct 25 > 09:28:57 2015 > @@ -60,7 +60,7 @@ > if (!NT_SUCCESS(Status)) > return -1; > > - return (size_t)Size; > + return (size_t)(Size / sizeof(wchar_t));; > } > > /* EOF */ Tiny, not critical typo: Two semicolons ;-) Best regards, Michael Fritscher

8 years, 10 months

Website Downtime on Monday

by Colin Finck

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

8 years, 10 months

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

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

8 years, 10 months

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

8 years, 11 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 > > // > > >

8 years, 11 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.

8 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev October 2015