October 2016 - Wine-commits

Hans Leidekker : webservices: WS_FIELD_OPTIONAL takes precedence over WS_FIELD_NILLABLE.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: b26b2655618e2907219908f80c0aa912ccf58b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26b2655618e2907219908f80… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 15:30:22 2016 +0200 webservices: WS_FIELD_OPTIONAL takes precedence over WS_FIELD_NILLABLE. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 20 +++++++++++++++----- dlls/webservices/writer.c | 7 ++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 465bc5a..912e944 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2122,7 +2122,7 @@ static void test_double(void) WsFreeWriter( writer ); } -static void test_field_flags(void) +static void test_field_options(void) { static const char expected[] = "<t><bool a:nil=\"true\" xmlns:a=\"http://www.w3.org/2001/XMLSchema-instance\"/><int32>-1</int32>" @@ -2130,10 +2130,10 @@ static void test_field_flags(void) HRESULT hr; WS_XML_WRITER *writer; WS_STRUCT_DESCRIPTION s; - WS_FIELD_DESCRIPTION f, f2, f3, f4, *fields[4]; + WS_FIELD_DESCRIPTION f, f2, f3, f4, f5, *fields[5]; WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}, str_guid = {4, (BYTE *)"guid"}; WS_XML_STRING str_int32 = {5, (BYTE *)"int32"}, str_bool = {4, (BYTE *)"bool"}; - WS_XML_STRING str_xmlstr = {6, (BYTE *)"xmlstr"}; + WS_XML_STRING str_xmlstr = {6, (BYTE *)"xmlstr"}, str_str = {3, (BYTE *)"str"}; INT32 val = -1; struct test { @@ -2141,6 +2141,7 @@ static void test_field_flags(void) BOOL *bool_ptr; INT32 *int32_ptr; WS_XML_STRING xmlstr; + WCHAR *str; } test; hr = WsCreateWriter( NULL, 0, &writer, NULL ); @@ -2187,11 +2188,20 @@ static void test_field_flags(void) f4.options = WS_FIELD_NILLABLE; fields[3] = &f4; + memset( &f5, 0, sizeof(f5) ); + f5.mapping = WS_ELEMENT_FIELD_MAPPING; + f5.localName = &str_str; + f5.offset = FIELD_OFFSET(struct test, str); + f5.ns = &ns; + f5.type = WS_WSZ_TYPE; + f5.options = WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE; + fields[4] = &f5; + memset( &s, 0, sizeof(s) ); s.size = sizeof(struct test); s.alignment = TYPE_ALIGNMENT(struct test); s.fields = fields; - s.fieldCount = 4; + s.fieldCount = 5; memset( &test, 0, sizeof(test) ); test.int32_ptr = &val; @@ -2679,7 +2689,7 @@ START_TEST(writer) test_WsCopyNode(); test_text_types(); test_double(); - test_field_flags(); + test_field_options(); test_WsWriteText(); test_WsWriteArray(); test_escapes(); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 36bf65b..b59e903 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1952,16 +1952,13 @@ static HRESULT write_type_struct_field( struct writer *writer, const WS_FIELD_DE if (is_nil_value( value, size )) { + if (field_options & WS_FIELD_OPTIONAL) return S_OK; if (field_options & WS_FIELD_NILLABLE) { if (field_options & WS_FIELD_POINTER) option = WS_WRITE_NILLABLE_POINTER; else option = WS_WRITE_NILLABLE_VALUE; } - else - { - if (field_options & WS_FIELD_OPTIONAL) return S_OK; - return E_INVALIDARG; - } + else return E_INVALIDARG; } else {

1 0

Hans Leidekker : webservices: Determine field size from write options and type size.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: ad57c7c72ad278dca2b3575bb6e4015f21d62abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad57c7c72ad278dca2b3575bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 15:30:23 2016 +0200 webservices: Determine field size from write options and type size. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 8 ++++++ dlls/webservices/writer.c | 68 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index c0710de..c364cff 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3775,12 +3775,18 @@ ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) case WS_GUID_TYPE: return sizeof(GUID); + case WS_STRING_TYPE: + return sizeof(WS_STRING); + case WS_WSZ_TYPE: return sizeof(WCHAR *); case WS_BYTES_TYPE: return sizeof(WS_BYTES); + case WS_XML_STRING_TYPE: + return sizeof(WS_XML_STRING); + case WS_STRUCT_TYPE: return desc->size; @@ -3813,7 +3819,9 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type, ULONG options ) case WS_DOUBLE_TYPE: case WS_DATETIME_TYPE: case WS_GUID_TYPE: + case WS_STRING_TYPE: case WS_BYTES_TYPE: + case WS_XML_STRING_TYPE: case WS_STRUCT_TYPE: case WS_ENUM_TYPE: if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_READ_NILLABLE_VALUE; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index b59e903..26ab726 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2023,10 +2023,70 @@ static HRESULT write_type_struct_field( struct writer *writer, const WS_FIELD_DE return S_OK; } -static ULONG get_field_size( const WS_STRUCT_DESCRIPTION *desc, ULONG index ) +static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) { - if (index < desc->fieldCount - 1) return desc->fields[index + 1]->offset - desc->fields[index]->offset; - return desc->size - desc->fields[index]->offset; + if (options & WS_FIELD_POINTER) + { + if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_WRITE_NILLABLE_POINTER; + return WS_WRITE_REQUIRED_POINTER; + } + + 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_DATETIME_TYPE: + case WS_GUID_TYPE: + case WS_STRING_TYPE: + case WS_BYTES_TYPE: + case WS_XML_STRING_TYPE: + case WS_STRUCT_TYPE: + case WS_ENUM_TYPE: + if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_WRITE_NILLABLE_VALUE; + return WS_WRITE_REQUIRED_VALUE; + + case WS_WSZ_TYPE: + case WS_DESCRIPTION_TYPE: + if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_WRITE_NILLABLE_POINTER; + return WS_WRITE_REQUIRED_POINTER; + + default: + FIXME( "unhandled type %u\n", type ); + return 0; + } +} + +static ULONG get_field_size( const WS_FIELD_DESCRIPTION *desc ) +{ + WS_WRITE_OPTION option; + ULONG size; + + switch ((option = get_field_write_option( desc->type, desc->options ))) + { + case WS_WRITE_REQUIRED_POINTER: + case WS_WRITE_NILLABLE_POINTER: + size = sizeof(const void *); + break; + + case WS_WRITE_REQUIRED_VALUE: + case WS_WRITE_NILLABLE_VALUE: + size = get_type_size( desc->type, desc->typeDescription ); + break; + + default: + WARN( "unhandled option %u\n", option ); + return 0; + } + + return size; } static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping, @@ -2045,7 +2105,7 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping for (i = 0; i < desc->fieldCount; i++) { field_ptr = (const char *)ptr + desc->fields[i]->offset; - field_size = get_field_size( desc, i ); + field_size = get_field_size( desc->fields[i] ); if ((hr = write_type_struct_field( writer, desc->fields[i], field_ptr, field_size )) != S_OK) return hr; }

