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

Dmitry Timoshkov : wineps.drv: Constify a variable.
by Alexandre Julliard 03 Apr '13

03 Apr '13

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

Jacek Caban : ieframe: Added GoForward tests.
by Alexandre Julliard 03 Apr '13

03 Apr '13

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

André Hentschel : uxtheme/tests: Don' t test for themed app.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: f5c49aaf83db5356c18c6da4a1df573713c224eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c49aaf83db5356c18c6da4a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 2 15:42:26 2013 +0200 uxtheme/tests: Don't test for themed app. --- dlls/uxtheme/tests/system.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 8dd413b..303ff8d 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -81,24 +81,11 @@ static void test_IsThemed(void) BOOL bAppThemed; BOOL bTPDefined; - SetLastError(0xdeadbeef); bThemeActive = pIsThemeActive(); trace("Theming is %s\n", (bThemeActive) ? "active" : "inactive"); - /* This test is not themed */ - SetLastError(0xdeadbeef); bAppThemed = pIsAppThemed(); - - if (bThemeActive) - todo_wine - ok( bAppThemed == FALSE, "Expected FALSE as this test executable is not (yet) themed.\n"); - else - /* Although Wine currently returns FALSE, the logic behind it is wrong. It is not a todo_wine though in the testing sense */ - ok( bAppThemed == FALSE, "Expected FALSE as this test executable is not (yet) themed.\n"); - - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + trace("Test executable is %s\n", (bAppThemed) ? "themed" : "not themed"); SetLastError(0xdeadbeef); bTPDefined = pIsThemePartDefined(NULL, 0 , 0);

1 0

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

03 Apr '13

