Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 31283: - A bit of cleanup (no code change).
by fireball＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: fireball Date: Sun Dec 16 20:23:38 2007 New Revision: 31283 URL: http://svn.reactos.org/svn/reactos?rev=31283&view=rev Log: - A bit of cleanup (no code change). Modified: trunk/reactos/ntoskrnl/config/cmdelay.c trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmmapvw.c Modified: trunk/reactos/ntoskrnl/config/cmdelay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdelay.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdelay.c (original) +++ trunk/reactos/ntoskrnl/config/cmdelay.c Sun Dec 16 20:23:38 2007 @@ -346,4 +346,3 @@ /* Set new delay size and remove the delete flag */ Kcb->DelayedCloseIndex = CmpDelayedCloseSize; } - Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c Sun Dec 16 20:23:38 2007 @@ -925,8 +925,8 @@ if (!(Flags & CMP_ENLIST_KCB_LOCKED_EXCLUSIVE)) { /* Acquire the lock */ - CmpAcquireKcbLockExclusive(KeyBody->KeyControlBlock); - } + CmpAcquireKcbLockExclusive(KeyBody->KeyControlBlock); + } /* Make sure we have the exclusive lock */ ASSERT((CmpIsKcbLockedExclusive(KeyBody->KeyControlBlock) == TRUE) || @@ -941,7 +941,7 @@ CMP_ENLIST_KCB_LOCKED_EXCLUSIVE))) { /* Release the lock */ - CmpReleaseKcbLock(KeyBody->KeyControlBlock); + CmpReleaseKcbLock(KeyBody->KeyControlBlock); } } @@ -974,7 +974,7 @@ ASSERT(IsListEmpty(&KeyBody->KeyBodyList) == FALSE); /* Lock the KCB */ - if (!LockHeld) CmpAcquireKcbLockExclusive(KeyBody->KeyControlBlock); + if (!LockHeld) CmpAcquireKcbLockExclusive(KeyBody->KeyControlBlock); ASSERT((CmpIsKcbLockedExclusive(KeyBody->KeyControlBlock) == TRUE) || (CmpTestRegistryLockExclusive() == TRUE)); @@ -982,7 +982,5 @@ RemoveEntryList(&KeyBody->KeyBodyList); /* Unlock it it if we did a manual lock */ - if (!LockHeld) CmpReleaseKcbLock(KeyBody->KeyControlBlock); -} - - + if (!LockHeld) CmpReleaseKcbLock(KeyBody->KeyControlBlock); +} Modified: trunk/reactos/ntoskrnl/config/cmmapvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmmapvw.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmmapvw.c (original) +++ trunk/reactos/ntoskrnl/config/cmmapvw.c Sun Dec 16 20:23:38 2007 @@ -29,4 +29,3 @@ Hive->PinnedViews = 0; Hive->UseCount = 0; } -

1 0

[fireball] 31282: - Add a signature field to KCBs, and use it to validate KCBs as well as to mark them dead after they've been freed (to catch invalid reuse). - Add assertions to make sure key hashes are valid. - Finish implementing EnlistKeyBodyWithKCB since the new parse routine is now used, and implement analogous DelistKeyBodyFromKCB. - Fix delay item allocation code which was overwriting pool memory. - Re-enable allocation-page support for allocating KCBs. - Implement the CmpDelayDerefKCBWo
by fireball＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: fireball Date: Sun Dec 16 19:37:15 2007 New Revision: 31282 URL: http://svn.reactos.org/svn/reactos?rev=31282&view=rev Log: - Add a signature field to KCBs, and use it to validate KCBs as well as to mark them dead after they've been freed (to catch invalid reuse). - Add assertions to make sure key hashes are valid. - Finish implementing EnlistKeyBodyWithKCB since the new parse routine is now used, and implement analogous DelistKeyBodyFromKCB. - Fix delay item allocation code which was overwriting pool memory. - Re-enable allocation-page support for allocating KCBs. - Implement the CmpDelayDerefKCBWorker now that delay alloc/free works. - Fix CmpDelayDerefKeyControlBlock which was overwriting KCB flags and incorrectly setting reference counts for the KCB. - CmpDelayCloseWorkItemActive should be enabled when arming the delayed close timer. - Fix reference counting bugs in CmpAddToDelayedClose and CmpRemoveFromDelayedClose. - Fix wrong sizes of CM_KCBS_PER_PAGE and CM_DELAYS_PER_PAGE which caused more pool overwrites. Modified: trunk/reactos/ntoskrnl/config/cmalloc.c trunk/reactos/ntoskrnl/config/cmdelay.c trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/include/internal/cm.h trunk/reactos/ntoskrnl/include/internal/cm_x.h Modified: trunk/reactos/ntoskrnl/config/cmalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmalloc.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmalloc.c (original) +++ trunk/reactos/ntoskrnl/config/cmalloc.c Sun Dec 16 19:37:15 2007 @@ -55,7 +55,7 @@ PAGED_CODE(); /* Sanity checks */ - ASSERT(IsListEmpty(&(Kcb->KeyBodyListHead)) == TRUE); + ASSERT(IsListEmpty(&Kcb->KeyBodyListHead) == TRUE); for (i = 0; i < 4; i++) ASSERT(Kcb->KeyBodyArray[i] == NULL); /* Check if it wasn't privately allocated */ @@ -87,12 +87,12 @@ if (++AllocPage->FreeCount == CM_KCBS_PER_PAGE) { /* Loop all the entries */ - for (i = CM_KCBS_PER_PAGE; i; i--) + for (i = 0; i < CM_KCBS_PER_PAGE; i++) { /* Get the KCB */ Kcb = (PVOID)((ULONG_PTR)AllocPage + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + - (i - 1) * sizeof(CM_KEY_CONTROL_BLOCK)); + i * sizeof(CM_KEY_CONTROL_BLOCK)); /* Remove the entry */ RemoveEntryList(&Kcb->FreeListEntry); @@ -117,7 +117,7 @@ PAGED_CODE(); /* Check if private allocations are initialized */ - if (FALSE) + if (CmpAllocInited) { /* They are, acquire the bucket lock */ KeAcquireGuardedMutex(&CmpAllocBucketLock); @@ -208,28 +208,28 @@ /* Look for an item on the free list */ SearchList: - if (!IsListEmpty(&CmpFreeDelayItemsListHead)) - { - /* Get the current entry in the list */ - NextEntry = RemoveHeadList(&CmpFreeDelayItemsListHead); - - /* Grab the item */ - Entry = CONTAINING_RECORD(NextEntry, CM_DELAY_ALLOC, ListEntry); - - /* Clear the list */ - Entry->ListEntry.Flink = Entry->ListEntry.Blink = NULL; - - /* Grab the alloc page */ - AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); - - /* Decrease free entries */ - ASSERT(AllocPage->FreeCount != 0); - AllocPage->FreeCount--; - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); - return Entry; - } + if (!IsListEmpty(&CmpFreeDelayItemsListHead)) + { + /* Get the current entry in the list */ + NextEntry = RemoveHeadList(&CmpFreeDelayItemsListHead); + + /* Grab the item */ + Entry = CONTAINING_RECORD(NextEntry, CM_DELAY_ALLOC, ListEntry); + + /* Clear the list */ + Entry->ListEntry.Flink = Entry->ListEntry.Blink = NULL; + + /* Grab the alloc page */ + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); + + /* Decrease free entries */ + ASSERT(AllocPage->FreeCount != 0); + AllocPage->FreeCount--; + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return Entry; + } /* Allocate an allocation page */ AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); Modified: trunk/reactos/ntoskrnl/config/cmdelay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdelay.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdelay.c (original) +++ trunk/reactos/ntoskrnl/config/cmdelay.c Sun Dec 16 19:37:15 2007 @@ -100,15 +100,41 @@ NTAPI CmpDelayDerefKCBWorker(IN PVOID Context) { + PCM_DELAY_DEREF_KCB_ITEM Entry; PAGED_CODE(); /* Sanity check */ ASSERT(CmpDelayDerefKCBWorkItemActive); - /* FIXME: TODO */ - DPRINT1("CmpDelayDerefKCBWorker has work to do!\n"); - return; - ASSERT(FALSE); + /* Lock the registry and and list lock */ + CmpLockRegistry(); + KeAcquireGuardedMutex(&CmpDelayDerefKCBLock); + + /* Check if the list is empty */ + while (!IsListEmpty(&CmpDelayDerefKCBListHead)) + { + /* Grab an entry */ + Entry = (PVOID)RemoveHeadList(&CmpDelayDerefKCBListHead); + + /* We can release the lock now */ + KeReleaseGuardedMutex(&CmpDelayDerefKCBLock); + + /* Now grab the actual entry */ + Entry = CONTAINING_RECORD(Entry, CM_DELAY_DEREF_KCB_ITEM, ListEntry); + Entry->ListEntry.Flink = Entry->ListEntry.Blink = NULL; + + /* Dereference and free */ + CmpDereferenceKeyControlBlock(Entry->Kcb); + CmpFreeDelayItem(Entry); + + /* Lock the list again */ + KeAcquireGuardedMutex(&CmpDelayDerefKCBLock); + } + + /* We're done */ + CmpDelayDerefKCBWorkItemActive = FALSE; + KeReleaseGuardedMutex(&CmpDelayDerefKCBLock); + CmpUnlockRegistry(); } VOID @@ -133,19 +159,22 @@ NTAPI CmpDelayDerefKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) { - USHORT OldRefCount, NewRefCount; + LONG OldRefCount, NewRefCount; LARGE_INTEGER Timeout; PCM_DELAY_DEREF_KCB_ITEM Entry; PAGED_CODE(); /* Get the previous reference count */ - OldRefCount = Kcb->RefCount; - - /* Write the new one */ - NewRefCount = (USHORT)InterlockedCompareExchange((PLONG)&Kcb->RefCount, - OldRefCount - 1, - OldRefCount); - if (NewRefCount != OldRefCount) return; + OldRefCount = *(PLONG)&Kcb->RefCount; + NewRefCount = OldRefCount - 1; + if (((NewRefCount & 0xFFFF) > 0) && + (InterlockedCompareExchange((PLONG)&Kcb->RefCount, + NewRefCount, + OldRefCount) == OldRefCount)) + { + /* KCB still had references, so we're done */ + return; + } /* Allocate a delay item */ Entry = CmpAllocateDelayItem(); @@ -179,6 +208,9 @@ { LARGE_INTEGER Timeout; PAGED_CODE(); + + /* Set the worker active */ + CmpDelayCloseWorkItemActive = TRUE; /* Setup the interval */ Timeout.QuadPart = CmpDelayCloseIntervalInSeconds * -10000000; @@ -220,14 +252,18 @@ if (Kcb->InDelayClose) ASSERT(FALSE); /* Get the previous reference count */ - OldRefCount = Kcb->InDelayClose; + OldRefCount = *(PLONG)&Kcb->InDelayClose; ASSERT(OldRefCount == 0); /* Write the new one */ - NewRefCount = InterlockedCompareExchange((PLONG)&Kcb->InDelayClose, - 1, - OldRefCount); - if (NewRefCount != OldRefCount) ASSERT(FALSE); + NewRefCount = 1; + if (InterlockedCompareExchange((PLONG)&Kcb->InDelayClose, + NewRefCount, + OldRefCount) != OldRefCount) + { + /* Sanity check */ + ASSERT(FALSE); + } /* Reset the delayed close index */ Kcb->DelayedCloseIndex = 0; @@ -290,15 +326,19 @@ /* Sanity check */ if (!Kcb->InDelayClose) ASSERT(FALSE); - /* Get the old reference count */ - OldRefCount = Kcb->InDelayClose; + /* Get the previous reference count */ + OldRefCount = *(PLONG)&Kcb->InDelayClose; ASSERT(OldRefCount == 1); - /* Set it to 0 */ - NewRefCount = InterlockedCompareExchange((PLONG)&Kcb->InDelayClose, - 0, - OldRefCount); - if (NewRefCount != OldRefCount) ASSERT(FALSE); + /* Write the new one */ + NewRefCount = 0; + if (InterlockedCompareExchange((PLONG)&Kcb->InDelayClose, + NewRefCount, + OldRefCount) != OldRefCount) + { + /* Sanity check */ + ASSERT(FALSE); + } /* Remove the link to the entry */ Kcb->DelayCloseEntry = NULL; @@ -307,5 +347,3 @@ Kcb->DelayedCloseIndex = CmpDelayedCloseSize; } - - Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c Sun Dec 16 19:37:15 2007 @@ -80,6 +80,7 @@ { PCM_KEY_HASH *Prev; PCM_KEY_HASH Current; + ASSERT_VALID_HASH(KeyHash); /* Lookup all the keys in this index entry */ Prev = &GET_HASH_ENTRY(CmpCacheTable, KeyHash->ConvKey).Entry; @@ -88,12 +89,14 @@ /* Save the current one and make sure it's valid */ Current = *Prev; ASSERT(Current != NULL); + ASSERT_VALID_HASH(Current); /* Check if it matches */ if (Current == KeyHash) { /* Then write the previous one */ *Prev = Current->NextHash; + if (*Prev) ASSERT_VALID_HASH(*Prev); break; } @@ -109,6 +112,7 @@ { ULONG i; PCM_KEY_HASH Entry; + ASSERT_VALID_HASH(KeyHash); /* Get the hash index */ i = GET_HASH_INDEX(KeyHash->ConvKey); @@ -121,6 +125,7 @@ while (Entry) { /* Check if this matches */ + ASSERT_VALID_HASH(Entry); if ((KeyHash->ConvKey == Entry->ConvKey) && (KeyHash->KeyCell == Entry->KeyCell) && (KeyHash->KeyHive == Entry->KeyHive)) @@ -488,6 +493,9 @@ Parent = Kcb->ParentKcb; if (!Kcb->Delete) CmpRemoveKeyControlBlock(Kcb); + /* Set invalid KCB signature */ + Kcb->Signature = CM_KCB_INVALID_SIGNATURE; + /* Free the KCB as well */ CmpFreeKeyControlBlock(Kcb); @@ -595,12 +603,15 @@ IN BOOLEAN LockHeldExclusively) { /* Sanity check */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + ASSERT_KCB_VALID(Kcb); /* Check if this is the last reference */ if ((InterlockedDecrement((PLONG)&Kcb->RefCount) & 0xFFFF) == 0) { + /* Sanity check */ + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + /* Check if we should do a direct delete */ if (((CmpHoldLazyFlush) && !(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) && @@ -699,6 +710,7 @@ InitializeKCBKeyBodyList(Kcb); /* Set it up */ + Kcb->Signature = CM_KCB_SIGNATURE; Kcb->Delete = FALSE; Kcb->RefCount = 1; Kcb->KeyHive = Hive; @@ -706,6 +718,7 @@ Kcb->ConvKey = ConvKey; Kcb->DelayedCloseIndex = CmpDelayedCloseSize; Kcb->InDelayClose = 0; + ASSERT_KCB_VALID(Kcb); /* Check if we have two hash entires */ HashLock = Flags & CMP_LOCK_HASHES_FOR_KCB ? TRUE : FALSE; @@ -730,9 +743,11 @@ { /* Sanity check */ ASSERT(!FoundKcb->Delete); + Kcb->Signature = CM_KCB_INVALID_SIGNATURE; /* Free the one we allocated and reference this one */ CmpFreeKeyControlBlock(Kcb); + ASSERT_KCB_VALID(FoundKcb); Kcb = FoundKcb; if (!CmpReferenceKeyControlBlock(Kcb)) { @@ -790,6 +805,7 @@ { /* Remove the KCB and free it */ CmpRemoveKeyControlBlock(Kcb); + Kcb->Signature = CM_KCB_INVALID_SIGNATURE; CmpFreeKeyControlBlock(Kcb); Kcb = NULL; } @@ -833,12 +849,20 @@ /* Remove the KCB and free it */ CmpRemoveKeyControlBlock(Kcb); + Kcb->Signature = CM_KCB_INVALID_SIGNATURE; CmpFreeKeyControlBlock(Kcb); Kcb = NULL; } } } + /* Check if this is a KCB inside a frozen hive */ + if ((Kcb) && (((PCMHIVE)Hive)->Frozen) && (!(Kcb->Flags & KEY_SYM_LINK))) + { + /* Don't add these to the delay close */ + Kcb->ExtFlags |= CM_KCB_NO_DELAY_CLOSE; + } + /* Sanity check */ ASSERT((!Kcb) || (Kcb->Delete == FALSE)); @@ -867,12 +891,98 @@ EnlistKeyBodyWithKCB(IN PCM_KEY_BODY KeyBody, IN ULONG Flags) { + ULONG i; + /* Sanity check */ ASSERT(KeyBody->KeyControlBlock != NULL); /* Initialize the list entry */ InitializeListHead(&KeyBody->KeyBodyList); - /* FIXME: Implement once we don't link parents to children anymore */ -} - + /* Check if we can use the parent KCB array */ + for (i = 0; i < 4; i++) + { + /* Add it into the list */ + if (!InterlockedCompareExchangePointer(&KeyBody->KeyControlBlock-> + KeyBodyArray[i], + KeyBody, + NULL)) + { + /* Added */ + return; + } + } + + /* Array full, check if we need to unlock the KCB */ + if (Flags & CMP_ENLIST_KCB_LOCKED_SHARED) + { + /* It's shared, so release the KCB shared lock */ + CmpReleaseKcbLock(KeyBody->KeyControlBlock); + ASSERT(!(Flags & CMP_ENLIST_KCB_LOCKED_EXCLUSIVE)); + } + + /* Check if we need to lock the KCB */ + if (!(Flags & CMP_ENLIST_KCB_LOCKED_EXCLUSIVE)) + { + /* Acquire the lock */ + CmpAcquireKcbLockExclusive(KeyBody->KeyControlBlock); + } + + /* Make sure we have the exclusive lock */ + ASSERT((CmpIsKcbLockedExclusive(KeyBody->KeyControlBlock) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + + /* do the insert */ + InsertTailList(&KeyBody->KeyControlBlock->KeyBodyListHead, + &KeyBody->KeyBodyList); + + /* Check if we did a manual lock */ + if (!(Flags & (CMP_ENLIST_KCB_LOCKED_SHARED | + CMP_ENLIST_KCB_LOCKED_EXCLUSIVE))) + { + /* Release the lock */ + CmpReleaseKcbLock(KeyBody->KeyControlBlock); + } +} + +VOID +NTAPI +DelistKeyBodyFromKCB(IN PCM_KEY_BODY KeyBody, + IN BOOLEAN LockHeld) +{ + ULONG i; + + /* Sanity check */ + ASSERT(KeyBody->KeyControlBlock != NULL); + + /* Check if we can use the parent KCB array */ + for (i = 0; i < 4; i++) + { + /* Add it into the list */ + if (InterlockedCompareExchangePointer(&KeyBody->KeyControlBlock-> + KeyBodyArray[i], + NULL, + KeyBody) == KeyBody) + { + /* Removed */ + return; + } + } + + /* Sanity checks */ + ASSERT(IsListEmpty(&KeyBody->KeyControlBlock->KeyBodyListHead) == FALSE); + ASSERT(IsListEmpty(&KeyBody->KeyBodyList) == FALSE); + + /* Lock the KCB */ + if (!LockHeld) CmpAcquireKcbLockExclusive(KeyBody->KeyControlBlock); + ASSERT((CmpIsKcbLockedExclusive(KeyBody->KeyControlBlock) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + + /* Remove the entry */ + RemoveEntryList(&KeyBody->KeyBodyList); + + /* Unlock it it if we did a manual lock */ + if (!LockHeld) CmpReleaseKcbLock(KeyBody->KeyControlBlock); +} + + Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sun Dec 16 19:37:15 2007 @@ -66,8 +66,8 @@ Kcb = KeyBody->KeyControlBlock; if (Kcb) { - /* Delist the key (once new parse routines are used) */ - //DelistKeyBodyFromKCB(KeyBody, FALSE); + /* Delist the key */ + DelistKeyBodyFromKCB(KeyBody, FALSE); } /* Dereference the KCB */ Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h Sun Dec 16 19:37:15 2007 @@ -36,12 +36,17 @@ #define CMTRACE(x, ...) DPRINT(__VA_ARGS__) #endif - // // Hack since bigkeys are not yet supported // #define ASSERT_VALUE_BIG(h, s) \ ASSERTMSG("Big keys not supported!", !CmpIsKeyValueBig(h, s)); + +// +// CM_KEY_CONTROL_BLOCK Signatures +// +#define CM_KCB_SIGNATURE TAG('C', 'm', 'K', 'b') +#define CM_KCB_INVALID_SIGNATURE TAG('C', 'm', 'F', '4') // // CM_KEY_CONTROL_BLOCK Flags @@ -81,6 +86,12 @@ #define CMP_LOCK_HASHES_FOR_KCB 0x2 // +// EnlistKeyBodyWithKCB Flags +// +#define CMP_ENLIST_KCB_LOCKED_SHARED 0x1 +#define CMP_ENLIST_KCB_LOCKED_EXCLUSIVE 0x2 + +// // Maximum size of Value Cache // #define MAXIMUM_CACHED_DATA 2 * PAGE_SIZE @@ -94,9 +105,9 @@ // Number of items that can fit inside an Allocation Page // #define CM_KCBS_PER_PAGE \ - PAGE_SIZE / sizeof(CM_KEY_CONTROL_BLOCK) + ((PAGE_SIZE - FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage)) / sizeof(CM_KEY_CONTROL_BLOCK)) #define CM_DELAYS_PER_PAGE \ - PAGE_SIZE / sizeof(CM_DELAYED_CLOSE_ENTRY) + ((PAGE_SIZE - FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage)) / sizeof(CM_DELAY_ALLOC)) // // Value Search Results @@ -229,6 +240,7 @@ // typedef struct _CM_KEY_CONTROL_BLOCK { + ULONG Signature; USHORT RefCount; USHORT Flags; struct @@ -905,6 +917,13 @@ EnlistKeyBodyWithKCB( IN PCM_KEY_BODY KeyObject, IN ULONG Flags +); + +VOID +NTAPI +DelistKeyBodyFromKCB( + IN PCM_KEY_BODY KeyBody, + IN BOOLEAN LockHeld ); NTSTATUS Modified: trunk/reactos/ntoskrnl/include/internal/cm_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/cm_x.h Sun Dec 16 19:37:15 2007 @@ -63,6 +63,8 @@ GET_HASH_KEY(ConvKey) % CmpHashTableSize #define GET_HASH_ENTRY(Table, ConvKey) \ (Table[GET_HASH_INDEX(ConvKey)]) +#define ASSERT_VALID_HASH(h) \ + ASSERT_KCB_VALID(CONTAINING_RECORD((h), CM_KEY_CONTROL_BLOCK, KeyHash)) // // Returns whether or not the cell is cached @@ -95,6 +97,12 @@ #define CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK() \ ASSERT((CmpSpecialBootCondition == TRUE) || \ (CmpTestRegistryLockExclusive() == TRUE)) + +// +// Makes sure this is a valid KCB +// +#define ASSERT_KCB_VALID(k) \ + ASSERT((k)->Signature == CM_KCB_SIGNATURE) // // Checks if a KCB is exclusively locked

