Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 08:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RTL]

Browse source 
Fix warnings and a bug in 64bit bitmap code

svn path=/trunk/; revision=63437
This commit is contained in:
Timo Kreuzer 2014-05-25 10:36:47 +00:00
parent ce1a5160ec
commit 84baf8d20a
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/lib/rtl/bitmap.c
View file

@ -30,6 +30,9 @@ typedef ULONG64 BITMAP_BUFFER, *PBITMAP_BUFFER;
#undef BitScanForward #undef BitScanForward
#define BitScanForward(Index, Mask) \ #define BitScanForward(Index, Mask) \
do { unsigned long tmp; BitScanForward64(&tmp, Mask); *Index = tmp; } while (0) do { unsigned long tmp; BitScanForward64(&tmp, Mask); *Index = tmp; } while (0)
#undef BitScanReverse
#define BitScanReverse(Index, Mask) \
do { unsigned long tmp; BitScanReverse64(&tmp, Mask); *Index = tmp; } while (0)
#define RtlFillMemoryUlong RtlFillMemoryUlonglong #define RtlFillMemoryUlong RtlFillMemoryUlonglong
#define RtlInitializeBitMap RtlInitializeBitMap64 #define RtlInitializeBitMap RtlInitializeBitMap64
@ -734,7 +737,7 @@ RtlFindFirstRunClear(
return RtlFindNextForwardRunClear(BitMapHeader, 0, StartingIndex); return RtlFindNextForwardRunClear(BitMapHeader, 0, StartingIndex);
} }
ULONG BITMAP_INDEX
NTAPI NTAPI
RtlFindLastBackwardRunClear( RtlFindLastBackwardRunClear(
_In_ PRTL_BITMAP BitMapHeader, _In_ PRTL_BITMAP BitMapHeader,
@ -771,7 +774,7 @@ RtlFindLastBackwardRunClear(
BitScanReverse(&BitPos, InvValue); BitScanReverse(&BitPos, InvValue);
/* Calculate last bit position */ /* Calculate last bit position */
FromIndex = (Buffer + 1 - BitMapHeader->Buffer) * _BITCOUNT + BitPos; FromIndex = (BITMAP_INDEX)((Buffer + 1 - BitMapHeader->Buffer) * _BITCOUNT + BitPos);
Value = ~InvValue << ((_BITCOUNT - 1) - BitPos) >> ((_BITCOUNT - 1) - BitPos); Value = ~InvValue << ((_BITCOUNT - 1) - BitPos) >> ((_BITCOUNT - 1) - BitPos);
@ -787,7 +790,7 @@ RtlFindLastBackwardRunClear(
BitScanReverse(&BitPos, Value); BitScanReverse(&BitPos, Value);
/* Calculate Starting Index */ /* Calculate Starting Index */
*StartingRunIndex = (Buffer + 1 - BitMapHeader->Buffer) * _BITCOUNT + BitPos + 1; *StartingRunIndex = (BITMAP_INDEX)((Buffer + 1 - BitMapHeader->Buffer) * _BITCOUNT + BitPos + 1);
} }
else else
{ {
@ -796,7 +799,7 @@ RtlFindLastBackwardRunClear(
} }
/* Return length of the run */ /* Return length of the run */
return FromIndex - *StartingRunIndex; return (FromIndex - *StartingRunIndex);
} }