1 0

Hans Leidekker : webservices: Fix node insertion in the reader when the current node is an end element.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 829b2255461bbaa79afd120fce02c86fc7c607b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=829b2255461bbaa79afd120fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 15:30:24 2016 +0200 webservices: Fix node insertion in the reader when the current node is an end element. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 25 ++++++++++++------------- dlls/webservices/webservices_private.h | 7 ++++++- dlls/webservices/writer.c | 15 +++++++++++---- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index c364cff..9a82bcd 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1400,16 +1400,15 @@ error: return hr; } -static inline BOOL is_valid_parent( const struct node *node ) +static struct node *find_parent( struct reader *reader ) { - if (!node) return FALSE; - return node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF; -} - -struct node *find_parent( struct node *node ) -{ - if (is_valid_parent( node )) return node; - if (is_valid_parent( node->parent )) return node->parent; + if (node_type( reader->current ) == WS_XML_NODE_TYPE_END_ELEMENT) + { + if (is_valid_parent( reader->current->parent->parent )) return reader->current->parent->parent; + return NULL; + } + else if (is_valid_parent( reader->current )) return reader->current; + else if (is_valid_parent( reader->current->parent )) return reader->current->parent; return NULL; } @@ -1468,7 +1467,7 @@ static HRESULT read_element( struct reader *reader ) } if (!len) goto error; - if (!(parent = find_parent( reader->current ))) goto error; + if (!(parent = find_parent( reader ))) goto error; hr = E_OUTOFMEMORY; if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error; @@ -1522,7 +1521,7 @@ static HRESULT read_text( struct reader *reader ) len += skip; } - if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = 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; @@ -1693,7 +1692,7 @@ static HRESULT read_comment( struct reader *reader ) len += skip; } - if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = 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; @@ -1717,7 +1716,7 @@ static HRESULT read_startcdata( struct reader *reader ) if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; read_skip( reader, 9 ); - if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; if (!(endnode = alloc_node( WS_XML_NODE_TYPE_END_CDATA ))) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index cdaa4b5..12b7984 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -52,7 +52,6 @@ struct node struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN; void free_node( struct node * ) DECLSPEC_HIDDEN; void destroy_nodes( struct node * ) DECLSPEC_HIDDEN; -struct node *find_parent( struct node * ) DECLSPEC_HIDDEN; HRESULT copy_node( WS_XML_READER *, struct node ** ) DECLSPEC_HIDDEN; static inline WS_XML_NODE_TYPE node_type( const struct node *node ) @@ -125,6 +124,12 @@ static inline BOOL is_nil_value( const char *value, ULONG size ) return TRUE; } +static inline BOOL is_valid_parent( const struct node *node ) +{ + if (!node) return FALSE; + return (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF); +} + static inline void *heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 26ab726..4622277 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -130,6 +130,13 @@ static void write_insert_node( struct writer *writer, struct node *parent, struc writer->current = node; } +static struct node *find_parent( struct writer *writer ) +{ + if (is_valid_parent( writer->current )) return writer->current; + if (is_valid_parent( writer->current->parent )) return writer->current->parent; + return NULL; +} + static HRESULT write_init_state( struct writer *writer ) { struct node *node; @@ -890,7 +897,7 @@ static HRESULT write_flush( struct writer *writer ) static HRESULT write_add_cdata_node( struct writer *writer ) { struct node *node, *parent; - if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( writer ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; write_insert_node( writer, parent, node ); return S_OK; @@ -977,7 +984,7 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN struct node *node, *parent; WS_XML_ELEMENT_NODE *elem; - if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( writer ))) return WS_E_INVALID_FORMAT; if (!prefix && node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) { @@ -2563,7 +2570,7 @@ static HRESULT write_add_comment_node( struct writer *writer, const WS_XML_STRIN struct node *node, *parent; WS_XML_COMMENT_NODE *comment; - if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( writer ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_COMMENT ))) return E_OUTOFMEMORY; comment = (WS_XML_COMMENT_NODE *)node; @@ -2774,7 +2781,7 @@ HRESULT WINAPI WsCopyNode( WS_XML_WRITER *handle, WS_XML_READER *reader, WS_ERRO if (error) FIXME( "ignoring error parameter\n" ); if (!writer) return E_INVALIDARG; - if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( writer ))) return WS_E_INVALID_FORMAT; if ((hr = copy_node( reader, &node )) != S_OK) return hr; write_insert_node( writer, parent, node );

