wine-devel May 2019

wine-devel@winehq.org

96 participants
789 discussions

[PATCH] wined3d: Propagate HRESULTs in context creation functions.
by Józef Kucia 08 May '19

08 May '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 1f4ba793ed85..b08ba62ad037 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 d39e6514454a..fad78ae5931e 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); -- 2.21.0

3 2

[PATCH] ddraw: Fix vertex count in d3d_device3_DrawIndexedPrimitiveVB().
by Paul Gofman 08 May '19

08 May '19

Fixes 1 of 2 issues for bug https://bugs.winehq.org/show_bug.cgi?id=47129. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- 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 054e2dccc9..18e585407c 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 0116106faa..cb7582c1d4 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); -- 2.21.0

3 2

[PATCH] riched20: Implement tests for IText{Selection, Range}::Set{Start, End}.
by Vijay Kiran Kamuju 08 May '19

08 May '19

From: Jactry Zeng <wine(a)jactry.com> V2: convert macros to static functions (Vijay Kiran Kamuju) Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/riched20/tests/richole.c | 163 ++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 40feb76f2b..38d28fb0e2 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3763,6 +3763,165 @@ static void test_MoveEnd(void) ITextRange_Release(range); } +#define CHECK_RANGE_START(txtrange, pos, expected_start, expected_end) \ + _check_range_start(txtrange, pos, expected_start, expected_end, __LINE__) +static void _check_range_start(ITextRange *txtrange, LONG pos, LONG expected_start, LONG expected_end, int line) +{ + HRESULT hres; + LONG start, end; + + hres = ITextRange_SetStart(txtrange, pos); + ok_(__FILE__,line)(hres == S_OK, "ITextRange_SetStart\n"); + ITextRange_GetStart(txtrange, &start); + ITextRange_GetEnd(txtrange, &end); + ok_(__FILE__,line)(start == expected_start, "got wrong start value: %d\n", start); + ok_(__FILE__,line)(end == expected_end, "got wrong end value: %d\n", end); +} + +static void test_ITextRange_SetStart(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hr; + LONG first, lim; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 4, lim = 8; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hr = ITextRange_SetStart(txtRge, first); + ok(hr == S_FALSE, "ITextRange_SetStart\n"); + + CHECK_RANGE_START(txtRge, 2, 2, 8); + CHECK_RANGE_START(txtRge, -1, 0, 8); + CHECK_RANGE_START(txtRge, 13, 12, 12); + + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + +#define CHECK_RANGE_END(txtrange, pos, expected_start, expected_end) \ + _check_range_end(txtrange, pos, expected_start, expected_end, __LINE__) +static void _check_range_end(ITextRange *txtrange, LONG pos, LONG expected_start, LONG expected_end, int line) +{ + HRESULT hres; + LONG start, end; + + hres = ITextRange_SetEnd(txtrange, pos); + ok_(__FILE__,line)(hres == S_OK, "ITextRange_SetEnd\n"); + ITextRange_GetStart(txtrange, &start); + ITextRange_GetEnd(txtrange, &end); + ok_(__FILE__,line)(start == expected_start, "got wrong start value: %d\n", start); + ok_(__FILE__,line)(end == expected_end, "got wrong end value: %d\n", end); +} + +static void test_ITextRange_SetEnd(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hr; + LONG first, lim; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 4, lim = 8; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hr = ITextRange_SetEnd(txtRge, lim); + ok(hr == S_FALSE, "ITextRange_SetEnd\n"); + + CHECK_RANGE_END(txtRge, 6, 4, 6); + CHECK_RANGE_END(txtRge, 14, 4, 13); + CHECK_RANGE_END(txtRge, -1, 0, 0); + + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + +#define CHECK_SELECTION_START(hwnd, txtselect, pos, expected_start, expected_end) \ + _check_selection_start(hwnd, txtselect, pos, expected_start, expected_end, __LINE__) +static void _check_selection_start(HWND hwnd, ITextSelection *txtselect, LONG pos, LONG expected_start, LONG expected_end, int line) +{ + HRESULT hres; + LONG start, end; + + hres = ITextSelection_SetStart(txtselect, pos); + ok_(__FILE__,line)(hres == S_OK, "ITextSelection_SetStart\n"); + SendMessageA(hwnd, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); \ + ok_(__FILE__,line)(start == expected_start, "got wrong start value: %d\n", start); + ok_(__FILE__,line)(end == expected_end, "got wrong end value: %d\n", end); +} + +static void test_ITextSelection_SetStart(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + HRESULT hr; + LONG first, lim; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 4, lim = 8; + SendMessageA(w, EM_SETSEL, first, lim); + hr = ITextSelection_SetStart(txtSel, first); + ok(hr == S_FALSE, "ITextSelection_SetStart\n"); + + CHECK_SELECTION_START(w, txtSel, 2, 2, 8); + CHECK_SELECTION_START(w, txtSel, -1, 0, 8); + CHECK_SELECTION_START(w, txtSel, 13, 12, 12); + + release_interfaces(&w, &reOle, &txtDoc, &txtSel); +} + +#define CHECK_SELECTION_END(hwnd, txtselect, pos, expected_start, expected_end) \ + _check_selection_end(hwnd, txtselect, pos, expected_start, expected_end, __LINE__) +static void _check_selection_end(HWND hwnd, ITextSelection *txtselect, LONG pos, LONG expected_start, LONG expected_end, int line) +{ + HRESULT hres; + LONG start, end; + + hres = ITextSelection_SetEnd(txtselect, pos); + ok_(__FILE__,line)(hres == S_OK, "ITextSelection_SetEnd\n"); + SendMessageA(hwnd, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); \ + ok_(__FILE__,line)(start == expected_start, "got wrong start value: %d\n", start); + ok_(__FILE__,line)(end == expected_end, "got wrong end value: %d\n", end); +} + +static void test_ITextSelection_SetEnd(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + HRESULT hr; + LONG first, lim; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 4, lim = 8; + SendMessageA(w, EM_SETSEL, first, lim); + hr = ITextSelection_SetEnd(txtSel, lim); + ok(hr == S_FALSE, "ITextSelection_SetEnd\n"); + + CHECK_SELECTION_END(w, txtSel, 6, 4, 6); + CHECK_SELECTION_END(w, txtSel, 14, 4, 13); + CHECK_SELECTION_END(w, txtSel, -1, 0, 0); + + release_interfaces(&w, &reOle, &txtDoc, &txtSel); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -3775,12 +3934,16 @@ START_TEST(richole) test_GetText(); test_ITextSelection_GetChar(); test_ITextSelection_GetStart_GetEnd(); + test_ITextSelection_SetStart(); + test_ITextSelection_SetEnd(); test_ITextSelection_Collapse(); test_ITextDocument_Range(); test_ITextRange_GetChar(); test_ITextRange_ScrollIntoView(); test_ITextRange_GetStart_GetEnd(); test_ITextRange_GetDuplicate(); + test_ITextRange_SetStart(); + test_ITextRange_SetEnd(); test_ITextRange_Collapse(); test_GetClientSite(); test_IOleWindow_GetWindow(); -- 2.21.0

