May 2019 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Move the "dummy_arbfp_prog" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard May 8, 2019

May 8, 2019

Module: wine Branch: master Commit: 3d2b82a257493de36e922bb18f3d43dc2600f479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d2b82a257493de36e922bb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 8 18:09:35 2019 +0430 wined3d: Move the "dummy_arbfp_prog" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 33 ++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1a45eca..eb64f14 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1398,11 +1398,6 @@ void wined3d_context_cleanup(struct wined3d_context *context) if (context->valid) { - if (context->dummy_arbfp_prog) - { - GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); - } - if (gl_info->supported[WINED3D_GL_PRIMITIVE_QUERY]) { for (i = 0; i < context->free_so_statistics_query_count; ++i) @@ -1482,8 +1477,32 @@ void wined3d_context_cleanup(struct wined3d_context *context) void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) { + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + HGLRC restore_ctx; + HDC restore_dc; + + restore_ctx = wglGetCurrentContext(); + restore_dc = wglGetCurrentDC(); + + if (restore_ctx == context_gl->c.glCtx) + restore_ctx = NULL; + else if (context_gl->c.valid) + context_set_gl_context(&context_gl->c); + + if (context_gl->c.valid) + { + if (context_gl->dummy_arbfp_prog) + GL_EXTCALL(glDeleteProgramsARB(1, &context_gl->dummy_arbfp_prog)); + + checkGLcall("context cleanup"); + } + heap_free(context_gl->texture_type); + context_restore_pixel_format(&context_gl->c); + if (restore_ctx) + context_restore_gl_context(gl_info, restore_dc, restore_ctx); + wined3d_context_cleanup(&context_gl->c); } @@ -2232,8 +2251,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi "!!ARBfp1.0\n" "MOV result.color, fragment.color.primary;\n" "END\n"; - GL_EXTCALL(glGenProgramsARB(1, &context->dummy_arbfp_prog)); - GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, context->dummy_arbfp_prog)); + GL_EXTCALL(glGenProgramsARB(1, &context_gl->dummy_arbfp_prog)); + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, context_gl->dummy_arbfp_prog)); GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(dummy_program), dummy_program)); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b8edf68..b649a47 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2023,7 +2023,6 @@ struct wined3d_context GLint gl_fog_source; GLfloat fog_coord_value; GLfloat color[4], fogstart, fogend, fogcolor[4]; - GLuint dummy_arbfp_prog; unsigned int viewport_count; unsigned int scissor_rect_count; @@ -2039,6 +2038,8 @@ struct wined3d_context_gl struct wined3d_context c; GLenum *texture_type; + + GLuint dummy_arbfp_prog; }; static inline struct wined3d_context_gl *wined3d_context_gl(struct wined3d_context *context)

1 0

Józef Kucia : wined3d: Propagate HRESULTs in context creation functions.
by Alexandre Julliard May 8, 2019

May 8, 2019

