Re: [ddraw/dsurface/dib.c] Check for NULL

[Christian Costa]

> Message du 09/03/05 16:52
> De : "Paul Vriens" 
> A : "wine-patches(a)winehq.org" 
> Copie à : 
> Objet : [ddraw/dsurface/dib.c] Check for NULL
>
> Hi,
>
> the recent 'ddraw lock' changes crash Zoo Tycoon 1 Demo.
>
> Changelog
> Check for NULL before touching src.
>
> Cheers,
>
> Paul.
> >

If src == NULL, you still need to check if the destination surface is not locked.

Bye,
Christian

[ddraw/dsurface/dib.c] Check for NULL

[Paul Vriens]

On Wed, 2005-03-09 at 19:01, Christian Costa wrote:
> > Message du 09/03/05 16:52
> > De : "Paul Vriens" 
> > A : "wine-patches(a)winehq.org" 
> > Copie à : 
> > Objet : [ddraw/dsurface/dib.c] Check for NULL
> >
> > Hi,
> >
> > the recent 'ddraw lock' changes crash Zoo Tycoon 1 Demo.
> >
> > Changelog
> > Check for NULL before touching src.
> >
> > Cheers,
> >
> > Paul.
> > >
>
> If src == NULL, you still need to check if the destination surface is not locked.
>
> Bye,
> Christian
> You mean:

if (This->locked) {
        WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n");
        return DDERR_SURFACEBUSY;
    }
                                                                                                                                        
    if (src != NULL) {
        if (((IDirectDrawSurfaceImpl *)src)->locked) {
            WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n");
            return DDERR_SURFACEBUSY;
        }
    }

or something alike? 

Cheers,

Paul.