Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[hbelusca] 73736: [BOOTLIB]: Make the EfiPrintf with __FUNCTION__ work also on GCC. Also, on MSVC (2010 at least), concatenating without converting __FUNCTION__ to unicode and adding 'L' for the "\...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Feb 6 22:46:57 2017 New Revision: 73736 URL: http://svn.reactos.org/svn/reactos?rev=73736&view=rev Log: [BOOTLIB]: Make the EfiPrintf with __FUNCTION__ work also on GCC. Also, on MSVC (2010 at least), concatenating without converting __FUNCTION__ to unicode and adding 'L' for the "\r\n" returned error C2308. Modified: trunk/reactos/boot/environ/lib/mm/mm.c trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/lib/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/mm.c?r… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] Mon Feb 6 22:46:57 2017 @@ -146,10 +146,8 @@ } /* We don't support virtual memory yet @TODO */ -#ifdef _MSC_VER // Fuck gcc. - EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); EfiStall(1000000); -#endif return STATUS_NOT_IMPLEMENTED; } @@ -189,10 +187,8 @@ } /* We don't support virtual memory yet @TODO */ -#ifdef _MSC_VER // Fuck gcc. - EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); EfiStall(1000000); -#endif return STATUS_NOT_IMPLEMENTED; } @@ -281,10 +277,8 @@ if (MmTranslationType != BlNone) { /* We don't support virtual memory yet @TODO */ -#ifdef _MSC_VER // Fuck gcc. - EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); EfiStall(1000000); -#endif Status = STATUS_NOT_IMPLEMENTED; goto Quickie; } @@ -319,10 +313,8 @@ else { /* We don't support virtual memory yet @TODO */ -#ifdef _MSC_VER // Fuck gcc. - EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); EfiStall(1000000); -#endif Status = STATUS_NOT_IMPLEMENTED; } } @@ -357,10 +349,8 @@ if ((NT_SUCCESS(Status)) && (MmTranslationType != BlNone)) { /* We don't support virtual memory yet @TODO */ -#ifdef _MSC_VER // Fuck gcc. - EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); EfiStall(1000000); -#endif Status = STATUS_NOT_IMPLEMENTED; } } Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Mon Feb 6 22:46:57 2017 @@ -188,10 +188,8 @@ /* Are we allocating from the virtual memory list? */ if (CurrentList == &MmMdlMappedUnallocated) { -#ifdef _MSC_VER // Fuck gcc. - EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); EfiStall(1000000); -#endif return STATUS_NOT_IMPLEMENTED; } @@ -443,10 +441,8 @@ if (MmTranslationType != BlNone) { /* We don't support virtual memory yet @TODO */ -#ifdef _MSC_VER // Fuck gcc. - EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiPrintf(L"not yet implemented in %S\r\n", __FUNCTION__); EfiStall(1000000); -#endif Status = STATUS_NOT_IMPLEMENTED; goto Exit; }

7 years, 10 months

[hbelusca] 73735: [USERENV_APITEST]: Add some simple tests for Get[AllUsers|DefaultUser|User]Profile[s]Directory APIs (checking return values & last errors).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Feb 6 22:14:50 2017 New Revision: 73735 URL: http://svn.reactos.org/svn/reactos?rev=73735&view=rev Log: [USERENV_APITEST]: Add some simple tests for Get[AllUsers|DefaultUser|User]Profile[s]Directory APIs (checking return values & last errors). Added: trunk/rostests/apitests/userenv/GetProfileDirs.c (with props) Modified: trunk/rostests/apitests/userenv/CMakeLists.txt trunk/rostests/apitests/userenv/testlist.c Modified: trunk/rostests/apitests/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/userenv/CMakeLis… ============================================================================== --- trunk/rostests/apitests/userenv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/userenv/CMakeLists.txt [iso-8859-1] Mon Feb 6 22:14:50 2017 @@ -1,5 +1,6 @@ list(APPEND SOURCE + GetProfileDirs.c LoadUserProfile.c testlist.c) Added: trunk/rostests/apitests/userenv/GetProfileDirs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/userenv/GetProfi… ============================================================================== --- trunk/rostests/apitests/userenv/GetProfileDirs.c (added) +++ trunk/rostests/apitests/userenv/GetProfileDirs.c [iso-8859-1] Mon Feb 6 22:14:50 2017 @@ -0,0 +1,86 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Tests for Get[AllUsers|DefaultUser|User]Profile[s]Directory APIs. + * PROGRAMMERS: Hermes Belusca-Maito + */ + +#include <apitest.h> +#include <userenv.h> + +/* The Get[AllUsers|DefaultUser|User]Profile[s]Directory have the same prototype */ +typedef BOOL (WINAPI *GET_PROFILE_DIRS_FUNC)(LPWSTR lpProfileDir, LPDWORD lpcchSize); + +typedef struct _GET_PROFILE_DIRS +{ + GET_PROFILE_DIRS_FUNC pFunc; + LPCWSTR pFuncName; +} GET_PROFILE_DIRS, *PGET_PROFILE_DIRS; + +GET_PROFILE_DIRS GetProfileDirsFuncsList[] = +{ + {GetAllUsersProfileDirectoryW, L"GetAllUsersProfileDirectoryW"}, + {GetDefaultUserProfileDirectoryW, L"GetDefaultUserProfileDirectoryW"}, + {GetProfilesDirectoryW, L"GetProfilesDirectoryW"}, +// {GetUserProfileDirectoryW, L"GetUserProfileDirectoryW"}, +}; + +START_TEST(GetProfileDirs) +{ + BOOL Success; + DWORD dwLastError; + DWORD cchSize; + WCHAR szProfileDir[MAX_PATH]; + + USHORT i; + PGET_PROFILE_DIRS GetProfileDirs; + + for (i = 0; i < _countof(GetProfileDirsFuncsList); ++i) + { + GetProfileDirs = &GetProfileDirsFuncsList[i]; + + SetLastError(0xdeadbeef); + Success = GetProfileDirs->pFunc(NULL, NULL); + dwLastError = GetLastError(); + ok(!Success, "%S: Expected failure, got success instead\n", GetProfileDirs->pFuncName); + ok(dwLastError == ERROR_INVALID_PARAMETER, "%S: Expected error %lu, got %lu\n", + GetProfileDirs->pFuncName, (DWORD)ERROR_INVALID_PARAMETER, dwLastError); + + SetLastError(0xdeadbeef); + Success = GetProfileDirs->pFunc(szProfileDir, NULL); + dwLastError = GetLastError(); + ok(!Success, "%S: Expected failure, got success instead\n", GetProfileDirs->pFuncName); + ok(dwLastError == ERROR_INVALID_PARAMETER, "%S: Expected error %lu, got %lu\n", + GetProfileDirs->pFuncName, (DWORD)ERROR_INVALID_PARAMETER, dwLastError); + + cchSize = 0; + SetLastError(0xdeadbeef); + Success = GetProfileDirs->pFunc(NULL, &cchSize); + dwLastError = GetLastError(); + ok(!Success, "%S: Expected failure, got success instead\n", GetProfileDirs->pFuncName); + ok(dwLastError == ERROR_INSUFFICIENT_BUFFER, "%S: Expected error %lu, got %lu\n", + GetProfileDirs->pFuncName, (DWORD)ERROR_INSUFFICIENT_BUFFER, dwLastError); + ok(cchSize != 0, "%S: Expected a profile directory size != 0, got 0\n", GetProfileDirs->pFuncName); + + cchSize = 0; + SetLastError(0xdeadbeef); + Success = GetProfileDirs->pFunc(szProfileDir, &cchSize); + dwLastError = GetLastError(); + ok(!Success, "%S: Expected failure, got success instead\n", GetProfileDirs->pFuncName); + ok(dwLastError == ERROR_INSUFFICIENT_BUFFER, "%S: Expected error %lu, got %lu\n", + GetProfileDirs->pFuncName, (DWORD)ERROR_INSUFFICIENT_BUFFER, dwLastError); + ok(cchSize != 0, "%S: Expected a profile directory size != 0, got 0\n", GetProfileDirs->pFuncName); + + cchSize = _countof(szProfileDir); + SetLastError(0xdeadbeef); + Success = GetProfileDirs->pFunc(szProfileDir, &cchSize); + dwLastError = GetLastError(); + ok(Success, "%S: Expected to success, got failure instead\n", GetProfileDirs->pFuncName); + ok(dwLastError == 0xdeadbeef, "%S: Expected error %lu, got %lu\n", + GetProfileDirs->pFuncName, (DWORD)0xdeadbeef, dwLastError); + ok(cchSize != 0, "%S: Expected a profile directory size != 0, got 0\n", GetProfileDirs->pFuncName); + ok(*szProfileDir, "%S: Expected a profile directory, got nothing\n", GetProfileDirs->pFuncName); + } + + // TODO: Add more tests! +} Propchange: trunk/rostests/apitests/userenv/GetProfileDirs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/userenv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/userenv/testlist… ============================================================================== --- trunk/rostests/apitests/userenv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/userenv/testlist.c [iso-8859-1] Mon Feb 6 22:14:50 2017 @@ -3,10 +3,12 @@ #define STANDALONE #include <apitest.h> +extern void func_GetProfileDirs(void); extern void func_LoadUserProfile(void); const struct test winetest_testlist[] = { + { "GetProfileDirs", func_GetProfileDirs }, { "LoadUserProfile", func_LoadUserProfile }, { 0, 0 } };

