Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Mon Sep 8 08:51:00 2008 New Revision: 36055 URL: http://svn.reactos.org/svn/reactos?rev=36055&view=rev Log: - Add ros-diff Added: trunk/reactos/dll/win32/pstorec/pstorec_ros.diff Modified: trunk/reactos/dll/win32/pstorec/pstorec.c Modified: trunk/reactos/dll/win32/pstorec/pstorec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] Mon Sep 8 08:51:00 2008 @@ -43,8 +43,6 @@ switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinst); break; Added: trunk/reactos/dll/win32/pstorec/pstorec_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec_… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec_ros.diff (added) +++ trunk/reactos/dll/win32/pstorec/pstorec_ros.diff [iso-8859-1] Mon Sep 8 08:51:00 2008 @@ -1,0 +1,13 @@ +Index: pstorec.c +=================================================================== +--- pstorec.c (revision 36054) ++++ pstorec.c (working copy) +@@ -43,8 +43,6 @@ + + switch (fdwReason) + { +- case DLL_WINE_PREATTACH: +- return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break;

16 years, 3 months

[fireball] 36053: - Implement a linear search in CmpFindSubKeyInRoot (until cells are stored in a lexically sorted way). - Implement Leaf->Root index conversion (leaf selecting algorithm, splitting the leaf if necessary). See issue #3418 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Sep 8 07:56:08 2008 New Revision: 36053 URL: http://svn.reactos.org/svn/reactos?rev=36053&view=rev Log: - Implement a linear search in CmpFindSubKeyInRoot (until cells are stored in a lexically sorted way). - Implement Leaf->Root index conversion (leaf selecting algorithm, splitting the leaf if necessary). See issue #3418 for more details. Modified: trunk/reactos/ntoskrnl/config/cmindex.c Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c [iso-8859-1] Mon Sep 8 07:56:08 2008 @@ -145,13 +145,12 @@ IN PCUNICODE_STRING SearchName, IN PHCELL_INDEX SubKey) { - ULONG High, Low = 0, i, ReturnIndex; + ULONG High, Low = 0, i = 0, ReturnIndex; HCELL_INDEX LeafCell; PCM_KEY_INDEX Leaf; LONG Result; /* Verify Index for validity */ - ASSERTMSG("We don't do a linear search yet!\n", FALSE); ASSERT(Index->Count != 0); ASSERT(Index->Signature == CM_KEY_INDEX_ROOT); @@ -160,7 +159,9 @@ while (TRUE) { /* Choose next entry */ +#ifdef SOMEONE_WAS_NICE_ENOUGH_TO_MAKE_OUR_CELLS_LEXICALLY_SORTED i = ((High - Low) / 2) + Low; +#endif /* Get the leaf cell and then the leaf itself */ LeafCell = Index->List[i]; @@ -190,6 +191,7 @@ goto Return; } +#ifdef SOMEONE_WAS_NICE_ENOUGH_TO_MAKE_OUR_CELLS_LEXICALLY_SORTED /* Check for negative result */ if (Result < 0) { @@ -228,6 +230,7 @@ /* Update the base to this index, since we know it's not lower. */ Low = i; } +#endif } else { @@ -242,6 +245,16 @@ /* Release the leaf cell */ HvReleaseCell(Hive, LeafCell); + +#ifndef SOMEONE_WAS_NICE_ENOUGH_TO_MAKE_OUR_CELLS_LEXICALLY_SORTED + /* Go to the next index, and return failure if we reach the end */ + if (++i > High) + { + /* Return failure */ + *SubKey = HCELL_NIL; + return 0; + } +#endif } /* Make sure we got here for the right reasons */ @@ -1114,6 +1127,366 @@ /* Update the leaf count and return the new cell */ Leaf->Count += 1; return NewCell; +} + +HCELL_INDEX +NTAPI +CmpSplitLeaf(IN PHHIVE Hive, + IN HCELL_INDEX RootCell, + IN ULONG RootSelect, + IN HSTORAGE_TYPE Type) +{ + PCM_KEY_INDEX IndexKey, LeafKey, NewKey; + PCM_KEY_FAST_INDEX FastLeaf; + HCELL_INDEX LeafCell, NewCell; + ULONG FirstHalf, LastHalf; + ULONG EntrySize, TotalSize; + + /* Get the cell */ + IndexKey = (PCM_KEY_INDEX)HvGetCell(Hive, RootCell); + + /* Check if we've got valid IndexKey */ + if (!IndexKey) return HCELL_NIL; + + /* Get the leaf cell and key */ + LeafCell = IndexKey->List[RootSelect]; + LeafKey = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + + /* Check if we've got valid LeafKey */ + if (!LeafKey) return HCELL_NIL; + + /* We are going to divide this leaf into two halves */ + FirstHalf = (LeafKey->Count / 2); + LastHalf = LeafKey->Count - FirstHalf; + + /* Now check what kind of hive we're dealing with, + * and compute entry size + */ + if (Hive->Version >= 5) + { + /* XP Hive: Use hash leaf */ + ASSERT(LeafKey->Signature == CM_KEY_HASH_LEAF); + EntrySize = sizeof(CM_INDEX); + } + else + { + /* Use index leaf */ + ASSERT(LeafKey->Signature == CM_KEY_INDEX_LEAF); + EntrySize = sizeof(HCELL_INDEX); + } + + /* Compute the total size */ + TotalSize = (EntrySize * LastHalf) + FIELD_OFFSET(CM_KEY_INDEX, List) + 1; + + /* Mark the leaf cell dirty */ + HvMarkCellDirty(Hive, LeafCell, FALSE); + + /* Make sure its type is the same */ + ASSERT(HvGetCellType(LeafCell) == Type); + + /* Allocate the cell, fail in case of error */ + NewCell = HvAllocateCell(Hive, TotalSize, Type, LeafCell); + if (NewCell == HCELL_NIL) return NewCell; + + /* Get the key */ + NewKey = (PCM_KEY_INDEX)HvGetCell(Hive, NewCell); + if (!NewKey) + { + /* Free the cell and exit - should not happen! */ + ASSERT(FALSE); + HvFreeCell(Hive, NewCell); + return HCELL_NIL; + } + + /* Release the newly created cell */ + HvReleaseCell(Hive, NewCell); + + /* Set its signature according to the version of the hive */ + if (Hive->Version >= 5) + { + /* XP Hive: Use hash leaf signature */ + NewKey->Signature = CM_KEY_HASH_LEAF; + } + else + { + /* Use index leaf signature */ + NewKey->Signature = CM_KEY_INDEX_LEAF; + } + + /* Calculate the size of the free entries in the root key */ + TotalSize = HvGetCellSize(Hive, IndexKey) - + (IndexKey->Count * sizeof(HCELL_INDEX)) - + FIELD_OFFSET(CM_KEY_INDEX, List); + + /* Check if we're out of space */ + if (TotalSize / sizeof(HCELL_INDEX) < 1) + { + /* Grow the leaf by one more entry */ + TotalSize = HvGetCellSize(Hive, IndexKey) + sizeof(HCELL_INDEX); + + /* Re-allocate the root */ + RootCell = HvReallocateCell(Hive, RootCell, TotalSize); + if (RootCell == HCELL_NIL) + { + /* Free the cell and exit */ + HvFreeCell(Hive, NewCell); + return HCELL_NIL; + } + + /* Get the leaf cell */ + IndexKey = (PCM_KEY_INDEX)HvGetCell(Hive, RootCell); + if (!IndexKey) + { + /* This shouldn't happen */ + ASSERT(FALSE); + return HCELL_NIL; + } + } + + /* Splitting is done, now we need to copy the contents, + * according to the hive version + */ + if (Hive->Version >= 5) + { + /* Copy the fast indexes */ + FastLeaf = (PCM_KEY_FAST_INDEX)LeafKey; + RtlMoveMemory(&NewKey->List[0], + &FastLeaf->List[FirstHalf], + LastHalf * EntrySize); + } + else + { + /* Copy the indexes themselves */ + RtlMoveMemory(&NewKey->List[0], + &LeafKey->List[FirstHalf], + LastHalf * EntrySize); + } + + /* Shift the data inside the root key */ + if (RootSelect < (IndexKey->Count - 1)) + { + RtlMoveMemory(&IndexKey->List[RootSelect + 2], + &IndexKey->List[RootSelect + 1], + IndexKey->Count - + (RootSelect + 1) * sizeof(HCELL_INDEX)); + } + + /* Make sure both old and new computed counts are valid */ + ASSERT(FirstHalf != 0); + ASSERT(LastHalf != 0); + + /* Update the count value of old and new keys */ + LeafKey->Count = FirstHalf; + NewKey->Count = LastHalf; + + /* Increase the count value of the root key */ + IndexKey->Count++; + + /* Set the new cell in root's list */ + IndexKey->List[RootSelect + 1] = NewCell; + + /* Return the root cell */ + return RootCell; +} + +HCELL_INDEX +NTAPI +CmpSelectLeaf(IN PHHIVE Hive, + IN PCM_KEY_NODE KeyNode, + IN PUNICODE_STRING Name, + IN HSTORAGE_TYPE Type, + IN PHCELL_INDEX *RootCell) +{ + PCM_KEY_INDEX IndexKey, LeafKey; + PCM_KEY_FAST_INDEX FastLeaf; + HCELL_INDEX LeafCell, CurrentCell; + ULONG SubKeyIndex; + LONG Result; + + /* Mark it as dirty */ + HvMarkCellDirty(Hive, KeyNode->SubKeyLists[Type], FALSE); + + /* Get the cell */ + IndexKey = (PCM_KEY_INDEX)HvGetCell(Hive, KeyNode->SubKeyLists[Type]); + + /* Check if we've got a valid key */ + if (!IndexKey) + { + /* Should not happen! */ + ASSERTMSG("IndexKey = NULL!, it should not happen!\n", FALSE); + return HCELL_NIL; + } + + /* Sanity check */ + ASSERT(IndexKey->Signature == CM_KEY_INDEX_ROOT); + + while (TRUE) + { + /* Find subkey */ + SubKeyIndex = CmpFindSubKeyInRoot(Hive, IndexKey, Name, &LeafCell); + + /* Make sure we found something valid */ + if (SubKeyIndex & 0x80000000) return HCELL_NIL; + + /* Try to fit it into the LeafCell, if it was found */ + if (LeafCell != HCELL_NIL) + { + /* Get the leaf key */ + LeafKey = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + + /* Check for failure */ + if (!LeafKey) return HCELL_NIL; + + /* Check if it fits into this leaf and break */ + if (LeafKey->Count < CmpMaxIndexPerHblock) + { + /* Fill in the result and return it */ + *RootCell = &IndexKey->List[SubKeyIndex]; + return LeafCell; + } + } + else + { + /* Get the leaf cell at the very end */ + LeafCell = IndexKey->List[SubKeyIndex]; + LeafKey = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + + /* Return an error in case of problems */ + if (!LeafKey) return HCELL_NIL; + + /* Choose the cell to search from depending on the key type */ + if ((LeafKey->Signature == CM_KEY_FAST_LEAF) || + (LeafKey->Signature == CM_KEY_HASH_LEAF)) + { + FastLeaf = (PCM_KEY_FAST_INDEX)LeafKey; + CurrentCell = FastLeaf->List[0].Cell; + } + else + { + /* Make sure it's an index leaf */ + ASSERT(LeafKey->Signature == CM_KEY_INDEX_LEAF); + CurrentCell = LeafKey->List[0]; + } + + /* Do a name compare */ + Result = CmpDoCompareKeyName(Hive, Name, CurrentCell); + + /* Check for failure */ + if (Result == 2) return HCELL_NIL; + + /* Names can't be equal, ensure that */ + ASSERT(Result != 0); + + /* Check if it's above */ + if (Result >= 0) + { + /* Get the first cell in the index */ + LeafCell = IndexKey->List[0]; + LeafKey = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + + /* Return an error in case of problems */ + if (!LeafKey) return HCELL_NIL; + + /* Check if it fits into this leaf and break */ + if (LeafKey->Count < CmpMaxIndexPerHblock) + { + /* Fill in the result and return the cell */ + *RootCell = &IndexKey->List[SubKeyIndex + 1]; + return LeafCell; + } + + /* No, it doesn't fit, check the other leaf */ + if (SubKeyIndex < (IndexKey->Count - 1)) + { + /* Yes, there is space */ + LeafCell = IndexKey->List[SubKeyIndex + 1]; + LeafKey = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + + /* Return an error in case of problems */ + if (!LeafKey) return HCELL_NIL; + + /* Check if it fits and break */ + if (LeafKey->Count < CmpMaxIndexPerHblock) + { + /* Fill in the result and return the cell */ + *RootCell = &IndexKey->List[SubKeyIndex + 1]; + return LeafCell; + } + } + } + else + { + /* No, it's below, check the subkey index */ + if (SubKeyIndex > 0) + { + /* There should be space at the leaf one before that */ + LeafCell = IndexKey->List[SubKeyIndex - 1]; + LeafKey = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + + /* Return an error in case of problems */ + if (!LeafKey) return HCELL_NIL; + + /* Check if it fits and break */ + if (LeafKey->Count < CmpMaxIndexPerHblock) + { + /* Decrement the subkey index */ + SubKeyIndex--; + + /* Fill in the result and return the cell */ + *RootCell = &IndexKey->List[SubKeyIndex]; + return LeafCell; + } + } + else + { + /* Use the first leaf, if possible */ + LeafCell = IndexKey->List[0]; + LeafKey = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + + /* Return an error in case of problems */ + if (!LeafKey) return HCELL_NIL; + + /* Check if it fits and break */ + if (LeafKey->Count < CmpMaxIndexPerHblock) + { + /* Fill in the result and return the cell */ + *RootCell = &IndexKey->List[0]; + return LeafCell; + } + } + + /* It didn't fit into either, so proceed to splitting */ + } + } + + /* We need to split */ + CurrentCell = CmpSplitLeaf(Hive, + KeyNode->SubKeyLists[Type], + SubKeyIndex, + Type); + + /* Return failure in case splitting failed */ + if (CurrentCell == HCELL_NIL) return CurrentCell; + + /* Set the SubKeyLists value with the new key */ + KeyNode->SubKeyLists[Type] = CurrentCell; + + /* Get the new cell */ + IndexKey = (PCM_KEY_INDEX)HvGetCell(Hive, KeyNode->SubKeyLists[Type]); + + /* Return in case of failure */ + if (!IndexKey) return HCELL_NIL; + + /* Make sure the new key became index root */ + ASSERT(IndexKey->Signature == CM_KEY_INDEX_ROOT); + + /* Now loop over with the new IndexKey value, which definately + * has the space now + */ + } + + /* Shouldn't come here */ + return HCELL_NIL; } BOOLEAN @@ -1253,7 +1626,7 @@ /* Convert */ OldIndex = (PCM_KEY_FAST_INDEX)Index; - for (i=0; i < OldIndex->Count; i++) + for (i = 0; i < OldIndex->Count; i++) { Index->List[i] = OldIndex->List[i].Cell; } @@ -1299,9 +1672,17 @@ /* Check if we turned the index into a root */ if (Index->Signature == CM_KEY_INDEX_ROOT) { - /* Not handled yet */ - DPRINT1("Leaf->Root Index Conversion not yet implemented!\n"); - ASSERT(FALSE); + DPRINT("Leaf->Root Index Conversion\n"); + + /* Get the leaf where to add the new entry (the routine will do + * the splitting if necessary) + */ + LeafCell = CmpSelectLeaf(Hive, KeyNode, &Name, Type, &RootPointer); + if (LeafCell == HCELL_NIL) + { + /* Not handled */ + ASSERT(FALSE); + } } /* Add our leaf cell */

16 years, 3 months

[fireball] 36052: - Add CmpArmDelayedCloseTimer declaration.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Sep 8 07:48:34 2008 New Revision: 36052 URL: http://svn.reactos.org/svn/reactos?rev=36052&view=rev Log: - Add CmpArmDelayedCloseTimer declaration. Modified: trunk/reactos/ntoskrnl/include/internal/cm.h 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Mon Sep 8 07:48:34 2008 @@ -836,6 +836,12 @@ CmpAddToDelayedClose( IN PCM_KEY_CONTROL_BLOCK Kcb, IN BOOLEAN LockHeldExclusively +); + +VOID +NTAPI +CmpArmDelayedCloseTimer( + VOID ); VOID

16 years, 3 months

[fireball] 36051: - Implement delay-close worker function. See issue #3418 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Sep 8 07:41:30 2008 New Revision: 36051 URL: http://svn.reactos.org/svn/reactos?rev=36051&view=rev Log: - Implement delay-close worker function. See issue #3418 for more details. Modified: trunk/reactos/ntoskrnl/config/cmdelay.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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdelay.c [iso-8859-1] Mon Sep 8 07:41:30 2008 @@ -54,13 +54,134 @@ NTAPI CmpDelayCloseWorker(IN PVOID Context) { + PCM_DELAYED_CLOSE_ENTRY ListEntry; + ULONG i, ConvKey; PAGED_CODE(); /* Sanity check */ ASSERT(CmpDelayCloseWorkItemActive); - /* FIXME: TODO */ - ASSERT(FALSE); + /* Lock the registry */ + CmpLockRegistry(); + + /* Acquire the delayed close table lock */ + KeAcquireGuardedMutex(&CmpDelayedCloseTableLock); + + /* Iterate */ + for (i = 0; i < (CmpDelayedCloseSize >> 2); i++) + { + /* Break out of the loop if there is nothing to process */ + if (CmpDelayedCloseElements <= CmpDelayedCloseSize) break; + + /* Sanity check */ + ASSERT(!IsListEmpty(&CmpDelayedLRUListHead)); + + /* Get the entry */ + ListEntry = CONTAINING_RECORD(CmpDelayedLRUListHead.Blink, + CM_DELAYED_CLOSE_ENTRY, + DelayedLRUList); + + /* Save the ConvKey value of the KCB */ + ConvKey = ListEntry->KeyControlBlock->ConvKey; + + /* Release the delayed close table lock */ + KeReleaseGuardedMutex(&CmpDelayedCloseTableLock); + + /* Acquire the KCB lock */ + CmpAcquireKcbLockExclusiveByKey(ConvKey); + + /* Reacquire the delayed close table lock */ + KeAcquireGuardedMutex(&CmpDelayedCloseTableLock); + + /* Get the entry */ + ListEntry = CONTAINING_RECORD(CmpDelayedLRUListHead.Blink, + CM_DELAYED_CLOSE_ENTRY, + DelayedLRUList); + + /* Is the entry we have still the first one? */ + if (CmpDelayedCloseElements <= CmpDelayedCloseSize) + { + /* No, someone already inserted an entry there */ + CmpReleaseKcbLockByKey(ConvKey); + break; + } + + /* Is it a different entry? */ + if (ConvKey != ListEntry->KeyControlBlock->ConvKey) + { + /* Release the delayed close table lock */ + KeReleaseGuardedMutex(&CmpDelayedCloseTableLock); + + /* Release the KCB lock */ + CmpReleaseKcbLockByKey(ConvKey); + + /* Reacquire the delayed close table lock */ + KeAcquireGuardedMutex(&CmpDelayedCloseTableLock); + + /* Iterate again */ + continue; + } + + /* Remove it from the end of the list */ + ListEntry = + (PCM_DELAYED_CLOSE_ENTRY)RemoveTailList(&CmpDelayedLRUListHead); + + /* Get the containing entry */ + ListEntry = CONTAINING_RECORD(ListEntry, + CM_DELAYED_CLOSE_ENTRY, + DelayedLRUList); + + /* Process the entry */ + if ((ListEntry->KeyControlBlock->RefCount) || + (ListEntry->KeyControlBlock->DelayedCloseIndex)) + { + /* Add it to the beginning of the list */ + InsertHeadList(&CmpDelayedLRUListHead, &ListEntry->DelayedLRUList); + + /* Release the delayed close table lock */ + KeReleaseGuardedMutex(&CmpDelayedCloseTableLock); + } + else + { + /* Release the delayed close table lock */ + KeReleaseGuardedMutex(&CmpDelayedCloseTableLock); + + /* Zero out the DelayCloseEntry pointer */ + ListEntry->KeyControlBlock->DelayCloseEntry = NULL; + + /* Cleanup the KCB cache */ + CmpCleanUpKcbCacheWithLock(ListEntry->KeyControlBlock, FALSE); + + /* Free the delay item */ + CmpFreeDelayItem(ListEntry); + + /* Decrement delayed close elements count */ + InterlockedDecrement((PLONG)&CmpDelayedCloseElements); + } + + /* Release the KCB lock */ + CmpReleaseKcbLockByKey(ConvKey); + + /* Reacquire the delayed close table lock */ + KeAcquireGuardedMutex(&CmpDelayedCloseTableLock); + } + + if (CmpDelayedCloseElements <= CmpDelayedCloseSize) + { + /* We're not active anymore */ + CmpDelayCloseWorkItemActive = FALSE; + } + else + { + /* We didn't process all things, so reschedule for the next time */ + CmpArmDelayedCloseTimer(); + } + + /* Release the delayed close table lock */ + KeReleaseGuardedMutex(&CmpDelayedCloseTableLock); + + /* Unlock the registry */ + CmpUnlockRegistry(); } VOID

