June 2015 - Wine-devel - list.winehq.org

Re: [1/2] msvcirt: Add initial implementation of streambuf
by Piotr Caban 02 Jun '15

02 Jun '15

On 06/02/15 14:52, Iván Matellanes wrote: > + __ASM_VTABLE(streambuf, > + VTABLE_ADD_FUNC(streambuf_vector_dtor)); It would be nice to add all the functions to vtable. Otherwise the application may crash without nice error message.

1 0

Re: [1/2] msvcirt: Add initial implementation of streambuf
by Piotr Caban 02 Jun '15

02 Jun '15

On 06/02/15 14:52, Iván Matellanes wrote: > +/* ??0streambuf@@IAE(a)XZ */ > +/* ??0streambuf@@IEAA(a)XZ */ > +DEFINE_THISCALL_WRAPPER(streambuf_ctor, 4) > +streambuf* __thiscall streambuf_ctor(streambuf *this) > +{ > + TRACE("(%p)\n", this); > + this->vtable = &MSVCP_streambuf_vtable; > + this->allocated = 0; > + this->unbuffered = 0; > + this->unknown = -1; > + this->unknown2 = -1; > + streambuf_setb(this, NULL, NULL, 0); > + streambuf_setg(this, NULL, NULL, NULL); > + streambuf_setp(this, NULL, NULL); > + InitializeCriticalSection(&this->lock); > + return this; > +} Can't it be simplified to: streambuf* __thiscall streambuf_ctor(streambuf *this) { return streambuf_reserve_ctor(this, NULL, 0); } ?

2 1

Re: msvcirt/tests: Add initial tests for streambuf
by Piotr Caban 02 Jun '15

02 Jun '15

On 06/02/15 12:47, Iván Matellanes wrote: > +todo_wine{ > + /* constructors */ > + call_func1(p_streambuf_ctor, &sb); You'll need to add streambuf_ctor stub in wine before you can test it. Currently the tests will fail with exception. Please also set &sb memory to something so you can detect uninitialized values. Please also call streambuf_dtor. Cheers, Piotr

2 2

Re: [PATCH 2/3] riched20: Reduce code duplication in WM_SETTEXT/WM_CREATE handler
by Dmitry Timoshkov 02 Jun '15

02 Jun '15

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + if (lParam) > + text = unicode ? (void*)createW->lpszName : (void*)createA->lpszName; These casts should not be needed. -- Dmitry.

3 2

Re: gdi32: Return default palette entries from GetSystemPaletteEntries for non-palette-based devices. (try 2)
by Sebastian Lackner 01 Jun '15

01 Jun '15

On 01.06.2015 17:51, Anton Baskanov wrote: > + if (entries && start < 256) > + { > + UINT i; > + const RGBQUAD *default_entries; > + > + if (start + count > 256) count = 256 - start; > + > + default_entries = get_default_color_table( 8 ); > + for (i = 0; i < count; ++i) > + { > + if (i < 10 || i >= 246) > + { That condition is obviously wrong. Feel free to merge the changes and additional tests from my improved patchset which is included in Wine-Staging: https://github.com/wine-compholio/wine-staging/blob/master/patches/gdi32-De… > + entries[i].peRed = default_entries[start + i].rgbRed; > + entries[i].peGreen = default_entries[start + i].rgbGreen; > + entries[i].peBlue = default_entries[start + i].rgbBlue; > + } > + else > + { > + entries[i].peRed = 0; > + entries[i].peGreen = 0; > + entries[i].peBlue = 0; > + } > + entries[i].peFlags = 0; > + }

2 1

Re: [PATCH 2/2] d3d9/test: implemented tests for UpdateTexture method
by Matteo Bruni 01 Jun '15

01 Jun '15

2015-05-27 21:55 GMT+02:00 Sergey Isakov <isakov-sl(a)bk.ru>: > The test was initially written by Matteo Bruni > https://www.winehq.org/pipermail/wine-patches/2015-April/138974.html > but rejected as failed > https://www.winehq.org/pipermail/wine-devel/2015-April/107491.html For the records, my tests failed for Alexandre on Linux because of a bug in the Nouveau drivers which is fixed by Mesa commit f617029db3f8786d94c64f1a73c42b89b6d261fa. I'll resend the unmodified tests at some point.

1 0

Re: [PATCH 1/2] wined3d: fix wrong level calculation implemented in 1.7.42
by Matteo Bruni 01 Jun '15

01 Jun '15

2015-05-27 21:45 GMT+02:00 Sergey Isakov <isakov-sl(a)bk.ru>: > Bug 38048. > It is closed by wrong fix 5af656ea85e22a00304f1904e91ccfee52a6ccc5 > According to MSDN > https://msdn.microsoft.com/en-us/library/windows/desktop/bb205858(v=vs.85).… > “If the source texture has fewer levels than the destination, the method > will fail.” > The method must fail > 1. To prevent fail on undefined levels. > 2. To inform caller that the call is wrong. > The correct patch attached. > Test will follow next commit As I already mentioned, MSDN is wrong in this case, like in many other cases. UpdateTexture never returns failure when using hardware devices on Windows.

1 0

Re: [1/3] shell32/tests: Make tests run on win2k again.
by Marvin 01 Jun '15

01 Jun '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=13744 Your paranoid android. === w2003std (32 bit shlfolder) === shlfolder.c:4997: Test failed: MKDIR: Expected wndproc to be called shlfolder.c:4910: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 8) shlfolder.c:4997: Test failed: CREATE: Expected wndproc to be called shlfolder.c:4910: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) shlfolder.c:4997: Test failed: RMDIR: Expected wndproc to be called shlfolder.c:4910: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) shlfolder.c:4997: Test failed: MKDIR: Expected wndproc to be called shlfolder.c:4910: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 468) shlfolder.c:4997: Test failed: CREATE: Expected wndproc to be called shlfolder.c:4910: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 468) shlfolder.c:4997: Test failed: RMDIR: Expected wndproc to be called shlfolder.c:4910: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 468)

1 0

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] mshtml: add NULL check to avoid crashing due to Gecko bug
by Jacek Caban 01 Jun '15

01 Jun '15

On 06/01/15 13:11, Indrek Altpere wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=34808 > > There seems to be a known bug in Gecko engine that causes iframe with display:none contents to return NULL nsstyle from nsIDOMWindow_GetComputedStyle > https://bugzilla.mozilla.org/show_bug.cgi?id=548397 > --- > dlls/mshtml/htmlcurstyle.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c > index 5f6cb35..f0b0d98 100644 > --- a/dlls/mshtml/htmlcurstyle.c > +++ b/dlls/mshtml/htmlcurstyle.c > @@ -1343,6 +1343,11 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) > return E_FAIL; > } > > + if(!nsstyle) { > + ERR("GetComputedStyle returned NULL nsstyle\n"); > + return E_FAIL; > + } We could try to work around the problem in Gecko, but it's obviously even better if it's fixed in Gecko. Anyway, if it fixes a bug I'm fine with the patch as is. Thanks, Jacek

1 0