September 2015 - Wine-Commits

Józef Kucia : d3d11: Implement d3d11_device_CreateVertexShader().
by Alexandre Julliard Sept. 16, 2015

Sept. 16, 2015

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 Sept. 16, 2015

Sept. 16, 2015

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 Sept. 16, 2015

Sept. 16, 2015

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 Sept. 16, 2015

Sept. 16, 2015

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

Józef Kucia : d3d11: Implement ID3D11VertexShader interface.
by Alexandre Julliard Sept. 16, 2015

Sept. 16, 2015

Module: wine Branch: master Commit: 32892beba97bf71133191310c4b9e8203d3b8d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=32892beba97bf71133191310c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 16 01:30:10 2015 +0200 d3d11: Implement ID3D11VertexShader 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 1b5be15..517a1be 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -224,15 +224,16 @@ HRESULT d3d_input_layout_create(struct d3d_device *device, struct d3d_input_layout **layout) DECLSPEC_HIDDEN; struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) DECLSPEC_HIDDEN; -/* ID3D10VertexShader */ +/* ID3D11VertexShader, ID3D10VertexShader */ struct d3d_vertex_shader { + ID3D11VertexShader ID3D11VertexShader_iface; ID3D10VertexShader ID3D10VertexShader_iface; LONG refcount; struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_device *device, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index b9be0a8..f0aadc8 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -122,73 +122,174 @@ void shader_free_signature(struct wined3d_shader_signature *s) HeapFree(GetProcessHeap(), 0, s->elements); } -static inline struct d3d_vertex_shader *impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) +/* ID3D11VertexShader methods */ + +static inline struct d3d_vertex_shader *impl_from_ID3D11VertexShader(ID3D11VertexShader *iface) { - return CONTAINING_RECORD(iface, struct d3d_vertex_shader, ID3D10VertexShader_iface); + return CONTAINING_RECORD(iface, struct d3d_vertex_shader, ID3D11VertexShader_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_QueryInterface(ID3D10VertexShader *iface, +static HRESULT STDMETHODCALLTYPE d3d11_vertex_shader_QueryInterface(ID3D11VertexShader *iface, REFIID riid, void **object) { - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + struct d3d_vertex_shader *shader = impl_from_ID3D11VertexShader(iface); - if (IsEqualGUID(riid, &IID_ID3D10VertexShader) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11VertexShader) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D11VertexShader_AddRef(iface); *object = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + if (IsEqualGUID(riid, &IID_ID3D10VertexShader) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + IUnknown_AddRef(&shader->ID3D10VertexShader_iface); + *object = &shader->ID3D10VertexShader_iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_AddRef(ID3D10VertexShader *iface) +static ULONG STDMETHODCALLTYPE d3d11_vertex_shader_AddRef(ID3D11VertexShader *iface) { - struct d3d_vertex_shader *This = impl_from_ID3D10VertexShader(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_vertex_shader *shader = impl_from_ID3D11VertexShader(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_vertex_shader_Release(ID3D10VertexShader *iface) +static ULONG STDMETHODCALLTYPE d3d11_vertex_shader_Release(ID3D11VertexShader *iface) { - struct d3d_vertex_shader *This = impl_from_ID3D10VertexShader(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d_vertex_shader *shader = impl_from_ID3D11VertexShader(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_vertex_shader_GetDevice(ID3D11VertexShader *iface, + ID3D11Device **device) +{ + struct d3d_vertex_shader *shader = impl_from_ID3D11VertexShader(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = shader->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_vertex_shader_GetPrivateData(ID3D11VertexShader *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_vertex_shader *shader = impl_from_ID3D11VertexShader(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_vertex_shader_SetPrivateData(ID3D11VertexShader *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_vertex_shader *shader = impl_from_ID3D11VertexShader(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_vertex_shader_SetPrivateDataInterface(ID3D11VertexShader *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_vertex_shader *shader = impl_from_ID3D11VertexShader(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 ID3D11VertexShaderVtbl d3d11_vertex_shader_vtbl = +{ + /* IUnknown methods */ + d3d11_vertex_shader_QueryInterface, + d3d11_vertex_shader_AddRef, + d3d11_vertex_shader_Release, + /* ID3D11DeviceChild methods */ + d3d11_vertex_shader_GetDevice, + d3d11_vertex_shader_GetPrivateData, + d3d11_vertex_shader_SetPrivateData, + d3d11_vertex_shader_SetPrivateDataInterface, +}; + +/* ID3D10VertexShader methods */ + +static inline struct d3d_vertex_shader *impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_vertex_shader, ID3D10VertexShader_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_QueryInterface(ID3D10VertexShader *iface, + REFIID riid, void **object) +{ + struct d3d_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_vertex_shader_QueryInterface(&shader->ID3D11VertexShader_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_AddRef(ID3D10VertexShader *iface) +{ + struct d3d_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_vertex_shader_AddRef(&shader->ID3D11VertexShader_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_Release(ID3D10VertexShader *iface) +{ + struct d3d_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_vertex_shader_Release(&shader->ID3D11VertexShader_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader *iface, ID3D10Device **device) @@ -197,8 +298,7 @@ static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader * 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_vertex_shader_GetPrivateData(ID3D10VertexShader *iface, @@ -268,6 +368,7 @@ HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_devi struct wined3d_shader_desc desc; HRESULT hr; + shader->ID3D11VertexShader_iface.lpVtbl = &d3d11_vertex_shader_vtbl; shader->ID3D10VertexShader_iface.lpVtbl = &d3d10_vertex_shader_vtbl; shader->refcount = 1; wined3d_mutex_lock(); @@ -301,8 +402,8 @@ HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_devi } 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/tests: Add tests for D3D11CreateDeviceAndSwapChain().
by Alexandre Julliard Sept. 16, 2015

Sept. 16, 2015

Module: wine Branch: master Commit: cad6ad920878f05222a55ddaad5cc9e3ef27a409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad6ad920878f05222a55ddaa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 16 01:30:08 2015 +0200 d3d11/tests: Add tests for D3D11CreateDeviceAndSwapChain(). --- dlls/d3d11/tests/Makefile.in | 2 +- dlls/d3d11/tests/d3d11.c | 160 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 154 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cad6ad920878f05222a55…

1 0

Nikolay Sivov : dwrite: Print font table tag in string form in traces.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: 20e6181304cb54341978a01b4919e5b91f24664d URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e6181304cb54341978a01b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 15 15:44:59 2015 +0300 dwrite: Print font table tag in string form in traces. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6a46a1a..e98dc15 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -260,7 +260,7 @@ static inline struct dwrite_fontlist *impl_from_IDWriteFontList(IDWriteFontList static inline const char *debugstr_tag(UINT32 tag) { - return wine_dbg_sprintf("%c%c%c%c", tag & 0xff, (tag >> 8) & 0xff, (tag >> 16) & 0xff, tag >> 24); + return debugstr_an((char*)&tag, 4); } static HRESULT get_cached_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) @@ -566,7 +566,7 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace2 *iface, UI { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - TRACE("(%p)->(%u %p %p %p %p)\n", This, table_tag, table_data, table_size, context, exists); + TRACE("(%p)->(%s %p %p %p %p)\n", This, debugstr_tag(table_tag), table_data, table_size, context, exists); return opentype_get_font_table(This->streams[0], This->type, This->index, table_tag, table_data, context, table_size, exists); }

1 0

Andrey Gusev : wined3d: Fix TRACE in shader_dump_decl_usage().
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: edbd841d341002d9f027af84b594981bfc4057a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edbd841d341002d9f027af84b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Sep 15 12:08:46 2015 +0300 wined3d: Fix TRACE in shader_dump_decl_usage(). --- dlls/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b7b57c7..6e9fa9e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1178,7 +1178,7 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti break; case WINED3D_SHADER_RESOURCE_TEXTURE_3D: - TRACE("_volume"); + TRACE("_3d"); break; case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE:

1 0

Józef Kucia : d3d11: Set immediate_context to NULL in d3d11_device_GetImmediateContext().
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

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 Sept. 15, 2015

Sept. 15, 2015

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