September 2016 - Wine-commits

Stefan Dösinger : ddraw: Fix offscreen flag handling in TransformVertices.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 56e9a6e792cc3eebfe0fe7f202cd67bebe3e643c URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e9a6e792cc3eebfe0fe7f20… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Aug 31 22:01:25 2016 +0100 ddraw: Fix offscreen flag handling in TransformVertices. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 32 ++++++++++++++++++++++++-------- dlls/ddraw/viewport.c | 34 +++++++++++++--------------------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 84cd8b8..f04ccd3 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9362,12 +9362,7 @@ static void test_transform_vertices(void) } /* Finally try to figure out how the DWORD dwOffscreen works. - * Apparently no vertex is offscreen with clipping off, - * and with clipping on the offscreen flag is set if only one vertex - * is transformed, and this vertex is offscreen. - * - * FIXME: This is wrong. It might be the logical AND of all - * output clip flags. */ + * It is a logical AND of the vertices' dwFlags members. */ vp_data = vp_template; vp_data.dwWidth = 5; vp_data.dwHeight = 5; @@ -9387,17 +9382,38 @@ static void test_transform_vertices(void) &transformdata, D3DTRANSFORM_CLIPPED, &offscreen); ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); ok(offscreen == (D3DCLIP_RIGHT | D3DCLIP_TOP), "Offscreen is %x.\n", offscreen); - + offscreen = 0xdeadbeef; hr = IDirect3DViewport_TransformVertices(viewport, 2, &transformdata, D3DTRANSFORM_CLIPPED, &offscreen); ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); - todo_wine ok(offscreen == (D3DCLIP_RIGHT | D3DCLIP_TOP), "Offscreen is %x.\n", offscreen); + ok(offscreen == (D3DCLIP_RIGHT | D3DCLIP_TOP), "Offscreen is %x.\n", offscreen); + hr = IDirect3DViewport_TransformVertices(viewport, 3, + &transformdata, D3DTRANSFORM_CLIPPED, &offscreen); + ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); + ok(!offscreen, "Offscreen is %x.\n", offscreen); + + transformdata.lpIn = cliptest + 1; + hr = IDirect3DViewport_TransformVertices(viewport, 1, + &transformdata, D3DTRANSFORM_CLIPPED, &offscreen); + ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); + ok(offscreen == (D3DCLIP_BACK | D3DCLIP_RIGHT | D3DCLIP_TOP), "Offscreen is %x.\n", offscreen); transformdata.lpIn = cliptest + 2; hr = IDirect3DViewport_TransformVertices(viewport, 1, &transformdata, D3DTRANSFORM_CLIPPED, &offscreen); ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); ok(offscreen == (D3DCLIP_BOTTOM | D3DCLIP_LEFT), "Offscreen is %x.\n", offscreen); + offscreen = 0xdeadbeef; + hr = IDirect3DViewport_TransformVertices(viewport, 2, + &transformdata, D3DTRANSFORM_CLIPPED, &offscreen); + ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); + ok(offscreen == (D3DCLIP_BOTTOM | D3DCLIP_LEFT), "Offscreen is %x.\n", offscreen); + + transformdata.lpIn = cliptest + 3; + hr = IDirect3DViewport_TransformVertices(viewport, 1, + &transformdata, D3DTRANSFORM_CLIPPED, &offscreen); + ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); + ok(offscreen == (D3DCLIP_FRONT | D3DCLIP_BOTTOM | D3DCLIP_LEFT), "Offscreen is %x.\n", offscreen); transformdata.lpIn = offscreentest; transformdata.dwInSize = sizeof(offscreentest[0]); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 8a42faf..d857dc3 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -372,8 +372,8 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE * dwVertexCount: The number of vertices to be transformed * lpData: Pointer to the vertex data * dwFlags: D3DTRANSFORM_CLIPPED or D3DTRANSFORM_UNCLIPPED - * lpOffScreen: Set to the clipping plane clipping the vertex, if only one - * vertex is transformed and clipping is on. 0 otherwise + * offscreen: Logical AND of the planes that clipped the vertices if clipping + * is on. 0 if clipping is off. * * Returns: * D3D_OK on success @@ -391,7 +391,7 @@ struct transform_vertices_vertex }; static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, - DWORD dwVertexCount, D3DTRANSFORMDATA *lpData, DWORD dwFlags, DWORD *lpOffScreen) + DWORD dwVertexCount, D3DTRANSFORMDATA *lpData, DWORD dwFlags, DWORD *offscreen) { struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface); D3DVIEWPORT vp = viewport->viewports.vp1; @@ -401,8 +401,8 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, unsigned int i; D3DHVERTEX *outH; - TRACE("iface %p, vertex_count %u, vertex_data %p, flags %#x, clip_plane %p.\n", - iface, dwVertexCount, lpData, dwFlags, lpOffScreen); + TRACE("iface %p, vertex_count %u, vertex_data %p, flags %#x, offscreen %p.\n", + iface, dwVertexCount, lpData, dwFlags, offscreen); /* Tests on windows show that Windows crashes when this occurs, * so don't return the (intuitive) return value @@ -428,6 +428,12 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, multiply_matrix(&mat, &view_mat, &world_mat); multiply_matrix(&mat, &viewport->active_device->legacy_projection, &mat); + /* The pointer is not tested against NULL on Windows. */ + if (dwFlags & D3DTRANSFORM_CLIPPED) + *offscreen = ~0U; + else + *offscreen = 0; + outH = lpData->lpHOut; for(i = 0; i < dwVertexCount; i++) { @@ -460,6 +466,8 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, if(z > 1.0) outH[i].dwFlags |= D3DCLIP_BACK; + *offscreen &= outH[i].dwFlags; + if(outH[i].dwFlags) { /* Looks like native just drops the vertex, leaves whatever data @@ -485,22 +493,6 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, out->payload = in->payload; } - /* According to the d3d test, the offscreen flag is set only - * if exactly one vertex is transformed. It's not documented, - * but the test shows that the lpOffscreen flag is set to the - * flag combination of clipping planes that clips the vertex. - * - * If clipping is requested, Windows assumes that the offscreen - * param is a valid pointer. - */ - if(dwVertexCount == 1 && dwFlags & D3DTRANSFORM_CLIPPED) - { - *lpOffScreen = outH[0].dwFlags; - } - else if(*lpOffScreen) - { - *lpOffScreen = 0; - } wined3d_mutex_unlock(); TRACE("All done\n");

1 0

Stefan Dösinger : ddraw: Validate the input data in TransformVertices.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 3cd0d92c8c48b1507c9cb8c9b449a597ef368a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd0d92c8c48b1507c9cb8c9b… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Aug 31 22:01:26 2016 +0100 ddraw: Validate the input data in TransformVertices. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index d857dc3..393113e 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -370,7 +370,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE * * Params: * dwVertexCount: The number of vertices to be transformed - * lpData: Pointer to the vertex data + * data: Pointer to the vertex input / output data. * dwFlags: D3DTRANSFORM_CLIPPED or D3DTRANSFORM_UNCLIPPED * offscreen: Logical AND of the planes that clipped the vertices if clipping * is on. 0 if clipping is off. @@ -391,7 +391,7 @@ struct transform_vertices_vertex }; static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, - DWORD dwVertexCount, D3DTRANSFORMDATA *lpData, DWORD dwFlags, DWORD *offscreen) + DWORD dwVertexCount, D3DTRANSFORMDATA *data, DWORD dwFlags, DWORD *offscreen) { struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface); D3DVIEWPORT vp = viewport->viewports.vp1; @@ -401,8 +401,8 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, unsigned int i; D3DHVERTEX *outH; - TRACE("iface %p, vertex_count %u, vertex_data %p, flags %#x, offscreen %p.\n", - iface, dwVertexCount, lpData, dwFlags, offscreen); + TRACE("iface %p, vertex_count %u, data %p, flags %#x, offscreen %p.\n", + iface, dwVertexCount, data, dwFlags, offscreen); /* Tests on windows show that Windows crashes when this occurs, * so don't return the (intuitive) return value @@ -413,7 +413,12 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, } */ - if(!(dwFlags & (D3DTRANSFORM_UNCLIPPED | D3DTRANSFORM_CLIPPED))) + if (!data || data->dwSize != sizeof(*data)) + { + WARN("Transform data is NULL or size is incorrect, returning DDERR_INVALIDPARAMS\n"); + return DDERR_INVALIDPARAMS; + } + if (!(dwFlags & (D3DTRANSFORM_UNCLIPPED | D3DTRANSFORM_CLIPPED))) { WARN("No clipping flag passed, returning DDERR_INVALIDPARAMS\n"); return DDERR_INVALIDPARAMS; @@ -434,11 +439,11 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, else *offscreen = 0; - outH = lpData->lpHOut; + outH = data->lpHOut; for(i = 0; i < dwVertexCount; i++) { - in = (struct transform_vertices_vertex *)((char *)lpData->lpIn + lpData->dwInSize * i); - out = (struct transform_vertices_vertex *)((char *)lpData->lpOut + lpData->dwOutSize * i); + in = (struct transform_vertices_vertex *)((char *)data->lpIn + data->dwInSize * i); + out = (struct transform_vertices_vertex *)((char *)data->lpOut + data->dwOutSize * i); x = (in->x * mat._11) + (in->y * mat._21) + (in->z * mat._31) + mat._41; y = (in->x * mat._12) + (in->y * mat._22) + (in->z * mat._32) + mat._42;

1 0

Stefan Dösinger : ddraw/tests: Extend TransformVertices invalid data tests.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: b12ab05f101c4fc64219e811f92743ce8efc996e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12ab05f101c4fc64219e811f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Aug 31 22:01:27 2016 +0100 ddraw/tests: Extend TransformVertices invalid data tests. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index f04ccd3..e8194b3 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9440,9 +9440,61 @@ static void test_transform_vertices(void) ok(offscreen == D3DCLIP_RIGHT, "Offscreen is %x.\n", offscreen); /* Invalid flags. */ + offscreen = 0xdeadbeef; hr = IDirect3DViewport_TransformVertices(viewport, ARRAY_SIZE(position_tests), &transformdata, 0, &offscreen); ok(hr == DDERR_INVALIDPARAMS, "TransformVertices returned %#x.\n", hr); + ok(offscreen == 0xdeadbeef, "Offscreen is %x.\n", offscreen); + + /* NULL transform data. */ + hr = IDirect3DViewport_TransformVertices(viewport, 1, + NULL, D3DTRANSFORM_UNCLIPPED, &offscreen); + ok(hr == DDERR_INVALIDPARAMS, "TransformVertices returned %#x.\n", hr); + ok(offscreen == 0xdeadbeef, "Offscreen is %x.\n", offscreen); + hr = IDirect3DViewport_TransformVertices(viewport, 0, + NULL, D3DTRANSFORM_UNCLIPPED, &offscreen); + ok(hr == DDERR_INVALIDPARAMS, "TransformVertices returned %#x.\n", hr); + ok(offscreen == 0xdeadbeef, "Offscreen is %x.\n", offscreen); + + /* NULL transform data and NULL dwOffscreen. + * + * Valid transform data + NULL dwOffscreen -> crash. */ + hr = IDirect3DViewport_TransformVertices(viewport, 1, + NULL, D3DTRANSFORM_UNCLIPPED, NULL); + ok(hr == DDERR_INVALIDPARAMS, "TransformVertices returned %#x.\n", hr); + + /* No vertices. */ + hr = IDirect3DViewport_TransformVertices(viewport, 0, + &transformdata, D3DTRANSFORM_UNCLIPPED, &offscreen); + ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); + ok(!offscreen, "Offscreen is %x.\n", offscreen); + hr = IDirect3DViewport_TransformVertices(viewport, 0, + &transformdata, D3DTRANSFORM_CLIPPED, &offscreen); + ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); + ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen); + + /* Invalid sizes. */ + offscreen = 0xdeadbeef; + transformdata.dwSize = sizeof(transformdata) - 1; + hr = IDirect3DViewport_TransformVertices(viewport, 1, + &transformdata, D3DTRANSFORM_UNCLIPPED, &offscreen); + ok(hr == DDERR_INVALIDPARAMS, "TransformVertices returned %#x.\n", hr); + ok(offscreen == 0xdeadbeef, "Offscreen is %x.\n", offscreen); + transformdata.dwSize = sizeof(transformdata) + 1; + hr = IDirect3DViewport_TransformVertices(viewport, 1, + &transformdata, D3DTRANSFORM_UNCLIPPED, &offscreen); + ok(hr == DDERR_INVALIDPARAMS, "TransformVertices returned %#x.\n", hr); + ok(offscreen == 0xdeadbeef, "Offscreen is %x.\n", offscreen); + + /* NULL lpIn or lpOut -> crash, except when transforming 0 vertices. */ + transformdata.dwSize = sizeof(transformdata); + transformdata.lpIn = NULL; + transformdata.lpOut = NULL; + offscreen = 0xdeadbeef; + hr = IDirect3DViewport_TransformVertices(viewport, 0, + &transformdata, D3DTRANSFORM_CLIPPED, &offscreen); + ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); + ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen); destroy_viewport(device, viewport); refcount = IDirect3DDevice_Release(device);

1 0

Nikolay Sivov : dxgi: Use texture pointer instead of resource pointer for DXGI surface.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 16a20955563342adcc0d2f185966c4858f169c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a20955563342adcc0d2f185… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 12:42:54 2016 +0300 dxgi: Use texture pointer instead of resource pointer for DXGI surface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 4 ++-- dlls/dxgi/device.c | 8 ++++---- dlls/dxgi/dxgi_private.h | 4 ++-- dlls/dxgi/surface.c | 6 +++--- include/wine/winedxgi.idl | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index d7b2af1..5563982 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -499,8 +499,8 @@ static HRESULT d3d_texture2d_init(struct d3d_texture2d *texture, struct d3d_devi return E_FAIL; } - hr = IWineDXGIDevice_create_surface(wine_device, wined3d_texture_get_resource(texture->wined3d_texture), - 0, NULL, (IUnknown *)&texture->ID3D10Texture2D_iface, (void **)&texture->dxgi_surface); + hr = IWineDXGIDevice_create_surface(wine_device, texture->wined3d_texture, 0, NULL, + (IUnknown *)&texture->ID3D10Texture2D_iface, (void **)&texture->dxgi_surface); IWineDXGIDevice_Release(wine_device); if (FAILED(hr)) { diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 2486204..f548ca2 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -279,14 +279,14 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetMaximumFrameLatency(IWineDXGIDev /* IWineDXGIDevice methods */ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, - struct wined3d_resource *wined3d_resource, DXGI_USAGE usage, + struct wined3d_texture *wined3d_texture, DXGI_USAGE usage, const DXGI_SHARED_RESOURCE *shared_resource, IUnknown *outer, void **surface) { struct dxgi_surface *object; HRESULT hr; - TRACE("iface %p, wined3d_resource %p, usage %#x, shared_resource %p, outer %p, surface %p.\n", - iface, wined3d_resource, usage, shared_resource, outer, surface); + TRACE("iface %p, wined3d_texture %p, usage %#x, shared_resource %p, outer %p, surface %p.\n", + iface, wined3d_texture, usage, shared_resource, outer, surface); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) { @@ -294,7 +294,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa return E_OUTOFMEMORY; } - if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, wined3d_resource))) + if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, wined3d_texture))) { WARN("Failed to initialize surface, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index b417470..86ba34a 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -183,11 +183,11 @@ struct dxgi_surface LONG refcount; struct wined3d_private_store private_store; IDXGIDevice *device; - struct wined3d_resource *wined3d_resource; + struct wined3d_texture *wined3d_texture; }; HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, - IUnknown *outer, struct wined3d_resource *wined3d_resource) DECLSPEC_HIDDEN; + IUnknown *outer, struct wined3d_texture *wined3d_texture) DECLSPEC_HIDDEN; D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index ba95758..687caaa 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -170,7 +170,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface1 *iface, DXGI TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_resource_get_desc(surface->wined3d_resource, &wined3d_desc); + wined3d_resource_get_desc(wined3d_texture_get_resource(surface->wined3d_texture), &wined3d_desc); wined3d_mutex_unlock(); desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; @@ -240,7 +240,7 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = }; HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, - IUnknown *outer, struct wined3d_resource *wined3d_resource) + IUnknown *outer, struct wined3d_texture *wined3d_texture) { surface->IDXGISurface1_iface.lpVtbl = &dxgi_surface_vtbl; surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; @@ -248,7 +248,7 @@ HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, wined3d_private_store_init(&surface->private_store); surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; - surface->wined3d_resource = wined3d_resource; + surface->wined3d_texture = wined3d_texture; return S_OK; } diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index d9f6677..a4f715b 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -28,7 +28,7 @@ import "dxgi.idl"; interface IWineDXGIDevice : IDXGIDevice1 { HRESULT create_surface( - [in] struct wined3d_resource *wined3d_resource, + [in] struct wined3d_texture *wined3d_texture, [in] DXGI_USAGE usage, [in] const DXGI_SHARED_RESOURCE *shared_resource, [in] IUnknown *outer,

1 0

Henri Verbeet : ddraw: Use resource mapping functions in d3d_device7_DrawPrimitiveStrided().
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: f72b682d4994febd3fa0e9db1e76cfe44751fc1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f72b682d4994febd3fa0e9db1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 11:57:40 2016 +0200 ddraw: Use resource mapping functions in d3d_device7_DrawPrimitiveStrided(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 55eb981..4cb244a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4030,8 +4030,10 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM HRESULT hr; UINT dst_stride = get_flexible_vertex_size(fvf); UINT dst_size = dst_stride * vertex_count; + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; + struct wined3d_resource *vb; 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, primitive_type, fvf, strided_data, vertex_count, flags); @@ -4055,12 +4057,14 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, dst_size, &dst_data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + dst_size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - pack_strided_data(dst_data, vertex_count, strided_data, fvf); - wined3d_buffer_unmap(device->vertex_buffer); + pack_strided_data(wined3d_map_desc.data, vertex_count, strided_data, fvf); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + dst_size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, dst_stride);

1 0

Henri Verbeet : ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitiveStrided ().
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: a8da2f35af2acd1d145198bbd44cdc2ef148b161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8da2f35af2acd1d145198bbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 11:57:41 2016 +0200 ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitiveStrided(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4cb244a..8cebe65 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4143,8 +4143,10 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, 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); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; + struct wined3d_resource *ib, *vb; UINT vb_pos, align; - BYTE *dst_data; UINT ib_pos; HRESULT hr; @@ -4172,12 +4174,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, vtx_dst_size, &dst_data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + vtx_dst_size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - pack_strided_data(dst_data, vertex_count, strided_data, fvf); - wined3d_buffer_unmap(device->vertex_buffer); + pack_strided_data(wined3d_map_desc.data, vertex_count, strided_data, fvf); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + vtx_dst_size; hr = d3d_device_prepare_index_buffer(device, idx_size); @@ -4187,12 +4191,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, if (device->index_buffer_size - idx_size < ib_pos) ib_pos = 0; - hr = wined3d_buffer_map(device->index_buffer, ib_pos, idx_size, &dst_data, - ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = ib_pos; + wined3d_box.right = ib_pos + idx_size; + ib = wined3d_buffer_get_resource(device->index_buffer); + if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, + ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(dst_data, indices, idx_size); - wined3d_buffer_unmap(device->index_buffer); + memcpy(wined3d_map_desc.data, indices, idx_size); + wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vtx_dst_stride);

1 0

Henri Verbeet : ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitiveVB().
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 612071c365941c4ea5c37e3fe175448c2f77eeb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=612071c365941c4ea5c37e3fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 11:57:42 2016 +0200 ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitiveVB(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8cebe65..c7a516e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4372,7 +4372,9 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, 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; + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; + struct wined3d_resource *ib; HRESULT hr; UINT ib_pos; @@ -4412,16 +4414,18 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, * 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(device->index_buffer, ib_pos, index_count * sizeof(WORD), - (BYTE **)&index_data, ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = ib_pos; + wined3d_box.right = ib_pos + index_count * sizeof(WORD); + ib = wined3d_buffer_get_resource(device->index_buffer); + if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, + ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) { ERR("Failed to map buffer, hr %#x.\n", hr); wined3d_mutex_unlock(); return hr; } - memcpy(index_data, indices, index_count * sizeof(WORD)); - wined3d_buffer_unmap(device->index_buffer); + memcpy(wined3d_map_desc.data, indices, index_count * sizeof(WORD)); + wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + index_count * sizeof(WORD); /* Set the index stream */

1 0

Henri Verbeet : d3d8: Use resource mapping functions in d3d8_device_DrawPrimitiveUP().
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 0338e10a73dc2a2fa5cf259af885243b4241f0ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0338e10a73dc2a2fa5cf259af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 11:57:43 2016 +0200 d3d8: Use resource mapping functions in d3d8_device_DrawPrimitiveUP(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0e3b5cc..fc1d220 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2034,9 +2034,11 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); HRESULT hr; UINT vtx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; UINT size = vtx_count * stride; + struct wined3d_resource *vb; UINT vb_pos, align; - BYTE *buffer_data; TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); @@ -2060,12 +2062,14 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, size, &buffer_data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(buffer_data, data, size); - wined3d_buffer_unmap(device->vertex_buffer); + memcpy(wined3d_map_desc.data, data, size); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride);

