Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 57211: [CMAKE] * Improve this one while we're at it.
by akhaldi＠svn.reactos.org 01 Sep '12

01 Sep '12

Author: akhaldi Date: Sat Sep 1 11:37:24 2012 New Revision: 57211 URL: http://svn.reactos.org/svn/reactos?rev=57211&view=rev Log: [CMAKE] * Improve this one while we're at it. Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sat Sep 1 11:37:24 2012 @@ -10,7 +10,7 @@ add_subdirectory(ntdll) add_subdirectory(powrprof) add_subdirectory(user32) -if(NOT MSVC AND ARCH STREQUAL "i386") +if((NOT MSVC) AND (ARCH STREQUAL "i386")) add_subdirectory(w32kdll) add_subdirectory(w32knapi) endif()

1 0

[akhaldi] 57210: [CMAKE] * Addendum to r57181. By Hermès Bélusca.
by akhaldi＠svn.reactos.org 01 Sep '12

01 Sep '12

Author: akhaldi Date: Sat Sep 1 11:35:12 2012 New Revision: 57210 URL: http://svn.reactos.org/svn/reactos?rev=57210&view=rev Log: [CMAKE] * Addendum to r57181. By Hermès Bélusca. Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake trunk/rostests/apitests/ntdll/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sat Sep 1 11:35:12 2012 @@ -10,7 +10,7 @@ add_subdirectory(ntdll) add_subdirectory(powrprof) add_subdirectory(user32) -if(NOT MSVC AND ARCH MATCHES i386) +if(NOT MSVC AND ARCH STREQUAL "i386") add_subdirectory(w32kdll) add_subdirectory(w32knapi) endif() Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/crtdll_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] Sat Sep 1 11:35:12 2012 @@ -525,7 +525,7 @@ # wscanf.c ) -if (ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE_CRTDLL # _CIpow.c # _ftol.c @@ -542,7 +542,7 @@ # _aullshr.c # _chkstk.c ) -elseif (ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE_CRTDLL # __C_specific_handler # _setjmp.c Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Sat Sep 1 11:35:12 2012 @@ -1263,7 +1263,7 @@ # wscanf_s.c ) -if (ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE_MSVCRT # _CIacos.c # _CIasin.c @@ -1350,7 +1350,7 @@ # _seh_longjmp_unwind.c # -norelay _setjmp3.c ) -elseif (ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE_MSVCRT # __C_specific_handler # _setjmp.c Modified: trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/ntdll_crt_ap… ============================================================================== --- trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] Sat Sep 1 11:35:12 2012 @@ -124,7 +124,7 @@ # wcstoul.c ) -if (ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE_NTDLL # _CIpow.c # _ftol.c @@ -141,7 +141,7 @@ # _aullshr.c # _chkstk.c ) -elseif (ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE_NTDLL # __C_specific_handler # _setjmp.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat Sep 1 11:35:12 2012 @@ -16,7 +16,7 @@ ZwContinue.c testlist.c) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE i386/ZwContinue.S) endif()

1 0

[ion] 57209: [NTOSKRNL]: Cleanup MmCreateArm3Section a little bit to handle file-backed sections in the future. [NTOSKRNL]: Remove an ASSERT(FALSE) that was only there for testing. [NTOSKRNL]: Supp...
by ion＠svn.reactos.org 01 Sep '12

01 Sep '12