1 0

[fireball] 31281: - Sync binhive.c changes with trunk. - Remove duplicated CM structs definitions. - Fixed up code so it compiles.
by fireball＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: fireball Date: Sun Dec 16 19:02:56 2007 New Revision: 31281 URL: http://svn.reactos.org/svn/reactos?rev=31281&view=rev Log: - Sync binhive.c changes with trunk. - Remove duplicated CM structs definitions. - Fixed up code so it compiles. Modified: branches/winldr/arch/i386/hardware.c branches/winldr/reactos/binhive.c branches/winldr/reactos/reactos.c branches/winldr/reactos/setupldr.c Modified: branches/winldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/hardware.c?rev… ============================================================================== --- branches/winldr/arch/i386/hardware.c (original) +++ branches/winldr/arch/i386/hardware.c Sun Dec 16 19:02:56 2007 @@ -79,44 +79,6 @@ /* Timeout in ms for sending to keyboard controller. */ #define CONTROLLER_TIMEOUT 250 - - -typedef struct _CM_DISK_GEOMETRY_DEVICE_DATA -{ - ULONG BytesPerSector; - ULONG NumberOfCylinders; - ULONG SectorsPerTrack; - ULONG NumberOfHeads; -} CM_DISK_GEOMETRY_DEVICE_DATA, *PCM_DISK_GEOMETRY_DEVICE_DATA; - - -typedef struct _CM_PNP_BIOS_DEVICE_NODE -{ - USHORT Size; - CHAR Node; - ULONG ProductId; - CHAR DeviceType[3]; - USHORT DeviceAttributes; -} __attribute__((packed)) CM_PNP_BIOS_DEVICE_NODE, *PCM_PNP_BIOS_DEVICE_NODE; - - -typedef struct _CM_PNP_BIOS_INSTALLATION_CHECK -{ - UCHAR Signature[4]; - UCHAR Revision; - UCHAR Length; - USHORT ControlField; - UCHAR Checksum; - ULONG EventFlagAddress; - USHORT RealModeEntryOffset; - USHORT RealModeEntrySegment; - USHORT ProtectedModeEntryOffset; - ULONG ProtectedModeCodeBaseAddress; - ULONG OemDeviceId; - USHORT RealModeDataBaseAddress; - ULONG ProtectedModeDataBaseAddress; -} __attribute__((packed)) CM_PNP_BIOS_INSTALLATION_CHECK, *PCM_PNP_BIOS_INSTALLATION_CHECK; - static CHAR Hex[] = "0123456789abcdef"; static unsigned int delay_count = 1; Modified: branches/winldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/binhive.c?rev=31… ============================================================================== --- branches/winldr/reactos/binhive.c (original) +++ branches/winldr/reactos/binhive.c Sun Dec 16 19:02:56 2007 @@ -23,11 +23,14 @@ #include <cmlib.h> #include <debug.h> +#define REG_DATA_SIZE_MASK 0x7FFFFFFF +#define REG_DATA_IN_OFFSET 0x80000000 + /* FUNCTIONS ****************************************************************/ static PVOID NTAPI -CmpAllocate (SIZE_T Size, BOOLEAN Paged) +CmpAllocate (SIZE_T Size, BOOLEAN Paged, ULONG Tag) { return MmHeapAlloc(Size); } @@ -35,489 +38,10 @@ static VOID NTAPI -CmpFree (PVOID Ptr) +CmpFree (PVOID Ptr, IN ULONG Quota) { return MmHeapFree(Ptr); } - - -static BOOLEAN -CmiAllocateHashTableCell (PHHIVE Hive, - PHCELL_INDEX HBOffset, - ULONG SubKeyCount) -{ - PHASH_TABLE_CELL HashCell; - ULONG NewHashSize; - - NewHashSize = sizeof(HASH_TABLE_CELL) + - (SubKeyCount * sizeof(HASH_RECORD)); - *HBOffset = HvAllocateCell (Hive, NewHashSize, HvStable); - if (*HBOffset == HCELL_NULL) - { - return FALSE; - } - - HashCell = HvGetCell (Hive, *HBOffset); - HashCell->Id = REG_HASH_TABLE_CELL_ID; - HashCell->HashTableSize = SubKeyCount; - - return TRUE; -} - - -static BOOLEAN -CmiAddKeyToParentHashTable (PHHIVE Hive, - HCELL_INDEX Parent, - PCM_KEY_NODE NewKeyCell, - HCELL_INDEX NKBOffset) -{ - PHASH_TABLE_CELL HashBlock; - PCM_KEY_NODE ParentKeyCell; - ULONG i; - - ParentKeyCell = HvGetCell (Hive, Parent); - HashBlock = HvGetCell (Hive, ParentKeyCell->SubKeyLists[HvStable]); - - for (i = 0; i < HashBlock->HashTableSize; i++) - { - if (HashBlock->Table[i].KeyOffset == 0) - { - HashBlock->Table[i].KeyOffset = NKBOffset; - memcpy (&HashBlock->Table[i].HashValue, - NewKeyCell->Name, - min(NewKeyCell->NameSize, sizeof(ULONG))); - ParentKeyCell->SubKeyCounts[HvStable]++; - return TRUE; - } - } - - return FALSE; -} - - -static BOOLEAN -CmiAllocateValueListCell (PHHIVE Hive, - PHCELL_INDEX ValueListOffset, - ULONG ValueCount) -{ - ULONG ValueListSize; - - ValueListSize = sizeof(VALUE_LIST_CELL) + - (ValueCount * sizeof(HCELL_INDEX)); - *ValueListOffset = HvAllocateCell (Hive, ValueListSize, HvStable); - if (*ValueListOffset == HCELL_NULL) - { - DbgPrint((DPRINT_REGISTRY, "HvAllocateCell() failed\n")); - return FALSE; - } - - return TRUE; -} - - -static BOOLEAN -CmiAllocateValueCell(PHHIVE Hive, - PCM_KEY_VALUE *ValueCell, - HCELL_INDEX *ValueCellOffset, - PWCHAR ValueName) -{ - PCM_KEY_VALUE NewValueCell; - ULONG NameSize; - BOOLEAN Packable = TRUE; - ULONG i; - - NameSize = (ValueName == NULL) ? 0 : wcslen (ValueName); - for (i = 0; i < NameSize; i++) - { - if (ValueName[i] & 0xFF00) - { - NameSize *= sizeof(WCHAR); - Packable = FALSE; - break; - } - } - *ValueCellOffset = HvAllocateCell (Hive, sizeof(CM_KEY_VALUE) + NameSize, HvStable); - if (*ValueCellOffset == HCELL_NULL) - { - DbgPrint((DPRINT_REGISTRY, "CmiAllocateCell() failed\n")); - return FALSE; - } - - NewValueCell = (PCM_KEY_VALUE) HvGetCell (Hive, *ValueCellOffset); - NewValueCell->Id = REG_VALUE_CELL_ID; - NewValueCell->NameSize = NameSize; - NewValueCell->Flags = 0; - if (NameSize > 0) - { - if (Packable) - { - for (i = 0; i < NameSize; i++) - { - ((PCHAR)NewValueCell->Name)[i] = (CHAR)ValueName[i]; - } - NewValueCell->Flags |= REG_VALUE_NAME_PACKED; - } - else - { - memcpy (NewValueCell->Name, - ValueName, - NameSize); - } - } - NewValueCell->DataType = 0; - NewValueCell->DataSize = 0; - NewValueCell->DataOffset = -1; - - *ValueCell = NewValueCell; - - return TRUE; -} - - -static BOOLEAN -CmiAddValueToKeyValueList(PHHIVE Hive, - HCELL_INDEX KeyCellOffset, - HCELL_INDEX ValueCellOffset) -{ - PVALUE_LIST_CELL ValueListCell; - PCM_KEY_NODE KeyCell; - - KeyCell = HvGetCell (Hive, KeyCellOffset); - if (KeyCell == NULL) - { - DbgPrint((DPRINT_REGISTRY, "HvGetCell() failed\n")); - return FALSE; - } - - ValueListCell = HvGetCell (Hive, KeyCell->ValueList.List); - if (ValueListCell == NULL) - { - DbgPrint((DPRINT_REGISTRY, "HvGetCell() failed\n")); - return FALSE; - } - - ValueListCell->ValueOffset[KeyCell->ValueList.Count] = ValueCellOffset; - KeyCell->ValueList.Count++; - - return TRUE; -} - -static BOOLEAN -CmiExportValue (PHHIVE Hive, - HCELL_INDEX KeyCellOffset, - FRLDRHKEY Key, - PVALUE Value) -{ - HCELL_INDEX ValueCellOffset; - HCELL_INDEX DataCellOffset; - PCM_KEY_VALUE ValueCell; - PVOID DataCell; - ULONG DataSize; - ULONG DataType; - PCHAR Data; - - DbgPrint((DPRINT_REGISTRY, "CmiExportValue('%S') called\n", - (Value == NULL) ? "<default>" : (PCHAR)Value->Name)); - DbgPrint((DPRINT_REGISTRY, "DataSize %lu\n", - (Value == NULL) ? Key->DataSize : Value->DataSize)); - - /* Allocate value cell */ - if (!CmiAllocateValueCell(Hive, &ValueCell, &ValueCellOffset, (Value == NULL) ? NULL : Value->Name)) - { - return FALSE; - } - - if (!CmiAddValueToKeyValueList(Hive, KeyCellOffset, ValueCellOffset)) - { - return FALSE; - } - - if (Value == NULL) - { - DataType = Key->DataType; - DataSize = Key->DataSize; - Data = Key->Data; - } - else - { - DataType = Value->DataType; - DataSize = Value->DataSize; - Data = Value->Data; - } - - if (DataSize <= sizeof(HCELL_INDEX)) - { - ValueCell->DataSize = DataSize | REG_DATA_IN_OFFSET; - ValueCell->DataType = DataType; - memcpy (&ValueCell->DataOffset, - &Data, - DataSize); - } - else - { - /* Allocate data cell */ - DataCellOffset = HvAllocateCell (Hive, DataSize, HvStable); - if (DataCellOffset == HCELL_NULL) - { - return FALSE; - } - - ValueCell->DataOffset = DataCellOffset; - ValueCell->DataSize = DataSize; - ValueCell->DataType = DataType; - - DataCell = HvGetCell (Hive, DataCellOffset); - memcpy (DataCell, - Data, - DataSize); - } - - return TRUE; -} - - -static BOOLEAN -CmiExportSubKey (PHHIVE Hive, - HCELL_INDEX Parent, - FRLDRHKEY ParentKey, - FRLDRHKEY Key) -{ - HCELL_INDEX NKBOffset; - PCM_KEY_NODE NewKeyCell; - ULONG KeyCellSize; - ULONG SubKeyCount; - ULONG ValueCount; - PLIST_ENTRY Entry; - FRLDRHKEY SubKey; - PVALUE Value; - BOOLEAN Packable = TRUE; - ULONG i; - ULONG NameSize; - - DbgPrint((DPRINT_REGISTRY, "CmiExportSubKey('%S') called\n", Key->Name)); - - /* Don't export links */ - if (Key->DataType == REG_LINK) - return TRUE; - - NameSize = (Key->NameSize - sizeof(WCHAR)) / sizeof(WCHAR); - for (i = 0; i < NameSize; i++) - { - if (Key->Name[i] & 0xFF00) - { - Packable = FALSE; - NameSize *= sizeof(WCHAR); - break; - } - } - - /* Allocate key cell */ - KeyCellSize = sizeof(CM_KEY_NODE) + NameSize; - NKBOffset = HvAllocateCell (Hive, KeyCellSize, HvStable); - if (NKBOffset == HCELL_NULL) - { - DbgPrint((DPRINT_REGISTRY, "HvAllocateCell() failed\n")); - return FALSE; - } - - /* Initialize key cell */ - NewKeyCell = (PCM_KEY_NODE) HvGetCell (Hive, NKBOffset); - NewKeyCell->Id = REG_KEY_CELL_ID; - NewKeyCell->Flags = 0; - NewKeyCell->LastWriteTime.QuadPart = 0ULL; - NewKeyCell->Parent = Parent; - NewKeyCell->SubKeyCounts[HvStable] = 0; - NewKeyCell->SubKeyLists[HvStable] = -1; - NewKeyCell->ValueList.Count = 0; - NewKeyCell->ValueList.List = -1; - NewKeyCell->SecurityKeyOffset = -1; - NewKeyCell->ClassNameOffset = -1; - NewKeyCell->NameSize = NameSize; - NewKeyCell->ClassSize = 0; - if (Packable) - { - for (i = 0; i < NameSize; i++) - { - ((PCHAR)NewKeyCell->Name)[i] = (CHAR)Key->Name[i]; - } - NewKeyCell->Flags |= REG_KEY_NAME_PACKED; - - } - else - { - memcpy (NewKeyCell->Name, - Key->Name, - NameSize); - } - - /* Add key cell to the parent key's hash table */ - if (!CmiAddKeyToParentHashTable (Hive, - Parent, - NewKeyCell, - NKBOffset)) - { - DbgPrint((DPRINT_REGISTRY, "CmiAddKeyToParentHashTable() failed\n")); - return FALSE; - } - - ValueCount = RegGetValueCount (Key); - DbgPrint((DPRINT_REGISTRY, "ValueCount: %u\n", ValueCount)); - if (ValueCount > 0) - { - /* Allocate value list cell */ - if (!CmiAllocateValueListCell (Hive, - &NewKeyCell->ValueList.List, - ValueCount)) - { - DbgPrint((DPRINT_REGISTRY, "CmiAllocateValueListCell() failed\n")); - return FALSE; - } - - if (Key->DataSize != 0) - { - if (!CmiExportValue (Hive, NKBOffset, Key, NULL)) - return FALSE; - } - - /* Enumerate values */ - Entry = Key->ValueList.Flink; - while (Entry != &Key->ValueList) - { - Value = CONTAINING_RECORD(Entry, - VALUE, - ValueList); - - if (!CmiExportValue (Hive, NKBOffset, Key, Value)) - return FALSE; - - Entry = Entry->Flink; - } - } - - SubKeyCount = RegGetSubKeyCount (Key); - DbgPrint((DPRINT_REGISTRY, "SubKeyCount: %u\n", SubKeyCount)); - if (SubKeyCount > 0) - { - /* Allocate hash table cell */ - if (!CmiAllocateHashTableCell (Hive, - &NewKeyCell->SubKeyLists[HvStable], - SubKeyCount)) - { - DbgPrint((DPRINT_REGISTRY, "CmiAllocateHashTableCell() failed\n")); - return FALSE; - } - - /* Enumerate subkeys */ - Entry = Key->SubKeyList.Flink; - while (Entry != &Key->SubKeyList) - { - SubKey = CONTAINING_RECORD(Entry, - KEY, - KeyList); - - if (!CmiExportSubKey (Hive, NKBOffset, Key, SubKey)) - return FALSE; - - Entry = Entry->Flink; - } - } - - return TRUE; -} - - -static BOOLEAN -CmiExportHive (PHHIVE Hive, - PCWSTR KeyName) -{ - PCM_KEY_NODE KeyCell; - FRLDRHKEY Key; - ULONG SubKeyCount; - ULONG ValueCount; - PLIST_ENTRY Entry; - FRLDRHKEY SubKey; - PVALUE Value; - - DbgPrint((DPRINT_REGISTRY, "CmiExportHive(%x, '%S') called\n", Hive, KeyName)); - - if (RegOpenKey (NULL, KeyName, &Key) != ERROR_SUCCESS) - { - DbgPrint((DPRINT_REGISTRY, "RegOpenKey() failed\n")); - return FALSE; - } - - KeyCell = HvGetCell (Hive, Hive->HiveHeader->RootCell); - if (KeyCell == NULL) - { - DbgPrint((DPRINT_REGISTRY, "HvGetCell() failed\n")); - return FALSE; - } - - ValueCount = RegGetValueCount (Key); - DbgPrint((DPRINT_REGISTRY, "ValueCount: %u\n", ValueCount)); - if (ValueCount > 0) - { - /* Allocate value list cell */ - if (!CmiAllocateValueListCell (Hive, - &KeyCell->ValueList.List, - ValueCount)) - { - DbgPrint((DPRINT_REGISTRY, "CmiAllocateValueListCell() failed\n")); - return FALSE; - } - - if (Key->DataSize != 0) - { - if (!CmiExportValue (Hive, Hive->HiveHeader->RootCell, Key, NULL)) - return FALSE; - } - - /* Enumerate values */ - Entry = Key->ValueList.Flink; - while (Entry != &Key->ValueList) - { - Value = CONTAINING_RECORD(Entry, - VALUE, - ValueList); - - if (!CmiExportValue (Hive, Hive->HiveHeader->RootCell, Key, Value)) - return FALSE; - - Entry = Entry->Flink; - } - } - - SubKeyCount = RegGetSubKeyCount (Key); - DbgPrint((DPRINT_REGISTRY, "SubKeyCount: %u\n", SubKeyCount)); - if (SubKeyCount > 0) - { - /* Allocate hash table cell */ - if (!CmiAllocateHashTableCell (Hive, - &KeyCell->SubKeyLists[HvStable], - SubKeyCount)) - { - DbgPrint((DPRINT_REGISTRY, "CmiAllocateHashTableCell() failed\n")); - return FALSE; - } - - /* Enumerate subkeys */ - Entry = Key->SubKeyList.Flink; - while (Entry != &Key->SubKeyList) - { - SubKey = CONTAINING_RECORD(Entry, - KEY, - KeyList); - - if (!CmiExportSubKey (Hive, Hive->HiveHeader->RootCell, Key, SubKey)) - return FALSE; - - Entry = Entry->Flink; - } - } - - return TRUE; -} - static BOOLEAN RegImportValue (PHHIVE Hive, @@ -527,45 +51,45 @@ PVOID DataCell; PWCHAR wName; LONG Error; - ULONG DataSize; + ULONG DataLength; ULONG i; - if (ValueCell->Id != REG_VALUE_CELL_ID) + if (ValueCell->Signature != CM_KEY_VALUE_SIGNATURE) { DbgPrint((DPRINT_REGISTRY, "Invalid key cell!\n")); return FALSE; } - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - wName = MmHeapAlloc((ValueCell->NameSize + 1)*sizeof(WCHAR)); - for (i = 0; i < ValueCell->NameSize; i++) + if (ValueCell->Flags & VALUE_COMP_NAME) + { + wName = MmHeapAlloc((ValueCell->NameLength + 1)*sizeof(WCHAR)); + for (i = 0; i < ValueCell->NameLength; i++) { wName[i] = ((PCHAR)ValueCell->Name)[i]; } - wName[ValueCell->NameSize] = 0; + wName[ValueCell->NameLength] = 0; } else { - wName = MmHeapAlloc(ValueCell->NameSize + sizeof(WCHAR)); + wName = MmHeapAlloc(ValueCell->NameLength + sizeof(WCHAR)); memcpy (wName, ValueCell->Name, - ValueCell->NameSize); - wName[ValueCell->NameSize / sizeof(WCHAR)] = 0; - } - - DataSize = ValueCell->DataSize & REG_DATA_SIZE_MASK; + ValueCell->NameLength); + wName[ValueCell->NameLength / sizeof(WCHAR)] = 0; + } + + DataLength = ValueCell->DataLength & REG_DATA_SIZE_MASK; DbgPrint((DPRINT_REGISTRY, "ValueName: '%S'\n", wName)); - DbgPrint((DPRINT_REGISTRY, "DataSize: %u\n", DataSize)); - - if (DataSize <= sizeof(HCELL_INDEX) && (ValueCell->DataSize & REG_DATA_IN_OFFSET)) + DbgPrint((DPRINT_REGISTRY, "DataLength: %u\n", DataLength)); + + if (DataLength <= sizeof(HCELL_INDEX) && (ValueCell->DataLength & REG_DATA_IN_OFFSET)) { Error = RegSetValue(Key, wName, - ValueCell->DataType, - (PCHAR)&ValueCell->DataOffset, - DataSize); + ValueCell->Type, + (PCHAR)&ValueCell->Data, + DataLength); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_REGISTRY, "RegSetValue() failed!\n")); @@ -575,15 +99,15 @@ } else { - DataCell = HvGetCell (Hive, ValueCell->DataOffset); + DataCell = (PVOID)HvGetCell (Hive, ValueCell->Data); DbgPrint((DPRINT_REGISTRY, "DataCell: %x\n", DataCell)); Error = RegSetValue (Key, wName, - ValueCell->DataType, + ValueCell->Type, DataCell, - DataSize); - + DataLength); + if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_REGISTRY, "RegSetValue() failed!\n")); @@ -603,7 +127,7 @@ PCM_KEY_NODE KeyCell, FRLDRHKEY ParentKey) { - PHASH_TABLE_CELL HashCell; + PCM_KEY_FAST_INDEX HashCell; PCM_KEY_NODE SubKeyCell; PVALUE_LIST_CELL ValueListCell; PCM_KEY_VALUE ValueCell = NULL; @@ -614,29 +138,29 @@ DbgPrint((DPRINT_REGISTRY, "KeyCell: %x\n", KeyCell)); - DbgPrint((DPRINT_REGISTRY, "KeyCell->Id: %x\n", KeyCell->Id)); - if (KeyCell->Id != REG_KEY_CELL_ID) - { - DbgPrint((DPRINT_REGISTRY, "Invalid key cell id!\n")); - return FALSE; - } - - if (KeyCell->Flags & REG_KEY_NAME_PACKED) - { - wName = MmHeapAlloc ((KeyCell->NameSize + 1) * sizeof(WCHAR)); - for (i = 0; i < KeyCell->NameSize; i++) + DbgPrint((DPRINT_REGISTRY, "KeyCell->Signature: %x\n", KeyCell->Signature)); + if (KeyCell->Signature != CM_KEY_NODE_SIGNATURE) + { + DbgPrint((DPRINT_REGISTRY, "Invalid key cell Signature!\n")); + return FALSE; + } + + if (KeyCell->Flags & KEY_COMP_NAME) + { + wName = MmHeapAlloc ((KeyCell->NameLength + 1) * sizeof(WCHAR)); + for (i = 0; i < KeyCell->NameLength; i++) { wName[i] = ((PCHAR)KeyCell->Name)[i]; } - wName[KeyCell->NameSize] = 0; + wName[KeyCell->NameLength] = 0; } else { - wName = MmHeapAlloc (KeyCell->NameSize + sizeof(WCHAR)); + wName = MmHeapAlloc (KeyCell->NameLength + sizeof(WCHAR)); memcpy (wName, KeyCell->Name, - KeyCell->NameSize); - wName[KeyCell->NameSize/sizeof(WCHAR)] = 0; + KeyCell->NameLength); + wName[KeyCell->NameLength/sizeof(WCHAR)] = 0; } DbgPrint((DPRINT_REGISTRY, "KeyName: '%S'\n", wName)); @@ -674,18 +198,17 @@ } /* Enumerate and add subkeys */ - if (KeyCell->SubKeyCounts[HvStable] > 0) - { - HashCell = (PHASH_TABLE_CELL) HvGetCell (Hive, KeyCell->SubKeyLists[HvStable]); + if (KeyCell->SubKeyCounts[Stable] > 0) + { + HashCell = (PCM_KEY_FAST_INDEX) HvGetCell (Hive, KeyCell->SubKeyLists[Stable]); DbgPrint((DPRINT_REGISTRY, "HashCell: %x\n", HashCell)); - DbgPrint((DPRINT_REGISTRY, "HashCell->Id: %x\n", HashCell->Id)); DbgPrint((DPRINT_REGISTRY, "SubKeyCounts: %x\n", KeyCell->SubKeyCounts)); - for (i = 0; i < KeyCell->SubKeyCounts[HvStable]; i++) - { - DbgPrint((DPRINT_REGISTRY, "KeyOffset[%d]: %x\n", i, HashCell->Table[i].KeyOffset)); - - SubKeyCell = (PCM_KEY_NODE) HvGetCell (Hive, HashCell->Table[i].KeyOffset); + for (i = 0; i < KeyCell->SubKeyCounts[Stable]; i++) + { + DbgPrint((DPRINT_REGISTRY, "Cell[%d]: %x\n", i, HashCell->List[i].Cell)); + + SubKeyCell = (PCM_KEY_NODE) HvGetCell (Hive, HashCell->List[i].Cell); DbgPrint((DPRINT_REGISTRY, "SubKeyCell[%d]: %x\n", i, SubKeyCell)); @@ -703,35 +226,44 @@ ULONG ChunkSize) { PCM_KEY_NODE KeyCell; - PHASH_TABLE_CELL HashCell; + PCM_KEY_FAST_INDEX HashCell; PCM_KEY_NODE SubKeyCell; FRLDRHKEY SystemKey; ULONG i; LONG Error; - PEREGISTRY_HIVE CmHive; + PCMHIVE CmHive; PHHIVE Hive; NTSTATUS Status; DbgPrint((DPRINT_REGISTRY, "RegImportBinaryHive(%x, %u) called\n",ChunkBase,ChunkSize)); - CmHive = CmpAllocate(sizeof(EREGISTRY_HIVE), TRUE); - Status = HvInitialize (&CmHive->Hive, HV_OPERATION_MEMORY_INPLACE, 0, 0, - (ULONG_PTR)ChunkBase, 0, - CmpAllocate, CmpFree, - NULL, NULL, NULL, NULL, NULL); + CmHive = CmpAllocate(sizeof(CMHIVE), TRUE, 0); + Status = HvInitialize (&CmHive->Hive, + HINIT_FLAT, + 0, + 0, + ChunkBase, + CmpAllocate, + CmpFree, + NULL, + NULL, + NULL, + NULL, + 1, + NULL); if (!NT_SUCCESS(Status)) { - DbgPrint((DPRINT_REGISTRY, "Invalid hive id!\n")); + DbgPrint((DPRINT_REGISTRY, "Invalid hive Signature!\n")); return FALSE; } Hive = &CmHive->Hive; - KeyCell = HvGetCell (Hive, Hive->HiveHeader->RootCell); + KeyCell = (PCM_KEY_NODE)HvGetCell (Hive, Hive->BaseBlock->RootCell); DbgPrint((DPRINT_REGISTRY, "KeyCell: %x\n", KeyCell)); - DbgPrint((DPRINT_REGISTRY, "KeyCell->Id: %x\n", KeyCell->Id)); - if (KeyCell->Id != REG_KEY_CELL_ID) - { - DbgPrint((DPRINT_REGISTRY, "Invalid key cell id!\n")); + DbgPrint((DPRINT_REGISTRY, "KeyCell->Signature: %x\n", KeyCell->Signature)); + if (KeyCell->Signature != CM_KEY_NODE_SIGNATURE) + { + DbgPrint((DPRINT_REGISTRY, "Invalid key cell Signature!\n")); return FALSE; } @@ -749,17 +281,17 @@ } /* Enumerate and add subkeys */ - if (KeyCell->SubKeyCounts[HvStable] > 0) - { - HashCell = HvGetCell (Hive, KeyCell->SubKeyLists[HvStable]); + if (KeyCell->SubKeyCounts[Stable] > 0) + { + HashCell = (PCM_KEY_FAST_INDEX)HvGetCell (Hive, KeyCell->SubKeyLists[Stable]); DbgPrint((DPRINT_REGISTRY, "HashCell: %x\n", HashCell)); - DbgPrint((DPRINT_REGISTRY, "SubKeyCounts: %x\n", KeyCell->SubKeyCounts[HvStable])); - - for (i = 0; i < KeyCell->SubKeyCounts[HvStable]; i++) - { - DbgPrint((DPRINT_REGISTRY, "KeyOffset[%d]: %x\n", i, HashCell->Table[i].KeyOffset)); - - SubKeyCell = HvGetCell (Hive, HashCell->Table[i].KeyOffset); + DbgPrint((DPRINT_REGISTRY, "SubKeyCounts: %x\n", KeyCell->SubKeyCounts[Stable])); + + for (i = 0; i < KeyCell->SubKeyCounts[Stable]; i++) + { + DbgPrint((DPRINT_REGISTRY, "Cell[%d]: %x\n", i, HashCell->List[i].Cell)); + + SubKeyCell = (PCM_KEY_NODE)HvGetCell (Hive, HashCell->List[i].Cell); DbgPrint((DPRINT_REGISTRY, "SubKeyCell[%d]: %x\n", i, SubKeyCell)); @@ -771,76 +303,4 @@ return TRUE; } - -static VOID -CmiWriteHive(PHHIVE Hive, - PCHAR ChunkBase, - ULONG* ChunkSize) -{ - PHBIN Bin; - ULONG i, Size; - - /* Write hive header */ - memcpy (ChunkBase, Hive->HiveHeader, HV_BLOCK_SIZE); - Size = HV_BLOCK_SIZE; - - Bin = NULL; - for (i = 0; i < Hive->Storage[HvStable].Length; i++) - { - if (Hive->Storage[HvStable].BlockList[i].Bin != (ULONG_PTR)Bin) - { - Bin = (PHBIN)Hive->Storage[HvStable].BlockList[i].Bin; - memcpy (ChunkBase + (i + 1) * HV_BLOCK_SIZE, - Bin, Bin->Size); - Size += Bin->Size; - } - } - - DbgPrint((DPRINT_REGISTRY, "ChunkSize: %x\n", Size)); - - *ChunkSize = Size; -} - - -BOOLEAN -RegExportBinaryHive(PCWSTR KeyName, - PCHAR ChunkBase, - ULONG* ChunkSize) -{ - PEREGISTRY_HIVE CmHive; - PHHIVE Hive; - NTSTATUS Status; - - DbgPrint((DPRINT_REGISTRY, "Creating binary hardware hive\n")); - - CmHive = CmpAllocate(sizeof(EREGISTRY_HIVE), TRUE); - Status = HvInitialize (&CmHive->Hive, HV_OPERATION_CREATE_HIVE, 0, 0, 0, 0, - CmpAllocate, CmpFree, - NULL, NULL, NULL, NULL, NULL); - Hive = &CmHive->Hive; - if (!NT_SUCCESS(Status)) - { - return FALSE; - } - - /* Init root key cell */ - if (!CmCreateRootNode (Hive, KeyName)) - { - HvFree (Hive); - return FALSE; - } - - if (!CmiExportHive (Hive, KeyName)) - { - HvFree (Hive); - return FALSE; - } - - CmiWriteHive (Hive, ChunkBase, ChunkSize); - - HvFree (Hive); - - return TRUE; -} - /* EOF */ Modified: branches/winldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/reactos.c?rev=31… ============================================================================== --- branches/winldr/reactos/reactos.c (original) +++ branches/winldr/reactos/reactos.c Sun Dec 16 19:02:56 2007 @@ -900,7 +900,7 @@ * Export the hardware hive */ Base = FrLdrCreateModule ("HARDWARE"); - RegExportBinaryHive (L"\\Registry\\Machine\\HARDWARE", (PCHAR)Base, &Size); + //RegExportBinaryHive (L"\\Registry\\Machine\\HARDWARE", (PCHAR)Base, &Size); FrLdrCloseModule (Base, Size); UiDrawProgressBarCenter(20, 100, szLoadingMsg); Modified: branches/winldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/setupldr.c?rev=3… ============================================================================== --- branches/winldr/reactos/setupldr.c (original) +++ branches/winldr/reactos/setupldr.c Sun Dec 16 19:02:56 2007 @@ -279,8 +279,8 @@ VOID RunLoader(VOID) { - ULONG_PTR Base; - ULONG Size; + //ULONG_PTR Base; + //ULONG Size; const char *SourcePath; const char *LoadOptions = "", *DbgLoadOptions = ""; UINT i; @@ -447,9 +447,9 @@ LoadKernelSymbols(SourcePath, "ntoskrnl.exe"); /* Export the hardware hive */ - Base = FrLdrCreateModule ("HARDWARE"); - RegExportBinaryHive (L"\\Registry\\Machine\\HARDWARE", (PVOID)Base, &Size); - FrLdrCloseModule (Base, Size); + //Base = FrLdrCreateModule ("HARDWARE"); + //RegExportBinaryHive (L"\\Registry\\Machine\\HARDWARE", (PVOID)Base, &Size); + //FrLdrCloseModule (Base, Size); #if 0 printf("Base: %x\n", Base);

