mirror of
https://github.com/reactos/reactos.git
synced 2024-10-04 00:13:57 +00:00
more source cleanup
svn path=/trunk/; revision=23167
This commit is contained in:
parent
342b9f2cdb
commit
64918dadb2
|
@ -474,15 +474,12 @@ DWORD STDCALL NtGdiDdDestroySurface(
|
|||
DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED;
|
||||
|
||||
PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hSurface, GDI_OBJECT_TYPE_DIRECTDRAW);
|
||||
#ifdef DX_DEBUG
|
||||
DPRINT1("NtGdiDdDestroySurface\n");
|
||||
#endif
|
||||
if (pDirectDraw == NULL)
|
||||
return DDHAL_DRIVER_NOTHANDLED;
|
||||
|
||||
if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE))
|
||||
ddRVal = DDHAL_DRIVER_NOTHANDLED;
|
||||
else
|
||||
DPRINT1("NtGdiDdDestroySurface\n");
|
||||
|
||||
if (pDirectDraw != NULL)
|
||||
{
|
||||
if (pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE)
|
||||
{
|
||||
DD_DESTROYSURFACEDATA DestroySurf;
|
||||
|
||||
|
@ -490,16 +487,17 @@ DWORD STDCALL NtGdiDdDestroySurface(
|
|||
* bRealDestroy
|
||||
* are we doing right ??
|
||||
*/
|
||||
DestroySurf.lpDD = &pDirectDraw->Global;
|
||||
|
||||
DestroySurf.lpDD = &pDirectDraw->Global;
|
||||
DestroySurf.lpDDSurface = hSurface; // ?
|
||||
DestroySurf.DestroySurface = pDirectDraw->Surf.DestroySurface;
|
||||
|
||||
ddRVal = pDirectDraw->Surf.DestroySurface(&DestroySurf);
|
||||
}
|
||||
|
||||
|
||||
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
|
||||
}
|
||||
|
||||
return ddRVal;
|
||||
}
|
||||
|
||||
|
@ -511,33 +509,29 @@ DWORD STDCALL NtGdiDdFlip(
|
|||
PDD_FLIPDATA puFlipData
|
||||
)
|
||||
{
|
||||
DWORD ddRVal;
|
||||
DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED;
|
||||
PDD_DIRECTDRAW_GLOBAL lgpl;
|
||||
|
||||
PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hSurfaceTarget, GDI_OBJECT_TYPE_DIRECTDRAW);
|
||||
#ifdef DX_DEBUG
|
||||
|
||||
DPRINT1("NtGdiDdFlip\n");
|
||||
#endif
|
||||
|
||||
if (pDirectDraw == NULL)
|
||||
return DDHAL_DRIVER_NOTHANDLED;
|
||||
|
||||
/* backup the orignal PDev and info */
|
||||
if (pDirectDraw != NULL)
|
||||
{
|
||||
if (pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_FLIP)
|
||||
{
|
||||
lgpl = puFlipData->lpDD;
|
||||
|
||||
/* use our cache version instead */
|
||||
puFlipData->lpDD = &pDirectDraw->Global;
|
||||
|
||||
/* make the call */
|
||||
if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_FLIP))
|
||||
ddRVal = DDHAL_DRIVER_NOTHANDLED;
|
||||
else
|
||||
ddRVal = pDirectDraw->Surf.Flip(puFlipData);
|
||||
|
||||
/* But back the orignal PDev */
|
||||
puFlipData->lpDD = lgpl;
|
||||
}
|
||||
|
||||
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
|
||||
}
|
||||
|
||||
return ddRVal;
|
||||
}
|
||||
|
||||
|
@ -547,32 +541,28 @@ DWORD STDCALL NtGdiDdLock(
|
|||
HDC hdcClip
|
||||
)
|
||||
{
|
||||
DWORD ddRVal;
|
||||
DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED;
|
||||
PDD_DIRECTDRAW_GLOBAL lgpl;
|
||||
|
||||
PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hSurface, GDI_OBJECT_TYPE_DIRECTDRAW);
|
||||
#ifdef DX_DEBUG
|
||||
|
||||
DPRINT1("NtGdiDdLock\n");
|
||||
#endif
|
||||
if (pDirectDraw == NULL)
|
||||
return DDHAL_DRIVER_NOTHANDLED;
|
||||
|
||||
/* backup the orignal PDev and info */
|
||||
if (pDirectDraw != NULL)
|
||||
{
|
||||
if (pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_LOCK)
|
||||
{
|
||||
lgpl = puLockData->lpDD;
|
||||
|
||||
/* use our cache version instead */
|
||||
puLockData->lpDD = &pDirectDraw->Global;
|
||||
|
||||
/* make the call */
|
||||
if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_LOCK))
|
||||
ddRVal = DDHAL_DRIVER_NOTHANDLED;
|
||||
else
|
||||
ddRVal = pDirectDraw->Surf.Lock(puLockData);
|
||||
|
||||
/* But back the orignal PDev */
|
||||
puLockData->lpDD = lgpl;
|
||||
}
|
||||
|
||||
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
|
||||
}
|
||||
|
||||
return ddRVal;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue