November 2017 - Wine-commits

Nikolay Sivov : xmllite/tests: Fix clang warning.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: b077271cfb1741c77dd753920132f4e79cc27090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b077271cfb1741c77dd753920… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 5 11:39:53 2017 +0300 xmllite/tests: Fix clang warning. Reported by Gerald Pfeifer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 0f03c3b..0033776 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -273,7 +273,7 @@ static void test_read_state(IXmlReader *reader, XmlReadState expected, state = -1; /* invalid state value */ IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, &state); - if (exp_broken == -1) + if (exp_broken == expected) broken_state = FALSE; else broken_state = broken(exp_broken == state); @@ -282,7 +282,7 @@ static void test_read_state(IXmlReader *reader, XmlReadState expected, state_to_str(expected), state_to_str(state)); } -#define TEST_READER_STATE(reader, state) test_read_state(reader, state, -1, __LINE__) +#define TEST_READER_STATE(reader, state) test_read_state(reader, state, state, __LINE__) #define TEST_READER_STATE2(reader, state, brk) test_read_state(reader, state, brk, __LINE__) #define reader_value(a,b) _reader_value(__LINE__,a,b)

1 0

Zebediah Figura : dinput/tests: Don't pump messages in test_acquire().
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 51895145fd67d3dd055888caaba7af413e4753f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51895145fd67d3dd055888caa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 3 17:26:59 2017 -0500 dinput/tests: Don't pump messages in test_acquire(). This causes intermittent failures due to implementation of our window drivers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/mouse.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index a6c981c..dac7d8d 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -93,7 +93,6 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) DIPROPDWORD di_op; DIDEVICEOBJECTDATA mouse_state; DWORD cnt; - MSG msg; int i; if (! SetForegroundWindow(hwnd)) @@ -132,7 +131,6 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError()); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr);

1 0

Zebediah Figura : quartz/tests: GetDestinationPosition() returns the actual window width.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 64c6761761334d91082e9846c015dcbb68f1d172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c6761761334d91082e9846c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 4 00:20:14 2017 -0500 quartz/tests: GetDestinationPosition() returns the actual window width. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/filtergraph.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 572b729..ebded4b 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = quartz.dll -IMPORTS = oleaut32 ole32 advapi32 +IMPORTS = oleaut32 ole32 advapi32 user32 C_SRCS = \ avisplitter.c \ diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6d5f8d1..13e6988 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -53,7 +53,7 @@ static int createfiltergraph(void) static void test_basic_video(void) { IBasicVideo* pbv; - LONG video_width, video_height; + LONG video_width, video_height, window_width; LONG left, top, width, height; HRESULT hr; @@ -158,6 +158,8 @@ static void test_basic_video(void) ok(height == video_height/4+1, "expected %d, got %d\n", video_height/4+1, height); /* test destination rectangle */ + window_width = max(video_width, GetSystemMetrics(SM_CXMIN) - 2 * GetSystemMetrics(SM_CXFRAME)); + 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); @@ -168,7 +170,7 @@ static void test_basic_video(void) 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(width == window_width, "expected %d, got %d\n", window_width, width); todo_wine ok(height == video_height, "expected %d, got %d\n", video_height, height); hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, 0, 0);

1 0

Zebediah Figura : quartz/tests: Avoid Sleep().
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 7074b411df28bd872e65ee756ec0e0e6f26584ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=7074b411df28bd872e65ee756… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 4 00:20:15 2017 -0500 quartz/tests: Avoid Sleep(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 13e6988..f9c95ae 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -330,8 +330,7 @@ static void rungraph(void) hr = IMediaEvent_GetEventHandle(pme, (OAEVENT*)&hEvent); ok(hr==S_OK, "Cannot get event handle returned: %x\n", hr); - /* WaitForSingleObject(hEvent, INFINITE); */ - Sleep(20000); + ok(WaitForSingleObject(hEvent, 2000) == WAIT_OBJECT_0, "Wait failed\n"); hr = IMediaEvent_Release(pme); ok(hr==2, "Releasing mediaevent returned: %x\n", hr);

1 0

Donna Whisnant : oleaut32: Fix DispCallFunc() stdcall test to be ABI not x64 specific.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: c4ac2d285dd3c0c4aa3282eb70dc51d5ab4d5fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ac2d285dd3c0c4aa3282eb7… Author: Donna Whisnant <dewhisna(a)dewtronics.com> Date: Sat Nov 4 11:04:15 2017 -0500 oleaut32: Fix DispCallFunc() stdcall test to be ABI not x64 specific. The tests checking callee stack cleaning for stdcall vs. cdecl should be a function of the calling ABI of the platform, not whether it is 64-bit or not. This fixes the check for platforms like ARM that may be 32-bit but that do not use the stdcall convention of callee stack cleaning. Signed-off-by: Donna Whisnant <dewhisna(a)dewtronics.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index d8ff310..bb70164 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -92,6 +92,12 @@ static WCHAR wszguid[] = {'g','u','i','d',0}; static const BOOL is_win64 = sizeof(void *) > sizeof(int); +#ifdef __i386__ +static const BOOL abi_supports_stdcall = TRUE; +#else +static const BOOL abi_supports_stdcall = FALSE; +#endif + static HRESULT WINAPI invoketest_QueryInterface(IInvokeTest *iface, REFIID riid, void **ret) { if (IsEqualIID(riid, &IID_IUnknown) || @@ -1115,7 +1121,7 @@ static void test_DispCallFunc(void) ok( V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result) ); /* the function checks the argument sizes for stdcall */ - if (!is_win64) /* no stdcall on 64-bit */ + if (abi_supports_stdcall) { res = DispCallFunc( NULL, (ULONG_PTR)stdcall_func, CC_STDCALL, VT_UI4, 0, types, pargs, &result ); ok( res == DISP_E_BADCALLEE, "DispCallFunc wrong error %x\n", res );

1 0

Zebediah Figura : dinput/tests: Remove a no longer needed workaround.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 58abb3518cc8fdff261c33e237d1ae5e0130ec40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58abb3518cc8fdff261c33e23… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 3 17:26:58 2017 -0500 dinput/tests: Remove a no longer needed workaround. This was fixed by 41ce4a01583d552a976cb921d2991a043e0363e4. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/mouse.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 262ed0e..a6c981c 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -136,8 +136,6 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr); - /* Workaround so we can test other things. Remove when Wine is fixed */ - IDirectInputDevice_Unacquire(pMouse); hr = IDirectInputDevice_Acquire(pMouse); ok(hr == DIERR_OTHERAPPHASPRIO, "Acquire() should have failed: %08x\n", hr);

1 0

Józef Kucia : d3d11/tests: Add test for indirect draws with index buffer offset.
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: 6d624b3d0fb0a3c4e64caf216b683002cebd11eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d624b3d0fb0a3c4e64caf216… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:15 2017 +0100 d3d11/tests: Add test for indirect draws with index buffer offset. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0d16cc3..900f489 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9737,7 +9737,7 @@ static void test_instance_id(void) ID3D11DeviceContext_DrawInstanced(context, 4, 4, 0, 4); args_buffer = create_buffer_misc(device, 0, D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS, - sizeof(argument_data), &argument_data); + sizeof(argument_data), argument_data); ID3D11DeviceContext_DrawInstancedIndirect(context, args_buffer, 0); ID3D11DeviceContext_DrawInstancedIndirect(context, args_buffer, sizeof(*argument_data)); @@ -14436,8 +14436,8 @@ static void test_uint_shader_instructions(void) static void test_index_buffer_offset(void) { + ID3D11Buffer *vb, *ib, *so_buffer, *args_buffer; struct d3d11_test_context test_context; - ID3D11Buffer *vb, *ib, *so_buffer; ID3D11InputLayout *input_layout; ID3D11DeviceContext *context; struct resource_readback rb; @@ -14547,6 +14547,10 @@ static void test_index_buffer_offset(void) {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, }; static const struct vec4 broken_result = {0.0f, 0.0f, 0.0f, 1.0f}; + static const D3D11_DRAW_INDEXED_INSTANCED_INDIRECT_ARGS argument_data[] = + { + {4, 1, 0, 0, 0}, + }; if (!init_test_context(&test_context, &feature_level)) return; @@ -14603,7 +14607,36 @@ static void test_index_buffer_offset(void) } release_resource_readback(&rb); + /* indirect draws */ + args_buffer = create_buffer_misc(device, 0, D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS, + sizeof(argument_data), argument_data); + + offset = 0; + ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 0); + ID3D11DeviceContext_DrawIndexedInstancedIndirect(context, args_buffer, 0); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 4 * sizeof(*indices)); + ID3D11DeviceContext_DrawIndexedInstancedIndirect(context, args_buffer, 0); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 8 * sizeof(*indices)); + ID3D11DeviceContext_DrawIndexedInstancedIndirect(context, args_buffer, 0); + + get_buffer_readback(so_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(expected_data); ++i) + { + data = get_readback_vec4(&rb, i, 0); + todo_wine_if(i >= 8 && i != 20 && i != 21) + ok(compare_vec4(data, &expected_data[i], 0) + || broken(is_nvidia_device(device) && !(i % 2) && compare_vec4(data, &broken_result, 0)), + "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u.\n", + data->x, data->y, data->z, data->w, i); + } + release_resource_readback(&rb); + ID3D11Buffer_Release(so_buffer); + ID3D11Buffer_Release(args_buffer); ID3D11Buffer_Release(ib); ID3D11Buffer_Release(vb); ID3D11VertexShader_Release(vs);