1 0

[fireball] 31280: - Add shared->Exclusive promotion support to value cache routines as well. - Implement CmpCompareNewValueDataAgainstKCBCache as an optimization during Set Value Key operations, so that if the value is already identical, it will not be written again.
by fireball＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: fireball Date: Sun Dec 16 18:41:48 2007 New Revision: 31280 URL: http://svn.reactos.org/svn/reactos?rev=31280&view=rev Log: - Add shared->Exclusive promotion support to value cache routines as well. - Implement CmpCompareNewValueDataAgainstKCBCache as an optimization during Set Value Key operations, so that if the value is already identical, it will not be written again. Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmvalche.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Sun Dec 16 18:41:48 2007 @@ -296,7 +296,11 @@ } /* Search for the value */ - SearchResult = SearchFail; + SearchResult = CmpCompareNewValueDataAgainstKCBCache(Kcb, + ValueName, + Type, + Data, + DataLength); if (SearchResult == SearchNeedExclusiveLock) { /* Try again with the exclusive lock */ Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c Sun Dec 16 18:41:48 2007 @@ -55,12 +55,10 @@ *ValueListToRelease = HCELL_NIL; *IndexIsCached = FALSE; - /* Get the hive */ + /* Get the hive and value ceche */ Hive = Kcb->KeyHive; + ChildList = &Kcb->ValueCache; KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); - - /* Get the child value cache */ - //ChildList = &Kcb->ValueCache; ChildList = (PCACHED_CHILD_LIST)&KeyNode->ValueList; /* Check if the value is cached */ @@ -73,10 +71,20 @@ } else { + /* Make sure the KCB is locked exclusive */ + if (!(CmpIsKcbLockedExclusive(Kcb)) && + !(CmpTryToConvertKcbSharedToExclusive(Kcb))) + { + /* We need the exclusive lock */ + return SearchNeedExclusiveLock; + } + /* Select the value list as our cell, and get the actual list array */ CellToRelease = ChildList->ValueList; *CellData = (PCELL_DATA)HvGetCell(Hive, CellToRelease); if (!(*CellData)) return SearchFail; + + /* FIXME: Here we would cache the value */ /* Return the cell to be released */ *ValueListToRelease = CellToRelease; @@ -210,12 +218,10 @@ *CellToRelease = HCELL_NIL; *Value = NULL; - /* Get the hive */ + /* Get the hive and child list */ Hive = Kcb->KeyHive; + ChildList = &Kcb->ValueCache; KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); - - /* Get the child value cache */ - //ChildList = &Kcb->ValueCache; ChildList = (PCACHED_CHILD_LIST)&KeyNode->ValueList; /* Check if the child list has any entries */ @@ -226,7 +232,13 @@ &CellData, &IndexIsCached, &Cell); - if (SearchResult != SearchSuccess) return SearchResult; + if (SearchResult != SearchSuccess) + { + /* We either failed or need the exclusive lock */ + ASSERT((SearchResult == SearchFail) || !(CmpIsKcbLockedExclusive(Kcb))); + ASSERT(Cell == HCELL_NIL); + return SearchResult; + } /* The index shouldn't be cached right now */ if (IndexIsCached) ASSERT_VALUE_CACHE(); @@ -251,7 +263,13 @@ IndexIsCached, ValueIsCached, CellToRelease); - if (SearchResult != SearchSuccess) return SearchResult; + if (SearchResult != SearchSuccess) + { + /* We either failed or need the exclusive lock */ + ASSERT((SearchResult == SearchFail) || !(CmpIsKcbLockedExclusive(Kcb))); + ASSERT(Cell == HCELL_NIL); + return SearchResult; + } /* Check if the both the index and the value are cached */ if ((IndexIsCached) && (*ValueIsCached)) @@ -647,3 +665,143 @@ /* Return the search result as well */ return Result; } + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpCompareNewValueDataAgainstKCBCache(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN PUNICODE_STRING ValueName, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize) +{ + VALUE_SEARCH_RETURN_TYPE SearchResult; + PCM_KEY_NODE KeyNode; + PCM_CACHED_VALUE *CachedValue; + ULONG Index; + PCM_KEY_VALUE Value; + BOOLEAN ValueCached, BufferAllocated = FALSE; + PVOID Buffer; + HCELL_INDEX ValueCellToRelease = HCELL_NIL, CellToRelease = HCELL_NIL; + BOOLEAN IsSmall; + ULONG CompareResult; + PAGED_CODE(); + + /* Check if this is a symlink */ + if (Kcb->Flags & KEY_SYM_LINK) + { + /* We need the exclusive lock */ + if (!(CmpIsKcbLockedExclusive(Kcb)) && + !(CmpTryToConvertKcbSharedToExclusive(Kcb))) + { + /* We need the exclusive lock */ + return SearchNeedExclusiveLock; + } + + /* Otherwise, get the key node */ + KeyNode = (PCM_KEY_NODE)HvGetCell(Kcb->KeyHive, Kcb->KeyCell); + if (!KeyNode) return SearchFail; + + /* Cleanup the KCB cache */ + CmpCleanUpKcbValueCache(Kcb); + + /* Sanity checks */ + ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); + ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); + + /* Set the value cache */ + Kcb->ValueCache.Count = KeyNode->ValueList.Count; + Kcb->ValueCache.ValueList = KeyNode->ValueList.List; + + /* Release the cell */ + HvReleaseCell(Kcb->KeyHive, Kcb->KeyCell); + } + + /* Do the search */ + SearchResult = CmpFindValueByNameFromCache(Kcb, + ValueName, + &CachedValue, + &Index, + &Value, + &ValueCached, + &ValueCellToRelease); + if (SearchResult == SearchNeedExclusiveLock) + { + /* We need the exclusive lock */ + ASSERT(!CmpIsKcbLockedExclusive(Kcb)); + ASSERT(ValueCellToRelease == HCELL_NIL); + ASSERT(Value == NULL); + goto Quickie; + } + else if (SearchResult == SearchSuccess) + { + /* Sanity check */ + ASSERT(Value); + + /* First of all, check if the key size and type matches */ + if ((Type == Value->Type) && + (DataSize == (Value->DataLength & ~CM_KEY_VALUE_SPECIAL_SIZE))) + { + /* Check if this is a small key */ + IsSmall = (DataSize <= CM_KEY_VALUE_SMALL) ? TRUE: FALSE; + if (IsSmall) + { + /* Compare against the data directly */ + Buffer = &Value->Data; + } + else + { + /* Do a search */ + SearchResult = CmpGetValueDataFromCache(Kcb, + CachedValue, + (PCELL_DATA)Value, + ValueCached, + &Buffer, + &BufferAllocated, + &CellToRelease); + if (SearchResult != SearchSuccess) + { + /* Sanity checks */ + ASSERT(Buffer == NULL); + ASSERT(BufferAllocated == FALSE); + goto Quickie; + } + } + + /* Now check the data size */ + if (DataSize) + { + /* Do the compare */ + CompareResult = RtlCompareMemory(Buffer, + Data, + DataSize & + ~CM_KEY_VALUE_SPECIAL_SIZE); + } + else + { + /* It's equal */ + CompareResult = 0; + } + + /* Now check if the compare wasn't equal */ + if (CompareResult != DataSize) SearchResult = SearchFail; + } + else + { + /* The length or type isn't equal */ + SearchResult = SearchFail; + } + } + +Quickie: + /* Release the value cell */ + if (ValueCellToRelease) HvReleaseCell(Kcb->KeyHive, ValueCellToRelease); + + /* Free the buffer */ + if (BufferAllocated) ExFreePool(Buffer); + + /* Free the cell */ + if (CellToRelease) HvReleaseCell(Kcb->KeyHive, CellToRelease); + + /* Return the search result */ + return SearchResult; +}

1 0

[pschweitzer] 31279: Fixed some details
by pschweitzer＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: pschweitzer Date: Sun Dec 16 18:25:17 2007 New Revision: 31279 URL: http://svn.reactos.org/svn/reactos?rev=31279&view=rev Log: Fixed some details Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Sun Dec 16 18:25:17 2007 @@ -176,7 +176,7 @@ { 6, 6, - "Licence:", + "Licence :", TEXT_HIGHLIGHT }, { @@ -254,7 +254,7 @@ { 8, 22, - "Warranty:", + "Garantie :", TEXT_HIGHLIGHT }, { @@ -300,31 +300,31 @@ { 8, 11, - " Ordinateur:", + " Ordinateur :", TEXT_NORMAL }, { 8, 12, - " Affichage:", + " Affichage :", TEXT_NORMAL, }, { 8, 13, - " Clavier:", + " Clavier :", TEXT_NORMAL }, { 8, 14, - "Réglage Clavier:", + "Réglage Clavier :", TEXT_NORMAL }, { 8, 16, - " Accepter:", + " Accepter :", TEXT_NORMAL }, {

1 0

[spetreolle] 31278: fix typo
by spetreolle＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: spetreolle Date: Sun Dec 16 17:55:48 2007 New Revision: 31278 URL: http://svn.reactos.org/svn/reactos?rev=31278&view=rev Log: fix typo Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c Sun Dec 16 17:55:48 2007 @@ -644,7 +644,7 @@ PollBuffer = HeapAlloc(GlobalHeap, 0, PollBufferSize); if (!PollBuffer) { - if (*lpErrno) *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; NtClose(SockEvent); return SOCKET_ERROR; }

