Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[akhaldi] 48348: [CMAKE] - Add debugsup lib to build.
by akhaldi＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: akhaldi Date: Thu Jul 29 01:53:31 2010 New Revision: 48348 URL: http://svn.reactos.org/svn/reactos?rev=48348&view=rev Log: [CMAKE] - Add debugsup lib to build. Added: branches/cmake-bringup/lib/debugsup/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/CMakeLists.txt Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Thu Jul 29 01:53:31 2010 @@ -7,6 +7,7 @@ add_subdirectory(3rdparty) add_subdirectory(atl) +add_subdirectory(debugsup) add_subdirectory(dnslib) add_subdirectory(drivers) add_subdirectory(epsapi) Added: branches/cmake-bringup/lib/debugsup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/debugsup/CMak… ============================================================================== --- branches/cmake-bringup/lib/debugsup/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/debugsup/CMakeLists.txt [iso-8859-1] Thu Jul 29 01:53:31 2010 @@ -1,0 +1,15 @@ + +ADD_CUSTOM_COMMAND( + OUTPUT ${REACTOS_BINARY_DIR}/lib/debugsup/debugsup_ntdll.a + COMMAND native-winebuild -o ${REACTOS_BINARY_DIR}/lib/debugsup/debugsup-ntos_debugsup_ntdll.stubs.c --pedll ${REACTOS_SOURCE_DIR}/lib/debugsup/debugsup-ntos.spec --filename ntdll.dll + COMMAND ${MINGW_PREFIX}gcc -o ${REACTOS_BINARY_DIR}/lib/debugsup/debugsup-ntos_debugsup_ntdll.stubs.o ${CMAKE_C_FLAGS} -c ${REACTOS_BINARY_DIR}/lib/debugsup/debugsup-ntos_debugsup_ntdll.stubs.c + COMMAND native-winebuild -o ${REACTOS_BINARY_DIR}/lib/debugsup/debugsup-ntos_debugsup_ntdll.auto.def --def -E ${REACTOS_SOURCE_DIR}/lib/debugsup/debugsup-ntos.spec --filename ntdll.dll + COMMAND ${MINGW_PREFIX}dlltool --def ${REACTOS_BINARY_DIR}/lib/debugsup/debugsup-ntos_debugsup_ntdll.auto.def --kill-at --output-lib ${REACTOS_BINARY_DIR}/lib/debugsup/debugsup_ntdll.a + COMMAND ${MINGW_PREFIX}ar -rc ${REACTOS_BINARY_DIR}/lib/debugsup/debugsup_ntdll.a ${REACTOS_BINARY_DIR}/lib/debugsup/debugsup-ntos_debugsup_ntdll.stubs.o + DEPENDS native-winebuild +) + +SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/lib/debugsup/debugsup_ntdll.a PROPERTIES GENERATED TRUE) + +ADD_CUSTOM_TARGET(debugsup_ntdll ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/debugsup/debugsup_ntdll.a) + Propchange: branches/cmake-bringup/lib/debugsup/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48347: [CMAKE] - Add libcntpr lib to build.
by akhaldi＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: akhaldi Date: Thu Jul 29 01:37:53 2010 New Revision: 48347 URL: http://svn.reactos.org/svn/reactos?rev=48347&view=rev Log: [CMAKE] - Add libcntpr lib to build. Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Thu Jul 29 01:37:53 2010 @@ -2,17 +2,129 @@ include_directories(.) include_directories(./include) -add_definitions(-D__MINGW_IMPORT=extern) -add_definitions(-DUSE_MSVCRT_PREFIX) -add_definitions(-D_MSVCRT_LIB_) -add_definitions(-D_MSVCRT_) -add_definitions(-D_MT) add_definitions(-D_CRTBLD) -file(GLOB_RECURSE SOURCE "*.c") -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdio/findgen.c) -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c) +file(GLOB_RECURSE CRT_SOURCE "*.c") +LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdio/findgen.c) +LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c) -add_library(crt ${SOURCE}) +add_library(crt ${CRT_SOURCE}) +set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS -D__MINGW_IMPORT=extern -DUSE_MSVCRT_PREFIX -D_MSVCRT_LIB_ -D_MSVCRT_ -D_MT) +add_dependencies(crt psdk) -add_dependencies(crt psdk) +get_directory_property(defines COMPILE_DEFINITIONS) + +foreach(arg ${defines}) + set(result_defs "${result_defs} -D${arg}") +endforeach(arg ${defines}) + +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> ${result_defs} -D__ASM__ <FLAGS> -c <SOURCE>") + +if(ARCH MATCHES i386) +set(LIBCNTPR_SOURCE + ${CMAKE_CURRENT_SOURCE_DIR}/except/i386/chkstk_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/except/i386/seh.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/alldiv_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/alldvrm_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/allmul_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/allrem_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/allshl_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/allshr_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/atan_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/aulldiv_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/aulldvrm_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/aullrem_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/aullshr_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/ceil_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/cos_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/fabs_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/floor_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/ftol_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/log_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/pow_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/sin_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/sqrt_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/tan_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/math/i386/ci.c + ${CMAKE_CURRENT_SOURCE_DIR}/math/abs.c + ${CMAKE_CURRENT_SOURCE_DIR}/math/div.c + ${CMAKE_CURRENT_SOURCE_DIR}/math/labs.c + ${CMAKE_CURRENT_SOURCE_DIR}/math/rand_nt.c + ${CMAKE_CURRENT_SOURCE_DIR}/mem/i386/memchr_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/mem/i386/memcpy_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/mem/i386/memmove_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/mem/i386/memset_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/mem/memccpy.c + ${CMAKE_CURRENT_SOURCE_DIR}/mem/memcmp.c + ${CMAKE_CURRENT_SOURCE_DIR}/mem/memicmp.c + ${CMAKE_CURRENT_SOURCE_DIR}/search/bsearch.c + ${CMAKE_CURRENT_SOURCE_DIR}/search/lfind.c + ${CMAKE_CURRENT_SOURCE_DIR}/setjmp/i386/setjmp.s + ${CMAKE_CURRENT_SOURCE_DIR}/stdlib/qsort.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strcat_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strchr_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strcmp_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strcpy_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strlen_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strncat_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strncmp_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strncpy_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strnlen_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/strrchr_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcscat_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcschr_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcscmp_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcscpy_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcslen_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcsncat_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcsncmp_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcsncpy_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcsnlen_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/i386/wcsrchr_asm.s + ${CMAKE_CURRENT_SOURCE_DIR}/string/ctype.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/scanf.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/strcspn.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/stricmp.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/strnicmp.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/strlwr.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/strrev.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/strset.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/strstr.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/strupr.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/strpbrk.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/strspn.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/atoi64.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/atoi.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/atol.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/itoa.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/itow.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/mbstowcs_nt.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/splitp.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/strtol.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/strtoul.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/strtoull.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/wcs.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/wcstol.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/wcstombs_nt.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/wcstoul.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/wsplitp.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/wtoi64.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/wtoi.c + ${CMAKE_CURRENT_SOURCE_DIR}/string/wtol.c + ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcsicmp.c + ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcslwr.c + ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcsnicmp.c + ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcsupr.c + ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcscspn.c + ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcsspn.c + ${CMAKE_CURRENT_SOURCE_DIR}/wstring/wcsstr.c +) +else() +#TBD +endif() + +add_library(libcntpr ${LIBCNTPR_SOURCE}) + +set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) + +add_dependencies(libcntpr psdk)