Author: ion Date: Sat Sep 1 02:32:25 2012 New Revision: 57209 URL: http://svn.reactos.org/svn/reactos?rev=57209&view=rev Log: [NTOSKRNL]: Cleanup MmCreateArm3Section a little bit to handle file-backed sections in the future. [NTOSKRNL]: Remove an ASSERT(FALSE) that was only there for testing. [NTOSKRNL]: Support transition pages during prototype PTE faults, which is our first try at soft faults! Should fix ASSERTs that were seen in the previous attempts in ole32, corrupting the registry. [NTOSKRNL]: It's fine for MiCreatePagingFileMap to fail in MmCreateSection -- don't assert and simply return failure. Should fix the ASSERTs taht were seen in KmTest. [NTOSKRNL]: Enable richard's ARM3 section code unconditionally for all non-file backed sections. Works4me. Let's see what Testbot says. Nobody has showed me how to use/where is PatchBot, and google founds 0 relevant results, so this is going into main again. However I'm actually home this week to revert if something goes wrong :) Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sat Sep 1 02:32:25 2012 @@ -980,8 +980,51 @@ else if ((TempPte.u.Soft.Prototype == 0) && (TempPte.u.Soft.Transition == 1)) { - /* No standby support yet */ - ASSERT(FALSE); + /* This is a standby page, bring it back from the cache */ + PageFrameIndex = TempPte.u.Trans.PageFrameNumber; + DPRINT1("oooh, shiny, a soft fault! 0x%lx\n", PageFrameIndex); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); + ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); + + /* Should not yet happen in ReactOS */ + ASSERT(Pfn1->u3.e1.ReadInProgress == 0); + ASSERT(Pfn1->u4.InPageError == 0); + + /* Get the page */ + MiUnlinkPageFromList(Pfn1); + + /* Bump its reference count */ + ASSERT(Pfn1->u2.ShareCount == 0); + InterlockedIncrement16((PSHORT)&Pfn1->u3.e2.ReferenceCount); + Pfn1->u2.ShareCount++; + + /* Make it valid again */ + /* This looks like another macro.... */ + Pfn1->u3.e1.PageLocation = ActiveAndValid; + ASSERT(PointerProtoPte->u.Hard.Valid == 0); + ASSERT(PointerProtoPte->u.Trans.Prototype == 0); + ASSERT(PointerProtoPte->u.Trans.Transition == 1); + TempPte.u.Long = (PointerProtoPte->u.Long & ~0xFFF) | + MmProtectToPteMask[PointerProtoPte->u.Trans.Protection]; + TempPte.u.Hard.Valid = 1; + TempPte.u.Hard.Accessed = 1; + + /* Is the PTE writeable? */ + if (((Pfn1->u3.e1.Modified) && (TempPte.u.Hard.Write)) && + (TempPte.u.Hard.CopyOnWrite == 0)) + { + /* Make it dirty */ + TempPte.u.Hard.Dirty = TRUE; + } + else + { + /* Make it clean */ + TempPte.u.Hard.Dirty = FALSE; + } + + /* Write the valid PTE */ + MI_WRITE_VALID_PTE(PointerProtoPte, TempPte); + ASSERT(PointerPte->u.Hard.Valid == 0); } else { 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] Sat Sep 1 02:32:25 2012 @@ -1335,7 +1335,6 @@ } /* Check to see which list this page should go into */ - ASSERT(FALSE); if (Pfn1->u3.e1.Modified == 1) { /* Push it into the modified page list */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sat Sep 1 02:32:25 2012 @@ -894,10 +894,10 @@ ASSERT(ActualPages <= PageCount); /* Release the working set lock */ -// MiUnlockWorkingSet(PsGetCurrentThread(), +// MiUnlockWorkingSet(PsGetCurrentThread(), // &MmSessionSpace->GlobalVirtualAddress->Vm); - + /* If we did at least one page... */ if (ActualPages) { @@ -974,7 +974,7 @@ { /* Create the PDEs needed for this mapping */ Status = MiSessionCommitPageTables(Base, - (PVOID)((ULONG_PTR)Base + + (PVOID)((ULONG_PTR)Base + Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE)); NT_ASSERT(NT_SUCCESS(Status)); } @@ -1243,6 +1243,37 @@ return STATUS_SUCCESS; } +VOID +NTAPI +MiSubsectionConsistent(IN PSUBSECTION Subsection) +{ + /* ReactOS only supports systems with 4K pages and 4K sectors */ + ASSERT(Subsection->u.SubsectionFlags.SectorEndOffset == 0); + + /* Therefore, then number of PTEs should be equal to the number of sectors */ + if (Subsection->NumberOfFullSectors != Subsection->PtesInSubsection) + { + /* Break and warn if this is inconsistent */ + DPRINT1("Mm: Subsection inconsistent (%x vs %x)\n", + Subsection->NumberOfFullSectors, Subsection->PtesInSubsection); + DbgBreakPoint(); + } +} + +NTSTATUS +NTAPI +MiCreateDataFileMap(IN PFILE_OBJECT File, + OUT PSEGMENT *Segment, + IN PSIZE_T MaximumSize, + IN ULONG SectionPageProtection, + IN ULONG AllocationAttributes, + IN ULONG IgnoreFileSizing) +{ + /* Not yet implemented */ + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS NTAPI MiCreatePagingFileMap(OUT PSEGMENT *Segment, @@ -2048,15 +2079,15 @@ SECTION Section; PSECTION NewSection; PSUBSECTION Subsection; - PSEGMENT NewSegment; + PSEGMENT NewSegment, Segment; NTSTATUS Status; PCONTROL_AREA ControlArea; - ULONG ProtectionMask; - - /* ARM3 does not yet support this */ - ASSERT(FileHandle == NULL); - ASSERT(FileObject == NULL); - ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); + ULONG ProtectionMask, ControlAreaSize, Size, NonPagedCharge, PagedCharge; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + BOOLEAN FileLock = FALSE, KernelCall = FALSE; + KIRQL OldIrql; + PFILE_OBJECT File; + PVOID PreviousSectionPointer; /* Make the same sanity checks that the Nt interface should've validated */ ASSERT((AllocationAttributes & ~(SEC_COMMIT | SEC_RESERVE | SEC_BASED | @@ -2079,53 +2110,229 @@ ProtectionMask = MiMakeProtectionMask(SectionPageProtection); if (ProtectionMask == MM_INVALID_PROTECTION) return STATUS_INVALID_PAGE_PROTECTION; - /* A handle must be supplied with SEC_IMAGE, and this is the no-handle path */ - if (AllocationAttributes & SEC_IMAGE) return STATUS_INVALID_FILE_FOR_SECTION; - - /* So this must be a pagefile-backed section, create the mappings needed */ - Status = MiCreatePagingFileMap(&NewSegment, - (PSIZE_T)InputMaximumSize, - ProtectionMask, - AllocationAttributes); - ASSERT(NT_SUCCESS(Status)); - ASSERT(NewSegment != NULL); + /* Check if this is going to be a data or image backed file section */ + if ((FileHandle) || (FileObject)) + { + /* These cannot be mapped with large pages */ + if (AllocationAttributes & SEC_LARGE_PAGES) return STATUS_INVALID_PARAMETER_6; + + /* For now, only support the mechanism through a file handle */ + ASSERT(FileObject == NULL); + + /* Reference the file handle to get the object */ + Status = ObReferenceObjectByHandle(FileHandle, + MmMakeFileAccess[ProtectionMask], + IoFileObjectType, + PreviousMode, + (PVOID*)&File, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Make sure Cc has been doing its job */ + if (!File->SectionObjectPointer) + { + /* This is not a valid file system-based file, fail */ + ObDereferenceObject(File); + return STATUS_INVALID_FILE_FOR_SECTION; + } + + /* Image-file backed sections are not yet supported */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + + /* Compute the size of the control area, and allocate it */ + ControlAreaSize = sizeof(CONTROL_AREA) + sizeof(MSUBSECTION); + ControlArea = ExAllocatePoolWithTag(NonPagedPool, ControlAreaSize, 'aCmM'); + if (!ControlArea) + { + ObDereferenceObject(File); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Zero it out */ + RtlZeroMemory(ControlArea, ControlAreaSize); + + /* Did we get a handle, or an object? */ + if (FileHandle) + { + /* We got a file handle so we have to lock down the file */ +#if 0 + Status = FsRtlAcquireToCreateMappedSection(File, SectionPageProtection); + if (!NT_SUCCESS(Status)) + { + ExFreePool(ControlArea); + ObDereferenceObject(File); + return Status; + } +#else + /* ReactOS doesn't support this API yet, so do nothing */ + Status = STATUS_SUCCESS; +#endif + /* Update the top-level IRP so that drivers know what's happening */ + IoSetTopLevelIrp((PIRP)FSRTL_FSP_TOP_LEVEL_IRP); + FileLock = TRUE; + } + + /* Lock the PFN database while we play with the section pointers */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Image-file backed sections are not yet supported */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + + /* There should not already be a control area for this file */ + ASSERT(File->SectionObjectPointer->DataSectionObject == NULL); + NewSegment = NULL; + + /* Write down that this CA is being created, and set it */ + ControlArea->u.Flags.BeingCreated = TRUE; + PreviousSectionPointer = File->SectionObjectPointer; + File->SectionObjectPointer->DataSectionObject = ControlArea; + + /* We can release the PFN lock now */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* We don't support previously-mapped file */ + ASSERT(NewSegment == NULL); + + /* Image-file backed sections are not yet supported */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + + /* So we always create a data file map */ + Status = MiCreateDataFileMap(File, + &Segment, + (PSIZE_T)InputMaximumSize, + SectionPageProtection, + AllocationAttributes, + KernelCall); + ASSERT(PreviousSectionPointer == File->SectionObjectPointer); + ASSERT(NT_SUCCESS(Status)); + + /* Check if a maximum size was specified */ + if (!InputMaximumSize->QuadPart) + { + /* Nope, use the segment size */ + Section.SizeOfSection.QuadPart = (LONGLONG)Segment->SizeOfSegment; + } + else + { + /* Yep, use the entered size */ + Section.SizeOfSection.QuadPart = InputMaximumSize->QuadPart; + } + + } + else + { + /* A handle must be supplied with SEC_IMAGE, as this is the no-handle path */ + if (AllocationAttributes & SEC_IMAGE) return STATUS_INVALID_FILE_FOR_SECTION; + + /* Not yet supported */ + ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); + + /* So this must be a pagefile-backed section, create the mappings needed */ + Status = MiCreatePagingFileMap(&NewSegment, + (PSIZE_T)InputMaximumSize, + ProtectionMask, + AllocationAttributes); + if (!NT_SUCCESS(Status)) return Status; + + /* Set the size here, and read the control area */ + Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; + ControlArea = NewSegment->ControlArea; + } + + /* Did we already have a segment? */ + if (!NewSegment) + { + /* This must be the file path and we created a segment */ + NewSegment = Segment; + ASSERT(File != NULL); + + /* Acquire the PFN lock while we set control area flags */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* We don't support this race condition yet, so assume no waiters */ + ASSERT(ControlArea->WaitingForDeletion == NULL); + ControlArea->WaitingForDeletion = NULL; + + /* Image-file backed sections are not yet supported, nor ROM images */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + ASSERT(Segment->ControlArea->u.Flags.Rom == 0); + + /* Take off the being created flag, and then release the lock */ + ControlArea->u.Flags.BeingCreated = FALSE; + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } + + /* Check if we locked the file earlier */ + if (FileLock) + { + /* Reset the top-level IRP and release the lock */ + IoSetTopLevelIrp(NULL); + //FsRtlReleaseFile(File); + FileLock = FALSE; + } /* Set the initial section object data */ Section.InitialPageProtection = SectionPageProtection; - Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; + + /* The mapping created a control area and segment, save the flags */ Section.Segment = NewSegment; - - /* THe mapping created a control area and segment, save the flags */ - ControlArea = NewSegment->ControlArea; Section.u.LongFlags = ControlArea->u.LongFlags; - /* ARM3 cannot support these right now, make sure they're not being set */ - ASSERT(ControlArea->u.Flags.Image == 0); - ASSERT(ControlArea->FilePointer == NULL); + /* Check if this is a user-mode read-write non-image file mapping */ + if (!(FileObject) && + (SectionPageProtection & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE)) && + (ControlArea->u.Flags.Image == 0) && + (ControlArea->FilePointer != NULL)) + { + /* Add a reference and set the flag */ + Section.u.Flags.UserWritable = 1; + InterlockedIncrement((PLONG)&ControlArea->WritableUserReferences); + } + + /* Check for image mappings or page file mappings */ + if ((ControlArea->u.Flags.Image == 1) || !(ControlArea->FilePointer)) + { + /* Charge the segment size, and allocate a subsection */ + PagedCharge = sizeof(SECTION) + NewSegment->TotalNumberOfPtes * sizeof(MMPTE); + Size = sizeof(SUBSECTION); + } + else + { + /* Charge nothing, and allocate a mapped subsection */ + PagedCharge = 0; + Size = sizeof(MSUBSECTION); + } + + /* Check if this is a normal CA */ ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); ASSERT(ControlArea->u.Flags.Rom == 0); - ASSERT(ControlArea->u.Flags.WasPurged == 0); - - /* A pagefile-backed mapping only has one subsection, and this is all ARM3 supports */ + + /* Charge only a CA, and the subsection is right after */ + NonPagedCharge = sizeof(CONTROL_AREA); Subsection = (PSUBSECTION)(ControlArea + 1); + + /* We only support single-subsection mappings */ + NonPagedCharge += Size; ASSERT(Subsection->NextSubsection == NULL); /* Create the actual section object, with enough space for the prototype PTEs */ - Status = ObCreateObject(ExGetPreviousMode(), + Status = ObCreateObject(PreviousMode, MmSectionObjectType, ObjectAttributes, - ExGetPreviousMode(), + PreviousMode, NULL, sizeof(SECTION), - sizeof(SECTION) + - NewSegment->TotalNumberOfPtes * sizeof(MMPTE), - sizeof(CONTROL_AREA) + sizeof(SUBSECTION), + PagedCharge, + NonPagedCharge, (PVOID*)&NewSection); ASSERT(NT_SUCCESS(Status)); /* Now copy the local section object from the stack into this new object */ RtlCopyMemory(NewSection, &Section, sizeof(SECTION)); NewSection->Address.StartingVpn = 0; + + /* For now, only user calls are supported */ + ASSERT(KernelCall == FALSE); NewSection->u.Flags.UserReference = TRUE; /* Migrate the attribute into a flag */ @@ -2170,6 +2377,13 @@ /* Finally release the lock */ KeReleaseGuardedMutex(&MmSectionBasedMutex); } + + /* Write down if this was a kernel call */ + ControlArea->u.Flags.WasPurged |= KernelCall; + ASSERT(ControlArea->u.Flags.WasPurged == FALSE); + + /* Make sure the segment and the section are the same size, or the section is smaller */ + ASSERT(NewSection->SizeOfSection.QuadPart <= NewSection->Segment->SizeOfSegment); /* Return the object and the creation status */ *SectionObject = (PVOID)NewSection; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Sep 1 02:32:25 2012 @@ -4860,17 +4860,19 @@ PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* Check if an ARM3 section is being created instead */ - if (AllocationAttributes & 1) + if (!(AllocationAttributes & SEC_IMAGE) && (AllocationAttributes)) { - DPRINT1("Creating ARM3 section\n"); - return MmCreateArm3Section(Section, - DesiredAccess, - ObjectAttributes, - MaximumSize, - SectionPageProtection, - AllocationAttributes &~ 1, - FileHandle, - FileObject); + if (!(FileObject) && !(FileHandle)) + { + return MmCreateArm3Section(Section, + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes &~ 1, + FileHandle, + FileObject); + } } /*

