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

Ken Thomases : winex11: Fix logic of whether to use XUnmapWindow() or XWithdrawWindow() in make_window_embedded().
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: daa351ee82c1b699fb34652ca91ae5cb93b1dbab URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa351ee82c1b699fb34652ca… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 16 22:34:26 2016 -0500 winex11: Fix logic of whether to use XUnmapWindow() or XWithdrawWindow() in make_window_embedded(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4789f98..59affca 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1174,7 +1174,7 @@ void make_window_embedded( struct x11drv_win_data *data ) /* the window cannot be mapped before being embedded */ if (data->mapped) { - if (data->managed) XUnmapWindow( data->display, data->whole_window ); + if (!data->managed) XUnmapWindow( data->display, data->whole_window ); else XWithdrawWindow( data->display, data->whole_window, data->vis.screen ); data->net_wm_state = 0; }

1 0

Andrey Gusev : comctl32/tests: Fix a typo in ok() call.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 7f0531cd407ecc89ce16ccdba530a7e7714817d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0531cd407ecc89ce16ccdba… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue May 17 12:00:02 2016 +0300 comctl32/tests: Fix a typo in ok() call. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index e94b2fd..422dd43 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -476,7 +476,7 @@ todo_wine toolinfoA.lpszText = bufA; r = SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); ok(!r, "got %ld\n", r); - ok(!strcmp(toolinfoA.lpszText, testtip2A), "expected %s, got %s\n", testtipA, toolinfoA.lpszText); + ok(!strcmp(toolinfoA.lpszText, testtip2A), "expected %s, got %s\n", testtip2A, toolinfoA.lpszText); DestroyWindow(hwnd); }

1 0

Hans Leidekker : webservices: Add support for reading arrays of pointers.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: dfc47061bd08a210b034cea7f5b0c6c51332f2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc47061bd08a210b034cea7f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:51:59 2016 +0200 webservices: Add support for reading arrays of pointers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 60 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 41755fe..41c76ee 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2973,25 +2973,57 @@ static ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) } } +static WS_READ_OPTION get_array_read_option( WS_TYPE type ) +{ + switch (type) + { + case WS_BOOL_TYPE: + case WS_INT8_TYPE: + case WS_INT16_TYPE: + case WS_INT32_TYPE: + case WS_INT64_TYPE: + case WS_UINT8_TYPE: + case WS_UINT16_TYPE: + case WS_UINT32_TYPE: + case WS_UINT64_TYPE: + case WS_DOUBLE_TYPE: + case WS_ENUM_TYPE: + case WS_STRUCT_TYPE: + case WS_DATETIME_TYPE: + return WS_READ_REQUIRED_VALUE; + + case WS_WSZ_TYPE: + return WS_READ_REQUIRED_POINTER; + + default: + FIXME( "unhandled type %u\n", type ); + return 0; + } +} + static HRESULT read_type( struct reader *, WS_TYPE_MAPPING, WS_TYPE, const WS_XML_STRING *, const WS_XML_STRING *, const void *, WS_READ_OPTION, WS_HEAP *, void *, ULONG ); static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, - WS_READ_OPTION option, WS_HEAP *heap, void **ret, - ULONG size, ULONG *count ) + WS_HEAP *heap, void **ret, ULONG size, ULONG *count ) { HRESULT hr; ULONG item_size, nb_items = 0, nb_allocated = 1, offset = 0; + WS_READ_OPTION option; char *buf; - if (size != sizeof(void *)) return E_INVALIDARG; + if (size != sizeof(void *) || !(option = get_array_read_option( desc->type ))) return E_INVALIDARG; /* wrapper element */ if (desc->localName && ((hr = read_type_next_element_node( reader, desc->localName, desc->ns )) != S_OK)) return hr; - item_size = get_type_size( desc->type, desc->typeDescription ); + if (option == WS_READ_REQUIRED_VALUE) + item_size = get_type_size( desc->type, desc->typeDescription ); + else + item_size = sizeof(void *); + if (!(buf = ws_alloc_zero( heap, item_size ))) return WS_E_QUOTA_EXCEEDED; for (;;) { @@ -3002,7 +3034,7 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL nb_allocated *= 2; } hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->itemLocalName, desc->itemNs, - desc->typeDescription, WS_READ_REQUIRED_VALUE, heap, buf + offset, item_size ); + desc->typeDescription, option, heap, buf + offset, item_size ); if (hr == WS_E_INVALID_FORMAT) break; if (hr != S_OK) { @@ -3046,14 +3078,8 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION desc->typeDescription, option, heap, ret, size ); } -static WS_READ_OPTION map_field_options( WS_TYPE type, ULONG options ) +static WS_READ_OPTION get_field_read_option( WS_TYPE type ) { - if (options & ~(WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) - { - FIXME( "options %08x not supported\n", options ); - return 0; - } - switch (type) { case WS_BOOL_TYPE: @@ -3087,7 +3113,13 @@ static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DES ULONG size; HRESULT hr; - if (!desc || !(option = map_field_options( desc->type, desc->options ))) return E_INVALIDARG; + if (!desc) return E_INVALIDARG; + if (desc->options & ~(WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) + { + FIXME( "options %08x not supported\n", desc->options ); + return E_NOTIMPL; + } + if (!(option = get_field_read_option( desc->type ))) return E_INVALIDARG; if (option == WS_READ_REQUIRED_VALUE) size = get_type_size( desc->type, desc->typeDescription ); @@ -3110,7 +3142,7 @@ static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DES case WS_REPEATING_ELEMENT_FIELD_MAPPING: { ULONG count; - hr = read_type_repeating_element( reader, desc, option, heap, (void **)ptr, size, &count ); + hr = read_type_repeating_element( reader, desc, heap, (void **)ptr, size, &count ); if (hr == S_OK) *(ULONG *)(buf + desc->countOffset) = count; break; }

1 0

Hans Leidekker : webservices: Reset the reader position if the next node doesn' t match the type to read.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 297dd85ca534abbb5ced69b13ac4600b2470c8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=297dd85ca534abbb5ced69b13… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:51:58 2016 +0200 webservices: Reset the reader position if the next node doesn't match the type to read. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 142 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 105 insertions(+), 37 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7b59eb2..41755fe 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -410,6 +410,7 @@ struct reader struct node *root; struct node *current; ULONG current_attr; + struct node *last; struct prefix *prefixes; ULONG nb_prefixes; ULONG nb_prefixes_allocated; @@ -524,14 +525,14 @@ static void read_insert_eof( struct reader *reader, struct node *eof ) eof->parent = reader->root; list_add_tail( &reader->root->children, &eof->entry ); } - reader->current = eof; + reader->current = reader->last = eof; } static void read_insert_bof( struct reader *reader, struct node *bof ) { reader->root->parent = bof; list_add_tail( &bof->children, &reader->root->entry ); - reader->current = reader->root = bof; + reader->current = reader->last = reader->root = bof; } static void read_insert_node( struct reader *reader, struct node *parent, struct node *node ) @@ -543,7 +544,7 @@ static void read_insert_node( struct reader *reader, struct node *parent, struct list_add_before( eof, &node->entry ); } else list_add_tail( &parent->children, &node->entry ); - reader->current = node; + reader->current = reader->last = node; } static HRESULT read_init_state( struct reader *reader ) @@ -1650,6 +1651,58 @@ static BOOL move_to_parent_element( struct reader *reader ) return FALSE; } +static BOOL move_to_first_node( struct reader *reader ) +{ + struct list *ptr; + if ((ptr = list_head( &reader->current->parent->children ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + return TRUE; + } + return FALSE; +} + +static BOOL move_to_next_node( struct reader *reader ) +{ + struct list *ptr; + if ((ptr = list_next( &reader->current->parent->children, &reader->current->entry ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + return TRUE; + } + return FALSE; +} + +static BOOL move_to_prev_node( struct reader *reader ) +{ + struct list *ptr; + if ((ptr = list_prev( &reader->current->parent->children, &reader->current->entry ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + return TRUE; + } + return FALSE; +} + +static BOOL move_to_child_node( struct reader *reader ) +{ + struct list *ptr; + if ((ptr = list_head( &reader->current->children ))) + { + reader->current = LIST_ENTRY( ptr, struct node, entry ); + return TRUE; + } + return FALSE; +} + +static BOOL move_to_parent_node( struct reader *reader ) +{ + struct node *parent = reader->current->parent; + if (!parent) return FALSE; + reader->current = parent; + return TRUE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1688,35 +1741,19 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found break; case WS_MOVE_TO_FIRST_NODE: - if ((ptr = list_head( &reader->current->parent->children ))) - { - reader->current = LIST_ENTRY( ptr, struct node, entry ); - success = TRUE; - } + success = move_to_first_node( reader ); break; case WS_MOVE_TO_NEXT_NODE: - if ((ptr = list_next( &reader->current->parent->children, &reader->current->entry ))) - { - reader->current = LIST_ENTRY( ptr, struct node, entry ); - success = TRUE; - } + success = move_to_next_node( reader ); break; case WS_MOVE_TO_PREVIOUS_NODE: - if ((ptr = list_prev( &reader->current->parent->children, &reader->current->entry ))) - { - reader->current = LIST_ENTRY( ptr, struct node, entry ); - success = TRUE; - } + success = move_to_prev_node( reader ); break; case WS_MOVE_TO_CHILD_NODE: - if ((ptr = list_head( &reader->current->children ))) - { - reader->current = LIST_ENTRY( ptr, struct node, entry ); - success = TRUE; - } + success = move_to_child_node( reader ); break; case WS_MOVE_TO_BOF: @@ -2836,6 +2873,16 @@ static BOOL is_empty_text_node( const struct node *node ) return TRUE; } +static HRESULT read_next_node( struct reader *reader ) +{ + if (reader->current == reader->last) return read_node( reader ); + if (move_to_child_node( reader )) return S_OK; + if (move_to_next_node( reader )) return S_OK; + if (!move_to_parent_node( reader )) return WS_E_INVALID_FORMAT; + if (move_to_next_node( reader )) return S_OK; + return WS_E_INVALID_FORMAT; +} + /* skips comment and empty text nodes */ static HRESULT read_type_next_node( struct reader *reader ) { @@ -2844,7 +2891,7 @@ static HRESULT read_type_next_node( struct reader *reader ) HRESULT hr; WS_XML_NODE_TYPE type; - if ((hr = read_node( reader )) != S_OK) return hr; + if ((hr = read_next_node( reader )) != S_OK) return hr; type = node_type( reader->current ); if (type == WS_XML_NODE_TYPE_COMMENT || (type == WS_XML_NODE_TYPE_TEXT && is_empty_text_node( reader->current ))) continue; @@ -2852,22 +2899,41 @@ static HRESULT read_type_next_node( struct reader *reader ) } } +static BOOL match_current_element( struct reader *reader, const WS_XML_STRING *localname, + const WS_XML_STRING *ns ) +{ + const WS_XML_ELEMENT_NODE *elem = &reader->current->hdr; + if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT) return FALSE; + return WsXmlStringEquals( localname, elem->localName, NULL ) == S_OK && + WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK; +} + static HRESULT read_type_next_element_node( struct reader *reader, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { - const WS_XML_ELEMENT_NODE *elem; + struct node *node; + ULONG attr; HRESULT hr; - BOOL found; if (!localname) return S_OK; /* assume reader is already correctly positioned */ - if ((hr = read_to_startelement( reader, &found )) != S_OK) return hr; - if (!found) return WS_E_INVALID_FORMAT; + if (reader->current == reader->last) + { + BOOL found; + if ((hr = read_to_startelement( reader, &found )) != S_OK) return hr; + if (!found) return WS_E_INVALID_FORMAT; + } + if (match_current_element( reader, localname, ns )) return S_OK; - elem = &reader->current->hdr; - if (WsXmlStringEquals( localname, elem->localName, NULL ) == S_OK && - WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK) return S_OK; + node = reader->current; + attr = reader->current_attr; - return read_type_next_node( reader ); + if ((hr = read_type_next_node( reader )) != S_OK) return hr; + if (match_current_element( reader, localname, ns )) return S_OK; + + reader->current = node; + reader->current_attr = attr; + + return WS_E_INVALID_FORMAT; } static ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) @@ -2967,11 +3033,13 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION WS_READ_OPTION option, WS_HEAP *heap, void *ret, ULONG size ) { HRESULT hr; - BOOL found; - - if ((hr = read_to_startelement( reader, &found )) != S_OK) return S_OK; - if (!found) return WS_E_INVALID_FORMAT; - if ((hr = read_node( reader )) != S_OK) return hr; + if (reader->current == reader->last) + { + BOOL found; + if ((hr = read_to_startelement( reader, &found )) != S_OK) return S_OK; + if (!found) return WS_E_INVALID_FORMAT; + } + if ((hr = read_next_node( reader )) != S_OK) return hr; if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; return read_type( reader, WS_ANY_ELEMENT_TYPE_MAPPING, desc->type, NULL, NULL,

1 0

Hans Leidekker : webservices: Validate parent nodes.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 7fb361d763e4876a0353cfeb6d0ac431e26100e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb361d763e4876a0353cfeb6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:51:57 2016 +0200 webservices: Validate parent nodes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 89 ++++++++++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4f2262e..7b59eb2 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1076,39 +1076,22 @@ error: return hr; } -static int cmp_name( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) +static inline BOOL is_valid_parent( const struct node *node ) { - ULONG i; - if (len1 != len2) return 1; - for (i = 0; i < len1; i++) { if (toupper( name1[i] ) != toupper( name2[i] )) return 1; } - return 0; + if (!node) return FALSE; + return node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF; } -static struct node *read_find_parent( struct reader *reader, const WS_XML_STRING *prefix, - const WS_XML_STRING *localname ) +static struct node *read_find_parent( struct reader *reader ) { - struct node *parent; - const WS_XML_STRING *str; - - for (parent = reader->current; parent; parent = parent->parent) + struct node *node = reader->current; + if (node_type( node ) == WS_XML_NODE_TYPE_END_ELEMENT) { - if (node_type( parent ) == WS_XML_NODE_TYPE_BOF) - { - if (!localname) return parent; - return NULL; - } - else if (node_type( parent ) == 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; - } + if (!node->parent || !is_valid_parent( node->parent->parent )) return NULL; + return node->parent->parent; } - + else if (is_valid_parent( node )) return node; + else if (is_valid_parent( node->parent )) return node->parent; return NULL; } @@ -1167,7 +1150,7 @@ static HRESULT read_element( struct reader *reader ) } if (!len) goto error; - if (!(parent = read_find_parent( reader, NULL, NULL ))) goto error; + if (!(parent = read_find_parent( reader ))) goto error; hr = E_OUTOFMEMORY; if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error; @@ -1202,7 +1185,7 @@ static HRESULT read_text( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; - struct node *node; + struct node *node, *parent; WS_XML_TEXT_NODE *text; WS_XML_UTF8_TEXT *utf8; @@ -1216,6 +1199,8 @@ static HRESULT read_text( struct reader *reader ) len += skip; } + if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; text = (WS_XML_TEXT_NODE *)node; if (!(utf8 = alloc_utf8_text( start, len ))) @@ -1225,7 +1210,7 @@ static HRESULT read_text( struct reader *reader ) } text->text = &utf8->text; - read_insert_node( reader, reader->current, node ); + read_insert_node( reader, parent, node ); reader->state = READER_STATE_TEXT; return S_OK; } @@ -1283,6 +1268,36 @@ 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; +} + +static struct node *read_find_start_element( 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 (node_type( parent ) == WS_XML_NODE_TYPE_BOF) return NULL; + if (node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) + { + 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; @@ -1319,7 +1334,7 @@ static HRESULT read_endelement( struct reader *reader ) } if ((hr = parse_name( start, len, &prefix, &localname )) != S_OK) return hr; - parent = read_find_parent( reader, prefix, localname ); + parent = read_find_start_element( reader, prefix, localname ); heap_free( prefix ); heap_free( localname ); if (!parent) return WS_E_INVALID_FORMAT; @@ -1334,7 +1349,7 @@ static HRESULT read_comment( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; - struct node *node; + struct node *node, *parent; WS_XML_COMMENT_NODE *comment; if (read_cmp( reader, "<!--", 4 )) return WS_E_INVALID_FORMAT; @@ -1353,6 +1368,8 @@ static HRESULT read_comment( struct reader *reader ) len += skip; } + if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + 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 ))) @@ -1363,20 +1380,22 @@ static HRESULT read_comment( struct reader *reader ) memcpy( comment->value.bytes, start, len ); comment->value.length = len; - read_insert_node( reader, reader->current, node ); + read_insert_node( reader, parent, node ); reader->state = READER_STATE_COMMENT; return S_OK; } static HRESULT read_startcdata( struct reader *reader ) { - struct node *node; + struct node *node, *parent; if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; read_skip( reader, 9 ); + if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; - read_insert_node( reader, reader->current, node ); + read_insert_node( reader, parent, node ); reader->state = READER_STATE_STARTCDATA; return S_OK; }

1 0

Nikolay Sivov : kernel32/nls: Fix shortest day names for Thai and Vietnamese.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 45edebfb4f07ab3533821e50b20369482df91d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=45edebfb4f07ab3533821e50b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 08:42:34 2016 +0300 kernel32/nls: Fix shortest day names for Thai and Vietnamese. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/tha.nls | 16 ++++++++-------- dlls/kernel32/nls/vit.nls | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls index 7e2e6ad..1b35e19 100644 --- a/dlls/kernel32/nls/tha.nls +++ b/dlls/kernel32/nls/tha.nls @@ -134,13 +134,13 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Thai;" LOCALE_SSHORTDATE "d/M/yyyy" - LOCALE_SSHORTESTDAYNAME1 "จ." - LOCALE_SSHORTESTDAYNAME2 "อ." - LOCALE_SSHORTESTDAYNAME3 "พ." - LOCALE_SSHORTESTDAYNAME4 "พฤ." - LOCALE_SSHORTESTDAYNAME5 "ศ." - LOCALE_SSHORTESTDAYNAME6 "ส." - LOCALE_SSHORTESTDAYNAME7 "อา." + LOCALE_SSHORTESTDAYNAME1 "จ" + LOCALE_SSHORTESTDAYNAME2 "อ" + LOCALE_SSHORTESTDAYNAME3 "พ" + LOCALE_SSHORTESTDAYNAME4 "พฤ" + LOCALE_SSHORTESTDAYNAME5 "ศ" + LOCALE_SSHORTESTDAYNAME6 "ส" + LOCALE_SSHORTESTDAYNAME7 "อา" LOCALE_SSHORTTIME "H:mm" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," @@ -160,7 +160,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls index 89b030c..b66c796 100644 --- a/dlls/kernel32/nls/vit.nls +++ b/dlls/kernel32/nls/vit.nls @@ -134,13 +134,13 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;" LOCALE_SSHORTDATE "dd/MM/yyyy" - LOCALE_SSHORTESTDAYNAME1 "hai" - LOCALE_SSHORTESTDAYNAME2 "ba" - LOCALE_SSHORTESTDAYNAME3 "tư" - LOCALE_SSHORTESTDAYNAME4 "năm" - LOCALE_SSHORTESTDAYNAME5 "sáu" - LOCALE_SSHORTESTDAYNAME6 "bảy" - LOCALE_SSHORTESTDAYNAME7 "cn" + LOCALE_SSHORTESTDAYNAME1 "H" + LOCALE_SSHORTESTDAYNAME2 "B" + LOCALE_SSHORTESTDAYNAME3 "T" + LOCALE_SSHORTESTDAYNAME4 "N" + LOCALE_SSHORTESTDAYNAME5 "S" + LOCALE_SSHORTESTDAYNAME6 "B" + LOCALE_SSHORTESTDAYNAME7 "C" LOCALE_SSHORTTIME "h:mm tt" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "." @@ -160,7 +160,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian"

1 0

Kirill Smirnov : winhlp32: Fix an uninitialized variable (clang).
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 85c67cca96b2010cd885a6789def5ba1444ab1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c67cca96b2010cd885a6789… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Mon May 9 19:09:46 2016 +0300 winhlp32: Fix an uninitialized variable (clang). Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/winhelp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index b7d99e8..dc6777b 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -986,6 +986,7 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam popup = Globals.active_popup; Globals.active_popup = NULL; WINHELP_ReleaseWindow(popup); + if (lret) *lret = 1; return TRUE; } return FALSE;

1 0

Kirill Smirnov : winhlp32: Do not pass NULL to strchr() (spotted by clang) .
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 5a3ad0ecf08c00fc0b7b2f24e55be27b7c3f5da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3ad0ecf08c00fc0b7b2f24e… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Mon May 9 18:56:14 2016 +0300 winhlp32: Do not pass NULL to strchr() (spotted by clang). Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/macro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index f0a6893..5a25d6c 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -607,7 +607,7 @@ static void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id) LPSTR ptr; WINE_TRACE("(%s, %s)\n", debugstr_a(lpszPathWindow), debugstr_a(topic_id)); - if ((ptr = strchr(lpszPathWindow, '>')) != NULL) + if (lpszPathWindow && (ptr = strchr(lpszPathWindow, '>')) != NULL) { LPSTR tmp; size_t sz;

1 0

Józef Kucia : d3d10core/tests: Add tests for 2D texture RTVs.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: ae78672d2515e1486fdae13553427917a8c4d211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae78672d2515e1486fdae1355… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:27 2016 +0200 d3d10core/tests: Add tests for 2D texture RTVs. 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 | 187 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a4fa401..7c66fe2 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #define COBJMACROS #include "initguid.h" #include "d3d11.h" @@ -356,6 +357,9 @@ struct d3d10core_test_context ID3D10InputLayout *input_layout; ID3D10VertexShader *vs; ID3D10Buffer *vb; + + ID3D10PixelShader *ps; + ID3D10Buffer *ps_cb; }; #define init_test_context(c) init_test_context_(__LINE__, c) @@ -405,6 +409,10 @@ static void release_test_context_(unsigned int line, struct d3d10core_test_conte ID3D10VertexShader_Release(context->vs); if (context->vb) ID3D10Buffer_Release(context->vb); + if (context->ps) + ID3D10PixelShader_Release(context->ps); + if (context->ps_cb) + ID3D10Buffer_Release(context->ps_cb); ID3D10RenderTargetView_Release(context->backbuffer_rtv); ID3D10Texture2D_Release(context->backbuffer); @@ -490,6 +498,57 @@ static void draw_quad_(unsigned int line, struct d3d10core_test_context *context ID3D10Device_Draw(context->device, 4, 0); } +#define draw_color_quad(c, color) draw_color_quad_(__LINE__, c, color) +static void draw_color_quad_(unsigned int line, struct d3d10core_test_context *context, const struct vec4 *color) +{ + static const DWORD ps_color_code[] = + { +#if 0 + float4 color; + + float4 main() : SV_TARGET + { + return color; + } +#endif + 0x43425844, 0x80f1c810, 0xdacbbc8b, 0xe07b133e, 0x3059cbfa, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000040, 0x00000040, 0x00000010, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, + 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + }; + + ID3D10Device *device = context->device; + D3D10_BUFFER_DESC buffer_desc; + HRESULT hr; + + if (!context->ps) + { + hr = ID3D10Device_CreatePixelShader(device, ps_color_code, sizeof(ps_color_code), &context->ps); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + } + + if (!context->ps_cb) + { + buffer_desc.ByteWidth = sizeof(*color); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &context->ps_cb); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + } + + ID3D10Device_PSSetShader(device, context->ps); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &context->ps_cb); + + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)context->ps_cb, 0, NULL, color, 0, 0); + + draw_quad_(line, context); +} + static void test_feature_level(void) { D3D_FEATURE_LEVEL feature_level; @@ -1469,6 +1528,133 @@ static void test_create_rendertarget_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_render_target_views(void) +{ + struct texture + { + UINT miplevel_count; + UINT array_size; + }; + struct rtv + { + DXGI_FORMAT format; + D3D10_RTV_DIMENSION dimension; + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; + }; + + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static struct test + { + struct texture texture; + struct rtv rtv; + DWORD expected_colors[4]; + } + tests[] = + { + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2D, 0}, + {0xff0000ff, 0x00000000}}, + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2D, 1}, + {0x00000000, 0xff0000ff}}, + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 1}, + {0xff0000ff, 0x00000000}}, + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 1, 0, 1}, + {0x00000000, 0xff0000ff}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2D, 0}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 1}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 1, 1}, + {0x00000000, 0xff0000ff, 0x00000000, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 2, 1}, + {0x00000000, 0x00000000, 0xff0000ff, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 3, 1}, + {0x00000000, 0x00000000, 0x00000000, 0xff0000ff}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 4}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2D, 0}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 1}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 1, 1}, + {0x00000000, 0x00000000, 0xff0000ff, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 1, 0, 1}, + {0x00000000, 0xff0000ff, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 1, 1, 1}, + {0x00000000, 0x00000000, 0x00000000, 0xff0000ff}}, + }; + + struct d3d10core_test_context test_context; + D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + ID3D10Texture2D *texture; + ID3D10Device *device; + unsigned int i, j; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 32; + texture_desc.Height = 32; + 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(tests) / sizeof(*tests); ++i) + { + const struct test *test = &tests[i]; + unsigned int sub_resource_count; + + texture_desc.MipLevels = test->texture.miplevel_count; + texture_desc.ArraySize = test->texture.array_size; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + + rtv_desc.Format = texture_desc.Format; + rtv_desc.ViewDimension = test->rtv.dimension; + if (test->rtv.dimension == D3D10_RTV_DIMENSION_TEXTURE2D) + { + U(rtv_desc).Texture2D.MipSlice = test->rtv.miplevel_idx; + } + else if (test->rtv.dimension == D3D10_RTV_DIMENSION_TEXTURE2DARRAY) + { + U(rtv_desc).Texture2DArray.MipSlice = test->rtv.miplevel_idx; + U(rtv_desc).Texture2DArray.FirstArraySlice = test->rtv.layer_idx; + U(rtv_desc).Texture2DArray.ArraySize = test->rtv.layer_count; + } + else + { + trace("Test %u: Unhandled view dimension %#x.\n", i, test->rtv.dimension); + } + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv); + ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + draw_color_quad(&test_context, &red); + + sub_resource_count = texture_desc.MipLevels * texture_desc.ArraySize; + assert(sub_resource_count <= sizeof(test->expected_colors) / sizeof(*test->expected_colors)); + for (j = 0; j < sub_resource_count; ++j) + check_texture_sub_resource_color(texture, j, test->expected_colors[j], 1); + + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(texture); + } + + release_test_context(&test_context); +} + static void test_create_shader_resource_view(void) { D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; @@ -6471,6 +6657,7 @@ START_TEST(device) test_create_depthstencil_view(); test_depthstencil_view_interfaces(); test_create_rendertarget_view(); + test_render_target_views(); test_create_shader_resource_view(); test_create_shader(); test_create_sampler_state();

1 0

Józef Kucia : d3d10core/tests: Check all sub-resources in check_texture_* functions.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 938545c61c99280622509a6934ab5feba1946e34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938545c61c99280622509a693… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:26 2016 +0200 d3d10core/tests: Check all sub-resources in check_texture_* functions. 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 | 83 ++++++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8e69656..a4fa401 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -91,12 +91,14 @@ struct texture_readback { ID3D10Texture2D *texture; D3D10_MAPPED_TEXTURE2D mapped_texture; - unsigned int width, height; + unsigned int width, height, sub_resource_idx; }; -static void get_texture_readback(ID3D10Texture2D *texture, struct texture_readback *rb) +static void get_texture_readback(ID3D10Texture2D *texture, unsigned int sub_resource_idx, + struct texture_readback *rb) { D3D10_TEXTURE2D_DESC texture_desc; + unsigned int miplevel; ID3D10Device *device; HRESULT hr; @@ -116,13 +118,16 @@ static void get_texture_readback(ID3D10Texture2D *texture, struct texture_readba return; } - rb->width = texture_desc.Width; - rb->height = texture_desc.Height; + miplevel = sub_resource_idx % texture_desc.MipLevels; + rb->width = max(1, texture_desc.Width >> miplevel); + rb->height = max(1, texture_desc.Height >> miplevel); + rb->sub_resource_idx = sub_resource_idx; ID3D10Device_CopyResource(device, (ID3D10Resource *)rb->texture, (ID3D10Resource *)texture); - if (FAILED(hr = ID3D10Texture2D_Map(rb->texture, 0, D3D10_MAP_READ, 0, &rb->mapped_texture))) + if (FAILED(hr = ID3D10Texture2D_Map(rb->texture, sub_resource_idx, + D3D10_MAP_READ, 0, &rb->mapped_texture))) { - trace("Failed to map texture, hr %#x.\n", hr); + trace("Failed to map sub-resource %u, hr %#x.\n", sub_resource_idx, hr); ID3D10Texture2D_Release(rb->texture); rb->texture = NULL; } @@ -142,7 +147,7 @@ static float get_readback_float(struct texture_readback *rb, unsigned int x, uns static void release_texture_readback(struct texture_readback *rb) { - ID3D10Texture2D_Unmap(rb->texture, 0); + ID3D10Texture2D_Unmap(rb->texture, rb->sub_resource_idx); ID3D10Texture2D_Release(rb->texture); } @@ -151,23 +156,23 @@ static DWORD get_texture_color(ID3D10Texture2D *texture, unsigned int x, unsigne struct texture_readback rb; DWORD color; - get_texture_readback(texture, &rb); + get_texture_readback(texture, 0, &rb); color = get_readback_color(&rb, x, y); release_texture_readback(&rb); return color; } -#define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) -static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, - DWORD expected_color, BYTE max_diff) +#define check_texture_sub_resource_color(t, s, c, d) check_texture_sub_resource_color_(__LINE__, t, s, c, d) +static void check_texture_sub_resource_color_(unsigned int line, ID3D10Texture2D *texture, + unsigned int sub_resource_idx, 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); + get_texture_readback(texture, sub_resource_idx, &rb); for (y = 0; y < rb.height; ++y) { for (x = 0; x < rb.width; ++x) @@ -184,19 +189,33 @@ static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, } release_texture_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected color 0x%08x at (%u, %u).\n", color, x, y); + "Got unexpected color 0x%08x at (%u, %u), sub-resource %u.\n", + color, x, y, sub_resource_idx); } -#define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d) -static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, - float expected_value, BYTE max_diff) +#define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) +static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, + DWORD expected_color, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D10_TEXTURE2D_DESC texture_desc; + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture_sub_resource_color_(line, texture, sub_resource_idx, expected_color, max_diff); +} + +#define check_texture_sub_resource_float(r, s, f, d) check_texture_sub_resource_float_(__LINE__, r, s, f, d) +static void check_texture_sub_resource_float_(unsigned int line, ID3D10Texture2D *texture, + unsigned int sub_resource_idx, float expected_value, BYTE max_diff) { struct texture_readback rb; unsigned int x = 0, y = 0; BOOL all_match = TRUE; float value = 0.0f; - get_texture_readback(texture, &rb); + get_texture_readback(texture, sub_resource_idx, &rb); for (y = 0; y < rb.height; ++y) { for (x = 0; x < rb.width; ++x) @@ -213,7 +232,21 @@ static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, } release_texture_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected value %.8e at (%u, %u).\n", value, x, y); + "Got unexpected value %.8e at (%u, %u), sub-resource %u.\n", + value, x, y, sub_resource_idx); +} + +#define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d) +static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, + float expected_value, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D10_TEXTURE2D_DESC texture_desc; + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture_sub_resource_float_(line, texture, sub_resource_idx, expected_value, max_diff); } static ID3D10Device *create_device(void) @@ -4255,7 +4288,7 @@ static void test_texture(void) draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (y = 0; y < 4; ++y) { for (x = 0; x < 4; ++x) @@ -5121,7 +5154,7 @@ static void test_update_subresource(void) ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, &box, bitmap_data, 4 * sizeof(*bitmap_data), 0); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5137,7 +5170,7 @@ static void test_update_subresource(void) ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, NULL, bitmap_data, 4 * sizeof(*bitmap_data), 0); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5321,7 +5354,7 @@ static void test_copy_subresource_region(void) ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 0, 0, 0, (ID3D10Resource *)src_texture, 0, &box); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5337,7 +5370,7 @@ static void test_copy_subresource_region(void) ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 0, 0, 0, (ID3D10Resource *)src_texture, 0, NULL); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5419,7 +5452,7 @@ static void test_copy_subresource_region(void) ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_buffer, 0, 0, 0, 0, (ID3D10Resource *)src_buffer, 0, &box); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -6402,7 +6435,7 @@ static void test_draw_depth_only(void) draw_quad(&test_context); } } - get_texture_readback(texture, &rb); + get_texture_readback(texture, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j)

1 0