Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 53850: [SERVICES] - Silence debug messages. - Fix typos. - Add missing database locks. - RControlService: Return ERROR_INVALID_PARAMETER on illegal control code.
by ekohl＠svn.reactos.org 25 Sep '11

25 Sep '11

Author: ekohl Date: Sun Sep 25 12:07:52 2011 New Revision: 53850 URL: http://svn.reactos.org/svn/reactos?rev=53850&view=rev Log: [SERVICES] - Silence debug messages. - Fix typos. - Add missing database locks. - RControlService: Return ERROR_INVALID_PARAMETER on illegal control code. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Sep 25 12:07:52 2011 @@ -146,7 +146,7 @@ ImageEntry = ImageEntry->Flink; } - DPRINT1("Couldn't find a matching image\n"); + DPRINT("Couldn't find a matching image\n"); return NULL; @@ -1368,7 +1368,7 @@ OVERLAPPED Overlapped = {0, 0, 0, 0, 0}; #endif - DPRINT1("ScmWaitForServiceConnect()\n"); + DPRINT("ScmWaitForServiceConnect()\n"); #ifdef USE_ASYNCHRONOUS_IO Overlapped.hEvent = (HANDLE)NULL; @@ -1377,19 +1377,21 @@ &Overlapped); if (bResult == FALSE) { - DPRINT1("ConnectNamedPipe() returned FALSE\n"); + DPRINT("ConnectNamedPipe() returned FALSE\n"); dwError = GetLastError(); if (dwError == ERROR_IO_PENDING) { - DPRINT1("dwError: ERROR_IO_PENDING\n"); + DPRINT("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, dwPipeTimeout); - DPRINT1("WaitForSingleObject() returned %lu\n", dwError); + DPRINT("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) { + DPRINT("WaitForSingleObject() returned WAIT_TIMEOUT\n"); + bResult = CancelIo(Service->lpImage->hControlPipe); if (bResult == FALSE) { @@ -1420,7 +1422,7 @@ } } - DPRINT1("Control pipe connected!\n"); + DPRINT("Control pipe connected!\n"); Overlapped.hEvent = (HANDLE) NULL; @@ -1432,18 +1434,18 @@ &Overlapped); if (bResult == FALSE) { - DPRINT1("ReadFile() returned FALSE\n"); + DPRINT("ReadFile() returned FALSE\n"); dwError = GetLastError(); if (dwError == ERROR_IO_PENDING) { - DPRINT1("dwError: ERROR_IO_PENDING\n"); + DPRINT("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, dwPipeTimeout); if (dwError == WAIT_TIMEOUT) { - DPRINT1("WaitForSingleObject() returned WAIT_TIMEOUT\n"); + DPRINT("WaitForSingleObject() returned WAIT_TIMEOUT\n"); bResult = CancelIo(Service->lpImage->hControlPipe); if (bResult == FALSE) @@ -1455,9 +1457,9 @@ } else if (dwError == ERROR_SUCCESS) { - DPRINT1("WaitForSingleObject() returned ERROR_SUCCESS\n"); - - DPRINT1("Process Id: %lu\n", dwProcessId); + DPRINT("WaitForSingleObject() returned ERROR_SUCCESS\n"); + + DPRINT("Process Id: %lu\n", dwProcessId); bResult = GetOverlappedResult(Service->lpImage->hControlPipe, &Overlapped, Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Sep 25 12:07:52 2011 @@ -609,11 +609,7 @@ if (dwControl >= 128 && dwControl <= 255) DesiredAccess = SERVICE_USER_DEFINED_CONTROL; else - DesiredAccess = SERVICE_QUERY_CONFIG | - SERVICE_CHANGE_CONFIG | - SERVICE_QUERY_STATUS | - SERVICE_START | - SERVICE_PAUSE_CONTINUE; + return ERROR_INVALID_PARAMETER; break; } @@ -862,7 +858,9 @@ return ERROR_INVALID_HANDLE; } - /* FIXME: Lock the service list */ + /* Lock the service database */ + ScmLockDatabaseShared(); + /* hack */ Status = RtlCreateSecurityDescriptor(&ObjectDescriptor, SECURITY_DESCRIPTOR_REVISION); @@ -873,7 +871,8 @@ cbBufSize, &dwBytesNeeded); - /* FIXME: Unlock the service list */ + /* Unlock the service database */ + ScmUnlockDatabase(); if (NT_SUCCESS(Status)) { @@ -975,9 +974,12 @@ return RtlNtStatusToDosError(Status); RpcRevertToSelf(); - - /* FIXME: Lock service database */ - +#endif + + /* Lock the service database exclusive */ + ScmLockDatabaseExclusive(); + +#if 0 Status = RtlSetSecurityObject(dwSecurityInformation, (PSECURITY_DESCRIPTOR)lpSecurityDescriptor, &lpService->lpSecurityDescriptor, @@ -1011,7 +1013,8 @@ NtClose(hToken); #endif - /* FIXME: Unlock service database */ + /* Unlock service database */ + ScmUnlockDatabase(); DPRINT("RSetServiceObjectSecurity() done (Error %lu)\n", dwError); @@ -1053,7 +1056,7 @@ return ERROR_INVALID_HANDLE; } - /* Lock the srevice database shared */ + /* Lock the service database shared */ ScmLockDatabaseShared(); /* Return service status information */

1 0

[rharabien] 53849: [SYSDM] - Don't give UINT to printf if %I64u is used - Minor improvements See issue #6501 for more details.
by rharabien＠svn.reactos.org 25 Sep '11

25 Sep '11

Author: rharabien Date: Sun Sep 25 11:29:45 2011 New Revision: 53849 URL: http://svn.reactos.org/svn/reactos?rev=53849&view=rev Log: [SYSDM] - Don't give UINT to printf if %I64u is used - Minor improvements See issue #6501 for more details. Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] Sun Sep 25 11:29:45 2011 @@ -441,18 +441,16 @@ { TCHAR szBuffer[64]; MEMORYSTATUSEX MemoryStatus; - ULARGE_INTEGER FreeBytes; - DWORDLONG FreeMemory; + ULARGE_INTEGER FreeDiskSpace; + UINT i, FreeMemMb, PageFileSizeMb; INT Index; - INT i; - INT FileSize; Index = (INT)SendDlgItemMessage(hwndDlg, IDC_PAGEFILELIST, LB_GETCURSEL, 0, 0); - if (Index < pVirtMem->Count) + if (Index >= 0 && Index < pVirtMem->Count) { /* Set drive letter */ SetDlgItemText(hwndDlg, IDC_DRIVE, @@ -460,10 +458,10 @@ /* Set available disk space */ if (GetDiskFreeSpaceEx(pVirtMem->Pagefile[Index].szDrive, - NULL, NULL, &FreeBytes)) - { - pVirtMem->Pagefile[Index].FreeSize = (UINT)(FreeBytes.QuadPart / (1024 * 1024)); - _stprintf(szBuffer, _T("%I64u MB"), pVirtMem->Pagefile[Index].FreeSize); + NULL, NULL, &FreeDiskSpace)) + { + pVirtMem->Pagefile[Index].FreeSize = (UINT)(FreeDiskSpace.QuadPart / (1024 * 1024)); + _stprintf(szBuffer, _T("%u MB"), pVirtMem->Pagefile[Index].FreeSize); SetDlgItemText(hwndDlg, IDC_SPACEAVAIL, szBuffer); } @@ -516,18 +514,18 @@ MemoryStatus.dwLength = sizeof(MEMORYSTATUSEX); if (GlobalMemoryStatusEx(&MemoryStatus)) { - FreeMemory = MemoryStatus.ullTotalPhys / (1024 * 1024); - _stprintf(szBuffer, _T("%I64u MB"), FreeMemory + (FreeMemory / 2)); + FreeMemMb = (UINT)(MemoryStatus.ullTotalPhys / (1024 * 1024)); + _stprintf(szBuffer, _T("%u MB"), FreeMemMb + (FreeMemMb / 2)); SetDlgItemText(hwndDlg, IDC_RECOMMENDED, szBuffer); } /* Set current pagefile size */ - FileSize = 0; + PageFileSizeMb = 0; for (i = 0; i < 26; i++) { - FileSize += pVirtMem->Pagefile[i].InitialSize; - } - _stprintf(szBuffer, _T("%u MB"), FileSize); + PageFileSizeMb += pVirtMem->Pagefile[i].InitialSize; + } + _stprintf(szBuffer, _T("%u MB"), PageFileSizeMb); SetDlgItemText(hwndDlg, IDC_CURRENT, szBuffer); }

1 0

