April 2013 - Wine-commits - list.winehq.org

Jacek Caban : configure: Get rid of no longer needed OpenSSL checks.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: adb8c8615b49dff9fd5f9b720ac30429ddfbd9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb8c8615b49dff9fd5f9b720… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 14:06:09 2013 +0200 configure: Get rid of no longer needed OpenSSL checks. --- configure | 128 --------------------------------------------------- configure.ac | 13 ----- include/config.h.in | 12 ----- 3 files changed, 0 insertions(+), 153 deletions(-) diff --git a/configure b/configure index f2a340f..6997375 100755 --- a/configure +++ b/configure @@ -824,7 +824,6 @@ with_mpg123 with_openal with_opencl with_opengl -with_openssl with_osmesa with_oss with_png @@ -1514,7 +1513,6 @@ Optional Packages: --without-openal do not use OpenAL --without-opencl do not use OpenCL --without-opengl do not use OpenGL - --without-openssl do not use OpenSSL --without-osmesa do not use the OSMesa library --without-oss do not use the OSS sound support --without-png do not use PNG @@ -2680,12 +2678,6 @@ if test "${with_opengl+set}" = set; then : fi -# Check whether --with-openssl was given. -if test "${with_openssl+set}" = set; then : - withval=$with_openssl; if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi -fi - - # Check whether --with-osmesa was given. if test "${with_osmesa+set}" = set; then : withval=$with_osmesa; @@ -5885,8 +5877,6 @@ for ac_header in \ netinet/in_systm.h \ netinet/tcp.h \ netinet/tcp_fsm.h \ - openssl/err.h \ - openssl/ssl.h \ png.h \ poll.h \ port.h \ @@ -11445,124 +11435,6 @@ This is an error since --with-fontconfig was requested." "$LINENO" 5 ;; esac fi -if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes" -then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lssl" >&5 -$as_echo_n "checking for -lssl... " >&6; } -if ${ac_cv_lib_soname_ssl+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lssl $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SSL_library_init (); -int -main () -{ -return SSL_library_init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - case "$LIBEXT" in - dll) ac_cv_lib_soname_ssl=`$ac_cv_path_LDD conftest.exe | grep "ssl" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_ssl=`otool -L conftest$ac_exeext | grep "libssl\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libssl\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_ssl=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libssl\\.$LIBEXT" | sed -e "s/^.*\\[\$libssl\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` - if test "x$ac_cv_lib_soname_ssl" = x; then : - ac_cv_lib_soname_ssl=`$LDD conftest$ac_exeext | grep "libssl\\.$LIBEXT" | sed -e "s/^.*$libssl\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` -fi ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if test "x$ac_cv_lib_soname_ssl" = "x"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_ssl" >&5 -$as_echo "$ac_cv_lib_soname_ssl" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBSSL "$ac_cv_lib_soname_ssl" -_ACEOF - - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcrypto" >&5 -$as_echo_n "checking for -lcrypto... " >&6; } -if ${ac_cv_lib_soname_crypto+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lcrypto $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char BIO_new_socket (); -int -main () -{ -return BIO_new_socket (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - case "$LIBEXT" in - dll) ac_cv_lib_soname_crypto=`$ac_cv_path_LDD conftest.exe | grep "crypto" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_crypto=`otool -L conftest$ac_exeext | grep "libcrypto\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libcrypto\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_crypto=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libcrypto\\.$LIBEXT" | sed -e "s/^.*\\[\$libcrypto\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` - if test "x$ac_cv_lib_soname_crypto" = x; then : - ac_cv_lib_soname_crypto=`$LDD conftest$ac_exeext | grep "libcrypto\\.$LIBEXT" | sed -e "s/^.*$libcrypto\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` -fi ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if test "x$ac_cv_lib_soname_crypto" = "x"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_crypto" >&5 -$as_echo "$ac_cv_lib_soname_crypto" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBCRYPTO "$ac_cv_lib_soname_crypto" -_ACEOF - - -fi -fi -if test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"; then : - case "x$with_openssl" in - x) as_fn_append wine_warnings "|OpenSSL ${notice_platform}development files not found, SSL won't be supported." ;; - xno) ;; - *) as_fn_error $? "OpenSSL ${notice_platform}development files not found, SSL won't be supported. -This is an error since --with-openssl was requested." "$LINENO" 5 ;; -esac -fi - if test "$ac_cv_header_gsm_h" = "yes" -o "$ac_cv_header_gsm_gsm_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lgsm" >&5 diff --git a/configure.ac b/configure.ac index d8f2e8d..080e961 100644 --- a/configure.ac +++ b/configure.ac @@ -66,8 +66,6 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]), [if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi]) AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) -AC_ARG_WITH(openssl, AS_HELP_STRING([--without-openssl],[do not use OpenSSL]), - [if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi]) AC_ARG_WITH(osmesa, AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library])) AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support])) AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]), @@ -469,8 +467,6 @@ AC_CHECK_HEADERS(\ netinet/in_systm.h \ netinet/tcp.h \ netinet/tcp_fsm.h \ - openssl/err.h \ - openssl/ssl.h \ png.h \ poll.h \ port.h \ @@ -1604,15 +1600,6 @@ fi WINE_NOTICE_WITH(fontconfig,[test "x$ac_cv_lib_soname_fontconfig" = "x"], [fontconfig ${notice_platform}development files not found, fontconfig won't be supported.]) -dnl **** Check for SSL **** -if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes" -then - WINE_CHECK_SONAME(ssl,SSL_library_init) - WINE_CHECK_SONAME(crypto,BIO_new_socket) -fi -WINE_WARNING_WITH(openssl,[test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"], - [OpenSSL ${notice_platform}development files not found, SSL won't be supported.]) - dnl **** Check for gsm codec **** if test "$ac_cv_header_gsm_h" = "yes" -o "$ac_cv_header_gsm_gsm_h" = "yes" then diff --git a/include/config.h.in b/include/config.h.in index 1a5652c..2f30549 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -578,12 +578,6 @@ /* Define to 1 if you have the <OpenCL/opencl.h> header file. */ #undef HAVE_OPENCL_OPENCL_H -/* Define to 1 if you have the <openssl/err.h> header file. */ -#undef HAVE_OPENSSL_ERR_H - -/* Define to 1 if you have the <openssl/ssl.h> header file. */ -#undef HAVE_OPENSSL_SSL_H - /* Define to 1 if `numaudioengines' is a member of `oss_sysinfo'. */ #undef HAVE_OSS_SYSINFO_NUMAUDIOENGINES @@ -1241,9 +1235,6 @@ /* Define to the soname of the libcapi20 library. */ #undef SONAME_LIBCAPI20 -/* Define to the soname of the libcrypto library. */ -#undef SONAME_LIBCRYPTO - /* Define to the soname of the libcups library. */ #undef SONAME_LIBCUPS @@ -1292,9 +1283,6 @@ /* Define to the soname of the libsane library. */ #undef SONAME_LIBSANE -/* Define to the soname of the libssl library. */ -#undef SONAME_LIBSSL - /* Define to the soname of the libtiff library. */ #undef SONAME_LIBTIFF

1 0

Francois Gouget : riched20: ME_StrDup() is not used anymore so remove it.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 8e304065c1da5bafcfd2baf61165ae81f2561653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e304065c1da5bafcfd2baf61… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 3 16:07:04 2013 +0200 riched20: ME_StrDup() is not used anymore so remove it. --- dlls/riched20/editor.h | 1 - dlls/riched20/string.c | 5 ----- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 95818cd..f7cac1f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -100,7 +100,6 @@ const char *ME_GetDITypeName(ME_DIType type) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) DECLSPEC_HIDDEN; -ME_String *ME_StrDup(const ME_String *s) DECLSPEC_HIDDEN; void ME_DestroyString(ME_String *s) DECLSPEC_HIDDEN; BOOL ME_AppendString(ME_String *s, const WCHAR *append, int len) DECLSPEC_HIDDEN; ME_String *ME_VSplitString(ME_String *orig, int nVPos) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index ce66af5..6d7d222 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -59,11 +59,6 @@ ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) return s; } -ME_String *ME_StrDup(const ME_String *s) -{ - return ME_MakeStringN(s->szData, s->nLen); -} - void ME_DestroyString(ME_String *s) { if (!s) return;

1 0

Francois Gouget : windowscodecs/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: b84d91dfecfd5ecd2438a99cde874934efe21616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84d91dfecfd5ecd2438a99cd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 3 16:07:10 2013 +0200 windowscodecs/tests: Add a trailing '\n' to an ok() call. --- dlls/windowscodecs/tests/converter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index a551fde..5b8f6e4 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -550,7 +550,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(SUCCEEDED(hr), "CreateFrame failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { - ok(options != NULL, "Encoder initialization has not created an property bag"); + ok(options != NULL, "Encoder initialization has not created an property bag\n"); if(options) test_encoder_properties(clsid_encoder, options);

1 0

Francois Gouget : dplayx: Add a trailing '\n' to a TRACE().
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 1891a89dd99b76566291d76dc0a1eded007bf866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1891a89dd99b76566291d76dc… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 3 16:07:13 2013 +0200 dplayx: Add a trailing '\n' to a TRACE(). --- dlls/dplayx/dplay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index e96a1e2..4658f4e 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -610,7 +610,7 @@ static HRESULT WINAPI IDirectPlay4Impl_Close( IDirectPlay4 *iface ) IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); HRESULT hr = DP_OK; - TRACE( "(%p)", This ); + TRACE( "(%p)\n", This ); /* FIXME: Need to find a new host I assume (how?) */ /* FIXME: Need to destroy all local groups */

1 0

Francois Gouget : ieframe: Make dump_travellog() static.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: a5d61eef629358c879f760e3694660ea74f0afb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d61eef629358c879f760e36… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 3 16:07:44 2013 +0200 ieframe: Make dump_travellog() static. --- dlls/ieframe/dochost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7522c38..c717d8b 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -363,7 +363,7 @@ static IStream *get_travellog_stream(DocHost *This) return stream; } -void dump_travellog(DocHost *This) +static void dump_travellog(DocHost *This) { unsigned i;

1 0

André Hentschel : kernel32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: b815548cf07a343fae3afa470ef669de86c8f6e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b815548cf07a343fae3afa470… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 3 17:26:22 2013 +0200 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/msvcrt/tests/locale.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 257e3c8..63f8a59 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -713,8 +713,9 @@ static void test__Gettnames(void) ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, "ret->str[40] = %s\n", ret->str[40]); - ok(GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, - buf, sizeof(buf)) != 0, "GetLocaleInfo failed: %x\n", GetLastError()); + size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), + LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, buf, sizeof(buf)); + ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); ok(!strcmp(ret->str[41], buf), "ret->str[41] = %s, expected %s\n", ret->str[41], buf); free(ret);

