wine-devel February 2014

wine-devel@winehq.org

63 participants
247 discussions

Re: [PATCH 5/6] wined3d: Add support for I420 textures
by Stefan Dösinger 12 Feb '14

12 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-02-11 12:14, schrieb Martin Storsjo: > I420 is similar to YV12, but the chroma planes are swapped. Do you have an application that uses this? Just making sure we're not adding dead code here. Otherwise this looks good, but patch 3 needs fixes. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS+4lrAAoJEN0/YqbEcdMwDjUP/1mawzD6WIoBsR/eFxSDu2SZ yE4AHd/HaUkYwYan6CjiYAV8uf3ikUIGHQhvyF79jKikRWUCGHRoQTL8xwx6wcXm fCIQjPuuwpizEpdGjD+mZHWMgg+RtgbYrJbSX8pWtRfcRQsVxtB8Q5tXyVtZGwWr vBtmeQUlaIBlSH8hG5ZC0UGsljP/hwV/LayeYmAKFRTccX/PFKTM1cua5AznPrxQ noEW9kYxpilWDPwvNWsic7e6FCYTHxMGZblVC5FSMxSq/66CAYUakD1iRc4xomw7 9jk0UQ308LKTzw7m86HfvnuqvIHprhZcn1IHwDWAmGxsQD+e+4uJ8XBwAKA575Sm RUQMDZdXzsxmBkZIYGDs7WNI03v6rEsGaM3KoHuurfhmc7XaCjzla0W3Y0yLgN4P 9+7WHzBZ8CyYDBHsNKNkFpXEwQuSzAbzr+nt8/8RhrwHyIa2RX26xCe91+6MYKkc trwK1inGiB3CBvzEha/YQuGzeyzTp8oV6yhGnGpf5tPJlRtzxc8IpHmWXCdwrk6z 3AAxUliwm4cYTPgrY2zAXHc/0rTULQ+3GCUb3pWGgdKCDzmyWsPaZ5TY0XmBGvIH R9JrC39ku/Md33+oWCKF4tpwzJ1go6eWnbBu/mPKStpoTaIi708H/vrTCmL/dHCp aYOYafddUXk5NKEcS91m =dZNW -----END PGP SIGNATURE-----

3 3

Re: [PATCH 6/6] d3d9/tests: Add tests for different YUV texture layouts
by Stefan Dösinger 12 Feb '14

