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

Re: [2/2] ddraw: add dsurface dimension tests, try 10

by Stefan Dösinger

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, You forgot to fix some IDirectDrawSurface2 macros. Otherwise this looks good. Thanks again for your work! Stefan Am 2014-06-29 16:37, schrieb Patrick Rudolph: > + 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; > + } > ... > + hr = IDirectDraw2_CreateSurface(ddraw, &surfacedesc, &surface, NULL); > + ok(SUCCEEDED(hr), "CreateSurface returned %08x\n", hr); > + if (surface) > + { > + hr = IDirectDrawSurface2_GetSurfaceDesc(surface, &surfacedesc); > + ok(SUCCEEDED(hr), "GetSurfaceDesc returned %x\n", hr); -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTsTBWAAoJEN0/YqbEcdMwThEP/3uJuJuU4gZNiiRy3AkP6guK cVnLXyasOBmwMNxLSFnt1RXQmYmcmY/cR16I/RRd1NbemC8+tB8PbO3Vp6bTGnx0 i4ZM+EFh+6F6xFzjua99sK67x0MNXqW+fp1L8tz5804piaqcJK/MX9XloMeG45ZL WrGVFqZnFKb67OjoXKqZSo0S4bR/GJveRz9x8KxpGnqsc2Wa/sRftIoiO67FSoaq P1ffH0OEPbkj7pzXFyV2BwHFVIC4LzFXmTWVNgmZfNSnTPossSyg8tuCe9+ZvVZa lVHRu95nda2nh/RRfEk+jH2strX2psmb20/bsNa1RQ4ujWJT+HBcaGbeicsyzqZL i+iJjNG/Pm0DRZ6DPfnUfW6/xIJW89L1fZ8sHLtSJ+jsR3tGQeYV5IAh0G5SBnM2 tXsbrQkVeZ3UfwGVK3zxl+C4UqkXyOhxSR2Bagr3QJqPGi7z2MR0/ScRdfJAAuMj 3yUbHZFYzsGBrgWZ4LYGDaZN2HL2Bnb7Er7QXPCSApgE8klHUwGTOPiRmyuKyYkJ cgysMnnxflVRwLEaMO6roLw4xL849yOiWGIJkFJ+zWZxuweEBEjOPUUv7ch+PfLY UNAWE7+BerPf/0UyNZvXw3MtYOd7cQxFCfwItboUV3iFEaG3ZBYhpT6+/mITHJ2i eP7C9M4fGnoU8F6TbLcZ =ELAp -----END PGP SIGNATURE-----

June 30, 2014

Re: [1/2] ddraw: add dsurface dimension tests, try 10

by Stefan Dösinger

-----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-----

June 30, 2014

Re: [PATCH 3/5] d3d8: Check the device status in present calls.

by Michael Stefaniuc

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

June 30, 2014

Re: Test bot error unrelated to patch, should I resend?

by Joris van der Wel

Ah I see, thank you. I probably need to register first to restart jobs, I will do that now. On Sun, Jun 29, 2014 at 12:13 PM, Francois Gouget <fgouget(a)codeweavers.com> wrote: > On Fri, 27 Jun 2014, Joris van der Wel wrote: > > > 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? > > It is indeed unrelated to the patch. This particular error happens when > the TestBot server fails to connect to the agent inside the VM to send > it work to do. The next set of TestBot patches should cause it to retry > when that happens to make this more robust. > > Note that in the meantime if you get a boterror on a job and you have an > account you can go to the web site and restart your job (which I did on > your job). > > -- > Francois Gouget <fgouget(a)codeweavers.com> >

June 29, 2014

RE: [Patch 1/2] winecfg: Set default button in Libraries tab [fixes bug 12804]

by Hugh McMaster

On Wednesday, 25 June 2014 6:01 AM, André Hentschel wrote: > 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... Confirmed. I'll keep looking.

June 29, 2014

Wine freetext search no longer working

by Hugh McMaster

As of 29 June 2014, the freetext source code search option at http://source.winehq.org/search is not working. The error message is "Unexpected return value 2 from Glimpse". A quick search on the internet reveals the following from http://lxr.sourceforge.net/en/troubleshooting.shtml: Unexpected return value x from Glimpse Glimpse was unable to complete the free-text search query. If x is 2, files are inaccessible. These usually are the auxiliary caches, which may be missing or have incorrect access rights. The relevant directory is defined by the 'glimpsedir' or 'glimpsedirbase' configuration parameters. There is no problem with the identifier search option. -- Hugh McMaster

June 29, 2014

Re: [4/5] user32: Set capture earlier on popup menus.

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://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

June 29, 2014

Re: Test bot error unrelated to patch, should I resend?

by Francois Gouget

On Fri, 27 Jun 2014, Joris van der Wel wrote: > 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? It is indeed unrelated to the patch. This particular error happens when the TestBot server fails to connect to the agent inside the VM to send it work to do. The next set of TestBot patches should cause it to retry when that happens to make this more robust. Note that in the meantime if you get a boterror on a job and you have an account you can go to the web site and restart your job (which I did on your job). -- Francois Gouget <fgouget(a)codeweavers.com>

June 29, 2014

Re: [2/2] ddraw: add dsurface dimension tests, try 9

by Stefan Dösinger

-----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-----

June 29, 2014

Re: [1/2] ddraw: add dsurface dimension tests, try 9

by Stefan Dösinger

-----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-----

June 29, 2014