wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Hans Leidekker : webservices: Implement WsWriteType for a number of basic types.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 2563356bd64f98bbc0f5933d40550df932e60ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2563356bd64f98bbc0f5933d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:59 2016 +0100 webservices: Implement WsWriteType for a number of basic types. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 483 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 468 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2563356bd64f98bbc0f59…

1 0

Hans Leidekker : webservices: Reject end elements without a parent in the writer.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 6086ad0fe384cd6744cf5c83f2ad4f336e381845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6086ad0fe384cd6744cf5c83f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:58 2016 +0100 webservices: Reject end elements without a parent in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 4 ++-- dlls/webservices/webservices_private.h | 2 ++ dlls/webservices/writer.c | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ae3d62a..13ca50b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1063,8 +1063,8 @@ static BOOL cmp_localname( const unsigned char *name1, ULONG len1, const unsigne return TRUE; } -static struct node *find_parent_element( struct node *node, const WS_XML_STRING *prefix, - const WS_XML_STRING *localname ) +struct node *find_parent_element( struct node *node, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname ) { struct node *parent; const WS_XML_STRING *str; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index bae2149..4eeedf5 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -32,6 +32,8 @@ WS_XML_STRING *alloc_xml_string( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; +struct node *find_parent_element( struct node *, const WS_XML_STRING *, + const WS_XML_STRING * ) DECLSPEC_HIDDEN; struct node { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 0178978..62e78be 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -546,10 +546,13 @@ static HRESULT write_startelement( struct writer *writer ) static HRESULT write_endelement( struct writer *writer ) { - WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)writer->current; + struct node *node = find_parent_element( writer->current, NULL, NULL ); + WS_XML_ELEMENT_NODE *elem = &node->hdr; ULONG size; HRESULT hr; + if (!elem) return WS_E_INVALID_FORMAT; + /* '</prefix:localname>' */ size = elem->localName->length + 3 /* '</>' */;

1 0

Hans Leidekker : webservices: Implement WsWriteXmlBufferToBytes.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: ed33639561f7bfe6ade90f4dac8575258aa32ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed33639561f7bfe6ade90f4da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:57 2016 +0100 webservices: Implement WsWriteXmlBufferToBytes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 42f5b63..fe9eb6c 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -188,6 +188,6 @@ @ stub WsWriteType @ stub WsWriteValue @ stdcall WsWriteXmlBuffer(ptr ptr ptr) -@ stub WsWriteXmlBufferToBytes +@ stdcall WsWriteXmlBufferToBytes(ptr ptr ptr ptr long ptr ptr ptr ptr) @ stub WsWriteXmlnsAttribute @ stdcall WsXmlStringEquals(ptr ptr ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 398d651..0178978 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -792,3 +792,41 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W write_bytes( writer, xmlbuf->ptr, xmlbuf->size ); return S_OK; } + +/************************************************************************** + * WsWriteXmlBufferToBytes [webservices.@] + */ +HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, + const WS_XML_WRITER_ENCODING *encoding, + const WS_XML_WRITER_PROPERTY *properties, ULONG count, + WS_HEAP *heap, void **bytes, ULONG *size, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + struct xmlbuf *xmlbuf = (struct xmlbuf *)buffer; + HRESULT hr; + char *buf; + ULONG i; + + TRACE( "%p %p %p %p %u %p %p %p %p\n", handle, buffer, encoding, properties, count, heap, + bytes, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !xmlbuf || !heap || !bytes) return E_INVALIDARG; + + if (encoding && encoding->encodingType != WS_XML_WRITER_ENCODING_TYPE_TEXT) + { + FIXME( "encoding type %u not supported\n", encoding->encodingType ); + return E_NOTIMPL; + } + + for (i = 0; i < count; i++) + { + hr = set_writer_prop( writer, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) return hr; + } + + if (!(buf = ws_alloc( heap, xmlbuf->size ))) return WS_E_QUOTA_EXCEEDED; + memcpy( buf, xmlbuf->ptr, xmlbuf->size ); + *bytes = buf; + return S_OK; +}

1 0

Hans Leidekker : webservices: Implement WsWriteXmlBuffer.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 32e20cbf320974bf6837835a5c30dd01b7254ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32e20cbf320974bf6837835a5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:56 2016 +0100 webservices: Implement WsWriteXmlBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 5a2baba..42f5b63 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -187,7 +187,7 @@ @ stdcall WsWriteText(ptr ptr ptr) @ stub WsWriteType @ stub WsWriteValue -@ stub WsWriteXmlBuffer +@ stdcall WsWriteXmlBuffer(ptr ptr ptr) @ stub WsWriteXmlBufferToBytes @ stub WsWriteXmlnsAttribute @ stdcall WsXmlStringEquals(ptr ptr ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index d36793a..398d651 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -773,3 +773,22 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E elem->attributes[elem->attributeCount - 1]->value = (WS_XML_TEXT *)dst; return S_OK; } + +/************************************************************************** + * WsWriteXmlBuffer [webservices.@] + */ +HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + struct xmlbuf *xmlbuf = (struct xmlbuf *)buffer; + HRESULT hr; + + TRACE( "%p %p %p\n", handle, buffer, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !xmlbuf) return E_INVALIDARG; + + if ((hr = write_grow_buffer( writer, xmlbuf->size )) != S_OK) return hr; + write_bytes( writer, xmlbuf->ptr, xmlbuf->size ); + return S_OK; +}

1 0

Hans Leidekker : webservices: Attributes inherit the prefix from their element.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 44d850c259b7a36007beaf38941a157b31b7c2db URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d850c259b7a36007beaf389… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:55 2016 +0100 webservices: Attributes inherit the prefix from their element. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index ece5ad1..d36793a 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -454,20 +454,24 @@ static HRESULT write_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) { WS_XML_UTF8_TEXT *text = (WS_XML_UTF8_TEXT *)attr->value; unsigned char quote = attr->singleQuote ? '\'' : '"'; + const WS_XML_STRING *prefix; ULONG size; HRESULT hr; + if (attr->prefix) prefix = attr->prefix; + else prefix = writer->current->hdr.prefix; + /* ' prefix:attr="value"' */ size = attr->localName->length + 4 /* ' =""' */; - if (attr->prefix) size += attr->prefix->length + 1 /* ':' */; + if (prefix) size += prefix->length + 1 /* ':' */; if (text) size += text->value.length; if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; write_char( writer, ' ' ); - if (attr->prefix) + if (prefix) { - write_bytes( writer, attr->prefix->bytes, attr->prefix->length ); + write_bytes( writer, prefix->bytes, prefix->length ); write_char( writer, ':' ); } write_bytes( writer, attr->localName->bytes, attr->localName->length );

1 0

Hans Leidekker : webservices: Simplify handling of quotes in write_attribute.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 4f0b912236fc8f7d72c5d50a6c9b784b80839b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0b912236fc8f7d72c5d50a6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:54 2016 +0100 webservices: Simplify handling of quotes in write_attribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index e7fa915..ece5ad1 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -453,6 +453,7 @@ static inline void write_bytes( struct writer *writer, const BYTE *bytes, ULONG static HRESULT write_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) { WS_XML_UTF8_TEXT *text = (WS_XML_UTF8_TEXT *)attr->value; + unsigned char quote = attr->singleQuote ? '\'' : '"'; ULONG size; HRESULT hr; @@ -471,11 +472,9 @@ static HRESULT write_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) } write_bytes( writer, attr->localName->bytes, attr->localName->length ); write_char( writer, '=' ); - if (attr->singleQuote) write_char( writer, '\'' ); - else write_char( writer, '"' ); + write_char( writer, quote ); if (text) write_bytes( writer, text->value.bytes, text->value.length ); - if (attr->singleQuote) write_char( writer, '\'' ); - else write_char( writer, '"' ); + write_char( writer, quote ); /* FIXME: ignoring namespace */ return S_OK;

1 0

Józef Kucia : d3d10core/tests: Port test_copy_subresource_region() from d3d11.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 50a8d3f6d2c0bce11aefa94a0b7fa53951d0defe URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a8d3f6d2c0bce11aefa94a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 19 22:28:12 2016 +0100 d3d10core/tests: Port test_copy_subresource_region() from d3d11. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 265 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 265 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50a8d3f6d2c0bce11aefa…

1 0

Józef Kucia : d3d11/tests: Add test for ID3D11DeviceContext::CopySubresourceRegion().
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: c161543c8678125b00972282208035ad710ff648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c161543c8678125b009722822… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 19 22:28:11 2016 +0100 d3d11/tests: Add test for ID3D11DeviceContext::CopySubresourceRegion(). Based on test_update_subresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 270 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c161543c8678125b00972…

1 0

Józef Kucia : wined3d: Do not copy surface region when empty box is passed.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: cd243969899b6c8a6531b18b63e5365c43dec487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd243969899b6c8a6531b18b6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 19 22:28:10 2016 +0100 wined3d: Do not copy surface region when empty box is passed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 87221c3..c058881 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4004,6 +4004,14 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev if (src_box) { + if (src_box->front >= src_box->back) + { + WARN("Invalid box (%u, %u, %u)->(%u, %u, %u) specified.\n", + src_box->left, src_box->top, src_box->front, + src_box->right, src_box->bottom, src_box->back); + return WINED3DERR_INVALIDCALL; + } + src_rect.left = src_box->left; src_rect.top = src_box->top; src_rect.right = src_box->right;

1 0

Riccardo Bortolato : d3d11: Implement d3d11_immediate_context_CopySubresourceRegion().
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: ccbe3a580b69d7a11c56c4b2b06aed89e9cfe1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccbe3a580b69d7a11c56c4b2b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Jan 19 22:28:09 2016 +0100 d3d11: Implement d3d11_immediate_context_CopySubresourceRegion(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 38845ec..fb308d0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -820,10 +820,31 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D ID3D11Resource *dst_resource, UINT dst_subresource_idx, UINT dst_x, UINT dst_y, UINT dst_z, ID3D11Resource *src_resource, UINT src_subresource_idx, const D3D11_BOX *src_box) { - FIXME("iface %p, dst_resource %p, dst_subresource_idx %u, dst_x %u, dst_y %u, dst_z %u, " - "src_resource %p, src_subresource_idx %u, src_box %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; + struct wined3d_box wined3d_src_box; + + TRACE("iface %p, dst_resource %p, dst_subresource_idx %u, dst_x %u, dst_y %u, dst_z %u, " + "src_resource %p, src_subresource_idx %u, src_box %p.\n", iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); + + if (src_box) + { + wined3d_src_box.left = src_box->left; + wined3d_src_box.top = src_box->top; + wined3d_src_box.front = src_box->front; + wined3d_src_box.right = src_box->right; + wined3d_src_box.bottom = src_box->bottom; + wined3d_src_box.back = src_box->back; + } + + wined3d_dst_resource = wined3d_resource_from_d3d11_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); + wined3d_mutex_lock(); + wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx, + dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CopyResource(ID3D11DeviceContext *iface,

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
63
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 January 2016