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

We're in at FOSDEM!

by Jeremy White

Hey folks, I thought I'd let everyone know that I applied for and we have been granted a room at FOSDEM again this year. I'm going to send a 'Call for Papers' separately. Cheers, Jeremy

Oct. 15, 2013

Video Mixing Renderer 7

by Michael Müller

Hi, I am wondering what would be the best way to handle programs which rely on the Video Mixing Renderer 7 (quartz.dll) as it's supposed to be available on XP and later, but Wine contains only an implementation of version 9. The program I am speaking of is Silverlight which uses the VMR 7 Interface to create a filter graph and then queries for the IAMCertifiedOutputProtection interface. I am currently using a hack fix to get around this by returning a VMR9 instance when a VMR7 is requested and implementing the missing subinterfaces (which are only part of VMR7). This solution is clearly not perfect and I am searching for a better way to get around this issue. The most similar way to Windows would be to completely rewrite the current implementation of the VMR9 as VMR7 using DirectDraw, which would take a lot of time and most probably end up in having a lot of duplicate code. I am wondering whether using d3d9 for VMR7 would also be an acceptable solution. We could move all the d3d9 related stuff to a separate file so that VMR7.c and VMR9.c only offer the version specific interfaces and use the same code internally. This shouldn't be a big problem since the differences between the VMR7 and VMR9 interfaces are often only very small. Though it would not completely fit the behavior of windows. I am open for other ideas on how to solve the problem, but as Silverlight does not even use the VMR7 object for playing the video but only to check for the graphic driver certificate I don't think it would justify to rewrite everything using Direct Draw if there are no other programs needing this interface. Best Regards, Michael Müller

Oct. 15, 2013

Re: wined3d: Initialize map_desc in wined3d_surface_map

by Marvin

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://newtestbot.winehq.org/JobDetails.pl?Key=2785 Your paranoid android. === w864 (32 bit device) === device.c:5409: Test failed: pBits not cleared on double lock. device.c:5410: Test failed: Pitch not cleared on double lock. device: unhandled exception c0000005 at 742814C8 === w864 (64 bit device) === device.c:5409: Test failed: pBits not cleared on double lock. device.c:5410: Test failed: Pitch not cleared on double lock. device: unhandled exception c0000005 at 000007F84EDD90EB

Oct. 15, 2013

Re: wined3d: Initialize map_desc in wined3d_surface_map

by Marvin

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://newtestbot.winehq.org/JobDetails.pl?Key=2784 Your paranoid android. === w864 (32 bit device) === device.c:2481: Test failed: Expected foreground window 000401A6, got 00010084. device.c:3174: Test failed: Expected wndproc 0x4107a0, got 0x4107a0. device: unhandled exception c0000005 at 742F14C8

Oct. 15, 2013

Re: d3d9: update locked_rect only if wined3d_surface_map succeeded (try 3)

by Henri Verbeet

On 15 October 2013 18:10, Nikolay Sivov <bunglehead(a)gmail.com> wrote: >> diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c >> index 02b4174..90d5c38 100644 >> --- a/dlls/d3d9/tests/device.c >> +++ b/dlls/d3d9/tests/device.c >> @@ -5404,6 +5404,10 @@ static void test_lockrect_invalid(void) >> ok(SUCCEEDED(hr), "Failed to lock surface with rect NULL, hr >> %#x.\n", hr); >> hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); >> ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); >> + locked_rect.pBits = (BYTE *)0xdeadbeef; >> + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); >> + ok(!SUCCEEDED(hr) && locked_rect.pBits == NULL, "Failed to clear >> pBits (%p)\n", >> + locked_rect.pBits); >> hr = IDirect3DSurface9_UnlockRect(surface); >> ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); >> > > It looks like you could use existing LockRect() call that's already tested > as failing. Also I think FAILED() is a preferred way to > test HRESULT value for failure, but as existing code does - you could also > test for exact failure code. > Yeah, I think it really just needs the intialization of pBits before the existing LockRect() call, and an extra ok() call after the existing one.

Oct. 15, 2013

Re: d3d9: update locked_rect only if wined3d_surface_map succeeded (try 3)

by Lasse Rasinen

Marvin <testbot(a)winehq.org> writes: > === w864 (32 bit device) === > device.c:5409: Test failed: Failed to clear pBits (DEADBEEF) > device: unhandled exception c0000005 at 742814C8 > > === w864 (64 bit device) === > device.c:5409: Test failed: Failed to clear pBits (00000000DEADBEEF) > device: unhandled exception c0000005 at 000007F84EDD90EB As I'm doing drive-by patching to fix My Favorite App, I have no idea what can possibly be the problem here. If someone could shed some light on why w864 behaves differently from the other systems, that would be appreciated. -- Lasse Rasinen lrasinen(a)iki.fi

Oct. 15, 2013

Re: d3d9: update locked_rect only if wined3d_surface_map succeeded (try 3)

by Nikolay Sivov

