January 2015 - Wine-Devel - list.winehq.org

Re: [PATCH 3/3] winecfg: add speaker config controls to audio tab

by Andrew Eikum

I think you can squash the last two patches. No need to add symbols before they're used. Does it make sense to have a "system default" configuration as well? For example if the user changes which device ALSA's "default" points to from a 5.1 setup to a stereo setup, the "system default" setting should report the configurations correctly (or, as correctly as the backend allows, but you get the point). This might require storing the user-selected speaker configuration elsewhere in the registry, and updating the real registry entry on mmdevapi load. Couple notes below. On Mon, Jan 26, 2015 at 10:28:26PM +0000, Mark Harmstone wrote: > + info->speaker_config = 999; > + if(SUCCEEDED(hr) && pv.vt == VT_UI4){ > + i = 0; > + while (speaker_configs[i].text_id != 0 && info->speaker_config == 999) { > + if ((speaker_configs[i].speaker_mask & pv.u.ulVal) == speaker_configs[i].speaker_mask) > + info->speaker_config = i; > + i++; > + } > + } This is kind of awkward. Could be a for-loop and break early. > + > + /* fallback to stereo */ > + if(info->speaker_config == 999) > + info->speaker_config = 2; > + Yeah, I don't like 999 either. The "system default" would provide a reasonable fallback option here, too. > + IPropertyStore_Release(ps); > + > return TRUE; > + for (i = 0; i < num_render_devs; i++) { > + ERR("%s -> %u\n", wine_dbgstr_w(render_devs[i].id), speaker_configs[render_devs[i].speaker_config].speaker_mask); Looks like a debug line that should be removed or switched to TRACE. > + pv.u.ulVal = speaker_configs[render_devs[i].speaker_config].speaker_mask; > + WARN("speaker_config = %u\n", pv.u.ulVal); Another debug line? > + > + hr = IPropertyStore_SetValue(ps, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv); > + > + if (FAILED(hr)) > + WARN("IPropertyStore_SetValue failed for %s: 0x%08x\n", wine_dbgstr_w(render_devs[i].id), hr); > + > + IPropertyStore_Commit(ps); This isn't actually implemented in mmdevapi, so we end up with noisy "stub" messages on the terminal. Best thing to do would be to fix the property store implementation, but in lieu of that, I'd just switch the FIXME in mmdevapi with a TRACE. Andrew

Jan. 27, 2015

Re: shell32: Handle TRASH_EnumItems failures correctly

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=11318 Your paranoid android. === wvistau64 (32 bit recyclebin) === recyclebin.c:98: Test failed: Expected recycle bin to have 0x8 bytes === wvistau64 (64 bit recyclebin) === recyclebin.c:98: Test failed: Expected recycle bin to have 0x8 bytes

Jan. 27, 2015

Re: msvcrt: Fix inconsistent rounding behaviour for sprintf and add tests.

by Piotr Caban

