Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 21:23:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix release build uninitialized

Browse source 
Implemet NtGdiDdAddAttachedSurface untested 

svn path=/trunk/; revision=18315
This commit is contained in:
Magnus Olsen 2005-10-07 21:48:12 +00:00
parent 2b24d9c754
commit d36e1abc80
2 changed files with 52 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

74
reactos/subsys/win32k/ntddraw/ddraw.c
View file

@ -328,7 +328,7 @@ DWORD STDCALL NtGdiDdDestroySurface(
BOOL bRealDestroy BOOL bRealDestroy
) )
{ {
DWORD ddRVal; DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED;
PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW);
if (pDirectDraw == NULL) if (pDirectDraw == NULL)
@ -391,10 +391,9 @@ DWORD STDCALL NtGdiDdLock(
return ddRVal; return ddRVal;
} }
DWORD STDCALL NtGdiDdUnlock(
DWORD STDCALL NtGdiDdSetColorKey(
HANDLE hSurface, HANDLE hSurface,
PDD_SETCOLORKEYDATA puSetColorKeyData PDD_UNLOCKDATA puUnlockData
) )
{ {
DWORD ddRVal; DWORD ddRVal;
@ -403,10 +402,10 @@ DWORD STDCALL NtGdiDdSetColorKey(
if (pDirectDraw == NULL) if (pDirectDraw == NULL)
return DDHAL_DRIVER_NOTHANDLED; return DDHAL_DRIVER_NOTHANDLED;
if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_SETCOLORKEY)) if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_UNLOCK))
ddRVal = DDHAL_DRIVER_NOTHANDLED; ddRVal = DDHAL_DRIVER_NOTHANDLED;
else else
ddRVal = pDirectDraw->Surf.SetColorKey(puSetColorKeyData); ddRVal = pDirectDraw->Surf.Unlock(puUnlockData);
GDIOBJ_UnlockObjByPtr(pDirectDraw); GDIOBJ_UnlockObjByPtr(pDirectDraw);
return ddRVal; return ddRVal;
@ -430,10 +429,52 @@ DWORD STDCALL NtGdiDdBlt(
ddRVal = pDirectDraw->Surf.Blt(puBltData); ddRVal = pDirectDraw->Surf.Blt(puBltData);
GDIOBJ_UnlockObjByPtr(pDirectDraw); GDIOBJ_UnlockObjByPtr(pDirectDraw);
return ddRVal; return ddRVal;
} }
DWORD STDCALL NtGdiDdSetColorKey(
HANDLE hSurface,
PDD_SETCOLORKEYDATA puSetColorKeyData
)
{
DWORD ddRVal;
PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW);
if (pDirectDraw == NULL)
return DDHAL_DRIVER_NOTHANDLED;
if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_SETCOLORKEY))
ddRVal = DDHAL_DRIVER_NOTHANDLED;
else
ddRVal = pDirectDraw->Surf.SetColorKey(puSetColorKeyData);
GDIOBJ_UnlockObjByPtr(pDirectDraw);
return ddRVal;
}
DWORD STDCALL NtGdiDdAddAttachedSurface(
HANDLE hSurface,
HANDLE hSurfaceAttached,
PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData
)
{
DWORD ddRVal;
PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceAttached, GDI_OBJECT_TYPE_DIRECTDRAW);
if (pDirectDraw == NULL)
return DDHAL_DRIVER_NOTHANDLED;
if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_ADDATTACHEDSURFACE))
ddRVal = DDHAL_DRIVER_NOTHANDLED;
else
ddRVal = pDirectDraw->Surf.AddAttachedSurface(puAddAttachedSurfaceData);
GDIOBJ_UnlockObjByPtr(pDirectDraw);
return ddRVal;
}
DWORD STDCALL NtGdiDdUpdateOverlay( DWORD STDCALL NtGdiDdUpdateOverlay(
HANDLE hSurfaceDestination, HANDLE hSurfaceDestination,
HANDLE hSurfaceSource, HANDLE hSurfaceSource,
@ -455,25 +496,6 @@ DWORD STDCALL NtGdiDdUpdateOverlay(
return ddRVal; return ddRVal;
} }
DWORD STDCALL NtGdiDdUnlock(
HANDLE hSurface,
PDD_UNLOCKDATA puUnlockData
)
{
DWORD ddRVal;
PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW);
if (pDirectDraw == NULL)
return DDHAL_DRIVER_NOTHANDLED;
if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY))
ddRVal = DDHAL_DRIVER_NOTHANDLED;
else
ddRVal = pDirectDraw->Surf.Unlock(puUnlockData);
GDIOBJ_UnlockObjByPtr(pDirectDraw);
return ddRVal;
}
/************************************************************************/ /************************************************************************/

9
reactos/subsys/win32k/ntddraw/stubs.c
View file

@ -69,16 +69,7 @@ DWORD STDCALL NtGdiD3dValidateTextureStageState(
return 0; return 0;
} }
DWORD STDCALL NtGdiDdAddAttachedSurface(
HANDLE hSurface,
HANDLE hSurfaceAttached,
PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData
)
{
UNIMPLEMENTED
return 0;
}