1 0

[tkreuzer] 57208: [CRT_APITEST] Fix broken test.
by tkreuzer＠svn.reactos.org 31 Aug '12

31 Aug '12

Author: tkreuzer Date: Fri Aug 31 17:20:56 2012 New Revision: 57208 URL: http://svn.reactos.org/svn/reactos?rev=57208&view=rev Log: [CRT_APITEST] Fix broken test. Modified: trunk/rostests/apitests/crt/_vscwprintf.c Modified: trunk/rostests/apitests/crt/_vscwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] Fri Aug 31 17:20:56 2012 @@ -16,13 +16,14 @@ /* Test the basic functionality */ va_start(args, formatString); ret = _vscwprintf(formatString, args); - ok(expected_ret == ret, "Test failed: expected %i, got %i.\n", expected_ret, ret); + ok(expected_ret == ret, "expected %i, got %i.\n", expected_ret, ret); } START_TEST(_vscwprintf) { /* Lesson of the day: don't mix wide and ansi char */ - call_varargs(19, L"%s world!", "hello"); + /* Lesson of the week: don't ignore the lesson of the day */ + call_varargs(12, L"%hs world!", "hello"); call_varargs(12, L"%s world!", L"hello"); call_varargs(17, L"Jack ate %u pies", 100); /* Do not test NULL argument. That is verified to SEGV on a */

