Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [MYDOCS] Follow-up of #2624

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dc2ec9de359e4d6c31b6… commit 2dc2ec9de359e4d6c31b6f61ba305e4323db8ddd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 22 23:08:56 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Apr 22 23:08:56 2020 +0900 [MYDOCS] Follow-up of #2624 Use HIDA_GetPIDLFolder and HIDA_GetPIDLItem. CORE-12562 --- dll/shellext/mydocs/CMyDocsDropHandler.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dll/shellext/mydocs/CMyDocsDropHandler.cpp b/dll/shellext/mydocs/CMyDocsDropHandler.cpp index c21be8964b9..cd74af6d016 100644 --- a/dll/shellext/mydocs/CMyDocsDropHandler.cpp +++ b/dll/shellext/mydocs/CMyDocsDropHandler.cpp @@ -95,12 +95,11 @@ CMyDocsDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState, // for all source items CStringW strSrcList; WCHAR szSrc[MAX_PATH]; - const BYTE *pb = reinterpret_cast<BYTE *>(pida); - PCIDLIST_ABSOLUTE pidlParent = reinterpret_cast<PCIDLIST_ABSOLUTE>(pb + pida->aoffset[0]); + PCIDLIST_ABSOLUTE pidlParent = HIDA_GetPIDLFolder(pida); for (iItem = 0; iItem < cItems; ++iItem) { // query source pidl - PCITEMID_CHILD pidlChild = reinterpret_cast<PCITEMID_CHILD>(pb + pida->aoffset[iItem + 1]); + PCITEMID_CHILD pidlChild = HIDA_GetPIDLItem(pida, iItem); CComHeapPtr<ITEMIDLIST> pidl(ILCombine(pidlParent, pidlChild)); // can get path?

4 years, 6 months

[reactos] 02/02: [SHSVCS] Don't call UnregisterWait from within the wait callback.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a5ba1ad107d1af37241d… commit 5a5ba1ad107d1af37241d444c567abc6f7cb6eb3 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Apr 15 12:09:49 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Apr 22 12:37:26 2020 +0200 [SHSVCS] Don't call UnregisterWait from within the wait callback. Doing this causes deadlocks, the process runs out of worker threads and the system runs out of memory by allocating too many I/O completion ports when using ntdll.dll from Windows. --- base/services/shsvcs/thmserver.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/base/services/shsvcs/thmserver.c b/base/services/shsvcs/thmserver.c index c4169446f44..a374079f9f8 100644 --- a/base/services/shsvcs/thmserver.c +++ b/base/services/shsvcs/thmserver.c @@ -76,7 +76,6 @@ CALLBACK ThemeStopCallback(PVOID lpParameter, BOOLEAN TimerOrWaitFired) { CloseHandle(hServiceProcess); - UnregisterWait(hThemeStopWaitObject); UnregisterWait(hThemeServiceWaitObject); ThemeWatchForStart(); @@ -92,7 +91,10 @@ ThemeServiceDiedCallback(PVOID lpParameter, BOOLEAN TimerOrWaitFired) ResetEvent(hStartEvent); ResetEvent(hStopEvent); - ThemeStopCallback(lpParameter, TimerOrWaitFired); + CloseHandle(hServiceProcess); + UnregisterWait(hThemeStopWaitObject); + ThemeWatchForStart(); + ThemeHooksRemove(); } static @@ -100,12 +102,10 @@ VOID CALLBACK ThemeStartCallback(PVOID lpParameter, BOOLEAN TimerOrWaitFired) { - UnregisterWait(hThemeStartWaitObject); - hServiceProcess = GetThemeServiceProcessHandle(); - RegisterWaitForSingleObject(&hThemeStopWaitObject, hStopEvent, ThemeStopCallback, NULL, INFINITE, WT_EXECUTEDEFAULT); - RegisterWaitForSingleObject(&hThemeServiceWaitObject, hServiceProcess, ThemeServiceDiedCallback, NULL, INFINITE, WT_EXECUTEDEFAULT); + RegisterWaitForSingleObject(&hThemeStopWaitObject, hStopEvent, ThemeStopCallback, NULL, INFINITE, WT_EXECUTEONLYONCE); + RegisterWaitForSingleObject(&hThemeServiceWaitObject, hServiceProcess, ThemeServiceDiedCallback, NULL, INFINITE, WT_EXECUTEONLYONCE); ThemeHooksInstall(); } @@ -117,7 +117,7 @@ ThemeWatchForStart(VOID) hStartEvent = CreateEventW(NULL, TRUE, FALSE, L"Global\\ThemeStartEvent"); hStopEvent = CreateEventW(NULL, TRUE, FALSE, L"Global\\ThemeStopEvent"); - RegisterWaitForSingleObject(&hThemeStartWaitObject, hStartEvent, ThemeStartCallback, NULL, INFINITE, WT_EXECUTEDEFAULT); + RegisterWaitForSingleObject(&hThemeStartWaitObject, hStartEvent, ThemeStartCallback, NULL, INFINITE, WT_EXECUTEONLYONCE); return TRUE; }

4 years, 6 months

