September 2016 - Wine-Commits

Aric Stewart : include: Fix definition of DRIVER_EXTENSION.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 71b66998f6f02c29a88b44154e8d0e7ab5a5e8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b66998f6f02c29a88b44154… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 1 09:31:02 2016 +0200 include: Fix definition of DRIVER_EXTENSION. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 68694af..1c00fda 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -48,6 +48,7 @@ typedef NTSTATUS (WINAPI *PDRIVER_INITIALIZE)(struct _DRIVER_OBJECT *, PUNICODE_ typedef NTSTATUS (WINAPI *PDRIVER_DISPATCH)(struct _DEVICE_OBJECT *, struct _IRP *); typedef void (WINAPI *PDRIVER_STARTIO)(struct _DEVICE_OBJECT *, struct _IRP *); typedef void (WINAPI *PDRIVER_UNLOAD)(struct _DRIVER_OBJECT *); +typedef NTSTATUS (WINAPI *PDRIVER_ADD_DEVICE)(struct _DRIVER_OBJECT *, struct _DEVICE_OBJECT *); typedef struct _DISPATCHER_HEADER { UCHAR Type; @@ -336,7 +337,7 @@ typedef struct _DEVICE_RELATIONS *PDEVICE_RELATIONS; typedef struct _DRIVER_EXTENSION { struct _DRIVER_OBJECT *DriverObject; - PVOID AddDevice; + PDRIVER_ADD_DEVICE AddDevice; ULONG Count; UNICODE_STRING ServiceKeyName; } DRIVER_EXTENSION, *PDRIVER_EXTENSION;

1 0

Nikolay Sivov : msctf/tests: Return interface pointers instead of pointers to impl structure.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: bbae410a2b7f49d777639287fd3820aa0cf6aa91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbae410a2b7f49d777639287f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 03:14:17 2016 +0300 msctf/tests: Return interface pointers instead of pointers to impl structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 2096bff..18a248f 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -191,12 +191,11 @@ static void TextStoreACP_Destructor(TextStoreACP *This) static HRESULT WINAPI TextStoreACP_QueryInterface(ITextStoreACP *iface, REFIID iid, LPVOID *ppvOut) { - TextStoreACP *This = impl_from_ITextStoreACP(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITextStoreACP)) { - *ppvOut = This; + *ppvOut = iface; } if (*ppvOut) @@ -464,7 +463,7 @@ static HRESULT TextStoreACP_Constructor(IUnknown **ppOut) This->ITextStoreACP_iface.lpVtbl = &TextStoreACP_TextStoreACPVtbl; This->refCount = 1; - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown*)&This->ITextStoreACP_iface; return S_OK; } @@ -489,12 +488,11 @@ static void ThreadMgrEventSink_Destructor(ThreadMgrEventSink *This) static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) { - ThreadMgrEventSink *This = impl_from_ITfThreadMgrEventSink(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfThreadMgrEventSink)) { - *ppvOut = This; + *ppvOut = iface; } if (*ppvOut) @@ -623,7 +621,7 @@ static HRESULT ThreadMgrEventSink_Constructor(IUnknown **ppOut) This->ITfThreadMgrEventSink_iface.lpVtbl = &ThreadMgrEventSink_ThreadMgrEventSinkVtbl; This->refCount = 1; - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown*)&This->ITfThreadMgrEventSink_iface; return S_OK; } @@ -773,7 +771,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->IClassFactory_iface.lpVtbl = &ClassFactoryVtbl; This->ref = 1; This->ctor = ctor; - *ppvOut = (LPVOID)This; + *ppvOut = &This->IClassFactory_iface; TS_refCount++; return S_OK; } @@ -785,12 +783,11 @@ static void TextService_Destructor(TextService *This) static HRESULT WINAPI TextService_QueryInterface(ITfTextInputProcessor *iface, REFIID iid, LPVOID *ppvOut) { - TextService *This = impl_from_ITfTextInputProcessor(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfTextInputProcessor)) { - *ppvOut = This; + *ppvOut = iface; } if (*ppvOut) @@ -858,7 +855,7 @@ static HRESULT TextService_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->ITfTextInputProcessor_iface.lpVtbl = &TextService_TextInputProcessorVtbl; This->refCount = 1; - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown*)&This->ITfTextInputProcessor_iface; return S_OK; } @@ -1148,12 +1145,11 @@ static void KeyEventSink_Destructor(KeyEventSink *This) static HRESULT WINAPI KeyEventSink_QueryInterface(ITfKeyEventSink *iface, REFIID iid, LPVOID *ppvOut) { - KeyEventSink *This = impl_from_ITfKeyEventSink(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfKeyEventSink)) { - *ppvOut = This; + *ppvOut = iface; } if (*ppvOut) @@ -1410,12 +1406,11 @@ static void TextEditSink_Destructor(TextEditSink *This) static HRESULT WINAPI TextEditSink_QueryInterface(ITfTextEditSink *iface, REFIID iid, LPVOID *ppvOut) { - TextEditSink *This = impl_from_ITfTextEditSink(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfTextEditSink)) { - *ppvOut = This; + *ppvOut = iface; } if (*ppvOut) @@ -1802,12 +1797,11 @@ static void EditSession_Destructor(EditSession *This) static HRESULT WINAPI EditSession_QueryInterface(ITfEditSession *iface, REFIID iid, LPVOID *ppvOut) { - EditSession *This = impl_from_ITfEditSession(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfEditSession)) { - *ppvOut = This; + *ppvOut = iface; } if (*ppvOut)

1 0

Henri Verbeet : d3d8: Use resource mapping functions in d3d8_device_DrawIndexedPrimitiveUP().
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

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

Henri Verbeet : ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitiveStrided ().
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

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_DrawPrimitiveStrided().
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

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

Nikolay Sivov : dxgi: Use texture pointer instead of resource pointer for DXGI surface.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

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: Fix offscreen flag handling in TransformVertices.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

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 Sept. 1, 2016

Sept. 1, 2016

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 Sept. 1, 2016

Sept. 1, 2016

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: Indicate that WinHttpCrackUrl should return string pointers.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

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