From 806deab0b75e1050bc0e47479bec22d7e5c2da43 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 7 Oct 2009 18:10:33 +0200 Subject: [PATCH] kernel32: Fix a couple of compiler warnings on 64-bit. --- dlls/kernel32/module.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index dee372500d6..fc75475af51 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -315,14 +315,11 @@ DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ) if (ext_header.nt.FileHeader.Characteristics & IMAGE_FILE_DLL) ret |= BINARY_FLAG_DLL; if (len < sizeof(ext_header.nt)) /* clear remaining part of header if missing */ memset( (char *)&ext_header.nt + len, 0, sizeof(ext_header.nt) - len ); - if (res_start) *res_start = (void *)ext_header.nt.OptionalHeader.ImageBase; - if (res_end) *res_end = (void *)(ext_header.nt.OptionalHeader.ImageBase + - ext_header.nt.OptionalHeader.SizeOfImage); switch (ext_header.nt.OptionalHeader.Magic) { case IMAGE_NT_OPTIONAL_HDR32_MAGIC: - if (res_start) *res_start = (void *)ext_header.nt.OptionalHeader.ImageBase; - if (res_end) *res_end = (void *)(ext_header.nt.OptionalHeader.ImageBase + + if (res_start) *res_start = (void *)(ULONG_PTR)ext_header.nt.OptionalHeader.ImageBase; + if (res_end) *res_end = (void *)((ULONG_PTR)ext_header.nt.OptionalHeader.ImageBase + ext_header.nt.OptionalHeader.SizeOfImage); return ret; case IMAGE_NT_OPTIONAL_HDR64_MAGIC: -- 2.11.4.GIT