1 0

[mnordell] 57207: Stop erroneous reporting of SEGV from test case. MS own CRT SEGV on NULL format string
by mnordell＠svn.reactos.org 31 Aug '12

31 Aug '12

Author: mnordell Date: Fri Aug 31 14:16:17 2012 New Revision: 57207 URL: http://svn.reactos.org/svn/reactos?rev=57207&view=rev Log: Stop erroneous reporting of SEGV from test case. MS own CRT SEGV on NULL format string Modified: trunk/rostests/apitests/crt/_vscprintf.c trunk/rostests/apitests/crt/_vscwprintf.c Modified: trunk/rostests/apitests/crt/_vscprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] Fri Aug 31 14:16:17 2012 @@ -25,7 +25,6 @@ call_varargs(12, "%S world!", L"hello"); call_varargs(12, "%s world!", "hello"); call_varargs(11, "%u cookies", 100); - /* Test NULL argument */ - call_varargs(-1, NULL); - ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); + /* Do not test NULL argument. That is verified to SEGV on a */ + /* release-build with VC10 and MS' msvcrt. */ } Modified: trunk/rostests/apitests/crt/_vscwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] Fri Aug 31 14:16:17 2012 @@ -25,10 +25,6 @@ call_varargs(19, L"%s world!", "hello"); call_varargs(12, L"%s world!", L"hello"); call_varargs(17, L"Jack ate %u pies", 100); - - /* Test NULL argument */ - call_varargs(-1, NULL); -#if defined(TEST_MSVCRT) /* NTDLL doesn't use/set errno */ - ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); -#endif + /* Do not test NULL argument. That is verified to SEGV on a */ + /* release-build with VC10 and MS' msvcrt. */ }

