Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

[reactos] 02/04: [NTOS:MM] Increment Prcb->MmDemandZeroCount while holding the Pfn lock
by Timo Kreuzer 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2eff510074aec9c843e19… commit 2eff510074aec9c843e196364f0f9b4bd7ce3d61 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Dec 27 15:09:39 2017 +0100 [NTOS:MM] Increment Prcb->MmDemandZeroCount while holding the Pfn lock --- ntoskrnl/mm/ARM3/pagfault.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index b2dd08cdda..f37fa458d2 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -669,6 +669,9 @@ MiResolveDemandZeroFault(IN PVOID Address, /* Initialize it */ MiInitializePfn(PageFrameNumber, PointerPte, TRUE); + /* Increment demand zero faults */ + KeGetCurrentPrcb()->MmDemandZeroCount++; + /* Do we have the lock? */ if (HaveLock) { @@ -679,9 +682,6 @@ MiResolveDemandZeroFault(IN PVOID Address, if (Process > HYDRA_PROCESS) Process->NumberOfPrivatePages++; } - /* Increment demand zero faults */ - InterlockedIncrement(&KeGetCurrentPrcb()->MmDemandZeroCount); - /* Zero the page if need be */ if (NeedZero) MiZeroPfn(PageFrameNumber); @@ -2297,14 +2297,14 @@ UserFault: /* Initialize the PFN entry now */ MiInitializePfn(PageFrameIndex, PointerPte, 1); - /* And we're done with the lock */ - MiReleasePfnLock(OldIrql); - /* Increment the count of pages in the process */ CurrentProcess->NumberOfPrivatePages++; /* One more demand-zero fault */ - InterlockedIncrement(&KeGetCurrentPrcb()->MmDemandZeroCount); + KeGetCurrentPrcb()->MmDemandZeroCount++; + + /* And we're done with the lock */ + MiReleasePfnLock(OldIrql); /* Fault on user PDE, or fault on user PTE? */ if (PointerPte <= MiHighestUserPte)

1 0

[reactos] 01/04: [NTOS/MM] Add Protection parameter to MiResolveDemandZeroFault
by Timo Kreuzer 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1240ed9e187fbead7fa4c… commit 1240ed9e187fbead7fa4cdd09f21430c35fb48b2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Nov 1 22:03:00 2011 +0100 [NTOS/MM] Add Protection parameter to MiResolveDemandZeroFault --- ntoskrnl/mm/ARM3/pagfault.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index 1e70cc07b9..b2dd08cdda 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -564,10 +564,12 @@ MiCopyPfn( MiReleaseSystemPtes(SysPtes, 2, SystemPteSpace); } +static NTSTATUS NTAPI MiResolveDemandZeroFault(IN PVOID Address, IN PMMPTE PointerPte, + IN ULONG Protection, IN PEPROCESS Process, IN KIRQL OldIrql) { @@ -689,7 +691,7 @@ MiResolveDemandZeroFault(IN PVOID Address, /* User fault, build a user PTE */ MI_MAKE_HARDWARE_PTE_USER(&TempPte, PointerPte, - PointerPte->u.Soft.Protection, + Protection, PageFrameNumber); } else @@ -697,7 +699,7 @@ MiResolveDemandZeroFault(IN PVOID Address, /* This is a user-mode PDE, create a kernel PTE for it */ MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, - PointerPte->u.Soft.Protection, + Protection, PageFrameNumber); } @@ -1246,6 +1248,7 @@ MiResolveProtoPteFault(IN BOOLEAN StoreInstruction, /* Resolve the demand zero fault */ Status = MiResolveDemandZeroFault(Address, PointerProtoPte, + (ULONG)TempPte.u.Soft.Protection, Process, OldIrql); ASSERT(NT_SUCCESS(Status)); @@ -1593,6 +1596,7 @@ MiDispatchFault(IN BOOLEAN StoreInstruction, // Status = MiResolveDemandZeroFault(Address, PointerPte, + (ULONG)TempPte.u.Soft.Protection, Process, MM_NOIRQL); ASSERT(KeAreAllApcsDisabled() == TRUE); @@ -2032,6 +2036,7 @@ UserFault: #if 0 /* Resolve a demand zero fault */ Status = MiResolveDemandZeroFault(PointerPpe, + PointerPxe, MM_READWRITE, CurrentProcess, MM_NOIRQL); @@ -2052,6 +2057,7 @@ UserFault: #if 0 /* Resolve a demand zero fault */ Status = MiResolveDemandZeroFault(PointerPde, + PointerPpe, MM_READWRITE, CurrentProcess, MM_NOIRQL); @@ -2061,7 +2067,7 @@ UserFault: } #endif - /* Check if the PDE is valid */ + /* Check if the PDE is invalid */ if (PointerPde->u.Hard.Valid == 0) { /* Right now, we only handle scenarios where the PDE is totally empty */ @@ -2180,6 +2186,7 @@ UserFault: /* Resolve the fault */ MiResolveDemandZeroFault(Address, PointerPte, + MM_READWRITE, CurrentProcess, MM_NOIRQL);

1 0

[reactos] 01/01: [DLL][WIN32][NEWDEV] Wrong character in the Romanian translation removed (#259)
by Bișoc George 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=699b8bf857ae4e424d1a1… commit 699b8bf857ae4e424d1a1c3dbbcba80144d3fc33 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Jan 3 21:29:44 2018 +0100 [DLL][WIN32][NEWDEV] Wrong character in the Romanian translation removed (#259) Replaced "ú" with "u". Is that letter even a thing? :D --- dll/win32/newdev/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/newdev/lang/ro-RO.rc b/dll/win32/newdev/lang/ro-RO.rc index 547271c9d5..243eb8234f 100644 --- a/dll/win32/newdev/lang/ro-RO.rc +++ b/dll/win32/newdev/lang/ro-RO.rc @@ -15,7 +15,7 @@ CAPTION "Asistent de instalare dispozitiv" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bun venit!", IDC_WELCOMETITLE, 120, 8, 195, 16 - LTEXT "Acest asistent va instala modúle-pilot pentru dispozitivul:", IDC_STATIC, 120, 21, 195, 16 + LTEXT "Acest asistent va instala module-pilot pentru dispozitivul:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Apăsați „Înainte” pentru a continua.", IDC_STATIC, 120, 169, 195, 16 LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 36, 147, 12 LTEXT "AVERTISMENT: INSTALAREA UNUI DISPOZITIV NEOBIȘNUIT VĂ POATE SCOATE DIN FUNCȚIUNE CALCULATORUL!", IDC_STATIC, 120, 59, 195, 16

1 0

[reactos] 01/01: [SYSSETUP] Add marquee progress bar to show setup is alive (#262)
by Stanislav Motylkov 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6fa16d791a980afcddf1d… commit 6fa16d791a980afcddf1d9e8f46690139a1b8308 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Jan 3 23:24:26 2018 +0300 [SYSSETUP] Add marquee progress bar to show setup is alive (#262) CORE-14163 #resolve --- dll/win32/syssetup/install.c | 8 +++++++- dll/win32/syssetup/lang/bg-BG.rc | 3 ++- dll/win32/syssetup/lang/cs-CZ.rc | 3 ++- dll/win32/syssetup/lang/da-DK.rc | 3 ++- dll/win32/syssetup/lang/de-DE.rc | 3 ++- dll/win32/syssetup/lang/el-GR.rc | 3 ++- dll/win32/syssetup/lang/en-US.rc | 3 ++- dll/win32/syssetup/lang/es-ES.rc | 3 ++- dll/win32/syssetup/lang/et-EE.rc | 3 ++- dll/win32/syssetup/lang/fi-FI.rc | 3 ++- dll/win32/syssetup/lang/fr-FR.rc | 3 ++- dll/win32/syssetup/lang/he-IL.rc | 3 ++- dll/win32/syssetup/lang/hu-HU.rc | 3 ++- dll/win32/syssetup/lang/id-ID.rc | 3 ++- dll/win32/syssetup/lang/it-IT.rc | 3 ++- dll/win32/syssetup/lang/ja-JP.rc | 3 ++- dll/win32/syssetup/lang/lt-LT.rc | 3 ++- dll/win32/syssetup/lang/nl-NL.rc | 3 ++- dll/win32/syssetup/lang/no-NO.rc | 3 ++- dll/win32/syssetup/lang/pl-PL.rc | 3 ++- dll/win32/syssetup/lang/pt-BR.rc | 3 ++- dll/win32/syssetup/lang/ro-RO.rc | 3 ++- dll/win32/syssetup/lang/ru-RU.rc | 3 ++- dll/win32/syssetup/lang/sk-SK.rc | 3 ++- dll/win32/syssetup/lang/sq-AL.rc | 3 ++- dll/win32/syssetup/lang/sv-SE.rc | 3 ++- dll/win32/syssetup/lang/th-TH.rc | 3 ++- dll/win32/syssetup/lang/tr-TR.rc | 3 ++- dll/win32/syssetup/lang/uk-UA.rc | 3 ++- dll/win32/syssetup/lang/zh-CN.rc | 3 ++- dll/win32/syssetup/lang/zh-TW.rc | 3 ++- dll/win32/syssetup/resource.h | 1 + 32 files changed, 68 insertions(+), 31 deletions(-) diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index 8c4ab5e591..e5b5530c43 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -553,7 +553,7 @@ ShowStatusMessageThread( IN LPVOID lpParameter) { HWND *phWnd = (HWND *)lpParameter; - HWND hWnd; + HWND hWnd, hItem; MSG Msg; hWnd = CreateDialogParam(hDllInstance, @@ -567,6 +567,12 @@ ShowStatusMessageThread( ShowWindow(hWnd, SW_SHOW); + hItem = GetDlgItem(hWnd, IDC_STATUSPROGRESS); + if (hItem) + { + PostMessage(hItem, PBM_SETMARQUEE, TRUE, 40); + } + /* Message loop for the Status window */ while (GetMessage(&Msg, NULL, 0, 0)) { diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index d4bc4611cc..665bf8e6ad 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "Добре", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Почакайте..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 6b0fe10173..e144877ce9 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -128,12 +128,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Prosím čekejte..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 3efb56e18a..b31e5e0f03 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 7974584736..5102afa80c 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "Schließen", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bitte warten..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 9000afafa2..25c89a7bcc 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Παρακαλώ περιμένετε..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index b1def1ab8d..a2459de107 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 3feb049b72..1820b59d2b 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -123,12 +123,13 @@ BEGIN DEFPUSHBUTTON "Aceptar", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Espere un momento..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index c070d7f8fd..8782113c6a 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "Olgu", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Palun oota..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index eb83a8c750..5fc3c8af13 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index 58b4b14630..fbd3f76383 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Veuillez patienter..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index b70acb602d..ec7b1b5ea4 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "אישור", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "נא להמתין..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 5475121af4..4e7d7b12f3 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 2a148a5b44..02cda34d17 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index acc6aba041..5fb089f248 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Attendere ..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index be6393c339..33c5a1187e 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "お待ち下さい..." FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 84d32f0c4d..dc5b9cf893 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index df52fcd0b6..a5f15c97c7 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index cd93cab73a..2e83eb0ca9 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Vennligst vent..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index ecde8acc43..8f3cf50f2f 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Proszę czekać..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 4592819aa1..7749c2f928 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Por favor aguarde..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index a79bf6761a..ffe2b013db 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -131,12 +131,13 @@ BEGIN DEFPUSHBUTTON "Î&nchide", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Așteptați…" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 34f9b01d3c..2de6f3d147 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -124,12 +124,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Пожалуйста подождите..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index a9ced2b38e..f5563c56f8 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -128,12 +128,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Počkajte, prosím ..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index e5639e4bf3..e5e20ec84d 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Ju Lutem prisni..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 3466d1c586..e583d35a33 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 71ca7380e7..de15cf770f 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index c590a06518..fdf95ea91f 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -124,12 +124,13 @@ BEGIN DEFPUSHBUTTON "Tamam", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Lütfen bekleyiniz..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index dfcc738409..558b1ef63b 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -130,12 +130,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Зачекайте..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 3d82805101..51fa6289f4 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "确定", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "请等待..." FONT 9, "宋体", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 01d22d839b..bfa21a5d7a 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -124,12 +124,13 @@ BEGIN DEFPUSHBUTTON "確定", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "請等待..." FONT 9, "新細明體", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index 105a31b222..90d931330e 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -77,6 +77,7 @@ #define IDD_STATUSWINDOW_DLG 2200 #define IDC_STATUSLABEL 2201 +#define IDC_STATUSPROGRESS 2202 #define IDS_ACKTITLE 3010 #define IDS_ACKSUBTITLE 3011

1 0

[reactos] 02/02: [RAPPS] Romanian translation update
by Bișoc George 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71899c4290799b1b4a229… commit 71899c4290799b1b4a229ac1fb5227181219863a Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Jan 3 10:25:25 2018 +0100 [RAPPS] Romanian translation update Quick update covering the latest commit - CORE-13789. --- base/applications/rapps/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index d13d72a2f1..7fa8a95972 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -219,7 +219,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Eșec la scrierea pe disc. Una din cauze poate fi atingerea limitei de capacitate." IDS_SELECT_ALL "Selectează/Deselectează Toate" IDS_INSTALL_SELECTED "Instalează selecționate" - IDS_SELECTEDFORINST "Selected for installation" + IDS_SELECTEDFORINST "Selectate pentru instalare" END STRINGTABLE

1 0

[reactos] 01/02: [RAPPS] Italian translation update
by Bișoc George 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e1f4184fe2cc92440541… commit 7e1f4184fe2cc92440541e65eeef35756a7eceec Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Jan 3 10:23:51 2018 +0100 [RAPPS] Italian translation update Quick-update covering the latest commit - CORE-13789. --- base/applications/rapps/lang/it-IT.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 9c7008dade..739f9312cc 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -210,7 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Impossibile scrivere su disco: lo spazio libero potrebbe essere esaurito." IDS_SELECT_ALL "Seleziona/Deseleziona Tutte" IDS_INSTALL_SELECTED "Installa le selezionate" - IDS_SELECTEDFORINST "Selected for installation" + IDS_SELECTEDFORINST "Selezionate per l'installazione" END STRINGTABLE

1 0

[reactos] 01/01: [RAPPS] update translation de-DE.rc for CORE-13789
by Joachim Henze 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1522d1cf67c283b4df6ca… commit 1522d1cf67c283b4df6ca94c1468851e507fa543 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jan 3 09:48:31 2018 +0100 [RAPPS] update translation de-DE.rc for CORE-13789 --- base/applications/rapps/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index 4182c8c1a4..dc99a4584d 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -210,7 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Schreibfehler. Prüfen Sie die Kapazität des Datenträgers!" IDS_SELECT_ALL "Alle/Keine" IDS_INSTALL_SELECTED "Ausgewählte Installieren" - IDS_SELECTEDFORINST "Selected for installation" + IDS_SELECTEDFORINST "Zur Installation ausgewählt" END STRINGTABLE

1 0

[reactos] 01/01: [RAPPS] Make selection global
by Alexander Shaposhnikov 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58f8fa9ec89c9f7ae2ffd… commit 58f8fa9ec89c9f7ae2ffde7870d17fd4313ab21d Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Tue Jan 2 22:45:59 2018 +0200 [RAPPS] Make selection global - Added a 'Selected for installation' category that shows what was selected. Selection is now kept between categories. - New string is added to resources. ru-RU.rc and uk-UA.rc strings are translated. CORE-13789 --- base/applications/rapps/available.cpp | 42 ++++++++++++++++++----------- base/applications/rapps/gui.cpp | 40 ++++++++++++++++++++++++--- base/applications/rapps/include/available.h | 2 ++ base/applications/rapps/include/defines.h | 3 ++- base/applications/rapps/include/resource.h | 2 ++ base/applications/rapps/lang/bg-BG.rc | 1 + base/applications/rapps/lang/cs-CZ.rc | 1 + base/applications/rapps/lang/de-DE.rc | 1 + base/applications/rapps/lang/en-US.rc | 1 + base/applications/rapps/lang/es-ES.rc | 1 + base/applications/rapps/lang/fr-FR.rc | 1 + base/applications/rapps/lang/he-IL.rc | 1 + base/applications/rapps/lang/it-IT.rc | 1 + base/applications/rapps/lang/ja-JP.rc | 1 + base/applications/rapps/lang/no-NO.rc | 1 + base/applications/rapps/lang/pl-PL.rc | 1 + base/applications/rapps/lang/pt-BR.rc | 1 + base/applications/rapps/lang/ro-RO.rc | 1 + base/applications/rapps/lang/ru-RU.rc | 1 + base/applications/rapps/lang/sk-SK.rc | 1 + base/applications/rapps/lang/sq-AL.rc | 1 + base/applications/rapps/lang/sv-SE.rc | 1 + base/applications/rapps/lang/tr-TR.rc | 1 + base/applications/rapps/lang/uk-UA.rc | 1 + base/applications/rapps/lang/zh-CN.rc | 1 + base/applications/rapps/lang/zh-TW.rc | 1 + base/applications/rapps/rapps.rc | 1 + 27 files changed, 92 insertions(+), 19 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index b396e1dbb7..19101cef14 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -19,12 +19,9 @@ // CAvailableApplicationInfo CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam) - : m_IsInstalled(FALSE), m_HasLanguageInfo(FALSE), m_HasInstalledVersion(FALSE) + : m_IsSelected(FALSE), m_LicenseType(LICENSE_NONE), m_sFileName(sFileNameParam), + m_IsInstalled(FALSE), m_HasLanguageInfo(FALSE), m_HasInstalledVersion(FALSE) { - m_LicenseType = LICENSE_NONE; - - m_sFileName = sFileNameParam; - RetrieveGeneralInfo(); } @@ -355,17 +352,15 @@ BOOL CAvailableApps::Enum(INT EnumType, AVAILENUMPROC lpEnumProc) m_InfoList.AddTail(Info); skip_if_cached: - if (Info->m_Category == FALSE) - continue; - - if (EnumType != Info->m_Category && EnumType != ENUM_ALL_AVAILABLE) - continue; - - Info->RefreshAppInfo(); - - if (lpEnumProc) - lpEnumProc(Info, m_Strings.szAppsPath.GetString()); + if (EnumType == Info->m_Category + || EnumType == ENUM_ALL_AVAILABLE + || (EnumType == ENUM_CAT_SELECTED && Info->m_IsSelected)) + { + Info->RefreshAppInfo(); + if (lpEnumProc) + lpEnumProc(Info, m_Strings.szAppsPath.GetString()); + } } while (FindNextFileW(hFind, &FindFileData) != 0); FindClose(hFind); @@ -407,6 +402,23 @@ ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::FindInfoList(const return result; } +ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::GetSelected() const +{ + ATL::CSimpleArray<CAvailableApplicationInfo> result; + POSITION CurrentListPosition = m_InfoList.GetHeadPosition(); + CAvailableApplicationInfo* Info; + + while (CurrentListPosition != NULL) + { + Info = m_InfoList.GetNext(CurrentListPosition); + if (Info->m_IsSelected) + { + result.Add(*Info); + } + } + return result; +} + const ATL::CStringW& CAvailableApps::GetFolderPath() const { return m_Strings.szPath; diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 62d1a1961b..4118acbca5 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -542,6 +542,30 @@ public: if (bHasCheckboxes) { SetItemState(item, INDEXTOSTATEIMAGEMASK((fCheck) ? 2 : 1), LVIS_STATEIMAGEMASK); + SetSelected(item, fCheck); + } + } + + VOID SetSelected(INT item, BOOL value) + { + if (item < 0) + { + for (INT i = 0; i >= 0; i = GetNextItem(i, LVNI_ALL)) + { + CAvailableApplicationInfo* pAppInfo = (CAvailableApplicationInfo*) GetItemData(i); + if (pAppInfo) + { + pAppInfo->m_IsSelected = value; + } + } + } + else + { + CAvailableApplicationInfo* pAppInfo = (CAvailableApplicationInfo*) GetItemData(item); + if (pAppInfo) + { + pAppInfo->m_IsSelected = value; + } } } @@ -735,6 +759,8 @@ private: AddCategory(hRootItemInstalled, IDS_APPLICATIONS, IDI_APPS); AddCategory(hRootItemInstalled, IDS_UPDATES, IDI_APPUPD); + AddCategory(TVI_ROOT, IDS_SELECTEDFORINST, IDI_SELECTEDFORINST); + hRootItemAvailable = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); AddCategory(hRootItemAvailable, IDS_CAT_AUDIO, IDI_CAT_AUDIO); AddCategory(hRootItemAvailable, IDS_CAT_VIDEO, IDI_CAT_VIDEO); @@ -1081,6 +1107,10 @@ private: case IDS_CAT_VIDEO: UpdateApplicationsList(ENUM_CAT_VIDEO); break; + + case IDS_SELECTEDFORINST: + UpdateApplicationsList(ENUM_CAT_SELECTED); + break; } } @@ -1153,7 +1183,7 @@ private: /* Check if the item is checked */ if ((pnic->uNewState & LVIS_STATEIMAGEMASK) && !bUpdating) { - BOOL checked = ListView_GetCheckState(pnic->hdr.hwndFrom, pnic->iItem); + BOOL checked = m_ListView->GetCheckState(pnic->iItem); /* FIXME: HAX! - preventing decremention below zero as a safeguard for ReactOS In ReactOS this action is triggered whenever user changes *selection*, but should be only when *checkbox* state toggled @@ -1165,6 +1195,10 @@ private: : ((nSelectedApps > 0) ? -1 : 0); + + /* Update item's selection status */ + m_ListView->SetSelected(pnic->iItem, checked); + UpdateStatusBarText(); } } @@ -1399,7 +1433,7 @@ private: { if (nSelectedApps > 0) { - CDownloadManager::DownloadListOfApplications(m_ListView->GetCheckedItems()); + CDownloadManager::DownloadListOfApplications(m_AvailableApps.GetSelected()); UpdateApplicationsList(-1); } else if (CDownloadManager::DownloadApplication(m_ListView->GetSelectedData())) @@ -1541,6 +1575,7 @@ private: ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(Info->m_szVersion.GetString())); ListView_SetItemText(hListView, Index, 2, const_cast<LPWSTR>(Info->m_szDesc.GetString())); + ListView_SetCheckState(hListView, Index, Info->m_IsSelected); return TRUE; } @@ -1565,7 +1600,6 @@ private: bUpdating = TRUE; m_ListView->SetRedraw(FALSE); - nSelectedApps = 0; if (EnumType < 0) { EnumType = SelectedEnumType; diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index 1e9a1df63b..adf4c73aec 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -25,6 +25,7 @@ inline BOOL IsLicenseType(INT x) struct CAvailableApplicationInfo { INT m_Category; + BOOL m_IsSelected; LicenseType m_LicenseType; ATL::CStringW m_szName; ATL::CStringW m_szRegName; @@ -106,6 +107,7 @@ public: CAvailableApplicationInfo* FindInfo(const ATL::CStringW& szAppName) const; ATL::CSimpleArray<CAvailableApplicationInfo> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const; + ATL::CSimpleArray<CAvailableApplicationInfo> GetSelected() const; const ATL::CStringW& GetFolderPath() const; const ATL::CStringW& GetAppPath() const; diff --git a/base/applications/rapps/include/defines.h b/base/applications/rapps/include/defines.h index 7934e96b23..159bcdc504 100644 --- a/base/applications/rapps/include/defines.h +++ b/base/applications/rapps/include/defines.h @@ -50,13 +50,14 @@ enum AppsCategories ENUM_CAT_DRIVERS, ENUM_CAT_LIBS, ENUM_CAT_OTHER, + ENUM_CAT_SELECTED, ENUM_ALL_INSTALLED, ENUM_INSTALLED_APPLICATIONS = 31, ENUM_UPDATES = 32, ENUM_INSTALLED_MIN = ENUM_ALL_INSTALLED, ENUM_INSTALLED_MAX = ENUM_UPDATES, ENUM_AVAILABLE_MIN = ENUM_ALL_AVAILABLE, - ENUM_AVAILABLE_MAX = ENUM_CAT_OTHER, + ENUM_AVAILABLE_MAX = ENUM_CAT_SELECTED, }; inline BOOL IsAvailableEnum(INT x) diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index 9dd6764a47..b035f02807 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -13,6 +13,7 @@ #define IDI_CATEGORY 19 #define IDI_UPDATE_DB 20 #define IDI_CHECK_ALL 21 +#define IDI_SELECTEDFORINST 22 /* Icons for categories */ #define IDI_CAT_AUDIO 50 @@ -108,6 +109,7 @@ #define IDS_SELECT_ALL 126 #define IDS_INSTALL_SELECTED 127 #define IDS_UNABLE_TO_INSTALL 128 +#define IDS_SELECTEDFORINST 129 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200 diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 4b5fe9acf8..b9fb94f09f 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -214,6 +214,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 2ac4d2e26a..52ad40bdd2 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -215,6 +215,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index d86a0513e2..4182c8c1a4 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -210,6 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Schreibfehler. Prüfen Sie die Kapazität des Datenträgers!" IDS_SELECT_ALL "Alle/Keine" IDS_INSTALL_SELECTED "Ausgewählte Installieren" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 048344532d..82a6aa0937 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -210,6 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 1467f24cef..97bf043e33 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -213,6 +213,7 @@ BEGIN IDS_UNABLE_TO_WRITE "No se ha podido escribir en el disco duro, es posible que no quede espacio libre." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index c438ecc0e4..59b9291ce1 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -210,6 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Impossible d'écrire sur le disque. Votre disque pourrait être plein." IDS_SELECT_ALL "Sélectionner/Désélectionner tout" IDS_INSTALL_SELECTED "Installer les sélectionnés" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 9df4d56199..b1498345c9 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -212,6 +212,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 0af2db3da7..9c7008dade 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -210,6 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Impossibile scrivere su disco: lo spazio libero potrebbe essere esaurito." IDS_SELECT_ALL "Seleziona/Deseleziona Tutte" IDS_INSTALL_SELECTED "Installa le selezionate" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 53bf912e22..7b5df0b7c8 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -210,6 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index aea5c416cb..aa7bbb1bb8 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -209,6 +209,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 5f3214d998..9dc447ce66 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -218,6 +218,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Nie można zapisać na dysku. Dysk może być pełny." IDS_SELECT_ALL "Zaznacz/Odznacz Wszystko" IDS_INSTALL_SELECTED "Instaluj Zaznaczone" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 8f1fe5015e..47e495d390 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -212,6 +212,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index b3886d5f4a..d13d72a2f1 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -219,6 +219,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Eșec la scrierea pe disc. Una din cauze poate fi atingerea limitei de capacitate." IDS_SELECT_ALL "Selectează/Deselectează Toate" IDS_INSTALL_SELECTED "Instalează selecționate" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 97c6a328e6..5f0788c9b6 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -210,6 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Не удалось записать данные на диск. Возможно, недостаточно свободного места на диске." IDS_SELECT_ALL "Выбрать все" IDS_INSTALL_SELECTED "Установить выбранное" + IDS_SELECTEDFORINST "Выбрано для установки" END STRINGTABLE diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index c65e4b6ec8..fa324aaf4a 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -215,6 +215,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 9d9f72c6a0..1656ce58e5 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -214,6 +214,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index 223e54c099..4bfaa9a23c 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -217,6 +217,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 34f0c693e5..c3a49db6c3 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -212,6 +212,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Diske yazılamıyor. Disk dolu olabilir." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index 4b6325da8f..97aa1a6f27 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -218,6 +218,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Записк на диск неможливий. Можливо, на диску недостатньо містця." IDS_SELECT_ALL "Вибрати все" IDS_INSTALL_SELECTED "Встановити обране" + IDS_SELECTEDFORINST "Обрані для встановлення" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index a482d8ecb4..2ab1e036dd 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -212,6 +212,7 @@ BEGIN IDS_UNABLE_TO_WRITE "无法写入磁盘。磁盘可能已满。" IDS_SELECT_ALL "全选/全反选" IDS_INSTALL_SELECTED "安装已选中的" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 236eee3b90..2636d7e4a1 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -212,6 +212,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/rapps.rc b/base/applications/rapps/rapps.rc index d200e179be..4d4c796c2e 100644 --- a/base/applications/rapps/rapps.rc +++ b/base/applications/rapps/rapps.rc @@ -40,6 +40,7 @@ IDI_CAT_OTHER ICON "res/cats/other.ico" IDI_CAT_SCIENCE ICON "res/cats/science.ico" IDI_CAT_TOOLS ICON "res/cats/tools.ico" IDI_CAT_VIDEO ICON "res/cats/video.ico" +IDI_SELECTEDFORINST ICON "res/select.ico" /* Accelerators -- key bindings */ HOTKEYS ACCELERATORS

1 0

[reactos] 01/01: [DISKPART] Don't crash on input if user provided no command
by Pierre Schweitzer 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06abd3b48018981a069b1… commit 06abd3b48018981a069b1263f8a716fe16379197 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Jan 3 08:47:36 2018 +0100 [DISKPART] Don't crash on input if user provided no command CORE-14018 --- base/system/diskpart/interpreter.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c index 4e22a6d646..59f75570ab 100644 --- a/base/system/diskpart/interpreter.c +++ b/base/system/diskpart/interpreter.c @@ -69,6 +69,10 @@ InterpretCmd(int argc, LPWSTR *argv) { PCOMMAND cmdptr; + /* If no args provided */ + if (argc < 1) + return TRUE; + /* First, determine if the user wants to exit or to use a comment */ if(wcsicmp(argv[0], L"exit") == 0)

1 0

[reactos] 02/02: [NTOS:INBV] Simplify a little bit the BootLogoFadeIn() function
by Hermes Belusca-Maito 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2be558e61b899a98d475… commit b2be558e61b899a98d47589cf7b9c80c8a33f694 Author: Hermes Belusca-Maito <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 27 17:14:02 2017 +0100 [NTOS:INBV] Simplify a little bit the BootLogoFadeIn() function - Use KeDelayExecutionThread() instead of KeStallExecutionProcessor(). - Fix magic values and add comments. - Fix structure name. --- ntoskrnl/inbv/inbv.c | 115 +++++++++++++++++++++++---------------- ntoskrnl/include/internal/inbv.h | 2 +- 2 files changed, 69 insertions(+), 48 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 40e015771c..cb6af3e4bf 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -48,9 +48,25 @@ static PUCHAR ResourceList[1 + IDB_MAX_RESOURCE]; // First entry == NULL, follow * Change this to modify progress bar behaviour */ #define ROT_BAR_DEFAULT_MODE RB_PROGRESS_BAR + +/* + * Values for PltRotBarStatus: + * - PltRotBarStatus == 1, do palette fading-in (done elsewhere in ReactOS); + * - PltRotBarStatus == 2, do rotation bar animation; + * - PltRotBarStatus == 3, stop the animation thread. + * - Any other value is ignored and the animation thread continues to run. + */ +typedef enum _ROT_BAR_STATUS +{ + RBS_FADEIN = 1, + RBS_ANIMATE, + RBS_STOP_ANIMATE, + RBS_STATUS_MAX +} ROT_BAR_STATUS; + static BOOLEAN RotBarThreadActive = FALSE; -static ROT_BAR_TYPE RotBarSelection; -static ULONG PltRotBarStatus; +static ROT_BAR_TYPE RotBarSelection = RB_UNSPECIFIED; +static ROT_BAR_STATUS PltRotBarStatus = 0; static UCHAR RotBarBuffer[24 * 9]; static UCHAR RotLineBuffer[640 * 6]; #endif @@ -109,7 +125,7 @@ typedef struct tagRGBQUAD static RGBQUAD MainPalette[16]; #define PALETTE_FADE_STEPS 15 -#define PALETTE_FADE_TIME 20 * 1000 /* 20ms */ +#define PALETTE_FADE_TIME (20 * 1000) /* 20 ms */ /** From bootvid/precomp.h **/ // @@ -143,52 +159,50 @@ BootLogoFadeIn(VOID) UCHAR PaletteBitmapBuffer[sizeof(BITMAPINFOHEADER) + sizeof(MainPalette)]; PBITMAPINFOHEADER PaletteBitmap = (PBITMAPINFOHEADER)PaletteBitmapBuffer; LPRGBQUAD Palette = (LPRGBQUAD)(PaletteBitmapBuffer + sizeof(BITMAPINFOHEADER)); - ULONG Iteration, Index, ClrUsed; - /* Check if we're installed and we own it */ - if (InbvBootDriverInstalled && - (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) - { - /* Acquire the lock */ - InbvAcquireLock(); + LARGE_INTEGER Delay; + Delay.QuadPart = - (PALETTE_FADE_TIME * 10); - /* - * Build a bitmap containing the fade in palette. The palette entries - * are then processed in a loop and set using VidBitBlt function. - */ - ClrUsed = RTL_NUMBER_OF(MainPalette); - RtlZeroMemory(PaletteBitmap, sizeof(BITMAPINFOHEADER)); - PaletteBitmap->biSize = sizeof(BITMAPINFOHEADER); - PaletteBitmap->biBitCount = 4; - PaletteBitmap->biClrUsed = ClrUsed; + /* Check if we are installed and we own the display */ + if (!InbvBootDriverInstalled || + (InbvDisplayState != INBV_DISPLAY_STATE_OWNED)) + { + return; + } - /* - * Main animation loop. - */ - for (Iteration = 0; Iteration <= PALETTE_FADE_STEPS; ++Iteration) + /* + * Build a bitmap containing the fade-in palette. The palette entries + * are then processed in a loop and set using VidBitBlt function. + */ + ClrUsed = RTL_NUMBER_OF(MainPalette); + RtlZeroMemory(PaletteBitmap, sizeof(BITMAPINFOHEADER)); + PaletteBitmap->biSize = sizeof(BITMAPINFOHEADER); + PaletteBitmap->biBitCount = 4; + PaletteBitmap->biClrUsed = ClrUsed; + + /* + * Main animation loop. + */ + for (Iteration = 0; Iteration <= PALETTE_FADE_STEPS; ++Iteration) + { + for (Index = 0; Index < ClrUsed; Index++) { - for (Index = 0; Index < ClrUsed; Index++) - { - Palette[Index].rgbRed = (UCHAR) - (MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS); - Palette[Index].rgbGreen = (UCHAR) - (MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS); - Palette[Index].rgbBlue = (UCHAR) - (MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS); - } - - VidBitBlt(PaletteBitmapBuffer, 0, 0); - - /* Wait for a bit */ - KeStallExecutionProcessor(PALETTE_FADE_TIME); + Palette[Index].rgbRed = (UCHAR) + (MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS); + Palette[Index].rgbGreen = (UCHAR) + (MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS); + Palette[Index].rgbBlue = (UCHAR) + (MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS); } - /* Release the lock */ + /* Do the animation */ + InbvAcquireLock(); + VidBitBlt(PaletteBitmapBuffer, 0, 0); InbvReleaseLock(); /* Wait for a bit */ - KeStallExecutionProcessor(PALETTE_FADE_TIME); + KeDelayExecutionThread(KernelMode, FALSE, &Delay); } } @@ -799,9 +813,9 @@ InbvRotationThread( InbvAcquireLock(); /* Unknown unexpected command */ - ASSERT(PltRotBarStatus <= 3); + ASSERT(PltRotBarStatus < RBS_STATUS_MAX); - if (PltRotBarStatus == 3) + if (PltRotBarStatus == RBS_STOP_ANIMATE) { /* Stop the thread */ InbvReleaseLock(); @@ -866,7 +880,8 @@ NTAPI INIT_FUNCTION InbvRotBarInit(VOID) { - PltRotBarStatus = 1; + PltRotBarStatus = RBS_FADEIN; + /* Perform other initialization if needed */ } #endif @@ -890,10 +905,10 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #endif #ifdef INBV_ROTBAR_IMPLEMENTED - /* Check if the system thread has already been created */ + /* Check if the animation thread has already been created */ if (RotBarThreadActive) { - /* Reset the progress bar */ + /* Yes, just reset the progress bar but keep the thread alive */ InbvAcquireLock(); RotBarSelection = RB_UNSPECIFIED; InbvReleaseLock(); @@ -994,7 +1009,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) /* * Save the main image palette and replace it with black palette, - * so that we can do fade in effect later. + * so that we can do fade-in effect later. */ BitmapInfoHeader = (PBITMAPINFOHEADER)Screen; Palette = (LPRGBQUAD)((PUCHAR)Screen + BitmapInfoHeader->biSize); @@ -1045,6 +1060,11 @@ DisplayBootBitmap(IN BOOLEAN TextMode) InbvBufferToScreenBlt(Buffer, 0, 0, 22, 9, 24); } + /* + * Add a rotating bottom horizontal bar when using a progress bar, + * to show that ReactOS can be still alive when the bar does not + * appear to progress. + */ if (TempRotBarSelection == RB_PROGRESS_BAR) { LineBmp = InbvGetResourceAddress(IDB_ROTATING_LINE); @@ -1078,6 +1098,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) NULL); if (NT_SUCCESS(Status)) { + /* The thread has started, close the handle as we don't need it */ RotBarThreadActive = TRUE; ObCloseHandle(ThreadHandle, KernelMode); } @@ -1089,7 +1110,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) } #ifdef INBV_ROTBAR_IMPLEMENTED - /* Do we have a system thread? */ + /* Do we have the animation thread? */ if (RotBarThreadActive) { /* We do, initialize the progress bar */ @@ -1148,7 +1169,7 @@ FinalizeBootLogo(VOID) /* Reset progress bar and lock */ #ifdef INBV_ROTBAR_IMPLEMENTED - PltRotBarStatus = 3; + PltRotBarStatus = RBS_STOP_ANIMATE; RotBarThreadActive = FALSE; #endif InbvReleaseLock(); diff --git a/ntoskrnl/include/internal/inbv.h b/ntoskrnl/include/internal/inbv.h index 9293828646..92de2cc83b 100644 --- a/ntoskrnl/include/internal/inbv.h +++ b/ntoskrnl/include/internal/inbv.h @@ -1,6 +1,6 @@ #pragma once -typedef struct _InbvProgressState +typedef struct _INBV_PROGRESS_STATE { ULONG Floor; ULONG Ceiling;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2018