7 years, 10 months

[ion] 73734: [BOOTLIB]: Finish implementation of MmMdRemoveRegionFromMdlEx for other straddling scenarios. [BOOTLIB]: Implement Mmx86MapInitStructure and most of Mmx86InitializeMemoryMap. [BOOTLIB]...

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 6 22:11:21 2017 New Revision: 73734 URL: http://svn.reactos.org/svn/reactos?rev=73734&view=rev Log: [BOOTLIB]: Finish implementation of MmMdRemoveRegionFromMdlEx for other straddling scenarios. [BOOTLIB]: Implement Mmx86MapInitStructure and most of Mmx86InitializeMemoryMap. [BOOTLIB]: Continue implementation of MmDefInitializeTranslation. [BOOTLIB]: More explicitly mark paths which are not yet implemented for paging mode yet (but only on compilers that don't give compiler errors when trying to use __FUNCTION__. Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/mm/descriptor.c trunk/reactos/boot/environ/lib/mm/i386/mmx86.c trunk/reactos/boot/environ/lib/mm/mm.c trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Feb 6 22:11:21 2017 @@ -2190,6 +2190,20 @@ ); /* VIRTUAL MEMORY ROUTINES ***************************************************/ + +NTSTATUS +MmMapPhysicalAddress ( + _Inout_ PPHYSICAL_ADDRESS PhysicalAddress, + _Out_ PVOID VirtualAddress, + _Inout_ PULONGLONG Size, + _In_ ULONG CacheAttributes + ); + +NTSTATUS +MmUnmapVirtualAddress ( + _Inout_ PVOID* VirtualAddress, + _Inout_ PULONGLONG Size + ); NTSTATUS BlMmMapPhysicalAddressEx ( Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Mon Feb 6 22:11:21 2017 @@ -698,16 +698,47 @@ } else { - /* This descriptor covers the head of the allocation @TODO: FIXME */ - EfiPrintf(L"FIXME: Descriptor covers the head of the region\r\n"); - EfiStall(1000000); + /* This descriptor fully covers the entire allocation */ + FoundBasePage = Descriptor->BasePage; + FoundPageCount = BasePage - FoundBasePage; + + /* This is how many pages we will eat away from the descriptor */ + RegionSize = FoundPageCount + PageCount; + + /* Update the descriptor to account for the consumed pages */ + Descriptor->BasePage += RegionSize; + Descriptor->PageCount -= RegionSize; + if (Descriptor->VirtualPage) + { + Descriptor->VirtualPage += RegionSize; + } + + /* Initialize a descriptor for the start of the region */ + Descriptor = MmMdInitByteGranularDescriptor(Descriptor->Flags, + Descriptor->Type, + FoundBasePage, + Descriptor->VirtualPage, + FoundPageCount); + if (!Descriptor) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Add it into the list */ + Status = MmMdAddDescriptorToList(MdList, Descriptor, Flags); + if (!NT_SUCCESS(Status)) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } } } else { - /* This descriptor contains the entire allocation @TODO: FIXME */ - EfiPrintf(L"FIXME: Descriptor contains the entire region\r\n"); - EfiStall(1000000); + /* This descriptor contains the entire allocation */ + RegionSize = FoundEndPage - BasePage; + Descriptor->PageCount -= RegionSize; } /* Keep going */ @@ -724,14 +755,14 @@ * * So first, figure out if we cover the entire end or not */ - if (EndPage > FoundEndPage) + if (EndPage < FoundEndPage) { /* The allocation goes past the end of this descriptor */ - EndPage = FoundEndPage; + FoundEndPage = EndPage; } /* This is how many pages we will eat away from the descriptor */ - RegionSize = EndPage - FoundBasePage; + RegionSize = FoundEndPage - FoundBasePage; /* Update the descriptor to account for the consumed pages */ Descriptor->BasePage += RegionSize; Modified: trunk/reactos/boot/environ/lib/mm/i386/mmx86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/i386/m… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] Mon Feb 6 22:11:21 2017 @@ -10,6 +10,7 @@ #include "bl.h" #include "bcd.h" +#include "../../../../../ntoskrnl/include/internal/i386/mm.h" /* DATA VARIABLES ************************************************************/ @@ -20,9 +21,10 @@ ULONG_PTR MmArchTopOfApplicationAddressSpace; PHYSICAL_ADDRESS Mmx86SelfMapBase; ULONG MmDeferredMappingCount; -PVOID MmPdpt; -PVOID MmArchReferencePage; +PMMPTE MmPdpt; +PULONG MmArchReferencePage; PVOID MmPteBase; +PVOID MmPdeBase; ULONG MmArchReferencePageSize; typedef VOID @@ -107,8 +109,6 @@ PBL_MM_FLUSH_TLB Mmx86FlushTlb; -#define PTE_BASE (PVOID)0xC0000000 - /* FUNCTIONS *****************************************************************/ VOID @@ -125,7 +125,7 @@ VOID ) { - if (MmPteBase != PTE_BASE) + if (MmPteBase != (PVOID)PTE_BASE) { EfiPrintf(L"Supposed to relocate CR3\r\n"); } @@ -299,6 +299,118 @@ } NTSTATUS +Mmx86MapInitStructure ( + _In_ PVOID VirtualAddress, + _In_ ULONGLONG Size, + _In_ PHYSICAL_ADDRESS PhysicalAddress + ) +{ + NTSTATUS Status; + + /* Make a virtual mapping for this physical address */ + Status = MmMapPhysicalAddress(&PhysicalAddress, &VirtualAddress, &Size, 0); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Nothing else to do if we're not in paging mode */ + if (MmTranslationType == BlNone) + { + return STATUS_SUCCESS; + } + + /* Otherwise, remove this region from the list of free virtual ranges */ + Status = MmMdRemoveRegionFromMdlEx(&MmMdlFreeVirtual, + BL_MM_REMOVE_VIRTUAL_REGION_FLAG, + (ULONG_PTR)VirtualAddress >> PAGE_SHIFT, + Size >> PAGE_SHIFT, + 0); + if (!NT_SUCCESS(Status)) + { + /* Unmap the address if that failed */ + MmUnmapVirtualAddress(&VirtualAddress, &Size); + } + + /* Return back to caller */ + return Status; +} + +NTSTATUS +Mmx86InitializeMemoryMap ( + _In_ ULONG Phase, + _In_ PBL_MEMORY_DATA MemoryData + ) +{ + ULONG ImageSize; + PVOID ImageBase; + KDESCRIPTOR Gdt, Idt; + NTSTATUS Status; + PHYSICAL_ADDRESS PhysicalAddress; + + /* If this is phase 2, map the memory regions */ + if (Phase != 1) + { + return Mmx86pMapMemoryRegions(Phase, MemoryData); + } + + /* Get the application image base/size */ + Status = BlGetApplicationBaseAndSize(&ImageBase, &ImageSize); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Map the image back at the same place */ + PhysicalAddress.QuadPart = (ULONG_PTR)ImageBase; + Status = Mmx86MapInitStructure(ImageBase, ImageSize, PhysicalAddress); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Map the first 4MB of memory */ + PhysicalAddress.QuadPart = 0; + Status = Mmx86MapInitStructure(NULL, 4 * 1024 * 1024, PhysicalAddress); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Map the GDT */ + _sgdt(&Gdt.Limit); + PhysicalAddress.QuadPart = Gdt.Base; + Status = Mmx86MapInitStructure((PVOID)Gdt.Base, Gdt.Limit + 1, PhysicalAddress); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Map the IDT */ + __sidt(&Idt.Limit); + PhysicalAddress.QuadPart = Idt.Base; + Status = Mmx86MapInitStructure((PVOID)Idt.Base, Idt.Limit + 1, PhysicalAddress); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Map the reference page */ + PhysicalAddress.QuadPart = (ULONG_PTR)MmArchReferencePage; + Status = Mmx86MapInitStructure(MmArchReferencePage, + MmArchReferencePageSize, + PhysicalAddress); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* More to do */ + EfiPrintf(L"VM more work\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS MmDefInitializeTranslation ( _In_ PBL_MEMORY_DATA MemoryData, _In_ BL_TRANSLATION_TYPE TranslationType @@ -306,6 +418,7 @@ { NTSTATUS Status; PHYSICAL_ADDRESS PhysicalAddress; + ULONG PdeIndex; /* Set the global function pointers for memory translation */ Mmx86TranslateVirtualAddress = MmDefpTranslateVirtualAddress; @@ -394,12 +507,51 @@ /* Zero them out */ RtlZeroMemory((PVOID)Mmx86SelfMapBase.LowPart, 4 * 1024 * 1024); - EfiPrintf(L"PDPT at 0x%p Reference Page at 0x%p Self-map at 0x%p\r\n", MmPdpt, MmArchReferencePage, Mmx86SelfMapBase.LowPart); + + /* Align PTE base to 4MB region */ + MmPteBase = (PVOID)(Mmx86SelfMapBase.LowPart & ~0x3FFFFF); + + /* The PDE is the PTE of the PTE base */ + MmPdeBase = MiAddressToPte(MmPteBase); + PdeIndex = MiGetPdeOffset(MmPdeBase); + MmPdpt[PdeIndex].u.Hard.Valid = 1; + MmPdpt[PdeIndex].u.Hard.Write = 1; + MmPdpt[PdeIndex].u.Hard.PageFrameNumber = (ULONG_PTR)MmPdpt >> PAGE_SHIFT; + MmArchReferencePage[PdeIndex]++; + + /* Remove PTE_BASE from free virtual memory */ + Status = MmMdRemoveRegionFromMdlEx(&MmMdlFreeVirtual, + BL_MM_REMOVE_VIRTUAL_REGION_FLAG, + PTE_BASE >> PAGE_SHIFT, + (4 * 1024 * 1024) >> PAGE_SHIFT, + 0); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Remove HAL_HEAP from free virtual memory */ + Status = MmMdRemoveRegionFromMdlEx(&MmMdlFreeVirtual, + BL_MM_REMOVE_VIRTUAL_REGION_FLAG, + MM_HAL_VA_START >> PAGE_SHIFT, + (4 * 1024 * 1024) >> PAGE_SHIFT, + 0); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Initialize the virtual->physical memory mappings */ + Status = Mmx86InitializeMemoryMap(1, MemoryData); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + EfiPrintf(L"Ready to turn on motherfucking paging, brah!\r\n"); Status = STATUS_NOT_IMPLEMENTED; - - //MmPteBase = Mmx86SelfMapBase.LowPart & 0xFFC00000; Quickie: /* Free reference page if we allocated it */ Modified: trunk/reactos/boot/environ/lib/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/mm.c?r… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] Mon Feb 6 22:11:21 2017 @@ -145,8 +145,11 @@ return STATUS_SUCCESS; } - /* Have to allocate physical pages */ - EfiPrintf(L"VM Todo\r\n"); + /* We don't support virtual memory yet @TODO */ +#ifdef _MSC_VER // Fuck gcc. + EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiStall(1000000); +#endif return STATUS_NOT_IMPLEMENTED; } @@ -185,7 +188,11 @@ return STATUS_UNSUCCESSFUL; } - EfiPrintf(L"VM todo\r\n"); + /* We don't support virtual memory yet @TODO */ +#ifdef _MSC_VER // Fuck gcc. + EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiStall(1000000); +#endif return STATUS_NOT_IMPLEMENTED; } @@ -273,8 +280,11 @@ /* Check if we're in physical or virtual mode */ if (MmTranslationType != BlNone) { - /* For virtual memory, there's more to do */ - EfiPrintf(L"VM not supported for mapping\r\n"); + /* We don't support virtual memory yet @TODO */ +#ifdef _MSC_VER // Fuck gcc. + EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiStall(1000000); +#endif Status = STATUS_NOT_IMPLEMENTED; goto Quickie; } @@ -306,9 +316,15 @@ { Status = STATUS_SUCCESS; } - - /* TODO */ - Status = STATUS_NOT_IMPLEMENTED; + else + { + /* We don't support virtual memory yet @TODO */ +#ifdef _MSC_VER // Fuck gcc. + EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiStall(1000000); +#endif + Status = STATUS_NOT_IMPLEMENTED; + } } else { @@ -340,8 +356,11 @@ /* Check if we actually had a virtual mapping active */ if ((NT_SUCCESS(Status)) && (MmTranslationType != BlNone)) { - /* TODO */ - EfiPrintf(L"unhandled virtual path\r\n"); + /* We don't support virtual memory yet @TODO */ +#ifdef _MSC_VER // Fuck gcc. + EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiStall(1000000); +#endif Status = STATUS_NOT_IMPLEMENTED; } } Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Mon Feb 6 22:11:21 2017 @@ -188,7 +188,10 @@ /* Are we allocating from the virtual memory list? */ if (CurrentList == &MmMdlMappedUnallocated) { - EfiPrintf(L"Virtual memory not yet supported\r\n"); +#ifdef _MSC_VER // Fuck gcc. + EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiStall(1000000); +#endif return STATUS_NOT_IMPLEMENTED; } @@ -439,7 +442,11 @@ /* What translation mode are we using? */ if (MmTranslationType != BlNone) { - /* We don't support virtual memory yet */ + /* We don't support virtual memory yet @TODO */ +#ifdef _MSC_VER // Fuck gcc. + EfiPrintf(L"not yet implemented in " __FUNCTION__ "\r\n"); + EfiStall(1000000); +#endif Status = STATUS_NOT_IMPLEMENTED; goto Exit; }

