September 2015 - Wine-commits

Józef Kucia : d3d11: Implement d3d11_device_CreateVertexShader().
by Alexandre Julliard 16 Sep '15

16 Sep '15

Module: wine Branch: master Commit: 70fdfdb11b312709e74b90e3f564f874a476e419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70fdfdb11b312709e74b90e3f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 16 01:30:11 2015 +0200 d3d11: Implement d3d11_device_CreateVertexShader(). --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 32 +++++++++++++++++--------------- dlls/d3d11/shader.c | 24 +++++++++++++++++++++++- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 517a1be..e14a305 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -236,8 +236,8 @@ struct d3d_vertex_shader ID3D11Device *device; }; -HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_device *device, - const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; +HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d_vertex_shader **shader) DECLSPEC_HIDDEN; struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN; /* ID3D10GeometryShader */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 050b83e..f3e5e89 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -199,10 +199,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device *if static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11VertexShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p stub!\n", + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_vertex_shader *object; + HRESULT hr; + + TRACE("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); - return E_NOTIMPL; + if (class_linkage) + FIXME("Class linkage is not implemented yet.\n"); + + if (FAILED(hr = d3d_vertex_shader_create(device, byte_code, byte_code_length, &object))) + return hr; + + *shader = &object->ID3D11VertexShader_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device *iface, const void *byte_code, @@ -2237,26 +2249,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device1 *i static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device1 *iface, const void *byte_code, SIZE_T byte_code_length, ID3D10VertexShader **shader) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_vertex_shader *object; HRESULT hr; - TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n", + TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p.\n", iface, byte_code, byte_code_length, shader); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - hr = d3d_vertex_shader_init(object, This, byte_code, byte_code_length); - if (FAILED(hr)) - { - WARN("Failed to initialize vertex shader, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_vertex_shader_create(device, byte_code, byte_code_length, &object))) return hr; - } - TRACE("Created vertex shader %p.\n", object); *shader = &object->ID3D10VertexShader_iface; return S_OK; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index f0aadc8..2df882c 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -359,7 +359,7 @@ static const struct wined3d_parent_ops d3d_vertex_shader_wined3d_parent_ops = d3d_vertex_shader_wined3d_object_destroyed, }; -HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_device *device, +static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) { struct wined3d_shader_signature output_signature; @@ -408,6 +408,28 @@ HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_devi return S_OK; } +HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d_vertex_shader **shader) +{ + struct d3d_vertex_shader *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_vertex_shader_init(object, device, byte_code, byte_code_length))) + { + WARN("Failed to initialize vertex shader, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created vertex shader %p.\n", object); + *shader = object; + + return S_OK; +} + struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Rename d3d10_pixel_shader to d3d_pixel_shader.
by Alexandre Julliard 16 Sep '15

16 Sep '15

Module: wine Branch: master Commit: f210c42de79e98288a277b6ee48cde351f047a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f210c42de79e98288a277b6ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 16 01:30:12 2015 +0200 d3d11: Rename d3d10_pixel_shader to d3d_pixel_shader. --- dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 8 ++++---- dlls/d3d11/shader.c | 30 +++++++++++++++--------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e14a305..5dc50ad 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -255,7 +255,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) DECLSPEC_HIDDEN; /* ID3D10PixelShader */ -struct d3d10_pixel_shader +struct d3d_pixel_shader { ID3D10PixelShader ID3D10PixelShader_iface; LONG refcount; @@ -265,9 +265,9 @@ struct d3d10_pixel_shader ID3D10Device1 *device; }; -HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d_device *device, +HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; -struct d3d10_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) DECLSPEC_HIDDEN; +struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) DECLSPEC_HIDDEN; HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f3e5e89..9ebb5a2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -657,7 +657,7 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetShader(ID3D10Device1 *iface, ID3D10PixelShader *shader) { struct d3d_device *This = impl_from_ID3D10Device(iface); - struct d3d10_pixel_shader *ps = unsafe_impl_from_ID3D10PixelShader(shader); + struct d3d_pixel_shader *ps = unsafe_impl_from_ID3D10PixelShader(shader); TRACE("iface %p, shader %p\n", iface, shader); @@ -1347,7 +1347,7 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetShaderResources(ID3D10Device1 *i static void STDMETHODCALLTYPE d3d10_device_PSGetShader(ID3D10Device1 *iface, ID3D10PixelShader **shader) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_pixel_shader *shader_impl; + struct d3d_pixel_shader *shader_impl; struct wined3d_shader *wined3d_shader; TRACE("iface %p, shader %p.\n", iface, shader); @@ -2308,7 +2308,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device1 *i const void *byte_code, SIZE_T byte_code_length, ID3D10PixelShader **shader) { struct d3d_device *This = impl_from_ID3D10Device(iface); - struct d3d10_pixel_shader *object; + struct d3d_pixel_shader *object; HRESULT hr; TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n", @@ -2318,7 +2318,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device1 *i if (!object) return E_OUTOFMEMORY; - hr = d3d10_pixel_shader_init(object, This, byte_code, byte_code_length); + hr = d3d_pixel_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) { WARN("Failed to initialize pixel shader, hr %#x.\n", hr); diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 2df882c..8bf32f0 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -612,9 +612,9 @@ struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10Geomet return impl_from_ID3D10GeometryShader(iface); } -static inline struct d3d10_pixel_shader *impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) +static inline struct d3d_pixel_shader *impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) { - return CONTAINING_RECORD(iface, struct d3d10_pixel_shader, ID3D10PixelShader_iface); + return CONTAINING_RECORD(iface, struct d3d_pixel_shader, ID3D10PixelShader_iface); } /* IUnknown methods */ @@ -641,7 +641,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_QueryInterface(ID3D10PixelSh static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *iface) { - struct d3d10_pixel_shader *This = impl_from_ID3D10PixelShader(iface); + struct d3d_pixel_shader *This = impl_from_ID3D10PixelShader(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -659,7 +659,7 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *ifac static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *iface) { - struct d3d10_pixel_shader *This = impl_from_ID3D10PixelShader(iface); + struct d3d_pixel_shader *This = impl_from_ID3D10PixelShader(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -683,7 +683,7 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *ifa static void STDMETHODCALLTYPE d3d10_pixel_shader_GetDevice(ID3D10PixelShader *iface, ID3D10Device **device) { - struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + struct d3d_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -694,7 +694,7 @@ static void STDMETHODCALLTYPE d3d10_pixel_shader_GetDevice(ID3D10PixelShader *if static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelShader *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + struct d3d_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -705,7 +705,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelSh static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateData(ID3D10PixelShader *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + struct d3d_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -716,7 +716,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateData(ID3D10PixelSh static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateDataInterface(ID3D10PixelShader *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + struct d3d_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -736,20 +736,20 @@ static const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl = d3d10_pixel_shader_SetPrivateDataInterface, }; -static void STDMETHODCALLTYPE d3d10_pixel_shader_wined3d_object_destroyed(void *parent) +static void STDMETHODCALLTYPE d3d_pixel_shader_wined3d_object_destroyed(void *parent) { - struct d3d10_pixel_shader *shader = parent; + struct d3d_pixel_shader *shader = parent; wined3d_private_store_cleanup(&shader->private_store); HeapFree(GetProcessHeap(), 0, parent); } -static const struct wined3d_parent_ops d3d10_pixel_shader_wined3d_parent_ops = +static const struct wined3d_parent_ops d3d_pixel_shader_wined3d_parent_ops = { - d3d10_pixel_shader_wined3d_object_destroyed, + d3d_pixel_shader_wined3d_object_destroyed, }; -HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d_device *device, +HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) { struct wined3d_shader_signature output_signature; @@ -779,7 +779,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d_de desc.max_version = 4; hr = wined3d_shader_create_ps(device->wined3d_device, &desc, shader, - &d3d10_pixel_shader_wined3d_parent_ops, &shader->wined3d_shader); + &d3d_pixel_shader_wined3d_parent_ops, &shader->wined3d_shader); shader_free_signature(&input_signature); shader_free_signature(&output_signature); if (FAILED(hr)) @@ -797,7 +797,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d_de return S_OK; } -struct d3d10_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) +struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) { if (!iface) return NULL;

1 0

Józef Kucia : d3d11: Implement ID3D11PixelShader interface.
by Alexandre Julliard 16 Sep '15

16 Sep '15

Module: wine Branch: master Commit: 13a80eaab180517ff64963cafce87ed04ec72820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a80eaab180517ff64963caf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 16 01:30:13 2015 +0200 d3d11: Implement ID3D11PixelShader interface. --- dlls/d3d11/d3d11_private.h | 5 +- dlls/d3d11/shader.c | 155 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 131 insertions(+), 29 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 5dc50ad..3aff186 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -254,15 +254,16 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) DECLSPEC_HIDDEN; -/* ID3D10PixelShader */ +/* ID3D11PixelShader, ID3D10PixelShader */ struct d3d_pixel_shader { + ID3D11PixelShader ID3D11PixelShader_iface; ID3D10PixelShader ID3D10PixelShader_iface; LONG refcount; struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d_device *device, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 8bf32f0..695ccf9 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -612,73 +612,174 @@ struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10Geomet return impl_from_ID3D10GeometryShader(iface); } -static inline struct d3d_pixel_shader *impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) +/* ID3D11PixelShader methods */ + +static inline struct d3d_pixel_shader *impl_from_ID3D11PixelShader(ID3D11PixelShader *iface) { - return CONTAINING_RECORD(iface, struct d3d_pixel_shader, ID3D10PixelShader_iface); + return CONTAINING_RECORD(iface, struct d3d_pixel_shader, ID3D11PixelShader_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_QueryInterface(ID3D10PixelShader *iface, +static HRESULT STDMETHODCALLTYPE d3d11_pixel_shader_QueryInterface(ID3D11PixelShader *iface, REFIID riid, void **object) { - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + struct d3d_pixel_shader *shader = impl_from_ID3D11PixelShader(iface); - if (IsEqualGUID(riid, &IID_ID3D10PixelShader) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11PixelShader) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D11PixelShader_AddRef(iface); *object = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + if (IsEqualGUID(riid, &IID_ID3D10PixelShader) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + IUnknown_AddRef(&shader->ID3D10PixelShader_iface); + *object = &shader->ID3D10PixelShader_iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *iface) +static ULONG STDMETHODCALLTYPE d3d11_pixel_shader_AddRef(ID3D11PixelShader *iface) { - struct d3d_pixel_shader *This = impl_from_ID3D10PixelShader(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_pixel_shader *shader = impl_from_ID3D11PixelShader(iface); + ULONG refcount = InterlockedIncrement(&shader->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", shader, refcount); if (refcount == 1) { - ID3D10Device1_AddRef(This->device); + ID3D11Device_AddRef(shader->device); wined3d_mutex_lock(); - wined3d_shader_incref(This->wined3d_shader); + wined3d_shader_incref(shader->wined3d_shader); wined3d_mutex_unlock(); } return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *iface) +static ULONG STDMETHODCALLTYPE d3d11_pixel_shader_Release(ID3D11PixelShader *iface) { - struct d3d_pixel_shader *This = impl_from_ID3D10PixelShader(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d_pixel_shader *shader = impl_from_ID3D11PixelShader(iface); + ULONG refcount = InterlockedDecrement(&shader->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", shader, refcount); if (!refcount) { - ID3D10Device1 *device = This->device; + ID3D11Device *device = shader->device; wined3d_mutex_lock(); - wined3d_shader_decref(This->wined3d_shader); + wined3d_shader_decref(shader->wined3d_shader); wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D10Device1_Release(device); + ID3D11Device_Release(device); } return refcount; } +static void STDMETHODCALLTYPE d3d11_pixel_shader_GetDevice(ID3D11PixelShader *iface, + ID3D11Device **device) +{ + struct d3d_pixel_shader *shader = impl_from_ID3D11PixelShader(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = shader->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_pixel_shader_GetPrivateData(ID3D11PixelShader *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_pixel_shader *shader = impl_from_ID3D11PixelShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_pixel_shader_SetPrivateData(ID3D11PixelShader *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_pixel_shader *shader = impl_from_ID3D11PixelShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_pixel_shader_SetPrivateDataInterface(ID3D11PixelShader *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_pixel_shader *shader = impl_from_ID3D11PixelShader(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&shader->private_store, guid, data); +} + +static const struct ID3D11PixelShaderVtbl d3d11_pixel_shader_vtbl = +{ + /* IUnknown methods */ + d3d11_pixel_shader_QueryInterface, + d3d11_pixel_shader_AddRef, + d3d11_pixel_shader_Release, + /* ID3D11DeviceChild methods */ + d3d11_pixel_shader_GetDevice, + d3d11_pixel_shader_GetPrivateData, + d3d11_pixel_shader_SetPrivateData, + d3d11_pixel_shader_SetPrivateDataInterface, +}; + +/* ID3D10PixelShader methods */ + +static inline struct d3d_pixel_shader *impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_pixel_shader, ID3D10PixelShader_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_QueryInterface(ID3D10PixelShader *iface, + REFIID riid, void **object) +{ + struct d3d_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_pixel_shader_QueryInterface(&shader->ID3D11PixelShader_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *iface) +{ + struct d3d_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_pixel_shader_AddRef(&shader->ID3D11PixelShader_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *iface) +{ + struct d3d_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_pixel_shader_Release(&shader->ID3D11PixelShader_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_pixel_shader_GetDevice(ID3D10PixelShader *iface, ID3D10Device **device) @@ -687,8 +788,7 @@ static void STDMETHODCALLTYPE d3d10_pixel_shader_GetDevice(ID3D10PixelShader *if TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)shader->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(shader->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelShader *iface, @@ -758,6 +858,7 @@ HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d_device struct wined3d_shader_desc desc; HRESULT hr; + shader->ID3D11PixelShader_iface.lpVtbl = &d3d11_pixel_shader_vtbl; shader->ID3D10PixelShader_iface.lpVtbl = &d3d10_pixel_shader_vtbl; shader->refcount = 1; wined3d_mutex_lock(); @@ -791,8 +892,8 @@ HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d_device } wined3d_mutex_unlock(); - shader->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(shader->device); + shader->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(shader->device); return S_OK; }

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreatePixelShader().
by Alexandre Julliard 16 Sep '15

16 Sep '15

Module: wine Branch: master Commit: 8d253f84011d4f3c99520cfa9240ec596efb786f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d253f84011d4f3c99520cfa9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 16 01:30:14 2015 +0200 d3d11: Implement d3d11_device_CreatePixelShader(). --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 32 +++++++++++++++++--------------- dlls/d3d11/shader.c | 24 +++++++++++++++++++++++- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 3aff186..e76ce6d 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -266,8 +266,8 @@ struct d3d_pixel_shader ID3D11Device *device; }; -HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d_device *device, - const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; +HRESULT d3d_pixel_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d_pixel_shader **shader) DECLSPEC_HIDDEN; struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) DECLSPEC_HIDDEN; HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9ebb5a2..eb605aa 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -242,10 +242,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutp static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11PixelShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p stub!\n", + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_pixel_shader *object; + HRESULT hr; + + TRACE("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); - return E_NOTIMPL; + if (class_linkage) + FIXME("Class linkage is not implemented yet.\n"); + + if (FAILED(hr = d3d_pixel_shader_create(device, byte_code, byte_code_length, &object))) + return hr; + + *shader = &object->ID3D11PixelShader_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device *iface, const void *byte_code, @@ -2307,26 +2319,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device1 *iface, const void *byte_code, SIZE_T byte_code_length, ID3D10PixelShader **shader) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_pixel_shader *object; HRESULT hr; - TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n", + TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p.\n", iface, byte_code, byte_code_length, shader); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - hr = d3d_pixel_shader_init(object, This, byte_code, byte_code_length); - if (FAILED(hr)) - { - WARN("Failed to initialize pixel shader, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_pixel_shader_create(device, byte_code, byte_code_length, &object))) return hr; - } - TRACE("Created pixel shader %p.\n", object); *shader = &object->ID3D10PixelShader_iface; return S_OK; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 695ccf9..40dac3d 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -849,7 +849,7 @@ static const struct wined3d_parent_ops d3d_pixel_shader_wined3d_parent_ops = d3d_pixel_shader_wined3d_object_destroyed, }; -HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d_device *device, +static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) { struct wined3d_shader_signature output_signature; @@ -898,6 +898,28 @@ HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d_device return S_OK; } +HRESULT d3d_pixel_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d_pixel_shader **shader) +{ + struct d3d_pixel_shader *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_pixel_shader_init(object, device, byte_code, byte_code_length))) + { + WARN("Failed to initialize pixel shader, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created pixel shader %p.\n", object); + *shader = object; + + return S_OK; +} + struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) { if (!iface)

1 0

Hans Leidekker : webservices: Implement WsGetReaderNode.
by Alexandre Julliard 16 Sep '15

16 Sep '15

Module: wine Branch: master Commit: 8bef93521f56f5f8a6d1443402443d374c16b99d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bef93521f56f5f8a6d144340… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 16 11:18:27 2015 +0200 webservices: Implement WsGetReaderNode. --- dlls/webservices/reader.c | 95 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7a811c7..1599aac 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -24,6 +24,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(webservices); @@ -250,6 +251,65 @@ void WINAPI WsFreeHeap( WS_HEAP *handle ) heap_free( heap ); } +struct node +{ + WS_XML_ELEMENT_NODE hdr; + struct list entry; +}; + +static struct node *alloc_node( WS_XML_NODE_TYPE type ) +{ + struct node *ret; + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; + ret->hdr.node.nodeType = type; + list_init( &ret->entry ); + return ret; +} + +static void free_node( struct node *node ) +{ + if (!node) return; + switch (node->hdr.node.nodeType) + { + case WS_XML_NODE_TYPE_ELEMENT: + { + WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)node; + heap_free( elem->prefix ); + heap_free( elem->localName ); + heap_free( elem->ns ); + break; + } + case WS_XML_NODE_TYPE_TEXT: + { + WS_XML_TEXT_NODE *text = (WS_XML_TEXT_NODE *)node; + heap_free( text->text ); + break; + } + case WS_XML_NODE_TYPE_END_ELEMENT: + case WS_XML_NODE_TYPE_EOF: + case WS_XML_NODE_TYPE_BOF: + break; + + default: + ERR( "unhandled type %u\n", node->hdr.node.nodeType ); + break; + } + heap_free( node ); +} + +static void destroy_nodes( struct list *list ) +{ + struct list *ptr; + + while ((ptr = list_head( list ))) + { + struct node *node = LIST_ENTRY( ptr, struct node, entry ); + list_remove( &node->entry ); + free_node( node ); + } +} + static const struct { ULONG size; @@ -276,6 +336,8 @@ reader_props[] = struct reader { + struct list nodes; + struct node *current; const char *input_data; ULONG input_size; ULONG prop_count; @@ -328,6 +390,7 @@ HRESULT WINAPI WsCreateReader( const WS_XML_READER_PROPERTY *properties, ULONG c WS_XML_READER **handle, WS_ERROR *error ) { struct reader *reader; + struct node *node; ULONG i, max_depth = 32, max_attrs = 128, max_ns = 32; WS_CHARSET charset = WS_CHARSET_UTF8; BOOL read_decl = TRUE; @@ -355,6 +418,15 @@ HRESULT WINAPI WsCreateReader( const WS_XML_READER_PROPERTY *properties, ULONG c } } + if (!(node = alloc_node( WS_XML_NODE_TYPE_EOF ))) + { + heap_free( reader ); + return E_OUTOFMEMORY; + } + list_init( &reader->nodes ); + list_add_tail( &reader->nodes, &node->entry ); + reader->current = node; + *handle = (WS_XML_READER *)reader; return S_OK; } @@ -369,6 +441,7 @@ void WINAPI WsFreeReader( WS_XML_READER *handle ) TRACE( "%p\n", handle ); if (!reader) return; + destroy_nodes( &reader->nodes ); heap_free( reader ); } @@ -399,6 +472,23 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void } /************************************************************************** + * WsGetReaderNode [webservices.@] + */ +HRESULT WINAPI WsGetReaderNode( WS_XML_READER *handle, const WS_XML_NODE **node, + WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %p %p\n", handle, node, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader || !node) return E_INVALIDARG; + + *node = &reader->current->hdr.node; + return S_OK; +} + +/************************************************************************** * WsGetReaderProperty [webservices.@] */ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERTY_ID id, @@ -435,6 +525,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * ULONG count, WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + struct node *node; HRESULT hr; ULONG i; @@ -479,5 +570,9 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * if (hr != S_OK) return hr; } + if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) return E_OUTOFMEMORY; + list_add_head( &reader->nodes, &node->entry ); + reader->current = node; + return S_OK; } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 6a81612..cf74019 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -80,7 +80,7 @@ @ stub WsGetPolicyAlternativeCount @ stub WsGetPolicyProperty @ stub WsGetPrefixFromNamespace -@ stub WsGetReaderNode +@ stdcall WsGetReaderNode(ptr ptr ptr) @ stub WsGetReaderPosition @ stdcall WsGetReaderProperty(ptr long ptr long ptr) @ stub WsGetSecurityContextProperty

1 0

Hans Leidekker : webservices: Implement WsFillReader.
by Alexandre Julliard 16 Sep '15

16 Sep '15

Module: wine Branch: master Commit: 7b16d186e62ebe591b41add50074f72ca61aeee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b16d186e62ebe591b41add50… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 16 11:19:00 2015 +0200 webservices: Implement WsFillReader. --- dlls/webservices/reader.c | 22 ++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 1599aac..a9219ee 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -336,6 +336,8 @@ reader_props[] = struct reader { + ULONG read_size; + ULONG read_pos; struct list nodes; struct node *current; const char *input_data; @@ -446,6 +448,26 @@ void WINAPI WsFreeReader( WS_XML_READER *handle ) } /************************************************************************** + * WsFillReader [webservices.@] + */ +HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + + /* FIXME: add support for stream input */ + reader->read_size = min( min_size, reader->input_size ); + reader->read_pos = 0; + + return S_OK; +} + +/************************************************************************** * WsGetErrorProperty [webservices.@] */ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, void *buf, diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index cf74019..e8a0c7f 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -44,7 +44,7 @@ @ stub WsEndWriterCanonicalization @ stub WsFileTimeToDateTime @ stub WsFillBody -@ stub WsFillReader +@ stdcall WsFillReader(ptr long ptr ptr) @ stub WsFindAttribute @ stub WsFlushBody @ stub WsFlushWriter

1 0

Józef Kucia : d3d11: Set immediate_context to NULL in d3d11_device_GetImmediateContext().
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: ccb30415b69b6e3fdf54a61d9b4e97687012eca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccb30415b69b6e3fdf54a61d9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 15 01:37:38 2015 +0200 d3d11: Set immediate_context to NULL in d3d11_device_GetImmediateContext(). --- dlls/d3d11/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index dcaa49c..e632677 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -425,6 +425,8 @@ static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext(ID3D11Device *ifa ID3D11DeviceContext **immediate_context) { FIXME("iface %p, immediate_context %p stub!\n", iface, immediate_context); + + *immediate_context = NULL; } static HRESULT STDMETHODCALLTYPE d3d11_device_SetExceptionMode(ID3D11Device *iface, UINT flags)

1 0

Józef Kucia : d3d11: Set output parameters to NULL when D3D11CreateDevice() fails.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: 77844e2a0efb6e1a1c8320e2b7b01a9d01f0213f URL: http://source.winehq.org/git/wine.git/?a=commit;h=77844e2a0efb6e1a1c8320e2b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 15 01:37:39 2015 +0200 d3d11: Set output parameters to NULL when D3D11CreateDevice() fails. --- dlls/d3d11/d3d11_main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 40c4a5f..bce5e97 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -157,6 +157,13 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version, device_out, obtained_feature_level, immediate_context); + if (device_out) + *device_out = NULL; + if (obtained_feature_level) + *obtained_feature_level = 0; + if (immediate_context) + *immediate_context = NULL; + if (adapter) { IDXGIAdapter_AddRef(adapter);

1 0

Józef Kucia : d3d11: Rename d3d10_input_layout to d3d_input_layout.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: 2a17794ffadda78a5a968eabfb76545607d3af82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a17794ffadda78a5a968eabf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 15 01:37:42 2015 +0200 d3d11: Rename d3d10_input_layout to d3d_input_layout. --- dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 8 ++++---- dlls/d3d11/inputlayout.c | 30 ++++++++++++++++-------------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e48befd..b8f8977 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -208,7 +208,7 @@ struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView( ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN; /* ID3D10InputLayout */ -struct d3d10_input_layout +struct d3d_input_layout { ID3D10InputLayout ID3D10InputLayout_iface; LONG refcount; @@ -217,10 +217,10 @@ struct d3d10_input_layout struct wined3d_vertex_declaration *wined3d_decl; }; -HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d_device *device, +HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d_device *device, const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length) DECLSPEC_HIDDEN; -struct d3d10_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) DECLSPEC_HIDDEN; +struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) DECLSPEC_HIDDEN; /* ID3D10VertexShader */ struct d3d10_vertex_shader diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e632677..d0468e2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -728,7 +728,7 @@ static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device1 *iface ID3D10InputLayout *input_layout) { struct d3d_device *This = impl_from_ID3D10Device(iface); - struct d3d10_input_layout *layout = unsafe_impl_from_ID3D10InputLayout(input_layout); + struct d3d_input_layout *layout = unsafe_impl_from_ID3D10InputLayout(input_layout); TRACE("iface %p, input_layout %p\n", iface, input_layout); @@ -1426,7 +1426,7 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetInputLayout(ID3D10Device1 *iface { struct d3d_device *device = impl_from_ID3D10Device(iface); struct wined3d_vertex_declaration *wined3d_declaration; - struct d3d10_input_layout *input_layout_impl; + struct d3d_input_layout *input_layout_impl; TRACE("iface %p, input_layout %p.\n", iface, input_layout); @@ -2207,7 +2207,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device1 *i ID3D10InputLayout **input_layout) { struct d3d_device *This = impl_from_ID3D10Device(iface); - struct d3d10_input_layout *object; + struct d3d_input_layout *object; HRESULT hr; TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p, " @@ -2219,7 +2219,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device1 *i if (!object) return E_OUTOFMEMORY; - hr = d3d10_input_layout_init(object, This, element_descs, element_count, + hr = d3d_input_layout_init(object, This, element_descs, element_count, shader_byte_code, shader_byte_code_length); if (FAILED(hr)) { diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index edf7806..3d3b17f 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -94,9 +94,11 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME return S_OK; } -static inline struct d3d10_input_layout *impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) +/* ID3D10InputLayout methods */ + +static inline struct d3d_input_layout *impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) { - return CONTAINING_RECORD(iface, struct d3d10_input_layout, ID3D10InputLayout_iface); + return CONTAINING_RECORD(iface, struct d3d_input_layout, ID3D10InputLayout_iface); } /* IUnknown methods */ @@ -123,7 +125,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_QueryInterface(ID3D10InputLa static ULONG STDMETHODCALLTYPE d3d10_input_layout_AddRef(ID3D10InputLayout *iface) { - struct d3d10_input_layout *This = impl_from_ID3D10InputLayout(iface); + struct d3d_input_layout *This = impl_from_ID3D10InputLayout(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -140,7 +142,7 @@ static ULONG STDMETHODCALLTYPE d3d10_input_layout_AddRef(ID3D10InputLayout *ifac static ULONG STDMETHODCALLTYPE d3d10_input_layout_Release(ID3D10InputLayout *iface) { - struct d3d10_input_layout *This = impl_from_ID3D10InputLayout(iface); + struct d3d_input_layout *This = impl_from_ID3D10InputLayout(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -165,7 +167,7 @@ static void STDMETHODCALLTYPE d3d10_input_layout_GetDevice(ID3D10InputLayout *if static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLayout *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); + struct d3d_input_layout *layout = impl_from_ID3D10InputLayout(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -176,7 +178,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLa static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLayout *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); + struct d3d_input_layout *layout = impl_from_ID3D10InputLayout(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -187,7 +189,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLa static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateDataInterface(ID3D10InputLayout *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); + struct d3d_input_layout *layout = impl_from_ID3D10InputLayout(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -207,20 +209,20 @@ static const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl = d3d10_input_layout_SetPrivateDataInterface, }; -static void STDMETHODCALLTYPE d3d10_input_layout_wined3d_object_destroyed(void *parent) +static void STDMETHODCALLTYPE d3d_input_layout_wined3d_object_destroyed(void *parent) { - struct d3d10_input_layout *layout = parent; + struct d3d_input_layout *layout = parent; wined3d_private_store_cleanup(&layout->private_store); HeapFree(GetProcessHeap(), 0, parent); } -static const struct wined3d_parent_ops d3d10_input_layout_wined3d_parent_ops = +static const struct wined3d_parent_ops d3d_input_layout_wined3d_parent_ops = { - d3d10_input_layout_wined3d_object_destroyed, + d3d_input_layout_wined3d_object_destroyed, }; -HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d_device *device, +HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d_device *device, const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length) { @@ -242,7 +244,7 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d_de } hr = wined3d_vertex_declaration_create(device->wined3d_device, wined3d_elements, element_count, - layout, &d3d10_input_layout_wined3d_parent_ops, &layout->wined3d_decl); + layout, &d3d_input_layout_wined3d_parent_ops, &layout->wined3d_decl); HeapFree(GetProcessHeap(), 0, wined3d_elements); if (FAILED(hr)) { @@ -256,7 +258,7 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d_de return S_OK; } -struct d3d10_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) +struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) { if (!iface) return NULL;

1 0

Józef Kucia : d3d11: Add ID3D11InputLayout interface stub.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: 8361963f7bc0f68984426ac9ce6357462607ec57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8361963f7bc0f68984426ac9c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 15 01:37:43 2015 +0200 d3d11: Add ID3D11InputLayout interface stub. --- dlls/d3d11/d3d11_private.h | 3 +- dlls/d3d11/inputlayout.c | 137 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 118 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b8f8977..5dfdc29 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -207,9 +207,10 @@ HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resourc struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView( ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN; -/* ID3D10InputLayout */ +/* ID3D11InputLayout, ID3D10InputLayout */ struct d3d_input_layout { + ID3D11InputLayout ID3D11InputLayout_iface; ID3D10InputLayout ID3D10InputLayout_iface; LONG refcount; diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 3d3b17f..68b8b6f 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -94,69 +94,163 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME return S_OK; } -/* ID3D10InputLayout methods */ +/* ID3D11InputLayout methods */ -static inline struct d3d_input_layout *impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) +static inline struct d3d_input_layout *impl_from_ID3D11InputLayout(ID3D11InputLayout *iface) { - return CONTAINING_RECORD(iface, struct d3d_input_layout, ID3D10InputLayout_iface); + return CONTAINING_RECORD(iface, struct d3d_input_layout, ID3D11InputLayout_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_input_layout_QueryInterface(ID3D10InputLayout *iface, +static HRESULT STDMETHODCALLTYPE d3d11_input_layout_QueryInterface(ID3D11InputLayout *iface, REFIID riid, void **object) { - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + struct d3d_input_layout *layout = impl_from_ID3D11InputLayout(iface); - if (IsEqualGUID(riid, &IID_ID3D10InputLayout) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11InputLayout) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D11InputLayout_AddRef(iface); *object = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + if (IsEqualGUID(riid, &IID_ID3D10InputLayout) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + ID3D10InputLayout_AddRef(&layout->ID3D10InputLayout_iface); + *object = &layout->ID3D10InputLayout_iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_input_layout_AddRef(ID3D10InputLayout *iface) +static ULONG STDMETHODCALLTYPE d3d11_input_layout_AddRef(ID3D11InputLayout *iface) { - struct d3d_input_layout *This = impl_from_ID3D10InputLayout(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_input_layout *layout = impl_from_ID3D11InputLayout(iface); + ULONG refcount = InterlockedIncrement(&layout->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", layout, refcount); if (refcount == 1) { wined3d_mutex_lock(); - wined3d_vertex_declaration_incref(This->wined3d_decl); + wined3d_vertex_declaration_incref(layout->wined3d_decl); wined3d_mutex_unlock(); } return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_input_layout_Release(ID3D10InputLayout *iface) +static ULONG STDMETHODCALLTYPE d3d11_input_layout_Release(ID3D11InputLayout *iface) { - struct d3d_input_layout *This = impl_from_ID3D10InputLayout(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d_input_layout *layout = impl_from_ID3D11InputLayout(iface); + ULONG refcount = InterlockedDecrement(&layout->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", layout, refcount); if (!refcount) { wined3d_mutex_lock(); - wined3d_vertex_declaration_decref(This->wined3d_decl); + wined3d_vertex_declaration_decref(layout->wined3d_decl); wined3d_mutex_unlock(); } return refcount; } +static void STDMETHODCALLTYPE d3d11_input_layout_GetDevice(ID3D11InputLayout *iface, + ID3D11Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_input_layout_GetPrivateData(ID3D11InputLayout *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_input_layout *layout = impl_from_ID3D11InputLayout(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&layout->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_input_layout_SetPrivateData(ID3D11InputLayout *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_input_layout *layout = impl_from_ID3D11InputLayout(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&layout->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_input_layout_SetPrivateDataInterface(ID3D11InputLayout *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_input_layout *layout = impl_from_ID3D11InputLayout(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&layout->private_store, guid, data); +} + +static const struct ID3D11InputLayoutVtbl d3d11_input_layout_vtbl = +{ + /* IUnknown methods */ + d3d11_input_layout_QueryInterface, + d3d11_input_layout_AddRef, + d3d11_input_layout_Release, + /* ID3D11DeviceChild methods */ + d3d11_input_layout_GetDevice, + d3d11_input_layout_GetPrivateData, + d3d11_input_layout_SetPrivateData, + d3d11_input_layout_SetPrivateDataInterface, +}; + +/* ID3D10InputLayout methods */ + +static inline struct d3d_input_layout *impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_input_layout, ID3D10InputLayout_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_input_layout_QueryInterface(ID3D10InputLayout *iface, + REFIID riid, void **object) +{ + struct d3d_input_layout *layout = impl_from_ID3D10InputLayout(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_input_layout_QueryInterface(&layout->ID3D11InputLayout_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_input_layout_AddRef(ID3D10InputLayout *iface) +{ + struct d3d_input_layout *layout = impl_from_ID3D10InputLayout(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_input_layout_AddRef(&layout->ID3D11InputLayout_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_input_layout_Release(ID3D10InputLayout *iface) +{ + struct d3d_input_layout *layout = impl_from_ID3D10InputLayout(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_input_layout_Release(&layout->ID3D11InputLayout_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_input_layout_GetDevice(ID3D10InputLayout *iface, ID3D10Device **device) @@ -229,6 +323,7 @@ HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d_device struct wined3d_vertex_element *wined3d_elements; HRESULT hr; + layout->ID3D11InputLayout_iface.lpVtbl = &d3d11_input_layout_vtbl; layout->ID3D10InputLayout_iface.lpVtbl = &d3d10_input_layout_vtbl; layout->refcount = 1; wined3d_mutex_lock();

1 0