1 0

Hans Leidekker : webservices: Implement WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 459b7caeb2a58895bf5d8173dd847edfec3815df URL: http://source.winehq.org/git/wine.git/?a=commit;h=459b7caeb2a58895bf5d8173d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 15:30:25 2016 +0200 webservices: Implement WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 109 +++++++++++++++++++++++---------- dlls/webservices/tests/reader.c | 42 ++++++++++++- dlls/webservices/webservices_private.h | 6 ++ 3 files changed, 124 insertions(+), 33 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9a82bcd..9ba4dfc 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4000,7 +4000,11 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, char *buf; if (!desc) return E_INVALIDARG; - if (desc->structOptions) FIXME( "struct options %08x not supported\n", desc->structOptions ); + if (desc->structOptions & ~WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT) + { + FIXME( "struct options %08x not supported\n", + desc->structOptions & ~WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT ); + } switch (option) { @@ -4037,7 +4041,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, return hr; } *(char **)ret = buf; - return S_OK; + break; case WS_READ_OPTIONAL_POINTER: case WS_READ_NILLABLE_POINTER: @@ -4047,16 +4051,77 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, buf = NULL; } *(char **)ret = buf; - return S_OK; + break; case WS_READ_REQUIRED_VALUE: case WS_READ_NILLABLE_VALUE: - return hr; + if (hr != S_OK) return hr; + break; default: ERR( "unhandled read option %u\n", option ); return E_NOTIMPL; } + + if (desc->structOptions & WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT) + { + struct node *parent = find_parent( reader ); + parent->flags |= NODE_FLAG_IGNORE_TRAILING_ELEMENT_CONTENT; + } + return S_OK; +} + +static HRESULT start_mapping( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, + const WS_XML_STRING *ns ) +{ + switch (mapping) + { + case WS_ELEMENT_TYPE_MAPPING: + case WS_ELEMENT_CONTENT_TYPE_MAPPING: + return read_type_next_element_node( reader, localname, ns ); + + case WS_ANY_ELEMENT_TYPE_MAPPING: + case WS_ATTRIBUTE_TYPE_MAPPING: + return S_OK; + + default: + FIXME( "unhandled mapping %u\n", mapping ); + return E_NOTIMPL; + } +} + +static HRESULT read_type_endelement_node( struct reader *reader ) +{ + const struct node *parent = find_parent( reader ); + HRESULT hr; + + for (;;) + { + if ((hr = read_type_next_node( reader )) != S_OK) return hr; + if (node_type( reader->current ) == WS_XML_NODE_TYPE_END_ELEMENT && reader->current->parent == parent) + { + return S_OK; + } + if (read_end_of_data( reader ) || !(parent->flags & NODE_FLAG_IGNORE_TRAILING_ELEMENT_CONTENT)) break; + } + + return WS_E_INVALID_FORMAT; +} + +static HRESULT end_mapping( struct reader *reader, WS_TYPE_MAPPING mapping ) +{ + switch (mapping) + { + case WS_ELEMENT_TYPE_MAPPING: + return read_type_endelement_node( reader ); + + case WS_ELEMENT_CONTENT_TYPE_MAPPING: + return read_type_next_node( reader ); + + case WS_ATTRIBUTE_TYPE_MAPPING: + default: + return S_OK; + } } static HRESULT is_nil_element( const WS_XML_ELEMENT_NODE *elem ) @@ -4078,28 +4143,17 @@ static HRESULT is_nil_element( const WS_XML_ELEMENT_NODE *elem ) } static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYPE type, - const WS_XML_STRING *localname, const WS_XML_STRING *ns, - const void *desc, WS_READ_OPTION option, WS_HEAP *heap, - void *value, ULONG size ) + const WS_XML_STRING *localname, const WS_XML_STRING *ns, const void *desc, + WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size ) { HRESULT hr; - switch (mapping) - { - case WS_ELEMENT_TYPE_MAPPING: - case WS_ELEMENT_CONTENT_TYPE_MAPPING: - if ((hr = read_type_next_element_node( reader, localname, ns )) != S_OK) return hr; - if ((option == WS_READ_NILLABLE_POINTER || option == WS_READ_NILLABLE_VALUE) && - is_nil_element( &reader->current->hdr )) return read_type_next_node( reader ); - break; - - case WS_ANY_ELEMENT_TYPE_MAPPING: - case WS_ATTRIBUTE_TYPE_MAPPING: - break; + if ((hr = start_mapping( reader, mapping, localname, ns )) != S_OK) return hr; - default: - FIXME( "unhandled mapping %u\n", mapping ); - return E_NOTIMPL; + if (mapping == WS_ELEMENT_TYPE_MAPPING && is_nil_element( &reader->current->hdr )) + { + if (option != WS_READ_NILLABLE_POINTER && option != WS_READ_NILLABLE_VALUE) return WS_E_INVALID_FORMAT; + return end_mapping( reader, mapping ); } switch (type) @@ -4189,16 +4243,7 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return E_NOTIMPL; } - switch (mapping) - { - case WS_ELEMENT_TYPE_MAPPING: - case WS_ELEMENT_CONTENT_TYPE_MAPPING: - return read_type_next_node( reader ); - - case WS_ATTRIBUTE_TYPE_MAPPING: - default: - return S_OK; - } + return end_mapping( reader, mapping ); } /************************************************************************** diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index a020c01..62ed499 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -71,6 +71,12 @@ static const char data11[] = "</o:services>" "</o:OfficeConfig>"; +static const char data11b[] = + "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" + "<o:services o:GenerationTime=\"2015-09-03T18:47:54\"></o:services>" + "<trailing>content</trailing>" + "</o:OfficeConfig>"; + static const char data12[] = "<services>" "<service><id>1</id></service>" @@ -2069,12 +2075,23 @@ static void test_simple_struct_type(void) s.typeLocalName = &localname2; s.typeNs = &ns; - test = NULL; prepare_struct_type_test( reader, "<?xml version=\"1.0\" encoding=\"utf-8\"?><str>test</str><str>test2</str>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + prepare_struct_type_test( reader, "<?xml version=\"1.0\" encoding=\"utf-8\"?><str>test</str><str>test2</str>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + s.structOptions = WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT; + prepare_struct_type_test( reader, "<?xml version=\"1.0\" encoding=\"utf-8\"?><str>test</str><str>test2</str>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + s.structOptions = 0; + test = NULL; prepare_struct_type_test( reader, "<?xml version=\"1.0\" encoding=\"utf-8\"?><str>test</str>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, @@ -2815,6 +2832,29 @@ static void test_complex_struct_type(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + /* trailing content */ + prepare_struct_type_test( reader, data11b ); + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + s.structOptions = WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + prepare_struct_type_test( reader, data11b ); + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + s.structOptions = 0; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeReader( reader ); WsFreeHeap( heap ); WsFreeError( error ); diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 12b7984..424f3fe 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -41,12 +41,18 @@ HRESULT set_output( WS_XML_WRITER * ) DECLSPEC_HIDDEN; HRESULT set_input( WS_XML_READER *, char *, ULONG ) DECLSPEC_HIDDEN; ULONG get_type_size( WS_TYPE, const WS_STRUCT_DESCRIPTION * ) DECLSPEC_HIDDEN; +enum node_flag +{ + NODE_FLAG_IGNORE_TRAILING_ELEMENT_CONTENT = 0x1, +}; + struct node { WS_XML_ELEMENT_NODE hdr; struct list entry; struct node *parent; struct list children; + ULONG flags; }; struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : d2d1: Implement GetDesktopDpi().
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 4121b223c85a5d0d491a3d9b5674ea854ba84716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4121b223c85a5d0d491a3d9b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 11 23:40:52 2016 +0300 d2d1: Implement GetDesktopDpi(). 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/factory.c | 36 +++++++++++++++++++++++++++++++----- dlls/d2d1/tests/d2d1.c | 17 +++++++++++++++++ 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 86c1690..b83d221 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -30,6 +30,9 @@ struct d2d_factory LONG refcount; ID3D10Device1 *device; + + float dpi_x; + float dpi_y; }; static inline struct d2d_factory *impl_from_ID2D1Factory(ID2D1Factory *iface) @@ -37,6 +40,24 @@ static inline struct d2d_factory *impl_from_ID2D1Factory(ID2D1Factory *iface) return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory_iface); } +static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) +{ + HDC hdc; + + if (!(hdc = GetDC(NULL))) + { + factory->dpi_x = factory->dpi_y = 96.0f; + return E_FAIL; + } + + factory->dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + factory->dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + + ReleaseDC(NULL, hdc); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -84,17 +105,21 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory *iface) static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_factory *factory = impl_from_ID2D1Factory(iface); - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + return d2d_factory_reload_sysmetrics(factory); } static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory *iface, float *dpi_x, float *dpi_y) { - FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); + struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + + TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); - *dpi_x = 96.0f; - *dpi_y = 96.0f; + *dpi_x = factory->dpi_x; + *dpi_y = factory->dpi_y; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory *iface, @@ -381,6 +406,7 @@ static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE fact factory->ID2D1Factory_iface.lpVtbl = &d2d_factory_vtbl; factory->refcount = 1; + d2d_factory_reload_sysmetrics(factory); } HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 38012ca..433b1a5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3099,6 +3099,22 @@ todo_wine ID2D1Factory_Release(factory); } +static void test_desktop_dpi(void) +{ + ID2D1Factory *factory; + float dpi_x, dpi_y; + HRESULT hr; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + dpi_x = dpi_y = 0.0f; + ID2D1Factory_GetDesktopDpi(factory, &dpi_x, &dpi_y); + ok(dpi_x > 0.0f && dpi_y > 0.0f, "Got wrong dpi %f x %f.\n", dpi_x, dpi_y); + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { test_clip(); @@ -3116,4 +3132,5 @@ START_TEST(d2d1) test_dc_target(); test_hwnd_target(); test_bitmap_target(); + test_desktop_dpi(); }

1 0

Sebastian Lackner : ntoskrnl.exe: Don' t transfer back input buffer for IRP_MJ_WRITE requests.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 8d799ea57bf607dc5e44089efdfd61f9511c657b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d799ea57bf607dc5e44089ef… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 12 18:53:55 2016 +0200 ntoskrnl.exe: Don't transfer back input buffer for IRP_MJ_WRITE requests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 ++++++++++--- include/ddk/wdm.h | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 909bf6f..5d423e0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -176,12 +176,15 @@ static HANDLE get_device_manager(void) static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { FILE_OBJECT *file = irp->Tail.Overlay.OriginalFileObject; + HANDLE irp_handle = context; void *out_buff = irp->UserBuffer; - HANDLE handle = context; + + if (irp->Flags & IRP_WRITE_OPERATION) + out_buff = NULL; /* do not transfer back input buffer */ SERVER_START_REQ( set_irp_result ) { - req->handle = wine_server_obj_handle( handle ); + req->handle = wine_server_obj_handle( irp_handle ); req->status = irp->IoStatus.u.Status; req->file_ptr = wine_server_client_ptr( file ); if (irp->IoStatus.u.Status >= 0) @@ -193,7 +196,7 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, } SERVER_END_REQ; - HeapFree( GetProcessHeap(), 0, out_buff ); + HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); return STATUS_SUCCESS; } @@ -248,6 +251,7 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON irp->UserIosb = NULL; irp->UserEvent = NULL; + irp->Flags |= IRP_CREATE_OPERATION; dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; @@ -285,6 +289,7 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irp->UserIosb = NULL; irp->UserEvent = NULL; + irp->Flags |= IRP_CLOSE_OPERATION; dispatch_irp( device, irp, irp_handle ); HeapFree( GetProcessHeap(), 0, file ); /* FIXME: async close processing not supported */ @@ -325,6 +330,7 @@ static NTSTATUS dispatch_read( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->Parameters.Read.Key = params->read.key; + irp->Flags |= IRP_READ_OPERATION; dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; @@ -358,6 +364,7 @@ static NTSTATUS dispatch_write( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->Parameters.Write.Key = params->write.key; + irp->Flags |= IRP_WRITE_OPERATION; dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5602f7d..d6ee235 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -457,6 +457,23 @@ typedef struct _IRP { } IRP; typedef struct _IRP *PIRP; +#define IRP_NOCACHE 0x0001 +#define IRP_PAGING_IO 0x0002 +#define IRP_MOUNT_COMPLETION 0x0002 +#define IRP_SYNCHRONOUS_API 0x0004 +#define IRP_ASSOCIATED_IRP 0x0008 +#define IRP_BUFFERED_IO 0x0010 +#define IRP_DEALLOCATE_BUFFER 0x0020 +#define IRP_INPUT_OPERATION 0x0040 +#define IRP_SYNCHRONOUS_PAGING_IO 0x0040 +#define IRP_CREATE_OPERATION 0x0080 +#define IRP_READ_OPERATION 0x0100 +#define IRP_WRITE_OPERATION 0x0200 +#define IRP_CLOSE_OPERATION 0x0400 +#define IRP_DEFER_IO_COMPLETION 0x0800 +#define IRP_OB_QUERY_NAME 0x1000 +#define IRP_HOLD_DEVICE_QUEUE 0x2000 + typedef VOID (WINAPI *PINTERFACE_REFERENCE)( PVOID Context);

1 0

Jacek Caban : ntdll/tests: Added a test of using NtCancelIoEx on iosb associated with pipe listening.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 86b5ec3fd1fb8c42f7e79b29647c59cd698aa236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b5ec3fd1fb8c42f7e79b296… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 12 17:13:52 2016 +0200 ntdll/tests: Added a test of using NtCancelIoEx on iosb associated with pipe listening. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 90ba950..dffd3f3 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -75,6 +75,7 @@ static NTSTATUS (WINAPI *pNtCreateNamedPipeFile) (PHANDLE handle, ULONG access, static NTSTATUS (WINAPI *pNtQueryInformationFile) (IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID FileInformation, IN ULONG Length, IN FILE_INFORMATION_CLASS FileInformationClass); static NTSTATUS (WINAPI *pNtSetInformationFile) (HANDLE handle, PIO_STATUS_BLOCK io, PVOID ptr, ULONG len, FILE_INFORMATION_CLASS class); static NTSTATUS (WINAPI *pNtCancelIoFile) (HANDLE hFile, PIO_STATUS_BLOCK io_status); +static NTSTATUS (WINAPI *pNtCancelIoFileEx) (HANDLE hFile, IO_STATUS_BLOCK *iosb, IO_STATUS_BLOCK *io_status); static void (WINAPI *pRtlInitUnicodeString) (PUNICODE_STRING target, PCWSTR source); static HANDLE (WINAPI *pOpenThread)(DWORD dwDesiredAccess, BOOL bInheritHandle, DWORD dwThreadId); @@ -95,6 +96,7 @@ static BOOL init_func_ptrs(void) loadfunc(NtQueryInformationFile) loadfunc(NtSetInformationFile) loadfunc(NtCancelIoFile) + loadfunc(NtCancelIoFileEx) loadfunc(RtlInitUnicodeString) /* not fatal */ @@ -498,6 +500,21 @@ static void test_cancelio(void) ok(ioapc_called, "IOAPC didn't run\n"); + CloseHandle(hPipe); + + res = create_pipe(&hPipe, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */); + ok(!res, "NtCreateNamedPipeFile returned %x\n", res); + + memset(&iosb, 0x55, sizeof(iosb)); + res = listen_pipe(hPipe, hEvent, &iosb, FALSE); + ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); + + res = pNtCancelIoFileEx(hPipe, &iosb, &cancel_sb); + ok(!res, "NtCancelIoFileEx returned %x\n", res); + + ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status); + ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); + CloseHandle(hEvent); CloseHandle(hPipe); }

1 0

Roman Pisl : shell32: Implement NIM_SETVERSION.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 6d7a32a1075999be44f312210766d992a09c735f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7a32a1075999be44f312210… Author: Roman Pisl <rpisl(a)seznam.cz> Date: Mon Oct 10 16:35:38 2016 +0200 shell32: Implement NIM_SETVERSION. Signed-off-by: Roman Pisl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/systray.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index dfa30ff..a043912 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -234,6 +234,8 @@ noicon: } if (data->uFlags & NIF_GUID) data->guidItem = nid->guidItem; + if (dwMessage == NIM_SETVERSION) + data->u.uVersion = nid->u.uVersion; /* FIXME: balloon icon */ cds.lpData = data;

1 0

Roman Pisl : winex11: Implement NIM_SETVERSION.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 9f774ada6c4f5b1bd3ac56bd47f342758028e97a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f774ada6c4f5b1bd3ac56bd4… Author: Roman Pisl <rpisl(a)seznam.cz> Date: Mon Oct 10 16:35:39 2016 +0200 winex11: Implement NIM_SETVERSION. Signed-off-by: Roman Pisl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/systray.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index c7e7013..794f2c6 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -65,6 +65,7 @@ struct tray_icon UINT info_flags; /* flags for info balloon */ UINT info_timeout; /* timeout for info balloon */ HICON info_icon; /* info balloon icon */ + UINT version; /* notify icon api version */ }; static struct list icon_list = LIST_INIT( icon_list ); @@ -484,15 +485,37 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR case WM_LBUTTONDBLCLK: case WM_RBUTTONDBLCLK: case WM_MBUTTONDBLCLK: - /* notify the owner hwnd of the message */ - TRACE("relaying 0x%x\n", msg); - ret = PostMessageW(icon->owner, icon->callback_message, icon->id, msg); - if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { - WARN( "application window was destroyed, removing icon %u\n", icon->id ); - delete_icon( icon ); + WPARAM wpar; + BOOL oldver; + + oldver = icon->version <= NOTIFY_VERSION; + if (oldver) { + /* 0 up to NOTIFYICON_VERSION (=3) */ + wpar = icon->id; + } else { + /* NOTIFYICON_VERSION_4 */ + RECT rect; + WORD x, y; + + GetWindowRect( icon->window, &rect ); + x = rect.left + LOWORD(lparam); + y = rect.top + HIWORD(lparam); + wpar = MAKEWPARAM(x, y); + } + + /* notify the owner hwnd of the message */ + TRACE("relaying 0x%x\n", msg); + ret = PostMessageW(icon->owner, icon->callback_message, wpar, + oldver ? msg : MAKELPARAM(msg, icon->id)); + + if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) + { + WARN( "application window was destroyed, removing icon %u\n", icon->id ); + delete_icon( icon ); + } + return 0; } - return 0; case WM_WINDOWPOSCHANGED: update_systray_balloon_position(); @@ -834,6 +857,13 @@ int CDECL wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data ) case NIM_MODIFY: if ((icon = get_icon( data->hWnd, data->uID ))) ret = modify_icon( icon, data ); break; + case NIM_SETVERSION: + if ((icon = get_icon( data->hWnd, data->uID ))) + { + icon->version = data->u.uVersion; + ret = TRUE; + } + break; case 0xdead: /* Wine extension: owner window has died */ cleanup_icons( data->hWnd ); break;

