wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_GetDevice().
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 01d435288f35d94316d4f91ae1faf6421b4e3b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=01d435288f35d94316d4f91ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 13 10:14:22 2014 +0100 d3d10core: Implement d3d10_depthstencil_view_GetDevice(). --- dlls/d3d10core/d3d10core_private.h | 3 ++- dlls/d3d10core/device.c | 6 +++--- dlls/d3d10core/tests/device.c | 14 ++++++++++++-- dlls/d3d10core/view.c | 12 ++++++++++-- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 012c884..c548c4a 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -123,9 +123,10 @@ struct d3d10_depthstencil_view D3D10_DEPTH_STENCIL_VIEW_DESC desc; ID3D10Resource *resource; + ID3D10Device1 *device; }; -HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, +HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN; /* ID3D10RenderTargetView */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 9c1467f..8b3e19c 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1214,16 +1214,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Device1 *iface, ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3D10DepthStencilView **view) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_depthstencil_view *object; HRESULT hr; TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_depthstencil_view_init(object, resource, desc))) + if (FAILED(hr = d3d10_depthstencil_view_init(object, device, resource, desc))) { WARN("Failed to initialize depthstencil view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 429869d..e5e1803 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -213,10 +213,10 @@ static void test_create_depthstencil_view(void) { D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; D3D10_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; ID3D10DepthStencilView *dsview; + ID3D10Device *device, *tmp; ID3D10Texture2D *texture; - ID3D10Device *device; - ULONG refcount; HRESULT hr; if (!(device = create_device())) @@ -240,8 +240,18 @@ static void test_create_depthstencil_view(void) hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsview); ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10DepthStencilView_GetDevice(dsview, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 98ba776..c3333c8 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -425,6 +425,7 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_Release(ID3D10DepthStenci if (!refcount) { ID3D10Resource_Release(This->resource); + ID3D10Device1_Release(This->device); HeapFree(GetProcessHeap(), 0, This); } @@ -435,7 +436,12 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_Release(ID3D10DepthStenci static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDevice(ID3D10DepthStencilView *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)view->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_GetPrivateData(ID3D10DepthStencilView *iface, @@ -506,7 +512,7 @@ static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = d3d10_depthstencil_view_GetDesc, }; -HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, +HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) { HRESULT hr; @@ -526,6 +532,8 @@ HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, view->resource = resource; ID3D10Resource_AddRef(resource); + view->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(view->device); return S_OK; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_buffer_GetDevice().
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 82fc81b644d2dd4e0000c3c9dd805c70d6a30ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fc81b644d2dd4e0000c3c9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 13 10:14:21 2014 +0100 d3d10core: Implement d3d10_buffer_GetDevice(). --- dlls/d3d10core/buffer.c | 20 +++++++++++++++++++- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/tests/device.c | 14 ++++++++++++-- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index 90ff0e8..b9ac6e1 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -59,7 +59,10 @@ static ULONG STDMETHODCALLTYPE d3d10_buffer_AddRef(ID3D10Buffer *iface) TRACE("%p increasing refcount to %u.\n", buffer, refcount); if (refcount == 1) + { + ID3D10Device1_AddRef(buffer->device); wined3d_buffer_incref(buffer->wined3d_buffer); + } return refcount; } @@ -72,7 +75,14 @@ static ULONG STDMETHODCALLTYPE d3d10_buffer_Release(ID3D10Buffer *iface) TRACE("%p decreasing refcount to %u.\n", buffer, refcount); if (!refcount) + { + ID3D10Device1 *device = buffer->device; + wined3d_buffer_decref(buffer->wined3d_buffer); + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D10Device1_Release(device); + } return refcount; } @@ -81,7 +91,12 @@ static ULONG STDMETHODCALLTYPE d3d10_buffer_Release(ID3D10Buffer *iface) static void STDMETHODCALLTYPE d3d10_buffer_GetDevice(ID3D10Buffer *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)buffer->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface, @@ -226,5 +241,8 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi return hr; } + buffer->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(buffer->device); + return S_OK; } diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index eb95f42..012c884 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -108,6 +108,7 @@ struct d3d10_buffer LONG refcount; struct wined3d_buffer *wined3d_buffer; + ID3D10Device1 *device; }; HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *device, diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 6014a93..429869d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -260,12 +260,12 @@ static void test_create_rendertarget_view(void) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; D3D10_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; D3D10_BUFFER_DESC buffer_desc; ID3D10RenderTargetView *rtview; + ID3D10Device *device, *tmp; ID3D10Texture2D *texture; ID3D10Buffer *buffer; - ID3D10Device *device; - ULONG refcount; HRESULT hr; if (!(device = create_device())) @@ -280,8 +280,18 @@ static void test_create_rendertarget_view(void) buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Buffer_GetDevice(buffer, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); rtv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_BUFFER;

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture3d_GetDevice().
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 6e3619c42b59e8814f43ea8c7412835f4517cd4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e3619c42b59e8814f43ea8c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 13 10:14:20 2014 +0100 d3d10core: Implement d3d10_texture3d_GetDevice(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/tests/device.c | 24 ++++++++++++++++++++++-- dlls/d3d10core/texture.c | 20 +++++++++++++++++++- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 291481e..eb95f42 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -95,6 +95,7 @@ struct d3d10_texture3d struct wined3d_texture *wined3d_texture; D3D10_TEXTURE3D_DESC desc; + ID3D10Device1 *device; }; HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_device *device, diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 0abacd7..6014a93 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -134,11 +134,11 @@ static void test_create_texture2d(void) static void test_create_texture3d(void) { + ULONG refcount, expected_refcount; + ID3D10Device *device, *tmp; D3D10_TEXTURE3D_DESC desc; ID3D10Texture3D *texture; IDXGISurface *surface; - ID3D10Device *device; - ULONG refcount; HRESULT hr; if (!(device = create_device())) @@ -157,8 +157,18 @@ static void test_create_texture3d(void) desc.CPUAccessFlags = 0; desc.MiscFlags = 0; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 3d texture, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Texture3D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); hr = ID3D10Texture3D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); ok(FAILED(hr), "Texture should not implement IDXGISurface.\n"); @@ -166,8 +176,18 @@ static void test_create_texture3d(void) ID3D10Texture3D_Release(texture); desc.MipLevels = 0; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 3d texture, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Texture3D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); ID3D10Texture3D_GetDesc(texture, &desc); ok(desc.Width == 64, "Got unexpected Width %u.\n", desc.Width); diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index bd1022d..f169190 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -337,7 +337,10 @@ static ULONG STDMETHODCALLTYPE d3d10_texture3d_AddRef(ID3D10Texture3D *iface) TRACE("%p increasing refcount to %u.\n", texture, refcount); if (refcount == 1) + { + ID3D10Device1_AddRef(texture->device); wined3d_texture_incref(texture->wined3d_texture); + } return refcount; } @@ -355,14 +358,26 @@ static ULONG STDMETHODCALLTYPE d3d10_texture3d_Release(ID3D10Texture3D *iface) TRACE("%p decreasing refcount to %u.\n", texture, refcount); if (!refcount) + { + ID3D10Device1 *device = texture->device; + wined3d_texture_decref(texture->wined3d_texture); + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D10Device1_Release(device); + } return refcount; } static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)texture->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D *iface, @@ -517,5 +532,8 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic } texture->desc.MipLevels = wined3d_texture_get_level_count(texture->wined3d_texture); + texture->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(texture->device); + return S_OK; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture2d_GetDevice().
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 387f65baf8dc01882bc2941dec95a1748feab7e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387f65baf8dc01882bc2941de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 13 10:14:19 2014 +0100 d3d10core: Implement d3d10_texture2d_GetDevice(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/tests/device.c | 30 ++++++++++++++++++++++++++++-- dlls/d3d10core/texture.c | 20 +++++++++++++++++++- dlls/dxgi/surface.c | 4 ---- 4 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 62392e5..291481e 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -81,6 +81,7 @@ struct d3d10_texture2d IUnknown *dxgi_surface; struct wined3d_texture *wined3d_texture; D3D10_TEXTURE2D_DESC desc; + ID3D10Device1 *device; }; HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device, diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 213987b..0abacd7 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -21,6 +21,12 @@ #include "d3d10.h" #include "wine/test.h" +static ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + static ID3D10Device *create_device(void) { ID3D10Device *device; @@ -37,11 +43,11 @@ static ID3D10Device *create_device(void) static void test_create_texture2d(void) { + ULONG refcount, expected_refcount; + ID3D10Device *device, *tmp; D3D10_TEXTURE2D_DESC desc; ID3D10Texture2D *texture; IDXGISurface *surface; - ID3D10Device *device; - ULONG refcount; HRESULT hr; if (!(device = create_device())) @@ -62,8 +68,18 @@ static void test_create_texture2d(void) desc.CPUAccessFlags = 0; desc.MiscFlags = 0; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Texture2D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Texture should implement IDXGISurface\n"); @@ -71,8 +87,18 @@ static void test_create_texture2d(void) ID3D10Texture2D_Release(texture); desc.MipLevels = 0; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Texture2D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); ID3D10Texture2D_GetDesc(texture, &desc); ok(desc.Width == 512, "Got unexpected Width %u.\n", desc.Width); diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index d3ffcb1..bd1022d 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -67,7 +67,10 @@ static ULONG STDMETHODCALLTYPE d3d10_texture2d_AddRef(ID3D10Texture2D *iface) TRACE("%p increasing refcount to %u\n", This, refcount); if (refcount == 1) + { + ID3D10Device1_AddRef(This->device); wined3d_texture_incref(This->wined3d_texture); + } return refcount; } @@ -88,7 +91,14 @@ static ULONG STDMETHODCALLTYPE d3d10_texture2d_Release(ID3D10Texture2D *iface) TRACE("%p decreasing refcount to %u\n", This, refcount); if (!refcount) + { + ID3D10Device1 *device = This->device; + wined3d_texture_decref(This->wined3d_texture); + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D10Device1_Release(device); + } return refcount; } @@ -97,7 +107,12 @@ static ULONG STDMETHODCALLTYPE d3d10_texture2d_Release(ID3D10Texture2D *iface) static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)texture->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *iface, @@ -283,6 +298,9 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic } texture->desc.MipLevels = wined3d_texture_get_level_count(texture->wined3d_texture); + texture->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(texture->device); + return S_OK; } diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index f7fa931..2814742 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -71,10 +71,7 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) TRACE("%p decreasing refcount to %u.\n", surface, refcount); if (!refcount) - { - IDXGIDevice_Release(surface->device); HeapFree(GetProcessHeap(), 0, surface); - } return refcount; } @@ -210,7 +207,6 @@ HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUn surface->refcount = 1; surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; - IDXGIDevice_AddRef(device); return S_OK; }

1 0

Henri Verbeet : d3d8/tests: Accept some broken results in test_scalar_instructions().
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: b22ee99fe948a30dc0c0aad5f3df711cffaa9596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22ee99fe948a30dc0c0aad5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 13 10:14:18 2014 +0100 d3d8/tests: Accept some broken results in test_scalar_instructions(). --- dlls/d3d8/tests/visual.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 7a7e11a..616dd41 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1767,15 +1767,18 @@ static void test_scalar_instructions(IDirect3DDevice8 *device) const char *name; const DWORD *byte_code; D3DCOLOR color; + /* Some drivers, including Intel HD4000 10.18.10.3345 and VMware SVGA + * 3D 7.14.1.5025, use the .x component instead of the .w one. */ + D3DCOLOR broken_color; } test_data[] = { - {"rcp_test", rcp_test, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x80)}, - {"rsq_test", rsq_test, D3DCOLOR_ARGB(0x00, 0xb4, 0xb4, 0xb4)}, - {"exp_test", exp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40)}, - {"expp_test", expp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40)}, - {"log_test", log_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)}, - {"logp_test", logp_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)}, + {"rcp_test", rcp_test, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x80), D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)}, + {"rsq_test", rsq_test, D3DCOLOR_ARGB(0x00, 0xb4, 0xb4, 0xb4), D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)}, + {"exp_test", exp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), D3DCOLOR_ARGB(0x00, 0xd6, 0xd6, 0xd6)}, + {"expp_test", expp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)}, + {"log_test", log_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, + {"logp_test", logp_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00)}, }; unsigned int i; DWORD shader; @@ -1800,7 +1803,8 @@ static void test_scalar_instructions(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "%s: Failed to end scene, hr %#x.\n", test_data[i].name, hr); color = getPixelColor(device, 320, 240); - ok(color_match(color, test_data[i].color, 4), "%s: Got unexpected color 0x%08x, expected 0x%08x.\n", + ok(color_match(color, test_data[i].color, 4) || broken(color_match(color, test_data[i].broken_color, 4)), + "%s: Got unexpected color 0x%08x, expected 0x%08x.\n", test_data[i].name, color, test_data[i].color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);

1 0

Nikolay Sivov : comctl32/tests: Don't assert() on test failures.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 91672c8453d4744ff45c712b3290b45d54a0eb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91672c8453d4744ff45c712b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 13 12:31:48 2014 +0400 comctl32/tests: Don't assert() on test failures. --- dlls/comctl32/tests/comboex.c | 6 +++--- dlls/comctl32/tests/header.c | 29 ++++++++++++++++------------- dlls/comctl32/tests/monthcal.c | 7 ++----- dlls/comctl32/tests/progress.c | 12 ++++++------ dlls/comctl32/tests/status.c | 3 +-- dlls/comctl32/tests/subclass.c | 14 ++++++++------ dlls/comctl32/tests/tab.c | 7 ++----- dlls/comctl32/tests/tooltips.c | 12 +++++------- dlls/comctl32/tests/treeview.c | 28 +++++++++++++--------------- 9 files changed, 56 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91672c8453d4744ff45c7…

1 0

Nikolay Sivov : shell32/tests: Fix a test failure on Win8.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 7dc45ea585ca328918419617186e50b56b42e7f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc45ea585ca3289184196171… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 13 10:14:16 2014 +0400 shell32/tests: Fix a test failure on Win8. --- dlls/shell32/tests/shlfolder.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 7b8a57e..f096476 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3639,10 +3639,23 @@ static void test_ShellItemBindToHandler(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); - /* BHID_Transfer */ - hr = IShellItem_BindToHandler(psi, NULL, &BHID_Transfer, &IID_IUnknown, (void**)&punk); - ok(hr == E_NOINTERFACE || broken(hr == MK_E_NOOBJECT /* XP */), "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(punk); + /* BHID_Transfer + ITransferSource and ITransferDestination are accessible starting Vista, IUnknown is + supported start Win8. */ + hr = IShellItem_BindToHandler(psi, NULL, &BHID_Transfer, &IID_ITransferSource, (void**)&punk); + ok(hr == S_OK || broken(FAILED(hr)) /* pre-Vista */, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + IUnknown_Release(punk); + + hr = IShellItem_BindToHandler(psi, NULL, &BHID_Transfer, &IID_ITransferDestination, (void**)&punk); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + + hr = IShellItem_BindToHandler(psi, NULL, &BHID_Transfer, &IID_IUnknown, (void**)&punk); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* pre-Win8 */, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + } /* BHID_EnumItems */ hr = IShellItem_BindToHandler(psi, NULL, &BHID_EnumItems, &IID_IEnumShellItems, (void**)&punk);

1 0

Nikolay Sivov : include: Added ITransferSource/ ITransferDestination interfaces.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: c2faae4c3a1a7f6e5ba0b89ca7fcb4275a1a2940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2faae4c3a1a7f6e5ba0b89ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 13 10:13:54 2014 +0400 include: Added ITransferSource/ITransferDestination interfaces. --- include/shobjidl.idl | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 8fe87b7..c9297a8 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3321,6 +3321,124 @@ interface IQueryCancelAutoPlay : IUnknown [in] DWORD serial_number); } +[ + uuid(d594d0d8-8da7-457b-b3b4-ce5dbaac0b88), + pointer_default(unique) +] +interface ITransferAdviseSink : IUnknown +{ + [v1_enum] enum _TRANSFER_ADVISE_STATE + { + TS_NONE = 0, + TS_PERFORMING = 1, + TS_PREPARING = 2, + TS_INDETERMINATE = 4 + }; + typedef DWORD TRANSFER_ADVISE_STATE; + + HRESULT UpdateProgress([in] ULONGLONG size_current, + [in] ULONGLONG size_total, + [in] INT files_current, + [in] INT files_total, + [in] INT folders_current, + [in] INT folders_total); + HRESULT UpdateTransferState([in] TRANSFER_ADVISE_STATE state); + HRESULT ConfirmOverwrite([in] IShellItem *source, + [in] IShellItem *dest_parent, + [in, string] LPCWSTR name); + HRESULT ConfirmEncryptLoss([in] IShellItem *source); + HRESULT FileFailure([in] IShellItem *item, + [in, unique, string] LPCWSTR itemname, + [in] HRESULT hr, + [out, unique, size_is(crename)] LPWSTR rename, + [in] ULONG crename); + HRESULT SubStreamFailure([in] IShellItem *item, + [in, string] LPCWSTR stream, + [in] HRESULT hr); + HRESULT PropertyFailure([in] IShellItem *item, + [in, unique] const PROPERTYKEY *key, + [in] HRESULT hr); +} + +[v1_enum] enum _TRANSFER_SOURCE_FLAGS +{ + TSF_NORMAL = 0, + TSF_FAIL_EXIST = 0, + TSF_RENAME_EXIST = 0x1, + TSF_OVERWRITE_EXIST = 0x2, + TSF_ALLOW_DECRYPTION = 0x4, + TSF_NO_SECURITY = 0x8, + TSF_COPY_CREATION_TIME = 0x10, + TSF_COPY_WRITE_TIME = 0x20, + TSF_USE_FULL_ACCESS = 0x40, + TSF_DELETE_RECYCLE_IF_POSSIBLE = 0x80, + TSF_COPY_HARD_LINK = 0x100, + TSF_COPY_LOCALIZED_NAME = 0x200, + TSF_MOVE_AS_COPY_DELETE = 0x400, + TSF_SUSPEND_SHELLEVENTS = 0x800 +}; +typedef DWORD TRANSFER_SOURCE_FLAGS; + +[ + uuid(00adb003-bde9-45c6-8e29-d09f9353e108), + object, + pointer_default(unique) +] +interface ITransferSource : IUnknown +{ + HRESULT Advise([in] ITransferAdviseSink *sink, [out] DWORD *cookie); + HRESULT Unadvise([in] DWORD cookie); + HRESULT SetProperties([in] IPropertyChangeArray *array); + HRESULT OpenItem([in] IShellItem *item, + [in] TRANSFER_SOURCE_FLAGS flags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + HRESULT MoveItem([in] IShellItem *item, + [in] IShellItem *parent_dest, + [in, string] LPCWSTR name_dest, + [in] TRANSFER_SOURCE_FLAGS flags, + [out] IShellItem **newitem); + HRESULT RecycleItem([in] IShellItem *source, + [in] IShellItem *parent_dest, + [in] TRANSFER_SOURCE_FLAGS flags, + [out] IShellItem **new_dest); + HRESULT RemoveItem([in] IShellItem *source, [in] TRANSFER_SOURCE_FLAGS flags); + HRESULT RenameItem([in] IShellItem *source, + [in, string] LPCWSTR newname, + [in] TRANSFER_SOURCE_FLAGS flags, + [out] IShellItem **new_dest); + HRESULT LinkItem([in] IShellItem *source, + [in] IShellItem *parent_dest, + [in, unique, string] LPCWSTR new_name, + [in] TRANSFER_SOURCE_FLAGS flags, + [out] IShellItem **new_dest); + HRESULT ApplyPropertiesToItem([in] IShellItem *source, [out] IShellItem **newitem); + HRESULT GetDefaultDestinationName([in] IShellItem *source, + [in] IShellItem *parent_dest, + [out, string] LPWSTR *dest_name); + HRESULT EnterFolder([in] IShellItem *child_folder); + HRESULT LeaveFolder([in] IShellItem *child_folder); +} + +[ + uuid(48addd32-3ca5-4124-abe3-b5a72531b207), + object, + pointer_default(unique) +] +interface ITransferDestination : IUnknown +{ + HRESULT Advise([in] ITransferAdviseSink *sink, [out] DWORD *cookie); + HRESULT Unadvise([in] DWORD cookie); + HRESULT CreateItem([in, string] LPCWSTR name, + [in] DWORD attr, + [in] ULONGLONG size, + [in] TRANSFER_SOURCE_FLAGS flags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv, + [in] REFIID resources, + [out, iid_is(riid)] void **presources); +} + /***************************************************************************** * ShellObjects typelibrary */

1 0

Nikolay Sivov : msxml3: Implement addParameter() for XSLProcessor.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 2d80fb33eeafb9f3ac9eb1165a800036d1a74b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d80fb33eeafb9f3ac9eb1165… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 13 10:13:08 2014 +0400 msxml3: Implement addParameter() for XSLProcessor. --- dlls/msxml3/stylesheet.c | 105 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 87f8fe2..f0fa299 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -37,6 +37,7 @@ #include "msxml_private.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -49,6 +50,19 @@ typedef struct IXMLDOMNode *node; } xsltemplate; +struct xslprocessor_par +{ + struct list entry; + BSTR name; + BSTR value; +}; + +struct xslprocessor_params +{ + struct list list; + unsigned int count; +}; + typedef struct { DispatchEx dispex; @@ -60,6 +74,8 @@ typedef struct IStream *output; BSTR outstr; + + struct xslprocessor_params params; } xslprocessor; static HRESULT XSLProcessor_create(xsltemplate*, IXSLProcessor**); @@ -74,6 +90,15 @@ static inline xslprocessor *impl_from_IXSLProcessor( IXSLProcessor *iface ) return CONTAINING_RECORD(iface, xslprocessor, IXSLProcessor_iface); } +static void xslprocessor_par_free(struct xslprocessor_params *params, struct xslprocessor_par *par) +{ + params->count--; + list_remove(&par->entry); + SysFreeString(par->name); + SysFreeString(par->value); + heap_free(par); +} + static void xsltemplate_set_node( xsltemplate *This, IXMLDOMNode *node ) { if (This->node) IXMLDOMNode_Release(This->node); @@ -305,9 +330,15 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { + struct xslprocessor_par *par, *par2; + if (This->input) IXMLDOMNode_Release(This->input); if (This->output) IStream_Release(This->output); SysFreeString(This->outstr); + + LIST_FOR_EACH_ENTRY_SAFE(par, par2, &This->params.list, struct xslprocessor_par, entry) + xslprocessor_par_free(&This->params, par); + IXSLTemplate_Release(&This->stylesheet->IXSLTemplate_iface); release_dispex(&This->dispex); heap_free( This ); @@ -547,6 +578,26 @@ static HRESULT WINAPI xslprocessor_get_readyState( return E_NOTIMPL; } +static HRESULT xslprocessor_set_parvalue(const VARIANT *var, struct xslprocessor_par *par) +{ + HRESULT hr = S_OK; + + switch (V_VT(var)) + { + case VT_BSTR: + { + par->value = SysAllocString(V_BSTR(var)); + if (!par->value) hr = E_OUTOFMEMORY; + break; + } + default: + FIXME("value type %d not handled\n", V_VT(var)); + hr = E_NOTIMPL; + } + + return hr; +} + static HRESULT WINAPI xslprocessor_addParameter( IXSLProcessor *iface, BSTR p, @@ -554,10 +605,58 @@ static HRESULT WINAPI xslprocessor_addParameter( BSTR uri) { xslprocessor *This = impl_from_IXSLProcessor( iface ); + struct xslprocessor_par *cur, *par = NULL; + HRESULT hr; - FIXME("(%p)->(%s %s %s): stub\n", This, debugstr_w(p), debugstr_variant(&var), + TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(p), debugstr_variant(&var), debugstr_w(uri)); - return E_NOTIMPL; + + if (uri && *uri) + FIXME("namespace uri is not supported\n"); + + /* search for existing parameter first */ + LIST_FOR_EACH_ENTRY(cur, &This->params.list, struct xslprocessor_par, entry) + { + if (!strcmpW(cur->name, p)) + { + par = cur; + break; + } + } + + /* override with new value or add new parameter */ + if (par) + { + if (V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY) + { + /* remove parameter */ + xslprocessor_par_free(&This->params, par); + return S_OK; + } + SysFreeString(par->value); + par->value = NULL; + } + else + { + /* new parameter */ + par = heap_alloc(sizeof(struct xslprocessor_par)); + if (!par) return E_OUTOFMEMORY; + + par->name = SysAllocString(p); + if (!par->name) + { + heap_free(par); + return E_OUTOFMEMORY; + } + list_add_tail(&This->params.list, &par->entry); + This->params.count++; + } + + hr = xslprocessor_set_parvalue(&var, par); + if (FAILED(hr)) + xslprocessor_par_free(&This->params, par); + + return hr; } static HRESULT WINAPI xslprocessor_addObject( @@ -633,6 +732,8 @@ HRESULT XSLProcessor_create(xsltemplate *template, IXSLProcessor **ppObj) This->input = NULL; This->output = NULL; This->outstr = NULL; + list_init(&This->params.list); + This->params.count = 0; This->stylesheet = template; IXSLTemplate_AddRef(&template->IXSLTemplate_iface); init_dispex(&This->dispex, (IUnknown*)&This->IXSLProcessor_iface, &xslprocessor_dispex);

1 0

Bruno Jesus : ws2_32: Add AI_NUMERICSERV support.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: e5fba2d54cb20e867e72e09040287e9de549e567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5fba2d54cb20e867e72e0904… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Feb 12 21:29:31 2014 -0200 ws2_32: Add AI_NUMERICSERV support. --- dlls/ws2_32/socket.c | 3 +++ include/ws2tcpip.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1c558bf..7a9440f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -525,6 +525,9 @@ static const int ws_aiflag_map[][2] = MAP_OPTION( AI_PASSIVE ), MAP_OPTION( AI_CANONNAME ), MAP_OPTION( AI_NUMERICHOST ), +#ifdef AI_NUMERICSERV + MAP_OPTION( AI_NUMERICSERV ), +#endif MAP_OPTION( AI_V4MAPPED ), MAP_OPTION( AI_ADDRCONFIG ), }; diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 89f4895..b3a6a1f 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -63,6 +63,7 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define AI_PASSIVE 0x00000001 # define AI_CANONNAME 0x00000002 # define AI_NUMERICHOST 0x00000004 +# define AI_NUMERICSERV 0x00000008 # define AI_ADDRCONFIG 0x00000400 # define AI_V4MAPPED 0x00000800 # define AI_NON_AUTHORITATIVE 0x00004000 @@ -82,6 +83,7 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define WS_AI_PASSIVE 0x00000001 # define WS_AI_CANONNAME 0x00000002 # define WS_AI_NUMERICHOST 0x00000004 +# define WS_AI_NUMERICSERV 0x00000008 # define WS_AI_ADDRCONFIG 0x00000400 # define WS_AI_V4MAPPED 0x00000800 # define WS_AI_NON_AUTHORITATIVE 0x00004000

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2014