Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 41574: - Move hypermap.c into ARM3 since it will be changed to use System PTEs for zero PTEs to solve the current race conditions that had to be fixed/hacked around in the current implementation. - DO NOT MAP HYPERSPACE PTEs as GLOBAL! They are now mapped as local, which might fix some really strange bugs that could've occured in the past. - Use MiPteToAddress instead of manually doing the bitmagic when mapping a page into hyperspace.
by ros-arm-bringup＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: ros-arm-bringup Date: Tue Jun 23 11:32:43 2009 New Revision: 41574 URL: http://svn.reactos.org/svn/reactos?rev=41574&view=rev Log: - Move hypermap.c into ARM3 since it will be changed to use System PTEs for zero PTEs to solve the current race conditions that had to be fixed/hacked around in the current implementation. - DO NOT MAP HYPERSPACE PTEs as GLOBAL! They are now mapped as local, which might fix some really strange bugs that could've occured in the past. - Use MiPteToAddress instead of manually doing the bitmagic when mapping a page into hyperspace. Added: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c - copied, changed from r41573, trunk/reactos/ntoskrnl/mm/hypermap.c Removed: trunk/reactos/ntoskrnl/mm/hypermap.c Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Copied: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c (from r41573, trunk/reactos/ntoskrnl/mm/hypermap.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/hypermap.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] Tue Jun 23 11:32:43 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/mm/hypermap.c + * FILE: ntoskrnl/mm/ARM3/hypermap.c * PURPOSE: Hyperspace Mapping Functionality * PROGRAMMERS: ReactOS Portable Systems Group */ @@ -15,6 +15,7 @@ /* GLOBALS ********************************************************************/ PMMPTE MmFirstReservedMappingPte, MmLastReservedMappingPte; +PMMPTE MiFirstReservedZeroingPte; MMPTE HyperTemplatePte; PEPROCESS HyperProcess; KIRQL HyperIrql; @@ -30,43 +31,60 @@ MMPTE TempPte; PMMPTE PointerPte; PFN_NUMBER Offset; - PVOID Address; - /* Never accept page 0 */ + // + // Never accept page 0 + // ASSERT(Page != 0); - /* Build the PTE */ + // + // Build the PTE + // TempPte = HyperTemplatePte; TempPte.u.Hard.PageFrameNumber = Page; + TempPte.u.Hard.Global = 0; // Hyperspace is local! - /* Pick the first hyperspace PTE */ + // + // Pick the first hyperspace PTE + // PointerPte = MmFirstReservedMappingPte; - /* Acquire the hyperlock */ + // + // Acquire the hyperlock + // ASSERT(Process == PsGetCurrentProcess()); KeAcquireSpinLock(&Process->HyperSpaceLock, OldIrql); - /* Now get the first free PTE */ + // + // Now get the first free PTE + // Offset = PFN_FROM_PTE(PointerPte); if (!Offset) { - /* Reset the PTEs */ + // + // Reset the PTEs + // Offset = MI_HYPERSPACE_PTES; KeFlushProcessTb(); } - /* Prepare the next PTE */ + // + // Prepare the next PTE + // PointerPte->u.Hard.PageFrameNumber = Offset - 1; - /* Write the current PTE */ + // + // Write the current PTE + // PointerPte += Offset; ASSERT(PointerPte->u.Hard.Valid == 0); ASSERT(TempPte.u.Hard.Valid == 1); *PointerPte = TempPte; - /* Return the address */ - Address = (PVOID)((ULONG_PTR)PointerPte << 10); - return Address; + // + // Return the address + // + return MiPteToAddress(PointerPte); } VOID @@ -77,10 +95,14 @@ { ASSERT(Process == PsGetCurrentProcess()); - /* Blow away the mapping */ + // + // Blow away the mapping + // MiAddressToPte(Address)->u.Long = 0; - /* Release the hyperlock */ + // + // Release the hyperlock + // ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); KeReleaseSpinLock(&Process->HyperSpaceLock, OldIrql); } @@ -93,24 +115,36 @@ PMMPTE PointerPte; PVOID Address; - /* Never accept page 0 */ + // + // Never accept page 0 + // ASSERT(Page != 0); - /* Build the PTE */ + // + // Build the PTE + // TempPte = HyperTemplatePte; TempPte.u.Hard.PageFrameNumber = Page; - /* Get the Zero PTE and its address */ + // + // Get the Zero PTE and its address + // PointerPte = MiAddressToPte(MI_ZERO_PTE); Address = (PVOID)((ULONG_PTR)PointerPte << 10); - /* Invalidate the old address */ + // + // Invalidate the old address + // __invlpg(Address); - /* Write the current PTE */ + // + // Write the current PTE + // TempPte.u.Hard.PageFrameNumber = Page; *PointerPte = TempPte; - /* Return the address */ + // + // Return the address + // return Address; } Removed: trunk/reactos/ntoskrnl/mm/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/hypermap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/hypermap.c (removed) @@ -1,116 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/mm/hypermap.c - * PURPOSE: Hyperspace Mapping Functionality - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES *******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ********************************************************************/ - -PMMPTE MmFirstReservedMappingPte, MmLastReservedMappingPte; -MMPTE HyperTemplatePte; -PEPROCESS HyperProcess; -KIRQL HyperIrql; - -/* PRIVATE FUNCTIONS **********************************************************/ - -PVOID -NTAPI -MiMapPageInHyperSpace(IN PEPROCESS Process, - IN PFN_NUMBER Page, - IN PKIRQL OldIrql) -{ - MMPTE TempPte; - PMMPTE PointerPte; - PFN_NUMBER Offset; - PVOID Address; - - /* Never accept page 0 */ - ASSERT(Page != 0); - - /* Build the PTE */ - TempPte = HyperTemplatePte; - TempPte.u.Hard.PageFrameNumber = Page; - - /* Pick the first hyperspace PTE */ - PointerPte = MmFirstReservedMappingPte; - - /* Acquire the hyperlock */ - ASSERT(Process == PsGetCurrentProcess()); - KeAcquireSpinLock(&Process->HyperSpaceLock, OldIrql); - - /* Now get the first free PTE */ - Offset = PFN_FROM_PTE(PointerPte); - if (!Offset) - { - /* Reset the PTEs */ - Offset = MI_HYPERSPACE_PTES; - KeFlushProcessTb(); - } - - /* Prepare the next PTE */ - PointerPte->u.Hard.PageFrameNumber = Offset - 1; - - /* Write the current PTE */ - PointerPte += Offset; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; - - /* Return the address */ - Address = (PVOID)((ULONG_PTR)PointerPte << 10); - return Address; -} - -VOID -NTAPI -MiUnmapPageInHyperSpace(IN PEPROCESS Process, - IN PVOID Address, - IN KIRQL OldIrql) -{ - ASSERT(Process == PsGetCurrentProcess()); - - /* Blow away the mapping */ - MiAddressToPte(Address)->u.Long = 0; - - /* Release the hyperlock */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - KeReleaseSpinLock(&Process->HyperSpaceLock, OldIrql); -} - -PVOID -NTAPI -MiMapPageToZeroInHyperSpace(IN PFN_NUMBER Page) -{ - MMPTE TempPte; - PMMPTE PointerPte; - PVOID Address; - - /* Never accept page 0 */ - ASSERT(Page != 0); - - /* Build the PTE */ - TempPte = HyperTemplatePte; - TempPte.u.Hard.PageFrameNumber = Page; - - /* Get the Zero PTE and its address */ - PointerPte = MiAddressToPte(MI_ZERO_PTE); - Address = (PVOID)((ULONG_PTR)PointerPte << 10); - - /* Invalidate the old address */ - __invlpg(Address); - - /* Write the current PTE */ - TempPte.u.Hard.PageFrameNumber = Page; - *PointerPte = TempPte; - - /* Return the address */ - return Address; -} Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Jun 23 11:32:43 2009 @@ -360,6 +360,7 @@ </directory> </if> <directory name="ARM3"> + <file>hypermap.c</file> <file>init.c</file> <file>pool.c</file> <file>syspte.c</file> @@ -370,7 +371,6 @@ <file>dbgpool.c</file> <file>drvlck.c</file> <file>freelist.c</file> - <file>hypermap.c</file> <file>iospace.c</file> <file>kmap.c</file> <file>marea.c</file>

1 0

[ros-arm-bringup] 41572: - Do not zero out MC_SYSTEM pages if they are "early pages" either. This could cause issues on certain systems where mapping the PFN database required "early pages", and they were zeroed before hyperspace was ready. - Add a new flag to MmGetContigousPages to specify if these pages should be zeroed or not. Allows the nonpaged pool pages not to get automatically zeroed when allocated (the NP pool allocator can do this by itself later). This allows initial nonpaged pool to
by ros-arm-bringup＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: ros-arm-bringup Date: Tue Jun 23 10:32:11 2009 New Revision: 41572 URL: http://svn.reactos.org/svn/reactos?rev=41572&view=rev Log: - Do not zero out MC_SYSTEM pages if they are "early pages" either. This could cause issues on certain systems where mapping the PFN database required "early pages", and they were zeroed before hyperspace was ready. - Add a new flag to MmGetContigousPages to specify if these pages should be zeroed or not. Allows the nonpaged pool pages not to get automatically zeroed when allocated (the NP pool allocator can do this by itself later). This allows initial nonpaged pool to be allocated before hyperspace is ready. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/cont.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Tue Jun 23 10:32:11 2009 @@ -1125,7 +1125,8 @@ ULONG NumberOfBytes, PHYSICAL_ADDRESS LowestAcceptableAddress, PHYSICAL_ADDRESS HighestAcceptableAddress, - PHYSICAL_ADDRESS BoundaryAddressMultiple + PHYSICAL_ADDRESS BoundaryAddressMultiple, + BOOLEAN ZeroPages ); NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/cont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/cont.c?rev=415… ============================================================================== --- trunk/reactos/ntoskrnl/mm/cont.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/cont.c [iso-8859-1] Tue Jun 23 10:32:11 2009 @@ -103,7 +103,8 @@ PBase = MmGetContinuousPages(NumberOfBytes, LowestAcceptableAddress, HighestAcceptableAddress, - BoundaryAddressMultiple); + BoundaryAddressMultiple, + TRUE); if (PBase == 0) { MmLockAddressSpace(MmGetKernelAddressSpace()); Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Tue Jun 23 10:32:11 2009 @@ -138,7 +138,8 @@ MmGetContinuousPages(ULONG NumberOfBytes, PHYSICAL_ADDRESS LowestAcceptableAddress, PHYSICAL_ADDRESS HighestAcceptableAddress, - PHYSICAL_ADDRESS BoundaryAddressMultiple) + PHYSICAL_ADDRESS BoundaryAddressMultiple, + BOOLEAN ZeroPages) { ULONG NrPages; ULONG i, j; @@ -222,7 +223,7 @@ { if (MiGetPfnEntry(i)->Flags.Zero == 0) { - MiZeroPage(i); + if (ZeroPages) MiZeroPage(i); } else { @@ -727,7 +728,7 @@ /* Allocate an early page -- we'll account for it later */ KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); PfnOffset = MmAllocEarlyPage(); - MiZeroPage(PfnOffset); + if (Consumer != MC_SYSTEM) MiZeroPage(PfnOffset); return PfnOffset; }

