Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49560: [GENINC] Add geninc tool, that creates assembly definitions.
by tkreuzer＠svn.reactos.org 11 Nov '10

11 Nov '10

Author: tkreuzer Date: Thu Nov 11 13:35:57 2010 New Revision: 49560 URL: http://svn.reactos.org/svn/reactos?rev=49560&view=rev Log: [GENINC] Add geninc tool, that creates assembly definitions. Added: branches/cmake-bringup/tools/geninc/CMakeLists.txt (with props) Modified: branches/cmake-bringup/tools/CMakeLists.txt branches/cmake-bringup/tools/geninc/geninc.c Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Thu Nov 11 13:35:57 2010 @@ -7,6 +7,7 @@ add_subdirectory(cabman) add_subdirectory(cdmake) add_subdirectory(gendib) +add_subdirectory(geninc) add_subdirectory(mkhive) add_subdirectory(nci) add_subdirectory(spec2pdef) Added: branches/cmake-bringup/tools/geninc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/geninc/CMak… ============================================================================== --- branches/cmake-bringup/tools/geninc/CMakeLists.txt (added) +++ branches/cmake-bringup/tools/geninc/CMakeLists.txt [iso-8859-1] Thu Nov 11 13:35:57 2010 @@ -1,0 +1,2 @@ + +add_executable(geninc geninc.c) Propchange: branches/cmake-bringup/tools/geninc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/geninc/geni… ============================================================================== --- branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] Thu Nov 11 13:35:57 2010 @@ -4,8 +4,205 @@ #include <stdlib.h> #include <string.h> - +#ifdef _WIN32 +#define PRIx64 "I64x" +#else +#define PRIx64 "llx" +#endif + +typedef struct +{ + char Type; + char Name[55]; + unsigned __int64 Value; +} ASMGENDATA; + +#define TYPE_END 0 +#define TYPE_RAW 1 +#define TYPE_CONSTANT 2 +#define TYPE_HEADER 3 int main(int argc, char* argv[]) { + FILE *input, *output; + ASMGENDATA data; + int i, result = -1; + int ms_format = 0; + char header[20]; + unsigned __int32 e_lfanew, signature; + unsigned __int16 Machine, NumberOfSections, SizeOfOptionalHeader; + typedef struct + { + char Name[8]; + unsigned __int32 VirtualSize; + unsigned __int32 VirtualAddress; + unsigned __int32 RawSize; + unsigned __int32 RawAddress; + unsigned __int32 RelocAddress; + unsigned __int32 LineNumbers; + unsigned __int16 RelocationsNumber; + unsigned __int16 LineNumbersNumber; + unsigned __int32 Characteristics; + } SECTION; + SECTION section; + + if (argc >= 4 && stricmp(argv[3], "-ms") == 0) ms_format = 1; + + /* Open the input file */ + input = fopen(argv[1], "rb"); + if (!input) + { + fprintf(stderr, "Could not open input file '%s'\n", argv[1]); + return -1; + } + + /* Open the output file */ + output = fopen(argv[2], "w"); + if (!output) + { + fprintf(stderr, "Could not open output file '%s'\n", argv[2]); + return -1; + } + + /* Read the DOS header */ + if (fread(&header, 1, 2, input) != 2) + { + fprintf(stderr, "Error reading header.\n"); + goto quit; + } + + if (header[0] != 0x4d || header[1] != 0x5a) + { + fprintf(stderr, "Not a PE file.\n"); + goto quit; + } + + fseek(input, 0x3C, SEEK_SET); + if (fread(&e_lfanew, 1, 4, input) != 4) + { + fprintf(stderr, "Could not read e_lfanew.\n"); + goto quit; + } + + fseek(input, e_lfanew, SEEK_SET); + if (fread(&signature, 1, 4, input) != 4) + { + fprintf(stderr, "Could not read signature.\n"); + goto quit; + } + + /* Verify the PE signature */ + if (signature != 0x4550) + { + fprintf(stderr, "Invalid signature: 0x%lx.\n", signature); + goto quit; + } + + /* Read Machine */ + fseek(input, e_lfanew + 4, SEEK_SET); + if (fread(&Machine, 1, 2, input) != 2) + { + fprintf(stderr, "Could not read ExportDirectoryRVA.\n"); + goto quit; + } + + if (Machine != 0x14c) + { + fprintf(stderr, "Invalid Machine: 0x%x.\n", Machine); + goto quit; + } + + /* Read NumberOfSections */ + if (fread(&NumberOfSections, 1, 2, input) != 2) + { + fprintf(stderr, "Could not read NumberOfSections.\n"); + goto quit; + } + + fseek(input, e_lfanew + 0x14, SEEK_SET); + if (fread(&SizeOfOptionalHeader, 1, 2, input) != 2) + { + fprintf(stderr, "Could not read SizeOfOptionalHeader.\n"); + goto quit; + } + + /* Read the section table */ + fseek(input, e_lfanew + 0x18 + SizeOfOptionalHeader, SEEK_SET); + + /* Search for the .asmdef section */ + for (i = 0; i < NumberOfSections; i++) + { + if (fread(&section, 1, sizeof(SECTION), input) != sizeof(SECTION)) + { + fprintf(stderr, "Could not read section.\n"); + goto quit; + } + + if (strcmp(section.Name, ".asmdef") == 0) + { + break; + } + } + + if (i == NumberOfSections) + { + fprintf(stderr, "Could not find section.\n"); + goto quit; + } + + /* Read the section table */ + fseek(input, section.RawAddress, SEEK_SET); + + while (1) + { + /* Read one entry */ + if (fread(&data, 1, sizeof(data), input) != sizeof(data)) + { + fprintf(stderr, "Error reading input file.\n"); + goto quit; + } + + switch(data.Type) + { + case TYPE_END: + break; + + case TYPE_RAW: + fprintf(output, "%s\n", data.Name); + continue; + + case TYPE_CONSTANT: + if (ms_format) + { + fprintf(output, "%s equ %"PRIx64"h\n", data.Name, data.Value); + } + else + { + fprintf(output, "%s = 0x%"PRIx64"\n", data.Name, data.Value); + } + continue; + + case TYPE_HEADER: + if (ms_format) + { + fprintf(output, "\n; %s\n", data.Name); + } + else + { + fprintf(output, "\n/* %s */\n", data.Name); + } + continue; + } + + break; + } + + result = 0; + +quit: + /* Close files */ + fclose(input); + fclose(output); + + return result; }

1 0

[sir_richard] 49559: [NTOS]: Start using colored pages. This will help performance on real systems significantly as cache is now taken into account by the memory manager. Also radically changes the...
by sir_richard＠svn.reactos.org 11 Nov '10

11 Nov '10

