January 2011 - Wine-Devel - list.winehq.org

Re: wined3d: Update clip planes when switching to/from offscreen rendering.

by Matteo Bruni

2011/1/31 Stefan Dösinger <stefandoesinger(a)gmx.at>: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > > Am 31.01.2011 um 15:57 schrieb Henri Verbeet: > >> On 31 January 2011 15:45, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: >>> >>> If we change the shader code to write gl_ClipVertex and result.clip before applying the y inversion then we should be able to avoid this. That should also make it more compatible to fixed function vertex processing - here the clipping is performed before the projection matrix is applied. >> >> Wouldn't it still have to be after the half-pixel offset is applied though? > That's what I am not sure about, but my gut feeling says no. In the ffp pipeline clipping wrt user clip planes is done in eye coordinates, so the half pixel offset should have no effect on it. I see no reason why it shouldn't work with shaders in the same way. > The attached patch should follow your idea, does it look right? FWIW, I can't see any 1-pixel offset in The Sims 3 with this patch. Yes, I know that's not how it should be tested... > -----BEGIN PGP SIGNATURE----- > Version: GnuPG/MacGPG2 v2.0.17 (Darwin) > > iQIcBAEBAgAGBQJNRtD8AAoJEN0/YqbEcdMwVOUP/1x8ZB6vutkspZU2fhspi1tE > s+b1drKBfHMu3LxswKwo/tA+xB/3h+qyKLuo6GT0kqQ+kF4IbFE3No1oX//baRDn > 9eWYke1dz/Q0Jh6K1dA72moptYvbpplgvjr4/8bnBCFGChkbQsaK2O0o6zxFtIXc > yeTxB+oymu0tNxLXzJn+nrOT3qMp1yN9c/MX7crK7O0B56RAUTTg8P4i2Zz4r9L8 > WBHQ8sGGBtpeN9lf65MZeJNZvchLrWsJjq5iDvGxl1vRVuEsMzMEM7xqosOeQgul > dFlYQFRTNxQk0XCdprq2jIdc/HiZANjvXO7U0eBiV6Orjo91Rbjtg2UCr43Q3hQH > wdtoXYyPRbCuvttEpnQBg6vg/UegTGIqKNl2QynN/wFocoJ/2FX+aNC49KGnrhEj > RzUCPuLuQ4y2DqX5zqggnbmrFPHke2Gbz4RJZy085X+FbKGpWen3o+iZCK2rX294 > 8nrlfO1JEGu2Gay+gqUJUQFUhdI1DRr0i5c+Lw7sLztqTZDeGt4/Al+wEDmkS1XA > lRJVdOtib+BtBzXB2k9H5vawJt2xmqxSmMfjBu7tvkdoINISmDRNHZoow/Io2sid > P2ZYNXt1AFnRFrvtC5CMLkTYEqMhh5/mcAzrmsVVD8WR4mwAR8dGUMCH17R3+C3L > P9sP1J5E/M1B9Yx5YV8M > =gL/E > -----END PGP SIGNATURE----- > > >

Jan. 31, 2011

Re: winex11.drv: Make sure that default clipping region exists before calling ExcludeUpdateRgn().

by Alexandre Julliard

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > Alexandre Julliard <julliard(a)winehq.org> wrote: > >> > I looks like the default clip region created by ExtSelectClipRgn() uses >> > the dimensions of the selected bitmap, and it's not large enough. >> >> That's a window DC, it doesn't have a selected bitmap. > > You are right. The app creates very large child window to fit the whole map > inside it (it's at least two times larger than the screen), and moves the child > window inside the parent window once one presses mouse button and drags the map > (when I drag the map into the left top corner the coordinates of the child window > are about -970,-860 while the screen resolution is 1680x1050 in my case). So, > using the screen size for a default clipping is not enough. OK, that makes sense. It sounds like a test case for ExtSelectClipRgn is in order, before we work around it. -- Alexandre Julliard julliard(a)winehq.org

Jan. 31, 2011

Re: winex11.drv: Make sure that default clipping region exists before calling ExcludeUpdateRgn().

by Dmitry Timoshkov

Alexandre Julliard <julliard(a)winehq.org> wrote: > > I looks like the default clip region created by ExtSelectClipRgn() uses > > the dimensions of the selected bitmap, and it's not large enough. > > That's a window DC, it doesn't have a selected bitmap. You are right. The app creates very large child window to fit the whole map inside it (it's at least two times larger than the screen), and moves the child window inside the parent window once one presses mouse button and drags the map (when I drag the map into the left top corner the coordinates of the child window are about -970,-860 while the screen resolution is 1680x1050 in my case). So, using the screen size for a default clipping is not enough. -- Dmitry.

Jan. 31, 2011

Re: wined3d: Update clip planes when switching to/from offscreen rendering.

by Stefan Dösinger

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 31.01.2011 um 15:57 schrieb Henri Verbeet: > On 31 January 2011 15:45, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: >> >> If we change the shader code to write gl_ClipVertex and result.clip before applying the y inversion then we should be able to avoid this. That should also make it more compatible to fixed function vertex processing - here the clipping is performed before the projection matrix is applied. > > Wouldn't it still have to be after the half-pixel offset is applied though? That's what I am not sure about, but my gut feeling says no. In the ffp pipeline clipping wrt user clip planes is done in eye coordinates, so the half pixel offset should have no effect on it. I see no reason why it shouldn't work with shaders in the same way. -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.17 (Darwin) iQIcBAEBAgAGBQJNRtD8AAoJEN0/YqbEcdMwVOUP/1x8ZB6vutkspZU2fhspi1tE s+b1drKBfHMu3LxswKwo/tA+xB/3h+qyKLuo6GT0kqQ+kF4IbFE3No1oX//baRDn 9eWYke1dz/Q0Jh6K1dA72moptYvbpplgvjr4/8bnBCFGChkbQsaK2O0o6zxFtIXc yeTxB+oymu0tNxLXzJn+nrOT3qMp1yN9c/MX7crK7O0B56RAUTTg8P4i2Zz4r9L8 WBHQ8sGGBtpeN9lf65MZeJNZvchLrWsJjq5iDvGxl1vRVuEsMzMEM7xqosOeQgul dFlYQFRTNxQk0XCdprq2jIdc/HiZANjvXO7U0eBiV6Orjo91Rbjtg2UCr43Q3hQH wdtoXYyPRbCuvttEpnQBg6vg/UegTGIqKNl2QynN/wFocoJ/2FX+aNC49KGnrhEj RzUCPuLuQ4y2DqX5zqggnbmrFPHke2Gbz4RJZy085X+FbKGpWen3o+iZCK2rX294 8nrlfO1JEGu2Gay+gqUJUQFUhdI1DRr0i5c+Lw7sLztqTZDeGt4/Al+wEDmkS1XA lRJVdOtib+BtBzXB2k9H5vawJt2xmqxSmMfjBu7tvkdoINISmDRNHZoow/Io2sid P2ZYNXt1AFnRFrvtC5CMLkTYEqMhh5/mcAzrmsVVD8WR4mwAR8dGUMCH17R3+C3L P9sP1J5E/M1B9Yx5YV8M =gL/E -----END PGP SIGNATURE-----

Jan. 31, 2011

Re: user32/gdi32: Fix for a crash in create_alpha_bitmap()

by Alexandre Julliard

Peter Schlaile <peter(a)schlaile.de> writes: > And: do you want to say, that there is a page fault handler within > wine, that can handle *that* case above? Yes, that's how DIBs work in Wine. > In either way, I hope we can agree on the following: > > a) the app is *not* broken (at least not regarding it's usage of > CreateIconFromResourceEx() ) > b) wine code *is* broken here > c) we can work around the problem within create_alpha_bitmap() or > d) make StretchDIBits() a function a lot less surprising to call... There's nothing surprising here. The page protection is transparent to the app, and exceptions are handled by Wine. It's only because the app breaks exception handling that you get problems. > At least, they seem to install the handler in such a clever way, that > no problems seem to occur within Windows (several different versions). > That said: I'd have prefered, if they didn't do that, since it made my > debugging session a lot longer... They don't install it in a clever way, that's the whole problem. They simply blindly override any other installed handler. The only way to fix it apart from writing a DIB engine would be to add a special hack to make the DIB exception handler take priority over the app broken handler. -- Alexandre Julliard julliard(a)winehq.org

Jan. 31, 2011

Re: wined3d: Update clip planes when switching to/from offscreen rendering.

by Henri Verbeet

On 31 January 2011 15:45, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > > Am 31.01.2011 um 15:13 schrieb Matteo Bruni: > >> It should fix http://bugs.winehq.org/show_bug.cgi?id=25877 >> <0001-wined3d-Update-clip-planes-when-switching-to-from-offs.txt> > If we change the shader code to write gl_ClipVertex and result.clip before applying the y inversion then we should be able to avoid this. That should also make it more compatible to fixed function vertex processing - here the clipping is performed before the projection matrix is applied. Wouldn't it still have to be after the half-pixel offset is applied though?

Jan. 31, 2011

Re: wined3d: Update clip planes when switching to/from offscreen rendering.

