[6/8] webservices: Allow structures to be passed by value in WsWriteType.
Hans Leidekker
hans at codeweavers.com
Thu Aug 25 13:02:48 CDT 2016
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
---
dlls/webservices/tests/writer.c | 15 +++++++++++++++
dlls/webservices/writer.c | 4 +---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c
index 128e66e..8888c69 100644
--- a/dlls/webservices/tests/writer.c
+++ b/dlls/webservices/tests/writer.c
@@ -791,6 +791,21 @@ static void test_simple_struct_type(void)
ok( hr == S_OK, "got %08x\n", hr );
check_output( writer, "<struct>value</struct>", __LINE__ );
+ /* required value */
+ hr = set_output( writer );
+ ok( hr == S_OK, "got %08x\n", hr );
+
+ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL );
+ ok( hr == S_OK, "got %08x\n", hr );
+
+ hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s,
+ WS_WRITE_REQUIRED_VALUE, test, sizeof(*test), NULL );
+ ok( hr == S_OK, "got %08x\n", hr );
+
+ hr = WsWriteEndElement( writer, NULL );
+ ok( hr == S_OK, "got %08x\n", hr );
+ check_output( writer, "<struct>value</struct>", __LINE__ );
+
hr = set_output( writer );
ok( hr == S_OK, "got %08x\n", hr );
diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c
index 89f9465..8872a37 100644
--- a/dlls/webservices/writer.c
+++ b/dlls/webservices/writer.c
@@ -1695,9 +1695,7 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY
case WS_STRUCT_TYPE:
{
const void *ptr;
-
- if (!desc || option == WS_WRITE_REQUIRED_VALUE) return E_INVALIDARG;
-
+ if (!desc) return E_INVALIDARG;
if (!option) option = WS_WRITE_REQUIRED_POINTER;
if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr;
return write_type_struct( writer, mapping, desc, ptr );
--
2.1.4
More information about the wine-patches
mailing list