Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[pschweitzer] 71047: [NTOSKRNL_VISTA] Bug fixes to FsRtlRemoveDotsFromPath() (buffer overrun, buffer underrun, etc.). This fixes the failing test

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Mar 25 22:12:08 2016 New Revision: 71047 URL: http://svn.reactos.org/svn/reactos?rev=71047&view=rev Log: [NTOSKRNL_VISTA] Bug fixes to FsRtlRemoveDotsFromPath() (buffer overrun, buffer underrun, etc.). This fixes the failing test Modified: trunk/reactos/lib/drivers/ntoskrnl_vista/fsrtl.c Modified: trunk/reactos/lib/drivers/ntoskrnl_vista/fsrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ntoskrnl_vista… ============================================================================== --- trunk/reactos/lib/drivers/ntoskrnl_vista/fsrtl.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ntoskrnl_vista/fsrtl.c [iso-8859-1] Fri Mar 25 22:12:08 2016 @@ -16,7 +16,7 @@ IN USHORT PathLength, OUT USHORT *NewLength) { - USHORT Length, ReadPos, WritePos = 0; + USHORT Length, ReadPos, WritePos; Length = PathLength / sizeof(WCHAR); @@ -35,79 +35,79 @@ return STATUS_IO_REPARSE_DATA_INVALID; } - if (Length > 0) + for (ReadPos = 0, WritePos = 0; ReadPos < Length; ++WritePos) { - ReadPos = 0; + for (; ReadPos > 0 && ReadPos < Length; ++ReadPos) + { + if (ReadPos < Length - 1 && OriginalString[ReadPos] == '\\' && OriginalString[ReadPos + 1] == '\\') + { + continue; + } - for (; ReadPos < Length; ++WritePos) - { - for (; ReadPos < Length; ++ReadPos) + if (OriginalString[ReadPos] != '.') { - if (ReadPos < Length - 1 && OriginalString[ReadPos] == '\\' && OriginalString[ReadPos + 1] == '\\') + break; + } + + if (ReadPos == Length - 1) + { + if (OriginalString[ReadPos - 1] == '\\') { + if (WritePos > 1) + { + --WritePos; + } + continue; } - if (OriginalString[ReadPos] != '.') + OriginalString[WritePos] = '.'; + ++WritePos; + continue; + } + + if (OriginalString[ReadPos + 1] == '\\') + { + if (OriginalString[ReadPos - 1] != '\\') { - break; + OriginalString[WritePos] = '.'; + ++WritePos; + continue; } - - if (ReadPos == Length - 1) + } + else + { + if (OriginalString[ReadPos + 1] != '.' || OriginalString[ReadPos - 1] != '\\' || + ((ReadPos != Length - 2) && OriginalString[ReadPos + 2] != '\\')) { - if (OriginalString[ReadPos - 1] == '\\') - { - if (WritePos > 1) - { - --WritePos; - } - - continue; - } - OriginalString[WritePos] = '.'; ++WritePos; continue; } - if (OriginalString[ReadPos + 1] == '\\') + for (WritePos -= 2; (SHORT)WritePos > 0 && OriginalString[WritePos] != '\\'; --WritePos); + + if ((SHORT)WritePos < 0 || OriginalString[WritePos] != '\\') { - if (OriginalString[ReadPos - 1] != '\\') - { - OriginalString[WritePos] = '.'; - ++WritePos; - continue; - } - } - else - { - if (OriginalString[ReadPos + 1] != '.' || OriginalString[ReadPos - 1] != '\\' || - ((ReadPos != Length - 2) && OriginalString[ReadPos + 2] != '\\')) - { - OriginalString[WritePos] = '.'; - ++WritePos; - continue; - } - - for (WritePos -= 2; (SHORT)WritePos > 0 && OriginalString[WritePos] != '\\'; --WritePos); - - if ((SHORT)WritePos < 0 || OriginalString[WritePos] != '\\') - { - return STATUS_IO_REPARSE_DATA_INVALID; - } - - if (WritePos == 0 && ReadPos == Length - 2) - { - WritePos = 1; - } + return STATUS_IO_REPARSE_DATA_INVALID; } - ++ReadPos; + if (WritePos == 0 && ReadPos == Length - 2) + { + WritePos = 1; + } } - OriginalString[WritePos] = OriginalString[ReadPos]; ++ReadPos; } + + if (ReadPos >= Length) + { + break; + } + + OriginalString[WritePos] = OriginalString[ReadPos]; + ++ReadPos; } *NewLength = WritePos * sizeof(WCHAR);

8 years, 9 months

[pschweitzer] 71046: [KMTESTS] - Define a new macro function KmtGetSystemOrEmbeddedRoutineAddress() which is to be used to get a function address from Mm if it exists system-wide or to fallback to ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Mar 25 18:53:43 2016 New Revision: 71046 URL: http://svn.reactos.org/svn/reactos?rev=71046&view=rev Log: [KMTESTS] - Define a new macro function KmtGetSystemOrEmbeddedRoutineAddress() which is to be used to get a function address from Mm if it exists system-wide or to fallback to embedded function if it doesn't exist - Use this mechanism to add tests for the newly implemented FsRtlRemoveDotsFromPath() which is Vista+. That allows, with a single build (and thus, same binaries), testing a function in ReactOS and in Windows. Added: trunk/rostests/kmtests/novp_fsrtl/ trunk/rostests/kmtests/novp_fsrtl/FsRtlRemoveDotsFromPath.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/include/kmt_test.h trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Fri Mar 25 18:53:43 2016 @@ -36,6 +36,7 @@ npfs/NpfsHelpers.c npfs/NpfsReadWrite.c npfs/NpfsVolumeInfo.c + novp_fsrtl/FsRtlRemoveDotsFromPath.c ntos_cm/CmSecurity.c ntos_ex/ExCallback.c ntos_ex/ExDoubleList.c @@ -90,7 +91,7 @@ add_library(kmtest_drv SHARED ${KMTEST_DRV_SOURCE}) set_module_type(kmtest_drv kernelmodedriver) -target_link_libraries(kmtest_drv kmtest_printf chkstk memcmp ${PSEH_LIB}) +target_link_libraries(kmtest_drv kmtest_printf chkstk memcmp ntoskrnl_vista ${PSEH_LIB}) add_importlibs(kmtest_drv ntoskrnl hal) add_dependencies(kmtest_drv bugcodes xdk) add_target_compile_definitions(kmtest_drv KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1) Modified: trunk/rostests/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test.… ============================================================================== --- trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] Fri Mar 25 18:53:43 2016 @@ -244,6 +244,16 @@ ok_eq_hex(ExceptionStatus, (ExpectedStatus)); \ } +#define KmtGetSystemOrEmbeddedRoutineAddress(RoutineName) \ + p##RoutineName = KmtGetSystemRoutineAddress(L ## #RoutineName); \ + if (!p##RoutineName) \ + { \ + p##RoutineName = RoutineName; \ + trace("Using embedded routine for " #RoutineName "\n"); \ + } \ + else \ + trace("Using system routine for " #RoutineName "\n"); + #if defined KMT_DEFINE_TEST_FUNCTIONS #if defined KMT_KERNEL_MODE Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Mar 25 18:53:43 2016 @@ -24,6 +24,7 @@ KMT_TESTFUNC Test_FsRtlExpression; KMT_TESTFUNC Test_FsRtlLegal; KMT_TESTFUNC Test_FsRtlMcb; +KMT_TESTFUNC Test_FsRtlRemoveDotsFromPath; KMT_TESTFUNC Test_FsRtlTunnel; KMT_TESTFUNC Test_IoCreateFile; KMT_TESTFUNC Test_IoDeviceInterface; @@ -91,6 +92,7 @@ { "FsRtlExpression", Test_FsRtlExpression }, { "FsRtlLegal", Test_FsRtlLegal }, { "FsRtlMcb", Test_FsRtlMcb }, + { "FsRtlRemoveDotsFromPath", Test_FsRtlRemoveDotsFromPath }, { "FsRtlTunnel", Test_FsRtlTunnel }, { "IoCreateFile", Test_IoCreateFile }, { "IoDeviceInterface", Test_IoDeviceInterface }, Added: trunk/rostests/kmtests/novp_fsrtl/FsRtlRemoveDotsFromPath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/novp_fsrtl/FsRtlR… ============================================================================== --- trunk/rostests/kmtests/novp_fsrtl/FsRtlRemoveDotsFromPath.c (added) +++ trunk/rostests/kmtests/novp_fsrtl/FsRtlRemoveDotsFromPath.c [iso-8859-1] Fri Mar 25 18:53:43 2016 @@ -0,0 +1,59 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Tests for FsRtlRemoveDotsFromPath + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +#define InitConstString(s, c) \ + wcscpy(s.Buffer, c); \ + s.Buffer[sizeof(c) / sizeof(WCHAR) - 1] = 0; \ + s.Length = sizeof(c) - sizeof(UNICODE_NULL) + +NTSTATUS NTAPI FsRtlRemoveDotsFromPath(PWSTR OriginalString, + USHORT PathLength, USHORT *NewLength); + +static +NTSTATUS +(NTAPI *pFsRtlRemoveDotsFromPath)(PWSTR OriginalString, + USHORT PathLength, USHORT *NewLength); + +START_TEST(FsRtlRemoveDotsFromPath) +{ + WCHAR Buf[255]; + UNICODE_STRING TestString; + NTSTATUS Status; + + TestString.Buffer = Buf; + TestString.MaximumLength = sizeof(Buf); + KmtGetSystemOrEmbeddedRoutineAddress(FsRtlRemoveDotsFromPath); + ASSERT(pFsRtlRemoveDotsFromPath); + + InitConstString(TestString, L"\\.."); + Status = pFsRtlRemoveDotsFromPath(TestString.Buffer, TestString.Length, &TestString.Length); + ok_eq_hex(Status, STATUS_IO_REPARSE_DATA_INVALID); + + InitConstString(TestString, L".."); + Status = pFsRtlRemoveDotsFromPath(TestString.Buffer, TestString.Length, &TestString.Length); + ok_eq_hex(Status, STATUS_IO_REPARSE_DATA_INVALID); + + InitConstString(TestString, L"..\\anyOtherContent"); + Status = pFsRtlRemoveDotsFromPath(TestString.Buffer, TestString.Length, &TestString.Length); + ok_eq_hex(Status, STATUS_IO_REPARSE_DATA_INVALID); + + InitConstString(TestString, L"\\\\.."); + Status = pFsRtlRemoveDotsFromPath(TestString.Buffer, TestString.Length, &TestString.Length); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_wstr(TestString.Buffer, L"\\"); + + InitConstString(TestString, L"\\dir1\\dir2\\..\\dir3\\.\\file.txt"); + Status = pFsRtlRemoveDotsFromPath(TestString.Buffer, TestString.Length, &TestString.Length); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_wstr(TestString.Buffer, L"\\dir1\\dir3\\file.txt"); +} + Propchange: trunk/rostests/kmtests/novp_fsrtl/FsRtlRemoveDotsFromPath.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 9 months

[zguo] 71045: Last rapps sync patch for rapps_new. Sync by Mark Jensen. Patch by toe_head2001. CORE-10986

by zguo＠svn.reactos.org