7 years, 10 months

[pschweitzer] 73733: [FASTFAT] Take the volume label into account when comparing the FAT volumes in case of a verify. This helps avoiding remounting every removable device on verify. Current hack i...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Feb 6 19:43:48 2017 New Revision: 73733 URL: http://svn.reactos.org/svn/reactos?rev=73733&view=rev Log: [FASTFAT] Take the volume label into account when comparing the FAT volumes in case of a verify. This helps avoiding remounting every removable device on verify. Current hack is only kept for FATX volumes for now. Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Mon Feb 6 19:43:48 2017 @@ -220,6 +220,7 @@ DPRINT("FAT12\n"); FatInfo.FatType = FAT12; FatInfo.RootCluster = (FatInfo.rootStart - 1) / FatInfo.SectorsPerCluster; + RtlCopyMemory(&FatInfo.VolumeLabel, &Boot->VolumeLabel, sizeof(FatInfo.VolumeLabel)); } else if (FatInfo.NumberOfClusters >= 65525) { @@ -228,12 +229,14 @@ FatInfo.RootCluster = ((struct _BootSector32*) Boot)->RootCluster; FatInfo.rootStart = FatInfo.dataStart + ((FatInfo.RootCluster - 2) * FatInfo.SectorsPerCluster); FatInfo.VolumeID = ((struct _BootSector32*) Boot)->VolumeID; + RtlCopyMemory(&FatInfo.VolumeLabel, &((struct _BootSector32*)Boot)->VolumeLabel, sizeof(FatInfo.VolumeLabel)); } else { DPRINT("FAT16\n"); FatInfo.FatType = FAT16; FatInfo.RootCluster = FatInfo.rootStart / FatInfo.SectorsPerCluster; + RtlCopyMemory(&FatInfo.VolumeLabel, &Boot->VolumeLabel, sizeof(FatInfo.VolumeLabel)); } if (PartitionInfoIsValid && @@ -653,7 +656,7 @@ * Each write to the root directory must update this crc sum. */ /* HACK */ - if (!FatInfo.FixedMedia) + if (!FatInfo.FixedMedia && FatInfo.FatType >= FATX16) { Status = STATUS_WRONG_VOLUME; } Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Mon Feb 6 19:43:48 2017 @@ -241,6 +241,7 @@ typedef struct { ULONG VolumeID; + CHAR VolumeLabel[11]; ULONG FATStart; ULONG FATCount; ULONG FATSectors;

7 years, 10 months

