Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix compilation errors with GCC 4.0-20041205.

Browse source 
svn path=/trunk/; revision=12065
This commit is contained in:
Filip Navara 2004-12-12 23:08:13 +00:00
parent 02f77a0c2a
commit eeeb963b9d
9 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsys/win32k/eng/bitblt.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: bitblt.c,v 1.60 2004/12/12 21:38:25 royce Exp $ /* $Id: bitblt.c,v 1.61 2004/12/12 23:08:09 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -89,7 +89,7 @@ BltMask(SURFOBJ* Dest,
static BYTE maskbit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; static BYTE maskbit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
/* Pattern brushes */ /* Pattern brushes */
PGDIBRUSHINST GdiBrush = NULL; PGDIBRUSHINST GdiBrush = NULL;
HBITMAP PatternSurface; HBITMAP PatternSurface = NULL;
SURFOBJ *PatternObj = NULL; SURFOBJ *PatternObj = NULL;
PBITMAPOBJ PatternBitmap; PBITMAPOBJ PatternBitmap;
ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0; ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0;

6
reactos/subsys/win32k/eng/xlate.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: xlate.c,v 1.43 2004/12/12 01:40:36 weiden Exp $ /* $Id: xlate.c,v 1.44 2004/12/12 23:08:09 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -151,8 +151,8 @@ IntEngCreateXlate(USHORT DestPalType, USHORT SourcePalType,
XLATEGDI *XlateGDI; XLATEGDI *XlateGDI;
PALGDI *SourcePalGDI = 0; PALGDI *SourcePalGDI = 0;
PALGDI *DestPalGDI = 0; PALGDI *DestPalGDI = 0;
ULONG SourceRedMask, SourceGreenMask, SourceBlueMask; ULONG SourceRedMask = 0, SourceGreenMask = 0, SourceBlueMask = 0;
ULONG DestRedMask, DestGreenMask, DestBlueMask; ULONG DestRedMask = 0, DestGreenMask = 0, DestBlueMask = 0;
ULONG i; ULONG i;
XlateGDI = EngAllocMem(0, sizeof(XLATEGDI), TAG_XLATEOBJ); XlateGDI = EngAllocMem(0, sizeof(XLATEGDI), TAG_XLATEOBJ);

4
reactos/subsys/win32k/include/msgqueue.h
View file

@ -194,8 +194,8 @@ MsqSetStateWindow(PUSER_MESSAGE_QUEUE MessageQueue, ULONG Type, HWND hWnd);
inline BOOL MsqIsSignaled( PUSER_MESSAGE_QUEUE queue ); inline BOOL MsqIsSignaled( PUSER_MESSAGE_QUEUE queue );
inline VOID MsqSetQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits ); inline VOID MsqSetQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits );
inline VOID MsqClearQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits ); inline VOID MsqClearQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits );
BOOL IntInitMessagePumpHook(); BOOL STDCALL IntInitMessagePumpHook();
BOOL IntUninitMessagePumpHook(); BOOL STDCALL IntUninitMessagePumpHook();
#define MAKE_LONG(x, y) ((((y) & 0xFFFF) << 16) | ((x) & 0xFFFF)) #define MAKE_LONG(x, y) ((((y) & 0xFFFF) << 16) | ((x) & 0xFFFF))
PHOOKTABLE FASTCALL MsqGetHooks(PUSER_MESSAGE_QUEUE Queue); PHOOKTABLE FASTCALL MsqGetHooks(PUSER_MESSAGE_QUEUE Queue);

2
reactos/subsys/win32k/include/window.h
View file

@ -212,7 +212,7 @@ BOOL FASTCALL
IntGetWindowInfo(PWINDOW_OBJECT WindowObject, PWINDOWINFO pwi); IntGetWindowInfo(PWINDOW_OBJECT WindowObject, PWINDOWINFO pwi);
VOID FASTCALL VOID FASTCALL
IntGetWindowBorderMeasures(PWINDOW_OBJECT WindowObject, INT *cx, INT *cy); IntGetWindowBorderMeasures(PWINDOW_OBJECT WindowObject, UINT *cx, UINT *cy);
BOOL FASTCALL BOOL FASTCALL
IntAnyPopup(VOID); IntAnyPopup(VOID);

4
reactos/subsys/win32k/ntuser/misc.c
View file

@ -1,4 +1,4 @@
/* $Id: misc.c,v 1.91 2004/12/12 01:40:37 weiden Exp $ /* $Id: misc.c,v 1.92 2004/12/12 23:08:11 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -563,7 +563,7 @@ NtUserCallTwoParam(
case TWOPARAM_ROUTINE_GETSYSCOLORPENS: case TWOPARAM_ROUTINE_GETSYSCOLORPENS:
case TWOPARAM_ROUTINE_GETSYSCOLORS: case TWOPARAM_ROUTINE_GETSYSCOLORS:
{ {
DWORD Ret; DWORD Ret = 0;
union union
{ {
PVOID Pointer; PVOID Pointer;

6
reactos/subsys/win32k/ntuser/window.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: window.c,v 1.254 2004/12/12 16:47:52 navaraf Exp $ /* $Id: window.c,v 1.255 2004/12/12 23:08:11 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -402,7 +402,7 @@ static LRESULT IntDestroyWindow(PWINDOW_OBJECT Window,
} }
VOID FASTCALL VOID FASTCALL
IntGetWindowBorderMeasures(PWINDOW_OBJECT WindowObject, INT *cx, INT *cy) IntGetWindowBorderMeasures(PWINDOW_OBJECT WindowObject, UINT *cx, UINT *cy)
{ {
if(HAS_DLGFRAME(WindowObject->Style, WindowObject->ExStyle) && !(WindowObject->Style & WS_MINIMIZE)) if(HAS_DLGFRAME(WindowObject->Style, WindowObject->ExStyle) && !(WindowObject->Style & WS_MINIMIZE))
{ {
@ -1327,7 +1327,7 @@ BOOL FASTCALL
IntCalcDefPosSize(PWINDOW_OBJECT Parent, PWINDOW_OBJECT WindowObject, RECT *rc, BOOL IncPos) IntCalcDefPosSize(PWINDOW_OBJECT Parent, PWINDOW_OBJECT WindowObject, RECT *rc, BOOL IncPos)
{ {
SIZE Sz; SIZE Sz;
POINT Pos; POINT Pos = {0, 0};
if(Parent != NULL) if(Parent != NULL)
{ {

6
reactos/subsys/win32k/ntuser/winpos.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: winpos.c,v 1.126 2004/12/12 01:40:38 weiden Exp $ /* $Id: winpos.c,v 1.127 2004/12/12 23:08:12 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -175,7 +175,7 @@ PINTERNALPOS FASTCALL
WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, POINT *pt, PRECT RestoreRect) WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, POINT *pt, PRECT RestoreRect)
{ {
PWINDOW_OBJECT Parent; PWINDOW_OBJECT Parent;
INT XInc, YInc; UINT XInc, YInc;
if (WindowObject->InternalPos == NULL) if (WindowObject->InternalPos == NULL)
{ {
@ -331,7 +331,7 @@ WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos)
VOID FASTCALL VOID FASTCALL
WinPosFillMinMaxInfoStruct(PWINDOW_OBJECT Window, MINMAXINFO *Info) WinPosFillMinMaxInfoStruct(PWINDOW_OBJECT Window, MINMAXINFO *Info)
{ {
INT XInc, YInc; UINT XInc, YInc;
RECT WorkArea; RECT WorkArea;
PDESKTOP_OBJECT Desktop = PsGetWin32Thread()->Desktop; /* Or rather get it from the window? */ PDESKTOP_OBJECT Desktop = PsGetWin32Thread()->Desktop; /* Or rather get it from the window? */

