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

Jacek Caban : configure: Get rid of no longer needed OpenSSL checks.
by Alexandre Julliard April 3, 2013

April 3, 2013

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: Added NETCON_GetCert support for schannel-based connections.
by Alexandre Julliard April 3, 2013

April 3, 2013

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 April 3, 2013

April 3, 2013

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 April 3, 2013

April 3, 2013

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

Dmitry Timoshkov : wineps.drv: Constify a variable.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: 1b55e50e205ba87ae45228bb999ef921f4666900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b55e50e205ba87ae45228bb9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 3 16:37:51 2013 +0900 wineps.drv: Constify a variable. --- dlls/wineps.drv/type1.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index 6855019..316bece 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -75,7 +75,7 @@ TYPE1 *T1_download_header(PHYSDEV dev, char *ps_name, RECT *bbox, UINT emsize) char *buf; TYPE1 *t1; - char dict[] = /* name, emsquare, fontbbox */ + static const char dict[] = /* name, emsquare, fontbbox */ "25 dict begin\n" " /FontName /%s def\n" " /Encoding 256 array 0 1 255{1 index exch /.notdef put} for def\n"

1 0

Sam Edwards : ddraw/tests: Verify window style after exiting fullscreen mode.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: d1b67698b97e79a723eab70f2343054fecd6307c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b67698b97e79a723eab70f2… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Apr 2 17:55:21 2013 -0600 ddraw/tests: Verify window style after exiting fullscreen mode. --- dlls/ddraw/tests/ddraw1.c | 8 ++++++++ dlls/ddraw/tests/ddraw2.c | 8 ++++++++ dlls/ddraw/tests/ddraw4.c | 8 ++++++++ dlls/ddraw/tests/ddraw7.c | 8 ++++++++ 4 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d3a296c..fa550f4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1898,6 +1898,14 @@ static void test_window_style(void) GetClientRect(window, &r); todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ref = IDirectDraw_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index a52cb78..8bb33fc 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2105,6 +2105,14 @@ static void test_window_style(void) GetClientRect(window, &r); todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ref = IDirectDraw2_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 55b6c01..742bd3f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2220,6 +2220,14 @@ static void test_window_style(void) GetClientRect(window, &r); todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ref = IDirectDraw4_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 027e03a..3d8c70d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1952,6 +1952,14 @@ static void test_window_style(void) GetClientRect(window, &r); todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref);

1 0

