November 2016 - Wine-Devel - list.winehq.org

Wineconf wrap up
by Jeremy White Nov. 23, 2016

Nov. 23, 2016

Hi Folks, I thought I would take a minute to write a summary of the events of the weekend, and that start a thread where others could chime in. It was a great event; a traditional wineconf with cheer and conversations, and even sometimes productive meetings. Here were our working notes for the weekend: https://www.winehq.org/~jwhite/wineconf_2016.pdf The plan for next year is to have the Wine conference in Poland next fall. We are going to try to broaden our reach; inviting users and others to come to the conference as well. Aric is going to try to help coordinate that structural growth. Mechanically, we did decide that the Google hangout was not intrusive, so we will likely try to repeat that next year. (We would like it to not require us to manually accept each person, if possible). Many others volunteered to help in a variety of ways; I did not take rigorous notes of this during the conference, so hopefully others will step forward with that information (or we'll all shame them into remembering <evil grin>). It was a joy to see you all! Cheers, Jeremy p.s. For my part, one key part is that we are going to attempt to make one or two of the Debian Jessie systems hosted here at CodeWeavers run make test to successful completion. We are going to accept the fact that we have several timing dependent tests; so 'success' is going to be something like the following: make test -o make test -o make test -o make test In a similar vein, we are going to try to establish a 'diffing' logic for the winetest bot. So if there are n failures that happen routinely, and a new patch arrives, so long as only those same failures remain, the patch will be considered suitable. The advantage to that approach is that we can also apply it to platforms such as the Mac, where we are no where close to running green. Michael will help Francois with this once he is done with his travels. I agreed to lock Francois and the d3d guys in the server room until we saw progress on the make test front; I think that was the sum total of what I volunteered to do.

4 5

Re: Donat Enikeev : crypt32/tests: Fix chain tests failure with cs.standford.edu certificates.
by Huw Davies Nov. 23, 2016

Nov. 23, 2016

> On 21 Nov 2016, at 21:28, Alexandre Julliard <julliard(a)winehq.org> wrote: > > Module: wine > Branch: master > Commit: 8a4508cecc4a6e46da200c85aa7d62515041f6e2 > URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4508cecc4a6e46da200c85a… > > Author: Donat Enikeev <donat(a)enikeev.net> > Date: Sat Nov 19 21:12:30 2016 +0300 > > crypt32/tests: Fix chain tests failure with cs.standford.edu certificates. > > Signed-off-by: Donat Enikeev <donat(a)enikeev.net> > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > > dlls/crypt32/tests/chain.c | 658 ++++++++++++++++++++++++--------------------- > 1 file changed, 352 insertions(+), 306 deletions(-) > > Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a4508cecc4a6e46da200… Hi Donat, This has caused failures on some of Francois’ XP VMs. For example: http://test.winehq.org/data/8a4508cecc4a6e46da200c85aa7d62515041f6e2/xp_fg-… Could you take a look? Thanks, Huw.

6 12

Re: [PATCH] wincodecs: Trigger conversion to target format in WriteSource()
by Dmitry Timoshkov Nov. 23, 2016

Nov. 23, 2016

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > - if (!IsEqualGUID(&src_format, format)) > - { > - /* FIXME: should use WICConvertBitmapSource to convert */ > - ERR("format %s unsupported\n", debugstr_guid(&src_format)); > - return E_FAIL; > + hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &src_format); > + if (FAILED(hr)) return hr; > } Despite the removing a questionable FIXME this part of the code won't do what you think it does. Besides, since there is no a single todo_wine removed with this patch adding a bunch of tests for different encoders is needed to show that the automatic conversion is really supposed to happen, and that it doesn't depend on the implementation detail in some of the encoders. According to my testing not every encoder does this kind of thing, especially when a conversion needs a palette. -- Dmitry.

2 2

Re: [PATCH] wincodecs: Recognize FilterOption property in PNG encoder
by Vincent Povirk Nov. 23, 2016

Nov. 23, 2016

We should either set this option when encoding, or print a fixme. I think setting it is easy enough.

1 0

Re: [PATCH] quartz: Use straight assignments instead of CopyRect().
by Michael Stefaniuc Nov. 23, 2016

Nov. 23, 2016

