some gcc 3.4.5 fixed; but not all we need

svn path=/trunk/; revision=26247
This commit is contained in:
Magnus Olsen 2007-04-02 10:32:21 +00:00
parent ceac8e2667
commit 3fd4c41408
13 changed files with 71 additions and 71 deletions

View file

@ -40,11 +40,11 @@ DWORD STDCALL NtGdiDdCreateSurface(
HANDLE *puhSurface
)
{
INT i;
INT i = 0;
DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED;
NTSTATUS Status = FALSE;
PDD_DIRECTDRAW pDirectDraw;
PDD_SURFACE phsurface;
PDD_DIRECTDRAW pDirectDraw = NULL;
PDD_SURFACE phsurface = NULL;
PDD_SURFACE_LOCAL pLocal;
PDD_SURFACE_MORE pMore;
@ -53,7 +53,7 @@ DWORD STDCALL NtGdiDdCreateSurface(
DD_CREATESURFACEDATA CreateSurfaceData;
/* FIXME alloc so mayne we need */
PHANDLE *myhSurface;
PHANDLE *myhSurface = NULL;
/* GCC4 warnns on value are unisitaed,
but they are initated in seh
@ -508,7 +508,7 @@ NtGdiDdGetScanLine( HANDLE hDirectDrawLocal, PDD_GETSCANLINEDATA puGetScanLineDa
{
DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED;
DD_GETSCANLINEDATA GetScanLineData;
PDD_DIRECTDRAW pDirectDraw;
PDD_DIRECTDRAW pDirectDraw = NULL;
NTSTATUS Status = FALSE;
DPRINT1("NtGdiDdGetScanLine\n");

View file

@ -292,7 +292,7 @@ NtGdiDdQueryDirectDrawObject(
DWORD *puFourCC
)
{
PDD_DIRECTDRAW pDirectDraw;
PDD_DIRECTDRAW pDirectDraw = NULL;
NTSTATUS Status = FALSE;
BOOL Ret=FALSE;
@ -549,7 +549,7 @@ BOOL STDCALL NtGdiDdReenableDirectDrawObject(
{
BOOL Ret=FALSE;
NTSTATUS Status = FALSE;
PDD_DIRECTDRAW pDirectDraw;
PDD_DIRECTDRAW pDirectDraw = NULL;
if (hDirectDrawLocal == NULL)
{

View file

@ -1137,7 +1137,7 @@ UserRegisterClass(IN CONST WNDCLASSEXW* lpwcx,
IN DWORD dwFlags)
{
PW32THREADINFO ti;
PW32PROCESSINFO pi;
PW32PROCESSINFO pi = NULL;
PWINDOWCLASS Class;
RTL_ATOM ClassAtom;
RTL_ATOM Ret = (RTL_ATOM)0;
@ -1484,7 +1484,7 @@ IntSetClassMenuName(IN PWINDOWCLASS Class,
if (MenuName->Length != 0)
{
ANSI_STRING AnsiString;
PWSTR strBufW;
PWSTR strBufW = NULL;
AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(MenuName);

View file

@ -628,7 +628,7 @@ NtGdiCreateDIBBrush(
IN BOOL bPen,
IN PVOID PackedDIB)
{
BITMAPINFO *SafeBitmapInfoAndData;
BITMAPINFO *SafeBitmapInfoAndData = NULL;
NTSTATUS Status = STATUS_SUCCESS;
HBRUSH hBrush;

View file

@ -203,7 +203,7 @@ IntGdiGetClipBox(HDC hDC, LPRECT rc)
int STDCALL NtGdiGetClipBox(HDC hDC,
LPRECT rc)
{
int Ret;
int Ret = FALSE;
NTSTATUS Status = STATUS_SUCCESS;
RECT Saferect;

View file

@ -82,7 +82,7 @@ BOOL STDCALL NtGdiCombineTransform(LPXFORM UnsafeXFormResult,
XFORM xformTemp;
XFORM xform1 = {0}, xform2 = {0};
NTSTATUS Status = STATUS_SUCCESS;
BOOL Ret;
BOOL Ret = FALSE;
_SEH_TRY
{
@ -170,10 +170,10 @@ NtGdiDPtoLP(HDC hDC,
LPPOINT UnsafePoints,
int Count)
{
PDC dc;
PDC dc = NULL;
NTSTATUS Status = STATUS_SUCCESS;
LPPOINT Points;
ULONG Size;
LPPOINT Points = NULL;
ULONG Size = 0;
dc = DC_LockDc(hDC);
if (!dc)
@ -320,7 +320,7 @@ STDCALL
NtGdiGetWorldTransform(HDC hDC,
LPXFORM XForm)
{
PDC dc;
PDC dc = NULL;
NTSTATUS Status = STATUS_SUCCESS;
dc = DC_LockDc ( hDC );
@ -393,10 +393,10 @@ IntLPtoDP ( PDC dc, LPPOINT Points, INT Count )
BOOL STDCALL
NtGdiLPtoDP ( HDC hDC, LPPOINT UnsafePoints, INT Count )
{
PDC dc;
PDC dc = NULL;
NTSTATUS Status = STATUS_SUCCESS;
LPPOINT Points;
ULONG Size;
LPPOINT Points = NULL;
ULONG Size = 0;
dc = DC_LockDc(hDC);
if (!dc)
@ -479,7 +479,7 @@ NtGdiModifyWorldTransform(HDC hDC,
CONST LPXFORM UnsafeXForm,
DWORD Mode)
{
PDC dc;
PDC dc = NULL;
XFORM SafeXForm;
BOOL Ret = FALSE;
@ -520,7 +520,7 @@ NtGdiOffsetViewportOrgEx(HDC hDC,
int YOffset,
LPPOINT UnsafePoint)
{
PDC dc;
PDC dc = NULL;
NTSTATUS Status = STATUS_SUCCESS;
dc = DC_LockDc ( hDC );
@ -569,7 +569,7 @@ NtGdiOffsetWindowOrgEx(HDC hDC,
int YOffset,
LPPOINT Point)
{
PDC dc;
PDC dc = NULL;
dc = DC_LockDc(hDC);
if (!dc)
@ -758,7 +758,7 @@ NtGdiSetViewportExtEx(HDC hDC,
int YExtent,
LPSIZE Size)
{
PDC dc;
PDC dc = NULL;
dc = DC_LockDc(hDC);
if ( !dc )
@ -830,7 +830,7 @@ NtGdiSetViewportOrgEx(HDC hDC,
int Y,
LPPOINT Point)
{
PDC dc;
PDC dc = NULL;
dc = DC_LockDc(hDC);
if (!dc)
@ -881,7 +881,7 @@ NtGdiSetWindowExtEx(HDC hDC,
int YExtent,
LPSIZE Size)
{
PDC dc;
PDC dc = NULL;
dc = DC_LockDc(hDC);
if (!dc)
@ -944,7 +944,7 @@ NtGdiSetWindowOrgEx(HDC hDC,
int Y,
LPPOINT Point)
{
PDC dc;
PDC dc = NULL;
dc = DC_LockDc(hDC);
if (!dc)
@ -993,7 +993,7 @@ STDCALL
NtGdiSetWorldTransform(HDC hDC,
CONST LPXFORM XForm)
{
PDC dc;
PDC dc = NULL;
NTSTATUS Status = STATUS_SUCCESS;
dc = DC_LockDc (hDC);

View file

@ -1249,8 +1249,8 @@ IntGdiGetDCOrgEx(DC *dc, LPPOINT Point)
BOOL STDCALL
NtGdiGetDCOrgEx(HDC hDC, LPPOINT Point)
{
BOOL Ret;
DC *dc;
BOOL Ret = FALSE;
DC *dc = NULL;
POINT SafePoint;
NTSTATUS Status = STATUS_SUCCESS;
@ -1812,7 +1812,7 @@ INT STDCALL
NtGdiGetObject(HANDLE handle, INT count, LPVOID buffer)
{
INT Ret = 0;
LPVOID SafeBuf;
LPVOID SafeBuf = NULL;
NTSTATUS Status = STATUS_SUCCESS;
INT RetCount = 0;

View file

@ -27,9 +27,9 @@
UINT STDCALL
NtGdiSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Colors)
{
PDC dc;
PBITMAPOBJ BitmapObj;
PPALGDI PalGDI;
PDC dc = NULL;
PBITMAPOBJ BitmapObj = NULL;
PPALGDI PalGDI = NULL;
UINT Index;
if (!(dc = DC_LockDc(hDC))) return 0;
@ -92,9 +92,9 @@ NtGdiSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Col
UINT STDCALL
NtGdiGetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, RGBQUAD *Colors)
{
PDC dc;
PBITMAPOBJ BitmapObj;
PPALGDI PalGDI;
PDC dc = NULL;
PBITMAPOBJ BitmapObj = NULL;
PPALGDI PalGDI = NULL;
UINT Index;
if (!(dc = DC_LockDc(hDC))) return 0;

View file

@ -827,8 +827,8 @@ NtGdiPolygon(HDC hDC,
CONST PPOINT UnsafePoints,
int Count)
{
DC *dc;
LPPOINT Safept;
DC *dc = NULL;
LPPOINT Safept = NULL;
NTSTATUS Status = STATUS_SUCCESS;
BOOL Ret = FALSE;
@ -906,9 +906,9 @@ NtGdiPolyPolygon(HDC hDC,
CONST LPINT PolyCounts,
int Count)
{
DC *dc;
LPPOINT Safept;
LPINT SafePolyPoints;
DC *dc = NULL;
LPPOINT Safept = NULL;
LPINT SafePolyPoints = NULL;
NTSTATUS Status = STATUS_SUCCESS;
BOOL Ret;
@ -1559,11 +1559,11 @@ NtGdiGradientFill(
ULONG uMesh,
ULONG ulMode)
{
DC *dc;
DC *dc = NULL;
BOOL Ret;
PTRIVERTEX SafeVertex;
PVOID SafeMesh;
ULONG SizeMesh;
PTRIVERTEX SafeVertex = NULL;
PVOID SafeMesh = NULL;
ULONG SizeMesh = 0;
NTSTATUS Status = STATUS_SUCCESS;
dc = DC_LockDc(hdc);

View file

@ -501,7 +501,7 @@ NtGdiMoveToEx(HDC hDC,
int Y,
LPPOINT Point)
{
DC *dc;
DC *dc = NULL;
POINT SafePoint;
NTSTATUS Status = STATUS_SUCCESS;
BOOL Ret;
@ -554,8 +554,8 @@ NtGdiPolyBezier(HDC hDC,
CONST LPPOINT pt,
DWORD Count)
{
DC *dc;
LPPOINT Safept;
DC *dc = NULL;
LPPOINT Safept = NULL;
NTSTATUS Status = STATUS_SUCCESS;
BOOL Ret;
@ -642,8 +642,8 @@ NtGdiPolyBezierTo(HDC hDC,
CONST LPPOINT pt,
DWORD Count)
{
DC *dc;
LPPOINT Safept;
DC *dc = NULL;
LPPOINT Safept = NULL;
NTSTATUS Status = STATUS_SUCCESS;
BOOL Ret;
@ -732,7 +732,7 @@ NtGdiPolyDraw(
IN LPBYTE lpbTypes,
IN ULONG cCount)
{
PDC dc;
PDC dc = NULL;
BOOL result = FALSE;
POINT lastmove;
unsigned int i;
@ -806,8 +806,8 @@ NtGdiPolyline(HDC hDC,
CONST LPPOINT pt,
int Count)
{
DC *dc;
LPPOINT Safept;
DC *dc = NULL;
LPPOINT Safept = NULL;
NTSTATUS Status = STATUS_SUCCESS;
BOOL Ret;
@ -894,8 +894,8 @@ NtGdiPolylineTo(HDC hDC,
CONST LPPOINT pt,
DWORD Count)
{
DC *dc;
LPPOINT Safept;
DC *dc = NULL;
LPPOINT Safept = NULL;
NTSTATUS Status = STATUS_SUCCESS;
BOOL Ret;
@ -983,9 +983,9 @@ NtGdiPolyPolyline(HDC hDC,
CONST LPDWORD PolyPoints,
DWORD Count)
{
DC *dc;
LPPOINT Safept;
LPDWORD SafePolyPoints;
DC *dc = NULL;
LPPOINT Safept = NULL;
LPDWORD SafePolyPoints = NULL;
NTSTATUS Status = STATUS_SUCCESS;
BOOL Ret;

View file

@ -160,7 +160,7 @@ NtGdiExtEscape(
LPVOID SafeInData = NULL;
LPVOID SafeOutData = NULL;
NTSTATUS Status = STATUS_SUCCESS;
INT Result;
INT Result = 0;
if ( pDC == NULL )
{

View file

@ -188,7 +188,7 @@ NtGdiUnionRect(PRECT UnsafeDest, const RECT* UnsafeSrc1, const RECT* UnsafeSrc2)
{
RECT Dest, Src1 = {0}, Src2 = {0};
NTSTATUS Status = STATUS_SUCCESS;
BOOL Ret;
BOOL Ret = FALSE;
_SEH_TRY
{
@ -300,7 +300,7 @@ NtGdiIntersectRect(PRECT UnsafeDest, const RECT* UnsafeSrc1, const RECT* UnsafeS
{
RECT Dest, Src1, Src2 = {0};
NTSTATUS Status = STATUS_SUCCESS;
BOOL Ret;
BOOL Ret = FALSE;
_SEH_TRY
{

View file

@ -2253,8 +2253,8 @@ NtGdiExtCreateRegion(OPTIONAL LPXFORM Xform,
DWORD Count,
LPRGNDATA RgnData)
{
HRGN hRgn;
PROSRGNDATA Region;
HRGN hRgn = 0;
PROSRGNDATA Region = NULL;
DWORD nCount = 0;
NTSTATUS Status = STATUS_SUCCESS;
@ -2404,7 +2404,7 @@ NtGdiGetRgnBox(HRGN hRgn,
{
PROSRGNDATA Rgn;
RECT SafeRect;
DWORD ret;
DWORD ret = 0;
NTSTATUS Status = STATUS_SUCCESS;
if (!(Rgn = RGNDATA_LockRgn(hRgn)))
@ -2637,7 +2637,7 @@ STDCALL
NtGdiRectInRegion(HRGN hRgn,
CONST LPRECT unsaferc)
{
PROSRGNDATA Rgn;
PROSRGNDATA Rgn = NULL;
RECT rc = {0};
BOOL Ret;
NTSTATUS Status = STATUS_SUCCESS;
@ -2713,7 +2713,7 @@ HRGN STDCALL
NtGdiUnionRectWithRgn(HRGN hDest, CONST PRECT UnsafeRect)
{
RECT SafeRect;
PROSRGNDATA Rgn;
PROSRGNDATA Rgn = NULL;
NTSTATUS Status = STATUS_SUCCESS;
if(!(Rgn = (PROSRGNDATA)RGNDATA_LockRgn(hDest)))
@ -2759,7 +2759,7 @@ NtGdiUnionRectWithRgn(HRGN hDest, CONST PRECT UnsafeRect)
*/
DWORD STDCALL NtGdiGetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata)
{
DWORD size;
DWORD size = 0;
PROSRGNDATA obj = RGNDATA_LockRgn( hrgn );
NTSTATUS Status = STATUS_SUCCESS;
@ -3399,7 +3399,7 @@ NtGdiCreatePolygonRgn(CONST PPOINT pt,
INT Count,
INT PolyFillMode)
{
POINT *SafePoints;
POINT *SafePoints = NULL;
NTSTATUS Status = STATUS_SUCCESS;
HRGN hRgn;
@ -3495,9 +3495,9 @@ NtGdiCreatePolyPolygonRgn(CONST PPOINT pt,
INT Count,
INT PolyFillMode)
{
POINT *Safept;
INT *SafePolyCounts;
INT nPoints, nEmpty, nInvalid, i;
POINT *Safept = NULL;
INT *SafePolyCounts = NULL;
INT nPoints = 0, nEmpty, nInvalid, i;
HRGN hRgn;
NTSTATUS Status = STATUS_SUCCESS;