Module: wine Branch: master Commit: 952588eac43244871c22e769e7027636ca45d932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952588eac43244871c22e769e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 14:03:13 2013 +0200 wininet: Use schannel in NETCON_secure_connect if OpenSSL is not available. --- dlls/wininet/internet.h | 5 + dlls/wininet/netconnection.c | 206 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 208 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c423fb6..9fbb74f 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -92,7 +92,12 @@ typedef struct int socket; BOOL secure; void *ssl_s; + CtxtHandle ssl_ctx; + SecPkgContext_StreamSizes ssl_sizes; server_t *server; + char *ssl_buf; + char *extra_buf; + size_t extra_len; DWORD security_flags; BOOL mask_errors; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 17518b9..e896d84 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -214,6 +214,7 @@ static PCCERT_CONTEXT X509_to_cert_context(X509 *cert) return ret; } +#endif /* SONAME_LIBSSL */ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTORE store) { @@ -372,6 +373,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR return ERROR_SUCCESS; } +#ifdef SONAME_LIBSSL static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) { SSL *ssl; @@ -603,6 +605,55 @@ static DWORD init_openssl(void) return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; #endif } +#else + +static SecHandle cred_handle, compat_cred_handle; +static BOOL cred_handle_initialized, have_compat_cred_handle; + +static CRITICAL_SECTION init_sechandle_cs; +static CRITICAL_SECTION_DEBUG init_sechandle_cs_debug = { + 0, 0, &init_sechandle_cs, + { &init_sechandle_cs_debug.ProcessLocksList, + &init_sechandle_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": init_sechandle_cs") } +}; +static CRITICAL_SECTION init_sechandle_cs = { &init_sechandle_cs_debug, -1, 0, 0, 0, 0 }; + +static BOOL ensure_cred_handle(void) +{ + SECURITY_STATUS res = SEC_E_OK; + + EnterCriticalSection(&init_sechandle_cs); + + if(!cred_handle_initialized) { + SCHANNEL_CRED cred = {SCHANNEL_CRED_VERSION}; + SecPkgCred_SupportedProtocols prots; + + res = AcquireCredentialsHandleW(NULL, (WCHAR*)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, &cred, + NULL, NULL, &cred_handle, NULL); + if(res == SEC_E_OK) { + res = QueryCredentialsAttributesA(&cred_handle, SECPKG_ATTR_SUPPORTED_PROTOCOLS, &prots); + if(res != SEC_E_OK || (prots.grbitProtocol & SP_PROT_TLS1_1PLUS_CLIENT)) { + cred.grbitEnabledProtocols = prots.grbitProtocol & ~SP_PROT_TLS1_1PLUS_CLIENT; + res = AcquireCredentialsHandleW(NULL, (WCHAR*)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, &cred, + NULL, NULL, &compat_cred_handle, NULL); + have_compat_cred_handle = res == SEC_E_OK; + } + } + + cred_handle_initialized = res == SEC_E_OK; + } + + LeaveCriticalSection(&init_sechandle_cs); + + if(res != SEC_E_OK) { + WARN("Failed: %08x\n", res); + return FALSE; + } + + return TRUE; +} + #endif /* SONAME_LIBSSL */ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) @@ -707,6 +758,10 @@ void free_netconn(netconn_t *netconn) #ifdef SONAME_LIBSSL pSSL_shutdown(netconn->ssl_s); pSSL_free(netconn->ssl_s); +#else + heap_free(netconn->ssl_buf); + netconn->ssl_buf = NULL; + DeleteSecurityContext(&netconn->ssl_ctx); #endif } @@ -738,6 +793,12 @@ void NETCON_unload(void) } heap_free(ssl_locks); } +#else + if(cred_handle_initialized) + FreeCredentialsHandle(&cred_handle); + if(have_compat_cred_handle) + FreeCredentialsHandle(&compat_cred_handle); + DeleteCriticalSection(&init_sechandle_cs); #endif } @@ -861,6 +922,147 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode } connection->ssl_s = ssl_s; +#else + SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; + SecBufferDesc out_desc = {SECBUFFER_VERSION, 1, &out_buf}, in_desc = {SECBUFFER_VERSION, 2, in_bufs}; + SecHandle *cred = &cred_handle; + BYTE *read_buf; + SIZE_T read_buf_size = 2048; + ULONG attrs = 0; + CtxtHandle ctx; + SSIZE_T size; + int bits; + const CERT_CONTEXT *cert; + SECURITY_STATUS status; + DWORD res = ERROR_SUCCESS; + + const DWORD isc_req_flags = ISC_REQ_ALLOCATE_MEMORY|ISC_REQ_USE_SESSION_KEY|ISC_REQ_CONFIDENTIALITY + |ISC_REQ_SEQUENCE_DETECT|ISC_REQ_REPLAY_DETECT|ISC_REQ_MANUAL_CRED_VALIDATION; + + if(!ensure_cred_handle()) + return FALSE; + + if(compat_mode) { + if(!have_compat_cred_handle) + return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + cred = &compat_cred_handle; + } + + read_buf = heap_alloc(read_buf_size); + if(!read_buf) + return ERROR_OUTOFMEMORY; + + status = InitializeSecurityContextW(cred, NULL, connection->server->name, isc_req_flags, 0, 0, NULL, 0, + &ctx, &out_desc, &attrs, NULL); + + assert(status != SEC_E_OK); + + while(status == SEC_I_CONTINUE_NEEDED || status == SEC_E_INCOMPLETE_MESSAGE) { + if(out_buf.cbBuffer) { + assert(status == SEC_I_CONTINUE_NEEDED); + + TRACE("sending %u bytes\n", out_buf.cbBuffer); + + size = send(connection->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); + if(size != out_buf.cbBuffer) { + ERR("send failed\n"); + status = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + break; + } + + FreeContextBuffer(out_buf.pvBuffer); + out_buf.pvBuffer = NULL; + out_buf.cbBuffer = 0; + } + + if(status == SEC_I_CONTINUE_NEEDED) { + assert(in_bufs[1].cbBuffer < read_buf_size); + + memmove(read_buf, (BYTE*)in_bufs[0].pvBuffer+in_bufs[0].cbBuffer-in_bufs[1].cbBuffer, in_bufs[1].cbBuffer); + in_bufs[0].cbBuffer = in_bufs[1].cbBuffer; + + in_bufs[1].BufferType = SECBUFFER_EMPTY; + in_bufs[1].cbBuffer = 0; + in_bufs[1].pvBuffer = NULL; + } + + assert(in_bufs[0].BufferType == SECBUFFER_TOKEN); + assert(in_bufs[1].BufferType == SECBUFFER_EMPTY); + + if(in_bufs[0].cbBuffer + 1024 > read_buf_size) { + BYTE *new_read_buf; + + new_read_buf = heap_realloc(read_buf, read_buf_size + 1024); + if(!new_read_buf) { + status = E_OUTOFMEMORY; + break; + } + + in_bufs[0].pvBuffer = read_buf = new_read_buf; + read_buf_size += 1024; + } + + size = recv(connection->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); + if(size < 1) { + WARN("recv error\n"); + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + break; + } + + TRACE("recv %lu bytes\n", size); + + in_bufs[0].cbBuffer += size; + in_bufs[0].pvBuffer = read_buf; + status = InitializeSecurityContextW(cred, &ctx, connection->server->name, isc_req_flags, 0, 0, &in_desc, + 0, NULL, &out_desc, &attrs, NULL); + TRACE("InitializeSecurityContext ret %08x\n", status); + + if(status == SEC_E_OK) { + if(in_bufs[1].BufferType == SECBUFFER_EXTRA) + FIXME("SECBUFFER_EXTRA not supported\n"); + + status = QueryContextAttributesW(&ctx, SECPKG_ATTR_STREAM_SIZES, &connection->ssl_sizes); + if(status != SEC_E_OK) { + WARN("Could not get sizes\n"); + break; + } + + status = QueryContextAttributesW(&ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); + if(status == SEC_E_OK) { + res = netconn_verify_cert(connection, cert, cert->hCertStore); + CertFreeCertificateContext(cert); + if(res != ERROR_SUCCESS) { + WARN("cert verify failed: %u\n", res); + break; + } + }else { + WARN("Could not get cert\n"); + break; + } + + connection->ssl_buf = heap_alloc(connection->ssl_sizes.cbHeader + connection->ssl_sizes.cbMaximumMessage + + connection->ssl_sizes.cbTrailer); + if(!connection->ssl_buf) { + res = GetLastError(); + break; + } + } + } + + + if(status != SEC_E_OK || res != ERROR_SUCCESS) { + WARN("Failed to initialize security context failed: %08x\n", status); + heap_free(connection->ssl_buf); + connection->ssl_buf = NULL; + DeleteSecurityContext(&ctx); + return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + } + + + TRACE("established SSL connection\n"); + connection->ssl_ctx = ctx; +#endif + connection->secure = TRUE; connection->security_flags |= SECURITY_FLAG_SECURE; @@ -876,6 +1078,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode connection->server->security_flags = connection->security_flags; return ERROR_SUCCESS; +#ifdef SONAME_LIBSSL fail: if (ssl_s) { @@ -883,9 +1086,6 @@ fail: pSSL_free(ssl_s); } return res; -#else - FIXME("Cannot connect, OpenSSL not available.\n"); - return ERROR_NOT_SUPPORTED; #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

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