by Stefan Dösinger

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 31.01.2011 um 15:13 schrieb Matteo Bruni: > It should fix http://bugs.winehq.org/show_bug.cgi?id=25877 > <0001-wined3d-Update-clip-planes-when-switching-to-from-offs.txt> If we change the shader code to write gl_ClipVertex and result.clip before applying the y inversion then we should be able to avoid this. That should also make it more compatible to fixed function vertex processing - here the clipping is performed before the projection matrix is applied. -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.17 (Darwin) iQIcBAEBAgAGBQJNRssNAAoJEN0/YqbEcdMwZv8P+wbbhcamRsg42fMzJ02jKLcT s4p19OqKPZEdVvzsfQCe4e7KGgGdZUefMWsY2ib9AK21cQXB3R9fnyl5TMDcuxuh EojJvAQCVd/hgnz7tserUJT6rS/W08BPsdHM4dgxdnhRTzi2FAc7l3NgFOONJXpG i8HfcmD2AgaGOam6Wriv3SD8fM0zrfmpZdJDH1moCefqptEEWD9adwWRSMhaMvTl rlj1gDR9cRC9fsxur2U1f5NuXN0AY+a+5VPQHElZV2bP9ulheoa9nYuXU+8F7OhK RyIJ2DO4vpaLpEbXW/amtUWnlBSk0n7k3F9w/fcthOmUvlPHOBY7i2Ukf4j84vQD AhpN7Yf4cFZaSV8q/gww+U9H1udelidiTEL05OKQJUohnM1F9/cRnXbXmmA5Nuia rQlcCnm12cw1ClykdrY7B/hDCqGOPnnmPp580kW1LlEtidYyGbG35seyHxNqcNcQ RWlvVsGwvlzgex7qWf9hT34KOcUzMKZdlehfvtQn0Fjrcf+/3s5EvrtG4Mw6qHNh aBFNaeB8LkV36hu71r/1yxsqHO+taYt1/Ho8poANYbOplV9FCpd0nXeK8n7rqCPx L5TVgSJVd4n354FlguuIUAiFlXxcxFN2CJlN2Hd4dwhZZhGBh+4LH+XhjUtzX4ge 15usBq4VUhhssvv6dVys =urcm -----END PGP SIGNATURE-----

Jan. 31, 2011

Re: user32/gdi32: Fix for a crash in create_alpha_bitmap()

by Peter Schlaile

Hi Alexandre, On Mon, 31 Jan 2011, Alexandre Julliard wrote: >> And: from a design perspective it sounds very strange that a fast >> track optimisation *silently* changes protection bits! > > There's nothing silent about it, the protection bits have to match the > DIB state. Hmm. In which way changes StretchDIBits() the DIB state? Or: why should be a DIB, that is created using CreateDIBSection() as READWRITE, silently change it's state into READONLY? (At least, msdn-docs don't tell me anything about that... Can you provide me with a link? ) But, let's say for a moment, that this is true and the right(tm) behaviour: Then create_alpha_bitmap() (within user32/cursoricon.c) seems to be broken. It does the following: * create a DIBSection alpha = CreateDIBSection( hdc, info, DIB_RGB_COLORS, &bits, NULL, 0) * here we can savely expect bits to be writable (at least the msdn-documentation says so) * in certain cases (if we are provided with a src_info-pointer), we do now: StretchDIBits( hdc, 0, 0, bm.bmWidth, bm.bmHeight, 0, 0, src_info->bmiHeader.biWidth, src_info->bmiHeader.biHeight, color_bits, src_info, DIB_RGB_COLORS, SRCCOPY ); * after that, bits is *probably* non-writable (depending on fast path or not) (I still find that *really* strange. Again: it depends on certain parameters of this function, specifically: if in and out parameters do match at enough places, the DIB bitmap *changes* it's state to READONLY, in other cases it doesn't. If that isn't a big surprise, what is? :) ). * and here... /* pre-multiply by alpha */ for (i = 0, ptr = bits; i < bm.bmWidth * bm.bmHeight; i++, ptr += 4) { unsigned int alpha = ptr[3]; ptr[0] = ptr[0] * alpha / 255; ptr[1] = ptr[1] * alpha / 255; ptr[2] = ptr[2] * alpha / 255; } * ... we write to the now readonly bits-array, which leads to a page fault. This is everything within wine code, the application only called CreateIconFromResourceEx(), which then called create_alpha_bitmap() (so: no, I don't think, the app is broken :) It only triggered a seldomly used code path within wine. ). Where is the page fault handler within wine and what should the page fault handler actually do in that situation? If we can't expect the "bits"-pointer to be writable after a call to StretchDIBs(), create_alpha_bitmap() should be rewritten. >> That wouldn't be a problem, if windows behaved exactly the same way. >> (which it most likely does not, otherwise PNClient wouldn't crash, >> right?). > > I wouldn't be surprised if there was a way to crash it on Windows too, > that app is broken, it never gives the code a chance to handle the > exception. This is not how exception handlers are supposed to work. Well, it doesn't crash on Windows and is actually rock solid there. And: do you want to say, that there is a page fault handler within wine, that can handle *that* case above? We either have to rewrite create_alpha_bitmap() in a way, that doesn't call StretchDIBits() in the fast path case and solves problems differently or: we should fix it at the source (which I still think my patch does, since it follows the rules of least surprise...). In either way, I hope we can agree on the following: a) the app is *not* broken (at least not regarding it's usage of CreateIconFromResourceEx() ) b) wine code *is* broken here c) we can work around the problem within create_alpha_bitmap() or d) make StretchDIBits() a function a lot less surprising to call... > Of course this specific issue would be fixed by a DIB engine, but there are > other places where exceptions can happen internally, even on Windows. At least, they seem to install the handler in such a clever way, that no problems seem to occur within Windows (several different versions). That said: I'd have prefered, if they didn't do that, since it made my debugging session a lot longer... >> Are you sure? 0 means: everything is transparent, and that sounds >> like: we need an alpha channel, right? > > 0 means there's no alpha channel, which is what we are checking here. Ouch! If that is really Windows behaviour, then it is really broken but bug-to-bug compatible :) Cheers, Peter ---- Peter Schlaile