1 0

[tkreuzer] 48346: [NTOS] Implement a new early page allocator MiEarlyAllocPages that allocates the pages from global variables instead of inconsistently allocating them from the either the MxFreeDescriptor or in other places manually removing pages. Instead the MxFreeDescriptor is set to a temporary value, with the consumed pages substracted, while the pfn database is build. This last step will also become obsolete as soon as the pfn database is initialized in a more proper sequence.
by tkreuzer＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: tkreuzer Date: Thu Jul 29 01:01:28 2010 New Revision: 48346 URL: http://svn.reactos.org/svn/reactos?rev=48346&view=rev Log: [NTOS] Implement a new early page allocator MiEarlyAllocPages that allocates the pages from global variables instead of inconsistently allocating them from the either the MxFreeDescriptor or in other places manually removing pages. Instead the MxFreeDescriptor is set to a temporary value, with the consumed pages substracted, while the pfn database is build. This last step will also become obsolete as soon as the pfn database is initialized in a more proper sequence. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Thu Jul 29 01:01:28 2010 @@ -285,7 +285,7 @@ // Now we actually need to get these many physical pages. Nonpaged pool // is actually also physically contiguous (but not the expansion) // - PageFrameIndex = MxGetNextPage(MxPfnAllocation + + PageFrameIndex = MiEarlyAllocPages(MxPfnAllocation + (MmSizeOfNonPagedPoolInBytes >> PAGE_SHIFT)); ASSERT(PageFrameIndex != 0); DPRINT("PFN DB PA PFN begins at: %lx\n", PageFrameIndex); @@ -305,7 +305,7 @@ // // Get a page // - TempPde.u.Hard.PageFrameNumber = MxGetNextPage(1); + TempPde.u.Hard.PageFrameNumber = MiEarlyAllocPages(1); MI_WRITE_VALID_PTE(StartPde, TempPde); // @@ -331,7 +331,7 @@ // // Get a page // - TempPde.u.Hard.PageFrameNumber = MxGetNextPage(1); + TempPde.u.Hard.PageFrameNumber = MiEarlyAllocPages(1); MI_WRITE_VALID_PTE(StartPde, TempPde); // @@ -385,6 +385,10 @@ /* ReactOS Stuff */ KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); + /* Hide the pages, that we already used from the descriptor */ + MxFreeDescriptor->BasePage = MiEarlyAllocBase; + MxFreeDescriptor->PageCount = MiEarlyAllocCount; + /* Build the PFN Database */ MiInitializePfnDatabase(LoaderBlock); MmInitializeBalancer(MmAvailablePages, 0); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Jul 29 01:01:28 2010 @@ -442,6 +442,8 @@ extern PMMPTE MmSharedUserDataPte; extern LIST_ENTRY MmProcessList; extern PFN_NUMBER MiNumberOfFreePages; +extern PFN_NUMBER MiEarlyAllocCount; +extern PFN_NUMBER MiEarlyAllocBase; #define MI_PFN_TO_PFNENTRY(x) (&MmPfnDatabase[1][x]) #define MI_PFNENTRY_TO_PFN(x) (x - MmPfnDatabase[1]) @@ -787,6 +789,12 @@ IN PFN_NUMBER PageCount ); +PFN_NUMBER +NTAPI +MiEarlyAllocPages( + IN PFN_NUMBER PageCount +); + PPHYSICAL_MEMORY_DESCRIPTOR NTAPI MmInitializeMemoryLimits( Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Thu Jul 29 01:01:28 2010 @@ -359,6 +359,7 @@ PFN_NUMBER MiNumberOfFreePages = 0; PFN_NUMBER MiEarlyAllocCount = 0; +PFN_NUMBER MiEarlyAllocBase; ULONG MiNumberDescriptors = 0; /* PRIVATE FUNCTIONS **********************************************************/ @@ -475,29 +476,30 @@ // Save original values of the free descriptor, since it'll be // altered by early allocations MxOldFreeDescriptor = *MxFreeDescriptor; + MiEarlyAllocBase = MxFreeDescriptor->BasePage; } PFN_NUMBER NTAPI -MxGetNextPage(IN PFN_NUMBER PageCount) +MiEarlyAllocPages(IN PFN_NUMBER PageCount) { PFN_NUMBER Pfn; /* Make sure we have enough pages */ - if (PageCount > MxFreeDescriptor->PageCount) + if (PageCount > MiEarlyAllocCount) { /* Crash the system */ KeBugCheckEx(INSTALL_MORE_MEMORY, MmNumberOfPhysicalPages, + MiEarlyAllocCount, MxFreeDescriptor->PageCount, - MxOldFreeDescriptor.PageCount, PageCount); } /* Use our lowest usable free pages */ - Pfn = MxFreeDescriptor->BasePage; - MxFreeDescriptor->BasePage += PageCount; - MxFreeDescriptor->PageCount -= PageCount; + Pfn = MiEarlyAllocBase; + MiEarlyAllocBase += PageCount; + MiEarlyAllocCount -= PageCount; return Pfn; } @@ -576,7 +578,7 @@ if (PointerPte->u.Hard.Valid == 0) { /* Get a page and map it */ - TempPte.u.Hard.PageFrameNumber = MxGetNextPage(1); + TempPte.u.Hard.PageFrameNumber = MiEarlyAllocPages(1); MI_WRITE_VALID_PTE(PointerPte, TempPte); /* Zero out the page */ @@ -665,16 +667,11 @@ NTAPI MiMapPfnDatabase(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - ULONG FreePage, FreePageCount, PagesLeft, BasePage, PageCount; + ULONG BasePage, PageCount; PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; PMMPTE PointerPte, LastPte; MMPTE TempPte = ValidKernelPte; - - /* Get current page data, since we won't be using MxGetNextPage as it would corrupt our state */ - FreePage = MxFreeDescriptor->BasePage; - FreePageCount = MxFreeDescriptor->PageCount; - PagesLeft = 0; /* Loop the memory descriptors */ NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; @@ -693,19 +690,9 @@ continue; } - /* Next, check if this is our special free descriptor we've found */ - if (MdBlock == MxFreeDescriptor) - { - /* Use the real numbers instead */ - BasePage = MxOldFreeDescriptor.BasePage; - PageCount = MxOldFreeDescriptor.PageCount; - } - else - { - /* Use the descriptor's numbers */ - BasePage = MdBlock->BasePage; - PageCount = MdBlock->PageCount; - } + /* Use the descriptor's numbers */ + BasePage = MdBlock->BasePage; + PageCount = MdBlock->PageCount; /* Get the PTEs for this range */ PointerPte = MiAddressToPte(&MmPfnDatabase[BasePage]); @@ -719,24 +706,9 @@ if (PointerPte->u.Hard.Valid == 0) { /* Use the next free page */ - TempPte.u.Hard.PageFrameNumber = FreePage; - ASSERT(FreePageCount != 0); - - /* Consume free pages */ - FreePage++; - FreePageCount--; - if (!FreePageCount) - { - /* Out of memory */ - KeBugCheckEx(INSTALL_MORE_MEMORY, - MmNumberOfPhysicalPages, - FreePageCount, - MxOldFreeDescriptor.PageCount, - 1); - } + TempPte.u.Hard.PageFrameNumber = MiEarlyAllocPages(1); /* Write out this PTE */ - PagesLeft++; MI_WRITE_VALID_PTE(PointerPte, TempPte); /* Zero this page */ @@ -750,10 +722,6 @@ /* Do the next address range */ NextEntry = MdBlock->ListEntry.Flink; } - - /* Now update the free descriptors to consume the pages we used up during the PFN allocation loop */ - MxFreeDescriptor->BasePage = FreePage; - MxFreeDescriptor->PageCount = FreePageCount; } VOID

