- wine-devel - winehq.org

Re: [PATCH 3/3] d3drm/tests: Split tests between different versions, initially adding frame QueryInterface tests.
by Stefan Dösinger 05 Apr '15

05 Apr '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, This series looks good to me, and this time I ran the tests on Windows and Wine :-) Am 2015-04-03 um 14:25 schrieb Aaryaman Vasishta: > +struct qi_test > +{ > + REFIID iid; > + REFIID refcount_iid; > + HRESULT hr; > + BOOL refcount_todo; > +}; refcount_todo is always FALSE in your tables, so you might as well remove it. I don't think it's necessary to resend the patch because of that though. You can just remove it when you add the vtable inheritance test. If you expect future tests to need refcount_todo you can also keep the field. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVIWyeAAoJEN0/YqbEcdMwZPgP/AoYCerTMFiXH9lYnmueThK/ UPGcBOLhdU0dT0U8lI0ZVzX7mbvtvjoVFUn/cAGgBZTUH175BK3SHbuIljJ+R954 +xQtRda5QrEu759UIkuc6v+REUtNQWzPtWLRX8EhZLhTEJaTEdsGeGUKAKRwGFmc UsMEff5r1gIIFgFDSlwSm1daAduOwkNcnzFwbxTbm7Kg/qCn50nSTfWj4Nk/sYYl kr6vzKH5EAt5nL9tvtXT7q8YDu+e2TC96B2xzoseRnS3st44nAgqjSb9E7fB05Cu Lem/zEEoGJI3mrLWpoDVDoYFFaHPifoqRgyf6EcT9ID0vUmJhM97WgBWw0+b8fFR yxJ/nsBol56Rb4xssOrXINDfF2E+7S9RMu/oxSbVbW8GV3vN4ssgZ5/Q8itmCdJd u7Kyfx/OS72xE9rrUXIQrS0EM7yFq1j6cZa/xv6xGzO0SpeIbWrB2Pnujvr5GTt/ KkPqJVoiFr8VOaZfK2SQreGTaBK4f6rDdW+jkfnQLU38uVSmDTowdO3oD6aPCy2s mgB8JmhBuDsU5RAWoA61PzTtDPmdWLhmHZJWfLC4PG9/IN0m3G3JhFUAUy3qr8UZ 543kGtR21tmPHLKXc+Bt20B0j+RY0sxu8CvVJPb3qa7VmDP+c3thnjkgng1ZJo0F CrXo+6/IKapzItlvTFIE =ssTG -----END PGP SIGNATURE-----

1 0

Re: locale: [1/1] patch - 0x10000000 flag is NORM_STOP_ON_NULL (marvins test fix)
by Marvin 04 Apr '15

04 Apr '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=12662 Your paranoid android. === w2000pro (32 bit locale) === locale.c:1776: Test failed: Without NORM_STOP_ON_NULL flag - strings `don\0a` (5) and `don\0b` (5) expected CSTR_LESS_THAN, got 2 === wvistau64 (32 bit locale) === locale.c:2010: Test failed: NORM_STOP_ON_NULL passed, though its equal to length autodetect (-1) - strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:2014: Test failed: NORM_STOP_ON_NULL is not set, strings considered as null terminated - so strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:2018: Test failed: NORM_STOP_ON_NULL passed, and lengths are defined exlicitly - so strings `don\0at` (6) and `don\__` (6) are expected CSTR_EQUAL due to flag, got 0 locale.c:2022: Test failed: NORM_STOP_ON_NULL passed, and length is defined exlicitly for one string - anyway strings `don\0at` (6) and `don\__` (-1) are expected CSTR_EQUAL due to flag, got 0 locale.c:2028: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, though its equal to length autodetect (-1) - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 locale.c:2032: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, and lengths are defined explicitely - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 === w2008s64 (32 bit locale) === locale.c:2010: Test failed: NORM_STOP_ON_NULL passed, though its equal to length autodetect (-1) - strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:2014: Test failed: NORM_STOP_ON_NULL is not set, strings considered as null terminated - so strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:2018: Test failed: NORM_STOP_ON_NULL passed, and lengths are defined exlicitly - so strings `don\0at` (6) and `don\__` (6) are expected CSTR_EQUAL due to flag, got 0 locale.c:2022: Test failed: NORM_STOP_ON_NULL passed, and length is defined exlicitly for one string - anyway strings `don\0at` (6) and `don\__` (-1) are expected CSTR_EQUAL due to flag, got 0 locale.c:2028: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, though its equal to length autodetect (-1) - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 locale.c:2032: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, and lengths are defined explicitely - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 === w7u (32 bit locale) === locale.c:2010: Test failed: NORM_STOP_ON_NULL passed, though its equal to length autodetect (-1) - strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:2014: Test failed: NORM_STOP_ON_NULL is not set, strings considered as null terminated - so strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:2018: Test failed: NORM_STOP_ON_NULL passed, and lengths are defined exlicitly - so strings `don\0at` (6) and `don\__` (6) are expected CSTR_EQUAL due to flag, got 0 locale.c:2022: Test failed: NORM_STOP_ON_NULL passed, and length is defined exlicitly for one string - anyway strings `don\0at` (6) and `don\__` (-1) are expected CSTR_EQUAL due to flag, got 0 locale.c:2028: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, though its equal to length autodetect (-1) - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 locale.c:2032: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, and lengths are defined explicitely - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 === w8 (32 bit locale) === locale.c:2010: Test failed: NORM_STOP_ON_NULL passed, though its equal to length autodetect (-1) - strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:2014: Test failed: NORM_STOP_ON_NULL is not set, strings considered as null terminated - so strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:2018: Test failed: NORM_STOP_ON_NULL passed, and lengths are defined exlicitly - so strings `don\0at` (6) and `don\__` (6) are expected CSTR_EQUAL due to flag, got 0 locale.c:2022: Test failed: NORM_STOP_ON_NULL passed, and length is defined exlicitly for one string - anyway strings `don\0at` (6) and `don\__` (-1) are expected CSTR_EQUAL due to flag, got 0 locale.c:2028: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, though its equal to length autodetect (-1) - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 locale.c:2032: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, and lengths are defined explicitely - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 === wvistau64 (64 bit locale) === locale.c:2010: Test failed: NORM_STOP_ON_NULL passed, though its equal to length autodetect (-1) - strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:2014: Test failed: NORM_STOP_ON_NULL is not set, strings considered as null terminated - so strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:2018: Test failed: NORM_STOP_ON_NULL passed, and lengths are defined exlicitly - so strings `don\0at` (6) and `don\__` (6) are expected CSTR_EQUAL due to flag, got 0 locale.c:2022: Test failed: NORM_STOP_ON_NULL passed, and length is defined exlicitly for one string - anyway strings `don\0at` (6) and `don\__` (-1) are expected CSTR_EQUAL due to flag, got 0 locale.c:2028: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, though its equal to length autodetect (-1) - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 locale.c:2032: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, and lengths are defined explicitely - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 === w2008s64 (64 bit locale) === locale.c:2010: Test failed: NORM_STOP_ON_NULL passed, though its equal to length autodetect (-1) - strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:2014: Test failed: NORM_STOP_ON_NULL is not set, strings considered as null terminated - so strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:2018: Test failed: NORM_STOP_ON_NULL passed, and lengths are defined exlicitly - so strings `don\0at` (6) and `don\__` (6) are expected CSTR_EQUAL due to flag, got 0 locale.c:2022: Test failed: NORM_STOP_ON_NULL passed, and length is defined exlicitly for one string - anyway strings `don\0at` (6) and `don\__` (-1) are expected CSTR_EQUAL due to flag, got 0 locale.c:2028: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, though its equal to length autodetect (-1) - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 locale.c:2032: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, and lengths are defined explicitely - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0

1 0

Re: [PATCH 1/7] advapi32: Initialize buffer length to zero in LsaLookupSids to prevent crash.
by Nikolay Sivov 04 Apr '15

04 Apr '15

On 04.04.2015 17:22, Qian Hong wrote: > > (*Names)[i].Name.Buffer = NULL; > + (*Names)[i].Name.Length = 0; > + (*Names)[i].Name.MaximumLength = 0; Maybe it's better to hide this in RtlInitUnicodeStringEx(..., NULL) ?