On 11/22/2016 08:01 PM, Hadrien Boizard wrote: > Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> > --- > dlls/quartz/videorenderer.c | 8 ++++---- > dlls/quartz/vmr9.c | 8 ++++---- > 2 files changed, 8 insertions(+), 8 deletions(-) > > > 0001-quartz-Use-straight-assignments-instead-of-CopyRect.patch > > > diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c > index 61f08f5..6631ccd 100644 > --- a/dlls/quartz/videorenderer.c > +++ b/dlls/quartz/videorenderer.c > @@ -483,7 +483,7 @@ static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { > static HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT *pSourceRect) > { > VideoRendererImpl *This = impl_from_BaseControlVideo(iface); > - CopyRect(pSourceRect,&This->SourceRect); > + *pSourceRect = This->SourceRect; NACK, this is not a no-op change. CopyRect() also checks for NULL rect pointers so it protects against NULL pSourceRect. With your change apps would crash if they do that. The proper fix is to add tests for NULL rects and return the proper error in those functions. Or at least add code like: if (!pSourceRect) return E_POINTER; No clue if Andrew Eikum is willing to accept that without tests. E_INVALIDARG would be also a plausible error code. bye michael

1 0

Re: user32/tests: Mark built-in wndproc auto-detection behaviour as broken on Windows 8 and 10.
by Dmitry Timoshkov Nov. 23, 2016

Nov. 23, 2016

Huw Davies <huw(a)codeweavers.com> wrote: > + SendMessageW(hwnd, WM_GETTEXT, sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); > + if (IsWindowUnicode(hwnd)) > + ok(memcmp(buf, unistring, sizeof(unistring)) == 0, "WM_GETTEXT invalid return\n"); > + else > + ok(memcmp(buf, unistring, sizeof(unistring)) != 0, "WM_GETTEXT invalid return\n"); This doesn't look right. SendMessageW(WM_GETTEXT) is supposed to always return a unicode string regardless of wheather IsWindowUnicode() is broken or not, otherwise a lot of applications would misbehave in weird ways. This needs further investigation. -- Dmitry.

2 7

Re: [PATCH 09/10] kernel32/tests: Added more named pipe tests.
by Marvin Nov. 23, 2016

Nov. 23, 2016

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=26858 Your paranoid android. === w864 (64 bit pipe) === pipe.c:2575: Test failed: FlushFileBuffers failed: 87 pipe.c:2575: Test failed: FlushFileBuffers failed: 87

1 0

Re: [PATCH] msvcrt: Add _lfind_s
by Piotr Caban Nov. 23, 2016

Nov. 23, 2016

Hi, On 11/22/16 16:36, Daniel Lehman wrote: > dlls/msvcrt/misc.c | 26 +++++++++++++++++ > dlls/msvcrt/msvcrt.spec | 2 +- > dlls/msvcrt/tests/misc.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ Please also update other spec files. > + /* simple samples */ > + /* simple sample - not found */ Could you please also remove these comments? They are not very useful. Thank you, Piotr

1 0

Re: [08/23] wined3d: Allow viewport to be out-of-bounds if using offscreen target.
by Andrew Wesie Nov. 22, 2016

Nov. 22, 2016

Assuming that viewport_test in d3d9/tests/visual.c is wrong only when render_offscreen is true, is there anyway to fix that test? Or should viewport_test be removed? The reason for the patch is that Overwatch renders to a 2D texture some UI elements. If the viewport is not what is expected, then the output is wrong (e.g. the UI elements are the wrong size or drawn at the wrong place on the texture). -Andrew On Sun, Nov 13, 2016 at 12:35 PM, Andrew Wesie <awesie(a)gmail.com> wrote: > Signed-off-by: Andrew Wesie <awesie(a)gmail.com> > --- > dlls/wined3d/state.c | 42 ++++++++++++++++++++++-------------------- > 1 file changed, 22 insertions(+), 20 deletions(-) > > diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c > index cd3763c..ed20e325 100644 > --- a/dlls/wined3d/state.c > +++ b/dlls/wined3d/state.c > @@ -4617,26 +4617,6 @@ static void viewport_miscpart(struct > wined3d_context *context, const struct wine > struct wined3d_viewport vp = state->viewport; > unsigned int width, height; > > - if (target) > - { > - if (vp.width > target->width) > - vp.width = target->width; > - if (vp.height > target->height) > - vp.height = target->height; > - > - wined3d_rendertarget_view_get_drawable_size(target, context, > &width, &height); > - } > - else if (depth_stencil) > - { > - width = depth_stencil->width; > - height = depth_stencil->height; > - } > - else > - { > - FIXME("No attachments draw calls not supported.\n"); > - return; > - } > - > gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); > checkGLcall("glDepthRange"); > /* Note: GL requires lower left, DirectX supplies upper left. This is > @@ -4644,7 +4624,29 @@ static void viewport_miscpart(struct > wined3d_context *context, const struct wine > if (context->render_offscreen) > gl_info->gl_ops.gl.p_glViewport(vp.x, vp.y, vp.width, vp.height); > else > + { > + if (target) > + { > + if (vp.width > target->width) > + vp.width = target->width; > + if (vp.height > target->height) > + vp.height = target->height; > + > + wined3d_rendertarget_view_get_drawable_size(target, context, > &width, &height); > + } > + else if (depth_stencil) > + { > + width = depth_stencil->width; > + height = depth_stencil->height; > + } > + else > + { > + FIXME("No attachments draw calls not supported.\n"); > + return; > + } > + > gl_info->gl_ops.gl.p_glViewport(vp.x, (height - (vp.y + > vp.height)), vp.width, vp.height); > + } > checkGLcall("glViewport"); > } > > -- > 2.7.4 > >

2 3

Re: [v2 1/3] wined3d: Implement return instruction.
by Józef Kucia Nov. 22, 2016

Nov. 22, 2016

On Fri, Nov 18, 2016 at 6:46 AM, Andrew Wesie <awesie(a)gmail.com> wrote: > --- a/dlls/wined3d/shader.c > +++ b/dlls/wined3d/shader.c > @@ -2028,6 +2028,7 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_st > struct wined3d_shader_tex_mx tex_mx; > struct wined3d_shader_context ctx; > const DWORD *ptr = byte_code; > + enum WINED3D_SHADER_INSTRUCTION_HANDLER last_opcode = WINED3DSIH_TABLE_SIZE; > > /* Initialize current parsing state. */ > tex_mx.current_row = 0; > @@ -2062,6 +2063,16 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_st > > /* Call appropriate function for output target */ > device->shader_backend->shader_handle_instruction(&ins); > + last_opcode = ins.handler_idx; > + } > + > + if (last_opcode != WINED3DSIH_RET) > + { > + /* Force a return instruction at the end of function body. */ > + memset(&ins, 0, sizeof(ins)); > + ins.ctx = &ctx; > + ins.handler_idx = WINED3DSIH_RET; > + device->shader_backend->shader_handle_instruction(&ins); > } > } Would it make sense to always generate a shader epilogue for shader model <= 3, and handle the RET instruction in a special way for shader model >= 4?