16 years, 3 months

[fireball] 36050: - Comment out the assert which is hit in some cases ("advapi32_winetest.exe registry" being one of them), because there is no locking operation performed in CmpBuildHashStackAndLookupCache yet. - Use a CmpIsKcbLockedExclusive macro in that assert.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Sep 8 07:34:01 2008 New Revision: 36050 URL: http://svn.reactos.org/svn/reactos?rev=36050&view=rev Log: - Comment out the assert which is hit in some cases ("advapi32_winetest.exe registry" being one of them), because there is no locking operation performed in CmpBuildHashStackAndLookupCache yet. - Use a CmpIsKcbLockedExclusive macro in that assert. Modified: trunk/reactos/ntoskrnl/config/cmalloc.c 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmalloc.c [iso-8859-1] Mon Sep 8 07:34:01 2008 @@ -70,9 +70,8 @@ KeAcquireGuardedMutex(&CmpAllocBucketLock); /* Sanity check on lock ownership */ - ASSERT((GET_HASH_ENTRY(CmpCacheTable, Kcb->ConvKey).Owner == - KeGetCurrentThread()) || - (CmpTestRegistryLockExclusive() == TRUE)); + //ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + // (CmpTestRegistryLockExclusive() == TRUE)); /* Add us to the free list */ InsertTailList(&CmpFreeKCBListHead, &Kcb->FreeListEntry);

16 years, 3 months

[cwittich] 36049: add a base address for pstorec.dll

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Sep 8 07:10:42 2008 New Revision: 36049 URL: http://svn.reactos.org/svn/reactos?rev=36049&view=rev Log: add a base address for pstorec.dll Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=360… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Mon Sep 8 07:10:42 2008 @@ -7,6 +7,7 @@ <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> <property name="BASEADDRESS_RSABASE" value="0x35700000" /> <property name="BASEADDRESS_RSAENH" value="0x35780000" /> + <property name="BASEADDRESS_PSTOREC" value="0x513D0000" /> <property name="BASEADDRESS_LPK" value="0x516C0000" /> <property name="BASEADDRESS_TELEPHON" value="0x58750000" /> <property name="BASEADDRESS_PWRCFG" value="0x587e0000" />

16 years, 3 months

[cwittich] 36048: sync pstore.idl to wine

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Sep 8 07:09:09 2008 New Revision: 36048 URL: http://svn.reactos.org/svn/reactos?rev=36048&view=rev Log: sync pstore.idl to wine Modified: trunk/reactos/include/psdk/pstore.idl Modified: trunk/reactos/include/psdk/pstore.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pstore.idl?re… ============================================================================== --- trunk/reactos/include/psdk/pstore.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pstore.idl [iso-8859-1] Mon Sep 8 07:09:09 2008 @@ -42,9 +42,13 @@ LPWSTR szProviderName; } PST_PROVIDERINFO, *PPST_PROVIDERINFO; -typedef void *PPST_PROMPTIFO; - - +typedef struct _PST_PROMPTINFO +{ + DWORD cbSize; + DWORD dwPromptFlags; + HWND hwndApp; + LPCWSTR szPrompt; +} PST_PROMPTINFO, *PPST_PROMPTINFO; typedef struct { DWORD cbSize; @@ -71,15 +75,9 @@ LPWSTR szDisplayName; } PST_TYPEINFO, *PPST_TYPEINFO; -typedef struct { - DWORD cbSize; - DWORD dwPromptFlags; - DWORD_PTR hwndApp; - LPCWSTR szPrompt; -} PST_PROMPTINFO, *PPST_PROMPTINFO; - [ object, + uuid(5a6f1ec1-2db1-11d0-8c39-00c04fd9126b), pointer_default(unique) ] interface IEnumPStoreItems : IUnknown @@ -100,6 +98,7 @@ [ object, + uuid(789c1cbf-31ee-11d0-8c39-00c04fd9126b), pointer_default(unique) ] interface IEnumPStoreTypes : IUnknown @@ -123,6 +122,7 @@ */ [ object, + uuid(5a6f1ec0-2db1-11d0-8c39-00c04fd9126b), pointer_default(unique) ] interface IPStore : IUnknown @@ -222,7 +222,7 @@ [in] LPCWSTR szItemName, [in] DWORD *cbData, [in] BYTE** pbData, - [in] PPST_PROMPTIFO pPromptInfo, + [in] PPST_PROMPTINFO pPromptInfo, [in] DWORD dwFlags ); HRESULT WriteItem( @@ -232,7 +232,7 @@ [in] LPCWSTR szItemName, [in] DWORD cbData, [in,size_is(cbData)] BYTE *ppbData, - [in] PPST_PROMPTIFO pPromptInfo, + [in] PPST_PROMPTINFO pPromptInfo, [in] DWORD dwDefaultConfirmationStyle, [in] DWORD dwFlags); @@ -242,12 +242,12 @@ [in] const GUID* pItemSubtype, [in] LPCWSTR szItemName, [in] PST_ACCESSMODE ModeFlags, - [in] PPST_PROMPTIFO pProomptInfo, - [in] DWORD dwFlags ); - - HRESULT CloseItem( - [in] PST_KEY Key, - [in] const GUID* pItemType, + [in] PPST_PROMPTINFO pProomptInfo, + [in] DWORD dwFlags ); + + HRESULT CloseItem( + [in] PST_KEY Key, + [in] const GUID* pItemType, [in] const GUID* pItemSubtype, [in] LPCWSTR* szItemName, [in] DWORD dwFlags );

16 years, 3 months

[sginsberg] 36047: - NtQueryInformationFile and NtSetInformationFile: Don't clear the IRP_SYNCHRONOUS_API flag if it has been set previously! This should obsolete the hack in irp.c!IopCompleteRequest. - If you still see "Not an executive event -- should not be dereferenced" after this patch then please report to me.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Sep 8 06:52:33 2008 New Revision: 36047 URL: http://svn.reactos.org/svn/reactos?rev=36047&view=rev Log: - NtQueryInformationFile and NtSetInformationFile: Don't clear the IRP_SYNCHRONOUS_API flag if it has been set previously! This should obsolete the hack in irp.c!IopCompleteRequest. - If you still see "Not an executive event -- should not be dereferenced" after this patch then please report to me. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Mon Sep 8 06:52:33 2008 @@ -1809,10 +1809,10 @@ if (!NT_SUCCESS(Status)) return Status; /* Set the flags */ - Irp->Flags = (IRP_BUFFERED_IO | - IRP_DEALLOCATE_BUFFER | - IRP_INPUT_OPERATION | - IRP_DEFER_IO_COMPLETION); + Irp->Flags |= (IRP_BUFFERED_IO | + IRP_DEALLOCATE_BUFFER | + IRP_INPUT_OPERATION | + IRP_DEFER_IO_COMPLETION); /* Set the Parameters */ StackPtr->Parameters.QueryFile.FileInformationClass = FileInformationClass; @@ -2405,9 +2405,9 @@ if (!NT_SUCCESS(Status)) return Status; /* Set the flags */ - Irp->Flags = (IRP_BUFFERED_IO | - IRP_DEALLOCATE_BUFFER | - IRP_DEFER_IO_COMPLETION); + Irp->Flags |= (IRP_BUFFERED_IO | + IRP_DEALLOCATE_BUFFER | + IRP_DEFER_IO_COMPLETION); /* Set the Parameters */ StackPtr->Parameters.SetFile.FileInformationClass = FileInformationClass;

16 years, 3 months