12 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-02-11 12:14, schrieb Martin Storsjo: > + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 8, 8, format, D3DPOOL_DEFAULT, &surface, NULL); > + ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface failed, hr = %08x\n", hr); Please use a non power of two size and skip the test if D3DPTEXTURECAPS_POW2 is set and D3DPTEXTURECAPS_NONPOW2CONDITIONAL is not set. That should avoid another regression in the np2 code. There's a decent chance that StretchRect from a plain np2 surface works even if NP2 textures are completely unsupported, but it will be rather hard to find a Windows machine to confirm this. > + memset(&lr, 0, sizeof(lr)); > + hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0); > + ok(hr == D3D_OK, "IDirect3DSurface9_LockRect failed, hr = %08x\n", hr); There's no need to memset lr to 0. We know LockRect returns a properly initialized structure if it succeeds. > + switch (format) > + { > + case D3DFMT_YV12: v_buf = chroma_buf; u_buf = chroma_buf + 4 * lr.Pitch/2; break; > + case D3DFMT_I420: u_buf = chroma_buf; v_buf = chroma_buf + 4 * lr.Pitch/2; break; > + default: break; > + } The switch causes a warning here because YV12 and I420 are not part of the D3DFORMAT enum. Please use an if to make the compiler happy. Set v_buf and u_buf to NULL in case of other formats - this should avoid the warning that they may be uninitialized. (Although I think the compiler is broken here. It should see that they're not used for formats that are not YV12 and I420.) > + /* Draw the top left quarter of the screen with color1, the rest with color2 */ > + for (y = 0; y < 8; y++) > + { > + for (x = 0; x < 8; x += 2) > + { > + DWORD color = (x < 4 && y < 4) ? test_data[i].color1 : test_data[i].color2; > + BYTE Y = (color >> 16) & 0xff; It would be nice to use different values for the two Y channels, unless this makes reading the result too difficult with filtering on. > + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 1.0f, 0); No need to clear the Z buffer. > + ok(hr == D3D_OK, "IDirect3DDevice9_StretchRect failed with 0x%08x\n", hr); Please use %#x instead of 0x%08x and add interpunctuation at the end of the ok message. Another set of unwritten style rules :-\ . -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS+5B8AAoJEN0/YqbEcdMwgLUP/19EoAQNiOg0JTdAHco28fTm zfSqZtMTv7JJAtznqt5EilK2gb33/oiyMXZcotg6YevJWRFrVQQw9K3b+JepxY4O l8ZBas9GGEAoTppb4W03w7Ngzr5J4yBBSXpVoEQDnmztywzZqcpaQc4y1/ukkkgg lN7HIPP3tychxk3IBiQtgVQ/U+xC6BmEgWdNClDBBpMnGkKbLERLjxpkOPi7fs1f FPOCW7P18BDLANw/FMipEqDsm+K/EOdVFBU4wcIWB7BOavZzwGRaKDFdifhwq2VR CBvm3uT6drct5put/JF/RIfnY5Za7GOIi5Ks4P0Gwt/e6xQ3WK+LrsEAASottF0O IUskCxGIKB/P7CsxtwGjTg9gDOm35W+4g0QiMvBoJk8dO2eggPXdNdmAR+5ZI/ez wxZzAl9m8VnXe0xeUSMha44n7F3EJ8Bz7F/Sixc6v8G6pmVdJNK9LM8+ZqD4muWQ cnZNKWLMeWaufb3KEVno0F2SUFhGb7q/FHBCInaz9EKOG5yMEEzNbHYMh3v/oJ9s IWXJgavdbIfUbj1YGulasKqlNzHzKnL+V2oMaqT+rGxypAcVentxIbV/bFseN091 b6oc8bL9KIKEHpWtPKqXYJ3wZBb2dKbcFhmd2VDNrWQSOTI5ZeU5xUnfsXeIthqo ntdGlkDSfAJlSMvzZOyh =m68B -----END PGP SIGNATURE-----

2 1

Re: [PATCH 4/6] wined3d: Fix the YV12 illustration
by Stefan Dösinger 12 Feb '14

12 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-02-11 12:14, schrieb Martin Storsjo: > The comment in the description further above is correct, that the > chroma planes are ordered V, then U, while the illustration had > them swapped. This patch looks correct to me. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS+4czAAoJEN0/YqbEcdMwKx8P/1J1flCobX1Z3XHptyIlEuyC gVt1OwxjQ2ayx5WwTtO8wlY//h+167HE4Ip7KFxk3QR21PKO/kvmhImmjVr2oUdm t8ZDh3q3158qSu1USNvKfTzLaBpXbXQNs10XIgvj2olHw80+CW0ZodPONAls94dU YHVAmYataxvTMkM/EXooBVJkJdF0qy80pkAcQLpN+wwpw+xZXwXq0901bm2u2LJn XuN9UDS9lViR2NRSNUkHhJKNKJiy72U6RXnKsjao83IES27zFKCpaJx8UeyvRCQY ZGCREFf4Xw9ge+Bi2tA5zfCeClVVZ5ds2gSbTvGmy7DAcjYCG4z7iYwWaUOWduH/ OGW9ASPdqvRTELjqB40x1hvtdhhFFjC2PI+UbS1ltiIpgHUQn2FZcG9qsOh1QaDt ddtyOc1cKazeE4iFFdDfNy9cJTg8n0bKAEFAfj/tUsKJjoDfbOyF0xeEsECs6MVt ayaEWUduLTD/hHq7kA/U8vzGmucJ7Ng7XvypLu3vKbH76f63e4nuUWfc8K2VpAXK SRoLvhePgmUkXkus+Y3l3ttAvN/y+HhKZiNvFIxQKUfZ07mg4gqhM1DzwO0/9Gdt byo+Nu0bK9arSyJUCi7Ah+fcBvJUCAvt47xQ1AnUvv2/2sOUfWcPxSERX4WLFPRG /RSNua7b9MRvibHxXC1G =rFkd -----END PGP SIGNATURE-----

1 0

Re: [PATCH v2 1/6] wined3d: Add support for NV12 textures
by Stefan Dösinger 12 Feb '14

12 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi again! I have some more format nitpicks below. As far as the big picture is concerned there is also a software conversion path in dlls/wined3d/surface.c. Search the file for d3dfmt_converter_desc and you should find the right place. You don't have to submit a patch for that unless you know an application that needs it though; I'm just making you aware of it. Am 2014-02-11 12:14, schrieb Martin Storsjo: > + switch(textype) You're missing a space here. As far as I can see the other places in this patch are correct, but it doesn't hurt to double-check with grep or something. (I really hope the testbot can one day take care of this...) > + case GL_TEXTURE_2D: tex = "2D"; break; Please make this case GL_TEXTURE_2D: tex = "2D"; break; etc > + * When reading from rectangle textures, keep in mind that > the input y coordinates + * go from 0 to d3d_height, whereas > the opengl texture height is 1.5 * d3d_height + */ Comment closing should go next to the last line of text. Also add proper interpunctuation at the last sentence of a comment. This applies to a few more places in this patch, and most likely the other patches. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS+4aPAAoJEN0/YqbEcdMwCXMQAIPeaYbrI+zC2zf6KlOdOCbe yDSbSvRS4vZWkukemQCb6jr2qFCjqoCJMHj1GpfWxlBxJ1+rOWyTdc+YG2DDzCqk YE3K8PgOaID7BnopA/Ri0gYiwRz7K2WBpMWMwgeVnjTFOUWJ8tYt1z4VmCHXgEEi JDphv1q9IDzCW/s3Pu68VtDrE4rsG/KLietRPTCgakdjX1oLvlKn1Fg5D7q78y87 szJg2SRaYOVWSXIK2D+s+A5Tvjr9gffSsDE6fgFgxeFyHsViGyq6QDJEBxCO+f+A UZ1FhidcogIt/sqSphg7lCyEUw49WojlXSXhLpdofwjrR/4griYgp21h6Y8UhtqG LzPUVGBfScvb208bIhL+LvCukQ00WnTI4LJA6khjL9AlCnrzh4nrhVo6RQDrL1A3 6V5gJLd1ZT4DepQc2XQLC0FupgYWafIJAzCcpZIpvQRjzH4MqJgeJC9m6alRzyWr TkN+Jo6yKRk2t+x7LOzee+mMPAfIT2OcHoIlG60Z8ZxK3Apu6k7/RPoqi1BWdJZZ gHA1CZLUDC+UXhPhr2pxNy4AQnD2EbIBp5GPKNHHvoqJJzXvbHPBx5TgOOaEyLnH idubGx+GLf3zXEaK+ujbMg8Ae/poGh841gBVbMLDqZguSkuTsVGpt8hjCZgWq+5d u177zpoEIMhOFIK17nSY =IHTQ -----END PGP SIGNATURE-----

1 0

Re: [PATCH 6/6] d3d9/tests: Add tests for different YUV texture layouts
by Stefan Dösinger 12 Feb '14

12 Feb '14

Am 11.02.2014 um 12:14 schrieb Martin Storsjo <martin(a)martin.st>: > +#define D3DFMT_YV12 MAKEFOURCC('Y','V','1','2') > +#define D3DFMT_I420 MAKEFOURCC('I','4','2','0') > +#define D3DFMT_NV12 MAKEFOURCC('N','V','1','2’) There’s no need for global definitions. Other tests that use custom fourccs just use MAKEFOURCC in their code. > + struct > + { > + DWORD color1, color2; > + DWORD rgb1, rgb2; > + } > + test_data[] = > + { > + { 0x000000, 0xffffff, 0x00008800, 0x00ff7dff }, > + { 0xff0000, 0x00ffff, 0x004aff14, 0x00b800ee }, > + { 0x00ff00, 0xff00ff, 0x000024ee, 0x00ffe114 }, > + { 0x0000ff, 0xffff00, 0x00b80000, 0x004affff }, > + { 0xffff00, 0x0000ff, 0x004affff, 0x00b80000 }, > + { 0xff00ff, 0x00ff00, 0x00ffe114, 0x000024ee }, > + { 0x00ffff, 0xff0000, 0x00b800ee, 0x004aff14 }, > + { 0xffffff, 0x000000, 0x00ff7dff, 0x00008800 }, > + }; Please make this static const. The same applies to the formats[] table. I’ll look at the details of the test and the other patches later today, when my headache is gone :-\ .

2 9

Re: msvcrt: Return error on invalid handle in _open_osfhandle (try4)
by Marvin 12 Feb '14

12 Feb '14

1 0

Re: shell32/tests: Skip any test that needs the .shlexec association if we could not create it.
by Marvin 12 Feb '14

12 Feb '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=4818 Your paranoid android. === wxppro (32 bit shlexec) === shlexec.c:1211: Test failed: expected 1 args, got 4 shlexec.c:2283: Test failed: argcA expected 5, but got 4 === w2008s64 (32 bit shlexec) === shlexec.c:1564: Test failed: argvA4 expected 'C:/Users/ADMINI~1/AppData/Local/Temp/wt6C3.tmp/test file.shlexec', got 'C:\Users\Administrator\AppData\Local\Temp\wt6C3.tmp\test file.shlexec' shlexec.c:2660: Test failed: longPath expected 'C:\Users\ADMINI~1\AppData\Local\Temp\wt6C3.tmp\test2.exe', got 'C:\Users\Administrator\AppData\Local\Temp\wt6C3.tmp\test2.exe' shlexec.c:2673: Test failed: longPath expected 'C:\Users\ADMINI~1\AppData\Local\Temp\wt6C3.tmp\test2.exe', got 'C:\Users\Administrator\AppData\Local\Temp\wt6C3.tmp\test2.exe' shlexec.c:2685: Test failed: longPath expected 'C:\Users\ADMINI~1\AppData\Local\Temp\wt6C3.tmp\test2.exe', got 'C:\Users\Administrator\AppData\Local\Temp\wt6C3.tmp\test2.exe' === w8 (32 bit shlexec) === shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:1532: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc") failed: rc=33 err=2 shlexec.c:1564: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:1532: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.shlexec.noassoc") failed: rc=33 err=2 shlexec.c:1564: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.shlexec.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\wt8C15.tmp" Exec") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\wt8C15.tmp" Exec") WaitForSingleObject returned 258 shlexec.c:2102: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wt8C14.tmp\wt8C15.tmp" Exec") succeeded: rc=42 === w2008s64 (64 bit shlexec) === shlexec.c:1564: Test failed: argvA4 expected 'C:/Users/ADMINI~1/AppData/Local/Temp/wt249F.tmp/test file.shlexec', got 'C:\Users\Administrator\AppData\Local\Temp\wt249F.tmp\test file.shlexec' shlexec.c:2660: Test failed: longPath expected 'C:\Users\ADMINI~1\AppData\Local\Temp\wt249F.tmp\test2.exe', got 'C:\Users\Administrator\AppData\Local\Temp\wt249F.tmp\test2.exe' shlexec.c:2673: Test failed: longPath expected 'C:\Users\ADMINI~1\AppData\Local\Temp\wt249F.tmp\test2.exe', got 'C:\Users\Administrator\AppData\Local\Temp\wt249F.tmp\test2.exe' shlexec.c:2685: Test failed: longPath expected 'C:\Users\ADMINI~1\AppData\Local\Temp\wt249F.tmp\test2.exe', got 'C:\Users\Administrator\AppData\Local\Temp\wt249F.tmp\test2.exe'

1 0

Re: ole32/tests: Use wine_dbgstr_guid for printing GUIDs.
by Marvin 12 Feb '14

12 Feb '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=4817 Your paranoid android. === wxppro (32 bit marshal) === marshal.c:3054: Test failed: wait timed out marshal.c:3058: Test failed: CoCreateInstance failed with error 0x80040154 marshal: unhandled exception c0000005 at 0041C45C === w8 (32 bit marshal) === marshal.c:3315: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3332: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3370: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3388: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3352: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3315: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3332: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3370: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3388: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3352: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3315: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3332: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3370: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3388: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0xc04 instead of 0xb00 marshal.c:3352: Test failed: info->cbSize was -873875100 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0xc04 instead of 0xb00

1 0

Re: [PATCH 5/5] d3d10core: Implement d3d10_depthstencil_view_GetDevice().
by Marvin 12 Feb '14

12 Feb '14

1 0

Re: [PATCH 4/5] d3d10core: Implement d3d10_buffer_GetDevice().
by Marvin 12 Feb '14

12 Feb '14

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel February 2014