From 57bca780f3853241cebc625f9d5ad26cd7a4b790 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Fri, 20 Aug 2004 00:57:55 +0000 Subject: [PATCH] Fix compiler warnings. svn path=/trunk/; revision=10612 --- reactos/drivers/bus/acpi/include/acmacros.h | 8 +++++++- reactos/drivers/bus/acpi/include/actypes.h | 10 +++++++++- reactos/lib/imagehlp/access.c | 2 -- reactos/lib/imagehlp/modify.c | 6 +++--- reactos/lib/msvcrt/stdio/getc.c | 5 +++-- reactos/lib/msvcrt/stdio/putc.c | 4 ++-- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/reactos/drivers/bus/acpi/include/acmacros.h b/reactos/drivers/bus/acpi/include/acmacros.h index 6c557cb50c7..6a386b67846 100644 --- a/reactos/drivers/bus/acpi/include/acmacros.h +++ b/reactos/drivers/bus/acpi/include/acmacros.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acmacros.h - C macros for the entire subsystem. - * $Revision: 1.3 $ + * $Revision: 1.4 $ * *****************************************************************************/ @@ -186,9 +186,15 @@ /* Macros for GAS addressing */ +#ifdef __GNUC__ +#define ACPI_PCI_DEVICE_MASK (UINT64) 0x0000FFFF00000000ULL +#define ACPI_PCI_FUNCTION_MASK (UINT64) 0x00000000FFFF0000ULL +#define ACPI_PCI_REGISTER_MASK (UINT64) 0x000000000000FFFFULL +#else #define ACPI_PCI_DEVICE_MASK (UINT64) 0x0000FFFF00000000 #define ACPI_PCI_FUNCTION_MASK (UINT64) 0x00000000FFFF0000 #define ACPI_PCI_REGISTER_MASK (UINT64) 0x000000000000FFFF +#endif #define ACPI_PCI_FUNCTION(a) (u32) ((((a) & ACPI_PCI_FUNCTION_MASK) >> 16)) #define ACPI_PCI_DEVICE(a) (u32) ((((a) & ACPI_PCI_DEVICE_MASK) >> 32)) diff --git a/reactos/drivers/bus/acpi/include/actypes.h b/reactos/drivers/bus/acpi/include/actypes.h index 6f3bc212dbd..b0a488d7412 100644 --- a/reactos/drivers/bus/acpi/include/actypes.h +++ b/reactos/drivers/bus/acpi/include/actypes.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: actypes.h - Common data types for the entire ACPI subsystem - * $Revision: 1.4 $ + * $Revision: 1.5 $ * *****************************************************************************/ @@ -150,7 +150,11 @@ typedef char NATIVE_CHAR; #define ACPI_UINT8_MAX (UINT8) 0xFF #define ACPI_UINT16_MAX (UINT16) 0xFFFF #define ACPI_UINT32_MAX (UINT32) 0xFFFFFFFF +#ifdef __GNUC__ +#define ACPI_UINT64_MAX (UINT64) 0xFFFFFFFFFFFFFFFFULL +#else #define ACPI_UINT64_MAX (UINT64) 0xFFFFFFFFFFFFFFFF +#endif #ifdef DEFINE_ALTERNATE_TYPES @@ -219,7 +223,11 @@ typedef u32 ACPI_INTEGER; typedef UINT64 ACPI_INTEGER; #define ACPI_INTEGER_MAX ACPI_UINT64_MAX #define ACPI_INTEGER_BIT_SIZE 64 +#ifdef __GNUC__ +#define ACPI_MAX_BCD_VALUE 9999999999999999ULL +#else #define ACPI_MAX_BCD_VALUE 9999999999999999 +#endif #define ACPI_MAX_BCD_DIGITS 16 #endif diff --git a/reactos/lib/imagehlp/access.c b/reactos/lib/imagehlp/access.c index 181f59f41c9..764ff029ac7 100644 --- a/reactos/lib/imagehlp/access.c +++ b/reactos/lib/imagehlp/access.c @@ -445,9 +445,7 @@ BOOL WINAPI MapAndLoad( BOOL DotDll, BOOL ReadOnly) { - HANDLE hFile = NULL; HANDLE hFileMapping = NULL; - HMODULE hModule = NULL; PIMAGE_NT_HEADERS NtHeader = NULL; ULONG Tried = 0; UCHAR Buffer[MAX_PATH]; diff --git a/reactos/lib/imagehlp/modify.c b/reactos/lib/imagehlp/modify.c index 4a3e2bd1ec5..3608ff5d28b 100644 --- a/reactos/lib/imagehlp/modify.c +++ b/reactos/lib/imagehlp/modify.c @@ -586,7 +586,7 @@ BindpBindThunk( if (!OrdinalNumber) return FALSE; /* Write the Pointer */ - (ULONG)BoundThunk->u1.Function = AddressOfPointers[OrdinalNumber] + LibraryOptionalHeader32->ImageBase; + BoundThunk->u1.Function = (PDWORD)(AddressOfPointers[OrdinalNumber] + LibraryOptionalHeader32->ImageBase); /* Load DLL's Exports */ ExportsBase = (ULONG)ImageDirectoryEntryToData (LoadedLibrary->MappedAddress, @@ -598,12 +598,12 @@ BindpBindThunk( ExportsBase += LibraryOptionalHeader32->ImageBase; /* Check if the Export is forwarded (meaning that it's pointer is inside the Export Table) */ - if ((ULONG)BoundThunk->u1.Function > ExportsBase && (ULONG)BoundThunk->u1.Function < (ExportsBase + ExportSize)) { + if (BoundThunk->u1.Function > (PDWORD)ExportsBase && BoundThunk->u1.Function < (PDWORD)(ExportsBase + ExportSize)) { //FIXME("This Thunk is a forward...calling forward thunk bounder\n"); /* Replace the Forwarder String by the actual Pointer */ - (ULONG)BoundThunk->u1.Function = BindpAddBoundForwarder (BoundImportDescriptor, + BoundThunk->u1.Function = (PDWORD)BindpAddBoundForwarder (BoundImportDescriptor, DllPath, ImageRvaToVa (LoadedLibrary->FileHeader, LoadedLibrary->MappedAddress, diff --git a/reactos/lib/msvcrt/stdio/getc.c b/reactos/lib/msvcrt/stdio/getc.c index 6f682f4bd11..6fc209da889 100644 --- a/reactos/lib/msvcrt/stdio/getc.c +++ b/reactos/lib/msvcrt/stdio/getc.c @@ -1,4 +1,4 @@ -/* $Id: getc.c,v 1.10 2004/08/15 18:16:38 chorns Exp $ +/* $Id: getc.c,v 1.11 2004/08/20 00:57:44 navaraf Exp $ * * ReactOS msvcrt library * @@ -80,7 +80,8 @@ wint_t getwc(FILE *fp) if (fp->_flag & _IOBINARY) { if (fp->_cnt > 1) { fp->_cnt -= sizeof(wchar_t); - c = (wint_t)*((wchar_t*)(fp->_ptr))++; + c = *((wchar_t*)fp->_ptr); + fp->_ptr += sizeof(wchar_t); } else { c = _filwbuf(fp); // need to fix by one values of fp->_ptr and fp->_cnt diff --git a/reactos/lib/msvcrt/stdio/putc.c b/reactos/lib/msvcrt/stdio/putc.c index 6f8625d8e14..dd68427c29b 100644 --- a/reactos/lib/msvcrt/stdio/putc.c +++ b/reactos/lib/msvcrt/stdio/putc.c @@ -1,4 +1,4 @@ -/* $Id: putc.c,v 1.10 2004/08/15 18:16:38 chorns Exp $ +/* $Id: putc.c,v 1.11 2004/08/20 00:57:44 navaraf Exp $ * * ReactOS msvcrt library * @@ -86,7 +86,7 @@ int putwc(wint_t c, FILE* fp) fp->_cnt -= sizeof(wchar_t); //*((wchar_t*)(fp->_ptr))++ = c; *((wchar_t*)(fp->_ptr)) = c; - ++((wchar_t*)(fp->_ptr)); + fp->_ptr += sizeof(wchar_t); return (wint_t)c; } else { #if 1