3 2

[PATCH 1/4] mf: Implement node connections.
by Nikolay Sivov 08 May '19

08 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 115 +++++++++++++++++++++- dlls/mf/topology.c | 235 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 308 insertions(+), 42 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4974e043af..8b3b8b4373 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -39,7 +39,15 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "wine/test.h" -DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG expected_refcount, int line) +{ + ULONG refcount; + IUnknown_AddRef(obj); + refcount = IUnknown_Release(obj); + ok_(__FILE__, line)(refcount == expected_refcount, "Unexpected refcount %d, expected %d.\n", refcount, + expected_refcount); +} static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { @@ -79,9 +87,10 @@ static void test_topology(void) IMFTopologyNode *node, *node2, *node3; IMFMediaType *mediatype, *mediatype2; IMFTopology *topology, *topology2; + MF_TOPOLOGY_TYPE node_type; + UINT32 count, index; IUnknown *object; WORD node_count; - UINT32 count; DWORD size; HRESULT hr; TOPOID id; @@ -520,6 +529,108 @@ static void test_topology(void) } IMFTopology_Release(topology); + + /* Connect nodes. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + EXPECT_REF(node, 1); + EXPECT_REF(node2, 1); + + hr = IMFTopologyNode_ConnectOutput(node, 0, node2, 1); + ok(hr == S_OK, "Failed to connect nodes, hr %#x.\n", hr); + + EXPECT_REF(node, 2); + EXPECT_REF(node2, 2); + + IMFTopologyNode_Release(node); + + EXPECT_REF(node, 1); + EXPECT_REF(node2, 2); + + IMFTopologyNode_Release(node2); + + EXPECT_REF(node, 1); + EXPECT_REF(node2, 1); + + hr = IMFTopologyNode_GetNodeType(node2, &node_type); + ok(hr == S_OK, "Failed to get node type, hr %#x.\n", hr); + + IMFTopologyNode_Release(node); + + /* Connect within topology. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateTopology(&topology); + ok(hr == S_OK, "Failed to create topology, hr %#x.\n", hr); + + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + hr = IMFTopology_AddNode(topology, node2); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + EXPECT_REF(node, 2); + EXPECT_REF(node2, 2); + + hr = IMFTopologyNode_ConnectOutput(node, 0, node2, 1); + ok(hr == S_OK, "Failed to connect nodes, hr %#x.\n", hr); + + EXPECT_REF(node, 3); + EXPECT_REF(node2, 3); + + 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); + + hr = IMFTopology_AddNode(topology, node2); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + hr = IMFTopologyNode_ConnectOutput(node, 0, node2, 1); + ok(hr == S_OK, "Failed to connect nodes, hr %#x.\n", hr); + + 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); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + hr = IMFTopologyNode_ConnectOutput(node, 0, node2, 1); + ok(hr == S_OK, "Failed to connect nodes, hr %#x.\n", hr); + + 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); + + IMFTopology_Release(topology); } static HRESULT WINAPI test_getservice_QI(IMFGetService *iface, REFIID riid, void **obj) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 298200c40d..eaae7c910c 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -57,6 +57,15 @@ struct topology struct node_stream { IMFMediaType *preferred_type; + struct topology_node *connection; + DWORD connection_stream; +}; + +struct node_streams +{ + struct node_stream *streams; + size_t size; + size_t count; }; struct topology_node @@ -67,18 +76,8 @@ struct topology_node MF_TOPOLOGY_TYPE node_type; TOPOID id; IUnknown *object; - struct - { - struct node_stream *streams; - size_t size; - size_t count; - } inputs; - struct - { - struct node_stream *streams; - size_t size; - size_t count; - } outputs; + struct node_streams inputs; + struct node_streams outputs; CRITICAL_SECTION cs; }; @@ -104,6 +103,15 @@ static struct topology_node *impl_from_IMFTopologyNode(IMFTopologyNode *iface) return CONTAINING_RECORD(iface, struct topology_node, IMFTopologyNode_iface); } +static const IMFTopologyNodeVtbl topologynodevtbl; + +static struct topology_node *unsafe_impl_from_IMFTopologyNode(IMFTopologyNode *iface) +{ + if (!iface || iface->lpVtbl != &topologynodevtbl) + return NULL; + return impl_from_IMFTopologyNode(iface); +} + static struct topology_loader *impl_from_IMFTopoLoader(IMFTopoLoader *iface) { return CONTAINING_RECORD(iface, struct topology_loader, IMFTopoLoader_iface); @@ -114,6 +122,20 @@ static struct seq_source *impl_from_IMFSequencerSource(IMFSequencerSource *iface return CONTAINING_RECORD(iface, struct seq_source, IMFSequencerSource_iface); } +static HRESULT topology_node_reserve_streams(struct node_streams *streams, DWORD index) +{ + if (!mf_array_reserve((void **)&streams->streams, &streams->size, index + 1, sizeof(*streams->streams))) + return E_OUTOFMEMORY; + + if (index >= streams->count) + { + memset(&streams->streams[streams->count], 0, (index - streams->count + 1) * sizeof(*streams->streams)); + streams->count = index + 1; + } + + return S_OK; +} + static HRESULT WINAPI topology_QueryInterface(IMFTopology *iface, REFIID riid, void **out) { struct topology *topology = impl_from_IMFTopology(iface); @@ -459,14 +481,17 @@ static HRESULT topology_get_node_by_id(const struct topology *topology, TOPOID i IMFTopologyNode *iter; unsigned int i = 0; - while (IMFCollection_GetElement(topology->nodes, i, (IUnknown **)&iter) == S_OK) + while (IMFCollection_GetElement(topology->nodes, i++, (IUnknown **)&iter) == S_OK) { TOPOID node_id; HRESULT hr; hr = IMFTopologyNode_GetTopoNodeID(iter, &node_id); if (FAILED(hr)) + { + IMFTopologyNode_Release(iter); return hr; + } if (node_id == id) { @@ -474,7 +499,7 @@ static HRESULT topology_get_node_by_id(const struct topology *topology, TOPOID i return S_OK; } - ++i; + IMFTopologyNode_Release(iter); } return MF_E_NOT_FOUND; @@ -1218,35 +1243,177 @@ 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 *node, DWORD input_index) + IMFTopologyNode *peer, DWORD input_index) { - FIXME("(%p)->(%u, %p, %u)\n", iface, output_index, node, input_index); + struct topology_node *node = impl_from_IMFTopologyNode(iface); + struct topology_node *connection = unsafe_impl_from_IMFTopologyNode(peer); + struct node_stream *stream; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p, %u.\n", iface, output_index, peer, input_index); + + if (!connection) + { + WARN("External node implementations are not supported.\n"); + return E_UNEXPECTED; + } + + if (node->node_type == MF_TOPOLOGY_OUTPUT_NODE || connection->node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) + return E_FAIL; + + EnterCriticalSection(&node->cs); + EnterCriticalSection(&connection->cs); + + topology_node_disconnect_output(node, output_index); + if (input_index < connection->inputs.count) + { + stream = &connection->inputs.streams[input_index]; + if (stream->connection) + topology_node_disconnect_output(stream->connection, stream->connection_stream); + } + + hr = topology_node_reserve_streams(&node->outputs, output_index); + if (SUCCEEDED(hr)) + hr = topology_node_reserve_streams(&connection->inputs, input_index); + + if (SUCCEEDED(hr)) + { + node->outputs.streams[output_index].connection = connection; + IMFTopologyNode_AddRef(&node->outputs.streams[output_index].connection->IMFTopologyNode_iface); + node->outputs.streams[output_index].connection_stream = input_index; + connection->inputs.streams[input_index].connection = node; + IMFTopologyNode_AddRef(&connection->inputs.streams[input_index].connection->IMFTopologyNode_iface); + connection->inputs.streams[input_index].connection_stream = output_index; + } + + LeaveCriticalSection(&connection->cs); + LeaveCriticalSection(&node->cs); + + return hr; } -static HRESULT WINAPI topology_node_DisconnectOutput(IMFTopologyNode *iface, DWORD index) +static HRESULT WINAPI topology_node_DisconnectOutput(IMFTopologyNode *iface, DWORD output_index) { - FIXME("(%p)->(%u)\n", iface, index); + struct topology_node *node = impl_from_IMFTopologyNode(iface); - return E_NOTIMPL; + TRACE("%p, %u.\n", iface, output_index); + + return topology_node_disconnect_output(node, output_index); } -static HRESULT WINAPI topology_node_GetInput(IMFTopologyNode *iface, DWORD input_index, IMFTopologyNode **node, +static HRESULT WINAPI topology_node_GetInput(IMFTopologyNode *iface, DWORD input_index, IMFTopologyNode **ret, DWORD *output_index) { - FIXME("(%p)->(%u, %p, %p)\n", iface, input_index, node, output_index); + struct topology_node *node = impl_from_IMFTopologyNode(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %p, %p.\n", iface, input_index, ret, output_index); + + EnterCriticalSection(&node->cs); + + if (input_index < node->inputs.count) + { + const struct node_stream *stream = &node->inputs.streams[input_index]; + + if (stream->connection) + { + *ret = &stream->connection->IMFTopologyNode_iface; + IMFTopologyNode_AddRef(*ret); + *output_index = stream->connection_stream; + } + else + hr = MF_E_NOT_FOUND; + } + else + hr = E_INVALIDARG; + + LeaveCriticalSection(&node->cs); + + return hr; } -static HRESULT WINAPI topology_node_GetOutput(IMFTopologyNode *iface, DWORD output_index, IMFTopologyNode **node, +static HRESULT WINAPI topology_node_GetOutput(IMFTopologyNode *iface, DWORD output_index, IMFTopologyNode **ret, DWORD *input_index) { - FIXME("(%p)->(%u, %p, %p)\n", iface, output_index, node, input_index); + struct topology_node *node = impl_from_IMFTopologyNode(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %p, %p.\n", iface, output_index, ret, input_index); + + EnterCriticalSection(&node->cs); + + if (output_index < node->outputs.count) + { + const struct node_stream *stream = &node->outputs.streams[output_index]; + + if (stream->connection) + { + *ret = &stream->connection->IMFTopologyNode_iface; + IMFTopologyNode_AddRef(*ret); + *input_index = stream->connection_stream; + } + else + hr = MF_E_NOT_FOUND; + } + else + hr = E_INVALIDARG; + + LeaveCriticalSection(&node->cs); + + return hr; } static HRESULT WINAPI topology_node_SetOutputPrefType(IMFTopologyNode *iface, DWORD index, IMFMediaType *mediatype) @@ -1260,23 +1427,14 @@ static HRESULT WINAPI topology_node_SetOutputPrefType(IMFTopologyNode *iface, DW if (node->node_type != MF_TOPOLOGY_OUTPUT_NODE) { - if (mf_array_reserve((void **)&node->outputs.streams, &node->outputs.size, index + 1, - sizeof(*node->outputs.streams))) + if (SUCCEEDED(hr = topology_node_reserve_streams(&node->outputs, index))) { - if (index >= node->outputs.count) - { - memset(&node->outputs.streams[node->outputs.count], 0, - (index - node->outputs.count + 1) * sizeof(*node->outputs.streams)); - node->outputs.count = index + 1; - } if (node->outputs.streams[index].preferred_type) IMFMediaType_Release(node->outputs.streams[index].preferred_type); node->outputs.streams[index].preferred_type = mediatype; if (node->outputs.streams[index].preferred_type) IMFMediaType_AddRef(node->outputs.streams[index].preferred_type); } - else - hr = E_OUTOFMEMORY; } else hr = E_NOTIMPL; @@ -1322,8 +1480,7 @@ static HRESULT WINAPI topology_node_SetInputPrefType(IMFTopologyNode *iface, DWO if (node->node_type != MF_TOPOLOGY_SOURCESTREAM_NODE && !(index > 0 && node->node_type == MF_TOPOLOGY_TEE_NODE)) { - if (mf_array_reserve((void **)&node->inputs.streams, &node->inputs.size, index + 1, - sizeof(*node->inputs.streams))) + if (SUCCEEDED(hr = topology_node_reserve_streams(&node->inputs, index))) { if (index >= node->inputs.count) { @@ -1337,8 +1494,6 @@ static HRESULT WINAPI topology_node_SetInputPrefType(IMFTopologyNode *iface, DWO if (node->inputs.streams[index].preferred_type) IMFMediaType_AddRef(node->inputs.streams[index].preferred_type); } - else - hr = E_OUTOFMEMORY; } else hr = node->node_type == MF_TOPOLOGY_TEE_NODE ? MF_E_INVALIDTYPE : E_NOTIMPL; -- 2.20.1

2 7

stdin and my console app
by Jerry Geis 08 May '19

08 May '19

Hi all - I am trying to get stdin (from a file) working with my app. Seems like the very first character works from the file - but then nothing after that. I am trying to simulate the keyboard hitting. the following: o UserName 192.168.5.50 Is there something special to format this file for stdin ? is it because of carriage returns in the file - one entry per line ? How do I accomplish stdin from a file ? Thanks Jerry

3 3

[PATCH 3/8] kernel32: added CreateFileMappingNumaA
by Roman Stingler 08 May '19

08 May '19

Signed-off-by: Roman Stingler <roman.stingler(a)gmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 08a9a9cd9d..cc2283f886 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -283,7 +283,7 @@ @ stdcall CreateFile2(wstr long long long ptr) @ stdcall CreateFileA(str long long ptr long long long) @ stdcall CreateFileMappingA(long ptr long long long str) -# @ stub CreateFileMappingNumaA +@ stdcall CreateFileMappingNumaA(long ptr long long long str long) # @ stub CreateFileMappingNumaW @ stdcall CreateFileMappingW(long ptr long long long wstr) @ stdcall CreateFileW(wstr long long ptr long long long) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 9f5b614508..fd615575c4 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1346,6 +1346,16 @@ HANDLE WINAPI CreateFileMappingW( HANDLE file, LPSECURITY_ATTRIBUTES sa, DWORD p } +/*********************************************************************** + * CreateFileMappingNumaA (KERNEL32.@) + */ +HANDLE WINAPI CreateFileMappingNumaA(HANDLE file,LPSECURITY_ATTRIBUTES sa, + DWORD protect, DWORD size_high, DWORD size_low, LPCSTR name,DWORD preferred_numa_node) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /*********************************************************************** * OpenFileMappingA (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 01fc4f5448..f1668de5c2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1850,6 +1850,7 @@ WINBASEAPI HANDLE WINAPI CreateFileW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBU WINBASEAPI HANDLE WINAPI CreateFileMappingA(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCSTR); WINBASEAPI HANDLE WINAPI CreateFileMappingW(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCWSTR); #define CreateFileMapping WINELIB_NAME_AW(CreateFileMapping) +WINBASEAPI HANDLE WINAPI CreateFileMappingNumaA(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCSTR,DWORD); WINBASEAPI HANDLE WINAPI CreateIoCompletionPort(HANDLE,HANDLE,ULONG_PTR,DWORD); WINBASEAPI HANDLE WINAPI CreateJobObjectA(LPSECURITY_ATTRIBUTES,LPCSTR); WINBASEAPI HANDLE WINAPI CreateJobObjectW(LPSECURITY_ATTRIBUTES,LPCWSTR); -- 2.21.0

2 1

[PATCH v2] dinput: Ensure Cursor is visible on config dialog.
by Alistair Leslie-Hughes 08 May '19

08 May '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/config.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index db5878b904..bf44898589 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -375,9 +375,15 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w SendDlgItemMessageW(dialog, IDC_CONTROLLERCOMBO, CB_SETCURSEL, 0, 0); fill_device_object_list(dialog); + ShowCursor(TRUE); + break; } + case WM_DESTROY: + ShowCursor(FALSE); + break; + case WM_NOTIFY: switch (((LPNMHDR)lParam)->code) -- 2.20.1

1 0

[PATCH] dinput: Ensure Cursor is visible on config dialog.
by Alistair Leslie-Hughes 08 May '19

08 May '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/config.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index f42a44a74d6..cd2c4b921e7 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -413,9 +413,15 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w SendDlgItemMessageW(dialog, IDC_PLAYERCOMBO, CB_SETCURSEL, 0, 0); fill_device_object_list(dialog); + ShowCursor(TRUE); + break; } + case WM_DESTROY: + ShowCursor(FALSE); + break; + case WM_NOTIFY: switch (((LPNMHDR)lParam)->code) -- 2.20.1

2 1

[PATCH v2] dinput: Trace This pointer in a consistent way
by Alistair Leslie-Hughes 08 May '19

08 May '19

v2: Correct the format string on various FIXME. thanks Matteo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device.c | 75 ++++++++++++++++++------------- dlls/dinput/dinput_main.c | 4 +- dlls/dinput/joystick.c | 10 ++--- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 4 +- dlls/dinput/keyboard.c | 8 ++-- dlls/dinput/mouse.c | 3 +- 8 files changed, 63 insertions(+), 45 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index cfade08433..ade79474f6 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1181,7 +1181,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W ifa { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(%p this=%p,%s,%p)\n", iface, This, debugstr_guid(riid), ppobj); + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppobj); if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDirectInputDeviceA, riid) || IsEqualGUID(&IID_IDirectInputDevice2A, riid) || @@ -1231,7 +1231,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface, DIDEVICEOBJECTINSTANCEA ddoi; int i; - TRACE("(%p) %p,%p flags:%08x)\n", iface, lpCallback, lpvRef, dwFlags); + TRACE("(%p)->(%p,%p flags:%08x)\n", This, lpCallback, lpvRef, dwFlags); TRACE(" - flags = "); _dump_EnumObjects_flags(dwFlags); TRACE("\n"); @@ -1261,7 +1261,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, DIDEVICEOBJECTINSTANCEW ddoi; int i; - TRACE("(%p) %p,%p flags:%08x)\n", iface, lpCallback, lpvRef, dwFlags); + TRACE("(%p)->(%p,%p flags:%08x)\n", This, lpCallback, lpvRef, dwFlags); TRACE(" - flags = "); _dump_EnumObjects_flags(dwFlags); TRACE("\n"); @@ -1292,7 +1292,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); if (!IS_DIPROP(rguid)) return DI_OK; @@ -1357,7 +1357,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); if (!IS_DIPROP(rguid)) return DI_OK; @@ -1596,7 +1596,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A ifac HRESULT WINAPI IDirectInputDevice2WImpl_RunControlPanel(LPDIRECTINPUTDEVICE8W iface, HWND hwndOwner, DWORD dwFlags) { - FIXME("(this=%p,%p,0x%08x): stub!\n", iface, hwndOwner, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("%p)->(%p,0x%08x): stub!\n", This, hwndOwner, dwFlags); return DI_OK; } @@ -1610,7 +1611,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(LPDIRECTINPUTDEVICE8A if HRESULT WINAPI IDirectInputDevice2WImpl_Initialize(LPDIRECTINPUTDEVICE8W iface, HINSTANCE hinst, DWORD dwVersion, REFGUID rguid) { - FIXME("(this=%p,%p,%d,%s): stub!\n", iface, hinst, dwVersion, debugstr_guid(rguid)); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%d,%s): stub!\n", This, hinst, dwVersion, debugstr_guid(rguid)); return DI_OK; } @@ -1628,7 +1630,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Initialize(LPDIRECTINPUTDEVICE8A iface, HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPCDIEFFECT lpeff, LPDIRECTINPUTEFFECT *ppdef, LPUNKNOWN pUnkOuter) { - FIXME("(this=%p,%s,%p,%p,%p): stub!\n", iface, debugstr_guid(rguid), lpeff, ppdef, pUnkOuter); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%s,%p,%p,%p): stub!\n", This, debugstr_guid(rguid), lpeff, ppdef, pUnkOuter); FIXME("not available in the generic implementation\n"); *ppdef = NULL; @@ -1648,9 +1651,9 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumEffects( LPVOID lpvRef, DWORD dwFlags) { - FIXME("(this=%p,%p,%p,0x%08x): stub!\n", - iface, lpCallback, lpvRef, dwFlags); - + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("%p)->(%p,%p,0x%08x): stub!\n", This, lpCallback, lpvRef, dwFlags); + return DI_OK; } @@ -1660,9 +1663,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( LPVOID lpvRef, DWORD dwFlags) { - FIXME("(this=%p,%p,%p,0x%08x): stub!\n", - iface, lpCallback, lpvRef, dwFlags); - + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%p,0x%08x): stub!\n", This, lpCallback, lpvRef, dwFlags); + return DI_OK; } @@ -1671,8 +1674,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetEffectInfo( LPDIEFFECTINFOA lpdei, REFGUID rguid) { - FIXME("(this=%p,%p,%s): stub!\n", - iface, lpdei, debugstr_guid(rguid)); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("(%p)->(%p,%s): stub!\n", This, lpdei, debugstr_guid(rguid)); return DI_OK; } @@ -1681,14 +1684,15 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetEffectInfo( LPDIEFFECTINFOW lpdei, REFGUID rguid) { - FIXME("(this=%p,%p,%s): stub!\n", - iface, lpdei, debugstr_guid(rguid)); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s): stub!\n", This, lpdei, debugstr_guid(rguid)); return DI_OK; } HRESULT WINAPI IDirectInputDevice2WImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8W iface, LPDWORD pdwOut) { - FIXME("(this=%p,%p): stub!\n", iface, pdwOut); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p): stub!\n", This, pdwOut); return DI_OK; } @@ -1700,7 +1704,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetForceFeedbackState(LPDIRECTINPUTDEVIC HRESULT WINAPI IDirectInputDevice2WImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags) { - TRACE("(%p) 0x%08x:\n", iface, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + TRACE("(%p)->(0x%08x)\n", This, dwFlags); return DI_NOEFFECT; } @@ -1713,7 +1718,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SendForceFeedbackCommand(LPDIRECTINPUTDE HRESULT WINAPI IDirectInputDevice2WImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDEVICE8W iface, LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback, LPVOID lpvRef, DWORD dwFlags) { - FIXME("(this=%p,%p,%p,0x%08x): stub!\n", iface, lpCallback, lpvRef, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)0>(%p,%p,0x%08x): stub!\n", This, lpCallback, lpvRef, dwFlags); return DI_OK; } @@ -1726,7 +1732,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDE HRESULT WINAPI IDirectInputDevice2WImpl_Escape(LPDIRECTINPUTDEVICE8W iface, LPDIEFFESCAPE lpDIEEsc) { - FIXME("(this=%p,%p): stub!\n", iface, lpDIEEsc); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p): stub!\n", This, lpDIEEsc); return DI_OK; } @@ -1756,7 +1763,8 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SendDeviceData(LPDIRECTINPUTDEVICE8W ifa LPCDIDEVICEOBJECTDATA rgdod, LPDWORD pdwInOut, DWORD dwFlags) { - FIXME("(this=%p,0x%08x,%p,%p,0x%08x): stub!\n", iface, cbObjectData, rgdod, pdwInOut, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(0x%08x,%p,%p,0x%08x): stub!\n", This, cbObjectData, rgdod, pdwInOut, dwFlags); return DI_OK; } @@ -1776,7 +1784,8 @@ HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8A LPVOID pvRef, DWORD dwFlags) { - FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", iface, lpszFileName, pec, pvRef, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", This, lpszFileName, pec, pvRef, dwFlags); return DI_OK; } @@ -1787,7 +1796,8 @@ HRESULT WINAPI IDirectInputDevice7WImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8W LPVOID pvRef, DWORD dwFlags) { - FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", iface, debugstr_w(lpszFileName), pec, pvRef, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", This, debugstr_w(lpszFileName), pec, pvRef, dwFlags); return DI_OK; } @@ -1798,7 +1808,8 @@ HRESULT WINAPI IDirectInputDevice7AImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8A LPDIFILEEFFECT rgDiFileEft, DWORD dwFlags) { - FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", iface, lpszFileName, dwEntries, rgDiFileEft, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", This, lpszFileName, dwEntries, rgDiFileEft, dwFlags); return DI_OK; } @@ -1809,7 +1820,8 @@ HRESULT WINAPI IDirectInputDevice7WImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8W LPDIFILEEFFECT rgDiFileEft, DWORD dwFlags) { - FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", iface, debugstr_w(lpszFileName), dwEntries, rgDiFileEft, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", This, debugstr_w(lpszFileName), dwEntries, rgDiFileEft, dwFlags); return DI_OK; } @@ -1819,7 +1831,8 @@ HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifa LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); #define X(x) if (dwFlags & x) FIXME("\tdwFlags =|"#x"\n"); X(DIDBAM_DEFAULT) X(DIDBAM_PRESERVE) @@ -1833,7 +1846,8 @@ HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifa HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEIMAGEINFOHEADERA lpdiDevImageInfoHeader) { - FIXME("(%p)->(%p): stub !\n", iface, lpdiDevImageInfoHeader); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("(%p)->(%p): stub !\n", This, lpdiDevImageInfoHeader); return DI_OK; } @@ -1841,7 +1855,8 @@ HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface HRESULT WINAPI IDirectInputDevice8WImpl_GetImageInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEIMAGEINFOHEADERW lpdiDevImageInfoHeader) { - FIXME("(%p)->(%p): stub !\n", iface, lpdiDevImageInfoHeader); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p): stub !\n", This, lpdiDevImageInfoHeader); return DI_OK; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0929961209..198c6a8f10 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -677,7 +677,7 @@ static HRESULT WINAPI IDirectInputAImpl_Initialize(LPDIRECTINPUT7A iface, HINSTA { IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); - TRACE("(%p)->(%p, 0x%04x)\n", iface, hinst, version); + TRACE("(%p)->(%p, 0x%04x)\n", This, hinst, version); if (!hinst) return DIERR_INVALIDPARAM; @@ -934,7 +934,7 @@ static HRESULT WINAPI IDirectInput8AImpl_Initialize(LPDIRECTINPUT8A iface, HINST { IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); - TRACE("(%p)->(%p, 0x%04x)\n", iface, hinst, version); + TRACE("(%p)->(%p, 0x%04x)\n", This, hinst, version); if (!hinst) return DIERR_INVALIDPARAM; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 6bd0dc920d..8b3edb2c54 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -471,7 +471,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); int size; - TRACE("%p->(%p)\n",iface,lpDIDevCaps); + TRACE("%p->(%p)\n",This,lpDIDevCaps); if (lpDIDevCaps == NULL) { WARN("invalid pointer\n"); @@ -554,7 +554,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF { JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p,%s,%p)\n", This, debugstr_guid(rguid), pdiph); if (TRACE_ON(dinput)) _dump_DIPROPHEADER(pdiph); @@ -637,7 +637,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( DIPROPDWORD pd; DWORD index = 0; - TRACE("(%p,%p)\n", iface, pdidi); + TRACE("(%p,%p)\n", This, pdidi); if (pdidi == NULL) { WARN("invalid pointer\n"); @@ -782,7 +782,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, unsigned int i, j; BOOL has_actions = FALSE; - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); for (i=0; i < lpdiaf->dwNumActions; i++) { @@ -860,7 +860,7 @@ HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, { JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); return _set_action_map(iface, lpdiaf, lpszUserName, dwFlags, This->base.data_format.wine_df); } diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 7a7f2a6899..5c4a35323d 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -716,7 +716,7 @@ static HRESULT WINAPI JoystickLinuxWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface { JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); if (!IS_DIPROP(rguid)) return DI_OK; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index d386403bd1..3ab04835eb 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -984,7 +984,7 @@ static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF { JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); if (!IS_DIPROP(rguid)) return DI_OK; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 3295965179..5ddfcbb91f 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1427,7 +1427,7 @@ static HRESULT WINAPI JoystickWImpl_CreateEffect(IDirectInputDevice8W *iface, EffectImpl *effect; HRESULT hr; - TRACE("%p %s %p %p %p\n", iface, debugstr_guid(type), params, out, outer); + TRACE("(%p)->(%s %p %p %p)\n", This, debugstr_guid(type), params, out, outer); dump_DIEFFECT(params, type, 0); if(!This->ff){ @@ -1468,7 +1468,7 @@ static HRESULT WINAPI JoystickAImpl_CreateEffect(IDirectInputDevice8A *iface, { JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - TRACE("%p %s %p %p %p\n", iface, debugstr_guid(type), params, out, outer); + TRACE("(%p)->(%s %p %p %p)\n", This, debugstr_guid(type), params, out, outer); return JoystickWImpl_CreateEffect(&This->generic.base.IDirectInputDevice8W_iface, type, params, out, outer); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 42c0759969..8f1de68632 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -559,7 +559,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); if (!IS_DIPROP(rguid)) return DI_OK; @@ -625,7 +625,8 @@ static HRESULT WINAPI SysKeyboardWImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifac LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); return _build_action_map(iface, lpdiaf, lpszUserName, dwFlags, DIKEYBOARD_MASK, &c_dfDIKeyboard); } @@ -665,7 +666,8 @@ static HRESULT WINAPI SysKeyboardWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); return _set_action_map(iface, lpdiaf, lpszUserName, dwFlags, &c_dfDIKeyboard); } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 58c78a5cc7..199ed03c13 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -830,7 +830,8 @@ static HRESULT WINAPI SysMouseWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); return _set_action_map(iface, lpdiaf, lpszUserName, dwFlags, &c_dfDIMouse2); } -- 2.20.1

1 0

[PATCH 1/2] dinput: Trace This pointer in a consistent way
by Alistair Leslie-Hughes 07 May '19

07 May '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device.c | 73 ++++++++++++++++++++++++--------------- dlls/dinput/dinput_main.c | 4 +-- dlls/dinput/joystick.c | 10 +++--- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 4 +-- dlls/dinput/keyboard.c | 8 +++-- dlls/dinput/mouse.c | 3 +- 8 files changed, 63 insertions(+), 43 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index cfade08..ff9bbfb 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1181,7 +1181,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W ifa { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(%p this=%p,%s,%p)\n", iface, This, debugstr_guid(riid), ppobj); + TRACE("(%p) %s,%p)\n", This, debugstr_guid(riid), ppobj); if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDirectInputDeviceA, riid) || IsEqualGUID(&IID_IDirectInputDevice2A, riid) || @@ -1231,7 +1231,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface, DIDEVICEOBJECTINSTANCEA ddoi; int i; - TRACE("(%p) %p,%p flags:%08x)\n", iface, lpCallback, lpvRef, dwFlags); + TRACE("(%p) %p,%p flags:%08x)\n", This, lpCallback, lpvRef, dwFlags); TRACE(" - flags = "); _dump_EnumObjects_flags(dwFlags); TRACE("\n"); @@ -1261,7 +1261,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, DIDEVICEOBJECTINSTANCEW ddoi; int i; - TRACE("(%p) %p,%p flags:%08x)\n", iface, lpCallback, lpvRef, dwFlags); + TRACE("(%p) %p,%p flags:%08x)\n", This, lpCallback, lpvRef, dwFlags); TRACE(" - flags = "); _dump_EnumObjects_flags(dwFlags); TRACE("\n"); @@ -1292,7 +1292,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); if (!IS_DIPROP(rguid)) return DI_OK; @@ -1357,7 +1357,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); if (!IS_DIPROP(rguid)) return DI_OK; @@ -1596,7 +1596,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A ifac HRESULT WINAPI IDirectInputDevice2WImpl_RunControlPanel(LPDIRECTINPUTDEVICE8W iface, HWND hwndOwner, DWORD dwFlags) { - FIXME("(this=%p,%p,0x%08x): stub!\n", iface, hwndOwner, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("%p) %p,0x%08x: stub!\n", This, hwndOwner, dwFlags); return DI_OK; } @@ -1610,7 +1611,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(LPDIRECTINPUTDEVICE8A if HRESULT WINAPI IDirectInputDevice2WImpl_Initialize(LPDIRECTINPUTDEVICE8W iface, HINSTANCE hinst, DWORD dwVersion, REFGUID rguid) { - FIXME("(this=%p,%p,%d,%s): stub!\n", iface, hinst, dwVersion, debugstr_guid(rguid)); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %p,%d,%s): stub!\n", This, hinst, dwVersion, debugstr_guid(rguid)); return DI_OK; } @@ -1628,7 +1630,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Initialize(LPDIRECTINPUTDEVICE8A iface, HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPCDIEFFECT lpeff, LPDIRECTINPUTEFFECT *ppdef, LPUNKNOWN pUnkOuter) { - FIXME("(this=%p,%s,%p,%p,%p): stub!\n", iface, debugstr_guid(rguid), lpeff, ppdef, pUnkOuter); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %s,%p,%p,%p: stub!\n", This, debugstr_guid(rguid), lpeff, ppdef, pUnkOuter); FIXME("not available in the generic implementation\n"); *ppdef = NULL; @@ -1648,8 +1651,9 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumEffects( LPVOID lpvRef, DWORD dwFlags) { - FIXME("(this=%p,%p,%p,0x%08x): stub!\n", - iface, lpCallback, lpvRef, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("%p) %p,%p,0x%08x: stub!\n", + This, lpCallback, lpvRef, dwFlags); return DI_OK; } @@ -1660,8 +1664,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( LPVOID lpvRef, DWORD dwFlags) { - FIXME("(this=%p,%p,%p,0x%08x): stub!\n", - iface, lpCallback, lpvRef, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %p,%p,0x%08x: stub!\n", + This, lpCallback, lpvRef, dwFlags); return DI_OK; } @@ -1671,8 +1676,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetEffectInfo( LPDIEFFECTINFOA lpdei, REFGUID rguid) { - FIXME("(this=%p,%p,%s): stub!\n", - iface, lpdei, debugstr_guid(rguid)); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("(%p) %p,%s: stub!\n", This, lpdei, debugstr_guid(rguid)); return DI_OK; } @@ -1681,14 +1686,15 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetEffectInfo( LPDIEFFECTINFOW lpdei, REFGUID rguid) { - FIXME("(this=%p,%p,%s): stub!\n", - iface, lpdei, debugstr_guid(rguid)); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %p,%s: stub!\n", This, lpdei, debugstr_guid(rguid)); return DI_OK; } HRESULT WINAPI IDirectInputDevice2WImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8W iface, LPDWORD pdwOut) { - FIXME("(this=%p,%p): stub!\n", iface, pdwOut); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %p: stub!\n", This, pdwOut); return DI_OK; } @@ -1700,7 +1706,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetForceFeedbackState(LPDIRECTINPUTDEVIC HRESULT WINAPI IDirectInputDevice2WImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags) { - TRACE("(%p) 0x%08x:\n", iface, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + TRACE("(%p) 0x%08x:\n", This, dwFlags); return DI_NOEFFECT; } @@ -1713,7 +1720,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SendForceFeedbackCommand(LPDIRECTINPUTDE HRESULT WINAPI IDirectInputDevice2WImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDEVICE8W iface, LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback, LPVOID lpvRef, DWORD dwFlags) { - FIXME("(this=%p,%p,%p,0x%08x): stub!\n", iface, lpCallback, lpvRef, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %p,%p,0x%08x: stub!\n", This, lpCallback, lpvRef, dwFlags); return DI_OK; } @@ -1726,7 +1734,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDE HRESULT WINAPI IDirectInputDevice2WImpl_Escape(LPDIRECTINPUTDEVICE8W iface, LPDIEFFESCAPE lpDIEEsc) { - FIXME("(this=%p,%p): stub!\n", iface, lpDIEEsc); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %p: stub!\n", This, lpDIEEsc); return DI_OK; } @@ -1756,7 +1765,8 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SendDeviceData(LPDIRECTINPUTDEVICE8W ifa LPCDIDEVICEOBJECTDATA rgdod, LPDWORD pdwInOut, DWORD dwFlags) { - FIXME("(this=%p,0x%08x,%p,%p,0x%08x): stub!\n", iface, cbObjectData, rgdod, pdwInOut, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) 0x%08x,%p,%p,0x%08x: stub!\n", This, cbObjectData, rgdod, pdwInOut, dwFlags); return DI_OK; } @@ -1776,7 +1786,8 @@ HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8A LPVOID pvRef, DWORD dwFlags) { - FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", iface, lpszFileName, pec, pvRef, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", This, lpszFileName, pec, pvRef, dwFlags); return DI_OK; } @@ -1787,7 +1798,8 @@ HRESULT WINAPI IDirectInputDevice7WImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8W LPVOID pvRef, DWORD dwFlags) { - FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", iface, debugstr_w(lpszFileName), pec, pvRef, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", This, debugstr_w(lpszFileName), pec, pvRef, dwFlags); return DI_OK; } @@ -1798,7 +1810,8 @@ HRESULT WINAPI IDirectInputDevice7AImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8A LPDIFILEEFFECT rgDiFileEft, DWORD dwFlags) { - FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", iface, lpszFileName, dwEntries, rgDiFileEft, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", This, lpszFileName, dwEntries, rgDiFileEft, dwFlags); return DI_OK; } @@ -1809,7 +1822,8 @@ HRESULT WINAPI IDirectInputDevice7WImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8W LPDIFILEEFFECT rgDiFileEft, DWORD dwFlags) { - FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", iface, debugstr_w(lpszFileName), dwEntries, rgDiFileEft, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", This, debugstr_w(lpszFileName), dwEntries, rgDiFileEft, dwFlags); return DI_OK; } @@ -1819,7 +1833,8 @@ HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifa LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); #define X(x) if (dwFlags & x) FIXME("\tdwFlags =|"#x"\n"); X(DIDBAM_DEFAULT) X(DIDBAM_PRESERVE) @@ -1833,7 +1848,8 @@ HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifa HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEIMAGEINFOHEADERA lpdiDevImageInfoHeader) { - FIXME("(%p)->(%p): stub !\n", iface, lpdiDevImageInfoHeader); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("(%p)->(%p): stub !\n", This, lpdiDevImageInfoHeader); return DI_OK; } @@ -1841,7 +1857,8 @@ HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface HRESULT WINAPI IDirectInputDevice8WImpl_GetImageInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEIMAGEINFOHEADERW lpdiDevImageInfoHeader) { - FIXME("(%p)->(%p): stub !\n", iface, lpdiDevImageInfoHeader); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p): stub !\n", This, lpdiDevImageInfoHeader); return DI_OK; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0929961..198c6a8 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -677,7 +677,7 @@ static HRESULT WINAPI IDirectInputAImpl_Initialize(LPDIRECTINPUT7A iface, HINSTA { IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); - TRACE("(%p)->(%p, 0x%04x)\n", iface, hinst, version); + TRACE("(%p)->(%p, 0x%04x)\n", This, hinst, version); if (!hinst) return DIERR_INVALIDPARAM; @@ -934,7 +934,7 @@ static HRESULT WINAPI IDirectInput8AImpl_Initialize(LPDIRECTINPUT8A iface, HINST { IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); - TRACE("(%p)->(%p, 0x%04x)\n", iface, hinst, version); + TRACE("(%p)->(%p, 0x%04x)\n", This, hinst, version); if (!hinst) return DIERR_INVALIDPARAM; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 9240ba3..5129bb8 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -467,7 +467,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); int size; - TRACE("%p->(%p)\n",iface,lpDIDevCaps); + TRACE("%p->(%p)\n",This,lpDIDevCaps); if (lpDIDevCaps == NULL) { WARN("invalid pointer\n"); @@ -550,7 +550,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF { JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p,%s,%p)\n", This, debugstr_guid(rguid), pdiph); if (TRACE_ON(dinput)) _dump_DIPROPHEADER(pdiph); @@ -633,7 +633,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( DIPROPDWORD pd; DWORD index = 0; - TRACE("(%p,%p)\n", iface, pdidi); + TRACE("(%p,%p)\n", This, pdidi); if (pdidi == NULL) { WARN("invalid pointer\n"); @@ -778,7 +778,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, unsigned int i, j; BOOL has_actions = FALSE; - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); for (i=0; i < lpdiaf->dwNumActions; i++) { @@ -856,7 +856,7 @@ HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, { JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); return _set_action_map(iface, lpdiaf, lpszUserName, dwFlags, This->base.data_format.wine_df); } diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index fb1b878..2644ed6 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -674,7 +674,7 @@ static HRESULT WINAPI JoystickLinuxWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface { JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); if (!IS_DIPROP(rguid)) return DI_OK; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index bc3c4de..c742c15 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -963,7 +963,7 @@ static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF { JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(this=%p,%s,%p)\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); if (!IS_DIPROP(rguid)) return DI_OK; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index cb88b2f..aad6076 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1413,7 +1413,7 @@ static HRESULT WINAPI JoystickWImpl_CreateEffect(IDirectInputDevice8W *iface, EffectImpl *effect; HRESULT hr; - TRACE("%p %s %p %p %p\n", iface, debugstr_guid(type), params, out, outer); + TRACE("%p %s %p %p %p\n", This, debugstr_guid(type), params, out, outer); dump_DIEFFECT(params, type, 0); if(!This->ff){ @@ -1454,7 +1454,7 @@ static HRESULT WINAPI JoystickAImpl_CreateEffect(IDirectInputDevice8A *iface, { JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - TRACE("%p %s %p %p %p\n", iface, debugstr_guid(type), params, out, outer); + TRACE("%p %s %p %p %p\n", This, debugstr_guid(type), params, out, outer); return JoystickWImpl_CreateEffect(&This->generic.base.IDirectInputDevice8W_iface, type, params, out, outer); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 42c0759..70eb579 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -559,7 +559,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); if (!IS_DIPROP(rguid)) return DI_OK; @@ -625,7 +625,8 @@ static HRESULT WINAPI SysKeyboardWImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifac LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); return _build_action_map(iface, lpdiaf, lpszUserName, dwFlags, DIKEYBOARD_MASK, &c_dfDIKeyboard); } @@ -665,7 +666,8 @@ static HRESULT WINAPI SysKeyboardWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); return _set_action_map(iface, lpdiaf, lpszUserName, dwFlags, &c_dfDIKeyboard); } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 58c78a5..199ed03 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -830,7 +830,8 @@ static HRESULT WINAPI SysMouseWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); return _set_action_map(iface, lpdiaf, lpszUserName, dwFlags, &c_dfDIMouse2); } -- 1.9.1

2 1

← Newer
1
...
57
58
59
60
61
62
63
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel May 2019