ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 19:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warnings.

Browse Source 
svn path=/trunk/; revision=10612
This commit is contained in:
Filip Navara
2004-08-20 00:57:55 +00:00
parent ed43fa6083
commit 57bca780f3
6 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/drivers/bus/acpi/include/acmacros.h
+7 -1
View File
@@ -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))
reactos/drivers/bus/acpi/include/actypes.h
+9 -1
View File
@@ -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
reactos/lib/imagehlp/access.c
-2
View File
@@ -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];
reactos/lib/imagehlp/modify.c
+3 -3
View File
@@ -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,
reactos/lib/msvcrt/stdio/getc.c
+3 -2
View File
@@ -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
reactos/lib/msvcrt/stdio/putc.c
+2 -2
View File
@@ -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