mirror of
https://github.com/reactos/reactos.git
synced 2025-08-03 07:16:18 +00:00
[NTDDRAW][NTGDI][VGADDI] Add missing \n to DPRINT() calls (#5952)
Add missing \n to DPRINT() calls and demote some DPRINT1().
This commit is contained in:
Serge Gautherie
GitHub
parent
bd0a5498b0
commit
24757e30e9
12 changed files with 237 additions and 315 deletions
|
|
@ -8,6 +8,8 @@
|
|||
*/
|
||||
|
||||
#include <win32k.h>
|
||||
|
||||
// #define NDEBUG
|
||||
#include <debug.h>
|
||||
|
||||
HSEMAPHORE ghsemShareDevLock = NULL;
|
||||
|
|
@ -60,7 +62,6 @@ DRVFN gaEngFuncs[] =
|
|||
{DXENG_INDEX_DxEngLoadImage, (PFN)DxEngLoadImage}
|
||||
};
|
||||
|
||||
|
||||
/*++
|
||||
* @name DxEngDispUniq
|
||||
* @implemented
|
||||
|
|
@ -78,7 +79,7 @@ ULONG
|
|||
APIENTRY
|
||||
DxEngDispUniq(VOID)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngDispUniq\n");
|
||||
DPRINT("ReactX Calling : DxEngDispUniq\n");
|
||||
return GdiHandleTable->flDeviceUniq;
|
||||
}
|
||||
|
||||
|
|
@ -105,11 +106,10 @@ BOOL
|
|||
APIENTRY
|
||||
DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngGetDeviceGammaRamp\n");
|
||||
DPRINT("ReactX Calling : DxEngGetDeviceGammaRamp\n");
|
||||
return IntGetDeviceGammaRamp(hPDev, Ramp);
|
||||
}
|
||||
|
||||
|
||||
/*++
|
||||
* @name DxEngLockDC
|
||||
* @implemented
|
||||
|
|
@ -130,11 +130,10 @@ PDC
|
|||
APIENTRY
|
||||
DxEngLockDC(HDC hDC)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngLockDC\n");
|
||||
DPRINT("ReactX Calling : DxEngLockDC\n");
|
||||
return DC_LockDc(hDC);
|
||||
}
|
||||
|
||||
|
||||
/*++
|
||||
* @name DxEngUnlockDC
|
||||
* @implemented
|
||||
|
|
@ -155,7 +154,7 @@ BOOLEAN
|
|||
APIENTRY
|
||||
DxEngUnlockDC(PDC pDC)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngUnlockDC\n");
|
||||
DPRINT("ReactX Calling : DxEngUnlockDC\n");
|
||||
DC_UnlockDc(pDC);
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -179,7 +178,7 @@ BOOLEAN
|
|||
APIENTRY
|
||||
DxEngLockShareSem(VOID)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngLockShareSem\n");
|
||||
DPRINT("ReactX Calling : DxEngLockShareSem\n");
|
||||
if(!ghsemShareDevLock) ghsemShareDevLock = EngCreateSemaphore(); // Hax, should be in dllmain.c
|
||||
EngAcquireSemaphore(ghsemShareDevLock);
|
||||
return TRUE;
|
||||
|
|
@ -202,7 +201,7 @@ BOOLEAN
|
|||
APIENTRY
|
||||
DxEngUnlockShareSem(VOID)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngUnlockShareSem\n");
|
||||
DPRINT("ReactX Calling : DxEngUnlockShareSem\n");
|
||||
EngReleaseSemaphore(ghsemShareDevLock);
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -233,7 +232,7 @@ BOOLEAN
|
|||
APIENTRY
|
||||
DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngSetDeviceGammaRamp\n");
|
||||
DPRINT("ReactX Calling : DxEngSetDeviceGammaRamp\n");
|
||||
return IntSetDeviceGammaRamp(hPDev, Ramp, Test);
|
||||
}
|
||||
|
||||
|
|
@ -284,101 +283,100 @@ DxEngGetHdevData(HDEV hDev,
|
|||
DWORD_PTR retVal = 0;
|
||||
PPDEVOBJ PDev = (PPDEVOBJ)hDev;
|
||||
|
||||
DPRINT1("ReactX Calling : DxEngGetHdevData DXEGSHDEVDATA : %ld\n", Type);
|
||||
DPRINT("ReactX Calling : DxEngGetHdevData, Type: %d\n", Type);
|
||||
|
||||
#if 1
|
||||
DPRINT1("HDEV hDev %p\n", hDev);
|
||||
DPRINT("hDev: %p\n", hDev);
|
||||
#endif
|
||||
|
||||
switch ( Type )
|
||||
{
|
||||
case DxEGShDevData_Surface:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_Surface\n");
|
||||
DPRINT("requested DxEGShDevData_Surface\n");
|
||||
retVal = (DWORD_PTR) PDev->pSurface; // ptr to Surface handle.
|
||||
break;
|
||||
case DxEGShDevData_hSpooler:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_hSpooler\n");
|
||||
DPRINT("requested DxEGShDevData_hSpooler\n");
|
||||
retVal = (DWORD_PTR) PDev->hSpooler;
|
||||
break;
|
||||
case DxEGShDevData_DitherFmt:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DitherFmt\n");
|
||||
DPRINT("requested DxEGShDevData_DitherFmt\n");
|
||||
retVal = (DWORD_PTR) PDev->devinfo.iDitherFormat;
|
||||
break;
|
||||
case DxEGShDevData_FxCaps:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps\n");
|
||||
DPRINT("requested DxEGShDevData_FxCaps\n");
|
||||
retVal = (DWORD_PTR) PDev->devinfo.flGraphicsCaps;
|
||||
break;
|
||||
case DxEGShDevData_FxCaps2:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps2\n");
|
||||
DPRINT("requested DxEGShDevData_FxCaps2\n");
|
||||
retVal = (DWORD_PTR) PDev->devinfo.flGraphicsCaps2;
|
||||
break;
|
||||
case DxEGShDevData_DrvFuncs:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DrvFuncs\n");
|
||||
DPRINT("requested DxEGShDevData_DrvFuncs\n");
|
||||
retVal = (DWORD_PTR) &PDev->DriverFunctions;
|
||||
break;
|
||||
case DxEGShDevData_dhpdev:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dhpdev\n");
|
||||
DPRINT("requested DxEGShDevData_dhpdev\n");
|
||||
retVal = (DWORD_PTR) PDev->dhpdev; // DHPDEV
|
||||
break;
|
||||
case DxEGShDevData_eddg:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_eddg\n");
|
||||
DPRINT("requested DxEGShDevData_eddg\n");
|
||||
retVal = (DWORD_PTR) PDev->pEDDgpl;
|
||||
break;
|
||||
case DxEGShDevData_dd_locks:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_locks\n");
|
||||
DPRINT("requested DxEGShDevData_dd_locks\n");
|
||||
retVal = (DWORD_PTR) PDev->cDirectDrawDisableLocks;
|
||||
break;
|
||||
case DxEGShDevData_dd_flags:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_flags\n");
|
||||
DPRINT("requested DxEGShDevData_dd_flags\n");
|
||||
retVal = (DWORD_PTR) PDev->DxDd_Flags;
|
||||
break;
|
||||
case DxEGShDevData_disable:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_disable\n");
|
||||
DPRINT("requested DxEGShDevData_disable\n");
|
||||
retVal = (DWORD_PTR) PDev->flFlags & PDEV_DISABLED;
|
||||
break;
|
||||
case DxEGShDevData_metadev:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_metadev\n");
|
||||
DPRINT("requested DxEGShDevData_metadev\n");
|
||||
retVal = (DWORD_PTR) PDev->flFlags & PDEV_META_DEVICE;
|
||||
break;
|
||||
case DxEGShDevData_display:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_display\n");
|
||||
DPRINT("requested DxEGShDevData_display\n");
|
||||
retVal = (DWORD_PTR) PDev->flFlags & PDEV_DISPLAY;
|
||||
break;
|
||||
case DxEGShDevData_Parent:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_Parent\n");
|
||||
DPRINT("requested DxEGShDevData_Parent\n");
|
||||
retVal = (DWORD_PTR) PDev->ppdevParent;
|
||||
break;
|
||||
case DxEGShDevData_OpenRefs:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_OpenRefs\n");
|
||||
DPRINT("requested DxEGShDevData_OpenRefs\n");
|
||||
retVal = (DWORD_PTR) PDev->cPdevOpenRefs != 0;
|
||||
break;
|
||||
case DxEGShDevData_palette:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_palette\n");
|
||||
DPRINT("requested DxEGShDevData_palette\n");
|
||||
retVal = (DWORD_PTR) PDev->gdiinfo.flRaster & RC_PALETTE;
|
||||
break;
|
||||
case DxEGShDevData_ldev:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_ldev\n");
|
||||
DPRINT("requested DxEGShDevData_ldev\n");
|
||||
retVal = (DWORD_PTR) PDev->pldev;
|
||||
break;
|
||||
case DxEGShDevData_GDev:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_GDev\n");
|
||||
DPRINT("requested DxEGShDevData_GDev\n");
|
||||
retVal = (DWORD_PTR) PDev->pGraphicsDevice; // P"GRAPHICS_DEVICE"
|
||||
break;
|
||||
case DxEGShDevData_clonedev:
|
||||
DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_clonedev\n");
|
||||
DPRINT("requested DxEGShDevData_clonedev\n");
|
||||
retVal = (DWORD_PTR) PDev->flFlags & PDEV_CLONE_DEVICE;
|
||||
break;
|
||||
|
||||
default:
|
||||
// TODO: Make this default a bit more useful.
|
||||
break;
|
||||
}
|
||||
|
||||
#if 1
|
||||
DPRINT1("return value %08lx\n", retVal);
|
||||
DPRINT("retVal: %08Ix\n", retVal);
|
||||
#endif
|
||||
|
||||
return retVal;
|
||||
|
||||
}
|
||||
|
||||
/*++
|
||||
|
|
@ -411,11 +409,11 @@ DxEngSetHdevData(HDEV hDev,
|
|||
{
|
||||
BOOLEAN retVal = FALSE; // Default, no set.
|
||||
|
||||
DPRINT1("ReactX Calling : DxEngSetHdevData DXEGSHDEVDATA : %ld\n", Type);
|
||||
DPRINT("ReactX Calling : DxEngSetHdevData, Type: %d\n", Type);
|
||||
|
||||
if (Type == DxEGShDevData_dd_locks)
|
||||
{
|
||||
DPRINT1("Assigning value %d\n", Data);
|
||||
DPRINT("Assigning value: %Iu\n", Data);
|
||||
((PPDEVOBJ)hDev)->cDirectDrawDisableLocks = Data;
|
||||
retVal = TRUE; // Set
|
||||
}
|
||||
|
|
@ -455,7 +453,7 @@ DxEngGetDCState(HDC hDC,
|
|||
PDC pDC = DC_LockDc(hDC);
|
||||
DWORD_PTR retVal = 0;
|
||||
|
||||
DPRINT1("ReactX Calling : DxEngGetDCState type : %lu\n", type);
|
||||
DPRINT("ReactX Calling : DxEngGetDCState, type: %lu\n", type);
|
||||
|
||||
if (pDC)
|
||||
{
|
||||
|
|
@ -482,7 +480,7 @@ DxEngGetDCState(HDC hDC,
|
|||
DC_UnlockDc(pDC);
|
||||
}
|
||||
|
||||
DPRINT1("Return value %08lx\n", retVal);
|
||||
DPRINT("retVal: %08Ix\n", retVal);
|
||||
|
||||
return retVal;
|
||||
}
|
||||
|
|
@ -504,7 +502,7 @@ BOOLEAN
|
|||
APIENTRY
|
||||
DxEngIncDispUniq(VOID)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngIncDispUniq \n");
|
||||
DPRINT("ReactX Calling : DxEngIncDispUniq\n");
|
||||
|
||||
InterlockedIncrement((LONG*)&GdiHandleTable->flDeviceUniq);
|
||||
return TRUE;
|
||||
|
|
@ -533,9 +531,9 @@ DxEngLockHdev(HDEV hDev)
|
|||
PPDEVOBJ ppdev = (PPDEVOBJ)hDev;
|
||||
PERESOURCE Resource;
|
||||
|
||||
DPRINT1("ReactX Calling : DxEngLockHdev \n");
|
||||
DPRINT("ReactX Calling : DxEngLockHdev\n");
|
||||
|
||||
DPRINT1("hDev : 0x%p\n",hDev);
|
||||
DPRINT("hDev: %p\n", hDev);
|
||||
|
||||
Resource = (PERESOURCE)ppdev->hsemDevLock;
|
||||
|
||||
|
|
@ -570,7 +568,7 @@ DxEngUnlockHdev(HDEV hDev)
|
|||
PPDEVOBJ ppdev = (PPDEVOBJ)hDev;
|
||||
PERESOURCE Resource = (PERESOURCE)ppdev->hsemDevLock;
|
||||
|
||||
DPRINT1("ReactX Calling : DxEngUnlockHdev \n");
|
||||
DPRINT("ReactX Calling : DxEngUnlockHdev\n");
|
||||
|
||||
if (Resource)
|
||||
{
|
||||
|
|
@ -580,7 +578,6 @@ DxEngUnlockHdev(HDEV hDev)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
/************************************************************************/
|
||||
/* DxEngReferenceHdev */
|
||||
/************************************************************************/
|
||||
|
|
@ -621,7 +618,6 @@ DxEngRedrawDesktop(VOID)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
ULONG gulVisRgnUniqueness; // Increase count everytime client region is updated.
|
||||
|
||||
/************************************************************************/
|
||||
|
|
@ -632,7 +628,7 @@ ULONG
|
|||
APIENTRY
|
||||
DxEngVisRgnUniq(VOID)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngVisRgnUniq \n");
|
||||
DPRINT("ReactX Calling : DxEngVisRgnUniq\n");
|
||||
|
||||
return gulVisRgnUniqueness;
|
||||
}
|
||||
|
|
@ -682,7 +678,6 @@ DxEngIsHdevLockedByCurrentThread(HDEV hDev)
|
|||
return pSem->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread();
|
||||
}
|
||||
|
||||
|
||||
/************************************************************************/
|
||||
/* DxEngUnreferenceHdev */
|
||||
/************************************************************************/
|
||||
|
|
@ -729,7 +724,7 @@ DxEngCleanDC(HDC hdc)
|
|||
/************************************************************************/
|
||||
BOOL APIENTRY DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngSetDCOwner \n");
|
||||
DPRINT("ReactX Calling : DxEngSetDCOwner\n");
|
||||
|
||||
return GreSetDCOwner(hObject, OwnerMask);
|
||||
}
|
||||
|
|
@ -765,7 +760,7 @@ DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set)
|
|||
/************************************************************************/
|
||||
HBITMAP APIENTRY DxEngSelectBitmap(HDC hdc, HBITMAP hbmp)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngSelectBitmap \n");
|
||||
DPRINT("ReactX Calling : DxEngSelectBitmap\n");
|
||||
|
||||
return NtGdiSelectBitmap(hdc, hbmp);
|
||||
}
|
||||
|
|
@ -775,7 +770,7 @@ HBITMAP APIENTRY DxEngSelectBitmap(HDC hdc, HBITMAP hbmp)
|
|||
/************************************************************************/
|
||||
BOOLEAN APIENTRY DxEngSetBitmapOwner(HBITMAP hbmp, ULONG ulOwner)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngSetBitmapOwner \n");
|
||||
DPRINT("ReactX Calling : DxEngSetBitmapOwner\n");
|
||||
|
||||
return GreSetBitmapOwner(hbmp, ulOwner);
|
||||
}
|
||||
|
|
@ -785,7 +780,7 @@ BOOLEAN APIENTRY DxEngSetBitmapOwner(HBITMAP hbmp, ULONG ulOwner)
|
|||
/************************************************************************/
|
||||
BOOLEAN APIENTRY DxEngDeleteSurface(HSURF hsurf)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngDeleteSurface \n");
|
||||
DPRINT("ReactX Calling : DxEngDeleteSurface\n");
|
||||
|
||||
return EngDeleteSurface(hsurf);
|
||||
}
|
||||
|
|
@ -804,7 +799,7 @@ DWORD APIENTRY DxEngGetSurfaceData(DWORD x1, DWORD x2)
|
|||
/************************************************************************/
|
||||
SURFOBJ * APIENTRY DxEngAltLockSurface(HSURF hsurf)
|
||||
{
|
||||
DPRINT1("ReactX Calling : DxEngAltLockSurface \n");
|
||||
DPRINT("ReactX Calling : DxEngAltLockSurface\n");
|
||||
|
||||
return EngLockSurface(hsurf);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue