Alexandre Julliard : kernel32: Fix a couple of compiler warnings on 64-bit.
Alexandre Julliard
julliard at winehq.org
Thu Oct 8 08:57:11 CDT 2009
Module: wine
Branch: master
Commit: 806deab0b75e1050bc0e47479bec22d7e5c2da43
URL: http://source.winehq.org/git/wine.git/?a=commit;h=806deab0b75e1050bc0e47479bec22d7e5c2da43
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Oct 7 18:10:33 2009 +0200
kernel32: Fix a couple of compiler warnings on 64-bit.
---
dlls/kernel32/module.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c
index dee3725..fc75475 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:
More information about the wine-cvs
mailing list