Sam Edwards : d3d8/tests: Verify window style after exiting fullscreen mode .
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: ce6173264dd6bdc91f414056ae8a623577bed5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6173264dd6bdc91f414056a… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Mon Apr 1 17:02:56 2013 -0600 d3d8/tests: Verify window style after exiting fullscreen mode. --- dlls/d3d8/tests/device.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fbc2d19..ba7e5e6 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2829,6 +2829,7 @@ static void test_window_style(void) LONG style, expected_style; IDirect3DDevice8 *device; IDirect3D8 *d3d8; + HRESULT hr; ULONG ref; @@ -2885,6 +2886,26 @@ static void test_window_style(void) focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, r.left, r.top, r.right, r.bottom); + hr = reset_device(device, device_window, TRUE); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | WS_VISIBLE; + ok(style == expected_style, "Expected device window style %#x, got %#x.\n", + expected_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + ok(style == expected_style, "Expected device window extended style %#x, got %#x.\n", + expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0

Sam Edwards : d3d9/tests: Verify window style after exiting fullscreen mode .
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: 8157aa143b74f26dad9b41bfe719647828322c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8157aa143b74f26dad9b41bfe… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Mon Apr 1 17:03:50 2013 -0600 d3d9/tests: Verify window style after exiting fullscreen mode. --- dlls/d3d9/tests/device.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bbbcbbc..f30938b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3130,6 +3130,7 @@ static void test_window_style(void) LONG style, expected_style; IDirect3DDevice9 *device; IDirect3D9 *d3d9; + HRESULT hr; ULONG ref; @@ -3186,6 +3187,25 @@ static void test_window_style(void) focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, r.left, r.top, r.right, r.bottom); + hr = reset_device(device, device_window, TRUE); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | WS_VISIBLE; + ok(style == expected_style, "Expected device window style %#x, got %#x.\n", + expected_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + ok(style == expected_style, "Expected device window extended style %#x, got %#x.\n", + expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + ref = IDirect3DDevice9_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0

Jacek Caban : ieframe: Added GoForward tests.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: 47f8d487679170a2c686aac6028fd06adffe5e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f8d487679170a2c686aac60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 13:04:46 2013 +0200 ieframe: Added GoForward tests. --- dlls/ieframe/tests/webbrowser.c | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 39bc21d..753a1680 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -160,8 +160,9 @@ static int wb_version; #define DWL_EXPECT_BEFORE_NAVIGATE 0x01 #define DWL_FROM_PUT_HREF 0x02 #define DWL_FROM_GOBACK 0x04 -#define DWL_HTTP 0x08 -#define DWL_REFRESH 0x10 +#define DWL_FROM_GOFORWARD 0x08 +#define DWL_HTTP 0x10 +#define DWL_REFRESH 0x20 static DWORD dwl_flags; @@ -786,7 +787,8 @@ static void test_navigatecomplete2(DISPPARAMS *dp) ok(V_VT(dp->rgvarg+1) == VT_DISPATCH, "V_VT(dp->rgvarg+1) = %d\n", V_VT(dp->rgvarg+1)); ok(V_DISPATCH(dp->rgvarg+1) == (IDispatch*)wb, "V_DISPATCH=%p, wb=%p\n", V_DISPATCH(dp->rgvarg+1), wb); - test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); + test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_FROM_GOFORWARD)) + ? READYSTATE_COMPLETE : READYSTATE_LOADING); } static void test_documentcomplete(DISPPARAMS *dp) @@ -857,7 +859,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe test_OnBeforeNavigate(pDispParams->rgvarg+6, pDispParams->rgvarg+5, pDispParams->rgvarg+4, pDispParams->rgvarg+3, pDispParams->rgvarg+2, pDispParams->rgvarg+1, pDispParams->rgvarg); - test_ready_state((dwl_flags & DWL_FROM_PUT_HREF) ? READYSTATE_COMPLETE : READYSTATE_LOADING); + test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOFORWARD)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); break; case DISPID_SETSECURELOCKICON: @@ -2721,9 +2723,10 @@ static void test_download(DWORD flags) is_downloading = TRUE; dwl_flags = flags; - test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); + test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH)) + ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2765,7 +2768,7 @@ static void test_download(DWORD flags) DispatchMessage(&msg); } - if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2946,6 +2949,21 @@ static void test_go_back(IWebBrowser2 *wb, const char *back_url) todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); } +static void test_go_forward(IWebBrowser2 *wb, const char *forward_url) +{ + HRESULT hres; + + current_url = forward_url; + dwl_flags |= DWL_FROM_GOFORWARD; + + SET_EXPECT(Invoke_BEFORENAVIGATE2); + SET_EXPECT(Invoke_COMMANDSTATECHANGE); + hres = IWebBrowser2_GoForward(wb); + ok(hres == S_OK, "GoForward failed: %08x\n", hres); + CHECK_CALLED(Invoke_BEFORENAVIGATE2); + todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); +} + static void test_QueryInterface(IWebBrowser2 *wb) { IQuickActivate *qa = (IQuickActivate*)0xdeadbeef; @@ -3309,6 +3327,7 @@ static void init_test(IWebBrowser2 *webbrowser, DWORD flags) is_downloading = (flags & TEST_DOWNLOAD) != 0; is_first_load = TRUE; + dwl_flags = 0; use_container_olecmd = !(flags & TEST_NOOLECMD); use_container_dochostui = !(flags & TEST_NODOCHOST); } @@ -3377,6 +3396,10 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) trace("GoBack...\n"); test_go_back(webbrowser, "http://test.winehq.org/tests/hello.html"); test_download(DWL_FROM_GOBACK|DWL_HTTP); + + trace("GoForward...\n"); + test_go_forward(webbrowser, "http://www.winehq.org/"); + test_download(DWL_FROM_GOFORWARD|DWL_HTTP); } test_EnumVerbs(webbrowser); @@ -3398,7 +3421,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_IServiceProvider(webbrowser); ref = IWebBrowser2_Release(webbrowser); - ok(ref == 0 || broken(do_download && !do_close && ref == 1), "ref=%d, expected 0\n", ref); + ok(ref == 0 || broken(do_download && !do_close), "ref=%d, expected 0\n", ref); } static void test_WebBrowserV1(void)

1 0

Jacek Caban : wininet: Added NETCON_get_data_available support for schannel-based connections.
by Alexandre Julliard April 3, 2013

April 3, 2013

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