Hans Leidekker : webservices: Fix reader movement for text field mappings.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a5a12491acf3c8a1a02c4e4b34ac014669395aa4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a5a12491acf3c8a1a02c4e4b34ac014669395aa4

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Wed Apr 13 13:49:39 2016 +0200

webservices: Fix reader movement for text field mappings.

Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/webservices/reader.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c
index 8191aa5..713e992 100644
--- a/dlls/webservices/reader.c
+++ b/dlls/webservices/reader.c
@@ -2016,6 +2016,7 @@ static HRESULT read_get_text( struct reader *reader, WS_TYPE_MAPPING mapping,
     }
     case WS_ELEMENT_TYPE_MAPPING:
     case WS_ELEMENT_CONTENT_TYPE_MAPPING:
+    case WS_ANY_ELEMENT_TYPE_MAPPING:
     {
         HRESULT hr;
         *found = TRUE;
@@ -2690,8 +2691,9 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION
     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 (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT;
 
-    return read_type( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, desc->type, NULL, NULL,
+    return read_type( reader, WS_ANY_ELEMENT_TYPE_MAPPING, desc->type, NULL, NULL,
                       desc->typeDescription, option, heap, ret, size );
 }
 
@@ -2875,6 +2877,7 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP
         if ((hr = read_type_next_element_node( reader, localname, ns )) != S_OK) return hr;
         break;
 
+    case WS_ANY_ELEMENT_TYPE_MAPPING:
     case WS_ATTRIBUTE_TYPE_MAPPING:
         break;