1 0

Henri Verbeet : d3d8: Use resource mapping functions in d3d8_device_DrawIndexedPrimitiveUP().
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 2adcec346c0cb9c77a7b279aaa1e7b5ea5b4bcc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2adcec346c0cb9c77a7b279aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 11:57:44 2016 +0200 d3d8: Use resource mapping functions in d3d8_device_DrawIndexedPrimitiveUP(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index fc1d220..33ff7a5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2122,11 +2122,12 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); HRESULT hr; - BYTE *buffer_data; - UINT idx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); UINT idx_fmt_size = index_format == D3DFMT_INDEX16 ? 2 : 4; UINT idx_size = idx_count * idx_fmt_size; + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; + struct wined3d_resource *ib, *vb; UINT ib_pos; UINT vtx_size = vertex_count * vertex_stride; @@ -2157,12 +2158,14 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, vtx_size, &buffer_data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + vtx_size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(buffer_data, vertex_data, vtx_size); - wined3d_buffer_unmap(device->vertex_buffer); + memcpy(wined3d_map_desc.data, vertex_data, vtx_size); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + vtx_size; hr = d3d8_device_prepare_index_buffer(device, idx_size); @@ -2177,12 +2180,14 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface else ib_pos += align; - hr = wined3d_buffer_map(device->index_buffer, ib_pos, idx_size, &buffer_data, - ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = ib_pos; + wined3d_box.right = ib_pos + idx_size; + ib = wined3d_buffer_get_resource(device->index_buffer); + if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, + ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(buffer_data, index_data, idx_size); - wined3d_buffer_unmap(device->index_buffer); + memcpy(wined3d_map_desc.data, index_data, idx_size); + wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vertex_stride);