[ion] 73732: [BOOTLIB]: Don't use __getcallerseflags() in Archx86IsCpuidSupported -- __readeflags should be good enough.

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 6 19:34:15 2017 New Revision: 73732 URL: http://svn.reactos.org/svn/reactos?rev=73732&view=rev Log: [BOOTLIB]: Don't use __getcallerseflags() in Archx86IsCpuidSupported -- __readeflags should be good enough. Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/misc/util.c trunk/reactos/boot/environ/lib/mm/i386/mmx86.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Feb 6 19:34:15 2017 @@ -1562,6 +1562,11 @@ _Out_opt_ PLARGE_INTEGER Frequency ); +ULONGLONG +BlArchGetPerformanceCounter ( + VOID + ); + /* RESOURCE LOCALE INTERNATIONALIZATION ROUTINES *****************************/ NTSTATUS @@ -1654,6 +1659,18 @@ ); /* UTILITY ROUTINES **********************************************************/ + +VOID +BlArchCpuId ( + _In_ ULONG Function, + _In_ ULONG SubFunction, + _Out_ INT* Result + ); + +BOOLEAN +BlArchIsCpuIdFunctionSupported ( + _In_ ULONG Function + ); VOID BlUtlUpdateProgress ( Modified: trunk/reactos/boot/environ/lib/misc/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/util… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] Mon Feb 6 19:34:15 2017 @@ -776,3 +776,91 @@ return PartialSum; } + +BOOLEAN +Archx86IsCpuidSupported ( + VOID + ) +{ + ULONG CallerFlags, Flags; + + /* Read the original flags, and add the CPUID bit */ + CallerFlags = __readeflags() ^ 0x200000; + __writeeflags(CallerFlags); + + /* Read our flags now */ + Flags = __readeflags(); + + /* Check if the bit stuck */ + return (((CallerFlags ^ Flags) >> 21) & 1) ^ 1; +} + +BOOLEAN +BlArchIsCpuIdFunctionSupported ( + _In_ ULONG Function + ) +{ + BOOLEAN Supported; + INT CpuInfo[4]; + + /* Check if the CPU supports this instruction */ + Supported = Archx86IsCpuidSupported(); + if (!Supported) + { + return FALSE; + } + + /* Check if it's the extended function */ + if (Function >= 0x80000000) + { + /* Check if extended functions are supported */ + __cpuid(CpuInfo, 0x80000000); + if ((CpuInfo[0] & 0xFFFFFF00) != 0x80000000) + { + /* Nope */ + return FALSE; + } + } + else + { + /* It's a regular function, get the maximum one supported */ + __cpuid(CpuInfo, 0); + } + + /* Check if our function is within bounds */ + if (Function <= CpuInfo[0]) + { + return TRUE; + } + + /* Nope */ + return FALSE; +} + +ULONGLONG +BlArchGetPerformanceCounter ( + VOID + ) +{ + INT CpuInfo[4]; + + /* Serialize with CPUID, if it exists */ + if (Archx86IsCpuidSupported()) + { + BlArchCpuId(0, 0, CpuInfo); + } + + /* Read the TSC */ + return __rdtsc(); +} + +VOID +BlArchCpuId ( + _In_ ULONG Function, + _In_ ULONG SubFunction, + _Out_ INT* Result + ) +{ + /* Use the intrinsic */ + __cpuidex(Result, Function, SubFunction); +} Modified: trunk/reactos/boot/environ/lib/mm/i386/mmx86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/i386/m… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] Mon Feb 6 19:34:15 2017 @@ -225,94 +225,6 @@ /* Success is if we found a descriptor */ return Descriptor != NULL; -} - -BOOLEAN -Archx86IsCpuidSupported ( - VOID - ) -{ - ULONG CallerFlags, Flags; - - /* Read the original flags, and add the CPUID bit */ - CallerFlags = __getcallerseflags() ^ 0x200000; - __writeeflags(CallerFlags); - - /* Read our flags now */ - Flags = __readeflags(); - - /* Check if the bit stuck */ - return (((CallerFlags ^ Flags) >> 21) & 1) ^ 1; -} - -BOOLEAN -BlArchIsCpuIdFunctionSupported ( - _In_ ULONG Function - ) -{ - BOOLEAN Supported; - INT CpuInfo[4]; - - /* Check if the CPU supports this instruction */ - Supported = Archx86IsCpuidSupported(); - if (!Supported) - { - return FALSE; - } - - /* Check if it's the extended function */ - if (Function >= 0x80000000) - { - /* Check if extended functions are supported */ - __cpuid(CpuInfo, 0x80000000); - if ((CpuInfo[0] & 0xFFFFFF00) != 0x80000000) - { - /* Nope */ - return FALSE; - } - } - else - { - /* It's a regular function, get the maximum one supported */ - __cpuid(CpuInfo, 0); - } - - /* Check if our function is within bounds */ - if (Function <= CpuInfo[0]) - { - return TRUE; - } - - /* Nope */ - return FALSE; -} - -VOID -BlArchCpuId ( - _In_ ULONG Function, - _In_ ULONG SubFunction, - _Out_ INT* Result - ) -{ - /* Use the intrinsic */ - __cpuidex(Result, Function, SubFunction); -} - -ULONGLONG -BlArchGetPerformanceCounter ( - VOID - ) -{ - INT CpuInfo[4]; - - /* Serialize with CPUID, if it exists */ - if (Archx86IsCpuidSupported()) - { - BlArchCpuId(0, 0, CpuInfo); - } - - /* Read the TSC */ - return __rdtsc(); } VOID

7 years, 10 months

[ekohl] 73731: [ACCESS] Get rid of the calculated control positions and sizes.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Feb 6 19:22:48 2017 New Revision: 73731 URL: http://svn.reactos.org/svn/reactos?rev=73731&view=rev Log: [ACCESS] Get rid of the calculated control positions and sizes. Modified: trunk/reactos/dll/cpl/access/lang/bg-BG.rc trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/el-GR.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/he-IL.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/no-NO.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/pt-BR.rc trunk/reactos/dll/cpl/access/lang/ro-RO.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/lang/sk-SK.rc trunk/reactos/dll/cpl/access/lang/sq-AL.rc trunk/reactos/dll/cpl/access/lang/tr-TR.rc trunk/reactos/dll/cpl/access/lang/uk-UA.rc trunk/reactos/dll/cpl/access/lang/zh-CN.rc trunk/reactos/dll/cpl/access/lang/zh-TW.rc trunk/reactos/dll/cpl/access/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/access/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/bg-BG.… Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… Modified: trunk/reactos/dll/cpl/access/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/el-GR.… Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… Modified: trunk/reactos/dll/cpl/access/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/he-IL.… Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… Modified: trunk/reactos/dll/cpl/access/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/no-NO.… Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/access/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pt-BR.… Modified: trunk/reactos/dll/cpl/access/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… Modified: trunk/reactos/dll/cpl/access/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/sk-SK.… Modified: trunk/reactos/dll/cpl/access/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/sq-AL.… Modified: trunk/reactos/dll/cpl/access/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/access/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/uk-UA.… Modified: trunk/reactos/dll/cpl/access/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/zh-CN.… Modified: trunk/reactos/dll/cpl/access/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/zh-TW.… Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?…

7 years, 10 months

[ion] 73730: Cleanly compiles with both VS/GCC on my system even though bcd.h is not included. I have no idea how. Evidence in IRC channel.

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 6 19:21:01 2017 New Revision: 73730 URL: http://svn.reactos.org/svn/reactos?rev=73730&view=rev Log: Cleanly compiles with both VS/GCC on my system even though bcd.h is not included. I have no idea how. Evidence in IRC channel. Modified: trunk/reactos/boot/environ/lib/mm/i386/mmx86.c Modified: trunk/reactos/boot/environ/lib/mm/i386/mmx86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/i386/m… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] Mon Feb 6 19:21:01 2017 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include "bl.h" +#include "bcd.h" /* DATA VARIABLES ************************************************************/

7 years, 10 months

[ion] 73729: [BOOTLIB]: Implement MmPaReserveSelfMapPages, MmPaReleaseSelfMapPages [BOOTLIB]: Stub MmDefMoveVirtualAddressRange, MmDefZeroVirtualAddressRange, MmDefRelocateSelfMap, MmDefpDestroySel...

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 6 19:07:17 2017 New Revision: 73729 URL: http://svn.reactos.org/svn/reactos?rev=73729&view=rev Log: [BOOTLIB]: Implement MmPaReserveSelfMapPages, MmPaReleaseSelfMapPages [BOOTLIB]: Stub MmDefMoveVirtualAddressRange, MmDefZeroVirtualAddressRange, MmDefRelocateSelfMap, MmDefpDestroySelfMap, MmDefpUnmapVirtualAddress, MmDefpRemapVirtualAddress, MmDefpMapPhysicalAddress, MmDefpTranslateVirtualAddress, [BOOTLIB]: Implement MmDefpFlushTlbEntry, MmDefpFlushTlb [BOOTLIB]: Implement MmPaReleaseSelfMapPages, MmPaReserveSelfMapPages. [BOOTLIB]: Implement Archx86IsCpuidSupported, BlArchIsCpuIdFunctionSupported, BlArchCpuId, BlArchGetPerformanceCounter. [BOOTLIB]: Implement MmArchInitialize. [BOOTLIB]: Implement most of MmDefInitializeTranslation. Almost ready to turn on paging. Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/mm/descriptor.c trunk/reactos/boot/environ/lib/mm/i386/mmx86.c trunk/reactos/boot/environ/lib/mm/mm.c trunk/reactos/boot/environ/lib/mm/pagealloc.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Feb 6 19:07:17 2017 @@ -223,6 +223,7 @@ { BlMdPhysical, BlMdVirtual, + BlMdTracker } BL_MEMORY_DESCRIPTOR_TYPE; typedef enum _BL_TRANSLATION_TYPE @@ -2114,6 +2115,17 @@ _In_ ULONG RangeType ); +NTSTATUS +MmPaReleaseSelfMapPages ( + _In_ PHYSICAL_ADDRESS Address + ); + +NTSTATUS +MmPaReserveSelfMapPages ( + _Inout_ PPHYSICAL_ADDRESS PhysicalAddress, + _In_ ULONG Alignment, + _In_ ULONG PageCount + ); NTSTATUS BlMmFreePhysicalPages ( _In_ PHYSICAL_ADDRESS Address Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Mon Feb 6 19:07:17 2017 @@ -680,7 +680,6 @@ FoundPageCount = Descriptor->PageCount; FoundEndPage = FoundBasePage + FoundPageCount; EndPage = PageCount + BasePage; - //EarlyPrint(L"Looking for Region 0x%08I64X-0x%08I64X in 0x%08I64X-0x%08I64X\r\n", BasePage, EndPage, FoundBasePage, FoundEndPage); /* Make a copy of the original descriptor */ RtlCopyMemory(&NewDescriptor, NextEntry, sizeof(NewDescriptor)); @@ -694,19 +693,21 @@ /* Check if the found region starts after the region or ends before the region */ if ((FoundBasePage >= BasePage) || (EndPage >= FoundEndPage)) { - /* This descriptor doesn't cover any part of the range */ - //EarlyPrint(L"No part of this descriptor contains the region\r\n"); + /* This descriptor doesn't cover any part of the range -- nothing to do */ + NOTHING; } else { - /* This descriptor covers the head of the allocation */ - //EarlyPrint(L"Descriptor covers the head of the region\r\n"); + /* This descriptor covers the head of the allocation @TODO: FIXME */ + EfiPrintf(L"FIXME: Descriptor covers the head of the region\r\n"); + EfiStall(1000000); } } else { - /* This descriptor contains the entire allocation */ - //EarlyPrint(L"Descriptor contains the entire region\r\n"); + /* This descriptor contains the entire allocation @TODO: FIXME */ + EfiPrintf(L"FIXME: Descriptor contains the entire region\r\n"); + EfiStall(1000000); } /* Keep going */ @@ -747,7 +748,6 @@ if (!Descriptor->PageCount) { /* Remove it */ - //EarlyPrint(L"Entire descriptor consumed\r\n"); MmMdRemoveDescriptorFromList(MdList, Descriptor); MmMdFreeDescriptor(Descriptor); Modified: trunk/reactos/boot/environ/lib/mm/i386/mmx86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/i386/m… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/i386/mmx86.c [iso-8859-1] Mon Feb 6 19:07:17 2017 @@ -17,7 +17,12 @@ ULONG MmArchLargePageSize; BL_ADDRESS_RANGE MmArchKsegAddressRange; ULONG_PTR MmArchTopOfApplicationAddressSpace; -ULONG_PTR Mmx86SelfMapBase; +PHYSICAL_ADDRESS Mmx86SelfMapBase; +ULONG MmDeferredMappingCount; +PVOID MmPdpt; +PVOID MmArchReferencePage; +PVOID MmPteBase; +ULONG MmArchReferencePageSize; typedef VOID (*PBL_MM_FLUSH_TLB) ( @@ -29,10 +34,79 @@ VOID ); +typedef NTSTATUS +(*PBL_MM_MOVE_VIRTUAL_ADDRESS_RANGE) ( + _In_ PVOID DestinationAddress, + _In_ PVOID SourceAddress, + _In_ ULONGLONG Size + ); + +typedef NTSTATUS +(*PBL_MM_ZERO_VIRTUAL_ADDRESS_RANGE) ( + _In_ PVOID DestinationAddress, + _In_ ULONGLONG Size + ); + +typedef VOID +(*PBL_MM_DESTROY_SELF_MAP) ( + VOID + ); + +typedef VOID +(*PBL_MM_FLUSH_TLB_ENTRY) ( + _In_ PVOID VirtualAddress + ); + +typedef VOID +(*PBL_MM_FLUSH_TLB) ( + VOID + ); + +typedef NTSTATUS +(*PBL_MM_UNMAP_VIRTUAL_ADDRESS) ( + _In_ PVOID VirtualAddress, + _In_ ULONG Size + ); + +typedef NTSTATUS +(*PBL_MM_REMAP_VIRTUAL_ADDRESS) ( + _In_ PPHYSICAL_ADDRESS PhysicalAddress, + _Out_ PVOID VirtualAddress, + _In_ ULONG Size, + _In_ ULONG CacheAttributes + ); + +typedef NTSTATUS +(*PBL_MM_MAP_PHYSICAL_ADDRESS) ( + _In_ PPHYSICAL_ADDRESS PhysicalAddress, + _Out_ PVOID VirtualAddress, + _In_ ULONG Size, + _In_ ULONG CacheAttributes + ); + +typedef BOOLEAN +(*PBL_MM_TRANSLATE_VIRTUAL_ADDRESS) ( + _In_ PVOID VirtualAddress, + _Out_ PPHYSICAL_ADDRESS PhysicalAddress, + _Out_opt_ PULONG CacheAttributes + ); + +PBL_MM_TRANSLATE_VIRTUAL_ADDRESS Mmx86TranslateVirtualAddress; +PBL_MM_MAP_PHYSICAL_ADDRESS Mmx86MapPhysicalAddress; +PBL_MM_REMAP_VIRTUAL_ADDRESS Mmx86RemapVirtualAddress; +PBL_MM_UNMAP_VIRTUAL_ADDRESS Mmx86UnmapVirtualAddress; +PBL_MM_FLUSH_TLB Mmx86FlushTlb; +PBL_MM_FLUSH_TLB_ENTRY Mmx86FlushTlbEntry; +PBL_MM_DESTROY_SELF_MAP Mmx86DestroySelfMap; + PBL_MM_RELOCATE_SELF_MAP BlMmRelocateSelfMap; PBL_MM_FLUSH_TLB BlMmFlushTlb; - -ULONG MmDeferredMappingCount; +PBL_MM_MOVE_VIRTUAL_ADDRESS_RANGE BlMmMoveVirtualAddressRange; +PBL_MM_ZERO_VIRTUAL_ADDRESS_RANGE BlMmZeroVirtualAddressRange; + +PBL_MM_FLUSH_TLB Mmx86FlushTlb; + +#define PTE_BASE (PVOID)0xC0000000 /* FUNCTIONS *****************************************************************/ @@ -43,6 +117,38 @@ { /* Nothing to do */ return; +} + +VOID +MmDefRelocateSelfMap ( + VOID + ) +{ + if (MmPteBase != PTE_BASE) + { + EfiPrintf(L"Supposed to relocate CR3\r\n"); + } +} + +NTSTATUS +MmDefMoveVirtualAddressRange ( + _In_ PVOID DestinationAddress, + _In_ PVOID SourceAddress, + _In_ ULONGLONG Size + ) +{ + EfiPrintf(L"Supposed to move shit\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +MmDefZeroVirtualAddressRange ( + _In_ PVOID DestinationAddress, + _In_ ULONGLONG Size + ) +{ + EfiPrintf(L"Supposed to zero shit\r\n"); + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -79,17 +185,6 @@ } BOOLEAN -Mmx86TranslateVirtualAddress ( - _In_ PVOID VirtualAddress, - _Out_opt_ PPHYSICAL_ADDRESS PhysicalAddress, - _Out_opt_ PULONG CachingFlags - ) -{ - EfiPrintf(L"paging TODO\r\n"); - return FALSE; -} - -BOOLEAN MmArchTranslateVirtualAddress ( _In_ PVOID VirtualAddress, _Out_opt_ PPHYSICAL_ADDRESS PhysicalAddress, @@ -131,6 +226,293 @@ return Descriptor != NULL; } +BOOLEAN +Archx86IsCpuidSupported ( + VOID + ) +{ + ULONG CallerFlags, Flags; + + /* Read the original flags, and add the CPUID bit */ + CallerFlags = __getcallerseflags() ^ 0x200000; + __writeeflags(CallerFlags); + + /* Read our flags now */ + Flags = __readeflags(); + + /* Check if the bit stuck */ + return (((CallerFlags ^ Flags) >> 21) & 1) ^ 1; +} + +BOOLEAN +BlArchIsCpuIdFunctionSupported ( + _In_ ULONG Function + ) +{ + BOOLEAN Supported; + INT CpuInfo[4]; + + /* Check if the CPU supports this instruction */ + Supported = Archx86IsCpuidSupported(); + if (!Supported) + { + return FALSE; + } + + /* Check if it's the extended function */ + if (Function >= 0x80000000) + { + /* Check if extended functions are supported */ + __cpuid(CpuInfo, 0x80000000); + if ((CpuInfo[0] & 0xFFFFFF00) != 0x80000000) + { + /* Nope */ + return FALSE; + } + } + else + { + /* It's a regular function, get the maximum one supported */ + __cpuid(CpuInfo, 0); + } + + /* Check if our function is within bounds */ + if (Function <= CpuInfo[0]) + { + return TRUE; + } + + /* Nope */ + return FALSE; +} + +VOID +BlArchCpuId ( + _In_ ULONG Function, + _In_ ULONG SubFunction, + _Out_ INT* Result + ) +{ + /* Use the intrinsic */ + __cpuidex(Result, Function, SubFunction); +} + +ULONGLONG +BlArchGetPerformanceCounter ( + VOID + ) +{ + INT CpuInfo[4]; + + /* Serialize with CPUID, if it exists */ + if (Archx86IsCpuidSupported()) + { + BlArchCpuId(0, 0, CpuInfo); + } + + /* Read the TSC */ + return __rdtsc(); +} + +VOID +MmDefpDestroySelfMap ( + VOID + ) +{ + EfiPrintf(L"No destroy\r\n"); +} + +VOID +MmDefpFlushTlbEntry ( + _In_ PVOID VirtualAddress + ) +{ + /* Flush the TLB */ + __invlpg(VirtualAddress); +} + +VOID +MmDefpFlushTlb ( + VOID + ) +{ + /* Flush the TLB */ + __writecr3(__readcr3()); +} + +NTSTATUS +MmDefpUnmapVirtualAddress ( + _In_ PVOID VirtualAddress, + _In_ ULONG Size + ) +{ + EfiPrintf(L"No unmap\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +MmDefpRemapVirtualAddress ( + _In_ PPHYSICAL_ADDRESS PhysicalAddress, + _Out_ PVOID VirtualAddress, + _In_ ULONG Size, + _In_ ULONG CacheAttributes + ) +{ + EfiPrintf(L"No remap\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +MmDefpMapPhysicalAddress ( + _In_ PPHYSICAL_ADDRESS PhysicalAddress, + _Out_ PVOID VirtualAddress, + _In_ ULONG Size, + _In_ ULONG CacheAttributes + ) +{ + EfiPrintf(L"No map\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +BOOLEAN +MmDefpTranslateVirtualAddress ( + _In_ PVOID VirtualAddress, + _Out_ PPHYSICAL_ADDRESS PhysicalAddress, + _Out_opt_ PULONG CacheAttributes + ) +{ + EfiPrintf(L"No translate\r\n"); + return FALSE; +} + +NTSTATUS +MmDefInitializeTranslation ( + _In_ PBL_MEMORY_DATA MemoryData, + _In_ BL_TRANSLATION_TYPE TranslationType + ) +{ + NTSTATUS Status; + PHYSICAL_ADDRESS PhysicalAddress; + + /* Set the global function pointers for memory translation */ + Mmx86TranslateVirtualAddress = MmDefpTranslateVirtualAddress; + Mmx86MapPhysicalAddress = MmDefpMapPhysicalAddress; + Mmx86UnmapVirtualAddress = MmDefpUnmapVirtualAddress; + Mmx86RemapVirtualAddress = MmDefpRemapVirtualAddress; + Mmx86FlushTlb = MmDefpFlushTlb; + Mmx86FlushTlbEntry = MmDefpFlushTlbEntry; + Mmx86DestroySelfMap = MmDefpDestroySelfMap; + + /* Check what mode we're currently in */ + if (TranslationType == BlVirtual) + { + EfiPrintf(L"Virtual->Virtual not yet supported\r\n"); + return STATUS_NOT_IMPLEMENTED; + } + else if (TranslationType != BlNone) + { + /* Not even Windows supports PAE->Virtual downgrade */ + return STATUS_NOT_IMPLEMENTED; + } + + /* The None->Virtual case */ + MmPdpt = NULL; + Mmx86SelfMapBase.QuadPart = 0; + MmArchReferencePage = NULL; + + /* Truncate all memory above 4GB so that we don't use it @TODO: FIXME */ + EfiPrintf(L"Warning: not truncating > 4GB memory. Don't boot with more than 4GB of RAM!\r\n"); + //Status = MmPaTruncateMemory(0x100000); + Status = STATUS_SUCCESS; + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Allocate a page directory */ + Status = MmPapAllocatePhysicalPagesInRange(&PhysicalAddress, + BlLoaderPageDirectory, + 1, + 0, + 0, + &MmMdlUnmappedAllocated, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Zero out the page directory */ + MmPdpt = (PVOID)PhysicalAddress.LowPart; + RtlZeroMemory(MmPdpt, PAGE_SIZE); + + /* Set the page size */ + MmArchReferencePageSize = PAGE_SIZE; + + /* Allocate the self-map page */ + Status = MmPapAllocatePhysicalPagesInRange(&PhysicalAddress, + BlLoaderReferencePage, + 1, + 0, + 0, + &MmMdlUnmappedAllocated, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Set the reference page */ + MmArchReferencePage = (PVOID)PhysicalAddress.LowPart; + + /* Zero it out */ + RtlZeroMemory(MmArchReferencePage, MmArchReferencePageSize); + + /* Allocate 4MB worth of self-map pages */ + Status = MmPaReserveSelfMapPages(&Mmx86SelfMapBase, + (4 * 1024 * 1024) >> PAGE_SHIFT, + (4 * 1024 * 1024) >> PAGE_SHIFT); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Zero them out */ + RtlZeroMemory((PVOID)Mmx86SelfMapBase.LowPart, 4 * 1024 * 1024); + + EfiPrintf(L"PDPT at 0x%p Reference Page at 0x%p Self-map at 0x%p\r\n", + MmPdpt, MmArchReferencePage, Mmx86SelfMapBase.LowPart); + Status = STATUS_NOT_IMPLEMENTED; + + //MmPteBase = Mmx86SelfMapBase.LowPart & 0xFFC00000; + +Quickie: + /* Free reference page if we allocated it */ + if (MmArchReferencePage) + { + PhysicalAddress.QuadPart = (ULONG_PTR)MmArchReferencePage; + BlMmFreePhysicalPages(PhysicalAddress); + } + + /* Free page directory if we allocated it */ + if (MmPdpt) + { + PhysicalAddress.QuadPart = (ULONG_PTR)MmPdpt; + BlMmFreePhysicalPages(PhysicalAddress); + } + + /* Free the self map if we allocated it */ + if (Mmx86SelfMapBase.QuadPart) + { + MmPaReleaseSelfMapPages(Mmx86SelfMapBase); + } + + /* All done */ + return Status; +} + NTSTATUS MmArchInitialize ( _In_ ULONG Phase, @@ -140,6 +522,8 @@ ) { NTSTATUS Status; + ULONGLONG IncreaseUserVa, PerfCounter, CpuRandom; + INT CpuInfo[4]; /* For phase 2, just map deferred regions */ if (Phase != 1) @@ -160,7 +544,7 @@ MmArchKsegAddressRange.Minimum = 0; MmArchKsegAddressRange.Maximum = (ULONGLONG)~0; MmArchTopOfApplicationAddressSpace = 0; - Mmx86SelfMapBase = 0; + Mmx86SelfMapBase.QuadPart = 0; /* Set stub functions */ BlMmRelocateSelfMap = MmArchNullFunction; @@ -172,7 +556,70 @@ case BlVirtual: - Status = STATUS_NOT_IMPLEMENTED; + /* Set the large page size to 1024 pages (4MB) */ + MmArchLargePageSize = (4 * 1024 * 1024) / PAGE_SIZE; + + /* Check if /USERVA option was used */ + Status = BlGetBootOptionInteger(BlpApplicationEntry.BcdData, + BcdOSLoaderInteger_IncreaseUserVa, + &IncreaseUserVa); + if (NT_SUCCESS(Status) && (IncreaseUserVa)) + { + /* Yes -- load the kernel at 0xE0000000 instead */ + MmArchKsegBase = 0xE0000000; + } + else + { + /* Nope, load at the standard 2GB split */ + MmArchKsegBase = 0x80000000; + } + + /* Check if CPUID 01h is supported */ + CpuRandom = 0; + if (BlArchIsCpuIdFunctionSupported(1)) + { + /* Call it */ + BlArchCpuId(1, 0, CpuInfo); + + /* Check if RDRAND is supported */ + if (CpuInfo[2] & 0x40000000) + { + EfiPrintf(L"Your CPU can do RDRAND! Good for you!\r\n"); + CpuRandom = 0; + } + } + + /* Read the TSC */ + PerfCounter = BlArchGetPerformanceCounter(); + PerfCounter >>= 4; + _rotl16(PerfCounter, 5); + + /* Set the address range */ + MmArchKsegAddressRange.Minimum = 0; + MmArchKsegAddressRange.Maximum = (ULONGLONG)~0; + + /* Set the KASLR bias */ + MmArchKsegBias = ((PerfCounter ^ CpuRandom) & 0xFFF) << 12; + MmArchKsegBias = 0; + MmArchKsegBase += MmArchKsegBias; + + /* Set the kernel range */ + MmArchKsegAddressRange.Minimum = MmArchKsegBase; + MmArchKsegAddressRange.Maximum = (ULONGLONG)~0; + + /* Set the boot application top maximum */ + MmArchTopOfApplicationAddressSpace = 0x70000000; + + /* Initialize virtual address space translation */ + Status = MmDefInitializeTranslation(MemoryData, TranslationType); + if (NT_SUCCESS(Status)) + { + /* Set stub functions */ + BlMmRelocateSelfMap = MmDefRelocateSelfMap; + BlMmFlushTlb = Mmx86FlushTlb; + BlMmMoveVirtualAddressRange = MmDefMoveVirtualAddressRange; + BlMmZeroVirtualAddressRange = MmDefZeroVirtualAddressRange; + } break; case BlPae: Modified: trunk/reactos/boot/environ/lib/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/mm.c?r… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] Mon Feb 6 19:07:17 2017 @@ -13,7 +13,9 @@ /* DATA VARIABLES ************************************************************/ -BL_TRANSLATION_TYPE MmTranslationType, MmOriginalTranslationType; +/* This is a bug in Windows, but is required for MmTrInitialize to load */ +BL_TRANSLATION_TYPE MmTranslationType = BlMax; +BL_TRANSLATION_TYPE MmOriginalTranslationType; ULONG MmDescriptorCallTreeCount; /* FUNCTIONS *****************************************************************/ @@ -23,15 +25,70 @@ VOID ) { + PBL_MEMORY_DESCRIPTOR Descriptor; + NTSTATUS Status; + PLIST_ENTRY NextEntry; + /* Nothing to track if we're using physical memory */ if (MmTranslationType == BlNone) { return STATUS_SUCCESS; } - /* TODO */ - EfiPrintf(L"Required for protected mode\r\n"); - return STATUS_NOT_IMPLEMENTED; + /* Initialize all the virtual lists */ + MmMdInitializeListHead(&MmMdlMappingTrackers); + MmMdlMappingTrackers.Type = BlMdTracker; + MmMdInitializeListHead(&MmMdlFreeVirtual); + MmMdlFreeVirtual.Type = BlMdVirtual; + + /* Initialize a 4GB free descriptor */ + Descriptor = MmMdInitByteGranularDescriptor(0, + BlConventionalMemory, + 0, + 0, + ((ULONGLONG)4 * 1024 * 1024 * 1024) >> + PAGE_SHIFT); + if (!Descriptor) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Add this 4GB region to the free virtual address space list */ + Status = MmMdAddDescriptorToList(&MmMdlFreeVirtual, + Descriptor, + BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG); + if (!NT_SUCCESS(Status)) + { + RtlZeroMemory(Descriptor, sizeof(*Descriptor)); + goto Quickie; + } + + /* Remove any reserved regions of virtual address space */ + NextEntry = MmMdlReservedAllocated.First->Flink; + while (NextEntry != MmMdlReservedAllocated.First) + { + /* Grab the descriptor and see if it's mapped */ + Descriptor = CONTAINING_RECORD(NextEntry, BL_MEMORY_DESCRIPTOR, ListEntry); + if (Descriptor->VirtualPage) + { + EfiPrintf(L"Need to handle reserved allocation: %llx %llx\r\n", + Descriptor->VirtualPage, Descriptor->PageCount); + EfiStall(100000); + Status = STATUS_NOT_IMPLEMENTED; + goto Quickie; + } + + /* Next entry */ + NextEntry = NextEntry->Flink; + } + + /* Set success if we made it */ + Status = STATUS_SUCCESS; + +Quickie: + /* Return back to caller */ + return Status; } NTSTATUS Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Mon Feb 6 19:07:17 2017 @@ -628,7 +628,7 @@ DontFree = FALSE; HasPageData = FALSE; - /* Only page-aligned addresses a re accepted */ + /* Only page-aligned addresses are accepted */ if (Address.QuadPart & (PAGE_SIZE - 1)) { EfiPrintf(L"free mem fail 1\r\n"); @@ -1096,3 +1096,124 @@ MmMdFreeList(&FirmwareMdList); return Status; } + +NTSTATUS +MmPaReleaseSelfMapPages ( + _In_ PHYSICAL_ADDRESS Address + ) +{ + PBL_MEMORY_DESCRIPTOR Descriptor; + ULONGLONG BasePage; + NTSTATUS Status; + + /* Only page-aligned addresses are accepted */ + if (Address.QuadPart & (PAGE_SIZE - 1)) + { + EfiPrintf(L"free mem fail 1\r\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Get the base page, and find a descriptor that matches */ + BasePage = Address.QuadPart >> PAGE_SHIFT; + Descriptor = MmMdFindDescriptor(BL_MM_INCLUDE_UNMAPPED_UNALLOCATED, + BL_MM_REMOVE_PHYSICAL_REGION_FLAG, + BasePage); + if (!(Descriptor) || (Descriptor->BasePage != BasePage)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Free the physical pages */ + Status = MmFwFreePages(BasePage, Descriptor->PageCount); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Remove the firmware flags */ + Descriptor->Flags &= ~(BlMemoryNonFirmware | + BlMemoryFirmware | + BlMemoryPersistent); + + /* Set it as free memory */ + Descriptor->Type = BlConventionalMemory; + + /* Create a new descriptor that's free memory, covering the old range */ + Descriptor = MmMdInitByteGranularDescriptor(0, + BlConventionalMemory, + BasePage, + 0, + Descriptor->PageCount); + if (!Descriptor) + { + return STATUS_NO_MEMORY; + } + + /* Insert it into the virtual free list */ + return MmMdAddDescriptorToList(&MmMdlFreeVirtual, + Descriptor, + BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG | + BL_MM_ADD_DESCRIPTOR_TRUNCATE_FLAG); +} + +NTSTATUS +MmPaReserveSelfMapPages ( + _Inout_ PPHYSICAL_ADDRESS PhysicalAddress, + _In_ ULONG Alignment, + _In_ ULONG PageCount + ) +{ + NTSTATUS Status; + BL_PA_REQUEST Request; + BL_MEMORY_DESCRIPTOR Descriptor; + + /* Increment descriptor usage count */ + ++MmDescriptorCallTreeCount; + + /* Bail if we don't have an address */ + if (!PhysicalAddress) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Make a request for the required number of self-map pages */ + Request.BaseRange.Minimum = PapMinimumPhysicalPage; + Request.BaseRange.Maximum = 0xFFFFFFFF >> PAGE_SHIFT; + Request.VirtualRange.Minimum = 0; + Request.VirtualRange.Maximum = 0; + Request.Pages = PageCount; + Request.Alignment = Alignment; + Request.Type = BL_MM_REQUEST_DEFAULT_TYPE; + Request.Flags = 0;; + Status = MmPaAllocatePages(&MmMdlUnmappedUnallocated, + &Descriptor, + &MmMdlUnmappedUnallocated, + &Request, + BlLoaderSelfMap); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Remove this region from free virtual memory */ + Status = MmMdRemoveRegionFromMdlEx(&MmMdlFreeVirtual, + BL_MM_REMOVE_VIRTUAL_REGION_FLAG, + Descriptor.BasePage, + Descriptor.PageCount, + 0); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Return the physical address */ + PhysicalAddress->QuadPart = Descriptor.BasePage << PAGE_SHIFT; + +Quickie: + /* Free global descriptors and reduce the count by one */ + MmMdFreeGlobalDescriptors(); + --MmDescriptorCallTreeCount; + return Status; +} +

7 years, 10 months

[hbelusca] 73728: [USERENV] - Remove old file comment header (the code license is already present in COPYING in the main directory); - Fix DPRINT; - Use new-style annotations for exported APIs.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Feb 6 18:57:57 2017 New Revision: 73728 URL: http://svn.reactos.org/svn/reactos?rev=73728&view=rev Log: [USERENV] - Remove old file comment header (the code license is already present in COPYING in the main directory); - Fix DPRINT; - Use new-style annotations for exported APIs. Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Mon Feb 6 18:57:57 2017 @@ -1,20 +1,3 @@ -/* - * ReactOS kernel - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -59,7 +42,7 @@ while (*lpszPtr != (WCHAR)0) { if (*lpszPtr == L'\\') - *lpszPtr = '_'; + *lpszPtr = L'_'; lpszPtr++; } @@ -518,7 +501,7 @@ LocalFree((HLOCAL)SidString); SetLastError((DWORD)Error); - DPRINT("CreateUserProfileW() done\n"); + DPRINT("CreateUserProfileExW() done\n"); return bRet; } @@ -526,8 +509,9 @@ BOOL WINAPI -GetAllUsersProfileDirectoryA(LPSTR lpProfileDir, - LPDWORD lpcchSize) +GetAllUsersProfileDirectoryA( + _Out_opt_ LPSTR lpProfileDir, + _Inout_ LPDWORD lpcchSize) { LPWSTR lpBuffer; BOOL bResult; @@ -559,8 +543,9 @@ BOOL WINAPI -GetAllUsersProfileDirectoryW(LPWSTR lpProfileDir, - LPDWORD lpcchSize) +GetAllUsersProfileDirectoryW( + _Out_opt_ LPWSTR lpProfileDir, + _Inout_ LPDWORD lpcchSize) { WCHAR szProfilePath[MAX_PATH]; WCHAR szBuffer[MAX_PATH]; @@ -654,8 +639,9 @@ BOOL WINAPI -GetDefaultUserProfileDirectoryA(LPSTR lpProfileDir, - LPDWORD lpcchSize) +GetDefaultUserProfileDirectoryA( + _Out_opt_ LPSTR lpProfileDir, + _Inout_ LPDWORD lpcchSize) { LPWSTR lpBuffer; BOOL bResult; @@ -687,8 +673,9 @@ BOOL WINAPI -GetDefaultUserProfileDirectoryW(LPWSTR lpProfileDir, - LPDWORD lpcchSize) +GetDefaultUserProfileDirectoryW( + _Out_opt_ LPWSTR lpProfileDir, + _Inout_ LPDWORD lpcchSize) { WCHAR szProfilePath[MAX_PATH]; WCHAR szBuffer[MAX_PATH]; @@ -782,8 +769,9 @@ BOOL WINAPI -GetProfilesDirectoryA(LPSTR lpProfileDir, - LPDWORD lpcchSize) +GetProfilesDirectoryA( + _Out_ LPSTR lpProfileDir, // _Out_opt_ + _Inout_ LPDWORD lpcchSize) { LPWSTR lpBuffer; BOOL bResult; @@ -821,8 +809,9 @@ BOOL WINAPI -GetProfilesDirectoryW(LPWSTR lpProfilesDir, - LPDWORD lpcchSize) +GetProfilesDirectoryW( + _Out_ LPWSTR lpProfilesDir, // _Out_opt_ + _Inout_ LPDWORD lpcchSize) { WCHAR szProfilesPath[MAX_PATH]; WCHAR szBuffer[MAX_PATH]; @@ -902,9 +891,10 @@ BOOL WINAPI -GetUserProfileDirectoryA(HANDLE hToken, - LPSTR lpProfileDir, - LPDWORD lpcchSize) +GetUserProfileDirectoryA( + _In_ HANDLE hToken, + _Out_opt_ LPSTR lpProfileDir, + _Inout_ LPDWORD lpcchSize) { LPWSTR lpBuffer; BOOL bResult; @@ -943,9 +933,10 @@ BOOL WINAPI -GetUserProfileDirectoryW(HANDLE hToken, - LPWSTR lpProfileDir, - LPDWORD lpcchSize) +GetUserProfileDirectoryW( + _In_ HANDLE hToken, + _Out_opt_ LPWSTR lpProfileDir, + _Inout_ LPDWORD lpcchSize) { UNICODE_STRING SidString; WCHAR szKeyName[MAX_PATH]; @@ -1081,8 +1072,9 @@ BOOL WINAPI -LoadUserProfileA(IN HANDLE hToken, - IN OUT LPPROFILEINFOA lpProfileInfo) +LoadUserProfileA( + _In_ HANDLE hToken, + _Inout_ LPPROFILEINFOA lpProfileInfo) { BOOL bResult = FALSE; PROFILEINFOW ProfileInfoW = {0}; @@ -1191,8 +1183,9 @@ BOOL WINAPI -LoadUserProfileW(IN HANDLE hToken, - IN OUT LPPROFILEINFOW lpProfileInfo) +LoadUserProfileW( + _In_ HANDLE hToken, + _Inout_ LPPROFILEINFOW lpProfileInfo) { WCHAR szUserHivePath[MAX_PATH]; LPWSTR UserName = NULL, Domain = NULL; @@ -1379,8 +1372,9 @@ BOOL WINAPI -UnloadUserProfile(HANDLE hToken, - HANDLE hProfile) +UnloadUserProfile( + _In_ HANDLE hToken, + _In_ HANDLE hProfile) { UNICODE_STRING SidString; LONG Error; @@ -1457,9 +1451,10 @@ BOOL WINAPI -DeleteProfileW(LPCWSTR lpSidString, - LPCWSTR lpProfilePath, - LPCWSTR lpComputerName) +DeleteProfileW( + _In_ LPCWSTR lpSidString, + _In_opt_ LPCWSTR lpProfilePath, + _In_opt_ LPCWSTR lpComputerName) { DPRINT1("DeleteProfileW() not implemented!\n"); return FALSE; @@ -1468,9 +1463,10 @@ BOOL WINAPI -DeleteProfileA(LPCSTR lpSidString, - LPCSTR lpProfilePath, - LPCSTR lpComputerName) +DeleteProfileA( + _In_ LPCSTR lpSidString, + _In_opt_ LPCSTR lpProfilePath, + _In_opt_ LPCSTR lpComputerName) { BOOL bResult; UNICODE_STRING SidString, ProfilePath, ComputerName; @@ -1511,7 +1507,7 @@ BOOL WINAPI -GetProfileType(OUT PDWORD pdwFlags) +GetProfileType(_Out_ PDWORD pdwFlags) { DPRINT1("GetProfileType() not implemented!\n"); return FALSE;

7 years, 10 months

[pschweitzer] 73727: [FASTFAT] Optimize the FAT mount process: there is no need to recognize the FS twice on mounting.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Feb 6 18:14:01 2017 New Revision: 73727 URL: http://svn.reactos.org/svn/reactos?rev=73727&view=rev Log: [FASTFAT] Optimize the FAT mount process: there is no need to recognize the FS twice on mounting. Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Mon Feb 6 18:14:01 2017 @@ -332,30 +332,6 @@ return Status; } -/* - * FUNCTION: Mounts the device - */ -static -NTSTATUS -VfatMountDevice( - PDEVICE_EXTENSION DeviceExt, - PDEVICE_OBJECT DeviceToMount) -{ - NTSTATUS Status; - BOOLEAN RecognizedFS; - - DPRINT("Mounting VFAT device...\n"); - - Status = VfatHasFileSystem(DeviceToMount, &RecognizedFS, &DeviceExt->FatInfo, FALSE); - if (!NT_SUCCESS(Status)) - { - return Status; - } - DPRINT("MountVfatdev %u, PAGE_SIZE = %d\n", DeviceExt->FatInfo.BytesPerCluster, PAGE_SIZE); - - return STATUS_SUCCESS; -} - /* * FUNCTION: Mount the filesystem @@ -443,11 +419,7 @@ DeviceObject->Vpb = Vpb; DeviceToMount->Vpb = Vpb; - Status = VfatMountDevice(DeviceExt, DeviceToMount); - if (!NT_SUCCESS(Status)) - { - goto ByeBye; - } + RtlCopyMemory(&DeviceExt->FatInfo, &FatInfo, sizeof(FATINFO)); DPRINT("BytesPerSector: %u\n", DeviceExt->FatInfo.BytesPerSector); DPRINT("SectorsPerCluster: %u\n", DeviceExt->FatInfo.SectorsPerCluster);

7 years, 10 months

← Newer
1
...
25
26
27
28
29
30
31
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2017