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

Re: [1/2] ddraw: add dsurface dimension tests, try 10
by Stefan Dösinger June 30, 2014

June 30, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, This patch looks good to me. There are two minor style issues, but I don't think they warrant a resend. If Henri has further suggestions you can fix those style issues as well: Note that I have not tested them on Windows yet. My my Mingw is currently broken, and I'm still struggling with Gentoo's crossdev tool. The tests pass on Linux on 32 and 64 bit Wine builds. Am 2014-06-29 16:37, schrieb Patrick Rudolph: > + if ((desc->dwWidth>0xFFFF) || (desc->dwHeight>0xFFFF)) Most other places (and your patch 2) use 0xffff and spaces around ">". > - > - /* Check that we have enough video ram left */ > + > if (pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) Trailing whitespace. I think Alexandre's git automatically removes that. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTsS+qAAoJEN0/YqbEcdMwrjwP/1duFUNuI9buzIl58xj/uRc0 zueU33ssfT0ktJWY2RIWpsOQI79j+WX3MlQvRTCKBY6vYPhYKM8DzAN4QNgGhGLT yPBnmrKQiQwRfmDlpXJkwB1/mV3gSIc6RYHW2vMu2qyiOAPS13Mb5gDuQFnlhLNm tlWrVmvTslkL0hdFt5w/uumqZO/NHnN7kdSktMHFtdQaRYT9PSldYGdYQTT4mFul 8lQ2DaKfUQPc92iJSywEMRwQs/NZf0FYsNaNN47YDAj+8xi4tsQjHoSAZzaU6LVP /izGhSzwTFToEO+MHgYbuU8NNFLSGcceNSkaEzMikIyLYvaHYvBhRSnb9ki6Y04s F2timDIagvSUqn97GTlM2FvQBn8vHVlTFLKx4FPlFC6sFXoJPkQkDf6zjPuRn4oY ZkbXemBJNnU+sLHoOpRJGhoYLktEYmOvHc0WPar3QvrGd1xKbUeRAOUO5YMMPiKe CbhBs00GBrxjaBoXUkiGRnHCs+cBRIo3IbcFrCE3LX5/aDlASNg70p6y2JqGi+BJ aiitq7ds6+OAlvbagPwuuR2YMfSVa5DFbvi8kMpJj+Uh+VQa/8829oY1XVqS3n9j uE/Vd1LqCmLA/wKVG8WqJ60O/pz0nO3fXx4ChLp3fVWu+DHF+XT4PW83FFAX8+u/ jkU5hoc6qI3sXbmggbS6 =ApEH -----END PGP SIGNATURE-----

1 0

Re: [PATCH 3/5] d3d8: Check the device status in present calls.
by Michael Stefaniuc June 30, 2014

June 30, 2014