On 01/26/15 12:29, YongHao Hu wrote: > + if(flags.Precision >= 0 && toupper(flags.Format)!='G') { > + temp = pow(10, flags.Precision); > + val = round(val * temp) / temp; > + } This is not correct, val may loose to much precision. Also temp can become INF (in your patch temp is int but I guess it's a mistake). I'm afraid that in order to fix this bug you'll need to stop using glibcs sprintf in wine's printf implementation. Your patch to msvcp tests depends on this patch. Please send patches that depend on each other in series. Thanks, Piotr

Jan. 27, 2015

Re: [PATCH 3/3] winecfg: add speaker config controls to audio tab

by André Hentschel

Hi, first, this should be merged with patch 2. (atomic changes) Am 26.01.2015 um 23:28 schrieb Mark Harmstone: > - IPropertyStore_Release(ps); > if(FAILED(hr)){ > CoTaskMemFree(info->id); > info->id = NULL; > + IPropertyStore_Release(ps); > return FALSE; > } This looks like a independent atomic fix... > + hr = IPropertyStore_GetValue(ps, > + &PKEY_AudioEndpoint_PhysicalSpeakers, &pv); > + > + info->speaker_config = 999; > + if(SUCCEEDED(hr) && pv.vt == VT_UI4){ minor whitespace issue(s) and seen some more whitespace issues, no need to keep consistent with existing code here i'd say > + > + /* fallback to stereo */ > + if(info->speaker_config == 999) my thoughts on this: not sure, maybe -1 is better, or ~0. maybe it should be unsigned... I hope my thoughts help anyway

Jan. 26, 2015

Re: [PATCH 2/2] mshtml: Report about protocol as UI resource.

by Alexandre Julliard

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/mshtml/nsio.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) This is apparently causing the script.c test to hang here. -- Alexandre Julliard julliard(a)winehq.org

Jan. 26, 2015

Re: [PATCH 2/2] d3d/tests: Show that WM_SYSCOMMAND(SC_RESTORE) is delivered only once.

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=11305 Your paranoid android. === w8 (32 bit device) === device.c:1222: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1267: Test failed: Reset failed, hr 0x88760868. device.c:1269: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1273: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1280: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1281: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1282: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1283: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1284: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1285: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1290: Test failed: Screen width is 640, expected 800. device.c:1291: Test failed: Screen height is 480, expected 600. device.c:1297: Test failed: Back buffer width is 640, expected 800. device.c:1299: Test failed: Back buffer height is 480, expected 600. device.c:1329: Test failed: Screen width is 640, expected 1024. device.c:1330: Test failed: Screen height is 480, expected 768. device.c:2557: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2562: Test failed: The focus window is active. device.c:2570: Test failed: Got unexpected hr 0x88760869. device.c:2576: Test failed: Got unexpect screen size 800x600. device.c:2591: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2600: Test failed: Got unexpect screen size 800x600. device.c:2613: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2621: Test failed: Got unexpect width 640. device.c:2622: Test failed: Got unexpect height 480.

Jan. 26, 2015

Re: [PATCH 1/2] wined3d: Pass WM_SYSCOMMAND(SC_RESTORE) to DefWindowProc (v2).

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=11303 Your paranoid android. === w8 (32 bit device) === device.c:1222: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1267: Test failed: Reset failed, hr 0x88760868. device.c:1269: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1273: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1280: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1281: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1282: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1283: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1284: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1285: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1290: Test failed: Screen width is 640, expected 800. device.c:1291: Test failed: Screen height is 480, expected 600. device.c:1297: Test failed: Back buffer width is 640, expected 800. device.c:1299: Test failed: Back buffer height is 480, expected 600. device.c:1329: Test failed: Screen width is 640, expected 1024. device.c:1330: Test failed: Screen height is 480, expected 768. device.c:2550: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2555: Test failed: The focus window is active. device.c:2563: Test failed: Got unexpected hr 0x88760869. device.c:2569: Test failed: Got unexpect screen size 800x600. device.c:2584: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2593: Test failed: Got unexpect screen size 800x600. device.c:2606: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2614: Test failed: Got unexpect width 640. device.c:2615: Test failed: Got unexpect height 480.

Jan. 26, 2015

Re: dpnet: Implement IDirectPlay8Address GetComponentByIndex (try 5)

by Stefan Dösinger

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-01-25 um 18:55 schrieb Stefan Dösinger: > Other than that I think error handling would be a good idea. You > can check for NULL (as well as in the place where you allocate > storage for the component in AddComponent) and return from > AddComponent with E_OUTOFMEMORY. Adding a component >= 0x80000000 should show how native handles out of memory situations here. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUxj5kAAoJEN0/YqbEcdMw7csP/AgCDVd5m1CiudhhY2TbdzqO y6RUMLy52zYX187dW5WniPDQeJbShi+cpFNv9w2neVd8VXx+7JyOPN9cn7aKDU/1 GecG0P9mvvtXCO4qRM2OYUWXYjKZGRCJGDTVETqef4fb4sfcq38v2dbDcCGwrob/ bQLL5b1myTmlWuuM1S4dFv92pglPqUK8N5zq8TybxW3Mko50kCfwxX1V8Tg0SvbT vu1gCJLVh2nIA2fWuC+HwwwZcbYhAwX1Bs9PLN/OOmTghji7W6PR60zJnNOP0+kG RtDm8W1vA+R9CZ4OfMBGD8elvWQSqMwUNfHcj8ZrG+1pZOu5gTfuCUBUj3KNJq2b ZP6VKoQLd+Xudw2qQiZzcXdNLKV6ARjMR/k0Fs2/cppWfBIXMWH/8szdUHCsnUqY Qvb6MFTc7jTRBOkyyaCP0VqnuClnE4sWBisq5cICnYYuYBKWXjUfqGZPIaOIyssl iIRTytxMjEooqU8UxXCWZeXNMrDBqbNm4Xct8vZsIQ5dPPziy2wpFntS9CI1IFOM /IZNo4S0FADAQ8QKdtG1bkgOvzrYuDK2c6vdFKh+xzqKBZjzq+XIyK2P87pMkgph Df8wvWEUVg9xfZTQIktwsx5K5wxBCfrERFcEj8xgaSXoEt/DPpXM8SfTpy2xoPAp L1kIkVxwVn2WCNguDpqZ =8Zzu -----END PGP SIGNATURE-----

Jan. 26, 2015

Re: msvcrt: Bump MSVCRT_MB_LEN_MAX to 6 and use it in MSVCRT__wctomb_l for default buffer length

by Piotr Caban

On 01/23/15 18:38, Orion Poplawski wrote: > diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h > index 41f31b9..401628a 100644 > --- a/dlls/msvcrt/msvcrt.h > +++ b/dlls/msvcrt/msvcrt.h > @@ -47,7 +47,7 @@ > #define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) > #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) > #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) > -#define MSVCRT_MB_LEN_MAX 2 > +#define MSVCRT_MB_LEN_MAX 6 MB_LEN_MAX equals 5 on windows. It should probably be set to 5 here as well. Probably include/msvcrt/limits.h should also be changed. Thanks, Piotr

Jan. 26, 2015

Re: [PATCH 5/5] atl100/tests: Added initial interface tests for AtlAxAttachControl.

by Qian Hong

Please ignore this patch, I'm working on an improved version. On Fri, Jan 23, 2015 at 5:21 PM, Qian Hong <qhong(a)codeweavers.com> wrote: > Test cases based on dlls/mshtml/tests/activex.c, thanks Jacek Caban for the > previous work. > > --- > dlls/atl100/tests/Makefile.in | 2 +- > dlls/atl100/tests/atl.c | 446 > ++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 447 insertions(+), 1 deletion(-) > > > > > -- Regards, Qian Hong - http://www.codeweavers.com

Jan. 26, 2015