Re: [PATCH 3/4] ddraw/tests: Add tests for lost P8 primaries.
Stefan Dösinger <stefan(a)codeweavers.com> writes:
The explicit request of DDSCAPS_VIDEOMEMORY is needed to work around two bugs in Wine's ddraw that are not the concern of this test: If neither SYSTEMMEMORY nor VIDEOMEMORY are requested we use SYSTEMMEMORY for P8 surfaces because check_device_format fails. The next patch addresses this. The second problem is that we do not lose system memory surfaces on SetCooperativeLevel even though we should. (We should at least lose primaries. I haven't checked offscreen or texture surfaces.)
I don't feel strongly about having this test included. I'm happy with just sending it as a documentation that SetCooperativeLevel does not have to restore the palette. If the DDSCAPS_VIDEOMEMORY is considered ugly, or the fix in the next patch wrong just ignore the patches. I do not know any game that depends on the behavior tested here or the behavior changed in the next patch. --- dlls/ddraw/tests/ddraw1.c | 141 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 141 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 141 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 573 insertions(+)
It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M ddraw.dll -p ddraw_test.exe.so ddraw1 && touch ddraw1.ok ddraw1.c:5694: Test failed: Got unexpected hr 0. ddraw1.c:5696: Test failed: Got unexpected hr 0. -- Alexandre Julliard julliard(a)winehq.org
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-07-07 22:58, schrieb Alexandre Julliard:
It doesn't work here:
../../../tools/runtest -q -P wine -T ../../.. -M ddraw.dll -p ddraw_test.exe.so ddraw1 && touch ddraw1.ok ddraw1.c:5694: Test failed: Got unexpected hr 0. ddraw1.c:5696: Test failed: Got unexpected hr 0. I cannot reproduce this, but I think I see what's going wrong. The screen is in 8 bpp mode when this part of the test is executed. Can you try the attached patch? It explicitly requests a 32 bpp mode.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTu+IPAAoJEN0/YqbEcdMwdAwQAJMm+xqoAq3+OpQTRPjvSIf9 NcOkLeAW5c+ulZVm/j9GAUCOXme/WieYmG3Gngbc5nxG1fbCLERKceZ62J5XBG2Q 3ruoMDKSeYkYaaQkB9JeTzwjvuZYdtYIlI8JI2t0mB6iKS2hksRr+/5WA/wLVrAd of1jsl0+GRI2G0zHL74BjAPuFro4dxc0cvYlACVpMNNroPXjWoYM1JjEMO6dRQkJ 9Z6EVSwPVq9y/dmztjlkF6x+CccH/HWMjsZwCPc1CQ1wUjRUnZZuTbgjfG5DMWjP r6Rw2Dmb9fg/JxlwYgg0ZJm9D42OhzHCYoo8lQOBBaRlQxIMTt6VrwdoYItSucX0 Y7JnA+vULEgImk1kPHT56wQHdm2MOdsNJ3o7IT7rcqh4gj/y0NAZdzPuSeCJ2Obk CR05V5+fIhZeRzQD/vsXKzi31dBd62G+iESJC3kXHXynsIXnGMdUq1BXUducM5di BAXMTHDJY6Qn6M3g5LaaLR8BDP0zTELm5xoKTB/dMCazb6XaMomyIu9Jx7f/4Ic3 RPt4ZatdGWAXBOqQcSvttJzvNipDe5lLatxqx7ctm+IASht0ZS41nUEWo9cjKQ9p knNrKNyLETxZHhMNbXbJbtNR58GtOUoszwRRxSKqgLpvWf0/slvDxmpofKyjSIxv XURJqt2KvxXHzkETRXZ+ =GIhl -----END PGP SIGNATURE-----
Stefan Dösinger <stefandoesinger(a)gmail.com> writes:
Am 2014-07-07 22:58, schrieb Alexandre Julliard:
It doesn't work here:
../../../tools/runtest -q -P wine -T ../../.. -M ddraw.dll -p ddraw_test.exe.so ddraw1 && touch ddraw1.ok ddraw1.c:5694: Test failed: Got unexpected hr 0. ddraw1.c:5696: Test failed: Got unexpected hr 0. I cannot reproduce this, but I think I see what's going wrong. The screen is in 8 bpp mode when this part of the test is executed. Can you try the attached patch? It explicitly requests a 32 bpp mode.
It seems to avoid the error, but it somehow screws up the mode changing so that subsequent tests fail. -- Alexandre Julliard julliard(a)winehq.org
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-07-08 16:47, schrieb Alexandre Julliard:
Stefan Dösinger <stefandoesinger(a)gmail.com> writes:
Am 2014-07-07 22:58, schrieb Alexandre Julliard:
It doesn't work here:
../../../tools/runtest -q -P wine -T ../../.. -M ddraw.dll -p ddraw_test.exe.so ddraw1 && touch ddraw1.ok ddraw1.c:5694: Test failed: Got unexpected hr 0. ddraw1.c:5696: Test failed: Got unexpected hr 0. I cannot reproduce this, but I think I see what's going wrong. The screen is in 8 bpp mode when this part of the test is executed. Can you try the attached patch? It explicitly requests a 32 bpp mode.
It seems to avoid the error, but it somehow screws up the mode changing so that subsequent tests fail. Can you send me a +ddraw,+d3d log of the original patch and the new one?
Thanks, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTvAW9AAoJEN0/YqbEcdMwBPgP/i2CgkiomenRj0CaNdOPL9/8 Im1g+fU5XS+lYfnBmXMvNbxB0FK4v4dWW2qktSXjEgVwxxcoQe1i80uea+p0MvGo 3seyfsPYWM2hB+OPgYScfzXUhWxdjWXuUdH7s+2C951jFFYpmO7Ka90RcWnzU1Vc Ky7ARZLsWGx/sTXVHKeTaD0FOMx++wSJ2ckLbvUFo1sTvjN7QOC5Vlv0KOok0eZf FJisUSxHsza8KkmPSzLFonmwyrkdWyy44t7HlF1jfQ4S+GFmxYoJiqshOmZj72GP Rgw0xDxPKP19YoNMYcxIN/a5ZxViHIusULVOFR15VgDuGyzhojyEJ1r7AdOiijZU I/XXqBWmOM/B9/gYjSMUbc2y6wbYQaRBPi14l6SqiqsEwiOF2DrNKYKX6ow0OvRd h27wkrfO3JmskNrN0gug1YpdyEWFh2QpkrrEvPKZvtVNN/o8xxGkUMV40jpYSBc2 meLq6a1Ry4Sn2NWB3A+NoR5ZDEOK31TD6xowWUhS5lhEDMH2+4o/Bb1m20GydoDh 8B7Cn4CqO2HG1QWLCjE1ODYFhu+h06vrRf6byBTmqsrPNYFsw4/GlTXNeBYQkrUw YxaoAPpJnJxHHYwLYOQjD0WYacIyDeHmx83W2JB90hCT5FQPY2/60fEDBLxj0Mlx IZR4j0Yp7/eJtWmWzx6X =NXix -----END PGP SIGNATURE-----
participants (2)
-
Alexandre Julliard -
Stefan Dösinger