February 2014 - Wine-devel - list.winehq.org

Re: [PATCH 3/6] wined3d: Use an rbtree for storing shaders for texture format conversion/blitting
by Stefan Dösinger 11 Feb '14

11 Feb '14

Am 11.02.2014 um 12:14 schrieb Martin Storsjo <martin(a)martin.st>: > --- > dlls/wined3d/arb_program_shader.c | 187 +++++++++++++++++++++++++------------- > 1 file changed, 122 insertions(+), 65 deletions(-) > > diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c > index 6d17ea3..8390c9e 100644 > --- a/dlls/wined3d/arb_program_shader.c > +++ b/dlls/wined3d/arb_program_shader.c > @@ -6768,22 +6768,68 @@ const struct fragment_pipeline arbfp_fragment_pipeline = { > arbfp_fragmentstate_template, > }; > > +struct arbfp_blit_type > +{ > + enum complex_fixup fixup; > + GLenum textype; > +}; > ... > +static int arbfp_blit_type_compare(const void *key, const struct wine_rb_entry *entry) > +{ > + const struct arbfp_blit_type *ka = key; > + const struct arbfp_blit_type *kb = &WINE_RB_ENTRY_VALUE(entry, const struct arbfp_blit_desc, entry)->type; > + > + return memcmp(ka, kb, sizeof(*ka)); > +} You have to watch out for padding space added by the compiler if you memcmp the structure. I think there’s no guarantee that enum complex_fixup is 4 bytes. Either use memset to initialize it to zero, or (preferred) make the fixup member a bitfield and add an explicit padding field for the remaining bits (see some structures in wined3d_private.h for examples) and set the padding to zero manually. > + desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*desc)); > + if (!desc) > + { > + ERR("Out of memory\n"); > + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)); > + checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)"); > + GL_EXTCALL(glDeleteProgramsARB(1, &shader)); > + checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &shader))"); > + return 0; > + } > ... > + ERR("Out of memory\n"); > + GL_EXTCALL(glDeleteProgramsARB(1, &shader)); > + checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &shader))"); > + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)); > + checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)"); > + HeapFree(GetProcessHeap(), 0, desc); > + return 0; > + } You can use goto (yes, goto) to avoid code duplication in error handling. See e.g. wined3d_device_init_3d in device.c > - upload_palette(surface, context); I think you lost that call. The unfortunate thing about the P8 conversion is that the shader conversion codepath is essentially dead code for various reasons. So it’s tricky to test and likely already broken.

2 1

Re: [PATCH 1/3] msvcrt/tests: Don't pass path containing spaces to _spawnvp (try3)
by Piotr Caban 11 Feb '14

11 Feb '14

Hi, s I've seen that this patch was marked as pending. I'm not sure what should I change in it. The argv[0] argument is not used in child process so maybe it will be clearer if I put some dummy value there. I can also change the tests to not use _spawnvp. There's following comment near _spawnvp implementation: Like on Windows, this function does not handle arguments with spaces or double-quotes. Here are some results that shows what happens on windows when the tests are executed without this patch. The behavior on wine is similar. E:\>msvcrt_crosstest.exe file file: 3 tests executed (0 marked as todo, 0 failures), 0 skipped. file: 1 tests executed (0 marked as todo, 0 failures), 0 skipped. file: 5 tests executed (0 marked as todo, 0 failures), 0 skipped. file: 5 tests executed (0 marked as todo, 0 failures), 0 skipped. file: 791 tests executed (0 marked as todo, 0 failures), 0 skipped. E:\>"a a\msvcrt_crosstest.exe" file Fatal: test 'a\msvcrt_crosstest.exe' does not exist. file.c:1417: Test failed: bad position 0 expecting 8 file.c:1419: Test failed: Couldn't read back the data Fatal: test 'a\msvcrt_crosstest.exe' does not exist. Fatal: test 'a\msvcrt_crosstest.exe' does not exist. file.c:1987: Test failed: i 0, got 0 file.c:1990: Test failed: expected to read 'Hello world', got '⌂' file.c:1987: Test failed: i 1, got 0 file.c:1990: Test failed: expected to read 'Hello world', got '⌂' file.c:1987: Test failed: i 2, got 0 file.c:1990: Test failed: expected to read 'Hello world', got '⌂' Fatal: test 'a\msvcrt_crosstest.exe' does not exist. file.c:2024: Test failed: fread() returned 0: ferror=0 file.c:2027: Test failed: got '⌂' expected 'Hello worldHello worldHello world' file: 791 tests executed (0 marked as todo, 10 failures), 0 skipped. In the failing case argv[0] = "a" argv[1] = "a\msvcrt_crosstest.exe" argv[2] = "file" Thanks, Piotr

2 1

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

11 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, The shader looks ok to me. Please add a test - see yuv_color_test in dlls/d3d9/tests/visual.c as an example, although it might not be feasible to integrate a NV12 test into the UYVY / YUY2 test loop. Since the UYVY / YUY2 test already covers the color space conversion parts I think a NV12 test should make sure that the coordinate selection works properly. Test that e.g. a 4x4 or 8x8 texture produces the correct color pattern. Am 2014-02-10 12:08, schrieb Martin Storsjo: > This fixes video playback with the sample app from OpenH264. > --- > I haven't been able to test the GL_TEXTURE_RECTANGLE_ARB codepath > here - if I explicitly disable > gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] the same app > crashes. Similarly for YV12 (which already exists and works), > if I disable ARB_TEXTURE_NON_POWER_OF_TWO there, the app crashes > and the video output is also garbled (the luma channel seems to > be right but chroma is handled incorrectly). I don't know what could be wrong with the texture rectangle codepath. I tested it when I wrote it for other formats, but it's quite possible that it has suffered from bitrot in the years since then. Also keep in mind that wined3d assumes limited ARB_TEXTURE_NON_POWER_OF_TWO support if OpenGL 2.0 is supported. > @@ -6772,6 +6772,7 @@ struct arbfp_blit_priv { > GLenum yuy2_rect_shader, yuy2_2d_shader; > GLenum uyvy_rect_shader, uyvy_2d_shader; > GLenum yv12_rect_shader, yv12_2d_shader; > + GLenum nv12_rect_shader, nv12_2d_shader; > GLenum p8_rect_shader, p8_2d_shader; > GLuint palette_texture; > }; It might be a good idea to replace those 10 shaders and the poorly scaling search for them with a rbtree. Yeah, I know, I started this mess, but back then it was just 4 shaders and we've been too lazy to clean this up since then :-\ . > + switch(textype) { > + case GL_TEXTURE_2D: tex = "2D"; break; > + case GL_TEXTURE_RECTANGLE_ARB: tex = "RECT"; break; > + default: > + FIXME("Implement nv12 correction for non-2d, non-rect textures\n"); > + return FALSE; > + } Regarding the code style please use the style found in dlls/wined3d/cs.c. We're migrating the code style of wined3d to this style, but since style-only changes are frowned upon we're doing this as we go. I'm sorry for the mess :-( -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS+MA3AAoJEN0/YqbEcdMw434P/36l/R7vl7k3mx24+cYw1mll DOqx4yov+V+I3ERFbQjWmzwvAKoxFbo2+Qn7AaEAegGk1x5G3cuw4jZmo+C4bUb0 uvePY9WbvZptGFdavLAEgYWaBtY6M9pNJkp1PuIehqeq9D3XP98AUH4awzWFbfcD /dQQGVow1D8hkp57iATzUpEwDZBGttAePxyYR/gj7r1FnqPpVD0NW/zWoLJBWMrq 4YQSZBmJQK3xq5mcVlajNUg0Ylh82fp0bzxCie8Zw1jNuahmbGEAaht87fzxWCMc DgdcCS19aZEa39kNT/0ft/vybIPNyHVA+Mon+JgYmEVQRxhJMCl6gYbEKYCWcs0f OZc6d5B8Z4PX9FiPTnofs49SRq2+Gh6YggJdjToY2YZ2iOGgD4A87EIj2iZQc+6w 9jz2SLIZPl4zrjBY5Ji31qyKy8c+emOO9KC1OdnkFPo6eUeIussjrCfX7r2mNyRs 2qNHLz2yrd8aG0+swYvHocZ/wnUeOtgaTYJef8BTEut0+iBsDJ/eQom1/84orhxJ oHmdTbfepXMEoQvhkMSu79gZBMnwvFERZngzOPjKuw0KS3XM+KIFOy1nFeVAMGvb AoVa39jkByIcF0tN6vuf12LdWtdMqkwKeNuF36iEwVAgzkr8pAU6xHL5QqY1QhuB zsCB0PSX3QSmNC/4s7k8 =r3du -----END PGP SIGNATURE-----

2 1

Re: [PATCH 2/2] draw: Return the D3D identifier when GetDeviceIdentifier is called with no flags.
by Henri Verbeet 11 Feb '14

11 Feb '14

On 11 February 2014 06:54, Erich E. Hoover <erich.e.hoover(a)gmail.com> wrote: > + memset(&adapter_id, 0x0, sizeof(adapter_id)); > + adapter_id.driver = DriverName; > + adapter_id.driver_size = sizeof(DriverName); > + adapter_id.description = DriverDescription; > + adapter_id.description_size = sizeof(DriverDescription); I think you can just write that as: + adapter_id.driver = DDDI->szDriver; + adapter_id.driver_size = sizeof(DDDI->szDriver); + adapter_id.description = DDDI->szDescription; + adapter_id.description_size = sizeof(DDDI->szDescription); + adapter_id.device_name_size = 0; > + /* check how strings are copied into the structure */ > + ok(pdddi2->szDriver[MAX_DDDEVICEID_STRING - 1]==0, "szDriver not cleared\n"); > + ok(pdddi2->szDescription[MAX_DDDEVICEID_STRING - 1]==0, "szDescription not cleared\n"); I don't think there anything in the code that guarantees this.

1 0

Re: [2/2] shell32: Supply a module name to CreateProcess
by Dmitry Timoshkov 11 Feb '14

11 Feb '14

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > --- a/dlls/shell32/shlexec.c > +++ b/dlls/shell32/shlexec.c > @@ -315,6 +315,8 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, > WCHAR curdir[MAX_PATH]; > DWORD dwCreationFlags; > const WCHAR *lpDirectory = NULL; > + WCHAR module_path[MAX_PATH] {0}; Does this really compile? -- Dmitry.

1 0

Re: [PATCH 1/5] wined3d: Introduce a sub resource structure.
by Henri Verbeet 10 Feb '14

10 Feb '14

On 10 February 2014 13:28, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > This structure will be a base structure for buffers, surfaces and > volumes. It will take care of location management, opengl buffers, > mapping and (at least for now) memory allocation. Sub resources will > also store the pointer to the container resource. > I'm not convinced this is really the correct approach to this.

2 1

Re: bcrypt: Add semi-stub implementation of BCryptGenRandom (try 2)
by Alexandre Julliard 10 Feb '14

10 Feb '14

Bruno Jesus <00cpxxx(a)gmail.com> writes: > + > + /* Zero sized buffer should work too */ > + ret = pBCryptGenRandom(NULL, buffer, 0, BCRYPT_USE_SYSTEM_PREFERRED_RNG); > + ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); > + > + /* Test random number generation - It's impossible for a sane RNG to return 8 zeros */ > + rnd[0] = 0; > + rnd[1] = 0; > + ret = pBCryptGenRandom(NULL, buffer, sizeof(DWORD) * 2, BCRYPT_USE_SYSTEM_PREFERRED_RNG); > + ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); > + ok(rnd[0] || rnd[1], "Expected a random number, got 0\n"); > + trace("BCryptGenRandom : %08X%08X\n", rnd[0], rnd[1]); There's no reason to work with DWORDs, the function returns bytes, just use that directly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: configure: Avoid nesting cat calls.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Nicolas Le Cam <niko.lecam(a)gmail.com> writes: > @@ -3453,9 +3453,7 @@ fi > AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], > [wine_fn_output_makefile () > { > - cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$[]1 && rm -f Make.tmp && return > -`cat $wine_rules_file` > -_WINE_EOF > + cat Make.tmp $wine_rules_file >\$tmp/makefile && mv -f \$tmp/makefile \$[]1 && rm -f Make.tmp && return This doesn't do the same thing at all, it can't possibly work. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Alexandre Julliard : Wine release 1.7.12
by Joseph Facciponti 09 Feb '14

09 Feb '14

remove me from your list please On Fri, Feb 7, 2014 at 2:04 PM, Alexandre Julliard <julliard(a)winehq.org>wrote: > Module: website > Branch: master > Commit: 14ca1bc06c384e1a3c2d51b3205a7e1e54045519 > URL: > http://source.winehq.org/git/website.git/?a=commit;h=14ca1bc06c384e1a3c2d51… > > Author: Alexandre Julliard <julliard(a)winehq.org> > Date: Fri Feb 7 20:04:34 2014 +0100 > > Wine release 1.7.12 > > --- > > news/en/2014020701.xml | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/news/en/2014020701.xml b/news/en/2014020701.xml > new file mode 100644 > index 0000000..ce004de > --- /dev/null > +++ b/news/en/2014020701.xml > @@ -0,0 +1,16 @@ > +<news> > +<date>February 7, 2014</date> > +<title>Wine 1.7.12 Released</title> > +<body> > + The Wine development release 1.7.12 is now available. > + <a href="{$root}/announce/1.7.12">What's new</a> in this release: > +<ul> > + <li>Initial support for Window Media Player interfaces.</li> > + <li>Some more Task Scheduler support.</li> > + <li>Various C++ runtime fixes.</li> > + <li>More dlls with ugly names for Windows 8 API set support.</li> > + <li>Various bug fixes.</li> > +</ul> > +The source is <a href=" > http://prdownloads.sourceforge.net/wine/wine-1.7.12.tar.bz2">available > now</a>. > +Binary packages are in the process of being built, and will appear soon > at their respective <a href="{$root}/download">download locations</a>. > +</body></news> > > > >

2 1

FOSDEM Presentations
by Stefan Dösinger 09 Feb '14

09 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Do we collect FOSDEM presentations in a central place? Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS9nIIAAoJEN0/YqbEcdMwXWIP/iB5Hb647oT5UcSiUy7Zru7a YaFb5/uTkBpOJZhD9KAa/u6XT8l7jh9pB633RgZSPl4xBY9/T3aIo+5amMF7IOvA 3NP3I0bRehnlbzAaeqhoN97BIHJQ4Y2ulub+FPx/GDY/kxwXayd0jurEcf+ZL4K2 csOtkgSplI05YXxBw1ZmYjiOGfXgqRH1DCEyaFaFgEWenYrfER7XzaiT2xAK64JN 85Cmp2vh5zlTh3C5jChpoeaWIHcweHC5EYONYOCAk9W2wxZdin0QWjYVnja5+DzR HnrcIsiFAXdD9IRxBStc+y4yqUq5YIDfZczpj0fI5cuPrqOxvnomyNI/y2Zs4epz sq1lL5eEyo5hTQS99PbqbENrT7IRF0IpSIebcrPCTbCpuKHctwWe3oFFS2BuqIPl 4Q/6bsNXxvQW4B3es4vcGDov05Aiy/MT1NQZoEsIXvYNa/ufqiEDmmXVCRz7rI6f 9D4hiMzS6Dxh3VRSigBcg1R3H+rYc+v1gUxGutcXWplGrVLFuE3iBY7UYfdp9rkC 6zcidSNrUDMsQMKLbmCXQV361RcL03bi+rtTVzl4d/u5RhpgVZG8BSoq49+Nt3ea MHNplal9pHWXcBHXos3L0o4PeF2tf7rdNRuLOdVYya6bBYP/UpVtHeJ2/SD7WoOV HvlQe9zHcOxAKYSX0M0P =bd+Z -----END PGP SIGNATURE-----

3 3