4
reactos/subsys/win32k/objects/bitmaps.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: bitmaps.c,v 1.83 2004/12/12 20:58:09 royce Exp $ */ /* $Id: bitmaps.c,v 1.84 2004/12/12 23:08:12 navaraf Exp $ */
#include <w32k.h> #include <w32k.h>
#define IN_RECT(r,x,y) \ #define IN_RECT(r,x,y) \
@ -156,7 +156,7 @@ NtGdiBitBlt(
SourcePalette = DCSrc->w.hPalette; SourcePalette = DCSrc->w.hPalette;
/* KB41464 details how to convert between mono and color */ /* KB41464 details how to convert between mono and color */
if (DCDest->w.bitsPerPixel == DCSrc->w.bitsPerPixel == 1) if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1)
{ {
XlateObj = NULL; XlateObj = NULL;
} }

4
reactos/subsys/win32k/objects/text.c
View file

@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: text.c,v 1.114 2004/12/12 21:58:42 royce Exp $ */ /* $Id: text.c,v 1.115 2004/12/12 23:08:13 navaraf Exp $ */
#include <w32k.h> #include <w32k.h>
#include <ft2build.h> #include <ft2build.h>
@ -1497,7 +1497,7 @@ NtGdiExtTextOut(
INT yoff; INT yoff;
FONTOBJ *FontObj; FONTOBJ *FontObj;
PFONTGDI FontGDI; PFONTGDI FontGDI;
PTEXTOBJ TextObj; PTEXTOBJ TextObj = NULL;
PPALGDI PalDestGDI; PPALGDI PalDestGDI;
XLATEOBJ *XlateObj, *XlateObj2; XLATEOBJ *XlateObj, *XlateObj2;
ULONG Mode; ULONG Mode;