wine-devel May 2015

wine-devel@winehq.org

43 participants
111 discussions

programs/regsvr32 patches
by Hugh McMaster 04 Jun '15

04 Jun '15

Excuse me, I've looked through patches 111564-111568 and have only found one minor issue. In patch 111565 I forgot to include ctype.h for tolower(). Was there a problem with the input comparison handling, or something else? The changes to the input handling make conversion to unicode much easier and cleaner. I realise that patch 111565 looks complex, but it's just the indenting. -- Hugh McMaster

1 1

Fix GetRawInputDeviceList() to return ERROR_INSUFFICIENT_BUFFER
by achurch＠achurch.org 01 Jun '15

01 Jun '15

(Note: I am not subscribed to the list; please CC me on any replies.) When GetRawInputDeviceList() is passed a buffer which is too small, the function should set the last error code to ERROR_INSUFFICIENT_BUFFER and return failure (see <http://msdn.microsoft.com/en-us/library/windows/desktop/ms645598(v=vs.85).a…>). However, the current Wine implementation does not set the last error code, meaning that callers expecting to see ERROR_INSUFFICIENT_BUFFER will behave incorrectly. I've confirmed that Windows itself (at least XP and 8) matches the documented behavior. See also: https://bugs.winehq.org/show_bug.cgi?id=37667 --Andrew Church http://achurch.org/ diff -urN wine-1.7.43-orig/dlls/user32/input.c wine-1.7.43/dlls/user32/input.c --- wine-1.7.43-orig/dlls/user32/input.c 2015-05-15 22:36:39 +0900 +++ wine-1.7.43/dlls/user32/input.c 2015-05-25 22:47:49 +0900 @@ -507,6 +507,7 @@ if (*device_count < 2) { *device_count = 2; + SetLastError(ERROR_INSUFFICIENT_BUFFER); return ~0U; } diff -urN wine-1.7.43-orig/dlls/user32/tests/Makefile.in wine-1.7.43/dlls/user32/tests/Makefile.in --- wine-1.7.43-orig/dlls/user32/tests/Makefile.in 2015-05-15 22:36:39 +0900 +++ wine-1.7.43/dlls/user32/tests/Makefile.in 2015-05-25 22:48:27 +0900 @@ -17,6 +17,7 @@ menu.c \ monitor.c \ msg.c \ + rawinput.c \ resource.c \ scroll.c \ static.c \ diff -urN wine-1.7.43-orig/dlls/user32/tests/rawinput.c wine-1.7.43/dlls/user32/tests/rawinput.c --- wine-1.7.43-orig/dlls/user32/tests/rawinput.c 1970-01-01 09:00:00 +0900 +++ wine-1.7.43/dlls/user32/tests/rawinput.c 2015-05-25 22:44:36 +0900 @@ -0,0 +1,43 @@ + /* Unit test suite for the rawinput functions + * + * Copyright 2015 Andrew Church + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINVER 0x0501 + +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" +#include "winuser.h" + +static void GRIDLShortArrayTest() +{ + RAWINPUTDEVICELIST devices[1]; + UINT device_count = 1; + int result, error; + + result = GetRawInputDeviceList(devices, &device_count, sizeof(*devices)); + ok(result == ~0U, "wrong result: %d\n", result); + ok(device_count >= 2, "wrong device_count: %d\n", device_count); + error = GetLastError(); + ok(error == ERROR_INSUFFICIENT_BUFFER, "wrong error code: %d\n", error); +} + +START_TEST(rawinput) +{ + GRIDLShortArrayTest(); +}

2 1

Re: [PATCH 2/5] riched20/tests: Small test for GetClientSite()
by Marvin 31 May '15

31 May '15

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=13718 Your paranoid android. === w2000pro (32 bit richole) === richole.c:1526: Test failed: got wrong pointer richole: unhandled exception c0000005 at 0042D1B0 === wxppro (32 bit richole) === richole.c:1526: Test failed: got wrong pointer richole: unhandled exception c0000005 at 0042D1B0 === w2003std (32 bit richole) === richole.c:1526: Test failed: got wrong pointer richole: unhandled exception c0000005 at 0042D1B0 === wvistau64 (32 bit richole) === richole.c:1526: Test failed: got wrong pointer richole: unhandled exception c0000005 at A574D492 === w2008s64 (32 bit richole) === richole.c:1526: Test failed: got wrong pointer richole: unhandled exception c0000005 at 00000000 === w7u (32 bit richole) === richole.c:1526: Test failed: got wrong pointer richole: unhandled exception c0000005 at 10000000 === w8 (32 bit richole) === richole.c:1526: Test failed: got wrong pointer === wvistau64 (64 bit richole) === richole.c:1526: Test failed: got wrong pointer richole: unhandled exception c0000005 at 0000000000426DF0 === w2008s64 (64 bit richole) === richole.c:1526: Test failed: got wrong pointer richole: unhandled exception c0000005 at 000007FEFEE619B8

1 0

Re: [PATCH 1/2] msvcp110: Add _File_size implementation and test.(try 2)
by YongHao Hu 29 May '15

29 May '15

Sry, Slackner found that I still used %llx /%llu as I misunderstood Piotr's comment and there are typos in the patch. I will fix all the issues later. :P On 2015年05月29日 21:16, YongHao Hu wrote: > try2: > Improve the patch according to Piotr's advices. > Add errno and SetLastError test. > --- > dlls/msvcp110/msvcp110.spec | 4 +- > dlls/msvcp120/msvcp120.spec | 4 +- > dlls/msvcp120/tests/msvcp120.c | 75 > +++++++++++++++++++++++++++++++++---- > dlls/msvcp120_app/msvcp120_app.spec | 4 +- > dlls/msvcp90/ios.c | 20 ++++++++++ > 5 files changed, 94 insertions(+), 13 deletions(-) > >

1 0

Re: dpnet: Implement IDirectPlay8Address GetComponentByIndex (try 12)
by Stefan Dösinger 29 May '15

29 May '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, This version of the patch looks good to me. Stefan Am 2015-05-29 um 12:06 schrieb Alistair Leslie-Hughes: > Hi, Add WARN on errors. > > I'll add more tests in another patch, which simplifies the > component list. > > Changelog: dpnet: Implement IDirectPlay8Address > GetComponentByIndex > > > Best Regards Alistair Leslie-Hughes > > > > > > > > > > > > > > > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVaE3VAAoJEN0/YqbEcdMwqIAP/iHHkRWQmGrZnoKbvuXuYJ9i caO0PB0akO3CvyLDcC68CMtT7jQ7gthTGPiXTHe4sEjmSR3KLoqajV2TX+JluWYj s/uTxbmPjNvafeXmflSpaoy0BRq5H/D+99AkKqo/GFPlCNT0UJpR9sD7OsXXA1E9 Cq7VpKMGqgnWoLf4/pRge/rBfV2vV0FOLhHTzboEyUOTgGegOI8v345vMw/Ph7RM YPEdLYUBkIwZZuZaDtaZ9DV5HyFG1fH65cYftkQFmM7tH4Sn1NiQcNHEUmPeX3Bc hv5Q9QOshwtWgQKhWe98YyGayP16Ip0iKDpxRZ28LEcOcKfK9URX66lBNWZjL/Ci IixsgZw12okh8Wn+Q76LwIh1PakpQSHZ/iQW8qDYlyWIRboFC+VyQoemkXxvUfVS VwqAe/D1uWAf1o6BD6vHNarH7A5ymHvxmcxw/1PxTGSZg4RBqOmt4/4gCWIuPXzX 564O8wrDn1msVhwS6tqpP85Sg3ydDYiPDVZNVigJAU/kMCiPH2WbXPxUGB/Pc7hA 4QaOK6FDTxXlTqEO0FHm12DU2bYzBMogOd0N6usKzVQe2kdy9hB4/hUo8+vojamS AI0agXg+a6UjVhTpNZvoZAxC0rFF6nEJaL6MgDS64LtmT6wrrri6hEtmPJM6aC/O 2bdo052EPFKWbfytsTK+ =jq9B -----END PGP SIGNATURE-----

1 0

Re: dpnet: Implement IDirectPlay8Address GetComponentByIndex (try 12)
by Marvin 29 May '15

29 May '15

1 0

Re: dpnet: Implement IDirectPlay8Address GetComponentByIndex (try 11)
by Stefan Dösinger 29 May '15

29 May '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, There's one major problem I missed previously: Am 2015-05-29 um 10:22 schrieb Alistair Leslie-Hughes: > + case DPNA_DATATYPE_STRING: > + memcpy(pvBuffer, &entry->data.string, entry->size); > + break; This won't work. There's a & too much. Please consider adding tests for String and Binary types to catch this kind of thing. GetComponentByName once had the same problem I believe. Minor stuff: > + TRACE("(%p)->(%d %p %p %p %p %p)\n", This, dwComponentID, pwszName, pdwNameLen, pvBuffer, pdwBufferSize, pdwDataType); pdwNameLen, pvBuffer, pdwBufferSize, pdwDataType); A DWORD is unsigned, %u is better. > + if(*pdwBufferSize < entry->size || *pdwNameLen < namesize) > + { > + *pdwNameLen = namesize + 1; > + *pdwBufferSize = entry->size; > + *pdwDataType = entry->type; > + return DPNERR_BUFFERTOOSMALL; > + } You forgot to add a WARN here. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVaCrwAAoJEN0/YqbEcdMwypEP/RttOLSqc6fQQW4XeMkBgVaS aiKUyYSysq9MnRoqP32A6lKq9LHpW23liKsvpwoWegdarTc35ENYwG7pLSLJuOIy i/e7AlWGLDphN9qdYMU0oCQ8PXGU8Y3Mb7kozZcnYm9EuYoJEFIiAYHtx4nFeGMj rVx/mruLmYTdgyR378iE4cYqNeMwzK7YtGNRHMPz8FNTzdLyzUu1blYQ8cYEbzAk Mm4RaIixByzKiGO7qUPCX4OOgYoohBOgMRiVWTJfZLrhKY0vyj0x2Jt5GWCzWeht 7mszNRRpvW+v60axT2xwemXmQSobjgjnddF0bwxC/vHZisfXF8H52lLgupXv9KRo efOsvX3lTpJstEL1Wt61NL/MqF4vwRjbrWeKD45DxHEzPX8wzUg4yFodz/yxAAN1 /l4fuX8BEjr9tttV4uup4fdOlVhlX95ZujQFT5Ue1zF97SSLOC9id/8Uy8xlHYmY Ou0H9GG5rILqG5+r9m3OghjuQcwomL6T7BSLYJ+WncdTgtxRbarhMI/mq9m0MiB2 OHkUddm/zn9EFPboQsCjqRuPFa6fcbx+b/XUmyLeBjosO3j7Otws4TGUEkzjbvWF f3fOORfbxpknZH9GxVaEFWlyUerNSJ4C4hYp5J+pHS9N5u+L9KsN0fXYT9jqpvh2 Tmu94XyHSblAoeS1ORgq =M5Sz -----END PGP SIGNATURE-----

1 0

Re: dpnet: Implement IDirectPlay8Address GetComponentByIndex (try 11)
by Marvin 29 May '15

29 May '15

1 0

Re: [PATCH 5/5] wined3d: Always enable GL_PROGRAM_POINT_SIZE in the GLSL backend.
by Henri Verbeet 29 May '15

29 May '15

On 28 May 2015 at 23:23, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -6987,6 +7006,13 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex > GLuint program_id = 0, prev_id = 0; > GLenum old_vertex_color_clamp, current_vertex_color_clamp; > > + if (!ctx_data->backend_init_done) > + { > + gl_info->gl_ops.gl.p_glEnable(GL_PROGRAM_POINT_SIZE); > + checkGLcall("GL_PROGRAM_POINT_SIZE"); > + ctx_data->backend_init_done = TRUE; > + } > + Is this shared state between contexts? Otherwise you need to do this once for every context. Also, shader_glsl_select() is kind of a hot path, it may be better to just add an entry to struct wined3d_shader_backend_ops for this kind of initialization.

2 2

Re: [PATCH 9/11] qcap: add the SmartTee filter automatically as necessary, and test this
by Marvin 28 May '15

28 May '15

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=13651 Your paranoid android. === w2008s64 (32 bit smartteefilter) === smartteefilter.c:1926: Test failed: couldn't create NullRenderer, hr=0x80040154 smartteefilter.c:1926: Test failed: couldn't create NullRenderer, hr=0x80040154 smartteefilter.c:1985: Test failed: couldn't create NullRenderer, hr=0x80040154 smartteefilter.c:1985: Test failed: couldn't create NullRenderer, hr=0x80040154 === w2008s64 (64 bit smartteefilter) === smartteefilter.c:1926: Test failed: couldn't create NullRenderer, hr=0x80040154 smartteefilter.c:1926: Test failed: couldn't create NullRenderer, hr=0x80040154 smartteefilter.c:1985: Test failed: couldn't create NullRenderer, hr=0x80040154 smartteefilter.c:1985: Test failed: couldn't create NullRenderer, hr=0x80040154

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel May 2015