Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[cgutman] 50077: [USBDRIVER] - Fix a bug that resulted in us only copying half of the old keyboard data - CID 10402
by cgutman＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: cgutman Date: Tue Dec 21 04:35:12 2010 New Revision: 50077 URL: http://svn.reactos.org/svn/reactos?rev=50077&view=rev Log: [USBDRIVER] - Fix a bug that resulted in us only copying half of the old keyboard data - CID 10402 Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] Tue Dec 21 04:35:12 2010 @@ -277,7 +277,7 @@ } // Save old keyboard data - RtlCopyMemory(pdev_ext->kbd_old, data, sizeof(data)); + RtlCopyMemory(pdev_ext->kbd_old, data, 8); // resubmit the urb status = usb_submit_urb(pdev_ext->dev_mgr, purb);

1 0

[rmessiant] 50076: [CLASSPNP] - Use correct type in sizeof expression (CID 1646 and 10401). - Simplify signature define (CID 3653 and 3654). - Remove funky 0xFF characters.
by rmessiant＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: rmessiant Date: Tue Dec 21 00:41:52 2010 New Revision: 50076 URL: http://svn.reactos.org/svn/reactos?rev=50076&view=rev Log: [CLASSPNP] - Use correct type in sizeof expression (CID 1646 and 10401). - Simplify signature define (CID 3653 and 3654). - Remove funky 0xFF characters. Modified: trunk/reactos/drivers/storage/classpnp/dictlib.c Modified: trunk/reactos/drivers/storage/classpnp/dictlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/d… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/dictlib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/dictlib.c [iso-8859-1] Tue Dec 21 00:41:52 2010 @@ -26,30 +26,27 @@ #include <ntddk.h> #include <classpnp.h> -#define DICTIONARY_SIGNATURE (((ULONG)'dict' << 32) + 'sig ') - -struct _DICTIONARY_HEADER { +#define DICTIONARY_SIGNATURE 'dsig' + +typedef struct _DICTIONARY_HEADER { struct _DICTIONARY_HEADER* Next; ULONGLONG Key; UCHAR Data[0]; -}; - -struct _DICTIONARY_HEADER; -typedef struct _DICTIONARY_HEADER DICTIONARY_HEADER, *PDICTIONARY_HEADER; - - +} DICTIONARY_HEADER, *PDICTIONARY_HEADER; + + VOID InitializeDictionary( IN PDICTIONARY Dictionary ) { - RtlZeroMemory(Dictionary, sizeof(Dictionary)); + RtlZeroMemory(Dictionary, sizeof(DICTIONARY)); Dictionary->Signature = DICTIONARY_SIGNATURE; KeInitializeSpinLock(&Dictionary->SpinLock); return; } - + BOOLEAN TestDictionarySignature( IN PDICTIONARY Dictionary @@ -136,7 +133,7 @@ return status; } - + PVOID GetDictionaryEntry( IN PDICTIONARY Dictionary, @@ -168,7 +165,7 @@ return data; } - + VOID FreeDictionaryEntry( IN PDICTIONARY Dictionary,

1 0

[jgardou] 50075: [CMAKE] - issue an error when an invalid module type is provided - add nativedll module type.
by jgardou＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: jgardou Date: Mon Dec 20 23:51:41 2010 New Revision: 50075 URL: http://svn.reactos.org/svn/reactos?rev=50075&view=rev Log: [CMAKE] - issue an error when an invalid module type is provided - add nativedll module type. Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=500… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Dec 20 23:51:41 2010 @@ -107,8 +107,7 @@ if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) set_entrypoint(${MODULE} NtProcessStartup@4) - endif() - if(${TYPE} MATCHES win32gui) + elseif(${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) set_entrypoint(${MODULE} WinMainCRTStartup) if(NOT IS_UNICODE) @@ -117,8 +116,7 @@ target_link_libraries(${MODULE} mingw_wmain) endif(NOT IS_UNICODE) target_link_libraries(${MODULE} mingw_common) - endif() - if(${TYPE} MATCHES win32cui) + elseif(${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) set_entrypoint(${MODULE} mainCRTStartup) if(NOT IS_UNICODE) @@ -127,8 +125,7 @@ target_link_libraries(${MODULE} mingw_wmain) endif(NOT IS_UNICODE) target_link_libraries(${MODULE} mingw_common) - endif() - if(${TYPE} MATCHES win32dll) + elseif(${TYPE} MATCHES win32dll) set_entrypoint(${MODULE} DllMainCRTStartup@12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) if(DEFINED baseaddress_${MODULE}) @@ -136,24 +133,25 @@ else() message(STATUS "${MODULE} has no base address") endif() - endif() - if(${TYPE} MATCHES win32ocx) + elseif(${TYPE} MATCHES win32ocx) set_entrypoint(${MODULE} DllMainCRTStartup@12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") - endif() - if(${TYPE} MATCHES cpl) + elseif(${TYPE} MATCHES cpl) set_entrypoint(${MODULE} DllMainCRTStartup@12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") - endif() - if(${TYPE} MATCHES kernelmodedriver) + elseif(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys") set_entrypoint(${MODULE} DriverEntry@8) set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) add_dependencies(${MODULE} bugcodes) - endif() + elseif(${TYPE} MATCHES nativedll) + set_subsystem(${MODULE} native) + else() + message(FATAL_ERROR "Unknown module type : ${TYPE}") + endif() endmacro() macro(set_unicode)

1 0

[cgutman] 50074: [URLMON] - Sync to Wine 1.3.9
by cgutman＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: cgutman Date: Mon Dec 20 21:29:55 2010 New Revision: 50074 URL: http://svn.reactos.org/svn/reactos?rev=50074&view=rev Log: [URLMON] - Sync to Wine 1.3.9 Modified: trunk/reactos/dll/win32/urlmon/bindctx.c trunk/reactos/dll/win32/urlmon/binding.c trunk/reactos/dll/win32/urlmon/bindprot.c trunk/reactos/dll/win32/urlmon/download.c trunk/reactos/dll/win32/urlmon/file.c trunk/reactos/dll/win32/urlmon/format.c trunk/reactos/dll/win32/urlmon/ftp.c trunk/reactos/dll/win32/urlmon/gopher.c trunk/reactos/dll/win32/urlmon/http.c trunk/reactos/dll/win32/urlmon/protocol.c trunk/reactos/dll/win32/urlmon/sec_mgr.c trunk/reactos/dll/win32/urlmon/session.c trunk/reactos/dll/win32/urlmon/umon.c trunk/reactos/dll/win32/urlmon/uri.c trunk/reactos/dll/win32/urlmon/urlmon.spec trunk/reactos/dll/win32/urlmon/urlmon_main.c trunk/reactos/dll/win32/urlmon/urlmon_main.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/urlmon/bindctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindctx.c… Modified: trunk/reactos/dll/win32/urlmon/binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/binding.c… Modified: trunk/reactos/dll/win32/urlmon/bindprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindprot.… Modified: trunk/reactos/dll/win32/urlmon/download.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/download.… Modified: trunk/reactos/dll/win32/urlmon/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/file.c?re… Modified: trunk/reactos/dll/win32/urlmon/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/format.c?… Modified: trunk/reactos/dll/win32/urlmon/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/ftp.c?rev… Modified: trunk/reactos/dll/win32/urlmon/gopher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/gopher.c?… Modified: trunk/reactos/dll/win32/urlmon/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/http.c?re… Modified: trunk/reactos/dll/win32/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/protocol.… Modified: trunk/reactos/dll/win32/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/sec_mgr.c… Modified: trunk/reactos/dll/win32/urlmon/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/session.c… Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… Modified: trunk/reactos/dll/win32/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/uri.c?rev… Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp… Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma…

1 0

[cgutman] 50073: [WININET] - Sync to Wine 1.3.9
by cgutman＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: cgutman Date: Mon Dec 20 21:25:11 2010 New Revision: 50073 URL: http://svn.reactos.org/svn/reactos?rev=50073&view=rev Log: [WININET] - Sync to Wine 1.3.9 Modified: trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/wininet.spec Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] Mon Dec 20 21:25:11 2010 @@ -5169,3 +5169,21 @@ FIXME("STUB: flags=%d host=%s length=%d\n",flags,szHost,length); return FALSE; } + +/*********************************************************************** + * InternetShowSecurityInfoByURLA (@) + */ +BOOL WINAPI InternetShowSecurityInfoByURLA(LPCSTR url, HWND window) +{ + FIXME("stub: %s %p\n", url, window); + return FALSE; +} + +/*********************************************************************** + * InternetShowSecurityInfoByURLW (@) + */ +BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) +{ + FIXME("stub: %s %p\n", debugstr_w(url), window); + return FALSE; +} Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] Mon Dec 20 21:25:11 2010 @@ -1370,8 +1370,9 @@ InternetCrackUrlW should not include it */ if (dwUrlLength == -1) nLength--; - lpwszUrl = HeapAlloc(GetProcessHeap(), 0, nLength * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,lpwszUrl,nLength); + lpwszUrl = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,lpwszUrl,nLength + 1); + lpwszUrl[nLength] = '\0'; memset(&UCW,0,sizeof(UCW)); UCW.dwStructSize = sizeof(URL_COMPONENTSW); @@ -1788,7 +1789,7 @@ */ if (lpszcp != 0 && lpszcp - lpszUrl < dwUrlLength && (!lpszParam || lpszcp <= lpszParam)) { - INT len; + DWORD len; /* Only truncate the parameter list if it's already been saved * in lpUC->lpszExtraInfo. @@ -1806,8 +1807,46 @@ else len = dwUrlLength-(lpszcp-lpszUrl); } - SetUrlComponentValueW(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, - lpszcp, len); + if (lpUC->dwUrlPathLength && lpUC->lpszUrlPath && + lpUC->nScheme == INTERNET_SCHEME_FILE) + { + WCHAR tmppath[MAX_PATH]; + if (*lpszcp == '/') + { + len = MAX_PATH; + PathCreateFromUrlW(lpszUrl_orig, tmppath, &len, 0); + } + else + { + WCHAR *iter; + memcpy(tmppath, lpszcp, len * sizeof(WCHAR)); + tmppath[len] = '\0'; + + iter = tmppath; + while (*iter) { + if (*iter == '/') + *iter = '\\'; + ++iter; + } + } + /* if ends in \. or \.. append a backslash */ + if (tmppath[len - 1] == '.' && + (tmppath[len - 2] == '\\' || + (tmppath[len - 2] == '.' && tmppath[len - 3] == '\\'))) + { + if (len < MAX_PATH - 1) + { + tmppath[len] = '\\'; + tmppath[len+1] = '\0'; + ++len; + } + } + SetUrlComponentValueW(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, + tmppath, len); + } + else + SetUrlComponentValueW(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, + lpszcp, len); } else { Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… ============================================================================== --- trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] Mon Dec 20 21:25:11 2010 @@ -114,7 +114,7 @@ static void *OpenSSL_ssl_handle; static void *OpenSSL_crypto_handle; -#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER> 0x1000000) +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER > 0x10000000) static const SSL_METHOD *meth; #else static SSL_METHOD *meth; @@ -152,7 +152,6 @@ MAKE_FUNCPTR(SSL_CTX_set_verify); MAKE_FUNCPTR(SSL_get_current_cipher); MAKE_FUNCPTR(SSL_CIPHER_get_bits); -MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); /* OpenSSL's libcrypto functions that we use */ MAKE_FUNCPTR(BIO_new_fp); @@ -162,6 +161,7 @@ MAKE_FUNCPTR(ERR_free_strings); MAKE_FUNCPTR(ERR_get_error); MAKE_FUNCPTR(ERR_error_string); +MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); MAKE_FUNCPTR(i2d_X509); MAKE_FUNCPTR(sk_num); MAKE_FUNCPTR(sk_value); @@ -228,13 +228,15 @@ PCCERT_CHAIN_CONTEXT chain; char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH; char *server_auth[] = { oid_server_auth }; - DWORD err = ERROR_SUCCESS; + DWORD err = ERROR_SUCCESS, chainFlags = 0; TRACE("verifying %s\n", debugstr_w(server)); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if ((ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, 0, - NULL, &chain))) + if (!(security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) + chainFlags |= CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT; + if ((ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, + chainFlags, NULL, &chain))) { if (chain->TrustStatus.dwErrorStatus) { @@ -431,7 +433,6 @@ DYNSSL(SSL_CTX_set_verify); DYNSSL(SSL_get_current_cipher); DYNSSL(SSL_CIPHER_get_bits); - DYNSSL(X509_STORE_CTX_get_ex_data); #undef DYNSSL #define DYNCRYPTO(x) \ @@ -449,6 +450,7 @@ DYNCRYPTO(ERR_free_strings); DYNCRYPTO(ERR_get_error); DYNCRYPTO(ERR_error_string); + DYNCRYPTO(X509_STORE_CTX_get_ex_data); DYNCRYPTO(i2d_X509); DYNCRYPTO(sk_num); DYNCRYPTO(sk_value); @@ -877,7 +879,11 @@ int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) { #ifdef SONAME_LIBSSL +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090707f) + const SSL_CIPHER *cipher; +#else SSL_CIPHER *cipher; +#endif int bits = 0; if (!connection->useSSL) Modified: trunk/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet.spec [iso-8859-1] Mon Dec 20 21:25:11 2010 @@ -195,9 +195,9 @@ @ stdcall InternetSetStatusCallback(ptr ptr) InternetSetStatusCallbackA @ stdcall InternetSetStatusCallbackA(ptr ptr) @ stdcall InternetSetStatusCallbackW(ptr ptr) -@ stub InternetShowSecurityInfoByURL -@ stub InternetShowSecurityInfoByURLA -@ stub InternetShowSecurityInfoByURLW +@ stdcall InternetShowSecurityInfoByURL(str ptr) InternetShowSecurityInfoByURLA +@ stdcall InternetShowSecurityInfoByURLA(str ptr) +@ stdcall InternetShowSecurityInfoByURLW(wstr ptr) @ stdcall InternetTimeFromSystemTime(ptr long ptr long) InternetTimeFromSystemTimeA @ stdcall InternetTimeFromSystemTimeA(ptr long ptr long) @ stdcall InternetTimeFromSystemTimeW(ptr long ptr long)

