ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix crash in the X11 HAL when setting a NULL palette to a surface.

This commit is contained in:
Lionel Ulmer 2002-02-26 00:36:21 +00:00 committed by Alexandre Julliard
parent 519d4864ea
commit e88edac600
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ddraw/dsurface/hal.c
View File

@ -223,7 +223,7 @@ void HAL_DirectDrawSurface_set_palette(IDirectDrawSurfaceImpl* This,
DIB_DirectDrawSurface_set_palette(This, pal); DIB_DirectDrawSurface_set_palette(This, pal);
data.lpDD = dd_gbl; data.lpDD = dd_gbl;
data.lpDDSurface = &This->local; data.lpDDSurface = &This->local;
data.lpDDPalette = &pal->global; data.lpDDPalette = (pal != NULL ? &pal->global : NULL);
data.ddRVal = 0; data.ddRVal = 0;
data.Attach = TRUE; /* what's this? */ data.Attach = TRUE; /* what's this? */
data.SetPalette = dd_gbl->lpDDCBtmp->HALDDSurface.SetPalette; data.SetPalette = dd_gbl->lpDDCBtmp->HALDDSurface.SetPalette;

8
dlls/x11drv/x11ddraw.c
View File

@ -159,12 +159,14 @@ static DWORD PASCAL X11DRV_DDHAL_DestroySurface(LPDDHAL_DESTROYSURFACEDATA data)
static DWORD PASCAL X11DRV_DDHAL_SetPalette(LPDDHAL_SETPALETTEDATA data) static DWORD PASCAL X11DRV_DDHAL_SetPalette(LPDDHAL_SETPALETTEDATA data)
{ {
Colormap pal = data->lpDDPalette->u1.dwReserved1; if (data->lpDDPalette && data->lpDDPalette->u1.dwReserved1) {
if (pal) {
if (data->lpDDSurface == X11DRV_DD_Primary) { if (data->lpDDSurface == X11DRV_DD_Primary) {
FIXME("stub\n"); FIXME("stub\n");
/* we should probably find the ddraw window (maybe data->lpDD->lpExclusiveOwner->hWnd), /* we should probably find the ddraw window (maybe data->lpDD->lpExclusiveOwner->hWnd),
* and attach the palette to it */ * and attach the palette to it
*
* Colormap pal = data->lpDDPalette->u1.dwReserved1;
*/
} }
} }
data->ddRVal = DD_OK; data->ddRVal = DD_OK;