1 0

[tkreuzer] 48345: [NTOS] Implement MiScanMemoryDescriptors, that loops all memory allocation descriptors early in Mm initialization and saves a number of values in global variables, instead of doing so in architecture specific code (20% less code here) and repeating the iterations in multiple places. It also initializes an array LocationByMemoryType, that gives us a central place to decide what we want to do with the different memory descriptor types, instead of always checking multiple cases.
by tkreuzer＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: tkreuzer Date: Wed Jul 28 23:44:24 2010 New Revision: 48345 URL: http://svn.reactos.org/svn/reactos?rev=48345&view=rev Log: [NTOS] Implement MiScanMemoryDescriptors, that loops all memory allocation descriptors early in Mm initialization and saves a number of values in global variables, instead of doing so in architecture specific code (20% less code here) and repeating the iterations in multiple places. It also initializes an array LocationByMemoryType, that gives us a central place to decide what we want to do with the different memory descriptor types, instead of always checking multiple cases. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Wed Jul 28 23:44:24 2010 @@ -151,9 +151,6 @@ NTAPI MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - PLIST_ENTRY NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; - ULONG FreePages = 0; PFN_NUMBER PageFrameIndex; PMMPTE StartPde, EndPde, PointerPte, LastPte; MMPTE TempPde, TempPte; @@ -211,122 +208,9 @@ RtlZeroMemory(StartPde, (EndPde - StartPde) * sizeof(MMPTE)); // - // Loop the memory descriptors - // - NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) - { - // - // Get the memory block - // - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - // - // Skip invisible memory - // - if ((MdBlock->MemoryType != LoaderFirmwarePermanent) && - (MdBlock->MemoryType != LoaderSpecialMemory) && - (MdBlock->MemoryType != LoaderHALCachedMemory) && - (MdBlock->MemoryType != LoaderBBTMemory)) - { - // - // Check if BURNMEM was used - // - if (MdBlock->MemoryType != LoaderBad) - { - // - // Count this in the total of pages - // - MmNumberOfPhysicalPages += MdBlock->PageCount; - } - - // - // Check if this is the new lowest page - // - if (MdBlock->BasePage < MmLowestPhysicalPage) - { - // - // Update the lowest page - // - MmLowestPhysicalPage = MdBlock->BasePage; - } - - // - // Check if this is the new highest page - // - PageFrameIndex = MdBlock->BasePage + MdBlock->PageCount; - if (PageFrameIndex > MmHighestPhysicalPage) - { - // - // Update the highest page - // - MmHighestPhysicalPage = PageFrameIndex - 1; - } - - // - // Check if this is free memory - // - if ((MdBlock->MemoryType == LoaderFree) || - (MdBlock->MemoryType == LoaderLoadedProgram) || - (MdBlock->MemoryType == LoaderFirmwareTemporary) || - (MdBlock->MemoryType == LoaderOsloaderStack)) - { - // - // Check if this is the largest memory descriptor - // - if (MdBlock->PageCount > FreePages) - { - // - // For now, it is - // - MxFreeDescriptor = MdBlock; - } - - // - // More free pages - // - FreePages += MdBlock->PageCount; - } - } - - // - // Keep going - // - NextEntry = MdBlock->ListEntry.Flink; - } - - // - // Save original values of the free descriptor, since it'll be - // altered by early allocations - // - MxOldFreeDescriptor = *MxFreeDescriptor; - + /* Compute non paged pool limits and size */ - MiComputeNonPagedPoolVa(FreePages); - - /* Compute color information (L2 cache-separated paging lists) */ - MiComputeColorInformation(); - - // - // Calculate the number of bytes for the PFN database, double it for ARM3, - // then add the color tables and convert to pages - // - MxPfnAllocation = (MmHighestPhysicalPage + 1) * sizeof(MMPFN); - //MxPfnAllocation <<= 1; - MxPfnAllocation += (MmSecondaryColors * sizeof(MMCOLOR_TABLES) * 2); - MxPfnAllocation >>= PAGE_SHIFT; - - // - // We have to add one to the count here, because in the process of - // shifting down to the page size, we actually ended up getting the - // lower aligned size (so say, 0x5FFFF bytes is now 0x5F pages). - // Later on, we'll shift this number back into bytes, which would cause - // us to end up with only 0x5F000 bytes -- when we actually want to have - // 0x60000 bytes. - // - MxPfnAllocation++; + MiComputeNonPagedPoolVa(MiNumberOfFreePages); // // Now calculate the nonpaged pool expansion VA region Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Jul 28 23:44:24 2010 @@ -441,6 +441,7 @@ extern PFN_NUMBER MmSystemPageDirectory[PD_COUNT]; extern PMMPTE MmSharedUserDataPte; extern LIST_ENTRY MmProcessList; +extern PFN_NUMBER MiNumberOfFreePages; #define MI_PFN_TO_PFNENTRY(x) (&MmPfnDatabase[1][x]) #define MI_PFNENTRY_TO_PFN(x) (x - MmPfnDatabase[1]) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed Jul 28 23:44:24 2010 @@ -353,6 +353,14 @@ SIZE_T MmTotalCommitLimit; SIZE_T MmTotalCommitLimitMaximum; +SCHAR LocationByMemoryType[LoaderMaximum]; +#define MiIsMemoryTypeInDatabase(t) (LocationByMemoryType[t] != -1) +#define MiIsMemoryTypeFree(t) (LocationByMemoryType[t] == FreePageList) + +PFN_NUMBER MiNumberOfFreePages = 0; +PFN_NUMBER MiEarlyAllocCount = 0; +ULONG MiNumberDescriptors = 0; + /* PRIVATE FUNCTIONS **********************************************************/ #ifndef _M_AMD64 @@ -379,6 +387,95 @@ } } #endif + +VOID +NTAPI +MiScanMemoryDescriptors(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + + /* Setup memory locations */ + LocationByMemoryType[LoaderExceptionBlock] = ActiveAndValid; + LocationByMemoryType[LoaderSystemBlock] = ActiveAndValid; + LocationByMemoryType[LoaderFree] = FreePageList; + LocationByMemoryType[LoaderBad] = BadPageList; + LocationByMemoryType[LoaderLoadedProgram] = FreePageList; + LocationByMemoryType[LoaderFirmwareTemporary] = FreePageList; + LocationByMemoryType[LoaderFirmwarePermanent] = -1; + LocationByMemoryType[LoaderOsloaderHeap] = ActiveAndValid; + LocationByMemoryType[LoaderOsloaderStack] = FreePageList; + LocationByMemoryType[LoaderSystemCode] = ActiveAndValid; + LocationByMemoryType[LoaderHalCode] = ActiveAndValid; + LocationByMemoryType[LoaderBootDriver] = ActiveAndValid; + LocationByMemoryType[LoaderConsoleInDriver] = ActiveAndValid; + LocationByMemoryType[LoaderConsoleOutDriver] = ActiveAndValid; + LocationByMemoryType[LoaderStartupDpcStack] = ActiveAndValid; + LocationByMemoryType[LoaderStartupKernelStack] = ActiveAndValid; + LocationByMemoryType[LoaderStartupPanicStack] = ActiveAndValid; + LocationByMemoryType[LoaderStartupPcrPage] = ActiveAndValid; + LocationByMemoryType[LoaderStartupPdrPage] = ActiveAndValid; + LocationByMemoryType[LoaderRegistryData] = ActiveAndValid; + LocationByMemoryType[LoaderMemoryData] = ActiveAndValid; + LocationByMemoryType[LoaderNlsData] = ActiveAndValid; + LocationByMemoryType[LoaderSpecialMemory] = -1; + LocationByMemoryType[LoaderBBTMemory] = -1; + LocationByMemoryType[LoaderReserve] = ActiveAndValid; + LocationByMemoryType[LoaderXIPRom] = ActiveAndValid; + LocationByMemoryType[LoaderHALCachedMemory] = ActiveAndValid; + LocationByMemoryType[LoaderLargePageFiller] = ActiveAndValid; + LocationByMemoryType[LoaderErrorLogMemory] = ActiveAndValid; + + /* Loop the memory descriptors */ + for (NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &LoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + /* Count descriptor */ + MiNumberDescriptors++; + + /* Get the descriptor */ + MdBlock = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + DPRINT("MD Type: %lx Base: %lx Count: %lx\n", + MdBlock->MemoryType, MdBlock->BasePage, MdBlock->PageCount); + + /* Skip memory that is not part of the database */ + if (!MiIsMemoryTypeInDatabase(MdBlock->MemoryType)) continue; + + /* Check if BURNMEM was used */ + if (MdBlock->MemoryType != LoaderBad) + { + /* Count this in the total of pages */ + MmNumberOfPhysicalPages += MdBlock->PageCount; + } + + /* Update the lowest and highest page */ + MmLowestPhysicalPage = min(MmLowestPhysicalPage, MdBlock->BasePage); + MmHighestPhysicalPage = max(MmHighestPhysicalPage, + MdBlock->BasePage + MdBlock->PageCount - 1); + + /* Check if this is free memory */ + if (MiIsMemoryTypeFree(MdBlock->MemoryType)) + { + /* Count it too free pages */ + MiNumberOfFreePages += MdBlock->PageCount; + + /* Check if this is the largest memory descriptor */ + if (MdBlock->PageCount > MiEarlyAllocCount) + { + /* Use this one for early allocations */ + MxFreeDescriptor = MdBlock; + MiEarlyAllocCount = MxFreeDescriptor->PageCount; + } + } + } + + // Save original values of the free descriptor, since it'll be + // altered by early allocations + MxOldFreeDescriptor = *MxFreeDescriptor; +} PFN_NUMBER NTAPI @@ -1294,86 +1391,31 @@ KeLowerIrql(OldIrql); } -PFN_NUMBER -NTAPI -MiPagesInLoaderBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PBOOLEAN IncludeType) -{ - PLIST_ENTRY NextEntry; - PFN_NUMBER PageCount = 0; - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; - - // - // Now loop through the descriptors - // - NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) - { - // - // Grab each one, and check if it's one we should include - // - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - if ((MdBlock->MemoryType < LoaderMaximum) && - (IncludeType[MdBlock->MemoryType])) - { - // - // Add this to our running total - // - PageCount += MdBlock->PageCount; - } - - // - // Try the next descriptor - // - NextEntry = MdBlock->ListEntry.Flink; - } - - // - // Return the total - // - return PageCount; -} - PPHYSICAL_MEMORY_DESCRIPTOR NTAPI MmInitializeMemoryLimits(IN PLOADER_PARAMETER_BLOCK LoaderBlock, IN PBOOLEAN IncludeType) { PLIST_ENTRY NextEntry; - ULONG Run = 0, InitialRuns = 0; + ULONG Run = 0; PFN_NUMBER NextPage = -1, PageCount = 0; PPHYSICAL_MEMORY_DESCRIPTOR Buffer, NewBuffer; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; // - // Scan the memory descriptors - // - NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) - { - // - // For each one, increase the memory allocation estimate - // - InitialRuns++; - NextEntry = NextEntry->Flink; - } - - // // Allocate the maximum we'll ever need // Buffer = ExAllocatePoolWithTag(NonPagedPool, sizeof(PHYSICAL_MEMORY_DESCRIPTOR) + sizeof(PHYSICAL_MEMORY_RUN) * - (InitialRuns - 1), + (MiNumberDescriptors - 1), 'lMmM'); if (!Buffer) return NULL; // // For now that's how many runs we have // - Buffer->NumberOfRuns = InitialRuns; + Buffer->NumberOfRuns = MiNumberDescriptors; // // Now loop through the descriptors again @@ -1437,7 +1479,7 @@ // // Our guess was probably exaggerated... // - if (InitialRuns > Run) + if (MiNumberDescriptors > Run) { // // Allocate a more accurately sized buffer @@ -1686,7 +1728,6 @@ BOOLEAN IncludeType[LoaderMaximum]; PVOID Bitmap; PPHYSICAL_MEMORY_RUN Run; - PFN_NUMBER PageCount; // // Instantiate memory that we don't consider RAM/usable @@ -1812,16 +1853,33 @@ /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); - - // - // Count physical pages on the system - // - PageCount = MiPagesInLoaderBlock(LoaderBlock, IncludeType); - + + /* Scan the boot loader memory descriptors */ + MiScanMemoryDescriptors(LoaderBlock); + + /* Compute color information (L2 cache-separated paging lists) */ + MiComputeColorInformation(); + + // Calculate the number of bytes for the PFN database, double it for ARM3, + // then add the color tables and convert to pages + MxPfnAllocation = (MmHighestPhysicalPage + 1) * sizeof(MMPFN); + //MxPfnAllocation <<= 1; + MxPfnAllocation += (MmSecondaryColors * sizeof(MMCOLOR_TABLES) * 2); + MxPfnAllocation >>= PAGE_SHIFT; + + // We have to add one to the count here, because in the process of + // shifting down to the page size, we actually ended up getting the + // lower aligned size (so say, 0x5FFFF bytes is now 0x5F pages). + // Later on, we'll shift this number back into bytes, which would cause + // us to end up with only 0x5F000 bytes -- when we actually want to have + // 0x60000 bytes. + // + MxPfnAllocation++; + // // Check if this is a machine with less than 19MB of RAM // - if (PageCount < MI_MIN_PAGES_FOR_SYSPTE_TUNING) + if (MmNumberOfPhysicalPages < MI_MIN_PAGES_FOR_SYSPTE_TUNING) { // // Use the very minimum of system PTEs @@ -1834,7 +1892,7 @@ // Use the default, but check if we have more than 32MB of RAM // MmNumberOfSystemPtes = 11000; - if (PageCount > MI_MIN_PAGES_FOR_SYSPTE_BOOST) + if (MmNumberOfPhysicalPages > MI_MIN_PAGES_FOR_SYSPTE_BOOST) // { // // Double the amount of system PTEs @@ -1858,12 +1916,12 @@ { /* Use the default value */ MmAllocationFragment = MI_ALLOCATION_FRAGMENT; - if (PageCount < ((256 * _1MB) / PAGE_SIZE)) + if (MmNumberOfPhysicalPages < ((256 * _1MB) / PAGE_SIZE)) // { /* On memory systems with less than 256MB, divide by 4 */ MmAllocationFragment = MI_ALLOCATION_FRAGMENT / 4; } - else if (PageCount < (_1GB / PAGE_SIZE)) + else if (MmNumberOfPhysicalPages < (_1GB / PAGE_SIZE)) // { /* On systems with less than 1GB, divide by 2 */ MmAllocationFragment = MI_ALLOCATION_FRAGMENT / 2; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Wed Jul 28 23:44:24 2010 @@ -69,7 +69,7 @@ PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; -ULONG MiNumberDescriptors = 0; +extern ULONG MiNumberDescriptors; PFN_NUMBER MiSystemPages = 0; BOOLEAN MiIncludeType[LoaderMaximum];

