Extravert-ir · Extravert-ir · May 4, 2020 · May 4, 2020 · May 4, 2020 · May 5, 2020
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,13 +11,27 @@ jobs:
           wget https://svn.reactos.org/storage/vperevertkin/rosbe-ci.tar.zst
           mkdir ${{github.workspace}}/rosbe
           tar -I zstd -xvf rosbe-ci.tar.zst --directory ${{github.workspace}}/rosbe
+      - name: Install other packages
+        run: sudo apt install ccache
       - uses: actions/checkout@v2
         with:
           path: src
+      - name: ccache cache files
+        uses: actions/cache@v1
+        with:
+          path: ccache
+          key: ccache-gcc-i386-${{github.sha}}
+          restore-keys: |
+            ccache-gcc-i386-
+      - name: Set ccache settings
+        env:
+          CCACHE_BASEDIR: ${{github.workspace}}
+          CCACHE_DIR: ${{github.workspace}}/ccache
+          CCACHE_MAXSIZE: 2G
       - name: Configure
         run: |
           mkdir build
-          echo 'cd ${{github.workspace}}/build && ${{github.workspace}}/src/configure.sh -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1' > commands
+          echo 'cd ${{github.workspace}}/build && ${{github.workspace}}/src/configure.sh -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1' > commands
           ${{github.workspace}}/rosbe/RosBE.sh < commands
       - name: Build
         run: |

diff --git a/CREDITS b/CREDITS
@@ -28,6 +28,7 @@ Filip Navara <[email protected]>
 Frederik Leemans
 Ge van Geldorp <[email protected]>
 Ged Murphy <[email protected]>
+George Bisoc <[email protected]>
 Giannis Adamopoulos <[email protected]>
 Gregor Brunmar <gregor brunmar at home se>
 Gregor Schneider <[email protected]>

diff --git a/README.md b/README.md
@@ -55,16 +55,15 @@ Up-to-date versions for Windows and for Unix/GNU-Linux are available from our do
 
 Alternatively one can use Microsoft Visual C++ (MSVC) version 2015+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B).
 
