April 2016 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in surface_blt_fbo().
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: c22c9b401a9024b363a633bbc093099755385df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22c9b401a9024b363a633bbc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 22 17:11:54 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in surface_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 04c16a4..88187e8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -502,6 +502,9 @@ static void surface_blt_fbo(const struct wined3d_device *device, struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect_in, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect_in) { + unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + struct wined3d_texture *dst_texture = dst_surface->container; + struct wined3d_texture *src_texture = src_surface->container; const struct wined3d_gl_info *gl_info; struct wined3d_context *context = old_ctx; struct wined3d_surface *required_rt, *restore_rt = NULL; @@ -534,7 +537,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, /* Resolve the source surface first if needed. */ if (src_location == WINED3D_LOCATION_RB_MULTISAMPLE - && (src_surface->container->resource.format->id != dst_surface->container->resource.format->id + && (src_texture->resource.format->id != dst_texture->resource.format->id || abs(src_rect.bottom - src_rect.top) != abs(dst_rect.bottom - dst_rect.top) || abs(src_rect.right - src_rect.left) != abs(dst_rect.right - dst_rect.left))) src_location = WINED3D_LOCATION_RB_RESOLVED; @@ -547,7 +550,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, if (!surface_is_full_rect(dst_surface, &dst_rect)) surface_load_location(dst_surface, old_ctx, dst_location); else - wined3d_surface_prepare(dst_surface, old_ctx, dst_location); + wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location); if (src_location == WINED3D_LOCATION_DRAWABLE) required_rt = src_surface; @@ -572,7 +575,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, if (src_location == WINED3D_LOCATION_DRAWABLE) { TRACE("Source surface %p is onscreen.\n", src_surface); - buffer = wined3d_texture_get_gl_buffer(src_surface->container); + buffer = wined3d_texture_get_gl_buffer(src_texture); surface_translate_drawable_coords(src_surface, context->win_handle, &src_rect); } else @@ -589,7 +592,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, if (dst_location == WINED3D_LOCATION_DRAWABLE) { TRACE("Destination surface %p is onscreen.\n", dst_surface); - buffer = wined3d_texture_get_gl_buffer(dst_surface->container); + buffer = wined3d_texture_get_gl_buffer(dst_texture); surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); } else @@ -616,9 +619,8 @@ static void surface_blt_fbo(const struct wined3d_device *device, dst_rect.left, dst_rect.top, dst_rect.right, dst_rect.bottom, GL_COLOR_BUFFER_BIT, gl_filter); checkGLcall("glBlitFramebuffer()"); - if (wined3d_settings.strict_draw_ordering - || (dst_location == WINED3D_LOCATION_DRAWABLE - && dst_surface->container->swapchain->front_buffer == dst_surface->container)) + if (wined3d_settings.strict_draw_ordering || (dst_location == WINED3D_LOCATION_DRAWABLE + && dst_texture->swapchain->front_buffer == dst_texture)) gl_info->gl_ops.gl.p_glFlush(); if (restore_rt)

1 0

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in surface_depth_blt_fbo().
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: b6b7e2379e40e9231b9f361a1ec508a85550de76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b7e2379e40e9231b9f361a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 22 17:11:53 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in surface_depth_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7b8f5eb..04c16a4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -402,6 +402,9 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { + unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + struct wined3d_texture *dst_texture = dst_surface->container; + struct wined3d_texture *src_texture = src_surface->container; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; DWORD src_mask, dst_mask; @@ -413,21 +416,21 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, TRACE("dst_surface %p, dst_location %s, dst_rect %s.\n", dst_surface, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); - src_mask = src_surface->container->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - dst_mask = dst_surface->container->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + src_mask = src_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + dst_mask = dst_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); if (src_mask != dst_mask) { ERR("Incompatible formats %s and %s.\n", - debug_d3dformat(src_surface->container->resource.format->id), - debug_d3dformat(dst_surface->container->resource.format->id)); + debug_d3dformat(src_texture->resource.format->id), + debug_d3dformat(dst_texture->resource.format->id)); return; } if (!src_mask) { ERR("Not a depth / stencil format: %s.\n", - debug_d3dformat(src_surface->container->resource.format->id)); + debug_d3dformat(src_texture->resource.format->id)); return; } @@ -451,7 +454,7 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, if (!surface_is_full_rect(dst_surface, dst_rect)) surface_load_location(dst_surface, context, dst_location); else - wined3d_surface_prepare(dst_surface, context, dst_location); + wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); gl_info = context->gl_info;

1 0

Henri Verbeet : ddraw: Return early in d3d_device7_DrawIndexedPrimitive() with a 0 vertex or index count.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: af4e471ef125cfcca7a2412ce2d5f3ef2251903d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4e471ef125cfcca7a2412ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 22 17:11:49 2016 +0200 ddraw: Return early in d3d_device7_DrawIndexedPrimitive() with a 0 vertex or index count. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 6 ++++++ dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f5197d6..583cd07 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3689,6 +3689,12 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, "indices %p, index_count %u, flags %#x.\n", iface, primitive_type, fvf, vertices, vertex_count, indices, index_count, flags); + if (!vertex_count || !index_count) + { + WARN("0 vertex or index count.\n"); + return D3D_OK; + } + /* Set the D3DDevice's FVF */ wined3d_mutex_lock(); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 56cb596..d11cb2a 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10132,15 +10132,15 @@ static void test_draw_primitive(void) IDirect3D2_Release(d3d); hr = IDirect3DDevice2_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, 0); todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, indices, 4, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, quad, 4, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, quad, 4, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, quad, 4, indices, 4, 0); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 08ab9bd..c98896e 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11420,7 +11420,7 @@ static void test_draw_primitive(void) memset(&strided, 0, sizeof(strided)); hr = IDirect3DDevice3_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, NULL, 0, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); @@ -11434,7 +11434,7 @@ static void test_draw_primitive(void) ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, indices, 4, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, indices, 4, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3efcf5b..4e7d9e8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11685,7 +11685,7 @@ static void test_draw_primitive(void) memset(&strided, 0, sizeof(strided)); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, NULL, 0, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); @@ -11701,7 +11701,7 @@ static void test_draw_primitive(void) ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, indices, 4, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, indices, 4, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);

1 0

Sebastian Lackner : reg: Fix a heap corruption when printing specific REG_MULTI_SZ values.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 7c774e98494d7392bc78bd3a8b2a2afd5ea0afe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c774e98494d7392bc78bd3a8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 22 19:35:01 2016 +0200 reg: Fix a heap corruption when printing specific REG_MULTI_SZ values. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6480f2c..32e75a0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -587,7 +587,7 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) } tmp_size = size_bytes - two_wchars; /* exclude both null terminators */ - buffer = HeapAlloc(GetProcessHeap(), 0, tmp_size * 2); + buffer = HeapAlloc(GetProcessHeap(), 0, tmp_size * 2 + sizeof(WCHAR)); len = tmp_size / sizeof(WCHAR); for (i = 0, destindex = 0; i < len; i++, destindex++)

1 0

Francois Gouget : shell32: Fix a spelling error in an ERR() message.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 7657845b1b20c2db4609631667a631910de0d1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=7657845b1b20c2db460963166… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 23 07:48:25 2016 +0200 shell32: Fix a spelling error in an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index be1ba81..309c941 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -668,7 +668,7 @@ static HRESULT UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, LPBC pbc, const WCHA szCompletePath[cPathLen-1] = '\0'; if ((szCompletePath[0] != '/') || (pNextPathElement[0] != '/')) { - ERR("szCompletePath: %s, pNextPathElment: %s\n", szCompletePath, pNextPathElement); + ERR("szCompletePath: %s, pNextPathElement: %s\n", szCompletePath, pNextPathElement); return E_FAIL; }

1 0

