Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix : hal lock surface so it does not crash any longer

Browse source 
svn path=/trunk/; revision=21574
This commit is contained in:
Magnus Olsen 2006-04-13 06:38:52 +00:00
parent becc8a8d30
commit e55cbd36de
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
reactos/dll/directx/ddraw/hal/surface_hal.c
View file

@ -132,11 +132,24 @@ HRESULT Hal_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURF
} }
// FIXME ??? is this right ?? // FIXME ??? is this right ??
RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC2)); if (pDDSD != NULL)
memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC)); {
pDDSD->dwSize = sizeof(DDSURFACEDESC2); if (pDDSD->dwSize == sizeof(DDSURFACEDESC2))
{
RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC2));
// FIXME the interanl mddsdPrimary shall be DDSURFACEDESC2
memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC));
pDDSD->dwSize = sizeof(DDSURFACEDESC2);
}
if (pDDSD->dwSize == sizeof(DDSURFACEDESC))
{
RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC));
memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC));
pDDSD->dwSize = sizeof(DDSURFACEDESC);
}
pDDSD->lpSurface = (LPVOID) Lock.lpSurfData; pDDSD->lpSurface = (LPVOID) Lock.lpSurfData;
}
return DD_OK; return DD_OK;
} }