1 0

Józef Kucia : wined3d: Add FIXME() for unimplemented index buffer offsets.
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: 7d7d3a8db6f9d05ccf3871159f25222617d95e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7d3a8db6f9d05ccf3871159… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:16 2017 +0100 wined3d: Add FIXME() for unimplemented index buffer offsets. We do not support index buffer offsets for indirect draws. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index a7ca748..f1d57dc 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -654,6 +654,8 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (idx_size) { GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; + if (state->index_offset) + FIXME("Ignoring index offset %u.\n", state->index_offset); GL_EXTCALL(glDrawElementsIndirect(state->gl_primitive_type, idx_type, (void *)(GLintptr)parameters->u.indirect.offset)); }

1 0

Józef Kucia : wined3d: Factor out draw_indirect() function.
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: 7f1f586f5df2d67745029b49656ecbc97016974b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1f586f5df2d67745029b496… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:17 2017 +0100 wined3d: Factor out draw_indirect() function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 55 ++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f1d57dc..6900578 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -395,6 +395,34 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const checkGLcall("glEnd and previous calls"); } +static void draw_indirect(struct wined3d_context *context, const struct wined3d_state *state, + const struct wined3d_indirect_draw_parameters *parameters, unsigned int idx_size) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_buffer *buffer = parameters->buffer; + + wined3d_buffer_load(buffer, context, state); + GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object)); + + if (idx_size) + { + GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; + if (state->index_offset) + FIXME("Ignoring index offset %u.\n", state->index_offset); + GL_EXTCALL(glDrawElementsIndirect(state->gl_primitive_type, idx_type, + (void *)(GLintptr)parameters->offset)); + } + else + { + GL_EXTCALL(glDrawArraysIndirect(state->gl_primitive_type, + (void *)(GLintptr)parameters->offset)); + } + + GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0)); + + checkGLcall("draw indirect"); +} + static void remove_vbos(struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_stream_info *s) { @@ -645,34 +673,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indirect) { if (!context->use_immediate_mode_draw && !emulation) - { - struct wined3d_buffer *buffer = parameters->u.indirect.buffer; - - wined3d_buffer_load(buffer, context, state); - GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object)); - - if (idx_size) - { - GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; - if (state->index_offset) - FIXME("Ignoring index offset %u.\n", state->index_offset); - GL_EXTCALL(glDrawElementsIndirect(state->gl_primitive_type, idx_type, - (void *)(GLintptr)parameters->u.indirect.offset)); - } - else - { - GL_EXTCALL(glDrawArraysIndirect(state->gl_primitive_type, - (void *)(GLintptr)parameters->u.indirect.offset)); - } - - GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0)); - - checkGLcall("draw indirect"); - } + draw_indirect(context, state, &parameters->u.indirect, idx_size); else - { FIXME("Indirect draws with immediate mode/emulation are not supported.\n"); - } } else {

1 0

Józef Kucia : wined3d: Bail out when ARB_draw_indirect is not supported.
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: a46a599af14879f6984925014adf0b752bc75c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46a599af14879f6984925014… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:18 2017 +0100 wined3d: Bail out when ARB_draw_indirect is not supported. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6900578..99f3ce2 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -401,6 +401,12 @@ static void draw_indirect(struct wined3d_context *context, const struct wined3d_ const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_buffer *buffer = parameters->buffer; + if (!gl_info->supported[ARB_DRAW_INDIRECT]) + { + FIXME("OpenGL implementation does not support indirect draws.\n"); + return; + } + wined3d_buffer_load(buffer, context, state); GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object));

1 0