1 0

[hpoussin] 31277: Fix typo spotted by Usurp
by hpoussin＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: hpoussin Date: Sun Dec 16 17:44:01 2007 New Revision: 31277 URL: http://svn.reactos.org/svn/reactos?rev=31277&view=rev Log: Fix typo spotted by Usurp Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c Sun Dec 16 17:44:01 2007 @@ -757,18 +757,18 @@ HeapFree( GlobalHeap, 0, PollBuffer ); NtClose( SockEvent ); - AFD_DbgPrint(MID_TRACE,("lpErrno = %x\n", lpErrno)); if( lpErrno ) { - switch( IOSB.Status ) { - case STATUS_SUCCESS: - case STATUS_TIMEOUT: *lpErrno = 0; break; - default: *lpErrno = WSAEINVAL; break; - } + switch( IOSB.Status ) { + case STATUS_SUCCESS: + case STATUS_TIMEOUT: *lpErrno = 0; break; + default: *lpErrno = WSAEINVAL; break; + } + AFD_DbgPrint(MID_TRACE,("*lpErrno = %x\n", *lpErrno)); } AFD_DbgPrint(MID_TRACE,("%d events\n", OutCount)); - + return OutCount; }

1 0

[greatlrd] 31276: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) add d3d COM interface to ddraw.dll Fixed smaller bugs as well
by greatlrd＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: greatlrd Date: Sun Dec 16 17:07:33 2007 New Revision: 31276 URL: http://svn.reactos.org/svn/reactos?rev=31276&view=rev Log: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) add d3d COM interface to ddraw.dll Fixed smaller bugs as well Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D2_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D3_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D7_Vtable.c (with props) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c trunk/reactos/dll/directx/ddraw/Surface/surface.h trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c trunk/reactos/dll/directx/ddraw/d3d/DirectD3D_main.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h Sun Dec 16 17:07:33 2007 @@ -68,6 +68,22 @@ HRESULT WINAPI Main_DirectDraw_EnumSurfaces( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwFlags, + LPDDSURFACEDESC lpDDSD2, + LPVOID context, + LPDDENUMSURFACESCALLBACK callback); + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces4( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwFlags, + LPDDSURFACEDESC2 lpDDSD2, + LPVOID context, + LPDDENUMSURFACESCALLBACK2 callback); + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces7( LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, @@ -217,3 +233,4 @@ + Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Sun Dec 16 17:07:33 2007 @@ -40,6 +40,24 @@ HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, + LPDDSURFACEDESC lpDDSD, LPVOID context, + LPDDENUMSURFACESCALLBACK callback) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces4(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, + LPDDSURFACEDESC2 lpDDSD2, LPVOID context, + LPDDENUMSURFACESCALLBACK2 callback) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces7(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, LPVOID context, LPDDENUMSURFACESCALLBACK7 callback) { Modified: trunk/reactos/dll/directx/ddraw/Surface/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface.h (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface.h Sun Dec 16 17:07:33 2007 @@ -1,56 +1,56 @@ // public interfaces ULONG WINAPI Main_DDrawSurface_AddRef(LPDDRAWI_DDRAWSURFACE_INT); -ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7); +ULONG WINAPI Main_DDrawSurface_Release(LPDDRAWI_DDRAWSURFACE_INT); HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDDRAWI_DDRAWSURFACE_INT, REFIID, LPVOID*); -HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX); -HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7, LPDDBLTBATCH, DWORD, DWORD); -HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7, DWORD, DWORD, LPDIRECTDRAWSURFACE7, LPRECT, DWORD); -HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7, DWORD, LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7, LPVOID, LPDDENUMSURFACESCALLBACK7); -HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK7); -HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 , LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7, REFGUID); -HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7, LPDDSCAPS2, LPDIRECTDRAWSURFACE7*); -HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7, DWORD dwFlags); -HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7, LPDDSCAPS2 pCaps); -HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7, LPDIRECTDRAWCLIPPER*); -HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7, DWORD, LPDDCOLORKEY); -HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7, HDC *); -HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7, LPVOID*); -HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7, LPDWORD); -HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7, LPLONG, LPLONG); -HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7, LPDIRECTDRAWPALETTE*); -HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7, LPDDPIXELFORMAT); -HRESULT WINAPI Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7, LPDWORD); -HRESULT WINAPI Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7, REFGUID, LPVOID, LPDWORD); -HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2); -HRESULT WINAPI Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7, LPDWORD); -HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7, HDC); -HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7, LPDIRECTDRAWCLIPPER); -HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7, DWORD, LPDDCOLORKEY); -HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE7, LONG, LONG); -HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7, LPDIRECTDRAWPALETTE); -HRESULT WINAPI Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7, REFGUID, LPVOID, DWORD, DWORD); -HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7, DWORD, LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7, DDSURFACEDESC2 *, DWORD); -HRESULT WINAPI Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7, LPRECT); -HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7, LPDIRECTDRAW, LPDDSURFACEDESC2); -HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7, LPRECT, LPDDSURFACEDESC2, DWORD, HANDLE); -HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, +HRESULT WINAPI Main_DDrawSurface_Blt(LPDDRAWI_DDRAWSURFACE_INT, LPRECT, LPDDRAWI_DDRAWSURFACE_INT, LPRECT, DWORD, LPDDBLTFX); +HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDDRAWI_DDRAWSURFACE_INT, LPDDBLTBATCH, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_BltFast(LPDDRAWI_DDRAWSURFACE_INT, DWORD, DWORD, LPDDRAWI_DDRAWSURFACE_INT, LPRECT, DWORD); +HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDDRAWI_DDRAWSURFACE_INT, DWORD, LPDDRAWI_DDRAWSURFACE_INT); +HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDDRAWI_DDRAWSURFACE_INT, LPVOID, LPDDENUMSURFACESCALLBACK7); +HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDDRAWI_DDRAWSURFACE_INT, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK7); +HRESULT WINAPI Main_DDrawSurface_Flip(LPDDRAWI_DDRAWSURFACE_INT , LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_FreePrivateData(LPDDRAWI_DDRAWSURFACE_INT, REFGUID); +HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDDRAWI_DDRAWSURFACE_INT, LPDDSCAPS2, LPDDRAWI_DDRAWSURFACE_INT*); +HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDDRAWI_DDRAWSURFACE_INT, DWORD dwFlags); +HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDDRAWI_DDRAWSURFACE_INT, LPDDSCAPS2 pCaps); +HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDDRAWI_DDRAWSURFACE_INT, LPDIRECTDRAWCLIPPER*); +HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDDRAWI_DDRAWSURFACE_INT, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_GetDC(LPDDRAWI_DDRAWSURFACE_INT, HDC *); +HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDDRAWI_DDRAWSURFACE_INT, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetLOD(LPDDRAWI_DDRAWSURFACE_INT, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDDRAWI_DDRAWSURFACE_INT, LPLONG, LPLONG); +HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDDRAWI_DDRAWSURFACE_INT, LPDIRECTDRAWPALETTE*); +HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDDRAWI_DDRAWSURFACE_INT, LPDDPIXELFORMAT); +HRESULT WINAPI Main_DDrawSurface_GetPriority(LPDDRAWI_DDRAWSURFACE_INT, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetPrivateData(LPDDRAWI_DDRAWSURFACE_INT, REFGUID, LPVOID, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDDRAWI_DDRAWSURFACE_INT, LPDDSURFACEDESC2); +HRESULT WINAPI Main_DDrawSurface_GetUniquenessValue(LPDDRAWI_DDRAWSURFACE_INT, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_IsLost(LPDDRAWI_DDRAWSURFACE_INT); +HRESULT WINAPI Main_DDrawSurface_PageLock(LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDDRAWI_DDRAWSURFACE_INT, HDC); +HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDDRAWI_DDRAWSURFACE_INT, LPDIRECTDRAWCLIPPER); +HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDDRAWI_DDRAWSURFACE_INT, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDDRAWI_DDRAWSURFACE_INT, LONG, LONG); +HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDDRAWI_DDRAWSURFACE_INT, LPDIRECTDRAWPALETTE); +HRESULT WINAPI Main_DDrawSurface_SetPriority (LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_SetPrivateData (LPDDRAWI_DDRAWSURFACE_INT, REFGUID, LPVOID, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDDRAWI_DDRAWSURFACE_INT, DWORD, LPDDRAWI_DDRAWSURFACE_INT); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDDRAWI_DDRAWSURFACE_INT, DDSURFACEDESC2 *, DWORD); +HRESULT WINAPI Main_DDrawSurface_SetLOD(LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDDRAWI_DDRAWSURFACE_INT, LPRECT); +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDDRAWI_DDRAWSURFACE_INT, LPDIRECTDRAW, LPDDSURFACEDESC2); +HRESULT WINAPI Main_DDrawSurface_Lock (LPDDRAWI_DDRAWSURFACE_INT, LPRECT, LPDDSURFACEDESC2, DWORD, HANDLE); +HRESULT WINAPI Main_DDrawSurface_Restore(LPDDRAWI_DDRAWSURFACE_INT); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDDRAWI_DDRAWSURFACE_INT, LPRECT, LPDDRAWI_DDRAWSURFACE_INT, LPRECT, DWORD, LPDDOVERLAYFX); -HRESULT WINAPI Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface); -HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 pAttach); -HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect); -HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD); -HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD Flags); +HRESULT WINAPI Main_DDrawSurface_ChangeUniquenessValue(LPDDRAWI_DDRAWSURFACE_INT iface); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDDRAWI_DDRAWSURFACE_INT iface, LPDDRAWI_DDRAWSURFACE_INT pAttach); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDDRAWI_DDRAWSURFACE_INT iface, LPRECT pRect); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDDRAWI_DDRAWSURFACE_INT iface, LPDDSURFACEDESC2 pDDSD); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDDRAWI_DDRAWSURFACE_INT iface, DDSURFACEDESC2 *DDSD, DWORD Flags); @@ -68,3 +68,4 @@ + Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Sun Dec 16 17:07:33 2007 @@ -33,14 +33,13 @@ return newThis; } -HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDDRAWI_DDRAWSURFACE_INT iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) { return DDERR_ALREADYINITIALIZED; } -ULONG WINAPI Main_DDrawSurface_AddRef(LPDDRAWI_DDRAWSURFACE_INT iface) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; +ULONG WINAPI Main_DDrawSurface_AddRef(LPDDRAWI_DDRAWSURFACE_INT This) +{ DX_WINDBG_trace(); @@ -203,7 +202,51 @@ *ppObj = This; Main_DDrawSurface_AddRef(This); } - + else if (IsEqualGUID(&IID_IDirect3D2, riid)) + { + if (This->lpVtbl != &IDirect3D2_Vtbl) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &IDirect3D2_Vtbl; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirect3D3, riid)) + { + if (This->lpVtbl != &IDirect3D3_Vtbl) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &IDirect3D3_Vtbl; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirect3D7, riid)) + { + if (This->lpVtbl != &IDirect3D7_Vtbl) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &IDirect3D7_Vtbl; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } else { DX_STUB_str("E_NOINTERFACE"); @@ -219,9 +262,8 @@ -ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; +ULONG WINAPI Main_DDrawSurface_Release(LPDDRAWI_DDRAWSURFACE_INT This) +{ /* FIXME This is not right exiame how it should be done @@ -230,11 +272,9 @@ return This->dwIntRefCnt; } -HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, - LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) -{ - LPDDRAWI_DDRAWSURFACE_INT ThisDest = (LPDDRAWI_DDRAWSURFACE_INT)iface; - LPDDRAWI_DDRAWSURFACE_INT ThisSrc = (LPDDRAWI_DDRAWSURFACE_INT)src; +HRESULT WINAPI Main_DDrawSurface_Blt(LPDDRAWI_DDRAWSURFACE_INT ThisDest, LPRECT rdst, + LPDDRAWI_DDRAWSURFACE_INT ThisSrc, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) +{ DDHAL_BLTDATA mDdBlt; @@ -347,10 +387,9 @@ HRESULT WINAPI -Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect, +Main_DDrawSurface_Lock (LPDDRAWI_DDRAWSURFACE_INT This, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE events) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DDHAL_LOCKDATA mdLock; DX_WINDBG_trace(); @@ -433,9 +472,8 @@ } -HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDDRAWI_DDRAWSURFACE_INT This, LPRECT pRect) +{ DDHAL_UNLOCKDATA mdUnLock; DX_WINDBG_trace(); @@ -467,8 +505,8 @@ } HRESULT WINAPI -Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWSURFACE7 pAttach) +Main_DDrawSurface_AddAttachedSurface(LPDDRAWI_DDRAWSURFACE_INT iface, + LPDDRAWI_DDRAWSURFACE_INT pAttach) { // LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; @@ -480,26 +518,24 @@ } HRESULT WINAPI -Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetAttachedSurface(LPDDRAWI_DDRAWSURFACE_INT This, LPDDSCAPS2 pCaps, - LPDIRECTDRAWSURFACE7* ppSurface) + LPDDRAWI_DDRAWSURFACE_INT* ppSurface) { /* FIXME hacked */ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); - *ppSurface = (LPDIRECTDRAWSURFACE7) This->lpLcl->lpGbl->lpDD->dsList; + *ppSurface = This->lpLcl->lpGbl->lpDD->dsList; return DD_OK; } HRESULT WINAPI -Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; +Main_DDrawSurface_GetBltStatus(LPDDRAWI_DDRAWSURFACE_INT This, DWORD dwFlags) +{ DX_WINDBG_trace(); @@ -512,13 +548,12 @@ } HRESULT WINAPI -Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps) -{ - LPDDRAWI_DDRAWSURFACE_INT This; - - DX_WINDBG_trace(); - - if (iface == NULL) +Main_DDrawSurface_GetCaps(LPDDRAWI_DDRAWSURFACE_INT This, LPDDSCAPS2 pCaps) +{ + + DX_WINDBG_trace(); + + if (This == NULL) { return DDERR_INVALIDOBJECT; } @@ -528,8 +563,6 @@ return DDERR_INVALIDPARAMS; } - This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - RtlZeroMemory(pCaps,sizeof(DDSCAPS2)); pCaps->dwCaps = This->lpLcl->ddsCaps.dwCaps; @@ -538,10 +571,9 @@ } HRESULT WINAPI -Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetClipper(LPDDRAWI_DDRAWSURFACE_INT This, LPDIRECTDRAWCLIPPER* ppClipper) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); @@ -566,10 +598,9 @@ } HRESULT WINAPI -Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_SetClipper (LPDDRAWI_DDRAWSURFACE_INT This, LPDIRECTDRAWCLIPPER pDDClipper) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); @@ -597,13 +628,12 @@ } HRESULT WINAPI -Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC) -{ - LPDDRAWI_DDRAWSURFACE_INT This; - - DX_WINDBG_trace(); - - if (iface == NULL) +Main_DDrawSurface_GetDC(LPDDRAWI_DDRAWSURFACE_INT This, HDC *phDC) +{ + + DX_WINDBG_trace(); + + if (This == NULL) { return DDERR_INVALIDOBJECT; } @@ -613,7 +643,6 @@ return DDERR_INVALIDPARAMS; } - This = (LPDDRAWI_DDRAWSURFACE_INT)iface; *phDC = (HDC)This->lpLcl->lpSurfMore->lpDD_lcl->hDC; @@ -621,10 +650,9 @@ } HRESULT WINAPI -Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetPixelFormat(LPDDRAWI_DDRAWSURFACE_INT This, LPDDPIXELFORMAT pDDPixelFormat) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; HRESULT retVale = DDERR_INVALIDPARAMS; DX_WINDBG_trace(); @@ -647,13 +675,11 @@ } HRESULT WINAPI -Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetSurfaceDesc(LPDDRAWI_DDRAWSURFACE_INT This, LPDDSURFACEDESC2 pDDSD) { DWORD dwSize; - - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); dwSize = pDDSD->dwSize; @@ -749,12 +775,11 @@ } HRESULT WINAPI -Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC) -{ - LPDDRAWI_DDRAWSURFACE_INT This; - DX_WINDBG_trace(); - - if (iface == NULL) +Main_DDrawSurface_ReleaseDC(LPDDRAWI_DDRAWSURFACE_INT This, HDC hDC) +{ + DX_WINDBG_trace(); + + if (This == NULL) { return DDERR_INVALIDOBJECT; } @@ -764,8 +789,6 @@ return DDERR_INVALIDPARAMS; } - This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - /* FIXME check if surface exits or not */ @@ -778,10 +801,9 @@ } HRESULT WINAPI -Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_SetColorKey (LPDDRAWI_DDRAWSURFACE_INT This, DWORD dwFlags, LPDDCOLORKEY pCKey) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DDHAL_SETCOLORKEYDATA ColorKeyData; @@ -813,9 +835,8 @@ HRESULT WINAPI -Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE7 iface, LONG X, LONG Y) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; +Main_DDrawSurface_SetOverlayPosition (LPDDRAWI_DDRAWSURFACE_INT This, LONG X, LONG Y) +{ DDHAL_SETOVERLAYPOSITIONDATA OverLayPositionData; Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c Sun Dec 16 17:07:33 2007 @@ -15,7 +15,7 @@ /* MSDN: "not currently implemented." */ HRESULT WINAPI -Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_AddOverlayDirtyRect(LPDDRAWI_DDRAWSURFACE_INT iface, LPRECT pRect) { DX_WINDBG_trace(); @@ -24,8 +24,8 @@ } HRESULT WINAPI -Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7 iface, DWORD dstx, - DWORD dsty, LPDIRECTDRAWSURFACE7 src, +Main_DDrawSurface_BltFast(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dstx, + DWORD dsty, LPDDRAWI_DDRAWSURFACE_INT src, LPRECT rsrc, DWORD trans) { DX_WINDBG_trace(); @@ -34,7 +34,7 @@ } HRESULT WINAPI -Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7 iface) +Main_DDrawSurface_Restore(LPDDRAWI_DDRAWSURFACE_INT iface) { DX_WINDBG_trace(); @@ -43,7 +43,7 @@ /* MSDN: "not currently implemented." */ HRESULT WINAPI -Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_BltBatch(LPDDRAWI_DDRAWSURFACE_INT iface, LPDDBLTBATCH pBatch, DWORD dwCount, DWORD dwFlags) { @@ -53,25 +53,25 @@ } HRESULT WINAPI -Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_ChangeUniquenessValue(LPDDRAWI_DDRAWSURFACE_INT iface) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_DeleteAttachedSurface(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwFlags, - LPDIRECTDRAWSURFACE7 pAttach) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7 iface, + LPDDRAWI_DDRAWSURFACE_INT pAttach) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_EnumAttachedSurfaces(LPDDRAWI_DDRAWSURFACE_INT iface, LPVOID context, LPDDENUMSURFACESCALLBACK7 cb) { @@ -81,7 +81,7 @@ } HRESULT WINAPI -Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_EnumOverlayZOrders(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwFlags, LPVOID context, LPDDENUMSURFACESCALLBACK7 cb) { @@ -91,23 +91,23 @@ } HRESULT WINAPI -Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7 iface, REFGUID tag) -{ - DX_WINDBG_trace(); - - DX_STUB; -} -HRESULT WINAPI -Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, +Main_DDrawSurface_Flip(LPDDRAWI_DDRAWSURFACE_INT iface, + LPDDRAWI_DDRAWSURFACE_INT lpDDSurfaceTargetOverride, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_FreePrivateData(LPDDRAWI_DDRAWSURFACE_INT iface, REFGUID tag) +{ + DX_WINDBG_trace(); + + DX_STUB; +} +HRESULT WINAPI +Main_DDrawSurface_GetColorKey(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwFlags, LPDDCOLORKEY pCKey) { //LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; @@ -118,30 +118,30 @@ } HRESULT WINAPI -Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7 iface, LPVOID* pDD) -{ - DX_WINDBG_trace(); - - DX_STUB; -} -HRESULT WINAPI -Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwMaxLOD) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetDDInterface(LPDDRAWI_DDRAWSURFACE_INT iface, LPVOID* pDD) +{ + DX_WINDBG_trace(); + + DX_STUB; +} +HRESULT WINAPI +Main_DDrawSurface_GetFlipStatus(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetLOD(LPDDRAWI_DDRAWSURFACE_INT iface, LPDWORD pdwMaxLOD) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetOverlayPosition(LPDDRAWI_DDRAWSURFACE_INT iface, LPLONG pX, LPLONG pY) { DX_WINDBG_trace(); @@ -149,7 +149,7 @@ DX_STUB; } HRESULT WINAPI -Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetPalette(LPDDRAWI_DDRAWSURFACE_INT iface, LPDIRECTDRAWPALETTE* ppPalette) { DX_WINDBG_trace(); @@ -158,7 +158,7 @@ } HRESULT WINAPI -Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetPriority(LPDDRAWI_DDRAWSURFACE_INT iface, LPDWORD pdwPriority) { DX_WINDBG_trace(); @@ -167,7 +167,7 @@ } HRESULT WINAPI -Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetPrivateData(LPDDRAWI_DDRAWSURFACE_INT iface, REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) { @@ -177,7 +177,7 @@ } HRESULT WINAPI -Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetUniquenessValue(LPDDRAWI_DDRAWSURFACE_INT iface, LPDWORD pValue) { DX_WINDBG_trace(); @@ -186,7 +186,7 @@ } HRESULT WINAPI -Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7 iface) +Main_DDrawSurface_IsLost(LPDDRAWI_DDRAWSURFACE_INT iface) { DX_WINDBG_trace(); @@ -196,23 +196,23 @@ } HRESULT WINAPI -Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_PageLock(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_PageUnlock(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetPalette (LPDDRAWI_DDRAWSURFACE_INT iface, LPDIRECTDRAWPALETTE pPalette) { DX_WINDBG_trace(); @@ -221,7 +221,7 @@ } HRESULT WINAPI -Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_SetPriority (LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwPriority) { DX_WINDBG_trace(); @@ -230,7 +230,7 @@ } HRESULT WINAPI -Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_SetPrivateData (LPDDRAWI_DDRAWSURFACE_INT iface, REFGUID tag, LPVOID pData, DWORD cbSize, DWORD dwFlags) { @@ -240,9 +240,9 @@ } HRESULT WINAPI -Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_UpdateOverlay (LPDDRAWI_DDRAWSURFACE_INT iface, LPRECT pSrcRect, - LPDIRECTDRAWSURFACE7 pDstSurface, + LPDDRAWI_DDRAWSURFACE_INT pDstSurface, LPRECT pDstRect, DWORD dwFlags, LPDDOVERLAYFX pFX) { @@ -254,10 +254,9 @@ /* MSDN: "not currently implemented." */ HRESULT WINAPI -Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_UpdateOverlayDisplay (LPDDRAWI_DDRAWSURFACE_INT This, DWORD dwFlags) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); @@ -270,27 +269,28 @@ } -HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface, - DWORD dwFlags, LPDIRECTDRAWSURFACE7 pDDSRef) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD Flags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7 iface, DWORD MaxLOD) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDDRAWI_DDRAWSURFACE_INT iface, + DWORD dwFlags, LPDDRAWI_DDRAWSURFACE_INT pDDSRef) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetSurfaceDesc(LPDDRAWI_DDRAWSURFACE_INT iface, DDSURFACEDESC2 *DDSD, DWORD Flags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetLOD(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD MaxLOD) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + + Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D2_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D2_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D2_Vtable.c Sun Dec 16 17:07:33 2007 @@ -1,0 +1,41 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +HRESULT WINAPI Main_D3D_QueryInterface(LPDIRECT3D2 iface, REFIID riid, LPVOID * ppvObj); +ULONG WINAPI Main_D3D_AddRef(LPDIRECT3D2 iface); +ULONG WINAPI Main_D3D_Release(LPDIRECT3D2 iface); +HRESULT WINAPI Main_D3D_EnumDevices(LPDIRECT3D2 iface, LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg); +HRESULT WINAPI Main_D3D_CreateLight(LPDIRECT3D2 iface, LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter); +HRESULT WINAPI Main_D3D_CreateMaterial(LPDIRECT3D2 iface, LPDIRECT3DMATERIAL2 *lplpDirect3DMaterial2, IUnknown *pUnkOuter); +HRESULT WINAPI Main_D3D_CreateViewport(LPDIRECT3D2 iface, LPDIRECT3DVIEWPORT2 *lplpD3DViewport2, IUnknown *pUnkOuter); +HRESULT WINAPI Main_D3D_FindDevice(LPDIRECT3D2 iface, LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR); +HRESULT WINAPI Main_D3D_CreateDevice2(LPDIRECT3D2 iface, REFCLSID rclsid, LPDIRECTDRAWSURFACE lpDDS, LPDIRECT3DDEVICE2 *lplpD3DDevice2); + +IDirect3D2Vtbl IDirect3D2_Vtbl = +{ + Main_D3D_QueryInterface, + Main_D3D_AddRef, + Main_D3D_Release, + Main_D3D_EnumDevices, + Main_D3D_CreateLight, + Main_D3D_CreateMaterial, + Main_D3D_CreateViewport, + Main_D3D_FindDevice, + Main_D3D_CreateDevice2, +}; + + Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D2_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D3_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D3_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D3_Vtable.c Sun Dec 16 17:07:33 2007 @@ -1,0 +1,47 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +HRESULT WINAPI Main_D3D_QueryInterface(LPDIRECT3D3 iface, REFIID riid, LPVOID * ppvObj); +ULONG WINAPI Main_D3D_AddRef(LPDIRECT3D3 iface); +ULONG WINAPI Main_D3D_Release(LPDIRECT3D3 iface); +HRESULT WINAPI Main_D3D_EnumDevices(LPDIRECT3D3 iface, LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg); +HRESULT WINAPI Main_D3D_CreateLight(LPDIRECT3D3 iface, LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter); +HRESULT WINAPI Main_D3D_CreateMaterial(LPDIRECT3D3 iface, LPDIRECT3DMATERIAL3 *lplpDirect3DMaterial3, IUnknown *pUnkOuter); +HRESULT WINAPI Main_D3D_CreateViewport(LPDIRECT3D3 iface, LPDIRECT3DVIEWPORT3 *lplpD3DViewport3, IUnknown *pUnkOuter); +HRESULT WINAPI Main_D3D_FindDevice(LPDIRECT3D3 iface, LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR); +HRESULT WINAPI Main_D3D_CreateDevice3(LPDIRECT3D3 iface, REFCLSID rclsid,LPDIRECTDRAWSURFACE4 lpDDS, LPDIRECT3DDEVICE3 *lplpD3DDevice3,LPUNKNOWN lpUnk); +HRESULT WINAPI Main_D3D_CreateVertexBuffer3(LPDIRECT3D3 iface, LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc, LPDIRECT3DVERTEXBUFFER *lplpD3DVertBuf,DWORD dwFlags,LPUNKNOWN lpUnk); +HRESULT WINAPI Main_D3D_EnumZBufferFormats(LPDIRECT3D3 iface, REFCLSID riidDevice, LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext); +HRESULT WINAPI Main_D3D_EvictManagedTextures(LPDIRECT3D3 iface); + +IDirect3D3Vtbl IDirect3D3_Vtbl = +{ + Main_D3D_QueryInterface, + Main_D3D_AddRef, + Main_D3D_Release, + Main_D3D_EnumDevices, + Main_D3D_CreateLight, + Main_D3D_CreateMaterial, + Main_D3D_CreateViewport, + Main_D3D_FindDevice, + Main_D3D_CreateDevice3, + Main_D3D_CreateVertexBuffer3, + Main_D3D_EnumZBufferFormats, + Main_D3D_EvictManagedTextures +}; + + Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D3_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D7_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D7_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D7_Vtable.c Sun Dec 16 17:07:33 2007 @@ -1,0 +1,38 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +HRESULT WINAPI Main_D3D_QueryInterface(LPDIRECT3D7 iface, REFIID riid, LPVOID * ppvObject); +ULONG WINAPI Main_D3D_AddRef(LPDIRECT3D7 iface); +ULONG WINAPI Main_D3D_Release(LPDIRECT3D7 iface); +HRESULT WINAPI Main_D3D_EnumDevices(LPDIRECT3D7 iface, LPD3DENUMDEVICESCALLBACK7 lpEnumDevicesCallback, LPVOID lpUserArg); +HRESULT WINAPI Main_D3D_CreateDevice7(LPDIRECT3D7 iface, REFCLSID rclsid,LPDIRECTDRAWSURFACE7 lpDDS, LPDIRECT3DDEVICE7 *lplpD3DDevice); +HRESULT WINAPI Main_D3D_CreateVertexBuffer7(LPDIRECT3D7 iface, LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc, LPDIRECT3DVERTEXBUFFER7 *lplpD3DVertBuf,DWORD dwFlags); +HRESULT WINAPI Main_D3D_EnumZBufferFormats(LPDIRECT3D7 iface, REFCLSID riidDevice, LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext); +HRESULT WINAPI Main_D3D_EvictManagedTextures(LPDIRECT3D7 iface); + +IDirect3D7Vtbl IDirect3D7_Vtbl = +{ + Main_D3D_QueryInterface, + Main_D3D_AddRef, + Main_D3D_Release, + Main_D3D_EnumDevices, + Main_D3D_CreateDevice7, + Main_D3D_CreateVertexBuffer7, + Main_D3D_EnumZBufferFormats, + Main_D3D_EvictManagedTextures +}; + Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D7_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c Sun Dec 16 17:07:33 2007 @@ -67,7 +67,7 @@ LPDDENUMMODESCALLBACK2 pCallback); HRESULT WINAPI -Main_DirectDraw_EnumSurfaces( +Main_DirectDraw_EnumSurfaces4( LPDIRECTDRAW4 iface, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, @@ -183,7 +183,7 @@ Main_DirectDraw_CreateSurface4, Main_DirectDraw_DuplicateSurface, Main_DirectDraw_EnumDisplayModes4, - Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_EnumSurfaces4, Main_DirectDraw_FlipToGDISurface, Main_DirectDraw_GetCaps, Main_DirectDraw_GetDisplayMode4, Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c Sun Dec 16 17:07:33 2007 @@ -71,7 +71,7 @@ LPDDENUMMODESCALLBACK2 pCallback); HRESULT WINAPI -Main_DirectDraw_EnumSurfaces( +Main_DirectDraw_EnumSurfaces7( LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, @@ -198,7 +198,7 @@ Main_DirectDraw_CreateSurface4, /* (CreateSurface4 testing / devloping) */ Main_DirectDraw_DuplicateSurface, Main_DirectDraw_EnumDisplayModes4, /* (EnumDisplayModes testing / devloping) */ - Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_EnumSurfaces7, Main_DirectDraw_FlipToGDISurface, Main_DirectDraw_GetCaps, /* (GetCaps done) */ Main_DirectDraw_GetDisplayMode4, /* (GetDisplayMode testing / devloping) */ @@ -222,3 +222,4 @@ }; + Modified: trunk/reactos/dll/directx/ddraw/d3d/DirectD3D_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/d3d/Dire… ============================================================================== --- trunk/reactos/dll/directx/ddraw/d3d/DirectD3D_main.c (original) +++ trunk/reactos/dll/directx/ddraw/d3d/DirectD3D_main.c Sun Dec 16 17:07:33 2007 @@ -68,3 +68,59 @@ DX_STUB; } +HRESULT WINAPI +Main_D3D_CreateDevice2(LPDIRECT3D2 iface, REFCLSID rclsid, LPDIRECTDRAWSURFACE lpDDS, + LPDIRECT3DDEVICE2 *lplpD3DDevice2) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_D3D_CreateDevice3(LPDIRECT3D3 iface, REFCLSID rclsid,LPDIRECTDRAWSURFACE4 lpDDS, + LPDIRECT3DDEVICE3 *lplpD3DDevice3,LPUNKNOWN lpUnk) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_D3D_CreateVertexBuffer3(LPDIRECT3D3 iface, LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc, + LPDIRECT3DVERTEXBUFFER *lplpD3DVertBuf,DWORD dwFlags,LPUNKNOWN lpUnk) +{ + DX_WINDBG_trace(); + DX_STUB; +} + + +HRESULT WINAPI +Main_D3D_CreateDevice7(LPDIRECT3D7 iface, REFCLSID rclsid,LPDIRECTDRAWSURFACE7 lpDDS, + LPDIRECT3DDEVICE7 *lplpD3DDevice) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_D3D_CreateVertexBuffer7(LPDIRECT3D7 iface, LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc, + LPDIRECT3DVERTEXBUFFER7 *lplpD3DVertBuf,DWORD dwFlags) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_D3D_EnumZBufferFormats(LPDIRECT3D7 iface, REFCLSID riidDevice, LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_D3D_EvictManagedTextures(LPDIRECT3D7 iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + + Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sun Dec 16 17:07:33 2007 @@ -71,5 +71,8 @@ <file>DirectDrawSurface2_Vtable.c</file> <file>DirectDrawSurface_Vtable.c</file> <file>DirectD3D_Vtable.c</file> + <file>DirectD3D2_Vtable.c</file> + <file>DirectD3D3_Vtable.c</file> + <file>DirectD3D7_Vtable.c</file> </directory> </module> Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun Dec 16 17:07:33 2007 @@ -40,11 +40,9 @@ extern IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable; extern IDirect3DVtbl IDirect3D_Vtbl; -/* extern IDirect3D2Vtbl IDirect3D2_Vtbl; extern IDirect3D3Vtbl IDirect3D3_Vtbl; extern IDirect3D7Vtbl IDirect3D7_Vtbl; -*/ /* Start up direct hal or hel * iface = a pointer to the com object

