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

ddraw: Only update primary_lock when we're actually locking the frontbuffer.

Browse Source 
This fixes a regression introduced by commit
8330558e125c9073068ffbd7741f1128c17c1e08.
This commit is contained in:
Henri Verbeet 2011-10-27 17:06:24 +02:00 committed by Alexandre Julliard
parent 61550ff1de
commit 38abddca68
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ddraw/surface.c
View File

@ -972,12 +972,15 @@ static HRESULT surface_lock(IDirectDrawSurfaceImpl *This,
} }
} }
if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)
{
if (Flags & DDLOCK_READONLY) if (Flags & DDLOCK_READONLY)
memset(&This->ddraw->primary_lock, 0, sizeof(This->ddraw->primary_lock)); memset(&This->ddraw->primary_lock, 0, sizeof(This->ddraw->primary_lock));
else if (Rect) else if (Rect)
This->ddraw->primary_lock = *Rect; This->ddraw->primary_lock = *Rect;
else else
SetRect(&This->ddraw->primary_lock, 0, 0, This->surface_desc.dwWidth, This->surface_desc.dwHeight); SetRect(&This->ddraw->primary_lock, 0, 0, This->surface_desc.dwWidth, This->surface_desc.dwHeight);
}
/* Override the memory area. The pitch should be set already. Strangely windows /* Override the memory area. The pitch should be set already. Strangely windows
* does not set the LPSURFACE flag on locked surfaces !?!. * does not set the LPSURFACE flag on locked surfaces !?!.