Author: sir_richard Date: Thu Nov 11 13:15:40 2010 New Revision: 49559 URL: http://svn.reactos.org/svn/reactos?rev=49559&view=rev Log: [NTOS]: Start using colored pages. This will help performance on real systems significantly as cache is now taken into account by the memory manager. Also radically changes the way page allocations are given out and creates a less uniform physical memory layout. The fact this now works means that the PFN lists are finally now sane. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Thu Nov 11 13:15:40 2010 @@ -356,18 +356,15 @@ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(MmAvailablePages != 0); ASSERT(Color < MmSecondaryColors); -#if 0 + /* Check the colored free list */ PageIndex = MmFreePagesByColor[FreePageList][Color].Flink; - DPRINT1("Found free page: %lx\n", PageIndex); if (PageIndex == LIST_HEAD) { /* Check the colored zero list */ PageIndex = MmFreePagesByColor[ZeroedPageList][Color].Flink; - DPRINT1("Found zero page: %lx\n", PageIndex); if (PageIndex == LIST_HEAD) { -#endif /* Check the free list */ ASSERT_LIST_INVARIANT(&MmFreePageListHead); PageIndex = MmFreePageListHead.Flink; @@ -385,10 +382,9 @@ ASSERT(MmZeroedPageListHead.Total == 0); } } -#if 0 } } -#endif + /* Remove the page from its list */ PageIndex = MiRemovePageByColor(PageIndex, Color); @@ -419,11 +415,9 @@ ASSERT(Color < MmSecondaryColors); /* Check the colored zero list */ -#if 0 PageIndex = MmFreePagesByColor[ZeroedPageList][Color].Flink; if (PageIndex == LIST_HEAD) { -#endif /* Check the zero list */ ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); PageIndex = MmZeroedPageListHead.Flink; @@ -433,12 +427,11 @@ /* This means there's no zero pages, we have to look for free ones */ ASSERT(MmZeroedPageListHead.Total == 0); Zero = TRUE; -#if 0 + /* Check the colored free list */ PageIndex = MmFreePagesByColor[FreePageList][Color].Flink; if (PageIndex == LIST_HEAD) { -#endif /* Check the free list */ ASSERT_LIST_INVARIANT(&MmFreePageListHead); PageIndex = MmFreePageListHead.Flink; @@ -449,13 +442,9 @@ /* FIXME: Should check the standby list */ ASSERT(MmZeroedPageListHead.Total == 0); } -#if 0 } -#endif } -#if 0 - } -#endif + } /* Sanity checks */ Pfn1 = MI_PFN_ELEMENT(PageIndex);

1 0

[sir_richard] 49558: [NTOS]: Use MI_PFN_ELEMENT in this code, as the extra checks done by MiGetPfnEntry are irrelevant and slow things down. [NTOS]: Remove some old ReactOS hacks before we had MMRO...
by sir_richard＠svn.reactos.org 11 Nov '10

11 Nov '10

