wine-commits September 2016

wine-commits@winehq.org

2 participants
430 discussions

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

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

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: 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: Copy extra vertex data in viewport::TransformVertices.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 606441e57ef9f00a817949d344ea42132f28c8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=606441e57ef9f00a817949d34… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Aug 31 22:01:24 2016 +0100 ddraw: Copy extra vertex data in viewport::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 | 2 +- dlls/ddraw/viewport.c | 46 ++++++++++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index cd2d791..84cd8b8 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9210,7 +9210,7 @@ static void test_transform_vertices(void) ok(compare_vec4(&cmp[i], out[i].x, out[i].y, out[i].z, out[i].w, 4096), "Vertex %u differs. Got %f %f %f %f.\n", i, out[i].x, out[i].y, out[i].z, out[i].w); - todo_wine ok(out[i].v1 == position_tests[i].v1 && out[i].v2 == position_tests[i].v2 + ok(out[i].v1 == position_tests[i].v1 && out[i].v2 == position_tests[i].v2 && out[i].v3 == position_tests[i].v3 && out[i].v4 == position_tests[i].v4, "Vertex %u payload is %u %u %u %u.\n", i, out[i].v1, out[i].v2, out[i].v3, out[i].v4); ok(out[i].unused3 == 0xdeadbeef && out[i].unused4 == 0xcafecafe, diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 000158d..8a42faf 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -381,14 +381,22 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE * DDERR_INVALIDPARAMS if no clipping flag is specified * *****************************************************************************/ +struct transform_vertices_vertex +{ + float x, y, z, w; /* w is unused in input data. */ + struct + { + DWORD p[4]; + } payload; +}; + static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, DWORD dwVertexCount, D3DTRANSFORMDATA *lpData, DWORD dwFlags, DWORD *lpOffScreen) { struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface); D3DVIEWPORT vp = viewport->viewports.vp1; D3DMATRIX view_mat, world_mat, mat; - float *in; - float *out; + struct transform_vertices_vertex *in, *out; float x, y, z, w; unsigned int i; D3DHVERTEX *outH; @@ -420,15 +428,16 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, multiply_matrix(&mat, &view_mat, &world_mat); multiply_matrix(&mat, &viewport->active_device->legacy_projection, &mat); - in = lpData->lpIn; - out = lpData->lpOut; outH = lpData->lpHOut; for(i = 0; i < dwVertexCount; i++) { - x = (in[0] * mat._11) + (in[1] * mat._21) + (in[2] * mat._31) + mat._41; - y = (in[0] * mat._12) + (in[1] * mat._22) + (in[2] * mat._32) + mat._42; - z = (in[0] * mat._13) + (in[1] * mat._23) + (in[2] * mat._33) + mat._43; - w = (in[0] * mat._14) + (in[1] * mat._24) + (in[2] * mat._34) + mat._44; + in = (struct transform_vertices_vertex *)((char *)lpData->lpIn + lpData->dwInSize * i); + out = (struct transform_vertices_vertex *)((char *)lpData->lpOut + lpData->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; + z = (in->x * mat._13) + (in->y * mat._23) + (in->z * mat._33) + mat._43; + w = (in->x * mat._14) + (in->y * mat._24) + (in->z * mat._34) + mat._44; if(dwFlags & D3DTRANSFORM_CLIPPED) { @@ -458,12 +467,10 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, * The exact scheme hasn't been figured out yet, but windows * definitely writes something there. */ - out[0] = x; - out[1] = y; - out[2] = z; - out[3] = w; - in = (float *) ((char *) in + lpData->dwInSize); - out = (float *) ((char *) out + lpData->dwOutSize); + out->x = x; + out->y = y; + out->z = z; + out->w = w; continue; } } @@ -471,12 +478,11 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, w = 1 / w; x *= w; y *= w; z *= w; - out[0] = vp.dwWidth / 2 + vp.dwX + x * vp.dvScaleX; - out[1] = vp.dwHeight / 2 + vp.dwY - y * vp.dvScaleY; - out[2] = z; - out[3] = w; - in = (float *) ((char *) in + lpData->dwInSize); - out = (float *) ((char *) out + lpData->dwOutSize); + out->x = vp.dwWidth / 2 + vp.dwX + x * vp.dvScaleX; + out->y = vp.dwHeight / 2 + vp.dwY - y * vp.dvScaleY; + out->z = z; + out->w = w; + out->payload = in->payload; } /* According to the d3d test, the offscreen flag is set only

1 0

Stefan Dösinger : ddraw/tests: Move IDirect3DViewport ::TransformVertices tests to ddraw1.c.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: cbb2f34a79a6e89c54f99baad5f932caaceaccfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb2f34a79a6e89c54f99baad… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Aug 31 22:01:23 2016 +0100 ddraw/tests: Move IDirect3DViewport::TransformVertices tests to ddraw1.c. 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/d3d.c | 275 ---------------------------------- dlls/ddraw/tests/ddraw1.c | 365 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 365 insertions(+), 275 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbb2f34a79a6e89c54f99…

1 0

Andrew Eikum : winhttp: Also pass hostname to jsproxy.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: c8b166e3bf4e4a4fe865f7216340a35f5394cc96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b166e3bf4e4a4fe865f7216… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 31 14:21:05 2016 -0500 winhttp: Also pass hostname to jsproxy. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 20 +++++++++++++++++--- dlls/winhttp/winhttp_private.h | 15 +++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 90e7946..600624c 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1813,6 +1813,7 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX char *result, *urlA; DWORD len_result; struct AUTO_PROXY_SCRIPT_BUFFER buffer; + URL_COMPONENTSW uc; buffer.dwStructSize = sizeof(buffer); buffer.lpszScriptBuffer = script; @@ -1824,10 +1825,23 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX heap_free( urlA ); return FALSE; } - if ((ret = InternetGetProxyInfo( urlA, strlen(urlA), NULL, 0, &result, &len_result ))) + + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.dwHostNameLength = -1; + + if (WinHttpCrackUrl( url, 0, 0, &uc )) { - ret = parse_script_result( result, info ); - heap_free( result ); + char *hostnameA = strdupWA_sized( uc.lpszHostName, uc.dwHostNameLength ); + + if ((ret = InternetGetProxyInfo( urlA, strlen(urlA), + hostnameA, strlen(hostnameA), &result, &len_result ))) + { + ret = parse_script_result( result, info ); + heap_free( result ); + } + + heap_free( hostnameA ); } heap_free( urlA ); return InternetDeInitializeAutoProxyDll( NULL, 0 ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index b3e28d2..388fc33 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -365,4 +365,19 @@ static inline char *strdupWA( const WCHAR *src ) return dst; } +static inline char *strdupWA_sized( const WCHAR *src, DWORD size ) +{ + char *dst = NULL; + if (src) + { + int len = WideCharToMultiByte( CP_ACP, 0, src, size, NULL, 0, NULL, NULL ) + 1; + if ((dst = heap_alloc( len ))) + { + WideCharToMultiByte( CP_ACP, 0, src, len, dst, size, NULL, NULL ); + dst[len - 1] = 0; + } + } + return dst; +} + #endif /* _WINE_WINHTTP_PRIVATE_H_ */

1 0

Andrew Eikum : winhttp: Indicate that WinHttpCrackUrl should return string pointers.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 668d4299b02926f1b7073ef019ec9cc0990e1f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668d4299b02926f1b7073ef01… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 31 14:21:00 2016 -0500 winhttp: Indicate that WinHttpCrackUrl should return string pointers. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 30909ff..90e7946 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1750,6 +1750,8 @@ static char *download_script( const WCHAR *url, DWORD *out_size ) memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); + uc.dwHostNameLength = -1; + uc.dwUrlPathLength = -1; if (!WinHttpCrackUrl( url, 0, 0, &uc )) return NULL; if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) return NULL; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) );

1 0

Sebastian Lackner : webservices: Fix invalid memory access in remove_header.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 4358f7c39ecc013855a9bd0b3d062a7b1016f16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4358f7c39ecc013855a9bd0b3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 31 21:09:25 2016 +0200 webservices: Fix invalid memory access in remove_header. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 6fcd046..e7da06f 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -787,7 +787,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val static void remove_header( struct msg *msg, ULONG i ) { free_header( msg->header[i] ); - memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i) * sizeof(struct header *) ); + memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i - 1) * sizeof(struct header *) ); msg->header_count--; }

1 0

Sebastian Lackner : webservices: Fix handling of duplicate headers in WsRemoveCustomHeader.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 0238d470316a7ee60abe695fef089580464b4891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0238d470316a7ee60abe695fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 31 21:09:04 2016 +0200 webservices: Fix handling of duplicate headers in WsRemoveCustomHeader. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 2 +- dlls/webservices/tests/msg.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 01b6625..6fcd046 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1062,7 +1062,7 @@ HRESULT WINAPI WsRemoveCustomHeader( WS_MESSAGE *handle, const WS_XML_STRING *na { remove_header( msg, i ); removed = TRUE; - break; + i--; } } diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index b78c52e..5d0901e 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -839,8 +839,15 @@ static void test_WsRemoveCustomHeader(void) "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" "</s:Header><s:Body/></s:Envelope>"; + static const char expected3[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<test xmlns=\"ns\">value</test><test xmlns=\"ns\">value2</test>" + "</s:Header><s:Body/></s:Envelope>"; static WS_XML_STRING localname = {4, (BYTE *)"test"}, ns = {2, (BYTE *)"ns"}; static const WS_XML_STRING value = {5, (BYTE *)"value"}; + static const WS_XML_STRING value2 = {6, (BYTE *)"value2"}; HRESULT hr; WS_MESSAGE *msg; WS_ELEMENT_DESCRIPTION desc; @@ -866,6 +873,10 @@ static void test_WsRemoveCustomHeader(void) ok( hr == S_OK, "got %08x\n", hr ); check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &value2, sizeof(value2), 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected3, -1, strstr(expected3, "urn:uuid:") - expected3, 46, __LINE__ ); + hr = WsRemoveCustomHeader( msg, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr );

1 0

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 September 2016