Ros-diffs November 2016

ros-diffs@reactos.org

15 participants
317 discussions

[akhaldi] 73370: [MSTSC] Addendum to r73368. Peter, please review. CORE-9321

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 24 11:16:56 2016 New Revision: 73370 URL: http://svn.reactos.org/svn/reactos?rev=73370&view=rev Log: [MSTSC] Addendum to r73368. Peter, please review. CORE-9321 Modified: trunk/reactos/base/applications/mstsc/tcp.c Modified: trunk/reactos/base/applications/mstsc/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/tc… ============================================================================== --- trunk/reactos/base/applications/mstsc/tcp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/tcp.c [iso-8859-1] Thu Nov 24 11:16:56 2016 @@ -593,7 +593,7 @@ read_buf_size += 1024; } - size = recv(g_sock, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); + size = recv(g_sock, (char *)read_buf + in_bufs[0].cbBuffer, read_buf_size - in_bufs[0].cbBuffer, 0); if (size < 1) { error("recv failed: %d (%s)\n", size, TCP_STRERROR);

7 years, 10 months

[akhaldi] 73369: [README.WINE] Mark some DX dlls as synced with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 24 10:59:01 2016 New Revision: 73369 URL: http://svn.reactos.org/svn/reactos?rev=73369&view=rev Log: [README.WINE] Mark some DX dlls as synced with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Nov 24 10:59:01 2016 @@ -27,18 +27,18 @@ reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.16 +reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.16 +reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.11 +reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.11 -reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.16 +reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 -reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.11 -reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.11 -reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.16 +reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4

7 years, 10 months

[phater] 73368: [MSTSC] Add schannel based SSL implementation. CORE-9321

by phater＠svn.reactos.org

Author: phater Date: Thu Nov 24 10:56:09 2016 New Revision: 73368 URL: http://svn.reactos.org/svn/reactos?rev=73368&view=rev Log: [MSTSC] Add schannel based SSL implementation. CORE-9321 Modified: trunk/reactos/base/applications/mstsc/CMakeLists.txt trunk/reactos/base/applications/mstsc/tcp.c Modified: trunk/reactos/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/CM… ============================================================================== --- trunk/reactos/base/applications/mstsc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/CMakeLists.txt [iso-8859-1] Thu Nov 24 10:56:09 2016 @@ -30,10 +30,11 @@ uimain.h precomp.h) +add_definitions(-DWITH_SSL) file(GLOB mstsc_rc_deps res/*.*) add_rc_deps(rdc.rc ${mstsc_rc_deps}) add_executable(mstsc ${SOURCE} rdc.rc) set_module_type(mstsc win32gui UNICODE) -add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32) +add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 crypt32 secur32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32) add_pch(mstsc precomp.h SOURCE) add_cd_file(TARGET mstsc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mstsc/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/tc… ============================================================================== --- trunk/reactos/base/applications/mstsc/tcp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/tcp.c [iso-8859-1] Thu Nov 24 10:56:09 2016 @@ -20,6 +20,10 @@ */ #include "precomp.h" +#ifdef WITH_SSL +#include <sspi.h> +#include <schannel.h> +#endif #ifdef _WIN32 #define socklen_t int @@ -45,9 +49,25 @@ #endif #ifdef WITH_SSL +typedef struct +{ + CtxtHandle ssl_ctx; + SecPkgContext_StreamSizes ssl_sizes; + char *ssl_buf; + char *extra_buf; + size_t extra_len; + char *peek_msg; + char *peek_msg_mem; + size_t peek_len; + DWORD security_flags; +} netconn_t; +static char * g_ssl_server = NULL; static RD_BOOL g_ssl_initialized = False; -static SSL *g_ssl = NULL; -static SSL_CTX *g_ssl_ctx = NULL; +static RD_BOOL cred_handle_initialized = False; +static RD_BOOL have_compat_cred_handle = False; +static SecHandle cred_handle, compat_cred_handle; +static netconn_t g_ssl1; +static netconn_t *g_ssl = NULL; #endif /* WITH_SSL */ static int g_sock; static struct stream g_in; @@ -84,13 +104,171 @@ return result; } +#ifdef WITH_SSL + +RD_BOOL send_ssl_chunk(const void *msg, size_t size) +{ + SecBuffer bufs[4] = { + {g_ssl->ssl_sizes.cbHeader, SECBUFFER_STREAM_HEADER, g_ssl->ssl_buf}, + {size, SECBUFFER_DATA, g_ssl->ssl_buf+g_ssl->ssl_sizes.cbHeader}, + {g_ssl->ssl_sizes.cbTrailer, SECBUFFER_STREAM_TRAILER, g_ssl->ssl_buf+g_ssl->ssl_sizes.cbHeader+size}, + {0, SECBUFFER_EMPTY, NULL} + }; + SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; + SECURITY_STATUS res; + int tcp_res; + + memcpy(bufs[1].pvBuffer, msg, size); + res = EncryptMessage(&g_ssl->ssl_ctx, 0, &buf_desc, 0); + if (res != SEC_E_OK) + { + error("EncryptMessage failed: %d\n", res); + return False; + } + + tcp_res = send(g_sock, g_ssl->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0); + if (tcp_res < 1) + { + error("send failed: %d (%s)\n", tcp_res, TCP_STRERROR); + return False; + } + + return True; +} + +DWORD read_ssl_chunk(void *buf, SIZE_T buf_size, BOOL blocking, SIZE_T *ret_size, BOOL *eof) +{ + const SIZE_T ssl_buf_size = g_ssl->ssl_sizes.cbHeader+g_ssl->ssl_sizes.cbMaximumMessage+g_ssl->ssl_sizes.cbTrailer; + SecBuffer bufs[4]; + SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; + SSIZE_T size, buf_len = 0; + int i; + SECURITY_STATUS res; + + //assert(conn->extra_len < ssl_buf_size); + + if (g_ssl->extra_len) + { + memcpy(g_ssl->ssl_buf, g_ssl->extra_buf, g_ssl->extra_len); + buf_len = g_ssl->extra_len; + g_ssl->extra_len = 0; + xfree(g_ssl->extra_buf); + g_ssl->extra_buf = NULL; + } + + size = recv(g_sock, g_ssl->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); + if (size < 0) + { + if (!buf_len) + { + if (size == -1 && TCP_BLOCKS) + { + return WSAEWOULDBLOCK; + } + error("recv failed: %d (%s)\n", size, TCP_STRERROR); + return -1;//ERROR_INTERNET_CONNECTION_ABORTED; + } + } + else + { + buf_len += size; + } + + if (!buf_len) + { + *eof = TRUE; + *ret_size = 0; + return ERROR_SUCCESS; + } + + *eof = FALSE; + + do + { + memset(bufs, 0, sizeof(bufs)); + bufs[0].BufferType = SECBUFFER_DATA; + bufs[0].cbBuffer = buf_len; + bufs[0].pvBuffer = g_ssl->ssl_buf; + + res = DecryptMessage(&g_ssl->ssl_ctx, &buf_desc, 0, NULL); + switch (res) + { + case SEC_E_OK: + break; + case SEC_I_CONTEXT_EXPIRED: + *eof = TRUE; + return ERROR_SUCCESS; + case SEC_E_INCOMPLETE_MESSAGE: + //assert(buf_len < ssl_buf_size); + + size = recv(g_sock, g_ssl->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); + if (size < 1) + { + if (size == -1 && TCP_BLOCKS) + { + /* FIXME: Optimize extra_buf usage. */ + g_ssl->extra_buf = xmalloc(buf_len); + if (!g_ssl->extra_buf) + return ERROR_NOT_ENOUGH_MEMORY; + + g_ssl->extra_len = buf_len; + memcpy(g_ssl->extra_buf, g_ssl->ssl_buf, g_ssl->extra_len); + return WSAEWOULDBLOCK; + } + + error("recv failed: %d (%s)\n", size, TCP_STRERROR); + return -1;//ERROR_INTERNET_CONNECTION_ABORTED; + } + + buf_len += size; + continue; + default: + error("DecryptMessage failed: %d\n", res); + return -1;//ERROR_INTERNET_CONNECTION_ABORTED; + } + } + 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); + g_ssl->peek_msg_mem = g_ssl->peek_msg = xmalloc(bufs[i].cbBuffer - size); + if (!g_ssl->peek_msg) + return ERROR_NOT_ENOUGH_MEMORY; + g_ssl->peek_len = bufs[i].cbBuffer-size; + memcpy(g_ssl->peek_msg, (char*)bufs[i].pvBuffer+size, g_ssl->peek_len); + } + + *ret_size = size; + } + } + + for (i=0; i < sizeof(bufs)/sizeof(*bufs); i++) + { + if (bufs[i].BufferType == SECBUFFER_EXTRA) + { + g_ssl->extra_buf = xmalloc(bufs[i].cbBuffer); + if (!g_ssl->extra_buf) + return ERROR_NOT_ENOUGH_MEMORY; + + g_ssl->extra_len = bufs[i].cbBuffer; + memcpy(g_ssl->extra_buf, bufs[i].pvBuffer, g_ssl->extra_len); + } + } + + return ERROR_SUCCESS; +} +#endif /* WITH_SSL */ /* Send TCP transport data packet */ void tcp_send(STREAM s) { -#ifdef WITH_SSL - int ssl_err; -#endif /* WITH_SSL */ int length = s->end - s->data; int sent, total = 0; @@ -105,26 +283,28 @@ #ifdef WITH_SSL if (g_ssl) { - sent = SSL_write(g_ssl, s->data + total, length - total); - if (sent <= 0) - { - ssl_err = SSL_get_error(g_ssl, sent); - if (sent < 0 && (ssl_err == SSL_ERROR_WANT_READ || - ssl_err == SSL_ERROR_WANT_WRITE)) - { - TCP_SLEEP(0); - sent = 0; - } - else + const BYTE *ptr = s->data + total; + size_t chunk_size; + + sent = 0; + + while (length - total) + { + chunk_size = min(length - total, g_ssl->ssl_sizes.cbMaximumMessage); + if (!send_ssl_chunk(ptr, chunk_size)) { #ifdef WITH_SCARD scard_unlock(SCARD_LOCK_TCP); #endif - error("SSL_write: %d (%s)\n", ssl_err, TCP_STRERROR); + //error("send_ssl_chunk: %d (%s)\n", sent, TCP_STRERROR); g_network_error = True; return; } + + sent += chunk_size; + ptr += chunk_size; + length -= chunk_size; } } else @@ -144,7 +324,7 @@ scard_unlock(SCARD_LOCK_TCP); #endif - error("send: %s\n", TCP_STRERROR); + error("send: %d (%s)\n", sent, TCP_STRERROR); g_network_error = True; return; } @@ -165,9 +345,6 @@ { uint32 new_length, end_offset, p_offset; int rcvd = 0; -#ifdef WITH_SSL - int ssl_err; -#endif /* WITH_SSL */ if (g_network_error == True) return NULL; @@ -201,7 +378,7 @@ while (length > 0) { #ifdef WITH_SSL - if (!g_ssl || SSL_pending(g_ssl) <= 0) + if (!g_ssl) #endif /* WITH_SSL */ { if (!ui_select(g_sock)) @@ -215,33 +392,50 @@ #ifdef WITH_SSL if (g_ssl) { - rcvd = SSL_read(g_ssl, s->end, length); - ssl_err = SSL_get_error(g_ssl, rcvd); - - if (ssl_err == SSL_ERROR_SSL) - { - if (SSL_get_shutdown(g_ssl) & SSL_RECEIVED_SHUTDOWN) + SIZE_T size = 0; + BOOL eof; + DWORD res; + + if (g_ssl->peek_msg) + { + size = min(length, g_ssl->peek_len); + memcpy(s->end, g_ssl->peek_msg, size); + g_ssl->peek_len -= size; + g_ssl->peek_msg += size; + s->end += size; + + if (!g_ssl->peek_len) { - error("Remote peer initiated ssl shutdown.\n"); - return NULL; + xfree(g_ssl->peek_msg_mem); + g_ssl->peek_msg_mem = g_ssl->peek_msg = NULL; } - ERR_print_errors_fp(stdout); - g_network_error = True; - return NULL; - } - - if (ssl_err == SSL_ERROR_WANT_READ || ssl_err == SSL_ERROR_WANT_WRITE) - { - rcvd = 0; - } - else if (ssl_err != SSL_ERROR_NONE) - { - error("SSL_read: %d (%s)\n", ssl_err, TCP_STRERROR); - g_network_error = True; - return NULL; - } - + return s; + } + + do + { + res = read_ssl_chunk((BYTE*)s->end, length, TRUE, &size, &eof); + if (res != ERROR_SUCCESS) + { + if (res == WSAEWOULDBLOCK) + { + if (size) + { + res = ERROR_SUCCESS; + } + } + else + { + error("read_ssl_chunk: %d (%s)\n", res, TCP_STRERROR); + g_network_error = True; + return NULL; + } + break; + } + } + while (!size && !eof); + rcvd = size; } else { @@ -255,7 +449,7 @@ } else { - error("recv: %s\n", TCP_STRERROR); + error("recv: %d (%s)\n", rcvd, TCP_STRERROR); g_network_error = True; return NULL; } @@ -277,78 +471,206 @@ } #ifdef WITH_SSL + +RD_BOOL +ensure_cred_handle(void) +{ + SECURITY_STATUS res = SEC_E_OK; + + 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; + } + + if (res != SEC_E_OK) + { + error("ensure_cred_handle failed: %ld\n", res); + return False; + } + + return True; +} + +DWORD +ssl_handshake(RD_BOOL compat_mode) +{ + 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; + 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 -1; + + if (compat_mode) { + if (!have_compat_cred_handle) + return -1; + cred = &compat_cred_handle; + } + + read_buf = xmalloc(read_buf_size); + if (!read_buf) + return ERROR_OUTOFMEMORY; + + if (!g_ssl_server) + return -1; + + status = InitializeSecurityContextA(cred, NULL, g_ssl_server, 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); + + size = send(g_sock, out_buf.pvBuffer, out_buf.cbBuffer, 0); + if (size != out_buf.cbBuffer) + { + error("send failed: %d (%s)\n", size, TCP_STRERROR); + status = -1; + 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 = xrealloc(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(g_sock, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); + if (size < 1) + { + error("recv failed: %d (%s)\n", size, TCP_STRERROR); + res = -1; + break; + } + + in_bufs[0].cbBuffer += size; + in_bufs[0].pvBuffer = read_buf; + status = InitializeSecurityContextA(cred, &ctx, g_ssl_server, isc_req_flags, 0, 0, &in_desc, + 0, NULL, &out_desc, &attrs, NULL); + + if (status == SEC_E_OK) { + if (SecIsValidHandle(&g_ssl->ssl_ctx)) + DeleteSecurityContext(&g_ssl->ssl_ctx); + g_ssl->ssl_ctx = ctx; + + if (in_bufs[1].BufferType == SECBUFFER_EXTRA) + { + //FIXME("SECBUFFER_EXTRA not supported\n"); + } + + status = QueryContextAttributesW(&ctx, SECPKG_ATTR_STREAM_SIZES, &g_ssl->ssl_sizes); + if (status != SEC_E_OK) + { + //error("Can't determine ssl buffer sizes: %ld\n", status); + break; + } + + g_ssl->ssl_buf = xmalloc(g_ssl->ssl_sizes.cbHeader + g_ssl->ssl_sizes.cbMaximumMessage + + g_ssl->ssl_sizes.cbTrailer); + if (!g_ssl->ssl_buf) + { + res = GetLastError(); + break; + } + } + } + + xfree(read_buf); + + if (status != SEC_E_OK || res != ERROR_SUCCESS) + { + error("Failed to establish SSL connection: %08x (%u)\n", status, res); + xfree(g_ssl->ssl_buf); + g_ssl->ssl_buf = NULL; + return res ? res : -1; + } + + return ERROR_SUCCESS; +} + /* Establish a SSL/TLS 1.0 connection */ RD_BOOL tcp_tls_connect(void) { int err; - long options; + char tcp_port_rdp_s[10]; if (!g_ssl_initialized) { - SSL_load_error_strings(); - SSL_library_init(); + g_ssl = &g_ssl1; + SecInvalidateHandle(&g_ssl->ssl_ctx); + g_ssl_initialized = True; } - /* create process context */ - if (g_ssl_ctx == NULL) - { - g_ssl_ctx = SSL_CTX_new(TLSv1_client_method()); - if (g_ssl_ctx == NULL) - { - error("tcp_tls_connect: SSL_CTX_new() failed to create TLS v1.0 context\n"); - goto fail; - } - - options = 0; -#ifdef SSL_OP_NO_COMPRESSION - options |= SSL_OP_NO_COMPRESSION; -#endif // __SSL_OP_NO_COMPRESSION - options |= SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; - SSL_CTX_set_options(g_ssl_ctx, options); - } - - /* free old connection */ - if (g_ssl) - SSL_free(g_ssl); - - /* create new ssl connection */ - g_ssl = SSL_new(g_ssl_ctx); - if (g_ssl == NULL) - { - error("tcp_tls_connect: SSL_new() failed\n"); + snprintf(tcp_port_rdp_s, 10, "%d", g_tcp_port_rdp); + if ((err = ssl_handshake(FALSE)) != 0) + { goto fail; } - if (SSL_set_fd(g_ssl, g_sock) < 1) - { - error("tcp_tls_connect: SSL_set_fd() failed\n"); - goto fail; - } - - do - { - err = SSL_connect(g_ssl); - } - while (SSL_get_error(g_ssl, err) == SSL_ERROR_WANT_READ); - - if (err < 0) - { - ERR_print_errors_fp(stdout); - goto fail; - } - return True; fail: - if (g_ssl) - SSL_free(g_ssl); - if (g_ssl_ctx) - SSL_CTX_free(g_ssl_ctx); - g_ssl = NULL; - g_ssl_ctx = NULL; return False; } @@ -356,46 +678,36 @@ RD_BOOL tcp_tls_get_server_pubkey(STREAM s) { - X509 *cert = NULL; - EVP_PKEY *pkey = NULL; + const CERT_CONTEXT *cert = NULL; + SECURITY_STATUS status; s->data = s->p = NULL; s->size = 0; if (g_ssl == NULL) goto out; - - cert = SSL_get_peer_certificate(g_ssl); - if (cert == NULL) - { - error("tcp_tls_get_server_pubkey: SSL_get_peer_certificate() failed\n"); + status = QueryContextAttributesW(&g_ssl->ssl_ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); + if (status != SEC_E_OK) + { + error("tcp_tls_get_server_pubkey: QueryContextAttributesW() failed %ld\n", status); goto out; } - pkey = X509_get_pubkey(cert); - if (pkey == NULL) - { - error("tcp_tls_get_server_pubkey: X509_get_pubkey() failed\n"); + s->size = cert->cbCertEncoded; + if (s->size < 1) + { + error("tcp_tls_get_server_pubkey: cert->cbCertEncoded = %ld\n", cert->cbCertEncoded); goto out; } - s->size = i2d_PublicKey(pkey, NULL); - if (s->size < 1) - { - error("tcp_tls_get_server_pubkey: i2d_PublicKey() failed\n"); - goto out; - } - - s->data = s->p = xmalloc(s->size); - i2d_PublicKey(pkey, &s->p); + s->data = s->p = (unsigned char *)xmalloc(s->size); + memcpy(cert->pbCertEncoded, &s->p, s->size); s->p = s->data; s->end = s->p + s->size; out: if (cert) - X509_free(cert); - if (pkey) - EVP_PKEY_free(pkey); + CertFreeCertificateContext(cert); return (s->size != 0); } #endif /* WITH_SSL */ @@ -508,6 +820,10 @@ g_out[i].data = (uint8 *) xmalloc(g_out[i].size); } +#ifdef WITH_SSL + g_ssl_server = xmalloc(strlen(server)+1); +#endif /* WITH_SSL */ + return True; } @@ -518,12 +834,28 @@ #ifdef WITH_SSL if (g_ssl) { - if (!g_network_error) - (void) SSL_shutdown(g_ssl); - SSL_free(g_ssl); + xfree(g_ssl->peek_msg_mem); + g_ssl->peek_msg_mem = NULL; + g_ssl->peek_msg = NULL; + g_ssl->peek_len = 0; + xfree(g_ssl->ssl_buf); + g_ssl->ssl_buf = NULL; + xfree(g_ssl->extra_buf); + g_ssl->extra_buf = NULL; + g_ssl->extra_len = 0; + if (SecIsValidHandle(&g_ssl->ssl_ctx)) + DeleteSecurityContext(&g_ssl->ssl_ctx); + if (cred_handle_initialized) + FreeCredentialsHandle(&cred_handle); + if (have_compat_cred_handle) + FreeCredentialsHandle(&compat_cred_handle); + if (g_ssl_server) + { + xfree(g_ssl_server); + g_ssl_server = NULL; + } g_ssl = NULL; - SSL_CTX_free(g_ssl_ctx); - g_ssl_ctx = NULL; + g_ssl_initialized = False; } #endif /* WITH_SSL */ TCP_CLOSE(g_sock);

7 years, 10 months

[spetreolle] 73367: [INCLUDES/WINE][DBGHELP] Remove the rbtree.h difference with Wine Staging 1.9.23. CORE-12409

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Nov 23 21:33:54 2016 New Revision: 73367 URL: http://svn.reactos.org/svn/reactos?rev=73367&view=rev Log: [INCLUDES/WINE][DBGHELP] Remove the rbtree.h difference with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/sdk/include/host/wine/rbtree.h trunk/reactos/sdk/include/reactos/wine/rbtree.h Modified: trunk/reactos/sdk/include/host/wine/rbtree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/host/wine/rbtr… ============================================================================== --- trunk/reactos/sdk/include/host/wine/rbtree.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/host/wine/rbtree.h [iso-8859-1] Wed Nov 23 21:33:54 2016 @@ -1 +1,2 @@ +#include <stddef.h> #include "../../reactos/wine/rbtree.h" Modified: trunk/reactos/sdk/include/reactos/wine/rbtree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/wine/r… ============================================================================== --- trunk/reactos/sdk/include/reactos/wine/rbtree.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/wine/rbtree.h [iso-8859-1] Wed Nov 23 21:33:54 2016 @@ -26,10 +26,10 @@ #ifdef __GNUC__ # define WINE_RB_ENTRY_VALUE(element, type, field) ({ \ const typeof(((type *)0)->field) *__ptr = (element); \ - (type *)((char *)__ptr - FIELD_OFFSET(type, field)); }) + (type *)((char *)__ptr - offsetof(type, field)); }) #else # define WINE_RB_ENTRY_VALUE(element, type, field) \ - ((type *)((char *)(element) - FIELD_OFFSET(type, field))) + ((type *)((char *)(element) - offsetof(type, field))) #endif struct wine_rb_entry