[tkreuzer] 36046: Merge 34722, 34723, 34724, 34843, 35528, 35703 from ros-amd64-bringup branch: - Convert port addresses to PULONG - fix several ULONG / ULONG_PTR issues - use %p in DPRINTs for pointer sized values - fix type of address table entry from PULONG to ULONG

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 8 06:13:51 2008 New Revision: 36046 URL: http://svn.reactos.org/svn/reactos?rev=36046&view=rev Log: Merge 34722, 34723, 34724, 34843, 35528, 35703 from ros-amd64-bringup branch: - Convert port addresses to PULONG - fix several ULONG / ULONG_PTR issues - use %p in DPRINTs for pointer sized values - fix type of address table entry from PULONG to ULONG 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/hwpci.c trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/cmdline.c trunk/reactos/boot/freeldr/freeldr/comm/rs232.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/include/inifile.h trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/mm/mm.c trunk/reactos/boot/freeldr/freeldr/oslist.c trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/ui/ui.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 [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -779,21 +779,21 @@ } static VOID -InitializeSerialPort(ULONG Port, +InitializeSerialPort(PUCHAR Port, ULONG LineControl) { - WRITE_PORT_UCHAR((PUCHAR)Port + 3, 0x80); /* set DLAB on */ - WRITE_PORT_UCHAR((PUCHAR)Port, 0x60); /* speed LO byte */ - WRITE_PORT_UCHAR((PUCHAR)Port + 1, 0); /* speed HI byte */ - WRITE_PORT_UCHAR((PUCHAR)Port + 3, LineControl); - WRITE_PORT_UCHAR((PUCHAR)Port + 1, 0); /* set comm and DLAB to 0 */ - WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x09); /* DR int enable */ - READ_PORT_UCHAR((PUCHAR)Port + 5); /* clear error bits */ + WRITE_PORT_UCHAR(Port + 3, 0x80); /* set DLAB on */ + WRITE_PORT_UCHAR(Port, 0x60); /* speed LO byte */ + WRITE_PORT_UCHAR(Port + 1, 0); /* speed HI byte */ + WRITE_PORT_UCHAR(Port + 3, LineControl); + WRITE_PORT_UCHAR(Port + 1, 0); /* set comm and DLAB to 0 */ + WRITE_PORT_UCHAR(Port + 4, 0x09); /* DR int enable */ + READ_PORT_UCHAR(Port + 5); /* clear error bits */ } static ULONG -DetectSerialMouse(ULONG Port) +DetectSerialMouse(PUCHAR Port) { CHAR Buffer[4]; ULONG i; @@ -801,8 +801,8 @@ UCHAR LineControl; /* Shutdown mouse or something like that */ - LineControl = READ_PORT_UCHAR((PUCHAR)Port + 4); - WRITE_PORT_UCHAR((PUCHAR)Port + 4, (LineControl & ~0x02) | 0x01); + LineControl = READ_PORT_UCHAR(Port + 4); + WRITE_PORT_UCHAR(Port + 4, (LineControl & ~0x02) | 0x01); StallExecutionProcessor(100000); /* @@ -812,18 +812,18 @@ * therefore we must give up after some time. */ TimeOut = 200; - while (READ_PORT_UCHAR((PUCHAR)Port + 5) & 0x01) + while (READ_PORT_UCHAR(Port + 5) & 0x01) { if (--TimeOut == 0) return MOUSE_TYPE_NONE; - READ_PORT_UCHAR((PUCHAR)Port); + READ_PORT_UCHAR(Port); } /* * Send modem control with 'Data Terminal Ready', 'Request To Send' and * 'Output Line 2' message. This enables mouse to identify. */ - WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x0b); + WRITE_PORT_UCHAR(Port + 4, 0x0b); /* Wait 10 milliseconds for the mouse getting ready */ StallExecutionProcessor(10000); @@ -832,14 +832,14 @@ TimeOut = 200; for (i = 0; i < 4; i++) { - while (((READ_PORT_UCHAR((PUCHAR)Port + 5) & 1) == 0) && (TimeOut > 0)) + while (((READ_PORT_UCHAR(Port + 5) & 1) == 0) && (TimeOut > 0)) { StallExecutionProcessor(1000); --TimeOut; if (TimeOut == 0) return MOUSE_TYPE_NONE; } - Buffer[i] = READ_PORT_UCHAR((PUCHAR)Port); + Buffer[i] = READ_PORT_UCHAR(Port); } DbgPrint((DPRINT_HWDETECT, @@ -891,26 +891,26 @@ static ULONG -GetSerialMousePnpId(ULONG Port, char *Buffer) +GetSerialMousePnpId(PUCHAR Port, char *Buffer) { ULONG TimeOut; ULONG i = 0; char c; char x; - WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x09); + WRITE_PORT_UCHAR(Port + 4, 0x09); /* Wait 10 milliseconds for the mouse getting ready */ StallExecutionProcessor(10000); - WRITE_PORT_UCHAR((PUCHAR)Port + 4, 0x0b); + WRITE_PORT_UCHAR(Port + 4, 0x0b); StallExecutionProcessor(10000); for (;;) { TimeOut = 200; - while (((READ_PORT_UCHAR((PUCHAR)Port + 5) & 1) == 0) && (TimeOut > 0)) + while (((READ_PORT_UCHAR(Port + 5) & 1) == 0) && (TimeOut > 0)) { StallExecutionProcessor(1000); --TimeOut; @@ -920,7 +920,7 @@ } } - c = READ_PORT_UCHAR((PUCHAR)Port); + c = READ_PORT_UCHAR(Port); if (c == 0x08 || c == 0x28) break; } @@ -931,14 +931,14 @@ for (;;) { TimeOut = 200; - while (((READ_PORT_UCHAR((PUCHAR)Port + 5) & 1) == 0) && (TimeOut > 0)) + while (((READ_PORT_UCHAR(Port + 5) & 1) == 0) && (TimeOut > 0)) { StallExecutionProcessor(1000); --TimeOut; if (TimeOut == 0) return 0; } - c = READ_PORT_UCHAR((PUCHAR)Port); + c = READ_PORT_UCHAR(Port); Buffer[i++] = c; if (c == x) break; @@ -952,7 +952,7 @@ static VOID DetectSerialPointerPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey, - ULONG Base) + PUCHAR Base) { CM_PARTIAL_RESOURCE_LIST PartialResourceList; char Buffer[256]; @@ -1227,7 +1227,7 @@ if (!Rs232PortInUse(Base)) { /* Detect serial mouse */ - DetectSerialPointerPeripheral(ControllerKey, Base); + DetectSerialPointerPeripheral(ControllerKey, UlongToPtr(Base)); } ControllerNumber++; 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 [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -30,7 +30,7 @@ /* Find the 'Root System Descriptor Table Pointer' */ Ptr = (PUCHAR)0xE0000; - while ((ULONG)Ptr < 0x100000) + while ((ULONG_PTR)Ptr < 0x100000) { if (!memcmp(Ptr, "RSD PTR ", 8)) { @@ -39,7 +39,7 @@ return (PRSDP_DESCRIPTOR)Ptr; } - Ptr = (PUCHAR)((ULONG)Ptr + 0x10); + Ptr = (PUCHAR)((ULONG_PTR)Ptr + 0x10); } DbgPrint((DPRINT_HWDETECT, "ACPI not supported\n")); 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 [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -71,7 +71,7 @@ ULONG i; Table = (PPCI_IRQ_ROUTING_TABLE)0xF0000; - while ((ULONG)Table < 0x100000) + while ((ULONG_PTR)Table < 0x100000) { if (Table->Signature == 0x52495024) { @@ -98,7 +98,7 @@ return Table; } - Table = (PPCI_IRQ_ROUTING_TABLE)((ULONG)Table + 0x10); + Table = (PPCI_IRQ_ROUTING_TABLE)((ULONG_PTR)Table + 0x10); } return NULL; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -25,8 +25,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////// // FUNCTIONS ///////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __i386__ BOOLEAN DiskResetController(ULONG DriveNumber) { @@ -177,7 +175,7 @@ DbgPrint((DPRINT_DISK, "EED configuration parameters: %x:%x\n", Ptr[13], Ptr[14])); if (Ptr[13] != 0xffff && Ptr[14] != 0xffff) { - PUCHAR SpecPtr = (PUCHAR)((Ptr[13] << 4) + Ptr[14]); + PUCHAR SpecPtr = (PUCHAR)(ULONG_PTR)((Ptr[13] << 4) + Ptr[14]); DbgPrint((DPRINT_DISK, "SpecPtr: %x\n", SpecPtr)); DbgPrint((DPRINT_DISK, "physical I/O port base address: %x\n", *(PUSHORT)&SpecPtr[0])); DbgPrint((DPRINT_DISK, "disk-drive control port address: %x\n", *(PUSHORT)&SpecPtr[2])); @@ -198,6 +196,4 @@ return TRUE; } -#endif /* defined __i386__ */ - /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -83,8 +83,8 @@ Packet->PacketSize = sizeof(I386_DISK_ADDRESS_PACKET); Packet->Reserved = 0; Packet->LBABlockCount = SectorCount; - Packet->TransferBufferOffset = ((ULONG)Buffer) & 0x0F; - Packet->TransferBufferSegment = ((ULONG)Buffer) >> 4; + Packet->TransferBufferOffset = ((ULONG_PTR)Buffer) & 0x0F; + Packet->TransferBufferSegment = ((ULONG_PTR)Buffer) >> 4; Packet->LBAStartBlock = SectorNumber; // BIOS int 0x13, function 42h - IBM/MS INT 13 Extensions - EXTENDED READ @@ -211,8 +211,8 @@ RegsIn.b.cl = (PhysicalSector + ((PhysicalTrack & 0x300) >> 2)); RegsIn.b.dh = PhysicalHead; RegsIn.b.dl = DriveNumber; - RegsIn.w.es = ((ULONG)Buffer) >> 4; - RegsIn.w.bx = ((ULONG)Buffer) & 0x0F; + RegsIn.w.es = ((ULONG_PTR)Buffer) >> 4; + RegsIn.w.bx = ((ULONG_PTR)Buffer) & 0x0F; // // Perform the read Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -194,8 +194,8 @@ /* Copy data to caller's buffer */ RtlCopyMemory(&BiosMemoryMap[MapCount], (PVOID)BIOSCALLBUFFER, Regs.x.ecx); - DbgPrint((DPRINT_MEMORY, "BaseAddress: 0x%x%x\n", BiosMemoryMap[MapCount].BaseAddress)); - DbgPrint((DPRINT_MEMORY, "Length: 0x%x%x\n", BiosMemoryMap[MapCount].Length)); + DbgPrint((DPRINT_MEMORY, "BaseAddress: 0x%p\n", (PVOID)(ULONG_PTR)BiosMemoryMap[MapCount].BaseAddress)); + DbgPrint((DPRINT_MEMORY, "Length: 0x%p\n", (PVOID)(ULONG_PTR)BiosMemoryMap[MapCount].Length)); DbgPrint((DPRINT_MEMORY, "Type: 0x%x\n", BiosMemoryMap[MapCount].Type)); DbgPrint((DPRINT_MEMORY, "Reserved: 0x%x\n", BiosMemoryMap[MapCount].Reserved)); DbgPrint((DPRINT_MEMORY, "\n")); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -361,7 +361,7 @@ static VOID PcVideoSet480ScanLines(VOID) { - int CRTC; + INT_PTR CRTC; /* Read CRTC port */ CRTC = READ_PORT_UCHAR((PUCHAR)0x03CC); @@ -418,7 +418,7 @@ static VOID PcVideoSetDisplayEnd(VOID) { - int CRTC; + INT_PTR CRTC; /* Read CRTC port */ CRTC = READ_PORT_UCHAR((PUCHAR)0x03CC); @@ -1054,7 +1054,7 @@ { USHORT *BufPtr; - BufPtr = (USHORT *) (VIDEOTEXT_MEM_ADDRESS + Y * BytesPerScanLine + X * 2); + BufPtr = (USHORT *) (ULONG_PTR)(VIDEOTEXT_MEM_ADDRESS + Y * BytesPerScanLine + X * 2); *BufPtr = ((USHORT) Attr << 8) | (Ch & 0xff); } Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -23,7 +23,7 @@ { CHAR SettingName[80]; CHAR SettingValue[80]; - ULONG SectionId; + ULONG_PTR SectionId; ULONG OperatingSystemCount; PCSTR *OperatingSystemSectionNames; PCSTR *OperatingSystemDisplayNames; @@ -161,7 +161,7 @@ { CHAR DefaultOSText[80]; PCSTR DefaultOSName; - ULONG SectionId; + ULONG_PTR SectionId; ULONG DefaultOS = 0; ULONG Idx; @@ -198,7 +198,7 @@ { CHAR TimeOutText[20]; LONG TimeOut; - ULONG SectionId; + ULONG_PTR SectionId; TimeOut = CmdLineGetTimeOut(); if (0 <= TimeOut) Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cmdli… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cmdline.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -61,7 +61,7 @@ // Get ramdisk base address // Setting = strstr(CmdLine, "rdbase="); - if (Setting) gRamDiskBase = (PVOID)strtoul(Setting + + if (Setting) gRamDiskBase = (PVOID)(ULONG_PTR)strtoull(Setting + sizeof("rdbase=") - sizeof(ANSI_NULL), NULL, Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -137,9 +137,9 @@ if (ComPort == 0) { - if (Rs232DoesComPortExist ((PUCHAR)BaseArray[2])) - { - Rs232PortBase = (PUCHAR)BaseArray[2]; + if (Rs232DoesComPortExist ((PUCHAR)(ULONG_PTR)BaseArray[2])) + { + Rs232PortBase = (PUCHAR)(ULONG_PTR)BaseArray[2]; Rs232ComPort = 2; /*#ifndef NDEBUG sprintf (buffer, @@ -149,9 +149,9 @@ HalDisplayString (buffer); #endif*/ /* NDEBUG */ } - else if (Rs232DoesComPortExist ((PUCHAR)BaseArray[1])) - { - Rs232PortBase = (PUCHAR)BaseArray[1]; + else if (Rs232DoesComPortExist ((PUCHAR)(ULONG_PTR)BaseArray[1])) + { + Rs232PortBase = (PUCHAR)(ULONG_PTR)BaseArray[1]; Rs232ComPort = 1; /*#ifndef NDEBUG sprintf (buffer, @@ -171,9 +171,9 @@ } else { - if (Rs232DoesComPortExist ((PUCHAR)BaseArray[ComPort])) - { - Rs232PortBase = (PUCHAR)BaseArray[ComPort]; + if (Rs232DoesComPortExist ((PUCHAR)(ULONG_PTR)BaseArray[ComPort])) + { + Rs232PortBase = (PUCHAR)(ULONG_PTR)BaseArray[ComPort]; Rs232ComPort = ComPort; /*#ifndef NDEBUG sprintf (buffer, @@ -280,7 +280,7 @@ BOOLEAN Rs232PortInUse(ULONG Base) { #ifdef DBG - return PortInitialized && Rs232PortBase == (PUCHAR)Base ? TRUE : FALSE; + return PortInitialized && Rs232PortBase == (PUCHAR)(ULONG_PTR)Base ? TRUE : FALSE; #else return FALSE; #endif Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -66,7 +66,7 @@ // // Get actual pointers and lengths // - StartAddress = (PVOID)((ULONG)SectorNumber * 512); + StartAddress = (PVOID)((ULONG_PTR)SectorNumber * 512); Length = SectorCount * 512; // Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -951,7 +951,7 @@ } // Copy the data to their buffer - RtlCopyMemory(InodeBuffer, (PVOID)(FILESYSBUFFER + (InodeOffsetInBlock * EXT3_INODE_SIZE(Ext2SuperBlock))), sizeof(EXT2_INODE)); + RtlCopyMemory(InodeBuffer, (PVOID)(ULONG_PTR)(FILESYSBUFFER + (InodeOffsetInBlock * EXT3_INODE_SIZE(Ext2SuperBlock))), sizeof(EXT2_INODE)); DbgPrint((DPRINT_FILESYSTEM, "Dumping inode information:\n")); DbgPrint((DPRINT_FILESYSTEM, "i_mode = 0x%x\n", InodeBuffer->i_mode)); Modified: trunk/reactos/boot/freeldr/freeldr/include/inifile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/inifile.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/inifile.h [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -72,14 +72,14 @@ BOOLEAN IniFileInitialize(VOID); -BOOLEAN IniOpenSection(PCSTR SectionName, ULONG* SectionId); -ULONG IniGetNumSectionItems(ULONG SectionId); -ULONG IniGetSectionSettingNameSize(ULONG SectionId, ULONG SettingIndex); -ULONG IniGetSectionSettingValueSize(ULONG SectionId, ULONG SettingIndex); -BOOLEAN IniReadSettingByNumber(ULONG SectionId, ULONG SettingNumber, PCHAR SettingName, ULONG NameSize, PCHAR SettingValue, ULONG ValueSize); -BOOLEAN IniReadSettingByName(ULONG SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize); -BOOLEAN IniAddSection(PCSTR SectionName, ULONG* SectionId); -BOOLEAN IniAddSettingValueToSection(ULONG SectionId, PCSTR SettingName, PCSTR SettingValue); +BOOLEAN IniOpenSection(PCSTR SectionName, ULONG_PTR* SectionId); +ULONG IniGetNumSectionItems(ULONG_PTR SectionId); +ULONG IniGetSectionSettingNameSize(ULONG_PTR SectionId, ULONG SettingIndex); +ULONG IniGetSectionSettingValueSize(ULONG_PTR SectionId, ULONG SettingIndex); +BOOLEAN IniReadSettingByNumber(ULONG_PTR SectionId, ULONG SettingNumber, PCHAR SettingName, ULONG NameSize, PCHAR SettingValue, ULONG ValueSize); +BOOLEAN IniReadSettingByName(ULONG_PTR SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize); +BOOLEAN IniAddSection(PCSTR SectionName, ULONG_PTR* SectionId); +BOOLEAN IniAddSettingValueToSection(ULONG_PTR SectionId, PCSTR SettingName, PCSTR SettingValue); #endif // defined __PARSEINI_H Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -20,7 +20,7 @@ #include <freeldr.h> #include <debug.h> -BOOLEAN IniOpenSection(PCSTR SectionName, ULONG* SectionId) +BOOLEAN IniOpenSection(PCSTR SectionName, ULONG_PTR* SectionId) { PINI_SECTION Section; @@ -35,7 +35,7 @@ { // We found it if (SectionId) - *SectionId = (ULONG)Section; + *SectionId = (ULONG_PTR)Section; DbgPrint((DPRINT_INIFILE, "IniOpenSection() Found it! SectionId = 0x%x\n", SectionId)); return TRUE; } @@ -49,7 +49,7 @@ return FALSE; } -ULONG IniGetNumSectionItems(ULONG SectionId) +ULONG IniGetNumSectionItems(ULONG_PTR SectionId) { PINI_SECTION Section = (PINI_SECTION)SectionId; @@ -59,7 +59,7 @@ return Section->SectionItemCount; } -PINI_SECTION_ITEM IniGetSettingByNumber(ULONG SectionId, ULONG SettingNumber) +PINI_SECTION_ITEM IniGetSettingByNumber(ULONG_PTR SectionId, ULONG SettingNumber) { PINI_SECTION Section = (PINI_SECTION)SectionId; PINI_SECTION_ITEM SectionItem; @@ -83,7 +83,7 @@ return NULL; } -ULONG IniGetSectionSettingNameSize(ULONG SectionId, ULONG SettingIndex) +ULONG IniGetSectionSettingNameSize(ULONG_PTR SectionId, ULONG SettingIndex) { PINI_SECTION_ITEM SectionItem; @@ -96,7 +96,7 @@ return (strlen(SectionItem->ItemName) + 1); } -ULONG IniGetSectionSettingValueSize(ULONG SectionId, ULONG SettingIndex) +ULONG IniGetSectionSettingValueSize(ULONG_PTR SectionId, ULONG SettingIndex) { PINI_SECTION_ITEM SectionItem; @@ -109,7 +109,7 @@ return (strlen(SectionItem->ItemValue) + 1); } -BOOLEAN IniReadSettingByNumber(ULONG SectionId, ULONG SettingNumber, PCHAR SettingName, ULONG NameSize, PCHAR SettingValue, ULONG ValueSize) +BOOLEAN IniReadSettingByNumber(ULONG_PTR SectionId, ULONG SettingNumber, PCHAR SettingName, ULONG NameSize, PCHAR SettingValue, ULONG ValueSize) { PINI_SECTION_ITEM SectionItem; DbgPrint((DPRINT_INIFILE, ".001 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); @@ -142,7 +142,7 @@ return TRUE; } -BOOLEAN IniReadSettingByName(ULONG SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize) +BOOLEAN IniReadSettingByName(ULONG_PTR SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize) { PINI_SECTION Section = (PINI_SECTION)SectionId; PINI_SECTION_ITEM SectionItem; @@ -174,7 +174,7 @@ return FALSE; } -BOOLEAN IniAddSection(PCSTR SectionName, ULONG* SectionId) +BOOLEAN IniAddSection(PCSTR SectionName, ULONG_PTR* SectionId) { PINI_SECTION Section; @@ -202,12 +202,12 @@ IniFileSectionCount++; InsertHeadList(&IniFileSectionListHead, &Section->ListEntry); - *SectionId = (ULONG)Section; + *SectionId = (ULONG_PTR)Section; return TRUE; } -BOOLEAN IniAddSettingValueToSection(ULONG SectionId, PCSTR SettingName, PCSTR SettingValue) +BOOLEAN IniAddSettingValueToSection(ULONG_PTR SectionId, PCSTR SettingName, PCSTR SettingValue) { PINI_SECTION Section = (PINI_SECTION)SectionId; PINI_SECTION_ITEM SectionItem; Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -169,7 +169,7 @@ ULONG MmGetPageNumberFromAddress(PVOID Address) { - return ((ULONG)Address) / MM_PAGE_SIZE; + return ((ULONG_PTR)Address) / MM_PAGE_SIZE; } PVOID MmGetEndAddressOfAnyMemory(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MapCount) @@ -195,7 +195,7 @@ DbgPrint((DPRINT_MEMORY, "MmGetEndAddressOfAnyMemory() returning 0x%x\n", (ULONG)EndAddressOfMemory)); - return (PVOID)(ULONG)EndAddressOfMemory; + return (PVOID)(ULONG_PTR)EndAddressOfMemory; } ULONG MmGetAddressablePageCountIncludingHoles(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MapCount) @@ -203,7 +203,7 @@ ULONG PageCount; ULONGLONG EndAddress; - EndAddress = (ULONGLONG)(ULONG)MmGetEndAddressOfAnyMemory(BiosMemoryMap, MapCount); + EndAddress = (ULONGLONG)(ULONG_PTR)MmGetEndAddressOfAnyMemory(BiosMemoryMap, MapCount); // Since MmGetEndAddressOfAnyMemory() won't // return addresses higher than 0xFFFFFFFF @@ -252,7 +252,7 @@ if (TempBiosMemoryMap[Index].Length >= PageLookupTableSize) { - PageLookupTableMemAddress = (PVOID)(ULONG) + PageLookupTableMemAddress = (PVOID)(ULONG_PTR) (TempBiosMemoryMap[Index].BaseAddress + (TempBiosMemoryMap[Index].Length - PageLookupTableSize)); break; } @@ -304,8 +304,8 @@ for (Index=0; Index<MapCount; Index++) { - MemoryMapStartPage = MmGetPageNumberFromAddress((PVOID)(ULONG)BiosMemoryMap[Index].BaseAddress); - MemoryMapEndPage = MmGetPageNumberFromAddress((PVOID)(ULONG)(BiosMemoryMap[Index].BaseAddress + BiosMemoryMap[Index].Length - 1)); + MemoryMapStartPage = MmGetPageNumberFromAddress((PVOID)(ULONG_PTR)BiosMemoryMap[Index].BaseAddress); + MemoryMapEndPage = MmGetPageNumberFromAddress((PVOID)(ULONG_PTR)(BiosMemoryMap[Index].BaseAddress + BiosMemoryMap[Index].Length - 1)); MemoryMapPageCount = (MemoryMapEndPage - MemoryMapStartPage) + 1; switch (BiosMemoryMap[Index].Type) Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -67,7 +67,7 @@ MmAllocatePagesInLookupTable(PageLookupTableAddress, FirstFreePageFromEnd, PagesNeeded, MemoryType); FreePagesInLookupTable -= PagesNeeded; - MemPointer = (PVOID)(FirstFreePageFromEnd * MM_PAGE_SIZE); + MemPointer = (PVOID)((ULONG_PTR)FirstFreePageFromEnd * MM_PAGE_SIZE); #ifdef DBG DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd)); @@ -167,7 +167,7 @@ MmAllocatePagesInLookupTable(PageLookupTableAddress, StartPageNumber, PagesNeeded, MemoryType); FreePagesInLookupTable -= PagesNeeded; - MemPointer = (PVOID)(StartPageNumber * MM_PAGE_SIZE); + MemPointer = (PVOID)((ULONG_PTR)StartPageNumber * MM_PAGE_SIZE); #ifdef DBG DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, StartPageNumber)); @@ -201,7 +201,7 @@ PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; // Get the page number for their desired address - DesiredAddressPageNumber = (ULONG)DesiredAddress / MM_PAGE_SIZE; + DesiredAddressPageNumber = (ULONG_PTR)DesiredAddress / MM_PAGE_SIZE; // If we don't have enough available mem // then return NULL @@ -224,7 +224,7 @@ MmAllocatePagesInLookupTable(PageLookupTableAddress, FirstFreePageFromEnd, PagesNeeded, MemoryType); FreePagesInLookupTable -= PagesNeeded; - MemPointer = (PVOID)(FirstFreePageFromEnd * MM_PAGE_SIZE); + MemPointer = (PVOID)((ULONG_PTR)FirstFreePageFromEnd * MM_PAGE_SIZE); #ifdef DBG DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd)); Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/oslis… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/oslist.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/oslist.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -26,8 +26,8 @@ CHAR SettingName[260]; CHAR SettingValue[260]; ULONG OperatingSystemCount; - ULONG SectionId; - ULONG OperatingSystemSectionId; + ULONG_PTR SectionId; + ULONG_PTR OperatingSystemSectionId; ULONG SectionSettingCount; PCHAR *OperatingSystemSectionNames; PCHAR *OperatingSystemDisplayNames; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -231,8 +231,8 @@ USHORT Hint) { PIMAGE_EXPORT_DIRECTORY ExportDir; - PULONG * ExFunctions; - PULONG * ExNames; + ULONG * ExFunctions; + ULONG * ExNames; USHORT * ExOrdinals; PVOID ExName; ULONG Ordinal; @@ -267,10 +267,10 @@ /* * Get header pointers */ - ExNames = (PULONG *)RVA(BaseAddress, ExportDir->AddressOfNames); + ExNames = (ULONG *)RVA(BaseAddress, ExportDir->AddressOfNames); ExOrdinals = (USHORT *)RVA(BaseAddress, ExportDir->AddressOfNameOrdinals); - ExFunctions = (PULONG *)RVA(BaseAddress, ExportDir->AddressOfFunctions); - + ExFunctions = (ULONG *)RVA(BaseAddress, ExportDir->AddressOfFunctions); + /* * Check the hint first */ @@ -348,7 +348,7 @@ PIMAGE_IMPORT_DESCRIPTOR ImportModuleDirectory) { PVOID* ImportAddressList; - PULONG FunctionNameList; + PULONG_PTR FunctionNameList; if (ImportModuleDirectory == NULL || ImportModuleDirectory->Name == 0) { @@ -361,11 +361,11 @@ /* Get the list of functions to import. */ if (ImportModuleDirectory->OriginalFirstThunk != 0) { - FunctionNameList = (PULONG)RVA(DriverBase, ImportModuleDirectory->OriginalFirstThunk); + FunctionNameList = (PULONG_PTR)RVA(DriverBase, ImportModuleDirectory->OriginalFirstThunk); } else { - FunctionNameList = (PULONG)RVA(DriverBase, ImportModuleDirectory->FirstThunk); + FunctionNameList = (PULONG_PTR)RVA(DriverBase, ImportModuleDirectory->FirstThunk); } /* Walk through function list and fixup addresses. */ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -571,7 +571,7 @@ CHAR szKernelName[255]; CHAR szFileName[255]; CHAR MsgBuffer[256]; - ULONG SectionId; + ULONG_PTR SectionId; PIMAGE_NT_HEADERS NtHeader; PVOID LoadBase; ULONG_PTR Base; @@ -628,19 +628,19 @@ UiDrawProgressBarCenter(1, 100, szLoadingMsg); UiDrawStatusText("Detecting Hardware..."); LoaderBlock.CommandLine = reactos_kernel_cmdline; - LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; - LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; + LoaderBlock.PageDirectoryStart = (ULONG_PTR)&PageDirectoryStart; + LoaderBlock.PageDirectoryEnd = (ULONG_PTR)&PageDirectoryEnd; LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; LoaderBlock.DrivesAddr = reactos_arc_disk_info; - LoaderBlock.RdAddr = (ULONG)gRamDiskBase; + LoaderBlock.RdAddr = (ULONG_PTR)gRamDiskBase; LoaderBlock.RdLength = gRamDiskSize; - LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); + LoaderBlock.MmapLength = (SIZE_T)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) { ULONG i; LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO; - LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map; + LoaderBlock.MmapAddr = (ULONG_PTR)&reactos_memory_map; reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24 for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++) { @@ -730,7 +730,7 @@ /* * Detect hardware */ - LoaderBlock.ArchExtra = (ULONG)MachHwDetect(); + LoaderBlock.ArchExtra = (ULONG_PTR)MachHwDetect(); UiDrawProgressBarCenter(5, 100, szLoadingMsg); LoaderBlock.DrivesCount = reactos_disk_count; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -460,8 +460,8 @@ PLIST_ENTRY Ptr; PVALUE Value = NULL; - DbgPrint((DPRINT_REGISTRY, "Key 0x%x, ValueName '%S', Type %d, Data 0x%x, DataSize %d\n", - (int)Key, ValueName, (int)Type, (int)Data, (int)DataSize)); + DbgPrint((DPRINT_REGISTRY, "Key 0x%p, ValueName '%S', Type %ld, Data 0x%p, DataSize %ld\n", + Key, ValueName, Type, Data, DataSize)); if ((ValueName == NULL) || (*ValueName == 0)) { Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -68,20 +68,20 @@ /* Setup multiboot information structure */ LoaderBlock.CommandLine = reactos_kernel_cmdline; - LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; - LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; + LoaderBlock.PageDirectoryStart = (ULONG_PTR)&PageDirectoryStart; + LoaderBlock.PageDirectoryEnd = (ULONG_PTR)&PageDirectoryEnd; LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) { -#ifdef _M_IX86 +#if defined (_M_IX86) || defined (_M_AMD64) ULONG i; #endif LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO; - LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map; + LoaderBlock.MmapAddr = (ULONG_PTR)&reactos_memory_map; reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24 -#ifdef _M_IX86 +#if defined (_M_IX86) || defined (_M_AMD64) for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++) { if (BiosMemoryUsable == reactos_memory_map[i].type && @@ -113,7 +113,7 @@ /* Detect hardware */ UiDrawStatusText("Detecting hardware..."); - LoaderBlock.ArchExtra = (ULONG)MachHwDetect(); + LoaderBlock.ArchExtra = (ULONG_PTR)MachHwDetect(); UiDrawStatusText(""); /* set boot device */ Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] Mon Sep 8 06:13:51 2008 @@ -80,7 +80,7 @@ { VIDEODISPLAYMODE UiDisplayMode; // Tells us if we are in text or graphics mode BOOLEAN UiMinimal = FALSE; // Tells us if we should use a minimal console-like UI - ULONG SectionId; + ULONG_PTR SectionId; CHAR DisplayModeText[260]; CHAR SettingText[260]; ULONG Depth; @@ -408,7 +408,7 @@ CHAR SettingValue[80]; PCHAR MessageBoxText; ULONG MessageBoxTextSize; - ULONG SectionId; + ULONG_PTR SectionId; if (!IniOpenSection(SectionName, &SectionId)) {

