Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 56232: [NTOS]: Perform system space mappings under the SystemSpaceViewLockPointer guarded mutex. [NTOS]: Expand system space view buckets when they are running low. [NTOS]: Support SE...
by sir_richard＠svn.reactos.org 26 Mar '12

26 Mar '12

Author: sir_richard Date: Mon Mar 26 07:26:36 2012 New Revision: 56232 URL: http://svn.reactos.org/svn/reactos?rev=56232&view=rev Log: [NTOS]: Perform system space mappings under the SystemSpaceViewLockPointer guarded mutex. [NTOS]: Expand system space view buckets when they are running low. [NTOS]: Support SEC_BASED section creates and mappings, implement based VAD parsing. [NTOS]: Support section mappings at a fixed base address and check for conflicts. [NTOS]: Define 8 prioritized standyby lists and initialize them. Also define the modified page list. [NTOS]: Support mapping with SEC_COMMIT less than the entire size of the section. [NTOS]: Detect and assert if ARM3 sections are attempted to be unmapped, since this isn't supported yet. [NTOS]: Clean up some DPRINTs and clarify ARM3 ASSERTs vs. Windows ASSERTs. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Mar 26 07:26:36 2012 @@ -26,7 +26,7 @@ MI_SESSION_IMAGE_SIZE + \ MI_SESSION_WORKING_SET_SIZE) -#define MI_SYSTEM_VIEW_SIZE (16 * _1MB) +#define MI_SYSTEM_VIEW_SIZE (32 * _1MB) #define MI_HIGHEST_USER_ADDRESS (PVOID)0x7FFEFFFF #define MI_USER_PROBE_ADDRESS (PVOID)0x7FFF0000 @@ -526,6 +526,7 @@ extern MM_PAGED_POOL_INFO MmPagedPoolInfo; extern RTL_BITMAP MiPfnBitMap; extern KGUARDED_MUTEX MmPagedPoolMutex; +extern KGUARDED_MUTEX MmSectionCommitMutex; extern PVOID MmPagedPoolStart; extern PVOID MmPagedPoolEnd; extern PVOID MmNonPagedSystemStart; @@ -557,6 +558,7 @@ extern ULONG MmMaximumNonPagedPoolPercent; extern ULONG MmLargeStackSize; extern PMMCOLOR_TABLES MmFreePagesByColor[FreePageList + 1]; +extern MMPFNLIST MmStandbyPageListByPriority[8]; extern ULONG MmProductType; extern MM_SYSTEMSIZE MmSystemSize; extern PKEVENT MiLowMemoryEvent; @@ -600,6 +602,9 @@ extern PVOID MiSessionViewStart; // 0xBE000000 extern ULONG MmMaximumDeadKernelStacks; extern SLIST_HEADER MmDeadStackSListHead; +extern MM_AVL_TABLE MmSectionBasedRoot; +extern KGUARDED_MUTEX MmSectionBasedMutex; +extern PVOID MmHighSectionBase; BOOLEAN FORCEINLINE @@ -1264,6 +1269,12 @@ IN PMMPFN Entry ); +VOID +NTAPI +MiUnlinkPageFromList( + IN PMMPFN Pfn +); + PFN_NUMBER NTAPI MiAllocatePfn( @@ -1405,6 +1416,16 @@ NTSTATUS NTAPI +MiFindEmptyAddressRangeDownBasedTree( + IN SIZE_T Length, + IN ULONG_PTR BoundaryAddress, + IN ULONG_PTR Alignment, + IN PMM_AVL_TABLE Table, + OUT PULONG_PTR Base +); + +NTSTATUS +NTAPI MiFindEmptyAddressRangeInTree( IN SIZE_T Length, IN ULONG_PTR Alignment, @@ -1418,6 +1439,28 @@ MiInsertVad( IN PMMVAD Vad, IN PEPROCESS Process +); + +VOID +NTAPI +MiInsertBasedSection( + IN PSECTION Section +); + +NTSTATUS +NTAPI +MiUnmapViewOfSection( + IN PEPROCESS Process, + IN PVOID BaseAddress, + IN ULONG Flags +); + +NTSTATUS +NTAPI +MiRosUnmapViewOfSection( + IN PEPROCESS Process, + IN PVOID BaseAddress, + IN ULONG Flags ); VOID @@ -1520,10 +1563,24 @@ IN ULONG Protect ); +NTSTATUS +NTAPI +MiRosUnmapViewInSystemSpace( + IN PVOID MappedBase +); + POOL_TYPE NTAPI MmDeterminePoolType( IN PVOID PoolAddress +); + +VOID +NTAPI +MiMakePdeExistAndMakeValid( + IN PMMPTE PointerPde, + IN PEPROCESS TargetProcess, + IN KIRQL OldIrql ); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Mon Mar 26 07:26:36 2012 @@ -149,7 +149,7 @@ // The system view space, on the other hand, is where sections that are memory // mapped into "system space" end up. // -// By default, it is a 16MB region. +// By default, it is a 16MB region, but we hack it to be 32MB for ReactOS // PVOID MiSystemViewStart; SIZE_T MmSystemViewSize; @@ -1134,7 +1134,7 @@ /* See how many pages are in this run */ i = Entry->PageCount; BasePage = Entry->BasePage; - + /* Loop each page */ Pfn1 = MiGetPfnEntry(BasePage); while (i--) @@ -2062,12 +2062,27 @@ /* Initialize session space address layout */ MiInitializeSessionSpaceLayout(); + + /* Set the based section highest address */ + MmHighSectionBase = (PVOID)((ULONG_PTR)MmHighestUserAddress - 0x800000); + + /* Loop all 8 standby lists */ + for (i = 0; i < 8; i++) + { + /* Initialize them */ + MmStandbyPageListByPriority[i].Total = 0; + MmStandbyPageListByPriority[i].ListName = StandbyPageList; + MmStandbyPageListByPriority[i].Flink = MM_EMPTY_LIST; + MmStandbyPageListByPriority[i].Blink = MM_EMPTY_LIST; + } /* Initialize the user mode image list */ InitializeListHead(&MmLoadedUserImageList); - /* Initialize the paged pool mutex */ + /* Initialize the paged pool mutex and the section commit mutex */ KeInitializeGuardedMutex(&MmPagedPoolMutex); + KeInitializeGuardedMutex(&MmSectionCommitMutex); + KeInitializeGuardedMutex(&MmSectionBasedMutex); /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Mon Mar 26 07:26:36 2012 @@ -35,10 +35,15 @@ BOOLEAN MmMirroring; ULONG MmSystemPageColor; +ULONG MmTransitionSharedPages; +ULONG MmTotalPagesForPagingFile; + MMPFNLIST MmZeroedPageListHead = {0, ZeroedPageList, LIST_HEAD, LIST_HEAD}; MMPFNLIST MmFreePageListHead = {0, FreePageList, LIST_HEAD, LIST_HEAD}; MMPFNLIST MmStandbyPageListHead = {0, StandbyPageList, LIST_HEAD, LIST_HEAD}; +MMPFNLIST MmStandbyPageListByPriority[8]; MMPFNLIST MmModifiedPageListHead = {0, ModifiedPageList, LIST_HEAD, LIST_HEAD}; +MMPFNLIST MmModifiedPageListByColor[1] = {{0, ModifiedPageList, LIST_HEAD, LIST_HEAD}}; MMPFNLIST MmModifiedNoWritePageListHead = {0, ModifiedNoWritePageList, LIST_HEAD, LIST_HEAD}; MMPFNLIST MmBadPageListHead = {0, BadPageList, LIST_HEAD, LIST_HEAD}; MMPFNLIST MmRomPageListHead = {0, StandbyPageList, LIST_HEAD, LIST_HEAD}; Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Mar 26 07:26:36 2012 @@ -82,6 +82,10 @@ }; MMSESSION MmSession; +KGUARDED_MUTEX MmSectionCommitMutex; +MM_AVL_TABLE MmSectionBasedRoot; +KGUARDED_MUTEX MmSectionBasedMutex; +PVOID MmHighSectionBase; /* PRIVATE FUNCTIONS **********************************************************/ @@ -243,19 +247,87 @@ IN PCONTROL_AREA ControlArea) { PVOID Base; - ULONG Entry, Hash, i; + ULONG Entry, Hash, i, HashSize; + PMMVIEW OldTable; PAGED_CODE(); /* Only global mappings supported for now */ ASSERT(Session == &MmSession); - /* Stay within 4GB and don't go past the number of hash entries available */ + /* Stay within 4GB */ ASSERT(Buckets < MI_SYSTEM_VIEW_BUCKET_SIZE); - ASSERT(Session->SystemSpaceHashEntries < Session->SystemSpaceHashSize); + + /* Lock system space */ + KeAcquireGuardedMutex(Session->SystemSpaceViewLockPointer); + + /* Check if we're going to exhaust hash entries */ + if ((Session->SystemSpaceHashEntries + 8) > Session->SystemSpaceHashSize) + { + /* Double the hash size */ + HashSize = Session->SystemSpaceHashSize * 2; + + /* Save the old table and allocate a new one */ + OldTable = Session->SystemSpaceViewTable; + Session->SystemSpaceViewTable = ExAllocatePoolWithTag(NonPagedPool, + HashSize * + sizeof(MMVIEW), + ' mM'); + if (!Session->SystemSpaceViewTable) + { + /* Failed to allocate a new table, keep the old one for now */ + Session->SystemSpaceViewTable = OldTable; + } + else + { + /* Clear the new table and set the new ahsh and key */ + RtlZeroMemory(Session->SystemSpaceViewTable, HashSize * sizeof(MMVIEW)); + Session->SystemSpaceHashSize = HashSize; + Session->SystemSpaceHashKey = Session->SystemSpaceHashSize - 1; + + /* Loop the old table */ + for (i = 0; i < Session->SystemSpaceHashSize / 2; i++) + { + /* Check if the entry was valid */ + if (OldTable[i].Entry) + { + /* Re-hash the old entry and search for space in the new table */ + Hash = (OldTable[i].Entry >> 16) % Session->SystemSpaceHashKey; + while (Session->SystemSpaceViewTable[Hash].Entry) + { + /* Loop back at the beginning if we had an overflow */ + if (++Hash >= Session->SystemSpaceHashSize) Hash = 0; + } + + /* Write the old entry in the new table */ + Session->SystemSpaceViewTable[Hash] = OldTable[i]; + } + } + + /* Free the old table */ + ExFreePool(OldTable); + } + } + + /* Check if we ran out */ + if (Session->SystemSpaceHashEntries == Session->SystemSpaceHashSize) + { + DPRINT1("Ran out of system view hash entries\n"); + KeReleaseGuardedMutex(Session->SystemSpaceViewLockPointer); + return NULL; + } /* Find space where to map this view */ i = RtlFindClearBitsAndSet(Session->SystemSpaceBitMap, Buckets, 0); - ASSERT(i != 0xFFFFFFFF); + if (i == 0xFFFFFFFF) + { + /* Out of space, fail */ + Session->BitmapFailures++; + DPRINT1("Out of system view space\n"); + KeReleaseGuardedMutex(Session->SystemSpaceViewLockPointer); + return NULL; + } + + /* Compute the base address */ Base = (PVOID)((ULONG_PTR)Session->SystemSpaceViewStart + (i * MI_SYSTEM_VIEW_BUCKET_SIZE)); /* Get the hash entry for this allocation */ @@ -275,6 +347,7 @@ /* Hash entry found, increment total and return the base address */ Session->SystemSpaceHashEntries++; + KeReleaseGuardedMutex(Session->SystemSpaceViewLockPointer); return Base; } @@ -701,30 +774,25 @@ PSEGMENT Segment; PFN_NUMBER PteOffset; NTSTATUS Status; - - /* Get the segment and subection for this section */ + ULONG QuotaCharge = 0, QuotaExcess = 0; + PMMPTE PointerPte, LastPte; + MMPTE TempPte; + + /* Get the segment for this section */ Segment = ControlArea->Segment; - Subsection = (PSUBSECTION)(ControlArea + 1); - - /* Non-pagefile-backed sections not supported */ - ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); - ASSERT(ControlArea->u.Flags.Rom == 0); - ASSERT(ControlArea->FilePointer == NULL); - ASSERT(Segment->SegmentFlags.TotalNumberOfPtes4132 == 0); - - /* Based sections not supported */ - ASSERT(Section->Address.StartingVpn == 0); - - /* These flags/parameters are not supported */ + + /* One can only reserve a file-based mapping, not shared memory! */ + if ((AllocationType & MEM_RESERVE) && !(ControlArea->FilePointer)) + { + return STATUS_INVALID_PARAMETER_9; + } + + /* This flag determines alignment, but ARM3 does not yet support it */ ASSERT((AllocationType & MEM_DOS_LIM) == 0); - ASSERT((AllocationType & MEM_RESERVE) == 0); - ASSERT(Process->VmTopDown == 0); - ASSERT(Section->u.Flags.CopyOnWrite == FALSE); - ASSERT(ZeroBits == 0); /* First, increase the map count. No purging is supported yet */ Status = MiCheckPurgeAndUpMapCount(ControlArea, FALSE); - ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) return Status; /* Check if the caller specified the view size */ if (!(*ViewSize)) @@ -742,29 +810,57 @@ SectionOffset->LowPart &= ~((ULONG)_64K - 1); } - /* We must be dealing with a 64KB aligned offset */ + /* We must be dealing with a 64KB aligned offset. This is a Windows ASSERT */ ASSERT((SectionOffset->LowPart & ((ULONG)_64K - 1)) == 0); /* It's illegal to try to map more than 2GB */ + /* FIXME: Should dereference the control area */ if (*ViewSize >= 0x80000000) return STATUS_INVALID_VIEW_SIZE; + + /* Windows ASSERTs for this flag */ + ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); + + /* Get the subsection. We don't support LARGE_CONTROL_AREA in ARM3 */ + ASSERT(ControlArea->u.Flags.Rom == 0); + Subsection = (PSUBSECTION)(ControlArea + 1); + + /* Sections with extended segments are not supported in ARM3 */ + ASSERT(Segment->SegmentFlags.TotalNumberOfPtes4132 == 0); /* Within this section, figure out which PTEs will describe the view */ PteOffset = (PFN_NUMBER)(SectionOffset->QuadPart >> PAGE_SHIFT); - /* The offset must be in this segment's PTE chunk and it must be valid */ + /* The offset must be in this segment's PTE chunk and it must be valid. Windows ASSERTs */ ASSERT(PteOffset < Segment->TotalNumberOfPtes); ASSERT(((SectionOffset->QuadPart + *ViewSize + PAGE_SIZE - 1) >> PAGE_SHIFT) >= PteOffset); /* In ARM3, only one subsection is used for now. It must contain these PTEs */ ASSERT(PteOffset < Subsection->PtesInSubsection); + + /* In ARM3, only page-file backed sections (shared memory) are supported now */ + ASSERT(ControlArea->FilePointer == NULL); + + /* Windows ASSERTs for this too -- there must be a subsection base address */ ASSERT(Subsection->SubsectionBase != NULL); - /* In ARM3, only MEM_COMMIT is supported for now. The PTEs must've been committed */ - ASSERT(Segment->NumberOfCommittedPages >= Segment->TotalNumberOfPtes); + /* Compute how much commit space the segment will take */ + if ((CommitSize) && (Segment->NumberOfCommittedPages < Segment->TotalNumberOfPtes)) + { + PointerPte = &Subsection->SubsectionBase[PteOffset]; + LastPte = PointerPte + BYTES_TO_PAGES(CommitSize); + QuotaCharge = LastPte - PointerPte; + } + + /* ARM3 does not currently support large pages */ + ASSERT(Segment->SegmentFlags.LargePages == 0); /* Did the caller specify an address? */ - if (!(*BaseAddress)) - { + if (!(*BaseAddress) && !(Section->Address.StartingVpn)) + { + /* ARM3 does not support these flags yet */ + ASSERT(Process->VmTopDown == 0); + ASSERT(ZeroBits == 0); + /* Which way should we search? */ if (AllocationType & MEM_TOP_DOWN) { @@ -787,21 +883,43 @@ &StartAddress); ASSERT(NT_SUCCESS(Status)); } + + /* Get the ending address, which is the last piece we need for the VAD */ + EndingAddress = (StartAddress + *ViewSize - 1) | (PAGE_SIZE - 1); } else { - /* This (rather easy) code path is not yet implemented */ - UNIMPLEMENTED; - while (TRUE); - } - - /* Get the ending address, which is the last piece we need for the VAD */ - EndingAddress = (StartAddress + *ViewSize - 1) | (PAGE_SIZE - 1); + /* Is it SEC_BASED, or did the caller manually specify an address? */ + if (!(*BaseAddress)) + { + /* It is a SEC_BASED mapping, use the address that was generated */ + StartAddress = Section->Address.StartingVpn + SectionOffset->LowPart; + DPRINT("BASED: 0x%p\n", StartAddress); + } + else + { + /* Just align what the caller gave us */ + StartAddress = ROUND_UP((ULONG_PTR)*BaseAddress, _64K); + } + + /* Get the ending address, which is the last piece we need for the VAD */ + EndingAddress = (StartAddress + *ViewSize - 1) | (PAGE_SIZE - 1); + + /* Make sure it doesn't conflict with an existing allocation */ + if (MiCheckForConflictingNode(StartAddress >> PAGE_SHIFT, + EndingAddress >> PAGE_SHIFT, + &Process->VadRoot)) + { + DPRINT1("Conflict with SEC_BASED or manually based section!\n"); + return STATUS_CONFLICTING_ADDRESSES; // FIXME: CA Leak + } + } /* A VAD can now be allocated. Do so and zero it out */ /* FIXME: we are allocating a LONG VAD for ReactOS compatibility only */ + ASSERT((AllocationType & MEM_RESERVE) == 0); /* ARM3 does not support this */ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); - ASSERT(Vad); + if (!Vad) return STATUS_INSUFFICIENT_RESOURCES; /* FIXME: CA Leak */ RtlZeroMemory(Vad, sizeof(MMVAD_LONG)); Vad->u4.Banked = (PVOID)0xDEADBABE; @@ -822,10 +940,10 @@ /* Finally, write down the first and last prototype PTE */ Vad->FirstPrototypePte = &Subsection->SubsectionBase[PteOffset]; PteOffset += (Vad->EndingVpn - Vad->StartingVpn); + ASSERT(PteOffset < Subsection->PtesInSubsection); Vad->LastContiguousPte = &Subsection->SubsectionBase[PteOffset]; - /* Make sure the last PTE is valid and still within the subsection */ - ASSERT(PteOffset < Subsection->PtesInSubsection); + /* Make sure the prototype PTE ranges make sense, this is a Windows ASSERT */ ASSERT(Vad->FirstPrototypePte <= Vad->LastContiguousPte); /* FIXME: Should setup VAD bitmap */ @@ -842,11 +960,49 @@ /* Windows stores this for accounting purposes, do so as well */ if (!Segment->u2.FirstMappedVa) Segment->u2.FirstMappedVa = (PVOID)StartAddress; + + /* Check if anything was committed */ + if (QuotaCharge) + { + /* Set the start and end PTE addresses, and pick the template PTE */ + PointerPte = Vad->FirstPrototypePte; + LastPte = PointerPte + BYTES_TO_PAGES(CommitSize); + TempPte = Segment->SegmentPteTemplate; + + /* Acquire the commit lock and loop all prototype PTEs to be committed */ + KeAcquireGuardedMutexUnsafe(&MmSectionCommitMutex); + while (PointerPte < LastPte) + { + /* Make sure the PTE is already invalid */ + if (PointerPte->u.Long == 0) + { + /* And write the invalid PTE */ + MI_WRITE_INVALID_PTE(PointerPte, TempPte); + } + else + { + /* The PTE is valid, so skip it */ + QuotaExcess++; + } + + /* Move to the next PTE */ + PointerPte++; + } + + /* Now check how many pages exactly we committed, and update accounting */ + ASSERT(QuotaCharge >= QuotaExcess); + QuotaCharge -= QuotaExcess; + Segment->NumberOfCommittedPages += QuotaCharge; + ASSERT(Segment->NumberOfCommittedPages <= Segment->TotalNumberOfPtes); + + /* Now that we're done, release the lock */ + KeReleaseGuardedMutexUnsafe(&MmSectionCommitMutex); + } /* Finally, let the caller know where, and for what size, the view was mapped */ *ViewSize = (ULONG_PTR)EndingAddress - (ULONG_PTR)StartAddress + 1; *BaseAddress = (PVOID)StartAddress; - DPRINT1("Start and region: 0x%p, 0x%p\n", *BaseAddress, *ViewSize); + DPRINT("Start and region: 0x%p, 0x%p\n", *BaseAddress, *ViewSize); return STATUS_SUCCESS; } @@ -1226,7 +1382,6 @@ ASSERT(FileHandle == NULL); ASSERT(FileObject == NULL); ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); - ASSERT((AllocationAttributes & SEC_BASED) == 0); /* Make the same sanity checks that the Nt interface should've validated */ ASSERT((AllocationAttributes & ~(SEC_COMMIT | SEC_RESERVE | SEC_BASED | @@ -1258,10 +1413,10 @@ ProtectionMask, AllocationAttributes); ASSERT(NT_SUCCESS(Status)); + ASSERT(NewSegment != NULL); /* Set the initial section object data */ Section.InitialPageProtection = SectionPageProtection; - Section.Segment = NULL; Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; Section.Segment = NewSegment; @@ -1296,6 +1451,49 @@ /* Now copy the local section object from the stack into this new object */ RtlCopyMemory(NewSection, &Section, sizeof(SECTION)); NewSection->Address.StartingVpn = 0; + NewSection->u.Flags.UserReference = TRUE; + + /* Migrate the attribute into a flag */ + if (AllocationAttributes & SEC_NO_CHANGE) NewSection->u.Flags.NoChange = TRUE; + + /* If R/W access is not requested, this might eventually become a CoW mapping */ + if (!(SectionPageProtection & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE))) + { + NewSection->u.Flags.CopyOnWrite = TRUE; + } + + /* Is this a "based" allocation, in which all mappings are identical? */ + if (AllocationAttributes & SEC_BASED) + { + /* Convert the flag, and make sure the section isn't too big */ + NewSection->u.Flags.Based = TRUE; + if (NewSection->SizeOfSection.QuadPart > (ULONG_PTR)MmHighSectionBase) + { + DPRINT1("BASED section is too large\n"); + ObDereferenceObject(NewSection); + return STATUS_NO_MEMORY; + } + + /* Lock the VAD tree during the search */ + KeAcquireGuardedMutex(&MmSectionBasedMutex); + + /* Find an address top-down */ + Status = MiFindEmptyAddressRangeDownBasedTree(NewSection->SizeOfSection.LowPart, + (ULONG_PTR)MmHighSectionBase, + _64K, + &MmSectionBasedRoot, + &NewSection->Address.StartingVpn); + ASSERT(NT_SUCCESS(Status)); + + /* Compute the ending address and insert it into the VAD tree */ + NewSection->Address.EndingVpn = NewSection->Address.StartingVpn + + NewSection->SizeOfSection.LowPart - + 1; + MiInsertBasedSection(NewSection); + + /* Finally release the lock */ + KeReleaseGuardedMutex(&MmSectionBasedMutex); + } /* Return the object and the creation status */ *SectionObject = (PVOID)NewSection; @@ -1421,7 +1619,7 @@ if (!Process->VmDeleted) { /* Do the actual mapping */ - DPRINT1("Mapping ARM3 data section\n"); + DPRINT("Mapping ARM3 data section\n"); Status = MiMapViewOfDataSection(ControlArea, Process, BaseAddress, @@ -1494,6 +1692,30 @@ return STATUS_NOT_IMPLEMENTED; } +/* + * @implemented + */ +NTSTATUS +NTAPI +MmUnmapViewInSystemSpace(IN PVOID MappedBase) +{ + PMEMORY_AREA MemoryArea; + PAGED_CODE(); + + /* Was this mapped by RosMm? */ + MemoryArea = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), MappedBase); + if ((MemoryArea) && (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3)) + { + return MiRosUnmapViewInSystemSpace(MappedBase); + } + + /* It was not, call the ARM3 routine */ + ASSERT(FALSE); + return STATUS_SUCCESS; +// DPRINT("ARM3 unmapping\n"); +// return MiUnmapViewInSystemSpace(&MmSession, MappedBase); +} + /* SYSTEM CALLS ***************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Mon Mar 26 07:26:36 2012 @@ -163,6 +163,21 @@ VOID NTAPI +MiInsertBasedSection(IN PSECTION Section) +{ + TABLE_SEARCH_RESULT Result; + PMMADDRESS_NODE Parent = NULL; + ASSERT(Section->Address.EndingVpn >= Section->Address.StartingVpn); + + /* Find the parent VAD and where this child should be inserted */ + Result = RtlpFindAvlTableNodeOrParent(&MmSectionBasedRoot, (PVOID)Section->Address.StartingVpn, &Parent); + ASSERT(Result != TableFoundNode); + ASSERT((Parent != NULL) || (Result == TableEmptyTree)); + MiInsertNode(&MmSectionBasedRoot, &Section->Address, Parent, Result); +} + +VOID +NTAPI MiRemoveNode(IN PMMADDRESS_NODE Node, IN PMM_AVL_TABLE Table) { @@ -471,4 +486,101 @@ return TableFoundNode; } +NTSTATUS +NTAPI +MiFindEmptyAddressRangeDownBasedTree(IN SIZE_T Length, + IN ULONG_PTR BoundaryAddress, + IN ULONG_PTR Alignment, + IN PMM_AVL_TABLE Table, + OUT PULONG_PTR Base) +{ + PMMADDRESS_NODE Node, LowestNode; + ULONG_PTR LowVpn, BestVpn; + + /* Sanity checks */ + ASSERT(Table == &MmSectionBasedRoot); + ASSERT(BoundaryAddress); + ASSERT(BoundaryAddress <= ((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); + + /* Compute page length, make sure the boundary address is valid */ + Length = ROUND_TO_PAGES(Length); + if ((BoundaryAddress + 1) < Length) return STATUS_NO_MEMORY; + + /* Check if the table is empty */ + BestVpn = ROUND_UP(BoundaryAddress + 1 - Length, Alignment); + if (Table->NumberGenericTableElements == 0) + { + /* Tree is empty, the candidate address is already the best one */ + *Base = BestVpn; + return STATUS_SUCCESS; + } + + /* Go to the right-most node which should be the biggest address */ + Node = Table->BalancedRoot.RightChild; + while (RtlRightChildAvl(Node)) Node = RtlRightChildAvl(Node); + + /* Check if we can fit in here */ + LowVpn = ROUND_UP(Node->EndingVpn, Alignment); + if ((LowVpn < BoundaryAddress) && (Length < (BoundaryAddress - LowVpn))) + { + /* Return the address */ + *Base = ROUND_UP(BoundaryAddress - Length, Alignment); + return STATUS_SUCCESS; + } + + /* Now loop the Vad nodes */ + do + { + /* Break out if we've reached the last node */ + LowestNode = MiGetPreviousNode(Node); + if (!LowestNode) break; + + /* Check if this node could contain the requested address */ + LowVpn = ROUND_UP(LowestNode->EndingVpn + 1, Alignment); + if ((LowestNode->EndingVpn < BestVpn) && + (Length <= (Node->StartingVpn - LowVpn))) + { + /* Check if it fits in perfectly */ + if ((BestVpn > LowestNode->EndingVpn) && + (BoundaryAddress < Node->StartingVpn)) + { + /* Return the optimal VPN address */ + *Base = BestVpn; + return STATUS_SUCCESS; + } + + /* It doesn't, check if it can partly fit */ + if (Node->StartingVpn > LowVpn) + { + /* Return an aligned base address within this node */ + *Base = ROUND_UP(Node->StartingVpn - Length, Alignment); + return STATUS_SUCCESS; + } + } + + /* Move to the next node */ + Node = LowestNode; + } while (TRUE); + + /* Check if there's enough space before the lowest Vad */ + if ((Node->StartingVpn > (ULONG_PTR)MI_LOWEST_VAD_ADDRESS) && + ((Node->StartingVpn - (ULONG_PTR)MI_LOWEST_VAD_ADDRESS) > Length)) + { + /* Check if it fits in perfectly */ + if (BoundaryAddress < Node->StartingVpn) + { + /* Return the optimal VPN address */ + *Base = BestVpn; + return STATUS_SUCCESS; + } + + /* Return an aligned base address within this node */ + *Base = ROUND_UP(Node->StartingVpn - Length, Alignment); + return STATUS_SUCCESS; + } + + /* No address space left at all */ + return STATUS_NO_MEMORY; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Mar 26 07:26:36 2012 @@ -2855,6 +2855,10 @@ DPRINT("Creating Section Object Type\n"); + /* Initialize the section based root */ + ASSERT(MmSectionBasedRoot.NumberGenericTableElements == 0); + MmSectionBasedRoot.BalancedRoot.u1.Parent = &MmSectionBasedRoot.BalancedRoot; + /* Initialize the Section object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Section"); @@ -4231,6 +4235,7 @@ MemoryArea->Type != MEMORY_AREA_SECTION_VIEW || MemoryArea->DeleteInProgress) { + ASSERT(MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3); MmUnlockAddressSpace(AddressSpace); return STATUS_NOT_MAPPED_VIEW; } @@ -4538,7 +4543,7 @@ if (MiIsRosSectionObject(SectionObject) == FALSE) { - DPRINT1("Mapping ARM3 section into %s\n", Process->ImageFileName); + DPRINT("Mapping ARM3 section into %s\n", Process->ImageFileName); return MmMapViewOfArm3Section(SectionObject, Process, BaseAddress, @@ -4875,7 +4880,6 @@ if (MiIsRosSectionObject(SectionObject) == FALSE) { - DPRINT1("ARM3 System Mapping\n"); return MiMapViewInSystemSpace(SectionObject, &MmSession, MappedBase, @@ -4917,11 +4921,9 @@ return Status; } -/* - * @implemented - */ -NTSTATUS NTAPI -MmUnmapViewInSystemSpace (IN PVOID MappedBase) +NTSTATUS +NTAPI +MiRosUnmapViewInSystemSpace(IN PVOID MappedBase) { PMMSUPPORT AddressSpace; NTSTATUS Status; @@ -4938,7 +4940,6 @@ return Status; } - /********************************************************************** * NAME EXPORTED