On 10/15/2013 18:57, Lasse Rasinen wrote: > According to debugging output, Artemis Spaceship Bridge Simulator 2.0 > calls LockRect twice on the same texture (for whatever reason) and crashes. > > http://bugs.winehq.org/show_bug.cgi?id=34271 > > The return values are cleared explicitly --- game is playable. > > Now with appropriate assignments and test output. > --- > dlls/d3d9/surface.c | 9 +++++++-- > dlls/d3d9/tests/device.c | 4 ++++ > 2 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c > index 99f0b0f..20ccc68 100644 > --- a/dlls/d3d9/surface.c > +++ b/dlls/d3d9/surface.c > @@ -293,8 +293,13 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, > hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags); > wined3d_mutex_unlock(); > > - locked_rect->Pitch = map_desc.row_pitch; > - locked_rect->pBits = map_desc.data; > + if (SUCCEEDED(hr)) { > + locked_rect->Pitch = map_desc.row_pitch; > + locked_rect->pBits = map_desc.data; > + } else { > + locked_rect->Pitch = 0; > + locked_rect->pBits = NULL; > + } > > return hr; > } > diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c > index 02b4174..90d5c38 100644 > --- a/dlls/d3d9/tests/device.c > +++ b/dlls/d3d9/tests/device.c > @@ -5404,6 +5404,10 @@ static void test_lockrect_invalid(void) > ok(SUCCEEDED(hr), "Failed to lock surface with rect NULL, hr %#x.\n", hr); > hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); > ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); > + locked_rect.pBits = (BYTE *)0xdeadbeef; > + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); > + ok(!SUCCEEDED(hr) && locked_rect.pBits == NULL, "Failed to clear pBits (%p)\n", > + locked_rect.pBits); > hr = IDirect3DSurface9_UnlockRect(surface); > ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); > It looks like you could use existing LockRect() call that's already tested as failing. Also I think FAILED() is a preferred way to test HRESULT value for failure, but as existing code does - you could also test for exact failure code.

Oct. 15, 2013

Re: d3d9: update locked_rect only if wined3d_surface_map succeeded (try 3)

by Marvin

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://newtestbot.winehq.org/JobDetails.pl?Key=2783 Your paranoid android. === w864 (32 bit device) === device.c:5409: Test failed: Failed to clear pBits (DEADBEEF) device: unhandled exception c0000005 at 742814C8 === w864 (64 bit device) === device.c:5409: Test failed: Failed to clear pBits (00000000DEADBEEF) device: unhandled exception c0000005 at 000007F84EDD90EB

Oct. 15, 2013

Re: d3d9: update locked_rect only if wined3d_surface_map succeeded (try 3)

by Stefan Dösinger

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2013-10-15 16:57, schrieb Lasse Rasinen: > - locked_rect->Pitch = map_desc.row_pitch; - > locked_rect->pBits = map_desc.data; + if (SUCCEEDED(hr)) { + > locked_rect->Pitch = map_desc.row_pitch; + > locked_rect->pBits = map_desc.data; + } else { + > locked_rect->Pitch = 0; + locked_rect->pBits = NULL; + } You can handle this in wined3d/surface.c, wined3d_surface_map. Also, please follow the code style of the existing code. Curly brackets go in their own line. > + locked_rect.pBits = (BYTE *)0xdeadbeef; + hr = > IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + > ok(!SUCCEEDED(hr) && locked_rect.pBits == NULL, "Failed to clear > pBits (%p)\n", + locked_rect.pBits); For the sake of completeness, please also test locked_rect.Pitch and port the test to d3d8. Ddraw already has a test in dsurface.c. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSXVwzAAoJEN0/YqbEcdMw1CQP/2Lk2v78Ws8BGh1x4MvaXj/x YhJQ1d44bqP9B8+H7E3NKWuwZ6ywNmxvH+Mq59nbNKdfBrxvTezIA2PDLEsNwWJa hl/Q4St61K1XkExmu+48tyxtT3BS8P2g60Z50V8VIfrUh/3qqquXq79tki9XqYSr vtuFLuJyHECzYq7hQ+BZqbudwSSf42ZQfX0wNpa4wuZ2uX/PzA4ku0R/zvHzaMTh HoOrlIxX9hvCF/y5y7v0SAeYT83nMCkUBOZ8EMoDqv81btLDCqdFedtlFz2gTO0P O2vaGzSH0NPU+umIU9rEXUwq3H2gJdFcTG4FujQNsoVSaliXz24OzVTCEc1PvuWz eo+zMhxfG05xNSsb6Yh+fATnOPP6YDWYukS42kmalZ+V5WGlwxxKd4jgfONjCqzH JsIcqbmlxkWN9bPB9k3mIMMDHZ1PClI3GFm1XVMnc4Vas2/FF/IAAK/yPpIV2O/R fJkz4PKcha8P9V/yNlGJrmHYq/Dy7mW9xANmQ4gKv9wm0iqHoUGrDorX7OptskHL ua0pOFmWIXHRtzFysctZ/w6QkKX/e9Vwh/hRWIBhN2JOliu5AZuqQESbqe/rCwZR Flje6p9RaxlqgIzxxK1GQawpQ05NP3y8oS1MIe+mGr4c6sk8KO5d6aUgNVo4jcdY 4OAnKqN3lNbqDZgNEg91 =32E8 -----END PGP SIGNATURE-----

Oct. 15, 2013

Re: d3d9: update locked_rect only if wined3d_surface_map succeeded (try 2)

by Marvin

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://newtestbot.winehq.org/JobDetails.pl?Key=2776 Your paranoid android. === w864 (32 bit device) === device.c:5409: Test failed: Failed to clear pBits (DEADBEEF)device.c:5588: Tests skipped: Failed to create surface for format D3DFMT_R8G8B8 (hr 0x8876086c), skipping tests. device: unhandled exception c0000005 at 740D14C8 === w864 (64 bit device) === device.c:5409: Test failed: Failed to clear pBits (00000000DEADBEEF)device.c:5588: Tests skipped: Failed to create surface for format D3DFMT_R8G8B8 (hr 0x8876086c), skipping tests. device: unhandled exception c0000005 at 000007F84EDD90EB

Oct. 15, 2013