January 2016 - Wine-devel - list.winehq.org

Testbot build VM is offline
by Hugh McMaster 05 Jan '16

05 Jan '16

The Build VM / vm4 is currently offline. Judging by the test queue, it has been offline since 3 January, 23:30 (UTC+1). Francois, I imagine this is for maintenance? -- Hugh McMaster

2 1

Re: [1/2] kernel32: add stub for GetSystemPreferredUILanguages
by Matteo Bruni 05 Jan '16

05 Jan '16

2015-12-30 10:21 GMT+01:00 Stefan Leichter <Stefan.Leichter(a)camline.com>: > The function is called from VSWinExpress.exe (Visual Studio 2013/12.0 > Express Edition) > > Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> > --- > .../api-ms-win-core-localization-l1-2-0.spec | 2 +- > .../api-ms-win-core-localization-l1-2-1.spec | 2 +- > dlls/kernel32/kernel32.spec | 2 +- > dlls/kernel32/locale.c | 26 > ++++++++++++++++++++++ > include/winnls.h | 1 + > 5 files changed, 30 insertions(+), 3 deletions(-) Just a drive-by comment: I think it would be nicer if the FIXME was at the start of the function i.e. before the early returns. I would also replace PULONG and PZZWSTR with ULONG * and WCHAR *, not sure what's the convention in kernel32 though.

2 1

Re: [PATCH 5/5] kernel32/tests: Add tests for GetLargestConsoleWindowSize
by Marvin 05 Jan '16

05 Jan '16

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=19405 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2359244 console.c:1689: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2359244 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2686924 console.c:1689: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2686924 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Re: [PATCH 4/5] kernel32/tests: Refresh the console to clear the console font table
by Marvin 05 Jan '16

05 Jan '16

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=19404 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2359244 console.c:1689: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2359244 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2686924 console.c:1689: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2686924 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Re: [PATCH 9/9] programs/plugplay.exe: Add Linux udev hidraw bus
by Damjan Jovanovic 05 Jan '16

05 Jan '16

Using poll() would be better than select() here, as select() not only has a limit on the number of fds that can be polled, but cannot even deal with a single fd whose number is above the same limit, which could happen if many files are already open by that process. That limit is as low as 1024, and needs patching and recompiling both the kernel and libc on Linux IIRC. We already went through a round of converting all Wine source from select() to poll(). udev is also Linux-only - the *BSDs are left out in the cold. Nice work otherwise, I expected it to take you much longer. Damjan On Mon, Jan 4, 2016 at 7:36 PM, Aric Stewart <aric(a)codeweavers.com> wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > programs/plugplay/Makefile.in | 1 + > programs/plugplay/bus_hidraw.c | 264 > +++++++++++++++++++++++++++++++++++++++++ > programs/plugplay/main.c | 3 + > programs/plugplay/pnp.h | 1 + > 4 files changed, 269 insertions(+) > create mode 100644 programs/plugplay/bus_hidraw.c > > > > > >

1 0

[PATCH] ntdll/tests: Correct signaled / not signaled error messages.
by Alex Henrie 05 Jan '16

05 Jan '16

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/tests/file.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index b8f1847..7bf2ffe 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -677,7 +677,7 @@ static void read_file_test(void) apc_count = 0; U(iosb).Status = 0xdeadbabe; iosb.Information = 0xdeadbeef; - ok( !is_signaled( read ), "read handle is not signaled\n" ); + ok( !is_signaled( read ), "read handle is signaled\n" ); status = pNtReadFile( read, 0, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); ok( status == STATUS_PENDING, "wrong status %x\n", status ); ok( !is_signaled( read ), "read handle is signaled\n" ); @@ -690,7 +690,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( read ), "read handle is signaled\n" ); + ok( is_signaled( read ), "read handle is not signaled\n" ); ok( !apc_count, "apc was called\n" ); apc_count = 0; SleepEx( 1, FALSE ); /* non-alertable sleep */ @@ -731,7 +731,7 @@ static void read_file_test(void) ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* partial read is good enough */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); @@ -762,7 +762,7 @@ static void read_file_test(void) ok( status == STATUS_INVALID_HANDLE, "wrong status %x\n", status ); ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); /* not reset on invalid handle */ + ok( is_signaled( event ), "event is not signaled\n" ); /* not reset on invalid handle */ ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( !apc_count, "apc was called\n" ); @@ -782,7 +782,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_PIPE_BROKEN, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -807,7 +807,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -833,7 +833,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -859,7 +859,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -885,7 +885,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 2, "apc was not called\n" ); @@ -906,7 +906,7 @@ static void read_file_test(void) if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -923,7 +923,7 @@ static void read_file_test(void) if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -940,7 +940,7 @@ static void read_file_test(void) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -961,7 +961,7 @@ static void read_file_test(void) if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -975,7 +975,7 @@ static void read_file_test(void) ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ todo_wine ok( !apc_count, "apc was called\n" ); -- 2.6.4

1 0

read_file_test doesn't look right
by Alex Henrie 05 Jan '16

05 Jan '16

Dear Mike and Alexandre, The function read_file_test in dlls/ntdll/tests/file.c [1] has a lot of lines like this: ok( is_signaled( event ), "event is not signaled\n" ); This makes sense to me. The first parameter is the condition we want (a signal), and the second parameter is the error message to display if we didn't get what we want (no signal). However, there are also a lot of lines like this: ok( is_signaled( event ), "event is signaled\n" ); Either this is a mistake or in some cases a zero return value does indicate that the event was signaled. What is going on here? I made a patch to make these messages look like I think they should. If you approve, I will send the patch on to wine-patches. -Alex [1] https://source.winehq.org/git/wine.git/blob/93d7356290bfe5bfd2104f985927908…

1 0

Re: [PATCH 3/5] winex11.drv: Only update drop effect if IDropTarget::DragOver returned S_OK
by Matteo Bruni 04 Jan '16

04 Jan '16

2015-12-21 11:21 GMT+01:00 Piotr Caban <piotr(a)codeweavers.com>: diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index d5881ad..841eaff 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -325,7 +325,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (dropTarget) { hr = IDropTarget_DragOver(dropTarget, MK_LBUTTON, pointl, &effect); - if (SUCCEEDED(hr)) + if (hr != S_OK) XDNDDropEffect = effect; else WARN("IDropTarget_DragOver failed, error 0x%08X\n", hr); Doesn't that do the opposite of what the patch title says?

1 0

Re: [PATCH 2/3] d3dx9_36: Store all values passed to the create and return them in the correct functions
by Matteo Bruni 04 Jan '16

04 Jan '16

2015-12-23 7:47 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > static ULONG WINAPI d3dx9_animation_controller_AddRef(ID3DXAnimationController *iface) > { > - struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface); > - ULONG refcount = InterlockedIncrement(&animation->ref); > + struct d3dx9_animation_controller *This = impl_from_ID3DXAnimationController(iface); > + ULONG refcount = InterlockedIncrement(&This->ref); > > - TRACE("%p increasing refcount to %u.\n", animation, refcount); > + TRACE("%p increasing refcount to %u.\n", This, refcount); These changes don't seem useful, especially considering that these lines were introduced in the previous patch. More of it below, same comment applies. FWIW I prefer "animation" to "This".

1 0

Re: [PATCH 1/3] d3dx9_36: Implement D3DXCreateAnimationController with a stubbed ID3DXAnimationController interface.
by Matteo Bruni 04 Jan '16

04 Jan '16

2015-12-23 7:47 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > From: Christian Costa <titan.costa(a)gmail.com> > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Hi Alistair, some nitpicking... Please use the "d3dx9:" prefix for this and the other patches. > +static HRESULT WINAPI d3dx9_animation_controller_QueryInterface(ID3DXAnimationController *iface, REFIID riid, void **out) > +{ > + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); > + > + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXAnimationController)) > + { > + IUnknown_AddRef(iface); > + *out = iface; I think this is usually done as "*out = &animation->ID3DXAnimationController_iface" or similar (where "animation" is the result of impl_from_ID3DXAnimationController(iface)). > + return D3D_OK; > + } > + > + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); > + > + *out = NULL; > + return E_NOINTERFACE; > +} Similarly this is usually written in a slightly different way. Please follow the style of the other (recent) QueryInterface implementations, we are pretty consistent now and it would be nice to preserve that consistency. > +static DOUBLE WINAPI d3dx9_animation_controller_GetTime(ID3DXAnimationController *iface) Can this (and the other instances of it in the patch) simply use "double" instead? Apparently the only difference between the two is that DOUBLE sometimes forces alignment to 8 bytes. That should only matter for struct fields though, as far as we are concerned, so we should probably prefer plain double. > +/*********************************************************************** > + * D3DXCreateAnimationController (D3DX9_36.@) > + */ It doesn't really matter but this comment is unnecessary. > +HRESULT WINAPI D3DXCreateAnimationController(UINT MaxNumAnimationOutputs, UINT MaxNumAnimationSets, > + UINT MaxNumTracks, UINT MaxNumEvents, ID3DXAnimationController **AnimationController) Please use the usual "lowercase and underscores" style for the parameter names. Also check the '*' placement a couple of lines below.

1 0