mirror of
https://github.com/reactos/reactos.git
synced 2025-04-25 08:00:24 +00:00
Fix formatting add a FIXME comment, no code change
svn path=/trunk/; revision=40202
This commit is contained in:
parent
0a1914e0b7
commit
65ce2884da
1 changed files with 460 additions and 457 deletions
|
@ -26,7 +26,7 @@ DC_AllocDC(PUNICODE_STRING Driver)
|
|||
if (Driver != NULL)
|
||||
{
|
||||
Buf = ExAllocatePoolWithTag(PagedPool, Driver->MaximumLength, TAG_DC);
|
||||
if(!Buf)
|
||||
if (!Buf)
|
||||
{
|
||||
DPRINT1("ExAllocatePoolWithTag failed\n");
|
||||
return NULL;
|
||||
|
@ -35,9 +35,9 @@ DC_AllocDC(PUNICODE_STRING Driver)
|
|||
}
|
||||
|
||||
NewDC = (PDC)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_DC);
|
||||
if(!NewDC)
|
||||
if (!NewDC)
|
||||
{
|
||||
if(Buf)
|
||||
if (Buf)
|
||||
{
|
||||
ExFreePoolWithTag(Buf, TAG_DC);
|
||||
}
|
||||
|
@ -121,7 +121,7 @@ VOID FASTCALL
|
|||
DC_FreeDC(HDC DCToFree)
|
||||
{
|
||||
DC_FreeDcAttr(DCToFree);
|
||||
if(!IsObjectDead( DCToFree ))
|
||||
if (!IsObjectDead( DCToFree ))
|
||||
{
|
||||
if (!GDIOBJ_FreeObjByHandle(DCToFree, GDI_OBJECT_TYPE_DC))
|
||||
{
|
||||
|
@ -150,25 +150,25 @@ DC_SetOwnership(HDC hDC, PEPROCESS Owner)
|
|||
{
|
||||
PDC pDC;
|
||||
|
||||
if(!GDIOBJ_SetOwnership(hDC, Owner)) return FALSE;
|
||||
if (!GDIOBJ_SetOwnership(hDC, Owner)) return FALSE;
|
||||
pDC = DC_LockDc(hDC);
|
||||
if (pDC)
|
||||
{
|
||||
if (pDC->rosdc.hClipRgn)
|
||||
{
|
||||
if(!GDIOBJ_SetOwnership(pDC->rosdc.hClipRgn, Owner)) return FALSE;
|
||||
if (!GDIOBJ_SetOwnership(pDC->rosdc.hClipRgn, Owner)) return FALSE;
|
||||
}
|
||||
if (pDC->rosdc.hVisRgn)
|
||||
{
|
||||
if(!GDIOBJ_SetOwnership(pDC->rosdc.hVisRgn, Owner)) return FALSE;
|
||||
if (!GDIOBJ_SetOwnership(pDC->rosdc.hVisRgn, Owner)) return FALSE;
|
||||
}
|
||||
if (pDC->rosdc.hGCClipRgn)
|
||||
{
|
||||
if(!GDIOBJ_SetOwnership(pDC->rosdc.hGCClipRgn, Owner)) return FALSE;
|
||||
if (!GDIOBJ_SetOwnership(pDC->rosdc.hGCClipRgn, Owner)) return FALSE;
|
||||
}
|
||||
if (pDC->dclevel.hPath)
|
||||
{
|
||||
if(!GDIOBJ_SetOwnership(pDC->dclevel.hPath, Owner)) return FALSE;
|
||||
if (!GDIOBJ_SetOwnership(pDC->dclevel.hPath, Owner)) return FALSE;
|
||||
}
|
||||
DC_UnlockDc(pDC);
|
||||
}
|
||||
|
@ -177,7 +177,8 @@ DC_SetOwnership(HDC hDC, PEPROCESS Owner)
|
|||
|
||||
|
||||
HDC FASTCALL
|
||||
IntGdiCreateDC(PUNICODE_STRING Driver,
|
||||
IntGdiCreateDC(
|
||||
PUNICODE_STRING Driver,
|
||||
PUNICODE_STRING Device,
|
||||
PVOID pUMdhpdev,
|
||||
CONST PDEVMODEW InitData,
|
||||
|
@ -214,20 +215,23 @@ IntGdiCreateDC(PUNICODE_STRING Driver,
|
|||
else
|
||||
{
|
||||
calledFromUser = UserIsEntered();
|
||||
if (!calledFromUser){
|
||||
if (!calledFromUser)
|
||||
{
|
||||
UserEnterExclusive();
|
||||
}
|
||||
|
||||
if (! co_IntGraphicsCheck(TRUE))
|
||||
{
|
||||
if (!calledFromUser){
|
||||
if (!calledFromUser)
|
||||
{
|
||||
UserLeave();
|
||||
}
|
||||
DPRINT1("Unable to initialize graphics, returning NULL dc\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!calledFromUser){
|
||||
if (!calledFromUser)
|
||||
{
|
||||
UserLeave();
|
||||
}
|
||||
|
||||
|
@ -263,7 +267,7 @@ IntGdiCreateDC(PUNICODE_STRING Driver,
|
|||
pdc->dctype = DC_TYPE_DIRECT;
|
||||
|
||||
pdc->dhpdev = PrimarySurface.hPDev;
|
||||
if(pUMdhpdev) pUMdhpdev = pdc->dhpdev; // set DHPDEV for device.
|
||||
if (pUMdhpdev) pUMdhpdev = pdc->dhpdev; // set DHPDEV for device.
|
||||
pdc->ppdev = (PVOID)&PrimarySurface;
|
||||
pdc->rosdc.hBitmap = (HBITMAP)PrimarySurface.pSurface; // <- what kind of haxx0ry is that?
|
||||
// ATM we only have one display.
|
||||
|
@ -331,7 +335,8 @@ IntGdiCreateDC(PUNICODE_STRING Driver,
|
|||
|
||||
|
||||
HDC APIENTRY
|
||||
NtGdiOpenDCW( PUNICODE_STRING Device,
|
||||
NtGdiOpenDCW(
|
||||
PUNICODE_STRING Device,
|
||||
DEVMODEW *InitData,
|
||||
PUNICODE_STRING pustrLogAddr,
|
||||
ULONG iType,
|
||||
|
@ -345,29 +350,24 @@ NtGdiOpenDCW( PUNICODE_STRING Device,
|
|||
HDC Ret;
|
||||
NTSTATUS Status = STATUS_SUCCESS;
|
||||
|
||||
if(InitData)
|
||||
if (InitData)
|
||||
{
|
||||
_SEH2_TRY
|
||||
{
|
||||
if (pUMdhpdev)
|
||||
{
|
||||
ProbeForWrite(pUMdhpdev,
|
||||
sizeof(PVOID),
|
||||
1);
|
||||
ProbeForWrite(pUMdhpdev, sizeof(PVOID), 1);
|
||||
}
|
||||
ProbeForRead(InitData,
|
||||
sizeof(DEVMODEW),
|
||||
1);
|
||||
RtlCopyMemory(&SafeInitData,
|
||||
InitData,
|
||||
sizeof(DEVMODEW));
|
||||
ProbeForRead(InitData, sizeof(DEVMODEW), 1);
|
||||
RtlCopyMemory(&SafeInitData, InitData, sizeof(DEVMODEW));
|
||||
}
|
||||
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
|
||||
{
|
||||
Status = _SEH2_GetExceptionCode();
|
||||
}
|
||||
_SEH2_END;
|
||||
if(!NT_SUCCESS(Status))
|
||||
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
SetLastNtError(Status);
|
||||
return NULL;
|
||||
|
@ -375,10 +375,10 @@ NtGdiOpenDCW( PUNICODE_STRING Device,
|
|||
/* FIXME - InitData can have some more bytes! */
|
||||
}
|
||||
|
||||
if(Device)
|
||||
if (Device)
|
||||
{
|
||||
Status = IntSafeCopyUnicodeString(&SafeDevice, Device);
|
||||
if(!NT_SUCCESS(Status))
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
SetLastNtError(Status);
|
||||
return NULL;
|
||||
|
@ -391,10 +391,10 @@ NtGdiOpenDCW( PUNICODE_STRING Device,
|
|||
InitData ? &SafeInitData : NULL,
|
||||
(BOOL) iType); // FALSE 0 DCW, TRUE 1 ICW
|
||||
|
||||
// FIXME!!!!
|
||||
if (pUMdhpdev) pUMdhpdev = Dhpdev;
|
||||
|
||||
return Ret;
|
||||
|
||||
}
|
||||
|
||||
HDC FASTCALL
|
||||
|
@ -444,7 +444,7 @@ IntGdiDeleteDC(HDC hDC, BOOL Force)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
if(!Force)
|
||||
if (!Force)
|
||||
{
|
||||
if (DCToDelete->fs & DC_FLAG_PERMANENT)
|
||||
{
|
||||
|
@ -528,18 +528,18 @@ DC_InitDC(HDC DCHandle)
|
|||
////
|
||||
//NtGdiSelectFont(DCHandle, hFont);
|
||||
|
||||
/*
|
||||
/*
|
||||
{
|
||||
int res;
|
||||
res = CLIPPING_UpdateGCRegion(DCToInit);
|
||||
ASSERT ( res != ERROR );
|
||||
}
|
||||
*/
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* @unimplemented
|
||||
*/
|
||||
/*
|
||||
* @unimplemented
|
||||
*/
|
||||
BOOL
|
||||
APIENTRY
|
||||
NtGdiMakeInfoDC(
|
||||
|
@ -596,7 +596,7 @@ NtGdiCreateCompatibleDC(HDC hDC)
|
|||
}
|
||||
NewDC = DC_LockDc( hNewDC );
|
||||
|
||||
if(!NewDC)
|
||||
if (!NewDC)
|
||||
{
|
||||
DPRINT1("Failed to lock hNewDC\n");
|
||||
NtGdiDeleteObjectApp(hNewDC);
|
||||
|
@ -634,7 +634,10 @@ NtGdiCreateCompatibleDC(HDC hDC)
|
|||
pdcattrNew->ulDirty_ = pdcattrOld->ulDirty_;
|
||||
pdcattrNew->iCS_CP = pdcattrOld->iCS_CP;
|
||||
|
||||
NewDC->erclWindow = (RECTL){0,0,1,1};
|
||||
NewDC->erclWindow = (RECTL)
|
||||
{
|
||||
0,0,1,1
|
||||
};
|
||||
|
||||
DC_UnlockDc(NewDC);
|
||||
DC_UnlockDc(OrigDC);
|
||||
|
@ -668,7 +671,7 @@ NtGdiDeleteObjectApp(HANDLE DCHandle)
|
|||
if (GDI_HANDLE_GET_TYPE(DCHandle) != GDI_OBJECT_TYPE_DC)
|
||||
return NtGdiDeleteObject((HGDIOBJ) DCHandle);
|
||||
|
||||
if(IsObjectDead((HGDIOBJ)DCHandle)) return TRUE;
|
||||
if (IsObjectDead((HGDIOBJ)DCHandle)) return TRUE;
|
||||
|
||||
if (!GDIOBJ_OwnedByCurrentProcess(DCHandle))
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue