wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

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 : 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 : 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

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

Jacek Caban : wininet: Use schannel for HTTPS connection by defaul and get rid of OpenSSL dependency .
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: cde372700c8c1fc66f727c66d1852d33aaa70794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde372700c8c1fc66f727c66d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 14:05:51 2013 +0200 wininet: Use schannel for HTTPS connection by defaul and get rid of OpenSSL dependency. --- dlls/wininet/internet.h | 1 - dlls/wininet/netconnection.c | 534 +----------------------------------------- dlls/wininet/tests/http.c | 1 - 3 files changed, 2 insertions(+), 534 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cde372700c8c1fc66f727…

1 0

Jacek Caban : wininet: Added NETCON_get_data_available support for schannel-based connections.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: cb1998afd2142854dc4144f3d63d3249a56caba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1998afd2142854dc4144f3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 14:04:11 2013 +0200 wininet: Added NETCON_get_data_available support for schannel-based connections. --- dlls/wininet/netconnection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 401025f..502db86 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -1408,8 +1408,8 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) #ifdef SONAME_LIBSSL *available = pSSL_pending(connection->ssl_s); #else - FIXME("not supported on this platform\n"); - return FALSE; + *available = connection->peek_len; + return TRUE; #endif } return TRUE;

1 0

Jacek Caban : wininet: Added NETCON_GetCert support for schannel-based connections.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 7d386bfcd8071977577c0d5037e4f5db593f35c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d386bfcd8071977577c0d503… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 14:04:01 2013 +0200 wininet: Added NETCON_GetCert support for schannel-based connections. --- dlls/wininet/netconnection.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4abf7f1..401025f 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -1458,8 +1458,14 @@ LPCVOID NETCON_GetCert(netconn_t *connection) r = X509_to_cert_context(cert); return r; #else - FIXME("not supported on this platform\n"); - return NULL; + const CERT_CONTEXT *ret; + SECURITY_STATUS res; + + if (!connection->secure) + return NULL; + + res = QueryContextAttributesW(&connection->ssl_ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&ret); + return res == SEC_E_OK ? ret : NULL; #endif }

1 0

Jacek Caban : wininet: Added NETCON_recv support for schannel-based connections.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 6c6e084a7d9bbf283506f5da66c8a0070965ed82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6e084a7d9bbf283506f5da6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 14:03:52 2013 +0200 wininet: Added NETCON_recv support for schannel-based connections. --- dlls/wininet/internet.h | 3 + dlls/wininet/netconnection.c | 144 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 145 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 9fbb74f..0161935 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -98,6 +98,9 @@ typedef struct char *ssl_buf; char *extra_buf; size_t extra_len; + char *peek_msg; + char *peek_msg_mem; + size_t peek_len; DWORD security_flags; BOOL mask_errors; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 53308b9..4abf7f1 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -759,8 +759,15 @@ void free_netconn(netconn_t *netconn) pSSL_shutdown(netconn->ssl_s); pSSL_free(netconn->ssl_s); #else + heap_free(netconn->peek_msg_mem); + netconn->peek_msg_mem = NULL; + netconn->peek_msg = NULL; + netconn->peek_len = 0; heap_free(netconn->ssl_buf); netconn->ssl_buf = NULL; + heap_free(netconn->extra_buf); + netconn->extra_buf = NULL; + netconn->extra_len = 0; DeleteSecurityContext(&netconn->ssl_ctx); #endif } @@ -1204,6 +1211,101 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, } } +#ifndef SONAME_LIBSSL +static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T *ret_size, BOOL *eof) +{ + const SIZE_T ssl_buf_size = conn->ssl_sizes.cbHeader+conn->ssl_sizes.cbMaximumMessage+conn->ssl_sizes.cbTrailer; + SecBuffer bufs[4]; + SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; + SSIZE_T size, buf_len; + int i; + SECURITY_STATUS res; + + assert(conn->extra_len < ssl_buf_size); + + if(conn->extra_len) { + memcpy(conn->ssl_buf, conn->extra_buf, conn->extra_len); + buf_len = conn->extra_len; + conn->extra_len = 0; + heap_free(conn->extra_buf); + conn->extra_buf = NULL; + }else { + buf_len = recv(conn->socket, conn->ssl_buf+conn->extra_len, ssl_buf_size-conn->extra_len, 0); + if(buf_len < 0) { + WARN("recv failed\n"); + return FALSE; + } + + if(!buf_len) { + *eof = TRUE; + return TRUE; + } + } + + *ret_size = 0; + *eof = FALSE; + + do { + memset(bufs, 0, sizeof(bufs)); + bufs[0].BufferType = SECBUFFER_DATA; + bufs[0].cbBuffer = buf_len; + bufs[0].pvBuffer = conn->ssl_buf; + + res = DecryptMessage(&conn->ssl_ctx, &buf_desc, 0, NULL); + switch(res) { + case SEC_E_OK: + break; + case SEC_I_CONTEXT_EXPIRED: + TRACE("context expired\n"); + *eof = TRUE; + return TRUE; + case SEC_E_INCOMPLETE_MESSAGE: + assert(buf_len < ssl_buf_size); + + size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); + if(size < 1) + return FALSE; + + buf_len += size; + continue; + default: + WARN("failed: %08x\n", res); + return FALSE; + } + } while(res != SEC_E_OK); + + for(i=0; i < sizeof(bufs)/sizeof(*bufs); i++) { + if(bufs[i].BufferType == SECBUFFER_DATA) { + size = min(buf_size, bufs[i].cbBuffer); + memcpy(buf, bufs[i].pvBuffer, size); + if(size < bufs[i].cbBuffer) { + assert(!conn->peek_len); + conn->peek_msg_mem = conn->peek_msg = heap_alloc(bufs[i].cbBuffer - size); + if(!conn->peek_msg) + return FALSE; + conn->peek_len = bufs[i].cbBuffer-size; + memcpy(conn->peek_msg, (char*)bufs[i].pvBuffer+size, conn->peek_len); + } + + *ret_size = size; + } + } + + for(i=0; i < sizeof(bufs)/sizeof(*bufs); i++) { + if(bufs[i].BufferType == SECBUFFER_EXTRA) { + conn->extra_buf = heap_alloc(bufs[i].cbBuffer); + if(!conn->extra_buf) + return FALSE; + + conn->extra_len = bufs[i].cbBuffer; + memcpy(conn->extra_buf, bufs[i].pvBuffer, conn->extra_len); + } + } + + return TRUE; +} +#endif + /****************************************************************************** * NETCON_recv * Basically calls 'recv()' unless we should use SSL @@ -1236,8 +1338,46 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int * return *recvd > 0 ? ERROR_SUCCESS : ERROR_INTERNET_CONNECTION_ABORTED; #else - FIXME("not supported on this platform\n"); - return ERROR_NOT_SUPPORTED; + SIZE_T size = 0, cread; + BOOL res, eof; + + if(connection->peek_msg) { + size = min(len, connection->peek_len); + memcpy(buf, connection->peek_msg, size); + connection->peek_len -= size; + connection->peek_msg += size; + + if(!connection->peek_len) { + heap_free(connection->peek_msg_mem); + connection->peek_msg_mem = connection->peek_msg = NULL; + } + /* check if we have enough data from the peek buffer */ + if(!(flags & MSG_WAITALL) || size == len) { + *recvd = size; + return ERROR_SUCCESS; + } + } + + do { + res = read_ssl_chunk(connection, (BYTE*)buf+size, len-size, &cread, &eof); + if(!res) { + WARN("read_ssl_chunk failed\n"); + if(!size) + return ERROR_INTERNET_CONNECTION_ABORTED; + break; + } + + if(eof) { + TRACE("EOF\n"); + break; + } + + size += cread; + }while(!size || ((flags & MSG_WAITALL) && size < len)); + + TRACE("received %ld bytes\n", size); + *recvd = size; + return ERROR_SUCCESS; #endif } }

1 0

Jacek Caban : wininet: Added NETCON_send support for schannel-based connections.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 71ba6fcb9fa30a06610b426028e60ab61efa6770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ba6fcb9fa30a06610b42602… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 14:03:34 2013 +0200 wininet: Added NETCON_send support for schannel-based connections. --- dlls/wininet/netconnection.c | 46 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index cc16950..53308b9 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -1127,6 +1127,34 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) return res; } +#ifndef SONAME_LIBSSL +static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) +{ + SecBuffer bufs[4] = { + {conn->ssl_sizes.cbHeader, SECBUFFER_STREAM_HEADER, conn->ssl_buf}, + {size, SECBUFFER_DATA, conn->ssl_buf+conn->ssl_sizes.cbHeader}, + {conn->ssl_sizes.cbTrailer, SECBUFFER_STREAM_TRAILER, conn->ssl_buf+conn->ssl_sizes.cbHeader+size}, + {0, SECBUFFER_EMPTY, NULL} + }; + SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; + SECURITY_STATUS res; + + memcpy(bufs[1].pvBuffer, msg, size); + res = EncryptMessage(&conn->ssl_ctx, 0, &buf_desc, 0); + if(res != SEC_E_OK) { + WARN("EncryptMessage failed\n"); + return FALSE; + } + + if(send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { + WARN("send failed\n"); + return FALSE; + } + + return TRUE; +} +#endif + /****************************************************************************** * NETCON_send * Basically calls 'send()' unless we should use SSL @@ -1156,8 +1184,22 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, return ERROR_INTERNET_CONNECTION_ABORTED; return ERROR_SUCCESS; #else - FIXME("not supported on this platform\n"); - return ERROR_NOT_SUPPORTED; + const BYTE *ptr = msg; + size_t chunk_size; + + *sent = 0; + + while(len) { + chunk_size = min(len, connection->ssl_sizes.cbMaximumMessage); + if(!send_ssl_chunk(connection, ptr, chunk_size)) + return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + + *sent += chunk_size; + ptr += chunk_size; + len -= chunk_size; + } + + return ERROR_SUCCESS; #endif } }

1 0

Jacek Caban : wininet: Use schannel in NETCON_GetCipherStrength if OpenSSL is not available.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: d473803765d6813a14f039d2bb576c406b51fccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d473803765d6813a14f039d2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 14:03:24 2013 +0200 wininet: Use schannel in NETCON_GetCipherStrength if OpenSSL is not available. --- dlls/wininet/netconnection.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e896d84..cc16950 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -1299,8 +1299,16 @@ int NETCON_GetCipherStrength(netconn_t *connection) pSSL_CIPHER_get_bits(cipher, &bits); return bits; #else - FIXME("not supported on this platform\n"); - return 0; + SecPkgContext_ConnectionInfo conn_info; + SECURITY_STATUS res; + + if (!connection->secure) + return 0; + + res = QueryContextAttributesW(&connection->ssl_ctx, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); + if(res != SEC_E_OK) + WARN("QueryContextAttributesW failed: %08x\n", res); + return res == SEC_E_OK ? conn_info.dwCipherStrength : 0; #endif }

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2013