ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases 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
reactos/subsys/win32k/ntddraw/ddraw.c
+52 -30
View File
@@ -328,7 +328,7 @@ DWORD STDCALL NtGdiDdDestroySurface(
BOOL bRealDestroy
)
{
DWORD ddRVal;
DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED;
PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW);
if (pDirectDraw == NULL)
@@ -391,6 +391,46 @@ DWORD STDCALL NtGdiDdLock(
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_UNLOCK))
ddRVal = DDHAL_DRIVER_NOTHANDLED;
else
ddRVal = pDirectDraw->Surf.Unlock(puUnlockData);
GDIOBJ_UnlockObjByPtr(pDirectDraw);
return ddRVal;
}
DWORD STDCALL NtGdiDdBlt(
HANDLE hSurfaceDest,
HANDLE hSurfaceSrc,
PDD_BLTDATA puBltData
)
{
DWORD ddRVal;
PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDest, GDI_OBJECT_TYPE_DIRECTDRAW);
if (pDirectDraw == NULL)
return DDHAL_DRIVER_NOTHANDLED;
if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_BLT))
ddRVal = DDHAL_DRIVER_NOTHANDLED;
else
ddRVal = pDirectDraw->Surf.Blt(puBltData);
GDIOBJ_UnlockObjByPtr(pDirectDraw);
return ddRVal;
}
DWORD STDCALL NtGdiDdSetColorKey(
HANDLE hSurface,
@@ -412,27 +452,28 @@ DWORD STDCALL NtGdiDdSetColorKey(
return ddRVal;
}
DWORD STDCALL NtGdiDdBlt(
HANDLE hSurfaceDest,
HANDLE hSurfaceSrc,
PDD_BLTDATA puBltData
DWORD STDCALL NtGdiDdAddAttachedSurface(
HANDLE hSurface,
HANDLE hSurfaceAttached,
PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData
)
{
DWORD ddRVal;
DWORD ddRVal;
PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDest, GDI_OBJECT_TYPE_DIRECTDRAW);
PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceAttached, GDI_OBJECT_TYPE_DIRECTDRAW);
if (pDirectDraw == NULL)
return DDHAL_DRIVER_NOTHANDLED;
if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_BLT))
if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_ADDATTACHEDSURFACE))
ddRVal = DDHAL_DRIVER_NOTHANDLED;
else
ddRVal = pDirectDraw->Surf.Blt(puBltData);
ddRVal = pDirectDraw->Surf.AddAttachedSurface(puAddAttachedSurfaceData);
GDIOBJ_UnlockObjByPtr(pDirectDraw);
return ddRVal;
}
return ddRVal;
}
DWORD STDCALL NtGdiDdUpdateOverlay(
HANDLE hSurfaceDestination,
@@ -455,25 +496,6 @@ DWORD STDCALL NtGdiDdUpdateOverlay(
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;
}
/************************************************************************/
reactos/subsys/win32k/ntddraw/stubs.c
-9
View File
@@ -69,16 +69,7 @@ DWORD STDCALL NtGdiD3dValidateTextureStageState(
return 0;
}
DWORD STDCALL NtGdiDdAddAttachedSurface(
HANDLE hSurface,
HANDLE hSurfaceAttached,
PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData
)
{
UNIMPLEMENTED
return 0;
}