Author: sir_richard Date: Thu Nov 11 13:13:05 2010 New Revision: 49558 URL: http://svn.reactos.org/svn/reactos?rev=49558&view=rev Log: [NTOS]: Use MI_PFN_ELEMENT in this code, as the extra checks done by MiGetPfnEntry are irrelevant and slow things down. [NTOS]: Remove some old ReactOS hacks before we had MMROSPFNDATA. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Thu Nov 11 13:13:05 2010 @@ -113,7 +113,7 @@ if (OldFlink != LIST_HEAD) { /* It is not, so set the backlink of the actual entry, to our backlink */ - MiGetPfnEntry(OldFlink)->u2.Blink = OldBlink; + MI_PFN_ELEMENT(OldFlink)->u2.Blink = OldBlink; } else { @@ -125,7 +125,7 @@ if (OldBlink != LIST_HEAD) { /* It is not, so set the backlink of the actual entry, to our backlink */ - MiGetPfnEntry(OldBlink)->u1.Flink = OldFlink; + MI_PFN_ELEMENT(OldBlink)->u1.Flink = OldFlink; } else { @@ -149,7 +149,7 @@ if (ColorTable->Flink != LIST_HEAD) { /* And make the previous link point to the head now */ - MiGetPfnEntry(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD; + MI_PFN_ELEMENT(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD; } else { @@ -163,14 +163,14 @@ ASSERT(Entry->u4.PteFrame != COLORED_LIST_HEAD); /* Make the back link point to whoever the next page is */ - Pfn1 = MiGetPfnEntry(Entry->u4.PteFrame); + Pfn1 = MI_PFN_ELEMENT(Entry->u4.PteFrame); Pfn1->OriginalPte.u.Long = Entry->OriginalPte.u.Long; /* Check if this page was pointing to the head */ if (Entry->OriginalPte.u.Long != LIST_HEAD) { /* Make the back link point to the head */ - Pfn1 = MiGetPfnEntry(Entry->OriginalPte.u.Long); + Pfn1 = MI_PFN_ELEMENT(Entry->OriginalPte.u.Long); Pfn1->u4.PteFrame = Entry->u4.PteFrame; } else @@ -235,7 +235,7 @@ ASSERT(Color < MmSecondaryColors); /* Get the PFN entry */ - Pfn1 = MiGetPfnEntry(PageIndex); + Pfn1 = MI_PFN_ELEMENT(PageIndex); ASSERT(Pfn1->u3.e1.RemovalRequested == 0); ASSERT(Pfn1->u3.e1.Rom == 0); @@ -260,7 +260,7 @@ if (OldFlink != LIST_HEAD) { /* It is not, so set the backlink of the actual entry, to our backlink */ - MiGetPfnEntry(OldFlink)->u2.Blink = OldBlink; + MI_PFN_ELEMENT(OldFlink)->u2.Blink = OldBlink; } else { @@ -272,7 +272,7 @@ if (OldBlink != LIST_HEAD) { /* It is not, so set the backlink of the actual entry, to our backlink */ - MiGetPfnEntry(OldBlink)->u1.Flink = OldFlink; + MI_PFN_ELEMENT(OldBlink)->u1.Flink = OldFlink; } else { @@ -306,7 +306,7 @@ else { /* The list is empty, so we are the first page */ - MiGetPfnEntry(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD; + MI_PFN_ELEMENT(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD; } /* One less page */ @@ -393,7 +393,7 @@ PageIndex = MiRemovePageByColor(PageIndex, Color); /* Sanity checks */ - Pfn1 = MiGetPfnEntry(PageIndex); + Pfn1 = MI_PFN_ELEMENT(PageIndex); ASSERT((Pfn1->u3.e1.PageLocation == FreePageList) || (Pfn1->u3.e1.PageLocation == ZeroedPageList)); ASSERT(Pfn1->u3.e2.ReferenceCount == 0); @@ -458,13 +458,13 @@ #endif /* Sanity checks */ - Pfn1 = MiGetPfnEntry(PageIndex); + Pfn1 = MI_PFN_ELEMENT(PageIndex); ASSERT((Pfn1->u3.e1.PageLocation == FreePageList) || (Pfn1->u3.e1.PageLocation == ZeroedPageList)); /* Remove the page from its list */ PageIndex = MiRemovePageByColor(PageIndex, Color); - ASSERT(Pfn1 == MiGetPfnEntry(PageIndex)); + ASSERT(Pfn1 == MI_PFN_ELEMENT(PageIndex)); /* Zero it, if needed */ if (Zero) MiZeroPhysicalPage(PageIndex); @@ -497,7 +497,7 @@ (PageFrameIndex >= MmLowestPhysicalPage)); /* Get the PFN entry */ - Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); /* Sanity checks that a right kind of page is being inserted here */ ASSERT(Pfn1->u4.MustBeCached == 0); @@ -516,7 +516,7 @@ if (LastPage != LIST_HEAD) { /* Link us with the previous page, so we're at the end now */ - MiGetPfnEntry(LastPage)->u1.Flink = PageFrameIndex; + MI_PFN_ELEMENT(LastPage)->u1.Flink = PageFrameIndex; } else { @@ -571,19 +571,15 @@ /* Get the previous page */ Blink = (PMMPFN)ColorTable->Blink; - /* Make it link to us */ + /* Make it link to us, and link back to it */ + Blink->OriginalPte.u.Long = PageFrameIndex; Pfn1->u4.PteFrame = MiGetPfnEntryIndex(Blink); - - /* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */ - ASSERT(Blink->u4.AweAllocation == FALSE); - Blink->OriginalPte.u.Long = PageFrameIndex; } /* Now initialize our own list pointers */ ColorTable->Blink = Pfn1; - /* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */ - ASSERT(Pfn1->u4.AweAllocation == FALSE); + /* This page is now the last */ Pfn1->OriginalPte.u.Long = LIST_HEAD; /* And increase the count in the colored list */ @@ -627,7 +623,7 @@ (PageFrameIndex >= MmLowestPhysicalPage)); /* Page should be unused */ - Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); ASSERT(Pfn1->u3.e2.ReferenceCount == 0); ASSERT(Pfn1->u3.e1.Rom != 1); @@ -651,7 +647,7 @@ if (Flink != LIST_HEAD) { /* It wasn't, so update the backlink of the previous head page */ - Pfn2 = MiGetPfnEntry(Flink); + Pfn2 = MI_PFN_ELEMENT(Flink); Pfn2->u2.Blink = PageFrameIndex; } else @@ -691,9 +687,6 @@ /* Get the old head */ Flink = ColorHead->Flink; - /* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */ - ASSERT(Pfn1->u4.AweAllocation == FALSE); - /* Make this page point back to the list, and point forwards to the old head */ Pfn1->OriginalPte.u.Long = Flink; Pfn1->u4.PteFrame = COLORED_LIST_HEAD; @@ -705,7 +698,7 @@ if (Flink != LIST_HEAD) { /* No, so make the old head point to this page */ - Pfn2 = MiGetPfnEntry(Flink); + Pfn2 = MI_PFN_ELEMENT(Flink); Pfn2->u4.PteFrame = PageFrameIndex; } else @@ -737,7 +730,7 @@ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); /* Setup the PTE */ - Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); Pfn1->PteAddress = PointerPte; /* Check if this PFN is part of a valid address space */ @@ -788,7 +781,7 @@ Pfn1->u4.PteFrame = PageFrameIndex; /* Increase its share count so we don't get rid of it */ - Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); Pfn1->u2.ShareCount++; } @@ -842,8 +835,8 @@ IN PFN_NUMBER PageFrameIndex) { ASSERT(PageFrameIndex > 0); - ASSERT(MiGetPfnEntry(PageFrameIndex) != NULL); - ASSERT(Pfn1 == MiGetPfnEntry(PageFrameIndex)); + ASSERT(MI_PFN_ELEMENT(PageFrameIndex) != NULL); + ASSERT(Pfn1 == MI_PFN_ELEMENT(PageFrameIndex)); ASSERT(MI_IS_ROS_PFN(Pfn1) == FALSE); /* Page must be in-use */ @@ -880,13 +873,7 @@ /* Clear the last reference */ Pfn1->u3.e2.ReferenceCount = 0; - - /* - * OriginalPte is used by AweReferenceCount in ReactOS, but either - * ways we shouldn't be seeing RMAP entries at this point - */ ASSERT(Pfn1->OriginalPte.u.Soft.Prototype == 0); - ASSERT(Pfn1->u4.AweAllocation == FALSE); /* Mark the page temporarily as valid, we're going to make it free soon */ Pfn1->u3.e1.PageLocation = ActiveAndValid; @@ -912,7 +899,7 @@ /* Sanity checks on the page */ ASSERT(PageFrameIndex < MmHighestPhysicalPage); - ASSERT(Pfn1 == MiGetPfnEntry(PageFrameIndex)); + ASSERT(Pfn1 == MI_PFN_ELEMENT(PageFrameIndex)); ASSERT(Pfn1->u3.e2.ReferenceCount != 0); /* Dereference the page, bail out if it's still alive */ @@ -954,7 +941,7 @@ PMMPFN Pfn1; /* Setup the PTE */ - Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); Pfn1->PteAddress = PointerPte; /* Make this a software PTE */ @@ -975,7 +962,7 @@ Pfn1->u4.PteFrame = PteFrame; /* Increase its share count so we don't get rid of it */ - Pfn1 = MiGetPfnEntry(PteFrame); + Pfn1 = MI_PFN_ELEMENT(PteFrame); Pfn1->u2.ShareCount++; } }

1 0

[sir_richard] 49557: [NTOS]: Fix a bug in MiRemovePageByColor which caused corruption of the page list and could lead to crashes, re-use of freed memory, assuming active memory was free, etc.
by sir_richard＠svn.reactos.org 11 Nov '10

11 Nov '10

Author: sir_richard Date: Thu Nov 11 13:08:41 2010 New Revision: 49557 URL: http://svn.reactos.org/svn/reactos?rev=49557&view=rev Log: [NTOS]: Fix a bug in MiRemovePageByColor which caused corruption of the page list and could lead to crashes, re-use of freed memory, assuming active memory was free, etc. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Thu Nov 11 13:08:41 2010 @@ -265,7 +265,7 @@ else { /* Set the list head's backlink instead */ - ListHead->Blink = OldFlink; + ListHead->Blink = OldBlink; } /* Check if the back entry is the list head */

1 0

[sir_richard] 49556: [NTOS]: Fix another bug in the continuous memory allocation code, which would go off-by-one while looping the PFN entries for the allocation, and corrupt the PteFrame/PteAddres...
by sir_richard＠svn.reactos.org 11 Nov '10

11 Nov '10

Author: sir_richard Date: Thu Nov 11 13:05:52 2010 New Revision: 49556 URL: http://svn.reactos.org/svn/reactos?rev=49556&view=rev Log: [NTOS]: Fix another bug in the continuous memory allocation code, which would go off-by-one while looping the PFN entries for the allocation, and corrupt the PteFrame/PteAddress of an unrelated PFN entry. If this PFN was in the active lists, it would cause page table leaks and faults, if the page was on a free list, it would override the colored list backlink and corrupt the list, later causing unlinked pages to remain linked to the list. Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/contmem.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] Thu Nov 11 13:05:52 2010 @@ -79,7 +79,6 @@ // if (MiIsPfnInUse(Pfn1)) { - //DPRINT1("In use: reset\n"); Length = 0; continue; } @@ -94,7 +93,6 @@ // // It does not, so bail out // - //DPRINT1("Doesn't match restrictions: reset\n"); continue; } @@ -368,7 +366,7 @@ /* Write the PTE address */ Pfn1->PteAddress = PointerPte; Pfn1->u4.PteFrame = PFN_FROM_PTE(MiAddressToPte(PointerPte++)); - } while (Pfn1++ < EndPfn); + } while (++Pfn1 < EndPfn); /* Return the address */ return BaseAddress;