1 0

[cgutman] 56231: [NTOSKRNL] - Implement proper use of alternate resource requirement lists - Implement the case to set DN_NO_SHOW_IN_DM - Implement reporting more problem codes: CM_PROB_NEED_RESTAR...
by cgutman＠svn.reactos.org 25 Mar '12

25 Mar '12

Author: cgutman Date: Sun Mar 25 23:28:23 2012 New Revision: 56231 URL: http://svn.reactos.org/svn/reactos?rev=56231&view=rev Log: [NTOSKRNL] - Implement proper use of alternate resource requirement lists - Implement the case to set DN_NO_SHOW_IN_DM - Implement reporting more problem codes: CM_PROB_NEED_RESTART, CM_PROB_FAILED_DRIVER_ENTRY, CM_PROB_FAILED_DRIVER_ENTRY, CM_PROB_DRIVER_FAILED_LOAD, CM_PROB_WILL_BE_REMOVED, CM_PROB_HELD_FOR_EJECT, CM_PROB_TRANSLATION_FAILED, and CM_PROB_NORMAL_CONFLICT Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sun Mar 25 23:28:23 2012 @@ -402,8 +402,8 @@ if (ServiceStart >= 4) { - /* FIXME: Check if it is the right status code */ - Status = STATUS_PLUGPLAY_NO_DEVICE; + /* We can't load this */ + Status = STATUS_DRIVER_UNABLE_TO_LOAD; } else { Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Sun Mar 25 23:28:23 2012 @@ -441,6 +441,9 @@ if (DeviceNode->Flags & DNF_LEGACY_DRIVER) Output |= DN_LEGACY_DRIVER; + if (DeviceNode->UserFlags & DNUF_DONT_SHOW_IN_UI) + Output |= DN_NO_SHOW_IN_DM; + /* FIXME: Implement the rest */ Output |= DN_NT_ENUMERATOR | DN_NT_DRIVER; @@ -611,6 +614,7 @@ { /* A driver has already been loaded for this device */ DPRINT1("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceNode->InstancePath); + DeviceNode->Problem = CM_PROB_NEED_RESTART; } } else Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Mar 25 23:28:23 2012 @@ -2624,11 +2624,18 @@ /* Initialize the driver */ Status = IopInitializeDriverModule(DeviceNode, ModuleObject, &DeviceNode->ServiceName, FALSE, &DriverObject); + if (!NT_SUCCESS(Status)) DeviceNode->Problem = CM_PROB_FAILED_DRIVER_ENTRY; + } + else if (Status == STATUS_DRIVER_UNABLE_TO_LOAD) + { + DPRINT1("Service '%wZ' is disabled\n", &DeviceNode->ServiceName); + DeviceNode->Problem = CM_PROB_DISABLED_SERVICE; } else { DPRINT("IopLoadServiceModule(%wZ) failed with status 0x%08x\n", &DeviceNode->ServiceName, Status); + if (!BootDrivers) DeviceNode->Problem = CM_PROB_DRIVER_FAILED_LOAD; } } @@ -2649,12 +2656,6 @@ if (!BootDrivers) { IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - IopDeviceNodeSetFlag(DeviceNode, DNF_START_FAILED); - DeviceNode->Problem = CM_PROB_FAILED_START; - - /* FIXME: Log the error (possibly in IopInitializeDeviceNodeService) */ - DPRINT1("Initialization of service %S failed (Status %x)\n", - DeviceNode->ServiceName.Buffer, Status); } } } @@ -4504,7 +4505,7 @@ } Stack.Parameters.QueryDeviceRelations.Type = RemovalRelations; - + Status = IopInitiatePnpIrp(DeviceObject, &IoStatusBlock, IRP_MN_QUERY_DEVICE_RELATIONS, @@ -4518,7 +4519,7 @@ { DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; } - + if (DeviceRelations) { Status = IopQueryRemoveDeviceRelations(DeviceRelations, Force); @@ -4535,6 +4536,7 @@ } DeviceNode->Flags |= DNF_WILL_BE_REMOVED; + DeviceNode->Problem = CM_PROB_WILL_BE_REMOVED; if (DeviceRelations) IopSendRemoveDeviceRelations(DeviceRelations); IopSendRemoveChildDevices(DeviceNode); @@ -4625,7 +4627,8 @@ if (DeviceRelations) IopSendRemoveDeviceRelations(DeviceRelations); IopSendRemoveChildDevices(DeviceNode); - + + DeviceNode->Problem = CM_PROB_HELD_FOR_EJECT; if (Capabilities.EjectSupported) { if (IopSendEject(PhysicalDeviceObject) != STATUS_SUCCESS) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sun Mar 25 23:28:23 2012 @@ -202,12 +202,48 @@ IN PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList, OUT PCM_RESOURCE_LIST *ResourceList) { - ULONG i; + ULONG i, OldCount; + BOOLEAN AlternateRequired = FALSE; + + /* Save the initial resource count when we got here so we can restore if an alternate fails */ + if (*ResourceList != NULL) + OldCount = (*ResourceList)->List[0].PartialResourceList.Count; + else + OldCount = 0; + for (i = 0; i < RequirementsList->AlternativeLists; i++) { ULONG ii; PIO_RESOURCE_LIST ResList = &RequirementsList->List[i]; - BOOLEAN AlternateRequired = FALSE; + + /* We need to get back to where we were before processing the last alternative list */ + if (OldCount == 0 && *ResourceList != NULL) + { + /* Just free it and kill the pointer */ + ExFreePool(*ResourceList); + *ResourceList = NULL; + } + else if (OldCount != 0) + { + PCM_RESOURCE_LIST NewList; + + /* Let's resize it */ + (*ResourceList)->List[0].PartialResourceList.Count = OldCount; + + /* Allocate the new smaller list */ + NewList = ExAllocatePool(PagedPool, PnpDetermineResourceListSize(*ResourceList)); + if (!NewList) + return STATUS_NO_MEMORY; + + /* Copy the old stuff back */ + RtlCopyMemory(NewList, *ResourceList, PnpDetermineResourceListSize(*ResourceList)); + + /* Free the old one */ + ExFreePool(*ResourceList); + + /* Store the pointer to the new one */ + *ResourceList = NewList; + } for (ii = 0; ii < ResList->Count; ii++) { @@ -226,14 +262,10 @@ /* Check if we couldn't satsify a requirement or its alternates */ if (AlternateRequired && !(IoDesc->Option & IO_RESOURCE_ALTERNATIVE)) { - DPRINT1("Unable to satisfy preferred resource or alternates\n"); - - if (*ResourceList) - { - ExFreePool(*ResourceList); - *ResourceList = NULL; - } - return STATUS_CONFLICTING_ADDRESSES; + DPRINT1("Unable to satisfy preferred resource or alternates in list %d\n", i); + + /* Break out of this loop and try the next list */ + break; } for (iii = 0; PartialList && iii < PartialList->Count && !Matched; iii++) @@ -411,12 +443,9 @@ /* Check if it's missing and required */ if (!FoundResource && IoDesc->Option == 0) { - if (*ResourceList) - { - ExFreePool(*ResourceList); - *ResourceList = NULL; - } - return STATUS_CONFLICTING_ADDRESSES; + /* Break out of this loop and try the next list */ + DPRINT1("Unable to satisfy required resource in list %d\n", i); + break; } else if (!FoundResource) { @@ -476,10 +505,32 @@ *ResourceList = NewList; } } + + /* Check if we need an alternate with no resources left */ + if (AlternateRequired) + { + DPRINT1("Unable to satisfy preferred resource or alternates in list %d\n", i); + + /* Try the next alternate list */ + continue; + } + + /* We're done because we satisfied one of the alternate lists */ + return STATUS_SUCCESS; } - /* Done */ - return STATUS_SUCCESS; + /* We ran out of alternates */ + DPRINT1("Out of alternate lists!\n"); + + /* Free the list */ + if (*ResourceList) + { + ExFreePool(*ResourceList); + *ResourceList = NULL; + } + + /* Fail */ + return STATUS_CONFLICTING_ADDRESSES; } static @@ -717,28 +768,28 @@ OBJECT_ATTRIBUTES ObjectAttributes; RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP"); + L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP"); InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE | OBJ_OPENIF, - 0, - NULL); + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + 0, + NULL); Status = ZwCreateKey(&ResourceMapKey, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE, - &Disposition); + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + &Disposition); if (!NT_SUCCESS(Status)) return Status; RtlInitUnicodeString(&KeyName, Level1Key); InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE | OBJ_OPENIF, - ResourceMapKey, - NULL); + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + ResourceMapKey, + NULL); Status = ZwCreateKey(&PnpMgrLevel1, KEY_ALL_ACCESS, &ObjectAttributes, @@ -752,10 +803,10 @@ RtlInitUnicodeString(&KeyName, Level2Key); InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE | OBJ_OPENIF, - PnpMgrLevel1, - NULL); + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + PnpMgrLevel1, + NULL); Status = ZwCreateKey(&PnpMgrLevel2, KEY_ALL_ACCESS, &ObjectAttributes, @@ -1069,6 +1120,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to fixup a resource list from supplied resources for %wZ\n", &DeviceNode->InstancePath); + DeviceNode->Problem = CM_PROB_NORMAL_CONFLICT; goto ByeBye; } @@ -1079,6 +1131,7 @@ Status = IopTranslateDeviceResources(DeviceNode); if (!NT_SUCCESS(Status)) { + DeviceNode->Problem = CM_PROB_TRANSLATION_FAILED; DPRINT1("Failed to translate resources for %wZ\n", &DeviceNode->InstancePath); goto ByeBye; }

1 0

[tfaber] 56230: [NTDLL_WINETEST] - Fix running RtlGetFullPathName_UstrEx test from drive root - Add a test for RtlGetFullPathName_U based on the same test cases
by tfaber＠svn.reactos.org 25 Mar '12

25 Mar '12

Author: tfaber Date: Sun Mar 25 21:24:05 2012 New Revision: 56230 URL: http://svn.reactos.org/svn/reactos?rev=56230&view=rev Log: [NTDLL_WINETEST] - Fix running RtlGetFullPathName_UstrEx test from drive root - Add a test for RtlGetFullPathName_U based on the same test cases Added: trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sun Mar 25 21:24:05 2012 @@ -2,6 +2,7 @@ list(APPEND SOURCE NtAllocateVirtualMemory.c NtFreeVirtualMemory.c + RtlGetFullPathName_U.c RtlGetFullPathName_UstrEx.c RtlInitializeBitMap.c SystemInfo.c Added: trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFull… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c (added) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c [iso-8859-1] Sun Mar 25 21:24:05 2012 @@ -1,0 +1,283 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for RtlGetFullPathName_U + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <wine/test.h> +#include <pseh/pseh2.h> +#include <ndk/rtlfuncs.h> + +/* +ULONG +NTAPI +RtlGetFullPathName_U( + IN PCWSTR FileName, + IN ULONG Size, + IN PWSTR Buffer, + OUT PWSTR *ShortName +); +*/ + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) + +static +BOOLEAN +CheckStringBuffer( + PCWSTR Buffer, + ULONG Length, + SIZE_T MaximumLength, + PCWSTR Expected) +{ + USHORT ExpectedLength = wcslen(Expected) * sizeof(WCHAR); + SIZE_T EqualLength; + BOOLEAN Result = TRUE; + SIZE_T i; + + if (Length != ExpectedLength) + { + ok(0, "String length is %u, expected %u\n", Length, ExpectedLength); + Result = FALSE; + } + + EqualLength = RtlCompareMemory(Buffer, Expected, Length); + if (EqualLength != Length) + { + ok(0, "String is '%S', expected '%S'\n", Buffer, Expected); + Result = FALSE; + } + + if (Buffer[Length / sizeof(WCHAR)] != UNICODE_NULL) + { + ok(0, "Not null terminated\n"); + Result = FALSE; + } + + /* the function nulls the rest of the buffer! */ + for (i = Length + sizeof(UNICODE_NULL); i < MaximumLength; i++) + { + UCHAR Char = ((PUCHAR)Buffer)[i]; + if (Char != 0) + { + ok(0, "Found 0x%x at offset %lu, expected 0x%x\n", Char, (ULONG)i, 0); + /* don't count this as a failure unless the string was actually wrong */ + //Result = FALSE; + /* don't flood the log */ + break; + } + } + + return Result; +} + +#define InvalidPointer ((PVOID)0x1234) + +/* winetest_platform is "windows" for us, so broken() doesn't do what it should :( */ +#undef broken +#define broken(x) 0 + +typedef enum +{ + PrefixNone, + PrefixCurrentDrive, + PrefixCurrentPath, + PrefixCurrentPathWithoutLastPart +} PREFIX_TYPE; + +static +VOID +RunTestCases(VOID) +{ + /* TODO: don't duplicate this here and in the RtlGetFullPathName_UstrEx test */ + struct + { + PCWSTR FileName; + PREFIX_TYPE PrefixType; + PCWSTR FullPathName; + PREFIX_TYPE FilePartPrefixType; + SIZE_T FilePartSize; + } TestCases[] = + { + { L"C:", PrefixCurrentPath, L"", PrefixCurrentPathWithoutLastPart }, + { L"C:\\", PrefixNone, L"C:\\" }, + { L"C:\\test", PrefixNone, L"C:\\test", PrefixCurrentDrive }, + { L"C:\\test\\", PrefixNone, L"C:\\test\\" }, + { L"C:/test/", PrefixNone, L"C:\\test\\" }, + + { L"C:\\\\test", PrefixNone, L"C:\\test", PrefixCurrentDrive }, + { L"test", PrefixCurrentPath, L"\\test", PrefixCurrentPath, sizeof(WCHAR) }, + { L"\\test", PrefixCurrentDrive, L"test", PrefixCurrentDrive }, + { L"/test", PrefixCurrentDrive, L"test", PrefixCurrentDrive }, + { L".\\test", PrefixCurrentPath, L"\\test", PrefixCurrentPath, sizeof(WCHAR) }, + + { L"\\.", PrefixCurrentDrive, L"" }, + { L"\\.\\", PrefixCurrentDrive, L"" }, + { L"\\\\.", PrefixNone, L"\\\\.\\" }, + { L"\\\\.\\", PrefixNone, L"\\\\.\\" }, + { L"\\\\.\\Something\\", PrefixNone, L"\\\\.\\Something\\" }, + + { L"\\??\\", PrefixCurrentDrive, L"??\\" }, + { L"\\??\\C:", PrefixCurrentDrive, L"??\\C:", PrefixCurrentDrive, 3 * sizeof(WCHAR) }, + { L"\\??\\C:\\", PrefixCurrentDrive, L"??\\C:\\" }, + { L"\\??\\C:\\test", PrefixCurrentDrive, L"??\\C:\\test", PrefixCurrentDrive, 6 * sizeof(WCHAR) }, + { L"\\??\\C:\\test\\", PrefixCurrentDrive, L"??\\C:\\test\\" }, + + { L"\\\\??\\", PrefixNone, L"\\\\??\\" }, + { L"\\\\??\\C:", PrefixNone, L"\\\\??\\C:" }, + { L"\\\\??\\C:\\", PrefixNone, L"\\\\??\\C:\\" }, + { L"\\\\??\\C:\\test", PrefixNone, L"\\\\??\\C:\\test", PrefixNone, sizeof(L"\\\\??\\C:\\") }, + { L"\\\\??\\C:\\test\\", PrefixNone, L"\\\\??\\C:\\test\\" }, + }; + NTSTATUS ExceptionStatus; + WCHAR FullPathNameBuffer[MAX_PATH]; + PWSTR ShortName; + SIZE_T Length; + WCHAR ExpectedPathName[MAX_PATH]; + SIZE_T FilePartSize; + SIZE_T ExpectedFilePartSize; + const INT TestCount = sizeof(TestCases) / sizeof(TestCases[0]); + INT i; + + for (i = 0; i < TestCount; i++) + { + trace("i = %d\n", i); + switch (TestCases[i].PrefixType) + { + case PrefixNone: + ExpectedPathName[0] = UNICODE_NULL; + break; + case PrefixCurrentDrive: + GetCurrentDirectoryW(sizeof(ExpectedPathName) / sizeof(WCHAR), ExpectedPathName); + ExpectedPathName[3] = UNICODE_NULL; + break; + case PrefixCurrentPath: + Length = GetCurrentDirectoryW(sizeof(ExpectedPathName) / sizeof(WCHAR), ExpectedPathName); + if (Length == 3 && TestCases[i].FullPathName[0]) + ExpectedPathName[2] = UNICODE_NULL; + break; + default: + skip(0, "Invalid test!\n"); + continue; + } + wcscat(ExpectedPathName, TestCases[i].FullPathName); + RtlFillMemory(FullPathNameBuffer, sizeof(FullPathNameBuffer), 0xAA); + Length = 0; + StartSeh() + Length = RtlGetFullPathName_U(TestCases[i].FileName, + sizeof(FullPathNameBuffer), + FullPathNameBuffer, + &ShortName); + EndSeh(STATUS_SUCCESS); + + /* TODO: remove SEH here */ + StartSeh() + ok(CheckStringBuffer(FullPathNameBuffer, Length, sizeof(FullPathNameBuffer), ExpectedPathName), + "Wrong path name '%S', expected '%S'\n", FullPathNameBuffer, ExpectedPathName); + EndSeh(STATUS_SUCCESS); + + if (!ShortName) + FilePartSize = 0; + else + FilePartSize = ShortName - FullPathNameBuffer; + + switch (TestCases[i].FilePartPrefixType) + { + case PrefixNone: + ExpectedFilePartSize = 0; + break; + case PrefixCurrentDrive: + ExpectedFilePartSize = sizeof(L"C:\\"); + break; + case PrefixCurrentPath: + ExpectedFilePartSize = GetCurrentDirectoryW(0, NULL) * sizeof(WCHAR); + if (ExpectedFilePartSize == sizeof(L"C:\\")) + ExpectedFilePartSize -= sizeof(WCHAR); + break; + case PrefixCurrentPathWithoutLastPart: + { + WCHAR CurrentPath[MAX_PATH]; + PCWSTR BackSlash; + ExpectedFilePartSize = GetCurrentDirectoryW(sizeof(CurrentPath) / sizeof(WCHAR), CurrentPath) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + if (ExpectedFilePartSize == sizeof(L"C:\\")) + ExpectedFilePartSize = 0; + else + { + BackSlash = wcsrchr(CurrentPath, L'\\'); + if (BackSlash) + ExpectedFilePartSize -= wcslen(BackSlash + 1) * sizeof(WCHAR); + else + ok(0, "GetCurrentDirectory returned %S\n", CurrentPath); + } + break; + } + default: + skip(0, "Invalid test!\n"); + continue; + } + ExpectedFilePartSize += TestCases[i].FilePartSize; + if (ExpectedFilePartSize != 0) + ExpectedFilePartSize = (ExpectedFilePartSize - sizeof(UNICODE_NULL)) / sizeof(WCHAR); + ok(FilePartSize == ExpectedFilePartSize, + "FilePartSize = %lu, expected %lu\n", (ULONG)FilePartSize, (ULONG)ExpectedFilePartSize); + } +} + +START_TEST(RtlGetFullPathName_U) +{ + NTSTATUS ExceptionStatus; + PCWSTR FileName; + PWSTR ShortName; + ULONG Length; + + /* Parameter checks */ + StartSeh() + Length = RtlGetFullPathName_U(NULL, 0, NULL, NULL); + ok(Length == 0, "Length = %lu\n", Length); + EndSeh(STATUS_SUCCESS); + + StartSeh() + Length = RtlGetFullPathName_U(L"", 0, NULL, NULL); + ok(Length == 0, "Length = %lu\n", Length); + EndSeh(STATUS_SUCCESS); + + ShortName = InvalidPointer; + StartSeh() + Length = RtlGetFullPathName_U(NULL, 0, NULL, &ShortName); + ok(Length == 0, "Length = %lu\n", Length); + EndSeh(STATUS_SUCCESS); + ok(ShortName == InvalidPointer || + broken(ShortName == NULL) /* Win7 */, "ShortName = %p\n", ShortName); + + StartSeh() + Length = RtlGetFullPathName_U(L"", 0, NULL, NULL); + ok(Length == 0, "Length = %lu\n", Length); + EndSeh(STATUS_SUCCESS); + + ShortName = InvalidPointer; + StartSeh() + Length = RtlGetFullPathName_U(L"", 0, NULL, &ShortName); + ok(Length == 0, "Length = %lu\n", Length); + EndSeh(STATUS_SUCCESS); + ok(ShortName == InvalidPointer || + broken(ShortName == NULL) /* Win7 */, "ShortName = %p\n", ShortName); + + StartSeh() + Length = RtlGetFullPathName_U(L"C:\\test", 0, NULL, NULL); + ok(Length == sizeof(L"C:\\test"), "Length = %lu\n", Length); + EndSeh(STATUS_SUCCESS); + + FileName = L"C:\\test"; + ShortName = InvalidPointer; + StartSeh() + Length = RtlGetFullPathName_U(FileName, 0, NULL, &ShortName); + ok(Length == sizeof(L"C:\\test"), "Length = %lu\n", Length); + EndSeh(STATUS_SUCCESS); + ok(ShortName == InvalidPointer || + broken(ShortName == NULL) /* Win7 */, "ShortName = %p\n", ShortName); + + /* check the actual functionality with different paths */ + RunTestCases(); +} Propchange: trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFull… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c [iso-8859-1] Sun Mar 25 21:24:05 2012 @@ -98,6 +98,7 @@ VOID RunTestCases(VOID) { + /* TODO: don't duplicate this here and in the RtlGetFullPathName_U test */ struct { PCWSTR FileName; @@ -166,8 +167,13 @@ ExpectedPathName[3] = UNICODE_NULL; break; case PrefixCurrentPath: - GetCurrentDirectoryW(sizeof(ExpectedPathName) / sizeof(WCHAR), ExpectedPathName); - break; + { + ULONG Length; + Length = GetCurrentDirectoryW(sizeof(ExpectedPathName) / sizeof(WCHAR), ExpectedPathName); + if (Length == 3 && TestCases[i].FullPathName[0]) + ExpectedPathName[2] = UNICODE_NULL; + break; + } default: skip(0, "Invalid test!\n"); continue; @@ -212,17 +218,24 @@ break; case PrefixCurrentPath: ExpectedFilePartSize = GetCurrentDirectoryW(0, NULL) * sizeof(WCHAR); + if (ExpectedFilePartSize == sizeof(L"C:\\")) + ExpectedFilePartSize -= sizeof(WCHAR); break; case PrefixCurrentPathWithoutLastPart: { WCHAR CurrentPath[MAX_PATH]; PCWSTR BackSlash; ExpectedFilePartSize = GetCurrentDirectoryW(sizeof(CurrentPath) / sizeof(WCHAR), CurrentPath) * sizeof(WCHAR) + sizeof(UNICODE_NULL); - BackSlash = wcsrchr(CurrentPath, L'\\'); - if (BackSlash) - ExpectedFilePartSize -= wcslen(BackSlash + 1) * sizeof(WCHAR); + if (ExpectedFilePartSize == sizeof(L"C:\\")) + ExpectedFilePartSize = 0; else - ok(0, "GetCurrentDirectory returned %S\n", CurrentPath); + { + BackSlash = wcsrchr(CurrentPath, L'\\'); + if (BackSlash) + ExpectedFilePartSize -= wcslen(BackSlash + 1) * sizeof(WCHAR); + else + ok(0, "GetCurrentDirectory returned %S\n", CurrentPath); + } break; } default: Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sun Mar 25 21:24:05 2012 @@ -8,6 +8,7 @@ extern void func_NtAllocateVirtualMemory(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtSystemInformation(void); +extern void func_RtlGetFullPathName_U(void); extern void func_RtlGetFullPathName_UstrEx(void); extern void func_RtlInitializeBitMap(void); extern void func_ZwContinue(void); @@ -17,6 +18,7 @@ { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtSystemInformation", func_NtSystemInformation }, + { "RtlGetFullPathName_U", func_RtlGetFullPathName_U }, { "RtlGetFullPathName_UstrEx", func_RtlGetFullPathName_UstrEx }, { "RtlInitializeBitMap", func_RtlInitializeBitMap }, { "ZwContinue", func_ZwContinue },

1 0

[tfaber] 56229: [NTDLL_APITEST] - Add a test for RtlGetFullPathName_UstrEx
by tfaber＠svn.reactos.org 25 Mar '12

25 Mar '12

Author: tfaber Date: Sun Mar 25 20:01:12 2012 New Revision: 56229 URL: http://svn.reactos.org/svn/reactos?rev=56229&view=rev Log: [NTDLL_APITEST] - Add a test for RtlGetFullPathName_UstrEx Added: trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sun Mar 25 20:01:12 2012 @@ -2,6 +2,7 @@ list(APPEND SOURCE NtAllocateVirtualMemory.c NtFreeVirtualMemory.c + RtlGetFullPathName_UstrEx.c RtlInitializeBitMap.c SystemInfo.c ZwContinue.c @@ -12,7 +13,14 @@ endif() add_executable(ntdll_apitest ${SOURCE}) -target_link_libraries(ntdll_apitest wine) +target_link_libraries(ntdll_apitest wine ${PSEH_LIB}) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll) + +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(ntdll_apitest "-Wno-format") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format") +endif() + add_cd_file(TARGET ntdll_apitest DESTINATION reactos/bin FOR all) Added: trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFull… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c (added) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c [iso-8859-1] Sun Mar 25 20:01:12 2012 @@ -1,0 +1,344 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for RtlGetFullPathName_UstrEx + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <wine/test.h> +#include <pseh/pseh2.h> +#include <ndk/rtlfuncs.h> + +/* +NTSTATUS +NTAPI +RtlGetFullPathName_UstrEx(IN PUNICODE_STRING FileName, + IN PUNICODE_STRING StaticString, + IN PUNICODE_STRING DynamicString, + IN PUNICODE_STRING *StringUsed, + IN PSIZE_T FilePartSize OPTIONAL, + OUT PBOOLEAN NameInvalid, + OUT RTL_PATH_TYPE* PathType, + OUT PSIZE_T LengthNeeded OPTIONAL); +*/ + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) + +#define ok_eq_ustr(str1, str2) do { \ + ok((str1)->Buffer == (str2)->Buffer, "Buffer modified\n"); \ + ok((str1)->Length == (str2)->Length, "Length modified\n"); \ + ok((str1)->MaximumLength == (str2)->MaximumLength, "MaximumLength modified\n"); \ + } while (0) + +static +BOOLEAN +CheckStringBuffer( + PCUNICODE_STRING String, + PCWSTR Expected) +{ + USHORT Length = wcslen(Expected) * sizeof(WCHAR); + SIZE_T EqualLength; + BOOLEAN Result = TRUE; + SIZE_T i; + + if (String->Length != Length) + { + ok(0, "String length is %u, expected %u\n", String->Length, Length); + Result = FALSE; + } + + EqualLength = RtlCompareMemory(String->Buffer, Expected, Length); + if (EqualLength != Length) + { + ok(0, "String is '%wZ', expected '%S'\n", String, Expected); + Result = FALSE; + } + + if (String->Buffer[String->Length / sizeof(WCHAR)] != UNICODE_NULL) + { + ok(0, "Not null terminated\n"); + Result = FALSE; + } + + /* the function nulls the rest of the buffer! */ + for (i = String->Length + sizeof(UNICODE_NULL); i < String->MaximumLength; i++) + { + UCHAR Char = ((PUCHAR)String->Buffer)[i]; + if (Char != 0) + { + ok(0, "Found 0x%x at offset %lu, expected 0x%x\n", Char, (ULONG)i, 0); + /* don't count this as a failure unless the string was actually wrong */ + //Result = FALSE; + /* don't flood the log */ + break; + } + } + + return Result; +} + +#define RtlPathTypeNotSet 123 +#define InvalidPointer ((PVOID)0x1234) + +/* winetest_platform is "windows" for us, so broken() doesn't do what it should :( */ +#undef broken +#define broken(x) 0 + +typedef enum +{ + PrefixNone, + PrefixCurrentDrive, + PrefixCurrentPath, + PrefixCurrentPathWithoutLastPart +} PREFIX_TYPE; + +static +VOID +RunTestCases(VOID) +{ + struct + { + PCWSTR FileName; + PREFIX_TYPE PrefixType; + PCWSTR FullPathName; + RTL_PATH_TYPE PathType; + PREFIX_TYPE FilePartPrefixType; + SIZE_T FilePartSize; + } TestCases[] = + { + { L"C:", PrefixCurrentPath, L"", RtlPathTypeDriveRelative, PrefixCurrentPathWithoutLastPart }, + { L"C:\\", PrefixNone, L"C:\\", RtlPathTypeDriveAbsolute }, + { L"C:\\test", PrefixNone, L"C:\\test", RtlPathTypeDriveAbsolute, PrefixCurrentDrive }, + { L"C:\\test\\", PrefixNone, L"C:\\test\\", RtlPathTypeDriveAbsolute }, + { L"C:/test/", PrefixNone, L"C:\\test\\", RtlPathTypeDriveAbsolute }, + + { L"C:\\\\test", PrefixNone, L"C:\\test", RtlPathTypeDriveAbsolute, PrefixCurrentDrive }, + { L"test", PrefixCurrentPath, L"\\test", RtlPathTypeRelative, PrefixCurrentPath, sizeof(WCHAR) }, + { L"\\test", PrefixCurrentDrive, L"test", RtlPathTypeRooted, PrefixCurrentDrive }, + { L"/test", PrefixCurrentDrive, L"test", RtlPathTypeRooted, PrefixCurrentDrive }, + { L".\\test", PrefixCurrentPath, L"\\test", RtlPathTypeRelative, PrefixCurrentPath, sizeof(WCHAR) }, + + { L"\\.", PrefixCurrentDrive, L"", RtlPathTypeRooted }, + { L"\\.\\", PrefixCurrentDrive, L"", RtlPathTypeRooted }, + { L"\\\\.", PrefixNone, L"\\\\.\\", RtlPathTypeRootLocalDevice }, + { L"\\\\.\\", PrefixNone, L"\\\\.\\", RtlPathTypeLocalDevice }, + { L"\\\\.\\Something\\", PrefixNone, L"\\\\.\\Something\\", RtlPathTypeLocalDevice }, + + { L"\\??\\", PrefixCurrentDrive, L"??\\", RtlPathTypeRooted }, + { L"\\??\\C:", PrefixCurrentDrive, L"??\\C:", RtlPathTypeRooted, PrefixCurrentDrive, 3 * sizeof(WCHAR) }, + { L"\\??\\C:\\", PrefixCurrentDrive, L"??\\C:\\", RtlPathTypeRooted }, + { L"\\??\\C:\\test", PrefixCurrentDrive, L"??\\C:\\test", RtlPathTypeRooted, PrefixCurrentDrive, 6 * sizeof(WCHAR) }, + { L"\\??\\C:\\test\\", PrefixCurrentDrive, L"??\\C:\\test\\", RtlPathTypeRooted }, + + { L"\\\\??\\", PrefixNone, L"\\\\??\\", RtlPathTypeUncAbsolute }, + { L"\\\\??\\C:", PrefixNone, L"\\\\??\\C:", RtlPathTypeUncAbsolute }, + { L"\\\\??\\C:\\", PrefixNone, L"\\\\??\\C:\\", RtlPathTypeUncAbsolute }, + { L"\\\\??\\C:\\test", PrefixNone, L"\\\\??\\C:\\test", RtlPathTypeUncAbsolute, PrefixNone, sizeof(L"\\\\??\\C:\\") }, + { L"\\\\??\\C:\\test\\", PrefixNone, L"\\\\??\\C:\\test\\", RtlPathTypeUncAbsolute }, + }; + NTSTATUS Status, ExceptionStatus; + UNICODE_STRING FileName; + UNICODE_STRING FullPathName; + WCHAR FullPathNameBuffer[MAX_PATH]; + UNICODE_STRING TempString; + PUNICODE_STRING StringUsed; + SIZE_T FilePartSize; + BOOLEAN NameInvalid; + RTL_PATH_TYPE PathType; + SIZE_T LengthNeeded; + WCHAR ExpectedPathName[MAX_PATH]; + SIZE_T ExpectedFilePartSize; + const INT TestCount = sizeof(TestCases) / sizeof(TestCases[0]); + INT i; + + for (i = 0; i < TestCount; i++) + { + trace("i = %d\n", i); + switch (TestCases[i].PrefixType) + { + case PrefixNone: + ExpectedPathName[0] = UNICODE_NULL; + break; + case PrefixCurrentDrive: + GetCurrentDirectoryW(sizeof(ExpectedPathName) / sizeof(WCHAR), ExpectedPathName); + ExpectedPathName[3] = UNICODE_NULL; + break; + case PrefixCurrentPath: + GetCurrentDirectoryW(sizeof(ExpectedPathName) / sizeof(WCHAR), ExpectedPathName); + break; + default: + skip(0, "Invalid test!\n"); + continue; + } + wcscat(ExpectedPathName, TestCases[i].FullPathName); + RtlInitUnicodeString(&FileName, TestCases[i].FileName); + RtlInitEmptyUnicodeString(&FullPathName, FullPathNameBuffer, sizeof(FullPathNameBuffer)); + RtlFillMemory(FullPathName.Buffer, FullPathName.MaximumLength, 0xAA); + TempString = FileName; + PathType = RtlPathTypeNotSet; + StringUsed = InvalidPointer; + FilePartSize = 1234; + NameInvalid = (BOOLEAN)-1; + LengthNeeded = 1234; + StartSeh() + Status = RtlGetFullPathName_UstrEx(&FileName, + &FullPathName, + NULL, + &StringUsed, + &FilePartSize, + &NameInvalid, + &PathType, + &LengthNeeded); + ok(Status == STATUS_SUCCESS, "status = %lx\n", Status); + EndSeh(STATUS_SUCCESS); + ok_eq_ustr(&FileName, &TempString); + ok(FullPathName.Buffer == FullPathNameBuffer, "Buffer modified\n"); + ok(FullPathName.MaximumLength == sizeof(FullPathNameBuffer), "MaximumLength modified\n"); + /* TODO: remove SEH here */ + StartSeh() + ok(CheckStringBuffer(&FullPathName, ExpectedPathName), + "Wrong path name '%wZ', expected '%S'\n", &FullPathName, ExpectedPathName); + EndSeh(STATUS_SUCCESS); + ok(StringUsed == &FullPathName, "StringUsed = %p, expected %p\n", StringUsed, &FullPathName); + switch (TestCases[i].FilePartPrefixType) + { + case PrefixNone: + ExpectedFilePartSize = 0; + break; + case PrefixCurrentDrive: + ExpectedFilePartSize = sizeof(L"C:\\"); + break; + case PrefixCurrentPath: + ExpectedFilePartSize = GetCurrentDirectoryW(0, NULL) * sizeof(WCHAR); + break; + case PrefixCurrentPathWithoutLastPart: + { + WCHAR CurrentPath[MAX_PATH]; + PCWSTR BackSlash; + ExpectedFilePartSize = GetCurrentDirectoryW(sizeof(CurrentPath) / sizeof(WCHAR), CurrentPath) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + BackSlash = wcsrchr(CurrentPath, L'\\'); + if (BackSlash) + ExpectedFilePartSize -= wcslen(BackSlash + 1) * sizeof(WCHAR); + else + ok(0, "GetCurrentDirectory returned %S\n", CurrentPath); + break; + } + default: + skip(0, "Invalid test!\n"); + continue; + } + ExpectedFilePartSize += TestCases[i].FilePartSize; + if (ExpectedFilePartSize != 0) + ExpectedFilePartSize = (ExpectedFilePartSize - sizeof(UNICODE_NULL)) / sizeof(WCHAR); + ok(FilePartSize == ExpectedFilePartSize, + "FilePartSize = %lu, expected %lu\n", (ULONG)FilePartSize, (ULONG)ExpectedFilePartSize); + ok(NameInvalid == FALSE, "NameInvalid = %u\n", NameInvalid); + ok(PathType == TestCases[i].PathType, "PathType = %d, expected %d\n", PathType, TestCases[i].PathType); + ok(LengthNeeded == 0, "LengthNeeded = %lu\n", (ULONG)LengthNeeded); + } +} + +START_TEST(RtlGetFullPathName_UstrEx) +{ + NTSTATUS Status, ExceptionStatus; + UNICODE_STRING FileName; + UNICODE_STRING TempString; + UNICODE_STRING StaticString; + PUNICODE_STRING StringUsed; + SIZE_T FilePartSize; + BOOLEAN NameInvalid; + RTL_PATH_TYPE PathType; + SIZE_T LengthNeeded; + + /* NULL parameters */ + StartSeh() + RtlGetFullPathName_UstrEx(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + EndSeh(STATUS_ACCESS_VIOLATION); + + RtlInitUnicodeString(&FileName, L""); + TempString = FileName; + StartSeh() + RtlGetFullPathName_UstrEx(&FileName, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + EndSeh(STATUS_ACCESS_VIOLATION); + ok_eq_ustr(&FileName, &TempString); + + PathType = RtlPathTypeNotSet; + StartSeh() + RtlGetFullPathName_UstrEx(NULL, NULL, NULL, NULL, NULL, NULL, &PathType, NULL); + EndSeh(STATUS_ACCESS_VIOLATION); + ok(PathType == RtlPathTypeUnknown || + broken(PathType == RtlPathTypeNotSet) /* Win7 */, "PathType = %d\n", PathType); + + /* check what else is initialized before it crashes */ + PathType = RtlPathTypeNotSet; + StringUsed = InvalidPointer; + FilePartSize = 1234; + NameInvalid = (BOOLEAN)-1; + LengthNeeded = 1234; + StartSeh() + RtlGetFullPathName_UstrEx(NULL, NULL, NULL, &StringUsed, &FilePartSize, &NameInvalid, &PathType, &LengthNeeded); + EndSeh(STATUS_ACCESS_VIOLATION); + ok(StringUsed == NULL, "StringUsed = %p\n", StringUsed); + ok(FilePartSize == 0, "FilePartSize = %lu\n", (ULONG)FilePartSize); + ok(NameInvalid == FALSE, "NameInvalid = %u\n", NameInvalid); + ok(PathType == RtlPathTypeUnknown || + broken(PathType == RtlPathTypeNotSet) /* Win7 */, "PathType = %d\n", PathType); + ok(LengthNeeded == 0, "LengthNeeded = %lu\n", (ULONG)LengthNeeded); + + RtlInitUnicodeString(&FileName, L""); + TempString = FileName; + StringUsed = InvalidPointer; + FilePartSize = 1234; + NameInvalid = (BOOLEAN)-1; + LengthNeeded = 1234; + StartSeh() + RtlGetFullPathName_UstrEx(&FileName, NULL, NULL, &StringUsed, &FilePartSize, &NameInvalid, NULL, &LengthNeeded); + EndSeh(STATUS_ACCESS_VIOLATION); + ok_eq_ustr(&FileName, &TempString); + ok(StringUsed == NULL, "StringUsed = %p\n", StringUsed); + ok(FilePartSize == 0, "FilePartSize = %lu\n", (ULONG)FilePartSize); + ok(NameInvalid == FALSE || + broken(NameInvalid == (BOOLEAN)-1) /* Win7 */, "NameInvalid = %u\n", NameInvalid); + ok(LengthNeeded == 0, "LengthNeeded = %lu\n", (ULONG)LengthNeeded); + + /* This is the first one that doesn't crash. FileName and PathType cannot be NULL */ + RtlInitUnicodeString(&FileName, L""); + TempString = FileName; + PathType = RtlPathTypeNotSet; + StartSeh() + Status = RtlGetFullPathName_UstrEx(&FileName, NULL, NULL, NULL, NULL, NULL, &PathType, NULL); + ok(Status == STATUS_OBJECT_NAME_INVALID, "status = %lx\n", Status); + EndSeh(STATUS_SUCCESS); + ok_eq_ustr(&FileName, &TempString); + ok(PathType == RtlPathTypeUnknown, "PathType = %d\n", PathType); + + /* Give it a valid path */ + RtlInitUnicodeString(&FileName, L"C:\\test"); + TempString = FileName; + PathType = RtlPathTypeNotSet; + StartSeh() + Status = RtlGetFullPathName_UstrEx(&FileName, NULL, NULL, NULL, NULL, NULL, &PathType, NULL); + ok(Status == STATUS_BUFFER_TOO_SMALL, "status = %lx\n", Status); + EndSeh(STATUS_SUCCESS); + ok_eq_ustr(&FileName, &TempString); + ok(PathType == RtlPathTypeDriveAbsolute, "PathType = %d\n", PathType); + + /* Zero-length static string */ + RtlInitUnicodeString(&FileName, L"C:\\test"); + TempString = FileName; + RtlInitUnicodeString(&StaticString, NULL); + PathType = RtlPathTypeNotSet; + StartSeh() + Status = RtlGetFullPathName_UstrEx(&FileName, &StaticString, NULL, NULL, NULL, NULL, &PathType, NULL); + ok(Status == STATUS_BUFFER_TOO_SMALL, "status = %lx\n", Status); + EndSeh(STATUS_SUCCESS); + ok_eq_ustr(&FileName, &TempString); + ok(PathType == RtlPathTypeDriveAbsolute, "PathType = %d\n", PathType); + + /* TODO: play around with StaticString and DynamicString */ + + /* check the actual functionality with different paths */ + RunTestCases(); +} Propchange: trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sun Mar 25 20:01:12 2012 @@ -8,6 +8,7 @@ extern void func_NtAllocateVirtualMemory(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtSystemInformation(void); +extern void func_RtlGetFullPathName_UstrEx(void); extern void func_RtlInitializeBitMap(void); extern void func_ZwContinue(void); @@ -16,9 +17,9 @@ { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtSystemInformation", func_NtSystemInformation }, + { "RtlGetFullPathName_UstrEx", func_RtlGetFullPathName_UstrEx }, { "RtlInitializeBitMap", func_RtlInitializeBitMap }, { "ZwContinue", func_ZwContinue }, { 0, 0 } }; -

1 0

[sginsberg] 56228: Remove remnant of old boot method.
by sginsberg＠svn.reactos.org 25 Mar '12

25 Mar '12

Author: sginsberg Date: Sun Mar 25 16:57:10 2012 New Revision: 56228 URL: http://svn.reactos.org/svn/reactos?rev=56228&view=rev Log: Remove remnant of old boot method. Removed: trunk/reactos/include/reactos/rosldr.h Modified: trunk/reactos/hal/halppc/generic/display.c trunk/reactos/hal/halx86/xbox/halxbox.h Modified: trunk/reactos/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/display… ============================================================================== --- trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] Sun Mar 25 16:57:10 2012 @@ -122,7 +122,6 @@ */ #include <hal.h> -#include <rosldr.h> #include <ppcboot.h> #include <ppcdebug.h> Modified: trunk/reactos/hal/halx86/xbox/halxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halxbox.h?… ============================================================================== --- trunk/reactos/hal/halx86/xbox/halxbox.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/xbox/halxbox.h [iso-8859-1] Sun Mar 25 16:57:10 2012 @@ -14,7 +14,6 @@ #include <hal.h> #include <ntdddisk.h> -#include <rosldr.h> VOID HalpXboxInitPciBus(PBUS_HANDLER BusHandler); VOID HalpXboxInitPartIo(VOID); Removed: trunk/reactos/include/reactos/rosldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rosldr.h?r… ============================================================================== --- trunk/reactos/include/reactos/rosldr.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/rosldr.h (removed) @@ -1,57 +1,0 @@ -#ifndef __REACTOS_LDR_H -#define __REACTOS_LDR_H - -#define MB_FLAGS_MEM_INFO (0x1) -#define MB_FLAGS_BOOT_DEVICE (0x2) -#define MB_FLAGS_COMMAND_LINE (0x4) -#define MB_FLAGS_MODULE_INFO (0x8) -#define MB_FLAGS_AOUT_SYMS (0x10) -#define MB_FLAGS_ELF_SYMS (0x20) -#define MB_FLAGS_MMAP_INFO (0x40) -#define MB_FLAGS_DRIVES_INFO (0x80) -#define MB_FLAGS_CONFIG_TABLE (0x100) -#define MB_FLAGS_BOOT_LOADER_NAME (0x200) -#define MB_FLAGS_APM_TABLE (0x400) -#define MB_FLAGS_GRAPHICS_TABLE (0x800) -#define MB_FLAGS_ACPI_TABLE (0x1000) - -typedef struct _LOADER_MODULE -{ - ULONG_PTR ModStart; - ULONG_PTR ModEnd; - ULONG_PTR String; - ULONG_PTR Reserved; -} LOADER_MODULE, *PLOADER_MODULE; - -typedef struct _ROS_LOADER_PARAMETER_BLOCK -{ - ULONG Flags; - ULONG_PTR MemLower; - ULONG_PTR MemHigher; - ULONG BootDevice; - PCHAR CommandLine; - ULONG ModsCount; - PLOADER_MODULE ModsAddr; - UCHAR Syms[12]; - SIZE_T MmapLength; - ULONG_PTR MmapAddr; - SIZE_T RdLength; - ULONG_PTR RdAddr; - ULONG DrivesCount; - PARC_DISK_SIGNATURE DrivesAddr; - ULONG ConfigTable; - ULONG BootLoaderName; - ULONG_PTR PageDirectoryStart; - ULONG_PTR PageDirectoryEnd; - ULONG_PTR KernelBase; - ULONG_PTR ArchExtra; - ULONG (*FrLdrDbgPrint)(const char *Format, ...); -} ROS_LOADER_PARAMETER_BLOCK, *PROS_LOADER_PARAMETER_BLOCK; - -VOID -NTAPI -KiRosPrepareForSystemStartup( - IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock -); - -#endif

1 0

[cgutman] 56227: [ACPI] - Properly tag alternate interrupt and DMA resources - Only iterate through the first dependent function (for now)
by cgutman＠svn.reactos.org 25 Mar '12

25 Mar '12

Author: cgutman Date: Sun Mar 25 16:53:02 2012 New Revision: 56227 URL: http://svn.reactos.org/svn/reactos?rev=56227&view=rev Log: [ACPI] - Properly tag alternate interrupt and DMA resources - Only iterate through the first dependent function (for now) Modified: trunk/reactos/drivers/bus/acpi/buspdo.c Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Sun Mar 25 16:53:02 2012 @@ -1269,7 +1269,7 @@ /* Fill resources list structure */ resource = Buffer.Pointer; - while (resource->Type != ACPI_RESOURCE_TYPE_END_TAG) + while (resource->Type != ACPI_RESOURCE_TYPE_END_TAG && resource->Type != ACPI_RESOURCE_TYPE_END_DEPENDENT) { switch (resource->Type) { @@ -1280,7 +1280,7 @@ break; for (i = 0; i < irq_data->InterruptCount; i++) { - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->Option = (i == 0) ? IO_RESOURCE_PREFERRED : IO_RESOURCE_ALTERNATIVE; RequirementDescriptor->Type = CmResourceTypeInterrupt; RequirementDescriptor->ShareDisposition = (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); RequirementDescriptor->Flags =(irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); @@ -1296,7 +1296,7 @@ ACPI_RESOURCE_IRQ *irq_data = (ACPI_RESOURCE_IRQ*) &resource->Data; for (i = 0; i < irq_data->InterruptCount; i++) { - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->Option = (i == 0) ? IO_RESOURCE_PREFERRED : IO_RESOURCE_ALTERNATIVE; RequirementDescriptor->Type = CmResourceTypeInterrupt; RequirementDescriptor->ShareDisposition = (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); RequirementDescriptor->Flags =(irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); @@ -1329,7 +1329,7 @@ case ACPI_TRANSFER_8_16: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break; } - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->Option = (i == 0) ? IO_RESOURCE_PREFERRED : IO_RESOURCE_ALTERNATIVE; RequirementDescriptor->ShareDisposition = CmResourceShareDriverExclusive; RequirementDescriptor->u.Dma.MinimumChannel = RequirementDescriptor->u.Dma.MaximumChannel = dma_data->Channels[i];

1 0

[cgutman] 56226: [ACPI] - Ignore resource producers when reporting resources
by cgutman＠svn.reactos.org 25 Mar '12

25 Mar '12

