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

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

22 Nov '16

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 22 Nov '16

22 Nov '16

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 22 Nov '16

22 Nov '16

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 22 Nov '16

22 Nov '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=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 22 Nov '16

22 Nov '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=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 22 Nov '16

22 Nov '16

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 22 Nov '16

22 Nov '16

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 22 Nov '16

22 Nov '16

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 22 Nov '16

22 Nov '16

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 22 Nov '16

22 Nov '16

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