January 2016 - Wine-commits

Hans Leidekker : webservices: Implement WsWriteXmlBufferToBytes.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: ed33639561f7bfe6ade90f4dac8575258aa32ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed33639561f7bfe6ade90f4da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:57 2016 +0100 webservices: Implement WsWriteXmlBufferToBytes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 42f5b63..fe9eb6c 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -188,6 +188,6 @@ @ stub WsWriteType @ stub WsWriteValue @ stdcall WsWriteXmlBuffer(ptr ptr ptr) -@ stub WsWriteXmlBufferToBytes +@ stdcall WsWriteXmlBufferToBytes(ptr ptr ptr ptr long ptr ptr ptr ptr) @ stub WsWriteXmlnsAttribute @ stdcall WsXmlStringEquals(ptr ptr ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 398d651..0178978 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -792,3 +792,41 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W write_bytes( writer, xmlbuf->ptr, xmlbuf->size ); return S_OK; } + +/************************************************************************** + * WsWriteXmlBufferToBytes [webservices.@] + */ +HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, + const WS_XML_WRITER_ENCODING *encoding, + const WS_XML_WRITER_PROPERTY *properties, ULONG count, + WS_HEAP *heap, void **bytes, ULONG *size, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + struct xmlbuf *xmlbuf = (struct xmlbuf *)buffer; + HRESULT hr; + char *buf; + ULONG i; + + TRACE( "%p %p %p %p %u %p %p %p %p\n", handle, buffer, encoding, properties, count, heap, + bytes, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !xmlbuf || !heap || !bytes) return E_INVALIDARG; + + if (encoding && encoding->encodingType != WS_XML_WRITER_ENCODING_TYPE_TEXT) + { + FIXME( "encoding type %u not supported\n", encoding->encodingType ); + return E_NOTIMPL; + } + + for (i = 0; i < count; i++) + { + hr = set_writer_prop( writer, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) return hr; + } + + if (!(buf = ws_alloc( heap, xmlbuf->size ))) return WS_E_QUOTA_EXCEEDED; + memcpy( buf, xmlbuf->ptr, xmlbuf->size ); + *bytes = buf; + return S_OK; +}

1 0

Hans Leidekker : webservices: Reject end elements without a parent in the writer.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 6086ad0fe384cd6744cf5c83f2ad4f336e381845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6086ad0fe384cd6744cf5c83f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:58 2016 +0100 webservices: Reject end elements without a parent in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 4 ++-- dlls/webservices/webservices_private.h | 2 ++ dlls/webservices/writer.c | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ae3d62a..13ca50b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1063,8 +1063,8 @@ static BOOL cmp_localname( const unsigned char *name1, ULONG len1, const unsigne return TRUE; } -static struct node *find_parent_element( struct node *node, const WS_XML_STRING *prefix, - const WS_XML_STRING *localname ) +struct node *find_parent_element( struct node *node, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname ) { struct node *parent; const WS_XML_STRING *str; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index bae2149..4eeedf5 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -32,6 +32,8 @@ WS_XML_STRING *alloc_xml_string( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; +struct node *find_parent_element( struct node *, const WS_XML_STRING *, + const WS_XML_STRING * ) DECLSPEC_HIDDEN; struct node { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 0178978..62e78be 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -546,10 +546,13 @@ static HRESULT write_startelement( struct writer *writer ) static HRESULT write_endelement( struct writer *writer ) { - WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)writer->current; + struct node *node = find_parent_element( writer->current, NULL, NULL ); + WS_XML_ELEMENT_NODE *elem = &node->hdr; ULONG size; HRESULT hr; + if (!elem) return WS_E_INVALID_FORMAT; + /* '</prefix:localname>' */ size = elem->localName->length + 3 /* '</>' */;

1 0

Hans Leidekker : webservices: Implement WsWriteType for a number of basic types.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 2563356bd64f98bbc0f5933d40550df932e60ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2563356bd64f98bbc0f5933d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:59 2016 +0100 webservices: Implement WsWriteType for a number of basic types. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 483 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 468 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2563356bd64f98bbc0f59…

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 8676f7bae099f0ca20c26a29dfa4bebd828b39b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8676f7bae099f0ca20c26a29d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:28:00 2016 +0100 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 189 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index f99705e..8394f7a 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -449,6 +449,193 @@ static void test_WsWriteStartAttribute(void) WsFreeWriter( writer ); } +static void test_WsWriteType(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_STRING prefix = {1, (BYTE*)"p"}, localname = {3, (BYTE *)"str"}, ns = {2, (BYTE *)"ns"}; + const WCHAR *val_str; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + val_str = testW; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + 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 ); + + /* required value */ + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_VALUE, NULL, sizeof(testW), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_VALUE, testW, sizeof(testW), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + /* required pointer */ + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, NULL, sizeof(val_str), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(WCHAR **), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">test", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">test</p:str>", __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 ); + + hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + val_str = testW; + hr = WsWriteType( writer, WS_ATTRIBUTE_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str p:str=\"test\" xmlns:p=\"ns\"/>", __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 ); + + val_str = testW; + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">test", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">test</p:str>", __LINE__ ); + + WsFreeWriter( writer ); +} + +static void test_basic_type(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + ULONG i; + static const struct + { + WS_TYPE type; + INT64 val; + ULONG size; + const char *result; + const char *result2; + } + tests[] = + { + { WS_BOOL_TYPE, TRUE, sizeof(BOOL), "<t>true</t>", "<t t=\"true\"/>" }, + { WS_BOOL_TYPE, FALSE, sizeof(BOOL), "<t>false</t>", "<t t=\"false\"/>" }, + { WS_INT8_TYPE, -128, sizeof(INT8), "<t>-128</t>", "<t t=\"-128\"/>" }, + { WS_INT16_TYPE, -32768, sizeof(INT16), "<t>-32768</t>", "<t t=\"-32768\"/>" }, + { WS_INT32_TYPE, -2147483647 - 1, sizeof(INT32), "<t>-2147483648</t>", + "<t t=\"-2147483648\"/>" }, + { WS_INT64_TYPE, -9223372036854775807 - 1, sizeof(INT64), "<t>-9223372036854775808</t>", + "<t t=\"-9223372036854775808\"/>" }, + { WS_UINT8_TYPE, 255, sizeof(UINT8), "<t>255</t>", "<t t=\"255\"/>" }, + { WS_UINT16_TYPE, 65535, sizeof(UINT16), "<t>65535</t>", "<t t=\"65535\"/>" }, + { WS_UINT32_TYPE, ~0u, sizeof(UINT32), "<t>4294967295</t>", "<t t=\"4294967295\"/>" }, + { WS_UINT64_TYPE, ~0, sizeof(UINT64), "<t>18446744073709551615</t>", + "<t t=\"18446744073709551615\"/>" }, + }; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + /* element content type mapping */ + 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, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, tests[i].type, NULL, + WS_WRITE_REQUIRED_VALUE, &tests[i].val, tests[i].size, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, tests[i].result, __LINE__ ); + } + + /* element type mapping is the same as element content type mapping for basic types */ + 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, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, tests[i].type, NULL, + WS_WRITE_REQUIRED_VALUE, &tests[i].val, tests[i].size, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, tests[i].result, __LINE__ ); + } + + /* attribute type mapping */ + 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, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ATTRIBUTE_TYPE_MAPPING, tests[i].type, NULL, + WS_WRITE_REQUIRED_VALUE, &tests[i].val, tests[i].size, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, tests[i].result2, __LINE__ ); + } + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -457,4 +644,6 @@ START_TEST(writer) test_WsSetOutputToBuffer(); test_WsWriteStartElement(); test_WsWriteStartAttribute(); + test_WsWriteType(); + test_basic_type(); }

1 0

Alexandre Julliard : configure: Don' t check for gnutls_hash if gnutls is missing entirely.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 90eb492a870470700a351913bc8e0724914bd9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90eb492a870470700a351913b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 15:53:14 2016 +0900 configure: Don't check for gnutls_hash if gnutls is missing entirely. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 24 ++++++++++++------------ configure.ac | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure b/configure index a17ad55..d0a7266 100755 --- a/configure +++ b/configure @@ -11585,18 +11585,7 @@ _ACEOF fi -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - GNUTLS_CFLAGS="" -fi - - -CPPFLAGS=$ac_save_CPPFLAGS -test -z "$GNUTLS_CFLAGS" || GNUTLS_CFLAGS=`echo " $GNUTLS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` -test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` - - ac_wine_check_funcs_save_LIBS="$LIBS" + ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $GNUTLS_LIBS" for ac_func in gnutls_hash do : @@ -11613,6 +11602,17 @@ done LIBS="$ac_wine_check_funcs_save_LIBS" fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + GNUTLS_CFLAGS="" +fi + + +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$GNUTLS_CFLAGS" || GNUTLS_CFLAGS=`echo " $GNUTLS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + +fi if test "x$ac_cv_lib_soname_gnutls" = "x"; then : case "x$with_gnutls" in x) as_fn_append wine_warnings "|libgnutls ${notice_platform}development files not found, no schannel support." ;; diff --git a/configure.ac b/configure.ac index 23fee7b..d20791a 100644 --- a/configure.ac +++ b/configure.ac @@ -1268,10 +1268,10 @@ then [AC_CHECK_HEADER(gnutls/gnutls.h, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h> #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], - [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]])])], + [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]]) + WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],, + [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])])])], [GNUTLS_CFLAGS=""])]) - WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],, - [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])]) fi WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], [libgnutls ${notice_platform}development files not found, no schannel support.])

1 0

Alexandre Julliard : configure: Don't check for gst/gstpad.h that we don' t use.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: cfb88194f260b7ada7cc55d216ed2fd8f970cc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb88194f260b7ada7cc55d21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 17:01:13 2016 +0900 configure: Don't check for gst/gstpad.h that we don't use. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 13 +++---------- configure.ac | 16 +++++++--------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/configure b/configure index d0a7266..e422437 100755 --- a/configure +++ b/configure @@ -12634,13 +12634,11 @@ ac_gst_incl="" done GSTREAMER_CFLAGS=$ac_gst_incl CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - ac_fn_c_check_header_mongrel "$LINENO" "gst/gstpad.h" "ac_cv_header_gst_gstpad_h" "$ac_includes_default" -if test "x$ac_cv_header_gst_gstpad_h" = xyes; then : - ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" + ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" if test "x$ac_cv_header_gst_gst_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gint64 defined by gst/gst.h is indeed 64-bit" >&5 $as_echo_n "checking whether gint64 defined by gst/gst.h is indeed 64-bit... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <gst/gst.h> int @@ -12654,7 +12652,7 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_new in -lgstreamer-1.0" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_new in -lgstreamer-1.0" >&5 $as_echo_n "checking for gst_pad_new in -lgstreamer-1.0... " >&6; } if ${ac_cv_lib_gstreamer_1_0_gst_pad_new+:} false; then : $as_echo_n "(cached) " >&6 @@ -12702,11 +12700,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -else - GSTREAMER_CFLAGS="" -fi - - CPPFLAGS=$ac_save_CPPFLAGS test -z "$GSTREAMER_CFLAGS" || GSTREAMER_CFLAGS=`echo " $GSTREAMER_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` test -z "$GSTREAMER_LIBS" || GSTREAMER_LIBS=`echo " $GSTREAMER_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` diff --git a/configure.ac b/configure.ac index d20791a..6db503c 100644 --- a/configure.ac +++ b/configure.ac @@ -1472,15 +1472,13 @@ then done GSTREAMER_CFLAGS=$ac_gst_incl CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - AC_CHECK_HEADER([gst/gstpad.h], - [AC_CHECK_HEADER([gst/gst.h], - [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], - [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], - [AC_MSG_RESULT([yes]) - AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])], - [AC_MSG_RESULT([no])])])], - [GSTREAMER_CFLAGS=""])]) + AC_CHECK_HEADER([gst/gst.h], + [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], + [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], + [AC_MSG_RESULT([yes]) + AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])], + [AC_MSG_RESULT([no])])])]) fi WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes], [gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled])

1 0

Andrew Eikum : xaudio2: Use an HRESULT return code.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 2b2b179422136d3986229e9b7ff2121f000891f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2b179422136d3986229e9b7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 20 14:08:18 2016 -0600 xaudio2: Use an HRESULT return code. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 4f0a11f..5ca592d 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1551,7 +1551,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, if(!deviceId){ if(This->ndevs == 0){ LeaveCriticalSection(&This->lock); - return ERROR_NOT_FOUND; + return E_NOTFOUND; } deviceId = This->devids[0]; }

1 0

Paul Gofman : mscoree: Fix calling convention for mono callback functions.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: b9a0fe18e3cbb4e5c0ac5021b8f041f970ab6c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a0fe18e3cbb4e5c0ac5021b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 20 18:03:40 2016 +0300 mscoree: Fix calling convention for mono callback functions. ms_abi calling convention is required for x86_64 arch. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 12 ++++++------ dlls/mscoree/mscoree_private.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index b0237b3..3d663f1 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -110,11 +110,11 @@ static BOOL get_mono_path(LPWSTR path); static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); -static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); -static void mono_shutdown_callback_fn(MonoProfiler *prof); +static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof); -static void mono_print_handler_fn(const char *string, INT is_stdout); +static void CDECL mono_print_handler_fn(const char *string, INT is_stdout); static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) @@ -249,12 +249,12 @@ fail: return E_FAIL; } -static void mono_shutdown_callback_fn(MonoProfiler *prof) +static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof) { is_mono_shutdown = TRUE; } -static void mono_print_handler_fn(const char *string, INT is_stdout) +static void CDECL mono_print_handler_fn(const char *string, INT is_stdout) { wine_dbg_printf("%s", string); } @@ -1144,7 +1144,7 @@ HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int return hr; } -static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) { HRESULT hr; MonoAssembly *result=NULL; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 0c59c42..7843407 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -128,11 +128,11 @@ typedef enum { MONO_IMAGE_IMAGE_INVALID } MonoImageOpenStatus; -typedef MonoAssembly* (*MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +typedef MonoAssembly* (CDECL *MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, void *user_data); -typedef void (*MonoProfileFunc)(MonoProfiler *prof); +typedef void (CDECL *MonoProfileFunc)(MonoProfiler *prof); -typedef void (*MonoPrintCallback) (const char *string, INT is_stdout); +typedef void (CDECL *MonoPrintCallback) (const char *string, INT is_stdout); extern BOOL is_mono_started DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcrt: Add support for member function pointers demangling in unDName function.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 112ad7fc8766b7b09d5026db19f2e826a9c83d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=112ad7fc8766b7b09d5026db1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 22:01:12 2016 +0100 msvcrt: Add support for member function pointers demangling in unDName function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index cbad1c1..fac1ab5 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1318,6 +1318,9 @@ static void test_demangle(void) /* 128 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", "??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", 2}, +/* 129 */ {"??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z", + "class QFuture<void> __cdecl QtConcurrent::run<void,class Task_Render_Preview>(class Task_Render_Preview * __ptr64,void (__cdecl Task_Render_Preview::*)(void) __ptr64)", + "??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 097f036..587a602 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -859,14 +859,55 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case 'P': /* Pointer */ if (isdigit(*sym->current)) { - /* FIXME: P6 = Function pointer, others who knows.. */ - if (*sym->current++ == '6') + /* FIXME: + * P6 = Function pointer + * P8 = Member function pointer + * others who knows.. */ + if (*sym->current == '8') { char* args = NULL; const char* call_conv; const char* exported; struct datatype_t sub_ct; unsigned mark = sym->stack.num; + const char* class; + const char* modifier; + const char* ptr_modif; + + sym->current++; + + if (!(class = get_class_name(sym))) + goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) + goto done; + if (modifier) + modifier = str_printf(sym, "%s %s", modifier, ptr_modif); + else if(ptr_modif[0]) + modifier = str_printf(sym, " %s", ptr_modif); + if (!get_calling_convention(*sym->current++, + &call_conv, &exported, + sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE)) + goto done; + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) + goto done; + + args = get_args(sym, pmt_ref, TRUE, '(', ')'); + if (!args) goto done; + sym->stack.num = mark; + + ct->left = str_printf(sym, "%s%s (%s %s::*", + sub_ct.left, sub_ct.right, call_conv, class); + ct->right = str_printf(sym, ")%s%s", args, modifier); + } + else if (*sym->current == '6') + { + char* args = NULL; + const char* call_conv; + const char* exported; + struct datatype_t sub_ct; + unsigned mark = sym->stack.num; + + sym->current++; if (!get_calling_convention(*sym->current++, &call_conv, &exported,

1 0

Piotr Caban : msvcrt: Add support for $$B datatype description format in unDName.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 6ac2acc34f266e2e59e1d1dd2de0f299e750ee01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac2acc34f266e2e59e1d1dd2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 22:01:23 2016 +0100 msvcrt: Add support for $$B datatype description format in unDName. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 2 ++ dlls/msvcrt/undname.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index fac1ab5..e67e344 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1321,6 +1321,8 @@ static void test_demangle(void) /* 129 */ {"??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z", "class QFuture<void> __cdecl QtConcurrent::run<void,class Task_Render_Preview>(class Task_Render_Preview * __ptr64,void (__cdecl Task_Render_Preview::*)(void) __ptr64)", "??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z"}, +/* 130 */ {"??_E?$TStrArray@$$BY0BAA(a)D$0BA@@@UAEPAXI(a)Z", + "public: virtual void * __thiscall TStrArray<char [256],16>::`vector deleting destructor'(unsigned int)"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 587a602..e6cb61f 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -991,7 +991,37 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, } break; case '$': - if (*sym->current == 'C') + if (*sym->current == 'B') + { + unsigned mark = sym->stack.num; + struct datatype_t sub_ct; + const char* arr = NULL; + sym->current++; + + /* multidimensional arrays */ + if (*sym->current == 'Y') + { + const char* n1; + int num; + + sym->current++; + if (!(n1 = get_number(sym))) goto done; + num = atoi(n1); + + while (num--) + arr = str_printf(sym, "%s[%s]", arr, get_number(sym)); + } + + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) goto done; + + if (arr) + ct->left = str_printf(sym, "%s %s", sub_ct.left, arr); + else + ct->left = sub_ct.left; + ct->right = sub_ct.right; + sym->stack.num = mark; + } + else if (*sym->current == 'C') { const char *ptr, *ptr_modif;

1 0