1 0

[arty] 49555: Part 1 of fixes: For some reason beyond me, I had abbreviated MiCowSectionPage to always assume CoW rather than always not CoW for cache sections. Make sure we're looking for cache ty...
by arty＠svn.reactos.org 11 Nov '10

11 Nov '10

Author: arty Date: Thu Nov 11 08:15:50 2010 New Revision: 49555 URL: http://svn.reactos.org/svn/reactos?rev=49555&view=rev Log: Part 1 of fixes: For some reason beyond me, I had abbreviated MiCowSectionPage to always assume CoW rather than always not CoW for cache sections. Make sure we're looking for cache type sections rather than (as we were in the branch) data file sections. More needed. Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Thu Nov 11 08:15:50 2010 @@ -107,7 +107,7 @@ PMEMORY_AREA MemoryArea; PMM_CACHE_SECTION_SEGMENT Segment; LARGE_INTEGER FileOffset = *FileOffsetPtr, End, FirstMapped; - DPRINT1("MiZeroFillSection(Address %x,Offset %x,Length %x)\n", Address, FileOffset.LowPart, Length); + DPRINT("MiZeroFillSection(Address %x,Offset %x,Length %x)\n", Address, FileOffset.LowPart, Length); AddressSpace = MmGetKernelAddressSpace(); MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); @@ -178,13 +178,14 @@ PFN_NUMBER Page; PPFN_NUMBER Pages; - DPRINT1("MiFlushMappedSection(%x,%08x,%x,%d,%s:%d)\n", BaseAddress, BaseOffset->LowPart, FileSize, WriteData, File, Line); + DPRINT("MiFlushMappedSection(%x,%08x,%x,%d,%s:%d)\n", BaseAddress, BaseOffset->LowPart, FileSize, WriteData, File, Line); MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); - if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) + if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_CACHE) { MmUnlockAddressSpace(AddressSpace); + DPRINT("STATUS_NOT_MAPPED_DATA\n"); return STATUS_NOT_MAPPED_DATA; } BeginningAddress = PAGE_ROUND_DOWN((ULONG_PTR)MemoryArea->StartingAddress); @@ -205,6 +206,8 @@ { ASSERT(FALSE); } + + DPRINT("Getting pages in range %08x-%08x\n", BeginningAddress, EndingAddress); for (PageAddress = BeginningAddress; PageAddress < EndingAddress; Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Thu Nov 11 08:15:50 2010 @@ -247,7 +247,7 @@ * Lock the segment */ MmLockCacheSectionSegment(Segment); - + /* * Find the offset of the page */ @@ -255,6 +255,44 @@ Offset.QuadPart = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.CacheData.ViewOffset.QuadPart; +#if 0 // XXX Cache sections are not CoW. For now, treat all access violations this way. + if ((!Segment->WriteCopy && + !MemoryArea->Data.CacheData.WriteCopyView) || + Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED) +#endif + { +#if 0 // XXX Cache sections don't have regions at present, which streamlines things + if (Region->Protect == PAGE_READWRITE || + Region->Protect == PAGE_EXECUTE_READWRITE) +#endif + { + DPRINTC("setting non-cow page %x %x:%x offset %x (%x) to writable\n", Segment, Process, PAddress, Offset.u.LowPart, MmGetPfnForProcess(Process, Address)); + if (Segment->FileObject) + { + DPRINTC("file %wZ\n", &Segment->FileObject->FileName); + } + ULONG Entry = MiGetPageEntryCacheSectionSegment(Segment, &Offset); + DPRINT("Entry %x\n", Entry); + if (Entry && + !IS_SWAP_FROM_SSE(Entry) && + PFN_FROM_SSE(Entry) == MmGetPfnForProcess(Process, Address)) { + MiSetPageEntryCacheSectionSegment(Segment, &Offset, DIRTY_SSE(Entry)); + } + MmSetPageProtect(Process, PAddress, PAGE_READWRITE); + MmUnlockCacheSectionSegment(Segment); + DPRINT("Done\n"); + return STATUS_SUCCESS; + } +#if 0 + else + { + DPRINT("Not supposed to be writable\n"); + MmUnlockCacheSectionSegment(Segment); + return STATUS_ACCESS_VIOLATION; + } +#endif + } + if (!Required->Page[0]) { SWAPENTRY SwapEntry;

1 0

[tkreuzer] 49554: [CMAKE] Create importlibs from spec files for kernel32, advapi32, gdi32, user32 and msvcrt calc now compiles with MSVC and works (slightly buggy)
by tkreuzer＠svn.reactos.org 10 Nov '10

10 Nov '10

Author: tkreuzer Date: Wed Nov 10 22:50:21 2010 New Revision: 49554 URL: http://svn.reactos.org/svn/reactos?rev=49554&view=rev Log: [CMAKE] Create importlibs from spec files for kernel32, advapi32, gdi32, user32 and msvcrt calc now compiles with MSVC and works (slightly buggy) Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Wed Nov 10 22:50:21 2010 @@ -66,5 +66,5 @@ add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE}) add_cab_target(advapi32 1) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/advapi32.def) +add_importlib_target(advapi32.spec libntdll) Modified: branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] Wed Nov 10 22:50:21 2010 @@ -54,4 +54,4 @@ add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) add_cab_target(gdi32 1) -add_importlib_target(gdi32.def) +add_importlib_target(gdi32.spec) Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Wed Nov 10 22:50:21 2010 @@ -121,4 +121,4 @@ add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) add_dependencies(kernel32 errcodes) add_cab_target(kernel32 1) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/kernel32.def) +add_importlib_target(kernel32.spec) Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Wed Nov 10 22:50:21 2010 @@ -34,5 +34,5 @@ add_pch(msvcrt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_importlibs(msvcrt kernel32 ntdll) add_cab_target(msvcrt 1) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/msvcrt.def) +add_importlib_target(msvcrt.spec) Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Wed Nov 10 22:50:21 2010 @@ -84,5 +84,5 @@ add_pch(user32 ${CMAKE_CURRENT_SOURCE_DIR}/include/user32.h ${SOURCE}) add_importlibs(user32 gdi32 advapi32 imm32 kernel32 ntdll) add_cab_target(user32 1) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/user32.def) +add_importlib_target(user32.spec)

1 0

[tkreuzer] 49553: [MSVCRT] Don't export linux stuff from our precious MSVCRT [MINGW] Bring back _matherr()
by tkreuzer＠svn.reactos.org 10 Nov '10

10 Nov '10

Author: tkreuzer Date: Wed Nov 10 22:43:46 2010 New Revision: 49553 URL: http://svn.reactos.org/svn/reactos?rev=49553&view=rev Log: [MSVCRT] Don't export linux stuff from our precious MSVCRT [MINGW] Bring back _matherr() Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec branches/cmake-bringup/lib/3rdparty/mingw/merr.c Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Wed Nov 10 22:43:46 2010 @@ -599,7 +599,6 @@ @ cdecl _makepath(ptr str str str str) @ cdecl _makepath_s(ptr long str str str str) # stub _malloc_dbg -@ cdecl _matherr(ptr) @ cdecl _mbbtombc(long) # stub _mbbtombc_l @ cdecl _mbbtype(long long) Modified: branches/cmake-bringup/lib/3rdparty/mingw/merr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/merr.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/merr.c [iso-8859-1] Wed Nov 10 22:43:46 2010 @@ -10,7 +10,6 @@ int __defaultmatherr = 0; -#if 0 int __CRTDECL _matherr (struct _exception *pexcept) { @@ -51,5 +50,3 @@ type, pexcept->name, pexcept->arg1, pexcept->arg2, pexcept->retval); return 0; } - -#endif

1 0

[jgardou] 49552: [HEADERS] - start using our own c++ headers and forward stlport ones to them in msvc build. - fix fpecode declaration for MSVC. [CMAKE] - cardlib is a cpp library. Now stlport comp...
by jgardou＠svn.reactos.org 10 Nov '10

10 Nov '10

Author: jgardou Date: Wed Nov 10 22:20:05 2010 New Revision: 49552 URL: http://svn.reactos.org/svn/reactos?rev=49552&view=rev Log: [HEADERS] - start using our own c++ headers and forward stlport ones to them in msvc build. - fix fpecode declaration for MSVC. [CMAKE] - cardlib is a cpp library. Now stlport compiles with msvc. Added: branches/cmake-bringup/include/c++/ (with props) branches/cmake-bringup/include/c++/cfloat (with props) branches/cmake-bringup/include/c++/climits (with props) branches/cmake-bringup/include/c++/clocale (with props) branches/cmake-bringup/include/c++/cmath (with props) branches/cmake-bringup/include/c++/cstddef (with props) branches/cmake-bringup/include/c++/cstdio (with props) branches/cmake-bringup/include/c++/cstdlib (with props) branches/cmake-bringup/include/c++/cstring (with props) branches/cmake-bringup/include/c++/ctime (with props) branches/cmake-bringup/include/c++/cwchar (with props) branches/cmake-bringup/include/c++/exception (with props) branches/cmake-bringup/include/c++/new (with props) branches/cmake-bringup/include/c++/typeinfo (with props) Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/include/crt/float.h branches/cmake-bringup/include/stlport/stl/_cstdlib.h branches/cmake-bringup/include/stlport/stl/config/user_config.h branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -123,6 +123,13 @@ macro(set_cpp) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/stlport) set(IS_CPP 1) + add_definitions( + -D_STLP_NATIVE_CPP_C_INCLUDE_PATH=../c++ + -D_STLP_NATIVE_C_INCLUDE_PATH=../crt + -D_STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH=../c++ + -D_STLP_USE_NEW_C_HEADERS + -D_STLP_NO_TYPEINFO + ) endmacro() MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd Propchange: branches/cmake-bringup/include/c++/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Nov 10 22:20:05 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/cmake-bringup/include/c++/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/cmake-bringup/include/c++/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/cmake-bringup/include/c++/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/cmake-bringup/include/c++/cfloat URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/c… ============================================================================== --- branches/cmake-bringup/include/c++/cfloat (added) +++ branches/cmake-bringup/include/c++/cfloat [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,9 @@ +// C++ forwarding C float header. + +// +// ISO C++ 14882: 18.2.2 Implementation properties: C library +// + +#pragma once + +#include <float.h> Propchange: branches/cmake-bringup/include/c++/cfloat ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/c++/climits URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/c… ============================================================================== --- branches/cmake-bringup/include/c++/climits (added) +++ branches/cmake-bringup/include/c++/climits [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,17 @@ +// C limitations + +#pragma once + +#include <limits.h> + +#ifndef LLONG_MIN +#define LLONG_MIN (-__LONG_LONG_MAX__ - 1) +#endif + +#ifndef LLONG_MAX +#define LLONG_MAX __LONG_LONG_MAX__ +#endif + +#ifndef ULLONG_MAX +#define ULLONG_MAX (__LONG_LONG_MAX__ * 2ULL + 1) +#endif Propchange: branches/cmake-bringup/include/c++/climits ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/c++/clocale URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/c… ============================================================================== --- branches/cmake-bringup/include/c++/clocale (added) +++ branches/cmake-bringup/include/c++/clocale [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,16 @@ +// C++ forwarding C locale header. + +#pragma once + +#include <locale.h> + +// Get rid of those macros defined in <locale.h> in lieu of real functions. +#undef setlocale +#undef localeconv + +namespace std +{ + using ::lconv; + using ::setlocale; + using ::localeconv; +} Propchange: branches/cmake-bringup/include/c++/clocale ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/c++/cmath URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/c… ============================================================================== --- branches/cmake-bringup/include/c++/cmath (added) +++ branches/cmake-bringup/include/c++/cmath [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,292 @@ +//Standard C++ math declarations + +#pragma once + +#include <math.h> + +// Get rid of those macros defined in <math.h> in lieu of real functions. +#undef abs +#undef div +#undef acos +#undef asin +#undef atan +#undef atan2 +#undef ceil +#undef cos +#undef cosh +#undef exp +#undef fabs +#undef floor +#undef fmod +#undef frexp +#undef ldexp +#undef log +#undef log10 +#undef modf +#undef pow +#undef sin +#undef sinh +#undef sqrt +#undef tan +#undef tanh + +namespace std +{ + // Forward declaration of a helper function. This really should be + // an `exported' forward declaration. + template<typename _Tp> + _Tp __cmath_power(_Tp, unsigned int); + + template<typename _Tp> + inline _Tp + __pow_helper(_Tp __x, int __n) + { + return __n < 0 + ? _Tp(1)/__cmath_power(__x, -__n) + : __cmath_power(__x, __n); + } + + inline double + abs(double __x) + { return fabs(__x); } + + inline float + abs(float __x) + { return fabsf(__x); } + + inline long double + abs(long double __x) + { return fabsl(__x); } + + using ::acos; + + inline float + acos(float __x) + { return acosf(__x); } + + inline long double + acos(long double __x) + { return acosl(__x); } + + using ::asin; + + inline float + asin(float __x) + { return asinf(__x); } + + inline long double + asin(long double __x) + { return asinl(__x); } + + using ::atan; + + inline float + atan(float __x) + { return atanf(__x); } + + inline long double + atan(long double __x) + { return atanl(__x); } + + using ::atan2; + + inline float + atan2(float __y, float __x) + { return atan2f(__y, __x); } + + inline long double + atan2(long double __y, long double __x) + { return atan2l(__y, __x); } + + using ::ceil; + + inline float + ceil(float __x) + { return ceilf(__x); } + + inline long double + ceil(long double __x) + { return ceill(__x); } + + using ::cos; + + inline float + cos(float __x) + { return cosf(__x); } + + inline long double + cos(long double __x) + { return cosl(__x); } + + using ::cosh; + + inline float + cosh(float __x) + { return coshf(__x); } + + inline long double + cosh(long double __x) + { return coshl(__x); } + + using ::exp; + + inline float + exp(float __x) + { return expf(__x); } + + inline long double + exp(long double __x) + { return expl(__x); } + + using ::fabs; + + inline float + fabs(float __x) + { return fabsf(__x); } + + inline long double + fabs(long double __x) + { return fabsl(__x); } + + using ::floor; + + inline float + floor(float __x) + { return floorf(__x); } + + inline long double + floor(long double __x) + { return floorl(__x); } + + using ::fmod; + + inline float + fmod(float __x, float __y) + { return fmodf(__x, __y); } + + inline long double + fmod(long double __x, long double __y) + { return fmodl(__x, __y); } + + using ::frexp; + + inline float + frexp(float __x, int* __exp) + { return frexpf(__x, __exp); } + + inline long double + frexp(long double __x, int* __exp) + { return frexpl(__x, __exp); } + + using ::ldexp; + + inline float + ldexp(float __x, int __exp) + { return ldexpf(__x, __exp); } + + inline long double + ldexp(long double __x, int __exp) + { return ldexpl(__x, __exp); } + + using ::log; + + inline float + log(float __x) + { return logf(__x); } + + inline long double + log(long double __x) + { return logl(__x); } + + using ::log10; + + inline float + log10(float __x) + { return log10f(__x); } + + inline long double + log10(long double __x) + { return log10l(__x); } + + using ::modf; + + inline float + modf(float __x, float* __iptr) + { return modff(__x, __iptr); } + + inline long double + modf(long double __x, long double* __iptr) + { return modfl(__x, __iptr); } + + using ::pow; + + inline float + pow(float __x, float __y) + { return powf(__x, __y); } + + inline long double + pow(long double __x, long double __y) + { return powl(__x, __y); } + + inline double + pow(double __x, int __i) + { return pow(__x, static_cast<double>(__i)); } + + inline float + pow(float __x, int __n) + { return powf(__x, static_cast<float>(__n)); } + + inline long double + pow(long double __x, int __n) + { return powl(__x, static_cast<long double>(__n)); } + + using ::sin; + + inline float + sin(float __x) + { return sinf(__x); } + + inline long double + sin(long double __x) + { return sinl(__x); } + + using ::sinh; + + inline float + sinh(float __x) + { return sinhf(__x); } + + inline long double + sinh(long double __x) + { return sinhl(__x); } + + using ::sqrt; + + inline float + sqrt(float __x) + { return sqrtf(__x); } + + inline long double + sqrt(long double __x) + { return sqrtl(__x); } + + using ::tan; + + inline float + tan(float __x) + { return tanf(__x); } + + inline long double + tan(long double __x) + { return tanl(__x); } + + using ::tanh; + + inline float + tanh(float __x) + { return tanhf(__x); } + + inline long double + tanh(long double __x) + { return tanhl(__x); } +} Propchange: branches/cmake-bringup/include/c++/cmath ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/c++/cstddef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/c… ============================================================================== --- branches/cmake-bringup/include/c++/cstddef (added) +++ branches/cmake-bringup/include/c++/cstddef [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,11 @@ +// ISO C++ standards definitions + +#include <stddef.h> + +#pragma once + +namespace std +{ + using ::ptrdiff_t; + using ::size_t; +} Propchange: branches/cmake-bringup/include/c++/cstddef ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/c++/cstdio URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/c… ============================================================================== --- branches/cmake-bringup/include/c++/cstdio (added) +++ branches/cmake-bringup/include/c++/cstdio [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,97 @@ +// C++ forwarding C stdio header. + +#pragma once + +#include <cstddef> +#include <stdio.h> + +// Get rid of those macros defined in <stdio.h> in lieu of real functions. +#undef clearerr +#undef fclose +#undef feof +#undef ferror +#undef fflush +#undef fgetc +#undef fgetpos +#undef fgets +#undef fopen +#undef fprintf +#undef fputc +#undef fputs +#undef fread +#undef freopen +#undef fscanf +#undef fseek +#undef fsetpos +#undef ftell +#undef fwrite +#undef getc +#undef getchar +#undef gets +#undef perror +#undef printf +#undef putc +#undef putchar +#undef puts +#undef remove +#undef rename +#undef rewind +#undef scanf +#undef setbuf +#undef setvbuf +#undef sprintf +#undef sscanf +#undef tmpfile +#undef tmpnam +#undef ungetc +#undef vfprintf +#undef vprintf +#undef vsprintf + +namespace std +{ + using ::FILE; + using ::fpos_t; + + using ::clearerr; + using ::fclose; + using ::feof; + using ::ferror; + using ::fflush; + using ::fgetc; + using ::fgetpos; + using ::fgets; + using ::fopen; + using ::fprintf; + using ::fputc; + using ::fputs; + using ::fread; + using ::freopen; + using ::fscanf; + using ::fseek; + using ::fsetpos; + using ::ftell; + using ::fwrite; + using ::getc; + using ::getchar; + using ::gets; + using ::perror; + using ::printf; + using ::putc; + using ::putchar; + using ::puts; + using ::remove; + using ::rename; + using ::rewind; + using ::scanf; + using ::setbuf; + using ::setvbuf; + using ::sprintf; + using ::sscanf; + using ::tmpfile; + using ::tmpnam; + using ::ungetc; + using ::vfprintf; + using ::vprintf; + using ::vsprintf; +} Propchange: branches/cmake-bringup/include/c++/cstdio ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/c++/cstdlib URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/c… ============================================================================== --- branches/cmake-bringup/include/c++/cstdlib (added) +++ branches/cmake-bringup/include/c++/cstdlib [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,77 @@ +// Standard C library declarations + +#pragma once + +#include <cstddef> +#include <stdlib.h> + +// Get rid of those macros defined in <stdlib.h> in lieu of real functions. +#undef abort +#undef abs +#undef atexit +#undef atof +#undef atoi +#undef atol +#undef bsearch +#undef calloc +#undef div +#undef exit +#undef free +#undef getenv +#undef labs +#undef ldiv +#undef malloc +#undef mblen +#undef mbstowcs +#undef mbtowc +#undef qsort +#undef rand +#undef realloc +#undef srand +#undef strtod +#undef strtol +#undef strtoul +#undef system +#undef wcstombs +#undef wctomb + +namespace std +{ + using ::div_t; + using ::ldiv_t; + + using ::abort; + using ::abs; + using ::atexit; + using ::atof; + using ::atoi; + using ::atol; + using ::bsearch; + using ::calloc; + using ::div; + using ::exit; + using ::free; + using ::getenv; + using ::labs; + using ::ldiv; + using ::malloc; + using ::mblen; + using ::mbstowcs; + using ::mbtowc; + using ::qsort; + using ::rand; + using ::realloc; + using ::srand; + using ::strtod; + using ::strtol; + using ::strtoul; + using ::system; + using ::wcstombs; + using ::wctomb; + + inline long + abs(long __i) { return labs(__i); } + + inline ldiv_t + div(long __i, long __j) { return ldiv(__i, __j); } +} Propchange: branches/cmake-bringup/include/c++/cstdlib ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/c++/cstring URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/c… ============================================================================== --- branches/cmake-bringup/include/c++/cstring (added) +++ branches/cmake-bringup/include/c++/cstring [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,60 @@ +// Standard C string declarations for C++ + +// +// ISO C++ 14882: 20.4.6 C library +// + +#pragma once + +#include <cstddef> +#include <string.h> + +// Get rid of those macros defined in <string.h> in lieu of real functions. +#undef memchr +#undef memcmp +#undef memcpy +#undef memmove +#undef memset +#undef strcat +#undef strchr +#undef strcmp +#undef strcoll +#undef strcpy +#undef strcspn +#undef strerror +#undef strlen +#undef strncat +#undef strncmp +#undef strncpy +#undef strpbrk +#undef strrchr +#undef strspn +#undef strstr +#undef strtok +#undef strxfrm + +namespace std +{ + using ::memchr; + using ::memcmp; + using ::memcpy; + using ::memmove; + using ::memset; + using ::strcat; + using ::strcmp; + using ::strcoll; + using ::strcpy; + using ::strcspn; + using ::strerror; + using ::strlen; + using ::strncat; + using ::strncmp; + using ::strncpy; + using ::strspn; + using ::strtok; + using ::strxfrm; + using ::strchr; + using ::strpbrk; + using ::strrchr; + using ::strstr; +} Propchange: branches/cmake-bringup/include/c++/cstring ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/c++/ctime URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/c… ============================================================================== --- branches/cmake-bringup/include/c++/ctime (added) +++ branches/cmake-bringup/include/c++/ctime [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,34 @@ +// ISO C++ date and time declarations + +#include <cstddef> +#include <time.h> + +#pragma once + +// Get rid of those macros defined in <time.h> in lieu of real functions. +#undef clock +#undef difftime +#undef mktime +#undef time +#undef asctime +#undef ctime +#undef gmtime +#undef localtime +#undef strftime + +namespace std +{ + using ::clock_t; + using ::time_t; + using ::tm; + + using ::clock; + using ::difftime; + using ::mktime; + using ::time; + using ::asctime; + using ::ctime; + using ::gmtime; + using ::localtime; + using ::strftime; +} Propchange: branches/cmake-bringup/include/c++/ctime ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/c++/cwchar URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/c… ============================================================================== --- branches/cmake-bringup/include/c++/cwchar (added) +++ branches/cmake-bringup/include/c++/cwchar [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,152 @@ +// C++ wchar forwarding header + +#pragma once + +#include <cstddef> + +#include <wchar.h> + +namespace std +{ + using ::mbstate_t; +} + +// Get rid of those macros defined in <wchar.h> in lieu of real functions. +#undef btowc +#undef fgetwc +#undef fgetws +#undef fputwc +#undef fputws +#undef fwide +#undef fwprintf +#undef fwscanf +#undef getwc +#undef getwchar +#undef mbrlen +#undef mbrtowc +#undef mbsinit +#undef mbsrtowcs +#undef putwc +#undef putwchar +#undef swprintf +#undef swscanf +#undef ungetwc +#undef vfwprintf +#undef vfwscanf +#undef vswprintf +#undef vswscanf +#undef vwprintf +#undef vwscanf +#undef wcrtomb +#undef wcscat +#undef wcschr +#undef wcscmp +#undef wcscoll +#undef wcscpy +#undef wcscspn +#undef wcsftime +#undef wcslen +#undef wcsncat +#undef wcsncmp +#undef wcsncpy +#undef wcspbrk +#undef wcsrchr +#undef wcsrtombs +#undef wcsspn +#undef wcsstr +#undef wcstod +#undef wcstof +#undef wcstok +#undef wcstol +#undef wcstoul +#undef wcsxfrm +#undef wctob +#undef wmemchr +#undef wmemcmp +#undef wmemcpy +#undef wmemmove +#undef wmemset +#undef wprintf +#undef wscanf + +namespace std +{ + using ::wint_t; + + using ::btowc; + using ::fgetwc; + using ::fgetws; + using ::fputwc; + using ::fputws; + using ::fwide; + using ::fwprintf; + using ::fwscanf; + using ::getwc; + using ::getwchar; + using ::mbrlen; + using ::mbrtowc; + using ::mbsinit; + using ::mbsrtowcs; + using ::putwc; + using ::putwchar; + using ::swprintf; + using ::swscanf; + using ::ungetwc; + using ::vfwprintf; + using ::vfwscanf; + using ::vswprintf; + using ::vswscanf; + using ::vwprintf; + using ::vwscanf; + using ::wcrtomb; + using ::wcscat; + using ::wcscmp; + using ::wcscoll; + using ::wcscpy; + using ::wcscspn; + using ::wcsftime; + using ::wcslen; + using ::wcsncat; + using ::wcsncmp; + using ::wcsncpy; + using ::wcsrtombs; + using ::wcsspn; + using ::wcstod; + using ::wcstof; + using ::wcstok; + using ::wcstol; + using ::wcstoul; + using ::wcsxfrm; + using ::wctob; + using ::wmemcmp; + using ::wmemcpy; + using ::wmemmove; + using ::wmemset; + using ::wprintf; + using ::wscanf; + using ::wcschr; + using ::wcspbrk; + using ::wcsrchr; + using ::wcsstr; + using ::wmemchr; + + inline wchar_t* + wcschr(wchar_t* __p, wchar_t __c) + { return wcschr(const_cast<const wchar_t*>(__p), __c); } + + inline wchar_t* + wcspbrk(wchar_t* __s1, const wchar_t* __s2) + { return wcspbrk(const_cast<const wchar_t*>(__s1), __s2); } + + inline wchar_t* + wcsrchr(wchar_t* __p, wchar_t __c) + { return wcsrchr(const_cast<const wchar_t*>(__p), __c); } + + inline wchar_t* + wcsstr(wchar_t* __s1, const wchar_t* __s2) + { return wcsstr(const_cast<const wchar_t*>(__s1), __s2); } + + inline wchar_t* + wmemchr(wchar_t* __p, wchar_t __c, size_t __n) + { return wmemchr(const_cast<const wchar_t*>(__p), __c, __n); } +} Propchange: branches/cmake-bringup/include/c++/cwchar ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/c++/exception URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/e… ============================================================================== --- branches/cmake-bringup/include/c++/exception (added) +++ branches/cmake-bringup/include/c++/exception [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,66 @@ +// Exception Handling support header for -*- C++ -*- + +#ifndef __EXCEPTION__ +#define __EXCEPTION__ + +extern "C++" { + +namespace std +{ + /** + * @defgroup exceptions Exceptions + * @ingroup diagnostics + * + * Classes and functions for reporting errors via exception classes. + * @{ + */ + + /** + * @brief Base class for all library exceptions. + * + * This is the base class for all exceptions thrown by the standard + * library, and by certain language expressions. You are free to derive + * your own %exception classes, or use a different hierarchy, or to + * throw non-class data (e.g., fundamental types). + */ + class exception + { + public: + exception() throw() { } + virtual ~exception() throw(); + + /** Returns a C-style character string describing the general cause + * of the current error. */ + virtual const char* what() const throw(); + }; + + /** If an %exception is thrown which is not listed in a function's + * %exception specification, one of these may be thrown. */ + class bad_exception : public exception + { + public: + bad_exception() throw() { } + + virtual ~bad_exception() throw(); + + virtual const char* what() const throw(); + }; + + typedef void (*unexpected_handler) (); + + unexpected_handler set_unexpected(unexpected_handler) throw(); + + DECLSPEC_NORETURN void unexpected(); + + bool uncaught_exception() throw(); + + // @} group exceptions +} // namespace std + +typedef void (*terminate_handler) (); +terminate_handler set_terminate(terminate_handler) throw(); +DECLSPEC_NORETURN void terminate() throw(); + +} // extern "C++" + +#endif Propchange: branches/cmake-bringup/include/c++/exception ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/c++/new URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/n… ============================================================================== --- branches/cmake-bringup/include/c++/new (added) +++ branches/cmake-bringup/include/c++/new [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,51 @@ +// Standard C++ dynamic memory management header + +#ifndef _NEW +#define _NEW + +#include <cstddef> +#include <exception> + +extern "C++" { + +namespace std +{ + class bad_alloc : public exception + { + public: + bad_alloc() throw() { } + + // This declaration is not useless: + // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118 + virtual ~bad_alloc() throw(); + + // See comment in eh_exception.cc. + virtual const char* what() const throw(); + }; + + struct nothrow_t { }; + + extern const nothrow_t nothrow; +} // namespace std + +typedef void (*new_handler)(); + +new_handler set_new_handler(new_handler) throw(); + +void* operator new (std::size_t size) throw (std::bad_alloc); +void* operator new (std::size_t size, const std::nothrow_t& nothrow_constant) throw(); +void* operator new (std::size_t size, void* ptr) throw(); +void* operator new[] (std::size_t size) throw (std::bad_alloc); +void* operator new[] (std::size_t size, const std::nothrow_t& nothrow_constant) throw(); +void* operator new[] (std::size_t size, void* ptr) throw(); + +void operator delete (void* ptr) throw (); +void operator delete (void* ptr, const std::nothrow_t& nothrow_constant) throw(); +void operator delete (void* ptr, void* voidptr2) throw(); +void operator delete[] (void* ptr) throw (); +void operator delete[] (void* ptr, const std::nothrow_t& nothrow_constant) throw(); +void operator delete[] (void* ptr, void* voidptr2) throw(); +//@} +} // extern "C++" + +#endif Propchange: branches/cmake-bringup/include/c++/new ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/c++/typeinfo URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/t… ============================================================================== --- branches/cmake-bringup/include/c++/typeinfo (added) +++ branches/cmake-bringup/include/c++/typeinfo [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,0 +1,48 @@ +// RTTI support for C++ + +#ifndef _TYPEINFO +#define _TYPEINFO + +#include <exception> + +extern "C++" { + +namespace std +{ + + class type_info { + public: + virtual ~type_info(); + bool before (const type_info& rhs) const; + { return __name < __arg.__name; } + bool operator==(const type_info& __arg) const + { return __name == __arg.__name; } + bool operator!=(const type_info& __arg) const + { return !operator==(__arg); } + const char* name() const; + protected: + const char* __name; + private: + type_info (const type_info& rhs); + type_info& operator= (const type_info& rhs); + }; + + class bad_cast : public exception + { + public: + bad_cast() throw() { } + virtual ~bad_cast() throw(); + virtual const char* what() const throw(); + }; + + class bad_typeid : public exception + { + public: + bad_typeid () throw() { } + virtual ~bad_typeid() throw(); + virtual const char* what() const throw(); + }; +} // namespace std + +} // extern "C++" +#endif Propchange: branches/cmake-bringup/include/c++/typeinfo ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/float… ============================================================================== --- branches/cmake-bringup/include/crt/float.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/float.h [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -127,7 +127,7 @@ void __cdecl __MINGW_NOTHROW fpreset (void); /* Global 'variable' for the current floating point error code. */ -_CRTIMP int * __cdecl __MINGW_NOTHROW __fpecode(void); +__MINGW_NOTHROW _CRTIMP int * __cdecl __fpecode(void); #define _fpecode (*(__fpecode())) /* Modified: branches/cmake-bringup/include/stlport/stl/_cstdlib.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/stlport/s… ============================================================================== --- branches/cmake-bringup/include/stlport/stl/_cstdlib.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/stlport/stl/_cstdlib.h [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -154,8 +154,8 @@ inline _STLP_LONG_LONG abs(_STLP_LONG_LONG __x) { return ::llabs(__x); } inline lldiv_t div(_STLP_LONG_LONG __x, _STLP_LONG_LONG __y) { return ::lldiv(__x, __y); } # endif -# else -inline _STLP_LONG_LONG abs(_STLP_LONG_LONG __x) { return __x < 0 ? -__x : __x; } +/*# else +inline _STLP_LONG_LONG abs(_STLP_LONG_LONG __x) { return __x < 0 ? -__x : __x; }*/ # endif #endif Modified: branches/cmake-bringup/include/stlport/stl/config/user_config.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/stlport/s… ============================================================================== --- branches/cmake-bringup/include/stlport/stl/config/user_config.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/stlport/stl/config/user_config.h [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -202,9 +202,7 @@ * a Microsoft Visual Studio release. This change native C/C++ library location * and implementation, please define this to get correct STLport configuration. */ -/* #define _STLP_USING_PLATFORM_SDK_COMPILER 1 -*/ /* * Some compilers support the automatic linking feature. Modified: branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/card… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] Wed Nov 10 22:20:05 2010 @@ -1,3 +1,5 @@ + +set_cpp() list(APPEND SOURCE cardbitmaps.cpp

1 0

[tkreuzer] 49551: [CRT] Add pragma function for _wcsset on MSVC builds
by tkreuzer＠svn.reactos.org 10 Nov '10

10 Nov '10

Author: tkreuzer Date: Wed Nov 10 22:15:10 2010 New Revision: 49551 URL: http://svn.reactos.org/svn/reactos?rev=49551&view=rev Log: [CRT] Add pragma function for _wcsset on MSVC builds Modified: branches/cmake-bringup/lib/sdk/crt/string/wcs.c Modified: branches/cmake-bringup/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/wcs.c [iso-8859-1] Wed Nov 10 22:15:10 2010 @@ -46,6 +46,10 @@ #undef vsnprintf #undef vprintf #undef vwprintf + +#ifdef _MSC_VER +#pragma function(_wcsset) +#endif #ifndef _LIBCNT_ /*********************************************************************

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