1 0

[tkreuzer] 48344: reduce diff to trunk
by tkreuzer＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: tkreuzer Date: Wed Jul 28 23:38:56 2010 New Revision: 48344 URL: http://svn.reactos.org/svn/reactos?rev=48344&view=rev Log: reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/include/ndk/rtltypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/rtltypes.h [iso-8859-1] Wed Jul 28 23:38:56 2010 @@ -977,7 +977,7 @@ // typedef struct _EXCEPTION_REGISTRATION_RECORD { - struct _EXCEPTION_REGISTRATION_RECORD *Prev; + struct _EXCEPTION_REGISTRATION_RECORD *Next; PEXCEPTION_ROUTINE Handler; } EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD;

1 0

[tkreuzer] 48343: Sync trunk HEAD (r48334)
by tkreuzer＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: tkreuzer Date: Wed Jul 28 23:25:52 2010 New Revision: 48343 URL: http://svn.reactos.org/svn/reactos?rev=48343&view=rev Log: Sync trunk HEAD (r48334) Removed: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/memory.c branches/ros-amd64-bringup/reactos/lib/ppcdevtree/ Modified: branches/ros-amd64-bringup/reactos/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/regedit/childwnd.c branches/ros-amd64-bringup/reactos/base/applications/regedit/hexedit.c branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/bg-BG.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/cs-CZ.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/de-DE.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/el-GR.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/en-US.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/es-ES.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/fr-FR.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/hu-HU.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/id-ID.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/it-IT.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/ko-KR.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/nl-NL.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/no-NO.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/pl-PL.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/pt-BR.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/pt-PT.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/ru-RU.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/sk-SK.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/sl-SI.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/sv-SE.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/th-TH.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/uk-UA.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/zh-CN.rc branches/ros-amd64-bringup/reactos/base/applications/regedit/main.h branches/ros-amd64-bringup/reactos/base/applications/regedit/resource.h branches/ros-amd64-bringup/reactos/base/applications/regedit/treeview.c branches/ros-amd64-bringup/reactos/base/services/ (props changed) branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/cpu_i386.c branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/cpu_ppc.c branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/cpu_x86_64.c branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/crc32.c branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/dbghelp.c branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/dbghelp.rbuild branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/dbghelp.spec branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/dbghelp_private.h branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/dwarf.c branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/dwarf.h branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/elf_module.c branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/module.c branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/pe_module.c branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/stack.c branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/symbol.c branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/type.c branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/access.c branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/imagehlp.rbuild branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/imagehlp.spec branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/imagehlp_main.c branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/integrity.c branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/modify.c branches/ros-amd64-bringup/reactos/dll/win32/mshtml/ (props changed) branches/ros-amd64-bringup/reactos/drivers/battery/battc/battc.c branches/ros-amd64-bringup/reactos/drivers/bus/pcix/pci.h branches/ros-amd64-bringup/reactos/drivers/bus/pcix/pci/ppbridge.c branches/ros-amd64-bringup/reactos/drivers/bus/pcix/utils.c branches/ros-amd64-bringup/reactos/hal/halx86/include/halp.h branches/ros-amd64-bringup/reactos/include/crt/_mingw.h branches/ros-amd64-bringup/reactos/include/crt/stdlib.h branches/ros-amd64-bringup/reactos/include/ddk/wdm.h branches/ros-amd64-bringup/reactos/include/dxsdk/atsmedia.h branches/ros-amd64-bringup/reactos/include/dxsdk/bdamedia.h branches/ros-amd64-bringup/reactos/include/dxsdk/bdatypes.h branches/ros-amd64-bringup/reactos/include/psdk/dbghelp.h branches/ros-amd64-bringup/reactos/include/psdk/evntrace.h branches/ros-amd64-bringup/reactos/include/psdk/imagehlp.h branches/ros-amd64-bringup/reactos/include/psdk/winnt.h branches/ros-amd64-bringup/reactos/include/xdk/wmifuncs.h branches/ros-amd64-bringup/reactos/media/doc/README.WINE branches/ros-amd64-bringup/reactos/media/drivers/ (props changed) branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/trap_x.h branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/device.c branches/ros-amd64-bringup/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/exp.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/irqobj.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/kiinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/traphdlr.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mdlsup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pagfault.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pfnlist.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pool.c branches/ros-amd64-bringup/reactos/subsystems/win32/ (props changed) branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/console.c branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/harderror.c branches/ros-amd64-bringup/reactos/tools/unicode/string.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/cpu_i386.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/cpu_ppc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/cpu_x86_64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/crc32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/dwarf.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/elf_module.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Removed: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/memory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/access.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/imagehlp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/imagehlp.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/imagehlp_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/integrity.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/drivers/battery/battc/battc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/pcix/pci/ppbridge.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/dxsdk/atsmedia.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/dxsdk/bdatypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/evntrace.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/imagehlp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/xdk/wmifuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…

