marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Be less strict on parameter checking in the SetSurfaceDesc function.

oldstable
Lionel Ulmer 2002-08-02 19:10:16 +00:00 committed by Alexandre Julliard
parent bacc1b3b58
commit 262cbcdb09
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/ddraw/dsurface/dib.c
View File

@ -1014,13 +1014,28 @@ DIB_DirectDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface,
ICOM_THIS(IDirectDrawSurfaceImpl,iface);
DIB_PRIV_VAR(priv, This);
HRESULT hr = DD_OK;
DWORD flags = pDDSD->dwFlags;
TRACE("(%p)->(%p,%08lx)\n",iface,pDDSD,dwFlags);
if (pDDSD->dwFlags == DDSD_LPSURFACE) {
if (TRACE_ON(ddraw)) {
TRACE("(%p)->(%p,%08lx)\n",iface,pDDSD,dwFlags);
DDRAW_dump_surface_desc(pDDSD);
}
if (pDDSD->dwFlags & DDSD_PIXELFORMAT) {
flags &= ~DDSD_PIXELFORMAT;
if (flags & DDSD_LPSURFACE) {
This->surface_desc.u4.ddpfPixelFormat = pDDSD->u4.ddpfPixelFormat;
} else {
FIXME("Change of pixel format without surface re-allocation is not supported !\n");
}
}
if (pDDSD->dwFlags & DDSD_LPSURFACE) {
HBITMAP oldbmp = priv->dib.DIBsection;
LPVOID oldsurf = This->surface_desc.lpSurface;
BOOL oldc = priv->dib.client_memory;
flags &= ~DDSD_LPSURFACE;
TRACE("new lpSurface=%p\n",pDDSD->lpSurface);
This->surface_desc.lpSurface = pDDSD->lpSurface;
priv->dib.client_memory = TRUE;
@ -1038,13 +1053,9 @@ DIB_DirectDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface,
if (!oldc)
VirtualFree(oldsurf, 0, MEM_RELEASE);
return hr;
}
else {
FIXME("flags=%08lx\n",pDDSD->dwFlags);
abort();
hr = E_FAIL;
if (flags) {
WARN("Unhandled flags : %08lx\n", flags);
}
return hr;
}