Author: zguo Date: Fri Mar 25 02:14:36 2016 New Revision: 71045 URL: http://svn.reactos.org/svn/reactos?rev=71045&view=rev Log: Last rapps sync patch for rapps_new. Sync by Mark Jensen. Patch by toe_head2001. CORE-10986 Modified: trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc trunk/reactos/base/applications/rapps_new/lang/de-DE.rc trunk/reactos/base/applications/rapps_new/lang/en-US.rc trunk/reactos/base/applications/rapps_new/lang/es-ES.rc trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc trunk/reactos/base/applications/rapps_new/lang/he-IL.rc trunk/reactos/base/applications/rapps_new/lang/it-IT.rc trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc trunk/reactos/base/applications/rapps_new/lang/no-NO.rc trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc trunk/reactos/base/applications/rapps_new/loaddlg.cpp trunk/reactos/base/applications/rapps_new/resource.h Modified: trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -204,4 +204,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -205,4 +205,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/de-DE.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "ÃberprÃ¼fung des SSL-Zertifikats fehlgeschlagen." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/en-US.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/es-ES.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -1,5 +1,5 @@ /* Spanish Language resource file. - * Translated by: ?? and Ismael Ferreras Morezuelas <2014-11-07> */ + * Translated by: ?? and Ismael Ferreras Morezuelas (Swyter) <2014-11-07> */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -203,4 +203,6 @@ IDS_CERT_DOES_NOT_MATCH "Ha fallado la comprobaciÃ³n del certificado SSL." IDS_INTEG_CHECK_TITLE "Verificando integridad del paquete..." IDS_INTEG_CHECK_FAIL "El paquete no ha pasado la comprobaciÃ³n de integridad, puede haber sido alterado o estar corrupto. No se recomienda ejecutarlo." -END + IDS_INTERRUPTED_DOWNLOAD "Se ha interrumpido la descarga por un error de red. Comprueba la conexiÃ³n a Internet." + IDS_UNABLE_TO_WRITE "No se ha podido escribir en el disco duro, es posible que no quede espacio libre." +END Modified: trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "La vÃ©rification du certificat SSL a Ã©chouÃ©." IDS_INTEG_CHECK_TITLE "VÃ©rification de l'intÃ©gritÃ© du paquet..." IDS_INTEG_CHECK_FAIL "Le contrÃ´le d'intÃ©gritÃ© du paquet a Ã©chouÃ©, il se peut qu'il ait Ã©tÃ© corrompu ou altÃ©rÃ© au cours du tÃ©lÃ©chargement. L'exÃ©cution du programme n'est pas recommandÃ©e." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/he-IL.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -202,4 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/it-IT.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -197,7 +197,9 @@ IDS_INFORMATION "Informazioni" IDS_UNABLE_TO_DOWNLOAD "Impossibile scaricare il pacchetto! Indirizzo non trovato!" IDS_UNABLE_TO_REMOVE "Impossibile cancellare i dati dal registro!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." - IDS_INTEG_CHECK_TITLE "Verifying package integrity..." - IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_CERT_DOES_NOT_MATCH "Verifica del certificato SSL fallita." + IDS_INTEG_CHECK_TITLE "Verifica integrità pacchetto..." + IDS_INTEG_CHECK_FAIL "Il pacchetto non ha superato il controllo di integrità, potrebbe essere stato danneggiato o manomesso durante lo scaricamento. L'esecuzione del software non è raccomandata." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/no-NO.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -200,4 +200,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -208,4 +208,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -202,4 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -206,4 +206,6 @@ IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eÈuat." IDS_INTEG_CHECK_TITLE "Se verificÄ integritatea pachetuluiâ¦" IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandatÄ." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -23,7 +23,7 @@ POPUP "Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN MENUITEM "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ\tF1", ID_HELP, GRAYED - MENUITEM "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ", ID_ABOUT + MENUITEM "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...", ID_ABOUT END END @@ -66,12 +66,12 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Ð&ÑÐ±ÑÐ°ÑÑ", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Ð£Ð´Ð°Ð»ÑÑÑ Ð¸Ð½ÑÑÐ°Ð»Ð»ÑÑÐ¾ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼ Ð¿Ð¾ÑÐ»Ðµ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 76 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + GROUPBOX "ÐÑÐ¾ÐºÑÐ¸", -1, 4, 116, 240, 76 + CONTROL "Ð¡Ð¸ÑÑÐµÐ¼Ð½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿ÑÐ¾ÐºÑÐ¸", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "ÐÐµÐ· Ð¿ÑÐ¾ÐºÑÐ¸", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "ÐÑÐ¾ÐºÑÐ¸", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 175, 64, 10 + LTEXT "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 @@ -141,7 +141,7 @@ IDS_INFO_UPDATEINFO "\nÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾Ð± Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸ÑÑ: " IDS_INFO_INFOABOUT "\nÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ: " IDS_INFO_COMMENTS "\nÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸: " - IDS_INFO_INSTLOCATION "\nÐ£ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð²: " + IDS_INFO_INSTLOCATION "\nÐÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸: " IDS_INFO_INSTALLSRC "\nÐÑÑÐ¾ÑÐ½Ð¸Ðº ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸: " IDS_INFO_UNINSTALLSTR "\nÐ¡ÑÑÐ¾ÐºÐ° Ð´Ð»Ñ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ: " IDS_INFO_MODIFYPATH "\nÐ¡ÑÑÐ¾ÐºÐ° Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ: " @@ -192,12 +192,14 @@ IDS_UPDATES "ÐÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ" IDS_APPLICATIONS "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ" IDS_CHOOSE_FOLDER_TEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¿Ð°Ð¿ÐºÑ, ÐºÐ¾ÑÐ¾ÑÐ°Ñ Ð±ÑÐ´ÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑÑÑ Ð´Ð»Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼:" - IDS_CHOOSE_FOLDER_ERROR "ÐÑ ÑÐºÐ°Ð·Ð°Ð»Ð¸ Ð½ÐµÑÑÑÐµÑÑÐ²ÑÑÑÑÑ Ð¿Ð°Ð¿ÐºÑ!" + IDS_CHOOSE_FOLDER_ERROR "Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð°Ñ Ð²Ð°Ð¼Ð¸ Ð¿Ð°Ð¿ÐºÐ° Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ. Ð¡Ð¾Ð·Ð´Ð°ÑÑ?" IDS_APP_REG_REMOVE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¾Ð± ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð· ÑÐµÐµÑÑÑÐ°?" IDS_INFORMATION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐºÐ°ÑÐ°ÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ! ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð°Ð´ÑÐµÑ!" IDS_UNABLE_TO_REMOVE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð· ÑÐµÐµÑÑÑÐ°!" IDS_CERT_DOES_NOT_MATCH "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ SSL ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°." IDS_INTEG_CHECK_TITLE "ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ..." IDS_INTEG_CHECK_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¿ÑÐ¾ÑÐ»Ð¾ Ð¿ÑÐ¾Ð²ÐµÑÐºÑ ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð½Ð¾ Ð±ÑÐ»Ð¾ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð¾ Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¼ÐµÐ½ÐµÐ½Ð¾. ÐÐ°Ð¿ÑÑÐº Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -205,4 +205,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -204,4 +204,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -207,4 +207,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -202,4 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL onay belgesi doÄrulamasÄ± baÅarÄ±sÄ±z." IDS_INTEG_CHECK_TITLE "Paket bÃ¼tÃ¼nlÃ¼ÄÃ¼ doÄrulanÄ±yor..." IDS_INTEG_CHECK_FAIL "Paket bÃ¼tÃ¼nlÃ¼k denetimini geÃ§medi, bozulmuÅ veyÃ¢ indirme esnÃ¢sÄ±nda oynanmÄ±Å olabilir. YazÄ±lÄ±mÄ± Ã§alÄ±ÅtÄ±rmak Ã¶nerilmez." -END + IDS_INTERRUPTED_DOWNLOAD "Ä°ndirme kesildi. UmÃ»mÃ® AÄ baÄlantÄ±nÄ±zÄ± denetleyiniz." + IDS_UNABLE_TO_WRITE "Diske yazÄ±lamÄ±yor. Disk dolu olabilir." +END Modified: trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -208,4 +208,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -202,4 +202,6 @@ IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -68,12 +68,12 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "é¸æ(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "å¨å®è£å®ç¨å¼å¾åªé¤å®è£ç¨å¼(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 76 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + GROUPBOX "ä»£ç", -1, 4, 116, 240, 76 + CONTROL "ç³»çµ±ä»£çè¨ç½®", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "ç´æ¥ (ç¡ä»£ç)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "ä»£ç", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 175, 64, 10 + LTEXT "æ²æä»£ç", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "é è¨", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 PUSHBUTTON "ç¢ºå®", IDOK, 116, 195, 60, 14 @@ -197,9 +197,11 @@ IDS_CHOOSE_FOLDER_ERROR "æ¨é¸æçè³æå¤¾ä¸åå¨ãåµå»ºåï¼" IDS_APP_REG_REMOVE "æ¨ç¢ºå®è¦å¾ç»éæªåªé¤è©²ç¨å¼çè³æåï¼" IDS_INFORMATION "è³è¨" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD "ç¡æ³ä¸è¼å!æ¾ä¸å°çä½å!" IDS_UNABLE_TO_REMOVE "ç¡æ³å¾ç»éæªåªé¤è©²ç¨å¼çè³æï¼" IDS_CERT_DOES_NOT_MATCH "SSL æèé©èå¤±æã" IDS_INTEG_CHECK_TITLE "é©èå¥è£è»é«çå®æ´æ§..." IDS_INTEG_CHECK_FAIL "åæ²æééå®æ´æ§æª¢æ¥ï¼å®å¯è½å·²æå£ï¼æèå¨ä¸è¼éç¨ä¸ç¯¡æ¹ãå»ºè°æ¨ä¸è¦éè¡è©²è»é«ã" -END + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." +END Modified: trunk/reactos/base/applications/rapps_new/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/loaddlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/loaddlg.cpp [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -413,8 +413,26 @@ do { - if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) goto end; - if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) goto end; + if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_INTERRUPTED_DOWNLOAD, szMsgText, _countof(szMsgText))) + goto end; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } + if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_UNABLE_TO_WRITE, szMsgText, _countof(szMsgText))) + goto end; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } dwCurrentBytesRead += dwBytesRead; dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, AppInfo->szUrlDownload); } Modified: trunk/reactos/base/applications/rapps_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/resource.h [iso-8859-1] Fri Mar 25 02:14:36 2016 @@ -99,6 +99,8 @@ #define IDS_CERT_DOES_NOT_MATCH 120 #define IDS_INTEG_CHECK_TITLE 121 #define IDS_INTEG_CHECK_FAIL 122 +#define IDS_INTERRUPTED_DOWNLOAD 123 +#define IDS_UNABLE_TO_WRITE 124 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200

8 years, 9 months

[zguo] 71044: Additional rapps sync involving SSL certs. Porting done by Mark Jensen. Original code from Ismael Ferreras Morezuelas. CORE-10986

by zguo＠svn.reactos.org

Author: zguo Date: Fri Mar 25 02:10:08 2016 New Revision: 71044 URL: http://svn.reactos.org/svn/reactos?rev=71044&view=rev Log: Additional rapps sync involving SSL certs. Porting done by Mark Jensen. Original code from Ismael Ferreras Morezuelas. CORE-10986 Modified: trunk/reactos/base/applications/rapps_new/CMakeLists.txt trunk/reactos/base/applications/rapps_new/loaddlg.cpp trunk/reactos/base/applications/rapps_new/rapps.h Modified: trunk/reactos/base/applications/rapps_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/CMakeLists.txt [iso-8859-1] Fri Mar 25 02:10:08 2016 @@ -18,6 +18,7 @@ winmain.cpp rapps.h) +add_definitions(-DUSE_CERT_PINNING) file(GLOB_RECURSE rapps_new_rc_deps res/*.*) add_rc_deps(rapps.rc ${rapps_new_rc_deps}) add_executable(rapps_new ${SOURCE} rapps.rc) Modified: trunk/reactos/base/applications/rapps_new/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/loaddlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/loaddlg.cpp [iso-8859-1] Fri Mar 25 02:10:08 2016 @@ -6,6 +6,7 @@ * Copyright 2004 Mike McCormack (for CodeWeavers) * Copyright 2005 Ge van Geldorp (gvg(a)reactos.org) * Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) + * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) */ /* * Based on Wine dlls/shdocvw/shdocvw_main.c @@ -34,6 +35,7 @@ #include <atlcom.h> #include <wininet.h> #include <shellutils.h> +#include <windowsx.h> static PAPPLICATION_INFO AppInfo; @@ -43,6 +45,9 @@ { HWND m_hDialog; PBOOL m_pbCancelled; + BOOL m_UrlHasBeenCopied; + WCHAR m_ProgressText[MAX_PATH]; + public: ~CDownloadDialog() @@ -54,6 +59,7 @@ { m_hDialog = Dlg; m_pbCancelled = pbCancelled; + m_UrlHasBeenCopied = FALSE; return S_OK; } @@ -84,21 +90,55 @@ { HWND Item; LONG r; - WCHAR OldText[100]; Item = GetDlgItem(m_hDialog, IDC_DOWNLOAD_PROGRESS); if (Item && ulProgressMax) { - SendMessageW(Item, PBM_SETPOS, MulDiv(ulProgress, 100, ulProgressMax), 0); + WCHAR szProgress[100]; + WCHAR szProgressMax[100]; + UINT uiPercentage = ((ULONGLONG)ulProgress * 100) / ulProgressMax; + + /* send the current progress to the progress bar */ + SendMessageW(Item, PBM_SETPOS, uiPercentage, 0); + + /* format the bits and bytes into pretty and accesible units... */ + StrFormatByteSizeW(ulProgress, szProgress, _countof(szProgress)); + StrFormatByteSizeW(ulProgressMax, szProgressMax, _countof(szProgressMax)); + + /* ...and post all of it to our subclassed progress bar text subroutine */ + StringCbPrintfW(m_ProgressText, + sizeof(m_ProgressText), + L"%u%% \x2014 %ls / %ls", + uiPercentage, + szProgress, + szProgressMax); + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)m_ProgressText); } Item = GetDlgItem(m_hDialog, IDC_DOWNLOAD_STATUS); - if (Item && szStatusText) - { - SendMessageW(Item, WM_GETTEXT, sizeof(OldText) / sizeof(OldText[0]), (LPARAM) OldText); - if (sizeof(OldText) / sizeof(OldText[0]) - 1 <= wcslen(OldText) || 0 != wcscmp(OldText, szStatusText)) - { - SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) szStatusText); + if (Item && szStatusText && wcslen(szStatusText) > 0 && m_UrlHasBeenCopied == FALSE) + { + DWORD len = wcslen(szStatusText) + 1; + PWSTR buf = (PWSTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + + if (buf) + { + /* beautify our url for display purposes */ + InternetCanonicalizeUrl(szStatusText, buf, &len, ICU_DECODE | ICU_NO_ENCODE); + } + else + { + /* just use the original */ + buf = (PWSTR)szStatusText; + } + + /* paste it into our dialog and don't do it again in this instance */ + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)buf); + m_UrlHasBeenCopied = TRUE; + + if (buf != szStatusText) + { + HeapFree(GetProcessHeap(), 0, buf); } } @@ -154,13 +194,67 @@ return ShellObjectCreatorInit<CDownloadDialog>(Dlg, pbCancelled, riid, ppv); } +#ifdef USE_CERT_PINNING +static BOOL CertIsValid(HINTERNET hInternet, LPWSTR lpszHostName) +{ + HINTERNET hConnect; + HINTERNET hRequest; + DWORD certInfoLength; + BOOL Ret = FALSE; + INTERNET_CERTIFICATE_INFOW certInfo; + + hConnect = InternetConnectW(hInternet, lpszHostName, INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); + if (hConnect) + { + hRequest = HttpOpenRequestW(hConnect, L"HEAD", NULL, NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); + if (hRequest != NULL) + { + Ret = HttpSendRequestW(hRequest, L"", 0, NULL, 0); + if (Ret) + { + certInfoLength = sizeof(INTERNET_CERTIFICATE_INFOW); + Ret = InternetQueryOptionW(hRequest, + INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, + &certInfo, + &certInfoLength); + if (Ret) + { + if (certInfo.lpszEncryptionAlgName) + LocalFree(certInfo.lpszEncryptionAlgName); + if (certInfo.lpszIssuerInfo) + { + if (strcmp((LPSTR)certInfo.lpszIssuerInfo, CERT_ISSUER_INFO) != 0) + Ret = FALSE; + LocalFree(certInfo.lpszIssuerInfo); + } + if (certInfo.lpszProtocolName) + LocalFree(certInfo.lpszProtocolName); + if (certInfo.lpszSignatureAlgName) + LocalFree(certInfo.lpszSignatureAlgName); + if (certInfo.lpszSubjectInfo) + { + if (strcmp((LPSTR)certInfo.lpszSubjectInfo, CERT_SUBJECT_INFO) != 0) + Ret = FALSE; + LocalFree(certInfo.lpszSubjectInfo); + } + } + } + InternetCloseHandle(hRequest); + } + InternetCloseHandle(hConnect); + } + return Ret; +} +#endif + + static DWORD WINAPI ThreadFunc(LPVOID Context) { CComPtr<IBindStatusCallback> dl; WCHAR path[MAX_PATH]; - LPWSTR p; + PWSTR p, q; HWND Dlg = (HWND) Context; ULONG dwContentLen, dwBytesWritten, dwBytesRead, dwStatus; ULONG dwCurrentBytesRead = 0; @@ -174,36 +268,48 @@ unsigned char lpBuffer[4096]; PCWSTR lpszAgent = L"RApps/1.0"; URL_COMPONENTS urlComponents; - size_t urlLength; - - /* built the path for the download */ + size_t urlLength, filenameLength; + + /* build the path for the download */ p = wcsrchr(AppInfo->szUrlDownload, L'/'); - + q = wcsrchr(AppInfo->szUrlDownload, L'?'); + + /* do we have a final slash separator? */ if (!p) goto end; - if (wcscmp(AppInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) - { - bCab = TRUE; - if (!GetStorageDirectory(path, sizeof(path) / sizeof(path[0]))) - goto end; - } - else - { - if (FAILED(StringCbCopyW(path, sizeof(path), SettingsInfo.szDownloadDir))) - goto end; - } - - + /* prepare the tentative length of the filename, maybe we've to remove part of it later on */ + filenameLength = wcslen(p) * sizeof(WCHAR); + + /* do we have query arguments in the target URL after the filename? account for them + (e.g. https://example.org/myfile.exe?no_adware_plz) */ + if (q && q > p && (q - p) > 0) + filenameLength -= wcslen(q - 1) * sizeof(WCHAR); + + /* is this URL an update package for RAPPS? if so store it in a different place */ + if (wcscmp(AppInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) + { + bCab = TRUE; + if (!GetStorageDirectory(path, _countof(path))) + goto end; + } + else + { + if (FAILED(StringCbCopyW(path, sizeof(path), SettingsInfo.szDownloadDir))) + goto end; + } + + /* is the path valid? can we access it? */ if (GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES) { if (!CreateDirectoryW(path, NULL)) goto end; } + /* append a \ to the provided file system path, and the filename portion from the URL after that */ if (FAILED(StringCbCatW(path, sizeof(path), L"\\"))) goto end; - if (FAILED(StringCbCatW(path, sizeof(path), p + 1))) + if (FAILED(StringCbCatNW(path, sizeof(path), p + 1, filenameLength))) goto end; if (!bCab && AppInfo->szSHA1[0] != 0 && GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) @@ -220,6 +326,7 @@ if (dl == NULL) goto end; + /* FIXME: this should just be using the system-wide proxy settings */ switch(SettingsInfo.Proxy) { case 0: /* preconfig */ @@ -264,10 +371,13 @@ if(FAILED(StringCbLengthW(AppInfo->szUrlDownload, sizeof(AppInfo->szUrlDownload), &urlLength))) goto end; - - urlComponents.dwSchemeLength = urlLength*sizeof(WCHAR); - urlComponents.lpszScheme = (PWSTR)malloc(urlComponents.dwSchemeLength); - + + urlLength /= sizeof(WCHAR); + urlComponents.dwSchemeLength = urlLength + 1; + urlComponents.lpszScheme = (LPWSTR)malloc(urlComponents.dwSchemeLength * sizeof(WCHAR)); + urlComponents.dwHostNameLength = urlLength + 1; + urlComponents.lpszHostName = (LPWSTR)malloc(urlComponents.dwHostNameLength * sizeof(WCHAR)); + if(!InternetCrackUrlW(AppInfo->szUrlDownload, urlLength+1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) goto end; @@ -277,7 +387,24 @@ if(urlComponents.nScheme == INTERNET_SCHEME_FTP) dwContentLen = FtpGetFileSize(hFile, &dwStatus); +#ifdef USE_CERT_PINNING + /* are we using HTTPS to download the RAPPS update package? check if the certificate is original */ + if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && + (wcscmp(AppInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) && + (!CertIsValid(hOpen, urlComponents.lpszHostName))) + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_CERT_DOES_NOT_MATCH, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + goto end; + + MessageBoxW(Dlg, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } +#endif + free(urlComponents.lpszScheme); + free(urlComponents.lpszHostName); hOut = CreateFileW(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); @@ -291,7 +418,7 @@ dwCurrentBytesRead += dwBytesRead; dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, AppInfo->szUrlDownload); } - while (dwBytesRead); + while (dwBytesRead && !bCancelled); CloseHandle(hOut); hOut = INVALID_HANDLE_VALUE; @@ -347,15 +474,92 @@ return 0; } + +LRESULT CALLBACK +DownloadProgressProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) +{ + static WCHAR szProgressText[MAX_STR_LEN] = {0}; + + switch (uMsg) + { + case WM_SETTEXT: + { + if (lParam) + { + StringCbCopyW(szProgressText, + sizeof(szProgressText), + (PCWSTR)lParam); + } + } + + case WM_ERASEBKGND: + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hDC = BeginPaint(hWnd, &ps), hdcMem; + HBITMAP hbmMem; + HANDLE hOld; + RECT myRect; + UINT win_width, win_height; + + GetClientRect(hWnd, &myRect); + + /* grab the progress bar rect size */ + win_width = myRect.right - myRect.left; + win_height = myRect.bottom - myRect.top; + + /* create an off-screen DC for double-buffering */ + hdcMem = CreateCompatibleDC(hDC); + hbmMem = CreateCompatibleBitmap(hDC, win_width, win_height); + + hOld = SelectObject(hdcMem, hbmMem); + + /* call the original draw code and redirect it to our memory buffer */ + DefSubclassProc(hWnd, uMsg, (WPARAM)hdcMem, lParam); + + /* draw our nifty progress text over it */ + SelectFont(hdcMem, GetStockFont(DEFAULT_GUI_FONT)); + DrawShadowText(hdcMem, szProgressText, wcslen(szProgressText), + &myRect, + DT_CENTER | DT_VCENTER | DT_NOPREFIX | DT_SINGLELINE, + GetSysColor(COLOR_CAPTIONTEXT), + GetSysColor(COLOR_3DSHADOW), + 1, 1); + + /* transfer the off-screen DC to the screen */ + BitBlt(hDC, 0, 0, win_width, win_height, hdcMem, 0, 0, SRCCOPY); + + /* free the off-screen DC */ + SelectObject(hdcMem, hOld); + DeleteObject(hbmMem); + DeleteDC(hdcMem); + + EndPaint(hWnd, &ps); + return 0; + } + + /* Raymond Chen says that we should safely unsubclass all the things! + (http://blogs.msdn.com/b/oldnewthing/archive/2003/11/11/55653.aspx) */ + case WM_NCDESTROY: + { + ZeroMemory(szProgressText, sizeof(szProgressText)); + RemoveWindowSubclass(hWnd, DownloadProgressProc, uIdSubclass); + } + + default: + return DefSubclassProc(hWnd, uMsg, wParam, lParam); + } +} + static INT_PTR CALLBACK -DownloadDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) +DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { HANDLE Thread; DWORD ThreadId; HWND Item; - switch (Msg) + switch (uMsg) { case WM_INITDIALOG: { @@ -374,12 +578,21 @@ Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS); if (Item) { + /* initialize the default values for our nifty progress bar + and subclass it so that it learns to print a status text */ SendMessageW(Item, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); SendMessageW(Item, PBM_SETPOS, 0, 0); - } + + SetWindowSubclass(Item, DownloadProgressProc, 0, 0); + } + + /* add a neat placeholder until the download URL is retrieved */ + Item = GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS); + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)L"\x2022 \x2022 \x2022"); Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId); - if (!Thread) return FALSE; + if (!Thread) + return FALSE; CloseHandle(Thread); return TRUE; } Modified: trunk/reactos/base/applications/rapps_new/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/rapps.h [iso-8859-1] Fri Mar 25 02:10:08 2016 @@ -28,8 +28,12 @@ #include "resource.h" -/* FIXME: this should be downloaded by HTTPS once is supported */ -#define APPLICATION_DATABASE_URL L"http://svn.reactos.org/packages/rappmgr.cab" +#ifdef USE_CERT_PINNING + #define CERT_ISSUER_INFO "BE\r\nGlobalSign nv-sa\r\nGlobalSign Domain Validation CA - SHA256 - G2" + #define CERT_SUBJECT_INFO "Domain Control Validated\r\n*.reactos.org" +#endif + +#define APPLICATION_DATABASE_URL L"https://svn.reactos.org/packages/rappmgr.cab" #define SPLIT_WIDTH 4 #define MAX_STR_LEN 256

8 years, 9 months

[zguo] 71043: Sync rapps_new with rapps. Porting done by Mark Jensen. Original code from Ismael Ferreras Morezuelas. CORE-10986

by zguo＠svn.reactos.org

Author: zguo Date: Thu Mar 24 23:03:35 2016 New Revision: 71043 URL: http://svn.reactos.org/svn/reactos?rev=71043&view=rev Log: Sync rapps_new with rapps. Porting done by Mark Jensen. Original code from Ismael Ferreras Morezuelas. CORE-10986 Modified: trunk/reactos/base/applications/rapps_new/loaddlg.cpp Modified: trunk/reactos/base/applications/rapps_new/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/loaddlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/loaddlg.cpp [iso-8859-1] Thu Mar 24 23:03:35 2016 @@ -36,7 +36,6 @@ #include <shellutils.h> static PAPPLICATION_INFO AppInfo; -static HICON hIcon = NULL; class CDownloadDialog : public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -359,12 +358,16 @@ switch (Msg) { case WM_INITDIALOG: - - hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); - if (hIcon) + { + HICON hIconSm = NULL, hIconBg = NULL; + + hIconBg = (HICON)GetClassLongPtr(hMainWnd, GCLP_HICON); + hIconSm = (HICON)GetClassLongPtr(hMainWnd, GCLP_HICONSM); + + if (hIconBg && hIconSm) { - SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIcon); - SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIcon); + SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIconBg); + SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSm); } SetWindowLongPtrW(Dlg, GWLP_USERDATA, 0); @@ -379,7 +382,7 @@ if (!Thread) return FALSE; CloseHandle(Thread); return TRUE; - + } case WM_COMMAND: if (wParam == IDCANCEL) { @@ -389,7 +392,6 @@ return FALSE; case WM_CLOSE: - if (hIcon) DestroyIcon(hIcon); EndDialog(Dlg, 0); return TRUE;

8 years, 9 months

[akhaldi] 71042: [HIVESFT] Fix Santiago timezone in ReactOS time settings. By Peter Hater. CORE-10231

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 24 18:18:30 2016 New Revision: 71042 URL: http://svn.reactos.org/svn/reactos?rev=71042&view=rev Log: [HIVESFT] Fix Santiago timezone in ReactOS time settings. By Peter Hater. CORE-10231 Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Thu Mar 24 18:18:30 2016 @@ -551,15 +551,14 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific SA Standard Time","Display",0x00000000,"(GMT-04:00) Santiago" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific SA Standard Time","Display",0x00000000,"(GMT-03:00) Santiago" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific SA Standard Time","Dlt",0x00000000,"Pacific SA Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific SA Standard Time","Std",0x00000000,"Pacific SA Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific SA Standard Time","Index",0x00010001,56 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Pacific SA Standard Time","TZI",0x00000001,\ -0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0xb4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x03,0x00,0x06,0x00,0x02,0x00,0x17,0x00,0x3b,0x00,0x3b,0x00,0xe7,0x03,\ 0x00,0x00,0x0a,0x00,0x06,0x00,0x02,0x00,0x17,0x00,0x3b,0x00,0x3b,0x00,0xe7,0x03 - HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Newfoundland Standard Time","Display",0x00000000,"(GMT-03:30) Newfoundland" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Newfoundland Standard Time","Dlt",0x00000000,"Newfoundland Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Newfoundland Standard Time","Std",0x00000000,"Newfoundland Standard Time"

8 years, 9 months

[akhaldi] 71041: [SHELL32] Do not ignore the localized name for Desktop. By Ștefan Fulea. CORE-11001

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 24 18:05:47 2016 New Revision: 71041 URL: http://svn.reactos.org/svn/reactos?rev=71041&view=rev Log: [SHELL32] Do not ignore the localized name for Desktop. By Ștefan Fulea. CORE-11001 Modified: trunk/reactos/dll/win32/shell32/res/rgs/shelldesktop.rgs Modified: trunk/reactos/dll/win32/shell32/res/rgs/shelldesktop.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/shelldesktop.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/shelldesktop.rgs [iso-8859-1] Thu Mar 24 18:05:47 2016 @@ -4,6 +4,7 @@ { ForceRemove {00021400-0000-0000-C000-000000000046} = s 'Desktop' { + val 'LocalizedString' = e '@%%SystemRoot%%\system32\SHELL32.dll,-20' InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment'

8 years, 9 months

[akhaldi] 71040: [NPFS] Add version information. By Lee Schroeder. CORE-11004

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 24 10:21:25 2016 New Revision: 71040 URL: http://svn.reactos.org/svn/reactos?rev=71040&view=rev Log: [NPFS] Add version information. By Lee Schroeder. CORE-11004 Added: trunk/reactos/drivers/filesystems/npfs/npfs.rc (with props) Modified: trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] Thu Mar 24 10:21:25 2016 @@ -22,7 +22,7 @@ writesup.c npfs.h) -add_library(npfs SHARED ${SOURCE}) +add_library(npfs SHARED ${SOURCE} npfs.rc) set_module_type(npfs kernelmodedriver) target_link_libraries(npfs ${PSEH_LIB}) add_importlibs(npfs ntoskrnl hal) Added: trunk/reactos/drivers/filesystems/npfs/npfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.rc (added) +++ trunk/reactos/drivers/filesystems/npfs/npfs.rc [iso-8859-1] Thu Mar 24 10:21:25 2016 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Named Pipe File System Driver" +#define REACTOS_STR_INTERNAL_NAME "npfs" +#define REACTOS_STR_ORIGINAL_FILENAME "npfs.sys" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/filesystems/npfs/npfs.rc ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 9 months

[hbelusca] 71039: [BTRFS] BUGBUG in fileinfo.c: 'datalen' is used but not initialized! [NTOSKRNL_VISTA] Add most of the same compile-time definitions as for ntoskrnl proper, since this static libra...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 23 21:24:28 2016 New Revision: 71039 URL: http://svn.reactos.org/svn/reactos?rev=71039&view=rev Log: [BTRFS] BUGBUG in fileinfo.c: 'datalen' is used but not initialized! [NTOSKRNL_VISTA] Add most of the same compile-time definitions as for ntoskrnl proper, since this static library can be seen as part of the kernel! Fixes MSVC build. Modified: trunk/reactos/drivers/filesystems/btrfs/fileinfo.c trunk/reactos/lib/drivers/ntoskrnl_vista/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/btrfs/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/fileinfo.c [iso-8859-1] Wed Mar 23 21:24:28 2016 @@ -1893,7 +1893,13 @@ free_traverse_ptr(&tp); return STATUS_INTERNAL_ERROR; } - + +#ifdef __REACTOS__ + // BUGBUG: FIXME!! + ERR("BUGBUG: datalen is uninitialized! Set it to zero temporarily...\n"); + datalen = 0; +#endif + if (tp.item->size < datalen) { ERR("(%llx,%x,%llx) was %u bytes, expected at least %u\n", tp.item->key.obj_id, tp.item->key.obj_type, tp.item->key.offset, tp.item->size, datalen); free_traverse_ptr(&tp); Modified: trunk/reactos/lib/drivers/ntoskrnl_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ntoskrnl_vista… ============================================================================== --- trunk/reactos/lib/drivers/ntoskrnl_vista/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ntoskrnl_vista/CMakeLists.txt [iso-8859-1] Wed Mar 23 21:24:28 2016 @@ -1,7 +1,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -D_NTSYSTEM_) list(APPEND SOURCE fsrtl.c

8 years, 9 months

[pschweitzer] 71038: [BTRFS] Add the driver to the registry and to the CDs (out of cab) Feel free to enjoy btrfs in ReactOS :-) CORE-10892

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Mar 23 20:37:55 2016 New Revision: 71038 URL: http://svn.reactos.org/svn/reactos?rev=71038&view=rev Log: [BTRFS] Add the driver to the registry and to the CDs (out of cab) Feel free to enjoy btrfs in ReactOS :-) CORE-10892 Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Mar 23 20:37:55 2016 @@ -1979,6 +1979,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","Ext3ForceWriting",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","AutoMount",0x00010001,0x00000001 +; BTRFS Filesystem driver +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","ImagePath",0x00020000,"system32\drivers\btrfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Type",0x00010001,0x00000002 + ; Filesystem Filter Manager driver HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ErrorControl",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Group",0x00000000,"Boot File System" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Wed Mar 23 20:37:55 2016 @@ -67,6 +67,7 @@ wmilib.sys=,,,,,,,,,,,,4 ksecdd.sys=,,,,,,,,,,,,4 mountmgr.sys=,,,,,,x,,,,,,4 +btrfs.sys=,,,,,,x,,,,,,4 [SystemPartitionFiles]

8 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
27
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 March 2016