1 0

[cfinck] 31275: Fix a typo
by cfinck＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: cfinck Date: Sun Dec 16 15:38:18 2007 New Revision: 31275 URL: http://svn.reactos.org/svn/reactos?rev=31275&view=rev Log: Fix a typo Modified: trunk/web/reactos.org/htdocs/paste/inc/paste.php Modified: trunk/web/reactos.org/htdocs/paste/inc/paste.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/p… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/paste.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/paste.php Sun Dec 16 15:38:18 2007 @@ -79,7 +79,7 @@ } ?> | <a href="<?php echo $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/text/'; ?>" target="_blank">Download as Text</a> - <a href="<?php echo $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/textw/'; ?>" target="_blank">(word-warp)</a> | + <a href="<?php echo $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/textw/'; ?>" target="_blank">(word-wrap)</a> | <a href="<?php echo $ros_paste_SET_path_ex . 'recent/'; ?>">Other recent pastes</a> | <a href="<?php echo $ros_paste_SET_path; ?>">Create new paste</a> </p> <?php

1 0

[fireball] 31274: - ARC hardware device tree passed to the kernel contains only partial descriptors (contents of full descriptors was ignored anyway).
by fireball＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: fireball Date: Sun Dec 16 13:04:04 2007 New Revision: 31274 URL: http://svn.reactos.org/svn/reactos?rev=31274&view=rev Log: - ARC hardware device tree passed to the kernel contains only partial descriptors (contents of full descriptors was ignored anyway). Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Sun Dec 16 13:04:04 2007 @@ -198,7 +198,7 @@ static VOID DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PNP_BIOS_DEVICE_NODE DeviceNode; PCM_PNP_BIOS_INSTALLATION_CHECK InstData; PCONFIGURATION_COMPONENT_DATA BusKey; @@ -255,28 +255,26 @@ FldrSetIdentifier(BusKey, L"PNP BIOS"); /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + (NodeSize * NodeCount); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + (NodeSize * NodeCount); + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); return; } - memset(FullResourceDescriptor, 0, Size); + memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ - FullResourceDescriptor->InterfaceType = Internal; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type = + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + PartialResourceList->PartialDescriptors[0].Type = CmResourceTypeDeviceSpecific; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition = + PartialResourceList->PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; - Ptr = (char *)(((ULONG_PTR)&FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]) + + Ptr = (char *)(((ULONG_PTR)&PartialResourceList->PartialDescriptors[0]) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Set instalation check data */ @@ -315,15 +313,15 @@ } /* Set real data size */ - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.DeviceSpecificData.DataSize = + PartialResourceList->PartialDescriptors[0].u.DeviceSpecificData.DataSize = PnpBufferSize; - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + PnpBufferSize; + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + PnpBufferSize; DbgPrint((DPRINT_HWDETECT, "Real buffer size: %u\n", PnpBufferSize)); DbgPrint((DPRINT_HWDETECT, "Resource size: %u\n", Size)); - FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(BusKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); } @@ -332,38 +330,36 @@ SetHarddiskConfigurationData(PCONFIGURATION_COMPONENT_DATA DiskKey, ULONG DriveNumber) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; EXTENDED_GEOMETRY ExtGeometry; GEOMETRY Geometry; ULONG Size; /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_DISK_GEOMETRY_DEVICE_DATA); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate a full resource descriptor\n")); return; } - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type = + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + PartialResourceList->PartialDescriptors[0].Type = CmResourceTypeDeviceSpecific; -// FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition = -// FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Flags = - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.DeviceSpecificData.DataSize = +// PartialResourceList->PartialDescriptors[0].ShareDisposition = +// PartialResourceList->PartialDescriptors[0].Flags = + PartialResourceList->PartialDescriptors[0].u.DeviceSpecificData.DataSize = sizeof(CM_DISK_GEOMETRY_DEVICE_DATA); /* Get pointer to geometry data */ - DiskGeometry = (PVOID)(((ULONG_PTR)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + DiskGeometry = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); /* Get the disk geometry */ ExtGeometry.Size = sizeof(EXTENDED_GEOMETRY); @@ -384,7 +380,7 @@ else { DbgPrint((DPRINT_HWDETECT, "Reading disk geometry failed\n")); - MmFreeMemory(FullResourceDescriptor); + MmFreeMemory(PartialResourceList); return; } DbgPrint((DPRINT_HWDETECT, @@ -395,8 +391,8 @@ DiskGeometry->SectorsPerTrack, DiskGeometry->BytesPerSector)); - FldrSetConfigurationData(DiskKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(DiskKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); } @@ -512,7 +508,7 @@ static VOID DetectBiosFloppyPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_FLOPPY_DEVICE_DATA FloppyData; WCHAR Identifier[20]; @@ -547,29 +543,27 @@ FloppyNumber, 0xFFFFFFFF); - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_FLOPPY_DEVICE_DATA); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); return; } - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(CM_FLOPPY_DEVICE_DATA); - FloppyData = (PVOID)(((ULONG_PTR)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + FloppyData = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); FloppyData->Version = 2; FloppyData->Revision = 0; FloppyData->MaxDensity = MaxDensity[FloppyType]; @@ -581,8 +575,8 @@ FloppyData->DataTransferRate = 0; /* Set 'Configuration Data' value */ - FldrSetConfigurationData(PeripheralKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(PeripheralKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); /* Set 'Identifier' value */ swprintf(Identifier, L"FLOPPY%u", FloppyNumber + 1); @@ -595,7 +589,7 @@ DetectBiosFloppyController(PCONFIGURATION_COMPONENT_DATA BusKey, PCONFIGURATION_COMPONENT_DATA ControllerKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; ULONG Size; ULONG FloppyCount; @@ -605,26 +599,24 @@ "Floppy count: %u\n", FloppyCount)); - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); return; } - memset(FullResourceDescriptor, 0, Size); + memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 3; + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 3; /* Set IO Port */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; @@ -633,7 +625,7 @@ PartialDescriptor->u.Port.Length = 8; /* Set Interrupt */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypeInterrupt; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; @@ -642,7 +634,7 @@ PartialDescriptor->u.Interrupt.Affinity = 0xFFFFFFFF; /* Set DMA channel */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[2]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[2]; PartialDescriptor->Type = CmResourceTypeDma; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = 0; @@ -650,8 +642,8 @@ PartialDescriptor->u.Dma.Port = 0; /* Set 'Configuration Data' value */ - FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(ControllerKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); if (FloppyCount) DetectBiosFloppyPeripheral(ControllerKey); } @@ -660,7 +652,7 @@ DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, PCONFIGURATION_COMPONENT_DATA BusKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_INT13_DRIVE_PARAMETER Int13Drives; GEOMETRY Geometry; PCONFIGURATION_COMPONENT_DATA DiskKey, ControllerKey; @@ -716,10 +708,10 @@ DetectBiosFloppyController(BusKey, ControllerKey); /* Allocate resource descriptor */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -727,20 +719,18 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = InterfaceTypeUndefined; - FullResourceDescriptor->BusNumber = -1; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type = CmResourceTypeDeviceSpecific; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition = 0; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Flags = 0; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.DeviceSpecificData.DataSize = + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + PartialResourceList->PartialDescriptors[0].Type = CmResourceTypeDeviceSpecific; + PartialResourceList->PartialDescriptors[0].ShareDisposition = 0; + PartialResourceList->PartialDescriptors[0].Flags = 0; + PartialResourceList->PartialDescriptors[0].u.DeviceSpecificData.DataSize = sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; /* Get harddisk Int13 geometry data */ - Int13Drives = (PVOID)(((ULONG_PTR)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + Int13Drives = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); for (i = 0; i < DiskCount; i++) { if (MachDiskGetDriveGeometry(0x80 + i, &Geometry)) @@ -762,8 +752,8 @@ } /* Set 'Configuration Data' value */ - FldrSetConfigurationData(SystemKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(SystemKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); /* Create and fill subkey for each harddisk */ for (i = 0; i < DiskCount; i++) @@ -964,7 +954,7 @@ DetectSerialPointerPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey, ULONG Base) { - CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + CM_PARTIAL_RESOURCE_LIST PartialResourceList; char Buffer[256]; WCHAR Identifier[256]; PCONFIGURATION_COMPONENT_DATA PeripheralKey; @@ -1116,16 +1106,14 @@ 0xFFFFFFFF); /* Set 'Configuration Data' value */ - memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); - FullResourceDescriptor.InterfaceType = Isa; - FullResourceDescriptor.BusNumber = 0; - FullResourceDescriptor.PartialResourceList.Version = 1; - FullResourceDescriptor.PartialResourceList.Revision = 1; - FullResourceDescriptor.PartialResourceList.Count = 0; + memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); + PartialResourceList.Version = 1; + PartialResourceList.Revision = 1; + PartialResourceList.Count = 0; FldrSetConfigurationData(PeripheralKey, - &FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + &PartialResourceList, + sizeof(CM_PARTIAL_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Set 'Identifier' value */ @@ -1137,7 +1125,7 @@ static VOID DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_SERIAL_DEVICE_DATA SerialDeviceData; ULONG Irq[4] = {4, 3, 4, 3}; @@ -1179,27 +1167,25 @@ 0xFFFFFFFF); /* Build full device descriptor */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + sizeof(CM_SERIAL_DEVICE_DATA); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); continue; } - memset(FullResourceDescriptor, 0, Size); + memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 3; + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 3; /* Set IO Port */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; @@ -1208,7 +1194,7 @@ PartialDescriptor->u.Port.Length = 7; /* Set Interrupt */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypeInterrupt; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; @@ -1217,20 +1203,20 @@ PartialDescriptor->u.Interrupt.Affinity = 0xFFFFFFFF; /* Set serial data (device specific) */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[2]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[2]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = 0; PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(CM_SERIAL_DEVICE_DATA); SerialDeviceData = - (PCM_SERIAL_DEVICE_DATA)&FullResourceDescriptor->PartialResourceList.PartialDescriptors[3]; + (PCM_SERIAL_DEVICE_DATA)&PartialResourceList->PartialDescriptors[3]; SerialDeviceData->BaudClock = 1843200; /* UART Clock frequency (Hertz) */ /* Set 'Configuration Data' value */ - FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); - + FldrSetConfigurationData(ControllerKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); + /* Set 'Identifier' value */ swprintf(Buffer, L"COM%u", i + 1); FldrSetIdentifier(ControllerKey, Buffer); @@ -1252,7 +1238,7 @@ static VOID DetectParallelPorts(PCONFIGURATION_COMPONENT_DATA BusKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; ULONG Irq[3] = {7, 5, (ULONG)-1}; WCHAR Buffer[80]; @@ -1293,28 +1279,26 @@ 0xFFFFFFFF); /* Build full device descriptor */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR); + Size = sizeof(CM_PARTIAL_RESOURCE_LIST); if (Irq[i] != (ULONG)-1) Size += sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); continue; } - memset(FullResourceDescriptor, 0, Size); + memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = (Irq[i] != (ULONG)-1) ? 2 : 1; + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = (Irq[i] != (ULONG)-1) ? 2 : 1; /* Set IO Port */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; @@ -1325,7 +1309,7 @@ /* Set Interrupt */ if (Irq[i] != (ULONG)-1) { - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypeInterrupt; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; @@ -1335,8 +1319,8 @@ } /* Set 'Configuration Data' value */ - FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(ControllerKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); /* Set 'Identifier' value */ swprintf(Buffer, L"PARALLEL%u", i + 1); @@ -1426,7 +1410,7 @@ static VOID DetectKeyboardPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_KEYBOARD_DEVICE_DATA KeyboardData; PCONFIGURATION_COMPONENT_DATA PeripheralKey; @@ -1451,10 +1435,10 @@ 0xFFFFFFFF); /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_KEYBOARD_DEVICE_DATA); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -1462,14 +1446,12 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(CM_KEYBOARD_DEVICE_DATA); @@ -1482,8 +1464,8 @@ KeyboardData->KeyboardFlags = 0x20; /* Set 'Configuration Data' value */ - FldrSetConfigurationData(PeripheralKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(PeripheralKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); /* Set 'Identifier' value */ FldrSetIdentifier(PeripheralKey, L"PCAT_ENHANCED"); @@ -1494,7 +1476,7 @@ static VOID DetectKeyboardController(PCONFIGURATION_COMPONENT_DATA BusKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCONFIGURATION_COMPONENT_DATA ControllerKey; ULONG Size; @@ -1515,10 +1497,10 @@ 0xFFFFFFFF); /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -1526,15 +1508,13 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 3; + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 3; /* Set Interrupt */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypeInterrupt; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; @@ -1543,7 +1523,7 @@ PartialDescriptor->u.Interrupt.Affinity = 0xFFFFFFFF; /* Set IO Port 0x60 */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; @@ -1552,7 +1532,7 @@ PartialDescriptor->u.Port.Length = 1; /* Set IO Port 0x64 */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[2]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[2]; PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; @@ -1561,8 +1541,8 @@ PartialDescriptor->u.Port.Length = 1; /* Set 'Configuration Data' value */ - FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(ControllerKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); DetectKeyboardPeripheral(ControllerKey); } @@ -1680,7 +1660,7 @@ static VOID DetectPS2Mouse(PCONFIGURATION_COMPONENT_DATA BusKey) { - CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + CM_PARTIAL_RESOURCE_LIST PartialResourceList; PCONFIGURATION_COMPONENT_DATA ControllerKey; PCONFIGURATION_COMPONENT_DATA PeripheralKey; @@ -1703,27 +1683,25 @@ 0, 0xFFFFFFFF); - memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); /* Initialize resource descriptor */ - FullResourceDescriptor.InterfaceType = Isa; - FullResourceDescriptor.BusNumber = 0; - FullResourceDescriptor.PartialResourceList.Version = 1; - FullResourceDescriptor.PartialResourceList.Revision = 1; - FullResourceDescriptor.PartialResourceList.Count = 1; + PartialResourceList.Version = 1; + PartialResourceList.Revision = 1; + PartialResourceList.Count = 1; /* Set Interrupt */ - FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].Type = CmResourceTypeInterrupt; - FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; - FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].Flags = CM_RESOURCE_INTERRUPT_LATCHED; - FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].u.Interrupt.Level = 12; - FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].u.Interrupt.Vector = 0; - FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].u.Interrupt.Affinity = 0xFFFFFFFF; + PartialResourceList.PartialDescriptors[0].Type = CmResourceTypeInterrupt; + PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; + PartialResourceList.PartialDescriptors[0].Flags = CM_RESOURCE_INTERRUPT_LATCHED; + PartialResourceList.PartialDescriptors[0].u.Interrupt.Level = 12; + PartialResourceList.PartialDescriptors[0].u.Interrupt.Vector = 0; + PartialResourceList.PartialDescriptors[0].u.Interrupt.Affinity = 0xFFFFFFFF; /* Set 'Configuration Data' value */ FldrSetConfigurationData(ControllerKey, - &FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + &PartialResourceList, + sizeof(CM_PARTIAL_RESOURCE_LIST)); if (DetectPS2AuxDevice()) { @@ -1745,17 +1723,15 @@ 0xFFFFFFFF); /* Initialize resource descriptor */ - memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); - FullResourceDescriptor.InterfaceType = Isa; - FullResourceDescriptor.BusNumber = 0; - FullResourceDescriptor.PartialResourceList.Version = 1; - FullResourceDescriptor.PartialResourceList.Revision = 1; - FullResourceDescriptor.PartialResourceList.Count = 0; + memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); + PartialResourceList.Version = 1; + PartialResourceList.Revision = 1; + PartialResourceList.Count = 0; /* Set 'Configuration Data' value */ FldrSetConfigurationData(PeripheralKey, - &FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + &PartialResourceList, + sizeof(CM_PARTIAL_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Set 'Identifier' value */ @@ -1823,7 +1799,7 @@ static VOID DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCONFIGURATION_COMPONENT_DATA BusKey; ULONG Size; @@ -1848,10 +1824,10 @@ FldrSetIdentifier(BusKey, L"ISA"); /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -1859,16 +1835,14 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 0; + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 0; /* Set 'Configuration Data' value */ - FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(BusKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); /* Detect ISA/BIOS devices */ DetectBiosDisks(SystemKey, BusKey); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Sun Dec 16 13:04:04 2007 @@ -52,7 +52,7 @@ DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCONFIGURATION_COMPONENT_DATA BiosKey; - CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + CM_PARTIAL_RESOURCE_LIST PartialResourceList; if (FindAcpiBios()) { @@ -73,15 +73,13 @@ 0xFFFFFFFF); /* Set 'Configuration Data' value */ - memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); - FullResourceDescriptor.InterfaceType = Internal; - FullResourceDescriptor.BusNumber = *BusNumber; - FullResourceDescriptor.PartialResourceList.Version = 0; - FullResourceDescriptor.PartialResourceList.Revision = 0; - FullResourceDescriptor.PartialResourceList.Count = 0; + memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); + PartialResourceList.Version = 0; + PartialResourceList.Revision = 0; + PartialResourceList.Count = 0; FldrSetConfigurationData(BiosKey, - &FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + &PartialResourceList, + sizeof(CM_PARTIAL_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Increment bus number */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Sun Dec 16 13:04:04 2007 @@ -57,7 +57,7 @@ DetectApmBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCONFIGURATION_COMPONENT_DATA BiosKey; - CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + CM_PARTIAL_RESOURCE_LIST PartialResourceList; if (FindApmBios()) { @@ -74,27 +74,25 @@ 0x0, 0x0, 0xFFFFFFFF); - + /* Set 'Configuration Data' value */ - memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); - FullResourceDescriptor.InterfaceType = Internal; - FullResourceDescriptor.BusNumber = *BusNumber; - FullResourceDescriptor.PartialResourceList.Version = 0; - FullResourceDescriptor.PartialResourceList.Revision = 0; - FullResourceDescriptor.PartialResourceList.Count = 0; + memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); + PartialResourceList.Version = 0; + PartialResourceList.Revision = 0; + PartialResourceList.Count = 0; FldrSetConfigurationData(BiosKey, - &FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + &PartialResourceList, + sizeof(CM_PARTIAL_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - + /* Increment bus number */ (*BusNumber)++; - + /* Set 'Identifier' value */ FldrSetIdentifier(BiosKey, L"APM"); } - - /* FIXME: Add congiguration data */ + + /* FIXME: Add configuration data */ } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Sun Dec 16 13:04:04 2007 @@ -143,7 +143,7 @@ static VOID DetectPciIrqRoutingTable(PCONFIGURATION_COMPONENT_DATA BusKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PPCI_IRQ_ROUTING_TABLE Table; PCONFIGURATION_COMPONENT_DATA TableKey; @@ -171,42 +171,39 @@ FldrSetIdentifier(TableKey, L"PCI Real-mode IRQ Routing Table"); /* Set 'Configuration Data' value */ - Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) + - 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + Table->Size; - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) - { - DbgPrint((DPRINT_HWDETECT, - "Failed to allocate resource descriptor\n")); - return; - } + Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors) + + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + Table->Size; + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) + { + DbgPrint((DPRINT_HWDETECT, + "Failed to allocate resource descriptor\n")); + return; + } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Internal; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 2; - - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 2; + + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypeBusNumber; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->u.BusNumber.Start = 0; PartialDescriptor->u.BusNumber.Length = 1; - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->u.DeviceSpecificData.DataSize = Table->Size; - memcpy(&FullResourceDescriptor->PartialResourceList.PartialDescriptors[2], - Table, - Table->Size); + memcpy(&PartialResourceList->PartialDescriptors[2], + Table, Table->Size); /* Set 'Configuration Data' value */ - FldrSetConfigurationData(TableKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(TableKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); } } @@ -214,7 +211,7 @@ VOID DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCI_REGISTRY_INFO BusData; PCONFIGURATION_COMPONENT_DATA BiosKey; @@ -247,10 +244,10 @@ FldrSetIdentifier(BiosKey, L"PCI BIOS"); /* Set 'Configuration Data' value */ - Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, - PartialResourceList.PartialDescriptors); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, + PartialDescriptors); + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -258,13 +255,11 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Internal; - FullResourceDescriptor->BusNumber = 0; + memset(PartialResourceList, 0, Size); /* Set 'Configuration Data' value */ - FldrSetConfigurationData(BiosKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(BiosKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); DetectPciIrqRoutingTable(BiosKey); @@ -289,12 +284,12 @@ if (i == 0) { /* Set 'Configuration Data' value */ - Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, - PartialResourceList.PartialDescriptors) + + Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, + PartialDescriptors) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + sizeof(PCI_REGISTRY_INFO); - FullResourceDescriptor = MmAllocateMemory(Size); - if (!FullResourceDescriptor) + PartialResourceList = MmAllocateMemory(Size); + if (!PartialResourceList) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -302,31 +297,29 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = PCIBus; - FullResourceDescriptor->BusNumber = i; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(PCI_REGISTRY_INFO); - memcpy(&FullResourceDescriptor->PartialResourceList.PartialDescriptors[1], + memcpy(&PartialResourceList->PartialDescriptors[1], &BusData, sizeof(PCI_REGISTRY_INFO)); /* Set 'Configuration Data' value */ - FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(BusKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); } else { /* Set 'Configuration Data' value */ - Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, - PartialResourceList.PartialDescriptors); - FullResourceDescriptor = MmAllocateMemory(Size); - if (!FullResourceDescriptor) + Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, + PartialDescriptors); + PartialResourceList = MmAllocateMemory(Size); + if (!PartialResourceList) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -334,13 +327,11 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = PCIBus; - FullResourceDescriptor->BusNumber = i; + memset(PartialResourceList, 0, Size); /* Set 'Configuration Data' value */ - FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(BusKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); } /* Increment bus number */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h Sun Dec 16 13:04:04 2007 @@ -75,7 +75,7 @@ NTAPI FldrSetConfigurationData( IN PCONFIGURATION_COMPONENT_DATA ComponentKey, - IN PCM_FULL_RESOURCE_DESCRIPTOR ConfigurationData, + IN PCM_PARTIAL_RESOURCE_LIST ResourceList, IN ULONG Size ); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Sun Dec 16 13:04:04 2007 @@ -167,7 +167,7 @@ VOID NTAPI FldrSetConfigurationData(IN PCONFIGURATION_COMPONENT_DATA ComponentData, - IN PCM_FULL_RESOURCE_DESCRIPTOR Data, + IN PCM_PARTIAL_RESOURCE_LIST ResourceList, IN ULONG Size) { PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; @@ -178,11 +178,9 @@ if (!ConfigurationData) return; /* Copy component information */ - RtlCopyMemory(ConfigurationData, &Data->PartialResourceList.Version, Size); - + RtlCopyMemory(ConfigurationData, ResourceList, Size); + /* Set component information */ ComponentData->ConfigurationData = ConfigurationData; - Component->ConfigurationDataLength = Size - - FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, - PartialResourceList); + Component->ConfigurationDataLength = Size; }

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