1 0

[ros-arm-bringup] 41571: - Do not reformat other people's code simply to reformat it.
by ros-arm-bringup＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: ros-arm-bringup Date: Tue Jun 23 09:00:48 2009 New Revision: 41571 URL: http://svn.reactos.org/svn/reactos?rev=41571&view=rev Log: - Do not reformat other people's code simply to reformat it. Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Jun 23 09:00:48 2009 @@ -384,7 +384,9 @@ /* Unmap low memory */ MmDeletePageTable(NULL, 0); - /* Initialize ARMÂ³ */ + // + // Initialize ARMÂ³ + // MmArmInitSystem(0, KeLoaderBlock); /* Initialize nonpaged pool */

1 0

[hyperion] 41557: #define inline to __inline for Visual C++ when compiling C sources
by hyperion＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: hyperion Date: Tue Jun 23 00:03:20 2009 New Revision: 41557 URL: http://svn.reactos.org/svn/reactos?rev=41557&view=rev Log: #define inline to __inline for Visual C++ when compiling C sources Modified: trunk/reactos/ReactOS-generic.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Tue Jun 23 00:03:20 2009 @@ -132,6 +132,7 @@ </group> <group compilerset="msc"> + <define name="inline" compiler="cc">__inline</define> <compilerflag>/Zl</compilerflag> <compilerflag>/Zi</compilerflag> <compilerflag>/W1</compilerflag>

2 1

[cwittich] 41569: fix comment IsUserAdmin -> IsUserAnAdmin
by cwittich＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: cwittich Date: Tue Jun 23 02:59:30 2009 New Revision: 41569 URL: http://svn.reactos.org/svn/reactos?rev=41569&view=rev Log: fix comment IsUserAdmin -> IsUserAnAdmin Modified: trunk/reactos/dll/win32/shell32/shellord.c Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Tue Jun 23 02:59:30 2009 @@ -1265,11 +1265,19 @@ { FIXME("(%s)\n", bFullInit ? "true" : "false"); return 0; } -/************************************************************************* - * IsUserAdmin [SHELL32.680] NT 4.0 - * - */ - + +/************************************************************************* + * IsUserAnAdmin [SHELL32.680] NT 4.0 + * + * Checks whether the current user is a member of the Administrators group. + * + * PARAMS + * None + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ BOOL WINAPI IsUserAnAdmin(VOID) { SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; @@ -1331,7 +1339,6 @@ FreeSid(lpSid); HeapFree(GetProcessHeap(), 0, lpGroups); - return bResult; }

1 0

[cwittich] 41568: partial advapi32 sid sync to wine 1.1.24
by cwittich＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: cwittich Date: Tue Jun 23 02:54:03 2009 New Revision: 41568 URL: http://svn.reactos.org/svn/reactos?rev=41568&view=rev Log: partial advapi32 sid sync to wine 1.1.24 Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Jun 23 02:54:03 2009 @@ -506,7 +506,7 @@ return FALSE; } - piace = (ACCESS_ALLOWED_ACE *)pace; + piace = pace; DumpString(&openbr, 1, pwptr, plen); switch (piace->Header.AceType) { @@ -789,7 +789,6 @@ return GetSidLengthRequired(0); } - /****************************************************************************** * ParseStringSidToSid */ @@ -899,7 +898,6 @@ TRACE("returning %s\n", bret ? "TRUE" : "FALSE"); return bret; } - /****************************************************************************** * ParseAclStringFlags @@ -930,7 +928,6 @@ return flags; } - /****************************************************************************** * ParseAceStringType */ @@ -1182,7 +1179,7 @@ */ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR* SecurityDescriptor, + SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, LPDWORD cBytes) { BOOL bret = FALSE; @@ -1195,7 +1192,7 @@ *cBytes = sizeof(SECURITY_DESCRIPTOR); if (SecurityDescriptor) - lpNext = ((LPBYTE) SecurityDescriptor) + sizeof(SECURITY_DESCRIPTOR); + lpNext = (LPBYTE)(SecurityDescriptor + 1); while (*StringSecurityDescriptor) { @@ -1233,7 +1230,7 @@ if (SecurityDescriptor) { - SecurityDescriptor->Owner = (PSID)(lpNext - (LPBYTE)SecurityDescriptor); + SecurityDescriptor->Owner = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ } @@ -1251,7 +1248,7 @@ if (SecurityDescriptor) { - SecurityDescriptor->Group = (PSID)(lpNext - (LPBYTE)SecurityDescriptor); + SecurityDescriptor->Group = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ } @@ -1271,7 +1268,7 @@ if (SecurityDescriptor) { SecurityDescriptor->Control |= SE_DACL_PRESENT | flags; - SecurityDescriptor->Dacl = (PACL)(lpNext - (LPBYTE)SecurityDescriptor); + SecurityDescriptor->Dacl = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ } @@ -1291,7 +1288,7 @@ if (SecurityDescriptor) { SecurityDescriptor->Control |= SE_SACL_PRESENT | flags; - SecurityDescriptor->Sacl = (PACL)(lpNext - (LPBYTE)SecurityDescriptor); + SecurityDescriptor->Sacl = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ } @@ -1360,7 +1357,7 @@ psd->Control |= SE_SELF_RELATIVE; if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, - psd, &cBytes)) + (SECURITY_DESCRIPTOR_RELATIVE *)psd, &cBytes)) { LocalFree(psd); goto lend;

1 0

[cwittich] 41567: don't build arm stuff on non arm builds fixes 2nd stage
by cwittich＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: cwittich Date: Tue Jun 23 02:48:39 2009 New Revision: 41567 URL: http://svn.reactos.org/svn/reactos?rev=41567&view=rev Log: don't build arm stuff on non arm builds fixes 2nd stage Modified: trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Jun 23 02:48:39 2009 @@ -384,11 +384,11 @@ /* Unmap low memory */ MmDeletePageTable(NULL, 0); - // - // Initialize ARMÂ³ - // +#ifdef _ARM_ + /* Initialize ARMÂ³ */ MmArmInitSystem(0, KeLoaderBlock); - +#endif + /* Initialize nonpaged pool */ MiInitializeNonPagedPool(); Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Jun 23 02:48:39 2009 @@ -352,6 +352,11 @@ <directory name="arm"> <file>stubs.c</file> </directory> + <directory name="ARM3"> + <file>init.c</file> + <file>pool.c</file> + <file>syspte.c</file> + </directory> </if> <if property="ARCH" value="powerpc"> <directory name="powerpc"> @@ -359,11 +364,6 @@ <file>page.c</file> </directory> </if> - <directory name="ARM3"> - <file>init.c</file> - <file>pool.c</file> - <file>syspte.c</file> - </directory> <file>anonmem.c</file> <file>balance.c</file> <file>cont.c</file>

1 0

[janderwald] 41566: - define YieldProcessor msvc compatible - rtl now builds
by janderwald＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: janderwald Date: Tue Jun 23 01:07:52 2009 New Revision: 41566 URL: http://svn.reactos.org/svn/reactos?rev=41566&view=rev Log: - define YieldProcessor msvc compatible - rtl now builds Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Tue Jun 23 01:07:52 2009 @@ -4946,10 +4946,24 @@ #error Unknown architecture #endif +VOID +_mm_pause ( + VOID + ); + + #if defined(_M_IX86) +#ifdef _MSC_VER +#pragma intrinsic(_mm_pause) +#else #define YieldProcessor() __asm__ __volatile__("pause"); +#endif #elif defined (_M_AMD64) +#ifdef _MSC_VER +#define YieldProcessor _mm_pause +#else #define YieldProcessor() __asm__ __volatile__("pause"); +#endif #elif defined(_M_PPC) #define YieldProcessor() __asm__ __volatile__("nop"); #elif defined(_M_MIPS)

1 0

