Ros-diffs June 2020

ros-diffs@reactos.org

20 participants
95 discussions

[reactos] 01/01: [RAPPS] delete obsolete field

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=393a2c42fec59341271a5… commit 393a2c42fec59341271a53d4f87c253a13aabf9c Author: He Yang <1160386205(a)qq.com> AuthorDate: Mon Jun 15 02:34:43 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jun 14 20:34:43 2020 +0200 [RAPPS] delete obsolete field --- base/applications/rapps/README.ENG | 1 - base/applications/rapps/README.RUS | 1 - 2 files changed, 2 deletions(-) diff --git a/base/applications/rapps/README.ENG b/base/applications/rapps/README.ENG index 9e35dae6d76..4e4876f549d 100644 --- a/base/applications/rapps/README.ENG +++ b/base/applications/rapps/README.ENG @@ -53,7 +53,6 @@ File format overview: Category = 5 URLSite = https://example.org/ URLDownload = https://ftp.example.org/pub/installer.exe - CDPath = ; Path in the local filesystem [Section.0419] ; 0419 - for Russian language Description = Description in Russian language diff --git a/base/applications/rapps/README.RUS b/base/applications/rapps/README.RUS index f5dfcf8de3b..7c74b5c90f7 100644 --- a/base/applications/rapps/README.RUS +++ b/base/applications/rapps/README.RUS @@ -21,7 +21,6 @@ Size = Category = 5 ; �� URLSite = http://www.site.com/ ; �� . �� URLDownload = http://ftp.site.com/pub/installer.exe ; �� . �� -CDPath = ; �� [Section.0419] ; �� Description = ��

4 years, 6 months

[reactos] 01/01: [DNSRSLVR] Define NDEBUG in cache.c

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b8b339aae27e4dc81414… commit 1b8b339aae27e4dc814149b628ac3a3aac00f4ea Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jun 14 20:03:33 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jun 14 20:03:33 2020 +0200 [DNSRSLVR] Define NDEBUG in cache.c To avoid leaking private data into logs by default. Some testers may consider their DNS-suffix private data. And DnsIntCacheAddEntry() logs that via Record->pName. --- base/services/dnsrslvr/cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/services/dnsrslvr/cache.c b/base/services/dnsrslvr/cache.c index e61cc8695a7..b232989f372 100644 --- a/base/services/dnsrslvr/cache.c +++ b/base/services/dnsrslvr/cache.c @@ -8,7 +8,7 @@ #include "precomp.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> static RESOLVER_CACHE DnsCache;

4 years, 6 months

[reactos] 01/01: Revert "[FONTS] Add Selawik as a substitution for Segoe UI" CORE-17122 (#2921)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cb8ee6d7e40b2558736d… commit 3cb8ee6d7e40b2558736df8f815385d59b78e1d5 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sun Jun 14 13:09:41 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jun 14 19:09:41 2020 +0900 Revert "[FONTS] Add Selawik as a substitution for Segoe UI" CORE-17122 (#2921) This reverts commit 97fb49a3d2bfdbbf5f03e193f922a80dd39ca9ba. --- base/setup/lib/muifonts.h | 1 - boot/bootdata/livecd.inf | 1 - media/fonts/CMakeLists.txt | 5 -- media/fonts/Selawik-Bold.ttf | Bin 58228 -> 0 bytes media/fonts/Selawik-ExtraLight.ttf | Bin 58956 -> 0 bytes media/fonts/Selawik-Light.ttf | Bin 59240 -> 0 bytes media/fonts/Selawik-Regular.ttf | Bin 58284 -> 0 bytes media/fonts/Selawik-SemiBold.ttf | Bin 58448 -> 0 bytes media/fonts/doc/Selawik/LICENSE.txt | 93 ------------------------------------ media/fonts/doc/Selawik/README.txt | 3 -- 10 files changed, 103 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 30ccfa87899..258cae7e1b5 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -29,7 +29,6 @@ MUI_SUBFONT LatinFonts[] = { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, - { L"Segoe UI", L"Selawik" }, { NULL, NULL } }; diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index 363066e595d..eae91147fa4 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -58,7 +58,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI",0x00000000,"Selawik" ; FIXME: Registration diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 159eec1f7cc..ef0284283c6 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -37,11 +37,6 @@ list(APPEND FONT_FILES palab.ttf palabi.ttf palai.ttf - Selawik-Regular.ttf - Selawik-SemiBold.ttf - Selawik-Bold.ttf - Selawik-Light.ttf - Selawik-ExtraLight.ttf SourceSansPro-Regular.ttf SourceSansPro-Bold.ttf SourceSansPro-BoldIt.ttf diff --git a/media/fonts/Selawik-Bold.ttf b/media/fonts/Selawik-Bold.ttf deleted file mode 100644 index 7f5484094a0..00000000000 Binary files a/media/fonts/Selawik-Bold.ttf and /dev/null differ diff --git a/media/fonts/Selawik-ExtraLight.ttf b/media/fonts/Selawik-ExtraLight.ttf deleted file mode 100644 index cff82b75a52..00000000000 Binary files a/media/fonts/Selawik-ExtraLight.ttf and /dev/null differ diff --git a/media/fonts/Selawik-Light.ttf b/media/fonts/Selawik-Light.ttf deleted file mode 100644 index bf01cf4ccfd..00000000000 Binary files a/media/fonts/Selawik-Light.ttf and /dev/null differ diff --git a/media/fonts/Selawik-Regular.ttf b/media/fonts/Selawik-Regular.ttf deleted file mode 100644 index a474725c9d5..00000000000 Binary files a/media/fonts/Selawik-Regular.ttf and /dev/null differ diff --git a/media/fonts/Selawik-SemiBold.ttf b/media/fonts/Selawik-SemiBold.ttf deleted file mode 100644 index 069bd1adf14..00000000000 Binary files a/media/fonts/Selawik-SemiBold.ttf and /dev/null differ diff --git a/media/fonts/doc/Selawik/LICENSE.txt b/media/fonts/doc/Selawik/LICENSE.txt deleted file mode 100644 index 7525d224635..00000000000 --- a/media/fonts/doc/Selawik/LICENSE.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2015, Microsoft Corporation (www.microsoft.com), with Reserved Font Name Selawik. All Rights Reserved. Selawik is a trademark of Microsoft Corporation in the United States and/or other countries. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media/fonts/doc/Selawik/README.txt b/media/fonts/doc/Selawik/README.txt deleted file mode 100644 index 06d41c97555..00000000000 --- a/media/fonts/doc/Selawik/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -The Selawik font files come from this GitHub repo: - -https://github.com/vv-monsalve/Selawik/tree/QA-Selawik

4 years, 6 months

[reactos] 01/02: [ACPICA] Update to version 20200528. CORE-17094

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cab7e9ade80e5f94fbba1… commit cab7e9ade80e5f94fbba1cd0603db131b87933bf Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat May 30 15:30:56 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jun 14 09:19:02 2020 +0200 [ACPICA] Update to version 20200528. CORE-17094 --- drivers/bus/acpi/acpica/include/acpixf.h | 2 +- drivers/bus/acpi/acpica/include/actypes.h | 3 ++- drivers/bus/acpi/acpica/utilities/utdecode.c | 23 ++++++++++++----------- media/doc/3rd Party Files.txt | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index c371ccd8ad8..1fa5770c7b4 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20200430 +#define ACPI_CA_VERSION 0x20200528 #include "acconfig.h" #include "actypes.h" diff --git a/drivers/bus/acpi/acpica/include/actypes.h b/drivers/bus/acpi/acpica/include/actypes.h index ad5c21d73d6..cb8d7cd4d2d 100644 --- a/drivers/bus/acpi/acpica/include/actypes.h +++ b/drivers/bus/acpi/acpica/include/actypes.h @@ -860,8 +860,9 @@ typedef UINT8 ACPI_ADR_SPACE_TYPE; #define ACPI_ADR_SPACE_GPIO (ACPI_ADR_SPACE_TYPE) 8 #define ACPI_ADR_SPACE_GSBUS (ACPI_ADR_SPACE_TYPE) 9 #define ACPI_ADR_SPACE_PLATFORM_COMM (ACPI_ADR_SPACE_TYPE) 10 +#define ACPI_ADR_SPACE_PLATFORM_RT (ACPI_ADR_SPACE_TYPE) 11 -#define ACPI_NUM_PREDEFINED_REGIONS 11 +#define ACPI_NUM_PREDEFINED_REGIONS 12 /* * Special Address Spaces diff --git a/drivers/bus/acpi/acpica/utilities/utdecode.c b/drivers/bus/acpi/acpica/utilities/utdecode.c index 5726f2f15e5..3c8550033a8 100644 --- a/drivers/bus/acpi/acpica/utilities/utdecode.c +++ b/drivers/bus/acpi/acpica/utilities/utdecode.c @@ -106,17 +106,18 @@ const UINT8 AcpiGbl_NsProperties[ACPI_NUM_NS_TYPES] = const char *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_REGIONS] = { - "SystemMemory", /* 0x00 */ - "SystemIO", /* 0x01 */ - "PCI_Config", /* 0x02 */ - "EmbeddedControl", /* 0x03 */ - "SMBus", /* 0x04 */ - "SystemCMOS", /* 0x05 */ - "PCIBARTarget", /* 0x06 */ - "IPMI", /* 0x07 */ - "GeneralPurposeIo", /* 0x08 */ - "GenericSerialBus", /* 0x09 */ - "PCC" /* 0x0A */ + "SystemMemory", /* 0x00 */ + "SystemIO", /* 0x01 */ + "PCI_Config", /* 0x02 */ + "EmbeddedControl", /* 0x03 */ + "SMBus", /* 0x04 */ + "SystemCMOS", /* 0x05 */ + "PCIBARTarget", /* 0x06 */ + "IPMI", /* 0x07 */ + "GeneralPurposeIo", /* 0x08 */ + "GenericSerialBus", /* 0x09 */ + "PCC", /* 0x0A */ + "PlatformRtMechanism" /* 0x0B */ }; diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index cdf713041c8..0627d25283a 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -92,7 +92,7 @@ Used Version: 1.6.37 Website: http://libpng.sourceforge.net/ Title: ACPICA -Used Version: 20200430 +Used Version: 20200528 Website: https://acpica.org/ Title: Schily Tools, mkisofs

4 years, 6 months

[reactos] 03/03: [RTL] Use LastEntryInSegment to speed up RtlpFindAndCommitPages. CORE-14588

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52f103c85bffc21f48ea4… commit 52f103c85bffc21f48ea4e8e121cbd3163a6f0f8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 2 12:54:19 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jun 14 09:10:31 2020 +0200 [RTL] Use LastEntryInSegment to speed up RtlpFindAndCommitPages. CORE-14588 --- sdk/lib/rtl/heap.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sdk/lib/rtl/heap.c b/sdk/lib/rtl/heap.c index 962d5b079b6..a75c18f5d2a 100644 --- a/sdk/lib/rtl/heap.c +++ b/sdk/lib/rtl/heap.c @@ -665,16 +665,21 @@ RtlpFindAndCommitPages(PHEAP Heap, /* Calculate first and last entries */ FirstEntry = (PHEAP_ENTRY)Address; - /* Go through the entries to find the last one */ - if (PreviousUcr) - LastEntry = (PHEAP_ENTRY)((ULONG_PTR)PreviousUcr->Address + PreviousUcr->Size); - else - LastEntry = &Segment->Entry; - - while (!(LastEntry->Flags & HEAP_ENTRY_LAST_ENTRY)) + LastEntry = Segment->LastEntryInSegment; + if (!(LastEntry->Flags & HEAP_ENTRY_LAST_ENTRY) || + LastEntry + LastEntry->Size != FirstEntry) { - ASSERT(LastEntry->Size != 0); - LastEntry += LastEntry->Size; + /* Go through the entries to find the last one */ + if (PreviousUcr) + LastEntry = (PHEAP_ENTRY)((ULONG_PTR)PreviousUcr->Address + PreviousUcr->Size); + else + LastEntry = &Segment->Entry; + + while (!(LastEntry->Flags & HEAP_ENTRY_LAST_ENTRY)) + { + ASSERT(LastEntry->Size != 0); + LastEntry += LastEntry->Size; + } } ASSERT((LastEntry + LastEntry->Size) == FirstEntry);

4 years, 6 months

[reactos] 02/03: [RTL] Add and populate LastEntryInSegment. CORE-14588

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4f736e8f4e05c214d74c… commit c4f736e8f4e05c214d74c0751189f38305583be0 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Feb 2 12:53:57 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jun 14 09:10:31 2020 +0200 [RTL] Add and populate LastEntryInSegment. CORE-14588 --- sdk/lib/rtl/heap.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++- sdk/lib/rtl/heap.h | 3 ++- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/sdk/lib/rtl/heap.c b/sdk/lib/rtl/heap.c index ad4f6a1513d..962d5b079b6 100644 --- a/sdk/lib/rtl/heap.c +++ b/sdk/lib/rtl/heap.c @@ -702,10 +702,12 @@ RtlpFindAndCommitPages(PHEAP Heap, if(UcrDescriptor->Address == Segment->LastValidEntry) { FirstEntry->Flags = HEAP_ENTRY_LAST_ENTRY; + Segment->LastEntryInSegment = FirstEntry; } else { FirstEntry->Flags = 0; + Segment->LastEntryInSegment = Segment->FirstEntry; /* Update field of next entry */ ASSERT((FirstEntry + FirstEntry->Size)->PreviousSize == 0); (FirstEntry + FirstEntry->Size)->PreviousSize = FirstEntry->Size; @@ -720,6 +722,7 @@ RtlpFindAndCommitPages(PHEAP Heap, else { FirstEntry->Flags = HEAP_ENTRY_LAST_ENTRY; + Segment->LastEntryInSegment = FirstEntry; } /* We're done */ @@ -841,6 +844,7 @@ RtlpDeCommitFreeBlock(PHEAP Heap, FreeEntry->Flags = HEAP_ENTRY_LAST_ENTRY; FreeEntry->Size = (USHORT)PrecedingSize; Heap->TotalFreeSize += PrecedingSize; + Segment->LastEntryInSegment = FreeEntry; /* Insert it into the free list */ RtlpInsertFreeBlockHelper(Heap, FreeEntry, PrecedingSize, FALSE); @@ -849,6 +853,13 @@ RtlpDeCommitFreeBlock(PHEAP Heap, { /* Adjust preceding in use entry */ PrecedingInUseEntry->Flags |= HEAP_ENTRY_LAST_ENTRY; + Segment->LastEntryInSegment = PrecedingInUseEntry; + } + else if ((ULONG_PTR)Segment->LastEntryInSegment >= DecommitBase && + (ULONG_PTR)Segment->LastEntryInSegment < DecommitBase + DecommitSize) + { + /* Invalidate last entry */ + Segment->LastEntryInSegment = Segment->FirstEntry; } /* Now the next one */ @@ -933,6 +944,9 @@ RtlpInitializeHeapSegment(IN OUT PHEAP Heap, RtlpInsertFreeBlock(Heap, (PHEAP_FREE_ENTRY) HeapEntry, (SegmentCommit >> HEAP_ENTRY_SHIFT) - Segment->Entry.Size); } + /* Always point to a valid entry */ + Segment->LastEntryInSegment = Segment->FirstEntry; + /* Initialise the Heap Segment UnCommitted Range information */ Segment->NumberOfUnCommittedPages = (ULONG)((SegmentReserve - SegmentCommit) >> PAGE_SHIFT); Segment->NumberOfUnCommittedRanges = 0; @@ -984,6 +998,7 @@ RtlpCoalesceFreeBlocks (PHEAP Heap, BOOLEAN Remove) { PHEAP_FREE_ENTRY CurrentEntry, NextEntry; + UCHAR SegmentOffset; /* Get the previous entry */ CurrentEntry = (PHEAP_FREE_ENTRY)((PHEAP_ENTRY)FreeEntry - FreeEntry->PreviousSize); @@ -1022,6 +1037,12 @@ RtlpCoalesceFreeBlocks (PHEAP Heap, { ((PHEAP_ENTRY)FreeEntry + *FreeSize)->PreviousSize = (USHORT)(*FreeSize); } + else + { + SegmentOffset = FreeEntry->SegmentOffset; + ASSERT(SegmentOffset < HEAP_SEGMENTS); + Heap->Segments[SegmentOffset]->LastEntryInSegment = FreeEntry; + } } /* Check the next block if it exists */ @@ -1057,6 +1078,12 @@ RtlpCoalesceFreeBlocks (PHEAP Heap, { ((PHEAP_ENTRY)FreeEntry + *FreeSize)->PreviousSize = (USHORT)(*FreeSize); } + else + { + SegmentOffset = FreeEntry->SegmentOffset; + ASSERT(SegmentOffset < HEAP_SEGMENTS); + Heap->Segments[SegmentOffset]->LastEntryInSegment = FreeEntry; + } } } return FreeEntry; @@ -1637,6 +1664,7 @@ RtlpSplitEntry(PHEAP Heap, UCHAR FreeFlags, EntryFlags = HEAP_ENTRY_BUSY; PHEAP_ENTRY InUseEntry; SIZE_T FreeSize; + UCHAR SegmentOffset; /* Add extra flags in case of settable user value feature is requested, or there is a tag (small or normal) or there is a request to @@ -1748,6 +1776,12 @@ RtlpSplitEntry(PHEAP Heap, /* Reset flags of the free entry */ FreeFlags = 0; + if (SplitBlock->Flags & HEAP_ENTRY_LAST_ENTRY) + { + SegmentOffset = SplitBlock->SegmentOffset; + ASSERT(SegmentOffset < HEAP_SEGMENTS); + Heap->Segments[SegmentOffset]->LastEntryInSegment = SplitBlock; + } } } @@ -2311,6 +2345,7 @@ RtlpGrowBlockInPlace (IN PHEAP Heap, PHEAP_FREE_ENTRY FreeEntry, UnusedEntry, FollowingEntry; SIZE_T FreeSize, PrevSize, TailPart, AddedSize = 0; PHEAP_ENTRY_EXTRA OldExtra, NewExtra; + UCHAR SegmentOffset; /* We can't grow beyond specified threshold */ if (Index > Heap->VirtualMemoryThreshold) @@ -2407,9 +2442,17 @@ RtlpGrowBlockInPlace (IN PHEAP Heap, InUseEntry->Flags |= RememberFlags & HEAP_ENTRY_LAST_ENTRY; /* Either update previous size of the next entry or mark it as a last - entry in the segment*/ + entry in the segment */ if (!(RememberFlags & HEAP_ENTRY_LAST_ENTRY)) + { (InUseEntry + InUseEntry->Size)->PreviousSize = InUseEntry->Size; + } + else + { + SegmentOffset = InUseEntry->SegmentOffset; + ASSERT(SegmentOffset < HEAP_SEGMENTS); + Heap->Segments[SegmentOffset]->LastEntryInSegment = InUseEntry; + } } else { @@ -2422,6 +2465,10 @@ RtlpGrowBlockInPlace (IN PHEAP Heap, /* Update the following block or set the last entry in the segment */ if (RememberFlags & HEAP_ENTRY_LAST_ENTRY) { + SegmentOffset = UnusedEntry->SegmentOffset; + ASSERT(SegmentOffset < HEAP_SEGMENTS); + Heap->Segments[SegmentOffset]->LastEntryInSegment = UnusedEntry; + /* Set flags and size */ UnusedEntry->Flags = RememberFlags; UnusedEntry->Size = (USHORT)FreeSize; @@ -2468,7 +2515,15 @@ RtlpGrowBlockInPlace (IN PHEAP Heap, UnusedEntry->Size = (USHORT)FreeSize; if (!(RememberFlags & HEAP_ENTRY_LAST_ENTRY)) + { ((PHEAP_ENTRY)UnusedEntry + FreeSize)->PreviousSize = (USHORT)FreeSize; + } + else + { + SegmentOffset = UnusedEntry->SegmentOffset; + ASSERT(SegmentOffset < HEAP_SEGMENTS); + Heap->Segments[SegmentOffset]->LastEntryInSegment = UnusedEntry; + } /* Insert it back and update total size */ RtlpInsertFreeBlockHelper(Heap, UnusedEntry, FreeSize, FALSE); @@ -2578,6 +2633,7 @@ RtlReAllocateHeap(HANDLE HeapPtr, SIZE_T RemainderBytes, ExtraSize; PHEAP_VIRTUAL_ALLOC_ENTRY VirtualAllocBlock; EXCEPTION_RECORD ExceptionRecord; + UCHAR SegmentOffset; /* Return success in case of a null pointer */ if (!Ptr) @@ -2787,6 +2843,10 @@ RtlReAllocateHeap(HANDLE HeapPtr, /* Is that the last entry */ if (FreeFlags & HEAP_ENTRY_LAST_ENTRY) { + SegmentOffset = SplitBlock->SegmentOffset; + ASSERT(SegmentOffset < HEAP_SEGMENTS); + Heap->Segments[SegmentOffset]->LastEntryInSegment = SplitBlock; + /* Set its size and insert it to the list */ SplitBlock->Size = (USHORT)FreeSize; RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE); @@ -2834,6 +2894,12 @@ RtlReAllocateHeap(HANDLE HeapPtr, /* Update previous size of the next entry */ ((PHEAP_FREE_ENTRY)((PHEAP_ENTRY)SplitBlock + FreeSize))->PreviousSize = (USHORT)FreeSize; } + else + { + SegmentOffset = SplitBlock->SegmentOffset; + ASSERT(SegmentOffset < HEAP_SEGMENTS); + Heap->Segments[SegmentOffset]->LastEntryInSegment = SplitBlock; + } /* Insert the new one back and update total size */ RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE); diff --git a/sdk/lib/rtl/heap.h b/sdk/lib/rtl/heap.h index 8fb9bc7ae0d..aef68e5edcd 100644 --- a/sdk/lib/rtl/heap.h +++ b/sdk/lib/rtl/heap.h @@ -217,7 +217,8 @@ typedef struct _HEAP_LIST_LOOKUP ULONG NumberOfUnCommittedRanges; \ USHORT SegmentAllocatorBackTraceIndex; \ USHORT Reserved; \ - LIST_ENTRY UCRSegmentList + LIST_ENTRY UCRSegmentList; \ + PVOID LastEntryInSegment //FIXME: non-Vista typedef struct _HEAP {

4 years, 6 months

[reactos] 01/03: [RTL] Create a define for the common members of HEAP and HEAP_SEGMENT. CORE-14588

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd83bcd6ad67e320c04a3… commit dd83bcd6ad67e320c04a393492cbbe342d9601b9 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 1 21:34:03 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jun 14 09:10:27 2020 +0200 [RTL] Create a define for the common members of HEAP and HEAP_SEGMENT. CORE-14588 The code relies on these members matching up, so it's confusing for them to be duplicated. --- sdk/lib/rtl/heap.h | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/sdk/lib/rtl/heap.h b/sdk/lib/rtl/heap.h index c4c46a45b45..8fb9bc7ae0d 100644 --- a/sdk/lib/rtl/heap.h +++ b/sdk/lib/rtl/heap.h @@ -203,22 +203,25 @@ typedef struct _HEAP_LIST_LOOKUP PLIST_ENTRY *ListHints; } HEAP_LIST_LOOKUP, *PHEAP_LIST_LOOKUP; +#define HEAP_SEGMENT_MEMBERS \ + HEAP_ENTRY Entry; \ + ULONG SegmentSignature; \ + ULONG SegmentFlags; \ + LIST_ENTRY SegmentListEntry; \ + struct _HEAP *Heap; \ + PVOID BaseAddress; \ + ULONG NumberOfPages; \ + PHEAP_ENTRY FirstEntry; \ + PHEAP_ENTRY LastValidEntry; \ + ULONG NumberOfUnCommittedPages; \ + ULONG NumberOfUnCommittedRanges; \ + USHORT SegmentAllocatorBackTraceIndex; \ + USHORT Reserved; \ + LIST_ENTRY UCRSegmentList + typedef struct _HEAP { - HEAP_ENTRY Entry; - ULONG SegmentSignature; - ULONG SegmentFlags; - LIST_ENTRY SegmentListEntry; - struct _HEAP *Heap; - PVOID BaseAddress; - ULONG NumberOfPages; - PHEAP_ENTRY FirstEntry; - PHEAP_ENTRY LastValidEntry; - ULONG NumberOfUnCommittedPages; - ULONG NumberOfUnCommittedRanges; - USHORT SegmentAllocatorBackTraceIndex; - USHORT Reserved; - LIST_ENTRY UCRSegmentList; + HEAP_SEGMENT_MEMBERS; ULONG Flags; ULONG ForceFlags; @@ -271,20 +274,7 @@ typedef struct _HEAP typedef struct _HEAP_SEGMENT { - HEAP_ENTRY Entry; - ULONG SegmentSignature; - ULONG SegmentFlags; - LIST_ENTRY SegmentListEntry; - PHEAP Heap; - PVOID BaseAddress; - ULONG NumberOfPages; - PHEAP_ENTRY FirstEntry; - PHEAP_ENTRY LastValidEntry; - ULONG NumberOfUnCommittedPages; - ULONG NumberOfUnCommittedRanges; - USHORT SegmentAllocatorBackTraceIndex; - USHORT Reserved; - LIST_ENTRY UCRSegmentList; + HEAP_SEGMENT_MEMBERS; } HEAP_SEGMENT, *PHEAP_SEGMENT; typedef struct _HEAP_UCR_DESCRIPTOR

4 years, 6 months

[reactos] 01/01: [USBSTOR] Fix unused variable introduced in 94e61c3

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2540c3b1e8658cd5a6599… commit 2540c3b1e8658cd5a6599e98d41d056ed7ede141 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Jun 13 03:20:08 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Jun 13 03:20:08 2020 +0300 [USBSTOR] Fix unused variable introduced in 94e61c3 --- drivers/usb/usbstor/scsi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/usb/usbstor/scsi.c b/drivers/usb/usbstor/scsi.c index d32aa0941cd..f1749aef48c 100644 --- a/drivers/usb/usbstor/scsi.c +++ b/drivers/usb/usbstor/scsi.c @@ -331,7 +331,6 @@ USBSTOR_CBWCompletionRoutine( PIRP Irp, PVOID Ctx) { - PIRP_CONTEXT Context; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; PPDO_DEVICE_EXTENSION PDODeviceExtension; @@ -344,7 +343,6 @@ USBSTOR_CBWCompletionRoutine( DPRINT("USBSTOR_CBWCompletionRoutine Irp %p Ctx %p Status %x\n", Irp, Ctx, Irp->IoStatus.Status); FDODeviceExtension = (PFDO_DEVICE_EXTENSION)Ctx; - Context = &FDODeviceExtension->CurrentIrpContext; IoStack = IoGetCurrentIrpStackLocation(Irp); Request = IoStack->Parameters.Scsi.Srb; PDODeviceExtension = (PPDO_DEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension;

4 years, 6 months

[reactos] 01/01: [USBSTOR] Fix wrong function name in a9b97ae

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=493f2ace1165245b11ed6… commit 493f2ace1165245b11ed6e7211ffe10a3d36334b Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Jun 13 03:07:00 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Jun 13 03:07:00 2020 +0300 [USBSTOR] Fix wrong function name in a9b97ae --- drivers/usb/usbstor/fdo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/usbstor/fdo.c b/drivers/usb/usbstor/fdo.c index 15af86f095a..ebf2d1976a4 100644 --- a/drivers/usb/usbstor/fdo.c +++ b/drivers/usb/usbstor/fdo.c @@ -61,7 +61,7 @@ USBSTOR_FdoHandleDeviceRelations( } } - DeviceRelations = ExFreePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS) + (DeviceCount-1) * sizeof(PDEVICE_OBJECT), USB_STOR_TAG); + DeviceRelations = ExAllocatePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS) + (DeviceCount - 1) * sizeof(PDEVICE_OBJECT), USB_STOR_TAG); if (!DeviceRelations) { Irp->IoStatus.Information = 0; @@ -70,6 +70,8 @@ USBSTOR_FdoHandleDeviceRelations( return STATUS_INSUFFICIENT_RESOURCES; } + DeviceRelations->Count = 0; + // add device objects for (Index = 0; Index < max(DeviceExtension->MaxLUN, 1); Index++) {

4 years, 6 months

[reactos] 02/02: [USBSTOR] Move PDO's Inquiry data and FDO's SCSI context to their Device Extensions. This way the driver can better handle low memory situations

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94e61c3080fe83efcc613… commit 94e61c3080fe83efcc613d0d77ade45cb0848808 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Jun 12 16:51:42 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Jun 12 16:55:27 2020 +0300 [USBSTOR] Move PDO's Inquiry data and FDO's SCSI context to their Device Extensions. This way the driver can better handle low memory situations --- drivers/usb/usbstor/disk.c | 5 +- drivers/usb/usbstor/error.c | 11 ++--- drivers/usb/usbstor/pdo.c | 35 ++++---------- drivers/usb/usbstor/scsi.c | 109 +++++++++++++++++------------------------- drivers/usb/usbstor/usbstor.h | 101 +++++++++++++++++++------------------- 5 files changed, 113 insertions(+), 148 deletions(-) diff --git a/drivers/usb/usbstor/disk.c b/drivers/usb/usbstor/disk.c index b73ca91292c..1e5bd1299fb 100644 --- a/drivers/usb/usbstor/disk.c +++ b/drivers/usb/usbstor/disk.c @@ -283,8 +283,7 @@ USBSTOR_HandleQueryProperty( ASSERT(FDODeviceExtension); ASSERT(FDODeviceExtension->Common.IsFDO); - InquiryData = PDODeviceExtension->InquiryData; - ASSERT(InquiryData); + InquiryData = (PINQUIRYDATA)&PDODeviceExtension->InquiryData; // compute extra parameters length FieldLengthVendor = USBSTOR_GetFieldLength(InquiryData->VendorId, 8); @@ -507,7 +506,7 @@ USBSTOR_HandleDeviceControl( // Note: INQUIRYDATA structure is larger than INQUIRYDATABUFFERSIZE RtlZeroMemory(InquiryData, sizeof(INQUIRYDATA)); - RtlCopyMemory(InquiryData, PDODeviceExtension->InquiryData, INQUIRYDATABUFFERSIZE); + RtlCopyMemory(InquiryData, &PDODeviceExtension->InquiryData, sizeof(PDODeviceExtension->InquiryData)); InquiryData->Versions = 0x04; InquiryData->ResponseDataFormat = 0x02; // some devices set this to 1 diff --git a/drivers/usb/usbstor/error.c b/drivers/usb/usbstor/error.c index 3964b2c7b4d..1c773ab6709 100644 --- a/drivers/usb/usbstor/error.c +++ b/drivers/usb/usbstor/error.c @@ -77,15 +77,15 @@ USBSTOR_ResetPipeWorkItemRoutine( IN PVOID Ctx) { NTSTATUS Status; - PIRP_CONTEXT Context = (PIRP_CONTEXT)Ctx; - PFDO_DEVICE_EXTENSION FDODeviceExtension = (PFDO_DEVICE_EXTENSION)FdoDevice->DeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension = (PFDO_DEVICE_EXTENSION)Ctx; + PIRP_CONTEXT Context = &FDODeviceExtension->CurrentIrpContext; // clear stall on the corresponding pipe Status = USBSTOR_ResetPipeWithHandle(FDODeviceExtension->LowerDeviceObject, Context->Urb.UrbBulkOrInterruptTransfer.PipeHandle); DPRINT1("USBSTOR_ResetPipeWithHandle Status %x\n", Status); // now resend the csw as the stall got cleared - USBSTOR_SendCSWRequest(Context, Context->Irp); + USBSTOR_SendCSWRequest(FDODeviceExtension, Context->Irp); } VOID @@ -133,15 +133,14 @@ USBSTOR_ResetDeviceWorkItemRoutine( VOID NTAPI USBSTOR_QueueResetPipe( - IN PFDO_DEVICE_EXTENSION FDODeviceExtension, - IN PIRP_CONTEXT Context) + IN PFDO_DEVICE_EXTENSION FDODeviceExtension) { DPRINT("USBSTOR_QueueResetPipe\n"); IoQueueWorkItem(FDODeviceExtension->ResetDeviceWorkItem, USBSTOR_ResetPipeWorkItemRoutine, CriticalWorkQueue, - Context); + FDODeviceExtension); } VOID diff --git a/drivers/usb/usbstor/pdo.c b/drivers/usb/usbstor/pdo.c index 50996e396c6..e89eb45d382 100644 --- a/drivers/usb/usbstor/pdo.c +++ b/drivers/usb/usbstor/pdo.c @@ -137,8 +137,7 @@ USBSTOR_PdoHandleQueryDeviceText( IoStack = IoGetCurrentIrpStackLocation(Irp); DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(DeviceExtension->InquiryData); - InquiryData = DeviceExtension->InquiryData; + InquiryData = (PINQUIRYDATA)&DeviceExtension->InquiryData; switch (IoStack->Parameters.QueryDeviceText.DeviceTextType) { @@ -191,8 +190,7 @@ USBSTOR_PdoHandleQueryDeviceId( UNICODE_STRING DeviceId; DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(DeviceExtension->InquiryData); - InquiryData = DeviceExtension->InquiryData; + InquiryData = (PINQUIRYDATA)&DeviceExtension->InquiryData; DeviceType = USBSTOR_GetDeviceType(InquiryData); @@ -282,7 +280,7 @@ USBSTOR_PdoHandleQueryHardwareId( PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->DeviceDescriptor); - InquiryData = PDODeviceExtension->InquiryData; + InquiryData = (PINQUIRYDATA)&PDODeviceExtension->InquiryData; DeviceType = USBSTOR_GetDeviceType(InquiryData); GenericType = USBSTOR_GetGenericType(InquiryData); @@ -404,7 +402,7 @@ USBSTOR_PdoHandleQueryCompatibleId( PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->DeviceDescriptor); - DeviceType = USBSTOR_GetDeviceType(PDODeviceExtension->InquiryData); + DeviceType = USBSTOR_GetDeviceType((PINQUIRYDATA)&PDODeviceExtension->InquiryData); // format instance id Length = sprintf(Buffer, "USBSTOR\\%s", DeviceType) + 1; @@ -573,10 +571,6 @@ USBSTOR_PdoHandlePnp( bDelete = FALSE; } - // clean up the device extension - ASSERT(DeviceExtension->InquiryData); - ExFreePoolWithTag(DeviceExtension->InquiryData, USB_STOR_TAG); - Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -804,19 +798,10 @@ USBSTOR_FillInquiryData( IN PDEVICE_OBJECT PDODeviceObject) { NTSTATUS Status = STATUS_INSUFFICIENT_RESOURCES; - PPDO_DEVICE_EXTENSION PDODeviceExtension; + PPDO_DEVICE_EXTENSION PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; CDB Cdb; ULONG DataTransferLength = INQUIRYDATABUFFERSIZE; - PINQUIRYDATA InquiryData; - - PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; - InquiryData = ExAllocatePoolWithTag(NonPagedPool, INQUIRYDATABUFFERSIZE, USB_STOR_TAG); - - if (!InquiryData) - { - DPRINT1("USBSTOR_FillInquiryData failed with %x\n", Status); - return Status; - } + PINQUIRYDATA InquiryData = (PINQUIRYDATA)&PDODeviceExtension->InquiryData; RtlZeroMemory(&Cdb, sizeof(Cdb)); Cdb.CDB6INQUIRY.OperationCode = SCSIOP_INQUIRY; @@ -827,7 +812,6 @@ USBSTOR_FillInquiryData( if (!NT_SUCCESS(Status)) { DPRINT1("USBSTOR_FillInquiryData failed with %x\n", Status); - ExFreePoolWithTag(InquiryData, USB_STOR_TAG); return Status; } @@ -846,7 +830,6 @@ USBSTOR_FillInquiryData( DPRINT("Revision %c%c%c%c\n", InquiryData->ProductRevisionLevel[0], InquiryData->ProductRevisionLevel[1], InquiryData->ProductRevisionLevel[2], InquiryData->ProductRevisionLevel[3]); - PDODeviceExtension->InquiryData = InquiryData; return Status; } @@ -859,6 +842,7 @@ USBSTOR_CreatePDO( NTSTATUS Status; PPDO_DEVICE_EXTENSION PDODeviceExtension; PFDO_DEVICE_EXTENSION FDODeviceExtension; + PINQUIRYDATA InquiryData; FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -874,6 +858,7 @@ USBSTOR_CreatePDO( PDO->StackSize = DeviceObject->StackSize; PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDO->DeviceExtension; + InquiryData = (PINQUIRYDATA)&PDODeviceExtension->InquiryData; // initialize device extension RtlZeroMemory(PDODeviceExtension, sizeof(PDO_DEVICE_EXTENSION)); @@ -899,8 +884,8 @@ USBSTOR_CreatePDO( return Status; } - if (PDODeviceExtension->InquiryData->DeviceType != DIRECT_ACCESS_DEVICE && - PDODeviceExtension->InquiryData->DeviceType != READ_ONLY_DIRECT_ACCESS_DEVICE) + if (InquiryData->DeviceType != DIRECT_ACCESS_DEVICE && + InquiryData->DeviceType != READ_ONLY_DIRECT_ACCESS_DEVICE) { return STATUS_NOT_SUPPORTED; } diff --git a/drivers/usb/usbstor/scsi.c b/drivers/usb/usbstor/scsi.c index 946065649dd..d32aa0941cd 100644 --- a/drivers/usb/usbstor/scsi.c +++ b/drivers/usb/usbstor/scsi.c @@ -65,10 +65,10 @@ USBSTOR_IssueBulkOrInterruptRequest( IN ULONG TransferBufferLength, IN PVOID TransferBuffer, IN PMDL TransferBufferMDL, - IN PIO_COMPLETION_ROUTINE CompletionRoutine, - IN PIRP_CONTEXT Context) + IN PIO_COMPLETION_ROUTINE CompletionRoutine) { PIO_STACK_LOCATION NextStack; + PIRP_CONTEXT Context = &FDODeviceExtension->CurrentIrpContext; RtlZeroMemory(&Context->Urb, sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER)); @@ -88,7 +88,7 @@ USBSTOR_IssueBulkOrInterruptRequest( IoSetCompletionRoutine(Irp, CompletionRoutine, - Context, + FDODeviceExtension, TRUE, TRUE, TRUE); @@ -107,9 +107,9 @@ USBSTOR_IsCSWValid( return FALSE; } - if (Context->csw.Tag != PtrToUlong(&Context->csw)) + if (Context->csw.Tag != PtrToUlong(Context->Irp)) { - DPRINT1("[USBSTOR] Expected Tag %Ix but got %x\n", PtrToUlong(&Context->csw), Context->csw.Tag); + DPRINT1("[USBSTOR] Expected Tag %Ix but got %x\n", PtrToUlong(Context->Irp), Context->csw.Tag); return FALSE; } @@ -120,8 +120,7 @@ static NTSTATUS USBSTOR_IssueRequestSense( IN PFDO_DEVICE_EXTENSION FDODeviceExtension, - IN PIRP Irp, - IN PIRP_CONTEXT Context); + IN PIRP Irp); IO_COMPLETION_ROUTINE USBSTOR_CSWCompletionRoutine; @@ -138,13 +137,12 @@ USBSTOR_CSWCompletionRoutine( PFDO_DEVICE_EXTENSION FDODeviceExtension; PSCSI_REQUEST_BLOCK Request; - Context = (PIRP_CONTEXT)Ctx; - DPRINT("USBSTOR_CSWCompletionRoutine Irp %p Ctx %p Status %x\n", Irp, Ctx, Irp->IoStatus.Status); IoStack = IoGetCurrentIrpStackLocation(Irp); PDODeviceExtension = (PPDO_DEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; - FDODeviceExtension = Context->FDODeviceExtension; + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)Ctx; + Context = &FDODeviceExtension->CurrentIrpContext; Request = IoStack->Parameters.Scsi.Srb; ASSERT(Request); @@ -158,7 +156,7 @@ USBSTOR_CSWCompletionRoutine( ++Context->StallRetryCount; // clear stall and resend cbw - USBSTOR_QueueResetPipe(FDODeviceExtension, Context); + USBSTOR_QueueResetPipe(FDODeviceExtension); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -211,7 +209,7 @@ USBSTOR_CSWCompletionRoutine( Request->SenseInfoBufferLength && Request->SenseInfoBuffer) { - USBSTOR_IssueRequestSense(FDODeviceExtension, Irp, Context); + USBSTOR_IssueRequestSense(FDODeviceExtension, Irp); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -224,7 +222,6 @@ USBSTOR_CSWCompletionRoutine( USBSTOR_QueueTerminateRequest(PDODeviceExtension->LowerDeviceObject, Irp); USBSTOR_QueueNextRequest(PDODeviceExtension->LowerDeviceObject); - ExFreePoolWithTag(Context, USB_STOR_TAG); return STATUS_CONTINUE_COMPLETION; ResetRecovery: @@ -238,24 +235,22 @@ ResetRecovery: USBSTOR_QueueTerminateRequest(PDODeviceExtension->LowerDeviceObject, Irp); USBSTOR_QueueResetDevice(FDODeviceExtension); - ExFreePoolWithTag(Context, USB_STOR_TAG); return STATUS_CONTINUE_COMPLETION; } NTSTATUS USBSTOR_SendCSWRequest( - PIRP_CONTEXT Context, + PFDO_DEVICE_EXTENSION FDODeviceExtension, PIRP Irp) { - return USBSTOR_IssueBulkOrInterruptRequest(Context->FDODeviceExtension, + return USBSTOR_IssueBulkOrInterruptRequest(FDODeviceExtension, Irp, - Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle, + FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkInPipeIndex].PipeHandle, USBD_TRANSFER_DIRECTION_IN, sizeof(CSW), - &Context->csw, + &FDODeviceExtension->CurrentIrpContext.csw, NULL, - USBSTOR_CSWCompletionRoutine, - Context); + USBSTOR_CSWCompletionRoutine); } IO_COMPLETION_ROUTINE USBSTOR_DataCompletionRoutine; @@ -270,17 +265,19 @@ USBSTOR_DataCompletionRoutine( PIRP_CONTEXT Context; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; + PFDO_DEVICE_EXTENSION FDODeviceExtension; PPDO_DEVICE_EXTENSION PDODeviceExtension; DPRINT("USBSTOR_DataCompletionRoutine Irp %p Ctx %p Status %x\n", Irp, Ctx, Irp->IoStatus.Status); - Context = (PIRP_CONTEXT)Ctx; + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)Ctx; + Context = &FDODeviceExtension->CurrentIrpContext; IoStack = IoGetCurrentIrpStackLocation(Irp); Request = IoStack->Parameters.Scsi.Srb; PDODeviceExtension = (PPDO_DEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; // for Sense Request a partial MDL was already freed (if existed) - if (Request == Context->FDODeviceExtension->ActiveSrb && + if (Request == FDODeviceExtension->ActiveSrb && Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferMDL != Irp->MdlAddress) { IoFreeMdl(Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferMDL); @@ -298,7 +295,7 @@ USBSTOR_DataCompletionRoutine( } Request->DataTransferLength = Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferLength; - USBSTOR_SendCSWRequest(Context, Irp); + USBSTOR_SendCSWRequest(FDODeviceExtension, Irp); } else if (USBD_STATUS(Context->Urb.UrbHeader.Status) == USBD_STATUS(USBD_STATUS_STALL_PID)) { @@ -308,7 +305,7 @@ USBSTOR_DataCompletionRoutine( Request->DataTransferLength = Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferLength; // clear stall and resend cbw - USBSTOR_QueueResetPipe(Context->FDODeviceExtension, Context); + USBSTOR_QueueResetPipe(FDODeviceExtension); } else { @@ -317,9 +314,8 @@ USBSTOR_DataCompletionRoutine( Request->SrbStatus = SRB_STATUS_BUS_RESET; USBSTOR_QueueTerminateRequest(PDODeviceExtension->LowerDeviceObject, Irp); - USBSTOR_QueueResetDevice(Context->FDODeviceExtension); + USBSTOR_QueueResetDevice(FDODeviceExtension); - ExFreePoolWithTag(Context, USB_STOR_TAG); return STATUS_CONTINUE_COMPLETION; } @@ -339,6 +335,7 @@ USBSTOR_CBWCompletionRoutine( PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; USBD_PIPE_HANDLE PipeHandle; ULONG TransferFlags; PMDL Mdl = NULL; @@ -346,7 +343,8 @@ USBSTOR_CBWCompletionRoutine( DPRINT("USBSTOR_CBWCompletionRoutine Irp %p Ctx %p Status %x\n", Irp, Ctx, Irp->IoStatus.Status); - Context = (PIRP_CONTEXT)Ctx; + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)Ctx; + Context = &FDODeviceExtension->CurrentIrpContext; IoStack = IoGetCurrentIrpStackLocation(Irp); Request = IoStack->Parameters.Scsi.Srb; PDODeviceExtension = (PPDO_DEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; @@ -358,10 +356,10 @@ USBSTOR_CBWCompletionRoutine( // a request without the buffer AND not a sense request // for a sense request we provide just a TransferBuffer, an Mdl will be allocated by usbport (see below) - if (!Irp->MdlAddress && Request == Context->FDODeviceExtension->ActiveSrb) + if (!Irp->MdlAddress && Request == FDODeviceExtension->ActiveSrb) { Request->SrbStatus = SRB_STATUS_SUCCESS; - USBSTOR_SendCSWRequest(Context, Irp); + USBSTOR_SendCSWRequest(FDODeviceExtension, Irp); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -369,12 +367,12 @@ USBSTOR_CBWCompletionRoutine( if ((Request->SrbFlags & SRB_FLAGS_UNSPECIFIED_DIRECTION) == SRB_FLAGS_DATA_IN) { - PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle; + PipeHandle = FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkInPipeIndex].PipeHandle; TransferFlags = USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK; } else if ((Request->SrbFlags & SRB_FLAGS_UNSPECIFIED_DIRECTION) == SRB_FLAGS_DATA_OUT) { - PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkOutPipeIndex].PipeHandle; + PipeHandle = FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkOutPipeIndex].PipeHandle; TransferFlags = USBD_TRANSFER_DIRECTION_OUT; } else @@ -385,7 +383,7 @@ USBSTOR_CBWCompletionRoutine( } // if it is not a Sense Request - if (Request == Context->FDODeviceExtension->ActiveSrb) + if (Request == FDODeviceExtension->ActiveSrb) { if (MmGetMdlVirtualAddress(Irp->MdlAddress) == Request->DataBuffer) { @@ -420,29 +418,27 @@ USBSTOR_CBWCompletionRoutine( TransferBuffer = Request->DataBuffer; } - USBSTOR_IssueBulkOrInterruptRequest(Context->FDODeviceExtension, + USBSTOR_IssueBulkOrInterruptRequest(FDODeviceExtension, Irp, PipeHandle, TransferFlags, Request->DataTransferLength, TransferBuffer, Mdl, - USBSTOR_DataCompletionRoutine, - Context); + USBSTOR_DataCompletionRoutine); return STATUS_MORE_PROCESSING_REQUIRED; ResetRecovery: - Request = Context->FDODeviceExtension->ActiveSrb; + Request = FDODeviceExtension->ActiveSrb; IoStack->Parameters.Scsi.Srb = Request; Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_IO_DEVICE_ERROR; Request->SrbStatus = SRB_STATUS_BUS_RESET; USBSTOR_QueueTerminateRequest(PDODeviceExtension->LowerDeviceObject, Irp); - USBSTOR_QueueResetDevice(Context->FDODeviceExtension); + USBSTOR_QueueResetDevice(FDODeviceExtension); - ExFreePoolWithTag(Context, USB_STOR_TAG); return STATUS_CONTINUE_COMPLETION; } @@ -461,12 +457,12 @@ static NTSTATUS USBSTOR_SendCBWRequest( IN PFDO_DEVICE_EXTENSION FDODeviceExtension, - IN PIRP Irp, - IN PIRP_CONTEXT Context) + IN PIRP Irp) { PPDO_DEVICE_EXTENSION PDODeviceExtension; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; + PIRP_CONTEXT Context = &FDODeviceExtension->CurrentIrpContext; RtlZeroMemory(&Context->cbw, sizeof(CBW)); RtlZeroMemory(&Context->Urb, sizeof(URB)); @@ -475,8 +471,9 @@ USBSTOR_SendCBWRequest( PDODeviceExtension = IoStack->DeviceObject->DeviceExtension; Request = IoStack->Parameters.Scsi.Srb; + // Make a CBW structure from SCSI request block Context->cbw.Signature = CBW_SIGNATURE; - Context->cbw.Tag = PtrToUlong(&Context->cbw); + Context->cbw.Tag = PtrToUlong(Irp); Context->cbw.DataTransferLength = Request->DataTransferLength; Context->cbw.Flags = ((UCHAR)Request->SrbFlags & SRB_FLAGS_UNSPECIFIED_DIRECTION) << 1; Context->cbw.LUN = PDODeviceExtension->LUN; @@ -489,7 +486,6 @@ USBSTOR_SendCBWRequest( // initialize rest of context Context->Irp = Irp; - Context->FDODeviceExtension = FDODeviceExtension; Context->StallRetryCount = 0; return USBSTOR_IssueBulkOrInterruptRequest( @@ -500,16 +496,14 @@ USBSTOR_SendCBWRequest( sizeof(CBW), &Context->cbw, NULL, - USBSTOR_CBWCompletionRoutine, - Context); + USBSTOR_CBWCompletionRoutine); } static NTSTATUS USBSTOR_IssueRequestSense( IN PFDO_DEVICE_EXTENSION FDODeviceExtension, - IN PIRP Irp, - IN PIRP_CONTEXT Context) + IN PIRP Irp) { PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK CurrentSrb; @@ -518,7 +512,7 @@ USBSTOR_IssueRequestSense( DPRINT("USBSTOR_IssueRequestSense: \n"); CurrentSrb = FDODeviceExtension->ActiveSrb; - SenseSrb = &Context->SenseSrb; + SenseSrb = &FDODeviceExtension->CurrentIrpContext.SenseSrb; IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack->Parameters.Scsi.Srb = SenseSrb; @@ -541,7 +535,7 @@ USBSTOR_IssueRequestSense( SrbGetCdb(SenseSrb)->CDB6GENERIC.OperationCode = SCSIOP_REQUEST_SENSE; SrbGetCdb(SenseSrb)->AsByte[4] = CurrentSrb->SenseInfoBufferLength; - return USBSTOR_SendCBWRequest(FDODeviceExtension, Irp, Context); + return USBSTOR_SendCBWRequest(FDODeviceExtension, Irp); } NTSTATUS @@ -549,13 +543,10 @@ USBSTOR_HandleExecuteSCSI( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - NTSTATUS Status; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; - PPDO_DEVICE_EXTENSION PDODeviceExtension; - PIRP_CONTEXT Context; + PPDO_DEVICE_EXTENSION PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -564,17 +555,7 @@ USBSTOR_HandleExecuteSCSI( DPRINT("USBSTOR_HandleExecuteSCSI Operation Code %x, Length %lu\n", SrbGetCdb(Request)->CDB10.OperationCode, Request->DataTransferLength); // check that we're sending to the right LUN - ASSERT(SrbGetCdb(Request)->CDB10.LogicalUnitNumber == (PDODeviceExtension->LUN & MAX_LUN)); - Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(IRP_CONTEXT), USB_STOR_TAG); - - if (!Context) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - } - else - { - Status = USBSTOR_SendCBWRequest(PDODeviceExtension->LowerDeviceObject->DeviceExtension, Irp, Context); - } + ASSERT(SrbGetCdb(Request)->CDB10.LogicalUnitNumber == PDODeviceExtension->LUN); - return Status; + return USBSTOR_SendCBWRequest(PDODeviceExtension->LowerDeviceObject->DeviceExtension, Irp); } diff --git a/drivers/usb/usbstor/usbstor.h b/drivers/usb/usbstor/usbstor.h index 9e8b50e5701..71e90708311 100644 --- a/drivers/usb/usbstor/usbstor.h +++ b/drivers/usb/usbstor/usbstor.h @@ -61,6 +61,52 @@ #define MAX_LUN 0xF #define USBSTOR_DEFAULT_MAX_TRANSFER_LENGTH 0x10000 +#define CBW_SIGNATURE 0x43425355 +#define CSW_SIGNATURE 0x53425355 + +#include <pshpack1.h> + +typedef struct +{ + ULONG Signature; // CBW signature + ULONG Tag; // CBW Tag of operation + ULONG DataTransferLength; // data transfer length + UCHAR Flags; // CBW Flags endpoint direction + UCHAR LUN; // lun unit + UCHAR CommandBlockLength; // Command block length + UCHAR CommandBlock[16]; +} CBW, *PCBW; + +C_ASSERT(sizeof(CBW) == 31); + +#define CSW_STATUS_COMMAND_PASSED 0x00 +#define CSW_STATUS_COMMAND_FAILED 0x01 +#define CSW_STATUS_PHASE_ERROR 0x02 + +typedef struct +{ + ULONG Signature; // CSW signature + ULONG Tag; // CSW tag + ULONG DataResidue; // CSW data transfer diff + UCHAR Status; // CSW status +} CSW, *PCSW; + +#include <poppack.h> + +typedef struct +{ + PIRP Irp; + ULONG ErrorIndex; + ULONG StallRetryCount; // the number of retries after receiving USBD_STATUS_STALL_PID status + union + { + CBW cbw; + CSW csw; + }; + URB Urb; + SCSI_REQUEST_BLOCK SenseSrb; +} IRP_CONTEXT, *PIRP_CONTEXT; + typedef struct __COMMON_DEVICE_EXTENSION__ { BOOLEAN IsFDO; @@ -99,6 +145,7 @@ typedef struct KSPIN_LOCK CommonLock; PIO_WORKITEM ResetDeviceWorkItem; ULONG Flags; + IRP_CONTEXT CurrentIrpContext; }FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; typedef struct @@ -108,57 +155,12 @@ typedef struct UCHAR LUN; // lun id BOOLEAN Claimed; // indicating if it has been claimed by upper driver PDEVICE_OBJECT LowerDeviceObject; // points to FDO - PINQUIRYDATA InquiryData; // USB SCSI inquiry data PDEVICE_OBJECT *PDODeviceObject; // entry in pdo list PDEVICE_OBJECT Self; // self + // the whole structure is not stored + UCHAR InquiryData[INQUIRYDATABUFFERSIZE]; // USB SCSI inquiry data }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; -#define CBW_SIGNATURE 0x43425355 -#define CSW_SIGNATURE 0x53425355 - -#include <pshpack1.h> -typedef struct -{ - ULONG Signature; // CBW signature - ULONG Tag; // CBW Tag of operation - ULONG DataTransferLength; // data transfer length - UCHAR Flags; // CBW Flags endpoint direction - UCHAR LUN; // lun unit - UCHAR CommandBlockLength; // Command block length - UCHAR CommandBlock[16]; -}CBW, *PCBW; - -C_ASSERT(sizeof(CBW) == 31); - -#define CSW_STATUS_COMMAND_PASSED 0x00 -#define CSW_STATUS_COMMAND_FAILED 0x01 -#define CSW_STATUS_PHASE_ERROR 0x02 - -typedef struct -{ - ULONG Signature; // CSW signature - ULONG Tag; // CSW tag - ULONG DataResidue; // CSW data transfer diff - UCHAR Status; // CSW status -}CSW, *PCSW; - -#include <poppack.h> - -typedef struct -{ - PIRP Irp; - PFDO_DEVICE_EXTENSION FDODeviceExtension; - ULONG ErrorIndex; - ULONG StallRetryCount; // the number of retries after receiving USBD_STATUS_STALL_PID status - union - { - CBW cbw; - CSW csw; - }; - URB Urb; - SCSI_REQUEST_BLOCK SenseSrb; -} IRP_CONTEXT, *PIRP_CONTEXT; - typedef struct _ERRORHANDLER_WORKITEM_DATA { PDEVICE_OBJECT DeviceObject; @@ -267,7 +269,7 @@ USBSTOR_HandleExecuteSCSI( NTSTATUS USBSTOR_SendCSWRequest( - PIRP_CONTEXT Context, + PFDO_DEVICE_EXTENSION FDODeviceExtension, PIRP Irp); @@ -351,8 +353,7 @@ USBSTOR_TimerRoutine( VOID NTAPI USBSTOR_QueueResetPipe( - IN PFDO_DEVICE_EXTENSION FDODeviceExtension, - IN PIRP_CONTEXT Context); + IN PFDO_DEVICE_EXTENSION FDODeviceExtension); VOID NTAPI

4 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2020