Author: cgutman Date: Sun Mar 25 16:42:26 2012 New Revision: 56226 URL: http://svn.reactos.org/svn/reactos?rev=56226&view=rev Log: [ACPI] - Ignore resource producers when reporting resources Modified: trunk/reactos/drivers/bus/acpi/buspdo.c Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Sun Mar 25 16:42:26 2012 @@ -552,71 +552,71 @@ case DeviceTextDescription: if (!Irp->IoStatus.Information) { - if (wcsstr (DeviceData->HardwareIDs, L"PNP000") != 0) - Temp = L"Programmable interrupt controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP010") != 0) - Temp = L"System timer"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP020") != 0) - Temp = L"DMA controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP03") != 0) - Temp = L"Keyboard"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP040") != 0) - Temp = L"Parallel port"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP05") != 0) - Temp = L"Serial port"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP06") != 0) - Temp = L"Disk controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP07") != 0) - Temp = L"Disk controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP09") != 0) - Temp = L"Display adapter"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A0") != 0) - Temp = L"Bus controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0E0") != 0) - Temp = L"PCMCIA controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0F") != 0) - Temp = L"Mouse device"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP8") != 0) - Temp = L"Network adapter"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNPA0") != 0) - Temp = L"SCSI controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNPB0") != 0) - Temp = L"Multimedia device"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNPC00") != 0) - Temp = L"Modem"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0C") != 0) - Temp = L"Power Button"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0E") != 0) - Temp = L"Sleep Button"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0D") != 0) - Temp = L"Lid Switch"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C09") != 0) - Temp = L"ACPI Embedded Controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0B") != 0) - Temp = L"ACPI Fan"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0) - Temp = L"PCI Root Bridge"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0A") != 0) - Temp = L"ACPI Battery"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0F") != 0) - Temp = L"PCI Interrupt Link"; - else if (wcsstr(DeviceData->HardwareIDs, L"ACPI_PWR") != 0) - Temp = L"ACPI Power Resource"; - else if (wcsstr(DeviceData->HardwareIDs, L"Processor") != 0) - Temp = L"Processor"; - else if (wcsstr(DeviceData->HardwareIDs, L"ThermalZone") != 0) - Temp = L"ACPI Thermal Zone"; - else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0002") != 0) - Temp = L"Smart Battery"; - else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0003") != 0) - Temp = L"AC Adapter"; - /* Simply checking if AcpiHandle is NULL eliminates the need to check - * for the 4 different names that ACPI knows the fixed feature button as internally - */ - else if (!DeviceData->AcpiHandle) - Temp = L"ACPI Fixed Feature Button"; - else - Temp = L"Other ACPI device"; + if (wcsstr (DeviceData->HardwareIDs, L"PNP000") != 0) + Temp = L"Programmable interrupt controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP010") != 0) + Temp = L"System timer"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP020") != 0) + Temp = L"DMA controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP03") != 0) + Temp = L"Keyboard"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP040") != 0) + Temp = L"Parallel port"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP05") != 0) + Temp = L"Serial port"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP06") != 0) + Temp = L"Disk controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP07") != 0) + Temp = L"Disk controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP09") != 0) + Temp = L"Display adapter"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A0") != 0) + Temp = L"Bus controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0E0") != 0) + Temp = L"PCMCIA controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0F") != 0) + Temp = L"Mouse device"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP8") != 0) + Temp = L"Network adapter"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNPA0") != 0) + Temp = L"SCSI controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNPB0") != 0) + Temp = L"Multimedia device"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNPC00") != 0) + Temp = L"Modem"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0C") != 0) + Temp = L"Power Button"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0E") != 0) + Temp = L"Sleep Button"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0D") != 0) + Temp = L"Lid Switch"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C09") != 0) + Temp = L"ACPI Embedded Controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0B") != 0) + Temp = L"ACPI Fan"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0) + Temp = L"PCI Root Bridge"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0A") != 0) + Temp = L"ACPI Battery"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0F") != 0) + Temp = L"PCI Interrupt Link"; + else if (wcsstr(DeviceData->HardwareIDs, L"ACPI_PWR") != 0) + Temp = L"ACPI Power Resource"; + else if (wcsstr(DeviceData->HardwareIDs, L"Processor") != 0) + Temp = L"Processor"; + else if (wcsstr(DeviceData->HardwareIDs, L"ThermalZone") != 0) + Temp = L"ACPI Thermal Zone"; + else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0002") != 0) + Temp = L"Smart Battery"; + else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0003") != 0) + Temp = L"AC Adapter"; + /* Simply checking if AcpiHandle is NULL eliminates the need to check + * for the 4 different names that ACPI knows the fixed feature button as internally + */ + else if (!DeviceData->AcpiHandle) + Temp = L"ACPI Fixed Feature Button"; + else + Temp = L"Other ACPI device"; Buffer = ExAllocatePoolWithTag (PagedPool, (wcslen(Temp) + 1) * sizeof(WCHAR), 'IPCA'); @@ -647,15 +647,15 @@ PPDO_DEVICE_DATA DeviceData, PIRP Irp ) { - ULONG NumberOfResources = 0; - PCM_RESOURCE_LIST ResourceList; - PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; - ACPI_STATUS AcpiStatus; - ACPI_BUFFER Buffer; - ACPI_RESOURCE* resource; - ULONG ResourceListSize; - ULONG i; - ULONGLONG BusNumber; + ULONG NumberOfResources = 0; + PCM_RESOURCE_LIST ResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + ACPI_STATUS AcpiStatus; + ACPI_BUFFER Buffer; + ACPI_RESOURCE* resource; + ULONG ResourceListSize; + ULONG i; + ULONGLONG BusNumber; struct acpi_device *device; if (!DeviceData->AcpiHandle) @@ -735,384 +735,403 @@ return STATUS_UNSUCCESSFUL; } - resource= Buffer.Pointer; - /* Count number of resources */ - while (resource->Type != ACPI_RESOURCE_TYPE_END_TAG) - { - switch (resource->Type) - { - case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: - { - ACPI_RESOURCE_EXTENDED_IRQ *irq_data = (ACPI_RESOURCE_EXTENDED_IRQ*) &resource->Data; - NumberOfResources += irq_data->InterruptCount; - break; - } - case ACPI_RESOURCE_TYPE_IRQ: - { - ACPI_RESOURCE_IRQ *irq_data = (ACPI_RESOURCE_IRQ*) &resource->Data; - NumberOfResources += irq_data->InterruptCount; - break; - } - case ACPI_RESOURCE_TYPE_DMA: - { - ACPI_RESOURCE_DMA *dma_data = (ACPI_RESOURCE_DMA*) &resource->Data; - NumberOfResources += dma_data->ChannelCount; - break; - } - case ACPI_RESOURCE_TYPE_ADDRESS16: - case ACPI_RESOURCE_TYPE_ADDRESS32: - case ACPI_RESOURCE_TYPE_ADDRESS64: - case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: - case ACPI_RESOURCE_TYPE_MEMORY24: - case ACPI_RESOURCE_TYPE_MEMORY32: + resource= Buffer.Pointer; + /* Count number of resources */ + while (resource->Type != ACPI_RESOURCE_TYPE_END_TAG) + { + switch (resource->Type) + { + case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: + { + ACPI_RESOURCE_EXTENDED_IRQ *irq_data = (ACPI_RESOURCE_EXTENDED_IRQ*) &resource->Data; + if (irq_data->ProducerConsumer == ACPI_PRODUCER) + break; + NumberOfResources += irq_data->InterruptCount; + break; + } + case ACPI_RESOURCE_TYPE_IRQ: + { + ACPI_RESOURCE_IRQ *irq_data = (ACPI_RESOURCE_IRQ*) &resource->Data; + NumberOfResources += irq_data->InterruptCount; + break; + } + case ACPI_RESOURCE_TYPE_DMA: + { + ACPI_RESOURCE_DMA *dma_data = (ACPI_RESOURCE_DMA*) &resource->Data; + NumberOfResources += dma_data->ChannelCount; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS16: + case ACPI_RESOURCE_TYPE_ADDRESS32: + case ACPI_RESOURCE_TYPE_ADDRESS64: + case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: + { + ACPI_RESOURCE_ADDRESS *addr_res = (ACPI_RESOURCE_ADDRESS*) &resource->Data; + if (addr_res->ProducerConsumer == ACPI_PRODUCER) + break; + NumberOfResources++; + break; + } + case ACPI_RESOURCE_TYPE_MEMORY24: + case ACPI_RESOURCE_TYPE_MEMORY32: case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: - case ACPI_RESOURCE_TYPE_IO: - { - NumberOfResources++; - break; - } - default: - { - DPRINT1("Unknown resource type: %d\n", resource->Type); - break; - } - } - resource = ACPI_NEXT_RESOURCE(resource); - } - - /* Allocate memory */ - ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); - ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, 'IPCA'); - - if (!ResourceList) - { - ExFreePoolWithTag(Buffer.Pointer, 'IPCA'); - return STATUS_INSUFFICIENT_RESOURCES; - } - ResourceList->Count = 1; - ResourceList->List[0].InterfaceType = Internal; /* FIXME */ - ResourceList->List[0].BusNumber = 0; /* We're the only ACPI bus device in the system */ - ResourceList->List[0].PartialResourceList.Version = 1; - ResourceList->List[0].PartialResourceList.Revision = 1; - ResourceList->List[0].PartialResourceList.Count = NumberOfResources; - ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors; - - /* Fill resources list structure */ + case ACPI_RESOURCE_TYPE_IO: + { + NumberOfResources++; + break; + } + default: + { + DPRINT1("Unknown resource type: %d\n", resource->Type); + break; + } + } + resource = ACPI_NEXT_RESOURCE(resource); + } + + /* Allocate memory */ + ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); + ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, 'IPCA'); + + if (!ResourceList) + { + ExFreePoolWithTag(Buffer.Pointer, 'IPCA'); + return STATUS_INSUFFICIENT_RESOURCES; + } + ResourceList->Count = 1; + ResourceList->List[0].InterfaceType = Internal; /* FIXME */ + ResourceList->List[0].BusNumber = 0; /* We're the only ACPI bus device in the system */ + ResourceList->List[0].PartialResourceList.Version = 1; + ResourceList->List[0].PartialResourceList.Revision = 1; + ResourceList->List[0].PartialResourceList.Count = NumberOfResources; + ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors; + + /* Fill resources list structure */ resource = Buffer.Pointer; - while (resource->Type != ACPI_RESOURCE_TYPE_END_TAG) - { - switch (resource->Type) - { - case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: - { - ACPI_RESOURCE_EXTENDED_IRQ *irq_data = (ACPI_RESOURCE_EXTENDED_IRQ*) &resource->Data; - for (i = 0; i < irq_data->InterruptCount; i++) - { - ResourceDescriptor->Type = CmResourceTypeInterrupt; - - ResourceDescriptor->ShareDisposition = - (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); - ResourceDescriptor->Flags = - (irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); - ResourceDescriptor->u.Interrupt.Level = - ResourceDescriptor->u.Interrupt.Vector = irq_data->Interrupts[i]; - ResourceDescriptor->u.Interrupt.Affinity = (KAFFINITY)(-1); - - ResourceDescriptor++; - } - break; - } - case ACPI_RESOURCE_TYPE_IRQ: - { - ACPI_RESOURCE_IRQ *irq_data = (ACPI_RESOURCE_IRQ*) &resource->Data; - for (i = 0; i < irq_data->InterruptCount; i++) - { - ResourceDescriptor->Type = CmResourceTypeInterrupt; - - ResourceDescriptor->ShareDisposition = - (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); - ResourceDescriptor->Flags = - (irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); - ResourceDescriptor->u.Interrupt.Level = - ResourceDescriptor->u.Interrupt.Vector = irq_data->Interrupts[i]; - ResourceDescriptor->u.Interrupt.Affinity = (KAFFINITY)(-1); - - ResourceDescriptor++; - } - break; - } - case ACPI_RESOURCE_TYPE_DMA: - { - ACPI_RESOURCE_DMA *dma_data = (ACPI_RESOURCE_DMA*) &resource->Data; - for (i = 0; i < dma_data->ChannelCount; i++) - { - ResourceDescriptor->Type = CmResourceTypeDma; - ResourceDescriptor->Flags = 0; - switch (dma_data->Type) - { - case ACPI_TYPE_A: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_A; break; - case ACPI_TYPE_B: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_B; break; - case ACPI_TYPE_F: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_F; break; - } - if (dma_data->BusMaster == ACPI_BUS_MASTER) - ResourceDescriptor->Flags |= CM_RESOURCE_DMA_BUS_MASTER; - switch (dma_data->Transfer) - { - case ACPI_TRANSFER_8: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8; break; - case ACPI_TRANSFER_16: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_16; break; - case ACPI_TRANSFER_8_16: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break; - } - ResourceDescriptor->u.Dma.Channel = dma_data->Channels[i]; - - ResourceDescriptor++; - } - break; - } - case ACPI_RESOURCE_TYPE_IO: - { - ACPI_RESOURCE_IO *io_data = (ACPI_RESOURCE_IO*) &resource->Data; - ResourceDescriptor->Type = CmResourceTypePort; - ResourceDescriptor->ShareDisposition = CmResourceShareDriverExclusive; - ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; - if (io_data->IoDecode == ACPI_DECODE_16) - ResourceDescriptor->Flags |= CM_RESOURCE_PORT_16_BIT_DECODE; - else - ResourceDescriptor->Flags |= CM_RESOURCE_PORT_10_BIT_DECODE; - ResourceDescriptor->u.Port.Start.QuadPart = io_data->Minimum; - ResourceDescriptor->u.Port.Length = io_data->AddressLength; - - ResourceDescriptor++; - break; - } - case ACPI_RESOURCE_TYPE_ADDRESS16: - { - ACPI_RESOURCE_ADDRESS16 *addr16_data = (ACPI_RESOURCE_ADDRESS16*) &resource->Data; - if (addr16_data->ResourceType == ACPI_BUS_NUMBER_RANGE) - { - ResourceDescriptor->Type = CmResourceTypeBusNumber; - ResourceDescriptor->ShareDisposition = CmResourceShareShared; - ResourceDescriptor->Flags = 0; - ResourceDescriptor->u.BusNumber.Start = addr16_data->Minimum; - ResourceDescriptor->u.BusNumber.Length = addr16_data->AddressLength; - } - else if (addr16_data->ResourceType == ACPI_IO_RANGE) - { - ResourceDescriptor->Type = CmResourceTypePort; - ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; - if (addr16_data->Decode == ACPI_POS_DECODE) - ResourceDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; - ResourceDescriptor->u.Port.Start.QuadPart = addr16_data->Minimum; - ResourceDescriptor->u.Port.Length = addr16_data->AddressLength; - } - else - { - ResourceDescriptor->Type = CmResourceTypeMemory; - ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - ResourceDescriptor->Flags = 0; - if (addr16_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - switch (addr16_data->Info.Mem.Caching) - { - case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; - case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; - case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; - } - ResourceDescriptor->u.Memory.Start.QuadPart = addr16_data->Minimum; - ResourceDescriptor->u.Memory.Length = addr16_data->AddressLength; - } - ResourceDescriptor++; - break; - } - case ACPI_RESOURCE_TYPE_ADDRESS32: - { - ACPI_RESOURCE_ADDRESS32 *addr32_data = (ACPI_RESOURCE_ADDRESS32*) &resource->Data; - if (addr32_data->ResourceType == ACPI_BUS_NUMBER_RANGE) - { - ResourceDescriptor->Type = CmResourceTypeBusNumber; - ResourceDescriptor->ShareDisposition = CmResourceShareShared; - ResourceDescriptor->Flags = 0; - ResourceDescriptor->u.BusNumber.Start = addr32_data->Minimum; - ResourceDescriptor->u.BusNumber.Length = addr32_data->AddressLength; - } - else if (addr32_data->ResourceType == ACPI_IO_RANGE) - { - ResourceDescriptor->Type = CmResourceTypePort; - ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; - if (addr32_data->Decode == ACPI_POS_DECODE) - ResourceDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; - ResourceDescriptor->u.Port.Start.QuadPart = addr32_data->Minimum; - ResourceDescriptor->u.Port.Length = addr32_data->AddressLength; - } - else - { - ResourceDescriptor->Type = CmResourceTypeMemory; - ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - ResourceDescriptor->Flags = 0; - if (addr32_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - switch (addr32_data->Info.Mem.Caching) - { - case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; - case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; - case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; - } - ResourceDescriptor->u.Memory.Start.QuadPart = addr32_data->Minimum; - ResourceDescriptor->u.Memory.Length = addr32_data->AddressLength; - } - ResourceDescriptor++; - break; - } - case ACPI_RESOURCE_TYPE_ADDRESS64: - { - ACPI_RESOURCE_ADDRESS64 *addr64_data = (ACPI_RESOURCE_ADDRESS64*) &resource->Data; - if (addr64_data->ResourceType == ACPI_BUS_NUMBER_RANGE) - { - DPRINT1("64-bit bus address is not supported!\n"); - ResourceDescriptor->Type = CmResourceTypeBusNumber; - ResourceDescriptor->ShareDisposition = CmResourceShareShared; - ResourceDescriptor->Flags = 0; - ResourceDescriptor->u.BusNumber.Start = (ULONG)addr64_data->Minimum; - ResourceDescriptor->u.BusNumber.Length = addr64_data->AddressLength; - } - else if (addr64_data->ResourceType == ACPI_IO_RANGE) - { - ResourceDescriptor->Type = CmResourceTypePort; - ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; - if (addr64_data->Decode == ACPI_POS_DECODE) - ResourceDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; - ResourceDescriptor->u.Port.Start.QuadPart = addr64_data->Minimum; - ResourceDescriptor->u.Port.Length = addr64_data->AddressLength; - } - else - { - ResourceDescriptor->Type = CmResourceTypeMemory; - ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - ResourceDescriptor->Flags = 0; - if (addr64_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - switch (addr64_data->Info.Mem.Caching) - { - case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; - case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; - case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; - } - ResourceDescriptor->u.Memory.Start.QuadPart = addr64_data->Minimum; - ResourceDescriptor->u.Memory.Length = addr64_data->AddressLength; - } - ResourceDescriptor++; - break; - } - case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: - { - ACPI_RESOURCE_EXTENDED_ADDRESS64 *addr64_data = (ACPI_RESOURCE_EXTENDED_ADDRESS64*) &resource->Data; - if (addr64_data->ResourceType == ACPI_BUS_NUMBER_RANGE) - { - DPRINT1("64-bit bus address is not supported!\n"); - ResourceDescriptor->Type = CmResourceTypeBusNumber; - ResourceDescriptor->ShareDisposition = CmResourceShareShared; - ResourceDescriptor->Flags = 0; - ResourceDescriptor->u.BusNumber.Start = (ULONG)addr64_data->Minimum; - ResourceDescriptor->u.BusNumber.Length = addr64_data->AddressLength; - } - else if (addr64_data->ResourceType == ACPI_IO_RANGE) - { - ResourceDescriptor->Type = CmResourceTypePort; - ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; - if (addr64_data->Decode == ACPI_POS_DECODE) - ResourceDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; - ResourceDescriptor->u.Port.Start.QuadPart = addr64_data->Minimum; - ResourceDescriptor->u.Port.Length = addr64_data->AddressLength; - } - else - { - ResourceDescriptor->Type = CmResourceTypeMemory; - ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - ResourceDescriptor->Flags = 0; - if (addr64_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - switch (addr64_data->Info.Mem.Caching) - { - case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; - case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; - case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; - } - ResourceDescriptor->u.Memory.Start.QuadPart = addr64_data->Minimum; - ResourceDescriptor->u.Memory.Length = addr64_data->AddressLength; - } - ResourceDescriptor++; - break; - } - case ACPI_RESOURCE_TYPE_MEMORY24: - { - ACPI_RESOURCE_MEMORY24 *mem24_data = (ACPI_RESOURCE_MEMORY24*) &resource->Data; - ResourceDescriptor->Type = CmResourceTypeMemory; - ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - ResourceDescriptor->Flags = CM_RESOURCE_MEMORY_24; - if (mem24_data->WriteProtect == ACPI_READ_ONLY_MEMORY) - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - ResourceDescriptor->u.Memory.Start.QuadPart = mem24_data->Minimum; - ResourceDescriptor->u.Memory.Length = mem24_data->AddressLength; - - ResourceDescriptor++; - break; - } - case ACPI_RESOURCE_TYPE_MEMORY32: - { - ACPI_RESOURCE_MEMORY32 *mem32_data = (ACPI_RESOURCE_MEMORY32*) &resource->Data; - ResourceDescriptor->Type = CmResourceTypeMemory; - ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - ResourceDescriptor->Flags = 0; - if (mem32_data->WriteProtect == ACPI_READ_ONLY_MEMORY) - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - ResourceDescriptor->u.Memory.Start.QuadPart = mem32_data->Minimum; - ResourceDescriptor->u.Memory.Length = mem32_data->AddressLength; - - ResourceDescriptor++; - break; - } + while (resource->Type != ACPI_RESOURCE_TYPE_END_TAG) + { + switch (resource->Type) + { + case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: + { + ACPI_RESOURCE_EXTENDED_IRQ *irq_data = (ACPI_RESOURCE_EXTENDED_IRQ*) &resource->Data; + if (irq_data->ProducerConsumer == ACPI_PRODUCER) + break; + for (i = 0; i < irq_data->InterruptCount; i++) + { + ResourceDescriptor->Type = CmResourceTypeInterrupt; + + ResourceDescriptor->ShareDisposition = + (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); + ResourceDescriptor->Flags = + (irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); + ResourceDescriptor->u.Interrupt.Level = + ResourceDescriptor->u.Interrupt.Vector = irq_data->Interrupts[i]; + ResourceDescriptor->u.Interrupt.Affinity = (KAFFINITY)(-1); + + ResourceDescriptor++; + } + break; + } + case ACPI_RESOURCE_TYPE_IRQ: + { + ACPI_RESOURCE_IRQ *irq_data = (ACPI_RESOURCE_IRQ*) &resource->Data; + for (i = 0; i < irq_data->InterruptCount; i++) + { + ResourceDescriptor->Type = CmResourceTypeInterrupt; + + ResourceDescriptor->ShareDisposition = + (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); + ResourceDescriptor->Flags = + (irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); + ResourceDescriptor->u.Interrupt.Level = + ResourceDescriptor->u.Interrupt.Vector = irq_data->Interrupts[i]; + ResourceDescriptor->u.Interrupt.Affinity = (KAFFINITY)(-1); + + ResourceDescriptor++; + } + break; + } + case ACPI_RESOURCE_TYPE_DMA: + { + ACPI_RESOURCE_DMA *dma_data = (ACPI_RESOURCE_DMA*) &resource->Data; + for (i = 0; i < dma_data->ChannelCount; i++) + { + ResourceDescriptor->Type = CmResourceTypeDma; + ResourceDescriptor->Flags = 0; + switch (dma_data->Type) + { + case ACPI_TYPE_A: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_A; break; + case ACPI_TYPE_B: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_B; break; + case ACPI_TYPE_F: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_F; break; + } + if (dma_data->BusMaster == ACPI_BUS_MASTER) + ResourceDescriptor->Flags |= CM_RESOURCE_DMA_BUS_MASTER; + switch (dma_data->Transfer) + { + case ACPI_TRANSFER_8: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8; break; + case ACPI_TRANSFER_16: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_16; break; + case ACPI_TRANSFER_8_16: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break; + } + ResourceDescriptor->u.Dma.Channel = dma_data->Channels[i]; + + ResourceDescriptor++; + } + break; + } + case ACPI_RESOURCE_TYPE_IO: + { + ACPI_RESOURCE_IO *io_data = (ACPI_RESOURCE_IO*) &resource->Data; + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDriverExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (io_data->IoDecode == ACPI_DECODE_16) + ResourceDescriptor->Flags |= CM_RESOURCE_PORT_16_BIT_DECODE; + else + ResourceDescriptor->Flags |= CM_RESOURCE_PORT_10_BIT_DECODE; + ResourceDescriptor->u.Port.Start.QuadPart = io_data->Minimum; + ResourceDescriptor->u.Port.Length = io_data->AddressLength; + + ResourceDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS16: + { + ACPI_RESOURCE_ADDRESS16 *addr16_data = (ACPI_RESOURCE_ADDRESS16*) &resource->Data; + if (addr16_data->ProducerConsumer == ACPI_PRODUCER) + break; + if (addr16_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + ResourceDescriptor->Type = CmResourceTypeBusNumber; + ResourceDescriptor->ShareDisposition = CmResourceShareShared; + ResourceDescriptor->Flags = 0; + ResourceDescriptor->u.BusNumber.Start = addr16_data->Minimum; + ResourceDescriptor->u.BusNumber.Length = addr16_data->AddressLength; + } + else if (addr16_data->ResourceType == ACPI_IO_RANGE) + { + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr16_data->Decode == ACPI_POS_DECODE) + ResourceDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + ResourceDescriptor->u.Port.Start.QuadPart = addr16_data->Minimum; + ResourceDescriptor->u.Port.Length = addr16_data->AddressLength; + } + else + { + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = 0; + if (addr16_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr16_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + ResourceDescriptor->u.Memory.Start.QuadPart = addr16_data->Minimum; + ResourceDescriptor->u.Memory.Length = addr16_data->AddressLength; + } + ResourceDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS32: + { + ACPI_RESOURCE_ADDRESS32 *addr32_data = (ACPI_RESOURCE_ADDRESS32*) &resource->Data; + if (addr32_data->ProducerConsumer == ACPI_PRODUCER) + break; + if (addr32_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + ResourceDescriptor->Type = CmResourceTypeBusNumber; + ResourceDescriptor->ShareDisposition = CmResourceShareShared; + ResourceDescriptor->Flags = 0; + ResourceDescriptor->u.BusNumber.Start = addr32_data->Minimum; + ResourceDescriptor->u.BusNumber.Length = addr32_data->AddressLength; + } + else if (addr32_data->ResourceType == ACPI_IO_RANGE) + { + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr32_data->Decode == ACPI_POS_DECODE) + ResourceDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + ResourceDescriptor->u.Port.Start.QuadPart = addr32_data->Minimum; + ResourceDescriptor->u.Port.Length = addr32_data->AddressLength; + } + else + { + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = 0; + if (addr32_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr32_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + ResourceDescriptor->u.Memory.Start.QuadPart = addr32_data->Minimum; + ResourceDescriptor->u.Memory.Length = addr32_data->AddressLength; + } + ResourceDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS64: + { + ACPI_RESOURCE_ADDRESS64 *addr64_data = (ACPI_RESOURCE_ADDRESS64*) &resource->Data; + if (addr64_data->ProducerConsumer == ACPI_PRODUCER) + break; + if (addr64_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + DPRINT1("64-bit bus address is not supported!\n"); + ResourceDescriptor->Type = CmResourceTypeBusNumber; + ResourceDescriptor->ShareDisposition = CmResourceShareShared; + ResourceDescriptor->Flags = 0; + ResourceDescriptor->u.BusNumber.Start = (ULONG)addr64_data->Minimum; + ResourceDescriptor->u.BusNumber.Length = addr64_data->AddressLength; + } + else if (addr64_data->ResourceType == ACPI_IO_RANGE) + { + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr64_data->Decode == ACPI_POS_DECODE) + ResourceDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + ResourceDescriptor->u.Port.Start.QuadPart = addr64_data->Minimum; + ResourceDescriptor->u.Port.Length = addr64_data->AddressLength; + } + else + { + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = 0; + if (addr64_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr64_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + ResourceDescriptor->u.Memory.Start.QuadPart = addr64_data->Minimum; + ResourceDescriptor->u.Memory.Length = addr64_data->AddressLength; + } + ResourceDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: + { + ACPI_RESOURCE_EXTENDED_ADDRESS64 *addr64_data = (ACPI_RESOURCE_EXTENDED_ADDRESS64*) &resource->Data; + if (addr64_data->ProducerConsumer == ACPI_PRODUCER) + break; + if (addr64_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + DPRINT1("64-bit bus address is not supported!\n"); + ResourceDescriptor->Type = CmResourceTypeBusNumber; + ResourceDescriptor->ShareDisposition = CmResourceShareShared; + ResourceDescriptor->Flags = 0; + ResourceDescriptor->u.BusNumber.Start = (ULONG)addr64_data->Minimum; + ResourceDescriptor->u.BusNumber.Length = addr64_data->AddressLength; + } + else if (addr64_data->ResourceType == ACPI_IO_RANGE) + { + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr64_data->Decode == ACPI_POS_DECODE) + ResourceDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + ResourceDescriptor->u.Port.Start.QuadPart = addr64_data->Minimum; + ResourceDescriptor->u.Port.Length = addr64_data->AddressLength; + } + else + { + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = 0; + if (addr64_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr64_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + ResourceDescriptor->u.Memory.Start.QuadPart = addr64_data->Minimum; + ResourceDescriptor->u.Memory.Length = addr64_data->AddressLength; + } + ResourceDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_MEMORY24: + { + ACPI_RESOURCE_MEMORY24 *mem24_data = (ACPI_RESOURCE_MEMORY24*) &resource->Data; + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_MEMORY_24; + if (mem24_data->WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + ResourceDescriptor->u.Memory.Start.QuadPart = mem24_data->Minimum; + ResourceDescriptor->u.Memory.Length = mem24_data->AddressLength; + + ResourceDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_MEMORY32: + { + ACPI_RESOURCE_MEMORY32 *mem32_data = (ACPI_RESOURCE_MEMORY32*) &resource->Data; + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = 0; + if (mem32_data->WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + ResourceDescriptor->u.Memory.Start.QuadPart = mem32_data->Minimum; + ResourceDescriptor->u.Memory.Length = mem32_data->AddressLength; + + ResourceDescriptor++; + break; + } case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: { ACPI_RESOURCE_FIXED_MEMORY32 *memfixed32_data = (ACPI_RESOURCE_FIXED_MEMORY32*) &resource->Data; - ResourceDescriptor->Type = CmResourceTypeMemory; - ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - ResourceDescriptor->Flags = 0; - if (memfixed32_data->WriteProtect == ACPI_READ_ONLY_MEMORY) - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - ResourceDescriptor->u.Memory.Start.QuadPart = memfixed32_data->Address; - ResourceDescriptor->u.Memory.Length = memfixed32_data->AddressLength; + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = 0; + if (memfixed32_data->WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + ResourceDescriptor->u.Memory.Start.QuadPart = memfixed32_data->Address; + ResourceDescriptor->u.Memory.Length = memfixed32_data->AddressLength; - ResourceDescriptor++; - break; - } - default: - { - break; - } - } - resource = ACPI_NEXT_RESOURCE(resource); - } + ResourceDescriptor++; + break; + } + default: + { + break; + } + } + resource = ACPI_NEXT_RESOURCE(resource); + } ExFreePoolWithTag(Buffer.Pointer, 'IPCA'); - Irp->IoStatus.Information = (ULONG_PTR)ResourceList; - return STATUS_SUCCESS; + Irp->IoStatus.Information = (ULONG_PTR)ResourceList; + return STATUS_SUCCESS; } NTSTATUS @@ -1120,14 +1139,14 @@ PPDO_DEVICE_DATA DeviceData, PIRP Irp ) { - ULONG NumberOfResources = 0; - ACPI_STATUS AcpiStatus; - ACPI_BUFFER Buffer; - ACPI_RESOURCE* resource; - ULONG i, RequirementsListSize; - PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; - PIO_RESOURCE_DESCRIPTOR RequirementDescriptor; - BOOLEAN CurrentRes = FALSE; + ULONG NumberOfResources = 0; + ACPI_STATUS AcpiStatus; + ACPI_BUFFER Buffer; + ACPI_RESOURCE* resource; + ULONG i, RequirementsListSize; + PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; + PIO_RESOURCE_DESCRIPTOR RequirementDescriptor; + BOOLEAN CurrentRes = FALSE; PAGED_CODE (); @@ -1147,7 +1166,7 @@ { Buffer.Length = 0; if (CurrentRes) - AcpiStatus = AcpiGetCurrentResources(DeviceData->AcpiHandle, &Buffer); + AcpiStatus = AcpiGetCurrentResources(DeviceData->AcpiHandle, &Buffer); else AcpiStatus = AcpiGetPossibleResources(DeviceData->AcpiHandle, &Buffer); if ((!ACPI_SUCCESS(AcpiStatus) && AcpiStatus != AE_BUFFER_OVERFLOW) || @@ -1177,403 +1196,422 @@ return STATUS_UNSUCCESSFUL; } - resource= Buffer.Pointer; - /* Count number of resources */ - while (resource->Type != ACPI_RESOURCE_TYPE_END_TAG) - { - switch (resource->Type) - { - case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: - { - ACPI_RESOURCE_EXTENDED_IRQ *irq_data = (ACPI_RESOURCE_EXTENDED_IRQ*) &resource->Data; - NumberOfResources += irq_data->InterruptCount; - break; - } - case ACPI_RESOURCE_TYPE_IRQ: - { - ACPI_RESOURCE_IRQ *irq_data = (ACPI_RESOURCE_IRQ*) &resource->Data; - NumberOfResources += irq_data->InterruptCount; - break; - } - case ACPI_RESOURCE_TYPE_DMA: - { - ACPI_RESOURCE_DMA *dma_data = (ACPI_RESOURCE_DMA*) &resource->Data; - NumberOfResources += dma_data->ChannelCount; - break; - } - case ACPI_RESOURCE_TYPE_ADDRESS16: - case ACPI_RESOURCE_TYPE_ADDRESS32: - case ACPI_RESOURCE_TYPE_ADDRESS64: - case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: - case ACPI_RESOURCE_TYPE_MEMORY24: - case ACPI_RESOURCE_TYPE_MEMORY32: + resource= Buffer.Pointer; + /* Count number of resources */ + while (resource->Type != ACPI_RESOURCE_TYPE_END_TAG) + { + switch (resource->Type) + { + case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: + { + ACPI_RESOURCE_EXTENDED_IRQ *irq_data = (ACPI_RESOURCE_EXTENDED_IRQ*) &resource->Data; + if (irq_data->ProducerConsumer == ACPI_PRODUCER) + break; + NumberOfResources += irq_data->InterruptCount; + break; + } + case ACPI_RESOURCE_TYPE_IRQ: + { + ACPI_RESOURCE_IRQ *irq_data = (ACPI_RESOURCE_IRQ*) &resource->Data; + NumberOfResources += irq_data->InterruptCount; + break; + } + case ACPI_RESOURCE_TYPE_DMA: + { + ACPI_RESOURCE_DMA *dma_data = (ACPI_RESOURCE_DMA*) &resource->Data; + NumberOfResources += dma_data->ChannelCount; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS16: + case ACPI_RESOURCE_TYPE_ADDRESS32: + case ACPI_RESOURCE_TYPE_ADDRESS64: + case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: + { + ACPI_RESOURCE_ADDRESS *res_addr = (ACPI_RESOURCE_ADDRESS*) &resource->Data; + if (res_addr->ProducerConsumer == ACPI_PRODUCER) + break; + NumberOfResources++; + break; + } + case ACPI_RESOURCE_TYPE_MEMORY24: + case ACPI_RESOURCE_TYPE_MEMORY32: case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: - case ACPI_RESOURCE_TYPE_IO: - { - NumberOfResources++; - break; - } - default: - { - break; - } - } - resource = ACPI_NEXT_RESOURCE(resource); - } - - RequirementsListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + sizeof(IO_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); - RequirementsList = (PIO_RESOURCE_REQUIREMENTS_LIST)ExAllocatePoolWithTag(PagedPool, RequirementsListSize, 'IPCA'); - - if (!RequirementsList) - { - ExFreePoolWithTag(Buffer.Pointer, 'IPCA'); - return STATUS_INSUFFICIENT_RESOURCES; - } - RequirementsList->ListSize = RequirementsListSize; - RequirementsList->InterfaceType = Internal; - RequirementsList->BusNumber = 0; - RequirementsList->SlotNumber = 0; /* Not used by WDM drivers */ - RequirementsList->AlternativeLists = 1; - RequirementsList->List[0].Version = 1; - RequirementsList->List[0].Revision = 1; - RequirementsList->List[0].Count = NumberOfResources; - RequirementDescriptor = RequirementsList->List[0].Descriptors; - - /* Fill resources list structure */ + case ACPI_RESOURCE_TYPE_IO: + { + NumberOfResources++; + break; + } + default: + { + break; + } + } + resource = ACPI_NEXT_RESOURCE(resource); + } + + RequirementsListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + sizeof(IO_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); + RequirementsList = (PIO_RESOURCE_REQUIREMENTS_LIST)ExAllocatePoolWithTag(PagedPool, RequirementsListSize, 'IPCA'); + + if (!RequirementsList) + { + ExFreePoolWithTag(Buffer.Pointer, 'IPCA'); + return STATUS_INSUFFICIENT_RESOURCES; + } + RequirementsList->ListSize = RequirementsListSize; + RequirementsList->InterfaceType = Internal; + RequirementsList->BusNumber = 0; + RequirementsList->SlotNumber = 0; /* Not used by WDM drivers */ + RequirementsList->AlternativeLists = 1; + RequirementsList->List[0].Version = 1; + RequirementsList->List[0].Revision = 1; + RequirementsList->List[0].Count = NumberOfResources; + RequirementDescriptor = RequirementsList->List[0].Descriptors; + + /* Fill resources list structure */ resource = Buffer.Pointer; - while (resource->Type != ACPI_RESOURCE_TYPE_END_TAG) - { - switch (resource->Type) - { - case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: - { - ACPI_RESOURCE_EXTENDED_IRQ *irq_data = (ACPI_RESOURCE_EXTENDED_IRQ*) &resource->Data; - for (i = 0; i < irq_data->InterruptCount; i++) - { - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; - RequirementDescriptor->Type = CmResourceTypeInterrupt; - RequirementDescriptor->ShareDisposition = (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); - RequirementDescriptor->Flags =(irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); - RequirementDescriptor->u.Interrupt.MinimumVector = - RequirementDescriptor->u.Interrupt.MaximumVector = irq_data->Interrupts[i]; - - RequirementDescriptor++; - } - break; - } - case ACPI_RESOURCE_TYPE_IRQ: - { - ACPI_RESOURCE_IRQ *irq_data = (ACPI_RESOURCE_IRQ*) &resource->Data; - for (i = 0; i < irq_data->InterruptCount; i++) - { - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; - RequirementDescriptor->Type = CmResourceTypeInterrupt; - RequirementDescriptor->ShareDisposition = (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); - RequirementDescriptor->Flags =(irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); - RequirementDescriptor->u.Interrupt.MinimumVector = - RequirementDescriptor->u.Interrupt.MaximumVector = irq_data->Interrupts[i]; - - RequirementDescriptor++; - } - break; - } - case ACPI_RESOURCE_TYPE_DMA: - { - ACPI_RESOURCE_DMA *dma_data = (ACPI_RESOURCE_DMA*) &resource->Data; - for (i = 0; i < dma_data->ChannelCount; i++) - { - RequirementDescriptor->Type = CmResourceTypeDma; - RequirementDescriptor->Flags = 0; - switch (dma_data->Type) - { - case ACPI_TYPE_A: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_A; break; - case ACPI_TYPE_B: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_B; break; - case ACPI_TYPE_F: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_F; break; - } - if (dma_data->BusMaster == ACPI_BUS_MASTER) - RequirementDescriptor->Flags |= CM_RESOURCE_DMA_BUS_MASTER; - switch (dma_data->Transfer) - { - case ACPI_TRANSFER_8: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_8; break; - case ACPI_TRANSFER_16: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_16; break; - case ACPI_TRANSFER_8_16: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break; - } - - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; - RequirementDescriptor->ShareDisposition = CmResourceShareDriverExclusive; - RequirementDescriptor->u.Dma.MinimumChannel = - RequirementDescriptor->u.Dma.MaximumChannel = dma_data->Channels[i]; - RequirementDescriptor++; - } - break; - } - case ACPI_RESOURCE_TYPE_IO: - { - ACPI_RESOURCE_IO *io_data = (ACPI_RESOURCE_IO*) &resource->Data; - RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; - if (io_data->IoDecode == ACPI_DECODE_16) - RequirementDescriptor->Flags |= CM_RESOURCE_PORT_16_BIT_DECODE; - else - RequirementDescriptor->Flags |= CM_RESOURCE_PORT_10_BIT_DECODE; - RequirementDescriptor->u.Port.Length = io_data->AddressLength; - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; - RequirementDescriptor->Type = CmResourceTypePort; - RequirementDescriptor->ShareDisposition = CmResourceShareDriverExclusive; - RequirementDescriptor->u.Port.Alignment = io_data->Alignment; - RequirementDescriptor->u.Port.MinimumAddress.QuadPart = io_data->Minimum; - RequirementDescriptor->u.Port.MaximumAddress.QuadPart = io_data->Maximum + io_data->AddressLength - 1; - - RequirementDescriptor++; - break; - } - case ACPI_RESOURCE_TYPE_ADDRESS16: - { - ACPI_RESOURCE_ADDRESS16 *addr16_data = (ACPI_RESOURCE_ADDRESS16*) &resource->Data; - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; - if (addr16_data->ResourceType == ACPI_BUS_NUMBER_RANGE) - { - RequirementDescriptor->Type = CmResourceTypeBusNumber; - RequirementDescriptor->ShareDisposition = CmResourceShareShared; - RequirementDescriptor->Flags = 0; - RequirementDescriptor->u.BusNumber.MinBusNumber = addr16_data->Minimum; - RequirementDescriptor->u.BusNumber.MaxBusNumber = addr16_data->Maximum + addr16_data->AddressLength - 1; - RequirementDescriptor->u.BusNumber.Length = addr16_data->AddressLength; - } - else if (addr16_data->ResourceType == ACPI_IO_RANGE) - { - RequirementDescriptor->Type = CmResourceTypePort; - RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; - if (addr16_data->Decode == ACPI_POS_DECODE) - RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; - RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr16_data->Minimum; - RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr16_data->Maximum + addr16_data->AddressLength - 1; - RequirementDescriptor->u.Port.Length = addr16_data->AddressLength; - } - else - { - RequirementDescriptor->Type = CmResourceTypeMemory; - RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - RequirementDescriptor->Flags = 0; - if (addr16_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - switch (addr16_data->Info.Mem.Caching) - { - case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; - case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; - case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; - } - RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr16_data->Minimum; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr16_data->Maximum + addr16_data->AddressLength - 1; - RequirementDescriptor->u.Memory.Length = addr16_data->AddressLength; - } - RequirementDescriptor++; - break; - } - case ACPI_RESOURCE_TYPE_ADDRESS32: - { - ACPI_RESOURCE_ADDRESS32 *addr32_data = (ACPI_RESOURCE_ADDRESS32*) &resource->Data; - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; - if (addr32_data->ResourceType == ACPI_BUS_NUMBER_RANGE) - { - RequirementDescriptor->Type = CmResourceTypeBusNumber; - RequirementDescriptor->ShareDisposition = CmResourceShareShared; - RequirementDescriptor->Flags = 0; - RequirementDescriptor->u.BusNumber.MinBusNumber = addr32_data->Minimum; - RequirementDescriptor->u.BusNumber.MaxBusNumber = addr32_data->Maximum + addr32_data->AddressLength - 1; - RequirementDescriptor->u.BusNumber.Length = addr32_data->AddressLength; - } - else if (addr32_data->ResourceType == ACPI_IO_RANGE) - { - RequirementDescriptor->Type = CmResourceTypePort; - RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; - if (addr32_data->Decode == ACPI_POS_DECODE) - RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; - RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr32_data->Minimum; - RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr32_data->Maximum + addr32_data->AddressLength - 1; - RequirementDescriptor->u.Port.Length = addr32_data->AddressLength; - } - else - { - RequirementDescriptor->Type = CmResourceTypeMemory; - RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - RequirementDescriptor->Flags = 0; - if (addr32_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - switch (addr32_data->Info.Mem.Caching) - { - case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; - case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; - case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; - } - RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr32_data->Minimum; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr32_data->Maximum + addr32_data->AddressLength - 1; - RequirementDescriptor->u.Memory.Length = addr32_data->AddressLength; - } - RequirementDescriptor++; - break; - } - case ACPI_RESOURCE_TYPE_ADDRESS64: - { - ACPI_RESOURCE_ADDRESS64 *addr64_data = (ACPI_RESOURCE_ADDRESS64*) &resource->Data; - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; - if (addr64_data->ResourceType == ACPI_BUS_NUMBER_RANGE) - { - DPRINT1("64-bit bus address is not supported!\n"); - RequirementDescriptor->Type = CmResourceTypeBusNumber; - RequirementDescriptor->ShareDisposition = CmResourceShareShared; - RequirementDescriptor->Flags = 0; - RequirementDescriptor->u.BusNumber.MinBusNumber = (ULONG)addr64_data->Minimum; - RequirementDescriptor->u.BusNumber.MaxBusNumber = (ULONG)addr64_data->Maximum + addr64_data->AddressLength - 1; - RequirementDescriptor->u.BusNumber.Length = addr64_data->AddressLength; - } - else if (addr64_data->ResourceType == ACPI_IO_RANGE) - { - RequirementDescriptor->Type = CmResourceTypePort; - RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; - if (addr64_data->Decode == ACPI_POS_DECODE) - RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; - RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr64_data->Minimum; - RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; - RequirementDescriptor->u.Port.Length = addr64_data->AddressLength; - } - else - { - RequirementDescriptor->Type = CmResourceTypeMemory; - RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - RequirementDescriptor->Flags = 0; - if (addr64_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - switch (addr64_data->Info.Mem.Caching) - { - case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; - case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; - case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; - } - RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr64_data->Minimum; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; - RequirementDescriptor->u.Memory.Length = addr64_data->AddressLength; - } - RequirementDescriptor++; - break; - } - case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: - { - ACPI_RESOURCE_EXTENDED_ADDRESS64 *addr64_data = (ACPI_RESOURCE_EXTENDED_ADDRESS64*) &resource->Data; - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; - if (addr64_data->ResourceType == ACPI_BUS_NUMBER_RANGE) - { - DPRINT1("64-bit bus address is not supported!\n"); - RequirementDescriptor->Type = CmResourceTypeBusNumber; - RequirementDescriptor->ShareDisposition = CmResourceShareShared; - RequirementDescriptor->Flags = 0; - RequirementDescriptor->u.BusNumber.MinBusNumber = (ULONG)addr64_data->Minimum; - RequirementDescriptor->u.BusNumber.MaxBusNumber = (ULONG)addr64_data->Maximum + addr64_data->AddressLength - 1; - RequirementDescriptor->u.BusNumber.Length = addr64_data->AddressLength; - } - else if (addr64_data->ResourceType == ACPI_IO_RANGE) - { - RequirementDescriptor->Type = CmResourceTypePort; - RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; - if (addr64_data->Decode == ACPI_POS_DECODE) - RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; - RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr64_data->Minimum; - RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; - RequirementDescriptor->u.Port.Length = addr64_data->AddressLength; - } - else - { - RequirementDescriptor->Type = CmResourceTypeMemory; - RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - RequirementDescriptor->Flags = 0; - if (addr64_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - switch (addr64_data->Info.Mem.Caching) - { - case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; - case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; - case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; - } - RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr64_data->Minimum; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; - RequirementDescriptor->u.Memory.Length = addr64_data->AddressLength; - } - RequirementDescriptor++; - break; - } - case ACPI_RESOURCE_TYPE_MEMORY24: - { - ACPI_RESOURCE_MEMORY24 *mem24_data = (ACPI_RESOURCE_MEMORY24*) &resource->Data; - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; - RequirementDescriptor->Type = CmResourceTypeMemory; - RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - RequirementDescriptor->Flags = CM_RESOURCE_MEMORY_24; - if (mem24_data->WriteProtect == ACPI_READ_ONLY_MEMORY) - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = mem24_data->Minimum; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = mem24_data->Maximum + mem24_data->AddressLength - 1; - RequirementDescriptor->u.Memory.Length = mem24_data->AddressLength; - - RequirementDescriptor++; - break; - } - case ACPI_RESOURCE_TYPE_MEMORY32: - { - ACPI_RESOURCE_MEMORY32 *mem32_data = (ACPI_RESOURCE_MEMORY32*) &resource->Data; - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; - RequirementDescriptor->Type = CmResourceTypeMemory; - RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - RequirementDescriptor->Flags = 0; - if (mem32_data->WriteProtect == ACPI_READ_ONLY_MEMORY) - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = mem32_data->Minimum; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = mem32_data->Maximum + mem32_data->AddressLength - 1; - RequirementDescriptor->u.Memory.Length = mem32_data->AddressLength; - - RequirementDescriptor++; - break; - } + while (resource->Type != ACPI_RESOURCE_TYPE_END_TAG) + { + switch (resource->Type) + { + case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: + { + ACPI_RESOURCE_EXTENDED_IRQ *irq_data = (ACPI_RESOURCE_EXTENDED_IRQ*) &resource->Data; + if (irq_data->ProducerConsumer == ACPI_PRODUCER) + break; + for (i = 0; i < irq_data->InterruptCount; i++) + { + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->Type = CmResourceTypeInterrupt; + RequirementDescriptor->ShareDisposition = (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); + RequirementDescriptor->Flags =(irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); + RequirementDescriptor->u.Interrupt.MinimumVector = + RequirementDescriptor->u.Interrupt.MaximumVector = irq_data->Interrupts[i]; + + RequirementDescriptor++; + } + break; + } + case ACPI_RESOURCE_TYPE_IRQ: + { + ACPI_RESOURCE_IRQ *irq_data = (ACPI_RESOURCE_IRQ*) &resource->Data; + for (i = 0; i < irq_data->InterruptCount; i++) + { + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->Type = CmResourceTypeInterrupt; + RequirementDescriptor->ShareDisposition = (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); + RequirementDescriptor->Flags =(irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); + RequirementDescriptor->u.Interrupt.MinimumVector = + RequirementDescriptor->u.Interrupt.MaximumVector = irq_data->Interrupts[i]; + + RequirementDescriptor++; + } + break; + } + case ACPI_RESOURCE_TYPE_DMA: + { + ACPI_RESOURCE_DMA *dma_data = (ACPI_RESOURCE_DMA*) &resource->Data; + for (i = 0; i < dma_data->ChannelCount; i++) + { + RequirementDescriptor->Type = CmResourceTypeDma; + RequirementDescriptor->Flags = 0; + switch (dma_data->Type) + { + case ACPI_TYPE_A: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_A; break; + case ACPI_TYPE_B: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_B; break; + case ACPI_TYPE_F: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_F; break; + } + if (dma_data->BusMaster == ACPI_BUS_MASTER) + RequirementDescriptor->Flags |= CM_RESOURCE_DMA_BUS_MASTER; + switch (dma_data->Transfer) + { + case ACPI_TRANSFER_8: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_8; break; + case ACPI_TRANSFER_16: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_16; break; + case ACPI_TRANSFER_8_16: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break; + } + + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->ShareDisposition = CmResourceShareDriverExclusive; + RequirementDescriptor->u.Dma.MinimumChannel = + RequirementDescriptor->u.Dma.MaximumChannel = dma_data->Channels[i]; + RequirementDescriptor++; + } + break; + } + case ACPI_RESOURCE_TYPE_IO: + { + ACPI_RESOURCE_IO *io_data = (ACPI_RESOURCE_IO*) &resource->Data; + RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (io_data->IoDecode == ACPI_DECODE_16) + RequirementDescriptor->Flags |= CM_RESOURCE_PORT_16_BIT_DECODE; + else + RequirementDescriptor->Flags |= CM_RESOURCE_PORT_10_BIT_DECODE; + RequirementDescriptor->u.Port.Length = io_data->AddressLength; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->Type = CmResourceTypePort; + RequirementDescriptor->ShareDisposition = CmResourceShareDriverExclusive; + RequirementDescriptor->u.Port.Alignment = io_data->Alignment; + RequirementDescriptor->u.Port.MinimumAddress.QuadPart = io_data->Minimum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = io_data->Maximum + io_data->AddressLength - 1; + + RequirementDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS16: + { + ACPI_RESOURCE_ADDRESS16 *addr16_data = (ACPI_RESOURCE_ADDRESS16*) &resource->Data; + if (addr16_data->ProducerConsumer == ACPI_PRODUCER) + break; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + if (addr16_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + RequirementDescriptor->Type = CmResourceTypeBusNumber; + RequirementDescriptor->ShareDisposition = CmResourceShareShared; + RequirementDescriptor->Flags = 0; + RequirementDescriptor->u.BusNumber.MinBusNumber = addr16_data->Minimum; + RequirementDescriptor->u.BusNumber.MaxBusNumber = addr16_data->Maximum + addr16_data->AddressLength - 1; + RequirementDescriptor->u.BusNumber.Length = addr16_data->AddressLength; + } + else if (addr16_data->ResourceType == ACPI_IO_RANGE) + { + RequirementDescriptor->Type = CmResourceTypePort; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr16_data->Decode == ACPI_POS_DECODE) + RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr16_data->Minimum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr16_data->Maximum + addr16_data->AddressLength - 1; + RequirementDescriptor->u.Port.Length = addr16_data->AddressLength; + } + else + { + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = 0; + if (addr16_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr16_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr16_data->Minimum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr16_data->Maximum + addr16_data->AddressLength - 1; + RequirementDescriptor->u.Memory.Length = addr16_data->AddressLength; + } + RequirementDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS32: + { + ACPI_RESOURCE_ADDRESS32 *addr32_data = (ACPI_RESOURCE_ADDRESS32*) &resource->Data; + if (addr32_data->ProducerConsumer == ACPI_PRODUCER) + break; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + if (addr32_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + RequirementDescriptor->Type = CmResourceTypeBusNumber; + RequirementDescriptor->ShareDisposition = CmResourceShareShared; + RequirementDescriptor->Flags = 0; + RequirementDescriptor->u.BusNumber.MinBusNumber = addr32_data->Minimum; + RequirementDescriptor->u.BusNumber.MaxBusNumber = addr32_data->Maximum + addr32_data->AddressLength - 1; + RequirementDescriptor->u.BusNumber.Length = addr32_data->AddressLength; + } + else if (addr32_data->ResourceType == ACPI_IO_RANGE) + { + RequirementDescriptor->Type = CmResourceTypePort; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr32_data->Decode == ACPI_POS_DECODE) + RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr32_data->Minimum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr32_data->Maximum + addr32_data->AddressLength - 1; + RequirementDescriptor->u.Port.Length = addr32_data->AddressLength; + } + else + { + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = 0; + if (addr32_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr32_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr32_data->Minimum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr32_data->Maximum + addr32_data->AddressLength - 1; + RequirementDescriptor->u.Memory.Length = addr32_data->AddressLength; + } + RequirementDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS64: + { + ACPI_RESOURCE_ADDRESS64 *addr64_data = (ACPI_RESOURCE_ADDRESS64*) &resource->Data; + if (addr64_data->ProducerConsumer == ACPI_PRODUCER) + break; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + if (addr64_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + DPRINT1("64-bit bus address is not supported!\n"); + RequirementDescriptor->Type = CmResourceTypeBusNumber; + RequirementDescriptor->ShareDisposition = CmResourceShareShared; + RequirementDescriptor->Flags = 0; + RequirementDescriptor->u.BusNumber.MinBusNumber = (ULONG)addr64_data->Minimum; + RequirementDescriptor->u.BusNumber.MaxBusNumber = (ULONG)addr64_data->Maximum + addr64_data->AddressLength - 1; + RequirementDescriptor->u.BusNumber.Length = addr64_data->AddressLength; + } + else if (addr64_data->ResourceType == ACPI_IO_RANGE) + { + RequirementDescriptor->Type = CmResourceTypePort; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr64_data->Decode == ACPI_POS_DECODE) + RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr64_data->Minimum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; + RequirementDescriptor->u.Port.Length = addr64_data->AddressLength; + } + else + { + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = 0; + if (addr64_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr64_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr64_data->Minimum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; + RequirementDescriptor->u.Memory.Length = addr64_data->AddressLength; + } + RequirementDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: + { + ACPI_RESOURCE_EXTENDED_ADDRESS64 *addr64_data = (ACPI_RESOURCE_EXTENDED_ADDRESS64*) &resource->Data; + if (addr64_data->ProducerConsumer == ACPI_PRODUCER) + break; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + if (addr64_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + DPRINT1("64-bit bus address is not supported!\n"); + RequirementDescriptor->Type = CmResourceTypeBusNumber; + RequirementDescriptor->ShareDisposition = CmResourceShareShared; + RequirementDescriptor->Flags = 0; + RequirementDescriptor->u.BusNumber.MinBusNumber = (ULONG)addr64_data->Minimum; + RequirementDescriptor->u.BusNumber.MaxBusNumber = (ULONG)addr64_data->Maximum + addr64_data->AddressLength - 1; + RequirementDescriptor->u.BusNumber.Length = addr64_data->AddressLength; + } + else if (addr64_data->ResourceType == ACPI_IO_RANGE) + { + RequirementDescriptor->Type = CmResourceTypePort; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr64_data->Decode == ACPI_POS_DECODE) + RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr64_data->Minimum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; + RequirementDescriptor->u.Port.Length = addr64_data->AddressLength; + } + else + { + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = 0; + if (addr64_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr64_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr64_data->Minimum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; + RequirementDescriptor->u.Memory.Length = addr64_data->AddressLength; + } + RequirementDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_MEMORY24: + { + ACPI_RESOURCE_MEMORY24 *mem24_data = (ACPI_RESOURCE_MEMORY24*) &resource->Data; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = CM_RESOURCE_MEMORY_24; + if (mem24_data->WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = mem24_data->Minimum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = mem24_data->Maximum + mem24_data->AddressLength - 1; + RequirementDescriptor->u.Memory.Length = mem24_data->AddressLength; + + RequirementDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_MEMORY32: + { + ACPI_RESOURCE_MEMORY32 *mem32_data = (ACPI_RESOURCE_MEMORY32*) &resource->Data; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = 0; + if (mem32_data->WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = mem32_data->Minimum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = mem32_data->Maximum + mem32_data->AddressLength - 1; + RequirementDescriptor->u.Memory.Length = mem32_data->AddressLength; + + RequirementDescriptor++; + break; + } case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: - { - ACPI_RESOURCE_FIXED_MEMORY32 *fixedmem32_data = (ACPI_RESOURCE_FIXED_MEMORY32*) &resource->Data; - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; - RequirementDescriptor->Type = CmResourceTypeMemory; - RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - RequirementDescriptor->Flags = 0; - if (fixedmem32_data->WriteProtect == ACPI_READ_ONLY_MEMORY) - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; - else - RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; - RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = fixedmem32_data->Address; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = fixedmem32_data->Address + fixedmem32_data->AddressLength - 1; - RequirementDescriptor->u.Memory.Length = fixedmem32_data->AddressLength; + { + ACPI_RESOURCE_FIXED_MEMORY32 *fixedmem32_data = (ACPI_RESOURCE_FIXED_MEMORY32*) &resource->Data; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = 0; + if (fixedmem32_data->WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = fixedmem32_data->Address; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = fixedmem32_data->Address + fixedmem32_data->AddressLength - 1; + RequirementDescriptor->u.Memory.Length = fixedmem32_data->AddressLength; - RequirementDescriptor++; - break; - } - default: - { - break; - } - } - resource = ACPI_NEXT_RESOURCE(resource); - } - ExFreePoolWithTag(Buffer.Pointer, 'IPCA'); + RequirementDescriptor++; + break; + } + default: + { + break; + } + } + resource = ACPI_NEXT_RESOURCE(resource); + } + ExFreePoolWithTag(Buffer.Pointer, 'IPCA'); Irp->IoStatus.Information = (ULONG_PTR)RequirementsList;