2 1

Re: mshtml: Removed return to ensure AddRef is called on an internal interface
by Piotr Caban 04 Apr '15

04 Apr '15

The patch is wrong, nsCycleCollectionISupports doesn't support AddRef/Release.

4 6

Re: locale: [1/1] patch - 0x10000000 flag is NORM_STOP_ON_NULL
by Marvin 04 Apr '15

04 Apr '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=12661 Your paranoid android. === wvistau64 (32 bit locale) === locale.c:1985: Test failed: NORM_STOP_ON_NULL passed, though its equal to length autodetect (-1) - strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:1989: Test failed: NORM_STOP_ON_NULL is not set, strings considered as null terminated - so strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:1993: Test failed: NORM_STOP_ON_NULL passed, and lengths are defined exlicitly - so strings `don\0at` (6) and `don\__` (6) are expected CSTR_EQUAL due to flag, got 0 locale.c:1997: Test failed: NORM_STOP_ON_NULL passed, and length is defined exlicitly for one string - anyway strings `don\0at` (6) and `don\__` (-1) are expected CSTR_EQUAL due to flag, got 0 locale.c:2003: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, though its equal to length autodetect (-1) - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 locale.c:2007: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, and lengths are defined explicitely - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 === w2008s64 (32 bit locale) === locale.c:1985: Test failed: NORM_STOP_ON_NULL passed, though its equal to length autodetect (-1) - strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:1989: Test failed: NORM_STOP_ON_NULL is not set, strings considered as null terminated - so strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:1993: Test failed: NORM_STOP_ON_NULL passed, and lengths are defined exlicitly - so strings `don\0at` (6) and `don\__` (6) are expected CSTR_EQUAL due to flag, got 0 locale.c:1997: Test failed: NORM_STOP_ON_NULL passed, and length is defined exlicitly for one string - anyway strings `don\0at` (6) and `don\__` (-1) are expected CSTR_EQUAL due to flag, got 0 locale.c:2003: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, though its equal to length autodetect (-1) - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 locale.c:2007: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, and lengths are defined explicitely - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 === w7u (32 bit locale) === locale.c:1985: Test failed: NORM_STOP_ON_NULL passed, though its equal to length autodetect (-1) - strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:1989: Test failed: NORM_STOP_ON_NULL is not set, strings considered as null terminated - so strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:1993: Test failed: NORM_STOP_ON_NULL passed, and lengths are defined exlicitly - so strings `don\0at` (6) and `don\__` (6) are expected CSTR_EQUAL due to flag, got 0 locale.c:1997: Test failed: NORM_STOP_ON_NULL passed, and length is defined exlicitly for one string - anyway strings `don\0at` (6) and `don\__` (-1) are expected CSTR_EQUAL due to flag, got 0 locale.c:2003: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, though its equal to length autodetect (-1) - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 locale.c:2007: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, and lengths are defined explicitely - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 === w8 (32 bit locale) === locale.c:1985: Test failed: NORM_STOP_ON_NULL passed, though its equal to length autodetect (-1) - strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:1989: Test failed: NORM_STOP_ON_NULL is not set, strings considered as null terminated - so strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:1993: Test failed: NORM_STOP_ON_NULL passed, and lengths are defined exlicitly - so strings `don\0at` (6) and `don\__` (6) are expected CSTR_EQUAL due to flag, got 0 locale.c:1997: Test failed: NORM_STOP_ON_NULL passed, and length is defined exlicitly for one string - anyway strings `don\0at` (6) and `don\__` (-1) are expected CSTR_EQUAL due to flag, got 0 locale.c:2003: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, though its equal to length autodetect (-1) - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 locale.c:2007: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, and lengths are defined explicitely - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 === wvistau64 (64 bit locale) === locale.c:1985: Test failed: NORM_STOP_ON_NULL passed, though its equal to length autodetect (-1) - strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:1989: Test failed: NORM_STOP_ON_NULL is not set, strings considered as null terminated - so strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:1993: Test failed: NORM_STOP_ON_NULL passed, and lengths are defined exlicitly - so strings `don\0at` (6) and `don\__` (6) are expected CSTR_EQUAL due to flag, got 0 locale.c:1997: Test failed: NORM_STOP_ON_NULL passed, and length is defined exlicitly for one string - anyway strings `don\0at` (6) and `don\__` (-1) are expected CSTR_EQUAL due to flag, got 0 locale.c:2003: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, though its equal to length autodetect (-1) - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 locale.c:2007: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, and lengths are defined explicitely - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 === w2008s64 (64 bit locale) === locale.c:1985: Test failed: NORM_STOP_ON_NULL passed, though its equal to length autodetect (-1) - strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:1989: Test failed: NORM_STOP_ON_NULL is not set, strings considered as null terminated - so strings `don\0at` (-1) and `don\__` (-1) expected CSTR_EQUAL, got 0 locale.c:1993: Test failed: NORM_STOP_ON_NULL passed, and lengths are defined exlicitly - so strings `don\0at` (6) and `don\__` (6) are expected CSTR_EQUAL due to flag, got 0 locale.c:1997: Test failed: NORM_STOP_ON_NULL passed, and length is defined exlicitly for one string - anyway strings `don\0at` (6) and `don\__` (-1) are expected CSTR_EQUAL due to flag, got 0 locale.c:2003: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, though its equal to length autodetect (-1) - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0 locale.c:2007: Test failed: NORM_STOP_ON_NULL | NORM_IGNORECASE passed, and lengths are defined explicitely - so strings `don\0at` (-1) and `dOn\At` (-1) expected CSTR_EQUAL, got 0

1 0

Re: [PATCH 7/7] advapi32/tests: Add more tests for LsaLookupSids and LsaLookupNames2.
by Marvin 04 Apr '15

04 Apr '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=12659 Your paranoid android. === w2003std (32 bit lsa) === lsa: unhandled exception c0000005 at 7C81BB52 === wvistau64 (64 bit lsa) === No test summary line found === w2008s64 (64 bit lsa) === No test summary line found

1 0

Re: msxml3: Explicitly list acceptable libxml2->msxml node types for unknode (try 2)
by Jacek Caban 04 Apr '15

04 Apr '15

Hi Nikolay, On 01/04/15 22:41, Nikolay Sivov wrote: > + switch (This->node.node->type) > + { > + case XML_ELEMENT_NODE: > + case XML_ATTRIBUTE_NODE: > + case XML_TEXT_NODE: > + case XML_CDATA_SECTION_NODE: > + case XML_ENTITY_REF_NODE: > + case XML_ENTITY_NODE: > + case XML_PI_NODE: > + case XML_COMMENT_NODE: > + case XML_DOCUMENT_NODE: > + case XML_DOCUMENT_TYPE_NODE: > + case XML_DOCUMENT_FRAG_NODE: > + case XML_NOTATION_NODE: Most of those types have their own IXMLDOMNode implementations, so they should never be the case in here. Also, ideally we shouldn't even create unknode object for types that are not supported, so it should be fixed in create_node or its callers. Is it possible in the case that you're fixing? Jacek

2 1

Re: [PATCH 3/4] ntdll/test: Add test_file_size_information
by Marvin 04 Apr '15

04 Apr '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=12656 Your paranoid android. === w8 (32 bit file) === file.c:397: Test failed: mismatched file size for L"WindowsUpdate.log"

1 0

Re: ntdll: Return STATUS_SUCCESS from SetInformationJobObject
by Nikolay Sivov 04 Apr '15

04 Apr '15

I don't think it's a good idea to always claim success. It might be better to actually store those UILIMIT flags (probably by extending set_job_limits ). Alternatively if you don't want to store those for some reason you can return success for this class only while keeping a fixme, but not for all unimplemented classes.

2 1

Re: [PATCH 2/4] ntdll/test: Add ntdll test function test_file_full_size_information
by Marvin 04 Apr '15

04 Apr '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=12655 Your paranoid android. === w8 (32 bit file) === file.c:397: Test failed: mismatched file size for L"WindowsUpdate.log"

1 0

Re: [PATCH] gdiplus: Avoid unnecessary pre-multiplied alpha conversions in GdipDrawImagePointsRect
by Vincent Povirk 03 Apr '15

03 Apr '15

Looks good to me.

1 0

Re: [PATCH] comctl32: Do not resize windows when giving an updown control the same buddy.
by Anton Baskanov 03 Apr '15

03 Apr '15

Hello! Have you verified this behavior on native comctl32? I've tried to send UDM_SETBUDDY with the same HWND repeatedly, and the buddy is resized every time. I've tested it on Windows 7 x64 with both version 5 and 6 of comctl32. On Wed, Apr 1, 2015 at 4:02 AM, Mark Harmstone <hellas(a)burntcomma.com> wrote: > When an updown control receives UDM_SETBUDDY with the HWND of its existing > buddy, it should do nothing. At present Wine resizes the buddy as it > would do initially, resulting in the textbox getting progressively smaller > every time UDM_SETBUDDY is sent. > > --- > dlls/comctl32/updown.c | 3 +++ > 1 file changed, 3 insertions(+) > > > > >

2 2

Re: [PATCH 4/4] d3drm/tests: Add vtable comparison tests in test_frame_qi
by Stefan Dösinger 03 Apr '15

03 Apr '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-04-02 um 18:36 schrieb Aaryaman Vasishta: > REFIID iid; > REFIID refcount_iid; > + REFIID vtable_iid; > HRESULT hr; > BOOL refcount_todo; > + BOOL vtable_equal; > + BOOL vtable_todo; > }; I think this is more complicated than it needs to be. All you should need is the vtable_iid field. Then, in the inner loop do something like if (IsEqualGUID(tests[i].vtable_iid, tests[j].vtable_iid)) ok(iface1 == iface2, ...); else ok(iface1 != iface2, ...); I may be missing something though. If you want to compare two Win32 BOOLs for equality you have to be careful: BOOL a = 1; BOOL b = 2; if (a) printf("this is true.\n"); if (b) printf("this is also true.\n"); if (a == b) printf("oops, this is false.\n"); For something like that you can use if (!a == !b) printf("yay, this is true!\n"); IsEqualGUID(a, b) is defined as !memcmp(a, b, sizeof(GUID)), so IsEqualGUID() == (ptr1 == ptr2) should be OK though. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVHakvAAoJEN0/YqbEcdMwPPYP/08CiwYXURzl7Ias7EKvZGO8 QlYjp4CSEorj44LMOMPMELbN+50NJOngxhXA0mecIhZYA9Dgd5NZtVvDWBIPPu/B tXe+0+Xw/EvzubfzMYjOX5/lOKm400CW3fPEbxwYrzdFOSmeNhclZpfD+9jjuekG Lj2XUSk/TAi1B8NlD0x0LE7P6gGb61rg7jeJNZGgfPYMsuAoB2OtekvbIvpbCZmb 3WlOXtzmqVMHjsEsw47i8pdL/DwCFFfpE0xWWdhfgCChFUG/Ul/V56ltN5ERtudO j+jKtY5oNhunIyALwIifwhYNq/bY9CdfovIOI7sNfM3bXwSCZGEk+5Oq3/dnd4rP /Ejp+Kd5xk4SDMC3kyE6VucZkyFD58plgEDNlgSXx2ND/o3Mw91PTDaGj5xT0Fy1 Enk6oqORgXQhvtUaDH5Y5rOyh+AMquWhhN5N43ymT0UW40D4b6UBNSSwuQeqKaxS d1CqkbjUcivIBVd1k8GiuXEgjaEvwMlv8kPj1FGu/GCoMeyoRy7mXN1NOapPdFVu Gz2e8xR8Bri7oglvsS25i6gjYeYvP8qhTcc8tKBU2tr6MHFN3sUkuOZwtLKJLirc NxdSzaylgVGpCFQ0cwNSjm+eY0WvBd4eLychal+cs2plMmMAkYVTLDRBC4ZReCkw KIL1cdIMHQIZSSrDu22h =tKFs -----END PGP SIGNATURE-----

2 2

Re: kernel32: Stub out GetFileMUIPath.
by Nikolay Sivov 03 Apr '15

03 Apr '15

> +@ stdcall GetFileMUIPath(long ptr ptr ptr ptr ptr ptr) Second and third arguments should be 'wstr'.

1 0

Re: advapi32: Handle NULL DACL in SetSecurityInfo
by Sebastian Lackner 03 Apr '15

03 Apr '15

On 02.04.2015 17:20, Piotr Caban wrote: > --- > dlls/advapi32/security.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > It doesn't match the Windows behaviour, please add at least a couple of tests. https://newtestbot.winehq.org/JobDetails.pl?Key=12622&log_204=1#k204

3 4

Re: user32/tests: Avoid side-effect in an assert.
by Marvin 03 Apr '15

03 Apr '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=12631 Your paranoid android. === wvistau64 (32 bit win) === win.c:7487: Test failed: didn't get start_event in.c:7429: Test failed: button under static window didn't get WM_LBUTTONUP

1 0

Re: [1/3] server: Allow to open a directory without any permission bits.
by Piotr Caban 02 Apr '15

02 Apr '15

On 04/02/15 09:42, Sebastian Lackner wrote: > Its a bit ugly, but probably the best solution to workaround the restrictions of the unix api. ;) There's similar problem with regular files (not directories). The owner should be able to read/write permissions. Also is there any need for unix_fd in this case? Thanks, Piotr

2 1

Re: [PATCH 3/4] d3drm/tests: Split tests between different versions, initially adding frame QueryInterface tests
by Stefan Dösinger 02 Apr '15

02 Apr '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, There are a few more issues: Am 2015-04-02 um 18:36 schrieb Aaryaman Vasishta: > + * Copyright 2012 Andr� Hentschel > + * Copyright 2011-2014 Henri Verbeet for CodeWeavers The encoding is still messed up. Is there any code you have taken from the other file? test_qi() is from dlls/ddraw/tests/ddraw*.c, so you should keep Henri's line. Taking along all the Copyright lines if you take something from an existing file is a safe choice though. Also, you should still fix your editor settings anyways. You can add your own name there if you want. (Fwiw, I don't know why we're maintaining these lines at all. The last thing I heard was that they don't have any legal meaning anyway. Also, git keep track of authorship pretty well.) > +#define CHECK_REFCOUNT(obj,rc) \ > + { \ > + int rc_new = rc; \ > + int count = get_refcount((IUnknown *)obj); \ > + ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ > + } Do you need this? You're using this in one place as far as I can see, you can also just use the get_refcount() and ok() calls directly. > +static int get_refcount(IUnknown *object) > +{ > + IUnknown_AddRef(object); > + return IUnknown_Release(object); > +} Refcounts are ULONG. > + hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame3 interface (hr = %x)\n", hr); The string is a bit misleading, I think something like "Failed to create frame" is better. Not a big issue though. The same applies to d3drm2.c and d3drm3.c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVHaNRAAoJEN0/YqbEcdMwZsAP/RvHLPjullG+tQC+JOZvzGDg nm2CZanwOzmC8ZEvWpXKxhCUjTIVUu0XB7yV33BgPywgRKBUUXkqEuGN+Z/wk7Lm rqNuPx17nPHL7aKjw9DxU3QP75t7RbFxU6N3Wz3Veoi+ox4xwxwmrIxRMkFNtxhv tPREjNp9yQVO79ZlLzI1VzeMVnTHKgVn/L+s68nADUkcBFrQaH6SBhB232utwbtp DdkwYOWCK0xGweaLAkt33X2Qhp+qbdtQjIoK/UZvq190owrW2tC2ORnIFhB/7zDR +FrpGzwGuTnhVocrLYCtVtB1RW5t0QealNjhlwv9HI03NSi/J7MmcwGOIE3TIatm TCCDvp034+EMThEvTDODATbYyihbgihG/jjiaQwznu+A66N9lOvhKRCbiasTjTym X06ti98dmpq9BwMd+8sRVe+U1zi9nRmGqvrcncmxUyZ1QoFdrDWFEpRog1jJvaho 8zO9NIzwsG839bqRyZIyZ0DvteaGXD7o907Nkr7aDt4jMjUmuj0ij+nrDvif9kTJ 5WOppUgN7JN4HhWNo4y5i3jei8X2TDDI9z76Juiv1DM0cbWbr2UTHSvFRysPiqGT vCg+boC2pZd94vQKnMYbyAg+06KDneZwiNYBVQpirY3Bua7PY7TwxkBgXQfh2sNv B2fjxmZVRMB3dWylqJmg =wYMH -----END PGP SIGNATURE-----

2 1

Re: [PATCH] undefined symbols compiling for macosx >10.8
by Ken Thomases 02 Apr '15

02 Apr '15

That symbol is in the 10.8 SDK. We build against that SDK all the time. It works fine. Here's the documentation for that function: <https://developer.apple.com/library/mac/documentation/Security/Reference/se…>. Notice that under Availability it says, "Available in OS X v10.8 and later." Here is the declaration from Security.framework/Headers/SecureTransport.h: ---------- OSStatus SSLGetProtocolVersionMax (SSLContextRef context, SSLProtocol *maxVersion) __OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_5_0); ---------- Notice the __MAC_10_8 identifier in the __OSX_AVAILABLE_STARTING() decorator. You need to fix your build environment and/or your build commands. Whatever problem you're encountering while trying to build is specific to your system. -Ken On Apr 2, 2015, at 11:58 AM, Sergey Isakov <isakov-sl(a)bk.ru> wrote: > Your proposition that SDK10.8 contains the symbol is wrong > —— > #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 > +#ifdef SSLGetProtocolVersionMax > if(SSLGetProtocolVersionMax != NULL) { > ---- > > On 01 апр. 2015 г., at 21:36, Ken Thomases <ken(a)codeweavers.com> wrote: > >> If you were having problems building Wine without this patch, then you have a system configuration problem. Or you're configuring Wine incorrectly. >> >> -Ken >> >> On Apr 1, 2015, at 11:52 AM, Sergey Isakov <isakov-sl(a)bk.ru> wrote: >> >>> Sorry but I committed the patch make me compilation be possible. >>> >>> On 01 апр. 2015 г., at 18:34, Ken Thomases <ken(a)codeweavers.com> wrote: >>> >>>> Hi, >>>> >>>> This patch makes no sense. Wine builds just fine for OS X versions greater than 10.8. Indeed, as near as I know, it still builds just fine for 10.5 and up (the Mac driver requires 10.6 or later, but on 10.5 it just will be skipped; it won't break anything). >>>> >>>> On Apr 1, 2015, at 6:48 AM, Sergey Isakov <isakov-sl(a)bk.ru> wrote: >>>> >>>>> Undefined symbols for architecture i386: >>>>> "_kCGDisplayShowDuplicateLowResolutionModes", referenced from: >>>>> -[WineApplicationController modeMatchingMode:forDisplay:] in cocoa_app.o >>>>> ld: symbol(s) not found for architecture i386 >>>> >>>> If you're getting this error, you're not building against a 10.8+ SDK properly. The compiler is seeing the headers for a 10.8+ SDK but the linker is seeing libraries and frameworks from some pre-10.8 SDK. >>>> >>>> >>>>> Instead of checking for NULL we should check #ifdef >>>> >>>> No. The things being tested are not macros in any version of the SDK. Your #ifdef checks will never pass. You have effectively done "#if 0". >>>> >>>> Finally, changes to separate DLLs (secur32 and winemac.drv, in this case) should be in separate patches unless they are inter-dependent. >>>> >>>> -Ken >>>> >>> >> >

1 0

Re: [PATCH] vbscript: Fixed Hex(try 3)
by Marvin 02 Apr '15

02 Apr '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=12612 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [1/4] windowscodecs: Add test for PNG gAMA metadata.
by Vincent Povirk 02 Apr '15

02 Apr '15

I forgot to NULL-terminate a string, please ignore. On Wed, Apr 1, 2015 at 5:24 PM, Vincent Povirk <madewokherd(a)gmail.com> wrote: >

1 0

Re: [PATCH] findstr: Added test for findstr. (try 2)
by Kaipeng Zeng 02 Apr '15

02 Apr '15

Excuse me,can anyone have a look at this patch? I appreciate for any comment. Thanks！ 2015-03-24 13:55 GMT+08:00 Kaipeng Zeng <kaipeng94(a)gmail.com>: > Thanks Stefan! > > Superseded patch 110143 . > ChangeLog: > - Exclude change to configure > - Return exit code of findstr in runcmd() >

2 1

Re: [1/3] server: Implement job limit flags (try 2)
by Nikolay Sivov 02 Apr '15

02 Apr '15

On 02.04.2015 10:38, Andrew Cook wrote: > Changes in try 2: > - Removed the goto in SetInformationJobObject, ExtendedLimit will need its own > wineserver call eventually anyway I don't think you'll need a separate server call for extended info case. All fields should be enabled with flags, so you don't have to invent special values to ignore some limits. > + switch (class) > + { > + > + case JobObjectExtendedLimitInformation: > + if (len != sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION)) > + return STATUS_INVALID_PARAMETER; > + > + basic_limit = &(((JOBOBJECT_EXTENDED_LIMIT_INFORMATION *)info)->BasicLimitInformation); > + if (basic_limit->LimitFlags & ~JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS) > + return STATUS_INVALID_PARAMETER; > + > + SERVER_START_REQ( job_set_limits ) > + { > + req->handle = wine_server_obj_handle( handle ); > + req->limit_flags = basic_limit->LimitFlags; > + status = wine_server_call( req ); > + } > + SERVER_END_REQ; > + break; This still looks strange, if you need only flags you can use switch() to prepare this flags value depending on info class, and handle invalid arguments same way you do know, no need to duplicate server calling block. Actually since extended info contains basic info you only need a switch() to test for invalid arguments, and you can cast unconditionally to JOBOBJECT_BASIC_LIMIT_INFORMATION* to get flags.

1 0

Re: [1/3] server: Implement job limit flags
by Alexandre Julliard 02 Apr '15

02 Apr '15

Andrew Cook <ariscop(a)gmail.com> writes: > + switch (class) > + { > + > + case JobObjectExtendedLimitInformation: > + if (len != sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION)) > + return STATUS_INVALID_PARAMETER; > + > + basic_limit = &(((JOBOBJECT_EXTENDED_LIMIT_INFORMATION *)info)->BasicLimitInformation); > + if (basic_limit->LimitFlags & ~JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS) > + return STATUS_INVALID_PARAMETER; > + > + goto set_basic_limits; > + > + case JobObjectBasicLimitInformation: > + if (len != sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION)) > + return STATUS_INVALID_PARAMETER; > + > + basic_limit = info; > + if (basic_limit->LimitFlags & ~JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS) > + return STATUS_INVALID_PARAMETER; > + > + set_basic_limits: > + SERVER_START_REQ( set_job_limits ) > + { > + req->handle = wine_server_obj_handle( handle ); > + req->limit_flags = basic_limit->LimitFlags; > + status = wine_server_call( req ); > + } > + SERVER_END_REQ; > + break; A goto target in the middle of a switch statement is not very nice, please try to find a better way. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msctf: Always return FALSE in DllCanUnloadNow
by Sebastian Lackner 02 Apr '15

02 Apr '15

On 02.04.2015 03:34, Alistair Leslie-Hughes wrote: > Hi, > Fixes https://bugs.winehq.org/show_bug.cgi?id=31579 > > Changelog: > msctf: Always return FALSE in DllCanUnloadNow > > > Best Regards > Alistair Leslie-Hughes > > > I doubt that the patch has any real disadvantage, but wouldn't it be better to fix the refcounting instead of just removing this feature? Qian Hong even attached a suggested patch on the bugreport.

3 2

Re: comctl32/tests: Fix couple of metrics tests that fail on some systems (try 3)
by Marvin 02 Apr '15

02 Apr '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=12601 Your paranoid android. === wvistau64 (32 bit listview) === listview.c:5190: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5195: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000 === w2008s64 (32 bit listview) === listview.c:5190: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5195: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000 === w7u (32 bit listview) === listview.c:5190: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5195: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000 === w2008s64 (64 bit listview) === listview.c:5190: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5195: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000

2 1

Re: [PATCH (try2)] gdiplus: Avoid unnecessary pre-multiplied alpha conversions in GdipDrawImagePointsRect
by Vincent Povirk 02 Apr '15

02 Apr '15

I think we also need resample_bitmap_pixel to be set up to handle PARGB. Nearest neighbor interpolation should work OK as is, but bilinear interpolation uses blend_colors which only works correctly for ARGB. (The implementation of blend_colors that we had before 9c579023f0750539bdf7815f8545c4620540387a should actually be correct for PARGB.) On Wed, Apr 1, 2015 at 11:38 AM, Andrew Eikum <aeikum(a)codeweavers.com> wrote: > Not all of the operations we perform in the DrawImage family need to > be post-multiplied. We can avoid doing a pre-to-post-multiplied alpha > conversion by detecting whether we need post-multiplied ahead of time. > Avoiding this conversion saves considerable time, about 3/1000s in my > particular test case. > > --- > > try2: Fix return value from color_over_fgpremult > > dlls/gdiplus/gdiplus_private.h | 20 +++++++++++++ > dlls/gdiplus/graphics.c | 66 ++++++++++++++++++++++++++++-------------- > 2 files changed, 65 insertions(+), 21 deletions(-) > > diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h > index 065f5ed..57b3de3 100644 > --- a/dlls/gdiplus/gdiplus_private.h > +++ b/dlls/gdiplus/gdiplus_private.h > @@ -121,6 +121,26 @@ static inline ARGB color_over(ARGB bg, ARGB fg) > return (a<<24)|(r<<16)|(g<<8)|b; > } > > +/* fg is premult, bg and return value are not */ > +static inline ARGB color_over_fgpremult(ARGB bg, ARGB fg) > +{ > + BYTE b, g, r, a; > + BYTE bg_alpha, fg_alpha; > + > + fg_alpha = (fg>>24)&0xff; > + > + if (fg_alpha == 0) return bg; > + > + bg_alpha = (((bg>>24)&0xff) * (0xff-fg_alpha)) / 0xff; > + > + a = bg_alpha + fg_alpha; > + b = ((bg&0xff)*bg_alpha + (fg&0xff)*0xff)/a; > + g = (((bg>>8)&0xff)*bg_alpha + ((fg>>8)&0xff)*0xff)/a; > + r = (((bg>>16)&0xff)*bg_alpha + ((fg>>16)&0xff)*0xff)/a; > + > + return (a<<24)|(r<<16)|(g<<8)|b; > +} > + > extern const char *debugstr_rectf(const RectF* rc) DECLSPEC_HIDDEN; > > extern const char *debugstr_pointf(const PointF* pt) DECLSPEC_HIDDEN; > diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c > index 580390f..89c108e 100644 > --- a/dlls/gdiplus/graphics.c > +++ b/dlls/gdiplus/graphics.c > @@ -354,9 +354,9 @@ static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) > return GdipGetRegionHRgn(graphics->clip, NULL, hrgn); > } > > -/* Draw non-premultiplied ARGB data to the given graphics object */ > +/* Draw ARGB data to the given graphics object */ > static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, > - const BYTE *src, INT src_width, INT src_height, INT src_stride) > + const BYTE *src, INT src_width, INT src_height, INT src_stride, const PixelFormat fmt) > { > GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; > INT x, y; > @@ -372,7 +372,10 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ > continue; > > GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); > - GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); > + if (fmt & PixelFormatPAlpha) > + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over_fgpremult(dst_color, src_color)); > + else > + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); > } > } > > @@ -380,7 +383,7 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ > } > > static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, > - const BYTE *src, INT src_width, INT src_height, INT src_stride) > + const BYTE *src, INT src_width, INT src_height, INT src_stride, PixelFormat fmt) > { > HDC hdc; > HBITMAP hbitmap; > @@ -404,7 +407,8 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ > hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, > (void**)&temp_bits, NULL, 0); > > - if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) > + if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE || > + fmt & PixelFormatPAlpha) > memcpy(temp_bits, src, src_width * src_height * 4); > else > convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, > @@ -420,7 +424,7 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ > } > > static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst_y, > - const BYTE *src, INT src_width, INT src_height, INT src_stride, HRGN hregion) > + const BYTE *src, INT src_width, INT src_height, INT src_stride, HRGN hregion, PixelFormat fmt) > { > GpStatus stat=Ok; > > @@ -470,7 +474,7 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst > stat = alpha_blend_bmp_pixels(graphics, rects[i].left, rects[i].top, > &src[(rects[i].left - dst_x) * 4 + (rects[i].top - dst_y) * src_stride], > rects[i].right - rects[i].left, rects[i].bottom - rects[i].top, > - src_stride); > + src_stride, fmt); > } > > GdipFree(rgndata); > @@ -503,7 +507,7 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst > ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); > > stat = alpha_blend_hdc_pixels(graphics, dst_x, dst_y, src, src_width, > - src_height, src_stride); > + src_height, src_stride, fmt); > > RestoreDC(graphics->hdc, save); > > @@ -514,9 +518,9 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst > } > > static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, > - const BYTE *src, INT src_width, INT src_height, INT src_stride) > + const BYTE *src, INT src_width, INT src_height, INT src_stride, PixelFormat fmt) > { > - return alpha_blend_pixels_hrgn(graphics, dst_x, dst_y, src, src_width, src_height, src_stride, NULL); > + return alpha_blend_pixels_hrgn(graphics, dst_x, dst_y, src, src_width, src_height, src_stride, NULL, fmt); > } > > static ARGB blend_colors(ARGB start, ARGB end, REAL position) > @@ -656,8 +660,9 @@ static BOOL color_is_gray(ARGB color) > return (r == g) && (g == b); > } > > -static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, > - UINT width, UINT height, INT stride, ColorAdjustType type) > +/* returns preferred pixel format for the applied attributes */ > +static PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, > + UINT width, UINT height, INT stride, ColorAdjustType type, PixelFormat fmt) > { > UINT x, y; > INT i; > @@ -669,6 +674,9 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d > BYTE min_blue, min_green, min_red; > BYTE max_blue, max_green, max_red; > > + if (!data || fmt != PixelFormat32bppARGB) > + return PixelFormat32bppARGB; > + > if (attributes->colorkeys[type].enabled) > key = &attributes->colorkeys[type]; > else > @@ -702,6 +710,9 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d > { > const struct color_remap_table *table; > > + if (!data || fmt != PixelFormat32bppARGB) > + return PixelFormat32bppARGB; > + > if (attributes->colorremaptables[type].enabled) > table = &attributes->colorremaptables[type]; > else > @@ -731,6 +742,9 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d > int gray_matrix[5][5]; > BOOL identity; > > + if (!data || fmt != PixelFormat32bppARGB) > + return PixelFormat32bppARGB; > + > if (attributes->colormatrices[type].enabled) > colormatrices = &attributes->colormatrices[type]; > else > @@ -769,6 +783,9 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d > { > REAL gamma; > > + if (!data || fmt != PixelFormat32bppARGB) > + return PixelFormat32bppARGB; > + > if (attributes->gamma_enabled[type]) > gamma = attributes->gamma[type]; > else > @@ -793,6 +810,8 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d > *src_color = (*src_color & 0xff000000) | (red << 16) | (green << 8) | blue; > } > } > + > + return fmt; > } > > /* Given a bitmap and its source rectangle, find the smallest rectangle in the > @@ -1237,7 +1256,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, > if (stat == Ok) > apply_image_attributes(fill->imageattributes, fill->bitmap_bits, > bitmap->width, bitmap->height, > - src_stride, ColorAdjustTypeBitmap); > + src_stride, ColorAdjustTypeBitmap, lockeddata.PixelFormat); > > if (stat != Ok) > { > @@ -2990,15 +3009,18 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image > return OutOfMemory; > src_stride = sizeof(ARGB) * src_area.Width; > > - /* Read the bits we need from the source bitmap into an ARGB buffer. */ > + /* Read the bits we need from the source bitmap into a compatible buffer. */ > lockeddata.Width = src_area.Width; > lockeddata.Height = src_area.Height; > lockeddata.Stride = src_stride; > - lockeddata.PixelFormat = PixelFormat32bppARGB; > lockeddata.Scan0 = src_data; > + if (bitmap->format == PixelFormat32bppPARGB) > + lockeddata.PixelFormat = apply_image_attributes(imageAttributes, NULL, 0, 0, 0, ColorAdjustTypeBitmap, bitmap->format); > + else > + lockeddata.PixelFormat = PixelFormat32bppARGB; > > stat = GdipBitmapLockBits(bitmap, &src_area, ImageLockModeRead|ImageLockModeUserInputBuf, > - PixelFormat32bppARGB, &lockeddata); > + lockeddata.PixelFormat, &lockeddata); > > if (stat == Ok) > stat = GdipBitmapUnlockBits(bitmap, &lockeddata); > @@ -3011,7 +3033,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image > > apply_image_attributes(imageAttributes, src_data, > src_area.Width, src_area.Height, > - src_stride, ColorAdjustTypeBitmap); > + src_stride, ColorAdjustTypeBitmap, lockeddata.PixelFormat); > > if (do_resampling) > { > @@ -3059,7 +3081,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image > } > > stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top, > - dst_data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, dst_stride); > + dst_data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, dst_stride, > + lockeddata.PixelFormat); > > GdipFree(src_data); > > @@ -4009,7 +4032,8 @@ static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, > if (stat == Ok) > stat = alpha_blend_pixels_hrgn(graphics, gp_bound_rect.X, > gp_bound_rect.Y, (BYTE*)pixel_data, gp_bound_rect.Width, > - gp_bound_rect.Height, gp_bound_rect.Width * 4, hregion); > + gp_bound_rect.Height, gp_bound_rect.Width * 4, hregion, > + PixelFormat32bppARGB); > > GdipFree(pixel_data); > } > @@ -5811,7 +5835,7 @@ GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) > /* Write the changed pixels to the real target. */ > alpha_blend_pixels(graphics, 0, 0, graphics->temp_bits, > graphics->temp_hbitmap_width, graphics->temp_hbitmap_height, > - graphics->temp_hbitmap_width * 4); > + graphics->temp_hbitmap_width * 4, PixelFormat32bppARGB); > > /* Clean up. */ > DeleteDC(graphics->temp_hdc); > @@ -6366,7 +6390,7 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI > > /* draw the result */ > stat = alpha_blend_pixels(graphics, min_x, min_y, pixel_data, pixel_area.Width, > - pixel_area.Height, pixel_data_stride); > + pixel_area.Height, pixel_data_stride, PixelFormat32bppARGB); > > GdipFree(pixel_data); > > -- > 2.3.5 > > >

1 1

Re: [PATCH 4/4] d3drm/tests: Add tests to compare vtables for frame{1-3}, object and visual
by Stefan Dösinger 01 Apr '15

01 Apr '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-04-01 um 18:15 schrieb Aaryaman Vasishta: > +struct vtable_test > +{ > + REFIID iid; > + BOOL equal; > + BOOL todo; > +}; You should be able to integrate this into the existing qi test table, similar to how the refcount_iid field works. If you need more than one TODO field (e.g. one for refcount_iid and one for vtable inheritance) use flags. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVHHR+AAoJEN0/YqbEcdMwNa4P/08HSs3DE722aHW2nyx0Zfs1 KPeEn3yqm32PUrBbFs8gptp5+KxKqpsd7mzN3OgHxx+ipRCbcSrVEFhMYuels/Sl YX8rYrpGam+kKOSBOV8mnwjR1Fc9K3KDi5vyODmi4hFWb+gWArtONOVTm8HQwk/P S339yQDjsRArCugbVywmAMEi8J4ImTvuG102vZIyHFysmPG9CQQ5ndE7naE+B58s MJ557ErCWtDdazOis3CtFFVe1jBvwcZyfKi+6LSTyhVxVOiP3Mc84k+5cdT7929u UzXlHkJlS7qxAjxHz0gF1gdvCS/jlUQV5pGNrwoLg4FQEY7I5jPqR8QkseccygYC bHH/JaNfFcaELF5OTkyJCCH0Xa7hAPSWk8/RRcutzboe2s6n3SRUXuM9lAE9tBZL lopYNRYqb7wuxMFzdsRD5MG9zyqOGdg1dx/t75WMcniD36g65CDHkTaIRDX1nrCE 4ZTBhmXoAQxz60nrMHbZDye9rxTd1+RPvs45X9BOFpolfUAJt6luX8+ib0v5myMf qL8QzYT+lsNiFtZMwGrSRb3Wj4nm+KWeH2E8WBx3oYrQZe1LWFH6ZlkyTRamEKDY ooC8tNxrhOqQOV5eD8+Y3DDN+jE6jI53vpC3RAUMUtHXYrYHLiwKKpgyCjXU/vBi Ym2oC3yNbzOon0NQZ9UR =E3pj -----END PGP SIGNATURE-----

1 0

Re: [PATCH] uxtheme: Load MUI file when theme loaded.
by Nikolay Sivov 01 Apr '15

01 Apr '15

On 04/02/2015 12:00 AM, Mark Harmstone wrote: > Version 4 uxthemes, as used in Vista and above, are split over two files - the > msstyles file, and a language-dependent MUI file storing the theme's name, the > fonts it uses, etc. In preparation for v4 support, this patch adds MUI loading > to uxtheme. > > --- > dlls/uxtheme/msstyles.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++- > dlls/uxtheme/msstyles.h | 1 + > 2 files changed, 98 insertions(+), 1 deletion(-) > Path resolution you've implemented looks very similar to what GetFileMUIPath() is supposed to return. It would be great to have it at least partially implemented instead of potentially duplicating it. It'd be perfectly fine if you implement only subset of flags that you'll actually need for uxtheme.

1 0

Re: comctl32/tests: Fix couple of metrics tests that fail on some systems (try2)
by Marvin 01 Apr '15

01 Apr '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=12597 Your paranoid android. === w2008s64 (32 bit listview) === listview.c:5190: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5195: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000 === w7u (32 bit listview) === listview.c:3933: Test failed: got right 112, bottom 19 listview.c:5190: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5195: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000 === w2008s64 (64 bit listview) === listview.c:5190: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5195: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000

1 0

Re: d3dx9_36: Add D3DXFrameFind stub.
by Nikolay Sivov 01 Apr '15

01 Apr '15

On 04/01/2015 08:59 PM, Andrey Gusev wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=38334 > > Thanks to Matteo Bruni for valuable help. > > +D3DXFRAME * WINAPI D3DXFrameFind(const D3DXFRAME *frame_root, const char *name) > +{ > + FIXME("frame_root %p, name %s stub.\n", frame_root, debugstr_a(name)); > + > + return NULL; > +} > + If it's just a matter of searching for a name in a tree, I think it's better to add actual implementation instead of a stub.

1 0

Re: [PATCH] undefined symbols compiling for macosx >10.8
by Ken Thomases 01 Apr '15

01 Apr '15

If you were having problems building Wine without this patch, then you have a system configuration problem. Or you're configuring Wine incorrectly. -Ken On Apr 1, 2015, at 11:52 AM, Sergey Isakov <isakov-sl(a)bk.ru> wrote: > Sorry but I committed the patch make me compilation be possible. > > On 01 апр. 2015 г., at 18:34, Ken Thomases <ken(a)codeweavers.com> wrote: > >> Hi, >> >> This patch makes no sense. Wine builds just fine for OS X versions greater than 10.8. Indeed, as near as I know, it still builds just fine for 10.5 and up (the Mac driver requires 10.6 or later, but on 10.5 it just will be skipped; it won't break anything). >> >> On Apr 1, 2015, at 6:48 AM, Sergey Isakov <isakov-sl(a)bk.ru> wrote: >> >>> Undefined symbols for architecture i386: >>> "_kCGDisplayShowDuplicateLowResolutionModes", referenced from: >>> -[WineApplicationController modeMatchingMode:forDisplay:] in cocoa_app.o >>> ld: symbol(s) not found for architecture i386 >> >> If you're getting this error, you're not building against a 10.8+ SDK properly. The compiler is seeing the headers for a 10.8+ SDK but the linker is seeing libraries and frameworks from some pre-10.8 SDK. >> >> >>> Instead of checking for NULL we should check #ifdef >> >> No. The things being tested are not macros in any version of the SDK. Your #ifdef checks will never pass. You have effectively done "#if 0". >> >> Finally, changes to separate DLLs (secur32 and winemac.drv, in this case) should be in separate patches unless they are inter-dependent. >> >> -Ken >> >

1 0

Re: [PATCH 3/4] d3drm/tests: Split tests seperately for IDirect3DRM{1-3} interfaces
by Stefan Dösinger 01 Apr '15

01 Apr '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-04-01 um 18:15 schrieb Aaryaman Vasishta: > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1841,6 +1841,104 @@ static void test_d3drm_qi(void) > IDirect3DRM_Release(d3drm); > } > > +static void test_frame_qi(void) > +{ There's no need to add this to d3drm.c and d3drm3.c. The versions in d3drm1.c, d3drm2.c and d3drm3.c are enough. Ideally d3drm.c will go away at some point. > + hr = Direct3DRMCreate(&d3drm); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); > + > + test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, sizeof(tests) / sizeof(*tests)); > + > + IDirect3DRM_Release(d3drm); This test is version independent because there is only one way to create the d3drm object. You can just keep it in d3drm.c for now, or move it to d3drm1.c in a separate patch if you want. > --- a/dlls/d3drm/tests/Makefile.in > +++ b/dlls/d3drm/tests/Makefile.in > @@ -2,4 +2,7 @@ TESTDLL = d3drm.dll > IMPORTS = d3drm dxguid ddraw user32 uuid > C_SRCS = \ > d3drm.c \ > + d3drm1.c \ > + d3drm2.c \ > + d3drm3.c \ > vector.c This doesn't match the Makefile.in file I have. You have a reordered IMPORTS line. This is why the testbot failed. Do you have other patches in your tree? > +* Copyright 2012 Andr� Hentschel This shows up wrong in my mail client. It may be a setup issue on my side. It shows up OK on http://source.winehq.org/patches/data/110484 when viewed with the browser, but if I download the patch with wget it is broken as well. Please make sure your text editor is configured to save the files as UTF8. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVHCwnAAoJEN0/YqbEcdMwqsMP/1pigFRsvxOMAYpIHbPoQzda rnKNX4egG04IFvrlObvEVNm6GUW02hgm7SB5+UcdCkXclbGbDjxW0R8M4RqoYOHs swdSxFIZX9s/wPqHJOv33oK8TDPKYUX2SwXyhyOEN7rh3LKJF4DeYGP0uW+wSMed bCXeJ9bx3X55cAGMJhP9jVdcq8ADTh8z0sYANHLBkD80OCac+KxFMmsGrxUD2e2H l6ATINj9BKlgAYGbFnoweNkiv4+O9y6zXBgOQu8Df6Jlr+mu86Jv0zi5S7MHEj4h tWwNyNyaDjTIUlfMdF3cCrKDhLhgYuuwQqij/iAdrEcGFEFn+QKeX0THCGwLeto8 nzwmEZFKYT2keJsMoHQ5tf0U6tT0xedsOjHHTHg/cg1BBj7ogtJ0YcEaxIYtF7uP 47tkjEL9iKXaN7bfdugH1D4buvufUzlZYIvehdbyNcWs3/HYHdiBAbER1ah3yAn9 TlpYdHpZstimuDkMMMLCExW/nlnGZlxz+orF9RNMm/SowtAe1aMVGGHMS5+6ZBfb 4z85+OWG8bR9D+e7+OeOYr/3Z62wiKLppRVQiJ4NgrGgv4ex2rIjqkiKBTEgSZm7 WTptfVrMCQ8zHEpos8iZHZOcoOLVFX4ylQaNNXmssGtwcLqH/P8o7KAk3o6RO+g0 qlkMVFMPEn7fE9h8WJfj =Jeuf -----END PGP SIGNATURE-----

3 3

Re: [PATCH 4/4] d3drm/tests: Add tests to compare vtables for frame{1-3}, object and visual
by Marvin 01 Apr '15

01 Apr '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=12593 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/4] d3drm/tests: Split tests seperately for IDirect3DRM{1-3} interfaces
by Marvin 01 Apr '15

01 Apr '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=12592 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH] undefined symbols compiling for macosx >10.8
by Ken Thomases 01 Apr '15

01 Apr '15

Hi, This patch makes no sense. Wine builds just fine for OS X versions greater than 10.8. Indeed, as near as I know, it still builds just fine for 10.5 and up (the Mac driver requires 10.6 or later, but on 10.5 it just will be skipped; it won't break anything). On Apr 1, 2015, at 6:48 AM, Sergey Isakov <isakov-sl(a)bk.ru> wrote: > Undefined symbols for architecture i386: > "_kCGDisplayShowDuplicateLowResolutionModes", referenced from: > -[WineApplicationController modeMatchingMode:forDisplay:] in cocoa_app.o > ld: symbol(s) not found for architecture i386 If you're getting this error, you're not building against a 10.8+ SDK properly. The compiler is seeing the headers for a 10.8+ SDK but the linker is seeing libraries and frameworks from some pre-10.8 SDK. > Instead of checking for NULL we should check #ifdef No. The things being tested are not macros in any version of the SDK. Your #ifdef checks will never pass. You have effectively done "#if 0". Finally, changes to separate DLLs (secur32 and winemac.drv, in this case) should be in separate patches unless they are inter-dependent. -Ken

1 0

Re: [PATCH] vbscript: Implemented Oct(try 4)
by Marvin 01 Apr '15

01 Apr '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=12481 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

3 2

Wine on Javascript
by Zhenbo Li 01 Apr '15

01 Apr '15

Hi All, I'm came up with this idea since last year, and I'm glad to share this idea to you today. We tried to compile wine with clang[1], and most of the blocks have been fixed[2]. I tried it on my computer, and wine was built successfully, but `make test` failed.' I think wine+clang would work fine soon. Besides, the JavaScript engines are improving, for example, Google V8[3], and we can expect a better performance[4]. Now, let's connect them: Why not run wine's IR with a JavaScript engine?[5] At least, we have such benefits: 1. We can offer a online demo for wine 2. Wine can work on portable devices 3. Wine user can use the same prefix on different devices 4. We can have a better backend[6] This is my humble idea. I'm looking forward to your reply. [1]: http://wiki.winehq.org/Clang [2]: https://llvm.org/bugs/show_bug.cgi?id=10638 [3]: https://code.google.com/p/v8/ [4]: http://arewefastyet.com/ [5]: http://kripken.github.io/emscripten-site/ [6]: https://software.intel.com/en-us/articles/graphics-acceleration-for-html5-a… -- Have a nice (April Fool) day! Zhenbo Li

3 2

Re: [PATCH] vbscript: Fixed Hex(try 2)
by Marvin 01 Apr '15

01 Apr '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=12560 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

3 2

Re: [1/6] kernel32/tests: Extend IsProcessInJob tests (try 2)
by Marvin 01 Apr '15

01 Apr '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=12559 Your paranoid android. === w7u (32 bit process) === prprocess.c:2496: Test failed: WaitForSingleObject returned 258

1 0

Re: [4/6] ntdll: Implement IsProcessInJob
by Marvin 01 Apr '15

01 Apr '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=12555 Your paranoid android. === w7u (32 bit process) === process.c:2274: Test failed: WaitForSingleObject returned 258 process.c:2278: Test failed: AssignProcessToJobObject unexpectedly succeeded process.c:2279: Test failed: Expected GetLastError() to be 5 (ERROR_ACCESS_DENIED) is -559038737

1 0

Re: [PATCH 4/4] d3drm/tests: Add QueryInterface tests for IDirect3DRMFrame3
by Aaryaman Vasishta 31 Mar '15

31 Mar '15

The tests also pass when the frame is created via IDirect3DRM_CreateFrame and IDirect3DRM2_CreateFrame. On Tue, Mar 31, 2015 at 1:36 AM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > --- > dlls/d3drm/tests/d3drm.c | 99 > ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 99 insertions(+) > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 515aace..6029b1a 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1841,6 +1841,104 @@ static void test_d3drm_qi(void) > IDirect3DRM_Release(d3drm); > } > > +static void test_frame_qi(void) > +{ > + static const struct qi_test tests[] = > + { > + { &IID_IDirect3DRMFrame3, &IID_IDirect3DRMFrame3, S_OK, > FALSE }, > + { &IID_IDirect3DRMFrame2, &IID_IDirect3DRMFrame3, S_OK, > FALSE }, > + { &IID_IDirect3DRMFrame, &IID_IDirect3DRMFrame3, S_OK, > FALSE }, > + { &IID_IDirect3DRM, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMDevice, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMObject, &IID_IDirect3DRMFrame3, S_OK, > FALSE }, > + { &IID_IDirect3DRMDevice2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMDevice3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMViewport, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMViewport2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRM3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRM2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMVisual, &IID_IDirect3DRMFrame3, S_OK, > FALSE }, > + { &IID_IDirect3DRMMesh, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMMeshBuilder, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMMeshBuilder2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMMeshBuilder3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMFace, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMFace2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMLight, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMTexture, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMTexture2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMTexture3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMWrap, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMMaterial, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMMaterial2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMAnimation, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMAnimation2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMAnimationSet, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMAnimationSet2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMObjectArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMDeviceArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMViewportArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMFrameArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMVisualArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMLightArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMPickedArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMFaceArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMAnimationArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMUserVisual, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMShadow, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMShadow2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMInterpolator, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMProgressiveMesh, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMPicked2Array, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMClippedVisual, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDrawClipper, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDrawSurface7, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDrawSurface4, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDrawSurface3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDrawSurface2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDrawSurface, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DDevice7, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DDevice3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DDevice2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DDevice, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3D7, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3D3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3D2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3D, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDraw7, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDraw4, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDraw3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDraw2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDraw, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DLight, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IUnknown, &IID_IDirect3DRMFrame3, S_OK, > FALSE }, > + }; > + HRESULT hr; > + IDirect3DRM *d3drm; > + IDirect3DRM3 *d3drm3; > + IDirect3DRMFrame3 *frame3; > + > + hr = Direct3DRMCreate(&d3drm); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", > hr); > + > + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, > (void **)&d3drm3))) > + { > + win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping > tests\n", hr); > + IDirect3DRM_Release(d3drm); > + return; > + } > + > + hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame3 interface (hr = > %x)\n", hr); > + CHECK_REFCOUNT(frame3, 1); > + > + test_qi("frame_qi", (IUnknown *)frame3, &IID_IDirect3DRMFrame3, > tests, sizeof(tests) / sizeof(*tests)); > + > + IDirect3DRMFrame3_Release(frame3); > + IDirect3DRM3_Release(d3drm3); > + IDirect3DRM_Release(d3drm); > +} > + > START_TEST(d3drm) > { > test_MeshBuilder(); > @@ -1857,4 +1955,5 @@ START_TEST(d3drm) > test_d3drm_load(); > test_frame_mesh_materials(); > test_d3drm_qi(); > + test_frame_qi(); > } > -- > 1.9.3 (Apple Git-50) > >

2 2

Re: [PATCH] comctl32: Handle BM_SETSTATE sent to themed buttons.
by Nikolay Sivov 31 Mar '15

31 Mar '15

On 03/31/2015 10:45 PM, Mark Harmstone wrote: > This patch changes comctl32 to handle BM_SETSTATE itself when sent to > a themed button, rather than forwarding it to user32. This way, the > theming isn't temporarily lost when user32 repaints it. > > + case BM_SETSTATE: > + { > + int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); > + if (wParam) > + SetWindowLongW(hwnd, 0, state | BST_PUSHED); > + else > + SetWindowLongW(hwnd, 0, state & ~BST_PUSHED); > + > + InvalidateRect(hwnd, NULL, FALSE); > + break; > + } > + I guess you can GetWindowLongW(...,0,...) instead of sending a message? But what's more important is that all these difference in behavior comparing to user32 controls should not be visible only when you have an active theme. It's actually another version of same Button control with additional messages and different behavior in some aspects, including theming-aware drawing. So my point is that theming support is secondary, what's important is class redirection support, and I'm worried if these theming-only changes will make it more difficult to fix properly later. P.S. 0 window data index is actually implementation details of user32 (I don't know if it's compatible with native one with that regard or not).

1 0

Re: gdiplus/tests: Use printf() for memory dumps instead of trace(). (try 2)
by Thomas Faber 31 Mar '15

31 Mar '15

On 2015-03-29 12:29, Thomas Faber wrote: > trace is unsuitable since it adds a file:line prefix every time. Is there a preferred way to handle this instead of using printf? Or is this simply a case that seems pointless to fix because tests should never fail anyway (in which case a patch to remove these dumps completely might make sense)? Thanks! -Thomas PS: Here's what I see with trace(), which was my reasoning for the patch: image.c:4241: Test marked todo: 16: data should match image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 80image.c:4249: 80image.c:4249: 80image.c:4249: 80image.c:4249: 80image.c:4249: 80image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4250:

2 1

Re: [PATCH] gdiplus: Avoid unnecessary post-to-pre-multiplied alpha conversions in GdipDrawImagePointsRect
by Vincent Povirk 31 Mar '15

31 Mar '15

On Tue, Mar 31, 2015 at 9:05 AM, Andrew Eikum <aeikum(a)codeweavers.com> wrote: > + if (bg_alpha == 0) return fg; This doesn't seem right. Foreground is premultiplied, but we expect the result to not be premultiplied.

1 0

Re: [PATCH 6/7] ddraw/tests: Add more d3d7 lighting tests.
by Henri Verbeet 31 Mar '15

31 Mar '15

On 30 March 2015 at 20:18, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + static WORD Indices[] = {0, 1, 2, 2, 3, 0}; You have a typo here. :)

2 1

Re: [PATCH 1/7] ddraw: D3DLIGHT lights default to active.
by Henri Verbeet 31 Mar '15

31 Mar '15

On 30 March 2015 at 20:18, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -184,7 +184,7 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) > - if (data->dwSize >= sizeof(D3DLIGHT2) && (((D3DLIGHT2 *)data)->dwFlags & D3DLIGHT_NO_SPECULAR)) > + if (!(flags & D3DLIGHT_NO_SPECULAR)) > light7->dcvSpecular = data->dcvColor; > else > light7->dcvSpecular = *(const D3DCOLORVALUE *)zero_value; I'm not holding this against the patch too much because it's ddraw, but I think "if (flags & D3DLIGHT_NO_SPECULAR)" and then flipping the branches reads a bit nicer. If the declaration of "zero_value" is fixed you can avoid the cast as well. > @@ -200,9 +200,10 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) > + memcpy(&light->light, data, sizeof(D3DLIGHT)); There's something to be said for "sizeof(D3DLIGHT)" here, although I don't think "sizeof(*data)" would have been worse.

2 1

Re: [3/3] kernel32: force 4096 byte page alignment (resend)
by Alexandre Julliard 31 Mar '15

31 Mar '15

David Naylor <dbn(a)freebsd.org> writes: > FreeBSD prefers to use a 0x200000 (super) page alignment however this causes > the image base to be displaced from the requested 0x7b800000. Forcing a > smaller page size ensures FreeBSD can place the image startin at 0x7b800000. This would have to be done in winegcc, with appropriate configure checks. It's probably easier to change the address to leave more room. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: comctl32/tests: Fix couple of metrics tests that fail on some systems
by Dmitry Timoshkov 31 Mar '15

31 Mar '15

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + /* estimate using stock font metrics */ > + hdc = GetDC(0); > + hOldFont = SelectObject(hdc, GetStockObject (SYSTEM_FONT)); > + GetTextMetricsA(hdc, &tm); > + SelectObject(hdc, hOldFont); > + ReleaseDC(0, hdc); Probably DEFAULT_GUI_FONT should be used instead of SYSTEM, you really don't want to see SYSTEM_FONT on the screen, or just use its metrics. -- Dmitry.

2 1

Re: comctl32/tests: Fix couple of metrics tests that fail on some systems
by Marvin 31 Mar '15

31 Mar '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=12538 Your paranoid android. === w2003std (32 bit listview) === listview.c:5151: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5156: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000 === w7u (32 bit listview) === listview.c:3914: Test failed: got right 112, bottom 19 listview.c:5151: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5156: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000 === w8 (32 bit listview) === listview.c:5151: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5156: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000 === w2008s64 (64 bit listview) === listview.c:5151: Test failed: NM_HOVER allow test: the msg sequence is not complete: expected 0087 - actual 0000 listview.c:5156: Test failed: NM_HOVER block test: the msg sequence is not complete: expected 0087 - actual 0000

1 0

2025

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