1 0

[akhaldi] 48342: [CMAKE] - Add ntsys to build.
by akhaldi＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: akhaldi Date: Wed Jul 28 23:21:13 2010 New Revision: 48342 URL: http://svn.reactos.org/svn/reactos?rev=48342&view=rev Log: [CMAKE] - Add ntsys to build. Added: branches/cmake-bringup/dll/CMakeLists.txt (with props) branches/cmake-bringup/dll/ntdll/CMakeLists.txt (with props) Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Wed Jul 28 23:21:13 2010 @@ -16,7 +16,7 @@ add_subdirectory(tools) add_subdirectory(lib) -export(TARGETS widl wmc nci FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +export(TARGETS widl winebuild wmc nci FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() @@ -68,6 +68,7 @@ add_subdirectory(include/dxsdk) add_subdirectory(include/reactos/mc) +add_subdirectory(dll) add_subdirectory(lib) # nci generated intermediate files @@ -103,6 +104,7 @@ ADD_CUSTOM_TARGET(ntdll_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) ADD_CUSTOM_TARGET(win32k_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) +ADD_CUSTOM_TARGET(ntsys_pspec ALL DEPENDS ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) endif() Added: branches/cmake-bringup/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/dll/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/CMakeLists.txt [iso-8859-1] Wed Jul 28 23:21:13 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(ntdll) Propchange: branches/cmake-bringup/dll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Wed Jul 28 23:21:13 2010 @@ -1,0 +1,16 @@ + +ADD_CUSTOM_COMMAND( + OUTPUT ${REACTOS_BINARY_DIR}/dll/ntdll/ntsys.a + COMMAND ${MINGW_PREFIX}gcc ${CMAKE_C_FLAGS} -xc -E ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec > ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.spec + COMMAND native-winebuild -o ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.stubs.c --pedll ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.spec --filename ntdll.dll + COMMAND ${MINGW_PREFIX}gcc -o ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.stubs.o ${CMAKE_C_FLAGS} -c ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.stubs.c + COMMAND native-winebuild -o ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.auto.def --def -E ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.spec --filename ntdll.dll + COMMAND ${MINGW_PREFIX}dlltool --def ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.auto.def --kill-at --output-lib ${REACTOS_BINARY_DIR}/dll/ntdll/ntsys.a + COMMAND ${MINGW_PREFIX}ar -rc ${REACTOS_BINARY_DIR}/dll/ntdll/ntsys.a ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys_ntsys.stubs.o + DEPENDS native-winebuild +) + +SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/dll/ntdll/ntsys.a PROPERTIES GENERATED TRUE) + +ADD_CUSTOM_TARGET(ntsys ALL DEPENDS ${REACTOS_BINARY_DIR}/dll/ntdll/ntsys.a) +add_dependencies(ntsys ntsys_pspec) Propchange: branches/cmake-bringup/dll/ntdll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 48341: reduce diff to trunk
by tkreuzer＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: tkreuzer Date: Wed Jul 28 23:15:56 2010 New Revision: 48341 URL: http://svn.reactos.org/svn/reactos?rev=48341&view=rev Log: reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/cmos.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/usage.c Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/cmos.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/cmos.c [iso-8859-1] Wed Jul 28 23:15:56 2010 @@ -5,7 +5,6 @@ * PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl - * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES ******************************************************************/ Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/usage.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/usage.c [iso-8859-1] Wed Jul 28 23:15:56 2010 @@ -512,13 +512,8 @@ /* Register the vector */ HalpRegisterVector(Flags, BusVector, SystemVector, Irql); -// FIXME use an architecture specific inline function -#ifdef _M_IX86 /* Connect the interrupt */ KeRegisterInterruptHandler(SystemVector, Handler); -#else - // TODO -#endif /* Enable the interrupt */ HalEnableSystemInterrupt(SystemVector, Irql, Mode);

