From 125060988e0745d5ef7394b9e30459bf76fcb4e6 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 21 Jan 2016 16:52:31 +0000 Subject: [PATCH] [RTL] Revert some accidental formatting changes in r70634. NFC. svn path=/trunk/; revision=70635 --- reactos/lib/rtl/image.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/reactos/lib/rtl/image.c b/reactos/lib/rtl/image.c index f5522735b09..c7815b00e47 100644 --- a/reactos/lib/rtl/image.c +++ b/reactos/lib/rtl/image.c @@ -346,24 +346,24 @@ RtlImageRvaToVa( { PIMAGE_SECTION_HEADER Section = NULL; -if (SectionHeader) -Section = *SectionHeader; - -if ((Section == NULL) || - (Rva < SWAPD(Section->VirtualAddress)) || - (Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->SizeOfRawData))) -{ - Section = RtlImageRvaToSection(NtHeader, BaseAddress, Rva); - if (Section == NULL) - return NULL; - if (SectionHeader) - *SectionHeader = Section; -} + Section = *SectionHeader; -return (PVOID)((ULONG_PTR)BaseAddress + Rva + - (ULONG_PTR)SWAPD(Section->PointerToRawData) - - (ULONG_PTR)SWAPD(Section->VirtualAddress)); + if ((Section == NULL) || + (Rva < SWAPD(Section->VirtualAddress)) || + (Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->SizeOfRawData))) + { + Section = RtlImageRvaToSection(NtHeader, BaseAddress, Rva); + if (Section == NULL) + return NULL; + + if (SectionHeader) + *SectionHeader = Section; + } + + return (PVOID)((ULONG_PTR)BaseAddress + Rva + + (ULONG_PTR)SWAPD(Section->PointerToRawData) - + (ULONG_PTR)SWAPD(Section->VirtualAddress)); } PIMAGE_BASE_RELOCATION @@ -426,7 +426,7 @@ LdrProcessRelocationBlockLongLong( default: DPRINT1("Unknown/unsupported fixup type %hu.\n", Type); DPRINT1("Address %p, Current %u, Count %u, *TypeOffset %x\n", - (PVOID)Address, i, Count, SWAPW(*TypeOffset)); + (PVOID)Address, i, Count, SWAPW(*TypeOffset)); return (PIMAGE_BASE_RELOCATION)NULL; }