[hyperion] 41565: Change <wine/list.h> to use the magic attribute salad for inline functions in headers
by hyperion＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: hyperion Date: Tue Jun 23 00:29:48 2009 New Revision: 41565 URL: http://svn.reactos.org/svn/reactos?rev=41565&view=rev Log: Change <wine/list.h> to use the magic attribute salad for inline functions in headers Modified: trunk/reactos/include/reactos/wine/list.h Modified: trunk/reactos/include/reactos/wine/list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/list.… ============================================================================== --- trunk/reactos/include/reactos/wine/list.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/list.h [iso-8859-1] Tue Jun 23 00:29:48 2009 @@ -20,6 +20,18 @@ #ifndef __WINE_SERVER_LIST_H #define __WINE_SERVER_LIST_H + +#ifdef __cplusplus +#define __WINE_SERVER_LIST_INLINE inline +#else +#if defined(__GNUC__) +#define __WINE_SERVER_LIST_INLINE extern __inline__ __attribute__((__always_inline__,__gnu_inline__)) +#elif defined(_MSC_VER) +#define __WINE_SERVER_LIST_INLINE __inline +#else +#define __WINE_SERVER_LIST_INLINE static +#endif +#endif struct list { @@ -63,7 +75,7 @@ */ /* add an element after the specified one */ -static inline void list_add_after( struct list *elem, struct list *to_add ) +__WINE_SERVER_LIST_INLINE void list_add_after( struct list *elem, struct list *to_add ) { to_add->next = elem->next; to_add->prev = elem; @@ -72,7 +84,7 @@ } /* add an element before the specified one */ -static inline void list_add_before( struct list *elem, struct list *to_add ) +__WINE_SERVER_LIST_INLINE void list_add_before( struct list *elem, struct list *to_add ) { to_add->next = elem; to_add->prev = elem->prev; @@ -81,26 +93,26 @@ } /* add element at the head of the list */ -static inline void list_add_head( struct list *list, struct list *elem ) +__WINE_SERVER_LIST_INLINE void list_add_head( struct list *list, struct list *elem ) { list_add_after( list, elem ); } /* add element at the tail of the list */ -static inline void list_add_tail( struct list *list, struct list *elem ) +__WINE_SERVER_LIST_INLINE void list_add_tail( struct list *list, struct list *elem ) { list_add_before( list, elem ); } /* remove an element from its list */ -static inline void list_remove( struct list *elem ) +__WINE_SERVER_LIST_INLINE void list_remove( struct list *elem ) { elem->next->prev = elem->prev; elem->prev->next = elem->next; } /* get the next element */ -static inline struct list *list_next( const struct list *list, const struct list *elem ) +__WINE_SERVER_LIST_INLINE struct list *list_next( const struct list *list, const struct list *elem ) { struct list *ret = elem->next; if (elem->next == list) ret = NULL; @@ -108,7 +120,7 @@ } /* get the previous element */ -static inline struct list *list_prev( const struct list *list, const struct list *elem ) +__WINE_SERVER_LIST_INLINE struct list *list_prev( const struct list *list, const struct list *elem ) { struct list *ret = elem->prev; if (elem->prev == list) ret = NULL; @@ -116,31 +128,31 @@ } /* get the first element */ -static inline struct list *list_head( const struct list *list ) +__WINE_SERVER_LIST_INLINE struct list *list_head( const struct list *list ) { return list_next( list, list ); } /* get the last element */ -static inline struct list *list_tail( const struct list *list ) +__WINE_SERVER_LIST_INLINE struct list *list_tail( const struct list *list ) { return list_prev( list, list ); } /* check if a list is empty */ -static inline int list_empty( const struct list *list ) +__WINE_SERVER_LIST_INLINE int list_empty( const struct list *list ) { return list->next == list; } /* initialize a list */ -static inline void list_init( struct list *list ) +__WINE_SERVER_LIST_INLINE void list_init( struct list *list ) { list->next = list->prev = list; } /* count the elements of a list */ -static inline unsigned int list_count( const struct list *list ) +__WINE_SERVER_LIST_INLINE unsigned int list_count( const struct list *list ) { unsigned count = 0; const struct list *ptr; @@ -149,7 +161,7 @@ } /* move all elements from src to the tail of dst */ -static inline void list_move_tail( struct list *dst, struct list *src ) +__WINE_SERVER_LIST_INLINE void list_move_tail( struct list *dst, struct list *src ) { if (list_empty(src)) return; @@ -161,7 +173,7 @@ } /* move all elements from src to the head of dst */ -static inline void list_move_head( struct list *dst, struct list *src ) +__WINE_SERVER_LIST_INLINE void list_move_head( struct list *dst, struct list *src ) { if (list_empty(src)) return;

1 0

[hyperion] 41564: Don't want to fix all uses of PSEH2 macros, therefore have some curly braces, everyone
by hyperion＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: hyperion Date: Tue Jun 23 00:27:16 2009 New Revision: 41564 URL: http://svn.reactos.org/svn/reactos?rev=41564&view=rev Log: Don't want to fix all uses of PSEH2 macros, therefore have some curly braces, everyone Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Tue Jun 23 00:27:16 2009 @@ -401,10 +401,10 @@ #include <excpt.h> -#define _SEH2_TRY __try -#define _SEH2_FINALLY __finally -#define _SEH2_EXCEPT(...) __except(__VA_ARGS__) -#define _SEH2_END +#define _SEH2_TRY __try { +#define _SEH2_FINALLY } __finally { +#define _SEH2_EXCEPT(...) } __except(__VA_ARGS__) { +#define _SEH2_END } #define _SEH2_GetExceptionInformation() (GetExceptionInformation()) #define _SEH2_GetExceptionCode() (GetExceptionCode())

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs