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

Re: [PATCH] dpnet: IDirectPlay8ThreadPool is a singleton interface.
by Sebastian Lackner 17 Feb '17

17 Feb '17

On 17.02.2017 07:43, Alistair Leslie-Hughes wrote: > - ok(pool1 != pool2, "same pointer returned.\n"); > + todo_wine ok(pool1 != pool2, "same pointer returned.\n"); Well, this test shows that its not implemented as a singleton interface on Windows. Just because part of the state is global doesn't necessarily mean you don't need any interface specific data.

2 1

Re: wined3d: Call wined3d_cs_emit_unload_resource outside of command stream.
by Henri Verbeet 17 Feb '17

17 Feb '17

On 17 February 2017 at 03:47, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/wined3d/device.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > Why would you want to do that?

2 2

Re: wined3d: Remove duplicate assignment of NULL to map_ptr in wined3d_buffer_map.
by Henri Verbeet 17 Feb '17

17 Feb '17

On 17 February 2017 at 04:43, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > BTW: Is someone currently working on wined3d_buffer_map? To me it looks like > there are multiple issues related to location handling in there. > The code certainly has issues, at least in part that's because it mostly predates the current resource location management scheme. > * For mappings without !(flags & WINED3D_MAP_READONLY), shouldn't the code invalidate > the sysmem location, to force a download when it is required later? > If you're referring to the case I think you're referring to, no, because WINED3D_BUFFER_PIN_SYSMEM isn't set and the system memory location has been evicted. > * In the "Falling back to doublebuffered operation." case with > !(flags & WINED3D_MAP_READONLY) the buffer location is never invalidated, which > means no upload will happen. For testing purposes, this can be triggered by > replacing the if conditions and running d3d9 visual tests. Adding something like: > buffer->locations &= ~WINED3D_LOCATION_BUFFER; fixes it (using a function would > add the modified range twice). > That path should only be reachable for read-only maps, in which case there's nothing to upload. The general issue that the code is overly complicated and hard to reason about is certainly true though.

1 0

Re: [PATCH v2 5/5] crypt32: Fix wrong Base64 trailer WCHAR constants.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Lauri Kenttä <lauri.kentta(a)gmail.com> writes: > The tests simply check that W and A give the same results. > That wouldn't always happen without this fix. > > v2: Fix buffer overflow. > Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M crypt32.dll -p crypt32_test.exe.so base64 && touch base64.ok base64.c:315: Test failed: base64 "V=" len 0: W and A differ base64.c:315: Test failed: base64 "VV=" len 0: W and A differ base64.c:315: Test failed: base64 "V==" len 0: W and A differ base64.c:315: Test failed: base64 "V=" len 2: W and A differ base64.c:315: Test failed: base64 "VV=" len 3: W and A differ base64.c:315: Test failed: base64 "V==" len 3: W and A differ Makefile:188: recipe for target 'base64.ok' failed make[1]: *** [base64.ok] Error 6 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] ddraw/tests: Rewrite SrcColorKey32BlitTest.
by Marvin 16 Feb '17

16 Feb '17

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=28707 Your paranoid android. === w8 (32 bit ddraw7) === ddraw7.c:12644: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw7.c:12644: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw7.c:12790: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw7.c:12807: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw7.c:12847: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw7.c:12878: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw7.c:12900: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw7.c:12980: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. === w864 (32 bit ddraw7) === ddraw7.c:12644: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw7.c:12644: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw7.c:12790: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw7.c:12807: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw7.c:12847: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw7.c:12878: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw7.c:12900: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw7.c:12980: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. === w1064 (32 bit ddraw7) === ddraw7.c:12644: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw7.c:12644: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw7.c:12790: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw7.c:12807: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw7.c:12847: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw7.c:12878: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw7.c:12900: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw7.c:12980: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. === w864 (64 bit ddraw7) === ddraw7.c:12644: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw7.c:12644: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw7.c:12790: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw7.c:12807: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw7.c:12847: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw7.c:12878: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw7.c:12900: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw7.c:12980: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. === w1064 (64 bit ddraw7) === ddraw7.c:12644: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw7.c:12644: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw7.c:12790: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw7.c:12807: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw7.c:12847: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw7.c:12878: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw7.c:12900: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw7.c:12980: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. === w8 (32 bit ddraw4) === ddraw4.c:12971: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw4.c:12971: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw4.c:13117: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw4.c:13134: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw4.c:13174: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw4.c:13205: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw4.c:13227: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw4.c:13307: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. === w864 (32 bit ddraw4) === ddraw4.c:12971: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw4.c:12971: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw4.c:13117: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw4.c:13134: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw4.c:13174: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw4.c:13205: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw4.c:13227: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw4.c:13307: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. === w1064 (32 bit ddraw4) === ddraw4.c:12971: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw4.c:12971: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw4.c:13117: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw4.c:13134: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw4.c:13174: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw4.c:13205: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw4.c:13227: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw4.c:13307: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. === w864 (64 bit ddraw4) === ddraw4.c:12971: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw4.c:12971: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw4.c:13117: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw4.c:13134: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw4.c:13174: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw4.c:13205: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw4.c:13227: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw4.c:13307: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. === w1064 (64 bit ddraw4) === ddraw4.c:12971: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw4.c:12971: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw4.c:13117: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw4.c:13134: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw4.c:13174: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw4.c:13205: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw4.c:13227: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw4.c:13307: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. === w8 (32 bit ddraw2) === ddraw2.c:11580: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw2.c:11580: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw2.c:11726: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw2.c:11743: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw2.c:11783: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw2.c:11814: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw2.c:11836: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw2.c:11916: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. === w864 (32 bit ddraw2) === ddraw2.c:11580: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw2.c:11580: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw2.c:11726: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw2.c:11743: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw2.c:11783: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw2.c:11814: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw2.c:11836: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw2.c:11916: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. === w1064 (32 bit ddraw2) === ddraw2.c:11580: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw2.c:11580: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw2.c:11726: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw2.c:11743: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw2.c:11783: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw2.c:11814: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw2.c:11836: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw2.c:11916: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. === w864 (64 bit ddraw2) === ddraw2.c:11580: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw2.c:11580: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw2.c:11726: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw2.c:11743: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw2.c:11783: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw2.c:11814: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw2.c:11836: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw2.c:11916: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. === w1064 (64 bit ddraw2) === ddraw2.c:11580: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw2.c:11580: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw2.c:11726: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw2.c:11743: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw2.c:11783: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw2.c:11814: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw2.c:11836: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw2.c:11916: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. === w8 (32 bit ddraw1) === ddraw1.c:10249: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw1.c:10249: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw1.c:10395: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw1.c:10412: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw1.c:10451: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw1.c:10482: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw1.c:10504: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw1.c:10584: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. === w864 (32 bit ddraw1) === ddraw1.c:10249: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw1.c:10249: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw1.c:10395: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw1.c:10412: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw1.c:10451: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw1.c:10482: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw1.c:10504: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw1.c:10584: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. === w1064 (32 bit ddraw1) === ddraw1.c:10249: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw1.c:10249: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw1.c:10395: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw1.c:10412: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw1.c:10451: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw1.c:10482: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw1.c:10504: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw1.c:10584: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. === w864 (64 bit ddraw1) === ddraw1.c:10249: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw1.c:10249: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw1.c:10395: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw1.c:10412: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw1.c:10451: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw1.c:10482: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw1.c:10504: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw1.c:10584: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. === w1064 (64 bit ddraw1) === ddraw1.c:10249: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=0. ddraw1.c:10249: Test failed: Destination data after blitting is ff010203 ff010203 cccccccc cccccccc, i=1. ddraw1.c:10395: Test failed: Got unexpected content 55555555 ff0000aa ffff0000 ff00ff00 ff001100 ff110000. ddraw1.c:10412: Test failed: Got unexpected content ff0000ff ff0000aa ffff0000 ff00ff00 ff001100 55555555. ddraw1.c:10451: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000. ddraw1.c:10482: Test failed: Got unexpected content ff0000ff ff0000aa 00001100 00001100 000000aa 000000aa. ddraw1.c:10504: Test failed: Got unexpected content 00ff0000 00ff0000 ffff0000 ff00ff00 000000aa 000000aa. ddraw1.c:10584: Test failed: Got unexpected content 00ff0000 00ff0000 00001100 00001100 ff001100 ff110000.

1 0

Re: [PATCH 2/3] comctl32/propsheet: Implement PSM_SETHEADERTITLE
by Alexandre Julliard 16 Feb '17

16 Feb '17

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > case PSM_SETHEADERTITLEW: > - PROPSHEET_SetHeaderTitleW(hwnd, (int)wParam, (LPCWSTR)lParam); > - return TRUE; > + PROPSHEET_SetHeaderTitleW(hwnd, wParam, (LPCWSTR)lParam); > + return FALSE; > > case PSM_SETHEADERTITLEA: > - PROPSHEET_SetHeaderTitleA(hwnd, (int)wParam, (LPCSTR)lParam); > - return TRUE; > + PROPSHEET_SetHeaderTitleA(hwnd, wParam, (LPCSTR)lParam); > + return FALSE; Not that it makes much difference, but is there a reason for changing these to returning FALSE? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH v2] winedevice: Use WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR to free drivers in async_shutdown_drivers.
by Sebastian Lackner 16 Feb '17

16 Feb '17

On 15.02.2017 17:07, Jacek Caban wrote: > + wine_rb_clear( &wine_drivers, NULL, NULL ); This fixes the issue, but passing a non-NULL callback to clear() would crash because the rbtree is temporarily corrupted. In all other places clear() is called to clear the content, not as a replacement for init(). Wouldn't it make more sense to integrate the clearing directly into the macro somehow, if its only used for destructors? You could for example reset ->root immediately after initializating the cursor. Otherwise, if the macro is supposed to be a general purpose postorder iterator, it would make more sense to use a different name.

3 5

Re: [v5 1/2] ntdll: Implement FileIdInformation class support in NtQueryInformationFile.
by Sebastian Lackner 16 Feb '17

16 Feb '17

On 14.02.2017 19:21, Jonathan Doron wrote: > Signed-off-by: Jonathan Doron <jond(a)wizery.com> > --- > dlls/ntdll/file.c | 29 ++++++++++++++++++++++++- > dlls/ntdll/tests/file.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ > include/winternl.h | 9 ++++++++ > 3 files changed, 93 insertions(+), 1 deletion(-) I have just sent a series (patch 130340 - 130343) based on your work which implements initial support for FileIdInformation. There are some tasks left, however I believe it is easier for all of us, when the basic stuff is already upstream, and we only have to discuss about the missing pieces. ;) > > diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c > index a6c1098..182db56 100644 > --- a/dlls/ntdll/file.c > +++ b/dlls/ntdll/file.c > @@ -2377,7 +2377,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, > 0, /* FileRenameInformationBypassAccessCheck */ > 0, /* FileLinkInformationBypassAccessCheck */ > 0, /* FileVolumeNameInformation */ > - 0, /* FileIdInformation */ > + sizeof(FILE_ID_INFORMATION), /* FileIdInformation */ > 0, /* FileIdExtdDirectoryInformation */ > 0, /* FileReplaceCompletionInformation */ > 0, /* FileHardLinkFullIdInformation */ > @@ -2619,6 +2619,33 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, > } > } > break; > + case FileIdInformation: > + { > + if (fstat(fd, &st) == -1) > + { > + io->u.Status = FILE_GetNtStatus(); > + } > + else > + { > + FILE_ID_INFORMATION *info = ptr; > +#if defined(HAVE_FSTATFS) > + struct statfs volstats; > + if (fstatfs(fd, &volstats) == -1) > + { > + io->u.Status = FILE_GetNtStatus(); > + break; > + } > + > + memcpy(&info->VolumeSerialNumber, > + &volstats.f_fsid, > + min(sizeof(info->VolumeSerialNumber), sizeof(volstats.f_fsid))); > +#else > + memset(&info->VolumeSerialNumber, 0, sizeof(info->VolumeSerialNumber)); > +#endif It might be fine to implement the volume serial number like that, but I believe it is even more important that all functions return the same information. If its required for your application, please also update kernel32 and other places where it is returned. > + ((LARGE_INTEGER *)&info->FileId)->QuadPart = st.st_ino; > + } > + } > + break; > default: > FIXME("Unsupported class (%d)\n", class); > io->u.Status = STATUS_NOT_IMPLEMENTED; > diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c > index 57d7df9..926b8f8 100644 > --- a/dlls/ntdll/tests/file.c > +++ b/dlls/ntdll/tests/file.c > @@ -1444,6 +1444,61 @@ static void test_file_basic_information(void) > CloseHandle( h ); > } > > +static void test_file_id_information(void) > +{ > + IO_STATUS_BLOCK io; > + FILE_ID_INFORMATION fid1, fid2; > + HANDLE h = INVALID_HANDLE_VALUE; > + NTSTATUS res; > + char path[MAX_PATH], buffer[MAX_PATH]; > + > + GetTempPathA(MAX_PATH, path); > + GetTempFileNameA(path, "foo", 0, buffer); > + > + h = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); > + ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); > + > + /* Query the temp file unique id */ > + memset(&fid1, 0, sizeof(fid1)); The memsets with same value hide that some bytes of FileId are uninitialized. > + res = pNtQueryInformationFile(h, &io, &fid1, sizeof(fid1), FileIdInformation); > + if (res == STATUS_NOT_IMPLEMENTED || res == STATUS_INVALID_INFO_CLASS) > + { > + CloseHandle(h); > + DeleteFileA(buffer); > + win_skip("FileIdInformation not supported\n"); > + return; > + } > + > + ok(res == STATUS_SUCCESS, "can't get fid1, res %x\n", res); > + > + CloseHandle(h); > + > + h = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); > + ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); > + > + memset(&fid2, 0, sizeof(fid2)); > + res = pNtQueryInformationFile(h, &io, &fid2, sizeof(fid2), FileIdInformation); > + ok(res == STATUS_SUCCESS, "can't get fid2, res %x\n", res); > + > + /* Verify we got the same unique id for the file */ > + ok(memcmp(&fid1, &fid2, sizeof(fid1)) == 0, "file id is not unique\n"); > + > + CloseHandle(h); > + > + h = create_temp_file(0); > + ok(h != NULL, "error creating new file %d\n", GetLastError()); > + > + memset(&fid2, 0, sizeof(fid2)); > + res = pNtQueryInformationFile(h, &io, &fid2, sizeof(fid2), FileIdInformation); > + ok(res == STATUS_SUCCESS, "can't get new fid2, res %x\n", res); > + > + /* Verify we got the different unique id for the new file */ > + ok(memcmp(&fid1, &fid2, sizeof(fid1)) != 0, "file id is not unique\n"); > + Some of those patches can probably be added again if you want. For now I have only added a test to compare the result with GetFileInformationByHandle. > + CloseHandle(h); > + DeleteFileA(buffer); > +} > + > static void test_file_all_information(void) > { > IO_STATUS_BLOCK io; > @@ -4262,4 +4317,5 @@ START_TEST(file) > test_file_disposition_information(); > test_query_volume_information_file(); > test_query_attribute_information_file(); > + test_file_id_information(); > } > diff --git a/include/winternl.h b/include/winternl.h > index 891b6a7..2f2ea86 100644 > --- a/include/winternl.h > +++ b/include/winternl.h > @@ -571,6 +571,15 @@ typedef struct _FILE_INTERNAL_INFORMATION { > LARGE_INTEGER IndexNumber; > } FILE_INTERNAL_INFORMATION, *PFILE_INTERNAL_INFORMATION; > > +typedef struct _FILE_ID_128 { > + UCHAR Identifier[16]; > +} FILE_ID_128, *PFILE_ID_128; > + > +typedef struct _FILE_ID_INFORMATION { > + ULONGLONG VolumeSerialNumber; > + FILE_ID_128 FileId; > +} FILE_ID_INFORMATION, *PFILE_ID_INFORMATION; > + > typedef struct _FILE_EA_INFORMATION { > ULONG EaSize; > } FILE_EA_INFORMATION, *PFILE_EA_INFORMATION; >

1 0

Re: [PATCH v2 8/9] ddraw/tests: Test ddraw7 CreateSurface with a null descriptor.
by Henri Verbeet 16 Feb '17

16 Feb '17

On 16 February 2017 at 04:46, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/ddraw/tests/ddraw7.c | 5 +++++ > 1 file changed, 5 insertions(+) > Actually, most of this is already covered by both CreateSurfaceBadCapsSizeTest() and create_surface_test() in dsurface.c. Could you cleanup and merge those instead?

1 0

Re: [PATCH v2 8/9] ddraw/tests: Test ddraw7 CreateSurface with a null descriptor.
by Marvin 15 Feb '17

15 Feb '17

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=28673 Your paranoid android. === w864 (32 bit ddraw7) === ddraw7.c:3767: Test failed: Lit quad with light has color 0x00000000. ddraw7.c:3767: Test failed: Lit quad with singular world matrix has color 0x00000000. ddraw7.c:3767: Test failed: Lit quad with transformation matrix has color 0x00000000.

1 0