Henri Verbeet : ddraw: Return early in d3d_device7_DrawIndexedPrimitiveVB( ) with a 0 vertex or index count.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 34a1ef42a7950bedb2db6b960851c4f4ef73d478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a1ef42a7950bedb2db6b960… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 22 17:11:52 2016 +0200 ddraw: Return early in d3d_device7_DrawIndexedPrimitiveVB() with a 0 vertex or index count. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 56 ++++++++++++++++++++++++++--------------------- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ca001cf..2a74da8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4346,21 +4346,28 @@ static HRESULT WINAPI d3d_device3_DrawPrimitiveVB(IDirect3DDevice3 *iface, D3DPR * *****************************************************************************/ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, - D3DPRIMITIVETYPE PrimitiveType, IDirect3DVertexBuffer7 *D3DVertexBuf, - DWORD StartVertex, DWORD NumVertices, WORD *Indices, DWORD IndexCount, DWORD Flags) + D3DPRIMITIVETYPE primitive_type, IDirect3DVertexBuffer7 *vb, + DWORD start_vertex, DWORD vertex_count, WORD *indices, DWORD index_count, DWORD flags) { - struct d3d_device *This = impl_from_IDirect3DDevice7(iface); - struct d3d_vertex_buffer *vb = unsafe_impl_from_IDirect3DVertexBuffer7(D3DVertexBuf); - DWORD stride = get_flexible_vertex_size(vb->fvf); - WORD *LockedIndices; + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct d3d_vertex_buffer *vb_impl = unsafe_impl_from_IDirect3DVertexBuffer7(vb); + DWORD stride = get_flexible_vertex_size(vb_impl->fvf); + WORD *index_data; HRESULT hr; UINT ib_pos; - TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, indices %p, index_count %u, flags %#x.\n", - iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Indices, IndexCount, Flags); + TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, " + "vertex_count %u, indices %p, index_count %u, flags %#x.\n", + iface, primitive_type, vb, start_vertex, vertex_count, indices, index_count, flags); + + if (!vertex_count || !index_count) + { + WARN("0 vertex or index count.\n"); + return D3D_OK; + } /* Steps: - * 1) Upload the Indices to the index buffer + * 1) Upload the indices to the index buffer * 2) Set the index source * 3) Set the Vertex Buffer as the Stream source * 4) Call IWineD3DDevice::DrawIndexedPrimitive @@ -4368,51 +4375,50 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(This->wined3d_device, vb->wineD3DVertexDeclaration); + wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wineD3DVertexDeclaration); - hr = d3d_device_prepare_index_buffer(This, IndexCount * sizeof(WORD)); + hr = d3d_device_prepare_index_buffer(device, index_count * sizeof(WORD)); if (FAILED(hr)) { wined3d_mutex_unlock(); return hr; } - ib_pos = This->index_buffer_pos; + ib_pos = device->index_buffer_pos; - if (This->index_buffer_size - IndexCount * sizeof(WORD) < ib_pos) + if (device->index_buffer_size - index_count * sizeof(WORD) < ib_pos) ib_pos = 0; /* Copy the index stream into the index buffer. A new IWineD3DDevice * method could be created which takes an user pointer containing the * indices or a SetData-Method for the index buffer, which overrides the * index buffer data with our pointer. */ - hr = wined3d_buffer_map(This->index_buffer, ib_pos, IndexCount * sizeof(WORD), - (BYTE **)&LockedIndices, ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); + hr = wined3d_buffer_map(device->index_buffer, ib_pos, index_count * sizeof(WORD), + (BYTE **)&index_data, ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) { ERR("Failed to map buffer, hr %#x.\n", hr); wined3d_mutex_unlock(); return hr; } - memcpy(LockedIndices, Indices, IndexCount * sizeof(WORD)); - wined3d_buffer_unmap(This->index_buffer); - This->index_buffer_pos = ib_pos + IndexCount * sizeof(WORD); + memcpy(index_data, indices, index_count * sizeof(WORD)); + wined3d_buffer_unmap(device->index_buffer); + device->index_buffer_pos = ib_pos + index_count * sizeof(WORD); /* Set the index stream */ - wined3d_device_set_base_vertex_index(This->wined3d_device, StartVertex); - wined3d_device_set_index_buffer(This->wined3d_device, This->index_buffer, WINED3DFMT_R16_UINT); + wined3d_device_set_base_vertex_index(device->wined3d_device, start_vertex); + wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, WINED3DFMT_R16_UINT); /* Set the vertex stream source */ - hr = wined3d_device_set_stream_source(This->wined3d_device, 0, vb->wineD3DVertexBuffer, 0, stride); + hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb_impl->wineD3DVertexBuffer, 0, stride); if (FAILED(hr)) { - ERR("(%p) IDirect3DDevice::SetStreamSource failed with hr = %08x\n", This, hr); + ERR("(%p) IDirect3DDevice::SetStreamSource failed with hr = %08x\n", device, hr); wined3d_mutex_unlock(); return hr; } - - wined3d_device_set_primitive_type(This->wined3d_device, PrimitiveType); - hr = wined3d_device_draw_indexed_primitive(This->wined3d_device, ib_pos / sizeof(WORD), IndexCount); + wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); + hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3be2b87..cbcae06 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11425,7 +11425,7 @@ static void test_draw_primitive(void) D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, NULL, 0, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, 0); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 4eb8fd6..424235f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11692,7 +11692,7 @@ static void test_draw_primitive(void) hr = IDirect3DDevice7_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, NULL, 0, 0); todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, 0);

1 0

Henri Verbeet : ddraw: Return early in d3d_device7_DrawIndexedPrimitiveStrided() with a 0 vertex or index count.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 41975efef665a919066378a07a90b7a8275a26d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41975efef665a919066378a07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 22 17:11:48 2016 +0200 ddraw: Return early in d3d_device7_DrawIndexedPrimitiveStrided() with a 0 vertex or index count. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 36 +++++++++++++++++++++--------------- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6166648..f5197d6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4107,21 +4107,27 @@ static HRESULT WINAPI d3d_device3_DrawPrimitiveStrided(IDirect3DDevice3 *iface, * *****************************************************************************/ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, - D3DPRIMITIVETYPE PrimitiveType, DWORD VertexType, - D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount, - WORD *Indices, DWORD IndexCount, DWORD Flags) + D3DPRIMITIVETYPE primitive_type, DWORD fvf, D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, + DWORD vertex_count, WORD *indices, DWORD index_count, DWORD flags) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; - UINT vtx_dst_stride = get_flexible_vertex_size(VertexType); - UINT vtx_dst_size = VertexCount * vtx_dst_stride; + UINT vtx_dst_stride = get_flexible_vertex_size(fvf); + UINT vtx_dst_size = vertex_count * vtx_dst_stride; + UINT idx_size = index_count * sizeof(WORD); UINT vb_pos, align; - UINT idx_size = IndexCount * sizeof(WORD); - UINT ib_pos; BYTE *dst_data; + UINT ib_pos; + HRESULT hr; - TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n", - iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); + TRACE("iface %p, primitive_type %#x, fvf %#x, strided_data %p, " + "vertex_count %u, indices %p, index_count %u, flags %#x.\n", + iface, primitive_type, fvf, strided_data, vertex_count, indices, index_count, flags); + + if (!vertex_count || !index_count) + { + WARN("0 vertex or index count.\n"); + return D3D_OK; + } wined3d_mutex_lock(); @@ -4141,7 +4147,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) goto done; - pack_strided_data(dst_data, VertexCount, D3DDrawPrimStrideData, VertexType); + pack_strided_data(dst_data, vertex_count, strided_data, fvf); wined3d_buffer_unmap(device->vertex_buffer); device->vertex_buffer_pos = vb_pos + vtx_dst_size; @@ -4156,7 +4162,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) goto done; - memcpy(dst_data, Indices, idx_size); + memcpy(dst_data, indices, idx_size); wined3d_buffer_unmap(device->index_buffer); device->index_buffer_pos = ib_pos + idx_size; @@ -4166,9 +4172,9 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, WINED3DFMT_R16_UINT); wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vtx_dst_stride); - wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, VertexType)); - wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), IndexCount); + wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); + wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); + hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); done: wined3d_mutex_unlock(); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 0608cf5..08ab9bd 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11423,7 +11423,7 @@ static void test_draw_primitive(void) todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, NULL, 0, 0); todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, 0); @@ -11437,7 +11437,7 @@ static void test_draw_primitive(void) todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, indices, 4, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, indices, 4, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 104346b..3efcf5b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11688,7 +11688,7 @@ static void test_draw_primitive(void) todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, NULL, 0, 0); todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, NULL, 0, 0); @@ -11704,7 +11704,7 @@ static void test_draw_primitive(void) todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, indices, 4, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, indices, 4, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);

1 0

Henri Verbeet : ddraw/tests: Add some tests for draw parameter validation.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: c12dc091bd595ccd0371676e7bbe925070e845fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12dc091bd595ccd0371676e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 22 17:11:47 2016 +0200 ddraw/tests: Add some tests for draw parameter validation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 62 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 105 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 275 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c12dc091bd595ccd03716…

1 0

Henri Verbeet : ddraw: Return early in d3d_device7_DrawPrimitiveStrided() with a 0 vertex count.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: d71132ed83b287f3b6b9ae6baaf45df1ae6c6af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71132ed83b287f3b6b9ae6ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 22 17:11:50 2016 +0200 ddraw: Return early in d3d_device7_DrawPrimitiveStrided() with a 0 vertex count. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 26 ++++++++++++++++---------- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 583cd07..0c53e52 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4010,18 +4010,24 @@ static void pack_strided_data(BYTE *dst, DWORD count, const D3DDRAWPRIMITIVESTRI } } -static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE PrimitiveType, - DWORD VertexType, D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount, DWORD Flags) +static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE primitive_type, + DWORD fvf, D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, DWORD flags) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); HRESULT hr; - UINT dst_stride = get_flexible_vertex_size(VertexType); - UINT dst_size = dst_stride * VertexCount; + UINT dst_stride = get_flexible_vertex_size(fvf); + UINT dst_size = dst_stride * vertex_count; UINT vb_pos, align; BYTE *dst_data; - TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, flags %#x.\n", - iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags); + TRACE("iface %p, primitive_type %#x, fvf %#x, strided_data %p, vertex_count %u, flags %#x.\n", + iface, primitive_type, fvf, strided_data, vertex_count, flags); + + if (!vertex_count) + { + WARN("0 vertex count.\n"); + return D3D_OK; + } wined3d_mutex_lock(); hr = d3d_device_prepare_vertex_buffer(device, dst_size); @@ -4040,17 +4046,17 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) goto done; - pack_strided_data(dst_data, VertexCount, D3DDrawPrimStrideData, VertexType); + pack_strided_data(dst_data, vertex_count, strided_data, fvf); wined3d_buffer_unmap(device->vertex_buffer); device->vertex_buffer_pos = vb_pos + dst_size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, dst_stride); if (FAILED(hr)) goto done; - wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, VertexType)); + wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType); - hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / dst_stride, VertexCount); + wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); + hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / dst_stride, vertex_count); done: wined3d_mutex_unlock(); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c98896e..c0ea11b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11429,7 +11429,7 @@ static void test_draw_primitive(void) hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, 0); todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 4e7d9e8..0b30467 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11696,7 +11696,7 @@ static void test_draw_primitive(void) hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, 0); todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);

1 0

Francois Gouget : ole32/tests: Fix spelling errors in a couple of comments.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 147d8231e4c3a84f552a29903ae9cbf224df6298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147d8231e4c3a84f552a29903… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 23 07:46:33 2016 +0200 ole32/tests: Fix spelling errors in a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 215d68f..3b523d1 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2218,7 +2218,7 @@ static void test_OleInitialize_InitCounting(void) IUnknown *pUnk; REFCLSID rclsid = &CLSID_InternetZoneManager; - /* 1. OleInitialize fails but OleUnintialize is still called: apartment stays inited */ + /* 1. OleInitialize fails but OleUninitialize is still called: apartment stays initialized */ hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); ok(hr == S_OK, "CoInitializeEx(COINIT_MULTITHREADED) failed with error 0x%08x\n", hr); @@ -2233,7 +2233,7 @@ static void test_OleInitialize_InitCounting(void) CoUninitialize(); - /* 2. Extra multiple OleUninitialize: apartment stays inited until CoUnitialize */ + /* 2. Extra multiple OleUninitialize: apartment stays initialized until CoUninitialize */ hr = CoInitialize(NULL); ok(hr == S_OK, "CoInitialize() failed with error 0x%08x\n", hr);

1 0