July 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : ntdll: Remove a redundant NULL check before RtlFreeHeap().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 7c8832b23a1bd193cdf645bcbb0519fd51be3c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8832b23a1bd193cdf645bcb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:18:07 2016 +0200 ntdll: Remove a redundant NULL check before RtlFreeHeap(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index d26a5c4..323ee68 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4585,7 +4585,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) } ret = RtlDosPathNameToNtPathName_U(source ? source : pActCtx->lpSource, &nameW, NULL, NULL); - if (source) RtlFreeHeap( GetProcessHeap(), 0, source ); + RtlFreeHeap( GetProcessHeap(), 0, source ); if (!ret) { status = STATUS_NO_SUCH_FILE;

1 0

Michael Stefaniuc : ole32: Remove a redundant NULL check before CoTaskMemFree().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 66f13236fe3d5f4cfa17d48182ebf2d397280b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f13236fe3d5f4cfa17d4818… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:13:13 2016 +0200 ole32: Remove a redundant NULL check before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 9cffb63..c7a9b27 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2713,8 +2713,7 @@ static void OLE_FreeClipDataArray(ULONG count, CLIPDATA * pClipDataArray) { ULONG i; for (i = 0; i < count; i++) - if (pClipDataArray[i].pClipData) - CoTaskMemFree(pClipDataArray[i].pClipData); + CoTaskMemFree(pClipDataArray[i].pClipData); } /***********************************************************************

1 0

Michael Stefaniuc : wined3d: Remove a redundant NULL check before HeapFree ().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 10925fa4515a1cac31dad436a38e575423a1bd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10925fa4515a1cac31dad436a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:09:10 2016 +0200 wined3d: Remove a redundant NULL check before HeapFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6a9f7fc..9a9eafb 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -459,8 +459,7 @@ struct wined3d_string_buffer *string_buffer_get(struct wined3d_string_buffer_lis if (!buffer || !string_buffer_init(buffer)) { ERR("Couldn't allocate buffer for temporary string.\n"); - if (buffer) - HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, buffer); return NULL; } }

1 0

Hans Leidekker : webservices: Add support for writing double values.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: df4046a3705972978c408cf44ab0fd636e25e31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4046a3705972978c408cf44… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:30 2016 +0200 webservices: Add support for writing double values. 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/tests/writer.c | 113 +++++++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 2 + dlls/webservices/writer.c | 100 +++++++++++++++++++++++++++++ include/webservices.h | 5 ++ 5 files changed, 224 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9e33000..1a51257 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2271,7 +2271,7 @@ static HRESULT str_to_uint64( const unsigned char *str, ULONG len, UINT64 max, U #if defined(__i386__) || defined(__x86_64__) #define RC_DOWN 0x100; -static BOOL set_fp_rounding( unsigned short *save ) +BOOL set_fp_rounding( unsigned short *save ) { #ifdef __GNUC__ unsigned short fpword; @@ -2286,7 +2286,7 @@ static BOOL set_fp_rounding( unsigned short *save ) return FALSE; #endif } -static void restore_fp_rounding( unsigned short fpword ) +void restore_fp_rounding( unsigned short fpword ) { #ifdef __GNUC__ __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); @@ -2295,12 +2295,12 @@ static void restore_fp_rounding( unsigned short fpword ) #endif } #else -static BOOL set_fp_rounding( unsigned short *save ) +BOOL set_fp_rounding( unsigned short *save ) { FIXME( "not implemented\n" ); return FALSE; } -static void restore_fp_rounding( unsigned short fpword ) +void restore_fp_rounding( unsigned short fpword ) { FIXME( "not implemented\n" ); } diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 9055021..d230cdd 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -21,6 +21,25 @@ #include "webservices.h" #include "wine/test.h" +#include <math.h> +#ifndef INFINITY +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() +#endif + +#ifndef NAN +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() +#endif + static HRESULT set_output( WS_XML_WRITER *writer ) { WS_XML_WRITER_TEXT_ENCODING encoding; @@ -1871,6 +1890,99 @@ static void test_text_types(void) WsFreeWriter( writer ); } +static void test_double(void) +{ + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + static const struct + { + double val; + const char *result; + } + tests[] = + { + {0.0, "<t>0</t>"}, + {1.0, "<t>1</t>"}, + {-1.0, "<t>-1</t>"}, + {1.0000000000000001, "<t>1</t>"}, + {1.0000000000000002, "<t>1.0000000000000002</t>"}, + {1.0000000000000003, "<t>1.0000000000000002</t>"}, + {1.0000000000000004, "<t>1.0000000000000004</t>"}, + {100000000000000, "<t>100000000000000</t>"}, + {1000000000000000, "<t>1E+15</t>"}, + {0.1, "<t>0.1</t>"}, + {0.01, "<t>1E-2</t>"}, + {-0.1, "<t>-0.1</t>"}, + {-0.01, "<t>-1E-2</t>"}, + {1.7976931348623158e308, "<t>1.7976931348623157E+308</t>"}, + {-1.7976931348623158e308, "<t>-1.7976931348623157E+308</t>"}, + }; + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_DOUBLE_TEXT text; + ULONG i; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + text.text.textType = WS_XML_TEXT_TYPE_DOUBLE; + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + text.value = tests[i].val; + hr = WsWriteText( writer, &text.text, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + check_output( writer, tests[i].result, __LINE__ ); + } + + 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 ); + + text.value = NAN; + hr = WsWriteText( writer, &text.text, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>NaN</t>", __LINE__ ); + + 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 ); + + text.value = INFINITY; + hr = WsWriteText( writer, &text.text, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>INF</t>", __LINE__ ); + + 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 ); + + text.value = -INFINITY; + hr = WsWriteText( writer, &text.text, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>-INF</t>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -1896,4 +2008,5 @@ START_TEST(writer) test_WsWriteNode(); test_WsCopyNode(); test_text_types(); + test_double(); } diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index bad2dfb..26cba38 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -33,6 +33,8 @@ WS_XML_UTF8_TEXT *alloc_utf8_text( const unsigned char *, ULONG ) DECLSPEC_HIDDE HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; WS_TYPE map_value_type( WS_VALUE_TYPE ) DECLSPEC_HIDDEN; +BOOL set_fp_rounding( unsigned short * ) DECLSPEC_HIDDEN; +void restore_fp_rounding( unsigned short ) DECLSPEC_HIDDEN; struct node { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 85a8973..48c7382 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -18,6 +18,7 @@ #include <stdarg.h> #include <stdio.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -1042,6 +1043,92 @@ static ULONG format_uint64( const UINT64 *ptr, unsigned char *buf ) return wsprintfA( (char *)buf, "%I64u", *ptr ); } +static ULONG format_double( const double *ptr, unsigned char *buf ) +{ + static const double precision = 0.0000000000000001; + unsigned char *p = buf; + double val = *ptr; /* FIXME: use long double */ + int neg, mag, mag2, use_exp; + + if (isnan( val )) + { + memcpy( buf, "NaN", 3 ); + return 3; + } + if (isinf( val )) + { + if (val < 0) + { + memcpy( buf, "-INF", 4 ); + return 4; + } + memcpy( buf, "INF", 3 ); + return 3; + } + if (val == 0.0) + { + *p = '0'; + return 1; + } + + if ((neg = val < 0)) + { + *p++ = '-'; + val = -val; + } + + mag = log10( val ); + use_exp = (mag >= 15 || (neg && mag >= 1) || mag <= -1); + if (use_exp) + { + if (mag < 0) mag -= 1; + val = val / pow( 10.0, mag ); + mag2 = mag; + mag = 0; + } + else if (mag < 1) mag = 0; + + while (val > precision || mag >= 0) + { + double weight = pow( 10.0, mag ); + if (weight > 0 && !isinf( weight )) + { + int digit = floor( val / weight ); + val -= digit * weight; + *(p++) = '0' + digit; + } + if (!mag && val > 0) *(p++) = '.'; + mag--; + } + + if (use_exp) + { + int i, j; + *(p++) = 'E'; + if (mag2 > 0) *(p++) = '+'; + else + { + *(p++) = '-'; + mag2 = -mag2; + } + mag = 0; + while (mag2 > 0) + { + *(p++) = '0' + mag2 % 10; + mag2 /= 10; + mag++; + } + for (i = -mag, j = -1; i < j; i++, j--) + { + p[i] ^= p[j]; + p[j] ^= p[i]; + p[i] ^= p[j]; + } + } + + return p - buf; +} + static ULONG format_guid( const GUID *ptr, unsigned char *buf ) { static const char fmt[] = "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x"; @@ -1111,6 +1198,19 @@ static HRESULT text_to_utf8text( const WS_XML_TEXT *text, WS_XML_UTF8_TEXT **ret if (!(*ret = alloc_utf8_text( buf, len ))) return E_OUTOFMEMORY; return S_OK; } + case WS_XML_TEXT_TYPE_DOUBLE: + { + const WS_XML_DOUBLE_TEXT *double_text = (const WS_XML_DOUBLE_TEXT *)text; + unsigned char buf[24]; /* "-1.1111111111111111E-308" */ + unsigned short fpword; + ULONG len; + + if (!set_fp_rounding( &fpword )) return E_NOTIMPL; + len = format_double( &double_text->value, buf ); + restore_fp_rounding( fpword ); + if (!(*ret = alloc_utf8_text( buf, len ))) return E_OUTOFMEMORY; + return S_OK; + } case WS_XML_TEXT_TYPE_GUID: { const WS_XML_GUID_TEXT *id = (const WS_XML_GUID_TEXT *)text; diff --git a/include/webservices.h b/include/webservices.h index c9c2ade..e35e389 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -577,6 +577,11 @@ typedef struct _WS_XML_UINT64_TEXT { unsigned __int64 value; } WS_XML_UINT64_TEXT; +typedef struct _WS_XML_DOUBLE_TEXT { + WS_XML_TEXT text; + double value; +} WS_XML_DOUBLE_TEXT; + typedef struct _WS_XML_GUID_TEXT { WS_XML_TEXT text; GUID value;

1 0

Hans Leidekker : webservices: Inherit the prefix only if parent and child namespaces match.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: d921526312e7f2da54c53a8d4f91ba330db7e761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d921526312e7f2da54c53a8d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:31 2016 +0200 webservices: Inherit the prefix only if parent and child namespaces match. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 29 ++++++++++++++++++++++++----- dlls/webservices/writer.c | 7 +++++-- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index d230cdd..6be47b5 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -364,7 +364,7 @@ static void test_WsWriteStartElement(void) { HRESULT hr; WS_XML_WRITER *writer; - WS_XML_STRING prefix = {1, (BYTE *)"p"}, ns = {2, (BYTE *)"ns"}; + WS_XML_STRING prefix = {1, (BYTE *)"p"}, ns = {2, (BYTE *)"ns"}, ns2 = {3, (BYTE *)"ns2"}; WS_XML_STRING localname = {1, (BYTE *)"a"}, localname2 = {1, (BYTE *)"b"}; hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; @@ -404,21 +404,40 @@ static void test_WsWriteStartElement(void) hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - check_output( writer, "<a xmlns=\"ns\">", __LINE__ ); + check_output( writer, "<p:a xmlns:p=\"ns\">", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:a xmlns:p=\"ns\"><p:b/>", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:a xmlns:p=\"ns\"><p:b/></p:a>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteStartElement( writer, NULL, &localname2, &ns2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:a xmlns:p=\"ns\">", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - check_output( writer, "<a xmlns=\"ns\"><b/>", __LINE__ ); + check_output( writer, "<p:a xmlns:p=\"ns\"><b xmlns=\"ns2\"/>", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - check_output( writer, "<a xmlns=\"ns\"><b/></a>", __LINE__ ); + check_output( writer, "<p:a xmlns:p=\"ns\"><b xmlns=\"ns2\"/></p:a>", __LINE__ ); WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 48c7382..f8512dc 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -929,8 +929,11 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; - if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT) - prefix = writer->current->hdr.prefix; + if (!prefix && node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) + { + elem = &parent->hdr; + if (WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK) prefix = elem->prefix; + } if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) return E_OUTOFMEMORY; elem = &node->hdr;

1 0

Hans Leidekker : webservices: Allow integer values to be passed by pointer in WsWriteType.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 04c52f14673b5ff1e8865e53a44e820e35db6422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c52f14673b5ff1e8865e53a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:32 2016 +0200 webservices: Allow integer values to be passed by pointer in WsWriteType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 84 +++++++++++++++++++++-------------------- dlls/webservices/writer.c | 73 +++++++++++++++++++++++++---------- 2 files changed, 97 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04c52f14673b5ff1e8865…

1 0

Hans Leidekker : webservices: Return the number of bytes written from WsWriteXmlBufferToBytes.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: da5c332c924cbc4c485c48edab083ec6527b1988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5c332c924cbc4c485c48eda… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:33 2016 +0200 webservices: Return the number of bytes written from WsWriteXmlBufferToBytes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 50cd398..45c5021 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1929,6 +1929,7 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu if (!(buf = ws_alloc( heap, xmlbuf->size ))) return WS_E_QUOTA_EXCEEDED; memcpy( buf, xmlbuf->ptr, xmlbuf->size ); *bytes = buf; + *size = xmlbuf->size; return S_OK; }

1 0

Hans Leidekker : webservices: Implement WsCreateMessageForChannel.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: dc8033d3710f2c04945e50d499bae727f5736cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8033d3710f2c04945e50d49… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:34 2016 +0200 webservices: Implement WsCreateMessageForChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 83 +++++++++++++++++++++++++++--- dlls/webservices/tests/msg.c | 103 +++++++++++++++++++++++++++++++++++--- dlls/webservices/webservices.spec | 2 +- 3 files changed, 172 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc8033d3710f2c04945e5…

1 0

Hans Leidekker : webservices: Implement WsInitializeMessage.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: d91a7d2e4b39341ea1629ad1b57c12c268bcb654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91a7d2e4b39341ea1629ad1b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:35 2016 +0200 webservices: Implement WsInitializeMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 25 ++++++++++++++++++ dlls/webservices/tests/msg.c | 54 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 82c8106..b3444e0 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -44,6 +44,7 @@ static const struct prop_desc msg_props[] = struct msg { + WS_MESSAGE_INITIALIZATION init; WS_MESSAGE_STATE state; WS_ENVELOPE_VERSION version_env; WS_ADDRESSING_VERSION version_addr; @@ -144,6 +145,30 @@ HRESULT WINAPI WsCreateMessageForChannel( WS_CHANNEL *channel_handle, const WS_M } /************************************************************************** + * WsInitializeMessage [webservices.@] + */ +HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATION init, + WS_MESSAGE *src_handle, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %u %p %p\n", handle, init, src_handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (src_handle) + { + FIXME( "src message not supported\n" ); + return E_NOTIMPL; + } + + if (!handle || init > WS_FAULT_MESSAGE) return E_INVALIDARG; + if (msg->state >= WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + msg->init = init; + msg->state = WS_MESSAGE_STATE_INITIALIZED; + return S_OK; +} + +/************************************************************************** * WsFreeMessage [webservices.@] */ void WINAPI WsFreeMessage( WS_MESSAGE *handle ) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 957a64e..e7b91d0 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -156,8 +156,62 @@ static void test_WsCreateMessageForChannel(void) WsFreeMessage( msg ); } +static void test_WsInitializeMessage(void) +{ + HRESULT hr; + WS_MESSAGE *msg; + WS_MESSAGE_STATE state; + WS_ENVELOPE_VERSION env_version; + WS_ADDRESSING_VERSION addr_version; + BOOL addressed; + + return; + hr = WsInitializeMessage( NULL, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, + 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, 0xdeadbeef, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + state = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_MESSAGE_STATE_INITIALIZED, "got %u\n", state ); + + addressed = -1; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !addressed, "unexpected value %d\n", addressed ); + + state = WS_MESSAGE_STATE_EMPTY; + hr = WsSetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + env_version = WS_ENVELOPE_VERSION_SOAP_1_1; + hr = WsSetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, + sizeof(env_version), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + addr_version = WS_ADDRESSING_VERSION_0_9; + hr = WsSetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, + sizeof(addr_version), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); test_WsCreateMessageForChannel(); + test_WsInitializeMessage(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 8c9c8ee..6a3fbd4 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -90,7 +90,7 @@ @ stdcall WsGetWriterPosition(ptr ptr ptr) @ stdcall WsGetWriterProperty(ptr long ptr long ptr) @ stdcall WsGetXmlAttribute(ptr ptr ptr ptr ptr ptr) -@ stub WsInitializeMessage +@ stdcall WsInitializeMessage(ptr long ptr ptr) @ stub WsMarkHeaderAsUnderstood @ stub WsMatchPolicyAlternative @ stdcall WsMoveReader(ptr long ptr ptr)

1 0

Hans Leidekker : webservices: Implement WsAddressMessage.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: e36a185fd878804de9d752fe8388742ed4ebc602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36a185fd878804de9d752fe8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:36 2016 +0200 webservices: Implement WsAddressMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 32 ++++++++++++++++++++ dlls/webservices/tests/msg.c | 63 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index b3444e0..360e0bd 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -49,6 +49,7 @@ struct msg WS_ENVELOPE_VERSION version_env; WS_ADDRESSING_VERSION version_addr; BOOL is_addressed; + WS_STRING addr; ULONG prop_count; struct prop prop[sizeof(msg_props)/sizeof(msg_props[0])]; }; @@ -68,6 +69,8 @@ static struct msg *alloc_msg(void) static void free_msg( struct msg *msg ) { + if (!msg) return; + heap_free( msg->addr.chars ); heap_free( msg ); } @@ -246,3 +249,32 @@ HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID } return prop_set( msg->prop, msg->prop_count, id, value, size ); } + +/************************************************************************** + * WsAddressMessage [webservices.@] + */ +HRESULT WINAPI WsAddressMessage( WS_MESSAGE *handle, const WS_ENDPOINT_ADDRESS *addr, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %p %p\n", handle, addr, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (addr && (addr->headers || addr->extensions || addr->identity)) + { + FIXME( "headers, extensions or identity not supported\n" ); + return E_NOTIMPL; + } + + if (!handle) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED || msg->is_addressed) return WS_E_INVALID_OPERATION; + + if (addr && addr->url.length) + { + if (!(msg->addr.chars = heap_alloc( addr->url.length * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + memcpy( msg->addr.chars, addr->url.chars, addr->url.length * sizeof(WCHAR) ); + msg->addr.length = addr->url.length; + } + + msg->is_addressed = TRUE; + return S_OK; +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index e7b91d0..3e321d7 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -209,9 +209,72 @@ static void test_WsInitializeMessage(void) WsFreeMessage( msg ); } +static void test_WsAddressMessage(void) +{ + static WCHAR localhost[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t','/',0}; + HRESULT hr; + WS_MESSAGE *msg; + WS_ENDPOINT_ADDRESS endpoint; + BOOL addressed; + + hr = WsAddressMessage( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, + 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), + NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsAddressMessage( msg, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + addressed = -1; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !addressed, "unexpected value %d\n", addressed ); + + hr = WsAddressMessage( msg, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + addressed = -1; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addressed == TRUE, "unexpected value %d\n", addressed ); + WsFreeMessage( msg ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, + 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &endpoint, 0, sizeof(endpoint) ); + endpoint.url.chars = localhost; + endpoint.url.length = sizeof(localhost)/sizeof(localhost[0]); + hr = WsAddressMessage( msg, &endpoint, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + addressed = -1; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addressed == TRUE, "unexpected value %d\n", addressed ); + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); test_WsCreateMessageForChannel(); test_WsInitializeMessage(); + test_WsAddressMessage(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 6a3fbd4..a702fc0 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -8,7 +8,7 @@ @ stub WsAddCustomHeader @ stub WsAddErrorString @ stub WsAddMappedHeader -@ stub WsAddressMessage +@ stdcall WsAddressMessage(ptr ptr ptr) @ stdcall WsAlloc(ptr long ptr ptr) @ stub WsAsyncExecute @ stdcall WsCall(ptr ptr ptr ptr ptr long ptr ptr)

1 0