16 years, 3 months

[cwittich] 36045: import timer queues from wine

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Sep 8 06:10:02 2008 New Revision: 36045 URL: http://svn.reactos.org/svn/reactos?rev=36045&view=rev Log: import timer queues from wine Modified: trunk/reactos/lib/rtl/timerqueue.c Modified: trunk/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timerqueue.c?rev=3… ============================================================================== --- trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] Mon Sep 8 06:10:02 2008 @@ -13,6 +13,10 @@ #define NDEBUG #include <debug.h> +#undef LIST_FOR_EACH +#undef LIST_FOR_EACH_SAFE +#include <wine/list.h> + /* FUNCTIONS ***************************************************************/ typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); @@ -25,87 +29,518 @@ return STATUS_NOT_IMPLEMENTED; } +static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, ULONG timeout ) +{ + if (timeout == INFINITE) return NULL; + pTime->QuadPart = (ULONGLONG)timeout * -10000; + return pTime; +} + +struct timer_queue; +struct queue_timer +{ + struct timer_queue *q; + struct list entry; + ULONG runcount; /* number of callbacks pending execution */ + WAITORTIMERCALLBACKFUNC callback; + PVOID param; + DWORD period; + ULONG flags; + ULONGLONG expire; + BOOL destroy; /* timer should be deleted; once set, never unset */ + HANDLE event; /* removal event */ +}; + +struct timer_queue +{ + RTL_CRITICAL_SECTION cs; + struct list timers; /* sorted by expiration time */ + BOOL quit; /* queue should be deleted; once set, never unset */ + HANDLE event; + HANDLE thread; +}; + +#define EXPIRE_NEVER (~(ULONGLONG) 0) + +static void queue_remove_timer(struct queue_timer *t) +{ + /* We MUST hold the queue cs while calling this function. This ensures + that we cannot queue another callback for this timer. The runcount + being zero makes sure we don't have any already queued. */ + struct timer_queue *q = t->q; + + assert(t->runcount == 0); + assert(t->destroy); + + list_remove(&t->entry); + if (t->event) + NtSetEvent(t->event, NULL); + RtlFreeHeap(RtlGetProcessHeap(), 0, t); + + if (q->quit && list_count(&q->timers) == 0) + NtSetEvent(q->event, NULL); +} + +static void timer_cleanup_callback(struct queue_timer *t) +{ + struct timer_queue *q = t->q; + RtlEnterCriticalSection(&q->cs); + + assert(0 < t->runcount); + --t->runcount; + + if (t->destroy && t->runcount == 0) + queue_remove_timer(t); + + RtlLeaveCriticalSection(&q->cs); +} + +static DWORD WINAPI timer_callback_wrapper(LPVOID p) +{ + struct queue_timer *t = p; + t->callback(t->param, TRUE); + timer_cleanup_callback(t); + return 0; +} + +static inline ULONGLONG queue_current_time(void) +{ + LARGE_INTEGER now; + NtQuerySystemTime(&now); + return now.QuadPart / 10000; +} + +static void queue_add_timer(struct queue_timer *t, ULONGLONG time, + BOOL set_event) +{ + /* We MUST hold the queue cs while calling this function. */ + struct timer_queue *q = t->q; + struct list *ptr = &q->timers; + + assert(!q->quit || (t->destroy && time == EXPIRE_NEVER)); + + if (time != EXPIRE_NEVER) + LIST_FOR_EACH(ptr, &q->timers) + { + struct queue_timer *cur = LIST_ENTRY(ptr, struct queue_timer, entry); + if (time < cur->expire) + break; + } + list_add_before(ptr, &t->entry); + + t->expire = time; + + /* If we insert at the head of the list, we need to expire sooner + than expected. */ + if (set_event && &t->entry == list_head(&q->timers)) + NtSetEvent(q->event, NULL); +} + +static inline void queue_move_timer(struct queue_timer *t, ULONGLONG time, + BOOL set_event) +{ + /* We MUST hold the queue cs while calling this function. */ + list_remove(&t->entry); + queue_add_timer(t, time, set_event); +} + +static void queue_timer_expire(struct timer_queue *q) +{ + struct queue_timer *t = NULL; + + RtlEnterCriticalSection(&q->cs); + if (list_head(&q->timers)) + { + t = LIST_ENTRY(list_head(&q->timers), struct queue_timer, entry); + if (!t->destroy && t->expire <= queue_current_time()) + { + ++t->runcount; + queue_move_timer( + t, t->period ? queue_current_time() + t->period : EXPIRE_NEVER, + FALSE); + } + else + t = NULL; + } + RtlLeaveCriticalSection(&q->cs); + + if (t) + { + if (t->flags & WT_EXECUTEINTIMERTHREAD) + timer_callback_wrapper(t); + else + { + ULONG flags + = (t->flags + & (WT_EXECUTEINIOTHREAD | WT_EXECUTEINPERSISTENTTHREAD + | WT_EXECUTELONGFUNCTION | WT_TRANSFER_IMPERSONATION)); + NTSTATUS status = RtlQueueWorkItem((WORKERCALLBACKFUNC)timer_callback_wrapper, t, flags); + if (status != STATUS_SUCCESS) + timer_cleanup_callback(t); + } + } +} + +static ULONG queue_get_timeout(struct timer_queue *q) +{ + struct queue_timer *t; + ULONG timeout = INFINITE; + + RtlEnterCriticalSection(&q->cs); + if (list_head(&q->timers)) + { + t = LIST_ENTRY(list_head(&q->timers), struct queue_timer, entry); + assert(!t->destroy || t->expire == EXPIRE_NEVER); + + if (t->expire != EXPIRE_NEVER) + { + ULONGLONG time = queue_current_time(); + timeout = t->expire < time ? 0 : t->expire - time; + } + } + RtlLeaveCriticalSection(&q->cs); + + return timeout; +} + +static void WINAPI timer_queue_thread_proc(LPVOID p) +{ + struct timer_queue *q = p; + ULONG timeout_ms; + + timeout_ms = INFINITE; + for (;;) + { + LARGE_INTEGER timeout; + NTSTATUS status; + BOOL done = FALSE; + + status = NtWaitForSingleObject( + q->event, FALSE, get_nt_timeout(&timeout, timeout_ms)); + + if (status == STATUS_WAIT_0) + { + /* There are two possible ways to trigger the event. Either + we are quitting and the last timer got removed, or a new + timer got put at the head of the list so we need to adjust + our timeout. */ + RtlEnterCriticalSection(&q->cs); + if (q->quit && list_count(&q->timers) == 0) + done = TRUE; + RtlLeaveCriticalSection(&q->cs); + } + else if (status == STATUS_TIMEOUT) + queue_timer_expire(q); + + if (done) + break; + + timeout_ms = queue_get_timeout(q); + } + + NtClose(q->event); + RtlDeleteCriticalSection(&q->cs); + RtlFreeHeap(RtlGetProcessHeap(), 0, q); +} + +static void queue_destroy_timer(struct queue_timer *t) +{ + /* We MUST hold the queue cs while calling this function. */ + t->destroy = TRUE; + if (t->runcount == 0) + /* Ensure a timer is promptly removed. If callbacks are pending, + it will be removed after the last one finishes by the callback + cleanup wrapper. */ + queue_remove_timer(t); + else + /* Make sure no destroyed timer masks an active timer at the head + of the sorted list. */ + queue_move_timer(t, EXPIRE_NEVER, FALSE); +} + +/*********************************************************************** + * RtlCreateTimerQueue (NTDLL.@) + * + * Creates a timer queue object and returns a handle to it. + * + * PARAMS + * NewTimerQueue [O] The newly created queue. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + */ +NTSTATUS WINAPI RtlCreateTimerQueue(PHANDLE NewTimerQueue) +{ + NTSTATUS status; + struct timer_queue *q = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof *q); + if (!q) + return STATUS_NO_MEMORY; + + RtlInitializeCriticalSection(&q->cs); + list_init(&q->timers); + q->quit = FALSE; + status = NtCreateEvent(&q->event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); + if (status != STATUS_SUCCESS) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, q); + return status; + } + status = RtlCreateUserThread(NtCurrentProcess(), NULL, FALSE, 0, 0, 0, + (PTHREAD_START_ROUTINE)timer_queue_thread_proc, q, &q->thread, NULL); + if (status != STATUS_SUCCESS) + { + NtClose(q->event); + RtlFreeHeap(RtlGetProcessHeap(), 0, q); + return status; + } + + *NewTimerQueue = q; + return STATUS_SUCCESS; +} + +/*********************************************************************** + * RtlDeleteTimerQueueEx (NTDLL.@) + * + * Deletes a timer queue object. + * + * PARAMS + * TimerQueue [I] The timer queue to destroy. + * CompletionEvent [I] If NULL, return immediately. If INVALID_HANDLE_VALUE, + * wait until all timers are finished firing before + * returning. Otherwise, return immediately and set the + * event when all timers are done. + * + * RETURNS + * Success: STATUS_SUCCESS if synchronous, STATUS_PENDING if not. + * Failure: Any NTSTATUS code. + */ +NTSTATUS WINAPI RtlDeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) +{ + struct timer_queue *q = TimerQueue; + struct queue_timer *t, *temp; + HANDLE thread; + NTSTATUS status; + + if (!q) + return STATUS_INVALID_HANDLE; + + thread = q->thread; + + RtlEnterCriticalSection(&q->cs); + q->quit = TRUE; + if (list_head(&q->timers)) + /* When the last timer is removed, it will signal the timer thread to + exit... */ + LIST_FOR_EACH_ENTRY_SAFE(t, temp, &q->timers, struct queue_timer, entry) + queue_destroy_timer(t); + else + /* However if we have none, we must do it ourselves. */ + NtSetEvent(q->event, NULL); + RtlLeaveCriticalSection(&q->cs); + + if (CompletionEvent == INVALID_HANDLE_VALUE) + { + NtWaitForSingleObject(thread, FALSE, NULL); + status = STATUS_SUCCESS; + } + else + { + if (CompletionEvent) + { + DPRINT1("asynchronous return on completion event unimplemented\n"); + NtWaitForSingleObject(thread, FALSE, NULL); + NtSetEvent(CompletionEvent, NULL); + } + status = STATUS_PENDING; + } + + NtClose(thread); + return status; +} + +static struct timer_queue *default_timer_queue; + +static struct timer_queue *get_timer_queue(HANDLE TimerQueue) +{ + if (TimerQueue) + return TimerQueue; + else + { + if (!default_timer_queue) + { + HANDLE q; + NTSTATUS status = RtlCreateTimerQueue(&q); + if (status == STATUS_SUCCESS) + { + PVOID p = _InterlockedCompareExchangePointer( + (void **) &default_timer_queue, q, NULL); + if (p) + /* Got beat to the punch. */ + RtlDeleteTimerQueueEx(p, NULL); + } + } + return default_timer_queue; + } +} + +/*********************************************************************** + * RtlCreateTimer (NTDLL.@) + * + * Creates a new timer associated with the given queue. + * + * PARAMS + * NewTimer [O] The newly created timer. + * TimerQueue [I] The queue to hold the timer. + * Callback [I] The callback to fire. + * Parameter [I] The argument for the callback. + * DueTime [I] The delay, in milliseconds, before first firing the + * timer. + * Period [I] The period, in milliseconds, at which to fire the timer + * after the first callback. If zero, the timer will only + * fire once. It still needs to be deleted with + * RtlDeleteTimer. + * Flags [I] Flags controling the execution of the callback. In + * addition to the WT_* thread pool flags (see + * RtlQueueWorkItem), WT_EXECUTEINTIMERTHREAD and + * WT_EXECUTEONLYONCE are supported. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + */ +NTSTATUS WINAPI RtlCreateTimer(HANDLE TimerQueue, PHANDLE NewTimer, + WAITORTIMERCALLBACKFUNC Callback, + PVOID Parameter, DWORD DueTime, DWORD Period, + ULONG Flags) +{ + NTSTATUS status; + struct queue_timer *t; + struct timer_queue *q = get_timer_queue(TimerQueue); + if (!q) + return STATUS_NO_MEMORY; + + t = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof *t); + if (!t) + return STATUS_NO_MEMORY; + + t->q = q; + t->runcount = 0; + t->callback = Callback; + t->param = Parameter; + t->period = Period; + t->flags = Flags; + t->destroy = FALSE; + t->event = NULL; + + status = STATUS_SUCCESS; + RtlEnterCriticalSection(&q->cs); + if (q->quit) + status = STATUS_INVALID_HANDLE; + else + queue_add_timer(t, queue_current_time() + DueTime, TRUE); + RtlLeaveCriticalSection(&q->cs); + + if (status == STATUS_SUCCESS) + *NewTimer = t; + else + RtlFreeHeap(RtlGetProcessHeap(), 0, t); + + return status; +} + +/*********************************************************************** + * RtlUpdateTimer (NTDLL.@) + * + * Changes the time at which a timer expires. + * + * PARAMS + * TimerQueue [I] The queue that holds the timer. + * Timer [I] The timer to update. + * DueTime [I] The delay, in milliseconds, before next firing the timer. + * Period [I] The period, in milliseconds, at which to fire the timer + * after the first callback. If zero, the timer will not + * refire once. It still needs to be deleted with + * RtlDeleteTimer. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + */ +NTSTATUS WINAPI RtlUpdateTimer(HANDLE TimerQueue, HANDLE Timer, + DWORD DueTime, DWORD Period) +{ + struct queue_timer *t = Timer; + struct timer_queue *q = t->q; + + RtlEnterCriticalSection(&q->cs); + /* Can't change a timer if it was once-only or destroyed. */ + if (t->expire != EXPIRE_NEVER) + { + t->period = Period; + queue_move_timer(t, queue_current_time() + DueTime, TRUE); + } + RtlLeaveCriticalSection(&q->cs); + + return STATUS_SUCCESS; +} + +/*********************************************************************** + * RtlDeleteTimer (NTDLL.@) + * + * Cancels a timer-queue timer. + * + * PARAMS + * TimerQueue [I] The queue that holds the timer. + * Timer [I] The timer to update. + * CompletionEvent [I] If NULL, return immediately. If INVALID_HANDLE_VALUE, + * wait until the timer is finished firing all pending + * callbacks before returning. Otherwise, return + * immediately and set the timer is done. + * + * RETURNS + * Success: STATUS_SUCCESS if the timer is done, STATUS_PENDING if not, + or if the completion event is NULL. + * Failure: Any NTSTATUS code. + */ +NTSTATUS WINAPI RtlDeleteTimer(HANDLE TimerQueue, HANDLE Timer, + HANDLE CompletionEvent) +{ + struct queue_timer *t = Timer; + struct timer_queue *q = t->q; + NTSTATUS status = STATUS_PENDING; + HANDLE event = NULL; + + if (CompletionEvent == INVALID_HANDLE_VALUE) + status = NtCreateEvent(&event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); + else if (CompletionEvent) + event = CompletionEvent; + + RtlEnterCriticalSection(&q->cs); + t->event = event; + if (t->runcount == 0 && event) + status = STATUS_SUCCESS; + queue_destroy_timer(t); + RtlLeaveCriticalSection(&q->cs); + + if (CompletionEvent == INVALID_HANDLE_VALUE && event) + { + if (status == STATUS_PENDING) + NtWaitForSingleObject(event, FALSE, NULL); + NtClose(event); + } + + return status; +} + /* - * @unimplemented - */ -NTSTATUS -NTAPI -RtlCreateTimer(HANDLE TimerQueue, - PHANDLE phNewTimer, - WAITORTIMERCALLBACKFUNC Callback, - PVOID Parameter, - ULONG DueTime, - ULONG Period, - ULONG Flags) -{ - DPRINT1("RtlCreateTimer: stub\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -RtlCreateTimerQueue(PHANDLE TimerQueue) -{ - DPRINT1("RtlCreateTimerQueue: stub\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -RtlDeleteTimer(HANDLE TimerQueue, - HANDLE Timer, - HANDLE CompletionEvent) -{ - DPRINT1("RtlDeleteTimer: stub\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented + * @implemented */ NTSTATUS NTAPI RtlDeleteTimerQueue(HANDLE TimerQueue) { - DPRINT1("RtlDeleteTimerQueue: stub\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -RtlDeleteTimerQueueEx(HANDLE TimerQueue, - HANDLE CompletionEvent) -{ - DPRINT1("RtlDeleteTimerQueueEx: stub\n"); - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -RtlUpdateTimer(HANDLE TimerQueue, - HANDLE Timer, - ULONG DueTime, - ULONG Period) -{ - DPRINT1("RtlUpdateTimer: stub\n"); - return STATUS_NOT_IMPLEMENTED; + return RtlDeleteTimerQueueEx(TimerQueue, INVALID_HANDLE_VALUE); } /* EOF */

16 years, 3 months

← Newer
1
...
52
53
54
55
56
57
58
...
75
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008