[NTOSKRNL]

- Initialize an uninitialized variable
- MI_GET_NEXT_COLOR() doesn't have an argument
- Fix a warning on MSVC

svn path=/trunk/; revision=52535
This commit is contained in:
Timo Kreuzer 2011-07-04 16:26:52 +00:00
parent fd6bb26299
commit f3a297daba
3 changed files with 5 additions and 5 deletions

View file

@ -244,7 +244,7 @@ extern const ULONG MmProtectToValue[32];
// Returns the color of a page // Returns the color of a page
// //
#define MI_GET_PAGE_COLOR(x) ((x) & MmSecondaryColorMask) #define MI_GET_PAGE_COLOR(x) ((x) & MmSecondaryColorMask)
#define MI_GET_NEXT_COLOR(x) (MI_GET_PAGE_COLOR(++MmSystemPageColor)) #define MI_GET_NEXT_COLOR() (MI_GET_PAGE_COLOR(++MmSystemPageColor))
#define MI_GET_NEXT_PROCESS_COLOR(x) (MI_GET_PAGE_COLOR(++(x)->NextPageColor)) #define MI_GET_NEXT_PROCESS_COLOR(x) (MI_GET_PAGE_COLOR(++(x)->NextPageColor))
#ifndef _M_AMD64 #ifndef _M_AMD64

View file

@ -20,7 +20,7 @@
* *
* The other difference is that the AVL package for Rtl has custom callbacks for * The other difference is that the AVL package for Rtl has custom callbacks for
* comparison purposes (which would access some internal, opaque, user data) while * comparison purposes (which would access some internal, opaque, user data) while
* the Mm package stores the user-data inline as StartingVpn and EndingVpn. So * the Mm package stores the user-data inline as StartingVpn and EndingVpn. So
* when a compare is being made, RtlpAvlCompareRoutine is called, which will either * when a compare is being made, RtlpAvlCompareRoutine is called, which will either
* perform the Mm work, or call the user-specified callback in the Rtl case. * perform the Mm work, or call the user-specified callback in the Rtl case.
*/ */
@ -54,7 +54,7 @@ RtlpAvlCompareRoutine(IN PRTL_AVL_TABLE Table,
{ {
return GenericEqual; return GenericEqual;
} }
else else
{ {
return GenericGreaterThan; return GenericGreaterThan;
} }
@ -80,7 +80,7 @@ SCHAR
FORCEINLINE FORCEINLINE
RtlBalance(IN PRTL_BALANCED_LINKS Node) RtlBalance(IN PRTL_BALANCED_LINKS Node)
{ {
return Node->u1.Balance; return (SCHAR)Node->u1.Balance;
} }
PRTL_BALANCED_LINKS PRTL_BALANCED_LINKS

View file

@ -2086,7 +2086,7 @@ MiWriteProtectSystemImage(IN PVOID ImageBase)
PIMAGE_NT_HEADERS NtHeaders; PIMAGE_NT_HEADERS NtHeaders;
PIMAGE_SECTION_HEADER Section; PIMAGE_SECTION_HEADER Section;
PFN_NUMBER DriverPages; PFN_NUMBER DriverPages;
ULONG CurrentProtection, SectionProtection, CombinedProtection, ProtectionMask; ULONG CurrentProtection, SectionProtection, CombinedProtection = 0, ProtectionMask;
ULONG Sections, Size; ULONG Sections, Size;
ULONG_PTR BaseAddress, CurrentAddress; ULONG_PTR BaseAddress, CurrentAddress;
PMMPTE PointerPte, StartPte, LastPte, CurrentPte, ComboPte = NULL; PMMPTE PointerPte, StartPte, LastPte, CurrentPte, ComboPte = NULL;