1 0

[tkreuzer] 57206: Fix build
by tkreuzer＠svn.reactos.org 30 Aug '12

30 Aug '12

Author: tkreuzer Date: Thu Aug 30 10:16:13 2012 New Revision: 57206 URL: http://svn.reactos.org/svn/reactos?rev=57206&view=rev Log: Fix build Modified: trunk/reactos/lib/sdk/crt/string/is_wctype.c Modified: trunk/reactos/lib/sdk/crt/string/is_wctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/is_wcty… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/is_wctype.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/is_wctype.c [iso-8859-1] Thu Aug 30 10:16:13 2012 @@ -1,6 +1,6 @@ #include <string.h> -extern const unsigned short wine_wctype_table[]; +int iswctype(wint_t wc, wctype_t wctypeFlags); /* * obsolete

1 0

[tkreuzer] 57205: [FREELDR/CRT] Freeldr size is currently limited to 448 KB. On MSVC it was already at 442 KB, before wine's wctype table was used. The new wctype table is itself 37 KB. This lead t...
by tkreuzer＠svn.reactos.org 30 Aug '12

30 Aug '12

Author: tkreuzer Date: Thu Aug 30 10:12:55 2012 New Revision: 57205 URL: http://svn.reactos.org/svn/reactos?rev=57205&view=rev Log: [FREELDR/CRT] Freeldr size is currently limited to 448 KB. On MSVC it was already at 442 KB, before wine's wctype table was used. The new wctype table is itself 37 KB. This lead to freeldr overflowing into memory regions that were used for the filesystem buffer, causing bootfailures. Fix this by giving freeldr it's own using _isctype(), since freeldr casts WCHAR to CHAR anyway. Added: trunk/reactos/lib/sdk/crt/string/is_wctype.c (with props) trunk/reactos/lib/sdk/crt/string/iswctype.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/lib/sdk/crt/string/ctype.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Thu Aug 30 10:12:55 2012 @@ -57,6 +57,8 @@ } // We need to emulate these, because the original ones don't work in freeldr +// These functions are here, because they need to be in the main compilation unit +// and cannot be in a library. int __cdecl wctomb(char *mbchar, wchar_t wchar) { *mbchar = (char)wchar; @@ -68,3 +70,10 @@ *wchar = (wchar_t)*mbchar; return 1; } + +// The wctype table is 144 KB, too much for poor freeldr +int iswctype(wint_t wc, wctype_t wctypeFlags) +{ + return _isctype((char)wc, wctypeFlags); +} + Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Thu Aug 30 10:12:55 2012 @@ -252,6 +252,8 @@ string/atoi64.c string/atol.c string/ctype.c + string/iswctype.c + string/is_wctype.c string/itoa.c string/itow.c string/scanf.c Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Thu Aug 30 10:12:55 2012 @@ -27,6 +27,8 @@ search/lfind.c stdlib/qsort.c string/ctype.c + string/iswctype.c + string/is_wctype.c string/scanf.c string/strcspn.c string/stricmp.c @@ -182,7 +184,7 @@ endif() add_library(libcntpr ${LIBCNTPR_SOURCE}) -add_target_compile_definitions(libcntpr +add_target_compile_definitions(libcntpr NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ Modified: trunk/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/ctype.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] Thu Aug 30 10:12:55 2012 @@ -587,24 +587,6 @@ /* * @implemented */ -int iswctype(wint_t wc, wctype_t wctypeFlags) -{ - return (wine_wctype_table[wine_wctype_table[wc >> 8] + (wc & 0xff)] & wctypeFlags); -} - -/* - * obsolete - * - * @implemented - */ -int is_wctype(wint_t wc, wctype_t wctypeFlags) -{ - return (wine_wctype_table[wine_wctype_table[wc >> 8] + (wc & 0xff)] & wctypeFlags); -} - -/* - * @implemented - */ int isalpha(int c) { return(_isctype(c, _ALPHA)); Added: trunk/reactos/lib/sdk/crt/string/is_wctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/is_wcty… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/is_wctype.c (added) +++ trunk/reactos/lib/sdk/crt/string/is_wctype.c [iso-8859-1] Thu Aug 30 10:12:55 2012 @@ -1,0 +1,13 @@ +#include <string.h> + +extern const unsigned short wine_wctype_table[]; + +/* + * obsolete + * + * @implemented + */ +int is_wctype(wint_t wc, wctype_t wctypeFlags) +{ + return iswctype(wc, wctypeFlags); +} Propchange: trunk/reactos/lib/sdk/crt/string/is_wctype.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/string/iswctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/iswctyp… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/iswctype.c (added) +++ trunk/reactos/lib/sdk/crt/string/iswctype.c [iso-8859-1] Thu Aug 30 10:12:55 2012 @@ -1,0 +1,12 @@ +#include <string.h> + +extern const unsigned short wine_wctype_table[]; + +/* + * @implemented + */ +int iswctype(wint_t wc, wctype_t wctypeFlags) +{ + return (wine_wctype_table[wine_wctype_table[wc >> 8] + (wc & 0xff)] & wctypeFlags); +} + Propchange: trunk/reactos/lib/sdk/crt/string/iswctype.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 57204: [MESA] - fix build
by jgardou＠svn.reactos.org 30 Aug '12