1 0

Roman Pisl : explorer: Implement NIM_SETVERSION.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: fcad721081ebd60aa6e9dfcc177a6a45b9d7d072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcad721081ebd60aa6e9dfcc1… Author: Roman Pisl <rpisl(a)seznam.cz> Date: Mon Oct 10 16:35:40 2016 +0200 explorer: Implement NIM_SETVERSION. Signed-off-by: Roman Pisl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 97cffbc..a08685b 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -77,6 +77,7 @@ struct icon UINT info_flags; /* flags for info balloon */ UINT info_timeout; /* timeout for info balloon */ HICON info_icon; /* info balloon icon */ + UINT version; /* notify icon api version */ }; static struct list icon_list = LIST_INIT( icon_list ); @@ -586,6 +587,10 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) case NIM_MODIFY: if (icon) ret = modify_icon( icon, &nid ); break; + case NIM_SETVERSION: + icon->version = nid.u.uVersion; + ret = TRUE; + break; default: WINE_FIXME("unhandled tray message: %ld\n", cds->dwData); break; @@ -790,6 +795,9 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_RBUTTONDBLCLK: case WM_MBUTTONDBLCLK: { + WPARAM wpar; + BOOL oldver; + BOOL ret; MSG message; struct icon *icon = icon_from_point( (short)LOWORD(lparam), (short)HIWORD(lparam) ); if (!icon) break; @@ -803,8 +811,26 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l message.lParam = lparam; SendMessageW( icon->tooltip, TTM_RELAYEVENT, 0, (LPARAM)&message ); - if (!PostMessageW( icon->owner, icon->callback_message, (WPARAM) icon->id, (LPARAM) msg ) && - GetLastError() == ERROR_INVALID_WINDOW_HANDLE) + oldver = icon->version <= NOTIFY_VERSION; + if (oldver) { + /* 0 up to NOTIFYICON_VERSION (=3) */ + wpar = icon->id; + } else { + /* NOTIFYICON_VERSION_4 */ + RECT rect; + WORD x, y; + + rect = get_icon_rect( icon ); + MapWindowPoints( tray_window, 0, (POINT *)&rect, 2 ); + x = rect.left + LOWORD(lparam); + y = rect.top + HIWORD(lparam); + wpar = MAKEWPARAM(x, y); + } + + ret = PostMessageW(icon->owner, icon->callback_message, wpar, + oldver ? msg : MAKELPARAM(msg, icon->id)); + + if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WINE_WARN("application window was destroyed without removing " "notification icon, removing automatically\n");

1 0