January 2015 - Wine-devel - list.winehq.org

Re: [PATCH 4/5] wined3d: Prefer the core glActiveTexture function. (v2)
by Henri Verbeet 08 Jan '15

08 Jan '15

On 8 January 2015 at 15:07, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + #define MAP_GL_FUNCTION(core_func, ext_func) \ > + { \ > + if (!gl_info->gl_ops.ext.p_##core_func) \ > + gl_info->gl_ops.ext.p_##core_func = gl_info->gl_ops.ext.p_##ext_func; \ > + } > + > + MAP_GL_FUNCTION(glActiveTexture, glActiveTextureARB); > +#undef MAP_GL_FUNCTION That probably works here in practice, but in general you want to avoid defining macros like that. See e.g. https://gcc.gnu.org/onlinedocs/cpp/Swallowing-the-Semicolon.html for the explanation.

1 0

Re: [PATCH 3/5] wined3d: Inline GL_EXT_FUNCS_GEN in load_gl_funcs.
by Henri Verbeet 08 Jan '15

08 Jan '15

On 8 January 2015 at 15:07, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > #include "wined3d_private.h" > +#include "wine/wglext.h" > I'd probably either just keep that in wined3d_gl.h, perhaps moving it below the wine/wgl.h include. > - GL_EXT_FUNCS_GEN; > + /* GL_APPLE_fence */ \ > + USE_GL_FUNC(glDeleteFencesAPPLE) \ You shouldn't need the line-continuations.

1 0

Re: [PATCH 1/2] d3d9/tests: fix volume_dxt5_test getPixelColor check.
by Henri Verbeet 08 Jan '15

08 Jan '15

On 7 January 2015 at 14:21, Axel Davy <axel.davy(a)ens.fr> wrote: > getPixelColor should be called before Present, > because the device swapchain was created with discard mode. > Could you please fix the equivalent d3d8 tests as well?

1 0

About Wine Security
by Pierre Schweitzer 08 Jan '15

08 Jan '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Dear all, I'm coming to you after a short discussion with Alexandre on this topic. Wine gets more and more used, in various ways: either directly by users, or because it gets shipped in various form. It can packaged in a distribution, forked to suit a project needs (thinking about pipelight), or even shipped along with software to save native portage costs. Not to say that it's core of the ReactOS operating system itself. But as any other software, Wine can present security vulnerabilities. MITRE exposes some of the code defects pattern (known as CWE) that can lead to potential exploitation and thus to security vulnerabilities [1]. When such defect is found and looks potentially exploitable (either because a crash was reported, or because it directly deals with callers data), a vulnerability ID (CVE) can be assigned by MITRE to reference the potential security vulnerability and make it known to people using it. Some of them (buffer overflow, overrun, double-free, use-after-free, and so on) are sometimes found and fixed in Wine without further consideration regarding what it would imply for real Wine (mis-)usage. Even if no Proof of Concept is available at the time when the commit is made, it doesn't mean it cannot be exploited later on. With such exploits, it generally means that the attacker can target a Linux OS through a crafted PE binary. What I'm proposing here is that I start requesting CVE-ID for these findings when I find them in the commit logs of Wine and that they look exploitable. My hope is that it would allow distributions to repackage Wine taking care of these issues, but also to make people shipping Wine aware that the Wine they are shipping is likely vulnerable. This proposal it though limited in space & time: I wouldn't only do it starting in 2015 (I don't believe going backwards would make that much sense) and for 1.7 branch which is, I believe, the most used. I'm looking for your feedback on my proposal and how you believe such vulnerabilities in Wine can affect the host Linux (or Mac). This wouldn't involve more work on your side (excepted if I ask for more details to make sure I'm right in my analysis of the issue). With my best regards, [1]: https://cwe.mitre.org/ - -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJUrVTCAAoJEHVFVWw9WFsLPDgQAILhixxtba3y2qadCl+2dBWg 1v2qjsUouAJe7vq28tx63MNK0Tm6ykHB66SJuWWUTMwYAHIz+Uzr2PJMHCq0aZs+ dnGo4sTycEkuMNVC/i9zijJtCd7/r5v+VJBQNji1lVhwY+ZLsA8mlp+UKb9fjos6 wwMk+5lCsiqvPubKvVZ8qfXKD2xEBkjWu15JmivR6ZhaNm5vDXmNxtqVT590JowW WWmcn6GiWMQQgAj6CLzG9d8qaHiJiuNmHi0BtUPZ8e+9hfcl76DBMiy1L8M3PM0f 1YRWF1NMOTQOr6nqxuviPL5eO7DKUmsiNVK1KGnNXMbjf/8EwL03VobAFaPu0X55 6v3jcNdBq9NCcRpkzUVksSMOSlzj4S8lvLEFYY8mWYW/o3TfmdTbLqeO7UIVJJiP lx1Pth7WA03wqzvhm5+/sIavkDDn3Z6/TY9k0BVHzq3VahUx6TP59mYPjI9jUvwA /0HoCCaD6AcGnDf8fsTNkLgqtqD6s3iOMra0mpH7nUQoTUds82ehZXRJ4viWsHxj c0mfAy/3ct8uMZAbVwjnahrk/RrF6DzI3eKh/LI5l5rQ9COgPwE2Ij2IWnPRK2zv XJbG161RRQwZSSU8TeBr2I/OxxQ+VE2Z0E4xSZY4tjYhdk/i9Y32J9w68qquISlF 4wtw5d9I9DFwvxq/AnBV =auVK -----END PGP SIGNATURE-----

5 7

Re: cmd: implemented && and || functionality
by Marvin 07 Jan '15

07 Jan '15

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://testbot.winehq.org/JobDetails.pl?Key=11049 Your paranoid android. === wxppro (32 bit) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 700 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 701 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 702 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 703 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 704 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 705 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 706 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 707 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 708 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 709 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 710 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 711 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 712 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 713 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 715 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 716 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 717 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 718 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 719 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 720 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 721 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 722 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 723 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 724 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 725 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 726 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 727 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 728 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 729 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 730 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 731 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 732 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 733 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 734 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 735 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 736 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 737 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 738 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 739 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 740 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 741 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 742 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 743 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 744 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 745 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 746 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 747 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 748 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 749 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 750 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 751 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 752 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 753 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 755 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 756 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 757 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 758 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 759 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 760 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 761 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 762 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 763 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 764 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 765 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 766 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 767 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 768 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 769 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 770 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 771 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 772 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 773 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 774 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 775 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 776 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 778 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 779 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 780 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 781 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 782 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 783 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 784 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 785 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 786 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 787 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 788 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 789 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 790 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 791 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1375 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1376 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1377 (got 'C:\Documents and Settings\winetest\My Documents\foobar\foodir2', wanted '@drive@@path(a)foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1378 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1379 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1380 (got '--- Extra endlocal in called batch', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1381 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1382 (got '--- Extra endlocal in called batch', wanted '@drive@@path(a)foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1384 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1387 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1388 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1389 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1390 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1391 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1392 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1393 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path(a)foobar') === wvistau64 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 329 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'') === w8 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 329 (got ''--a--------'', wanted ''--a------'@or_broken@'%~ai'') === wvistau64 (64 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 329 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'')

1 0

Re: winex11.drv: Ignore ConfigureNotify events on hidden windows
by Alexandre Julliard 07 Jan '15

07 Jan '15

Piotr Caban <piotr(a)codeweavers.com> writes: > diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c > index ea24471..1b8e568 100644 > --- a/dlls/winex11.drv/event.c > +++ b/dlls/winex11.drv/event.c > @@ -1075,6 +1075,10 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) > event->serial, data->configure_serial ); > goto done; > } > +#ifdef HAVE_LIBXSHAPE > + /* ignore notifications on hidden window */ > + if (IsRectEmpty( &data->window_rect )) goto done; > +#endif It shouldn't make a difference whether we have XShape or not. Also note that there's already a check later on, which is probably where you'd want to change something. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] msvcp120: Implemented xtime functions. (try 2)
by Alexandre Julliard 07 Jan '15

07 Jan '15

Yifu Wang <YWang(a)esri.com> writes: > @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); > #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) > #define TICKSPERSEC 10000000 > #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) > +#define NANOSEC_PER_MICROSEC 1000000 > +#define MICROSEC_PER_SEC 1000 Something's not quite right here ;-) -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [2/5] wbemdisp: Add IDispatch support to the services object.
by Nikolay Sivov 07 Jan '15

07 Jan '15

On 07.01.2015 12:58, Hans Leidekker wrote: > --- > dlls/wbemdisp/locator.c | 145 +++++++++++++++++++++++++++++------------------- > 1 file changed, 89 insertions(+), 56 deletions(-) > > + > +static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) > +{ > ... > + } > + *ret = wbemdisp_typeinfo[tid]; > + return S_OK; > +} get_typeinfo() doesn't AddRef() returned pointer. > @@ -102,8 +155,10 @@ static HRESULT WINAPI services_GetTypeInfo( > LCID lcid, > ITypeInfo **info ) > { > - FIXME( "\n" ); > - return E_NOTIMPL; > + struct services *services = impl_from_ISWbemServices( iface ); > + TRACE( "%p, %u, %u, %p\n", services, index, lcid, info ); > + > + return get_typeinfo( ISWbemServices_tid, info ); > } That means you should AddRef() it here. > static HRESULT WINAPI services_GetIDsOfNames( > @@ -114,8 +169,21 @@ static HRESULT WINAPI services_GetIDsOfNames( > LCID lcid, > DISPID *dispid ) > { > - FIXME( "\n" ); > - return E_NOTIMPL; > + struct services *services = impl_from_ISWbemServices( iface ); > + ITypeInfo *typeinfo; > + HRESULT hr; > + > + TRACE( "%p, %s, %p, %u, %u, %p\n", services, debugstr_guid(riid), names, count, lcid, dispid ); > + > + if (!names || !count || !dispid) return E_INVALIDARG; > + > + hr = get_typeinfo( ISWbemServices_tid, &typeinfo ); > + if (SUCCEEDED(hr)) > + { > + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); > + ITypeInfo_Release( typeinfo ); > + } > + return hr; And remove Release() here. Or am I missing something?

1 0

Review request: New header for programs writing to the console
by Hugh McMaster 07 Jan '15

07 Jan '15

Wine has at least 11 programs that write output to the console. Each program, however, uses a different method to achieve the same purpose. These programs can be modified to use a unified console output method with only minor changes to each program's codebase. In anticipation of taking on this task, I've created a new header (output.h, attached) to contain the unified method. Before I submit the header to wine-patches, I'm asking for review by other developers. Any and all feedback/comments appreciated. -- Hugh

1 0

Re: [PATCH 4/4] dsound: support 5.1 sound
by Chris Robinson 07 Jan '15

07 Jan '15

On 01/06/2015 11:27 AM, Mark Harmstone wrote: > + case DSSPEAKER_5POINT1_BACK: > + device->speaker_angles[0] = M_PI/180.0f * -135.0f; > + device->speaker_angles[1] = M_PI/180.0f * -45.0f; > + device->speaker_angles[2] = M_PI/180.0f * 0.0f; > + device->speaker_angles[3] = M_PI/180.0f * 45.0f; > + device->speaker_angles[4] = M_PI/180.0f * 135.0f; > + device->speaker_angles[5] = 9999.0f; > + device->speaker_num[0] = 4; /* Rear left */ > + device->speaker_num[1] = 0; /* Front left */ > + device->speaker_num[2] = 2; /* Front centre */ > + device->speaker_num[3] = 1; /* Front right */ > + device->speaker_num[4] = 5; /* Rear right */ > + device->speaker_num[5] = 3; /* LFE */ > + device->num_speakers = 6; > + device->lfe_channel = 3; > + break; This doesn't look right. According to <http://www.dolby.com/us/en/guide/surround-sound-speaker-setup/5-1-setup.html>, 5.1 should have the front-right/right speakers between +/-30 degrees max and +/-22 degrees min, and the back (surround) speakers between +/-110 degrees max, +/-90 degrees min. > + case DSSPEAKER_5POINT1_SURROUND: > + device->speaker_angles[0] = M_PI/180.0f * -90.0f; > + device->speaker_angles[1] = M_PI/180.0f * -30.0f; > + device->speaker_angles[2] = M_PI/180.0f * 0.0f; > + device->speaker_angles[3] = M_PI/180.0f * 30.0f; > + device->speaker_angles[4] = M_PI/180.0f * 90.0f; > + device->speaker_angles[5] = 9999.0f; > + device->speaker_num[0] = 4; /* Rear left */ > + device->speaker_num[1] = 0; /* Front left */ > + device->speaker_num[2] = 2; /* Front centre */ > + device->speaker_num[3] = 1; /* Front right */ > + device->speaker_num[4] = 5; /* Rear right */ > + device->speaker_num[5] = 3; /* LFE */ > + device->num_speakers = 6; > + device->lfe_channel = 3; > + break; This looks like it's based on OpenAL Soft (which is fine), which originally had 5.1side using 90 degrees. However I'm not sure it's really necessary for the two modes to use different angles. The current Git version of OpenAL Soft was changed so both 5.1 modes use 110 degree angles for the rear/side speakers, and the only difference is which output speakers they're mapped to. It's not exactly wrong to put 5POINT1_BACK at 110 degrees and 5POINT1_SURROUND at 90 (they're both within spec), but I think the intended difference is only for physical speaker mapping rather than positioning.

1 0