wine-commits September 2015

wine-commits@winehq.org

2 participants
318 discussions

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

15 Sep '15

Module: wine Branch: master Commit: 1cb181668ee991c0e17c116b5c16880ea18393b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb181668ee991c0e17c116b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 15 01:37:44 2015 +0200 d3d11: Implement d3d11_device_CreateInputLayout(). --- dlls/d3d11/d3d11_private.h | 7 ++++--- dlls/d3d11/device.c | 32 ++++++++++++++++---------------- dlls/d3d11/inputlayout.c | 36 +++++++++++++++++++++++++++++++----- 3 files changed, 51 insertions(+), 24 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 5dfdc29..303fa6d 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -218,9 +218,10 @@ struct d3d_input_layout struct wined3d_vertex_declaration *wined3d_decl; }; -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; +HRESULT d3d_input_layout_create(struct d3d_device *device, + const D3D11_INPUT_ELEMENT_DESC *element_descs, UINT element_count, + const void *shader_byte_code, SIZE_T shader_byte_code_length, + struct d3d_input_layout **layout) DECLSPEC_HIDDEN; struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) DECLSPEC_HIDDEN; /* ID3D10VertexShader */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d0468e2..65524d3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -179,11 +179,21 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device *if const D3D11_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, ID3D11InputLayout **input_layout) { - FIXME("iface %p, element_descs %p, element_count %u, shader_byte_code %p, shader_byte_code_length %lu, " - "input_layout %p stub!\n", iface, element_descs, element_count, shader_byte_code, + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_input_layout *object; + HRESULT hr; + + TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p, shader_byte_code_length %lu, " + "input_layout %p.\n", iface, element_descs, element_count, shader_byte_code, shader_byte_code_length, input_layout); - return E_NOTIMPL; + if (FAILED(hr = d3d_input_layout_create(device, element_descs, element_count, + shader_byte_code, shader_byte_code_length, &object))) + return hr; + + *input_layout = &object->ID3D11InputLayout_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device *iface, const void *byte_code, @@ -2206,7 +2216,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device1 *i const void *shader_byte_code, SIZE_T shader_byte_code_length, ID3D10InputLayout **input_layout) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_input_layout *object; HRESULT hr; @@ -2215,20 +2225,10 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device1 *i iface, element_descs, element_count, shader_byte_code, shader_byte_code_length, input_layout); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - hr = d3d_input_layout_init(object, This, element_descs, element_count, - shader_byte_code, shader_byte_code_length); - if (FAILED(hr)) - { - WARN("Failed to initialize input layout, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_input_layout_create(device, (const D3D11_INPUT_ELEMENT_DESC *)element_descs, element_count, + shader_byte_code, shader_byte_code_length, &object))) return hr; - } - TRACE("Created input layout %p.\n", object); *input_layout = &object->ID3D10InputLayout_iface; return S_OK; diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 68b8b6f..bb98d30 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -39,7 +39,7 @@ static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void * } } -static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC *element_descs, +static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, struct wined3d_vertex_element **wined3d_elements) { @@ -65,7 +65,7 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME for (i = 0; i < element_count; ++i) { struct wined3d_vertex_element *e = &(*wined3d_elements)[i]; - const D3D10_INPUT_ELEMENT_DESC *f = &element_descs[i]; + const D3D11_INPUT_ELEMENT_DESC *f = &element_descs[i]; UINT j; e->format = wined3dformat_from_dxgi_format(f->Format); @@ -316,8 +316,8 @@ static const struct wined3d_parent_ops d3d_input_layout_wined3d_parent_ops = d3d_input_layout_wined3d_object_destroyed, }; -HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d_device *device, - const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, +static HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d_device *device, + const D3D11_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length) { struct wined3d_vertex_element *wined3d_elements; @@ -329,7 +329,7 @@ HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d_device wined3d_mutex_lock(); wined3d_private_store_init(&layout->private_store); - if (FAILED(hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count, + if (FAILED(hr = d3d11_input_layout_to_wined3d_declaration(element_descs, element_count, shader_byte_code, shader_byte_code_length, &wined3d_elements))) { WARN("Failed to create wined3d vertex declaration elements, hr %#x.\n", hr); @@ -353,6 +353,32 @@ HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d_device return S_OK; } +HRESULT d3d_input_layout_create(struct d3d_device *device, + const D3D11_INPUT_ELEMENT_DESC *element_descs, UINT element_count, + const void *shader_byte_code, SIZE_T shader_byte_code_length, + struct d3d_input_layout **layout) +{ + struct d3d_input_layout *object; + HRESULT hr; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_input_layout_init(object, device, element_descs, element_count, + shader_byte_code, shader_byte_code_length))) + { + WARN("Failed to initialize input layout, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created input layout %p.\n", object); + *layout = object; + + return S_OK; +} + struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) { if (!iface)

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

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: 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: 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

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: e4f32c3c4b289b12c7428f6ce1e6e210306c7a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4f32c3c4b289b12c7428f6ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 15 11:16:26 2015 +0200 webservices/tests: Add tests. --- dlls/webservices/tests/reader.c | 149 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 4b247d9..7f43a07 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -21,6 +21,9 @@ #include "webservices.h" #include "wine/test.h" +static const char data1[] = + "<?xml version=\"1.0\" encoding=\"utf-8\"?>"; + static void test_WsCreateError(void) { HRESULT hr; @@ -183,8 +186,154 @@ static void test_WsCreateHeap(void) ok( hr == E_INVALIDARG, "got %08x\n", hr ); } +static HRESULT set_input( WS_XML_READER *reader, const char *data, ULONG size ) +{ + WS_XML_READER_TEXT_ENCODING encoding; + WS_XML_READER_BUFFER_INPUT input; + + encoding.encoding.encodingType = WS_XML_READER_ENCODING_TYPE_TEXT; + encoding.charSet = WS_CHARSET_UTF8; + + input.input.inputType = WS_XML_READER_INPUT_TYPE_BUFFER; + input.encodedData = (void *)data; + input.encodedDataSize = size; + + return WsSetInput( reader, (WS_XML_READER_ENCODING *)&encoding, + (WS_XML_READER_INPUT *)&input, NULL, 0, NULL ); +} + +static void test_WsCreateReader(void) +{ + HRESULT hr; + WS_XML_READER *reader; + WS_XML_READER_PROPERTY prop; + ULONG size, max_depth, max_attrs, trim_size, buffer_size, max_ns; + BOOL allow_fragment, read_decl, in_attr; + ULONGLONG row, column; + WS_CHARSET charset; + + hr = WsCreateReader( NULL, 0, NULL, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + reader = NULL; + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + ok( reader != NULL, "reader not set\n" ); + + /* can't retrieve properties before input is set */ + max_depth = 0xdeadbeef; + size = sizeof(max_depth); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( max_depth == 0xdeadbeef, "max_depth set\n" ); + + hr = set_input( reader, data1, sizeof(data1) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* check some defaults */ + max_depth = 0xdeadbeef; + size = sizeof(max_depth); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_depth == 32, "got %u\n", max_depth ); + + allow_fragment = TRUE; + size = sizeof(allow_fragment); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_ALLOW_FRAGMENT, &allow_fragment, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !allow_fragment, "got %d\n", allow_fragment ); + + max_attrs = 0xdeadbeef; + size = sizeof(max_attrs); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_ATTRIBUTES, &max_attrs, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_attrs == 128, "got %u\n", max_attrs ); + + read_decl = FALSE; + size = sizeof(read_decl); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_READ_DECLARATION, &read_decl, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( read_decl, "got %u\n", read_decl ); + + charset = 0xdeadbeef; + size = sizeof(charset); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( charset == WS_CHARSET_UTF8, "got %u\n", charset ); + + size = sizeof(trim_size); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_UTF8_TRIM_SIZE, &trim_size, size, NULL ); + todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + WsFreeReader( reader ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, data1, sizeof(data1) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + size = sizeof(buffer_size); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_STREAM_BUFFER_SIZE, &buffer_size, size, NULL ); + todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + WsFreeReader( reader ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, data1, sizeof(data1) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + max_ns = 0xdeadbeef; + size = sizeof(max_ns); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_NAMESPACES, &max_ns, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_ns == 32, "got %u\n", max_ns ); + WsFreeReader( reader ); + + /* change a property */ + max_depth = 16; + prop.id = WS_XML_READER_PROPERTY_MAX_DEPTH; + prop.value = &max_depth; + prop.valueSize = sizeof(max_depth); + hr = WsCreateReader( &prop, 1, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, data1, sizeof(data1) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + max_depth = 0xdeadbeef; + size = sizeof(max_depth); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_depth == 16, "got %u\n", max_depth ); + WsFreeReader( reader ); + + /* show that some properties are read-only */ + row = 1; + prop.id = WS_XML_READER_PROPERTY_ROW; + prop.value = &row; + prop.valueSize = sizeof(row); + hr = WsCreateReader( &prop, 1, &reader, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + column = 1; + prop.id = WS_XML_READER_PROPERTY_COLUMN; + prop.value = &column; + prop.valueSize = sizeof(column); + hr = WsCreateReader( &prop, 1, &reader, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + in_attr = TRUE; + prop.id = WS_XML_READER_PROPERTY_IN_ATTRIBUTE; + prop.value = &in_attr; + prop.valueSize = sizeof(in_attr); + hr = WsCreateReader( &prop, 1, &reader, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); +} + START_TEST(reader) { test_WsCreateError(); test_WsCreateHeap(); + test_WsCreateReader(); }

1 0

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

15 Sep '15

Module: wine Branch: master Commit: cf8efc384a40502ae29c453dc8ce7f58392983d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8efc384a40502ae29c453dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 15 11:15:58 2015 +0200 webservices: Implement WsSetInput. --- dlls/webservices/reader.c | 58 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4f4d31c..7a811c7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -276,6 +276,8 @@ reader_props[] = struct reader { + const char *input_data; + ULONG input_size; ULONG prop_count; WS_XML_READER_PROPERTY prop[sizeof(reader_props)/sizeof(reader_props[0])]; }; @@ -407,6 +409,7 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); + if (!reader->input_data) return WS_E_INVALID_OPERATION; return get_reader_prop( reader, id, buf, size ); } @@ -423,3 +426,58 @@ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, co if (id == WS_ERROR_PROPERTY_LANGID) return WS_E_INVALID_OPERATION; return set_error_prop( error, id, value, size ); } + +/************************************************************************** + * WsSetInput [webservices.@] + */ +HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING *encoding, + const WS_XML_READER_INPUT *input, const WS_XML_READER_PROPERTY *properties, + ULONG count, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + HRESULT hr; + ULONG i; + + TRACE( "%p %p %p %p %u %p\n", handle, encoding, input, properties, count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + + switch (encoding->encodingType) + { + case WS_XML_READER_ENCODING_TYPE_TEXT: + { + WS_XML_READER_TEXT_ENCODING *text = (WS_XML_READER_TEXT_ENCODING *)encoding; + if (text->charSet != WS_CHARSET_UTF8) + { + FIXME( "charset %u not supported\n", text->charSet ); + return E_NOTIMPL; + } + break; + } + default: + FIXME( "encoding type %u not supported\n", encoding->encodingType ); + return E_NOTIMPL; + } + switch (input->inputType) + { + case WS_XML_READER_INPUT_TYPE_BUFFER: + { + WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; + reader->input_data = buf->encodedData; + reader->input_size = buf->encodedDataSize; + break; + } + default: + FIXME( "input type %u not supported\n", input->inputType ); + return E_NOTIMPL; + } + + for (i = 0; i < count; i++) + { + hr = set_reader_prop( reader, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) return hr; + } + + return S_OK; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 487c2af..6a81612 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -150,7 +150,7 @@ @ stub WsSetFaultErrorDetail @ stub WsSetFaultErrorProperty @ stub WsSetHeader -@ stub WsSetInput +@ stdcall WsSetInput(ptr ptr ptr ptr long ptr) @ stub WsSetInputToBuffer @ stub WsSetListenerProperty @ stub WsSetMessageProperty

1 0

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

15 Sep '15

Module: wine Branch: master Commit: 0e3b3e07ad5d55cb4a6103da80f1f7cc9b777445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3b3e07ad5d55cb4a6103da8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 15 11:15:35 2015 +0200 webservices: Implement WsGetReaderProperty. --- dlls/webservices/reader.c | 23 +++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 84802fc..4f4d31c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -310,6 +310,15 @@ static HRESULT set_reader_prop( struct reader *reader, WS_XML_READER_PROPERTY_ID return S_OK; } +static HRESULT get_reader_prop( struct reader *reader, WS_XML_READER_PROPERTY_ID id, void *buf, ULONG size ) +{ + if (id >= reader->prop_count || size != reader_props[id].size) + return E_INVALIDARG; + + memcpy( buf, reader->prop[id].value, reader->prop[id].valueSize ); + return S_OK; +} + /************************************************************************** * WsCreateReader [webservices.@] */ @@ -388,6 +397,20 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void } /************************************************************************** + * WsGetReaderProperty [webservices.@] + */ +HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERTY_ID id, + void *buf, ULONG size, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + return get_reader_prop( reader, id, buf, size ); +} + +/************************************************************************** * WsSetErrorProperty [webservices.@] */ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, const void *value, diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 7e0a86b..487c2af 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -82,7 +82,7 @@ @ stub WsGetPrefixFromNamespace @ stub WsGetReaderNode @ stub WsGetReaderPosition -@ stub WsGetReaderProperty +@ stdcall WsGetReaderProperty(ptr long ptr long ptr) @ stub WsGetSecurityContextProperty @ stub WsGetSecurityTokenProperty @ stub WsGetServiceHostProperty

1 0

Hans Leidekker : webservices: Implement WsCreateReader and WsFreeReader.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: a3004d11de2ace91b4e9646741406e59b2dababf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3004d11de2ace91b4e964674… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 15 11:15:06 2015 +0200 webservices: Implement WsCreateReader and WsFreeReader. --- dlls/webservices/reader.c | 111 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 +- 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a0123aa..84802fc 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -250,6 +250,117 @@ void WINAPI WsFreeHeap( WS_HEAP *handle ) heap_free( heap ); } +static const struct +{ + ULONG size; + BOOL readonly; +} +reader_props[] = +{ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_MAX_DEPTH */ + { sizeof(BOOL), FALSE }, /* WS_XML_READER_PROPERTY_ALLOW_FRAGMENT */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_MAX_ATTRIBUTES */ + { sizeof(BOOL), FALSE }, /* WS_XML_READER_PROPERTY_READ_DECLARATION */ + { sizeof(WS_CHARSET), FALSE }, /* WS_XML_READER_PROPERTY_CHARSET */ + { sizeof(ULONGLONG), TRUE }, /* WS_XML_READER_PROPERTY_ROW */ + { sizeof(ULONGLONG), TRUE }, /* WS_XML_READER_PROPERTY_COLUMN */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_UTF8_TRIM_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_STREAM_BUFFER_SIZE */ + { sizeof(BOOL), TRUE }, /* WS_XML_READER_PROPERTY_IN_ATTRIBUTE */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_STREAM_MAX_ROOT_MIME_PART_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_STREAM_MAX_MIME_HEADERS_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_MAX_MIME_PARTS */ + { sizeof(BOOL), FALSE }, /* WS_XML_READER_PROPERTY_ALLOW_INVALID_CHARACTER_REFERENCES */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_MAX_NAMESPACES */ +}; + +struct reader +{ + ULONG prop_count; + WS_XML_READER_PROPERTY prop[sizeof(reader_props)/sizeof(reader_props[0])]; +}; + +static struct reader *alloc_reader(void) +{ + static const ULONG count = sizeof(reader_props)/sizeof(reader_props[0]); + struct reader *ret; + ULONG i, size = sizeof(*ret) + count * sizeof(WS_XML_READER_PROPERTY); + char *ptr; + + for (i = 0; i < count; i++) size += reader_props[i].size; + if (!(ret = heap_alloc_zero( size ))) return NULL; + + ptr = (char *)&ret->prop[count]; + for (i = 0; i < count; i++) + { + ret->prop[i].value = ptr; + ret->prop[i].valueSize = reader_props[i].size; + ptr += ret->prop[i].valueSize; + } + ret->prop_count = count; + return ret; +} + +static HRESULT set_reader_prop( struct reader *reader, WS_XML_READER_PROPERTY_ID id, const void *value, ULONG size ) +{ + if (id >= reader->prop_count || size != reader_props[id].size || reader_props[id].readonly) + return E_INVALIDARG; + + memcpy( reader->prop[id].value, value, size ); + return S_OK; +} + +/************************************************************************** + * WsCreateReader [webservices.@] + */ +HRESULT WINAPI WsCreateReader( const WS_XML_READER_PROPERTY *properties, ULONG count, + WS_XML_READER **handle, WS_ERROR *error ) +{ + struct reader *reader; + ULONG i, max_depth = 32, max_attrs = 128, max_ns = 32; + WS_CHARSET charset = WS_CHARSET_UTF8; + BOOL read_decl = TRUE; + HRESULT hr; + + TRACE( "%p %u %p %p\n", properties, count, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle) return E_INVALIDARG; + if (!(reader = alloc_reader())) return E_OUTOFMEMORY; + + set_reader_prop( reader, WS_XML_READER_PROPERTY_MAX_DEPTH, &max_depth, sizeof(max_depth) ); + set_reader_prop( reader, WS_XML_READER_PROPERTY_MAX_ATTRIBUTES, &max_attrs, sizeof(max_attrs) ); + set_reader_prop( reader, WS_XML_READER_PROPERTY_READ_DECLARATION, &read_decl, sizeof(read_decl) ); + set_reader_prop( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, sizeof(charset) ); + set_reader_prop( reader, WS_XML_READER_PROPERTY_MAX_NAMESPACES, &max_ns, sizeof(max_ns) ); + + for (i = 0; i < count; i++) + { + hr = set_reader_prop( reader, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) + { + heap_free( reader ); + return hr; + } + } + + *handle = (WS_XML_READER *)reader; + return S_OK; +} + +/************************************************************************** + * WsFreeReader [webservices.@] + */ +void WINAPI WsFreeReader( WS_XML_READER *handle ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p\n", handle ); + + if (!reader) return; + heap_free( reader ); +} + /************************************************************************** * WsGetErrorProperty [webservices.@] */ diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 4cb35f6..7e0a86b 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -29,7 +29,7 @@ @ stub WsCreateMessage @ stub WsCreateMessageForChannel @ stub WsCreateMetadata -@ stub WsCreateReader +@ stdcall WsCreateReader(ptr long ptr ptr) @ stub WsCreateServiceEndpointFromTemplate @ stub WsCreateServiceHost @ stub WsCreateServiceProxy @@ -54,7 +54,7 @@ @ stub WsFreeListener @ stub WsFreeMessage @ stub WsFreeMetadata -@ stub WsFreeReader +@ stdcall WsFreeReader(ptr) @ stub WsFreeSecurityToken @ stub WsFreeServiceHost @ stub WsFreeServiceProxy

1 0

Aric Stewart : hidclass.sys: Implement IRP_MJ_READ for HID Devices.
by Alexandre Julliard 15 Sep '15

15 Sep '15

Module: wine Branch: master Commit: 1de389ae2bbfb254cda55bc41a4ec837a86ce94f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de389ae2bbfb254cda55bc41… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 14 09:58:44 2015 -0500 hidclass.sys: Implement IRP_MJ_READ for HID Devices. --- dlls/hidclass.sys/buffer.c | 33 +++++++++++++++++++++++++++++++++ dlls/hidclass.sys/device.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/hid.h | 3 +++ dlls/hidclass.sys/main.c | 1 + 4 files changed, 80 insertions(+) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index c07632c..af59284 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -80,6 +80,39 @@ void RingBuffer_Destroy(struct ReportRingBuffer *ring) HeapFree(GetProcessHeap(), 0, ring); } +UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *ring) +{ + return ring->buffer_size; +} + +void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) +{ + void *ret = NULL; + + EnterCriticalSection(&ring->lock); + if (index >= ring->pointer_alloc || ring->pointers[index] == 0xffffffff) + { + LeaveCriticalSection(&ring->lock); + *size = 0; + return; + } + if (ring->pointers[index] == ring->end) + { + LeaveCriticalSection(&ring->lock); + *size = 0; + } + else + { + ret = &ring->buffer[ring->pointers[index] * ring->buffer_size]; + memcpy(output, ret, ring->buffer_size); + ring->pointers[index]++; + if (ring->pointers[index] == ring->size) + ring->pointers[index] = 0; + LeaveCriticalSection(&ring->lock); + *size = ring->buffer_size; + } +} + UINT RingBuffer_AddPointer(struct ReportRingBuffer *ring) { UINT idx; diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 0b27baa..46bd010 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -36,6 +36,7 @@ #include "devguid.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); +WINE_DECLARE_DEBUG_CHANNEL(hid_report); static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e', '\\','H','I','D','#','%','p','&','%','p',0}; @@ -352,6 +353,48 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) return rc; } +NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) +{ + HID_XFER_PACKET *packet; + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + UINT buffer_size = RingBuffer_GetBufferSize(ext->ring_buffer); + NTSTATUS rc = STATUS_SUCCESS; + int ptr = -1; + + packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); + ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); + + irp->IoStatus.Information = 0; + RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); + + if (buffer_size) + { + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + TRACE_(hid_report)("Got Packet %p %i\n", packet->reportBuffer, packet->reportBufferLen); + if (irpsp->Parameters.Read.Length >= packet->reportBufferLen) + { + memcpy(irp->AssociatedIrp.SystemBuffer, packet->reportBuffer, packet->reportBufferLen); + irp->IoStatus.Information = packet->reportBufferLen; + irp->IoStatus.u.Status = STATUS_SUCCESS; + } + else + { + irp->IoStatus.Information = 0; + irp->IoStatus.u.Status = STATUS_BUFFER_OVERFLOW; + } + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } + else + { + TRACE_(hid_report)("Queue irp\n"); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); + rc = STATUS_PENDING; + } + HeapFree(GetProcessHeap(), 0, packet); + + return rc; +} + NTSTATUS WINAPI HID_Device_create(DEVICE_OBJECT *device, IRP *irp) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 2005d8f..41b9937 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -58,6 +58,8 @@ typedef struct _BASE_DEVICE_EXTENSTION { UINT RingBuffer_AddPointer(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) DECLSPEC_HIDDEN; +void RingBuffer_Read(struct ReportRingBuffer *buffer, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; +UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) DECLSPEC_HIDDEN; @@ -81,6 +83,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) DE void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; +NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_create(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_close(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index 1e0e802..4be4409 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -69,6 +69,7 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) registration->DriverObject->DriverUnload = UnloadDriver; registration->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = HID_Device_ioctl; + registration->DriverObject->MajorFunction[IRP_MJ_READ] = HID_Device_read; registration->DriverObject->MajorFunction[IRP_MJ_CREATE] = HID_Device_create; registration->DriverObject->MajorFunction[IRP_MJ_CLOSE] = HID_Device_close;

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
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