On 06/30/2014 11:17 AM, Henri Verbeet wrote: > diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c > index e9f4976..067a3e0 100644 > --- a/dlls/d3d8/swapchain.c > +++ b/dlls/d3d8/swapchain.c > @@ -91,11 +91,15 @@ static HRESULT WINAPI d3d8_swapchain_Present(IDirect3DSwapChain8 *iface, > const RGNDATA *dirty_region) > { > struct d3d8_swapchain *swapchain = impl_from_IDirect3DSwapChain8(iface); > + struct d3d8_device *device = impl_from_IDirect3DDevice8(swapchain->parent_device); I kinda don't like this: impl_from_IFoo() should be called only from methods of IFoo. For the rest there is unsafe_impl_from_IFoo(). But in this case, my first impulse would be to make swapchain->parent_device a struct d3d8_device thus avoiding the impl_from_IDirect3DDevice8() altogether. bye michael

1 0

Test bot error unrelated to patch, should I resend?
by Joris van der Wel June 29, 2014

June 29, 2014

After I submitted a patch the testbot failed because of an error unrelated to my patch: === build (build) === Could not copy the patch to the VM: the "nc -q0 '10.42.42.130' '4242'" command returned 1 Should I resend my patch, or will this be resolved on its own? Thanks

3 3

Re: [Patch 1/2] winecfg: Set default button in Libraries tab [fixes bug 12804]
by André Hentschel June 29, 2014

June 29, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 24.06.2014 10:35, schrieb Hugh McMaster: > This patch sets the default button to IDC_DLLS_ADDDLL in the Libraries tab of winecfg when a user is typing in the combo box. > > This allows the user to hit the Enter key and add the override. Currently, hitting the Enter key closes winecfg, which is causing problems with many users. > > The patch fixes bug 12804 and was tested by Austin English. That's just a workaround, if you modify winecfg to run on Windows you'll see that the button works there as expected, the problem lies deeper in the Wine code... Of course we maybe want a workaround to satisfy our users... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQGcBAEBAgAGBQJTqdjyAAoJEGm5GZTakYsswH4L/198JPSwjgYiwSnLkYgBjZJ6 YD5XWVA3YfdexdV2urNIIN8fHv97xVR9INqnbEksS/HJpTY9QU9CIYTSw8IkxlS4 3423KKJe+St7cjKLwoAMFK6LJNQrtloxik2S8Y7y7QMLocPxmRPZOFK45032RTEM BH/vAwxtud4yux13rKsl9TX4Z6LwoqeKcGk9k0I2vYy0ez53rIS0bP9sytasNTLL 34Vmj65kVX5lQGYNhECgkd5W2LNDSUxXecpc+BQ1iaHNNnGkne0uZPERVoqIRHYv TZuhtzF/VI4nXO9bRnAkZhMycHH8aZI4vk5D/kvamzEApDx8dC78S+s0by+RFLfb 7UMaV24GM6DI3QS6aK7e/UjTSBKq4fqyOykrn0Pdjhb7fx5OPHevV84HoPil5Sx0 LRsrNZQY+tr+0jqHvAV0YPohspZb05qZDQbv/6jnt085m6SIQdPiJq4RqD6Vwl81 cpy1fYd1hTO1hY5zSrVl+6TbN9PgniTb6d5OfhI5+g== =Z18S -----END PGP SIGNATURE-----

2 2

Re: [4/5] user32: Set capture earlier on popup menus.
by Marvin June 29, 2014

June 29, 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=7665 Your paranoid android. === wxppro (32 bit msg) === msg.c:11766: Test failed: SetActiveWindow(0): 0: the msg sequence is not complete: expected 0086 - actual 0000 msg.c:11787: Test failed: SetActiveWindow(hwnd), hwnd not visible: 8: in msg 0x0086 expecting wParam 0x1 got 0x0 msg.c:11793: Test failed: SetActiveWindow(popup), hwnd not visible, popup not visible: 9: in msg 0x0086 expecting wParam 0x1 got 0x0 msg.c:13528: Test failed: key release only: 0: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13540: Test failed: key press only: 0: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13552: Test failed: key press repeat: 0: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13564: Test failed: key release repeat: 0: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13584: Test failed: key press after setkeyboardstate: 0: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13604: Test failed: key release after setkeyboardstate: 0: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13804: Test failed: window hotkey press LWIN: 1: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13829: Test failed: window hotkey release: 1: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13834: Test failed: window hotkey release LWIN: 1: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13862: Test failed: window hotkey combined: 7: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13876: Test failed: window hotkey previous: 4: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13891: Test failed: window hotkey new: 3: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13915: Test failed: thread hotkey press LWIN: 1: the msg sequence is not complete: expected 0100 - actual 0000 msg.c:13944: Test failed: thread hotkey release: 1: the msg sequence is not complete: expected 0101 - actual 0000 msg.c:13952: Test failed: thread hotkey release LWIN: 1: the msg sequence is not complete: expected 0101 - actual 0000 === w7u (32 bit msg) === msg.c:12099: Test failed: unexpected hwnd 00090138 msg.c:12121: Test failed: bad time 30ab9/30ac9

1 0

Re: [2/2] ddraw: add dsurface dimension tests, try 9
by Stefan Dösinger June 29, 2014

June 29, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-06-28 17:43, schrieb Patrick Rudolph: > + for (j = 0; j < sizeof(formats) / sizeof(*formats); j ++) > + { > + for (i = 0; i < sizeof(tests) / sizeof(*tests); i ++) > + { I don't think we use "i ++" with a space anywhere. Please make it i++ or ++i. > + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); > + ok(SUCCEEDED(hr), "SetCooperativeLevel failed with %08x\n", hr); > + IDirectDraw_Release(ddraw); > + DestroyWindow(window); > +} The SetCooperativeLevel call is redundant here. I think it was used in the old test because dsurface.c re-used the IDirectDraw object. > + hr = IDirectDraw2_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(hr == tests[i].hr, "Pixelformat %s, test %d returned %08x\n", formats[j].name, i, hr); > + > + if (surface) > + { > + IDirectDrawSurface2_Release(surface); > + surface = NULL; > + } IDirectDraw2_CreateSurface returns an IDirectDrawSurface, not IDirectDrawSurface2. Other than that this patch looks good to me. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTr7XvAAoJEN0/YqbEcdMwYwMP/RXeG9kiO+8EJVRDOaPiSi3O YOWppnsurP6oDCWo9RdtdbarfLGYeypGMPwTi/RAkdgYFbBJvqZhMGyINQ3DqCkn nLVKZCfSBkKFFRG3IR4HixVqqlk/vXqtdFizV7IuzQYuGLdUCFPDKYqldDCQtdGH vKGH97qJjIe28ArcHXPufdpV0ZxJBgKPn4XxD8ZquElPEPB0obF7jONYMohmWvWr 7bea+n7ecKNlfWUM/ROb0S/OBP2l8aQ/ZoGKdxQTJKDS6LJzAbkClt5limDnsToV uabvHXvfv8t4jw2Sa3MkJEAcqWQ4fgkcqxltGk/AKNdmgs0Wfhp7ZdLGpZqFPjp6 tlNWsoU69NHRocghc41UB2droIbcU17U7jP7hd1kZOwGg1ksjDoDF2P/n375MFV7 gdKEMELD0c/i9Hy6pFYpQUgnS5X6pNcnHJR3EcxOi/lLUMBMnPpsWiDIQzcG9f58 hcTznm8MR2J1tphYZ4bnE7VmOXZOpDNqY7kyLe8PRMaOJlo70Z2yRAiqTL1dCqVP ntZ7i7CeSxrejg8SWkzWwgBKKMHJ22fCK3UkfewbLqxmUcMVteypZ/ESh82C3LFE OZVOW/iY2Ilt+dEdoH6guRV/2trzfj3UXOsLC9ZNmcl+VL4PLN+N8gytH9Q23/Ak ApTtStXqJfLTv4OI7AHI =VHdx -----END PGP SIGNATURE-----

1 0

Re: [1/2] ddraw: add dsurface dimension tests, try 9
by Stefan Dösinger June 29, 2014

June 29, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-06-28 17:43, schrieb Patrick Rudolph: > + if ((desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) && (hr == E_OUTOFMEMORY)) > + hr = DDERR_OUTOFVIDEOMEMORY; I don't like this. wined3d should return WINED3DERR_OUTOFVIDEOMEMORY when the emulated adapter memory is exhausted. I guess it returns E_OUTOFMEMORY because it first tries to allocate heap memory and then checks if there's enough adapter memory left. If you swap the order of operations in resource_init() in dlls/wined3d/resource.c this should be much nicer. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTr7QkAAoJEN0/YqbEcdMwQEAQAJbgNG0XDSpLeU6PjGhJf9+2 jAwldh9cCrKtSotndSe7IQ9aKGKtG/akF7u219ciaEHE2oXy9Qtcj31PIpA0Zh80 V2kv+rMU4gN+b55OaInIO8hEFxMcHEUGcaMguMyUJdjsZtHUBX066QwmP2VKP822 mYsNT4E4pNi20Bn7HoddGzlb5oA0EwNXLojnQhHQLBE6EUSA/EIgYWuRBRcyTGrY 4144gvnXHUMSxajxi+cQKcWKD56+hODNGTtDZeuo94h+PoV/B+QNz0OOUCy5O+3F KnNL/Njy/FeNYoi+MCdVdBhhJiQAaUuV2vhxGbSmHmBf1p71/JcCsORAg5pefemD hRsThGJrNfPPFdksF6pbszEQRPNLU8n0a+5HQ2j7xKqGTmT+Rek1H8etVQM/xVt3 e3nhN5VY2UNT0irckjK0imMr/3ydYs7wWxE++Xh4mKAeXbWII1lcVJSlq+dGTnVx dtOdPUtJS9QSiMgDjBETRG1JjyC57TNfXK2IwLHst1wZ+0jMZ3tENZZX2H6F2XWT T+UK9+lLJnvztmcA8KC4VirsLPJmJJGlhFsuZEsCUUH/rUC3CFFCAuvk3fA83mJp +Nxf/uLkUkSZTAMX717vXoL5p0i6/Vzdx2vYjX3O/H7DiP1mU/OyTOccklhmAhb/ 7K15mms5Z4VV6FdOjXPG =dq6I -----END PGP SIGNATURE-----

1 0

XFORM matrix and rotation bug
by Alexander Almaleh June 28, 2014

June 28, 2014

While working on the previous bug with PlgBlt(), I noticed there is another one with the XFORM matrix. I've submitted a bug report at https://bugs.winehq.org/show_bug.cgi?id=36815 . I want to try to debug it and find a solution, but I need some help. Can someone tell me where the code is where the XFORM matrix is used to transform the coordinates? I mean where the actual blitting is done. Also, how is it done? Does wine use an internal buffer and all the operations are made manually, or does it just translate the blitting operations to the X server?

1 0

Re: mshtml/tests: Fix a memory leak (valgrind).
by Marvin June 27, 2014

June 27, 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=7746 Your paranoid android. === w2000pro (32 bit htmldoc) === htmldoc: unhandled exception c0000005 at 00090100 === wxppro (32 bit htmldoc) === htmldoc: unhandled exception c0000005 at 3C8363A7 === wvistau64 (32 bit htmldoc) === htmldoc: unhandled exception c0000005 at 00000000 === w7u (32 bit htmldoc) === htmldoc.c:2863: Test failed: unexpected command 74 The test timed out === w8 (32 bit htmldoc) === htmldoc.c:2863: Test failed: unexpected command 74 htmldoc.c:2863: Test failed: unexpected command 74 htmldoc.c:2863: Test failed: unexpected command 74 htmldoc.c:6113: Test failed: LoadHistory failed: 80070057 htmldoc.c:6117: Test failed: expected FireBeforeNavigate2 htmldoc.c:6118: Test failed: expected Invoke_AMBIENT_SILENT htmldoc.c:6119: Test failed: expected Invoke_AMBIENT_OFFLINEIFNOTCONNECTED htmldoc.c:2781: Test failed: unexpected state L"uninitialized", expected 1 htmldoc.c:2781: Test failed: VT_I4(out)=0, expected 1 htmldoc.c:367: Test failed: expected Exec_SETTITLE htmldoc.c:5666: Test failed: unexpected state L"uninitialized", expected 1 htmldoc.c:5666: Test failed: VT_I4(out)=0, expected 1 htmldoc.c:2781: Test failed: unexpected state L"uninitialized", expected 1 htmldoc.c:2781: Test failed: VT_I4(out)=0, expected 1 htmldoc.c:2781: Test failed: unexpected state L"uninitialized", expected 1 htmldoc.c:2781: Test failed: VT_I4(out)=0, expected 1 The test timed out === wvistau64 (64 bit htmldoc) === htmldoc: unhandled exception c0000005 at 000000007137D8A6

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 4)
by Piotr Caban June 27, 2014

June 27, 2014

Please add VT_NULL argument handling and tests. This function is returning error on Sgn(Null) call.

2 1