wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Matteo Bruni : d3d8: Validate vertex stride in Draw[Indexed]PrimitiveUP().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 2305f7966f9cd8578350a905f75d9b15dfaf6f4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2305f7966f9cd8578350a905… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 12 21:25:10 2019 +0100 d3d8: Validate vertex stride in Draw[Indexed]PrimitiveUP(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 59e32ecbbe7c9a7ba2dd036d242861b33c88e684) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/device.c | 8 ++++---- dlls/d3d8/tests/device.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1d892ec..5c1be80 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2423,9 +2423,9 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); - if (!primitive_count) + if (!primitive_count || !stride) { - WARN("primitive_count is 0, returning D3D_OK\n"); + WARN("primitive_count or stride is 0, returning D3D_OK.\n"); return D3D_OK; } @@ -2523,9 +2523,9 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface iface, primitive_type, min_vertex_idx, vertex_count, primitive_count, index_data, index_format, vertex_data, vertex_stride); - if (!primitive_count) + if (!primitive_count || !vertex_stride) { - WARN("primitive_count is 0, returning D3D_OK\n"); + WARN("primitive_count or vertex_stride is 0, returning D3D_OK.\n"); return D3D_OK; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 0f8f15d..d0e840a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9282,6 +9282,11 @@ static void test_draw_primitive(void) ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); IDirect3DVertexBuffer8_Release(current_vb); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, 0); + ok(hr == D3D_OK, "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, sizeof(*quad)); + ok(hr == D3D_OK, "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); @@ -9308,6 +9313,13 @@ static void test_draw_primitive(void) ok(base_vertex_index == 1, "Unexpected base vertex index %u.\n", base_vertex_index); IDirect3DIndexBuffer8_Release(current_ib); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 0, + indices, D3DFMT_INDEX16, quad, 0); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, 0); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr);

1 0

Zebediah Figura : d3d8/tests: Port test_draw_primitive() from d3d9.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 0f4e5ca849aa13bb444fca2bfe236a5c6ce451a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f4e5ca849aa13bb444fca2b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 23:06:11 2019 -0600 d3d8/tests: Port test_draw_primitive() from d3d9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 38fb14a688641a3a93c135c6bc6e4721e0529df8) Conflicts: dlls/d3d8/tests/device.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/device.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index adfeca8..0f8f15d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9208,6 +9208,186 @@ static void test_resource_access(void) DestroyWindow(window); } +static void test_draw_primitive(void) +{ + static const struct + { + float position[3]; + DWORD color; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + }; + static const WORD indices[] = {0, 1, 2, 3, 0, 2}; + + IDirect3DVertexBuffer8 *vertex_buffer, *current_vb; + IDirect3DIndexBuffer8 *index_buffer, *current_ib; + UINT stride, base_vertex_index; + IDirect3DDevice8 *device; + DWORD stateblock; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + BYTE *ptr; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad), 0, 0, + D3DPOOL_DEFAULT, &vertex_buffer); + ok(SUCCEEDED(hr), "CreateVertexBuffer failed, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(vertex_buffer, 0, 0, &ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Lock failed, hr %#x.\n", hr); + memcpy(ptr, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer8_Unlock(vertex_buffer); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vertex_buffer, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, + D3DPOOL_DEFAULT, &index_buffer); + ok(SUCCEEDED(hr), "CreateIndexBuffer failed, hr %#x.\n", hr); + hr = IDirect3DIndexBuffer8_Lock(index_buffer, 0, 0, &ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Lock failed, hr %#x.\n", hr); + memcpy(ptr, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer8_Unlock(index_buffer); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState D3DRS_LIGHTING failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); + ok(current_vb == vertex_buffer, "Unexpected vb %p.\n", current_vb); + ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); + IDirect3DVertexBuffer8_Release(current_vb); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); + ok(!current_vb, "Unexpected vb %p.\n", current_vb); + ok(!stride, "Unexpected stride %u.\n", stride); + + /* NULL index buffer, NULL stream source. */ + hr = IDirect3DDevice8_SetIndices(device, NULL, 0); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 4, 0, 2); + todo_wine ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed, hr %#x.\n", hr); + + /* Valid index buffer, NULL stream source. */ + hr = IDirect3DDevice8_SetIndices(device, index_buffer, 1); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 4, 0, 2); + ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); + ok(base_vertex_index == 1, "Unexpected base vertex index %u.\n", base_vertex_index); + IDirect3DIndexBuffer8_Release(current_ib); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); + ok(!base_vertex_index, "Unexpected base vertex index %u.\n", base_vertex_index); + + /* Resetting of stream source and index buffer is not recorded in stateblocks. */ + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vertex_buffer, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetIndices(device, index_buffer, 1); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(SUCCEEDED(hr), "BeginStateBlock failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "BeginStateBlock failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); +todo_wine { + ok(!current_vb, "Unexpected vb %p.\n", current_vb); + ok(!stride, "Unexpected stride %u.\n", stride); +} + if (current_vb) + IDirect3DVertexBuffer8_Release(current_vb); + hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); +todo_wine { + ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); + ok(!base_vertex_index, "Unexpected base vertex index %u.\n", base_vertex_index); +} + if (current_ib) + IDirect3DIndexBuffer8_Release(current_ib); + + hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); + ok(SUCCEEDED(hr), "Capture failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vertex_buffer, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetIndices(device, index_buffer, 1); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_ApplyStateBlock(device, stateblock); + ok(SUCCEEDED(hr), "Apply failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); + ok(current_vb == vertex_buffer, "Unexpected vb %p.\n", current_vb); + ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); + IDirect3DVertexBuffer8_Release(current_vb); + hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); + ok(base_vertex_index == 1, "Unexpected base vertex index %u.\n", base_vertex_index); + IDirect3DIndexBuffer8_Release(current_ib); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + + IDirect3DDevice8_DeleteStateBlock(device, stateblock); + IDirect3DVertexBuffer8_Release(vertex_buffer); + IDirect3DIndexBuffer8_Release(index_buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -9321,6 +9501,7 @@ START_TEST(device) test_device_caps(); test_get_info(); test_resource_access(); + test_draw_primitive(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Matteo Bruni : d3d9: Validate vertex stride in Draw[Indexed]PrimitiveUP().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 865563e0655e80aa69cc9aa8b0df09ed626d3cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=865563e0655e80aa69cc9aa8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 12 21:25:09 2019 +0100 d3d9: Validate vertex stride in Draw[Indexed]PrimitiveUP(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46713 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 758cdfa02dce6d8facf9e6a0a7f09bcbb9cacb1b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/device.c | 12 +++++++++++- dlls/d3d9/tests/device.c | 12 ++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 067ea2b..6185a5a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2893,9 +2893,14 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); + if (!stride) + { + WARN("stride is 0, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } if (!primitive_count) { - WARN("primitive_count is 0, returning D3D_OK\n"); + WARN("primitive_count is 0, returning D3D_OK.\n"); return D3D_OK; } @@ -3004,6 +3009,11 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa iface, primitive_type, min_vertex_idx, vertex_count, primitive_count, index_data, index_format, vertex_data, vertex_stride); + if (!vertex_stride) + { + WARN("vertex_stride is 0, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } if (!primitive_count) { WARN("primitive_count is 0, returning D3D_OK.\n"); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 1cd548f..e105b25 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2976,6 +2976,11 @@ static void test_draw_primitive(void) hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); @@ -3005,6 +3010,13 @@ static void test_draw_primitive(void) IDirect3DIndexBuffer9_Release(current_ib); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 0, + indices, D3DFMT_INDEX16, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr);

1 0

Zebediah Figura : d3d9/tests: Add more tests for reset state after DrawIndexedPrimitiveUP().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 2497c5e781020cdb9ec56fde9358d170970767e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2497c5e781020cdb9ec56fde… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 23:06:10 2019 -0600 d3d9/tests: Add more tests for reset state after DrawIndexedPrimitiveUP(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ca86c2ed84a6e59f21d3d66e25643de15712ef3b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/device.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bc8d708..1cd548f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2874,6 +2874,7 @@ static void test_draw_primitive(void) IDirect3DVertexBuffer9 *vertex_buffer, *current_vb; IDirect3DIndexBuffer9 *index_buffer, *current_ib; IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DStateBlock9 *stateblock; IDirect3DDevice9 *device; UINT offset, stride; IDirect3D9 *d3d9; @@ -2998,16 +2999,81 @@ static void test_draw_primitive(void) 0 /* MinIndex */, 4 /* NumVerts */, 0 /* StartIndex */, 2 /*PrimCount */); ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetIndices(device, &current_ib); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); + IDirect3DIndexBuffer9_Release(current_ib); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetIndices(device, &current_ib); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); + + /* Resetting of stream source and index buffer is not recorded in stateblocks. */ + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vertex_buffer, 0, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetIndices(device, index_buffer); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginStateBlock(device); + ok(SUCCEEDED(hr), "BeginStateBlock failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "BeginStateBlock failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); +todo_wine + ok(!current_vb, "Unexpected vb %p.\n", current_vb); + ok(!offset, "Unexpected offset %u.\n", offset); +todo_wine + ok(!stride, "Unexpected stride %u.\n", stride); + if (current_vb) + IDirect3DVertexBuffer9_Release(current_vb); + hr = IDirect3DDevice9_GetIndices(device, &current_ib); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); +todo_wine + ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); + if (current_ib) + IDirect3DIndexBuffer9_Release(current_ib); + + hr = IDirect3DStateBlock9_Capture(stateblock); + ok(SUCCEEDED(hr), "Capture failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vertex_buffer, 0, sizeof(*quad)); + ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetIndices(device, index_buffer); + ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); + + hr = IDirect3DStateBlock9_Apply(stateblock); + ok(SUCCEEDED(hr), "Capture failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); + ok(current_vb == vertex_buffer, "Unexpected vb %p.\n", current_vb); + ok(!offset, "Unexpected offset %u.\n", offset); + ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); + IDirect3DVertexBuffer9_Release(current_vb); + hr = IDirect3DDevice9_GetIndices(device, &current_ib); + ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); + ok(current_ib == index_buffer, "Unexpected index buffer %p.\n", current_ib); + IDirect3DIndexBuffer9_Release(current_ib); + hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + IDirect3DStateBlock9_Release(stateblock); IDirect3DVertexBuffer9_Release(vertex_buffer); IDirect3DIndexBuffer9_Release(index_buffer); IDirect3DVertexDeclaration9_Release(vertex_declaration);

1 0

Zebediah Figura : devenum: Return S_FALSE from CreateClassEnumerator() if no devices exist.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: d63079f2c71306743a7ca924916ac37e57e274c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63079f2c71306743a7ca924… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 5 19:41:13 2019 -0500 devenum: Return S_FALSE from CreateClassEnumerator() if no devices exist. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46316 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e0da0b777a293059c32a7c846dff16ef0738b2de) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/createdevenum.c | 18 +++++++++++++++++- dlls/devenum/tests/devenum.c | 6 ++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 8a3160c..65c1ccd 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -862,7 +862,23 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( else if (IsEqualGUID(class, &CLSID_VideoInputDeviceCategory)) register_avicap_devices(); - return create_EnumMoniker(class, out); + if (SUCCEEDED(hr = create_EnumMoniker(class, out))) + { + IMoniker *mon; + hr = IEnumMoniker_Next(*out, 1, &mon, NULL); + if (hr == S_OK) + { + IMoniker_Release(mon); + IEnumMoniker_Reset(*out); + } + else + { + IEnumMoniker_Release(*out); + *out = NULL; + } + } + + return hr; } /********************************************************************** diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index e31f65c..1ce0d04 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -68,6 +68,7 @@ static void test_devenum(IBindCtx *bind_ctx) WCHAR *displayname; VARIANT var; HRESULT hr; + int count; hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); @@ -104,6 +105,8 @@ static void test_devenum(IBindCtx *bind_ctx) if (hr == S_OK) { + count = 0; + while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) { hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &displayname); @@ -134,8 +137,11 @@ static void test_devenum(IBindCtx *bind_ctx) CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); + count++; } IEnumMoniker_Release(enum_moniker); + + ok(count > 0, "CreateClassEnumerator() returned S_OK but no devices were enumerated.\n"); } }

1 0

Alexandre Julliard : kernel32: Validate handle before freeing a LOAD_LIBRARY_AS_DATAFILE module.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 9c41c5aa4637b104e8474407bef36f6c9ea114c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c41c5aa4637b104e8474407… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 09:42:09 2019 +0200 kernel32: Validate handle before freeing a LOAD_LIBRARY_AS_DATAFILE module. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46019 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 35d202fc0982da4e7ae3596414482318af118acb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/module.c | 8 +++++++- dlls/kernel32/tests/module.c | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 1199eff..17c0e95 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1102,6 +1102,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) if ((ULONG_PTR)hLibModule & 3) /* this is a datafile module */ { + void *ptr = (void *)((ULONG_PTR)hLibModule & ~3); + if (!RtlImageNtHeader( ptr )) + { + SetLastError( ERROR_BAD_EXE_FORMAT ); + return FALSE; + } if ((ULONG_PTR)hLibModule & 1) { struct exclusive_datafile *file; @@ -1119,7 +1125,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) } LdrUnlockLoaderLock( 0, magic ); } - return UnmapViewOfFile( (void *)((ULONG_PTR)hLibModule & ~3) ); + return UnmapViewOfFile( ptr ); } if ((nts = LdrUnloadDll( hLibModule )) == STATUS_SUCCESS) retv = TRUE; diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index ba65e0a..2f1a5a5 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -439,6 +439,11 @@ static void testLoadLibraryEx(void) ok(hmodule != 0, "Expected valid module handle\n"); SetLastError(0xdeadbeef); + ret = FreeLibrary( (HMODULE)((ULONG_PTR)hmodule + 0x1230)); + ok(!ret, "Free succeeded on wrong handle\n"); + ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = FreeLibrary(hmodule); ok(ret, "Expected to be able to free the module, failed with %d\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Alistair Leslie-Hughes : hid: Implement HidD_FlushQueue().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 599e8995c646692a75b9bd1f22d6245caeb3f3f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=599e8995c646692a75b9bd1f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Apr 6 22:20:18 2019 -0500 hid: Implement HidD_FlushQueue(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45878 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 718b1bc54207a1fe44554041d1d02a41ebd3b365) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 5bf3913..5714d6c 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -1,4 +1,4 @@ -@ stub HidD_FlushQueue +@ stdcall HidD_FlushQueue(ptr) @ stdcall HidD_FreePreparsedData(ptr) @ stdcall HidD_GetAttributes(long ptr) @ stub HidD_GetConfiguration diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index e313ccb..711aff2 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -163,3 +163,9 @@ BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULO TRACE("file %p, index %u, buffer %p, length %u.\n", file, index, buffer, length); return sync_ioctl(file, IOCTL_HID_GET_INDEXED_STRING, &index, sizeof(index), buffer, length); } + +BOOLEAN WINAPI HidD_FlushQueue(HANDLE file) +{ + TRACE("file %p.\n", file); + return sync_ioctl(file, IOCTL_HID_FLUSH_QUEUE, NULL, 0, NULL, 0); +} diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index e57a968..22f64e6 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -34,6 +34,7 @@ typedef struct _HIDD_ATTRIBUTES { USHORT VersionNumber; } HIDD_ATTRIBUTES, *PHIDD_ATTRIBUTES; +BOOLEAN WINAPI HidD_FlushQueue(HANDLE file); BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length);

1 0

Zebediah Figura : hid: Implement HidD_GetIndexedString().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 307ce18efe9d06f4d77e2a777849dd3dc8666d85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=307ce18efe9d06f4d77e2a77… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 22:20:17 2019 -0500 hid: Implement HidD_GetIndexedString(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46711 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5ae3910e93390d73105abc1171ab084a19ac02be) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index e4d4202..5bf3913 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -4,7 +4,7 @@ @ stub HidD_GetConfiguration @ stdcall HidD_GetFeature(long ptr long) @ stdcall HidD_GetHidGuid(ptr) -@ stub HidD_GetIndexedString +@ stdcall HidD_GetIndexedString(ptr long ptr long) @ stdcall HidD_GetInputReport(long ptr long) @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index ca14c4f..e313ccb 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -157,3 +157,9 @@ BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0); } + +BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length) +{ + TRACE("file %p, index %u, buffer %p, length %u.\n", file, index, buffer, length); + return sync_ioctl(file, IOCTL_HID_GET_INDEXED_STRING, &index, sizeof(index), buffer, length); +} diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 71e50a9..e57a968 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -36,6 +36,7 @@ typedef struct _HIDD_ATTRIBUTES { BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); +BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length); BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers);

1 0

Zebediah Figura : winebus.sys: Retrieve hidraw device strings from the parent USB device.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 239c6e4449188e6cdd1cf28b775bba9b8abba95a URL: https://source.winehq.org/git/wine.git/?a=commit;h=239c6e4449188e6cdd1cf28b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 29 16:18:32 2019 -0500 winebus.sys: Retrieve hidraw device strings from the parent USB device. This partially reverts 164517fe575564daa44f74cc3bc4a6bbdd7d3f3d. The manufacturer, product, and serial string attributes are not exposed by the HID device on Linux, but by its parent USB device. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46711 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cc3820ca99e65150958af5410ac2de77f9a4a505) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 64b245e..3c89963 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -674,23 +674,23 @@ static NTSTATUS hidraw_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, static NTSTATUS hidraw_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) { - struct udev_device *hiddev; + struct udev_device *usbdev; struct platform_private *private = impl_from_DEVICE_OBJECT(device); WCHAR *str = NULL; - hiddev = udev_device_get_parent_with_subsystem_devtype(private->udev_device, "hid", NULL); - if (hiddev) + usbdev = udev_device_get_parent_with_subsystem_devtype(private->udev_device, "usb", "usb_device"); + if (usbdev) { switch (index) { case HID_STRING_ID_IPRODUCT: - str = get_sysattr_string(hiddev, "product"); + str = get_sysattr_string(usbdev, "product"); break; case HID_STRING_ID_IMANUFACTURER: - str = get_sysattr_string(hiddev, "manufacturer"); + str = get_sysattr_string(usbdev, "manufacturer"); break; case HID_STRING_ID_ISERIALNUMBER: - str = get_sysattr_string(hiddev, "serial"); + str = get_sysattr_string(usbdev, "serial"); break; default: ERR("Unhandled string index %08x\n", index);

1 0

Paul Gofman : ddraw: Improve d3d_device7_GetClipStatus() stub.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: d1423d4f7cca70583c2bafd58e25a475ccdf32f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1423d4f7cca70583c2bafd5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 11 17:05:36 2019 +0300 ddraw: Improve d3d_device7_GetClipStatus() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43411 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> (cherry picked from commit 38bdd6fc5c36c61a2b8edbb8fe52ba858d4c32c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b251b53..6292a18 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3915,7 +3915,20 @@ static HRESULT WINAPI d3d_device2_SetClipStatus(IDirect3DDevice2 *iface, D3DCLIP *****************************************************************************/ static HRESULT WINAPI d3d_device7_GetClipStatus(IDirect3DDevice7 *iface, D3DCLIPSTATUS *clip_status) { - FIXME("iface %p, clip_status %p stub!\n", iface, clip_status); + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_viewport vp; + + FIXME("iface %p, clip_status %p stub.\n", iface, clip_status); + + wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + clip_status->minx = vp.x; + clip_status->maxx = vp.x + vp.width; + clip_status->miny = vp.y; + clip_status->maxy = vp.y + vp.height; + clip_status->minz = 0.0f; + clip_status->maxz = 0.0f; + clip_status->dwFlags = D3DCLIPSTATUS_EXTENTS2; + clip_status->dwStatus = 0; return D3D_OK; }

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
71
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-commits August 2019