1 0

[tkreuzer] 56224: [WIN32K] - Fix right-to-left support the new EngBitBlt code - Remove an ASSERT that we don't support - Fix clipping in IntEngBitBlt by bailing out when the target rect got empty -...
by tkreuzer＠svn.reactos.org 24 Mar '12

24 Mar '12

Author: tkreuzer Date: Sat Mar 24 21:07:46 2012 New Revision: 56224 URL: http://svn.reactos.org/svn/reactos?rev=56224&view=rev Log: [WIN32K] - Fix right-to-left support the new EngBitBlt code - Remove an ASSERT that we don't support - Fix clipping in IntEngBitBlt by bailing out when the target rect got empty - Delete obsolete file You can use the code now, but there is a bug in the clipping code somewhere, sometimes causing the taskbar to be overwritten Removed: trunk/reactos/subsystems/win32/win32k/diblib/engbitblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c Removed: trunk/reactos/subsystems/win32/win32k/diblib/engbitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/engbitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/engbitblt.c (removed) @@ -1,282 +1,0 @@ - -#include "DibLib.h" - -#define ROP4_FGND(Rop4) ((Rop4) & 0x00FF) -#define ROP4_BKGND(Rop4) (((Rop4) & 0xFF00) >> 8) - -#define ROP4_USES_SOURCE(Rop4) (((((Rop4) & 0xCC00) >> 2) != ((Rop4) & 0x3300)) || ((((Rop4) & 0xCC) >> 2) != ((Rop4) & 0x33))) -#define ROP4_USES_MASK(Rop4) (((Rop4) & 0xFF00) != (((Rop4) & 0xff) << 8)) -#define ROP4_USES_DEST(Rop4) (((((Rop4) & 0xAA) >> 1) != ((Rop4) & 0x55)) || ((((Rop4) & 0xAA00) >> 1) != ((Rop4) & 0x5500))) -#define ROP4_USES_PATTERN(Rop4) (((((Rop4) & 0xF0) >> 4) != ((Rop4) & 0x0F)) || ((((Rop4) & 0xF000) >> 4) != ((Rop4) & 0x0F00))) - - -typedef struct -{ - ULONG c; - RECTL arcl[5]; -} RECT_ENUM; - -static -VOID -AdjustOffsetAndSize( - _Out_ PPOINTL pptOffset, - _Out_ PSIZEL psizTrg, - _In_ PPOINTL pptlSrc, - _In_ PSIZEL psizSrc) -{ - ULONG x, y, cxMax, cyMax; - - x = pptlSrc->x + pptOffset->x; - if (x < 0) pptOffset->x -= x, x = 0; - - cxMax = psizSrc->cx - x; - if (psizTrg->cx > cxMax) psizTrg->cx= cxMax; - - y = pptlSrc->y + pptOffset->y; - if (y < 0) pptOffset->y -= y, y = 0; - - cyMax = psizSrc->cy - y; - if (psizTrg->cy > cyMax) psizTrg->cy = cyMax; -} - -BOOL -APIENTRY -EngBitBlt( - _Inout_ SURFOBJ *psoTrg, - _In_opt_ SURFOBJ *psoSrc, - _In_opt_ SURFOBJ *psoMask, - _In_opt_ CLIPOBJ *pco, - _In_opt_ XLATEOBJ *pxlo, - _In_ RECTL *prclTrg, - _When_(psoSrc, _In_) POINTL *pptlSrc, - _When_(psoMask, _In_) POINTL *pptlMask, - _In_opt_ BRUSHOBJ *pbo, - _When_(pbo, _In_) POINTL *pptlBrush, - _In_ ROP4 rop4) -{ - BLTDATA bltdata; - ULONG i, iDComplexity, iDirection, rop3Fg, iFunctionIndex; - RECTL rcTrg; - POINTL ptOffset, ptSrc, ptMask; - SIZEL sizTrg; - PFN_DIBFUNCTION pfnBitBlt; - BOOL bEnumMore; - RECT_ENUM rcenum; - - /* Clip the target rect to the extents of the target surface */ - rcTrg.left = min(prclTrg->left, 0); - rcTrg.top = min(prclTrg->top, 0); - rcTrg.right = min(prclTrg->right, psoTrg->sizlBitmap.cx); - rcTrg.bottom = min(prclTrg->bottom, psoTrg->sizlBitmap.cy); - - /* Check if there is a clipping region */ - iDComplexity = pco ? pco->iDComplexity : DC_TRIVIAL; - if (iDComplexity != DC_TRIVIAL) - { - /* Clip the target rect to the bounds of the clipping region */ - RECTL_bIntersectRect(&rcTrg, prclTrg, &pco->rclBounds); - } - - /* Calculate initial offset and size */ - ptOffset.x = rcTrg.left - prclTrg->left; - ptOffset.y = rcTrg.top - prclTrg->top; - sizTrg.cx = rcTrg.right - rcTrg.left; - sizTrg.cy = rcTrg.bottom - rcTrg.top; - - /* Check if the ROP uses a source */ - if (ROP4_USES_SOURCE(rop4)) - { - /* Must have a source surface and point */ - if (!psoSrc || !pptlSrc) return FALSE; - - /* Get the source point */ - ptSrc = *pptlSrc; - - /* Clip against the extents of the source surface */ - AdjustOffsetAndSize(&ptOffset, &sizTrg, &ptSrc, &psoSrc->sizlBitmap); - - /* Check if source and target are equal */ - if (psoSrc == psoTrg) - { - /* Use 0 to mark source as equal to target */ - bltdata.siSrc.iFormat = 0; - - } - else - { - bltdata.siSrc.iFormat = psoSrc->iBitmapFormat; - } - bltdata.siSrc.pjBase = psoSrc->pvScan0; - bltdata.siSrc.lDelta = psoSrc->lDelta; - } - else - { - ptSrc.x = 0; - ptSrc.y = 0; - } - - /* Check if the ROP uses a mask */ - if (ROP4_USES_MASK(rop4)) - { - /* Must have a mask surface and point */ - if (!psoMask || !pptlMask) return FALSE; - - /* Get the mask point */ - ptMask = *pptlMask; - - /* Clip against the extents of the mask surface */ - AdjustOffsetAndSize(&ptOffset, &sizTrg, &ptMask, &psoMask->sizlBitmap); - - bltdata.siMsk.iFormat = psoMask->iBitmapFormat; - bltdata.siMsk.pjBase = psoMask->pvScan0; - bltdata.siMsk.lDelta = psoMask->lDelta; - } - else - { - ptMask.x = 0; - ptMask.y = 0; - } - - /* Adjust the points */ - ptSrc.x += ptOffset.x; - ptSrc.y += ptOffset.y; - ptMask.x += ptOffset.x; - ptMask.y += ptOffset.y; - - /* Recalculate the target rect */ - rcTrg.left = prclTrg->left + ptOffset.x; - rcTrg.top = prclTrg->top + ptOffset.y; - rcTrg.right = rcTrg.left + sizTrg.cx; - rcTrg.bottom = rcTrg.top + sizTrg.cy; - - bltdata.ulWidth = prclTrg->right - prclTrg->left; - bltdata.ulHeight = prclTrg->bottom - prclTrg->top; - bltdata.pxlo = pxlo; - bltdata.rop4 = rop4; - - bltdata.siDst.iFormat = psoTrg->iBitmapFormat; - bltdata.siDst.pjBase = psoTrg->pvScan0; - bltdata.siDst.lDelta = psoTrg->lDelta; - bltdata.siDst.ptOrig.x = prclTrg->left; - bltdata.siDst.ptOrig.y = prclTrg->top; - - - /* Check of the ROP uses a pattern / brush */ - if (ROP4_USES_PATTERN(rop4)) - { - /* Must have a brush */ - if (!pbo) return FALSE; - - /* Copy the solid color */ - bltdata.ulSolidColor = pbo->iSolidColor; - - /* Check if this is a pattern brush */ - if (pbo->iSolidColor == 0xFFFFFFFF) - { - // FIXME: use EBRUSHOBJ - - bltdata.siPat.iFormat = 0;//psoPat->iBitmapFormat; - bltdata.siPat.pjBase = 0;//psoPat->pvScan0; - bltdata.siPat.lDelta = 0;//psoPat->lDelta; - bltdata.siPat.ptOrig = *pptlBrush; - - bltdata.ulPatWidth = 0; - bltdata.ulPatHeight = 0; - } - } - - /* Analyze the copying direction */ - if (psoTrg == psoSrc) - { - if (rcTrg.top < ptSrc.y) - iDirection = rcTrg.left < ptSrc.x ? CD_RIGHTDOWN : CD_LEFTDOWN; - else - iDirection = rcTrg.left < ptSrc.x ? CD_RIGHTUP : CD_LEFTUP; - } - else - iDirection = CD_ANY; - - /* Check if this is a masking ROP */ - if (ROP4_USES_MASK(rop4)) - { - bltdata.apfnDoRop[0] = gapfnRop[ROP4_BKGND(rop4)]; - bltdata.apfnDoRop[1] = gapfnRop[ROP4_FGND(rop4)]; - } - - /* Get the foreground ROP index */ - rop3Fg = ROP4_FGND(rop4); - - /* Get the function index */ - iFunctionIndex = aiIndexPerRop[rop3Fg]; - - /* Get the dib function */ - pfnBitBlt = apfnDibFunction[iFunctionIndex]; - - /* Check if we need to enumerate rects */ - if (iDComplexity == DC_COMPLEX) - { - /* Start the enumeration of the clip object */ - CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, iDirection, 0); - do - { - /* Enumerate a set of rectangles */ - bEnumMore = CLIPOBJ_bEnum(pco, sizeof(rcenum), (ULONG*)&rcenum); - - /* Loop all rectangles we got */ - for (i = 0; i < rcenum.c; i++) - { - /* Intersect this rect with the already calculated bounds rect */ - if (!RECTL_bIntersectRect(&rcenum.arcl[i], &rcenum.arcl[i], &rcTrg)) - { - /* This rect is outside the valid bounds, continue */ - continue; - } - - /* Copy the target start point */ - bltdata.siDst.ptOrig.x = rcenum.arcl[i].left; - bltdata.siDst.ptOrig.x = rcenum.arcl[i].top; - - /* Calculate width and height of this rect */ - bltdata.ulWidth = rcenum.arcl[i].right - rcenum.arcl[i].left; - bltdata.ulHeight = rcenum.arcl[i].bottom - rcenum.arcl[i].top; - - /* Calculate the offset of this rect from the original coordinates */ - ptOffset.x = rcenum.arcl[i].left - prclTrg->left; - ptOffset.y = rcenum.arcl[i].top - prclTrg->top; - - /* Calculate current origin for source and mask */ - bltdata.siSrc.ptOrig.x = pptlSrc->x + ptOffset.x; - bltdata.siSrc.ptOrig.y = pptlSrc->y + ptOffset.y; - bltdata.siMsk.ptOrig.x = pptlMask->x + ptOffset.x; - bltdata.siMsk.ptOrig.y = pptlMask->y + ptOffset.y; - - //bltdata.siPat.ptOrig.x = (pptlMask->x + ptOffset.x) % psoMask->sizlBitmap.cx; - //bltdata.siPat.ptOrig.y = (pptlMask->y + ptOffset.y) % psoMask->sizlBitmap.cx; - - } - } - while (bEnumMore); - } - else - { - /* Call the dib function */ - pfnBitBlt(&bltdata); - } - - return TRUE; -} - -ULONG -NTAPI -XLATEOBJ_iXlate(XLATEOBJ *pxlo, ULONG ulColor) -{ - return ulColor; -} - -BOOL -//__fastcall -RECTL_bIntersectRect(RECTL* prclDst, const RECTL* prcl1, const RECTL* prcl2) -{ - return TRUE; -} - Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c [iso-8859-1] Sat Mar 24 21:07:46 2012 @@ -27,8 +27,13 @@ pbltdata->ulWidth = prclClipped->right - prclClipped->left; pbltdata->ulHeight = prclClipped->bottom - prclClipped->top; - /* Calculate the offset to the origin coordinates */ - cx = (prclClipped->left - prclOrg->left); + /* Calculate the x offset to the origin coordinates */ + if (pbltdata->siDst.iFormat == 0) + cx = (prclClipped->right - 1 - prclOrg->left); + else + cx = (prclClipped->left - prclOrg->left); + + /* Calculate the y offset to the origin coordinates */ if (pbltdata->dy < 0) cy = (prclClipped->bottom - 1 - prclOrg->top); else @@ -43,14 +48,11 @@ pbltdata->siDst.pjBase += pbltdata->siDst.ptOrig.y * pbltdata->siDst.lDelta; pbltdata->siDst.pjBase += pbltdata->siDst.ptOrig.x * pbltdata->siDst.jBpp / 8; - if (pptlSrc) { - /* Calculate current origin for the source */ + /* Calculate start point and bitpointer for source */ pbltdata->siSrc.ptOrig.x = pptlSrc->x + cx; pbltdata->siSrc.ptOrig.y = pptlSrc->y + cy; - - /* Calculate start position for source */ pbltdata->siSrc.pjBase = pbltdata->siSrc.pvScan0; pbltdata->siSrc.pjBase += pbltdata->siSrc.ptOrig.y * pbltdata->siSrc.lDelta; pbltdata->siSrc.pjBase += pbltdata->siSrc.ptOrig.x * pbltdata->siSrc.jBpp / 8; @@ -58,10 +60,9 @@ if (pptlMask) { + /* Calculate start point and bitpointer for mask */ pbltdata->siMsk.ptOrig.x = pptlMask->x + cx; pbltdata->siMsk.ptOrig.y = pptlMask->y + cy; - - /* Calculate start position for mask */ pbltdata->siMsk.pjBase = pbltdata->siMsk.pvScan0; pbltdata->siMsk.pjBase += pbltdata->siMsk.ptOrig.y * pbltdata->siMsk.lDelta; pbltdata->siMsk.pjBase += pbltdata->siMsk.ptOrig.x * pbltdata->siMsk.jBpp / 8; @@ -69,10 +70,9 @@ if (pptlPat) { + /* Calculate start point and bitpointer for pattern */ pbltdata->siPat.ptOrig.x = (pptlPat->x + cx) % psizlPat->cx; pbltdata->siPat.ptOrig.y = (pptlPat->x + cy) % psizlPat->cy; - - /* Calculate start position for pattern */ pbltdata->siPat.pjBase = pbltdata->siPat.pvScan0; pbltdata->siPat.pjBase += pbltdata->siPat.ptOrig.y * pbltdata->siPat.lDelta; pbltdata->siPat.pjBase += pbltdata->siPat.ptOrig.x * pbltdata->siPat.jBpp / 8; @@ -158,7 +158,7 @@ /* Use 0 as target format to get special right to left versions */ bltdata.siDst.iFormat = 0; bltdata.siSrc.iFormat = psoSrc->iBitmapFormat; - __debugbreak(); + //__debugbreak(); } else { @@ -241,8 +241,9 @@ ASSERT(psoMask); ASSERT(pptlMask); - __debugbreak(); - + //__debugbreak(); + + /* Set the mask format info */ bltdata.siMsk.iFormat = psoMask->iBitmapFormat; bltdata.siMsk.pvScan0 = psoMask->pvScan0; bltdata.siMsk.lDelta = psoMask->lDelta; @@ -342,7 +343,7 @@ if (x < 0) pptOffset->x -= x, x = 0; cxMax = psizSrc->cx - x; - if (psizTrg->cx > cxMax) psizTrg->cx= cxMax; + if (psizTrg->cx > cxMax) psizTrg->cx = cxMax; y = pptlSrc->y + pptOffset->y; if (y < 0) pptOffset->y -= y, y = 0; @@ -380,7 +381,6 @@ ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); ASSERT(psoTrg->iBitmapFormat <= BMF_32BPP); ASSERT(prclTrg); - ASSERT(RECTL_bIsWellOrdered(prclTrg)); /* Clip the target rect to the extents of the target surface */ rcClipped.left = max(prclTrg->left, 0); @@ -395,11 +395,15 @@ if (pco->iDComplexity != DC_TRIVIAL) { /* Clip the target rect to the bounds of the clipping region */ - RECTL_bIntersectRect(&rcClipped, &rcClipped, &pco->rclBounds); + if (!RECTL_bIntersectRect(&rcClipped, &rcClipped, &pco->rclBounds)) + { + /* Nothing left */ + return TRUE; + } } /* Don't pass a clip object with a single rectangle */ -// if (pco->iDComplexity == DC_RECT) pco = (CLIPOBJ*)&gxcoTrivial; + if (pco->iDComplexity == DC_RECT) pco = (CLIPOBJ*)&gxcoTrivial; /* Calculate initial offset and size */ ptOffset.x = rcClipped.left - prclTrg->left; @@ -446,6 +450,10 @@ ptMask.x = 0; ptMask.y = 0; } + + /* Check if all has been clipped away */ + if ((sizTrg.cx <= 0) || (sizTrg.cy <= 0)) + return TRUE; /* Adjust the points */ ptSrc.x += ptOffset.x; @@ -628,3 +636,16 @@ /* Forward to the driver */ return pfnCopyBits(psoTrg, psoSrc, pco, pxlo, prclTrg, pptlSrc); } + +BOOL +APIENTRY +IntEngCopyBits( + SURFOBJ *psoTrg, + SURFOBJ *psoSrc, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + RECTL *prclTrg, + POINTL *pptlSrc) +{ + return EngCopyBits(psoTrg, psoSrc, pco, pxlo, prclTrg, pptlSrc); +}

1 0

[tkreuzer] 56223: [WIN32K] Fix build
by tkreuzer＠svn.reactos.org 24 Mar '12

24 Mar '12

Author: tkreuzer Date: Sat Mar 24 19:04:09 2012 New Revision: 56223 URL: http://svn.reactos.org/svn/reactos?rev=56223&view=rev Log: [WIN32K] Fix build Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/CM… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Sat Mar 24 19:04:09 2012 @@ -43,7 +43,7 @@ eng/engevent.c eng/clip.c eng/debug.c - eng/drvdbg.c + #eng/drvdbg.c eng/device.c eng/driverobj.c eng/error.c

1 0

[tkreuzer] 56222: [WIN32K] Allow to build win32k with the new dib library, a switch is in win32k's CMakeLists.txt
by tkreuzer＠svn.reactos.org 24 Mar '12

24 Mar '12

Author: tkreuzer Date: Sat Mar 24 18:52:48 2012 New Revision: 56222 URL: http://svn.reactos.org/svn/reactos?rev=56222&view=rev Log: [WIN32K] Allow to build win32k with the new dib library, a switch is in win32k's CMakeLists.txt Added: trunk/reactos/subsystems/win32/win32k/dib/dib_new.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/CM… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Sat Mar 24 18:52:48 2012 @@ -1,3 +1,5 @@ + +set (USE_DIBLIB FALSE) spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) @@ -33,7 +35,6 @@ dib/dib16bpp.c dib/dib24bpp.c dib/dib32bpp.c - dib/dib.c dib/floodfill.c dib/stretchblt.c eng/alphablend.c @@ -41,8 +42,8 @@ eng/engbrush.c eng/engevent.c eng/clip.c - eng/copybits.c eng/debug.c + eng/drvdbg.c eng/device.c eng/driverobj.c eng/error.c @@ -143,7 +144,7 @@ objects/font.c objects/freetype.c objects/gdibatch.c - objects/gdidbg.c + objects/gdidbg.c objects/gdiobj.c objects/gdipool.c objects/icm.c @@ -164,7 +165,18 @@ stubs/umpdstubs.c win32k.rc) -list(APPEND SOURCE ${GENDIB_FILES}) +if (USE_DIBLIB) + add_definitions( + -D_USE_DIBLIB_) + list(APPEND SOURCE + dib/dib_new.c + eng/bitblt_new.c) +else() + list(APPEND SOURCE + dib/dib.c + eng/copybits.c + ${GENDIB_FILES}) +endif() if(ARCH MATCHES i386) list(APPEND SOURCE @@ -194,6 +206,11 @@ dxguid libcntpr) +if (USE_DIBLIB) + target_link_libraries(win32k + diblib) +endif() + add_importlibs(win32k ntoskrnl hal ftfd) add_pch(win32k pch.h) add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all) @@ -201,3 +218,9 @@ add_library(win32ksys sys-stubs.S) set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h) + +if (USE_DIBLIB) + add_subdirectory(diblib) +endif() + + Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Sat Mar 24 18:52:48 2012 @@ -313,6 +313,7 @@ return TRUE; } +#ifndef _USE_DIBLIB_ BOOLEAN DIB_1BPP_BitBlt(PBLTINFO BltInfo) { @@ -465,6 +466,7 @@ } return TRUE; } +#endif // !_USE_DIBLIB_ BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, Modified: trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] Sat Mar 24 18:52:48 2012 @@ -55,6 +55,7 @@ } } +#ifndef _USE_DIBLIB_ BOOLEAN DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo) { @@ -366,6 +367,7 @@ } return TRUE; } +#endif // !_USE_DIBLIB_ BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, Added: trunk/reactos/subsystems/win32/win32k/dib/dib_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib_new.c (added) +++ trunk/reactos/subsystems/win32/win32k/dib/dib_new.c [iso-8859-1] Sat Mar 24 18:52:48 2012 @@ -1,0 +1,152 @@ +/* + * PROJECT: Win32 subsystem + * LICENSE: See COPYING in the top level directory + * FILE: subsystems/win32/win32k/dib/dib.c + * PURPOSE: ROP handling, function pointer arrays, misc + * PROGRAMMERS: Ge van Geldorp + */ + + +#include <win32k.h> +#include "..\diblib\DibLib_interface.h" + +/* Static data */ + +unsigned char notmask[2] = { 0x0f, 0xf0 }; +unsigned char altnotmask[2] = { 0xf0, 0x0f }; + +ULONG +DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern) +{ + return gapfnRop[Rop & 0xFF](Dest, Source, Pattern); +} + +DIB_FUNCTIONS DibFunctionsForBitmapFormat[] = +{ + /* 0 */ + { + Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, + 0, 0, Dummy_StretchBlt, Dummy_TransparentBlt, + 0, Dummy_AlphaBlend + }, + /* BMF_1BPP */ + { + DIB_1BPP_PutPixel, DIB_1BPP_GetPixel, DIB_1BPP_HLine, DIB_1BPP_VLine, + 0, 0, DIB_XXBPP_StretchBlt, + DIB_1BPP_TransparentBlt, 0, DIB_XXBPP_AlphaBlend + }, + /* BMF_4BPP */ + { + DIB_4BPP_PutPixel, DIB_4BPP_GetPixel, DIB_4BPP_HLine, DIB_4BPP_VLine, + 0, 0, DIB_XXBPP_StretchBlt, + DIB_4BPP_TransparentBlt, 0, DIB_XXBPP_AlphaBlend + }, + /* BMF_8BPP */ + { + DIB_8BPP_PutPixel, DIB_8BPP_GetPixel, DIB_8BPP_HLine, DIB_8BPP_VLine, + 0, 0, DIB_XXBPP_StretchBlt, + DIB_8BPP_TransparentBlt, 0, DIB_XXBPP_AlphaBlend + }, + /* BMF_16BPP */ + { + DIB_16BPP_PutPixel, DIB_16BPP_GetPixel, DIB_16BPP_HLine, DIB_16BPP_VLine, + 0, 0, DIB_XXBPP_StretchBlt, + DIB_16BPP_TransparentBlt, 0, DIB_XXBPP_AlphaBlend + }, + /* BMF_24BPP */ + { + DIB_24BPP_PutPixel, DIB_24BPP_GetPixel, DIB_24BPP_HLine, DIB_24BPP_VLine, + 0, 0, DIB_XXBPP_StretchBlt, + DIB_24BPP_TransparentBlt, 0, DIB_24BPP_AlphaBlend + }, + /* BMF_32BPP */ + { + DIB_32BPP_PutPixel, DIB_32BPP_GetPixel, DIB_32BPP_HLine, DIB_32BPP_VLine, + 0, 0, DIB_XXBPP_StretchBlt, + DIB_32BPP_TransparentBlt, 0, DIB_32BPP_AlphaBlend + }, + /* BMF_4RLE */ + { + Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, + 0, 0, Dummy_StretchBlt, Dummy_TransparentBlt, + 0, Dummy_AlphaBlend + }, + /* BMF_8RLE */ + { + Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, + 0, 0, Dummy_StretchBlt, Dummy_TransparentBlt, + 0, Dummy_AlphaBlend + }, + /* BMF_JPEG */ + { + Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, + 0, 0, Dummy_StretchBlt, Dummy_TransparentBlt, + 0, Dummy_AlphaBlend + }, + /* BMF_PNG */ + { + Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, + 0, 0, Dummy_StretchBlt, Dummy_TransparentBlt, + 0, Dummy_AlphaBlend + } +}; + + +VOID Dummy_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c) +{ + return; +} + +ULONG Dummy_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y) +{ + return 0; +} + +VOID Dummy_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c) +{ + return; +} + +VOID Dummy_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c) +{ + return; +} + +BOOLEAN Dummy_BitBlt(PBLTINFO BltInfo) +{ + return FALSE; +} + +BOOLEAN Dummy_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, + SURFOBJ *PatternSurface, SURFOBJ *MaskSurf, + RECTL* DestRect, RECTL *SourceRect, + POINTL* MaskOrigin, BRUSHOBJ* Brush, + POINTL* BrushOrign, + XLATEOBJ *ColorTranslation, + ROP4 Rop) +{ + return FALSE; +} + +BOOLEAN Dummy_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, + RECTL* DestRect, RECTL *SourceRect, + XLATEOBJ *ColorTranslation, ULONG iTransColor) +{ + return FALSE; +} + +BOOLEAN Dummy_ColorFill(SURFOBJ* Dest, RECTL* DestRect, ULONG Color) +{ + return FALSE; +} + + +BOOLEAN +Dummy_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, + RECTL* SourceRect, CLIPOBJ* ClipRegion, + XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) +{ + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/subsystems/win32/win32k/dib/dib_new.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs