[ros-diffs] [reactos] 01/02: [SHDOCVW] Add missing file headers and fix existing
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fe3564ba99b5b893715811f43158bd89a1d0880 commit 1fe3564ba99b5b893715811f43158bd89a1d0880 Author: Stanislav Motylkov AuthorDate: Fri Aug 2 16:32:46 2024 +0300 Commit: Stanislav Motylkov CommitDate: Fri Aug 2 16:32:46 2024 +0300 [SHDOCVW] Add missing file headers and fix existing Addendum to 69931a4a7d1 and 960a305e5c5. --- dll/win32/shdocvw/CExplorerBand.cpp | 2 +- dll/win32/shdocvw/CExplorerBand.h | 2 +- dll/win32/shdocvw/CFavBand.cpp | 2 +- dll/win32/shdocvw/CFavBand.h| 2 +- dll/win32/shdocvw/lang/bg-BG.rc | 6 ++ dll/win32/shdocvw/lang/de-DE.rc | 6 ++ dll/win32/shdocvw/lang/en-US.rc | 7 +++ dll/win32/shdocvw/lang/es-ES.rc | 6 ++ dll/win32/shdocvw/lang/et-EE.rc | 6 ++ dll/win32/shdocvw/lang/eu-ES.rc | 6 ++ dll/win32/shdocvw/lang/fr-FR.rc | 6 ++ dll/win32/shdocvw/lang/he-IL.rc | 6 ++ dll/win32/shdocvw/lang/hi-IN.rc | 6 ++ dll/win32/shdocvw/lang/hu-HU.rc | 6 ++ dll/win32/shdocvw/lang/id-ID.rc | 8 +++- dll/win32/shdocvw/lang/it-IT.rc | 6 ++ dll/win32/shdocvw/lang/ja-JP.rc | 6 ++ dll/win32/shdocvw/lang/pl-PL.rc | 6 ++ dll/win32/shdocvw/lang/pt-BR.rc | 6 ++ dll/win32/shdocvw/lang/pt-PT.rc | 6 ++ dll/win32/shdocvw/lang/ro-RO.rc | 6 ++ dll/win32/shdocvw/lang/ru-RU.rc | 6 ++ dll/win32/shdocvw/lang/sq-AL.rc | 6 ++ dll/win32/shdocvw/lang/tr-TR.rc | 6 ++ dll/win32/shdocvw/lang/uk-UA.rc | 6 ++ dll/win32/shdocvw/lang/zh-CN.rc | 6 ++ dll/win32/shdocvw/lang/zh-TW.rc | 6 ++ dll/win32/shdocvw/objects.cpp | 4 ++-- dll/win32/shdocvw/objects.h | 4 ++-- dll/win32/shdocvw/utility.cpp | 4 ++-- dll/win32/shdocvw/utility.h | 4 ++-- 31 files changed, 152 insertions(+), 13 deletions(-) diff --git a/dll/win32/shdocvw/CExplorerBand.cpp b/dll/win32/shdocvw/CExplorerBand.cpp index ab65442d847..d47964f08ab 100644 --- a/dll/win32/shdocvw/CExplorerBand.cpp +++ b/dll/win32/shdocvw/CExplorerBand.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Explorer + * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Explorer bar * COPYRIGHT: Copyright 2016 Sylvain Deverre diff --git a/dll/win32/shdocvw/CExplorerBand.h b/dll/win32/shdocvw/CExplorerBand.h index 5498dc605f0..5c307deacce 100644 --- a/dll/win32/shdocvw/CExplorerBand.h +++ b/dll/win32/shdocvw/CExplorerBand.h @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Explorer + * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Explorer bar * COPYRIGHT: Copyright 2016 Sylvain Deverre diff --git a/dll/win32/shdocvw/CFavBand.cpp b/dll/win32/shdocvw/CFavBand.cpp index 38e7a4ebbdc..bc00c3943bb 100644 --- a/dll/win32/shdocvw/CFavBand.cpp +++ b/dll/win32/shdocvw/CFavBand.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Explorer + * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Favorites bar * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ diff --git a/dll/win32/shdocvw/CFavBand.h b/dll/win32/shdocvw/CFavBand.h index ff6f86c282e..1b91e04779c 100644 --- a/dll/win32/shdocvw/CFavBand.h +++ b/dll/win32/shdocvw/CFavBand.h @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Explorer + * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Favorites bar * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ diff --git a/dll/win32/shdocvw/lang/bg-BG.rc b/dll/win32/shdocvw/lang/bg-BG.rc index f83e20b8019..55adac3a09a 100644 --- a/dll/win32/shdocvw/lang/bg-BG.rc +++ b/dll/win32/shdocvw/lang/bg-BG.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Bulgarian resource file + * TRANSLATOR: Copyright 2010 S. Stanev (CCTAHEB) + */ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/dll/win32/shdocvw/lang/de-DE.rc b/dll/win32/shdocvw/lang/de-DE.rc index 3c9eac042ed..959c1f16f22 100644 --- a/dll/win32/shdocvw/lang/de-DE.rc +++ b/dll/win32/shdocvw/lang/de-DE.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: German resource file + * TRANSLATOR: Copyright 2014 Christoph von Wittich + */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/dll/win32/shdocvw/lang/en-US.rc b/dll/win32/shdocvw/lang/en-US.rc index 12d6bbe94dd..2ae4b74e92e 100644 --- a/dll/win32/shdocvw/lang/en-US.rc +++ b/dll/win32/shdocvw/lang/en-US.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Engli
[ros-diffs] [reactos] 02/02: [SHDOCVW] Update Russian (ru-RU) translation
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=191d716cb2242ec0e8c99be94c0d14b91bb84ab0 commit 191d716cb2242ec0e8c99be94c0d14b91bb84ab0 Author: Stanislav Motylkov AuthorDate: Fri Aug 2 16:38:11 2024 +0300 Commit: Stanislav Motylkov CommitDate: Fri Aug 2 16:38:11 2024 +0300 [SHDOCVW] Update Russian (ru-RU) translation Addendum to 69931a4a7d1. CORE-19686 --- dll/win32/shdocvw/lang/ru-RU.rc | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/win32/shdocvw/lang/ru-RU.rc b/dll/win32/shdocvw/lang/ru-RU.rc index 7c0b549f78c..7db8c0b0fd9 100644 --- a/dll/win32/shdocvw/lang/ru-RU.rc +++ b/dll/win32/shdocvw/lang/ru-RU.rc @@ -2,14 +2,15 @@ * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Russian resource file - * TRANSLATOR: Copyright 2014 Petr Akhlamov + * TRANSLATORS: Copyright 2014 Petr Akhlamov + * Copyright 2024 Stanislav Motylkov */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN -IDS_ADD "Add..." -IDS_ORGANIZE "Organize..." +IDS_ADD "Добавить..." +IDS_ORGANIZE "Упорядочить..." IDS_FOLDERSLABEL "Папки" END
[ros-diffs] [reactos] 01/01: [EXPLORER] Restore windows on second click of Show Desktop button (#7184)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=045333e8904a0eebc8bbf0416df5121e53fc5023 commit 045333e8904a0eebc8bbf0416df5121e53fc5023 Author: Jose Carlos Jesus AuthorDate: Fri Aug 2 15:36:26 2024 +0100 Commit: GitHub CommitDate: Fri Aug 2 17:36:26 2024 +0300 [EXPLORER] Restore windows on second click of Show Desktop button (#7184) On the second click on "Show desktop" button, the minimized windows are not restored, because after the first click, and the addition to `CSimpleArray g_MinimizedAll`, a call to `RestoreMinimizedNonTaskWnds()` via `HSHELL_WINDOWACTIVATED` message clears the list of minimized windows. Don't empty `g_MinimizedAll` while processing HSHELL_WINDOWCREATED or HSHELL_WINDOWACTIVATED messages (bDestroyed=FALSE). Empty `g_MinimizedAll` only when SendPulseToTray is called with bDestroyed=TRUE. Addendum to e6bced7a353 and 70d7009ad95. CORE-19703 CORE-15369 --- base/shell/explorer/traywnd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index a2d49f8010d..868447796fc 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -3049,9 +3049,9 @@ HandleTrayContextMenu: } } -g_MinimizedAll.RemoveAll(); - -if (!bDestroyed) +if (bDestroyed) +g_MinimizedAll.RemoveAll(); +else ::SetForegroundWindow(hwndActive); }
[ros-diffs] [reactos] 01/01: [TASKMGR] Allow setting each column alignment independently (#7208)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=deccfb8c9fb860c2dcc19d28339ab9cbab2bcc8d commit deccfb8c9fb860c2dcc19d28339ab9cbab2bcc8d Author: Jose Carlos Jesus AuthorDate: Fri Aug 2 22:54:41 2024 +0100 Commit: GitHub CommitDate: Sat Aug 3 00:54:41 2024 +0300 [TASKMGR] Allow setting each column alignment independently (#7208) Add dwAlign attribute to the PresetColumnEntry structure to make it work. CORE-19280 --- base/applications/taskmgr/column.c | 58 +++--- base/applications/taskmgr/column.h | 1 + 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/base/applications/taskmgr/column.c b/base/applications/taskmgr/column.c index b6eec0f5ec8..75d106f68e3 100644 --- a/base/applications/taskmgr/column.c +++ b/base/applications/taskmgr/column.c @@ -10,36 +10,36 @@ UINTColumnDataHints[COLUMN_NMAX]; -#define DECLARE_COLUMN_PRESET(_name, _size, _state) \ -{ IDS_TAB_##_name, IDC_##_name, _size, _state }, +#define DECLARE_COLUMN_PRESET(_name, _size, _state, _align) \ +{ IDS_TAB_##_name, IDC_##_name, _size, _state, _align }, const PresetColumnEntry ColumnPresets[COLUMN_NMAX] = { -DECLARE_COLUMN_PRESET(IMAGENAME,105, TRUE) -DECLARE_COLUMN_PRESET(PID, 50, TRUE) -DECLARE_COLUMN_PRESET(USERNAME, 107, FALSE) -DECLARE_COLUMN_PRESET(SESSIONID, 70, FALSE) -DECLARE_COLUMN_PRESET(CPUUSAGE, 35, TRUE) -DECLARE_COLUMN_PRESET(CPUTIME, 70, TRUE) -DECLARE_COLUMN_PRESET(MEMORYUSAGE, 70, TRUE) -DECLARE_COLUMN_PRESET(PEAKMEMORYUSAGE, 100, FALSE) -DECLARE_COLUMN_PRESET(MEMORYUSAGEDELTA, 70, FALSE) -DECLARE_COLUMN_PRESET(PAGEFAULTS,70, FALSE) -DECLARE_COLUMN_PRESET(PAGEFAULTSDELTA, 70, FALSE) -DECLARE_COLUMN_PRESET(VIRTUALMEMORYSIZE, 70, FALSE) -DECLARE_COLUMN_PRESET(PAGEDPOOL, 70, FALSE) -DECLARE_COLUMN_PRESET(NONPAGEDPOOL, 70, FALSE) -DECLARE_COLUMN_PRESET(BASEPRIORITY, 60, FALSE) -DECLARE_COLUMN_PRESET(HANDLECOUNT, 60, FALSE) -DECLARE_COLUMN_PRESET(THREADCOUNT, 60, FALSE) -DECLARE_COLUMN_PRESET(USEROBJECTS, 60, FALSE) -DECLARE_COLUMN_PRESET(GDIOBJECTS,60, FALSE) -DECLARE_COLUMN_PRESET(IOREADS, 70, FALSE) -DECLARE_COLUMN_PRESET(IOWRITES, 70, FALSE) -DECLARE_COLUMN_PRESET(IOOTHER, 70, FALSE) -DECLARE_COLUMN_PRESET(IOREADBYTES, 70, FALSE) -DECLARE_COLUMN_PRESET(IOWRITEBYTES, 70, FALSE) -DECLARE_COLUMN_PRESET(IOOTHERBYTES, 70, FALSE) -DECLARE_COLUMN_PRESET(COMMANDLINE, 450, FALSE) +DECLARE_COLUMN_PRESET(IMAGENAME,105, TRUE, LVCFMT_LEFT) +DECLARE_COLUMN_PRESET(PID, 50, TRUE, LVCFMT_LEFT) +DECLARE_COLUMN_PRESET(USERNAME, 107, FALSE, LVCFMT_LEFT) +DECLARE_COLUMN_PRESET(SESSIONID, 70, FALSE, LVCFMT_LEFT) +DECLARE_COLUMN_PRESET(CPUUSAGE, 35, TRUE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(CPUTIME, 70, TRUE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(MEMORYUSAGE, 70, TRUE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(PEAKMEMORYUSAGE, 100, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(MEMORYUSAGEDELTA, 70, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(PAGEFAULTS,70, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(PAGEFAULTSDELTA, 70, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(VIRTUALMEMORYSIZE, 70, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(PAGEDPOOL, 70, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(NONPAGEDPOOL, 70, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(BASEPRIORITY, 60, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(HANDLECOUNT, 60, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(THREADCOUNT, 60, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(USEROBJECTS, 60, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(GDIOBJECTS,60, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(IOREADS, 70, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(IOWRITES, 70, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(IOOTHER, 70, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(IOREADBYTES, 70, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(IOWRITEBYTES, 70, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(IOOTHERBYTES, 70, FALSE, LVCFMT_RIGHT) +DECLARE_COLUMN_PRESET(COMMANDLINE, 450, FALSE, LVCFMT_LEFT) }; static int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); @@ -54,7 +54,7 @@ void AddColumns(void) for (n=0; n