30 Aug '12

Author: jgardou Date: Thu Aug 30 00:57:44 2012 New Revision: 57204 URL: http://svn.reactos.org/svn/reactos?rev=57204&view=rev Log: [MESA] - fix build Added: trunk/reactos/dll/opengl/mesa/generated/mesa/matypes.h (with props) Added: trunk/reactos/dll/opengl/mesa/generated/mesa/matypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… ============================================================================== --- trunk/reactos/dll/opengl/mesa/generated/mesa/matypes.h (added) +++ trunk/reactos/dll/opengl/mesa/generated/mesa/matypes.h [iso-8859-1] Thu Aug 30 00:57:44 2012 @@ -1,0 +1,162 @@ +/* + * This file is automatically generated from the Mesa internal type + * definitions. Do not edit directly. + */ + +#ifndef __ASM_TYPES_H__ +#define __ASM_TYPES_H__ + + + +/* ============================================================= + * Offsets for struct gl_context + */ + +#define CTX_DRIVER_CTX 880 + +#define CTX_LIGHT_ENABLED 39932 +#define CTX_LIGHT_SHADE_MODEL 39936 +#define CTX_LIGHT_COLOR_MAT_FACE 39944 +#define CTX_LIGHT_COLOR_MAT_MODE 39948 +#define CTX_LIGHT_COLOR_MAT_MASK 39952 +#define CTX_LIGHT_COLOR_MAT_ENABLED 39956 +#define CTX_LIGHT_ENABLED_LIST 39968 +#define CTX_LIGHT_NEED_VERTS 44321 +#define CTX_LIGHT_FLAGS 44324 +#define CTX_LIGHT_BASE_COLOR 44328 + + +/* ============================================================= + * Offsets for struct vertex_buffer + */ + +#define VB_SIZE 0 +#define VB_COUNT 4 + +#define VB_ELTS 8 +#define VB_OBJ_PTR 60 +#define VB_EYE_PTR 12 +#define VB_CLIP_PTR 16 +#define VB_PROJ_CLIP_PTR 20 +#define VB_CLIP_OR_MASK 24 +#define VB_CLIP_MASK 28 +#define VB_NORMAL_PTR 68 +#define VB_EDGE_FLAG 36 +#define VB_TEX0_COORD_PTR 92 +#define VB_TEX1_COORD_PTR 96 +#define VB_TEX2_COORD_PTR 100 +#define VB_TEX3_COORD_PTR 104 +#define VB_INDEX_PTR 84 +#define VB_COLOR_PTR 72 +#define VB_SECONDARY_COLOR_PTR 76 +#define VB_FOG_COORD_PTR 80 +#define VB_PRIMITIVE 52 + + +/* + * Flags for struct vertex_buffer + */ + +#define VERT_BIT_OBJ 0x1 +#define VERT_BIT_NORM 0x4 +#define VERT_BIT_RGBA 0x8 +#define VERT_BIT_SPEC_RGB 0x10 +#define VERT_BIT_FOG_COORD 0x20 +#define VERT_BIT_TEX0 0x100 +#define VERT_BIT_TEX1 0x200 +#define VERT_BIT_TEX2 0x400 +#define VERT_BIT_TEX3 0x800 + + +/* ============================================================= + * Offsets for GLvector4f + */ + +#define V4F_DATA 0 +#define V4F_START 4 +#define V4F_COUNT 8 +#define V4F_STRIDE 12 +#define V4F_SIZE 16 +#define V4F_FLAGS 20 + +/* + * Flags for GLvector4f + */ + +#define VEC_MALLOC 0x10 +#define VEC_NOT_WRITEABLE 0x40 +#define VEC_BAD_STRIDE 0x100 + +#define VEC_SIZE_1 0x1 +#define VEC_SIZE_2 0x3 +#define VEC_SIZE_3 0x7 +#define VEC_SIZE_4 0xf + + +/* ============================================================= + * Offsets for GLmatrix + */ + +#define MATRIX_DATA 0 +#define MATRIX_INV 4 +#define MATRIX_FLAGS 8 +#define MATRIX_TYPE 12 + + +/* ============================================================= + * Offsets for struct gl_light + */ + +#define LIGHT_NEXT 0 +#define LIGHT_PREV 4 + +#define LIGHT_AMBIENT 8 +#define LIGHT_DIFFUSE 24 +#define LIGHT_SPECULAR 40 +#define LIGHT_EYE_POSITION 56 +#define LIGHT_SPOT_DIRECTION 72 +#define LIGHT_SPOT_EXPONENT 88 +#define LIGHT_SPOT_CUTOFF 92 +#define LIGHT_COS_CUTOFF 100 +#define LIGHT_CONST_ATTEN 104 +#define LIGHT_LINEAR_ATTEN 108 +#define LIGHT_QUADRATIC_ATTEN 112 +#define LIGHT_ENABLED 116 + +#define LIGHT_FLAGS 120 + +#define LIGHT_POSITION 124 +#define LIGHT_VP_INF_NORM 140 +#define LIGHT_H_INF_NORM 152 +#define LIGHT_NORM_DIRECTION 164 +#define LIGHT_VP_INF_SPOT_ATTEN 180 + +#define LIGHT_SPOT_EXP_TABLE 184 +#define LIGHT_MAT_AMBIENT 4280 +#define LIGHT_MAT_DIFFUSE 4304 +#define LIGHT_MAT_SPECULAR 4328 + +#define SIZEOF_GL_LIGHT 4352 + +/* + * Flags for struct gl_light + */ + +#define LIGHT_SPOT 0x1 +#define LIGHT_LOCAL_VIEWER 0x2 +#define LIGHT_POSITIONAL 0x4 + +#define LIGHT_NEED_VERTICES 0x6 + + +/* ============================================================= + * Offsets for struct gl_lightmodel + */ + +#define LIGHT_MODEL_AMBIENT 0 +#define LIGHT_MODEL_LOCAL_VIEWER 16 +#define LIGHT_MODEL_TWO_SIDE 17 +#define LIGHT_MODEL_COLOR_CONTROL 20 + + +#endif /* __ASM_TYPES_H__ */ Propchange: trunk/reactos/dll/opengl/mesa/generated/mesa/matypes.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 57203: [LIBMESA] - Use x86 ASM optimizations on GCC - Don't compile useless stuff
by jgardou＠svn.reactos.org 30 Aug '12

30 Aug '12

Author: jgardou Date: Thu Aug 30 00:51:00 2012 New Revision: 57203 URL: http://svn.reactos.org/svn/reactos?rev=57203&view=rev Log: [LIBMESA] - Use x86 ASM optimizations on GCC - Don't compile useless stuff Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/ (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/ (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/Makefile (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/calling_convention.txt (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/x86-64.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/x86-64.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/xform4.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_normal.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform1.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform2.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform3.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform4.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/Makefile (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/assyntax.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/clip_args.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86_asm.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86_asm.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86_features.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/gen_matypes.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/mmx.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/mmx_blend.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/mmx_blendtmp.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/norm_args.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/read_rgba_span_x86.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/read_rgba_span_x86.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/rtasm/ (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/rtasm/x86sse.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/rtasm/x86sse.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_normal.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform1.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform2.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform3.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform4.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_cliptest.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform2.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform3.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform4.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/xform_args.h (with props) Modified: trunk/reactos/dll/opengl/mesa/src/glsl/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mapi/glapi/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_x86.S trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/mesa/src/glsl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/C… Modified: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Modified: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_x86.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/C… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/calling_convention.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/x86-64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/x86-64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_normal.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform1.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform3.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/assyntax.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/clip_args.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86_asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86_features.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/gen_matypes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/mmx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/mmx_blend.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/mmx_blendtmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/norm_args.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/read_rgba_span_x86.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/read_rgba_span_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/rtasm/x86sse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/rtasm/x86sse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_normal.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform1.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform3.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_cliptest.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform3.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/xform_args.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x…