Module: wine Branch: master Commit: ad5a448d7e95d4d6c94312fb65a872591d399e6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad5a448d7e95d4d6c94312fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 8 12:04:06 2019 +0200 wined3d: Propagate HRESULTs in context creation functions. 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/adapter_gl.c | 5 +++-- dlls/wined3d/adapter_vk.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 1f4ba79..b08ba62 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4277,17 +4277,18 @@ static void adapter_gl_destroy_device(struct wined3d_device *device) static HRESULT adapter_gl_create_context(struct wined3d_swapchain *swapchain, struct wined3d_context **context) { struct wined3d_context_gl *context_gl; + HRESULT hr; TRACE("swapchain %p, context %p.\n", swapchain, context); if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) return E_OUTOFMEMORY; - if (FAILED(wined3d_context_gl_init(context_gl, swapchain))) + if (FAILED(hr = wined3d_context_gl_init(context_gl, swapchain))) { WARN("Failed to initialise context.\n"); heap_free(context_gl); - return E_FAIL; + return hr; } TRACE("Created context %p.\n", context_gl); diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d39e651..fad78ae 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -291,17 +291,18 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) static HRESULT adapter_vk_create_context(struct wined3d_swapchain *swapchain, struct wined3d_context **context) { struct wined3d_context *context_vk; + HRESULT hr; TRACE("swapchain %p, context %p.\n", swapchain, context); if (!(context_vk = heap_alloc_zero(sizeof(*context_vk)))) return E_OUTOFMEMORY; - if (FAILED(wined3d_context_vk_init(context_vk, swapchain))) + if (FAILED(hr = wined3d_context_vk_init(context_vk, swapchain))) { WARN("Failed to initialise context.\n"); heap_free(context_vk); - return E_FAIL; + return hr; } TRACE("Created context %p.\n", context_vk);

1 0

Henri Verbeet : wined3d: Move the "texture_type" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard May 8, 2019

May 8, 2019

Module: wine Branch: master Commit: c5b09fd2312234ce8e47a7a030782caa38b23cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5b09fd2312234ce8e47a7a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 8 18:09:34 2019 +0430 wined3d: Move the "texture_type" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9aa78f5..1a45eca 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1478,12 +1478,12 @@ void wined3d_context_cleanup(struct wined3d_context *context) DWORD err = GetLastError(); ERR("wglDeleteContext(%p) failed, last error %#x.\n", context->glCtx, err); } - - heap_free(context->texture_type); } void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) { + heap_free(context_gl->texture_type); + wined3d_context_cleanup(&context_gl->c); } @@ -2009,8 +2009,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi } } - if (!(context->texture_type = heap_calloc(gl_info->limits.combined_samplers, - sizeof(*context->texture_type)))) + if (!(context_gl->texture_type = heap_calloc(gl_info->limits.combined_samplers, + sizeof(*context_gl->texture_type)))) return E_FAIL; target = &context->current_rt.texture->resource; @@ -2093,7 +2093,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi { ERR("Failed to set pixel format %d on device context %p.\n", context->pixel_format, context->hdc); context_release(context); - heap_free(context->texture_type); + heap_free(context_gl->texture_type); return E_FAIL; } @@ -2103,7 +2103,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (!(ctx = context_create_wgl_attribs(gl_info, context->hdc, share_ctx))) { context_release(context); - heap_free(context->texture_type); + heap_free(context_gl->texture_type); return E_FAIL; } } @@ -2113,7 +2113,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi { ERR("Failed to create a WGL context.\n"); context_release(context); - heap_free(context->texture_type); + heap_free(context_gl->texture_type); return E_FAIL; } @@ -2123,7 +2123,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_release(context); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - heap_free(context->texture_type); + heap_free(context_gl->texture_type); return E_FAIL; } } @@ -2143,7 +2143,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_release(context); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - heap_free(context->texture_type); + heap_free(context_gl->texture_type); return E_FAIL; } @@ -2541,7 +2541,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen target = GL_NONE; unit = context_gl->c.active_texture; - old_texture_type = context_gl->c.texture_type[unit]; + old_texture_type = context_gl->texture_type[unit]; if (old_texture_type != target) { switch (old_texture_type) @@ -2586,7 +2586,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen ERR("Unexpected texture target %#x.\n", old_texture_type); } - context_gl->c.texture_type[unit] = target; + context_gl->texture_type[unit] = target; } checkGLcall("bind texture"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 03c6977..b8edf68 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1954,7 +1954,6 @@ struct wined3d_context UINT blit_w, blit_h; enum fogsource fog_source; DWORD active_texture; - DWORD *texture_type; UINT instance_count; @@ -2038,6 +2037,8 @@ HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_context_gl { struct wined3d_context c; + + GLenum *texture_type; }; static inline struct wined3d_context_gl *wined3d_context_gl(struct wined3d_context *context)

1 0

Paul Gofman : ddraw: Fix vertex count in d3d_device3_DrawIndexedPrimitiveVB().
by Alexandre Julliard May 8, 2019

May 8, 2019

Module: wine Branch: master Commit: 08d630e250d24d6f0f8c1f6106dff0397b4d058e URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d630e250d24d6f0f8c1f61… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 7 21:57:53 2019 +0300 ddraw: Fix vertex count in d3d_device3_DrawIndexedPrimitiveVB(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47129 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 19 ++++++++++++------- dlls/ddraw/tests/ddraw4.c | 10 +++++++--- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 054e2dc..18e5854 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4518,19 +4518,24 @@ static HRESULT WINAPI d3d_device7_DrawIndexedPrimitiveVB_FPUPreserve(IDirect3DDe } static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface, - D3DPRIMITIVETYPE PrimitiveType, IDirect3DVertexBuffer *D3DVertexBuf, WORD *Indices, - DWORD IndexCount, DWORD Flags) + D3DPRIMITIVETYPE primitive_type, IDirect3DVertexBuffer *vertex_buffer, + WORD *indices, DWORD index_count, DWORD flags) { + struct d3d_vertex_buffer *vb = + unsafe_impl_from_IDirect3DVertexBuffer7((IDirect3DVertexBuffer7 *)vertex_buffer); struct d3d_device *device = impl_from_IDirect3DDevice3(iface); - struct d3d_vertex_buffer *vb = unsafe_impl_from_IDirect3DVertexBuffer7((IDirect3DVertexBuffer7 *)D3DVertexBuf); + DWORD stride; TRACE("iface %p, primitive_type %#x, vb %p, indices %p, index_count %u, flags %#x.\n", - iface, PrimitiveType, D3DVertexBuf, Indices, IndexCount, Flags); + iface, primitive_type, vertex_buffer, indices, index_count, flags); - setup_lighting(device, vb->fvf, Flags); + setup_lighting(device, vb->fvf, flags); + + if (!(stride = get_flexible_vertex_size(vb->fvf))) + return D3D_OK; - return IDirect3DDevice7_DrawIndexedPrimitiveVB(&device->IDirect3DDevice7_iface, PrimitiveType, - &vb->IDirect3DVertexBuffer7_iface, 0, IndexCount, Indices, IndexCount, Flags); + return IDirect3DDevice7_DrawIndexedPrimitiveVB(&device->IDirect3DDevice7_iface, primitive_type, + &vb->IDirect3DVertexBuffer7_iface, 0, vb->size / stride, indices, index_count, flags); } /***************************************************************************** diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 0116106..cb7582c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15523,12 +15523,16 @@ static void test_sysmem_draw(void) } quad[] = { + {{ 0.0f, 0.0f, 0.0f}, 0x00000000}, + {{ 0.0f, 0.0f, 0.0f}, 0x00000000}, + {{ 0.0f, 0.0f, 0.0f}, 0x00000000}, + {{ 0.0f, 0.0f, 0.0f}, 0x00000000}, {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, }; - static WORD indices[] = {0, 1, 2, 3}; + static WORD indices[] = {4, 5, 6, 7}; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -15557,7 +15561,7 @@ static void test_sysmem_draw(void) vb_desc.dwSize = sizeof(vb_desc); vb_desc.dwCaps = D3DVBCAPS_SYSTEMMEMORY; vb_desc.dwFVF = D3DFVF_XYZ | D3DFVF_DIFFUSE; - vb_desc.dwNumVertices = 4; + vb_desc.dwNumVertices = ARRAY_SIZE(quad); hr = IDirect3D3_CreateVertexBuffer(d3d, &vb_desc, &vb, 0, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -15572,7 +15576,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice3_BeginScene(device); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 4, 0); + hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 4, 4, 0); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_EndScene(device); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf: Disconnect removed nodes.
by Alexandre Julliard May 8, 2019

May 8, 2019

Module: wine Branch: master Commit: 37a7b65140c928de8e029d5bea3d27ba1c346573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37a7b65140c928de8e029d5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 8 14:46:42 2019 +0300 mf: Disconnect removed nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 10 ++--- dlls/mf/topology.c | 123 +++++++++++++++++++++++++++++++---------------------- 2 files changed, 74 insertions(+), 59 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8b3b8b4..ff3290a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -589,10 +589,9 @@ static void test_topology(void) hr = IMFTopology_Clear(topology); ok(hr == S_OK, "Failed to clear topology, hr %#x.\n", hr); -todo_wine { EXPECT_REF(node, 1); EXPECT_REF(node2, 1); -} + /* Removing connected node breaks connection. */ hr = IMFTopology_AddNode(topology, node); ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); @@ -606,12 +605,10 @@ todo_wine { hr = IMFTopology_RemoveNode(topology, node); ok(hr == S_OK, "Failed to remove a node, hr %#x.\n", hr); -todo_wine { EXPECT_REF(node, 1); EXPECT_REF(node2, 2); -} + hr = IMFTopologyNode_GetOutput(node, 0, &node3, &index); -todo_wine ok(hr == MF_E_NOT_FOUND, "Unexpected hr %#x.\n", hr); hr = IMFTopology_AddNode(topology, node); @@ -623,10 +620,9 @@ todo_wine hr = IMFTopology_RemoveNode(topology, node2); ok(hr == S_OK, "Failed to remove a node, hr %#x.\n", hr); -todo_wine { EXPECT_REF(node, 2); EXPECT_REF(node2, 1); -} + IMFTopologyNode_Release(node); IMFTopologyNode_Release(node2); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index c10bc6a..e10bc8b 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -174,12 +174,81 @@ static ULONG WINAPI topology_AddRef(IMFTopology *iface) return refcount; } +static HRESULT topology_node_disconnect_output(struct topology_node *node, DWORD output_index) +{ + struct topology_node *connection = NULL; + struct node_stream *stream; + DWORD connection_stream; + HRESULT hr = S_OK; + + EnterCriticalSection(&node->cs); + + if (output_index < node->outputs.count) + { + stream = &node->outputs.streams[output_index]; + + if (stream->connection) + { + connection = stream->connection; + connection_stream = stream->connection_stream; + stream->connection = NULL; + stream->connection_stream = 0; + } + else + hr = MF_E_NOT_FOUND; + } + else + hr = E_INVALIDARG; + + LeaveCriticalSection(&node->cs); + + if (connection) + { + EnterCriticalSection(&connection->cs); + + if (connection_stream < connection->inputs.count) + { + stream = &connection->inputs.streams[connection_stream]; + + if (stream->connection) + { + stream->connection = NULL; + stream->connection_stream = 0; + } + } + + LeaveCriticalSection(&connection->cs); + + IMFTopologyNode_Release(&connection->IMFTopologyNode_iface); + IMFTopologyNode_Release(&node->IMFTopologyNode_iface); + } + + return hr; +} + +static void topology_node_disconnect(struct topology_node *node) +{ + struct node_stream *stream; + size_t i; + + for (i = 0; i < node->outputs.count; ++i) + topology_node_disconnect_output(node, i); + + for (i = 0; i < node->inputs.count; ++i) + { + stream = &node->inputs.streams[i]; + if (stream->connection) + topology_node_disconnect_output(stream->connection, stream->connection_stream); + } +} + static void topology_clear(struct topology *topology) { size_t i; for (i = 0; i < topology->nodes.count; ++i) { + topology_node_disconnect(topology->nodes.nodes[i]); IMFTopologyNode_Release(&topology->nodes.nodes[i]->IMFTopologyNode_iface); } heap_free(topology->nodes.nodes); @@ -551,6 +620,8 @@ static HRESULT WINAPI topology_RemoveNode(IMFTopology *iface, IMFTopologyNode *n { if (&topology->nodes.nodes[i]->IMFTopologyNode_iface == node) { + topology_node_disconnect(topology->nodes.nodes[i]); + IMFTopologyNode_Release(&topology->nodes.nodes[i]->IMFTopologyNode_iface); count = topology->nodes.count - i - 1; if (count) { @@ -1248,58 +1319,6 @@ static HRESULT WINAPI topology_node_GetOutputCount(IMFTopologyNode *iface, DWORD return S_OK; } -static HRESULT topology_node_disconnect_output(struct topology_node *node, DWORD output_index) -{ - struct topology_node *connection = NULL; - struct node_stream *stream; - DWORD connection_stream; - HRESULT hr = S_OK; - - EnterCriticalSection(&node->cs); - - if (output_index < node->outputs.count) - { - stream = &node->outputs.streams[output_index]; - - if (stream->connection) - { - connection = stream->connection; - connection_stream = stream->connection_stream; - stream->connection = NULL; - stream->connection_stream = 0; - } - else - hr = MF_E_NOT_FOUND; - } - else - hr = E_INVALIDARG; - - LeaveCriticalSection(&node->cs); - - if (connection) - { - EnterCriticalSection(&connection->cs); - - if (connection_stream < connection->inputs.count) - { - stream = &connection->inputs.streams[connection_stream]; - - if (stream->connection) - { - stream->connection = NULL; - stream->connection_stream = 0; - } - } - - LeaveCriticalSection(&connection->cs); - - IMFTopologyNode_Release(&connection->IMFTopologyNode_iface); - IMFTopologyNode_Release(&node->IMFTopologyNode_iface); - } - - return hr; -} - static HRESULT WINAPI topology_node_ConnectOutput(IMFTopologyNode *iface, DWORD output_index, IMFTopologyNode *peer, DWORD input_index) {

1 0

Nikolay Sivov : mf: Rework node collection implementation.
by Alexandre Julliard May 8, 2019

May 8, 2019

Module: wine Branch: master Commit: 184f99945975728d0ac4a3c544b13f1b40bf1c9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=184f99945975728d0ac4a3c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 8 14:46:41 2019 +0300 mf: Rework node collection implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 193 +++++++++++++++++++++++++++-------------------------- 1 file changed, 99 insertions(+), 94 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index eaae7c9..c10bc6a 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -45,15 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); static LONG next_node_id; static TOPOID next_topology_id; -struct topology -{ - IMFTopology IMFTopology_iface; - LONG refcount; - IMFAttributes *attributes; - IMFCollection *nodes; - TOPOID id; -}; - struct node_stream { IMFMediaType *preferred_type; @@ -81,6 +72,20 @@ struct topology_node CRITICAL_SECTION cs; }; +struct topology +{ + IMFTopology IMFTopology_iface; + LONG refcount; + IMFAttributes *attributes; + struct + { + struct topology_node **nodes; + size_t size; + size_t count; + } nodes; + TOPOID id; +}; + struct topology_loader { IMFTopoLoader IMFTopoLoader_iface; @@ -169,19 +174,32 @@ static ULONG WINAPI topology_AddRef(IMFTopology *iface) return refcount; } +static void topology_clear(struct topology *topology) +{ + size_t i; + + for (i = 0; i < topology->nodes.count; ++i) + { + IMFTopologyNode_Release(&topology->nodes.nodes[i]->IMFTopologyNode_iface); + } + heap_free(topology->nodes.nodes); + topology->nodes.nodes = NULL; + topology->nodes.count = 0; + topology->nodes.size = 0; +} + static ULONG WINAPI topology_Release(IMFTopology *iface) { struct topology *topology = impl_from_IMFTopology(iface); ULONG refcount = InterlockedDecrement(&topology->refcount); - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { if (topology->attributes) IMFAttributes_Release(topology->attributes); - if (topology->nodes) - IMFCollection_Release(topology->nodes); + topology_clear(topology); heap_free(topology); } @@ -476,80 +494,72 @@ static HRESULT WINAPI topology_GetTopologyID(IMFTopology *iface, TOPOID *id) return S_OK; } -static HRESULT topology_get_node_by_id(const struct topology *topology, TOPOID id, IMFTopologyNode **node) +static HRESULT topology_get_node_by_id(const struct topology *topology, TOPOID id, struct topology_node **node) { - IMFTopologyNode *iter; - unsigned int i = 0; + size_t i = 0; - while (IMFCollection_GetElement(topology->nodes, i++, (IUnknown **)&iter) == S_OK) + for (i = 0; i < topology->nodes.count; ++i) { - TOPOID node_id; - HRESULT hr; - - hr = IMFTopologyNode_GetTopoNodeID(iter, &node_id); - if (FAILED(hr)) - { - IMFTopologyNode_Release(iter); - return hr; - } - - if (node_id == id) + if (topology->nodes.nodes[i]->id == id) { - *node = iter; + *node = topology->nodes.nodes[i]; + IMFTopologyNode_AddRef(&(*node)->IMFTopologyNode_iface); return S_OK; } - - IMFTopologyNode_Release(iter); } return MF_E_NOT_FOUND; } -static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node) +static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node_iface) { struct topology *topology = impl_from_IMFTopology(iface); - IMFTopologyNode *match; - HRESULT hr; - TOPOID id; + struct topology_node *node = unsafe_impl_from_IMFTopologyNode(node_iface); + struct topology_node *match; - TRACE("(%p)->(%p)\n", iface, node); + TRACE("%p, %p.\n", iface, node_iface); if (!node) return E_POINTER; - if (FAILED(hr = IMFTopologyNode_GetTopoNodeID(node, &id))) - return hr; + if (SUCCEEDED(topology_get_node_by_id(topology, node->id, &match))) + { + IMFTopologyNode_Release(&match->IMFTopologyNode_iface); + return E_INVALIDARG; + } - if (FAILED(topology_get_node_by_id(topology, id, &match))) - return IMFCollection_AddElement(topology->nodes, (IUnknown *)node); + if (!mf_array_reserve((void **)&topology->nodes.nodes, &topology->nodes.size, topology->nodes.count + 1, + sizeof(*topology->nodes.nodes))) + { + return E_OUTOFMEMORY; + } - IMFTopologyNode_Release(match); + topology->nodes.nodes[topology->nodes.count++] = node; + IMFTopologyNode_AddRef(&node->IMFTopologyNode_iface); - return E_INVALIDARG; + return S_OK; } static HRESULT WINAPI topology_RemoveNode(IMFTopology *iface, IMFTopologyNode *node) { struct topology *topology = impl_from_IMFTopology(iface); - unsigned int i = 0; - IUnknown *element; + size_t i, count; - TRACE("(%p)->(%p)\n", iface, node); + TRACE("%p, %p.\n", iface, node); - while (IMFCollection_GetElement(topology->nodes, i, &element) == S_OK) + for (i = 0; i < topology->nodes.count; ++i) { - BOOL match = element == (IUnknown *)node; - - IUnknown_Release(element); - - if (match) + if (&topology->nodes.nodes[i]->IMFTopologyNode_iface == node) { - IMFCollection_RemoveElement(topology->nodes, i, &element); - IUnknown_Release(element); + count = topology->nodes.count - i - 1; + if (count) + { + memmove(&topology->nodes.nodes[i], &topology->nodes.nodes[i + 1], + count * sizeof(*topology->nodes.nodes)); + } + topology->nodes.count--; return S_OK; } - - ++i; } return E_INVALIDARG; @@ -558,38 +568,43 @@ static HRESULT WINAPI topology_RemoveNode(IMFTopology *iface, IMFTopologyNode *n static HRESULT WINAPI topology_GetNodeCount(IMFTopology *iface, WORD *count) { struct topology *topology = impl_from_IMFTopology(iface); - DWORD nodecount; - HRESULT hr; - TRACE("(%p)->(%p)\n", iface, count); + TRACE("%p, %p.\n", iface, count); - hr = IMFCollection_GetElementCount(topology->nodes, count ? &nodecount : NULL); - if (count) - *count = nodecount; + if (!count) + return E_POINTER; - return hr; + *count = topology->nodes.count; + + return S_OK; } static HRESULT WINAPI topology_GetNode(IMFTopology *iface, WORD index, IMFTopologyNode **node) { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%u, %p)\n", iface, index, node); + TRACE("%p, %u, %p.\n", iface, index, node); if (!node) return E_POINTER; - return SUCCEEDED(IMFCollection_GetElement(topology->nodes, index, (IUnknown **)node)) ? - S_OK : MF_E_INVALIDINDEX; + if (index >= topology->nodes.count) + return MF_E_INVALIDINDEX; + + *node = &topology->nodes.nodes[index]->IMFTopologyNode_iface; + IMFTopologyNode_AddRef(*node); + + return S_OK; } static HRESULT WINAPI topology_Clear(IMFTopology *iface) { struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)\n", iface); + TRACE("%p.\n", iface); - return IMFCollection_RemoveAllElements(topology->nodes); + topology_clear(topology); + return S_OK; } static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src_topology) @@ -599,36 +614,27 @@ static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src_to return E_NOTIMPL; } -static HRESULT WINAPI topology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTopologyNode **node) +static HRESULT WINAPI topology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTopologyNode **ret) { struct topology *topology = impl_from_IMFTopology(iface); - - TRACE("(%p)->(%p)\n", iface, node); - - return topology_get_node_by_id(topology, id, node); -} - -static HRESULT topology_add_node_of_type(const struct topology *topology, IMFTopologyNode *node, - MF_TOPOLOGY_TYPE filter, IMFCollection *collection) -{ - MF_TOPOLOGY_TYPE node_type; + struct topology_node *node; HRESULT hr; - if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) - return hr; + TRACE("%p, %p.\n", iface, ret); - if (node_type != filter) - return S_OK; + if (SUCCEEDED(hr = topology_get_node_by_id(topology, id, &node))) + *ret = &node->IMFTopologyNode_iface; + else + *ret = NULL; - return IMFCollection_AddElement(collection, (IUnknown *)node); + return hr; } static HRESULT topology_get_node_collection(const struct topology *topology, MF_TOPOLOGY_TYPE node_type, IMFCollection **collection) { - IMFTopologyNode *node; - unsigned int i = 0; HRESULT hr; + size_t i; if (!collection) return E_POINTER; @@ -636,15 +642,17 @@ static HRESULT topology_get_node_collection(const struct topology *topology, MF_ if (FAILED(hr = MFCreateCollection(collection))) return hr; - while (IMFCollection_GetElement(topology->nodes, i++, (IUnknown **)&node) == S_OK) + for (i = 0; i < topology->nodes.count; ++i) { - hr = topology_add_node_of_type(topology, node, node_type, *collection); - IMFTopologyNode_Release(node); - if (FAILED(hr)) + if (topology->nodes.nodes[i]->node_type == node_type) { - IMFCollection_Release(*collection); - *collection = NULL; - break; + if (FAILED(hr = IMFCollection_AddElement(*collection, + (IUnknown *)&topology->nodes.nodes[i]->IMFTopologyNode_iface))) + { + IMFCollection_Release(*collection); + *collection = NULL; + break; + } } } @@ -750,9 +758,6 @@ HRESULT WINAPI MFCreateTopology(IMFTopology **topology) object->refcount = 1; hr = MFCreateAttributes(&object->attributes, 0); - if (SUCCEEDED(hr)) - hr = MFCreateCollection(&object->nodes); - if (FAILED(hr)) { IMFTopology_Release(&object->IMFTopology_iface);

1 0

Nikolay Sivov : mf: Implement node connections.
by Alexandre Julliard May 8, 2019

May 8, 2019

Module: wine Branch: master Commit: 6b1a33ce93cc57bcc1346d09a3f8d429e3d7bd88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b1a33ce93cc57bcc1346d09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 8 14:46:40 2019 +0300 mf: Implement node connections. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 115 +++++++++++++++++++++++++- dlls/mf/topology.c | 235 ++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 308 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b1a33ce93cc57bcc134…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_load_tex_coords().
by Alexandre Julliard May 8, 2019

May 8, 2019

Module: wine Branch: master Commit: 34ab198faf9990b3371c10519dfc6d0162b3953d URL: https://source.winehq.org/git/wine.git/?a=commit;h=34ab198faf9990b3371c1051… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 8 18:09:38 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_load_tex_coords(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 13 +++++++------ dlls/wined3d/state.c | 3 ++- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e52e4bc..97d7656 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5036,19 +5036,19 @@ void context_unload_tex_coords(const struct wined3d_context *context) } } -void context_load_tex_coords(const struct wined3d_context *context, const struct wined3d_stream_info *si, - GLuint *current_bo, const struct wined3d_state *state) +void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, + const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_format_gl *format_gl; unsigned int mapped_stage = 0; unsigned int texture_idx; - for (texture_idx = 0; texture_idx < context->d3d_info->limits.ffp_blend_stages; ++texture_idx) + for (texture_idx = 0; texture_idx < context_gl->c.d3d_info->limits.ffp_blend_stages; ++texture_idx) { unsigned int coord_idx = state->texture_states[texture_idx][WINED3D_TSS_TEXCOORD_INDEX]; - if ((mapped_stage = context->tex_unit_map[texture_idx]) == WINED3D_UNMAPPED_STAGE) + if ((mapped_stage = context_gl->c.tex_unit_map[texture_idx]) == WINED3D_UNMAPPED_STAGE) continue; if (mapped_stage >= gl_info->limits.texture_coords) @@ -5116,6 +5116,7 @@ static void context_unload_vertex_data(struct wined3d_context *context) static void context_load_vertex_data(struct wined3d_context *context, const struct wined3d_stream_info *si, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_stream_info_element *e; const struct wined3d_format_gl *format_gl; @@ -5305,7 +5306,7 @@ static void context_load_vertex_data(struct wined3d_context *context, } /* Texture coordinates */ - context_load_tex_coords(context, si, &current_bo, state); + wined3d_context_gl_load_tex_coords(context_gl, si, &current_bo, state); } static void context_unload_numbered_array(struct wined3d_context *context, unsigned int i) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1d2ffbb..0f35f2a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3315,6 +3315,7 @@ static void transform_texture(struct wined3d_context *context, const struct wine static void tex_coordindex(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); static const GLfloat s_plane[] = { 1.0f, 0.0f, 0.0f, 0.0f }; static const GLfloat t_plane[] = { 0.0f, 1.0f, 0.0f, 0.0f }; static const GLfloat r_plane[] = { 0.0f, 0.0f, 1.0f, 0.0f }; @@ -3483,7 +3484,7 @@ static void tex_coordindex(struct wined3d_context *context, const struct wined3d GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; context_unload_tex_coords(context); - context_load_tex_coords(context, &context->stream_info, &curVBO, state); + wined3d_context_gl_load_tex_coords(context_gl, &context->stream_info, &curVBO, state); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fd27c6e..a226cd4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2054,6 +2054,8 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, + const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; struct wined3d_fb_state { @@ -2236,8 +2238,6 @@ void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; -void context_load_tex_coords(const struct wined3d_context *context, const struct wined3d_stream_info *si, - GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; struct wined3d_context *context_reacquire(const struct wined3d_device *device,

1 0

Andrew Eikum : winebus.sys: Report SDL controller buttons in the right order.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: ba79a14369e52f7e932211288bde0a487155b439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba79a14369e52f7e93221128… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 7 09:01:57 2019 -0500 winebus.sys: Report SDL controller buttons in the right order. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 8 ++++---- dlls/xinput1_3/hid.c | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 8ff8373..59c1698 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -808,10 +808,10 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) case SDL_CONTROLLER_BUTTON_Y: usage = 3; break; case SDL_CONTROLLER_BUTTON_LEFTSHOULDER: usage = 4; break; case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: usage = 5; break; - case SDL_CONTROLLER_BUTTON_LEFTSTICK: usage = 6; break; - case SDL_CONTROLLER_BUTTON_RIGHTSTICK: usage = 7; break; - case SDL_CONTROLLER_BUTTON_START: usage = 8; break; - case SDL_CONTROLLER_BUTTON_BACK: usage = 9; break; + case SDL_CONTROLLER_BUTTON_BACK: usage = 6; break; + case SDL_CONTROLLER_BUTTON_START: usage = 7; break; + case SDL_CONTROLLER_BUTTON_LEFTSTICK: usage = 8; break; + case SDL_CONTROLLER_BUTTON_RIGHTSTICK: usage = 9; break; case SDL_CONTROLLER_BUTTON_GUIDE: usage = 10; break; case SDL_CONTROLLER_BUTTON_DPAD_UP: diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index f0036b1..34e4e51 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -375,11 +375,10 @@ void HID_update_state(xinput_controller* device) case 4: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break; case 5: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break; case 6: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break; - case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; - case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; - - case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; - case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; + case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; + case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; + case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; + case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; } }

1 0

Andrew Eikum : winebus.sys: Report hatswitch values correctly.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 2239aae97f274d21c92857a4561bb10e483556f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2239aae97f274d21c92857a4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 7 09:01:13 2019 -0500 winebus.sys: Report hatswitch values correctly. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 21 ++++++++++++--------- dlls/winebus.sys/bus_udev.c | 21 ++++++++++++--------- dlls/winebus.sys/controller.h | 2 +- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 701d5a5..21f4aed 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -303,15 +303,18 @@ static void set_hat_value(struct platform_private *ext, int index, int value) offset = ext->hat_start + index; switch (value) { - case SDL_HAT_CENTERED: ext->report_buffer[offset] = 8; break; - case SDL_HAT_UP: ext->report_buffer[offset] = 0; break; - case SDL_HAT_RIGHTUP: ext->report_buffer[offset] = 1; break; - case SDL_HAT_RIGHT: ext->report_buffer[offset] = 2; break; - case SDL_HAT_RIGHTDOWN: ext->report_buffer[offset] = 3; break; - case SDL_HAT_DOWN: ext->report_buffer[offset] = 4; break; - case SDL_HAT_LEFTDOWN: ext->report_buffer[offset] = 5; break; - case SDL_HAT_LEFT: ext->report_buffer[offset] = 6; break; - case SDL_HAT_LEFTUP: ext->report_buffer[offset] = 7; break; + /* 8 1 2 + * 7 0 3 + * 6 5 4 */ + case SDL_HAT_CENTERED: ext->report_buffer[offset] = 0; break; + case SDL_HAT_UP: ext->report_buffer[offset] = 1; break; + case SDL_HAT_RIGHTUP: ext->report_buffer[offset] = 2; break; + case SDL_HAT_RIGHT: ext->report_buffer[offset] = 3; break; + case SDL_HAT_RIGHTDOWN: ext->report_buffer[offset] = 4; break; + case SDL_HAT_DOWN: ext->report_buffer[offset] = 5; break; + case SDL_HAT_LEFTDOWN: ext->report_buffer[offset] = 6; break; + case SDL_HAT_LEFT: ext->report_buffer[offset] = 7; break; + case SDL_HAT_LEFTUP: ext->report_buffer[offset] = 8; break; } } diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 9baccf6..ddda78d 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -303,32 +303,35 @@ static void set_abs_axis_value(struct wine_input_private *ext, int code, int val ext->hat_values[index] = value; if ((code - ABS_HAT0X) % 2) index--; + /* 8 1 2 + * 7 0 3 + * 6 5 4 */ if (ext->hat_values[index] == 0) { if (ext->hat_values[index+1] == 0) - value = 8; - else if (ext->hat_values[index+1] < 0) value = 0; + else if (ext->hat_values[index+1] < 0) + value = 1; else - value = 4; + value = 5; } else if (ext->hat_values[index] > 0) { if (ext->hat_values[index+1] == 0) - value = 2; + value = 3; else if (ext->hat_values[index+1] < 0) - value = 1; + value = 2; else - value = 3; + value = 4; } else { if (ext->hat_values[index+1] == 0) - value = 6; - else if (ext->hat_values[index+1] < 0) value = 7; + else if (ext->hat_values[index+1] < 0) + value = 8; else - value = 5; + value = 6; } ext->current_report_buffer[ext->hat_map[index]] = value; } diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h index d443d6c..5fce16b 100644 --- a/dlls/winebus.sys/controller.h +++ b/dlls/winebus.sys/controller.h @@ -75,7 +75,7 @@ static const BYTE REPORT_REL_AXIS_TAIL[] = { static const BYTE REPORT_HATSWITCH[] = { 0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */ 0x09, 0x39, /* USAGE (Hatswitch) */ - 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ + 0x15, 0x01, /* LOGICAL_MINIMUM (1) */ 0x25, 0x08, /* LOGICAL_MAXIMUM (0x08) */ 0x35, 0x00, /* PHYSICAL_MINIMUM (0) */ 0x45, 0x08, /* PHYSICAL_MAXIMUM (8) */

1 0