7 years, 10 months

[akhaldi] 73366: [D3DX9_33] We don't need these here as d3dx9_36 already has them.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Nov 23 18:43:17 2016 New Revision: 73366 URL: http://svn.reactos.org/svn/reactos?rev=73366&view=rev Log: [D3DX9_33] We don't need these here as d3dx9_36 already has them. Modified: trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c Modified: trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_33/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_33/d3dx9_33_main.c [iso-8859-1] Wed Nov 23 18:43:17 2016 @@ -63,21 +63,3 @@ else return FALSE; } - -/*********************************************************************** - * D3DXDebugMute - * Returns always FALSE for us. - */ -BOOL WINAPI D3DXDebugMute(BOOL mute) -{ - return FALSE; -} - -/*********************************************************************** - * D3DXGetDriverLevel. - * Returns always 900 (DX 9) for us - */ -UINT WINAPI D3DXGetDriverLevel(struct IDirect3DDevice9 *device) -{ - return 900; -}

7 years, 10 months

[akhaldi] 73365: [UXTHEME] Reduce difference with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Nov 23 18:38:48 2016 New Revision: 73365 URL: http://svn.reactos.org/svn/reactos?rev=73365&view=rev Log: [UXTHEME] Reduce difference with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/dll/win32/uxtheme/buffer.c trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/metric.c trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/uxini.c Modified: trunk/reactos/dll/win32/uxtheme/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/buffer.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] Wed Nov 23 18:38:48 2016 @@ -67,3 +67,106 @@ FIXME("Stub (%p %d)\n", hPaintBuffer, fUpdateTarget); return S_OK; } + +#ifndef __REACTOS__ + +/*********************************************************************** + * BufferedPaintClear (UXTHEME.@) + */ +HRESULT WINAPI BufferedPaintClear(HPAINTBUFFER hBufferedPaint, const RECT *prc) +{ + FIXME("Stub (%p %p)\n", hBufferedPaint, prc); + return E_NOTIMPL; +} + +/*********************************************************************** + * BufferedPaintSetAlpha (UXTHEME.@) + */ +HRESULT WINAPI BufferedPaintSetAlpha(HPAINTBUFFER hBufferedPaint, const RECT *prc, BYTE alpha) +{ + FIXME("Stub (%p %p %u)\n", hBufferedPaint, prc, alpha); + return E_NOTIMPL; +} + +/*********************************************************************** + * GetBufferedPaintBits (UXTHEME.@) + */ +HRESULT WINAPI GetBufferedPaintBits(HPAINTBUFFER hBufferedPaint, RGBQUAD **ppbBuffer, + int *pcxRow) +{ + FIXME("Stub (%p %p %p)\n", hBufferedPaint, ppbBuffer, pcxRow); + return E_NOTIMPL; +} + +/*********************************************************************** + * GetBufferedPaintDC (UXTHEME.@) + */ +HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER hBufferedPaint) +{ + FIXME("Stub (%p)\n", hBufferedPaint); + return NULL; +} + +/*********************************************************************** + * GetBufferedPaintTargetDC (UXTHEME.@) + */ +HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER hBufferedPaint) +{ + FIXME("Stub (%p)\n", hBufferedPaint); + return NULL; +} + +/*********************************************************************** + * GetBufferedPaintTargetRect (UXTHEME.@) + */ +HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER hBufferedPaint, RECT *prc) +{ + FIXME("Stub (%p %p)\n", hBufferedPaint, prc); + return E_NOTIMPL; +} + +/*********************************************************************** + * BeginBufferedAnimation (UXTHEME.@) + */ +HANIMATIONBUFFER WINAPI BeginBufferedAnimation(HWND hwnd, HDC hdcTarget, const RECT *rcTarget, + BP_BUFFERFORMAT dwFormat, BP_PAINTPARAMS *pPaintParams, + BP_ANIMATIONPARAMS *pAnimationParams, HDC *phdcFrom, + HDC *phdcTo) +{ + FIXME("Stub (%p %p %p %u %p %p %p %p)\n", hwnd, hdcTarget, rcTarget, dwFormat, + pPaintParams, pAnimationParams, phdcFrom, phdcTo); + + return NULL; +} + +/*********************************************************************** + * BufferedPaintRenderAnimation (UXTHEME.@) + */ +BOOL WINAPI BufferedPaintRenderAnimation(HWND hwnd, HDC hdcTarget) +{ + FIXME("Stub (%p %p)\n", hwnd, hdcTarget); + + return FALSE; +} + +/*********************************************************************** + * BufferedPaintStopAllAnimations (UXTHEME.@) + */ +HRESULT WINAPI BufferedPaintStopAllAnimations(HWND hwnd) +{ + FIXME("Stub (%p)\n", hwnd); + + return E_NOTIMPL; +} + +/*********************************************************************** + * EndBufferedAnimation (UXTHEME.@) + */ +HRESULT WINAPI EndBufferedAnimation(HANIMATIONBUFFER hbpAnimation, BOOL fUpdateTarget) +{ + FIXME("Stub (%p %u)\n", hbpAnimation, fUpdateTarget); + + return E_NOTIMPL; +} + +#endif /* __REACTOS__ */ Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Wed Nov 23 18:38:48 2016 @@ -82,9 +82,9 @@ if(!hParent) hParent = hwnd; if(prc) { - CopyRect(&rt, prc); + rt = *prc; MapWindowPoints(hwnd, hParent, (LPPOINT)&rt, 2); - + clip = CreateRectRgn(0,0,1,1); hasClip = GetClipRgn(hdc, clip); if(hasClip == -1) @@ -126,7 +126,7 @@ opts.dwFlags = 0; if(pClipRect) { opts.dwFlags |= DTBG_CLIPRECT; - CopyRect(&opts.rcClip, pClipRect); + opts.rcClip = *pClipRect; } return DrawThemeBackgroundEx(hTheme, hdc, iPartId, iStateId, pRect, &opts); } @@ -562,7 +562,7 @@ int sizingtype = ST_STRETCH; BOOL uniformsizing = FALSE; - CopyRect(&rcDst, prc); + rcDst = *prc; dstSize.x = rcDst.right-rcDst.left; dstSize.y = rcDst.bottom-rcDst.top; @@ -670,7 +670,7 @@ } oldSrc = SelectObject(hdcSrc, bmpSrc); - CopyRect(&rcDst, pRect); + rcDst = *pRect; get_transparency (hTheme, iPartId, iStateId, hasAlpha, &transparent, &transparentcolor, FALSE); @@ -743,7 +743,7 @@ rcSrc.right = srcSize.x; rcSrc.bottom = srcSize.y; } -#endif +#endif /* __REACTOS__ */ hdcDst = hdc; OffsetViewportOrgEx(hdcDst, rcDst.left, rcDst.top, &org); @@ -851,7 +851,7 @@ DeleteDC(hdcSrc); if (bmpSrcResized) DeleteObject(bmpSrcResized); if (hdcOrigSrc) DeleteDC(hdcOrigSrc); - CopyRect(pRect, &rcDst); + *pRect = rcDst; return hr; } @@ -989,7 +989,7 @@ HRESULT hr; RECT rt; - CopyRect(&rt, pRect); + rt = *pRect; hr = UXTHEME_DrawBorderRectangle(hTheme, hdc, iPartId, iStateId, &rt, pOptions); if(FAILED(hr)) @@ -1031,7 +1031,7 @@ else IntersectClipRect(hdc, opts->rcClip.left, opts->rcClip.top, opts->rcClip.right, opts->rcClip.bottom); } - CopyRect(&rt, pRect); + rt = *pRect; if(bgtype == BT_IMAGEFILE) hr = UXTHEME_DrawImageBackground(hTheme, hdc, iPartId, iStateId, &rt, opts); @@ -1614,7 +1614,7 @@ FIXME("%d %d: stub\n", iPartId, iStateId); if(!hTheme) return E_HANDLE; - return ERROR_CALL_NOT_IMPLEMENTED; + return E_NOTIMPL; } /*********************************************************************** @@ -1710,7 +1710,7 @@ /* If nothing was found, leave unchanged */ } - TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pContentRect->left, pContentRect->top, pContentRect->right, pContentRect->bottom); + TRACE("%s\n", wine_dbgstr_rect(pContentRect)); return S_OK; } @@ -1758,7 +1758,7 @@ /* If nothing was found, leave unchanged */ } - TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pExtentRect->left, pExtentRect->top, pExtentRect->right, pExtentRect->bottom); + TRACE("%s\n", wine_dbgstr_rect(pExtentRect)); return S_OK; } @@ -2015,8 +2015,8 @@ return E_HANDLE; if(pBoundingRect) - CopyRect(&rt, pBoundingRect); - + rt = *pBoundingRect; + hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont); if(SUCCEEDED(hr)) { hFont = CreateFontIndirectW(&logfont); @@ -2027,7 +2027,7 @@ oldFont = SelectObject(hdc, hFont); DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags|DT_CALCRECT); - CopyRect(pExtentRect, &rt); + *pExtentRect = rt; if(hFont) { SelectObject(hdc, oldFont); Modified: trunk/reactos/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] Wed Nov 23 18:38:48 2016 @@ -225,3 +225,17 @@ return MSSTYLES_GetPropertyString(tp, pszStringBuff, cchMaxStringChars); return E_PROP_ID_UNSUPPORTED; } + +#ifndef __REACTOS__ +/*********************************************************************** + * GetThemeTransitionDuration (UXTHEME.@) + */ +HRESULT WINAPI GetThemeTransitionDuration(HTHEME hTheme, int iPartId, int iStateIdFrom, + int iStateIdTo, int iPropId, DWORD *pdwDuration) +{ + FIXME("(%p, %u, %u, %u, %u, %p) stub\n", hTheme, iPartId, iStateIdFrom, iStateIdTo, + iPropId, pdwDuration); + + return E_NOTIMPL; +} +#endif Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Wed Nov 23 18:38:48 2016 @@ -699,8 +699,8 @@ LPCWSTR pszAppName; LPCWSTR pszUseClassList; HTHEME hTheme = NULL; - TRACE("(%p,%s)\n", hwnd, debugstr_w(pszClassList)); - + TRACE("(%p,%s, %x)\n", hwnd, debugstr_w(pszClassList), flags); + if(!pszClassList) { SetLastError(E_POINTER); @@ -894,7 +894,7 @@ FIXME("%d %d 0x%08x: stub\n", iPartId, iStateId, dwOptions); if(!hTheme) return E_HANDLE; - return ERROR_CALL_NOT_IMPLEMENTED; + return E_NOTIMPL; } /*********************************************************************** @@ -1320,7 +1320,7 @@ PARSETHEMEINIFILEPROC callback, LPVOID lpData) { FIXME("%s %s: stub\n", debugstr_w(pszIniFileName), debugstr_w(pszUnknown)); - return ERROR_CALL_NOT_IMPLEMENTED; + return E_NOTIMPL; } /********************************************************************** Modified: trunk/reactos/dll/win32/uxtheme/uxini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxini.c?… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] Wed Nov 23 18:38:48 2016 @@ -32,7 +32,7 @@ LPCWSTR lpIni; LPCWSTR lpCurLoc; LPCWSTR lpEnd; -} UXINI_FILE; +} UXINI_FILE, *PUXINI_FILE; /***********************************************************************/

7 years, 10 months

[pschweitzer] 73364: [LOCALMON] Add French translation. CORE-12363

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Nov 23 18:29:40 2016 New Revision: 73364 URL: http://svn.reactos.org/svn/reactos?rev=73364&view=rev Log: [LOCALMON] Add French translation. CORE-12363 Added: trunk/reactos/win32ss/printing/monitors/localmon/lang/fr-FR.rc (with props) Modified: trunk/reactos/win32ss/printing/monitors/localmon/localmon.rc Added: trunk/reactos/win32ss/printing/monitors/localmon/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/monitors/… ============================================================================== --- trunk/reactos/win32ss/printing/monitors/localmon/lang/fr-FR.rc (added) +++ trunk/reactos/win32ss/printing/monitors/localmon/lang/fr-FR.rc [iso-8859-1] Wed Nov 23 18:29:40 2016 @@ -0,0 +1,7 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_LOCAL_PORT "Port local" + IDS_LOCAL_MONITOR "Moniteur local" +END Propchange: trunk/reactos/win32ss/printing/monitors/localmon/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/printing/monitors/localmon/localmon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/monitors/… ============================================================================== --- trunk/reactos/win32ss/printing/monitors/localmon/localmon.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/monitors/localmon/localmon.rc [iso-8859-1] Wed Nov 23 18:29:40 2016 @@ -24,6 +24,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif

7 years, 10 months

[akhaldi] 73363: [CDFS] Fix a thinko.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Nov 23 18:27:07 2016 New Revision: 73363 URL: http://svn.reactos.org/svn/reactos?rev=73363&view=rev Log: [CDFS] Fix a thinko. Modified: trunk/reactos/drivers/filesystems/cdfs/cleanup.c Modified: trunk/reactos/drivers/filesystems/cdfs/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] Wed Nov 23 18:27:07 2016 @@ -44,8 +44,8 @@ PDEVICE_EXTENSION DeviceExt; PFCB Fcb; - DPRINT("CdfsCleanupFile(DeviceExt %p, FileObject %p)\n", - DeviceExt, + DPRINT("CdfsCleanupFile(IrpContext %p, FileObject %p)\n", + IrpContext, FileObject); DeviceExt = IrpContext->DeviceObject->DeviceExtension;

7 years, 10 months

[pschweitzer] 73362: [FASTFAT] In IRP_MJ_QUERY_INFORMATION/IRP_MJ_SET_INFORMATION, handle the case when we receive buggy FO without FCB. This fixes bugchecks when using FileSpy. CORE-12448

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Nov 23 18:21:03 2016 New Revision: 73362 URL: http://svn.reactos.org/svn/reactos?rev=73362&view=rev Log: [FASTFAT] In IRP_MJ_QUERY_INFORMATION/IRP_MJ_SET_INFORMATION, handle the case when we receive buggy FO without FCB. This fixes bugchecks when using FileSpy. CORE-12448 Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Wed Nov 23 18:21:03 2016 @@ -1444,6 +1444,12 @@ DPRINT("VfatQueryInformation is called for '%s'\n", FileInformationClass >= FileMaximumInformation - 1 ? "????" : FileInformationClassNames[FileInformationClass]); + if (FCB == NULL) + { + DPRINT1("IRP_MJ_QUERY_INFORMATION without FCB!\n"); + IrpContext->Irp->IoStatus.Information = 0; + return STATUS_INVALID_PARAMETER; + } SystemBuffer = IrpContext->Irp->AssociatedIrp.SystemBuffer; BufferLength = IrpContext->Stack->Parameters.QueryFile.Length; @@ -1569,6 +1575,13 @@ DPRINT("FileInformationClass %d\n", FileInformationClass); DPRINT("SystemBuffer %p\n", SystemBuffer); + if (FCB == NULL) + { + DPRINT1("IRP_MJ_SET_INFORMATION without FCB!\n"); + IrpContext->Irp->IoStatus.Information = 0; + return STATUS_INVALID_PARAMETER; + } + /* Special: We should call MmCanFileBeTruncated here to determine if changing the file size would be allowed. If not, we bail with the right error. We must do this before acquiring the lock. */

7 years, 10 months

[akhaldi] 73361: [WININET_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Nov 23 18:11:04 2016 New Revision: 73361 URL: http://svn.reactos.org/svn/reactos?rev=73361&view=rev Log: [WININET_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/wininet/http.c Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Wed Nov 23 18:11:04 2016 @@ -205,7 +205,7 @@ static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL is_todo) { DWORD code, size, index; - char exbuf[10], bufa[10]; + char exbuf[12], bufa[10]; WCHAR bufw[10]; BOOL res; @@ -4904,11 +4904,10 @@ CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); } -#define readex_expect_sync_data(a,b,c,d,e) _readex_expect_sync_data(__LINE__,a,b,c,d,e) -static void _readex_expect_sync_data(unsigned line, HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, - DWORD buf_size, const char *exdata) -{ - DWORD len = strlen(exdata); +#define readex_expect_sync_data_len(a,b,c,d,e,f) _readex_expect_sync_data_len(__LINE__,a,b,c,d,e,f) +static void _readex_expect_sync_data_len(unsigned line, HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, + DWORD buf_size, const char *exdata, DWORD len) +{ BOOL ret; SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); @@ -4918,10 +4917,17 @@ ret = InternetReadFileExW(req, buf, flags, 0xdeadbeef); ok_(__FILE__,line)(ret, "InternetReadFileExW failed: %u\n", GetLastError()); ok_(__FILE__,line)(buf->dwBufferLength == len, "dwBufferLength = %u, expected %u\n", buf->dwBufferLength, len); - if(len) + if(len && exdata) ok_(__FILE__,line)(!memcmp(buf->lpvBuffer, exdata, len), "Unexpected data\n"); CLEAR_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); +} + +#define readex_expect_sync_data(a,b,c,d,e) _readex_expect_sync_data(__LINE__,a,b,c,d,e) +static void _readex_expect_sync_data(unsigned line, HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, + DWORD buf_size, const char *exdata) +{ + _readex_expect_sync_data_len(line, req, flags, buf, buf_size, exdata, strlen(exdata)); } static void send_response_and_wait(const char *response, BOOL close_connection, INTERNET_BUFFERSW *buf) @@ -4946,6 +4952,17 @@ /* If IRF_NO_WAIT is used, buffer is not changed. */ ok(buf->dwBufferLength == orig_size, "dwBufferLength = %u\n", buf->dwBufferLength); ok(!*(int*)buf->lpvBuffer, "buffer data changed\n"); +} + +static void send_response_len_and_wait(unsigned len, BOOL close_connection, INTERNET_BUFFERSW *buf) +{ + char *response; + + response = HeapAlloc(GetProcessHeap(), 0, len+1); + memset(response, 'x', len); + response[len] = 0; + send_response_and_wait(response, close_connection, buf); + HeapFree(GetProcessHeap(), 0, response); } static void readex_expect_async(HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, DWORD buf_size) @@ -4960,11 +4977,26 @@ ok(!*(int*)buf->lpvBuffer, "buffer data changed\n"); } +#define expect_data_available(a,b) _expect_data_available(__LINE__,a,b) +static DWORD _expect_data_available(unsigned line, HINTERNET req, int exsize) +{ + DWORD size = 0; + BOOL res; + + res = InternetQueryDataAvailable(req, &size, 0, 0); + ok_(__FILE__,line)(res, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + if(exsize != -1) + ok_(__FILE__,line)(size == exsize, "size = %u, expected %u\n", size, exsize); + + return size; +} + static void test_http_read(int port) { INTERNET_BUFFERSW ib; test_request_t req; - char buf[4096]; + char buf[24000]; + DWORD avail; if(!is_ie7plus) return; @@ -5040,6 +5072,27 @@ readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), ""); close_async_handle(req.session, hCompleteEvent, 2); + + trace("Testing InternetQueryDataAvailable...\n"); + + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "\r\n" + "123"); + expect_data_available(req.request, 3); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "123"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_len_and_wait(20000, TRUE, &ib); + avail = expect_data_available(req.request, -1); + ok(avail < 17000, "avail = %u\n", avail); + + SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); + SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); + close_async_handle(req.session, hCompleteEvent, 2); + todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CloseHandle(hCompleteEvent); CloseHandle(conn_wait_event);

7 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2016