1 0

Nikolay Sivov : include: Updated CAL_* info defines.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 6748f03bec89c2475a6070f51dff0cd2e10e232e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6748f03bec89c2475a6070f51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 02:04:50 2016 +0300 include: Updated CAL_* info defines. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index 1a7baaf..35521fd 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -471,9 +471,10 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define MAX_DEFAULTCHAR 2 /* Defines for calendar handling */ -#define CAL_NOUSEROVERRIDE LOCALE_NOUSEROVERRIDE -#define CAL_USE_CP_ACP LOCALE_USE_CP_ACP -#define CAL_RETURN_NUMBER LOCALE_RETURN_NUMBER +#define CAL_NOUSEROVERRIDE LOCALE_NOUSEROVERRIDE +#define CAL_USE_CP_ACP LOCALE_USE_CP_ACP +#define CAL_RETURN_NUMBER LOCALE_RETURN_NUMBER +#define CAL_RETURN_GENITIVE_NAMES LOCALE_RETURN_GENITIVE_NAMES #define CAL_ICALINTVALUE 0x01 #define CAL_SCALNAME 0x02 @@ -523,6 +524,15 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define CAL_SABBREVMONTHNAME13 0x2e #define CAL_SYEARMONTH 0x2f #define CAL_ITWODIGITYEARMAX 0x30 +#define CAL_SSHORTESTDAYNAME1 0x31 +#define CAL_SSHORTESTDAYNAME2 0x32 +#define CAL_SSHORTESTDAYNAME3 0x33 +#define CAL_SSHORTESTDAYNAME4 0x34 +#define CAL_SSHORTESTDAYNAME5 0x35 +#define CAL_SSHORTESTDAYNAME6 0x36 +#define CAL_SSHORTESTDAYNAME7 0x37 +#define CAL_SMONTHDAY 0x38 +#define CAL_SABBREVERASTRING 0x39 /* Calendar types */ #define CAL_GREGORIAN 1

1 0