Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 01/01: [KERNEL32] Silent a noisy DPRINT1

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4fcaf92ec385dfb2a0506… commit 4fcaf92ec385dfb2a05064aef1ef75c205a68c81 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 9 11:53:54 2017 +0100 [KERNEL32] Silent a noisy DPRINT1 --- dll/win32/kernel32/client/console/readwrite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/console/readwrite.c b/dll/win32/kernel32/client/console/readwrite.c index 1721fefcbd..c10d833bec 100644 --- a/dll/win32/kernel32/client/console/readwrite.c +++ b/dll/win32/kernel32/client/console/readwrite.c @@ -66,7 +66,7 @@ IntReadConsole(IN HANDLE hConsoleInput, UNICODE_STRING ExeName; ExeName.Length = ExeName.MaximumLength = ReadConsoleRequest->ExeLength; ExeName.Buffer = (PWCHAR)ReadConsoleRequest->StaticBuffer; - DPRINT1("IntReadConsole(ExeName = %wZ)\n", &ExeName); + DPRINT("IntReadConsole(ExeName = %wZ)\n", &ExeName); } /******************************/

6 years, 9 months

[reactos] 01/01: [WIN32K] Fix NtGdiGetTextFaceW to report face name correctly (#173)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea4daf8b6873cd6256c45… commit ea4daf8b6873cd6256c45ac1c6b7cfea2e58b340 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 9 19:06:51 2017 +0900 [WIN32K] Fix NtGdiGetTextFaceW to report face name correctly (#173) Initialize TEXTOBJ.FaceName member in TextIntRealizeFont and use it in NtGdiGetTextFaceW CORE-14071 --- win32ss/gdi/ntgdi/freetype.c | 12 ++++++++++++ win32ss/gdi/ntgdi/text.c | 26 ++++++++++++++++++++------ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 5fb58cf3e4..b8b3f74a03 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -4504,6 +4504,7 @@ TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) } else { + UNICODE_STRING NameW; PFONTGDI FontGdi = ObjToGDI(TextObj->Font, FONT); // Need hdev, when freetype is loaded need to create DEVOBJ for // Consumer and Producer. @@ -4518,6 +4519,17 @@ TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) else FontGdi->RequestWeight = FW_NORMAL; + /* store the localized family name */ + RtlInitUnicodeString(&NameW, NULL); + Status = IntGetFontLocalizedName(&NameW, FontGdi->SharedFace, + TT_NAME_ID_FONT_FAMILY, gusLanguageID); + if (NT_SUCCESS(Status)) + { + RtlCopyMemory(TextObj->FaceName, NameW.Buffer, NameW.Length); + TextObj->FaceName[NameW.Length / sizeof(WCHAR)] = UNICODE_NULL; + RtlFreeUnicodeString(&NameW); + } + Face = FontGdi->SharedFace->Face; //FontGdi->OriginalWeight = WeightFromStyle(Face->style_name); diff --git a/win32ss/gdi/ntgdi/text.c b/win32ss/gdi/ntgdi/text.c index b4130b6b2f..4d8d8779df 100644 --- a/win32ss/gdi/ntgdi/text.c +++ b/win32ss/gdi/ntgdi/text.c @@ -3,7 +3,11 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: win32ss/gdi/ntgdi/text.c * PURPOSE: Text/Font - * PROGRAMMER: + * PROGRAMMERS: Amine Khaldi <amine.khaldi(a)reactos.org> + * Timo Kreuzer <timo.kreuzer(a)reactos.org> + * James Tabor <james.tabor(a)reactos.org> + * Hermes Belusca-Maito <hermes.belusca(a)sfr.fr> + * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ /** Includes ******************************************************************/ @@ -512,12 +516,14 @@ NtGdiGetTextFaceW( TextObj = RealizeFontInit(hFont); ASSERT(TextObj != NULL); - fLen = wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName) + 1; + fLen = wcslen(TextObj->FaceName) + 1; + if (fLen > LF_FACESIZE) + fLen = LF_FACESIZE; if (FaceName != NULL) { Count = min(Count, fLen); - Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); + Status = MmCopyToCaller(FaceName, TextObj->FaceName, Count * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { TEXTOBJ_UnlockText(TextObj); @@ -525,11 +531,19 @@ NtGdiGetTextFaceW( return 0; } /* Terminate if we copied only part of the font name */ - if (Count > 0 && Count < fLen) + ret = Count; + if (Count > 0 && Count <= fLen) { - FaceName[Count - 1] = '\0'; + _SEH2_TRY + { + FaceName[Count - 1] = '\0'; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = 0; + } + _SEH2_END; } - ret = Count; } else {

6 years, 9 months

[reactos] 02/02: [FASTFAT] Calculate more accurately buffer length in VfatGetAllInformation().

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e95751ab786e0266f430e… commit e95751ab786e0266f430e6f65218835774d328d9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 9 10:59:37 2017 +0100 [FASTFAT] Calculate more accurately buffer length in VfatGetAllInformation(). --- drivers/filesystems/fastfat/finfo.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/fastfat/finfo.c index 766a4f38ee..03b7d3cc93 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/fastfat/finfo.c @@ -1188,6 +1188,8 @@ VfatGetAllInformation( if (*BufferLength < FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName)) return STATUS_BUFFER_OVERFLOW; + *BufferLength -= (sizeof(FILE_ACCESS_INFORMATION) + sizeof(FILE_MODE_INFORMATION) + sizeof(FILE_ALIGNMENT_INFORMATION)); + /* Basic Information */ Status = VfatGetBasicInformation(FileObject, Fcb, DeviceExt, &Info->BasicInformation, BufferLength); if (!NT_SUCCESS(Status)) return Status; @@ -1200,15 +1202,9 @@ VfatGetAllInformation( /* EA Information */ Status = VfatGetEaInformation(FileObject, Fcb, DeviceExt, &Info->EaInformation, BufferLength); if (!NT_SUCCESS(Status)) return Status; - /* Access Information: The IO-Manager adds this information */ - *BufferLength -= sizeof(FILE_ACCESS_INFORMATION); /* Position Information */ Status = VfatGetPositionInformation(FileObject, Fcb, DeviceExt, &Info->PositionInformation, BufferLength); if (!NT_SUCCESS(Status)) return Status; - /* Mode Information: The IO-Manager adds this information */ - *BufferLength -= sizeof(FILE_MODE_INFORMATION); - /* Alignment Information: The IO-Manager adds this information */ - *BufferLength -= sizeof(FILE_ALIGNMENT_INFORMATION); /* Name Information */ Status = VfatGetNameInformation(FileObject, Fcb, DeviceExt, &Info->NameInformation, BufferLength);

6 years, 9 months

[reactos] 01/02: [FASTFAT] Allow partial returns on directory info query for first entry. This mimics what MS FastFAT does and fixes (a bit) ntdll_winetest:directory. It still crashes, but go farther.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52f0726817fc40917f1ce… commit 52f0726817fc40917f1ce956029b38985f32d9fa Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 9 10:58:19 2017 +0100 [FASTFAT] Allow partial returns on directory info query for first entry. This mimics what MS FastFAT does and fixes (a bit) ntdll_winetest:directory. It still crashes, but go farther. CORE-13367 --- drivers/filesystems/fastfat/dir.c | 559 ++++++++++++++++++++++---------------- 1 file changed, 330 insertions(+), 229 deletions(-) diff --git a/drivers/filesystems/fastfat/dir.c b/drivers/filesystems/fastfat/dir.c index 165d8c9bdf..db96257281 100644 --- a/drivers/filesystems/fastfat/dir.c +++ b/drivers/filesystems/fastfat/dir.c @@ -91,20 +91,43 @@ NTSTATUS VfatGetFileNameInformation( PVFAT_DIRENTRY_CONTEXT DirContext, PFILE_NAMES_INFORMATION pInfo, - ULONG BufferLength) + ULONG BufferLength, + PULONG Written, + BOOLEAN First) { - if ((sizeof(FILE_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) - return STATUS_BUFFER_OVERFLOW; + NTSTATUS Status; + ULONG BytesToCopy = 0; - pInfo->FileNameLength = DirContext->LongNameU.Length; - pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_DIRECTORY_INFORMATION) + - DirContext->LongNameU.Length); + *Written = 0; + Status = STATUS_BUFFER_OVERFLOW; - RtlCopyMemory(pInfo->FileName, - DirContext->LongNameU.Buffer, - DirContext->LongNameU.Length); + if (FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName) > BufferLength) + return Status; + + if (First || (BufferLength >= FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName) + DirContext->LongNameU.Length)) + { + pInfo->FileNameLength = DirContext->LongNameU.Length; + + *Written = FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName); + pInfo->NextEntryOffset = 0; + if (BufferLength > FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName)) + { + BytesToCopy = min(DirContext->LongNameU.Length, BufferLength - FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName)); + RtlCopyMemory(pInfo->FileName, + DirContext->LongNameU.Buffer, + BytesToCopy); + *Written += BytesToCopy; + + if (BytesToCopy == DirContext->LongNameU.Length) + { + pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_NAMES_INFORMATION) + + BytesToCopy); + Status = STATUS_SUCCESS; + } + } + } - return STATUS_SUCCESS; + return Status; } static @@ -113,90 +136,115 @@ VfatGetFileDirectoryInformation( PVFAT_DIRENTRY_CONTEXT DirContext, PDEVICE_EXTENSION DeviceExt, PFILE_DIRECTORY_INFORMATION pInfo, - ULONG BufferLength) + ULONG BufferLength, + PULONG Written, + BOOLEAN First) { - if ((sizeof(FILE_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) - return STATUS_BUFFER_OVERFLOW; + NTSTATUS Status; + ULONG BytesToCopy = 0; - pInfo->FileNameLength = DirContext->LongNameU.Length; - pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_DIRECTORY_INFORMATION) + - DirContext->LongNameU.Length); - /* pInfo->FileIndex = ; */ + *Written = 0; + Status = STATUS_BUFFER_OVERFLOW; - RtlCopyMemory(pInfo->FileName, - DirContext->LongNameU.Buffer, - DirContext->LongNameU.Length); + if (FIELD_OFFSET(FILE_DIRECTORY_INFORMATION, FileName) > BufferLength) + return Status; - if (vfatVolumeIsFatX(DeviceExt)) + if (First || (BufferLength >= FIELD_OFFSET(FILE_DIRECTORY_INFORMATION, FileName) + DirContext->LongNameU.Length)) { - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.FatX.CreationDate, - DirContext->DirEntry.FatX.CreationTime, - &pInfo->CreationTime); - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.FatX.AccessDate, - DirContext->DirEntry.FatX.AccessTime, - &pInfo->LastAccessTime); - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.FatX.UpdateDate, - DirContext->DirEntry.FatX.UpdateTime, - &pInfo->LastWriteTime); - - pInfo->ChangeTime = pInfo->LastWriteTime; - - if (BooleanFlagOn(DirContext->DirEntry.FatX.Attrib, FILE_ATTRIBUTE_DIRECTORY)) - { - pInfo->EndOfFile.QuadPart = 0; - pInfo->AllocationSize.QuadPart = 0; - } - else + pInfo->FileNameLength = DirContext->LongNameU.Length; + /* pInfo->FileIndex = ; */ + + *Written = FIELD_OFFSET(FILE_DIRECTORY_INFORMATION, FileName); + pInfo->NextEntryOffset = 0; + if (BufferLength > FIELD_OFFSET(FILE_DIRECTORY_INFORMATION, FileName)) { - pInfo->EndOfFile.u.HighPart = 0; - pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.FatX.FileSize; - /* Make allocsize a rounded up multiple of BytesPerCluster */ - pInfo->AllocationSize.u.HighPart = 0; - pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.FatX.FileSize, - DeviceExt->FatInfo.BytesPerCluster); + BytesToCopy = min(DirContext->LongNameU.Length, BufferLength - FIELD_OFFSET(FILE_DIRECTORY_INFORMATION, FileName)); + RtlCopyMemory(pInfo->FileName, + DirContext->LongNameU.Buffer, + BytesToCopy); + *Written += BytesToCopy; + + if (BytesToCopy == DirContext->LongNameU.Length) + { + pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_DIRECTORY_INFORMATION) + + BytesToCopy); + Status = STATUS_SUCCESS; + } } - pInfo->FileAttributes = DirContext->DirEntry.FatX.Attrib & 0x3f; - } - else - { - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.Fat.CreationDate, - DirContext->DirEntry.Fat.CreationTime, - &pInfo->CreationTime); - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.Fat.AccessDate, - 0, - &pInfo->LastAccessTime); - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.Fat.UpdateDate, - DirContext->DirEntry.Fat.UpdateTime, - &pInfo->LastWriteTime); - - pInfo->ChangeTime = pInfo->LastWriteTime; - - if (BooleanFlagOn(DirContext->DirEntry.Fat.Attrib, FILE_ATTRIBUTE_DIRECTORY)) + + + if (vfatVolumeIsFatX(DeviceExt)) { - pInfo->EndOfFile.QuadPart = 0; - pInfo->AllocationSize.QuadPart = 0; + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.CreationDate, + DirContext->DirEntry.FatX.CreationTime, + &pInfo->CreationTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.AccessDate, + DirContext->DirEntry.FatX.AccessTime, + &pInfo->LastAccessTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.UpdateDate, + DirContext->DirEntry.FatX.UpdateTime, + &pInfo->LastWriteTime); + + pInfo->ChangeTime = pInfo->LastWriteTime; + + if (BooleanFlagOn(DirContext->DirEntry.FatX.Attrib, FILE_ATTRIBUTE_DIRECTORY)) + { + pInfo->EndOfFile.QuadPart = 0; + pInfo->AllocationSize.QuadPart = 0; + } + else + { + pInfo->EndOfFile.u.HighPart = 0; + pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.FatX.FileSize; + /* Make allocsize a rounded up multiple of BytesPerCluster */ + pInfo->AllocationSize.u.HighPart = 0; + pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.FatX.FileSize, + DeviceExt->FatInfo.BytesPerCluster); + } + + pInfo->FileAttributes = DirContext->DirEntry.FatX.Attrib & 0x3f; } else { - pInfo->EndOfFile.u.HighPart = 0; - pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.Fat.FileSize; - /* Make allocsize a rounded up multiple of BytesPerCluster */ - pInfo->AllocationSize.u.HighPart = 0; - pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.Fat.FileSize, - DeviceExt->FatInfo.BytesPerCluster); - } + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.CreationDate, + DirContext->DirEntry.Fat.CreationTime, + &pInfo->CreationTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.AccessDate, + 0, + &pInfo->LastAccessTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.UpdateDate, + DirContext->DirEntry.Fat.UpdateTime, + &pInfo->LastWriteTime); + + pInfo->ChangeTime = pInfo->LastWriteTime; + + if (BooleanFlagOn(DirContext->DirEntry.Fat.Attrib, FILE_ATTRIBUTE_DIRECTORY)) + { + pInfo->EndOfFile.QuadPart = 0; + pInfo->AllocationSize.QuadPart = 0; + } + else + { + pInfo->EndOfFile.u.HighPart = 0; + pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.Fat.FileSize; + /* Make allocsize a rounded up multiple of BytesPerCluster */ + pInfo->AllocationSize.u.HighPart = 0; + pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.Fat.FileSize, + DeviceExt->FatInfo.BytesPerCluster); + } - pInfo->FileAttributes = DirContext->DirEntry.Fat.Attrib & 0x3f; + pInfo->FileAttributes = DirContext->DirEntry.Fat.Attrib & 0x3f; + } } - return STATUS_SUCCESS; + return Status; } static @@ -205,183 +253,220 @@ VfatGetFileFullDirectoryInformation( PVFAT_DIRENTRY_CONTEXT DirContext, PDEVICE_EXTENSION DeviceExt, PFILE_FULL_DIR_INFORMATION pInfo, - ULONG BufferLength) + ULONG BufferLength, + PULONG Written, + BOOLEAN First) { - if ((sizeof(FILE_FULL_DIR_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) - return STATUS_BUFFER_OVERFLOW; - - pInfo->FileNameLength = DirContext->LongNameU.Length; - pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_FULL_DIR_INFORMATION) + - DirContext->LongNameU.Length); - /* pInfo->FileIndex = ; */ - /* pInfo->EaSize = ; */ - - RtlCopyMemory(pInfo->FileName, - DirContext->LongNameU.Buffer, - DirContext->LongNameU.Length); - - if (vfatVolumeIsFatX(DeviceExt)) - { - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.FatX.CreationDate, - DirContext->DirEntry.FatX.CreationTime, - &pInfo->CreationTime); - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.FatX.AccessDate, - DirContext->DirEntry.FatX.AccessTime, - &pInfo->LastAccessTime); - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.FatX.UpdateDate, - DirContext->DirEntry.FatX.UpdateTime, - &pInfo->LastWriteTime); - - pInfo->ChangeTime = pInfo->LastWriteTime; - pInfo->EndOfFile.u.HighPart = 0; - pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.FatX.FileSize; - /* Make allocsize a rounded up multiple of BytesPerCluster */ - pInfo->AllocationSize.u.HighPart = 0; - pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.FatX.FileSize, - DeviceExt->FatInfo.BytesPerCluster); - pInfo->FileAttributes = DirContext->DirEntry.FatX.Attrib & 0x3f; - } - else - { - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.Fat.CreationDate, - DirContext->DirEntry.Fat.CreationTime, - &pInfo->CreationTime); - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.Fat.AccessDate, - 0, - &pInfo->LastAccessTime); - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.Fat.UpdateDate, - DirContext->DirEntry.Fat.UpdateTime, - &pInfo->LastWriteTime); - - pInfo->ChangeTime = pInfo->LastWriteTime; - pInfo->EndOfFile.u.HighPart = 0; - pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.Fat.FileSize; - /* Make allocsize a rounded up multiple of BytesPerCluster */ - pInfo->AllocationSize.u.HighPart = 0; - pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.Fat.FileSize, - DeviceExt->FatInfo.BytesPerCluster); - pInfo->FileAttributes = DirContext->DirEntry.Fat.Attrib & 0x3f; - } - - return STATUS_SUCCESS; -} + NTSTATUS Status; + ULONG BytesToCopy = 0; -static -NTSTATUS -VfatGetFileBothInformation( - PVFAT_DIRENTRY_CONTEXT DirContext, - PDEVICE_EXTENSION DeviceExt, - PFILE_BOTH_DIR_INFORMATION pInfo, - ULONG BufferLength) -{ - if ((sizeof(FILE_BOTH_DIR_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) - return STATUS_BUFFER_OVERFLOW; + *Written = 0; + Status = STATUS_BUFFER_OVERFLOW; - pInfo->EaSize = 0; + if (FIELD_OFFSET(FILE_FULL_DIR_INFORMATION, FileName) > BufferLength) + return Status; - if (vfatVolumeIsFatX(DeviceExt)) + if (First || (BufferLength >= FIELD_OFFSET(FILE_FULL_DIR_INFORMATION, FileName) + DirContext->LongNameU.Length)) { pInfo->FileNameLength = DirContext->LongNameU.Length; - - RtlCopyMemory(pInfo->FileName, - DirContext->LongNameU.Buffer, - DirContext->LongNameU.Length); - - pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + - DirContext->LongNameU.Length); - pInfo->ShortName[0] = 0; - pInfo->ShortNameLength = 0; /* pInfo->FileIndex = ; */ + pInfo->EaSize = 0; - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.FatX.CreationDate, - DirContext->DirEntry.FatX.CreationTime, - &pInfo->CreationTime); - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.FatX.AccessDate, - DirContext->DirEntry.FatX.AccessTime, - &pInfo->LastAccessTime); - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.FatX.UpdateDate, - DirContext->DirEntry.FatX.UpdateTime, - &pInfo->LastWriteTime); - - pInfo->ChangeTime = pInfo->LastWriteTime; - - if (BooleanFlagOn(DirContext->DirEntry.FatX.Attrib, FILE_ATTRIBUTE_DIRECTORY)) + *Written = FIELD_OFFSET(FILE_FULL_DIR_INFORMATION, FileName); + pInfo->NextEntryOffset = 0; + if (BufferLength > FIELD_OFFSET(FILE_FULL_DIR_INFORMATION, FileName)) { - pInfo->EndOfFile.QuadPart = 0; - pInfo->AllocationSize.QuadPart = 0; + BytesToCopy = min(DirContext->LongNameU.Length, BufferLength - FIELD_OFFSET(FILE_FULL_DIR_INFORMATION, FileName)); + RtlCopyMemory(pInfo->FileName, + DirContext->LongNameU.Buffer, + BytesToCopy); + *Written += BytesToCopy; + + if (BytesToCopy == DirContext->LongNameU.Length) + { + pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_FULL_DIR_INFORMATION) + + BytesToCopy); + Status = STATUS_SUCCESS; + } } - else + + if (vfatVolumeIsFatX(DeviceExt)) { + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.CreationDate, + DirContext->DirEntry.FatX.CreationTime, + &pInfo->CreationTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.AccessDate, + DirContext->DirEntry.FatX.AccessTime, + &pInfo->LastAccessTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.UpdateDate, + DirContext->DirEntry.FatX.UpdateTime, + &pInfo->LastWriteTime); + + pInfo->ChangeTime = pInfo->LastWriteTime; pInfo->EndOfFile.u.HighPart = 0; pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.FatX.FileSize; /* Make allocsize a rounded up multiple of BytesPerCluster */ pInfo->AllocationSize.u.HighPart = 0; pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.FatX.FileSize, DeviceExt->FatInfo.BytesPerCluster); + pInfo->FileAttributes = DirContext->DirEntry.FatX.Attrib & 0x3f; + } + else + { + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.CreationDate, + DirContext->DirEntry.Fat.CreationTime, + &pInfo->CreationTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.AccessDate, + 0, + &pInfo->LastAccessTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.UpdateDate, + DirContext->DirEntry.Fat.UpdateTime, + &pInfo->LastWriteTime); + + pInfo->ChangeTime = pInfo->LastWriteTime; + pInfo->EndOfFile.u.HighPart = 0; + pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.Fat.FileSize; + /* Make allocsize a rounded up multiple of BytesPerCluster */ + pInfo->AllocationSize.u.HighPart = 0; + pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.Fat.FileSize, + DeviceExt->FatInfo.BytesPerCluster); + pInfo->FileAttributes = DirContext->DirEntry.Fat.Attrib & 0x3f; } - - pInfo->FileAttributes = DirContext->DirEntry.FatX.Attrib & 0x3f; } - else - { - pInfo->FileNameLength = DirContext->LongNameU.Length; - pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + - DirContext->LongNameU.Length); - RtlCopyMemory(pInfo->ShortName, - DirContext->ShortNameU.Buffer, - DirContext->ShortNameU.Length); + return Status; +} + +static +NTSTATUS +VfatGetFileBothInformation( + PVFAT_DIRENTRY_CONTEXT DirContext, + PDEVICE_EXTENSION DeviceExt, + PFILE_BOTH_DIR_INFORMATION pInfo, + ULONG BufferLength, + PULONG Written, + BOOLEAN First) +{ + NTSTATUS Status; + ULONG BytesToCopy = 0; + + *Written = 0; + Status = STATUS_BUFFER_OVERFLOW; - pInfo->ShortNameLength = (CCHAR)DirContext->ShortNameU.Length; + if (FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName) > BufferLength) + return Status; - RtlCopyMemory(pInfo->FileName, - DirContext->LongNameU.Buffer, - DirContext->LongNameU.Length); + if (First || (BufferLength >= FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName) + DirContext->LongNameU.Length)) + { + pInfo->FileNameLength = DirContext->LongNameU.Length; + pInfo->EaSize = 0; - /* pInfo->FileIndex = ; */ + *Written = FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName); + pInfo->NextEntryOffset = 0; + if (BufferLength > FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName)) + { + BytesToCopy = min(DirContext->LongNameU.Length, BufferLength - FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName)); + RtlCopyMemory(pInfo->FileName, + DirContext->LongNameU.Buffer, + BytesToCopy); + *Written += BytesToCopy; + + if (BytesToCopy == DirContext->LongNameU.Length) + { + pInfo->NextEntryOffset = ULONG_ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + + BytesToCopy); + Status = STATUS_SUCCESS; + } + } - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.Fat.CreationDate, - DirContext->DirEntry.Fat.CreationTime, - &pInfo->CreationTime); - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.Fat.AccessDate, - 0, - &pInfo->LastAccessTime); - FsdDosDateTimeToSystemTime(DeviceExt, - DirContext->DirEntry.Fat.UpdateDate, - DirContext->DirEntry.Fat.UpdateTime, - &pInfo->LastWriteTime); - - pInfo->ChangeTime = pInfo->LastWriteTime; - - if (BooleanFlagOn(DirContext->DirEntry.Fat.Attrib, FILE_ATTRIBUTE_DIRECTORY)) + if (vfatVolumeIsFatX(DeviceExt)) { - pInfo->EndOfFile.QuadPart = 0; - pInfo->AllocationSize.QuadPart = 0; + pInfo->ShortName[0] = 0; + pInfo->ShortNameLength = 0; + /* pInfo->FileIndex = ; */ + + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.CreationDate, + DirContext->DirEntry.FatX.CreationTime, + &pInfo->CreationTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.AccessDate, + DirContext->DirEntry.FatX.AccessTime, + &pInfo->LastAccessTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.FatX.UpdateDate, + DirContext->DirEntry.FatX.UpdateTime, + &pInfo->LastWriteTime); + + pInfo->ChangeTime = pInfo->LastWriteTime; + + if (BooleanFlagOn(DirContext->DirEntry.FatX.Attrib, FILE_ATTRIBUTE_DIRECTORY)) + { + pInfo->EndOfFile.QuadPart = 0; + pInfo->AllocationSize.QuadPart = 0; + } + else + { + pInfo->EndOfFile.u.HighPart = 0; + pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.FatX.FileSize; + /* Make allocsize a rounded up multiple of BytesPerCluster */ + pInfo->AllocationSize.u.HighPart = 0; + pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.FatX.FileSize, + DeviceExt->FatInfo.BytesPerCluster); + } + + pInfo->FileAttributes = DirContext->DirEntry.FatX.Attrib & 0x3f; } else { - pInfo->EndOfFile.u.HighPart = 0; - pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.Fat.FileSize; - /* Make allocsize a rounded up multiple of BytesPerCluster */ - pInfo->AllocationSize.u.HighPart = 0; - pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.Fat.FileSize, DeviceExt->FatInfo.BytesPerCluster); - } + pInfo->ShortNameLength = (CCHAR)DirContext->ShortNameU.Length; + + RtlCopyMemory(pInfo->FileName, + DirContext->LongNameU.Buffer, + DirContext->LongNameU.Length); + + /* pInfo->FileIndex = ; */ + + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.CreationDate, + DirContext->DirEntry.Fat.CreationTime, + &pInfo->CreationTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.AccessDate, + 0, + &pInfo->LastAccessTime); + FsdDosDateTimeToSystemTime(DeviceExt, + DirContext->DirEntry.Fat.UpdateDate, + DirContext->DirEntry.Fat.UpdateTime, + &pInfo->LastWriteTime); + + pInfo->ChangeTime = pInfo->LastWriteTime; + + if (BooleanFlagOn(DirContext->DirEntry.Fat.Attrib, FILE_ATTRIBUTE_DIRECTORY)) + { + pInfo->EndOfFile.QuadPart = 0; + pInfo->AllocationSize.QuadPart = 0; + } + else + { + pInfo->EndOfFile.u.HighPart = 0; + pInfo->EndOfFile.u.LowPart = DirContext->DirEntry.Fat.FileSize; + /* Make allocsize a rounded up multiple of BytesPerCluster */ + pInfo->AllocationSize.u.HighPart = 0; + pInfo->AllocationSize.u.LowPart = ROUND_UP(DirContext->DirEntry.Fat.FileSize, DeviceExt->FatInfo.BytesPerCluster); + } - pInfo->FileAttributes = DirContext->DirEntry.Fat.Attrib & 0x3f; + pInfo->FileAttributes = DirContext->DirEntry.Fat.Attrib & 0x3f; + } } - return STATUS_SUCCESS; + return Status; } static @@ -402,6 +487,7 @@ DoQuery( VFAT_DIRENTRY_CONTEXT DirContext; WCHAR LongNameBuffer[LONGNAME_MAX_LENGTH + 1]; WCHAR ShortNameBuffer[13]; + ULONG Written; PIO_STACK_LOCATION Stack = IrpContext->Stack; @@ -517,6 +603,7 @@ DoQuery( DirContext.ShortNameU.Buffer = ShortNameBuffer; DirContext.ShortNameU.MaximumLength = sizeof(ShortNameBuffer); + Written = 0; while ((Status == STATUS_SUCCESS) && (BufferLength > 0)) { Status = FindFile(IrpContext->DeviceExt, @@ -536,28 +623,36 @@ DoQuery( case FileNameInformation: Status = VfatGetFileNameInformation(&DirContext, (PFILE_NAMES_INFORMATION)Buffer, - BufferLength); + BufferLength, + &Written, + Buffer0 == NULL); break; case FileDirectoryInformation: Status = VfatGetFileDirectoryInformation(&DirContext, IrpContext->DeviceExt, (PFILE_DIRECTORY_INFORMATION)Buffer, - BufferLength); + BufferLength, + &Written, + Buffer0 == NULL); break; case FileFullDirectoryInformation: Status = VfatGetFileFullDirectoryInformation(&DirContext, IrpContext->DeviceExt, (PFILE_FULL_DIR_INFORMATION)Buffer, - BufferLength); + BufferLength, + &Written, + Buffer0 == NULL); break; case FileBothDirectoryInformation: Status = VfatGetFileBothInformation(&DirContext, IrpContext->DeviceExt, (PFILE_BOTH_DIR_INFORMATION)Buffer, - BufferLength); + BufferLength, + &Written, + Buffer0 == NULL); break; default: @@ -591,6 +686,12 @@ DoQuery( Status = STATUS_SUCCESS; IrpContext->Irp->IoStatus.Information = Stack->Parameters.QueryDirectory.Length - BufferLength; } + else + { + ASSERT(Status != STATUS_SUCCESS || BufferLength == 0); + ASSERT(Written <= Stack->Parameters.QueryDirectory.Length); + IrpContext->Irp->IoStatus.Information = Written; + } ExReleaseResourceLite(&pFcb->MainResource); ExReleaseResourceLite(&IrpContext->DeviceExt->DirResource);

6 years, 9 months

[reactos] 01/01: [STOBJECT] Improve the existing PCH and make use of it.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e15874b491a3b528eeae0… commit e15874b491a3b528eeae0dbbf64b29bcfb9c20a9 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Dec 8 23:15:31 2017 +0100 [STOBJECT] Improve the existing PCH and make use of it. --- dll/shellext/stobject/CMakeLists.txt | 9 +++++++-- dll/shellext/stobject/csystray.cpp | 3 ++- dll/shellext/stobject/csystray.h | 1 + dll/shellext/stobject/hotplug.cpp | 9 +++------ dll/shellext/stobject/power.cpp | 16 +++++----------- dll/shellext/stobject/precomp.h | 22 ++++++++-------------- dll/shellext/stobject/stobject.cpp | 3 --- dll/shellext/stobject/volume.cpp | 3 --- 8 files changed, 26 insertions(+), 40 deletions(-) diff --git a/dll/shellext/stobject/CMakeLists.txt b/dll/shellext/stobject/CMakeLists.txt index 341fe672ae..e25e433f6f 100644 --- a/dll/shellext/stobject/CMakeLists.txt +++ b/dll/shellext/stobject/CMakeLists.txt @@ -20,13 +20,17 @@ spec2def(stobject.dll stobject.spec) file(GLOB_RECURSE stobject_rc_deps resources/*.*) add_rc_deps(stobject.rc ${stobject_rc_deps}) -add_library(stobject SHARED +list(APPEND SOURCE csystray.cpp stobject.cpp - stobject.rc hotplug.cpp power.cpp volume.cpp + precomp.h) + +add_library(stobject SHARED + ${SOURCE} + stobject.rc ${CMAKE_CURRENT_BINARY_DIR}/stobject.def) set_module_type(stobject win32dll UNICODE) @@ -48,4 +52,5 @@ add_importlibs(stobject kernel32 ntdll) +add_pch(stobject precomp.h SOURCE) add_cd_file(TARGET stobject DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/stobject/csystray.cpp b/dll/shellext/stobject/csystray.cpp index e4a2afe403..89bd5c5ac0 100644 --- a/dll/shellext/stobject/csystray.cpp +++ b/dll/shellext/stobject/csystray.cpp @@ -9,7 +9,8 @@ #include "precomp.h" -WINE_DEFAULT_DEBUG_CHANNEL(stobject); +#include <undocshell.h> +#include <shellutils.h> SysTrayIconHandlers_t g_IconHandlers [] = { { Volume_Init, Volume_Shutdown, Volume_Update, Volume_Message }, diff --git a/dll/shellext/stobject/csystray.h b/dll/shellext/stobject/csystray.h index b95cd65577..214a4c6549 100644 --- a/dll/shellext/stobject/csystray.h +++ b/dll/shellext/stobject/csystray.h @@ -7,6 +7,7 @@ * David Quintana <gigaherz(a)gmail.com> * Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ + #pragma once extern const GUID CLSID_SysTray; diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index 4b17a1baf2..5c6d3099a8 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -5,17 +5,14 @@ * PURPOSE: Removable devices notification icon handler * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ -#include <windows.h> + #include "precomp.h" -#include <mmsystem.h> -#include <mmddk.h> -#include <atlstr.h> + #include <atlsimpcoll.h> #include <dbt.h> -#include <setupapi.h> #include <cfgmgr32.h> +#include <shlwapi.h> -WINE_DEFAULT_DEBUG_CHANNEL(stobject); #define DISPLAY_NAME_LEN 40 //BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY Handle); diff --git a/dll/shellext/stobject/power.cpp b/dll/shellext/stobject/power.cpp index a25de28cfb..12382faf7d 100644 --- a/dll/shellext/stobject/power.cpp +++ b/dll/shellext/stobject/power.cpp @@ -8,23 +8,17 @@ * David Quintana <gigaherz(a)gmail.com> */ -#include <windows.h> -#include <setupapi.h> -#include <devguid.h> -#include <batclass.h> - #include "precomp.h" -#include "powrprof.h" -#include <mmsystem.h> -#include <mmddk.h> -#include <atlstr.h> +#include <devguid.h> +#include <winioctl.h> +#include <powrprof.h> +#include <windows.h> +#include <batclass.h> #define GBS_HASBATTERY 0x1 #define GBS_ONBATTERY 0x2 -WINE_DEFAULT_DEBUG_CHANNEL(stobject); - int br_icons[5] = { IDI_BATTCAP0, IDI_BATTCAP1, IDI_BATTCAP2, IDI_BATTCAP3, IDI_BATTCAP4 }; // battery mode icons. int bc_icons[5] = { IDI_BATTCHA0, IDI_BATTCHA1, IDI_BATTCHA2, IDI_BATTCHA3, IDI_BATTCHA4 }; // charging mode icons. diff --git a/dll/shellext/stobject/precomp.h b/dll/shellext/stobject/precomp.h index 64824ba825..cefd8ea16e 100644 --- a/dll/shellext/stobject/precomp.h +++ b/dll/shellext/stobject/precomp.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _STOBJECT_PRECOMP_H_ +#define _STOBJECT_PRECOMP_H_ #define WIN32_NO_STATUS #include <stdarg.h> @@ -12,27 +13,18 @@ #include <windef.h> #include <winbase.h> -#include <winreg.h> -#include <winuser.h> -#include <wincon.h> -#include <ddeml.h> #include <shlguid_undoc.h> -#include <shlwapi.h> #include <shlobj.h> -#include <shlobj_undoc.h> -#include <shlwapi_undoc.h> -#include <tchar.h> #include <strsafe.h> #include <atlbase.h> #include <atlcom.h> #include <atlwin.h> -#include <undocshell.h> -#include <shellutils.h> - +#include <atlstr.h> +#include <setupapi.h> #include <shellapi.h> #include <wine/debug.h> -#include <wine/unicode.h> +WINE_DEFAULT_DEBUG_CHANNEL(stobject); #include "resource.h" @@ -82,4 +74,6 @@ extern HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uM #define POWER_TIMER_ID 2 #define VOLUME_TIMER_ID 3 -#define HOTPLUG_TIMER_ID 4 \ No newline at end of file +#define HOTPLUG_TIMER_ID 4 + +#endif /* _STOBJECT_PRECOMP_H_ */ diff --git a/dll/shellext/stobject/stobject.cpp b/dll/shellext/stobject/stobject.cpp index 3b0683bbe1..455bf70ef9 100644 --- a/dll/shellext/stobject/stobject.cpp +++ b/dll/shellext/stobject/stobject.cpp @@ -9,9 +9,6 @@ #include "precomp.h" -#include <olectl.h> -#include <atlwin.h> - BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_SysTray, CSysTray) END_OBJECT_MAP() diff --git a/dll/shellext/stobject/volume.cpp b/dll/shellext/stobject/volume.cpp index b7cb3ff049..a78bda743b 100644 --- a/dll/shellext/stobject/volume.cpp +++ b/dll/shellext/stobject/volume.cpp @@ -8,11 +8,8 @@ #include "precomp.h" -#include <mmsystem.h> #include <mmddk.h> -WINE_DEFAULT_DEBUG_CHANNEL(stobject); - HICON g_hIconVolume; HICON g_hIconMute;

6 years, 9 months

[reactos] 01/01: [CONSRV] Deduplicate GetScreenBufferSizeUnits(), SmallRectToRect() and ConsoleInput. Rename ConsoleList and InsertConsole(). #179

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6429bfcd8f8fe1dd6ca83… commit 6429bfcd8f8fe1dd6ca836421f723a139f0fea78 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Dec 8 23:04:48 2017 +0100 [CONSRV] Deduplicate GetScreenBufferSizeUnits(), SmallRectToRect() and ConsoleInput. Rename ConsoleList and InsertConsole(). #179 --- win32ss/user/winsrv/consrv/condrv/coninput.c | 9 ------ win32ss/user/winsrv/consrv/condrv/console.c | 10 +++--- win32ss/user/winsrv/consrv/consrv.h | 5 +++ win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 37 ---------------------- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c | 21 ------------ win32ss/user/winsrv/consrv/frontends/gui/guiterm.h | 36 +++++++++++++++++++++ win32ss/user/winsrv/consrv/frontends/terminal.c | 7 ---- 7 files changed, 46 insertions(+), 79 deletions(-) diff --git a/win32ss/user/winsrv/consrv/condrv/coninput.c b/win32ss/user/winsrv/consrv/condrv/coninput.c index 393c9af365..e3894d8a54 100644 --- a/win32ss/user/winsrv/consrv/condrv/coninput.c +++ b/win32ss/user/winsrv/consrv/condrv/coninput.c @@ -14,15 +14,6 @@ #define NDEBUG #include <debug.h> -/* GLOBALS ********************************************************************/ - -typedef struct ConsoleInput_t -{ - LIST_ENTRY ListEntry; - INPUT_RECORD InputEvent; -} ConsoleInput; - - /* PRIVATE FUNCTIONS **********************************************************/ // ConDrvAddInputEvents diff --git a/win32ss/user/winsrv/consrv/condrv/console.c b/win32ss/user/winsrv/consrv/condrv/console.c index df0f4118bf..d088f317eb 100644 --- a/win32ss/user/winsrv/consrv/condrv/console.c +++ b/win32ss/user/winsrv/consrv/condrv/console.c @@ -23,7 +23,7 @@ static ULONG CurrentConsoleID = 0; /* Linked list of consoles */ -static LIST_ENTRY ConsoleList; +static LIST_ENTRY ConDrvConsoleList; static RTL_RESOURCE ListLock; #define ConDrvLockConsoleListExclusive() \ @@ -37,7 +37,7 @@ static RTL_RESOURCE ListLock; static NTSTATUS -InsertConsole(IN PCONSOLE Console) +ConDrvInsertConsole(IN PCONSOLE Console) { ASSERT(Console); @@ -45,7 +45,7 @@ InsertConsole(IN PCONSOLE Console) ConDrvLockConsoleListExclusive(); DPRINT("Insert in the list\n"); - InsertTailList(&ConsoleList, &Console->ListEntry); + InsertTailList(&ConDrvConsoleList, &Console->ListEntry); // FIXME: Move this code to the caller function!! /* Get a new console ID */ @@ -152,7 +152,7 @@ ConDrvInitConsoleSupport(VOID) DPRINT("CONSRV: ConDrvInitConsoleSupport()\n"); /* Initialize the console list and its lock */ - InitializeListHead(&ConsoleList); + InitializeListHead(&ConDrvConsoleList); RtlInitializeResource(&ListLock); } @@ -248,7 +248,7 @@ ConDrvInitConsole(OUT PCONSOLE* NewConsole, DPRINT("Console initialized\n"); /* All went right, so add the console to the list */ - Status = InsertConsole(Console); + Status = ConDrvInsertConsole(Console); if (!NT_SUCCESS(Status)) { /* Fail */ diff --git a/win32ss/user/winsrv/consrv/consrv.h b/win32ss/user/winsrv/consrv/consrv.h index c17573e8e0..4ea7d2ee17 100644 --- a/win32ss/user/winsrv/consrv/consrv.h +++ b/win32ss/user/winsrv/consrv/consrv.h @@ -54,6 +54,11 @@ typedef struct _CONSOLE_PROCESS_DATA // LPTHREAD_START_ROUTINE ImeRoutine; } CONSOLE_PROCESS_DATA, *PCONSOLE_PROCESS_DATA; +typedef struct ConsoleInput_t +{ + LIST_ENTRY ListEntry; + INPUT_RECORD InputEvent; +} ConsoleInput; // Helper for code refactoring // #define USE_NEW_CONSOLE_WAY diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index 6058956599..860244f6c5 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -20,7 +20,6 @@ #include "font.h" #include "guiterm.h" -#include "conwnd.h" #include "resource.h" /* GLOBALS ********************************************************************/ @@ -172,28 +171,6 @@ UnRegisterConWndClass(HINSTANCE hInstance) return !!UnregisterClassW(GUI_CONWND_CLASS, hInstance); } - -/* NOTE: Also used in guiterm.c */ -/* static */ VOID -GetScreenBufferSizeUnits(IN PCONSOLE_SCREEN_BUFFER Buffer, - IN PGUI_CONSOLE_DATA GuiData, - OUT PUINT WidthUnit, - OUT PUINT HeightUnit) -{ - ASSERT(Buffer && GuiData && WidthUnit && HeightUnit); - - if (GetType(Buffer) == TEXTMODE_BUFFER) - { - *WidthUnit = GuiData->CharWidth ; - *HeightUnit = GuiData->CharHeight; - } - else /* if (GetType(Buffer) == GRAPHICS_BUFFER) */ - { - *WidthUnit = 1; - *HeightUnit = 1; - } -} - static VOID AppendMenuItems(HMENU hMenu, const GUICONSOLE_MENUITEM *Items) @@ -742,20 +719,6 @@ OnFocus(PGUI_CONSOLE_DATA GuiData, BOOL SetFocus) DPRINT("TODO: Destroy console caret\n"); } -static VOID -SmallRectToRect(PGUI_CONSOLE_DATA GuiData, PRECT Rect, PSMALL_RECT SmallRect) -{ - PCONSOLE_SCREEN_BUFFER Buffer = GuiData->ActiveBuffer; - UINT WidthUnit, HeightUnit; - - GetScreenBufferSizeUnits(Buffer, GuiData, &WidthUnit, &HeightUnit); - - Rect->left = (SmallRect->Left - Buffer->ViewOrigin.X) * WidthUnit ; - Rect->top = (SmallRect->Top - Buffer->ViewOrigin.Y) * HeightUnit; - Rect->right = (SmallRect->Right + 1 - Buffer->ViewOrigin.X) * WidthUnit ; - Rect->bottom = (SmallRect->Bottom + 1 - Buffer->ViewOrigin.Y) * HeightUnit; -} - VOID GetSelectionBeginEnd(PCOORD Begin, PCOORD End, PCOORD SelectionAnchor, diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c index 1258b792f8..c3e14d3099 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c @@ -56,13 +56,6 @@ UnRegisterConWndClass(HINSTANCE hInstance); /* FUNCTIONS ******************************************************************/ -/* NOTE: Defined in conwnd.c */ -VOID -GetScreenBufferSizeUnits(IN PCONSOLE_SCREEN_BUFFER Buffer, - IN PGUI_CONSOLE_DATA GuiData, - OUT PUINT WidthUnit, - OUT PUINT HeightUnit); - VOID GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData) { @@ -78,20 +71,6 @@ GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData) } } -static VOID -SmallRectToRect(PGUI_CONSOLE_DATA GuiData, PRECT Rect, PSMALL_RECT SmallRect) -{ - PCONSOLE_SCREEN_BUFFER Buffer = GuiData->ActiveBuffer; - UINT WidthUnit, HeightUnit; - - GetScreenBufferSizeUnits(Buffer, GuiData, &WidthUnit, &HeightUnit); - - Rect->left = (SmallRect->Left - Buffer->ViewOrigin.X) * WidthUnit ; - Rect->top = (SmallRect->Top - Buffer->ViewOrigin.Y) * HeightUnit; - Rect->right = (SmallRect->Right + 1 - Buffer->ViewOrigin.X) * WidthUnit ; - Rect->bottom = (SmallRect->Bottom + 1 - Buffer->ViewOrigin.Y) * HeightUnit; -} - static VOID DrawRegion(PGUI_CONSOLE_DATA GuiData, SMALL_RECT* Region) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h index 3b252afdb3..627237237d 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h @@ -14,6 +14,42 @@ #include "guisettings.h" #include "conwnd.h" +extern inline +VOID +GetScreenBufferSizeUnits(IN PCONSOLE_SCREEN_BUFFER Buffer, + IN PGUI_CONSOLE_DATA GuiData, + OUT PUINT WidthUnit, + OUT PUINT HeightUnit) +{ + ASSERT(Buffer && GuiData && WidthUnit && HeightUnit); + + if (GetType(Buffer) == TEXTMODE_BUFFER) + { + *WidthUnit = GuiData->CharWidth ; + *HeightUnit = GuiData->CharHeight; + } + else /* if (GetType(Buffer) == GRAPHICS_BUFFER) */ + { + *WidthUnit = 1; + *HeightUnit = 1; + } +} + +extern inline +VOID +SmallRectToRect(PGUI_CONSOLE_DATA GuiData, PRECT Rect, PSMALL_RECT SmallRect) +{ + PCONSOLE_SCREEN_BUFFER Buffer = GuiData->ActiveBuffer; + UINT WidthUnit, HeightUnit; + + GetScreenBufferSizeUnits(Buffer, GuiData, &WidthUnit, &HeightUnit); + + Rect->left = (SmallRect->Left - Buffer->ViewOrigin.X) * WidthUnit ; + Rect->top = (SmallRect->Top - Buffer->ViewOrigin.Y) * HeightUnit; + Rect->right = (SmallRect->Right + 1 - Buffer->ViewOrigin.X) * WidthUnit ; + Rect->bottom = (SmallRect->Bottom + 1 - Buffer->ViewOrigin.Y) * HeightUnit; +} + VOID GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData); diff --git a/win32ss/user/winsrv/consrv/frontends/terminal.c b/win32ss/user/winsrv/consrv/frontends/terminal.c index 49f2d1fe3a..d4f380ba3e 100644 --- a/win32ss/user/winsrv/consrv/frontends/terminal.c +++ b/win32ss/user/winsrv/consrv/frontends/terminal.c @@ -40,13 +40,6 @@ ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ MultiByteToWideChar((Console)->InputCodePage, 0, (sChar), 1, (dWChar), 1) -typedef struct ConsoleInput_t -{ - LIST_ENTRY ListEntry; - INPUT_RECORD InputEvent; -} ConsoleInput; - - /* PRIVATE FUNCTIONS **********************************************************/ #if 0

6 years, 9 months

[reactos] 01/01: [SERVICES] Fix querying the status of a registered but not started driver. The current implementation was broken and some dead code was never called; always failing before. This fix revives this dead code! Extra fix: avoid derefencing potential null-ptr. And also, as bonus, comment the function so that logic can be easily understood.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d91a2e8cea8b17fdf641… commit 9d91a2e8cea8b17fdf64171724ed07fda4546aab Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 8 22:45:04 2017 +0100 [SERVICES] Fix querying the status of a registered but not started driver. The current implementation was broken and some dead code was never called; always failing before. This fix revives this dead code! Extra fix: avoid derefencing potential null-ptr. And also, as bonus, comment the function so that logic can be easily understood. CORE-14062 --- base/system/services/driver.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/base/system/services/driver.c b/base/system/services/driver.c index 34be894659..4248ac95c9 100644 --- a/base/system/services/driver.c +++ b/base/system/services/driver.c @@ -140,8 +140,13 @@ ScmGetDriverStatus(PSERVICE lpService, DPRINT1("ScmGetDriverStatus() called\n"); - memset(lpServiceStatus, 0, sizeof(SERVICE_STATUS)); + /* Zero output buffer if any */ + if (lpServiceStatus != NULL) + { + memset(lpServiceStatus, 0, sizeof(SERVICE_STATUS)); + } + /* Select the appropriate object directory based on driver type */ if (lpService->Status.dwServiceType == SERVICE_KERNEL_DRIVER) { RtlInitUnicodeString(&DirName, L"\\Driver"); @@ -158,6 +163,7 @@ ScmGetDriverStatus(PSERVICE lpService, NULL, NULL); + /* Open the object directory where loaded drivers are */ Status = NtOpenDirectoryObject(&DirHandle, DIRECTORY_QUERY | DIRECTORY_TRAVERSE, &ObjectAttributes); @@ -167,12 +173,14 @@ ScmGetDriverStatus(PSERVICE lpService, return RtlNtStatusToDosError(Status); } + /* Allocate a buffer big enough for querying the object */ BufferLength = sizeof(OBJECT_DIRECTORY_INFORMATION) + 2 * MAX_PATH * sizeof(WCHAR); DirInfo = (OBJECT_DIRECTORY_INFORMATION*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, BufferLength); + /* Now, start browsing entry by entry */ Index = 0; while (TRUE) { @@ -183,19 +191,23 @@ ScmGetDriverStatus(PSERVICE lpService, FALSE, &Index, &DataLength); + /* End of enumeration, the driver was not found */ if (Status == STATUS_NO_MORE_ENTRIES) { DPRINT("No more services\n"); break; } + /* Other error, fail */ if (!NT_SUCCESS(Status)) break; DPRINT("Comparing: '%S' '%wZ'\n", lpService->lpServiceName, &DirInfo->Name); + /* Compare names to check whether it matches our driver */ if (_wcsicmp(lpService->lpServiceName, DirInfo->Name.Buffer) == 0) { + /* That's our driver, bail out! */ DPRINT1("Found: '%S' '%wZ'\n", lpService->lpServiceName, &DirInfo->Name); bFound = TRUE; @@ -204,17 +216,27 @@ ScmGetDriverStatus(PSERVICE lpService, } } + /* Release resources we don't need */ HeapFree(GetProcessHeap(), 0, DirInfo); NtClose(DirHandle); - if (!NT_SUCCESS(Status)) + /* Only quit if there's a failure + * Not having found the driver is legit! + * It means the driver was registered as a service, but not loaded + * We have not to fail in that situation, but to return proper status + */ + if (!NT_SUCCESS(Status) && Status != STATUS_NO_MORE_ENTRIES) { DPRINT1("Status: %lx\n", Status); return RtlNtStatusToDosError(Status); } + /* Now, we have two cases: + * We found the driver: it means it's running + * We didn't find the driver: it wasn't running + */ if ((bFound != FALSE) && (lpService->Status.dwCurrentState != SERVICE_STOP_PENDING)) { @@ -235,6 +257,7 @@ ScmGetDriverStatus(PSERVICE lpService, lpService->Status.dwWin32ExitCode = ERROR_SUCCESS; } } + /* Not found, return it's stopped */ else { lpService->Status.dwCurrentState = SERVICE_STOPPED; @@ -248,6 +271,7 @@ ScmGetDriverStatus(PSERVICE lpService, lpService->Status.dwWin32ExitCode = ERROR_GEN_FAILURE; } + /* Copy service status if required */ if (lpServiceStatus != NULL) { memcpy(lpServiceStatus,

6 years, 9 months

[reactos] 02/02: [NTOS:MM] Implement and use MiAcquirePfnLockAtDpcLevel/MiReleasePfnLockFromDpcLevel.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81532227b6be15f8f143e… commit 81532227b6be15f8f143e879c85f329e5a084c12 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Nov 21 23:36:34 2017 +0100 [NTOS:MM] Implement and use MiAcquirePfnLockAtDpcLevel/MiReleasePfnLockFromDpcLevel. --- ntoskrnl/include/internal/mm.h | 22 ++++++++++++++++++++++ ntoskrnl/mm/ARM3/pool.c | 6 ++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index d96900b27e..ec42abbfae 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -883,6 +883,28 @@ MiReleasePfnLock( KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } +FORCEINLINE +VOID +MiAcquirePfnLockAtDpcLevel(VOID) +{ + PKSPIN_LOCK_QUEUE LockQueue; + + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + LockQueue = &KeGetCurrentPrcb()->LockQueue[LockQueuePfnLock]; + KeAcquireQueuedSpinLockAtDpcLevel(LockQueue); +} + +FORCEINLINE +VOID +MiReleasePfnLockFromDpcLevel(VOID) +{ + PKSPIN_LOCK_QUEUE LockQueue; + + LockQueue = &KeGetCurrentPrcb()->LockQueue[LockQueuePfnLock]; + KeReleaseQueuedSpinLockFromDpcLevel(LockQueue); + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); +} + #define MI_ASSERT_PFN_LOCK_HELD() ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL) FORCEINLINE diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index b47ee2608e..7cebabe818 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -433,7 +433,6 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, PMMPFN Pfn1; PVOID BaseVa, BaseVaStart; PMMFREE_POOL_ENTRY FreeEntry; - PKSPIN_LOCK_QUEUE LockQueue; // // Figure out how big the allocation is in pages @@ -844,8 +843,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // // Lock the PFN database too // - LockQueue = &KeGetCurrentPrcb()->LockQueue[LockQueuePfnLock]; - KeAcquireQueuedSpinLockAtDpcLevel(LockQueue); + MiAcquirePfnLockAtDpcLevel(); // // Loop the pages @@ -889,7 +887,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // // Release the PFN and nonpaged pool lock // - KeReleaseQueuedSpinLockFromDpcLevel(LockQueue); + MiReleasePfnLockFromDpcLevel(); KeReleaseQueuedSpinLock(LockQueueMmNonPagedPoolLock, OldIrql); //

6 years, 9 months

[reactos] 01/02: [NTOS:MM] Use inline functions to acquire/release the PFN lock.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da5949280c3c97449ebf0… commit da5949280c3c97449ebf0776936d62a58e5ed7a0 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Nov 21 23:33:42 2017 +0100 [NTOS:MM] Use inline functions to acquire/release the PFN lock. --- ntoskrnl/cache/section/data.c | 4 +-- ntoskrnl/cache/section/fault.c | 4 +-- ntoskrnl/include/internal/mm.h | 17 +++++++++++++ ntoskrnl/mm/ARM3/contmem.c | 10 ++++---- ntoskrnl/mm/ARM3/dynamic.c | 4 +-- ntoskrnl/mm/ARM3/i386/init.c | 8 +++--- ntoskrnl/mm/ARM3/mdlsup.c | 34 ++++++++++++------------- ntoskrnl/mm/ARM3/mminit.c | 12 ++++----- ntoskrnl/mm/ARM3/pagfault.c | 56 ++++++++++++++++++++-------------------- ntoskrnl/mm/ARM3/pfnlist.c | 28 ++++++++++---------- ntoskrnl/mm/ARM3/pool.c | 4 +-- ntoskrnl/mm/ARM3/procsup.c | 34 ++++++++++++------------- ntoskrnl/mm/ARM3/section.c | 58 +++++++++++++++++++++--------------------- ntoskrnl/mm/ARM3/session.c | 32 +++++++++++------------ ntoskrnl/mm/ARM3/special.c | 16 ++++++------ ntoskrnl/mm/ARM3/sysldr.c | 4 +-- ntoskrnl/mm/ARM3/virtual.c | 26 +++++++++---------- ntoskrnl/mm/ARM3/zeropage.c | 8 +++--- ntoskrnl/mm/amd64/page.c | 8 +++--- ntoskrnl/mm/balance.c | 6 ++--- ntoskrnl/mm/freelist.c | 50 ++++++++++++++++++------------------ ntoskrnl/mm/marea.c | 8 +++--- ntoskrnl/mm/section.c | 4 +-- 23 files changed, 226 insertions(+), 209 deletions(-) diff --git a/ntoskrnl/cache/section/data.c b/ntoskrnl/cache/section/data.c index 198787b6e7..1fb0fc20c5 100644 --- a/ntoskrnl/cache/section/data.c +++ b/ntoskrnl/cache/section/data.c @@ -192,9 +192,9 @@ _MiFlushMappedSection(PVOID BaseAddress, (MmIsDirtyPageRmap(Page) || IS_DIRTY_SSE(Entry)) && FileOffset.QuadPart < FileSize->QuadPart) { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); MmReferencePage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); Pages[(PageAddress - BeginningAddress) >> PAGE_SHIFT] = Entry; } else diff --git a/ntoskrnl/cache/section/fault.c b/ntoskrnl/cache/section/fault.c index 169d436891..c70805a71a 100644 --- a/ntoskrnl/cache/section/fault.c +++ b/ntoskrnl/cache/section/fault.c @@ -236,9 +236,9 @@ MmNotPresentFaultCachePage ( KeBugCheck(CACHE_MANAGER); } - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); MmReferencePage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); Status = MmCreateVirtualMapping(Process, Address, Attributes, &Page, 1); if (NT_SUCCESS(Status)) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 694c51f1f0..d96900b27e 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -868,6 +868,23 @@ MmPageOutPhysicalAddress(PFN_NUMBER Page); /* freelist.c **********************************************************/ +FORCEINLINE +KIRQL +MiAcquirePfnLock(VOID) +{ + return KeAcquireQueuedSpinLock(LockQueuePfnLock); +} + +FORCEINLINE +VOID +MiReleasePfnLock( + _In_ KIRQL OldIrql) +{ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); +} + +#define MI_ASSERT_PFN_LOCK_HELD() ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL) + FORCEINLINE PMMPFN MiGetPfnEntry(IN PFN_NUMBER Pfn) diff --git a/ntoskrnl/mm/ARM3/contmem.c b/ntoskrnl/mm/ARM3/contmem.c index b250ebc941..6a7fe01cbd 100644 --- a/ntoskrnl/mm/ARM3/contmem.c +++ b/ntoskrnl/mm/ARM3/contmem.c @@ -109,7 +109,7 @@ MiFindContiguousPages(IN PFN_NUMBER LowestPfn, // // Acquire the PFN lock // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); do { // @@ -164,7 +164,7 @@ MiFindContiguousPages(IN PFN_NUMBER LowestPfn, // // Now it's safe to let go of the PFN lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); // // Quick sanity check that the last PFN is consistent @@ -196,7 +196,7 @@ MiFindContiguousPages(IN PFN_NUMBER LowestPfn, // If we got here, something changed while we hadn't acquired // the PFN lock yet, so we'll have to restart // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); Length = 0; } } @@ -540,7 +540,7 @@ MiFreeContiguousMemory(IN PVOID BaseAddress) // // Lock the PFN database // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); // // Loop all the pages @@ -556,7 +556,7 @@ MiFreeContiguousMemory(IN PVOID BaseAddress) // // Release the PFN lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } /* PUBLIC FUNCTIONS ***********************************************************/ diff --git a/ntoskrnl/mm/ARM3/dynamic.c b/ntoskrnl/mm/ARM3/dynamic.c index dc3469c8a2..d0d3167064 100644 --- a/ntoskrnl/mm/ARM3/dynamic.c +++ b/ntoskrnl/mm/ARM3/dynamic.c @@ -91,7 +91,7 @@ MmGetPhysicalMemoryRanges(VOID) // // Lock the PFN database // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); // // Make sure it hasn't changed before we had acquired the lock @@ -121,6 +121,6 @@ MmGetPhysicalMemoryRanges(VOID) // // Release the lock and return // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); return Buffer; } diff --git a/ntoskrnl/mm/ARM3/i386/init.c b/ntoskrnl/mm/ARM3/i386/init.c index 05c1007d51..58cb5ba03c 100644 --- a/ntoskrnl/mm/ARM3/i386/init.c +++ b/ntoskrnl/mm/ARM3/i386/init.c @@ -487,7 +487,7 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) StartPde = MiAddressToPde(HYPER_SPACE); /* Lock PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Allocate a page for hyperspace and create it */ MI_SET_USAGE(MI_USAGE_PAGE_TABLE); @@ -501,7 +501,7 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) KeFlushCurrentTb(); /* Release the lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); // // Zero out the page table now @@ -532,7 +532,7 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) MiFirstReservedZeroingPte->u.Hard.PageFrameNumber = MI_ZERO_PTES - 1; /* Lock PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Reset the ref/share count so that MmInitializeProcessAddressSpace works */ Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(MiAddressToPde(PDE_BASE))); @@ -565,7 +565,7 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) } /* Release the lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Initialize the bogus address space */ Flags = 0; diff --git a/ntoskrnl/mm/ARM3/mdlsup.c b/ntoskrnl/mm/ARM3/mdlsup.c index 85bbfd1854..7317a9a30f 100644 --- a/ntoskrnl/mm/ARM3/mdlsup.c +++ b/ntoskrnl/mm/ARM3/mdlsup.c @@ -218,9 +218,9 @@ MiMapLockedPagesInUserSpace( /* Acquire a share count */ Pfn1 = MI_PFN_ELEMENT(PointerPde->u.Hard.PageFrameNumber); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); Pfn1->u2.ShareCount++; - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Next page */ MdlPages++; @@ -293,7 +293,7 @@ MiUnmapLockedPagesInUserSpace( ASSERT(Process->VadRoot.NodeHint != Vad); PointerPte = MiAddressToPte(BaseAddress); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); while (NumberOfPages != 0 && *MdlPages != LIST_HEAD) { @@ -336,7 +336,7 @@ MiUnmapLockedPagesInUserSpace( } KeFlushProcessTb(); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); MiUnlockProcessWorkingSetUnsafe(Process, Thread); MmUnlockAddressSpace(&Process->Vm); ExFreePoolWithTag(Vad, 'ldaV'); @@ -560,7 +560,7 @@ MmFreePagesFromMdl(IN PMDL Mdl) // // Acquire PFN lock // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); // // Loop all the MDL pages @@ -618,7 +618,7 @@ MmFreePagesFromMdl(IN PMDL Mdl) // // Release the lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); // // Remove the pages locked flag @@ -1121,7 +1121,7 @@ MmProbeAndLockPages(IN PMDL Mdl, // Use the PFN lock // UsePfnLock = TRUE; - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); } else { @@ -1180,7 +1180,7 @@ MmProbeAndLockPages(IN PMDL Mdl, // // Release PFN lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } else { @@ -1212,7 +1212,7 @@ MmProbeAndLockPages(IN PMDL Mdl, // // Grab the PFN lock // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); } else { @@ -1250,7 +1250,7 @@ MmProbeAndLockPages(IN PMDL Mdl, // // Release PFN lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } else { @@ -1281,7 +1281,7 @@ MmProbeAndLockPages(IN PMDL Mdl, // // Grab the PFN lock // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); } else { @@ -1353,7 +1353,7 @@ MmProbeAndLockPages(IN PMDL Mdl, // // Release PFN lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } else { @@ -1381,7 +1381,7 @@ CleanupWithLock: // // Release PFN lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } else { @@ -1462,7 +1462,7 @@ MmUnlockPages(IN PMDL Mdl) // // Acquire PFN lock // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); // // Loop every page @@ -1485,7 +1485,7 @@ MmUnlockPages(IN PMDL Mdl) // // Release the lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); // // Check if we have a process @@ -1564,7 +1564,7 @@ MmUnlockPages(IN PMDL Mdl) // // Now grab the PFN lock for the actual unlock and dereference // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); do { /* Get the current entry and reference count */ @@ -1575,7 +1575,7 @@ MmUnlockPages(IN PMDL Mdl) // // Release the lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); // // We're done diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index 597cf050b2..c92db6ca1d 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -949,7 +949,7 @@ MiBuildPfnDatabaseFromLoaderBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock) Pfn1 = MiGetPfnEntry(PageFrameIndex); /* Lock the PFN Database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); while (PageCount--) { /* If the page really has no references, mark it as free */ @@ -966,7 +966,7 @@ MiBuildPfnDatabaseFromLoaderBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock) } /* Release PFN database */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Done with this block */ break; @@ -1138,7 +1138,7 @@ MmFreeLoaderBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock) } /* Acquire the PFN lock */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Loop the runs */ LoaderPages = 0; @@ -1180,7 +1180,7 @@ MmFreeLoaderBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock) /* Release the PFN lock and flush the TLB */ DPRINT("Loader pages freed: %lx\n", LoaderPages); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); KeFlushCurrentTb(); /* Free our run structure */ @@ -1829,7 +1829,7 @@ MiBuildPagedPool(VOID) // // Lock the PFN database // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); #if (_MI_PAGING_LEVELS >= 3) /* On these systems, there's no double-mapping, so instead, the PPEs @@ -1890,7 +1890,7 @@ MiBuildPagedPool(VOID) // // Release the PFN database lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); // // We only have one PDE mapped for now... at fault time, additional PDEs diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index 0ded2d6c79..2e962edd92 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -638,12 +638,12 @@ MiResolveDemandZeroFault(IN PVOID Address, if (OldIrql == MM_NOIRQL) { /* Acquire it and remember we should release it after */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); HaveLock = TRUE; } /* We either manually locked the PFN DB, or already came with it locked */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); ASSERT(PointerPte->u.Hard.Valid == 0); /* Assert we have enough pages */ @@ -692,7 +692,7 @@ MiResolveDemandZeroFault(IN PVOID Address, if (HaveLock) { /* Release it */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Update performance counters */ if (Process > HYDRA_PROCESS) Process->NumberOfPrivatePages++; @@ -763,7 +763,7 @@ MiCompleteProtoPteFault(IN BOOLEAN StoreInstruction, BOOLEAN OriginalProtection, DirtyPage; /* Must be called with an valid prototype PTE, with the PFN lock held */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); ASSERT(PointerProtoPte->u.Hard.Valid == 1); /* Get the page */ @@ -825,7 +825,7 @@ MiCompleteProtoPteFault(IN BOOLEAN StoreInstruction, } /* Release the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Remove special/caching bits */ Protection &= ~MM_PROTECT_SPECIAL; @@ -892,7 +892,7 @@ MiResolvePageFileFault(_In_ BOOLEAN StoreInstruction, ASSERT(*OldIrql != MM_NOIRQL); /* We must hold the PFN lock */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); /* Some sanity checks */ ASSERT(TempPte.u.Hard.Valid == 0); @@ -919,13 +919,13 @@ MiResolvePageFileFault(_In_ BOOLEAN StoreInstruction, MI_WRITE_INVALID_PTE(PointerPte, TempPte); /* Release the PFN lock while we proceed */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, *OldIrql); + MiReleasePfnLock(*OldIrql); /* Do the paging IO */ Status = MiReadPageFile(Page, PageFileIndex, PageFileOffset); /* Lock the PFN database again */ - *OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + *OldIrql = MiAcquirePfnLock(); /* Nobody should have changed that while we were not looking */ ASSERT(Pfn1->u3.e1.ReadInProgress == 1); @@ -1106,7 +1106,7 @@ MiResolveProtoPteFault(IN BOOLEAN StoreInstruction, ULONG Protection; /* Must be called with an invalid, prototype PTE, with the PFN lock held */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); ASSERT(PointerPte->u.Hard.Valid == 0); ASSERT(PointerPte->u.Soft.Prototype == 1); @@ -1136,7 +1136,7 @@ MiResolveProtoPteFault(IN BOOLEAN StoreInstruction, { /* Release the lock */ DPRINT1("Access on reserved section?\n"); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); return STATUS_ACCESS_VIOLATION; } @@ -1193,7 +1193,7 @@ MiResolveProtoPteFault(IN BOOLEAN StoreInstruction, } /* Lock again the PFN lock, MiResolveProtoPteFault unlocked it */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* And re-read the proto PTE */ TempPte = *PointerProtoPte; @@ -1236,7 +1236,7 @@ MiResolveProtoPteFault(IN BOOLEAN StoreInstruction, MI_WRITE_VALID_PTE(PointerPte, PteContents); /* The caller expects us to release the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); return Status; } @@ -1330,7 +1330,7 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, if (Address >= MmSystemRangeStart) { /* Lock the PFN database */ - LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + LockIrql = MiAcquirePfnLock(); /* Has the PTE been made valid yet? */ if (!SuperProtoPte->u.Hard.Valid) @@ -1381,7 +1381,7 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, ProcessedPtes = 0; /* Lock the PFN database */ - LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + LockIrql = MiAcquirePfnLock(); /* We only handle the valid path */ ASSERT(SuperProtoPte->u.Hard.Valid == 1); @@ -1518,14 +1518,14 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, { /* We had a locked PFN, so acquire the PFN lock to dereference it */ ASSERT(PointerProtoPte != NULL); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Dereference the locked PFN */ MiDereferencePfnAndDropLockCount(OutPfn); ASSERT(OutPfn->u3.e2.ReferenceCount >= 1); /* And now release the lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } /* Complete this as a transition fault */ @@ -1544,7 +1544,7 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, KEVENT CurrentPageEvent; /* Lock the PFN database */ - LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + LockIrql = MiAcquirePfnLock(); /* Resolve */ Status = MiResolveTransitionFault(StoreInstruction, Address, PointerPte, Process, LockIrql, &InPageBlock); @@ -1560,7 +1560,7 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, } /* And now release the lock and leave*/ - KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); + MiReleasePfnLock(LockIrql); if (InPageBlock != NULL) { @@ -1583,13 +1583,13 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, if (TempPte.u.Soft.PageFileHigh != 0) { /* Lock the PFN database */ - LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + LockIrql = MiAcquirePfnLock(); /* Resolve */ Status = MiResolvePageFileFault(StoreInstruction, Address, PointerPte, Process, &LockIrql); /* And now release the lock and leave*/ - KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); + MiReleasePfnLock(LockIrql); ASSERT(OldIrql == KeGetCurrentIrql()); ASSERT(OldIrql <= APC_LEVEL); @@ -1777,7 +1777,7 @@ MmArmAccessFault(IN BOOLEAN StoreInstruction, if (!IsSessionAddress) { /* Check if the PTE is still valid under PFN lock */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); TempPte = *PointerPte; if (TempPte.u.Hard.Valid) { @@ -1800,7 +1800,7 @@ MmArmAccessFault(IN BOOLEAN StoreInstruction, } /* Release PFN lock and return all good */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); return STATUS_SUCCESS; } } @@ -2147,7 +2147,7 @@ UserFault: PFN_NUMBER PageFrameIndex, OldPageFrameIndex; PMMPFN Pfn1; - LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + LockIrql = MiAcquirePfnLock(); ASSERT(MmAvailablePages > 0); @@ -2172,7 +2172,7 @@ UserFault: MI_WRITE_VALID_PTE(PointerPte, TempPte); - KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); + MiReleasePfnLock(LockIrql); /* Return the status */ MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); @@ -2282,7 +2282,7 @@ UserFault: } /* Lock the PFN database since we're going to grab a page */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Make sure we have enough pages */ ASSERT(MmAvailablePages >= 32); @@ -2299,20 +2299,20 @@ UserFault: ASSERT(PageFrameIndex); /* Release the lock since we need to do some zeroing */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Zero out the page, since it's for user-mode */ MiZeroPfn(PageFrameIndex); /* Grab the lock again so we can initialize the PFN entry */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); } /* Initialize the PFN entry now */ MiInitializePfn(PageFrameIndex, PointerPte, 1); /* And we're done with the lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Increment the count of pages in the process */ CurrentProcess->NumberOfPrivatePages++; diff --git a/ntoskrnl/mm/ARM3/pfnlist.c b/ntoskrnl/mm/ARM3/pfnlist.c index 8fc607c794..0373fff2de 100644 --- a/ntoskrnl/mm/ARM3/pfnlist.c +++ b/ntoskrnl/mm/ARM3/pfnlist.c @@ -144,7 +144,7 @@ MiUnlinkFreeOrZeroedPage(IN PMMPFN Entry) PMMPFN Pfn1; /* Make sure the PFN lock is held */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); /* Make sure the PFN entry isn't in-use */ ASSERT(Entry->u3.e1.WriteInProgress == 0); @@ -267,7 +267,7 @@ MiUnlinkPageFromList(IN PMMPFN Pfn) PFN_NUMBER OldFlink, OldBlink; /* Make sure the PFN lock is held */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); /* ARM3 should only call this for dead pages */ ASSERT(Pfn->u3.e2.ReferenceCount == 0); @@ -371,7 +371,7 @@ MiRemovePageByColor(IN PFN_NUMBER PageIndex, PMMCOLOR_TABLES ColorTable; /* Make sure PFN lock is held */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); ASSERT(Color < MmSecondaryColors); /* Get the PFN entry */ @@ -478,7 +478,7 @@ MiRemoveAnyPage(IN ULONG Color) PMMPFN Pfn1; /* Make sure PFN lock is held and we have pages */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); ASSERT(MmAvailablePages != 0); ASSERT(Color < MmSecondaryColors); @@ -535,7 +535,7 @@ MiRemoveZeroPage(IN ULONG Color) BOOLEAN Zero = FALSE; /* Make sure PFN lock is held and we have pages */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); ASSERT(MmAvailablePages != 0); ASSERT(Color < MmSecondaryColors); @@ -723,7 +723,7 @@ MiInsertStandbyListAtFront(IN PFN_NUMBER PageFrameIndex) /* Make sure the lock is held */ DPRINT("Inserting page: %lx into standby list !\n", PageFrameIndex); - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); /* Make sure the PFN is valid */ ASSERT((PageFrameIndex != 0) && @@ -788,7 +788,7 @@ MiInsertPageInList(IN PMMPFNLIST ListHead, ASSERT(ListHead != &MmFreePageListHead); /* Make sure the lock is held */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); /* Make sure the PFN is valid */ ASSERT((PageFrameIndex) && @@ -973,7 +973,7 @@ MiInitializePfn(IN PFN_NUMBER PageFrameIndex, PMMPFN Pfn1; NTSTATUS Status; PMMPTE PointerPtePte; - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); /* Setup the PTE */ Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); @@ -1040,7 +1040,7 @@ MiInitializePfnAndMakePteValid(IN PFN_NUMBER PageFrameIndex, PMMPFN Pfn1; NTSTATUS Status; PMMPTE PointerPtePte; - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); /* PTE must be invalid */ ASSERT(PointerPte->u.Hard.Valid == 0); @@ -1102,13 +1102,13 @@ MiInitializeAndChargePfn(OUT PPFN_NUMBER PageFrameIndex, TempPde = SessionAllocation ? ValidKernelPdeLocal : ValidKernelPde; /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Make sure nobody is racing us */ if (PointerPde->u.Hard.Valid == 1) { /* Return special error if that was the case */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); return STATUS_RETRY; } @@ -1124,7 +1124,7 @@ MiInitializeAndChargePfn(OUT PPFN_NUMBER PageFrameIndex, ASSERT(MI_PFN_ELEMENT(*PageFrameIndex)->u1.WsIndex == 0); /* Release the lock and return success */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); return STATUS_SUCCESS; } @@ -1186,7 +1186,7 @@ MiDecrementShareCount(IN PMMPFN Pfn1, Pfn1->u3.e1.PageLocation = TransitionPage; /* PFN lock must be held */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); if (Pfn1->u3.e2.ReferenceCount == 1) { @@ -1223,7 +1223,7 @@ MiDecrementReferenceCount(IN PMMPFN Pfn1, IN PFN_NUMBER PageFrameIndex) { /* PFN lock must be held */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); /* Sanity checks on the page */ if (PageFrameIndex > MmHighestPhysicalPage || diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index ce72c16724..b47ee2608e 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -536,7 +536,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // // Lock the PFN database and loop pages // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); do { // @@ -577,7 +577,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // // Release the PFN database lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); // // These pages are now available, clear their availablity bits diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index e415a6e27b..7522e35497 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -203,7 +203,7 @@ MmDeleteKernelStack(IN PVOID StackBase, MmLargeStackSize : KERNEL_STACK_SIZE); /* Acquire the PFN lock */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); // // Loop them @@ -245,7 +245,7 @@ MmDeleteKernelStack(IN PVOID StackBase, ASSERT(PointerPte->u.Hard.Valid == 0); /* Release the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); // // Release the PTEs @@ -330,7 +330,7 @@ MmCreateKernelStack(IN BOOLEAN GuiStack, // // Acquire the PFN DB lock // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); // // Loop each stack page @@ -359,7 +359,7 @@ MmCreateKernelStack(IN BOOLEAN GuiStack, // // Release the PFN lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); // // Return the stack address @@ -421,7 +421,7 @@ MmGrowKernelStackEx(IN PVOID StackPointer, // // Acquire the PFN DB lock // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); // // Loop each stack page @@ -447,7 +447,7 @@ MmGrowKernelStackEx(IN PVOID StackPointer, // // Release the PFN lock // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); // // Set the new limit @@ -918,7 +918,7 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, Process->VadRoot.BalancedRoot.u1.Parent = &Process->VadRoot.BalancedRoot; /* Lock PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Setup the PFN for the PDE base of this process */ #ifdef _M_AMD64 @@ -957,7 +957,7 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, ASSERT(Process->PhysicalVadRoot == NULL); /* Release PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Check if there's a Section Object */ if (SectionObject) @@ -1087,7 +1087,7 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, KeInitializeSpinLock(&Process->HyperSpaceLock); /* Lock PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Get a zero page for the PDE, if possible */ Color = MI_GET_NEXT_PROCESS_COLOR(Process); @@ -1099,9 +1099,9 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, PdeIndex = MiRemoveAnyPage(Color); /* Zero it outside the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); MiZeroPhysicalPage(PdeIndex); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); } /* Get a zero page for hyperspace, if possible */ @@ -1114,9 +1114,9 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, HyperIndex = MiRemoveAnyPage(Color); /* Zero it outside the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); MiZeroPhysicalPage(HyperIndex); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); } /* Get a zero page for the woring set list, if possible */ @@ -1129,13 +1129,13 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, WsListIndex = MiRemoveAnyPage(Color); /* Zero it outside the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); MiZeroPhysicalPage(WsListIndex); } else { /* Release the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } /* Switch to phase 1 initialization */ @@ -1334,7 +1334,7 @@ MmDeleteProcessAddressSpace2(IN PEPROCESS Process) //ASSERT(Process->CommitCharge == 0); /* Acquire the PFN lock */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Check for fully initialized process */ if (Process->AddressSpaceInitialized == 2) @@ -1378,7 +1378,7 @@ MmDeleteProcessAddressSpace2(IN PEPROCESS Process) } /* Release the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Drop a reference on the session */ if (Process->Session) MiReleaseProcessReferenceToSessionDataPage(Process->Session); diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index 6b5aadd1aa..c9b5daf13d 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -499,7 +499,7 @@ MiFillSystemPageDirectory(IN PVOID Base, while (PointerPde <= LastPde) { /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Check if we don't already have this PDE mapped */ if (SystemMapPde->u.Hard.Valid == 0) @@ -533,7 +533,7 @@ MiFillSystemPageDirectory(IN PVOID Base, } /* Release the lock and keep going with the next PDE */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); SystemMapPde++; PointerPde++; } @@ -550,7 +550,7 @@ MiCheckPurgeAndUpMapCount(IN PCONTROL_AREA ControlArea, ASSERT(FailIfSystemViews == FALSE); /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* State not yet supported */ ASSERT(ControlArea->u.Flags.BeingPurged == 0); @@ -561,7 +561,7 @@ MiCheckPurgeAndUpMapCount(IN PCONTROL_AREA ControlArea, ASSERT(ControlArea->NumberOfSectionReferences != 0); /* Release the PFN lock and return success */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); return STATUS_SUCCESS; } @@ -633,7 +633,7 @@ MiSegmentDelete(IN PSEGMENT Segment) LastPte = PointerPte + Segment->NonExtendedPtes; /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Check if the master PTE is invalid */ PteForProto = MiAddressToPte(PointerPte); @@ -716,7 +716,7 @@ MiSegmentDelete(IN PSEGMENT Segment) } /* Release the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Free the structures */ ExFreePool(ControlArea); @@ -729,7 +729,7 @@ MiCheckControlArea(IN PCONTROL_AREA ControlArea, IN KIRQL OldIrql) { BOOLEAN DeleteSegment = FALSE; - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); /* Check if this is the last reference or view */ if (!(ControlArea->NumberOfMappedViews) && @@ -747,7 +747,7 @@ MiCheckControlArea(IN PCONTROL_AREA ControlArea, } /* Release the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Delete the segment if needed */ if (DeleteSegment) @@ -765,7 +765,7 @@ MiDereferenceControlArea(IN PCONTROL_AREA ControlArea) KIRQL OldIrql; /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Drop reference counts */ ControlArea->NumberOfMappedViews--; @@ -802,7 +802,7 @@ MiRemoveMappedView(IN PEPROCESS CurrentProcess, MiUnlockProcessWorkingSetUnsafe(CurrentProcess, CurrentThread); /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Remove references */ ControlArea->NumberOfMappedViews--; @@ -993,7 +993,7 @@ _WARN("MiSessionCommitPageTables halfplemented for amd64") ASSERT(MmAvailablePages >= 32); /* Acquire the PFN lock and grab a zero page */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); MI_SET_USAGE(MI_USAGE_PAGE_TABLE); MI_SET_PROCESS2(PsGetCurrentProcess()->ImageFileName); Color = (++MmSessionSpace->Color) & MmSecondaryColorMask; @@ -1011,7 +1011,7 @@ _WARN("MiSessionCommitPageTables halfplemented for amd64") MmSessionSpace->SessionPageDirectoryIndex); /* And now release the lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Get the PFN entry and make sure there's no event for it */ Pfn1 = MI_PFN_ELEMENT(PageFrameNumber); @@ -1145,11 +1145,11 @@ MiSetControlAreaSymbolsLoaded(IN PCONTROL_AREA ControlArea) ASSERT(KeGetCurrentIrql() <= APC_LEVEL); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); ControlArea->u.Flags.DebugSymbolsLoaded |= 1; ASSERT(OldIrql <= APC_LEVEL); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); ASSERT(KeGetCurrentIrql() <= APC_LEVEL); } @@ -1976,7 +1976,7 @@ MiFlushTbAndCapture(IN PMMVAD FoundVad, PointerPte, ProtectionMask, PreviousPte.u.Hard.PageFrameNumber); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); // // We don't support I/O mappings in this path yet @@ -2050,7 +2050,7 @@ MiFlushTbAndCapture(IN PMMVAD FoundVad, // // Release the PFN lock, we are done // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } // @@ -2257,7 +2257,7 @@ MiRemoveMappedPtes(IN PVOID BaseAddress, PointerPde = MiPteToPde(PointerPte); /* Lock the PFN database and make sure this isn't a mapped file */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); ASSERT(((Pfn1->u3.e1.PrototypePte) && (Pfn1->OriginalPte.u.Soft.Prototype)) == 0); /* Mark the page as modified accordingly */ @@ -2287,7 +2287,7 @@ MiRemoveMappedPtes(IN PVOID BaseAddress, MiDecrementShareCount(Pfn1, PFN_FROM_PTE(&PteContents)); /* Release the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } else { @@ -2317,7 +2317,7 @@ MiRemoveMappedPtes(IN PVOID BaseAddress, KeFlushCurrentTb(); /* Acquire the PFN lock */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Decrement the accounting counters */ ControlArea->NumberOfUserReferences--; @@ -2514,7 +2514,7 @@ MmCreateArm3Section(OUT PVOID *SectionObject, } /* Lock the PFN database while we play with the section pointers */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Image-file backed sections are not yet supported */ ASSERT((AllocationAttributes & SEC_IMAGE) == 0); @@ -2530,7 +2530,7 @@ MmCreateArm3Section(OUT PVOID *SectionObject, File->SectionObjectPointer->DataSectionObject = ControlArea; /* We can release the PFN lock now */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* We don't support previously-mapped file */ ASSERT(NewSegment == NULL); @@ -2548,7 +2548,7 @@ MmCreateArm3Section(OUT PVOID *SectionObject, if (!NT_SUCCESS(Status)) { /* Lock the PFN database while we play with the section pointers */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Reset the waiting-for-deletion event */ ASSERT(ControlArea->WaitingForDeletion == NULL); @@ -2566,7 +2566,7 @@ MmCreateArm3Section(OUT PVOID *SectionObject, ControlArea->u.Flags.BeingCreated = FALSE; /* We can release the PFN lock now */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Check if we locked and set the IRP */ if (FileLock) @@ -2630,7 +2630,7 @@ MmCreateArm3Section(OUT PVOID *SectionObject, ASSERT(File != NULL); /* Acquire the PFN lock while we set control area flags */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* We don't support this race condition yet, so assume no waiters */ ASSERT(ControlArea->WaitingForDeletion == NULL); @@ -2642,7 +2642,7 @@ MmCreateArm3Section(OUT PVOID *SectionObject, /* Take off the being created flag, and then release the lock */ ControlArea->u.Flags.BeingCreated = FALSE; - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } /* Check if we locked the file earlier */ @@ -2725,7 +2725,7 @@ MmCreateArm3Section(OUT PVOID *SectionObject, if (UserRefIncremented) { /* Acquire the PFN lock while we change counters */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Decrement the accounting counters */ ControlArea->NumberOfSectionReferences--; @@ -2795,13 +2795,13 @@ MmCreateArm3Section(OUT PVOID *SectionObject, if (ControlArea->u.Flags.BeingCreated == 1) { /* Acquire the PFN lock while we set control area flags */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Take off the being created flag, and then release the lock */ ControlArea->u.Flags.BeingCreated = 0; NewSection->u.Flags.BeingCreated = 0; - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } /* Migrate the attribute into a flag */ @@ -3258,7 +3258,7 @@ MiDeleteARM3Section(PVOID ObjectBody) } /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); ASSERT(SectionObject->Segment); ASSERT(SectionObject->Segment->ControlArea); diff --git a/ntoskrnl/mm/ARM3/session.c b/ntoskrnl/mm/ARM3/session.c index 2404a88d86..8760623968 100644 --- a/ntoskrnl/mm/ARM3/session.c +++ b/ntoskrnl/mm/ARM3/session.c @@ -246,7 +246,7 @@ MiReleaseProcessReferenceToSessionDataPage(IN PMM_SESSION_SPACE SessionGlobal) } /* Loop every data page and drop a reference count */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); for (i = 0; i < MiSessionDataPages; i++) { /* Sanity check that the page is correct, then decrement it */ @@ -257,7 +257,7 @@ MiReleaseProcessReferenceToSessionDataPage(IN PMM_SESSION_SPACE SessionGlobal) } /* Done playing with pages, release the lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Decrement the number of data pages */ InterlockedDecrement(&MmSessionDataPages); @@ -505,7 +505,7 @@ MiSessionInitializeWorkingSetList(VOID) /* Initialize the working set lock, and lock the PFN database */ ExInitializePushLock(&SessionGlobal->Vm.WorkingSetMutex); //MmLockPageableSectionByHandle(ExPageLockHandle); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Check if we need a page table */ if (AllocatedPageTable != FALSE) @@ -520,9 +520,9 @@ MiSessionInitializeWorkingSetList(VOID) PageFrameIndex = MiRemoveAnyPage(Color); /* Zero it outside the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); MiZeroPhysicalPage(PageFrameIndex); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); } /* Write a valid PDE for it */ @@ -552,9 +552,9 @@ MiSessionInitializeWorkingSetList(VOID) PageFrameIndex = MiRemoveAnyPage(Color); /* Zero it outside the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); MiZeroPhysicalPage(PageFrameIndex); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); } /* Write a valid PTE for it */ @@ -566,7 +566,7 @@ MiSessionInitializeWorkingSetList(VOID) MiInitializePfnAndMakePteValid(PageFrameIndex, PointerPte, TempPte); /* Now we can release the PFN database lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Fill out the working set structure */ MmSessionSpace->Vm.Flags.SessionSpace = 1; @@ -674,7 +674,7 @@ MiSessionCreateInternal(OUT PULONG SessionId) ASSERT(SessionPte != NULL); /* Acquire the PFN lock while we set everything up */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Loop the global PTEs */ TempPte = ValidKernelPte; @@ -690,9 +690,9 @@ MiSessionCreateInternal(OUT PULONG SessionId) DataPage[i] = MiRemoveAnyPage(Color); /* Zero it outside the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); MiZeroPhysicalPage(DataPage[i]); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); } /* Fill the PTE out */ @@ -713,9 +713,9 @@ MiSessionCreateInternal(OUT PULONG SessionId) SessionPageDirIndex = MiRemoveAnyPage(Color); /* Zero it outside the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); MiZeroPhysicalPage(SessionPageDirIndex); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); } /* Fill the PTE out */ @@ -755,9 +755,9 @@ MiSessionCreateInternal(OUT PULONG SessionId) TagPage[i] = MiRemoveAnyPage(Color); /* Zero it outside the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); MiZeroPhysicalPage(TagPage[i]); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); } /* Fill the PTE out */ @@ -768,7 +768,7 @@ MiSessionCreateInternal(OUT PULONG SessionId) } /* PTEs have been setup, release the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Fill out the session space structure now */ MmSessionSpace->GlobalVirtualAddress = SessionGlobal; diff --git a/ntoskrnl/mm/ARM3/special.c b/ntoskrnl/mm/ARM3/special.c index bb0a5f8165..6d40315bc0 100644 --- a/ntoskrnl/mm/ARM3/special.c +++ b/ntoskrnl/mm/ARM3/special.c @@ -206,7 +206,7 @@ MmExpandSpecialPool(VOID) ULONG i; PMMPTE PointerPte; - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); if (MiSpecialPoolExtraCount == 0) return STATUS_INSUFFICIENT_RESOURCES; @@ -292,13 +292,13 @@ MmAllocateSpecialPool(SIZE_T NumberOfBytes, ULONG Tag, POOL_TYPE PoolType, ULONG } /* Lock PFN database */ - Irql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + Irql = MiAcquirePfnLock(); /* Reject allocation in case amount of available pages is too small */ if (MmAvailablePages < 0x100) { /* Release the PFN database lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, Irql); + MiReleasePfnLock(Irql); DPRINT1("Special pool: MmAvailablePages 0x%x is too small\n", MmAvailablePages); return NULL; } @@ -311,7 +311,7 @@ MmAllocateSpecialPool(SIZE_T NumberOfBytes, ULONG Tag, POOL_TYPE PoolType, ULONG { /* No reserves left, reject this allocation */ static int once; - KeReleaseQueuedSpinLock(LockQueuePfnLock, Irql); + MiReleasePfnLock(Irql); if (!once++) DPRINT1("Special pool: No PTEs left!\n"); return NULL; } @@ -344,7 +344,7 @@ MmAllocateSpecialPool(SIZE_T NumberOfBytes, ULONG Tag, POOL_TYPE PoolType, ULONG MiInitializePfnAndMakePteValid(PageFrameNumber, PointerPte, TempPte); /* Release the PFN database lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, Irql); + MiReleasePfnLock(Irql); /* Increase page counter */ PagesInUse = InterlockedIncrementUL(&MmSpecialPagesInUse); @@ -601,7 +601,7 @@ MmFreeSpecialPool(PVOID P) InterlockedDecrementUL(&MiSpecialPagesNonPaged); /* Lock PFN database */ - Irql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + Irql = MiAcquirePfnLock(); /* Delete this PFN */ MI_SET_PFN_DELETED(Pfn); @@ -624,7 +624,7 @@ MmFreeSpecialPool(PVOID P) InterlockedDecrementUL(&MiSpecialPagesPagable); /* Lock PFN database */ - Irql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + Irql = MiAcquirePfnLock(); } /* Mark next PTE as invalid */ @@ -641,7 +641,7 @@ MmFreeSpecialPool(PVOID P) MiSpecialPoolLastPte = PointerPte; /* Release the PFN database lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, Irql); + MiReleasePfnLock(Irql); /* Update page counter */ InterlockedDecrementUL(&MmSpecialPagesInUse); diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 0b929f7bf8..471551184f 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -176,7 +176,7 @@ MiLoadImageSection(IN OUT PVOID *SectionPtr, DPRINT1("Loading: %wZ at %p with %lx pages\n", FileName, DriverBase, PteCount); /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Loop the new driver PTEs */ TempPte = ValidKernelPte; @@ -213,7 +213,7 @@ MiLoadImageSection(IN OUT PVOID *SectionPtr, } /* Release the PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Copy the image */ RtlCopyMemory(DriverBase, Base, PteCount << PAGE_SHIFT); diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index 8f0591db0b..0e5fe77a23 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -267,7 +267,7 @@ MiMakeSystemAddressValidPfn(IN PVOID VirtualAddress, while (!MmIsAddressValid(VirtualAddress)) { /* Release the PFN database */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Fault it in */ Status = MmAccessFault(FALSE, VirtualAddress, KernelMode, NULL); @@ -285,7 +285,7 @@ MiMakeSystemAddressValidPfn(IN PVOID VirtualAddress, LockChange = TRUE; /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); } /* Let caller know what the lock state is */ @@ -337,7 +337,7 @@ MiDeleteSystemPageableVm(IN PMMPTE PointerPte, Pfn2 = MiGetPfnEntry(PageTableIndex); /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Delete it the page */ MI_SET_PFN_DELETED(Pfn1); @@ -347,7 +347,7 @@ MiDeleteSystemPageableVm(IN PMMPTE PointerPte, MiDecrementShareCount(Pfn2, PageTableIndex); /* Release the PFN database */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Destroy the PTE */ MI_ERASE_PTE(PointerPte); @@ -399,7 +399,7 @@ MiDeletePte(IN PMMPTE PointerPte, PMMPDE PointerPde; /* PFN lock must be held */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); /* Capture the PTE */ TempPte = *PointerPte; @@ -626,7 +626,7 @@ MiDeleteVirtualAddresses(IN ULONG_PTR Va, } /* Lock the PFN Database while we delete the PTEs */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); do { /* Capture the PDE and make sure it exists */ @@ -708,7 +708,7 @@ MiDeleteVirtualAddresses(IN ULONG_PTR Va, } /* Release the lock and get out if we're done */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); if (Va > EndingAddress) return; /* Otherwise, we exited because we hit a new PDE boundary, so start over */ @@ -1379,7 +1379,7 @@ MiGetPageProtection(IN PMMPTE PointerPte) { /* The PTE is valid, so we might need to get the protection from the PFN. Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Check if the PDE is still valid */ if (MiAddressToPte(PointerPte)->u.Hard.Valid == 0) @@ -1407,7 +1407,7 @@ MiGetPageProtection(IN PMMPTE PointerPte) } /* Release the PFN database */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } /* Lock the working set again */ @@ -2301,7 +2301,7 @@ MiProtectVirtualMemory(IN PEPROCESS Process, if ((NewAccessProtection & PAGE_NOACCESS) || (NewAccessProtection & PAGE_GUARD)) { - KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + KIRQL OldIrql = MiAcquirePfnLock(); /* Mark the PTE as transition and change its protection */ PteContents.u.Hard.Valid = 0; @@ -2318,7 +2318,7 @@ MiProtectVirtualMemory(IN PEPROCESS Process, KeInvalidateTlbEntry(MiPteToAddress(PointerPte)); /* We are done for this PTE */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } else { @@ -2459,7 +2459,7 @@ MiProcessValidPteList(IN PMMPTE *ValidPteList, // // Acquire the PFN lock and loop all the PTEs in the list // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); for (i = 0; i != Count; i++) { // @@ -2494,7 +2494,7 @@ MiProcessValidPteList(IN PMMPTE *ValidPteList, // and then release the PFN lock // KeFlushCurrentTb(); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } ULONG diff --git a/ntoskrnl/mm/ARM3/zeropage.c b/ntoskrnl/mm/ARM3/zeropage.c index 4b0b9cbe64..e2b96ca56a 100644 --- a/ntoskrnl/mm/ARM3/zeropage.c +++ b/ntoskrnl/mm/ARM3/zeropage.c @@ -67,7 +67,7 @@ MmZeroPageThread(VOID) FALSE, NULL, NULL); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); MmZeroingPageThreadActive = TRUE; while (TRUE) @@ -75,7 +75,7 @@ MmZeroPageThread(VOID) if (!MmFreePageListHead.Total) { MmZeroingPageThreadActive = FALSE; - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); break; } @@ -97,14 +97,14 @@ MmZeroPageThread(VOID) } Pfn1->u1.Flink = LIST_HEAD; - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); ZeroAddress = MiMapPagesInZeroSpace(Pfn1, 1); ASSERT(ZeroAddress); RtlZeroMemory(ZeroAddress, PAGE_SIZE); MiUnmapPagesInZeroSpace(ZeroAddress, 1); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); MiInsertPageInList(&MmZeroedPageListHead, PageIndex); } diff --git a/ntoskrnl/mm/amd64/page.c b/ntoskrnl/mm/amd64/page.c index 964d488479..864302bd42 100644 --- a/ntoskrnl/mm/amd64/page.c +++ b/ntoskrnl/mm/amd64/page.c @@ -165,7 +165,7 @@ MiGetPteForProcess( TmplPte.u.Flush.Owner = (Address < MmHighestUserAddress) ? 1 : 0; /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Get the PXE */ Pte = MiAddressToPxe(Address); @@ -192,7 +192,7 @@ MiGetPteForProcess( } /* Unlock PFN database */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } else { @@ -610,7 +610,7 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, KeInitializeSpinLock(&Process->HyperSpaceLock); /* Lock PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); /* Get a page for the table base and one for hyper space. The PFNs for these pages will be initialized in MmInitializeProcessAddressSpace, @@ -622,7 +622,7 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, WorkingSetPfn = MiRemoveAnyPage(MI_GET_NEXT_PROCESS_COLOR(Process)); /* Release PFN lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Zero pages */ /// FIXME: MiZeroPhysicalPage(HyperPfn); diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index e4b108aa07..324f3d84f7 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -357,7 +357,7 @@ MiBalancerThread(PVOID Unused) PEPROCESS Process = PsGetCurrentProcess(); /* Acquire PFN lock */ - KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + KIRQL OldIrql = MiAcquirePfnLock(); PMMPDE pointerPde; for (Address = (ULONG_PTR)MI_LOWEST_VAD_ADDRESS; Address < (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; @@ -372,7 +372,7 @@ MiBalancerThread(PVOID Unused) } } /* Release lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } #endif do @@ -410,7 +410,7 @@ BOOLEAN MmRosNotifyAvailablePage(PFN_NUMBER Page) PMMPFN Pfn1; /* Make sure the PFN lock is held */ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); if (!MiMinimumAvailablePages) { diff --git a/ntoskrnl/mm/freelist.c b/ntoskrnl/mm/freelist.c index 9cff79cb21..93d9bbd9f5 100644 --- a/ntoskrnl/mm/freelist.c +++ b/ntoskrnl/mm/freelist.c @@ -66,9 +66,9 @@ MmGetLRUFirstUserPage(VOID) KIRQL OldIrql; /* Find the first user page */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); Position = RtlFindSetBits(&MiUserPfnBitMap, 1, 0); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); if (Position == 0xFFFFFFFF) return 0; /* Return it */ @@ -87,9 +87,9 @@ MmInsertLRULastUserPage(PFN_NUMBER Pfn) ASSERT(Pfn != 0); ASSERT_IS_ROS_PFN(MiGetPfnEntry(Pfn)); ASSERT(!RtlCheckBit(&MiUserPfnBitMap, (ULONG)Pfn)); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); RtlSetBit(&MiUserPfnBitMap, (ULONG)Pfn); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } PFN_NUMBER @@ -100,9 +100,9 @@ MmGetLRUNextUserPage(PFN_NUMBER PreviousPfn) KIRQL OldIrql; /* Find the next user page */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); Position = RtlFindSetBits(&MiUserPfnBitMap, 1, (ULONG)PreviousPfn + 1); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); if (Position == 0xFFFFFFFF) return 0; /* Return it */ @@ -121,9 +121,9 @@ MmRemoveLRUUserPage(PFN_NUMBER Page) ASSERT(Page != 0); ASSERT_IS_ROS_PFN(MiGetPfnEntry(Page)); ASSERT(RtlCheckBit(&MiUserPfnBitMap, (ULONG)Page)); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); RtlClearBit(&MiUserPfnBitMap, (ULONG)Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } BOOLEAN @@ -217,7 +217,7 @@ MiAllocatePagesForMdl(IN PHYSICAL_ADDRESS LowAddress, // // Lock the PFN database // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); // // Are we looking for any pages, without discriminating? @@ -332,7 +332,7 @@ MiAllocatePagesForMdl(IN PHYSICAL_ADDRESS LowAddress, // // Now release the PFN count // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); // // We might've found less pages, but not more ;-) @@ -395,7 +395,7 @@ MmSetRmapListHeadPage(PFN_NUMBER Pfn, PMM_RMAP_ENTRY ListHead) KIRQL oldIrql; PMMPFN Pfn1; - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = MiAcquirePfnLock(); Pfn1 = MiGetPfnEntry(Pfn); ASSERT(Pfn1); ASSERT_IS_ROS_PFN(Pfn1); @@ -419,7 +419,7 @@ MmSetRmapListHeadPage(PFN_NUMBER Pfn, PMM_RMAP_ENTRY ListHead) /* ReactOS semantics will now release the page, which will make it free and enter a colored list */ } - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); + MiReleasePfnLock(oldIrql); } PMM_RMAP_ENTRY @@ -431,7 +431,7 @@ MmGetRmapListHeadPage(PFN_NUMBER Pfn) PMMPFN Pfn1; /* Lock PFN database */ - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = MiAcquirePfnLock(); /* Get the entry */ Pfn1 = MiGetPfnEntry(Pfn); @@ -445,7 +445,7 @@ MmGetRmapListHeadPage(PFN_NUMBER Pfn) ASSERT(MiIsPfnInUse(Pfn1) == TRUE); /* Release PFN database and return rmap list head */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); + MiReleasePfnLock(oldIrql); return ListHead; } @@ -460,9 +460,9 @@ MmSetSavedSwapEntryPage(PFN_NUMBER Pfn, SWAPENTRY SwapEntry) ASSERT(Pfn1); ASSERT_IS_ROS_PFN(Pfn1); - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = MiAcquirePfnLock(); Pfn1->u1.SwapEntry = SwapEntry; - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); + MiReleasePfnLock(oldIrql); } SWAPENTRY @@ -477,9 +477,9 @@ MmGetSavedSwapEntryPage(PFN_NUMBER Pfn) ASSERT(Pfn1); ASSERT_IS_ROS_PFN(Pfn1); - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = MiAcquirePfnLock(); SwapEntry = Pfn1->u1.SwapEntry; - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); + MiReleasePfnLock(oldIrql); return(SwapEntry); } @@ -492,7 +492,7 @@ MmReferencePage(PFN_NUMBER Pfn) DPRINT("MmReferencePage(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + MI_ASSERT_PFN_LOCK_HELD(); ASSERT(Pfn != 0); ASSERT(Pfn <= MmHighestPhysicalPage); @@ -514,14 +514,14 @@ MmGetReferenceCountPage(PFN_NUMBER Pfn) DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = MiAcquirePfnLock(); Pfn1 = MiGetPfnEntry(Pfn); ASSERT(Pfn1); ASSERT_IS_ROS_PFN(Pfn1); RCount = Pfn1->u3.e2.ReferenceCount; - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); + MiReleasePfnLock(oldIrql); return(RCount); } @@ -540,7 +540,7 @@ MmDereferencePage(PFN_NUMBER Pfn) KIRQL OldIrql; DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); Pfn1 = MiGetPfnEntry(Pfn); ASSERT(Pfn1); @@ -561,7 +561,7 @@ MmDereferencePage(PFN_NUMBER Pfn) MiInsertPageInFreeList(Pfn); } - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } PFN_NUMBER @@ -572,7 +572,7 @@ MmAllocPage(ULONG Type) PMMPFN Pfn1; KIRQL OldIrql; - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); PfnOffset = MiRemoveZeroPage(MI_GET_NEXT_COLOR()); if (!PfnOffset) @@ -592,7 +592,7 @@ MmAllocPage(ULONG Type) Pfn1->u1.SwapEntry = 0; Pfn1->RmapListHead = NULL; - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); return PfnOffset; } diff --git a/ntoskrnl/mm/marea.c b/ntoskrnl/mm/marea.c index 12dcc6fd7d..1dc4d612d4 100644 --- a/ntoskrnl/mm/marea.c +++ b/ntoskrnl/mm/marea.c @@ -332,12 +332,12 @@ MmFreeMemoryArea( if (MiQueryPageTableReferences((PVOID)Address) == 0) { /* No PTE relies on this PDE. Release it */ - KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + KIRQL OldIrql = MiAcquirePfnLock(); PMMPDE PointerPde = MiAddressToPde(Address); ASSERT(PointerPde->u.Hard.Valid == 1); MiDeletePte(PointerPde, MiPdeToPte(PointerPde), Process, NULL); ASSERT(PointerPde->u.Hard.Valid == 0); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } } #endif @@ -594,7 +594,7 @@ MmDeleteProcessAddressSpace(PEPROCESS Process) KeAttachProcess(&Process->Pcb); /* Acquire PFN lock */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); for (Address = MI_LOWEST_VAD_ADDRESS; Address < MM_HIGHEST_VAD_ADDRESS; @@ -619,7 +619,7 @@ MmDeleteProcessAddressSpace(PEPROCESS Process) } /* Release lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); /* Detach */ KeDetachProcess(); diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 1b679fd224..66fa6d2245 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1982,9 +1982,9 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace, } else { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + OldIrql = MiAcquirePfnLock(); MmReferencePage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + MiReleasePfnLock(OldIrql); } MmDeleteAllRmaps(Page, (PVOID)&Context, MmPageOutDeleteMapping);

6 years, 9 months

[reactos] 02/02: [NTDLL_APITEST] Create Test_NtFreeVirtualMemory_Parameters(). CORE-13126

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a11841c939790b9bd1721… commit a11841c939790b9bd1721f6aeae79e335932528c Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Nov 27 00:51:18 2017 +0100 [NTDLL_APITEST] Create Test_NtFreeVirtualMemory_Parameters(). CORE-13126 - Test 4th parameter ("ULONG FreeType") invalid values. --- .../rostests/apitests/ntdll/NtFreeVirtualMemory.c | 43 +++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ntdll/NtFreeVirtualMemory.c b/modules/rostests/apitests/ntdll/NtFreeVirtualMemory.c index 02ebe8dec6..07aa119218 100644 --- a/modules/rostests/apitests/ntdll/NtFreeVirtualMemory.c +++ b/modules/rostests/apitests/ntdll/NtFreeVirtualMemory.c @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Test for NtFreeVirtualMemory * COPYRIGHT: Copyright 2011 Jérôme Gardou <jerome.gardou(a)reactos.org> + * Copyright 2017 Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> */ #include "precomp.h" @@ -169,8 +170,48 @@ static void Test_NtFreeVirtualMemory(void) ok(Length == 2*PAGE_SIZE, "Length mismatch : 0x%08lx\n", (ULONG)Length); ok(Buffer2 == Buffer, "The buffer is not aligned to PAGE_SIZE.\n"); } - + +static void Test_NtFreeVirtualMemory_Parameters(void) +{ + NTSTATUS Status; + ULONG FreeType; + int i; + + // 4th parameter: "ULONG FreeType". + + // A type is mandatory. + Status = NtFreeVirtualMemory(NULL, NULL, NULL, 0ul); + ok(Status == STATUS_INVALID_PARAMETER_4, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); + + // All but MEM_DECOMMIT and MEM_RELEASE are unsupported. + // Each bit one by one. + for (i = 0; i < 32; ++i) + { + FreeType = 1 << i; + if (FreeType == MEM_DECOMMIT || FreeType == MEM_RELEASE) + continue; + + Status = NtFreeVirtualMemory(NULL, NULL, NULL, FreeType); + ok(Status == STATUS_INVALID_PARAMETER_4, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); + } + // All bits at once. + // Not testing all other values. + Status = NtFreeVirtualMemory(NULL, NULL, NULL, ~(MEM_DECOMMIT | MEM_RELEASE)); + ok(Status == STATUS_INVALID_PARAMETER_4, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); + Status = NtFreeVirtualMemory(NULL, NULL, NULL, ~MEM_DECOMMIT); + ok(Status == STATUS_INVALID_PARAMETER_4, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); + Status = NtFreeVirtualMemory(NULL, NULL, NULL, ~MEM_RELEASE); + ok(Status == STATUS_INVALID_PARAMETER_4, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); + Status = NtFreeVirtualMemory(NULL, NULL, NULL, ~0ul); + ok(Status == STATUS_INVALID_PARAMETER_4, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); + + // MEM_DECOMMIT and MEM_RELEASE are exclusive. + Status = NtFreeVirtualMemory(NULL, NULL, NULL, MEM_DECOMMIT | MEM_RELEASE); + ok(Status == STATUS_INVALID_PARAMETER_4, "NtFreeVirtualMemory returned status : 0x%08lx\n", Status); +} + START_TEST(NtFreeVirtualMemory) { Test_NtFreeVirtualMemory(); + Test_NtFreeVirtualMemory_Parameters(); } \ No newline at end of file

6 years, 9 months

← Newer
1
...
28
29
30
31
32
33
34
35
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 December 2017