Re: DDRAW: Surface locking patch, take 2

2005-03-28 Thread Alexandre Julliard
Matthew Mastracci [EMAIL PROTECTED] writes: I'm just pinging the list ot see if there's any reason why this patch hasn't been applied yet. AFAIK, it takes into account all the feedback received so far. If you think you have taken into account the feedback then you should resubmit the patch.

Re: DDRAW: Surface locking patch, take 2

2005-03-26 Thread Matthew Mastracci
Matthew Mastracci wrote: This patch (correctly) fixes the locking problems in SimCity 3000. We now check to see if the blit src and dest are the same surface and, if so, we make sure to lock the surface only once and, in the case of BltFast, re-adjust the surface pointers. This patch also

Re: DDRAW: Surface locking patch, take 2

2005-03-23 Thread Tony Lambregts
Matthew Mastracci wrote: This patch (correctly) fixes the locking problems in SimCity 3000. We now check to see if the blit src and dest are the same surface and, if so, we make sure to lock the surface only once and, in the case of BltFast, re-adjust the surface pointers. This patch also

Re: DDRAW: Surface locking patch, take 2

2005-03-20 Thread Christian Costa
Hi Matthew, This seems fine. There are some comments though, see below. Index: dlls/ddraw/dsurface/dib.c === RCS file: /home/wine/wine/dlls/ddraw/dsurface/dib.c,v retrieving revision 1.46 diff -u -r1.46 dib.c ---

Re: DDRAW: Surface locking patch, take 2

2005-03-20 Thread Christian Costa
Matthew Mastracci wrote: Christian Costa wrote: Hi Matthew, This seems fine. There are some comments though, see below. ... +if (src == iface) { +int pitch; + +UnionRect(lock_union, lock_src, lock_dst); + +/* Lock the union of the two rectangles */ +

Re: DDRAW: Surface locking patch, take 2

2005-03-20 Thread Matthew Mastracci
Christian Costa wrote: Hi Matthew, This seems fine. There are some comments though, see below. ... +if (src == iface) { +int pitch; + +UnionRect(lock_union, lock_src, lock_dst); + +/* Lock the union of the two rectangles */ +IDirectDrawSurface7_Lock(iface,