June 2016 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : d3dx9_32: Share the source with d3dx9_36.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 9e80c1ab8e587cabef3ecd855702033b1ce4ef93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e80c1ab8e587cabef3ecd855… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 06:00:29 2016 +0000 d3dx9_32: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_32/Makefile.in | 22 +- dlls/d3dx9_32/d3dx9_32.spec | 666 +++++++++++++++++++++--------------------- dlls/d3dx9_32/d3dx9_32_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 354 insertions(+), 337 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e80c1ab8e587cabef3ec…

1 0

Alistair Leslie-Hughes : d3dx9_33: Share the source with d3dx9_36.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 1a885745fce9b896d06cc191b93dda6ea3bbd75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a885745fce9b896d06cc191b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 06:00:11 2016 +0000 d3dx9_33: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_33/Makefile.in | 22 +- dlls/d3dx9_33/d3dx9_33.spec | 666 +++++++++++++++++++++--------------------- dlls/d3dx9_33/d3dx9_33_main.c | 1 + tools/make_specfiles | 1 - 4 files changed, 354 insertions(+), 336 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a885745fce9b896d06cc…

1 0

Alistair Leslie-Hughes : d3dx9_26: Share the source with d3dx9_36.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 9efbfefef56eef7735219f645977c43d587f3b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efbfefef56eef7735219f645… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 06:01:47 2016 +0000 d3dx9_26: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_26/Makefile.in | 22 +- dlls/d3dx9_26/d3dx9_26.spec | 646 +++++++++++++++++++++--------------------- dlls/d3dx9_26/d3dx9_26_main.c | 2 +- tools/make_specfiles | 1 - 4 files changed, 344 insertions(+), 327 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9efbfefef56eef7735219…

1 0

Hans Leidekker : webservices: Implement WsSetWriterPosition.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 511c21d30977cb15c03bd193a7aa2fb3982a6c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=511c21d30977cb15c03bd193a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:48 2016 +0200 webservices: Implement WsSetWriterPosition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 48 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 17 ++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index f425664..5314bc8 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1532,6 +1532,53 @@ static void test_WsGetWriterPosition(void) WsFreeHeap( heap ); } +static void test_WsSetWriterPosition(void) +{ + WS_HEAP *heap; + WS_XML_WRITER *writer; + WS_XML_BUFFER *buf1, *buf2; + WS_XML_NODE_POSITION pos; + HRESULT hr; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetWriterPosition( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateXmlBuffer( heap, NULL, 0, &buf1, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutputToBuffer( writer, buf1, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetWriterPosition( writer, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + pos.buffer = pos.node = NULL; + hr = WsGetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos.buffer == buf1, "wrong buffer\n" ); + ok( pos.node != NULL, "node not set\n" ); + + hr = WsSetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* different buffer */ + hr = WsCreateXmlBuffer( heap, NULL, 0, &buf2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + pos.buffer = buf2; + hr = WsSetWriterPosition( writer, &pos, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + WsFreeWriter( writer ); + WsFreeHeap( heap ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -1552,4 +1599,5 @@ START_TEST(writer) test_complex_struct_type(); test_WsMoveWriter(); test_WsGetWriterPosition(); + test_WsSetWriterPosition(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 618d6ee..3a69302 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -157,7 +157,7 @@ @ stdcall WsSetOutput(ptr ptr ptr ptr long ptr) @ stdcall WsSetOutputToBuffer(ptr ptr ptr long ptr) @ stub WsSetReaderPosition -@ stub WsSetWriterPosition +@ stdcall WsSetWriterPosition(ptr ptr ptr) @ stub WsShutdownSessionChannel @ stub WsSkipNode @ stub WsStartReaderCanonicalization diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f9c9ca9..8c9e202 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1819,3 +1819,20 @@ HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION pos->node = writer->current; return S_OK; } + +/************************************************************************** + * WsSetWriterPosition [webservices.@] + */ +HRESULT WINAPI WsSetWriterPosition( WS_XML_WRITER *handle, const WS_XML_NODE_POSITION *pos, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + + TRACE( "%p %p %p\n", handle, pos, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !pos || (struct xmlbuf *)pos->buffer != writer->output_buf) return E_INVALIDARG; + if (!writer->output_type) return WS_E_INVALID_OPERATION; + + writer->current = pos->node; + return S_OK; +}

1 0

Hans Leidekker : webservices: Implement WsGetWriterPosition.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 600e2e53c858beb553f97855c56031d8d6beb64c URL: http://source.winehq.org/git/wine.git/?a=commit;h=600e2e53c858beb553f97855c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:47 2016 +0200 webservices: Implement WsGetWriterPosition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 18 +++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index b223544..f425664 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1486,6 +1486,52 @@ static void test_WsMoveWriter(void) WsFreeHeap( heap ); } +static void test_WsGetWriterPosition(void) +{ + WS_HEAP *heap; + WS_XML_WRITER *writer; + WS_XML_BUFFER *buffer; + WS_XML_NODE_POSITION pos; + HRESULT hr; + + hr = WsGetWriterPosition( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetWriterPosition( writer, &pos, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* writer must be set to an XML buffer */ + hr = WsGetWriterPosition( writer, &pos, NULL ); + todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetWriterPosition( writer, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + pos.buffer = pos.node = NULL; + hr = WsGetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos.buffer != NULL, "buffer not set\n" ); + ok( pos.node != NULL, "node not set\n" ); + + WsFreeWriter( writer ); + WsFreeHeap( heap ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -1505,4 +1551,5 @@ START_TEST(writer) test_WsGetPrefixFromNamespace(); test_complex_struct_type(); test_WsMoveWriter(); + test_WsGetWriterPosition(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 5754c61..618d6ee 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -87,7 +87,7 @@ @ stub WsGetSecurityTokenProperty @ stub WsGetServiceHostProperty @ stdcall WsGetServiceProxyProperty(ptr long ptr long ptr) -@ stub WsGetWriterPosition +@ stdcall WsGetWriterPosition(ptr ptr ptr) @ stdcall WsGetWriterProperty(ptr long ptr long ptr) @ stdcall WsGetXmlAttribute(ptr ptr ptr ptr ptr ptr) @ stub WsInitializeMessage diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 583e7fa..f9c9ca9 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1801,3 +1801,21 @@ HRESULT WINAPI WsMoveWriter( WS_XML_WRITER *handle, WS_MOVE_TO move, BOOL *found return write_move_to( writer, move, found ); } + +/************************************************************************** + * WsGetWriterPosition [webservices.@] + */ +HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION *pos, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + + TRACE( "%p %p %p\n", handle, pos, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !pos) return E_INVALIDARG; + if (!writer->output_type) return WS_E_INVALID_OPERATION; + + pos->buffer = (WS_XML_BUFFER *)writer->output_buf; + pos->node = writer->current; + return S_OK; +}

1 0

Hans Leidekker : webservices: Validate parent nodes in the writer.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 13ef81e4c08bb8f4d032496591e34027d6d5942d URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ef81e4c08bb8f4d03249659… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:44 2016 +0200 webservices: Validate parent nodes 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 | 11 +++++------ dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 11 +++++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ca8f1bd..8f2d8fb 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1100,9 +1100,8 @@ static inline BOOL is_valid_parent( const struct node *node ) return node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF; } -static struct node *read_find_parent( struct reader *reader ) +struct node *find_parent( struct node *node ) { - struct node *node = reader->current; if (node_type( node ) == WS_XML_NODE_TYPE_END_ELEMENT) { if (!node->parent || !is_valid_parent( node->parent->parent )) return NULL; @@ -1168,7 +1167,7 @@ static HRESULT read_element( struct reader *reader ) } if (!len) goto error; - if (!(parent = read_find_parent( reader ))) goto error; + if (!(parent = find_parent( reader->current ))) goto error; hr = E_OUTOFMEMORY; if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error; @@ -1217,7 +1216,7 @@ static HRESULT read_text( struct reader *reader ) len += skip; } - if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; text = (WS_XML_TEXT_NODE *)node; @@ -1386,7 +1385,7 @@ static HRESULT read_comment( struct reader *reader ) len += skip; } - if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_COMMENT ))) return E_OUTOFMEMORY; comment = (WS_XML_COMMENT_NODE *)node; @@ -1410,7 +1409,7 @@ static HRESULT read_startcdata( struct reader *reader ) if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; read_skip( reader, 9 ); - if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; read_insert_node( reader, parent, node ); diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 363f164..fc888ee 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -45,6 +45,7 @@ struct node struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN; void free_node( struct node * ) DECLSPEC_HIDDEN; void destroy_nodes( struct node * ) DECLSPEC_HIDDEN; +struct node *find_parent( struct node * ) DECLSPEC_HIDDEN; static inline WS_XML_NODE_TYPE node_type( const struct node *node ) { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index ebe9b9d..bf4c61b 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -880,10 +880,11 @@ static HRESULT write_flush( struct writer *writer ) static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRING *prefix, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { - struct node *node; + struct node *node, *parent; WS_XML_ELEMENT_NODE *elem; HRESULT hr; + if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; if ((hr = write_flush( writer )) != S_OK) return hr; if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT) @@ -907,7 +908,7 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN free_node( node ); return E_OUTOFMEMORY; } - write_insert_node( writer, writer->current, node ); + write_insert_node( writer, parent, node ); writer->state = WRITER_STATE_STARTELEMENT; return S_OK; } @@ -938,14 +939,16 @@ static inline void write_set_attribute_value( struct writer *writer, WS_XML_TEXT static HRESULT write_add_text_node( struct writer *writer, WS_XML_TEXT *value ) { - struct node *node; + struct node *node, *parent; WS_XML_TEXT_NODE *text; + if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; text = (WS_XML_TEXT_NODE *)node; text->text = value; - write_insert_node( writer, writer->current, node ); + write_insert_node( writer, parent, node ); writer->state = WRITER_STATE_TEXT; return S_OK; }

1 0

Hans Leidekker : webservices: Accept zero write option in WsWriteType.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: b0077f06f091c661138ef39550ca66bada1ee56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0077f06f091c661138ef3955… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:43 2016 +0200 webservices: Accept zero write option in WsWriteType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 9779870..ebe9b9d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1424,55 +1424,55 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_BOOL_TYPE: { const BOOL *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_bool( writer, mapping, desc, ptr ); } case WS_INT8_TYPE: { const INT8 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_int8( writer, mapping, desc, ptr ); } case WS_INT16_TYPE: { const INT16 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_int16( writer, mapping, desc, ptr ); } case WS_INT32_TYPE: { const INT32 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_int32( writer, mapping, desc, ptr ); } case WS_INT64_TYPE: { const INT64 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_int64( writer, mapping, desc, ptr ); } case WS_UINT8_TYPE: { const UINT8 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_uint8( writer, mapping, desc, ptr ); } case WS_UINT16_TYPE: { const UINT16 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_uint16( writer, mapping, desc, ptr ); } case WS_UINT32_TYPE: { const UINT32 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_uint32( writer, mapping, desc, ptr ); } case WS_UINT64_TYPE: { const UINT64 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_uint64( writer, mapping, desc, ptr ); } case WS_WSZ_TYPE:

1 0

Józef Kucia : wined3d: Recognize vThreadGroupID register.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 1c6d168742e74fd0e6bfb40134c591b901832138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c6d168742e74fd0e6bfb4013… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:10:00 2016 +0200 wined3d: Recognize vThreadGroupID register. 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/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a4177bc..eb87c94 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1751,6 +1751,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "g"); break; + case WINED3DSPR_THREADGROUPID: + shader_addline(buffer, "vThreadGroupID"); + break; + case WINED3DSPR_LOCALTHREADINDEX: shader_addline(buffer, "vThreadIDInGroupFlattened"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ada369b..4e7557d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -251,6 +251,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, WINED3D_SM5_RT_SHARED_MEMORY = 0x1f, + WINED3D_SM5_RT_THREAD_GROUP_ID = 0x21, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, }; @@ -820,7 +821,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, /* WINED3D_SM5_RT_SHARED_MEMORY */ WINED3DSPR_GROUPSHAREDMEM, /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_THREAD_GROUP_ID */ WINED3DSPR_THREADGROUPID, /* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_LOCAL_THREAD_INDEX */ WINED3DSPR_LOCALTHREADINDEX, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e7c626d..e3c3d2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -388,6 +388,7 @@ enum wined3d_shader_register_type WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, WINED3DSPR_GROUPSHAREDMEM, + WINED3DSPR_THREADGROUPID, WINED3DSPR_LOCALTHREADINDEX, };

1 0

Józef Kucia : wined3d: Add compute shader type.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: b30f59c56725441f23e8a13083b38d37a73d3c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30f59c56725441f23e8a1308… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:09:56 2016 +0200 wined3d: Add compute shader type. 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/arb_program_shader.c | 4 +++- dlls/wined3d/context.c | 3 ++- dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 8 +++++++- dlls/wined3d/shader.c | 21 +++++++++++++++++++-- dlls/wined3d/utils.c | 1 + dlls/wined3d/wined3d_main.c | 3 +++ dlls/wined3d/wined3d_private.h | 5 ++++- 8 files changed, 40 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b30f59c56725441f23e8a…

1 0

Henri Verbeet : wined3d: Send rendertarget view destruction through the command stream.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 7fe9858988eabf377ab5e2c64d92f973574b1ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe9858988eabf377ab5e2c64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:47 2016 +0200 wined3d: Send rendertarget view destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 329a0bb..e9e62d1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -33,6 +33,11 @@ ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *v return refcount; } +static void wined3d_rendertarget_view_destroy_object(void *object) +{ + HeapFree(GetProcessHeap(), 0, object); +} + ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedDecrement(&view->refcount); @@ -41,11 +46,13 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v if (!refcount) { + struct wined3d_device *device = view->resource->device; + /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); wined3d_resource_decref(view->resource); - HeapFree(GetProcessHeap(), 0, view); + wined3d_cs_emit_destroy_object(device->cs, wined3d_rendertarget_view_destroy_object, view); } return refcount;

1 0