[rharabien] 53848: [FREELDR] - Improve tracing - Fix memory corruption caused by marking pages outside of page lookup table (when table is allocated only free pages was counted but MmMarkPagesInLoo...
by rharabien＠svn.reactos.org 25 Sep '11

25 Sep '11

Author: rharabien Date: Sun Sep 25 11:07:27 2011 New Revision: 53848 URL: http://svn.reactos.org/svn/reactos?rev=53848&view=rev Log: [FREELDR] - Improve tracing - Fix memory corruption caused by marking pages outside of page lookup table (when table is allocated only free pages was counted but MmMarkPagesInLookupTable was used for all types of memory like firmware). Fixes bugcheck in ACPI HAL which happened for me Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Sun Sep 25 11:07:27 2011 @@ -209,7 +209,7 @@ MmInitializeHeap(PageLookupTableAddress); - TRACE("Memory Manager initialized. %d pages available.\n", FreePagesInLookupTable); + TRACE("Memory Manager initialized. 0x%x pages available.\n", FreePagesInLookupTable); return TRUE; @@ -271,7 +271,7 @@ } } - TRACE("lo/hi %lx %lxn", MmLowestPhysicalPage, MmHighestPhysicalPage); + TRACE("lo/hi %lx %lx\n", MmLowestPhysicalPage, MmHighestPhysicalPage); PageCount = MmHighestPhysicalPage - MmLowestPhysicalPage; TRACE("MmGetAddressablePageCountIncludingHoles() returning 0x%x\n", PageCount); return PageCount; @@ -319,7 +319,6 @@ VOID MmInitPageLookupTable(PVOID PageLookupTable, ULONG TotalPageCount) { const FREELDR_MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; - TYPE_OF_MEMORY MemoryMapPageAllocated; ULONG PageLookupTableStartPage; ULONG PageLookupTablePageCount; @@ -333,26 +332,30 @@ // Parse the whole memory map while ((MemoryDescriptor = ArcGetMemoryDescriptor(MemoryDescriptor)) != NULL) { - TRACE("Got range: 0x%lx-0x%lx, type=%s\n", - MemoryDescriptor->BasePage, - MemoryDescriptor->BasePage + MemoryDescriptor->PageCount, - MmGetSystemMemoryMapTypeString(MemoryDescriptor->MemoryType)); - - MemoryMapPageAllocated = MemoryDescriptor->MemoryType; - // Mark used pages in the lookup table - TRACE("Marking pages as type %d: StartPage: %d PageCount: %d\n", - MemoryMapPageAllocated, MemoryDescriptor->BasePage, MemoryDescriptor->PageCount); - MmMarkPagesInLookupTable(PageLookupTable, - MemoryDescriptor->BasePage, - MemoryDescriptor->PageCount, - MemoryMapPageAllocated); + + if (MemoryDescriptor->BasePage + MemoryDescriptor->PageCount <= TotalPageCount) + { + TRACE("Marking pages 0x%lx-0x%lx as type %s\n", + MemoryDescriptor->BasePage, + MemoryDescriptor->BasePage + MemoryDescriptor->PageCount, + MmGetSystemMemoryMapTypeString(MemoryDescriptor->MemoryType)); + MmMarkPagesInLookupTable(PageLookupTable, + MemoryDescriptor->BasePage, + MemoryDescriptor->PageCount, + MemoryDescriptor->MemoryType); + } + else + TRACE("Ignoring pages 0x%lx-0x%lx (%s)\n", + MemoryDescriptor->BasePage, + MemoryDescriptor->BasePage + MemoryDescriptor->PageCount, + MmGetSystemMemoryMapTypeString(MemoryDescriptor->MemoryType)); } // Mark the pages that the lookup table occupies as reserved PageLookupTableStartPage = MmGetPageNumberFromAddress(PageLookupTable); PageLookupTablePageCount = MmGetPageNumberFromAddress((PVOID)((ULONG_PTR)PageLookupTable + ROUND_UP(TotalPageCount * sizeof(PAGE_LOOKUP_TABLE_ITEM), MM_PAGE_SIZE))) - PageLookupTableStartPage; - TRACE("Marking the page lookup table pages as reserved StartPage: %d PageCount: %d\n", PageLookupTableStartPage, PageLookupTablePageCount); + TRACE("Marking the page lookup table pages as reserved StartPage: 0x%x PageCount: 0x%x\n", PageLookupTableStartPage, PageLookupTablePageCount); MmMarkPagesInLookupTable(PageLookupTable, PageLookupTableStartPage, PageLookupTablePageCount, LoaderFirmwareTemporary); } @@ -368,7 +371,7 @@ #if 0 if ((Index <= (StartPage + 16)) || (Index >= (StartPage+PageCount-16))) { - TRACE("Index = %d StartPage = %d PageCount = %d\n", Index, StartPage, PageCount); + TRACE("Index = 0x%x StartPage = 0x%x PageCount = 0x%x\n", Index, StartPage, PageCount); } #endif RealPageLookupTable[Index].PageAllocated = PageAllocated; @@ -443,7 +446,7 @@ } else { - TRACE("Alloc low memory, LastFreePageHint %d, TPC %d\n", LastFreePageHint, TotalPageCount); + TRACE("Alloc low memory, LastFreePageHint 0x%x, TPC 0x%x\n", LastFreePageHint, TotalPageCount); /* Allocate "low" pages */ for (Index=1; Index < LastFreePageHint; Index++) {

1 0

[tkreuzer] 53847: [NTOSKRNL] - also disable "MTRR support detected but not yet taken advantage of"
by tkreuzer＠svn.reactos.org 25 Sep '11

25 Sep '11

Author: tkreuzer Date: Sun Sep 25 09:16:10 2011 New Revision: 53847 URL: http://svn.reactos.org/svn/reactos?rev=53847&view=rev Log: [NTOSKRNL] - also disable "MTRR support detected but not yet taken advantage of" Modified: trunk/reactos/ntoskrnl/ke/i386/mtrr.c Modified: trunk/reactos/ntoskrnl/ke/i386/mtrr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/mtrr.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/mtrr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/mtrr.c [iso-8859-1] Sun Sep 25 09:16:10 2011 @@ -22,7 +22,7 @@ KiInitializeMTRR(IN BOOLEAN FinalCpu) { /* FIXME: Support this */ - DPRINT1("MTRR support detected but not yet taken advantage of\n"); + DPRINT("MTRR support detected but not yet taken advantage of\n"); } VOID @@ -31,5 +31,5 @@ KiAmdK6InitializeMTRR(VOID) { /* FIXME: Support this */ - DPRINT1("AMD MTRR support detected but not yet taken advantage of\n"); + DPRINT("AMD MTRR support detected but not yet taken advantage of\n"); }

1 0

[tkreuzer] 53846: [NTOSKRNL] - Undo disabling of systemcalls, which was disabled in r53646 for testing purpose. - Sillence "Support for SYSENTER detected." debug print, since its the normal case, o...
by tkreuzer＠svn.reactos.org 25 Sep '11

25 Sep '11

Author: tkreuzer Date: Sun Sep 25 09:12:26 2011 New Revision: 53846 URL: http://svn.reactos.org/svn/reactos?rev=53846&view=rev Log: [NTOSKRNL] - Undo disabling of systemcalls, which was disabled in r53646 for testing purpose. - Sillence "Support for SYSENTER detected." debug print, since its the normal case, only keep the disabled and not present cases. - Silence "xxx support detected but not yet taken advantage of" debug prints. CPU features are already reported and there is no point in printing every single feature we do not support. - Invert if/else in KiRestoreFastSyscallReturnState Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/patpge.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sun Sep 25 09:12:26 2011 @@ -23,7 +23,7 @@ /* CPU Features and Flags */ ULONG KeI386CpuType; ULONG KeI386CpuStep; -ULONG KiFastSystemCallDisable = 1; +ULONG KiFastSystemCallDisable = 0; ULONG KeI386NpxPresent = 0; ULONG KiMXCsrMask = 0; ULONG MxcsrFeatureMask = 0; @@ -1064,21 +1064,21 @@ if (KeFeatureBits & KF_FAST_SYSCALL) { /* Check if it has been disabled */ - if (!KiFastSystemCallDisable) - { - /* Do an IPI to enable it */ - KeIpiGenericCall(KiLoadFastSyscallMachineSpecificRegisters, 0); - - /* It's enabled, so use the proper exit stub */ - KiFastCallExitHandler = KiSystemCallSysExitReturn; - DPRINT1("Support for SYSENTER detected.\n"); - } - else + if (KiFastSystemCallDisable) { /* Disable fast system call */ KeFeatureBits &= ~KF_FAST_SYSCALL; KiFastCallExitHandler = KiSystemCallTrapReturn; DPRINT1("Support for SYSENTER disabled.\n"); + } + else + { + /* Do an IPI to enable it */ + KeIpiGenericCall(KiLoadFastSyscallMachineSpecificRegisters, 0); + + /* It's enabled, so use the proper exit stub */ + KiFastCallExitHandler = KiSystemCallSysExitReturn; + DPRINT("Support for SYSENTER detected.\n"); } } else Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Sun Sep 25 09:12:26 2011 @@ -51,7 +51,7 @@ if (KeFeatureBits & KF_LARGE_PAGE) { /* FIXME: Support this */ - DPRINT1("Large Page support detected but not yet taken advantage of\n"); + DPRINT("Large Page support detected but not yet taken advantage of\n"); } /* Check for global page support */ @@ -314,7 +314,7 @@ /* FIXME: TODO */ DPRINT1("ISR Time Limit not yet supported\n"); } - + /* Set CR0 features based on detected CPU */ KiSetCR0Bits(); } @@ -650,7 +650,7 @@ KiSystemStartupBootStack(VOID) { PKTHREAD Thread; - + /* Initialize the kernel for the current CPU */ KiInitializeKernel(&KiInitialProcess.Pcb, (PKTHREAD)KeLoaderBlock->Thread, @@ -658,15 +658,15 @@ (PKPRCB)__readfsdword(KPCR_PRCB), KeNumberProcessors - 1, KeLoaderBlock); - + /* Set the priority of this thread to 0 */ Thread = KeGetCurrentThread(); Thread->Priority = 0; - + /* Force interrupts enabled and lower IRQL back to DISPATCH_LEVEL */ _enable(); KfLowerIrql(DISPATCH_LEVEL); - + /* Set the right wait IRQL */ Thread->WaitIrql = DISPATCH_LEVEL; @@ -687,7 +687,7 @@ KIDTENTRY NmiEntry, DoubleFaultEntry; PKTSS Tss; PKIPCR Pcr; - + /* Boot cycles timestamp */ BootCycles = __rdtsc(); Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] Sun Sep 25 09:12:26 2011 @@ -43,7 +43,7 @@ __writecr3(Cr3); /* Now enable PGE */ - DPRINT1("Global page support detected but not yet taken advantage of\n"); + DPRINT("Global page support detected but not yet taken advantage of\n"); //__writecr4(Cr4 | CR4_PGE); /* Restore interrupts */ @@ -57,5 +57,5 @@ KiInitializePAT(VOID) { /* FIXME: Support this */ - DPRINT1("PAT support detected but not yet taken advantage of\n"); + DPRINT("PAT support detected but not yet taken advantage of\n"); }

1 0

[rharabien] 53845: - Commit forgotten file...
by rharabien＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: rharabien Date: Sat Sep 24 20:01:04 2011 New Revision: 53845 URL: http://svn.reactos.org/svn/reactos?rev=53845&view=rev Log: - Commit forgotten file... Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] Sat Sep 24 20:01:04 2011 @@ -59,6 +59,8 @@ std::string GetFullName ( const FileLocation& file ) const; std::string GetFullPath ( const FileLocation& file ) const; + std::string GetRegistrySourceFiles () const; + std::string GetRegistryTargetFiles () const; private: void CreateMakefile (); @@ -108,8 +110,6 @@ void OutputInstallTarget ( const FileLocation& source, const FileLocation& target ); void OutputNonModuleInstallTargets (); void OutputModuleInstallTargets (); - std::string GetRegistrySourceFiles (); - std::string GetRegistryTargetFiles (); void OutputRegistryInstallTarget (); void GenerateInstallTarget (); void GetModuleTestTargets ( std::vector<std::string>& out ) const;

1 0

[rharabien] 53844: [MKHIVE] - Get all INF files from command line instead of using hardcoded names [CMAKE] - Use new mkhive syntax and fix livecd hives dependences [RBUILD] - Use new mkhive syntax
by rharabien＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: rharabien Date: Sat Sep 24 19:59:56 2011 New Revision: 53844 URL: http://svn.reactos.org/svn/reactos?rev=53844&view=rev Log: [MKHIVE] - Get all INF files from command line instead of using hardcoded names [CMAKE] - Use new mkhive syntax and fix livecd hives dependences [RBUILD] - Use new mkhive syntax Modified: trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/tools/mkhive/mkhive.c trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Sat Sep 24 19:59:56 2011 @@ -9,8 +9,12 @@ # livecd hives list(APPEND CD_HIVES + ${CMAKE_CURRENT_SOURCE_DIR}/hivecls_${ARCH}.inf + ${CMAKE_CURRENT_SOURCE_DIR}/hivedef_${ARCH}.inf + ${CMAKE_CURRENT_SOURCE_DIR}/hivesft_${ARCH}.inf + ${CMAKE_CURRENT_SOURCE_DIR}/hivesys_${ARCH}.inf ${CMAKE_CURRENT_SOURCE_DIR}/livecd.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hiveinst_${ARCH}.inf) + ${CMAKE_CURRENT_SOURCE_DIR}/hiveinst_${ARCH}.inf) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sam @@ -18,7 +22,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/security ${CMAKE_CURRENT_BINARY_DIR}/software ${CMAKE_CURRENT_BINARY_DIR}/system - COMMAND native-mkhive ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ARCH} ${CD_HIVES} + COMMAND native-mkhive ${CMAKE_CURRENT_BINARY_DIR} ${CD_HIVES} DEPENDS native-mkhive ${CD_HIVES}) add_custom_target(livecd_hives Modified: trunk/reactos/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.c [iso-8859-1] Sat Sep 24 19:59:56 2011 @@ -49,11 +49,9 @@ void usage (void) { - printf ("Usage: mkhive <srcdir> <dstdir> <arch> [addinf]\n\n"); - printf (" srcdir - inf files are read from this directory\n"); - printf (" dstdir - binary hive files are created in this directory\n"); - printf (" arch - architecture\n"); - printf (" addinf - additional inf files with full path\n"); + printf ("Usage: mkhive <dstdir> <inffiles>\n\n"); + printf (" dstdir - binary hive files are created in this directory\n"); + printf (" inffiles - inf files with full path\n"); } void convert_path(char *dst, char *src) @@ -87,53 +85,25 @@ int main (int argc, char *argv[]) { char FileName[PATH_MAX]; - int Param; + int i; - if (argc < 4) + if (argc < 3) { usage (); return 1; } - printf ("Binary hive maker: %s\n", argv[3]); + printf ("Binary hive maker\n"); RegInitializeRegistry (); - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "hivesys_"); - strcat (FileName, argv[3]); - strcat (FileName, ".inf"); - ImportRegistryFile (FileName); - - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "hivecls_"); - strcat (FileName, argv[3]); - strcat (FileName, ".inf"); - ImportRegistryFile (FileName); - - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "hivesft_"); - strcat (FileName, argv[3]); - strcat (FileName, ".inf"); - ImportRegistryFile (FileName); - - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "hivedef_"); - strcat (FileName, argv[3]); - strcat (FileName, ".inf"); - ImportRegistryFile (FileName); - - for (Param = 4; Param < argc; Param++) + for (i = 2; i < argc; i++) { - convert_path (FileName, argv[Param]); + convert_path (FileName, argv[i]); ImportRegistryFile (FileName); } - convert_path (FileName, argv[2]); + convert_path (FileName, argv[1]); strcat (FileName, DIR_SEPARATOR_STRING); strcat (FileName, "default"); if (!ExportBinaryHive (FileName, &DefaultHive)) @@ -141,7 +111,7 @@ return 1; } - convert_path (FileName, argv[2]); + convert_path (FileName, argv[1]); strcat (FileName, DIR_SEPARATOR_STRING); strcat (FileName, "sam"); if (!ExportBinaryHive (FileName, &SamHive)) @@ -149,7 +119,7 @@ return 1; } - convert_path (FileName, argv[2]); + convert_path (FileName, argv[1]); strcat (FileName, DIR_SEPARATOR_STRING); strcat (FileName, "security"); if (!ExportBinaryHive (FileName, &SecurityHive)) @@ -157,7 +127,7 @@ return 1; } - convert_path (FileName, argv[2]); + convert_path (FileName, argv[1]); strcat (FileName, DIR_SEPARATOR_STRING); strcat (FileName, "software"); if (!ExportBinaryHive (FileName, &SoftwareHive)) @@ -165,7 +135,7 @@ return 1; } - convert_path (FileName, argv[2]); + convert_path (FileName, argv[1]); strcat (FileName, DIR_SEPARATOR_STRING); strcat (FileName, "system"); if (!ExportBinaryHive (FileName, &SystemHive)) Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Sep 24 19:59:56 2011 @@ -1252,17 +1252,17 @@ } string -MingwBackend::GetRegistrySourceFiles () -{ - return "boot" + sSep + "bootdata" + sSep + "hivecls_" + Environment::GetArch() + ".inf " - "boot" + sSep + "bootdata" + sSep + "hivedef_" + Environment::GetArch() + ".inf " - "boot" + sSep + "bootdata" + sSep + "hiveinst_" + Environment::GetArch() + ".inf " - "boot" + sSep + "bootdata" + sSep + "hivesft_" + Environment::GetArch() + ".inf " - "boot" + sSep + "bootdata" + sSep + "hivesys_" + Environment::GetArch() + ".inf "; +MingwBackend::GetRegistrySourceFiles () const +{ + return "boot" + sSep + "bootdata" + sSep + "hivecls_$(ARCH).inf " + "boot" + sSep + "bootdata" + sSep + "hivedef_$(ARCH).inf " + "boot" + sSep + "bootdata" + sSep + "hivesft_$(ARCH).inf " + "boot" + sSep + "bootdata" + sSep + "hivesys_$(ARCH).inf " + "boot" + sSep + "bootdata" + sSep + "hiveinst_$(ARCH).inf "; } string -MingwBackend::GetRegistryTargetFiles () +MingwBackend::GetRegistryTargetFiles () const { string system32ConfigDirectory = "system32" + sSep + "config"; FileLocation system32 ( InstallDirectory, system32ConfigDirectory, "" ); @@ -1295,9 +1295,9 @@ fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(mkhive_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%chiveinst_$(ARCH).inf\n", - cSep, GetFullPath ( system32 ).c_str (), - cSep, cSep ); + "\t$(mkhive_TARGET) %s %s\n", + GetFullPath ( system32 ).c_str (), + registrySourceFiles.c_str() ); fprintf ( fMakefile, "\n" ); } Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sat Sep 24 19:59:56 2011 @@ -2917,6 +2917,7 @@ void MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory ) { + string registrySourceFiles = backend->GetRegistrySourceFiles (); fprintf ( fMakefile, "# REGISTRY COMMANDS\n" ); FileLocation reactosSystem32ConfigDirectory ( OutputDirectory, livecdDirectory + sSep + "reactos" + sSep + "system32" + sSep + "config", @@ -2924,9 +2925,10 @@ fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(mkhive_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%clivecd.inf boot%cbootdata%chiveinst_$(ARCH).inf\n", - cSep, backend->GetFullPath ( reactosSystem32ConfigDirectory ).c_str (), - cSep, cSep, cSep, cSep ); + "\t$(mkhive_TARGET) %s %s boot%cbootdata%clivecd.inf\n", + backend->GetFullPath ( reactosSystem32ConfigDirectory ).c_str (), + registrySourceFiles.c_str(), + cSep, cSep ); } void

1 0

[dgorbachev] 53843: [BUGCODES] Bug check code 0x5d is UNSUPPORTED_PROCESSOR. [NTOSKRNL] Use it.
by dgorbachev＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: dgorbachev Date: Sat Sep 24 18:13:57 2011 New Revision: 53843 URL: http://svn.reactos.org/svn/reactos?rev=53843&view=rev Log: [BUGCODES] Bug check code 0x5d is UNSUPPORTED_PROCESSOR. [NTOSKRNL] Use it. Modified: trunk/reactos/include/reactos/mc/bugcodes.mc trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Sat Sep 24 18:13:57 2011 @@ -825,9 +825,9 @@ MessageId=0x5D Severity=Success Facility=System -SymbolicName=HEAP_INITIALIZATION_FAILED -Language=English -HEAP_INITIALIZATION_FAILED +SymbolicName=UNSUPPORTED_PROCESSOR +Language=English +UNSUPPORTED_PROCESSOR . MessageId=0x5E Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Sat Sep 24 18:13:57 2011 @@ -407,7 +407,7 @@ PoInitializePrcb(Prcb); /* Bugcheck if this is a 386 CPU */ - if (Prcb->CpuType == 3) KeBugCheckEx(0x5D, 0x386, 0, 0, 0); + if (Prcb->CpuType == 3) KeBugCheckEx(UNSUPPORTED_PROCESSOR, 0x386, 0, 0, 0); /* Get the processor features for the CPU */ FeatureBits = KiGetFeatureBits(); @@ -480,7 +480,7 @@ RtlCopyMemory(Vendor, Prcb->VendorString, sizeof(Vendor)); /* Bugcheck the system. Windows *requires* this */ - KeBugCheckEx(0x5D, + KeBugCheckEx(UNSUPPORTED_PROCESSOR, (1 << 24 ) | (Prcb->CpuType << 16) | Prcb->CpuStep, Vendor[0], Vendor[1],

1 0

[fireball] 53842: [BUGCODES] - Add SPECIAL_POOL_DETECTED_MEMORY_CORRUPTION definition.
by fireball＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: fireball Date: Sat Sep 24 17:33:54 2011 New Revision: 53842 URL: http://svn.reactos.org/svn/reactos?rev=53842&view=rev Log: [BUGCODES] - Add SPECIAL_POOL_DETECTED_MEMORY_CORRUPTION definition. Modified: trunk/reactos/include/reactos/mc/bugcodes.mc Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Sat Sep 24 17:33:54 2011 @@ -1258,6 +1258,14 @@ An attempt was made to write to read-only memory. . +MessageId=0xC1 +Severity=Success +Facility=System +SymbolicName=SPECIAL_POOL_DETECTED_MEMORY_CORRUPTION +Language=English +SPECIAL_POOL_DETECTED_MEMORY_CORRUPTION +. + MessageId=0xC2 Severity=Success Facility=System

1 0

[dgorbachev] 53841: [FREELDR] Add FREELDR_MEMORY_DESCRIPTOR structure using TYPE_OF_MEMORY instead of MEMORY_TYPE. Use it in place of MEMORY_DESCRIPTOR. Undo r53837 changes.
by dgorbachev＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: dgorbachev Date: Sat Sep 24 17:25:29 2011 New Revision: 53841 URL: http://svn.reactos.org/svn/reactos?rev=53841&view=rev Log: [FREELDR] Add FREELDR_MEMORY_DESCRIPTOR structure using TYPE_OF_MEMORY instead of MEMORY_TYPE. Use it in place of MEMORY_DESCRIPTOR. Undo r53837 changes. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c trunk/reactos/boot/freeldr/freeldr/include/arcemul.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Sat Sep 24 17:25:29 2011 @@ -143,9 +143,9 @@ return RootNode; } -MEMORY_DESCRIPTOR ArmMemoryMap[32]; - -PMEMORY_DESCRIPTOR +FREELDR_MEMORY_DESCRIPTOR ArmMemoryMap[32]; + +PFREELDR_MEMORY_DESCRIPTOR ArmMemGetMemoryMap(OUT ULONG *MemoryMapSize) { ASSERT(ArmBoardBlock->MemoryMapEntryCount <= 32); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Sat Sep 24 17:25:29 2011 @@ -271,6 +271,7 @@ BOOLEAN PcDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer) { + BOOLEAN ExtensionsSupported; TRACE("PcDiskReadLogicalSectors() DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d Buffer: 0x%x\n", DriveNumber, SectorNumber, SectorCount, Buffer); @@ -279,9 +280,11 @@ // If so then check to see if Int13 extensions work // If they do then use them, otherwise default back to BIOS calls // - if ((DriveNumber >= 0x80) && DiskInt13ExtensionsSupported(DriveNumber)) - { - TRACE("Using Int 13 Extensions for read. DiskInt13ExtensionsSupported(%d) = %s\n", DriveNumber, DiskInt13ExtensionsSupported(DriveNumber) ? "TRUE" : "FALSE"); + ExtensionsSupported = DiskInt13ExtensionsSupported(DriveNumber); + + if ((DriveNumber >= 0x80) && ExtensionsSupported) + { + TRACE("Using Int 13 Extensions for read. DiskInt13ExtensionsSupported(%d) = %s\n", DriveNumber, ExtensionsSupported ? "TRUE" : "FALSE"); // // LBA is easy, nothing to calculate Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Sat Sep 24 17:25:29 2011 @@ -44,7 +44,7 @@ BIOS_MEMORY_MAP PcBiosMemoryMap[MAX_BIOS_DESCRIPTORS]; ULONG PcBiosMapCount; -MEMORY_DESCRIPTOR PcMemoryMap[MAX_BIOS_DESCRIPTORS + 1] = +FREELDR_MEMORY_DESCRIPTOR PcMemoryMap[MAX_BIOS_DESCRIPTORS + 1] = { { LoaderFirmwarePermanent, 0x00, 1 }, // realmode int vectors { LoaderFirmwareTemporary, 0x01, FREELDR_BASE_PAGE - 1 }, // freeldr stack + cmdline @@ -60,7 +60,7 @@ ULONG AddMemoryDescriptor( - IN OUT PMEMORY_DESCRIPTOR List, + IN OUT PFREELDR_MEMORY_DESCRIPTOR List, IN ULONG MaxCount, IN PFN_NUMBER BasePage, IN PFN_NUMBER PageCount, @@ -189,7 +189,7 @@ static ULONG -PcMemGetBiosMemoryMap(PMEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSize) +PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSize) { REGS Regs; ULONG MapCount = 0; @@ -292,7 +292,7 @@ } -PMEMORY_DESCRIPTOR +PFREELDR_MEMORY_DESCRIPTOR PcMemGetMemoryMap(ULONG *MemoryMapSize) { ULONG i, EntryCount; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c [iso-8859-1] Sat Sep 24 17:25:29 2011 @@ -75,9 +75,9 @@ AvailableMemoryMb = InstalledMemoryMb; } -MEMORY_DESCRIPTOR BiosMemoryMap[2]; +FREELDR_MEMORY_DESCRIPTOR BiosMemoryMap[2]; -PMEMORY_DESCRIPTOR +PFREELDR_MEMORY_DESCRIPTOR XboxMemGetMemoryMap(ULONG *MemoryMapSize) { /* Synthesize memory map */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arcemul.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arcemul.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arcemul.h [iso-8859-1] Sat Sep 24 17:25:29 2011 @@ -34,10 +34,6 @@ VOID* ConfigurationData, CONFIGURATION_COMPONENT* Component); -/* mm.c */ -const MEMORY_DESCRIPTOR* -ArcGetMemoryDescriptor(const MEMORY_DESCRIPTOR* Current); - /* time.c */ TIMEINFO* ArcGetTime(VOID); ULONG ArcGetRelativeTime(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] Sat Sep 24 17:25:29 2011 @@ -49,7 +49,7 @@ VOID XboxMemInit(VOID); PVOID XboxMemReserveMemory(ULONG MbToReserve); -PMEMORY_DESCRIPTOR XboxMemGetMemoryMap(ULONG *MemoryMapSize); +PFREELDR_MEMORY_DESCRIPTOR XboxMemGetMemoryMap(ULONG *MemoryMapSize); BOOLEAN XboxDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN XboxDiskGetPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h [iso-8859-1] Sat Sep 24 17:25:29 2011 @@ -46,7 +46,7 @@ VOID PcVideoPrepareForReactOS(IN BOOLEAN Setup); VOID PcPrepareForReactOS(IN BOOLEAN Setup); -PMEMORY_DESCRIPTOR PcMemGetMemoryMap(ULONG *MemoryMapSize); +PFREELDR_MEMORY_DESCRIPTOR PcMemGetMemoryMap(ULONG *MemoryMapSize); BOOLEAN PcDiskGetBootPath(char *BootPath, unsigned Size); BOOLEAN PcDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Sat Sep 24 17:25:29 2011 @@ -57,8 +57,8 @@ VOID (*Beep)(VOID); VOID (*PrepareForReactOS)(IN BOOLEAN Setup); - MEMORY_DESCRIPTOR* (*GetMemoryDescriptor)(MEMORY_DESCRIPTOR* Current); - PMEMORY_DESCRIPTOR (*GetMemoryMap)(PULONG MaxMemoryMapSize); + FREELDR_MEMORY_DESCRIPTOR* (*GetMemoryDescriptor)(FREELDR_MEMORY_DESCRIPTOR* Current); + PFREELDR_MEMORY_DESCRIPTOR (*GetMemoryMap)(PULONG MaxMemoryMapSize); BOOLEAN (*DiskGetBootPath)(char *BootPath, unsigned Size); BOOLEAN (*DiskReadLogicalSectors)(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Sat Sep 24 17:25:29 2011 @@ -26,6 +26,13 @@ BiosMemoryAcpiReclaim, BiosMemoryAcpiNvs } BIOS_MEMORY_TYPE; + +typedef struct _FREELDR_MEMORY_DESCRIPTOR +{ + TYPE_OF_MEMORY MemoryType; + PFN_NUMBER BasePage; + PFN_NUMBER PageCount; +} FREELDR_MEMORY_DESCRIPTOR, *PFREELDR_MEMORY_DESCRIPTOR; #include <pshpack1.h> typedef struct Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Sat Sep 24 17:25:29 2011 @@ -59,7 +59,7 @@ ULONG MmLowestPhysicalPage = 0xFFFFFFFF; ULONG MmHighestPhysicalPage = 0; -PMEMORY_DESCRIPTOR BiosMemoryMap; +PFREELDR_MEMORY_DESCRIPTOR BiosMemoryMap; ULONG BiosMemoryMapEntryCount; extern ULONG_PTR MmHeapPointer; @@ -67,11 +67,11 @@ ULONG AddMemoryDescriptor( - IN OUT PMEMORY_DESCRIPTOR List, + IN OUT PFREELDR_MEMORY_DESCRIPTOR List, IN ULONG MaxCount, IN PFN_NUMBER BasePage, IN PFN_NUMBER PageCount, - IN MEMORY_TYPE MemoryType) + IN TYPE_OF_MEMORY MemoryType) { ULONG i, c; PFN_NUMBER NextBase; @@ -147,8 +147,8 @@ return c; } -const MEMORY_DESCRIPTOR* -ArcGetMemoryDescriptor(const MEMORY_DESCRIPTOR* Current) +const FREELDR_MEMORY_DESCRIPTOR* +ArcGetMemoryDescriptor(const FREELDR_MEMORY_DESCRIPTOR* Current) { if (Current == NULL) { @@ -166,7 +166,7 @@ BOOLEAN MmInitializeMemoryManager(VOID) { #if DBG - const MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; + const FREELDR_MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; #endif TRACE("Initializing Memory Manager.\n"); @@ -239,7 +239,7 @@ ULONG MmGetAddressablePageCountIncludingHoles(VOID) { - const MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; + const FREELDR_MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; ULONG PageCount; // @@ -255,7 +255,7 @@ // // Yes, remember it if this is real memory // - if (MemoryDescriptor->MemoryType == MemoryFree) + if (MemoryDescriptor->MemoryType == LoaderFree) MmHighestPhysicalPage = MemoryDescriptor->BasePage + MemoryDescriptor->PageCount; } @@ -279,7 +279,7 @@ PVOID MmFindLocationForPageLookupTable(ULONG TotalPageCount) { - const MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; + const FREELDR_MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; ULONG PageLookupTableSize; ULONG PageLookupTablePages; ULONG PageLookupTableStartPage = 0; @@ -293,7 +293,7 @@ while ((MemoryDescriptor = ArcGetMemoryDescriptor(MemoryDescriptor)) != NULL) { // Continue, if memory is not free - if (MemoryDescriptor->MemoryType != MemoryFree) continue; + if (MemoryDescriptor->MemoryType != LoaderFree) continue; // Continue, if the block is not big enough? if (MemoryDescriptor->PageCount < PageLookupTablePages) continue; @@ -318,7 +318,7 @@ VOID MmInitPageLookupTable(PVOID PageLookupTable, ULONG TotalPageCount) { - const MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; + const FREELDR_MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; TYPE_OF_MEMORY MemoryMapPageAllocated; ULONG PageLookupTableStartPage; ULONG PageLookupTablePageCount;

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