2 3

Re: [PATCH 6/6] d3d9/tests: Add test for occlusion query with result bigger than UINT32_MAX.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Józef Kucia <jkucia(a)codeweavers.com> writes: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/d3d9/tests/device.c | 87 +++++++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 78 insertions(+), 9 deletions(-) This one fails here: ../../../tools/runtest -q -P wine -T ../../.. -M d3d9.dll -p d3d9_test.exe.so device && touch device.ok device.c:2291: Tests skipped: could not create device, IDirect3D9_CreateDevice returned 0x8876086c device.c:5666: Test failed: Failed to create render target, hr 0x8876017c. device.c:5670: Test failed: Failed to set render target, hr 0x8876086c. device.c:5705: Test failed: Got unexpected query result 0x0000000003f7a000. wine: Unhandled page fault on read access to 0x00000000 at address 0x7ecb5a48 (thread 00bd), starting debugger... Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x7ecb5a48). fixme:dbghelp_dwarf:dwarf2_parse_const_type Unsupported children Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7ecb5a48 ESP:0032f484 EBP:0032f658 EFLAGS:00210212( R- -- I -A- - ) EAX:00000000 EBX:7ed3f000 ECX:0032f480 EDX:00000000 ESI:00000001 EDI:7ed15e7c Stack dump: 0x0032f484: 7ed198a4 00000000 03f7a000 04000000 0x0032f494: 7ed198a4 7ed12a3f 7ed13f78 00000001 0x0032f4a4: 001434b8 01390060 00000042 7ed15e7c 0x0032f4b4: 00000001 7ed1e200 7ed12a26 0032f4e0 0x0032f4c4: 00000000 03f7a000 00161970 00000000 0x0032f4d4: 00000000 0013ea60 0013aa30 03f7a000 Backtrace: =>0 0x7ecb5a48 test_occlusion_query+0xe58() [/home/julliard/wine/wine/dlls/d3d9/tests/device.c:5713] in d3d9_test (0x0032f658) 1 0x7ecbe103 func_device+0x4772() [/home/julliard/wine/wine/dlls/d3d9/tests/device.c:11382] in d3d9_test (0x0032fd68) 2 0x7ec85d9a main+0x379(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/d3d9/tests/../../../include/wine/test.h:589] in d3d9_test (0x0032fe18) 3 0x7ed124db __wine_spec_exe_entry+0x4a(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in d3d9_test (0x0032fe58) 4 0x7b45e3cc call_process_entry+0xb() in kernel32 (0x0032fe78) 5 0x7b45f34a start_process+0x59(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1108] in kernel32 (0x0032fea8) 6 0x7bc7fb8c call_thread_func_wrapper+0xb() in ntdll (0x0032fec8) 7 0x7bc8295f call_thread_func+0xde(entry=0x7b45f2f0, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2759] in ntdll (0x0032ffa8) 8 0x7bc7fb6a call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 9 0x7bc53587 start_process+0x16(kernel_start=0x7b45f2f0) [/home/julliard/wine/wine/dlls/ntdll/loader.c:3047] in ntdll (0x0032ffe8) 10 0xf755e8cd wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 11 0xf755ea30 wine_switch_to_stack+0x1f(func=0x7bc53570, arg=0x7b45f2f0, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:77] in libwine.so.1 (0xffda6508) 12 0x7bc59279 LdrInitializeThunk+0x228(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:3103] in ntdll (0xffda6548) 13 0x7b465179 __wine_kernel_init+0xa58() [/home/julliard/wine/wine/dlls/kernel32/process.c:1302] in kernel32 (0xffda7438) 14 0x7bc5a0c3 __wine_process_init+0x152() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3312] in ntdll (0xffda74a8) 15 0xf755cac3 wine_init+0x2a2(argc=0x3, argv=0xffda79e4, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:956] in libwine.so.1 (0xffda74f8) 16 0x7c000a3a main+0x79(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:254] in <wine-loader> (0xffda7938) 17 0xf736a276 __libc_start_main+0xf5() in libc.so.6 (0x00000000) 0x7ecb5a48 test_occlusion_query+0xe58 [/home/julliard/wine/wine/dlls/d3d9/tests/device.c:5713] in d3d9_test: movl 0x0(%eax),%edx 5713 IDirect3DSurface9_Release(rt); -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] gdi32: Initialize rgbReserved to zero in SetDIBColorTable
by Nikolay Sivov Nov. 22, 2016

Nov. 22, 2016

On 11/22/2016 06:36 PM, Daniel Lehman wrote: > removes a TODO > > Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> > --- > dlls/gdi32/dib.c | 9 ++++++++- > dlls/gdi32/tests/bitmap.c | 3 ++- > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c > index 36a7b0f..6636f23 100644 > --- a/dlls/gdi32/dib.c > +++ b/dlls/gdi32/dib.c > @@ -922,7 +922,7 @@ INT WINAPI SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx, > UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, const RGBQUAD *colors ) > { > DC * dc; > - UINT result = 0; > + UINT i, result = 0; > BITMAPOBJ * bitmap; > > if (!(dc = get_dc_ptr( hdc ))) return 0; > @@ -933,6 +933,13 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, const RGBQUA > { > result = min( entries, bitmap->dib.dsBmih.biClrUsed - startpos ); > memcpy(bitmap->color_table + startpos, colors, result * sizeof(RGBQUAD)); > + for (i = 0; i < result; i++) > + { > + bitmap->color_table[startpos + i].rgbBlue = colors[i].rgbBlue; > + bitmap->color_table[startpos + i].rgbGreen = colors[i].rgbGreen; > + bitmap->color_table[startpos + i].rgbRed = colors[i].rgbRed; > + bitmap->color_table[startpos + i].rgbReserved = 0; > + } > } Doesn't this make memcpy() redundant? A couple of options that could be used: - leave memcpy() and only reset rgbReserved() in the loop; - remove memcpy(); - remove memcpy(), add another memcpy() for a size of three fields instead of a quad, keep separate rgbReserved assignment; Not sure which one will be the fastest, could depend on 'result' value too. > GDI_ReleaseObj( dc->hBitmap ); > > diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c > index 5539283..88250ca 100644 > --- a/dlls/gdi32/tests/bitmap.c > +++ b/dlls/gdi32/tests/bitmap.c > @@ -880,12 +880,13 @@ static void test_dibsections(void) > ok( ret == 1, "SetDIBColorTable returned unexpected result %u\n", ret ); > ok( rgb[0].rgbReserved == 123, "Expected rgbReserved = 123, got %u\n", rgb[0].rgbReserved ); > > + rgb[0].rgbRed = rgb[0].rgbGreen = rgb[0].rgbBlue = rgb[0].rgbReserved = -1; > ret = GetDIBColorTable( hdcmem, 0, 1, rgb ); > ok( ret == 1, "GetDIBColorTable returned unexpected result %u\n", ret ); > ok( rgb[0].rgbRed == 1, "Expected rgbRed = 1, got %u\n", rgb[0].rgbRed ); > ok( rgb[0].rgbGreen == 2, "Expected rgbGreen = 2, got %u\n", rgb[0].rgbGreen ); > ok( rgb[0].rgbBlue == 3, "Expected rgbBlue = 3, got %u\n", rgb[0].rgbBlue ); > - todo_wine ok( rgb[0].rgbReserved == 0, "Expected rgbReserved = 0, got %u\n", rgb[0].rgbReserved ); > + ok( rgb[0].rgbReserved == 0, "Expected rgbReserved = 0, got %u\n", rgb[0].rgbReserved ); > > SelectObject(hdcmem, oldbm); > DeleteObject(hdib);

1 0

Re: Jeremy Newman : beginnings of HTML5 code and updating design
by Bruno Jesus Nov. 22, 2016

Nov. 22, 2016

On Mon, Nov 21, 2016 at 12:38 PM, Jeremy Newman <jnewman(a)winehq.org> wrote: > ... > include/header.php | 25 ++++++++++++++----------- > 1 file changed, 14 insertions(+), 11 deletions(-) > > diff --git a/include/header.php b/include/header.php > index 014a8c4..ff01e3b 100644 > --- a/include/header.php > +++ b/include/header.php > @@ -2,28 +2,31 @@ > /*********************************/ > /* Application Database - Header */ > /*********************************/ > -?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> > -<html> > +?><!doctype html> > +<html lang="en"> > <head> > <title>WineHQ <?php echo $title; ?></title> > - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > - <meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> > - <meta HTTP-EQUIV="Pragma" CONTENT="no-cache"> > + > + <meta charset="utf-8"> > <meta name="description" content="Open Source Software for running Windows applications on other operating systems."> > <meta name="keywords" content="windows, linux, macintosh, solaris, freebsd"> > <meta name="robots" content="index, follow"> > <meta name="copyright" content="Copyright WineHQ.org All Rights Reserved."> > <meta name="language" content="English"> > <meta name="revisit-after" content="1"> > + > + <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous"> > + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css"> > + <link rel="stylesheet" href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css" type="text/css" media="all"> Why not https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.min.css ?

2 3

Re: [PATCH 2/3] kernel32/tests: On failure don't test the returned count - it contains random data on Windows 8 and 10.
by Marvin Nov. 22, 2016

Nov. 22, 2016

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=26790 Your paranoid android. === w864 (32 bit console) === console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed === w1064 (32 bit console) === console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed === w1064 (64 bit console) === console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed

1 0

Re: [PATCH 1/3] kernel32/tests: Add some GetLastError() values for Windows 8 and 10.
by Marvin Nov. 22, 2016

Nov. 22, 2016

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=26789 Your paranoid android. === w864 (32 bit console) === console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1497: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [13] Expected output count to be 0, got 2685552 console.c:1497: Test failed: [15] Expected output count to be 0, got 2685616 console.c:1497: Test failed: [18] Expected output count to be 3735928559, got 2685680 console.c:1741: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [13] Expected output count to be 0, got 2685552 console.c:1741: Test failed: [15] Expected output count to be 0, got 2685616 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 2685680 console.c:2200: Test failed: [7] Expected count to be 0, got 1 console.c:2266: Test failed: [7] Expected count to be 0, got 1 console.c:2332: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1497: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [13] Expected output count to be 0, got 51 console.c:1497: Test failed: [15] Expected output count to be 0, got 43 console.c:1497: Test failed: [18] Expected output count to be 3735928559, got 43 console.c:1741: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [13] Expected output count to be 0, got 51 console.c:1741: Test failed: [15] Expected output count to be 0, got 43 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 43 console.c:2200: Test failed: [7] Expected count to be 0, got 1 console.c:2266: Test failed: [7] Expected count to be 0, got 1 console.c:2332: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1497: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2200: Test failed: [7] Expected count to be 0, got 1 console.c:2266: Test failed: [7] Expected count to be 0, got 1 console.c:2332: Test failed: [7] Expected count to be 0, got 1

1 0

Re: [PATCH 2/6] wined3d: Increase data size for occlusion queries to 8 bytes.
by Henri Verbeet Nov. 22, 2016

Nov. 22, 2016

On 21 November 2016 at 15:15, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -115,7 +115,9 @@ static DWORD WINAPI d3d9_query_GetDataSize(IDirect3DQuery9 *iface) > > wined3d_mutex_lock(); > type = wined3d_query_get_type(query->wined3d_query); > - if (type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT) > + if (type == WINED3D_QUERY_TYPE_OCCLUSION) > + ret = sizeof(DWORD); We probably don't care that much, but note that this only works with little-endian byte order.

1 0

Re: [PATCH] d2d1: Implement DrawLine() over DrawGeometry() for a linear path
by Henri Verbeet Nov. 22, 2016

Nov. 22, 2016

On 21 November 2016 at 13:10, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + ID2D1GeometrySink_BeginFigure(sink, p0, D2D1_FIGURE_BEGIN_FILLED); > + ID2D1GeometrySink_AddLine(sink, p1); > + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); Strictly speaking D2D1_FIGURE_BEGIN_HOLLOW and D2D1_FIGURE_END_OPEN would be more appropriate here, but it shouldn't matter in practice.

1 0

Re: [v2 2/2] d3d11/tests: Add test of SV_VertexID.
by Józef Kucia Nov. 22, 2016

Nov. 22, 2016

On Fri, Nov 18, 2016 at 6:06 AM, Andrew Wesie <awesie(a)gmail.com> wrote: > +static void test_sm4_vertexid(void) I would drop the "sm4" prefix. > + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = > + { > + { "SV_Position", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 }, > + { "SV_VertexID", 0, DXGI_FORMAT_R32_UINT, 1, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 }, > + }; I don't think that SV_VertexID should be a part of the input layout.

2 1

Re: [v2 1/2] wined3d: Fix mapping of SV_VertexID to gl_VertexID.
by Henri Verbeet Nov. 22, 2016

Nov. 22, 2016

On 18 November 2016 at 06:06, Andrew Wesie <awesie(a)gmail.com> wrote: > @@ -424,6 +424,9 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) > device_invalidate_state(cs->device, STATE_BASEVERTEXINDEX); > } > > + state->base_vertex_index = op->indexed ? op->base_vertex_idx : op->start_idx; I don't think you can do this, the modified state would be visible to the application through wined3d_stateblock_capture() and wined3d_device_get_base_vertex_index(). > + device_invalidate_state(cs->device, STATE_BASEVERTEXINDEX); State invalidation isn't free, so it may be better to avoid doing this unnecessarily. But if you do do this unconditionally, the invalidation of STATE_BASEVERTEXINDEX a few lines above becomes redundant. > @@ -1793,7 +1800,8 @@ static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_b > > if (e->sysval_semantic == WINED3D_SV_VERTEX_ID) > { > - shader_addline(buffer, "vec4 vs_in%u = vec4(intBitsToFloat(gl_VertexID), 0.0, 0.0, 0.0);\n", > + shader_addline(buffer, "uniform int base_vertex;\n"); > + shader_addline(buffer, "vec4 vs_in%u = vec4(intBitsToFloat(gl_VertexID - base_vertex), 0.0, 0.0, 0.0);\n", > index); > return; > } Note that in principle this code would do the wrong thing when ARB_draw_elements_base_vertex is not supported. The reason it works in practice is that SV_VertexID is a SM4+ feature, and SM4 requires GL 3.2, which implies ARB_draw_elements_base_vertex. That's fine, but could do with a comment.

1 0

Re: [v2 2/2] d3d11/tests: Add test for primitive restart index.
by Henri Verbeet Nov. 22, 2016

Nov. 22, 2016

Józef pointed out a couple of issues in the other patches that also apply here. I won't repeat those. On 18 November 2016 at 04:45, Andrew Wesie <awesie(a)gmail.com> wrote: > + static const struct vec2 vertices[] = > + { > + { -1.0f, -1.0f }, > + { -1.0f, 1.0f }, > + { 1.0f, -1.0f }, > + { 1.0f, 1.0f }, > + { -1.0f, -1.0f }, > + { -1.0f, 1.0f }, > + { 1.0f, -1.0f }, > + { 1.0f, 1.0f }, > + }; This works, but for primitive restart in particular it may be more useful to not draw these overlapping and instead use e.g. {-1.0f, -0.25f, 0.25f, 1.0f} for the x-coordinates. > + static const unsigned int indices[] = > + { > + 0, 1, 2, 3, 0xFFFFFFFF, 4, 5, 6, 7 > + }; We use lowercase hexadecimal constants. > + hr = ID3D11Device_CreateInputLayout(device, layout_desc, > + sizeof(layout_desc) / sizeof(*layout_desc), > + vs_code, sizeof(vs_code), &test_context.input_layout); I realise test_cb_relative_addressing() in particular uses test_context's input_layout field in a similar way, but it doesn't strike me as something we'd want to encourage. Likewise for the "vs" and "vb" fields. We use double indentation for line continuations. > + expected_color = 0xff0000ff; > + ID3D11DeviceContext_IASetIndexBuffer(test_context.immediate_context, ib, DXGI_FORMAT_R32_UINT, 0); > + ID3D11DeviceContext_DrawIndexed(test_context.immediate_context, 9, 0, 0); > + check_texture_color(test_context.backbuffer, expected_color, 0); > + > + ID3D11DeviceContext_IASetIndexBuffer(test_context.immediate_context, ib16, DXGI_FORMAT_R16_UINT, 0); > + ID3D11DeviceContext_DrawIndexed(test_context.immediate_context, 9, 0, 0); > + check_texture_color(test_context.backbuffer, expected_color, 0); The "expected_color" variable seems unnecessary here.

1 0

Re: [PATCH 1/2] regedit: Overhaul Unicode line processing
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > + p = strpbrkW(line, line_endings); > + if (!p) > + { > + HeapFree(GetProcessHeap(), 0, buf); > + return NULL; If there are no line endings you need to read more data instead of failing. Also it looks to me that you are reading the entire file into the buffer instead of just one line. -- Alexandre Julliard julliard(a)winehq.org

2 4

Code style guidelines on the wiki
by Alex Henrie Nov. 22, 2016

Nov. 22, 2016

As requested at WineConf, I have rewritten the wiki's notes about code style to match our current practices, as best I understand them: https://wiki.winehq.org/Submitting_Patches#Code_guidelines Please read this over, let me know what you think, and feel free to edit the wiki directly. -Alex

2 1

readelf: Error: the dynamic segment offset + size exceeds the size of the file
by Hin-Tak Leung Nov. 21, 2016

Nov. 21, 2016

Hi, Just rebuilding the wine staging rpm from fedora, and towards the end I see piles of "readelf: Error: the dynamic segment offset + size exceeds the size of the file" on wine's dll.so's. This is specific to the rpm build and packaging process - AFAIK this strips off the debuginfo so that it can be shipped as a separate package. Nonetheless, should I worry about it, and/or file this as a problem of readelf (binutils)? Thanks. Hin-Tak

1 0

Re: [4/5] quartz: Add tests for IBasicVideo.
by Andrew Eikum Nov. 21, 2016

Nov. 21, 2016

It's a good start, though I'm a little concerned your tests didn't turn up the bugs I found in 2/5, 3/5, and 5/5, nor the bug I noticed in BaseControlVideoImpl_get_DestinationHeight while reviewing your patches... Andrew On Sun, Nov 20, 2016 at 03:33:25PM +0900, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/quartz/tests/filtergraph.c | 93 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 93 insertions(+) > > diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c > index 87b1123..a92aab3 100644 > --- a/dlls/quartz/tests/filtergraph.c > +++ b/dlls/quartz/tests/filtergraph.c > @@ -50,6 +50,97 @@ static int createfiltergraph(void) > &CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&pgraph); > } > > +static void test_basic_video(void) > +{ > + IBasicVideo* pbv; > + LONG video_width, video_height; > + LONG left, top, width, height; > + HRESULT hr; > + > + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IBasicVideo, (LPVOID*)&pbv); > + ok(hr==S_OK, "Cannot get IBasicVideo interface returned: %x\n", hr); > + > + /* test get video size */ > + hr = IBasicVideo_GetVideoSize(pbv, NULL, NULL); > + ok(hr==E_POINTER, "IBasicVideo_GetVideoSize returned: %x\n", hr); > + hr = IBasicVideo_GetVideoSize(pbv, &video_width, NULL); > + ok(hr==E_POINTER, "IBasicVideo_GetVideoSize returned: %x\n", hr); > + hr = IBasicVideo_GetVideoSize(pbv, NULL, &video_height); > + ok(hr==E_POINTER, "IBasicVideo_GetVideoSize returned: %x\n", hr); > + hr = IBasicVideo_GetVideoSize(pbv, &video_width, &video_height); > + ok(hr==S_OK, "Cannot get video size returned: %x\n", hr); > + > + /* test source position */ > + hr = IBasicVideo_GetSourcePosition(pbv, NULL, NULL, NULL, NULL); > + ok(hr == E_POINTER, "IBasicVideo_GetSourcePosition returned: %x\n", hr); > + hr = IBasicVideo_GetSourcePosition(pbv, &left, &top, NULL, NULL); > + ok(hr == E_POINTER, "IBasicVideo_GetSourcePosition returned: %x\n", hr); > + hr = IBasicVideo_GetSourcePosition(pbv, NULL, NULL, &width, &height); > + ok(hr == E_POINTER, "IBasicVideo_GetSourcePosition returned: %x\n", hr); > + hr = IBasicVideo_GetSourcePosition(pbv, &left, &top, &width, &height); > + ok(hr == S_OK, "Cannot get source position returned: %x\n", hr); > + ok(left == 0, "expected 0, got %d\n", left); > + ok(top == 0, "expected 0, got %d\n", top); > + ok(width == video_width, "expected %d, got %d\n", video_width, width); > + ok(height == video_height, "expected %d, got %d\n", video_height, height); > + > + hr = IBasicVideo_SetSourcePosition(pbv, 0, 0, 0, 0); > + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); > + hr = IBasicVideo_put_SourceTop(pbv, -1); > + ok(hr==E_INVALIDARG, "IBasicVideo_put_SourceTop returned: %x\n", hr); > + hr = IBasicVideo_put_SourceTop(pbv, 0); > + ok(hr==S_OK, "Cannot put source top returned: %x\n", hr); > + hr = IBasicVideo_put_SourceTop(pbv, 1); > + todo_wine ok(hr==E_INVALIDARG, "IBasicVideo_put_SourceTop returned: %x\n", hr); > + > + hr = IBasicVideo_SetSourcePosition(pbv, video_width, 0, 1, video_height); > + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); > + hr = IBasicVideo_SetSourcePosition(pbv, 0, video_height, video_width, 1); > + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); > + > + hr = IBasicVideo_SetSourcePosition(pbv, 0, 0, video_width, video_height+1); > + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); > + hr = IBasicVideo_SetSourcePosition(pbv, 0, 0, video_width+1, video_height); > + ok(hr==E_INVALIDARG, "IBasicVideo_SetSourcePosition returned: %x\n", hr); > + > + /* test destination position */ > + hr = IBasicVideo_GetDestinationPosition(pbv, NULL, NULL, NULL, NULL); > + ok(hr == E_POINTER, "IBasicVideo_GetDestinationPosition returned: %x\n", hr); > + hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, NULL, NULL); > + ok(hr == E_POINTER, "IBasicVideo_GetDestinationPosition returned: %x\n", hr); > + hr = IBasicVideo_GetDestinationPosition(pbv, NULL, NULL, &width, &height); > + ok(hr == E_POINTER, "IBasicVideo_GetDestinationPosition returned: %x\n", hr); > + hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, &width, &height); > + ok(hr == S_OK, "Cannot get destination position returned: %x\n", hr); > + ok(left == 0, "expected 0, got %d\n", left); > + ok(top == 0, "expected 0, got %d\n", top); > + todo_wine ok(width == video_width, "expected %d, got %d\n", video_width, width); > + todo_wine ok(height == video_height, "expected %d, got %d\n", video_height, height); > + > + hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, 0, 0); > + ok(hr==E_INVALIDARG, "IBasicVideo_SetDestinationPosition returned: %x\n", hr); > + > + hr = IBasicVideo_put_DestinationLeft(pbv, -1); > + todo_wine ok(hr==S_OK, "Cannot put destination left returned: %x\n", hr); > + hr = IBasicVideo_put_DestinationLeft(pbv, 0); > + todo_wine ok(hr==S_OK, "Cannot put destination left returned: %x\n", hr); > + hr = IBasicVideo_put_DestinationLeft(pbv, 1); > + todo_wine ok(hr==S_OK, "Cannot put destination left returned: %x\n", hr); > + > + hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, video_width * 2, video_height * 2); > + ok(hr==S_OK, "Cannot set destination position returned: %x\n", hr); > + > + /* reset source position */ > + hr = IBasicVideo_SetSourcePosition(pbv, 0, 0, video_width, video_height); > + ok(hr==S_OK, "Cannot set source position returned: %x\n", hr); > + > + /* reset destination position */ > + hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, video_width, video_height); > + ok(hr==S_OK, "Cannot set destination position returned: %x\n", hr); > + > + IBasicVideo_Release(pbv); > +} > + > static void rungraph(void) > { > HRESULT hr; > @@ -70,6 +161,8 @@ static void rungraph(void) > > IMediaFilter_Release(pmf); > > + test_basic_video(); > + > hr = IMediaControl_Run(pmc); > ok(hr==S_FALSE, "Cannot run the graph returned: %x\n", hr); > >

1 0

Re: [3/5] strmbase: Add validation checks when updating destination rectangle.
by Andrew Eikum Nov. 21, 2016

Nov. 21, 2016

On Sun, Nov 20, 2016 at 03:33:24PM +0900, Akihiro Sagawa wrote: > @@ -73,6 +73,17 @@ static HRESULT BaseControlVideoImpl_CheckSourceRect(BaseControlVideo *This, RECT > return S_OK; > } > > +static HRESULT BaseControlVideoImpl_CheckTargetRect(BaseControlVideo *This, RECT *pTargetRect) > +{ > + if (pTargetRect->top >= pTargetRect->bottom || > + pTargetRect->left >= pTargetRect->right || > + (pTargetRect->bottom - pTargetRect->top) <= 0 || > + (pTargetRect->right - pTargetRect->left) <= 0) > + return E_INVALIDARG; > + The third and fourth conditions seem redundant with the first and second. You could use IsRectEmpty() here as well. Andrew

1 0