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

Sebastian Lackner : advapi32: Fix RegDeleteTreeW when an empty string is passed.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 2ddcd97bb13b22e369e168ed344215f7bb650501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ddcd97bb13b22e369e168ed3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 2 07:37:27 2016 +0100 advapi32: Fix RegDeleteTreeW when an empty string is passed. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 6 +++--- dlls/advapi32/tests/registry.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 172423b..aa451b1 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3030,7 +3030,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey ) TRACE( "(%p, %s)\n", hkey, debugstr_w(subkey) ); - if (subkey) + if (subkey && *subkey) { ret = RegOpenKeyExW( hkey, subkey, 0, KEY_READ, &hkey ); if (ret) return ret; @@ -3060,7 +3060,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey ) } /* Delete the key itself */ - if (subkey) + if (subkey && *subkey) { ret = RegDeleteKeyW( hkey, emptyW ); goto cleanup; @@ -3081,7 +3081,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey ) cleanup: heap_free( name_buf ); - if (subkey) + if (subkey && *subkey) RegCloseKey( hkey ); return ret; } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d37042f..c2b0e12 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2246,6 +2246,20 @@ static void test_reg_delete_tree(void) dwsize = MAX_PATH; ok(RegQueryValueExA(subkey, "value", NULL, &type, (BYTE *)buffer, &dwsize), "Value is still present\n"); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegOpenKeyA(hkey_main, "subkey", &subkey); + ok(ret == ERROR_SUCCESS, "subkey was deleted\n"); + ret = pRegDeleteTreeA(subkey, ""); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegOpenKeyA(hkey_main, "subkey", &subkey); + ok(ret == ERROR_SUCCESS, "subkey was deleted\n"); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); ret = pRegDeleteTreeA(hkey_main, "not-here"); ok(ret == ERROR_FILE_NOT_FOUND,

1 0

Marcus Meissner : manpages: Markup fixes.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 0d06ebf5fb515e19cd9ec951dd9e49f6e678b35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d06ebf5fb515e19cd9ec951d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Mar 2 09:24:34 2016 +0100 manpages: Markup fixes. Reported by Eric S. Raymond. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/msiexec.man.in | 50 ++++++++++++++++++++-------------------- programs/winedbg/winedbg.man.in | 2 +- tools/winemaker/winemaker.man.in | 1 - 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/programs/msiexec/msiexec.man.in b/programs/msiexec/msiexec.man.in index 83328ae..23b3b58 100644 --- a/programs/msiexec/msiexec.man.in +++ b/programs/msiexec/msiexec.man.in @@ -24,25 +24,25 @@ Same as \fB/x\fR. \fR[\fBp\fR|\fBo\fR|\fBe\fR|\fBd\fR|\fBc\fR|\fBa\fR|\fBu\fR|\fBm\fR|\fBs\fR|\fBv\fR]\ \ \fR{\fIpackage\fR|\fIproductcode\fR} Repair an installation. Default options are \'omus\' -.IP "\flp\fR" +.IP "\fBlp\fR" Reinstall the file if it is missing. -.IP "\flo\fR" +.IP "\fBlo\fR" Reinstall the file if it is missing or if any older version is installed. -.IP "\fle\fR" +.IP "\fBle\fR" Reinstall the file if it is missing, or if the installed version is equal or older. -.IP "\fld\fR" +.IP "\fBld\fR" Reinstall the file if it is missing or a different version is installed. -.IP "\flc\fR" +.IP "\fBlc\fR" Reinstall the file if it is missing or the checksum does not match. -.IP "\fla\fR" +.IP "\fBla\fR" Reinstall all files. -.IP "\flu\fR" +.IP "\fBlu\fR" Rewrite all required user registry entries. -.IP "\flm\fR" +.IP "\fBlm\fR" Rewrite all required machine registry entries. -.IP "\fls\fR" +.IP "\fBls\fR" Overwrite any conflicting shortcuts. -.IP "\flv\fR" +.IP "\fBlv\fR" Recache the local installation package from the source installation package. .SH PATCHING .IP \fB/p\ \fR{\fIpatch\fR}\ \fR[\fIproperty\fR=\fIfoobar\fR] @@ -65,35 +65,35 @@ Shows a full UI. [\fBi\fR|\fBw\fR|\fBe\fR|\fBa\fR|\fBr\fR|\fBu\fR|\fBc\fR|\fBm\fR|\fBo\fR|\fBp\fR|\fBv\fR]\ [\fB+\fR|\fB!\fR]\ {\fIlogfile\fR} Enable logging to \fIlogfile\fR. Defaults are \'iwearmo\'. -.IP "\fl*\fR" +.IP "\fBl*\fR" Enable all logging options except \'v\' and \'x\'. -.IP "\fli\fR" +.IP "\fBli\fR" Log status messages. -.IP "\flw\fR" +.IP "\fBlw\fR" Log nonfatal warnings. -.IP "\fle\fR" +.IP "\fBle\fR" Log all error messages. -.IP "\fla\fR" +.IP "\fBla\fR" Log start of actions. -.IP "\flr\fR" +.IP "\fBlr\fR" Log action specifc records. -.IP "\flu\fR" +.IP "\fBlu\fR" Log user requests. -.IP "\flc\fR" +.IP "\fBlc\fR" Log initial UI parameters. -.IP "\flm\fR" +.IP "\fBlm\fR" Log out of memory errors. -.IP "\flo\fR" +.IP "\fBlo\fR" Log out of diskspace messages. -.IP "\flp \fR" +.IP "\fBlp \fR" Log terminal properties. -.IP "\flv \fR" +.IP "\fBlv \fR" Verbose logging. -.IP "\flx \fR" +.IP "\fBlx \fR" Log extra debugging messages. -.IP "\fl+ \fR" +.IP "\fBl+ \fR" Append logging to existing file. -.IP "\fl! \fR" +.IP "\fBl! \fR" Flush each line to log. .SH OTHER OPTIONS .IP \fB/h diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index d6e5dc9..d107166 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -163,7 +163,7 @@ Adds a breakpoint at the line \fIN\fR inside symbol \fIid\fR. .IP \fBbreak\ \fIN\fR Adds a breakpoint at line \fIN\fR of current source file. .IP \fBbreak\fR -Adds a breakpoint at current \f$PC\fR address. +Adds a breakpoint at current \fB$PC\fR address. .IP \fBwatch\ *\ \fIN\fR Adds a watch command (on write) at address \fIN\fR (on 4 bytes). .IP \fBwatch\ \fIid\fR diff --git a/tools/winemaker/winemaker.man.in b/tools/winemaker/winemaker.man.in index 5014cdd..9d03e65 100644 --- a/tools/winemaker/winemaker.man.in +++ b/tools/winemaker/winemaker.man.in @@ -29,7 +29,6 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U .br [ .BR "--generated-files " "] [ " "--nogenerated-files " "] -] .br [ .BR "--wine32 " "]

1 0

Hans Leidekker : webservices: Add support for element and text field mappings in the writer.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: bf74c6a5ddef345130ddf91b352e2a81d86e4a31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf74c6a5ddef345130ddf91b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 2 14:06:29 2016 +0100 webservices: Add support for element and text field mappings in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 96 +++++++++++++++++++++++++++ dlls/webservices/writer.c | 142 ++++++++++++++++------------------------ 2 files changed, 152 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf74c6a5ddef345130ddf…

1 0

Hans Leidekker : webservices: Add support for attribute field mappings in the reader.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 7a6595bf5160b66e2ef335bea204b8f6460a3826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a6595bf5160b66e2ef335bea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 2 14:06:27 2016 +0100 webservices: Add support for attribute field mappings in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 249 ++++++++++++---------------------------- dlls/webservices/tests/reader.c | 65 +++++++++++ 2 files changed, 141 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a6595bf5160b66e2ef33…

1 0

Hans Leidekker : webservices: Don' t read past the closing bracket in read_element.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: b7178446fc123d1b25ed72a8c235a90dfd38f943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7178446fc123d1b25ed72a8c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 2 14:06:25 2016 +0100 webservices: Don't read past the closing bracket in read_element. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 125 ++++++++++++++++++--------------- dlls/webservices/tests/reader.c | 4 +- dlls/webservices/webservices_private.h | 2 - dlls/webservices/writer.c | 11 ++- 4 files changed, 79 insertions(+), 63 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 37c2045..db68733 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1001,11 +1001,47 @@ error: return hr; } +static int cmp_name( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) +{ + ULONG i; + if (len1 != len2) return 1; + for (i = 0; i < len1; i++) { if (toupper( name1[i] ) != toupper( name2[i] )) return 1; } + return 0; +} + +static struct node *read_find_parent( struct reader *reader, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname ) +{ + struct node *parent; + const WS_XML_STRING *str; + + for (parent = reader->current; parent; parent = parent->parent) + { + if (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_BOF) + { + if (!localname) return parent; + return NULL; + } + else if (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + if (!localname) return parent; + + str = parent->hdr.prefix; + if (cmp_name( str->bytes, str->length, prefix->bytes, prefix->length )) continue; + str = parent->hdr.localName; + if (cmp_name( str->bytes, str->length, localname->bytes, localname->length )) continue; + return parent; + } + } + + return NULL; +} + static HRESULT read_element( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; - struct node *node; + struct node *node = NULL, *parent; WS_XML_ELEMENT_NODE *elem; WS_XML_ATTRIBUTE *attr; HRESULT hr = WS_E_INVALID_FORMAT; @@ -1018,9 +1054,6 @@ static HRESULT read_element( struct reader *reader ) return S_OK; } - if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) return E_OUTOFMEMORY; - elem = (WS_XML_ELEMENT_NODE *)node; - if (read_cmp( reader, "<", 1 )) goto error; read_skip( reader, 1 ); @@ -1034,6 +1067,12 @@ static HRESULT read_element( struct reader *reader ) } if (!len) goto error; + if (!(parent = read_find_parent( reader, NULL, NULL ))) goto error; + + hr = E_OUTOFMEMORY; + if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error; + elem = (WS_XML_ELEMENT_NODE *)node; + if ((hr = parse_name( start, len, &elem->prefix, &elem->localName )) != S_OK) goto error; hr = E_OUTOFMEMORY; if (!(elem->ns = alloc_xml_string( NULL, 0 ))) goto error; @@ -1053,26 +1092,8 @@ static HRESULT read_element( struct reader *reader ) reader->current_attr++; } - read_skip_whitespace( reader ); - if (read_cmp( reader, ">", 1 ) && read_cmp( reader, "/>", 2 )) - { - hr = WS_E_INVALID_FORMAT; - goto error; - } - - read_insert_node( reader, reader->current, node ); - if (!read_cmp( reader, "/>", 2 )) - { - read_skip( reader, 2 ); - if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; - read_insert_node( reader, reader->current, node ); - reader->state = READER_STATE_ENDELEMENT; - } - else - { - read_skip( reader, 1 ); - reader->state = READER_STATE_STARTELEMENT; - } + read_insert_node( reader, parent, node ); + reader->state = READER_STATE_STARTELEMENT; return S_OK; error: @@ -1112,10 +1133,27 @@ static HRESULT read_text( struct reader *reader ) return S_OK; } +static HRESULT read_node( struct reader * ); + static HRESULT read_startelement( struct reader *reader ) { - if (!read_cmp( reader, "<", 1 )) return read_element( reader ); - return read_text( reader ); + struct node *node; + + read_skip_whitespace( reader ); + if (!read_cmp( reader, "/>", 2 )) + { + read_skip( reader, 2 ); + if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; + read_insert_node( reader, reader->current, node ); + reader->state = READER_STATE_ENDELEMENT; + return S_OK; + } + else if (!read_cmp( reader, ">", 1 )) + { + read_skip( reader, 1 ); + return read_node( reader ); + } + return WS_E_INVALID_FORMAT; } static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) @@ -1148,36 +1186,6 @@ static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) return hr; } -static int cmp_name( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) -{ - ULONG i; - if (len1 != len2) return 1; - for (i = 0; i < len1; i++) { if (toupper( name1[i] ) != toupper( name2[i] )) return 1; } - return 0; -} - -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; - - for (parent = node; parent; parent = parent->parent) - { - if (parent->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) continue; - if (!localname) return parent; - - str = parent->hdr.prefix; - if (cmp_name( str->bytes, str->length, prefix->bytes, prefix->length )) continue; - - str = parent->hdr.localName; - if (cmp_name( str->bytes, str->length, localname->bytes, localname->length )) continue; - - return parent; - } - return NULL; -} - static HRESULT read_endelement( struct reader *reader ) { struct node *node, *parent; @@ -1204,7 +1212,7 @@ static HRESULT read_endelement( struct reader *reader ) } if ((hr = parse_name( start, len, &prefix, &localname )) != S_OK) return hr; - parent = find_parent_element( reader->current, prefix, localname ); + parent = read_find_parent( reader, prefix, localname ); heap_free( prefix ); heap_free( localname ); if (!parent) return WS_E_INVALID_FORMAT; @@ -1333,7 +1341,8 @@ static HRESULT read_node( struct reader *reader ) else if (!read_cmp( reader, "</", 2 )) return read_endelement( reader ); else if (!read_cmp( reader, "<![CDATA[", 9 )) return read_startcdata( reader ); else if (!read_cmp( reader, "<!--", 4 )) return read_comment( reader ); - else if (!read_cmp( reader, "<", 1 )) return read_startelement( reader ); + else if (!read_cmp( reader, "<", 1 )) return read_element( reader ); + else if (!read_cmp( reader, "/>", 2 ) || !read_cmp( reader, ">", 1 )) return read_startelement( reader ); else return read_text( reader ); } } diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 720379e..62a8846 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -2045,7 +2045,7 @@ static void test_WsGetNamespaceFromPrefix(void) hr = set_input( reader, "<prefix:t xmlns:prefix2='ns'/>", sizeof("<prefix:t xmlns:prefix2='ns'/>") - 1 ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadStartElement( reader, NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); prepare_namespace_test( reader, "<t></t>" ); ns = NULL; @@ -2132,7 +2132,7 @@ static void test_WsGetNamespaceFromPrefix(void) prepare_namespace_test( reader, "<t xmlns:prefix='ns'></t>" ); hr = WsReadStartElement( reader, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadEndElement( reader, NULL ); todo_wine ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 4eeedf5..bae2149 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -32,8 +32,6 @@ 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 14bddfb..f29b257 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -597,9 +597,18 @@ static HRESULT write_startelement( struct writer *writer ) return S_OK; } +static struct node *write_find_parent_element( struct writer *writer ) +{ + struct node *node = writer->current; + + if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) return node; + if (node->parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) return node->parent; + return NULL; +} + static HRESULT write_endelement( struct writer *writer ) { - struct node *node = find_parent_element( writer->current, NULL, NULL ); + struct node *node = write_find_parent_element( writer ); WS_XML_ELEMENT_NODE *elem = &node->hdr; ULONG size; HRESULT hr;

1 0

Józef Kucia : d3d10core/tests: Port test_multiple_render_targets() from d3d11.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 9e9b51f1b13863c0fa4f48af232b8d1b4875b838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e9b51f1b13863c0fa4f48af2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 1 22:20:02 2016 +0100 d3d10core/tests: Port test_multiple_render_targets() 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 | 175 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 11f9c73..00302bb 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3930,6 +3930,180 @@ static void test_texture(void) DestroyWindow(window); } +static void test_multiple_render_targets(void) +{ + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10InputLayout *input_layout; + unsigned int stride, offset, i; + ID3D10RenderTargetView *rtv[4]; + D3D10_BUFFER_DESC buffer_desc; + ID3D10Texture2D *rt[4]; + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10Device *device; + D3D10_VIEWPORT vp; + ID3D10Buffer *vb; + ULONG refcount; + HRESULT hr; + + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + struct output + { + float4 t1 : SV_TARGET0; + float4 t2 : SV_Target1; + float4 t3 : SV_TARGET2; + float4 t4 : SV_Target3; + }; + + output main(float4 position : SV_POSITION) + { + struct output o; + o.t1 = (float4)1.0f; + o.t2 = (float4)0.5f; + o.t3 = (float4)0.2f; + o.t4 = float4(0.0f, 0.2f, 0.5f, 1.0f); + return o; + } +#endif + 0x43425844, 0x8701ad18, 0xe3d5291d, 0x7b4288a6, 0x01917515, 0x00000001, 0x000001a8, 0x00000003, + 0x0000002c, 0x00000060, 0x000000e4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000072, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x00000068, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x00000072, 0x00000003, + 0x00000000, 0x00000003, 0x00000003, 0x0000000f, 0x545f5653, 0x45475241, 0x56530054, 0x7261545f, + 0x00746567, 0x52444853, 0x000000bc, 0x00000040, 0x0000002f, 0x03000065, 0x001020f2, 0x00000000, + 0x03000065, 0x001020f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x03000065, 0x001020f2, + 0x00000003, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, + 0x3f800000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, + 0x3f000000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x3e4ccccd, 0x3e4ccccd, 0x3e4ccccd, + 0x3e4ccccd, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x00000000, 0x3e4ccccd, 0x3f000000, + 0x3f800000, 0x0100003e, + }; + static const struct + { + struct vec2 position; + } + quad[] = + { + {{-1.0f, -1.0f}}, + {{-1.0f, 1.0f}}, + {{ 1.0f, -1.0f}}, + {{ 1.0f, 1.0f}}, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(quad); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + resource_data.pSysMem = quad; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < sizeof(rt) / sizeof(*rt); ++i) + { + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &rt[i]); + ok(SUCCEEDED(hr), "Failed to create texture %u, hr %#x.\n", i, hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)rt[i], NULL, &rtv[i]); + ok(SUCCEEDED(hr), "Failed to create rendertarget view %u, hr %#x.\n", i, hr); + } + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 4, rtv, NULL); + ID3D10Device_IASetInputLayout(device, input_layout); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &stride, &offset); + ID3D10Device_VSSetShader(device, vs); + ID3D10Device_PSSetShader(device, ps); + + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D10Device_RSSetViewports(device, 1, &vp); + + for (i = 0; i < sizeof(rtv) / sizeof(*rtv); ++i) + ID3D10Device_ClearRenderTargetView(device, rtv[i], red); + + ID3D10Device_Draw(device, 4, 0); + + check_texture_color(rt[0], 0xffffffff, 2); + check_texture_color(rt[1], 0x7f7f7f7f, 2); + check_texture_color(rt[2], 0x33333333, 2); + check_texture_color(rt[3], 0xff7f3300, 2); + + ID3D10Buffer_Release(vb); + ID3D10PixelShader_Release(ps); + ID3D10VertexShader_Release(vs); + ID3D10InputLayout_Release(input_layout); + for (i = 0; i < sizeof(rtv) / sizeof(*rtv); ++i) + ID3D10RenderTargetView_Release(rtv[i]); + for (i = 0; i < sizeof(rt) / sizeof(*rt); ++i) + ID3D10Texture2D_Release(rt[i]); + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_private_data(void) { D3D10_TEXTURE2D_DESC texture_desc; @@ -5872,6 +6046,7 @@ START_TEST(device) test_clear_state(); test_blend(); test_texture(); + test_multiple_render_targets(); test_private_data(); test_il_append_aligned(); test_fragment_coords();

1 0

Józef Kucia : d3d11/tests: Introduce check_texture_color().
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 0ac8dd6976c37b1a874568371c7cbeee175ffda1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac8dd6976c37b1a874568371… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 1 22:20:01 2016 +0100 d3d11/tests: Introduce check_texture_color(). 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 | 84 +++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 43 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4054b2a..0d675f7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -85,6 +85,7 @@ struct texture_readback ID3D11Resource *texture; D3D11_MAPPED_SUBRESOURCE map_desc; ID3D11DeviceContext *immediate_context; + unsigned int width, height; }; static void get_texture_readback(ID3D11Texture2D *texture, struct texture_readback *rb) @@ -109,6 +110,9 @@ static void get_texture_readback(ID3D11Texture2D *texture, struct texture_readba return; } + rb->width = texture_desc.Width; + rb->height = texture_desc.Height; + ID3D11Device_GetImmediateContext(device, &rb->immediate_context); ID3D11DeviceContext_CopyResource(rb->immediate_context, rb->texture, (ID3D11Resource *)texture); @@ -152,6 +156,35 @@ static DWORD get_texture_color(ID3D11Texture2D *texture, unsigned int x, unsigne return color; } +#define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) +static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, + DWORD expected_color, BYTE max_diff) +{ + struct texture_readback rb; + unsigned int x = 0, y = 0; + BOOL all_match = TRUE; + DWORD color = 0; + + get_texture_readback(texture, &rb); + for (y = 0; y < rb.height; ++y) + { + for (x = 0; x < rb.width; ++x) + { + color = get_readback_color(&rb, x, y); + if (!compare_color(color, expected_color, max_diff)) + { + all_match = FALSE; + break; + } + } + if (!all_match) + break; + } + release_texture_readback(&rb); + ok_(__FILE__, line)(all_match, + "Got unexpected color 0x%08x at (%u, %u).\n", color, x, y); +} + static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) { ID3D11Device *device; @@ -3580,7 +3613,6 @@ static void test_multiple_render_targets(void) D3D11_VIEWPORT vp; ID3D11Buffer *vb; ULONG refcount; - DWORD color; HRESULT hr; static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = @@ -3733,14 +3765,10 @@ static void test_multiple_render_targets(void) ID3D11DeviceContext_Draw(context, 4, 0); - color = get_texture_color(rt[0], 320, 240); - ok(compare_color(color, 0xffffffff, 2), "Got unexpected color 0x%08x.\n", color); - color = get_texture_color(rt[1], 320, 240); - ok(compare_color(color, 0x7f7f7f7f, 2), "Got unexpected color 0x%08x.\n", color); - color = get_texture_color(rt[2], 320, 240); - ok(compare_color(color, 0x33333333, 2), "Got unexpected color 0x%08x.\n", color); - color = get_texture_color(rt[3], 320, 240); - ok(compare_color(color, 0xff7f3300, 2), "Got unexpected color 0x%08x.\n", color); + check_texture_color(rt[0], 0xffffffff, 2); + check_texture_color(rt[1], 0x7f7f7f7f, 2); + check_texture_color(rt[2], 0x33333333, 2); + check_texture_color(rt[3], 0xff7f3300, 2); ID3D11Buffer_Release(vb); ID3D11PixelShader_Release(ps); @@ -3917,8 +3945,7 @@ static void test_scissor(void) ID3D11DeviceContext_OMSetRenderTargets(immediate_context, 1, &rtv, NULL); ID3D11DeviceContext_ClearRenderTargetView(immediate_context, rtv, red); - color = get_texture_color(backbuffer, 320, 240); - ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + check_texture_color(backbuffer, 0xff0000ff, 1); ID3D11DeviceContext_Draw(immediate_context, 4, 0); color = get_texture_color(backbuffer, 320, 60); @@ -4617,19 +4644,10 @@ static void test_update_subresource(void) ID3D11DeviceContext_RSSetViewports(context, 1, &vp); ID3D11DeviceContext_ClearRenderTargetView(context, backbuffer_rtv, red); + check_texture_color(backbuffer, 0x7f0000ff, 1); ID3D11DeviceContext_Draw(context, 4, 0); - get_texture_readback(backbuffer, &rb); - for (i = 0; i < 4; ++i) - { - for (j = 0; j < 4; ++j) - { - color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120); - ok(compare_color(color, 0x00000000, 0), - "Got unexpected color 0x%08x at (%u, %u).\n", color, j, i); - } - } - release_texture_readback(&rb); + check_texture_color(backbuffer, 0x00000000, 0); set_box(&box, 1, 1, 0, 3, 3, 1); ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)texture, 0, &box, @@ -5113,11 +5131,7 @@ static void test_multisample_init(void) ID3D11Device *device; ID3D11DeviceContext *context; ULONG refcount; - DWORD color; HRESULT hr; - unsigned int x, y; - struct texture_readback rb; - BOOL all_zero = TRUE; UINT count = 0; HWND window; IDXGISwapChain *swapchain; @@ -5166,23 +5180,7 @@ static void test_multisample_init(void) ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)backbuffer, 0, (ID3D11Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); - get_texture_readback(backbuffer, &rb); - for (y = 0; y < 480; ++y) - { - for (x = 0; x < 640; ++x) - { - color = get_readback_color(&rb, x, y); - if (!compare_color(color, 0x00000000, 0)) - { - all_zero = FALSE; - break; - } - } - if (!all_zero) - break; - } - release_texture_readback(&rb); - todo_wine ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + todo_wine check_texture_color(backbuffer, 0x00000000, 0); ID3D11DeviceContext_Release(context); ID3D11RenderTargetView_Release(rtview);

1 0

Józef Kucia : d3d11/tests: Add test for multiple render targets.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 25f9fbcc6d263b10e773553fd0ef6b1594079f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f9fbcc6d263b10e773553fd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 1 22:20:00 2016 +0100 d3d11/tests: Add test for multiple render targets. 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 | 192 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 00b3d18..4054b2a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3564,6 +3564,197 @@ static void test_texture(void) DestroyWindow(window); } +static void test_multiple_render_targets(void) +{ + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11InputLayout *input_layout; + unsigned int stride, offset, i; + ID3D11RenderTargetView *rtv[4]; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11Texture2D *rt[4]; + ID3D11VertexShader *vs; + ID3D11PixelShader *ps; + ID3D11Device *device; + D3D11_VIEWPORT vp; + ID3D11Buffer *vb; + ULONG refcount; + DWORD color; + HRESULT hr; + + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + struct output + { + float4 t1 : SV_TARGET0; + float4 t2 : SV_Target1; + float4 t3 : SV_TARGET2; + float4 t4 : SV_Target3; + }; + + output main(float4 position : SV_POSITION) + { + struct output o; + o.t1 = (float4)1.0f; + o.t2 = (float4)0.5f; + o.t3 = (float4)0.2f; + o.t4 = float4(0.0f, 0.2f, 0.5f, 1.0f); + return o; + } +#endif + 0x43425844, 0x8701ad18, 0xe3d5291d, 0x7b4288a6, 0x01917515, 0x00000001, 0x000001a8, 0x00000003, + 0x0000002c, 0x00000060, 0x000000e4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000072, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x00000068, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x00000072, 0x00000003, + 0x00000000, 0x00000003, 0x00000003, 0x0000000f, 0x545f5653, 0x45475241, 0x56530054, 0x7261545f, + 0x00746567, 0x52444853, 0x000000bc, 0x00000040, 0x0000002f, 0x03000065, 0x001020f2, 0x00000000, + 0x03000065, 0x001020f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x03000065, 0x001020f2, + 0x00000003, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, + 0x3f800000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, + 0x3f000000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x3e4ccccd, 0x3e4ccccd, 0x3e4ccccd, + 0x3e4ccccd, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x00000000, 0x3e4ccccd, 0x3f000000, + 0x3f800000, 0x0100003e, + }; + static const struct + { + struct vec2 position; + } + quad[] = + { + {{-1.0f, -1.0f}}, + {{-1.0f, 1.0f}}, + {{ 1.0f, -1.0f}}, + {{ 1.0f, 1.0f}}, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + if (ID3D11Device_GetFeatureLevel(device) < D3D_FEATURE_LEVEL_9_3) + { + skip("Feature level 9_3 or higher is required.\n"); + ID3D11Device_Release(device); + return; + } + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(quad); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + resource_data.pSysMem = quad; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < sizeof(rt) / sizeof(*rt); ++i) + { + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt[i]); + ok(SUCCEEDED(hr), "Failed to create texture %u, hr %#x.\n", i, hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt[i], NULL, &rtv[i]); + ok(SUCCEEDED(hr), "Failed to create rendertarget view %u, hr %#x.\n", i, hr); + } + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11Device_GetImmediateContext(device, &context); + + ID3D11DeviceContext_OMSetRenderTargets(context, 4, rtv, NULL); + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + vp.TopLeftX = 0.0f; + vp.TopLeftY = 0.0f; + vp.Width = 640.0f; + vp.Height = 480.0f; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + + for (i = 0; i < sizeof(rtv) / sizeof(*rtv); ++i) + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[i], red); + + ID3D11DeviceContext_Draw(context, 4, 0); + + color = get_texture_color(rt[0], 320, 240); + ok(compare_color(color, 0xffffffff, 2), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(rt[1], 320, 240); + ok(compare_color(color, 0x7f7f7f7f, 2), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(rt[2], 320, 240); + ok(compare_color(color, 0x33333333, 2), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(rt[3], 320, 240); + ok(compare_color(color, 0xff7f3300, 2), "Got unexpected color 0x%08x.\n", color); + + ID3D11Buffer_Release(vb); + ID3D11PixelShader_Release(ps); + ID3D11VertexShader_Release(vs); + ID3D11InputLayout_Release(input_layout); + for (i = 0; i < sizeof(rtv) / sizeof(*rtv); ++i) + ID3D11RenderTargetView_Release(rtv[i]); + for (i = 0; i < sizeof(rt) / sizeof(*rt); ++i) + ID3D11Texture2D_Release(rt[i]); + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_scissor(void) { ID3D11DeviceContext *immediate_context; @@ -5205,6 +5396,7 @@ START_TEST(d3d11) test_private_data(); test_blend(); test_texture(); + test_multiple_render_targets(); test_scissor(); test_il_append_aligned(); test_fragment_coords();

1 0

Józef Kucia : wined3d: Fix SM4 pixel shader output registers mapping.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: b77dd8813def9afb3c120a021cd2758d47fb980c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77dd8813def9afb3c120a021… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 1 22:19:59 2016 +0100 wined3d: Fix SM4 pixel shader output registers mapping. 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_sm4.c | 42 +++++------------------------------------- include/wine/wined3d.h | 10 ---------- 2 files changed, 5 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 45bd9f0..a741f66 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -266,11 +266,7 @@ struct wined3d_sm4_data struct wined3d_shader_version shader_version; const DWORD *end; - struct - { - enum wined3d_shader_register_type register_type; - UINT register_idx; - } output_map[MAX_REG_OUTPUT]; + unsigned int output_map[MAX_REG_OUTPUT]; struct wined3d_shader_src_param src_param[5]; struct wined3d_shader_dst_param dst_param[2]; @@ -287,13 +283,6 @@ struct wined3d_sm4_opcode_info const char *src_info; }; -struct sysval_map -{ - enum wined3d_sysval_semantic sysval; - enum wined3d_shader_register_type register_type; - UINT register_idx; -}; - /* * F -> WINED3D_DATA_FLOAT * I -> WINED3D_DATA_INT @@ -429,19 +418,6 @@ static const enum wined3d_primitive_type input_primitive_type_table[] = /* WINED3D_SM4_INPUT_PT_TRIANGLEADJ */ WINED3D_PT_TRIANGLELIST_ADJ, }; -static const struct sysval_map sysval_map[] = -{ - {WINED3D_SV_DEPTH, WINED3DSPR_DEPTHOUT, 0}, - {WINED3D_SV_TARGET0, WINED3DSPR_COLOROUT, 0}, - {WINED3D_SV_TARGET1, WINED3DSPR_COLOROUT, 1}, - {WINED3D_SV_TARGET2, WINED3DSPR_COLOROUT, 2}, - {WINED3D_SV_TARGET3, WINED3DSPR_COLOROUT, 3}, - {WINED3D_SV_TARGET4, WINED3DSPR_COLOROUT, 4}, - {WINED3D_SV_TARGET5, WINED3DSPR_COLOROUT, 5}, - {WINED3D_SV_TARGET6, WINED3DSPR_COLOROUT, 6}, - {WINED3D_SV_TARGET7, WINED3DSPR_COLOROUT, 7}, -}; - static const enum wined3d_shader_resource_type resource_type_table[] = { /* 0 */ WINED3D_SHADER_RESOURCE_NONE, @@ -496,8 +472,8 @@ static void map_register(const struct wined3d_sm4_data *priv, struct wined3d_sha break; } - reg->type = priv->output_map[reg_idx].register_type; - reg->idx[0].offset = priv->output_map[reg_idx].register_idx; + reg->type = WINED3DSPR_COLOROUT; + reg->idx[0].offset = priv->output_map[reg_idx]; } break; @@ -529,7 +505,7 @@ static enum wined3d_data_type map_data_type(char t) static void *shader_sm4_init(const DWORD *byte_code, const struct wined3d_shader_signature *output_signature) { struct wined3d_sm4_data *priv; - unsigned int i, j; + unsigned int i; if (!(priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)))) { @@ -548,15 +524,7 @@ static void *shader_sm4_init(const DWORD *byte_code, const struct wined3d_shader continue; } - for (j = 0; j < ARRAY_SIZE(sysval_map); ++j) - { - if (e->sysval_semantic == sysval_map[j].sysval) - { - priv->output_map[e->register_idx].register_type = sysval_map[j].register_type; - priv->output_map[e->register_idx].register_idx = sysval_map[j].register_idx; - break; - } - } + priv->output_map[e->register_idx] = e->semantic_idx; } list_init(&priv->src_free); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1af0d52..a4b2a30 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -752,16 +752,6 @@ enum wined3d_sysval_semantic WINED3D_SV_INSTANCEID = 8, WINED3D_SV_ISFRONTFACE = 9, WINED3D_SV_SAMPLEINDEX = 10, - - WINED3D_SV_DEPTH = 0xffffffff, - WINED3D_SV_TARGET0 = 0, - WINED3D_SV_TARGET1 = 1, - WINED3D_SV_TARGET2 = 2, - WINED3D_SV_TARGET3 = 3, - WINED3D_SV_TARGET4 = 4, - WINED3D_SV_TARGET5 = 5, - WINED3D_SV_TARGET6 = 6, - WINED3D_SV_TARGET7 = 7, }; enum wined3d_scanline_ordering

1 0

Nikolay Sivov : d3drm: Implement SetAppData/GetAppData for a viewport.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 7cf81baca446ae4677c759c179aa8ec12b57d0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf81baca446ae4677c759c17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 1 19:45:29 2016 +0300 d3drm: Implement SetAppData/GetAppData for a viewport. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 5 +++++ dlls/d3drm/tests/d3drm.c | 23 ++++++++++++++++++++++- dlls/d3drm/viewport.c | 33 +++++++++++++++++++++------------ 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 5df83a7..5703560 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -25,6 +25,11 @@ #include "dxfile.h" struct d3drm_device; +struct d3drm_object +{ + LONG ref; + DWORD appdata; +}; HRESULT d3drm_device_create(struct d3drm_device **out) DECLSPEC_HIDDEN; IDirect3DRMDevice *IDirect3DRMDevice_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 4a1c180..16f0913 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1220,10 +1220,11 @@ static void test_Viewport(void) IDirect3DRMDevice *device; IDirect3DRMFrame *frame; IDirect3DRMViewport *viewport; + IDirect3DRMViewport2 *viewport2; GUID driver; HWND window; RECT rc; - DWORD size; + DWORD size, data; CHAR cname[64] = {0}; window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); @@ -1261,6 +1262,26 @@ static void test_Viewport(void) ok(size == sizeof("Viewport"), "wrong size: %u\n", size); ok(!strcmp(cname, "Viewport"), "Expected cname to be \"Viewport\", but got \"%s\"\n", cname); + /* AppData */ + hr = IDirect3DRMViewport_SetAppData(viewport, 0); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_SetAppData(viewport, 0); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_SetAppData(viewport, 1); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_SetAppData(viewport, 1); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + data = IDirect3DRMViewport2_GetAppData(viewport2); + ok(data == 1, "got %x\n", data); + IDirect3DRMViewport2_Release(viewport2); + IDirect3DRMViewport_Release(viewport); IDirect3DRMFrame_Release(frame); IDirect3DRMDevice_Release(device); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 58de085..34c6fb4 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -31,9 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); struct d3drm_viewport { + struct d3drm_object obj; IDirect3DRMViewport IDirect3DRMViewport_iface; IDirect3DRMViewport2 IDirect3DRMViewport2_iface; - LONG ref; D3DVALUE back; D3DVALUE front; D3DVALUE field; @@ -79,7 +79,7 @@ static HRESULT WINAPI d3drm_viewport1_QueryInterface(IDirect3DRMViewport *iface, static ULONG WINAPI d3drm_viewport1_AddRef(IDirect3DRMViewport *iface) { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); - ULONG refcount = InterlockedIncrement(&viewport->ref); + ULONG refcount = InterlockedIncrement(&viewport->obj.ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -89,7 +89,7 @@ static ULONG WINAPI d3drm_viewport1_AddRef(IDirect3DRMViewport *iface) static ULONG WINAPI d3drm_viewport1_Release(IDirect3DRMViewport *iface) { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); - ULONG refcount = InterlockedDecrement(&viewport->ref); + ULONG refcount = InterlockedDecrement(&viewport->obj.ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -125,16 +125,20 @@ static HRESULT WINAPI d3drm_viewport1_DeleteDestroyCallback(IDirect3DRMViewport static HRESULT WINAPI d3drm_viewport1_SetAppData(IDirect3DRMViewport *iface, DWORD data) { - FIXME("iface %p, data %#x stub!\n", iface, data); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); - return E_NOTIMPL; + TRACE("iface %p, data %#x\n", iface, data); + + return IDirect3DRMViewport2_SetAppData(&viewport->IDirect3DRMViewport2_iface, data); } static DWORD WINAPI d3drm_viewport1_GetAppData(IDirect3DRMViewport *iface) { - FIXME("iface %p.\n", iface); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); + + TRACE("iface %p.\n", iface); - return 0; + return IDirect3DRMViewport2_GetAppData(&viewport->IDirect3DRMViewport2_iface); } static HRESULT WINAPI d3drm_viewport1_SetName(IDirect3DRMViewport *iface, const char *name) @@ -478,16 +482,21 @@ static HRESULT WINAPI d3drm_viewport2_DeleteDestroyCallback(IDirect3DRMViewport2 static HRESULT WINAPI d3drm_viewport2_SetAppData(IDirect3DRMViewport2 *iface, DWORD data) { - FIXME("iface %p, data %#x stub!\n", iface, data); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); - return E_NOTIMPL; + TRACE("iface %p, data %#x\n", iface, data); + + viewport->obj.appdata = data; + return S_OK; } static DWORD WINAPI d3drm_viewport2_GetAppData(IDirect3DRMViewport2 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); + + TRACE("iface %p\n", iface); - return 0; + return viewport->obj.appdata; } static HRESULT WINAPI d3drm_viewport2_SetName(IDirect3DRMViewport2 *iface, const char *name) @@ -819,7 +828,7 @@ HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown **out) object->IDirect3DRMViewport_iface.lpVtbl = &d3drm_viewport1_vtbl; object->IDirect3DRMViewport2_iface.lpVtbl = &d3drm_viewport2_vtbl; - object->ref = 1; + object->obj.ref = 1; if (IsEqualGUID(riid, &IID_IDirect3DRMViewport2)) *out = (IUnknown *)&object->IDirect3DRMViewport2_iface;

1 0