Jan. 31, 2011

Re: [3/3] d3d9: account for another different behavior in the viewport test

by Stefan Dösinger

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I just noticed that I sent the other two mails with my gmail account, so they got stuck in moderation. This patch should apply on its own, but depending on what Alexandre commits today I'll resend the patches after today's commit wave. Am 31.01.2011 um 11:21 schrieb Stefan Dösinger: > The alternative to this patch is to remove the test entirely, as it now accepts all possible outcomes on windows. I prefer to keep it because the behavior it accepts as non-broken(invalid viewport = "default" viewport) is required by some ddraw apps. We also have a test in ddraw, but it isn't quite as straightforward. > > <0011-d3d9-account-for-another-different-behavior-in-the-v.patch> -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.17 (Darwin) iQIcBAEBAgAGBQJNRsifAAoJEN0/YqbEcdMwUSAP/2HphIB7RzKXuS/q52t5mCvt b9yFQ/9ci11GWlzWG7okm72Z+hUdC4bIMPxIalWM7/VKPzsSB7Qg2EvwpMTGq0r5 lAX3WFFqWqCNoAZd7JnQO6LqX0TR4wJOCxIjAYSw+WlZW7tYNVFEsw3mPTUxqggR 88wVQ8C5oBAW3Rns6QGYmxyw+R6Xryh3pdukxBP2DS6jQDkqodq9L6JU24YHHy0z OFEZCIAl8VqhTfgTeO5pqJ7e4ujGyT0U25h8rmIuhMt8DFRdxTSE4agib4haFrLb jLEUAVqjSrV4EX1A+iisryBYCCOGpGT9vYKB5Xw169fzkjd2XMQ9C3udE/VznGWo grcWX9CJxm1XzR/AYuNh+pNSq+wZPxwrlJrOmcW4EC1o1X/OdXr+KtZFX2ldkGwF v6LCel4WPN5G4+mKryNnPMRDPo69ccZr2iKTdMQFs7nm0NZGxPNnj3o7eGDP92pq DNUboQ3EoZ3ow9c8vpfeGgxk647jgJwpeOzUKj7ON3l5XyFvoEAAv2pFwRp/lpn8 3ioLYDePd7VBcf6cT9ckI0Qptx2hM8yRyd1r+qC4jGv8ydQnHmAu+w61cmSrpl3X EYpvHmFYEdkJjDKcn2Z1gYekg4RisXcd/CVBWfZHLudpibEab+3NQp7wb+HwNscu 2P/hz0RIdqEC7BBQf6bJ =Vxnq -----END PGP SIGNATURE-----

Jan. 31, 2011

Re: winex11.drv: Make sure that default clipping region exists before calling ExcludeUpdateRgn().

by Alexandre Julliard

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > I looks like the default clip region created by ExtSelectClipRgn() uses > the dimensions of the selected bitmap, and it's not large enough. That's a window DC, it doesn't have a selected bitmap. -- Alexandre Julliard julliard(a)winehq.org

Jan. 31, 2011