1 0

[spetreolle] 57202: [ROSAPPS] Add the imagesoft CMakeLists.txt (forgotten in previous commit.)
by spetreolle＠svn.reactos.org 29 Aug '12

29 Aug '12

Author: spetreolle Date: Wed Aug 29 21:07:55 2012 New Revision: 57202 URL: http://svn.reactos.org/svn/reactos?rev=57202&view=rev Log: [ROSAPPS] Add the imagesoft CMakeLists.txt (forgotten in previous commit.) Added: trunk/rosapps/applications/imagesoft/CMakeLists.txt (with props) Added: trunk/rosapps/applications/imagesoft/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/CMa… ============================================================================== --- trunk/rosapps/applications/imagesoft/CMakeLists.txt (added) +++ trunk/rosapps/applications/imagesoft/CMakeLists.txt [iso-8859-1] Wed Aug 29 21:07:55 2012 @@ -1,0 +1,25 @@ + +set_rc_compiler() + +list(APPEND SOURCE + about.c + adjust.c + brightness.c + contrast.c + custcombo.c + floatwindow.c + font.c + imagesoft.c + imgedwnd.c + mainwnd.c + misc.c + opensave.c + tooldock.c + imagesoft.rc) + +add_pch(imagesoft precomp.h) +add_executable(imagesoft ${SOURCE}) +set_module_type(imagesoft win32gui UNICODE) +add_importlibs(imagesoft gdi32 user32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) + +add_cd_file(TARGET imagesoft DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/imagesoft/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

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