October 2014 - Wine-Devel - list.winehq.org

Re: [PATCH 4/4] d3d9/tests: Port test_window_style to d3d9ex.
by Marvin Oct. 14, 2014

Oct. 14, 2014

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=9534 Your paranoid android. === w8 (32 bit d3d9ex) === d3d9ex.c:1294: Test failed: Got unexpected hr 0. d3d9ex.c:1296: Test failed: Got unexpected hr 0. d3d9ex.c:1298: Test failed: Got unexpected hr 0. d3d9ex.c:1300: Test failed: Got unexpected hr 0.

1 0

Re: [PATCH 3/3] kernel32/tests: Add tests for UTF-7 conversion. (try 3.1)
by Michael Stefaniuc Oct. 14, 2014

Oct. 14, 2014

Hello Alex, On 10/13/2014 08:19 AM, Alex Henrie wrote: > The only difference from the previous version of this patch is the > correction of a typo in one of the comments. > > --- > dlls/kernel32/tests/codepage.c | 751 ++++++++++++++++++++++++++++++++++ > +++++++ 1 file changed, 751 insertions(+) while more tests are good that's a lot of lines to have for just one function. So splitting the WCHAR => UTF-7 from the UTF-7 => WCHAR tests should help make it more manageable. Also some of the strings are huge. Most of those seem to be for the WCHAR => UTF-7 and could be probably generated by just using the directly_encodable_table[] from patch 2. If the tests cannot be generated from the table then please split the strings into more manageable chunks, as is they are unreadable / unmaintainable. Also the due to the size of the patch it is hard to discern what the difference between the different test structs are. Especially as the names are basically equivalent in this context: - utf16_to_utf7_tests and wcstombs_tests - utf7_to_utf16_tests and mbstowcs_tests bye michael

1 0

Re: [PATCH 3/4] d3d9/tests: Port wndproc tests to d3d9ex.
by Marvin Oct. 14, 2014

Oct. 14, 2014

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=9533 Your paranoid android. === w8 (32 bit d3d9ex) === d3d9ex.c:1294: Test failed: Got unexpected hr 0. d3d9ex.c:1296: Test failed: Got unexpected hr 0. d3d9ex.c:1298: Test failed: Got unexpected hr 0. d3d9ex.c:1300: Test failed: Got unexpected hr 0.

1 0

Re: [PATCH 1/1] ddraw: Return the primary legacy ddraw device last.
by Stefan Dösinger Oct. 14, 2014

Oct. 14, 2014

There are a few things I am wondering about and where the test can be extended: The existing test > /* Test with valid callback parameter and count the number of primary devices */ > callbackCount = 0; > ret = pDirectDrawEnumerateExA(test_count_callbackExA, &callbackCount, 0); > ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); > ok(callbackCount == 1, "Expected 1 primary device, got %d\n", callbackCount); Combined with your change that suggests that without any flag only the NULL guid is enumerated. If so I think that's worth an explicit check. Is the NULL guid enumerated when DDENUM_DETACHEDSECONDARYDEVICES and/or DDENUM_NONDISPLAYDEVICES are set? Regarding the specific changes you make: > dlls/ddraw/tests/ddrawmodes.c | 35 +++++++++++++++++++++++++++++++++++ I'd prefer that this test be moved to ddraw1.c > + static char DriverDescription[] = "DirectDraw HAL"; > + static char DriverName[] = "display"; Please do not use CamelCase or lpFoo in d3d-related code. Somewhat related, but that can be a separate patch: d3d3_EnumDevices() mentions that some games modify the strings. In your code (and the current code), such modifications would persist for the runtime of the application. It would be interesting to add a test for this. > +static BOOL WINAPI test_last_callbackExA(GUID *lpGUID, char *lpDriverDescription, > + char *lpDriverName, void *lpContext, HMONITOR hm) You should be able to combine the callbacks. Just declare a structure and put a counter in it. > +{ > + GUID **context_guid = (GUID **)lpContext; > + static GUID last_guid; I guess this works, but it is somewhat ugly. If you use a struct you can put a GUID and a BOOL guid_was_null in it. Or a GUID and a GUID *. Please extend the test to DirectDrawEnumerateA. MSDN suggests it is equivalent to DirectDrawEnumerateExA(DDENUM_NONDISPLAYDEVICES), but I have my doubts here. Comparing the strings of the non-NULL device against "DirectDraw HAL" and "display" (in the Ex and non-Ex case) would also be a good idea. Am 13.10.2014 um 21:16 schrieb Erich E. Hoover <erich.e.hoover(a)gmail.com>: > Fixes bug #37307. There are a couple of other bugs that are > preventing Urban Assault from working, but this fixes the problem with > returning the interfaces in the wrong order. > <0001-ddraw-Return-the-primary-legacy-ddraw-device-last.patch>

2 2

Re: [PATCH 1/1] d3d8/tests: Allow a width and height to be passed to create_device().
by Marvin Oct. 14, 2014

Oct. 14, 2014

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=9522 Your paranoid android. === w8 (32 bit device) === device.c:2421: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3078: Test failed: Expected wndproc 0x412c60, got 0x412c60.

1 0

Re: [PATCH] vbscript: Implemented Timer
by Marvin Oct. 14, 2014

Oct. 14, 2014

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=9490 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (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: advapi32/tests: Don't crash on Wine in WoW setups
by Marvin Oct. 13, 2014

Oct. 13, 2014

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=9509 Your paranoid android. === w7u (32 bit service) === The test timed out

1 0

Re: [PATCH 5/5] ntdll: Implement storing DOS attributes in NtCreateFile.
by Marvin Oct. 13, 2014

Oct. 13, 2014

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=9506 Your paranoid android. === build (build) === Make in include dir failed

1 0

Re: [PATCH 4/5] ntdll: Implement storing DOS attributes in NtSetInformationFile.
by Marvin Oct. 13, 2014

Oct. 13, 2014

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=9505 Your paranoid android. === build (build) === Make in include dir failed

1 0

RFC: Adding distribution field to Bugzilla
by Austin English Oct. 13, 2014

Oct. 13, 2014

Howdy everyone, I'd like to add a distribution field to Bugzilla, to make it easier to identify when users may have additional patches installed by their distribution and/or other distribution specific issues (e.g., https://bugs.winehq.org/show_bug.cgi?id=35413) It would be a drop down selection, with the major distributions listed (i.e., ArchLinux, Debian, Fedora, Gentoo, Mint, RedHat, Slackware, Suse, Ubuntu, other). Comments/feedback welcome. -- -Austin

6 9

Re: Add WWN 377
by Stefan Dösinger Oct. 13, 2014

Oct. 13, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-10 21:48, schrieb André Hentschel: > +<stats posts="131" size="310" contrib="23" multiples="14" lastweek="11"> > + > +<person posts="9" size="21" who="stefandoesinger at gmail.com (Stefan Dösinger)" /> > +<person posts="6" size="8" who="hverbeet at gmail.com (Henri Verbeet)" /> > +<person posts="6" size="6" who="julliard at winehq.org (Alexandre Julliard)" /> > +<person posts="4" size="8" who="mstefani at redhat.com (Michael Stefaniuc)" /> > +<person posts="3" size="4" who="austinenglish at gmail.com (Austin English)" /> > +<person posts="3" size="3" who="alexhenrie24 at gmail.com (Alex Henrie)" /> > +<person posts="3" size="2" who="nsivov at codeweavers.com (Nikolay Sivov)" /> > +<person posts="2" size="5" who="scottritchie at ubuntu.com (Scott Ritchie)" /> > +<person posts="2" size="2" who="dimesio at earthlink.net (Rosanne DiMesio)" /> > +<person posts="2" size="1" who="piotr.caban at gmail.com (Piotr Caban)" /> You may want to check the stat generation. Those are 38 posts. Plus 8 for the other 4 multiple posters + 9 for the single posters != 131. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOFxQAAoJEN0/YqbEcdMwMEgP/AycUgCYLAtZ0O8BLi1YCMP2 1asxLYGu0ERqqI+ga/cB83bOSYwDqHMfM4EvxwmEkv+1OunHYObEaTFmGeo/ylee T/GrRg6boHBsgaLyNYsn7xKltBxxY8mZTy8kYEnHi95Hz1r8FBTTjYH93sgUEtRd qmKyL7IJjAAgQzsZe4HBcKUzdGUCRVI0IrFRBc/48SDdVZs47UuTMg2NpLjxF2Db ebgt+YtJQhjnikqMkA541JkxDKd6EIqOIg38dOY1easnqV9WAURdvESY5zrtWmnF ZCPJvmS8PxGylBiI2b/AgrjmoU/cxpjoe1n3Uza8pvdxrCZSVNjDK0ceteIex57g SlqHkplYrrZHaeYsVgdoq+z9+S+4fdgm0pMUUV9W4QBXZdIsoRPFEMbplX7B30Uo /01hVceSzEoM+DeNV4G55KCJnBrPhQ7vOT1rfbdGgcVqX3OEdpv9FaKY0VLmuwNq QBRghN9TY7sX12Q3VPmTkVHkudTCz9gQAScDJpIh60XHj2ZkS8bmQHwhrPDERkoe YvtyR9OROcqrpzCeBW4AnbMuJHeYrGJC7H2OYFbt+N0VAFkV2Zh5Z3+LAkrER5DY 0HIqADQy0c73l7FPT172j3zvC9t4boDelR8Wx5jHsSmUdzboiFQZodLaw2o6b3Mt 2a6cjWARAZNetTBaAPwq =/Lzl -----END PGP SIGNATURE-----

2 1

Re: ieframe: Send command state change notifications from history navigation handlers.
by Marvin Oct. 13, 2014

Oct. 13, 2014

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=9497 Your paranoid android. === wvistau64 (32 bit webbrowser) === webbrowser.c:976: Test failed: unexpected dispIdMember 271 webbrowser.c:1602: Test failed: unexpected call TranslateUrl webbrowser.c:445: Test failed: unexpected nCmdID 14

1 0

Re: cmd/tests: Spelling and grammar fixes
by Marvin Oct. 13, 2014

Oct. 13, 2014

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=9495 Your paranoid android. === wxppro (32 bit) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 689 (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 690 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 691 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 692 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 693 (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 694 (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 695 (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 696 (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 697 (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 698 (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 699 (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 700 (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 701 (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 702 (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 703 (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 704 (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 705 (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 706 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 707 (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 708 (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 709 (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 710 (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 711 (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 712 (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 713 (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 714 (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 715 (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 716 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 717 (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 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 0x47 position 0 in line 720 (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 721 (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 722 (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 723 (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 724 (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 725 (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 726 (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 727 (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 728 (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 729 (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 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 0x47 position 0 in line 734 (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 735 (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 736 (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 737 (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 738 (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 739 (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 740 (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 741 (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 742 (got 'With duplicates enumeration', 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 0x47 position 0 in line 747 (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 748 (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 749 (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 750 (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 751 (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 752 (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 753 (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 754 (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 755 (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 756 (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 757 (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 758 (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 759 (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 760 (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 761 (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 762 (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 763 (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 764 (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 765 (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 766 (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 767 (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 768 (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 769 (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 770 (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 771 (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 772 (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 773 (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 774 (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 775 (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 776 (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 777 (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 778 (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 779 (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 780 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1364 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1365 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1366 (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 1367 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1368 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1369 (got '--- Extra endlocal in called batch', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1370 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1371 (got '--- Extra endlocal in called batch', wanted '@drive@@path(a)foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1373 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1376 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1377 (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 1378 (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 1379 (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 1380 (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 1381 (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 1382 (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 318 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'') === w8 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--------'', wanted ''--a------'@or_broken@'%~ai'') === wvistau64 (64 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'')

1 0

Re: [PATCH] widl: Generate method macros/wrappers for overridden methods.
by Marvin Oct. 13, 2014

Oct. 13, 2014

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=9493 Your paranoid android. === build (build) === Make failed

2 1

Re: wininet: Remove the content length header after the request is sent.
by Jacek Caban Oct. 13, 2014

Oct. 13, 2014

On 10/13/14 13:57, Hans Leidekker wrote: > This ensures that a new content length header is inserted when the request is reused. Could you please add a test? Jacek

1 0

Re: ieframe: Send command state change notifications from history navigation handlers.
by Jacek Caban Oct. 13, 2014

Oct. 13, 2014

Hi Hans, On 10/13/14 13:56, Hans Leidekker wrote: > HRESULT go_back(DocHost *This) > { > + HRESULT hres; > + > if(!This->travellog.position) { > WARN("No history available\n"); > return E_FAIL; > } > > - return navigate_history(This, This->travellog.position-1); > + hres = navigate_history(This, This->travellog.position-1); > + if(SUCCEEDED(hres)) > + on_commandstate_change(This, CSC_NAVIGATEFORWARD, VARIANT_TRUE); We probably shouldn't call this notification if forward navigation was already possible before the call. Also, if we reach the bottom of history stack, we should also probably notify that back navigation is no longer possible. It would be more generic and easier to get right if you did that in navigate_history, based on previous and current history position. > HRESULT get_location_url(DocHost *This, BSTR *ret) > diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c > index fa37169..238b6de 100644 > --- a/dlls/ieframe/tests/webbrowser.c > +++ b/dlls/ieframe/tests/webbrowser.c > @@ -3022,7 +3022,7 @@ static void test_go_back(IWebBrowser2 *wb, const char *back_url) > hres = IWebBrowser2_GoBack(wb); > ok(hres == S_OK, "GoBack failed: %08x\n", hres); > CHECK_CALLED(Invoke_BEFORENAVIGATE2); > - todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); > + CHECK_CALLED(Invoke_COMMANDSTATECHANGE); > CLEAR_CALLED(Invoke_PROPERTYCHANGE); /* called by IE11 */ > } > > @@ -3038,7 +3038,7 @@ static void test_go_forward(IWebBrowser2 *wb, const char *forward_url) > hres = IWebBrowser2_GoForward(wb); > ok(hres == S_OK, "GoForward failed: %08x\n", hres); > CHECK_CALLED(Invoke_BEFORENAVIGATE2); > - todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); > + CHECK_CALLED(Invoke_COMMANDSTATECHANGE); > I would be nice to have those tests stricter. For example, by checking command in COMMANDSTATECHANGE notification and have separated Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD and Invoke_COMMANDSTATECHANGE_NAVIGATEBACK. Thanks, Jacek

1 0

Re: jscript: Don't use builtin property for exposing ActiveXObject constructor.
by Marvin Oct. 13, 2014

Oct. 13, 2014

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=9494 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (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: [PATCH v4 5/8] reg.exe: Add wchar/raw data conversion functions
by Stefan Dösinger Oct. 12, 2014

Oct. 12, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This code could use more tests, especially for REG_SZ_MULTI and REG_BINARY. Am 2014-10-09 10:55, schrieb Jonathan Vollebregt: > +static WCHAR *data_get_wchar(const BYTE *data, const DWORD size, const DWORD type) This function is not used until the next patch. From a design point of view it unfortunate that you allocate a new string for the REG_SZ and REG_SZ_MULTI case and essentially just do a memcpy and free the old string. As long as you just need this function to print the values it would be better to add a function that prints directly. Keep reg export in mind though. It may need the function like this, or maybe a printing function that is passed a file descriptor. > + do > + { > + lstrcpyW(output+i, &input[i]); > + > + i += strlenW(&input[i]) + 1; > + > + if (input[i] != 0) > + output[i - 1] = ','; > + } while (input[i]); If I understand this correctly this replaces 0 WCHARs with ',' . There should be nicer ways to do this. > +static BYTE *wchar_get_data(const WCHAR *input, const DWORD type, > + const WCHAR seperator, DWORD *size_out) > ... > + case REG_SZ: > + case REG_EXPAND_SZ: > + { > + i = (strlenW(input) + 1) * sizeof(WCHAR); > + output = HeapAlloc(GetProcessHeap(), 0, i); > + lstrcpyW((WCHAR *) output, input); > + *size_out = i; > + return output; > + } This also has unfortunate copying behavior. Maybe there is a nicer way to solve this. > + for (i = 0, p = 0; i <= strlenW(input); i++, p++) > + { > + if (input[i] == seperator) Please watch the spelling of separator. This confused me a bit in my code search :-) . > + temp[p] = 0; > + else if (seperator == 0 && input[i] == '\\' && input[i + 1] == '0') How does a 0 separator work? The command line interpreter would fail to parse such a string. msdn claims that the default separator is '\0', but maybe they mean a backslash ('\\') like your code uses. If the default separator is a backslash it would be nicer to handle this default in the code that parses the command line. > + { > + temp[p] = 0; > + i++; > + } I don't understand what's special about a 0 or \ separator as far as this loop is concerned. > + if (p % 2) if (p & 1) is nicer to check for odd / even (i.e., the lowest bit). The compiler should be able to to this optimization as well. > + p /= 2; p >>= 1 . Or you could consider incrementing i by 2 in the for loop below. > + for (i = 0; i < p; i++) > + temp[i] = (temp[i * 2] << 4) | temp[i * 2 + 1]; -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOpgoAAoJEN0/YqbEcdMwyLYP+QFSbpZLsy/Au6uKLQNfcRqS MnHxgrB1wq+RxfDbQ6UdzT6gIVKhEII0c//gZ32H5Fr/+zIofaa38XmtH6Fp8MMg p1s+ubFeZ29vMaNER28zwK/QM6Allwo+JLjqLSM6W2cgrfe1kU/iPWGC97nJktEj cG4wsAdcgYCHvkOH/06ZIC/zSbWyG0yZJSgKfLqfgEbuD/TAmmkXh0TVMm9Znp88 J6mLhcYSbfTK2oHzU9nXETTa5oFR/VfHQHZ7asa+q14kftl24Y5JCs1VD6BK/G4p TjD5jQhIN9L5FHKj79n+9y5eeYjrIiMhdi81ey3Bm8it03ZPUN3aAjXf6CD6UmBu wxHZwB8L1PALJsDBK+E7a8QgeteWxMjX07m2FdfFNewj4IFq4eoASdeINd8Zd1rt TpWl2/jpKz4PecRvGeNKOEgqx+mFcSRWiXErytWtEmJzz+aPEjdjFXesf6aWFB/l +ZZxc202He9JXacPFvmCuL0ltWStJqdSZRZg/FkIgqXZkWfj1bwxDYpu+7Jv6243 KrQrMUGna1VXGM6tAfYph0BLtZnksTwFS6MEoPzirf2Yqe3uuQzecQqhyaStaESJ 5HS+6NTEZT2LhvKy3mui970k2THpmQFb7j4f+xdmKHEj6qdsoH+SHouJgkig/KLk x28pWN1J80RCE92BQdYV =tqtd -----END PGP SIGNATURE-----

2 2

Re: [PATCH v4 3/8] reg.exe: Add wchar/type conversion functions
by Stefan Dösinger Oct. 12, 2014

Oct. 12, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-09 10:55, schrieb Jonathan Vollebregt: > +static const WCHAR *type_get_wchar(const DWORD type) This function is not used. You can add it in patch 5, where you actually use it. > +static DWORD wchar_get_type(const WCHAR *type) > +{ > + static const WCHAR type_dword_le[] = {'R','E','G','_','D','W','O','R','D','_','L','I','T','T','L','E','_','E','N','D','I','A','N',0}; > + DWORD i; > + > + if (lstrcmpiW(type, type_dword_le) == 0) > + return REG_DWORD_LITTLE_ENDIAN; I think a table where you can map two different strings to index 4 is nicer than the special case, unless having the cheap reverse lookup is important for performance. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOotdAAoJEN0/YqbEcdMwpsAQAJIoOZIzwfKU+EWf6lTO1L6u zhHECP7G8GnlxDI9XGVkg0xvj0v+mxBXUXHdWkCczKyuWJFmUB4adULqpXDloyRa 0aMKSnziixXadiQMY5p36KmTSVLg+rCq3ol/dCjR1E/kCktkwbH0mcx0w4YMf9wZ /gtTRFY7F4OVLFQdhZV4lI2stcJpP057Tx+MivzfpVgw+HXfo3IUZlDtAVY0LNXV DfjX9terIhqE6kqkyalsa6sYczNRgrGF2D+jU+MADJSnQ7bHk15foayV4nzkcqk9 wabU65qY4HEWTo54m4u/W0yVyEb3j3JWN1XQAm/a+ae1iFnE86XHf5eq7s4ze81a Wu5dYdBanrH/qMkzGdG15+3h2u33PxHOL0R/25KrwvZDV61GGJ8r1gJEsPvNWqh3 QomLLMPCSArNLBUQSUrfk84GyeOg0TBfSXTR/JLOxG8GtQ/slAWwa/F310tBxSTa 6Csx6aeazHDMrZhgT2W75hMy1eA8GVGCH5ovBl3ThdJB9kkJM6zIQh7UB940TnVA orZcSXxxKVENO2FTWbeSrsQhjqwwvTL8reRS2T7wZZAQ3J10OI0HXOAIE4hr54wE j7FA5whN86sLXg4stjLW0ExpzlTHvTKYxQJl7CPILaYMQXwVIIdrgeaV8bi9ko5c vlir4SrW/E5rfUfxflAx =eD+7 -----END PGP SIGNATURE-----

1 0

Re: [PATCH v4 1/8] reg.exe: Perform checks in wmain
by Stefan Dösinger Oct. 12, 2014

Oct. 12, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-09 10:55, schrieb Jonathan Vollebregt: > Move as much error-checking to main as possible so sub functions > don't have to repeat basic checks > > IE: Is the key on a remote system, or are we missing arguments? I don't think this is really an improvement. The old code first looked at argvW[1], then argvW[2], ..., with clear checks that the argument count is big enough. The new code jumps around between the arguments without any clear order. As a result it still isn't clear if argv[2] is supposed to be a registry key at all when you check it for remoting. While it may be true in the current form of reg.exe, it won't work if support for e.g. reg import is added. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOoBfAAoJEN0/YqbEcdMw+ogP/AnFEAMDQrGtrjtau/EL0Yuu vkmUcgAcSG71I//iFchLvpSzzrVlgmrX2t8eatFHyClBh0jhGwtFOvdXHiilsOEV yRcJBlkr5wa+hD+SvpBX4VGTBFJEhbJ9uhzzeFv0teh6AhxVpkjFGM6yR373xmkz Pk9F7sT30YxOqF5RftPwWylihpWNOgMwk2rHJkanImI+Fle0EMQOIaI+ASDsc5i0 DhAl8Xs867wUkiFfBzU5l5p+nARGr971PDj3nUOubDeJEUNBaO7d+Uh4AAa9a+h3 evDd1e+kdW8kjStnFXQZfkFYw+8gK9lxB05NrX1EeIkGoxpKaOXMW+5gEV76eb8z yqfe3vdzijHptKGxAml5Y6A7N3HPuZyi+dwDW41Dmgsz3cY+WmZ6X3CGXB3wBcew SVSoZjfcdE4mq6BDFPRC7A1+Rt6aYUAvxQDQT+jhRtlMBRQrAtML3o9n08JEbqkD T6twKYBniWHBlGgb8rD9yA1snUYlOO2a4zhGzZ2Z/L9WHMzxOXLApa2x6Tcew9Jz V1gqDQPpgwhy4a/8oeukwj9VH2uva12Q72f7RQMKc1Q7CGXskso4RlZpJpHi2eNi 1oHDQzTYX0nLOSeU8C4336zq+ljh2Csme8CtLFw9a44mbzhSzzdtWJBcS3M8pQ8C Txkl4Xka006+rZQHjzQO =inoY -----END PGP SIGNATURE-----

1 0

Re: [PATCH 3/5] wined3d: Track texture allocation per-texture.
by Farmboy0 Oct. 12, 2014

Oct. 12, 2014

On 08.10.2014 08:47, Henri Verbeet wrote: > --- > dlls/wined3d/surface.c | 13 +++-------- > dlls/wined3d/texture.c | 47 ++++++++++++++++++++++++++++++---------- > dlls/wined3d/volume.c | 8 +++---- > dlls/wined3d/wined3d_private.h | 14 ++++++------ > 4 files changed, 49 insertions(+), 33 deletions(-) > > diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c > index d02d5f2..0967220 100644 > --- a/dlls/wined3d/surface.c > +++ b/dlls/wined3d/surface.c > @@ -599,11 +599,6 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) > surface_invalidate_location(surface, WINED3D_LOCATION_SYSMEM); > } > > -static void surface_force_reload(struct wined3d_surface *surface) > -{ > - surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); > -} > - > static void surface_release_client_storage(struct wined3d_surface *surface) > { > struct wined3d_context *context = context_acquire(surface->resource.device, NULL); > @@ -621,11 +616,9 @@ static void surface_release_client_storage(struct wined3d_surface *surface) > gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, > GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); > } > + wined3d_texture_force_reload(surface->container); > > context_release(context); > - > - surface_invalidate_location(surface, WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); > - surface_force_reload(surface); > } > > static BOOL surface_use_pbo(const struct wined3d_surface *surface) > @@ -1211,7 +1204,7 @@ static void surface_unload(struct wined3d_resource *resource) > surface_load_location(surface, surface->resource.map_binding); > surface_invalidate_location(surface, ~surface->resource.map_binding); > } > - surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); > + wined3d_texture_force_reload(surface->container); > > context = context_acquire(device, NULL); > gl_info = context->gl_info; > @@ -1845,7 +1838,7 @@ void surface_load(struct wined3d_surface *surface, BOOL srgb) > surface_invalidate_location(surface, ~surface->resource.map_binding); > /* Switching color keying on / off may change the internal format. */ > if (ck_changed) > - surface_force_reload(surface); > + wined3d_texture_force_reload(surface->container); > } > else if (!(surface->locations & location)) > { > diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c > index 27a10c6..bc75305 100644 > --- a/dlls/wined3d/texture.c > +++ b/dlls/wined3d/texture.c > @@ -751,7 +751,26 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT > > void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) > { > + DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; > + > + if (texture->flags & alloc_flag) > + return; > + > texture->texture_ops->texture_prepare_texture(texture, context, srgb); > + texture->flags |= alloc_flag; > +} > + > +void wined3d_texture_force_reload(struct wined3d_texture *texture) > +{ > + unsigned int sub_count = texture->level_count * texture->layer_count; > + unsigned int i; > + > + texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED); > + for (i = 0; i < sub_count; ++i) > + { > + texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i], > + WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); > + } > } > > void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) > @@ -817,11 +836,17 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource > wined3d_surface_destroy(surface); > } > > +static void texture2d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location) > +{ > + struct wined3d_surface *surface = surface_from_resource(sub_resource); > + > + surface_invalidate_location(surface, location); > +} > + > /* Context activation is done by the caller. */ > static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) > { > UINT sub_count = texture->level_count * texture->layer_count; > - DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; > const struct wined3d_format *format = texture->resource.format; > const struct wined3d_gl_info *gl_info = context->gl_info; > const struct wined3d_color_key_conversion *conversion; > @@ -864,9 +889,6 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi > GLsizei width = surface->pow2Width; > const BYTE *mem = NULL; > > - if (surface->flags & alloc_flag) > - continue; > - > if (converted) > surface->flags |= SFLAG_CONVERTED; > else > @@ -922,8 +944,6 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi > gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); > checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); > } > - > - surface->flags |= alloc_flag; > } > } > > @@ -932,6 +952,7 @@ static const struct wined3d_texture_ops texture2d_ops = > texture2d_sub_resource_load, > texture2d_sub_resource_add_dirty_region, > texture2d_sub_resource_cleanup, > + texture2d_sub_resource_invalidate_location, > texture2d_prepare_texture, > }; > > @@ -1261,9 +1282,15 @@ static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource > wined3d_volume_destroy(volume); > } > > +static void texture3d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location) > +{ > + struct wined3d_volume *volume = volume_from_resource(sub_resource); > + > + wined3d_volume_invalidate_location(volume, location); > +} > + > static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) > { > - DWORD alloc_flag = srgb ? WINED3D_VFLAG_SRGB_ALLOCATED : WINED3D_VFLAG_ALLOCATED; > unsigned int sub_count = texture->level_count * texture->layer_count; > const struct wined3d_format *format = texture->resource.format; > const struct wined3d_gl_info *gl_info = context->gl_info; > @@ -1276,9 +1303,6 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi > struct wined3d_volume *volume = volume_from_resource(texture->sub_resources[i]); > void *mem = NULL; > > - if (volume->flags & alloc_flag) > - continue; > - > if (gl_info->supported[APPLE_CLIENT_STORAGE] && !format->convert > && volume_prepare_system_memory(volume)) > { > @@ -1300,8 +1324,6 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi > gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); > checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); > } > - > - volume->flags |= alloc_flag; > } > } > > @@ -1310,6 +1332,7 @@ static const struct wined3d_texture_ops texture3d_ops = > texture3d_sub_resource_load, > texture3d_sub_resource_add_dirty_region, > texture3d_sub_resource_cleanup, > + texture3d_sub_resource_invalidate_location, > texture3d_prepare_texture, > }; > > diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c > index 92bc1e1..0cbc7d4 100644 > --- a/dlls/wined3d/volume.c > +++ b/dlls/wined3d/volume.c > @@ -262,9 +262,9 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, > case WINED3D_LOCATION_TEXTURE_RGB: > case WINED3D_LOCATION_TEXTURE_SRGB: > if ((location == WINED3D_LOCATION_TEXTURE_RGB > - && !(volume->flags & WINED3D_VFLAG_ALLOCATED)) > + && !(volume->container->flags & WINED3D_TEXTURE_RGB_ALLOCATED)) > || (location == WINED3D_LOCATION_TEXTURE_SRGB > - && !(volume->flags & WINED3D_VFLAG_SRGB_ALLOCATED))) > + && !(volume->container->flags & WINED3D_TEXTURE_SRGB_ALLOCATED))) > ERR("Trying to load (s)RGB texture without prior allocation.\n"); > > if (volume->locations & WINED3D_LOCATION_DISCARDED) > @@ -451,8 +451,8 @@ static void volume_unload(struct wined3d_resource *resource) > } > > /* The texture name is managed by the container. */ > - volume->flags &= ~(WINED3D_VFLAG_ALLOCATED | WINED3D_VFLAG_SRGB_ALLOCATED > - | WINED3D_VFLAG_CLIENT_STORAGE); > + wined3d_texture_force_reload(volume->container); > + volume->flags &= ~WINED3D_VFLAG_CLIENT_STORAGE; > > resource_unload(resource); > } > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 17a68dc..5ec5088 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -2116,6 +2116,7 @@ struct wined3d_texture_ops > void (*texture_sub_resource_add_dirty_region)(struct wined3d_resource *sub_resource, > const struct wined3d_box *dirty_region); > void (*texture_sub_resource_cleanup)(struct wined3d_resource *sub_resource); > + void (*texture_sub_resource_invalidate_location)(struct wined3d_resource *sub_resource, DWORD location); > void (*texture_prepare_texture)(struct wined3d_texture *texture, > struct wined3d_context *context, BOOL srgb); > }; > @@ -2123,8 +2124,10 @@ struct wined3d_texture_ops > #define WINED3D_TEXTURE_COND_NP2 0x00000001 > #define WINED3D_TEXTURE_POW2_MAT_IDENT 0x00000002 > #define WINED3D_TEXTURE_IS_SRGB 0x00000004 > -#define WINED3D_TEXTURE_RGB_VALID 0x00000008 > -#define WINED3D_TEXTURE_SRGB_VALID 0x00000010 > +#define WINED3D_TEXTURE_RGB_ALLOCATED 0x00000008 > +#define WINED3D_TEXTURE_RGB_VALID 0x00000010 > +#define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000020 > +#define WINED3D_TEXTURE_SRGB_VALID 0x00000040 > > struct wined3d_texture > { > @@ -2170,6 +2173,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, > struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; > void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, > struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; > +void wined3d_texture_force_reload(struct wined3d_texture *texture) DECLSPEC_HIDDEN; > void wined3d_texture_load(struct wined3d_texture *texture, > struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; > void wined3d_texture_prepare_texture(struct wined3d_texture *texture, > @@ -2191,9 +2195,7 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, > > const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; > > -#define WINED3D_VFLAG_ALLOCATED 0x00000001 > -#define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000002 > -#define WINED3D_VFLAG_CLIENT_STORAGE 0x00000004 > +#define WINED3D_VFLAG_CLIENT_STORAGE 0x00000001 > > struct wined3d_volume > { > @@ -2354,8 +2356,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D > #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ > #define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ > #define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ > -#define SFLAG_ALLOCATED 0x00000800 /* A GL texture is allocated for this surface. */ > -#define SFLAG_SRGBALLOCATED 0x00001000 /* A sRGB GL texture is allocated for this surface. */ > > struct wined3d_sampler > { Hi, This commit causes problems with Eve Online. When switching from Fullscreen to Windowed I get the following errors and the 3d objects look like a mess of colors. err:d3d_surface:surface_load_location Surface 0x1f834240 does not have any up to date location. err:d3d_surface:surface_invalidate_location Surface 0x1f834240 does not have any up to date location. I have bisected the following commit to be the offender: commit ee8a5b7dd1e554ef32229c766715f23ba17c9f6c Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:20 2014 +0200 wined3d: Track texture allocation per-texture.

2 1

Re: Add WWN 377
by Rico Schüller Oct. 11, 2014

Oct. 11, 2014

On 10.10.2014 21:48, André Hentschel wrote: > diff --git a/news/de/2014101001.xml b/news/de/2014101001.xml > new file mode 100644 > index 0000000..8ad495c > --- /dev/null > +++ b/news/de/2014101001.xml > @@ -0,0 +1,11 @@ > +<news> > + <date>10. Oktober 2014</date> > + <title>World Wine News Ausgabe 377</title> > + <body> > +<a href="{$root}/wwn/377">WWN Ausgabe 377 (en)</a> wurde heute verÃ¶ffentlicht. > +<ul> > +<li><a href="{$root}/wwn/377#Idea for a Wine staging tree">Idea fÃ¼r einen Wine Staging Tree</a></li> <li><a href="{$root}/wwn/377#Idea for a Wine staging tree">Idee ... Cheers Rico

1 0

Re: [PATCH] mshtml/tests: Fix typo.
by Marvin Oct. 11, 2014

Oct. 11, 2014

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=9465 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (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

2 1

Re: wined3d: Correctly display fog for right-handed projection matrix (try 6)
by Stefan Dösinger Oct. 10, 2014

Oct. 10, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I missed a few things the last time. This list is exhaustive now, at least as far as I'm concerned. I have listed most things for d3d8, but they apply to the d3d9 test as well. Am 2014-10-10 15:21, schrieb Joachim Priesner: > + static const D3DMATRIX proj_mat = > + {{{ > + 1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 1.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, -1.0f, 0.0f, > + 0.0f, 0.0f, -0.0f, 1.0f > + }}}; Minor detail: you left a redundant - in here. (4th row, third column, -0.0f) > + /* Basic vertex shader with fog computation ("foggy"). > + * Using the vertex' x coordinate as fog coordinate so that all test cases that use vertex fog > + * will have a gradient from fully fogged (green, left) to unfogged (red, right). */ This is a bit off-topic, but I'm still noting it here: We don't have any tests for the clamp(0.0, 1.0) we do on the oFog output. Hence it may be interesting to check the middle of the screen in case of the foggy shader. If it is half fogged, the clamp is correct. If it is fully fogged the clamp is wrong (keep in mind that "foggy shaders" have reverse fog with start = 1, end = 0). This shouldn't be part of this patch, but it is an idea for a follow-up test if you or anyone else is interested. > + {0, 0, D3DFOG_NONE, D3DFOG_LINEAR, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 1, D3DFOG_NONE, D3DFOG_LINEAR, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 0, D3DFOG_LINEAR, D3DFOG_LINEAR, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 0, D3DFOG_LINEAR, D3DFOG_NONE, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 1, D3DFOG_LINEAR, D3DFOG_NONE, COLOR_UNFOGGED, COLOR_FOGGED}, Please add a D3DFOG_NONE, D3DFOG_NONE case for completeness. In case of the shaders I expect the same result as with table fog = NONE, vertex fog = LINEAR. In case of fixed function fragment processing I expect fully fogged because it uses the alpha component of the specular color, which defaults to 0. Fogstart = 255 and fogend = 0 in that case, similar to the vertex shader oFog case. > + /* Note: Shaders expect matrices in column-major form, so they have > + * to be transposed if they are not symmetrical (which is the case at the moment). */ > + hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &view_mat, 4); > + ok(SUCCEEDED(hr), "SetVertexShaderConstant (view matrix) failed (%08x)\n", hr); > + hr = IDirect3DDevice8_SetVertexShaderConstant(device, 4, &proj_mat, 4); > + ok(SUCCEEDED(hr), "SetVertexShaderConstant (projection matrix) failed (%08x)\n", hr); I'd expect these calls to fail on hardware that does not support shaders. Same for the Set*Shader(NULL) calls later on. Technically you do not need the matrix multiply inside the shader with the new matrices, but if you want to keep them in to make the fixed function and shader codepaths more similar that's OK with me. The D3DPRASTERCAPS_FOGTABLE capability applies to d3d8/9 as well. I don't know if there's any GPU out there that doesn't support table fog other than my ancient ATI 3D Rage. > + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); You are not checking the return value here. > + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) > + { > + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code1, &vertex_shader[1]); > + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); > + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code2, &vertex_shader[2]); > + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); > ... > + } Please check the vertex shader version separately from the pixel shader one. > diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c > index 0385044..23542ff 100644 > --- a/dlls/ddraw/tests/visual.c > +++ b/dlls/ddraw/tests/visual.c New ddraw tests should go to dlls/ddraw/tests/ddraw*.c. I'm fine with just a ddraw7 test for this. The older ddraw interfaces have a different fog interface (D3DLIGHTSTATE_FOG*, and somehow there's a separate D3DRENDERSTATE_FOGTABLE*). While we could certainly use more tests for this interface it shouldn't be the concern of this patch. > + if (IDirect3DDevice7_BeginScene(device) == D3D_OK) This is not a big issue, but there's no need to have a code branch for BeginScene / EndScene, just let the draws in between fail like you do in d3d8/9. I have never seen a case where BeginScene fails unexpectedly. (Yeah, the existing code isn't consistent on this point.) > + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, end.i); > + ok(SUCCEEDED(hr), "Setting fog end failed (%08x)\n", hr); > ... > + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &proj_mat); > + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); Another minor style issue: You're mixing %08x and %#x. The preferred one is %#x, but what mostly matters is consistency. Similar for punctuation at the end of the traces. SUCCEEDED(hr) is preferred over hr == D3D_OK. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOFewAAoJEN0/YqbEcdMwxSYP/jFB5IT9a+7w8JQ7vlziVdGz KZccLwVFSyJqLhEiTIs7B0yz5rWhkjI6HPxzWRPRMVbNTjlUvsiZRLl8FU6hR86A 1G6azwEnMs0/u9LUOfdphBLdj454+E/NJMr1EzkRjL+PMt49RZwSxdCmxPXK/unx yrxLSPuxCjHGhN6K95/xV8fVkbJoa7va8IeKDHhfoFpdpaUqUqyGaSbNCfiyYj6l cyA8ZBlQEEEYBDg8HopQgw99MmfU3BIL4rY984YnsscYMckI5qjOs+joMcUwHscU Vaflkmh5udcj74sdgPguOwigJeLuLzY6zbWzhUGDFzdkXuwfuF0oe+ws/QcNOYX6 r2d/CGa7nYXfTFewR4SODJT+950P8CwuskLsslBAiPpy4uzVcbhKT2oNh7L7vhU1 +o6gYk98ceCaRdZxajf+j2hElg7N9AkWAK/RfLY25d3ALnKKVDbaidWKot3dVcHN nicK89v6jKSmD/FdbVM9/YUi4QzOZM5IJAItG0OuhS0oU/Bfkpr0e7NXvORxdGPC BpRvQrwIJXWiT43aqK8E1w67mE47PMmqoKjO3qVfWLojC0L7KPybDjGtUKj652Qr ixqPlaERPLeRVyAGtpxHlIE2opyx3fOSy/ZSTq6/PzK4GNZ/hgfTLbUff2ixxa+M cL3+mTtlQSBx9yt9BmUG =ZDPP -----END PGP SIGNATURE-----

1 0

Re: kernel32: fix incorrect lastpart in GetFullPathNameA with DBCS
by Akihiro Sagawa Oct. 10, 2014

Oct. 10, 2014

On Thu, 09 Oct 2014 12:03:15 -0500, Aric Stewart wrote: > --- > dlls/kernel32/path.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Hi Aric, Thank you for pointing this out, but unfortunately this seems not to be perfect. Because certain DBCS trail byte range is overlapped its lead byte range [1]. To demonstrate this issue, I attached additional test. The first case (0x955c,0x97a0=表裏) is now pass by your patch, but the second one (0x838f,0x8343,0x8393=ワイン) is failure. In my opinion, the solution is looking up the path separator from the beginning of the string like _mbsrchr() in msvcrt. If you have a further question about this, please contact me. [1] For CP 932 (Japanese Shift JIS), Double byte character: Lead byte (first byte): 0x81-0x9f or 0xe0-0xfc, and Trail byte (second byte): 0x40-0x7e or 0x80-0xfc. Single byte character: 0x00-0x7f, 0xa1-0xdf. Regards, Akihiro Sagawa

2 1