1 0

[tkreuzer] 48340: fix USERMODE=1 compilation
by tkreuzer＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: tkreuzer Date: Wed Jul 28 23:15:17 2010 New Revision: 48340 URL: http://svn.reactos.org/svn/reactos?rev=48340&view=rev Log: fix USERMODE=1 compilation Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/directory.rbuild Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] Wed Jul 28 23:15:17 2010 @@ -1,9 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <if property="USERMODE" value="1"> <directory name="audio_test"> <xi:include href="audio_test/audio_test.rbuild" /> </directory> + </if> <directory name="portcls"> <xi:include href="portcls/portcls.rbuild" /> </directory>

1 0

[tkreuzer] 48339: [MINGW] Fix duplicated import libraries
by tkreuzer＠svn.reactos.org 28 Jul '10

28 Jul '10

Author: tkreuzer Date: Wed Jul 28 23:14:33 2010 New Revision: 48339 URL: http://svn.reactos.org/svn/reactos?rev=48339&view=rev Log: [MINGW] Fix duplicated import libraries Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Wed Jul 28 23:14:33 2010 @@ -3,9 +3,6 @@ <group> <module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="static"> <library>oldnames</library> - <library>ntdll</library> - <library>oldnames</library> - <library>ntdll</library> <define name="_CRTBLD" />  @@ -14,6 +11,7 @@ <include base="ReactOS">include/reactos/mingw-w64</include> <if property="USERMODE" value="1"> <library>kernel32</library> + <library>ntdll</library> </if> <file>_newmode.c</file> <file>atonexit.c</file>

1 0

← Newer
1
2
3
4
5
6
7
8
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010