1 0

[cgutman] 50072: [NDIS] - Fix sizeof typo - CID 10400
by cgutman＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: cgutman Date: Mon Dec 20 20:57:22 2010 New Revision: 50072 URL: http://svn.reactos.org/svn/reactos?rev=50072&view=rev Log: [NDIS] - Fix sizeof typo - CID 10400 Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Dec 20 20:57:22 2010 @@ -1600,7 +1600,7 @@ KeInitializeCallbackRecord(BugcheckContext->CallbackRecord); KeRegisterBugCheckCallback(BugcheckContext->CallbackRecord, NdisIBugcheckCallback, - BugcheckContext, sizeof(BugcheckContext), (PUCHAR)"Ndis Miniport"); + BugcheckContext, sizeof(*BugcheckContext), (PUCHAR)"Ndis Miniport"); IoRegisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject); }

1 0

[cgutman] 50071: [WINHTTP] - Sync to Wine 1.3.9
by cgutman＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: cgutman Date: Mon Dec 20 20:36:21 2010 New Revision: 50071 URL: http://svn.reactos.org/svn/reactos?rev=50071&view=rev Log: [WINHTTP] - Sync to Wine 1.3.9 Modified: trunk/reactos/dll/win32/winhttp/net.c Modified: trunk/reactos/dll/win32/winhttp/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/net.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] Mon Dec 20 20:36:21 2010 @@ -92,7 +92,7 @@ static void *libssl_handle; static void *libcrypto_handle; -#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER> 0x1000000) +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER > 0x10000000) static const SSL_METHOD *method; #else static SSL_METHOD *method; @@ -277,7 +277,8 @@ TRACE("verifying %s\n", debugstr_w( server )); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if ((ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, 0, + if ((ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, + CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, NULL, &chain ))) { if (chain->TrustStatus.dwErrorStatus) @@ -330,6 +331,7 @@ sslExtraPolicyPara.u.cbSize = sizeof(sslExtraPolicyPara); sslExtraPolicyPara.dwAuthType = AUTHTYPE_SERVER; sslExtraPolicyPara.pwszServerName = server; + sslExtraPolicyPara.fdwChecks = security_flags; policyPara.cbSize = sizeof(policyPara); policyPara.dwFlags = 0; policyPara.pvExtraPolicyPara = &sslExtraPolicyPara; @@ -342,10 +344,7 @@ if (ret && policyStatus.dwError) { if (policyStatus.dwError == CERT_E_CN_NO_MATCH) - { - if (!(security_flags & SECURITY_FLAG_IGNORE_CERT_CN_INVALID)) - err = ERROR_WINHTTP_SECURE_CERT_CN_INVALID; - } + err = ERROR_WINHTTP_SECURE_CERT_CN_INVALID; else err = ERROR_WINHTTP_SECURE_INVALID_CERT; } @@ -876,10 +875,10 @@ return FALSE; #endif } - + FD_ZERO(&infd); FD_SET(conn->socket, &infd); - + while (recvd < *buflen) { int res; @@ -890,7 +889,7 @@ ptv = &tv; else ptv = NULL; - + if (select( 0, &infd, NULL, NULL, ptv ) > 0) { if ((res = recv( conn->socket, &buffer[recvd], 1, 0 )) <= 0) @@ -1086,7 +1085,11 @@ int netconn_get_cipher_strength( netconn_t *conn ) { #ifdef SONAME_LIBSSL +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090707f) + const SSL_CIPHER *cipher; +#else SSL_CIPHER *cipher; +#endif int bits = 0; if (!conn->secure) return 0;

