January 2016 - Wine-Commits

Hans Leidekker : bcrypt: Accept NULL implementation in BCryptOpenAlgorithmProvider.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: e3e2805b25a7264674a865e395bbb48da8629e9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e2805b25a7264674a865e39… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 14:51:43 2016 +0100 bcrypt: Accept NULL implementation in BCryptOpenAlgorithmProvider. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fdd6911..6393d59 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -209,7 +209,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR FIXME( "algorithm %s not supported\n", debugstr_w(id) ); return STATUS_NOT_IMPLEMENTED; } - if (!implementation || strcmpW( implementation, MS_PRIMITIVE_PROVIDER )) + if (implementation && strcmpW( implementation, MS_PRIMITIVE_PROVIDER )) { FIXME( "implementation %s not supported\n", debugstr_w(implementation) ); return STATUS_NOT_IMPLEMENTED;

1 0

Hans Leidekker : bcrypt: Support retrieving hash length from algorithm handles.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 11279badf212e4cec7211662aea8b44d206f2f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11279badf212e4cec7211662a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 14:51:44 2016 +0100 bcrypt: Support retrieving hash length from algorithm handles. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 20 ++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 24 ++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 6393d59..4871f20 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -438,6 +438,11 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, value = OBJECT_LENGTH_SHA1; break; } + else if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + value = HASH_DIGEST_LENGTH_SHA1; + break; + } FIXME( "unsupported sha1 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; @@ -447,6 +452,11 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, value = OBJECT_LENGTH_SHA256; break; } + else if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + value = HASH_DIGEST_LENGTH_SHA256; + break; + } FIXME( "unsupported sha256 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; @@ -456,6 +466,11 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, value = OBJECT_LENGTH_SHA384; break; } + else if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + value = HASH_DIGEST_LENGTH_SHA384; + break; + } FIXME( "unsupported sha384 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; @@ -465,6 +480,11 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, value = OBJECT_LENGTH_SHA512; break; } + else if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + value = HASH_DIGEST_LENGTH_SHA512; + break; + } FIXME( "unsupported sha512 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 2e45600..721221c 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -123,6 +123,12 @@ static void test_sha1(void) ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 20, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + hash = NULL; len = sizeof(buf); ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); @@ -196,6 +202,12 @@ static void test_sha256(void) ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 32, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + hash = NULL; len = sizeof(buf); ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); @@ -269,6 +281,12 @@ static void test_sha384(void) ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 48, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + hash = NULL; len = sizeof(buf); ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); @@ -343,6 +361,12 @@ static void test_sha512(void) ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 64, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + hash = NULL; len = sizeof(buf); ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0);

1 0

Stefan Dösinger : d3d8/tests: Test invalid locks with textures.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: e6cf8ba609f33a528f7fddbcb6e1ad681e69feca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6cf8ba609f33a528f7fddbcb… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 18 22:20:06 2016 +0000 d3d8/tests: Test invalid locks with textures. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 300 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 245 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6cf8ba609f33a528f7fd…

1 0

Stefan Dösinger : d3d9/tests: Test invalid locks with textures.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 062c0a90a250d95cb086303ae4e2c5292229b205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=062c0a90a250d95cb086303ae… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 18 22:20:07 2016 +0000 d3d9/tests: Test invalid locks with textures. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 286 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 231 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=062c0a90a250d95cb0863…

1 0

Alexandre Julliard : server: Store the desktop object names inside their window station.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: fcc977c139a24557e94fcefbe856ee691c572a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc977c139a24557e94fcefbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 20 22:27:44 2016 +0900 server: Store the desktop object names inside their window station. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 4 +- server/user.h | 1 + server/winstation.c | 110 ++++++++++++++++++----------------------- 3 files changed, 50 insertions(+), 65 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index db82026..21df249 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -452,8 +452,8 @@ static void test_getuserobjectinformation(void) name_info = (OBJECT_NAME_INFORMATION *)buffer; status = pNtQueryObject(desk, ObjectNameInformation, name_info, sizeof(buffer), NULL); ok(!status, "expected STATUS_SUCCESS, got %08x\n", status); - todo_wine ok(lstrcmpW(name_info->Name.Buffer, foobarTestW) == 0, - "expected '\\foobarTest', got %s\n", wine_dbgstr_w(name_info->Name.Buffer)); + ok(lstrcmpW(name_info->Name.Buffer, foobarTestW) == 0, + "expected '\\foobarTest', got %s\n", wine_dbgstr_w(name_info->Name.Buffer)); /** Tests for UOI_TYPE **/ diff --git a/server/user.h b/server/user.h index 08d0959..89646f1 100644 --- a/server/user.h +++ b/server/user.h @@ -49,6 +49,7 @@ struct winstation struct list desktops; /* list of desktops of this winstation */ struct clipboard *clipboard; /* clipboard information */ struct atom_table *atom_table; /* global atom table */ + struct namespace *desktop_names; /* namespace for desktops of this winstation */ }; struct global_cursor diff --git a/server/winstation.c b/server/winstation.c index 33e121f..7a6b9fc 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -42,7 +42,6 @@ static struct list winstation_list = LIST_INIT(winstation_list); -static struct namespace *winstation_namespace; static void winstation_dump( struct object *obj, int verbose ); static struct object_type *winstation_get_type( struct object *obj ); @@ -104,9 +103,6 @@ static struct winstation *create_winstation( struct directory *root, const struc { struct winstation *winstation; - if (!winstation_namespace && !(winstation_namespace = create_namespace( 7 ))) - return NULL; - if (memchrW( name->str, '\\', name->len / sizeof(WCHAR) )) /* no backslash allowed in name */ { set_error( STATUS_INVALID_PARAMETER ); @@ -123,6 +119,11 @@ static struct winstation *create_winstation( struct directory *root, const struc winstation->atom_table = NULL; list_add_tail( &winstation_list, &winstation->entry ); list_init( &winstation->desktops ); + if (!(winstation->desktop_names = create_namespace( 7 ))) + { + release_object( winstation ); + return NULL; + } } } return winstation; @@ -157,6 +158,7 @@ static void winstation_destroy( struct object *obj ) list_remove( &winstation->entry ); if (winstation->clipboard) release_object( winstation->clipboard ); if (winstation->atom_table) release_object( winstation->atom_table ); + free( winstation->desktop_names ); } static unsigned int winstation_map_access( struct object *obj, unsigned int access ) @@ -177,32 +179,6 @@ struct winstation *get_process_winstation( struct process *process, unsigned int access, &winstation_ops ); } -/* build the full name of a desktop object */ -static WCHAR *build_desktop_name( const struct unicode_str *name, - struct winstation *winstation, struct unicode_str *res ) -{ - const WCHAR *winstation_name; - WCHAR *full_name; - data_size_t winstation_len; - - if (memchrW( name->str, '\\', name->len / sizeof(WCHAR) )) - { - set_error( STATUS_INVALID_PARAMETER ); - return NULL; - } - - if (!(winstation_name = get_object_name( &winstation->obj, &winstation_len ))) - winstation_len = 0; - - res->len = winstation_len + name->len + sizeof(WCHAR); - if (!(full_name = mem_alloc( res->len ))) return NULL; - memcpy( full_name, winstation_name, winstation_len ); - full_name[winstation_len / sizeof(WCHAR)] = '\\'; - memcpy( full_name + winstation_len / sizeof(WCHAR) + 1, name->str, name->len ); - res->str = full_name; - return full_name; -} - /* retrieve a pointer to a desktop object */ struct desktop *get_desktop_obj( struct process *process, obj_handle_t handle, unsigned int access ) { @@ -214,12 +190,14 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned unsigned int flags, struct winstation *winstation ) { struct desktop *desktop; - struct unicode_str full_str; - WCHAR *full_name; - if (!(full_name = build_desktop_name( name, winstation, &full_str ))) return NULL; + if (memchrW( name->str, '\\', name->len / sizeof(WCHAR) )) /* no backslash allowed in name */ + { + set_error( STATUS_INVALID_PARAMETER ); + return NULL; + } - if ((desktop = create_named_object( winstation_namespace, &desktop_ops, &full_str, attr ))) + if ((desktop = create_named_object( winstation->desktop_names, &desktop_ops, name, attr ))) { if (get_error() != STATUS_OBJECT_NAME_EXISTS) { @@ -238,7 +216,6 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned list_init( &desktop->hotkeys ); } } - free( full_name ); return desktop; } @@ -423,21 +400,6 @@ void close_thread_desktop( struct thread *thread ) if (handle) close_handle( thread->process, handle ); } -/* set the reply data from the object name */ -static void set_reply_data_obj_name( struct object *obj, int full_name ) -{ - data_size_t len; - const WCHAR *ptr, *name = get_object_name( obj, &len ); - - /* if there is a backslash return the part of the name after it */ - if (name && !full_name && (ptr = memchrW( name, '\\', len/sizeof(WCHAR) ))) - { - len -= (ptr + 1 - name) * sizeof(WCHAR); - name = ptr + 1; - } - if (name) set_reply_data( name, min( len, get_reply_max_size() )); -} - /* create a window station */ DECL_HANDLER(create_winstation) { @@ -547,15 +509,8 @@ DECL_HANDLER(open_desktop) if (winstation) { - struct unicode_str full_str; - WCHAR *full_name; - - if ((full_name = build_desktop_name( &name, winstation, &full_str ))) - { - reply->handle = open_object( winstation_namespace, &full_str, &desktop_ops, req->access, - req->attributes ); - free( full_name ); - } + reply->handle = open_object( winstation->desktop_names, &name, &desktop_ops, + req->access, req->attributes ); release_object( winstation ); } } @@ -658,6 +613,7 @@ DECL_HANDLER(set_thread_desktop) DECL_HANDLER(set_user_object_info) { struct object *obj; + data_size_t len; if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return; @@ -681,8 +637,30 @@ DECL_HANDLER(set_user_object_info) release_object( obj ); return; } - if (get_reply_max_size()) - set_reply_data_obj_name( obj, (req->flags & SET_USER_OBJECT_GET_FULL_NAME) != 0 ); + if (obj->ops == &desktop_ops && get_reply_max_size() && (req->flags & SET_USER_OBJECT_GET_FULL_NAME)) + { + struct desktop *desktop = (struct desktop *)obj; + data_size_t winstation_len, desktop_len; + const WCHAR *winstation_name = get_object_name( &desktop->winstation->obj, &winstation_len ); + const WCHAR *desktop_name = get_object_name( obj, &desktop_len ); + WCHAR *full_name; + + if (!winstation_name) winstation_len = 0; + if (!desktop_name) desktop_len = 0; + len = winstation_len + desktop_len + sizeof(WCHAR); + if ((full_name = mem_alloc( len ))) + { + memcpy( full_name, winstation_name, winstation_len ); + full_name[winstation_len / sizeof(WCHAR)] = '\\'; + memcpy( full_name + winstation_len / sizeof(WCHAR) + 1, desktop_name, desktop_len ); + set_reply_data_ptr( full_name, min( len, get_reply_max_size() )); + } + } + else + { + const WCHAR *name = get_object_name( obj, &len ); + if (name) set_reply_data( name, min( len, get_reply_max_size() )); + } release_object( obj ); } @@ -692,15 +670,18 @@ DECL_HANDLER(enum_winstation) { unsigned int index = 0; struct winstation *winsta; + const WCHAR *name; + data_size_t len; LIST_FOR_EACH_ENTRY( winsta, &winstation_list, struct winstation, entry ) { unsigned int access = WINSTA_ENUMERATE; if (req->index > index++) continue; if (!check_object_access( &winsta->obj, &access )) continue; - set_reply_data_obj_name( &winsta->obj, 0 ); clear_error(); reply->next = index; + if ((name = get_object_name( &winsta->obj, &len ))) + set_reply_data( name, min( len, get_reply_max_size() )); return; } set_error( STATUS_NO_MORE_ENTRIES ); @@ -713,6 +694,8 @@ DECL_HANDLER(enum_desktop) struct winstation *winstation; struct desktop *desktop; unsigned int index = 0; + const WCHAR *name; + data_size_t len; if (!(winstation = (struct winstation *)get_handle_obj( current->process, req->winstation, WINSTA_ENUMDESKTOPS, &winstation_ops ))) @@ -724,7 +707,8 @@ DECL_HANDLER(enum_desktop) if (req->index > index++) continue; if (!desktop->obj.name) continue; if (!check_object_access( &desktop->obj, &access )) continue; - set_reply_data_obj_name( &desktop->obj, 0 ); + if ((name = get_object_name( &desktop->obj, &len ))) + set_reply_data( name, min( len, get_reply_max_size() )); release_object( winstation ); clear_error(); reply->next = index;

1 0

Alexandre Julliard : server: Create window stations objects in a standard directory.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 546289dc59e5208cf20789fac02b46d8014d4f84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=546289dc59e5208cf20789fac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 20 22:02:03 2016 +0900 server: Create window stations objects in a standard directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winstation.c | 25 +++++++++++++++++++++++++ include/wine/server_protocol.h | 6 ++++-- server/directory.c | 10 +++++++++- server/protocol.def | 2 ++ server/request.h | 4 +++- server/trace.c | 2 ++ server/winstation.c | 27 ++++++++++++++++++--------- 7 files changed, 63 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=546289dc59e5208cf2078…

1 0

Hans Leidekker : webservices/tests: Add more tests for WsReadEndElement.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: a443318d18786191f58ada6964a242be09db2bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a443318d18786191f58ada696… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 14:53:42 2016 +0100 webservices/tests: Add more tests for WsReadEndElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 67 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 8a6ba3e..58d1b2b 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -869,6 +869,39 @@ static void test_WsReadStartElement(void) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); ok( !memcmp( elem->localName->bytes, "node2", 5), "wrong name\n" ); } + + 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) ok( node->nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", node->nodeType ); + + 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) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + /* WsReadEndElement advances reader to EOF */ + hr = WsReadEndElement( reader, NULL ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeReader( reader ); } @@ -924,6 +957,40 @@ static void test_WsReadEndElement(void) ok( hr == S_OK, "got %08x\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + hr = set_input( reader, data2, sizeof(data2) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof(data2) - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadStartElement( 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) ok( node->nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", node->nodeType ); + + 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) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + /* WsReadEndElement advances reader to EOF */ + hr = WsReadEndElement( reader, NULL ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + hr = set_input( reader, data5, sizeof(data5) - 1 ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Józef Kucia : d3d11/tests: Extend test for ID3D11DeviceContext::UpdateSubresource().
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 8330635c93c392b4f1e12c1127dd5682cb6c1ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8330635c93c392b4f1e12c112… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 19 22:28:06 2016 +0100 d3d11/tests: Extend test for ID3D11DeviceContext::UpdateSubresource(). 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5c6efaf..cb3f185 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4227,6 +4227,9 @@ static void test_update_subresource(void) set_box(&box, 4, 4, 0, 3, 1, 1); ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)texture, 0, &box, bitmap_data, sizeof(*bitmap_data), 0); + set_box(&box, 0, 0, 0, 4, 4, 0); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)texture, 0, &box, + bitmap_data, 4 * sizeof(*bitmap_data), 0); ID3D11DeviceContext_Draw(context, 4, 0); get_texture_readback(backbuffer, &rb); for (i = 0; i < 4; ++i)