+See ["Building ReactOS"](https://reactos.org/wiki/Building_ReactOS) article for more details.
+
 ### Binaries
 
 To build ReactOS you must run the `configure` script in the directory you want to have your build files. Choose `configure.cmd` or `configure.sh` depending on your system. Then run `ninja <modulename>` to build a module you want or just `ninja` to build all modules.
 
 ### Bootable images
 
-To build a bootable CD image run `ninja bootcd` from the
-build directory. This will create a CD image with a filename `bootcd.iso`.
-
-See ["Building ReactOS"](https://reactos.org/wiki/Building_ReactOS) for more details.
+To build a bootable CD image run `ninja bootcd` from the build directory. This will create a CD image with a filename `bootcd.iso`.
 
 You can always download fresh binary builds of bootable images from the ["Daily builds"](https://reactos.org/getbuilds/) page.
 
@@ -74,9 +73,7 @@ By default, ReactOS currently can only be installed on a machine that has a FAT1
 The partition on which ReactOS is to be installed (which may or may not be the bootable partition) must also be formatted as FAT16 or FAT32.
 ReactOS Setup can format the partitions if needed.
 
-Starting 0.4.10, ReactOS can be installed using the BtrFS file system. But
-consider this as an experimental feature and thus regressions not triggered on
-FAT setup may be observed.
+Starting with 0.4.10, ReactOS can be installed using the BtrFS file system. But consider this as an experimental feature and thus regressions not triggered on FAT setup may be observed.
 
 To install ReactOS from the bootable CD distribution, extract the archive contents. Then burn the CD image, boot from it, and follow the instructions.
 
@@ -125,10 +122,10 @@ The main development is done on [GitHub](https://github.com/reactos/reactos). We
 There is also an obsolete [SVN archive repository](https://svn.reactos.org/reactos/) that is kept for historical purposes.
 
 [coverity.badge]:   https://scan.coverity.com/projects/205/badge.svg?flat=1
-[rosbewin.badge]:   https://img.shields.io/badge/RosBE_Windows-2.1.6-0688CB.svg
-[rosbeunix.badge]:  https://img.shields.io/badge/RosBE_Unix-2.1.2-0688CB.svg
+[rosbewin.badge]:   https://img.shields.io/badge/RosBE_Windows-2.2.0-0688CB.svg
+[rosbeunix.badge]:  https://img.shields.io/badge/RosBE_Unix-2.2-0688CB.svg
 [prwelcome.badge]:  https://img.shields.io/badge/PR-welcome-0688CB.svg
 
 [coverity.link]:    https://scan.coverity.com/projects/205
-[rosbewin.link]:    https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.1.6/
-[rosbeunix.link]:   https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.1.2/
+[rosbewin.link]:    https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.2.0/
+[rosbeunix.link]:   https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.2/
diff --git a/base/applications/fontview/fontview.c b/base/applications/fontview/fontview.c
@@ -126,10 +126,10 @@ wWinMain(HINSTANCE hThisInstance,
 	if (argc < 2)
 	{
 		OPENFILENAMEW fontOpen;
-        WCHAR filter[MAX_PATH*2], dialogTitle[MAX_PATH];
+        WCHAR filter[MAX_PATH*2] = {0}, dialogTitle[MAX_PATH];
 
 		LoadStringW(NULL, IDS_OPEN, dialogTitle, ARRAYSIZE(dialogTitle));
-		LoadStringW(NULL, IDS_FILTER_LIST, filter, ARRAYSIZE(filter));
+		LoadStringW(NULL, IDS_FILTER_LIST, filter, ARRAYSIZE(filter) - 1);
 
 		/* Clears out any values of fontOpen before we use it */
 		ZeroMemory(&fontOpen, sizeof(fontOpen));

diff --git a/base/applications/mplay32/mplay32.c b/base/applications/mplay32/mplay32.c
@@ -1149,22 +1149,15 @@ OpenFileDialog(HWND hwnd, DWORD dwFilterIndex, LPTSTR lpType)
 {
     OPENFILENAME OpenFileName;
     TCHAR szFile[MAX_PATH + 1] = _T("");
-    TCHAR szCurrentDir[MAX_PATH];
 
     ZeroMemory(&OpenFileName, sizeof(OpenFileName));
 
-    if (!GetCurrentDirectory(ARRAYSIZE(szCurrentDir), szCurrentDir))
-    {
-        StringCbCopy(szCurrentDir, sizeof(szCurrentDir), _T("c:\\"));
-    }
-
     OpenFileName.lStructSize     = sizeof(OpenFileName);
     OpenFileName.hwndOwner       = hwnd;
     OpenFileName.hInstance       = hInstance;
     OpenFileName.lpstrFilter     = szFilter;
     OpenFileName.lpstrFile       = szFile;
     OpenFileName.nMaxFile        = ARRAYSIZE(szFile);
-    OpenFileName.lpstrInitialDir = szCurrentDir;
     OpenFileName.Flags           = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_SHAREAWARE;
     OpenFileName.lpstrDefExt     = _T("\0");
     OpenFileName.nFilterIndex = dwFilterIndex;

diff --git a/base/applications/mscutils/servman/CMakeLists.txt b/base/applications/mscutils/servman/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 list(APPEND SOURCE
-    about.c
     control.c
     create.c
     delete.c

diff --git a/base/applications/mscutils/servman/about.c b/base/applications/mscutils/servman/about.c
diff --git a/base/applications/mscutils/servman/lang/bg-BG.rc b/base/applications/mscutils/servman/lang/bg-BG.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "За управителя на устройствата"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Close", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 300, 225
 CAPTION "Общи"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Брой услуги: %d"
     IDS_STOP_DEPENDS "При спирането на %s, ще спрат и следните услуги"
     IDS_NO_DEPENDS "<Без зависимости>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Управление на услугите на РеактОС"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy ([email protected])"
 END
 
 STRINGTABLE

diff --git a/base/applications/mscutils/servman/lang/cs-CZ.rc b/base/applications/mscutils/servman/lang/cs-CZ.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "O správci služeb"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Správce služeb v0.8\nCopyright (C) 2005-2007\nGed Murphy ([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Zavřít", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Obecné"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Počet služeb: %d"
     IDS_STOP_DEPENDS "Zastavením %s dojde také k zastavení"
     IDS_NO_DEPENDS "<Žádné závislosti>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS Správce služeb"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy ([email protected])"
 END
 
 STRINGTABLE

diff --git a/base/applications/mscutils/servman/lang/de-DE.rc b/base/applications/mscutils/servman/lang/de-DE.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Info über Dienst-Manager"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Dienst-Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Anzahl der Dienste: %d"
     IDS_STOP_DEPENDS "Wenn %s beendet wird, werden diese Dienste ebenfalls beendet"
     IDS_NO_DEPENDS "<Keine Abhängigkeiten>"
-    IDS_LICENSE "Dieses Programm ist Freie Software: Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation, Version 2.1 der Lizenz oder (nach Ihrer Wahl) jeder neueren veröffentlichten Version, weiterverbreiten und/oder modifizieren.\r\n\r\nDieses Programm wird in der Hoffnung, dass es nützlich sein wird, aber OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.\r\n\r\nSie sollten eine Kopie der GNU General Public License zusammen mit diesem Programm erhalten haben. Wenn nicht, siehe <http://www.gnu.org/licenses/>."
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS Dienst-Manager"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy ([email protected])"
 END
 
 STRINGTABLE

diff --git a/base/applications/mscutils/servman/lang/el-GR.rc b/base/applications/mscutils/servman/lang/el-GR.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Σχετικά με το Διαχειριστή Υπηρεσιών"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Διαχειριστής Υπηρεσιών v0.8\nCopyright (C) 2005-2007\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Κλείσιμο", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "Γενικά"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Num Services: %d"
     IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
     IDS_NO_DEPENDS "<No Dependencies>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Διαχειριστής Υπηρεσιών του ReactOS"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy ([email protected])"
 END
 
 STRINGTABLE

diff --git a/base/applications/mscutils/servman/lang/en-US.rc b/base/applications/mscutils/servman/lang/en-US.rc
@@ -68,17 +68,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "About Service Manager"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "&Close", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -262,7 +251,6 @@ BEGIN
     IDS_NUM_SERVICES "Num Services: %d"
     IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
     IDS_NO_DEPENDS "<No Dependencies>"
-    IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE
@@ -331,6 +319,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "ReactOS Service Manager"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy ([email protected])"
 END
 
 STRINGTABLE

diff --git a/base/applications/mscutils/servman/lang/es-ES.rc b/base/applications/mscutils/servman/lang/es-ES.rc
@@ -71,17 +71,6 @@ BEGIN
     VK_F5, ID_REFRESH, VIRTKEY
 END
 
-IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Acerca del Administrador de servicios"
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "Administrador de servicios v0.8\nCopyright (C) 2005-2007\ncreado por Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 135, 40
-    PUSHBUTTON "Cerrar", IDOK, 75, 162, 44, 15
-    ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
 IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0
@@ -265,7 +254,6 @@ BEGIN
     IDS_NUM_SERVICES "Número de servicios: %d"
     IDS_STOP_DEPENDS "Cuando %s se detenga, estos otros servicios también se detendrán"
     IDS_NO_DEPENDS "<Sin dependencias>"
-    IDS_LICENSE "Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo los términos de la GNU General Public License tal y como fueron publicados por la Free Software Foundation; ya sea la versión 2 de la Licencia, o (bajo tu discreción) cualquier versión posterior.\r\n\r\nEste programa se distribuye con el fin de ser útil, pero viene SIN NINGUNA GARANTÍA; sin tan siquiera la garantía implícita de COMERCIALIZACIÓN o la de IDONEIDAD PARA UN PROPÓSITO CONCRETO. Para más información lee la GNU General Public License.\r\n\r\nDeberías de haber recibido una copia de la GNU General Public License con el programa; si no, puedes escribir a la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 EE.UU."
 END
 
 STRINGTABLE
@@ -334,6 +322,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Administrador de servicios de ReactOS"
+    IDS_APPAUTHORS "Copyright (C) 2005-2007 creado por Ged Murphy ([email protected])"
 END
 
 STRINGTABLE