wine-commits September 2015

wine-commits@winehq.org

2 participants
318 discussions

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 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: Implement ID3D11VertexShader interface.
by Alexandre Julliard 16 Sep '15

16 Sep '15

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: Rename d3d10_vertex_shader to d3d_vertex_shader.
by Alexandre Julliard 16 Sep '15

16 Sep '15

Module: wine Branch: master Commit: 92a71ae09c2de1c4c27a06f9a4ab40bc018ed72c URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a71ae09c2de1c4c27a06f9a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 16 01:30:09 2015 +0200 d3d11: Rename d3d10_vertex_shader to d3d_vertex_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 27a7ed4..1b5be15 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -225,7 +225,7 @@ HRESULT d3d_input_layout_create(struct d3d_device *device, struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) DECLSPEC_HIDDEN; /* ID3D10VertexShader */ -struct d3d10_vertex_shader +struct d3d_vertex_shader { ID3D10VertexShader ID3D10VertexShader_iface; LONG refcount; @@ -235,9 +235,9 @@ struct d3d10_vertex_shader ID3D10Device1 *device; }; -HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d_device *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; -struct d3d10_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN; +struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN; /* ID3D10GeometryShader */ struct d3d10_geometry_shader diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 65524d3..050b83e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -678,7 +678,7 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetShader(ID3D10Device1 *iface, ID3D10VertexShader *shader) { struct d3d_device *This = impl_from_ID3D10Device(iface); - struct d3d10_vertex_shader *vs = unsafe_impl_from_ID3D10VertexShader(shader); + struct d3d_vertex_shader *vs = unsafe_impl_from_ID3D10VertexShader(shader); TRACE("iface %p, shader %p\n", iface, shader); @@ -1385,7 +1385,7 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetSamplers(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_VSGetShader(ID3D10Device1 *iface, ID3D10VertexShader **shader) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_vertex_shader *shader_impl; + struct d3d_vertex_shader *shader_impl; struct wined3d_shader *wined3d_shader; TRACE("iface %p, shader %p.\n", iface, shader); @@ -2238,7 +2238,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device1 * const void *byte_code, SIZE_T byte_code_length, ID3D10VertexShader **shader) { struct d3d_device *This = impl_from_ID3D10Device(iface); - struct d3d10_vertex_shader *object; + struct d3d_vertex_shader *object; HRESULT hr; TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n", @@ -2248,7 +2248,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device1 * if (!object) return E_OUTOFMEMORY; - hr = d3d10_vertex_shader_init(object, This, byte_code, byte_code_length); + 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); diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index bab6cbf..b9be0a8 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -122,9 +122,9 @@ void shader_free_signature(struct wined3d_shader_signature *s) HeapFree(GetProcessHeap(), 0, s->elements); } -static inline struct d3d10_vertex_shader *impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) +static inline struct d3d_vertex_shader *impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) { - return CONTAINING_RECORD(iface, struct d3d10_vertex_shader, ID3D10VertexShader_iface); + return CONTAINING_RECORD(iface, struct d3d_vertex_shader, ID3D10VertexShader_iface); } /* IUnknown methods */ @@ -151,7 +151,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_QueryInterface(ID3D10Vertex static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_AddRef(ID3D10VertexShader *iface) { - struct d3d10_vertex_shader *This = impl_from_ID3D10VertexShader(iface); + struct d3d_vertex_shader *This = impl_from_ID3D10VertexShader(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -169,7 +169,7 @@ static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_AddRef(ID3D10VertexShader *if static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_Release(ID3D10VertexShader *iface) { - struct d3d10_vertex_shader *This = impl_from_ID3D10VertexShader(iface); + struct d3d_vertex_shader *This = impl_from_ID3D10VertexShader(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -193,7 +193,7 @@ static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_Release(ID3D10VertexShader *i static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader *iface, ID3D10Device **device) { - struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + struct d3d_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -204,7 +204,7 @@ static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader * static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10VertexShader *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + struct d3d_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -215,7 +215,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10Vertex static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10VertexShader *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + struct d3d_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -226,7 +226,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10Vertex static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateDataInterface(ID3D10VertexShader *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + struct d3d_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -246,20 +246,20 @@ static const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl = d3d10_vertex_shader_SetPrivateDataInterface, }; -static void STDMETHODCALLTYPE d3d10_vertex_shader_wined3d_object_destroyed(void *parent) +static void STDMETHODCALLTYPE d3d_vertex_shader_wined3d_object_destroyed(void *parent) { - struct d3d10_vertex_shader *shader = parent; + struct d3d_vertex_shader *shader = parent; wined3d_private_store_cleanup(&shader->private_store); HeapFree(GetProcessHeap(), 0, parent); } -static const struct wined3d_parent_ops d3d10_vertex_shader_wined3d_parent_ops = +static const struct wined3d_parent_ops d3d_vertex_shader_wined3d_parent_ops = { - d3d10_vertex_shader_wined3d_object_destroyed, + d3d_vertex_shader_wined3d_object_destroyed, }; -HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d_device *device, +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; @@ -289,7 +289,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d_ desc.max_version = 4; hr = wined3d_shader_create_vs(device->wined3d_device, &desc, shader, - &d3d10_vertex_shader_wined3d_parent_ops, &shader->wined3d_shader); + &d3d_vertex_shader_wined3d_parent_ops, &shader->wined3d_shader); shader_free_signature(&input_signature); shader_free_signature(&output_signature); if (FAILED(hr)) @@ -307,7 +307,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d_ return S_OK; } -struct d3d10_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) +struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) { if (!iface) return NULL;

1 0

Józef Kucia : d3d11/tests: Add tests for D3D11CreateDeviceAndSwapChain().
by Alexandre Julliard 16 Sep '15

16 Sep '15

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

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

16 Sep '15

Module: wine Branch: master Commit: e441e7b4a98cabb39d6270a343a38c8e850fbd9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e441e7b4a98cabb39d6270a34… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 16 01:30:07 2015 +0200 d3d11: Implement D3D11CreateDeviceAndSwapChain(). --- dlls/d3d11/d3d11_main.c | 84 +++++++++++++++++++++++++++++++++++++++++++--- dlls/d3d11/d3d11_private.h | 2 +- 2 files changed, 80 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index bce5e97..5d35f10 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -273,11 +273,85 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, const DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, - ID3D11Device **device, D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **immediate_context) + ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) { - FIXME("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %u, " - "swapchain_desc %p, swapchain %p, device %p, feature_level %p, immediate_context %p stub!\n", + DXGI_SWAP_CHAIN_DESC desc; + IDXGIDevice *dxgi_device; + IDXGIFactory *factory; + ID3D11Device *device; + HRESULT hr; + + TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %u, sdk_version %u, " + "swapchain_desc %p, swapchain %p, device %p, obtained_feature_level %p, immediate_context %p.\n", adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version, - swapchain_desc, swapchain, device, feature_level, immediate_context); - return E_NOTIMPL; + swapchain_desc, swapchain, device_out, obtained_feature_level, immediate_context); + + if (swapchain) + *swapchain = NULL; + if (device_out) + *device_out = NULL; + + if (FAILED(hr = D3D11CreateDevice(adapter, driver_type, swrast, flags, feature_levels, levels, sdk_version, + &device, obtained_feature_level, immediate_context))) + { + WARN("Failed to create a device, returning %#x.\n", hr); + return hr; + } + + if (swapchain) + { + if (FAILED(hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device))) + { + ERR("Failed to get a dxgi device from the d3d11 device, returning %#x.\n", hr); + goto cleanup; + } + + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + IDXGIDevice_Release(dxgi_device); + if (FAILED(hr)) + { + ERR("Failed to get the device adapter, returning %#x.\n", hr); + goto cleanup; + } + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + IDXGIAdapter_Release(adapter); + if (FAILED(hr)) + { + ERR("Failed to get the adapter factory, returning %#x.\n", hr); + goto cleanup; + } + + desc = *swapchain_desc; + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &desc, swapchain); + IDXGIFactory_Release(factory); + if (FAILED(hr)) + { + WARN("Failed to create a swapchain, returning %#x.\n", hr); + goto cleanup; + } + + TRACE("Created IDXGISwapChain %p.\n", swapchain); + } + + if (device_out) + *device_out = device; + else + ID3D11Device_Release(device); + + return S_OK; + +cleanup: + if (device) + ID3D11Device_Release(device); + if (obtained_feature_level) + *obtained_feature_level = 0; + if (immediate_context) + { + /* FIXME: Remove the following NULL check once the d3d11_device_GetImmediateContext() is implemented. */ + if (*immediate_context) ID3D11DeviceContext_Release(*immediate_context); + *immediate_context = NULL; + } + + return hr; } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 303fa6d..27a7ed4 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -353,7 +353,7 @@ HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d_device *device, const D3D10_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN; struct d3d10_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; -/* IDirect3D10Device1 */ +/* ID3D11Device, ID3D10Device1 */ struct d3d_device { IUnknown IUnknown_inner;

1 0

Jacek Caban : mshtml/tests: Fixed tests on some Windows versions.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: aacc7b394ee1eb25001ae2854fd774e1b443e50b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aacc7b394ee1eb25001ae2854… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 15 15:09:09 2015 +0200 mshtml/tests: Fixed tests on some Windows versions. --- dlls/mshtml/tests/htmldoc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 635302c..899cd73 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3453,7 +3453,8 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2(IDocObjectService *i if(!testing_submit) { ok(!pPostData, "pPostData = %p\n", pPostData); ok(!cbPostData, "cbPostData = %d\n", cbPostData); - ok(!lpszHeaders, "lpszHeaders = %s\n", wine_dbgstr_w(lpszHeaders)); + ok(!lpszHeaders || !strcmp_wa(lpszHeaders, "Referer: http://test.winehq.org/tests/winehq_snapshot/\r\n"), + "lpszHeaders = %s\n", wine_dbgstr_w(lpszHeaders)); }else { ok(cbPostData == 9, "cbPostData = %d\n", cbPostData); ok(!memcmp(pPostData, "cmd=TEST", cbPostData), "pPostData = %p\n", pPostData);

1 0

Jacek Caban : ieframe/tests: Fixed tests on some VMs.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: c4d41435062e430c1c5f2ba3e9f3a282a7fd8c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d41435062e430c1c5f2ba3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 15 15:04:50 2015 +0200 ieframe/tests: Fixed tests on some VMs. --- dlls/ieframe/tests/webbrowser.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index e95fd5e..3e0e760 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -688,6 +688,8 @@ static void _test_invoke_bool(unsigned line, const DISPPARAMS *params, BOOL stri static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const VARIANT *flags, const VARIANT *frame, const VARIANT *post_data, const VARIANT *headers, const VARIANT *cancel) { + BSTR str; + ok(V_VT(disp) == VT_DISPATCH, "V_VT(disp)=%d, expected VT_DISPATCH\n", V_VT(disp)); ok(V_DISPATCH(disp) != NULL, "V_DISPATCH(disp) == NULL\n"); ok(V_DISPATCH(disp) == (IDispatch*)wb, "V_DISPATCH(disp)=%p, wb=%p\n", V_DISPATCH(disp), wb); @@ -763,8 +765,9 @@ static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const if(V_VARIANTREF(headers)) { ok(V_VT(V_VARIANTREF(headers)) == VT_BSTR, "V_VT(V_VARIANTREF(headers))=%d, expected VT_BSTR\n", V_VT(V_VARIANTREF(headers))); - ok(V_BSTR(V_VARIANTREF(headers)) == NULL, "V_BSTR(V_VARIANTREF(headers)) = %s, expected NULL\n", - wine_dbgstr_w(V_BSTR(V_VARIANTREF(headers)))); + str = V_BSTR(V_VARIANTREF(headers)); + ok(!str || !strcmp_wa(str, "Referer: http://test.winehq.org/tests/hello.html\r\n"), + "V_BSTR(V_VARIANTREF(headers)) = %s, expected NULL\n", wine_dbgstr_w(str)); } ok(V_VT(cancel) == (VT_BYREF|VT_BOOL), "V_VT(cancel)=%x, expected VT_BYREF|VT_BOOL\n",

1 0

Nikolay Sivov : dwrite: Print font table tag in string form in traces.
by Alexandre Julliard 15 Sep '15

15 Sep '15

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 15 Sep '15

15 Sep '15

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

← Newer
1
...
4
5
6
7
8
9
10
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2015