1 0

Józef Kucia : d3d10core/tests: Extend test for ID3D10Device::UpdateSubresource().
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: f26e13f38f68716fead0d363d62db686e41571b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26e13f38f68716fead0d363d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 19 22:28:07 2016 +0100 d3d10core/tests: Extend test for ID3D10Device::UpdateSubresource(). 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5d2b4c4..ba35e0d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4582,6 +4582,9 @@ static void test_update_subresource(void) set_box(&box, 4, 4, 0, 3, 1, 1); ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, &box, bitmap_data, sizeof(*bitmap_data), 0); + set_box(&box, 0, 0, 0, 4, 4, 0); + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, &box, + bitmap_data, 4 * sizeof(*bitmap_data), 0); ID3D10Device_Draw(device, 4, 0); get_texture_readback(backbuffer, &rb); for (i = 0; i < 4; ++i)

1 0

Nikolay Sivov : d2d1: Don't update target dpi if only one SetDpi() argument is zero.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: c05dd9e11f74d16d568e5a59cbc2459ba658e8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c05dd9e11f74d16d568e5a59c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 00:43:33 2016 +0300 d2d1: Don't update target dpi if only one SetDpi() argument is zero. 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/d2d1/render_target.c | 2 ++ dlls/d2d1/tests/d2d1.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 21c3125..fba1738 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1436,6 +1436,8 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetDpi(ID2D1RenderTarget *if dpi_x = 96.0f; dpi_y = 96.0f; } + else if (dpi_x == 0.0f || dpi_y == 0.0f) + return; render_target->dpi_x = dpi_x; render_target->dpi_y = dpi_y; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b721c26..7c554d2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -587,6 +587,19 @@ static void test_clip(void) ok(dpi_x == 96.0f, "Got unexpected dpi_x %.8e.\n", dpi_x); ok(dpi_y == 96.0f, "Got unexpected dpi_y %.8e.\n", dpi_y); + ID2D1RenderTarget_SetDpi(rt, 192.0f, 192.0f); + ID2D1RenderTarget_SetDpi(rt, 0.0f, 96.0f); + ID2D1RenderTarget_GetDpi(rt, &dpi_x, &dpi_y); + ok(dpi_x == 192.0f, "Got unexpected dpi_x %.8e.\n", dpi_x); + ok(dpi_y == 192.0f, "Got unexpected dpi_y %.8e.\n", dpi_y); + + ID2D1RenderTarget_SetDpi(rt, 96.0f, 0.0f); + ID2D1RenderTarget_GetDpi(rt, &dpi_x, &dpi_y); + ok(dpi_x == 192.0f, "Got unexpected dpi_x %.8e.\n", dpi_x); + ok(dpi_y == 192.0f, "Got unexpected dpi_y %.8e.\n", dpi_y); + + ID2D1RenderTarget_SetDpi(rt, 96.0f, 96.0f); + /* Transformations apply to clip rects, the effective clip rect is the * (axis-aligned) bounding box of the transformed clip rect. */ set_point(&point, 320.0f, 240.0f);

1 0