[reactos] 01/02: [MBEDTLS] Update to version 2.7.15. CORE-16869

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c58d7a6df6a44ac728b4a… commit c58d7a6df6a44ac728b4a6bb6bf1a6c84a1fc8ba Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Apr 14 22:11:46 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Apr 22 12:37:25 2020 +0200 [MBEDTLS] Update to version 2.7.15. CORE-16869 --- dll/3rdparty/mbedtls/ecp.c | 28 +++++++++++++++++++ dll/3rdparty/mbedtls/ssl_cli.c | 16 +++++++++-- dll/3rdparty/mbedtls/ssl_tls.c | 37 +++++++++++++++++-------- dll/3rdparty/mbedtls/x509.c | 2 +- sdk/include/reactos/libs/mbedtls/check_config.h | 21 ++++++++++++++ sdk/include/reactos/libs/mbedtls/version.h | 8 +++--- 6 files changed, 94 insertions(+), 18 deletions(-) diff --git a/dll/3rdparty/mbedtls/ecp.c b/dll/3rdparty/mbedtls/ecp.c index 89d1606a74f..eedf76103a2 100644 --- a/dll/3rdparty/mbedtls/ecp.c +++ b/dll/3rdparty/mbedtls/ecp.c @@ -1446,6 +1446,20 @@ static int ecp_mul_comb( mbedtls_ecp_group *grp, mbedtls_ecp_point *R, * Now get m * P from M * P and normalize it */ MBEDTLS_MPI_CHK( ecp_safe_invert_jac( grp, R, ! m_is_odd ) ); + + /* + * Knowledge of the jacobian coordinates may leak the last few bits of the + * scalar [1], and since our MPI implementation isn't constant-flow, + * inversion (used for coordinate normalization) may leak the full value + * of its input via side-channels [2]. + * + * [1] https://eprint.iacr.org/2003/191 + * [2] https://eprint.iacr.org/2020/055 + * + * Avoid the leak by randomizing coordinates before we normalize them. + */ + if( f_rng != 0 ) + MBEDTLS_MPI_CHK( ecp_randomize_jac( grp, R, f_rng, p_rng ) ); MBEDTLS_MPI_CHK( ecp_normalize_jac( grp, R ) ); cleanup: @@ -1666,6 +1680,20 @@ static int ecp_mul_mxz( mbedtls_ecp_group *grp, mbedtls_ecp_point *R, MBEDTLS_MPI_CHK( mbedtls_mpi_safe_cond_swap( &R->Z, &RP.Z, b ) ); } + /* + * Knowledge of the projective coordinates may leak the last few bits of the + * scalar [1], and since our MPI implementation isn't constant-flow, + * inversion (used for coordinate normalization) may leak the full value + * of its input via side-channels [2]. + * + * [1] https://eprint.iacr.org/2003/191 + * [2] https://eprint.iacr.org/2020/055 + * + * Avoid the leak by randomizing coordinates before we normalize them. + */ + if( f_rng != NULL ) + MBEDTLS_MPI_CHK( ecp_randomize_mxz( grp, R, f_rng, p_rng ) ); + MBEDTLS_MPI_CHK( ecp_normalize_mxz( grp, R ) ); cleanup: diff --git a/dll/3rdparty/mbedtls/ssl_cli.c b/dll/3rdparty/mbedtls/ssl_cli.c index 2355d6544d5..622a92d3abe 100644 --- a/dll/3rdparty/mbedtls/ssl_cli.c +++ b/dll/3rdparty/mbedtls/ssl_cli.c @@ -1413,6 +1413,19 @@ static int ssl_parse_hello_verify_request( mbedtls_ssl_context *ssl ) MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> parse hello verify request" ) ); + /* Check that there is enough room for: + * - 2 bytes of version + * - 1 byte of cookie_len + */ + if( mbedtls_ssl_hs_hdr_len( ssl ) + 3 > ssl->in_msglen ) + { + MBEDTLS_SSL_DEBUG_MSG( 1, + ( "incoming HelloVerifyRequest message is too short" ) ); + mbedtls_ssl_send_alert_message( ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL, + MBEDTLS_SSL_ALERT_MSG_DECODE_ERROR ); + return( MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO ); + } + /* * struct { * ProtocolVersion server_version; @@ -1441,8 +1454,6 @@ static int ssl_parse_hello_verify_request( mbedtls_ssl_context *ssl ) } cookie_len = *p++; - MBEDTLS_SSL_DEBUG_BUF( 3, "cookie", p, cookie_len ); - if( ( ssl->in_msg + ssl->in_msglen ) - p < cookie_len ) { MBEDTLS_SSL_DEBUG_MSG( 1, @@ -1451,6 +1462,7 @@ static int ssl_parse_hello_verify_request( mbedtls_ssl_context *ssl ) MBEDTLS_SSL_ALERT_MSG_DECODE_ERROR ); return( MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO ); } + MBEDTLS_SSL_DEBUG_BUF( 3, "cookie", p, cookie_len ); mbedtls_free( ssl->handshake->verify_cookie ); diff --git a/dll/3rdparty/mbedtls/ssl_tls.c b/dll/3rdparty/mbedtls/ssl_tls.c index 6f8566a9907..f15cbbb5518 100644 --- a/dll/3rdparty/mbedtls/ssl_tls.c +++ b/dll/3rdparty/mbedtls/ssl_tls.c @@ -875,8 +875,6 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl ) #if defined(MBEDTLS_SSL_HW_RECORD_ACCEL) if( mbedtls_ssl_hw_record_init != NULL ) { - int ret = 0; - MBEDTLS_SSL_DEBUG_MSG( 2, ( "going for mbedtls_ssl_hw_record_init()" ) ); if( ( ret = mbedtls_ssl_hw_record_init( ssl, key1, key2, transform->keylen, @@ -2702,15 +2700,18 @@ static void ssl_dtls_replay_reset( mbedtls_ssl_context *ssl ); /* * Swap transform_out and out_ctr with the alternative ones */ -static void ssl_swap_epochs( mbedtls_ssl_context *ssl ) +static int ssl_swap_epochs( mbedtls_ssl_context *ssl ) { mbedtls_ssl_transform *tmp_transform; unsigned char tmp_out_ctr[8]; +#if defined(MBEDTLS_SSL_HW_RECORD_ACCEL) + int ret; +#endif /* MBEDTLS_SSL_HW_RECORD_ACCEL */ if( ssl->transform_out == ssl->handshake->alt_transform_out ) { MBEDTLS_SSL_DEBUG_MSG( 3, ( "skip swap epochs" ) ); - return; + return( 0 ); } MBEDTLS_SSL_DEBUG_MSG( 3, ( "swap epochs" ) ); @@ -2744,7 +2745,9 @@ static void ssl_swap_epochs( mbedtls_ssl_context *ssl ) return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED ); } } -#endif +#endif /* MBEDTLS_SSL_HW_RECORD_ACCEL */ + + return( 0 ); } /* @@ -2756,6 +2759,8 @@ static void ssl_swap_epochs( mbedtls_ssl_context *ssl ) */ int mbedtls_ssl_resend( mbedtls_ssl_context *ssl ) { + int ret; + MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> mbedtls_ssl_resend" ) ); if( ssl->handshake->retransmit_state != MBEDTLS_SSL_RETRANS_SENDING ) @@ -2763,14 +2768,14 @@ int mbedtls_ssl_resend( mbedtls_ssl_context *ssl ) MBEDTLS_SSL_DEBUG_MSG( 2, ( "initialise resending" ) ); ssl->handshake->cur_msg = ssl->handshake->flight; - ssl_swap_epochs( ssl ); + if( ( ret = ssl_swap_epochs( ssl ) ) != 0 ) + return( ret ); ssl->handshake->retransmit_state = MBEDTLS_SSL_RETRANS_SENDING; } while( ssl->handshake->cur_msg != NULL ) { - int ret; mbedtls_ssl_flight_item *cur = ssl->handshake->cur_msg; /* Swap epochs before sending Finished: we can't do it after @@ -2779,7 +2784,8 @@ int mbedtls_ssl_resend( mbedtls_ssl_context *ssl ) if( cur->type == MBEDTLS_SSL_MSG_HANDSHAKE && cur->p[0] == MBEDTLS_SSL_HS_FINISHED ) { - ssl_swap_epochs( ssl ); + if( ( ret = ssl_swap_epochs( ssl ) ) != 0 ) + return( ret ); } memcpy( ssl->out_msg, cur->p, cur->len ); @@ -3594,29 +3600,38 @@ static int ssl_handle_possible_reconnect( mbedtls_ssl_context *ssl ) int ret; size_t len; + /* Use out_msg as temporary buffer for writing out HelloVerifyRequest, + * because the output buffer's already around. Don't use out_buf though, + * as we don't want to overwrite out_ctr. */ ret = ssl_check_dtls_clihlo_cookie( ssl->conf->f_cookie_write, ssl->conf->f_cookie_check, ssl->conf->p_cookie, ssl->cli_id, ssl->cli_id_len, ssl->in_buf, ssl->in_left, - ssl->out_buf, MBEDTLS_SSL_MAX_CONTENT_LEN, &len ); + ssl->out_msg, MBEDTLS_SSL_MAX_CONTENT_LEN, &len ); MBEDTLS_SSL_DEBUG_RET( 2, "ssl_check_dtls_clihlo_cookie", ret ); if( ret == MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED ) { + int send_ret; + MBEDTLS_SSL_DEBUG_MSG( 1, ( "sending HelloVerifyRequest" ) ); + MBEDTLS_SSL_DEBUG_BUF( 4, "output record sent to network", + ssl->out_msg, len ); /* Don't check write errors as we can't do anything here. * If the error is permanent we'll catch it later, * if it's not, then hopefully it'll work next time. */ - (void) ssl->f_send( ssl->p_bio, ssl->out_buf, len ); + send_ret = ssl->f_send( ssl->p_bio, ssl->out_msg, len ); + MBEDTLS_SSL_DEBUG_RET( 2, "ssl->f_send", send_ret ); + (void) send_ret; return( MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED ); } if( ret == 0 ) { - /* Got a valid cookie, partially reset context */ + MBEDTLS_SSL_DEBUG_MSG( 1, ( "cookie is valid, resetting context" ) ); if( ( ret = ssl_session_reset_int( ssl, 1 ) ) != 0 ) { MBEDTLS_SSL_DEBUG_RET( 1, "reset", ret ); diff --git a/dll/3rdparty/mbedtls/x509.c b/dll/3rdparty/mbedtls/x509.c index 55007d38c03..b9dab3ba105 100644 --- a/dll/3rdparty/mbedtls/x509.c +++ b/dll/3rdparty/mbedtls/x509.c @@ -1089,7 +1089,7 @@ cleanup: mbedtls_x509_crt_free( &clicert ); #else ((void) verbose); -#endif /* MBEDTLS_CERTS_C && MBEDTLS_SHA1_C */ +#endif /* MBEDTLS_CERTS_C && MBEDTLS_SHA256_C */ return( ret ); } diff --git a/sdk/include/reactos/libs/mbedtls/check_config.h b/sdk/include/reactos/libs/mbedtls/check_config.h index 97af2d2d8f3..f5d80aef4c9 100644 --- a/sdk/include/reactos/libs/mbedtls/check_config.h +++ b/sdk/include/reactos/libs/mbedtls/check_config.h @@ -527,6 +527,23 @@ #error "MBEDTLS_SSL_PROTO_TLS1_2 defined, but not all prerequisites" #endif +#if (defined(MBEDTLS_SSL_PROTO_SSL3) || defined(MBEDTLS_SSL_PROTO_TLS1) || \ + defined(MBEDTLS_SSL_PROTO_TLS1_1) || defined(MBEDTLS_SSL_PROTO_TLS1_2)) && \ + !(defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED) || \ + defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED) || \ + defined(MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED) || \ + defined(MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) || \ + defined(MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED) || \ + defined(MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED) || \ + defined(MBEDTLS_KEY_EXCHANGE_PSK_ENABLED) || \ + defined(MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED) || \ + defined(MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED) || \ + defined(MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED) || \ + defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED) ) +#error "One or more versions of the TLS protocol are enabled " \ + "but no key exchange methods defined with MBEDTLS_KEY_EXCHANGE_xxxx" +#endif + #if defined(MBEDTLS_SSL_PROTO_DTLS) && \ !defined(MBEDTLS_SSL_PROTO_TLS1_1) && \ !defined(MBEDTLS_SSL_PROTO_TLS1_2) @@ -650,6 +667,10 @@ #error "MBEDTLS_X509_CREATE_C defined, but not all prerequisites" #endif +#if defined(MBEDTLS_CERTS_C) && !defined(MBEDTLS_X509_USE_C) +#error "MBEDTLS_CERTS_C defined, but not all prerequisites" +#endif + #if defined(MBEDTLS_X509_CRT_PARSE_C) && ( !defined(MBEDTLS_X509_USE_C) ) #error "MBEDTLS_X509_CRT_PARSE_C defined, but not all prerequisites" #endif diff --git a/sdk/include/reactos/libs/mbedtls/version.h b/sdk/include/reactos/libs/mbedtls/version.h index 6c93385b030..9effd8cb6a9 100644 --- a/sdk/include/reactos/libs/mbedtls/version.h +++ b/sdk/include/reactos/libs/mbedtls/version.h @@ -42,16 +42,16 @@ */ #define MBEDTLS_VERSION_MAJOR 2 #define MBEDTLS_VERSION_MINOR 7 -#define MBEDTLS_VERSION_PATCH 14 +#define MBEDTLS_VERSION_PATCH 15 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define MBEDTLS_VERSION_NUMBER 0x02070E00 -#define MBEDTLS_VERSION_STRING "2.7.14" -#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.7.14" +#define MBEDTLS_VERSION_NUMBER 0x02070F00 +#define MBEDTLS_VERSION_STRING "2.7.15" +#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.7.15" #if defined(MBEDTLS_VERSION_C)

4 years, 6 months

[reactos] 01/01: [SHELLEXT][MYDOCS][INF] Add mydocs.dll and .mydocs file extension (#2624)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4efff7f4631e603496355… commit 4efff7f4631e603496355c18ae9523e0a66282ad Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 22 19:34:15 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 22 19:34:15 2020 +0900 [SHELLEXT][MYDOCS][INF] Add mydocs.dll and .mydocs file extension (#2624) I found "SendTo My Documents" is realized by .mydocs filename extension in WinXP/2k3. To implement this, I will add mydocs.dll file. CORE-12562 --- dll/shellext/CMakeLists.txt | 1 + dll/shellext/mydocs/CMakeLists.txt | 35 +++++ dll/shellext/mydocs/CMyDocsDropHandler.cpp | 214 +++++++++++++++++++++++++++++ dll/shellext/mydocs/CMyDocsDropHandler.hpp | 50 +++++++ dll/shellext/mydocs/lang/en-US.rc | 6 + dll/shellext/mydocs/mydocs.cpp | 68 +++++++++ dll/shellext/mydocs/mydocs.rc | 23 ++++ dll/shellext/mydocs/mydocs.spec | 4 + dll/shellext/mydocs/mydocs_version.h | 15 ++ dll/shellext/mydocs/mydocs_version.rc | 14 ++ dll/shellext/mydocs/precomp.hpp | 29 ++++ dll/shellext/mydocs/res/mydocs.rgs | 35 +++++ dll/shellext/mydocs/resource.h | 15 ++ media/inf/syssetup.inf | 1 + sdk/include/reactos/shlguid_undoc.h | 1 + 15 files changed, 511 insertions(+) diff --git a/dll/shellext/CMakeLists.txt b/dll/shellext/CMakeLists.txt index 4baed6eb048..8d005319c4c 100644 --- a/dll/shellext/CMakeLists.txt +++ b/dll/shellext/CMakeLists.txt @@ -5,6 +5,7 @@ add_subdirectory(deskadp) add_subdirectory(deskmon) add_subdirectory(devcpux) add_subdirectory(fontext) +add_subdirectory(mydocs) add_subdirectory(netplwiz) add_subdirectory(netshell) add_subdirectory(ntobjshex) diff --git a/dll/shellext/mydocs/CMakeLists.txt b/dll/shellext/mydocs/CMakeLists.txt new file mode 100644 index 00000000000..0c9649c25f4 --- /dev/null +++ b/dll/shellext/mydocs/CMakeLists.txt @@ -0,0 +1,35 @@ +set_cpp(WITH_RUNTIME) +spec2def(mydocs.dll mydocs.spec) + +add_definitions( + -D_WINE + -D_ATL_NO_EXCEPTIONS) + +if(NOT MSVC) + # HACK: this should be enabled globally! + add_compile_flags_language("-std=c++11" "CXX") +endif() + +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/lib/atl + ${REACTOS_SOURCE_DIR}) + +file(GLOB_RECURSE mydocs_rc_deps res/*.*) +add_rc_deps(mydocs.rc ${mydocs_rc_deps}) + +list(APPEND SOURCE + CMyDocsDropHandler.cpp + mydocs.cpp + precomp.hpp) + +add_library(mydocs MODULE + ${SOURCE} + mydocs.rc + ${CMAKE_CURRENT_BINARY_DIR}/mydocs.def) + +set_module_type(mydocs win32dll UNICODE) +target_link_libraries(mydocs uuid wine) +add_delay_importlibs(mydocs ole32 oleaut32) +add_importlibs(mydocs advapi32 shell32 user32 comctl32 shlwapi msvcrt kernel32 ntdll) +add_pch(mydocs precomp.hpp SOURCE) +add_cd_file(TARGET mydocs DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/mydocs/CMyDocsDropHandler.cpp b/dll/shellext/mydocs/CMyDocsDropHandler.cpp new file mode 100644 index 00000000000..c21be8964b9 --- /dev/null +++ b/dll/shellext/mydocs/CMyDocsDropHandler.cpp @@ -0,0 +1,214 @@ +/* + * PROJECT: mydocs + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: MyDocs implementation + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "precomp.hpp" + +WINE_DEFAULT_DEBUG_CHANNEL(mydocs); + +static CLIPFORMAT g_cfHIDA = 0; + +CMyDocsDropHandler::CMyDocsDropHandler() +{ + InterlockedIncrement(&g_ModuleRefCnt); +} + +CMyDocsDropHandler::~CMyDocsDropHandler() +{ + InterlockedDecrement(&g_ModuleRefCnt); +} + +// IDropTarget +STDMETHODIMP +CMyDocsDropHandler::DragEnter(IDataObject *pDataObject, DWORD dwKeyState, + POINTL pt, DWORD *pdwEffect) +{ + TRACE("(%p)\n", this); + + *pdwEffect &= DROPEFFECT_COPY; // Copy only + + return S_OK; +} + +STDMETHODIMP +CMyDocsDropHandler::DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + TRACE("(%p)\n", this); + + *pdwEffect &= DROPEFFECT_COPY; // Copy only + + return S_OK; +} + +STDMETHODIMP CMyDocsDropHandler::DragLeave() +{ + TRACE("(%p)\n", this); + return S_OK; +} + +STDMETHODIMP +CMyDocsDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState, + POINTL pt, DWORD *pdwEffect) +{ + TRACE("(%p)\n", this); + + if (!pDataObject) + { + ERR("pDataObject is NULL\n"); + *pdwEffect = 0; + DragLeave(); + return E_POINTER; + } + + CComPtr<IShellFolder> pDesktop; + HRESULT hr = SHGetDesktopFolder(&pDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + // get the clipboard format + if (g_cfHIDA == 0) + g_cfHIDA = ::RegisterClipboardFormatW(CFSTR_SHELLIDLIST); + + // Retrieve an HIDA (handle of IDA) + STGMEDIUM medium; + FORMATETC fmt = { g_cfHIDA, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + hr = pDataObject->GetData(&fmt, &medium); + if (FAILED_UNEXPECTEDLY(hr)) + { + *pdwEffect = 0; + DragLeave(); + return E_FAIL; + } + + // lock HIDA + LPIDA pida = reinterpret_cast<LPIDA>(GlobalLock(medium.hGlobal)); + UINT iItem, cItems = pida->cidl; + + // get the path of "My Documents" + WCHAR szzDir[MAX_PATH + 1]; + SHGetSpecialFolderPathW(NULL, szzDir, CSIDL_PERSONAL, FALSE); + szzDir[lstrlenW(szzDir) + 1] = 0; // ends with double NULs + + // for all source items + CStringW strSrcList; + WCHAR szSrc[MAX_PATH]; + const BYTE *pb = reinterpret_cast<BYTE *>(pida); + PCIDLIST_ABSOLUTE pidlParent = reinterpret_cast<PCIDLIST_ABSOLUTE>(pb + pida->aoffset[0]); + for (iItem = 0; iItem < cItems; ++iItem) + { + // query source pidl + PCITEMID_CHILD pidlChild = reinterpret_cast<PCITEMID_CHILD>(pb + pida->aoffset[iItem + 1]); + CComHeapPtr<ITEMIDLIST> pidl(ILCombine(pidlParent, pidlChild)); + + // can get path? + szSrc[0] = 0; + if (!SHGetPathFromIDListW(pidl, szSrc)) + { + // try to retrieve path from desktop + STRRET strret; + hr = pDesktop->GetDisplayNameOf(pidl, SHGDN_INFOLDER, &strret); + if (FAILED_UNEXPECTEDLY(hr)) + break; + hr = StrRetToBufW(&strret, pidl, szSrc, _countof(szSrc)); + if (FAILED_UNEXPECTEDLY(hr)) + break; + if (!PathFileExistsW(szSrc)) + break; + } + + if (iItem > 0) + strSrcList += L'|'; // separator is '|' + strSrcList += szSrc; + } + + // unlock HIDA + GlobalUnlock(medium.hGlobal); + + if (iItem != cItems) + { + // source not found + CStringW strText; + strText.Format(IDS_NOSRCFILEFOUND, szSrc[0] ? szSrc : L"(null)"); + MessageBoxW(NULL, strText, NULL, MB_ICONERROR); + + *pdwEffect = 0; + DragLeave(); + return E_FAIL; + } + + strSrcList += L"||"; // double separators + + // lock the buffer + LPWSTR pszzSrcList = strSrcList.GetBuffer(); + + // convert every separator to a NUL + INT cch = strSrcList.GetLength(); + for (INT i = 0; i < cch; ++i) + { + if (pszzSrcList[i] == L'|') + pszzSrcList[i] = L'\0'; + } + + // copy them + SHFILEOPSTRUCTW fileop = { NULL }; + fileop.wFunc = FO_COPY; + fileop.pFrom = pszzSrcList; + fileop.pTo = szzDir; + fileop.fFlags = FOF_ALLOWUNDO | FOF_FILESONLY | FOF_MULTIDESTFILES | FOF_NOCONFIRMMKDIR; + SHFileOperationW(&fileop); + + // unlock buffer + strSrcList.ReleaseBuffer(); + + DragLeave(); + return hr; +} + +// IPersistFile +STDMETHODIMP CMyDocsDropHandler::GetCurFile(LPOLESTR *ppszFileName) +{ + FIXME("(%p)\n", this); + return E_NOTIMPL; +} + +STDMETHODIMP CMyDocsDropHandler::IsDirty() +{ + FIXME("(%p)\n", this); + return E_NOTIMPL; +} + +STDMETHODIMP CMyDocsDropHandler::Load(LPCOLESTR pszFileName, DWORD dwMode) +{ + return S_OK; +} + +STDMETHODIMP CMyDocsDropHandler::Save(LPCOLESTR pszFileName, BOOL fRemember) +{ + FIXME("(%p)\n", this); + return E_NOTIMPL; +} + +STDMETHODIMP CMyDocsDropHandler::SaveCompleted(LPCOLESTR pszFileName) +{ + FIXME("(%p)\n", this); + return E_NOTIMPL; +} + +// IPersist +STDMETHODIMP CMyDocsDropHandler::GetClassID(CLSID * lpClassId) +{ + TRACE("(%p)\n", this); + + if (!lpClassId) + { + ERR("lpClassId is NULL\n"); + return E_POINTER; + } + + *lpClassId = CLSID_MyDocsDropHandler; + + return S_OK; +} diff --git a/dll/shellext/mydocs/CMyDocsDropHandler.hpp b/dll/shellext/mydocs/CMyDocsDropHandler.hpp new file mode 100644 index 00000000000..f9993a8ae6c --- /dev/null +++ b/dll/shellext/mydocs/CMyDocsDropHandler.hpp @@ -0,0 +1,50 @@ +/* + * PROJECT: mydocs + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: MyDocs implementation + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#pragma once + +#include "resource.h" + +class CMyDocsDropHandler : + public CComCoClass<CMyDocsDropHandler, &CLSID_MyDocsDropHandler>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDropTarget, + public IPersistFile +{ +public: + CMyDocsDropHandler(); + ~CMyDocsDropHandler(); + + // IDropTarget + STDMETHODIMP DragEnter(IDataObject *pDataObject, DWORD dwKeyState, + POINTL pt, DWORD *pdwEffect); + STDMETHODIMP DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + STDMETHODIMP DragLeave(); + STDMETHODIMP Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, + DWORD *pdwEffect); + + // IPersist + STDMETHODIMP GetClassID(CLSID *lpClassId); + + // IPersistFile + STDMETHODIMP GetCurFile(LPOLESTR *ppszFileName); + STDMETHODIMP IsDirty(); + STDMETHODIMP Load(LPCOLESTR pszFileName, DWORD dwMode); + STDMETHODIMP Save(LPCOLESTR pszFileName, BOOL fRemember); + STDMETHODIMP SaveCompleted(LPCOLESTR pszFileName); + + DECLARE_REGISTRY_RESOURCEID(IDR_MYDOCS) + DECLARE_NOT_AGGREGATABLE(CMyDocsDropHandler) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CMyDocsDropHandler) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IPersistFile, IPersistFile) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + END_COM_MAP() +}; diff --git a/dll/shellext/mydocs/lang/en-US.rc b/dll/shellext/mydocs/lang/en-US.rc new file mode 100644 index 00000000000..f38a277fa2f --- /dev/null +++ b/dll/shellext/mydocs/lang/en-US.rc @@ -0,0 +1,6 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +{ + IDS_NOSRCFILEFOUND "Source file or folder '%ls' is not found." +} diff --git a/dll/shellext/mydocs/mydocs.cpp b/dll/shellext/mydocs/mydocs.cpp new file mode 100644 index 00000000000..c5954c1ff88 --- /dev/null +++ b/dll/shellext/mydocs/mydocs.cpp @@ -0,0 +1,68 @@ +/* + * PROJECT: mydocs + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: MyDocs implementation + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "precomp.hpp" + +WINE_DEFAULT_DEBUG_CHANNEL(mydocs); + +BEGIN_OBJECT_MAP(ObjectMap) + OBJECT_ENTRY(CLSID_MyDocsDropHandler, CMyDocsDropHandler) +END_OBJECT_MAP() + +CComModule gModule; +LONG g_ModuleRefCnt = 0; + +STDAPI DllCanUnloadNow(void) +{ + if (g_ModuleRefCnt) + return S_FALSE; + return gModule.DllCanUnloadNow(); +} + +STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + TRACE("CLSID:%s,IID:%s\n", wine_dbgstr_guid(&rclsid), wine_dbgstr_guid(&riid)); + + HRESULT hr = gModule.DllGetClassObject(rclsid, riid, ppv); + + TRACE("-- pointer to class factory: %p\n", *ppv); + + return hr; +} + +STDAPI DllRegisterServer(void) +{ + HRESULT hr = gModule.DllRegisterServer(FALSE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} + +STDAPI DllUnregisterServer(void) +{ + HRESULT hr = gModule.DllUnregisterServer(FALSE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} + +STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad) +{ + TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad); + if (dwReason == DLL_PROCESS_ATTACH) + { + gModule.Init(ObjectMap, hInstance, NULL); + DisableThreadLibraryCalls(hInstance); + } + else if (dwReason == DLL_PROCESS_DETACH) + { + gModule.Term(); + } + return TRUE; +} diff --git a/dll/shellext/mydocs/mydocs.rc b/dll/shellext/mydocs/mydocs.rc new file mode 100644 index 00000000000..8adeb54160c --- /dev/null +++ b/dll/shellext/mydocs/mydocs.rc @@ -0,0 +1,23 @@ +/* + * PROJECT: mydocs + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: MyDocs implementation + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include <windef.h> +#include <winuser.h> +#include "resource.h" + +#include "mydocs_version.rc" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDR_MYDOCS REGISTRY "res/mydocs.rgs" + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif diff --git a/dll/shellext/mydocs/mydocs.spec b/dll/shellext/mydocs/mydocs.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dll/shellext/mydocs/mydocs.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dll/shellext/mydocs/mydocs_version.h b/dll/shellext/mydocs/mydocs_version.h new file mode 100644 index 00000000000..4ce4d8b4fe6 --- /dev/null +++ b/dll/shellext/mydocs/mydocs_version.h @@ -0,0 +1,15 @@ +/* + * PROJECT: mydocs + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: MyDocs implementation + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#pragma once + +#define WINE_FILEVERSION_MAJOR 6 +#define WINE_FILEVERSION_MINOR 0 +#define WINE_FILEVERSION_BUILD 3790 +#define WINE_FILEVERSION_PLATFORMID 3959 + +#define WINE_FILEVERSION_STR "6.0.3790.3959" diff --git a/dll/shellext/mydocs/mydocs_version.rc b/dll/shellext/mydocs/mydocs_version.rc new file mode 100644 index 00000000000..937b11947e8 --- /dev/null +++ b/dll/shellext/mydocs/mydocs_version.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: mydocs + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: MyDocs implementation + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "mydocs_version.h" + +#define WINE_OLESELFREGISTER +#define WINE_FILEVERSION WINE_FILEVERSION_MAJOR,WINE_FILEVERSION_MINOR,WINE_FILEVERSION_BUILD,WINE_FILEVERSION_PLATFORMID +#define WINE_FILENAME_STR "mydocs.dll" + +#include <wine/wine_common_ver.rc> diff --git a/dll/shellext/mydocs/precomp.hpp b/dll/shellext/mydocs/precomp.hpp new file mode 100644 index 00000000000..4ad886e0146 --- /dev/null +++ b/dll/shellext/mydocs/precomp.hpp @@ -0,0 +1,29 @@ +/* + * PROJECT: mydocs + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: MyDocs implementation + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#define COBJMACROS +#define WIN32_NO_STATUS +#include <windows.h> +#include <shlwapi.h> +#include <shlobj.h> +#include <shobjidl.h> +#include <atlbase.h> +#include <atlcom.h> +#include <atlwin.h> +#include <atlstr.h> +#include <shlguid_undoc.h> +#include <shellapi.h> +#include <shellutils.h> +#include <strsafe.h> +#include <wine/debug.h> + +#include "CMyDocsDropHandler.hpp" + +#include "mydocs_version.h" +#include "resource.h" + +extern LONG g_ModuleRefCnt; diff --git a/dll/shellext/mydocs/res/mydocs.rgs b/dll/shellext/mydocs/res/mydocs.rgs new file mode 100644 index 00000000000..40bbe0da0ba --- /dev/null +++ b/dll/shellext/mydocs/res/mydocs.rgs @@ -0,0 +1,35 @@ +HKCR +{ + NoRemove CLSID + { + '{ECF03A32-103D-11d2-854D-006008059367}' = s 'MyDocs Drop Target' + { + val 'NeverShowExt' = s '' + val 'NoOpen' = s 'Drag Files onto this icon to store them in My Documents' + val EditFlags = d '0x01' + DefaultIcon = e '%%SystemRoot%%\system32\shell32.dll,-235' + { + } + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + 'shellex' + { + 'DropHandler' = s '{ECF03A32-103D-11d2-854D-006008059367}' + { + } + } + } + } +} +HKLM +{ + NoRemove Software + { + NoRemove Classes + { + '.mydocs' = s 'CLSID\{ECF03A32-103D-11d2-854D-006008059367}' + } + } +} diff --git a/dll/shellext/mydocs/resource.h b/dll/shellext/mydocs/resource.h new file mode 100644 index 00000000000..0cbcb889962 --- /dev/null +++ b/dll/shellext/mydocs/resource.h @@ -0,0 +1,15 @@ +/* + * PROJECT: mydocs + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: MyDocs implementation + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#ifndef RESOURCE_H_ +#define RESOURCE_H_ + +#define IDR_MYDOCS 100 + +#define IDS_NOSRCFILEFOUND 100 + +#endif diff --git a/media/inf/syssetup.inf b/media/inf/syssetup.inf index d70d83c7d13..0de1dc980ca 100644 --- a/media/inf/syssetup.inf +++ b/media/inf/syssetup.inf @@ -86,6 +86,7 @@ AddReg=Classes 11,,msxml3.dll,1 11,,msxml4.dll,1 11,,msxml6.dll,1 +11,,mydocs.dll,1 11,,netshell.dll,1 11,,ntobjshex.dll,1 11,,objsel.dll,1 diff --git a/sdk/include/reactos/shlguid_undoc.h b/sdk/include/reactos/shlguid_undoc.h index 7360ab57460..42021b6cdb1 100644 --- a/sdk/include/reactos/shlguid_undoc.h +++ b/sdk/include/reactos/shlguid_undoc.h @@ -112,6 +112,7 @@ DEFINE_GUID(CLSID_ShellNetDefExt, 0x86422020, 0x42A0, 0x1069, 0xA2, 0xE DEFINE_GUID(CLSID_ExeDropHandler, 0x86C86720, 0x42A0, 0x1069, 0xA2, 0xE8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); DEFINE_GUID(CLSID_DeskLinkDropHandler, 0x9E56BE61, 0xC50F, 0x11CF, 0x9A, 0x2C, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xCE); +DEFINE_GUID(CLSID_MyDocsDropHandler, 0xECF03A32, 0x103D, 0x11d2, 0x85, 0x4D, 0x00, 0x60, 0x08, 0x05, 0x93, 0x67); DEFINE_GUID(CLSID_MergedFolder, 0x26FDC864, 0xBE88, 0x46E7, 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E); DEFINE_GUID(IID_IAugmentedShellFolder, 0x91EA3F8C, 0xC99B, 0x11D0, 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72);

4 years, 6 months

[reactos] 01/01: [IEXPLORE] Update now-redirected 'http' and 'www.reactos.org' URLs (#2619)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=333b7f254b0dcba7d2eb4… commit 333b7f254b0dcba7d2eb407a62af35457f71da84 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Apr 22 07:45:12 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 22 14:45:12 2020 +0900 [IEXPLORE] Update now-redirected 'http' and 'www.reactos.org' URLs (#2619) --- base/applications/iexplore/iexplore.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/iexplore/iexplore.inf b/base/applications/iexplore/iexplore.inf index 5e059669d00..165d86b0e7a 100644 --- a/base/applications/iexplore/iexplore.inf +++ b/base/applications/iexplore/iexplore.inf @@ -28,11 +28,11 @@ HKCR,"CLSID\%CLSID_InternetExplorerManager%\LocalServer32",,,"""%16422%\Internet [Settings.Reg] HKCU,"Software\Microsoft\Internet Explorer\Main","ShowGoButton",2,"yes" #HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"https://www.winehq.org" -HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.reactos.org" +HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"https://reactos.org/" HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" HKCU,"Software\Microsoft\Internet Explorer\Settings","Text Color",2,"0,0,0" #HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"https://www.winehq.org" -HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.reactos.org" +HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"https://reactos.org/" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe",,,"%16422%\Internet Explorer\iexplore.exe" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",,"%16422%\Internet Explorer;"

4 years, 6 months

[reactos] 01/01: [USETUP] Update now-redirected 'http' and 'www.reactos.org' URLs (#2622)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c62b7a67ef9674b2e59d9… commit c62b7a67ef9674b2e59d9d28e2c8fa1826de4bd1 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Apr 22 07:44:13 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 22 14:44:13 2020 +0900 [USETUP] Update now-redirected 'http' and 'www.reactos.org' URLs (#2622) NB: http://www.reactos.org/uk/ is not updated, as it returns Error 404 - Page not found. --- base/setup/usetup/lang/bg-BG.h | 2 +- base/setup/usetup/lang/bn-BD.h | 2 +- base/setup/usetup/lang/cs-CZ.h | 2 +- base/setup/usetup/lang/da-DK.h | 2 +- base/setup/usetup/lang/de-DE.h | 2 +- base/setup/usetup/lang/el-GR.h | 2 +- base/setup/usetup/lang/en-US.h | 2 +- base/setup/usetup/lang/es-ES.h | 2 +- base/setup/usetup/lang/et-EE.h | 2 +- base/setup/usetup/lang/fr-FR.h | 2 +- base/setup/usetup/lang/he-IL.h | 2 +- base/setup/usetup/lang/hu-HU.h | 2 +- base/setup/usetup/lang/id-ID.h | 2 +- base/setup/usetup/lang/it-IT.h | 2 +- base/setup/usetup/lang/ja-JP.h | 2 +- base/setup/usetup/lang/lt-LT.h | 2 +- base/setup/usetup/lang/ms-MY.h | 2 +- base/setup/usetup/lang/nl-NL.h | 2 +- base/setup/usetup/lang/pl-PL.h | 4 ++-- base/setup/usetup/lang/pt-BR.h | 2 +- base/setup/usetup/lang/pt-PT.h | 2 +- base/setup/usetup/lang/ro-RO.h | 2 +- base/setup/usetup/lang/sk-SK.h | 2 +- base/setup/usetup/lang/sq-AL.h | 2 +- base/setup/usetup/lang/sv-SE.h | 2 +- base/setup/usetup/lang/tr-TR.h | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 0ea380691ff..3b9f0bab118 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -168,7 +168,7 @@ static MUI_ENTRY bgBGWelcomePageEntries[] = { 6, 25, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 1033aadade5..a59d8577fec 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -159,7 +159,7 @@ static MUI_ENTRY bnBDWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 121959d6ca7..73ae0058045 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -167,7 +167,7 @@ static MUI_ENTRY csCZWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 03757390b58..9640b2e7815 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -161,7 +161,7 @@ static MUI_ENTRY daDKWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 3af245019b2..c5a83d18def 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -161,7 +161,7 @@ static MUI_ENTRY deDEWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 77954444a03..2a63ff6691f 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -161,7 +161,7 @@ static MUI_ENTRY elGRWelcomePageEntries[] = { 5, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 378700de0d8..84e5d047b90 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -159,7 +159,7 @@ static MUI_ENTRY enUSWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 2dc102333ac..f8577625af2 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -164,7 +164,7 @@ static MUI_ENTRY esESWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index b48275023b2..e0ba53ed4ab 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -161,7 +161,7 @@ static MUI_ENTRY etEEWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 93a6717f107..aeb2913ffee 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -161,7 +161,7 @@ static MUI_ENTRY frFRWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 292a8d97f3d..2c305dd1cbe 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -163,7 +163,7 @@ static MUI_ENTRY heILWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index b15823a72bb..8ddecbbb818 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -161,7 +161,7 @@ static MUI_ENTRY huHUWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org weboldalra.", + "https://reactos.org/ weboldalra.", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index 3fa32e3293d..f7df6647aae 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -159,7 +159,7 @@ static MUI_ENTRY idIDWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 53227ba7669..7d46e399ba3 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -158,7 +158,7 @@ static MUI_ENTRY itITWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 37988a2df97..d7b6d78bcfa 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -161,7 +161,7 @@ static MUI_ENTRY jaJPWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 7fc3a3be540..e9f4a8e9779 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -170,7 +170,7 @@ static MUI_ENTRY ltLTWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 027af2649fc..d5c9581c1bf 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -158,7 +158,7 @@ static MUI_ENTRY msMYWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 147bb3de274..547b4229be3 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -173,7 +173,7 @@ static MUI_ENTRY nlNLWelcomePageEntries[] = { 6, 25, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 7ec3da89da2..4f5af3cc482 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -4,7 +4,7 @@ /* * translated by Caemyr (Jan-Feb, Apr, 2008) * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org + * https://reactos.org/ * IRC: irc.freenode.net #reactos-pl; * Updated by Wojo664 (July, 2014) * Updated by Saibamen (July, 2015) @@ -170,7 +170,7 @@ static MUI_ENTRY plPLWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 6993289d576..ac4265cc5ec 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -161,7 +161,7 @@ static MUI_ENTRY ptBRWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 9a7979b6ca4..874beb02408 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -161,7 +161,7 @@ static MUI_ENTRY ptPTWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 97a30c7f924..496d6722502 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -169,7 +169,7 @@ static MUI_ENTRY roROWelcomePageEntries[] = { 6, 27, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 59987603034..2d0ddf70c4a 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -167,7 +167,7 @@ static MUI_ENTRY skSKWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index b74b10792ea..96d55ff1f36 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -165,7 +165,7 @@ static MUI_ENTRY sqALWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 223b89dcde6..92e99838fcf 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -167,7 +167,7 @@ static MUI_ENTRY svSEWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 17a7cbd7867..83480a62c94 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -163,7 +163,7 @@ static MUI_ENTRY trTRWelcomePageEntries[] = { 6, 24, - "http://www.reactos.org", + "https://reactos.org/", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC },

4 years, 6 months

[reactos] 01/01: [RAPPS] Update now-redirected 'http' and 'www.reactos.org' URLs (#2621)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03006ecfadfc010c38f9e… commit 03006ecfadfc010c38f9e4c15e3f68896b6ffd63 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Apr 22 07:42:43 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 22 14:42:43 2020 +0900 [RAPPS] Update now-redirected 'http' and 'www.reactos.org' URLs (#2621) NB: http://www.reactos.org/wiki/Bulgarian_translation is not updated, as it returns Error 404 - Page not found. --- base/applications/rapps/README.RUS | 2 +- base/applications/rapps/lang/bg-BG.rc | 2 +- base/applications/rapps/lang/cs-CZ.rc | 2 +- base/applications/rapps/lang/de-DE.rc | 2 +- base/applications/rapps/lang/en-US.rc | 2 +- base/applications/rapps/lang/es-ES.rc | 2 +- base/applications/rapps/lang/et-EE.rc | 2 +- base/applications/rapps/lang/fr-FR.rc | 2 +- base/applications/rapps/lang/he-IL.rc | 2 +- base/applications/rapps/lang/id-ID.rc | 2 +- base/applications/rapps/lang/it-IT.rc | 2 +- base/applications/rapps/lang/ja-JP.rc | 2 +- base/applications/rapps/lang/no-NO.rc | 2 +- base/applications/rapps/lang/pl-PL.rc | 4 ++-- base/applications/rapps/lang/pt-BR.rc | 2 +- base/applications/rapps/lang/pt-PT.rc | 2 +- base/applications/rapps/lang/ro-RO.rc | 2 +- base/applications/rapps/lang/ru-RU.rc | 2 +- base/applications/rapps/lang/sk-SK.rc | 2 +- base/applications/rapps/lang/sq-AL.rc | 2 +- base/applications/rapps/lang/sv-SE.rc | 2 +- base/applications/rapps/lang/tr-TR.rc | 2 +- base/applications/rapps/lang/uk-UA.rc | 2 +- base/applications/rapps/lang/zh-CN.rc | 2 +- base/applications/rapps/lang/zh-TW.rc | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/base/applications/rapps/README.RUS b/base/applications/rapps/README.RUS index 28a43c041dd..f5dfcf8de3b 100644 --- a/base/applications/rapps/README.RUS +++ b/base/applications/rapps/README.RUS @@ -1,4 +1,4 @@ -For more information for RAPPS, see: https://www.reactos.org/wiki/RAPPS +For more information for RAPPS, see: https://reactos.org/wiki/RAPPS �� diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 93fe7d9f35c..33a417442a9 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -195,7 +195,7 @@ BEGIN IDS_APPS_COUNT "Брой приложения: %d; Selected: %d" IDS_WELCOME_TITLE "Управителят на приложенията на РеактОС ви приветства" IDS_WELCOME_TEXT "Изберете раздел от лявата страна, след което изберете приложение за слагане или премахване.\nСтраницата на РеактОС: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Сложено" IDS_AVAILABLEFORINST "Налично за слагане" IDS_UPDATES "Обновления" diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 35b3907f33f..6ad7cf8b6c4 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -196,7 +196,7 @@ BEGIN IDS_APPS_COUNT "Počet aplikací: %d; Selected: %d" IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!\n\n" IDS_WELCOME_TEXT "Na levé straně zvolte kategorii, pak vpravo zvolte aplikaci, která bude nainstalována nebo odinstalována.\nWebová stránka ReactOS: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Nainstalováno" IDS_AVAILABLEFORINST "Lze instalovat" IDS_UPDATES "Aktualizace" diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index 0f043c3d776..adc5e3c4bb7 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -191,7 +191,7 @@ BEGIN IDS_APPS_COUNT "Anzahl der Anwendungen: %d, ausgewählt: %d" IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!\n\n" IDS_WELCOME_TEXT "Wählen Sie links eine Kategorie und dann eine Anwendung um sie zu installieren oder zu deinstallieren.\nReactOS-Webseite: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Installiert" IDS_AVAILABLEFORINST "Zur Installation verfügbar" IDS_UPDATES "Aktualisierungen" diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 26b24a3807f..a5528dc9c8a 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -191,7 +191,7 @@ BEGIN IDS_APPS_COUNT "Applications count: %d; Selected: %d" IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!\n\n" IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Installed" IDS_AVAILABLEFORINST "Available for installation" IDS_UPDATES "Updates" diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 7c6f198f54c..b031a1973b0 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -194,7 +194,7 @@ BEGIN IDS_APPS_COUNT "Nº de aplicaciones: %d; Selecionadas: %d" IDS_WELCOME_TITLE "Bienvenido al Administrador de aplicaciones de ReactOS.\n\n" IDS_WELCOME_TEXT "Seleccione una categoría a la izquierda, para más tarde seleccionar la aplicación a instalar o desinstalar.\nWeb de ReactOS: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Instaladas" IDS_AVAILABLEFORINST "Disponible para su instalación" IDS_UPDATES "Actualizaciones" diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index 46325c9499b..ba857f28a2d 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -199,7 +199,7 @@ BEGIN IDS_APPS_COUNT "Rakenduste arv: %d; Valitud: %d" IDS_WELCOME_TITLE "Tere tulemast ReactOS'i Rakenduste Haldurisse!\n\n" IDS_WELCOME_TEXT "Vali vasakult teema, siis vali paremalt rakendusi mida soovid installida või desinstallida.\nReactOS'i veebileht: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Installitud" IDS_AVAILABLEFORINST "Installimiseks saadaval" IDS_UPDATES "Uuendused" diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index ca69b6a4fad..c9ada1afef0 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -191,7 +191,7 @@ BEGIN IDS_APPS_COUNT "Nombre d'applications : %d ; Sélectionnées : %d" IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !\n\n" IDS_WELCOME_TEXT "Choisissez une catégorie à gauche, ensuite choisissez une application à installer ou désinstaller.\nSite internet de ReactOS : " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Installé" IDS_AVAILABLEFORINST "Disponible pour installation" IDS_UPDATES "Mises à jour" diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index f2d9b994979..7a55dc68269 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -198,7 +198,7 @@ BEGIN IDS_APPS_COUNT "ספירת יישומים: %d; Selected: %d" IDS_WELCOME_TITLE "ברוכים הבאים למנהל היישומים של ReactOS!\n\n" IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "מותקן" IDS_AVAILABLEFORINST "זמין להתקנה" IDS_UPDATES "עדכונים" diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index 4d30fea43a0..a497a36a369 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -191,7 +191,7 @@ BEGIN IDS_APPS_COUNT "Jumlah aplikasi: %d; Terpilih: %d" IDS_WELCOME_TITLE "Selamat datang di Manajer Aplikasi ReactOS!\n\n" IDS_WELCOME_TEXT "pilih kategori di sisi kiri, kemudian pilih aplikasi untuk dipasang atau dibongkar.\nSitus Web ReactOS: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Terpasang" IDS_AVAILABLEFORINST "Tersedia untuk pemasangan" IDS_UPDATES "Pembaruan" diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index e8dcb3b512f..0b4b9f35731 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -191,7 +191,7 @@ BEGIN IDS_APPS_COUNT "Numero applicazioni: %d; Selezionate: %d" IDS_WELCOME_TITLE "Benvenuto!\n\n" IDS_WELCOME_TEXT "Scegliere una categoria a sinistra, poi scegliere una applicazione da installare o disinstallare.\nReactOS Web Site: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Installato" IDS_AVAILABLEFORINST "Disponibile per l'installazione" IDS_UPDATES "Aggiornamenti" diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 5618427dfdb..fe640d28060 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -191,7 +191,7 @@ BEGIN IDS_APPS_COUNT "アプリケーション数: %d; Selected: %d" IDS_WELCOME_TITLE "ReactOS アプリケーションマネージャへようこそ!\n\n" IDS_WELCOME_TEXT "左側からカテゴリを選択し、インストール又はアンインストールするアプリケーションを選んでください。\nReactOS ウェブサイト: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "インストール済み" IDS_AVAILABLEFORINST "インストール可能" IDS_UPDATES "アップデート" diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index dd21e562d93..8c866f43f3e 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -191,7 +191,7 @@ BEGIN IDS_APPS_COUNT "Program oppsummering: %d; Selected: %d" IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!\n\n" IDS_WELCOME_TEXT "Velg en kategori til venstre, og velg et program for installere eller avinstallere programvaren.\nReactOS internettside: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Installert" IDS_AVAILABLEFORINST "Tilgjengelig for installasjon" IDS_UPDATES "Oppdateringer" diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index bdaefc20c68..93c5135382e 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -2,7 +2,7 @@ * Translated by Caemyr - Olaf Siejka (Aug, 2009) * Use ReactOS forum PM or IRC to contact me * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (Apr, 2011) - * http://www.reactos.org + * https://reactos.org/ * IRC: irc.freenode.net #reactos-pl; */ @@ -199,7 +199,7 @@ BEGIN IDS_APPS_COUNT "Licznik aplikacji: %d" IDS_WELCOME_TITLE "Witamy w Menedżerze aplikacji ReactOS!\n\n" IDS_WELCOME_TEXT "Z listy po lewej wybierz kategorię, a następnie aplikację, by ją zainstalować lub odinstalować.\nStrona projektu ReactOS: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Zainstalowane" IDS_AVAILABLEFORINST "Dostępne" IDS_UPDATES "Uaktualnienia" diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 48b63e5a210..bb22b3bbe51 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -193,7 +193,7 @@ BEGIN IDS_APPS_COUNT "Número de aplicativos: %d; Selected: %d" IDS_WELCOME_TITLE "Bem-vindo(a) a Central de Aplicativos ReactOS!\n\n" IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, então escolha um aplicativo para instalar ou desinstalar.\nWeb Site ReactOS: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Instalado" IDS_AVAILABLEFORINST "Disponível para instalação" IDS_UPDATES "Atualizações" diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index 34700700292..74fedc62631 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -193,7 +193,7 @@ BEGIN IDS_APPS_COUNT "Número de aplicativos: %d; Seleccionados: %d" IDS_WELCOME_TITLE "Bem-vindo(a) a Central de Aplicativos ReactOS!\n\n" IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, então escolha um aplicativo para instalar ou desinstalar.\nWeb Site ReactOS: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Instalado" IDS_AVAILABLEFORINST "Disponível para instalação" IDS_UPDATES "Actualizações" diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 45bdbf7bca9..4fa83823a7b 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -200,7 +200,7 @@ BEGIN IDS_APPS_COUNT "Numărul de programe: %d; Selectate: %d" IDS_WELCOME_TITLE "Bun venit la gestionarul de programe ReactOS!\n\n" IDS_WELCOME_TEXT "Alegeți o categorie din stânga, apoi alegeți o aplicație pentru a o instala sau dezinstala.\nArdesa web ReactOS: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Instalate" IDS_AVAILABLEFORINST "Disponibile pentru instalare" IDS_UPDATES "Actualizări" diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 990ce2113e7..0fb40d419f6 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -191,7 +191,7 @@ BEGIN IDS_APPS_COUNT "Количество приложений: %d; Выбрано: %d" IDS_WELCOME_TITLE "Добро пожаловать в ""Менеджер приложений ReactOS""!\n\n" IDS_WELCOME_TEXT "Выберите категорию слева и приложение для установки или удаления.\nСайт ReactOS: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Установленные" IDS_AVAILABLEFORINST "Доступно для установки" IDS_UPDATES "Обновления" diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index 941a2cef9bb..331ca01ce8a 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -196,7 +196,7 @@ BEGIN IDS_APPS_COUNT "Počet programov: %d; Selected: %d" IDS_WELCOME_TITLE "Víta Vás Manažér aplikácií systému ReactOS!\n\n" // ReactOS Application Manager IDS_WELCOME_TEXT "Vyberte si kategóriu na ľavej strane, potom vyberte aplikáciu, ktorú chcete nainštalovať alebo odinštalovať.\nWebstránka projektu ReactOS: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Nainštalované" IDS_AVAILABLEFORINST "Dostupné pre nainštalovanie" IDS_UPDATES "Aktualizácie" diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 4638eef3f7b..57a66c4cff3 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -195,7 +195,7 @@ BEGIN IDS_APPS_COUNT "Numrimi Aplicacioneve: %d; Selected: %d" IDS_WELCOME_TITLE "Mire Se Erdhe ne ReactOS Applications Manager!\n\n" IDS_WELCOME_TEXT "Zgjidh nje kategori ne te majte, pastaj zgjidh nje aplicacion per ta instaluar ose uninstall.\nReactOS Web Site: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Instaluar" IDS_AVAILABLEFORINST "Te vlefshem per instalim" IDS_UPDATES "Updates" diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index 0ef75671715..62078832efd 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -198,7 +198,7 @@ BEGIN IDS_APPS_COUNT "Programantal: %d; Selected: %d" IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!\n\n" IDS_WELCOME_TEXT "Välj en kategori till vänster, och sedan ett program för att installera eller avinstallera.\nReactOS Web sida: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Installerat" IDS_AVAILABLEFORINST "Tillgängliga for installation" IDS_UPDATES "Uppdateringar" diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 2c0ad27d6ae..390f34e8565 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -193,7 +193,7 @@ BEGIN IDS_APPS_COUNT "Uygulama Sayısı: %d; Seçili: %d" IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz.\n\n" IDS_WELCOME_TEXT "Solda bir kategori seçiniz, ardından kurmak ya da kaldırmak için bir uygulama seçiniz.\nReactOS'un İnternet sitesi: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Kurulanlar" IDS_AVAILABLEFORINST "Kurulum İçin Bulunanlar" IDS_UPDATES "Güncelleştirmeler" diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index f4a82f00de3..bf71509e84c 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -199,7 +199,7 @@ BEGIN IDS_APPS_COUNT "Kількість додатків: %d; Обрано: %d" IDS_WELCOME_TITLE "Ласкаво просимо в Менеджер додатків ReactOS!\n\n" IDS_WELCOME_TEXT "Виберіть категорію зліва, а потім виберіть програми для встановлення чи видалення.\nСторінка ReactOS: " - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "Встановлені" IDS_AVAILABLEFORINST "Доступні для встановлення" IDS_UPDATES "Оновлення" diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 7707fd55872..8d79e46ce5e 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -193,7 +193,7 @@ BEGIN IDS_APPS_COUNT "程序数量：%d；已选：%d" IDS_WELCOME_TITLE "欢迎使用 ReactOS 程序管理器！\n\n" IDS_WELCOME_TEXT "从左栏选择一个类别，然后选择要安装或卸载的程序。\nReactOS 网站：" - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "已安装" IDS_AVAILABLEFORINST "可安装" IDS_UPDATES "更新" diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 8429e31c7df..2ca01a19306 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -193,7 +193,7 @@ BEGIN IDS_APPS_COUNT "程式個數:%d; Selected: %d" IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n" IDS_WELCOME_TEXT "從左欄選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站:" - IDS_WELCOME_URL "http://www.reactos.org" + IDS_WELCOME_URL "https://reactos.org/" IDS_INSTALLED "已安裝" IDS_AVAILABLEFORINST "可安裝" IDS_UPDATES "更新"

4 years, 6 months

[reactos] 01/01: [GDI32_APITEST] Add Tahoma font to GetTextMetrics apitest set (#2615)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02e27dd512483ae378683… commit 02e27dd512483ae378683c2ab0c730c9ee6ec60e Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Wed Apr 22 00:21:31 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 22 14:21:31 2020 +0900 [GDI32_APITEST] Add Tahoma font to GetTextMetrics apitest set (#2615) Tahoma is available in Windows and ReactOS both, so this allows us to compare these fonts in both systems. --- modules/rostests/apitests/gdi32/GetTextMetrics.c | 55 ++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/modules/rostests/apitests/gdi32/GetTextMetrics.c b/modules/rostests/apitests/gdi32/GetTextMetrics.c index 9fb056f9b90..b6b33aef545 100644 --- a/modules/rostests/apitests/gdi32/GetTextMetrics.c +++ b/modules/rostests/apitests/gdi32/GetTextMetrics.c @@ -373,6 +373,57 @@ static const TEST_ENTRY g_MSMINCHO[] = { __LINE__, -400, 0, 3000, 400, 400, 344, 56, 0, 0 }, }; #define g_MSMINCHO_count _countof(g_MSMINCHO) + +static const TEST_ENTRY g_TAHOMA[] = +{ + { __LINE__, 400, 0, 1953, 400, 400, 332, 68, 0, 0 }, + { __LINE__, 300, 0, 1466, 300, 300, 249, 51, 0, 0 }, + { __LINE__, 200, 0, 980, 200, 200, 166, 34, 0, 0 }, + { __LINE__, 100, 0, 490, 100, 100, 83, 17, 0, 0 }, + { __LINE__, 64, 0, 316, 64, 64, 53, 11, 0, 0 }, + { __LINE__, 32, 0, 156, 32, 32, 27, 5, 6, 0 }, + { __LINE__, 16, 0, 77, 16, 16, 13, 3, 0, 0 }, + { __LINE__, 15, 0, 73, 15, 15, 12, 3, 0, 0 }, + { __LINE__, 14, 0, 73, 14, 14, 12, 2, 0, 0 }, + { __LINE__, 13, 0, 64, 13, 13, 11, 2, 0, 0 }, + { __LINE__, 12, 0, 56, 12, 12, 10, 2, 0, 0 }, + { __LINE__, 11, 0, 55, 11, 11, 9, 2, 0, 0 }, + { __LINE__, 10, 0, 50, 10, 10, 8, 2, 0, 0 }, + { __LINE__, 9, 0, 41, 9, 9, 7, 2, 0, 0 }, + { __LINE__, 8, 0, 41, 8, 8, 7, 1, 0, 0 }, + { __LINE__, 7, 0, 36, 7, 7, 6, 1, 0, 0 }, + { __LINE__, 6, 0, 32, 6, 6, 5, 1, 0, 0 }, + { __LINE__, 5, 0, 22, 5, 5, 4, 1, 0, 0 }, + { __LINE__, 4, 0, 19, 4, 4, 3, 1, 0, 0 }, + { __LINE__, 3, 0, 13, 4, 4, 3, 0, 0, 0 }, + { __LINE__, 2, 0, 13, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 1, 0, 13, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 0, 0, -135, -18, -18, -15, -3, 0, 0 }, + { __LINE__, -1, 0, 13, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -2, 0, 13, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -3, 0, 19, 4, 4, 3, 0, 0, 0 }, + { __LINE__, -4, 0, 22, 5, 5, 4, 1, 0, 0 }, + { __LINE__, -5, 0, 32, 6, 6, 5, 1, 0, 0 }, + { __LINE__, -6, 0, 36, 7, 7, 6, 1, 0, 0 }, + { __LINE__, -7, 0, 41, 8, 8, 7, 1, 0, 0 }, + { __LINE__, -8, 0, 50, 10, 10, 8, 2, 0, 0 }, + { __LINE__, -9, 0, 55, 11, 11, 9, 2, 0, 0 }, + { __LINE__, -10, 0, 56, 12, 12, 10, 2, 0, 0 }, + { __LINE__, -11, 0, 64, 13, 13, 11, 2, 0, 0 }, + { __LINE__, -12, 0, 73, 14, 14, 12, 2, 0, 0 }, + { __LINE__, -13, 0, 77, 16, 16, 13, 3, 0, 0 }, + { __LINE__, -14, 0, 78, 17, 17, 14, 3, 0, 0 }, + { __LINE__, -15, 0, 89, 18, 18, 15, 3, 0, 0 }, + { __LINE__, -16, 0, 94, 19, 19, 16, 3, 0, 0 }, + { __LINE__, -32, 0, 189, 39, 39, 32, 7, 7, 0 }, + { __LINE__, -64, 0, 379, 77, 77, 64, 13, 0, 0 }, + { __LINE__, -100, 0, 589, 121, 121, 100, 21, 0, 0 }, + { __LINE__, -200, 0, 1182, 241, 241, 200, 41, 0, 0 }, + { __LINE__, -300, 0, 1770, 362, 362, 300, 62, 0, 0 }, + { __LINE__, -400, 0, 2361, 483, 483, 400, 83, 0, 0 }, +}; +#define g_TAHOMA_count _countof(g_TAHOMA) + #endif typedef struct FONT_ENTRY @@ -393,6 +444,7 @@ static FONT_ENTRY g_font_entries[] = { "UBUNTUMONO", "Ubuntu Mono", "UbuntuMono-R.ttf" }, { "MSGOTHIC", "MS Gothic", "msgothic.ttc" }, { "MSMINCHO", "MS Mincho", "msmincho.ttc" }, + { "TAHOMA", "Tahoma", "tahoma.ttf" }, #else { "FREEMONO", "FreeMono", "FreeMono.ttf", g_FREEMONO_count, g_FREEMONO }, { "DEJAVUSERIF", "DejaVu Serif", "DejaVuSerif.ttf", g_DEJAVUSERIF_count, g_DEJAVUSERIF }, @@ -400,6 +452,7 @@ static FONT_ENTRY g_font_entries[] = { "UBUNTUMONO", "Ubuntu Mono", "UbuntuMono-R.ttf", g_UBUNTUMONO_count, g_UBUNTUMONO }, { "MSGOTHIC", "MS Gothic", "msgothic.ttc", g_MSGOTHIC_count, g_MSGOTHIC }, { "MSMINCHO", "MS Mincho", "msmincho.ttc", g_MSMINCHO_count, g_MSMINCHO }, + { "TAHOMA", "Tahoma", "Tahoma.ttf", g_TAHOMA_count, g_TAHOMA }, #endif }; static size_t g_font_entry_count = _countof(g_font_entries); @@ -433,6 +486,8 @@ START_TEST(GetTextMetrics) continue; } + trace("Testing '%s'.\n", font->font_file); + #ifdef EMIT_TESTCASES printf("static const TEST_ENTRY g_%s[] =\n", font->entry_name); printf("{\n");

4 years, 6 months

[reactos] 03/03: [TIMEDATE.CPL] In case TimeZone data does not contain a valid StandardName, perform comparisons against the time-zone numerical values instead.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa69236646f01a476377e… commit aa69236646f01a476377ec76ae7b762e061cd300 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 22 00:16:14 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 22 00:58:34 2020 +0200 [TIMEDATE.CPL] In case TimeZone data does not contain a valid StandardName, perform comparisons against the time-zone numerical values instead. It may happen that the time-zone information in the registry key HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\TimeZoneInformation contains an empty StandardName / DaylightName, or is too long for the standard maximum 32-character length, and therefore is returned empty. And/or it may happen as well that some of the standard names (value "Std") present in some of the time zones listed in HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones are similarly too long, and therefore are returned as empty strings. In case this happens, perform comparisons instead with the numerical values Bias, StandardBias, DaylightBias, StandardDate and DaylightDate in order to find a match. It is interesting to note also that in Vista+ there is an additional REG_SZ value "TimeZoneKeyName" in HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\TimeZoneInformation that allows to directly find a match in the time zones list in "Windows NT\CurrentVersion\Time Zones". --- dll/cpl/timedate/timezone.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dll/cpl/timedate/timezone.c b/dll/cpl/timedate/timezone.c index 9dd79e1d01a..cd7361136a9 100644 --- a/dll/cpl/timedate/timezone.c +++ b/dll/cpl/timedate/timezone.c @@ -168,10 +168,12 @@ ShowTimeZoneList(HWND hwnd) { TIME_ZONE_INFORMATION TimeZoneInfo; PTIMEZONE_ENTRY Entry; + BOOL bDoAdvancedTest; DWORD dwIndex; DWORD i; GetTimeZoneInformation(&TimeZoneInfo); + bDoAdvancedTest = (!*TimeZoneInfo.StandardName); dwIndex = 0; i = 0; @@ -183,8 +185,16 @@ ShowTimeZoneList(HWND hwnd) 0, (LPARAM)Entry->Description); - if (!wcscmp(Entry->StandardName, TimeZoneInfo.StandardName)) + if ( (!bDoAdvancedTest && *Entry->StandardName && + wcscmp(Entry->StandardName, TimeZoneInfo.StandardName) == 0) || + ( (Entry->TimezoneInfo.Bias == TimeZoneInfo.Bias) && + (Entry->TimezoneInfo.StandardBias == TimeZoneInfo.StandardBias) && + (Entry->TimezoneInfo.DaylightBias == TimeZoneInfo.DaylightBias) && + (memcmp(&Entry->TimezoneInfo.StandardDate, &TimeZoneInfo.StandardDate, sizeof(SYSTEMTIME)) == 0) && + (memcmp(&Entry->TimezoneInfo.DaylightDate, &TimeZoneInfo.DaylightDate, sizeof(SYSTEMTIME)) == 0) ) ) + { dwIndex = i; + } i++; Entry = Entry->Next;

4 years, 6 months

[reactos] 02/03: [TZLIB] QueryTimeZoneData(): Don't fail if the optional values "Display", "Std", "Dlt" are missing (or too long to be captured). However fail if the timezone information is missing.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbdb0ab6a8a576fb9da0f… commit bbdb0ab6a8a576fb9da0f57908d9e725c4925849 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 19 18:50:00 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 22 00:58:32 2020 +0200 [TZLIB] QueryTimeZoneData(): Don't fail if the optional values "Display", "Std", "Dlt" are missing (or too long to be captured). However fail if the timezone information is missing. --- sdk/lib/tzlib/tzlib.c | 52 +++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/sdk/lib/tzlib/tzlib.c b/sdk/lib/tzlib/tzlib.c index 93c33a3fb3a..1dc0cbe7f76 100644 --- a/sdk/lib/tzlib/tzlib.c +++ b/sdk/lib/tzlib/tzlib.c @@ -152,6 +152,30 @@ QueryTimeZoneData( LONG lError; DWORD dwValueSize; + if (Index) + { + dwValueSize = sizeof(*Index); + lError = RegQueryValueExW(hZoneKey, + L"Index", + NULL, + NULL, + (LPBYTE)Index, + &dwValueSize); + if (lError != ERROR_SUCCESS) + *Index = 0; + } + + /* The time zone information structure is mandatory for a valid time zone */ + dwValueSize = sizeof(*TimeZoneInfo); + lError = RegQueryValueExW(hZoneKey, + L"TZI", + NULL, + NULL, + (LPBYTE)TimeZoneInfo, + &dwValueSize); + if (lError != ERROR_SUCCESS) + return lError; + if (Description && DescriptionSize && *DescriptionSize > 0) { lError = RegQueryValueExW(hZoneKey, @@ -161,7 +185,7 @@ QueryTimeZoneData( (LPBYTE)Description, DescriptionSize); if (lError != ERROR_SUCCESS) - return lError; + *Description = 0; } if (StandardName && StandardNameSize && *StandardNameSize > 0) @@ -173,7 +197,7 @@ QueryTimeZoneData( (LPBYTE)StandardName, StandardNameSize); if (lError != ERROR_SUCCESS) - return lError; + *StandardName = 0; } if (DaylightName && DaylightNameSize && *DaylightNameSize > 0) @@ -185,30 +209,10 @@ QueryTimeZoneData( (LPBYTE)DaylightName, DaylightNameSize); if (lError != ERROR_SUCCESS) - return lError; - } - - if (Index) - { - dwValueSize = sizeof(*Index); - lError = RegQueryValueExW(hZoneKey, - L"Index", - NULL, - NULL, - (LPBYTE)Index, - &dwValueSize); - if (lError != ERROR_SUCCESS) - return lError; + *DaylightName = 0; } - dwValueSize = sizeof(*TimeZoneInfo); - lError = RegQueryValueExW(hZoneKey, - L"TZI", - NULL, - NULL, - (LPBYTE)TimeZoneInfo, - &dwValueSize); - return lError; + return ERROR_SUCCESS; } //

4 years, 6 months

← Newer
1
...
13
14
15
16
17
18
19
...
40
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 April 2020