1 0

[fireball] 50070: - Update "slightly less than all" IDLs to Wine-1.3.9. (Except for shlobj, shobjidl and shtypes.h, and DirectX stuff).
by fireball＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: fireball Date: Mon Dec 20 11:56:24 2010 New Revision: 50070 URL: http://svn.reactos.org/svn/reactos?rev=50070&view=rev Log: - Update "slightly less than all" IDLs to Wine-1.3.9. (Except for shlobj, shobjidl and shtypes.h, and DirectX stuff). Added: trunk/reactos/include/psdk/msxml6.idl (with props) trunk/reactos/include/psdk/msxml6did.h (with props) trunk/reactos/include/psdk/propkeydef.h (with props) trunk/reactos/include/psdk/winsxs.idl (with props) Modified: trunk/reactos/include/psdk/control.idl trunk/reactos/include/psdk/exdisp.idl trunk/reactos/include/psdk/exdispid.h trunk/reactos/include/psdk/mscoree.idl trunk/reactos/include/psdk/mshtmdid.h trunk/reactos/include/psdk/mshtml.idl trunk/reactos/include/psdk/mstask.idl trunk/reactos/include/psdk/msxml2.idl trunk/reactos/include/psdk/msxml2did.h trunk/reactos/include/psdk/objidl.idl trunk/reactos/include/psdk/oledb.idl trunk/reactos/include/psdk/propsys.idl trunk/reactos/include/psdk/psdk.rbuild trunk/reactos/include/psdk/urlmon.idl trunk/reactos/include/psdk/wbemcli.idl trunk/reactos/include/psdk/wincodec.idl trunk/reactos/include/psdk/wuapi.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/control.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/control.idl?r… Modified: trunk/reactos/include/psdk/exdisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/exdisp.idl?re… Modified: trunk/reactos/include/psdk/exdispid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/exdispid.h?re… Modified: trunk/reactos/include/psdk/mscoree.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mscoree.idl?r… Modified: trunk/reactos/include/psdk/mshtmdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtmdid.h?re… Modified: trunk/reactos/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?re… Modified: trunk/reactos/include/psdk/mstask.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mstask.idl?re… Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… Modified: trunk/reactos/include/psdk/msxml2did.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2did.h?r… Added: trunk/reactos/include/psdk/msxml6.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml6.idl?re… Added: trunk/reactos/include/psdk/msxml6did.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml6did.h?r… Modified: trunk/reactos/include/psdk/objidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objidl.idl?re… Modified: trunk/reactos/include/psdk/oledb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/oledb.idl?rev… Added: trunk/reactos/include/psdk/propkeydef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propkeydef.h?… Modified: trunk/reactos/include/psdk/propsys.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propsys.idl?r… Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… Modified: trunk/reactos/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?re… Modified: trunk/reactos/include/psdk/wbemcli.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wbemcli.idl?r… Modified: trunk/reactos/include/psdk/wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincodec.idl?… Added: trunk/reactos/include/psdk/winsxs.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsxs.idl?re… Modified: trunk/reactos/include/psdk/wuapi.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wuapi.idl?rev…