1 0

Piotr Caban : msvcp: Change architecture of more thiscall functions.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 1f2aceb5beff2804c06d665677f5929e57fd4f59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2aceb5beff2804c06d66567… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 16:23:00 2013 +0200 msvcp: Change architecture of more thiscall functions. --- dlls/msvcp100/msvcp100.spec | 64 +++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.spec | 52 +++++++++++++++++----------------- 2 files changed, 58 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f2aceb5beff2804c06d6…

1 0

Piotr Caban : msvcp90: Add arm exports.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 96761461d83de9f50bc0bb1abdcf5e187ad05214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96761461d83de9f50bc0bb1ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 16:23:12 2013 +0200 msvcp90: Add arm exports. --- dlls/msvcp90/msvcp90.spec | 745 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 745 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96761461d83de9f50bc0b…

1 0

Piotr Caban : msvcp100: Add arm exports.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 991efb93c975e8a85a8c787022596f9362c73106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991efb93c975e8a85a8c78702… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 16:23:47 2013 +0200 msvcp100: Add arm exports. --- dlls/msvcp100/msvcp100.spec | 101 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=991efb93c975e8a85a8c7…

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: a62b7679356abde12a0d4c86926d010099d1393b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62b7679356abde12a0d4c869… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 16:24:00 2013 +0200 msvcp: Sync spec files. --- dlls/msvcp110/msvcp110.spec | 1804 +++++++++++++++++++++--------------------- dlls/msvcp70/msvcp70.spec | 48 +- dlls/msvcp80/msvcp80.spec | 52 +- 3 files changed, 952 insertions(+), 952 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a62b7679356abde12a0d4…

1 0