wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: e7d44ee61e809cc70609b143c4a220fa36ba9eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d44ee61e809cc70609b143c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:09 2015 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index 7d9a0e2..8bef315 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -57,6 +57,14 @@ typedef struct _WS_HEAP_PROPERTY { ULONG valueSize; } WS_HEAP_PROPERTY; +typedef ULONG WS_XML_BUFFER_PROPERTY_ID; + +typedef struct _WS_XML_BUFFER_PROPERTY { + WS_XML_BUFFER_PROPERTY_ID id; + void *value; + ULONG valueSize; +} WS_XML_BUFFER_PROPERTY; + typedef enum { WS_XML_READER_PROPERTY_MAX_DEPTH, WS_XML_READER_PROPERTY_ALLOW_FRAGMENT, @@ -445,6 +453,8 @@ HRESULT WINAPI WsCreateError(const WS_ERROR_PROPERTY*, ULONG, WS_ERROR**); HRESULT WINAPI WsCreateHeap(SIZE_T, SIZE_T, const WS_HEAP_PROPERTY*, ULONG, WS_HEAP**, WS_ERROR*); HRESULT WINAPI WsCreateReader(const WS_XML_READER_PROPERTY*, ULONG, WS_XML_READER**, WS_ERROR*); HRESULT WINAPI WsCreateWriter(const WS_XML_WRITER_PROPERTY*, ULONG, WS_XML_WRITER**, WS_ERROR*); +HRESULT WINAPI WsCreateXmlBuffer(WS_HEAP*, const WS_XML_BUFFER_PROPERTY*, ULONG, WS_XML_BUFFER**, + WS_ERROR*); HRESULT WINAPI WsFillReader(WS_XML_READER*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFindAttribute(WS_XML_READER*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, ULONG*, WS_ERROR*); @@ -474,8 +484,18 @@ HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, HRESULT WINAPI WsSetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, const void*, ULONG); HRESULT WINAPI WsSetInput(WS_XML_READER*, const WS_XML_READER_ENCODING*, const WS_XML_READER_INPUT*, const WS_XML_READER_PROPERTY*, ULONG, WS_ERROR*); +HRESULT WINAPI WsSetInputToBuffer(WS_XML_READER*, WS_XML_BUFFER*, const WS_XML_READER_PROPERTY*, + ULONG, WS_ERROR*); HRESULT WINAPI WsSetOutput(WS_XML_WRITER*, const WS_XML_WRITER_ENCODING*, const WS_XML_WRITER_OUTPUT*, const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); +HRESULT WINAPI WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_WRITER_PROPERTY*, + ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*); +HRESULT WINAPI WsWriteEndElement(WS_XML_WRITER*, WS_ERROR*); +HRESULT WINAPI WsWriteStartAttribute(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, + const WS_XML_STRING*, BOOL, WS_ERROR*); +HRESULT WINAPI WsWriteStartElement(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, + const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsWriteType(WS_XML_WRITER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*);

1 0

Hans Leidekker : webservices: Add a stub implementation of WsGetXmlAttribute.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 9eee37f53feeaa9454a86afa09f5efafc05e4a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eee37f53feeaa9454a86afa0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:08 2015 +0200 webservices: Add a stub implementation of WsGetXmlAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 10 +++++++ dlls/webservices/tests/reader.c | 60 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ca59f33..7ae4e34 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -565,6 +565,16 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT return get_reader_prop( reader, id, buf, size ); } +/************************************************************************** + * WsGetXmlAttribute [webservices.@] + */ +HRESULT WINAPI WsGetXmlAttribute( WS_XML_READER *handle, const WS_XML_STRING *attr, + WS_HEAP *heap, WCHAR **str, ULONG *len, WS_ERROR *error ) +{ + FIXME( "%p %p %p %p %p %p: stub\n", handle, debugstr_xmlstr(attr), heap, str, len, error ); + return E_NOTIMPL; +} + static WS_XML_STRING *alloc_xml_string( const char *data, ULONG len ) { WS_XML_STRING *ret; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index f0c7077..03dd569 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -58,6 +58,9 @@ static const char data7[] = static const char data8[] = "<node1><node2>test</node2></node1>"; +static const char data9[] = + "<text xml:attr=\"value\">test</text>"; + static void test_WsCreateError(void) { HRESULT hr; @@ -1286,6 +1289,62 @@ static void test_WsReadType(void) WsFreeHeap( heap ); } +static void test_WsGetXmlAttribute(void) +{ + static const WCHAR valueW[] = {'v','a','l','u','e',0}; + HRESULT hr; + WS_XML_READER *reader; + WS_XML_STRING xmlstr; + WS_HEAP *heap; + WCHAR *str; + ULONG count; + int found; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, data9, sizeof(data9) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof(data9) - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + found = -1; + hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( found == TRUE, "got %d\n", found ); + + xmlstr.bytes = (BYTE *)"attr"; + xmlstr.length = sizeof("attr") - 1; + xmlstr.dictionary = NULL; + xmlstr.id = 0; + str = NULL; + count = 0; + hr = WsGetXmlAttribute( reader, &xmlstr, heap, &str, &count, NULL ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( str != NULL, "str not set\n" ); + todo_wine ok( count == 5, "got %u\n", count ); + /* string is not null-terminated */ + if (str) ok( !memcmp( str, valueW, count * sizeof(WCHAR) ), "wrong data\n" ); + + xmlstr.bytes = (BYTE *)"none"; + xmlstr.length = sizeof("none") - 1; + xmlstr.dictionary = NULL; + xmlstr.id = 0; + str = (WCHAR *)0xdeadbeef; + count = 0xdeadbeef; + hr = WsGetXmlAttribute( reader, &xmlstr, heap, &str, &count, NULL ); + todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); + todo_wine ok( str == NULL, "str not set\n" ); + todo_wine ok( !count, "got %u\n", count ); + + WsFreeReader( reader ); + WsFreeHeap( heap ); +} + START_TEST(reader) { test_WsCreateError(); @@ -1298,4 +1357,5 @@ START_TEST(reader) test_WsReadEndElement(); test_WsReadNode(); test_WsReadType(); + test_WsGetXmlAttribute(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 15c2c89..b666a08 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -89,7 +89,7 @@ @ stub WsGetServiceProxyProperty @ stub WsGetWriterPosition @ stdcall WsGetWriterProperty(ptr long ptr long ptr) -@ stub WsGetXmlAttribute +@ stdcall WsGetXmlAttribute(ptr ptr ptr ptr ptr ptr) @ stub WsInitializeMessage @ stub WsMarkHeaderAsUnderstood @ stub WsMatchPolicyAlternative

1 0

Hans Leidekker : webservices: Add support for character set detection.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: ce71c50f30749465f0de4959ce0a197b20ada8f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce71c50f30749465f0de4959c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:07 2015 +0200 webservices: Add support for character set detection. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 77 +++++++++++++++++++++++++++++---- dlls/webservices/tests/reader.c | 95 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 154 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce71c50f30749465f0de4…

1 0

Hans Leidekker : webservices: Parse comment nodes.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 2eab71185980221075949cd4225f72fb35a32ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eab71185980221075949cd42… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:06 2015 +0200 webservices: Parse comment nodes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 46 +++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 29 ++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ac61890..d888223 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -287,6 +287,11 @@ static void free_node( struct node *node ) heap_free( text->text ); break; } + case WS_XML_NODE_TYPE_COMMENT: + { + WS_XML_COMMENT_NODE *comment = (WS_XML_COMMENT_NODE *)node; + heap_free( comment->value.bytes ); + } case WS_XML_NODE_TYPE_END_ELEMENT: case WS_XML_NODE_TYPE_EOF: case WS_XML_NODE_TYPE_BOF: @@ -342,6 +347,7 @@ enum reader_state READER_STATE_STARTELEMENT, READER_STATE_TEXT, READER_STATE_ENDELEMENT, + READER_STATE_COMMENT, READER_STATE_EOF }; @@ -954,6 +960,45 @@ static HRESULT read_endelement( struct reader *reader ) return S_OK; } +static HRESULT read_comment( struct reader *reader ) +{ + unsigned int len = 0, ch, skip; + const char *start; + struct node *node; + WS_XML_COMMENT_NODE *comment; + + if (read_cmp( reader, "", 3 )) + { + read_skip( reader, 3 ); + break; + } + if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + read_skip( reader, skip ); + len += skip; + } + + if (!(node = alloc_node( WS_XML_NODE_TYPE_COMMENT ))) return E_OUTOFMEMORY; + comment = (WS_XML_COMMENT_NODE *)node; + if (!(comment->value.bytes = heap_alloc( len ))) + { + heap_free( node ); + return E_OUTOFMEMORY; + } + memcpy( comment->value.bytes, start, len ); + comment->value.length = len; + + list_add_after( &reader->current->entry, &node->entry ); + reader->current = node; + reader->state = READER_STATE_COMMENT; + return S_OK; +} + static HRESULT read_node( struct reader *reader ) { HRESULT hr; @@ -972,6 +1017,7 @@ static HRESULT read_node( struct reader *reader ) if (FAILED( hr )) return hr; } else if (!read_cmp( reader, "</", 2 )) return read_endelement( reader ); + else if (!read_cmp( reader, "<!", 2 )) return read_comment( reader ); else if (!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 f4ac601..31587e1 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -52,6 +52,9 @@ static const char data6[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" "<text attr= \"value\" attr2='value2'>test</text>"; +static const char data7[] = + ""; + static const char data8[] = "<node1><node2>test</node2></node1>"; @@ -780,6 +783,9 @@ static void test_WsReadNode(void) static const char str12[] = "<text>test</text>"; static const char str13[] = "<?xml version=\"1.0\"?><text>test</text>"; static const char str14[] = ""; + static const char str15[] = ""; + static const char str17[] = ""; HRESULT hr; WS_XML_READER *reader; const WS_XML_NODE *node; @@ -808,6 +814,9 @@ static void test_WsReadNode(void) { str12, S_OK, WS_XML_NODE_TYPE_ELEMENT }, { str13, S_OK, WS_XML_NODE_TYPE_ELEMENT }, { str14, WS_E_INVALID_FORMAT, 0, 1 }, + { str15, WS_E_INVALID_FORMAT, 0 }, + { str16, S_OK, WS_XML_NODE_TYPE_COMMENT }, + { str17, S_OK, WS_XML_NODE_TYPE_COMMENT }, }; hr = WsCreateReader( NULL, 0, &reader, NULL ) ; @@ -915,6 +924,26 @@ static void test_WsReadNode(void) ok( !memcmp( text->value.bytes, "value2", 6 ), "wrong data\n" ); } + hr = set_input( reader, data7, sizeof(data7) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof(data7) - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) + { + WS_XML_COMMENT_NODE *comment = (WS_XML_COMMENT_NODE *)node; + + ok( comment->node.nodeType == WS_XML_NODE_TYPE_COMMENT, "got %u\n", comment->node.nodeType ); + ok( comment->value.length == 9, "got %u\n", comment->value.length ); + ok( !memcmp( comment->value.bytes, " comment ", 9 ), "wrong data\n" ); + } + WsFreeReader( reader ); }

1 0

Jacek Caban : windns.h: Added missing DNS_QUERY_* constants.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 8d357fc11c41fe1505196ac50c94db4ccefd6e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d357fc11c41fe1505196ac50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 22 11:29:20 2015 +0200 windns.h: Added missing DNS_QUERY_* constants. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windns.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/windns.h b/include/windns.h index 7b11e3a..f150919 100644 --- a/include/windns.h +++ b/include/windns.h @@ -96,8 +96,16 @@ extern "C" { #define DNS_QUERY_NO_NETBT 0x00000080 #define DNS_QUERY_WIRE_ONLY 0x00000100 #define DNS_QUERY_RETURN_MESSAGE 0x00000200 +#define DNS_QUERY_MULTICAST_ONLY 0x00000400 +#define DNS_QUERY_NO_MULTICAST 0x00000800 #define DNS_QUERY_TREAT_AS_FQDN 0x00001000 +#define DNS_QUERY_ADDRCONFIG 0x00002000 +#define DNS_QUERY_DUAL_ADDR 0x00004000 #define DNS_QUERY_DONT_RESET_TTL_VALUES 0x00100000 +#define DNS_QUERY_DISABLE_IDN_ENCODING 0x00200000 +#define DNS_QUERY_APPEND_MULTILABEL 0x00800000 +#define DNS_QUERY_DNSSEC_OK 0x01000000 +#define DNS_QUERY_DNSSEC_CHECKING_DISABLED 0x02000000 #define DNS_QUERY_RESERVED 0xff000000 typedef enum _DNS_NAME_FORMAT

1 0

Jacek Caban : winerror.h: Added DNS_REQUEST_PENDING error code.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: f38829921f19e0c2a3e4b294e8d775c3be399bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38829921f19e0c2a3e4b294e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 22 11:27:39 2015 +0200 winerror.h: Added DNS_REQUEST_PENDING error code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winerror.h b/include/winerror.h index 87419d1..c524798 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1778,6 +1778,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define DNS_ERROR_NO_PACKET 9503 #define DNS_ERROR_RCODE 9504 #define DNS_ERROR_UNSECURE_PACKET 9505 +#define DNS_REQUEST_PENDING 9506 #define DNS_ERROR_INVALID_TYPE 9551 #define DNS_ERROR_INVALID_IP_ADDRESS 9552 #define DNS_ERROR_INVALID_PROPERTY 9553

1 0

Józef Kucia : dxgi/tests: Remove test_device_interfaces().
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 6a508f26d10c228ab7cc83080358284909c257fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a508f26d10c228ab7cc83080… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 22 01:52:27 2015 +0200 dxgi/tests: Remove test_device_interfaces(). This test duplicates test_device_interfaces() in d3d10/tests. 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/dxgi/tests/device.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index ea4e7b3..9e676b9 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -54,53 +54,6 @@ success: return dxgi_device; } -static void test_device_interfaces(void) -{ - IDXGIDevice *device; - IUnknown *iface; - ULONG refcount; - HRESULT hr; - - if (!(device = create_device())) - { - skip("Failed to create device, skipping tests.\n"); - return; - } - - hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to query IUnknown interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - hr = IDXGIDevice_QueryInterface(device, &IID_IDXGIObject, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to query IDXGIObject interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - hr = IDXGIDevice_QueryInterface(device, &IID_IDXGIDevice, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to query IDXGIDevice interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to query ID3D10Device interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to query ID3D10Multithread interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface))) - IUnknown_Release(iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Failed to query ID3D10Device1 interface, hr %#x.\n", hr); - - if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D11Device, (void **)&iface))) - IUnknown_Release(iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Failed to query ID3D11Device interface, hr %#x.\n", hr); - - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); -} - static void test_adapter_desc(void) { DXGI_ADAPTER_DESC1 desc1; @@ -1270,7 +1223,6 @@ START_TEST(device) test_adapter_desc(); test_check_interface_support(); - test_device_interfaces(); test_create_surface(); test_parents(); test_output();

1 0

Józef Kucia : d3d10_1/tests: Port test_device_interfaces() from d3d11.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: ef6c1636f3dc5b8c420f5cac1b39e8e2964363b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6c1636f3dc5b8c420f5cac1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 22 01:52:26 2015 +0200 d3d10_1/tests: Port test_device_interfaces() 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/d3d10_1/tests/d3d10_1.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 534689c..fd865a3 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -22,6 +22,15 @@ #include "d3d11.h" #include "wine/test.h" +static const D3D10_FEATURE_LEVEL1 d3d10_feature_levels[] = +{ + D3D10_FEATURE_LEVEL_10_1, + D3D10_FEATURE_LEVEL_10_0, + D3D10_FEATURE_LEVEL_9_3, + D3D10_FEATURE_LEVEL_9_2, + D3D10_FEATURE_LEVEL_9_1 +}; + static ULONG get_refcount(IUnknown *iface) { IUnknown_AddRef(iface); @@ -45,6 +54,66 @@ static ID3D10Device1 *create_device(D3D10_FEATURE_LEVEL1 feature_level) return NULL; } +static void test_device_interfaces(void) +{ + IDXGIAdapter *dxgi_adapter; + IDXGIDevice *dxgi_device; + ID3D10Device1 *device; + IUnknown *iface; + ULONG refcount; + unsigned int i; + HRESULT hr; + + for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + { + if (!(device = create_device(d3d10_feature_levels[i]))) + { + skip("Failed to create device for feature level %#x.\n", d3d10_feature_levels[i]); + continue; + } + + hr = ID3D10Device1_QueryInterface(device, &IID_IUnknown, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IUnknown interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIObject, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IDXGIObject interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Device should implement IDXGIDevice.\n"); + hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter.\n"); + hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory, (void **)&iface); + ok(SUCCEEDED(hr), "Adapter parent should implement IDXGIFactory.\n"); + IUnknown_Release(iface); + IDXGIAdapter_Release(dxgi_adapter); + hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter1, (void **)&dxgi_adapter); + ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter1.\n"); + hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory1, (void **)&iface); + ok(hr == E_NOINTERFACE, "Adapter parent should not implement IDXGIFactory1.\n"); + IDXGIAdapter_Release(dxgi_adapter); + IDXGIDevice_Release(dxgi_device); + + hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement ID3D10Device interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D10Device1_QueryInterface(device, &IID_ID3D11Device, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Device should implement ID3D11Device interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D10Device1_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } +} + static void test_create_shader_resource_view(void) { D3D10_SHADER_RESOURCE_VIEW_DESC1 srv_desc; @@ -379,6 +448,7 @@ static void test_create_blend_state(void) START_TEST(d3d10_1) { + test_device_interfaces(); test_create_shader_resource_view(); test_create_blend_state(); }

1 0

Józef Kucia : d3d10core/tests: Port test_device_interfaces() from d3d11.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 33127703bf6f0a2d159e73dd84427f164471ab27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33127703bf6f0a2d159e73dd8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 22 01:52:25 2015 +0200 d3d10core/tests: Port test_device_interfaces() 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 | 57 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index de9eee1..38e9e9c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -202,6 +202,62 @@ static void test_feature_level(void) ID3D10Device_Release(device10); } +static void test_device_interfaces(void) +{ + IDXGIAdapter *dxgi_adapter; + IDXGIDevice *dxgi_device; + ID3D10Device *device; + IUnknown *iface; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D10Device_QueryInterface(device, &IID_IUnknown, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IUnknown interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D10Device_QueryInterface(device, &IID_IDXGIObject, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IDXGIObject interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Device should implement IDXGIDevice.\n"); + hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter.\n"); + hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory, (void **)&iface); + ok(SUCCEEDED(hr), "Adapter parent should implement IDXGIFactory.\n"); + IUnknown_Release(iface); + IUnknown_Release(dxgi_adapter); + hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter1, (void **)&dxgi_adapter); + ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter1.\n"); + hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory1, (void **)&iface); + ok(hr == E_NOINTERFACE, "Adapter parent should not implement IDXGIFactory1.\n"); + IUnknown_Release(dxgi_adapter); + IUnknown_Release(dxgi_device); + + hr = ID3D10Device_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Device should implement ID3D10Device1 interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + hr = ID3D10Device_QueryInterface(device, &IID_ID3D11Device, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Device should implement ID3D11Device interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_texture2d(void) { ULONG refcount, expected_refcount; @@ -4215,6 +4271,7 @@ static void test_update_subresource(void) START_TEST(device) { test_feature_level(); + test_device_interfaces(); test_create_texture2d(); test_texture2d_interfaces(); test_create_texture3d();

1 0

Józef Kucia : d3d11/tests: Add test for ID3D11Device parents.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: b6462c18daa49d07e7281091355d39e92615532f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6462c18daa49d07e72810913… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 22 01:52:24 2015 +0200 d3d11/tests: Add test for ID3D11Device parents. 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 | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index bd9ad64..f54e6e3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -248,6 +248,8 @@ static void test_create_device(void) static void test_device_interfaces(void) { + IDXGIAdapter *dxgi_adapter; + IDXGIDevice *dxgi_device; ID3D11Device *device; IUnknown *iface; ULONG refcount; @@ -270,9 +272,21 @@ static void test_device_interfaces(void) ok(SUCCEEDED(hr), "Device should implement IDXGIObject interface, hr %#x.\n", hr); IUnknown_Release(iface); - hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&iface); - ok(SUCCEEDED(hr), "Device should implement IDXGIDevice interface, hr %#x.\n", hr); + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Device should implement IDXGIDevice.\n"); + hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter.\n"); + hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory, (void **)&iface); + ok(SUCCEEDED(hr), "Adapter parent should implement IDXGIFactory.\n"); + IUnknown_Release(iface); + IDXGIAdapter_Release(dxgi_adapter); + hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter1, (void **)&dxgi_adapter); + ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter1.\n"); + hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory1, (void **)&iface); + ok(SUCCEEDED(hr), "Adapter parent should implement IDXGIFactory1.\n"); IUnknown_Release(iface); + IDXGIAdapter_Release(dxgi_adapter); + IDXGIDevice_Release(dxgi_device); hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */,

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
75
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 October 2015