1 0

[tkreuzer] 50069: [CRT] rename pow_asm.c to powl.c to reflect it's content.
by tkreuzer＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: tkreuzer Date: Mon Dec 20 11:48:55 2010 New Revision: 50069 URL: http://svn.reactos.org/svn/reactos?rev=50069&view=rev Log: [CRT] rename pow_asm.c to powl.c to reflect it's content. Added: trunk/reactos/lib/sdk/crt/math/powl.c - copied unchanged from r50068, trunk/reactos/lib/sdk/crt/math/pow_asm.c Removed: trunk/reactos/lib/sdk/crt/math/pow_asm.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Mon Dec 20 11:48:55 2010 @@ -156,7 +156,7 @@ <file>sinf.c</file> <file>sinh.c</file> <file>tanh.c</file> - <file>pow_asm.c</file> + <file>powl.c</file> <if property="ARCH" value="i386"> <directory name="i386"> Removed: trunk/reactos/lib/sdk/crt/math/pow_asm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/pow_asm.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/pow_asm.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/pow_asm.c (removed) @@ -1,31 +1,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <math.h> - -/* - * @implemented - */ - -long double powl (long double __x,long double __y) -{ - return pow(__x,__y/2)*pow(__x,__y/2); -}

1 0

[tkreuzer] 50068: [CRT] Fix bugs in converted asm file. Fixes Firefox color issues.
by tkreuzer＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: tkreuzer Date: Mon Dec 20 10:16:43 2010 New Revision: 50068 URL: http://svn.reactos.org/svn/reactos?rev=50068&view=rev Log: [CRT] Fix bugs in converted asm file. Fixes Firefox color issues. Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/pow_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] Mon Dec 20 10:16:43 2010 @@ -117,7 +117,7 @@ /* fistpll raises invalid exception for |y| >= 1L<<63. */ fld st // y : y : x fabs // |y| : y : x - fcomp qword ptr MO(p63) // y : x + fcomp qword ptr ds:MO(p63) // y : x fnstsw ax sahf jnc L2 @@ -194,7 +194,7 @@ L8: fmul st, st(1) // y*log2(x) : y fst st(1) // y*log2(x) : y*log2(x) frndint // int(y*log2(x)) : y*log2(x) - fsubr st(1), st // int(y*log2(x)) : fract(y*log2(x)) + fsub st(1), st // int(y*log2(x)) : fract(y*log2(x)) fxch // fract(y*log2(x)) : int(y*log2(x)) f2xm1 // 2^fract(y*log2(x))-1 : int(y*log2(x)) fadd qword ptr MO(one) // 2^fract(y*log2(x)) : int(y*log2(x)) @@ -278,7 +278,7 @@ cfi_adjust_cfa_offset (8) .align ALIGNARG(4) -L16:fcomp qword ptr MO(zero) +L16:fcomp qword ptr ds:MO(zero) add esp, 8 cfi_adjust_cfa_offset (-8) fnstsw ax @@ -289,7 +289,7 @@ cfi_adjust_cfa_offset (8) .align ALIGNARG(4) -L17: shl ecx, 30 // sign bit for y in right position +L17: shl edx, 30 // sign bit for y in right position add esp, 8 cfi_adjust_cfa_offset (-8) L18: shr edx, 31

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010