ROS Merge

Windivs-Devs · Feb 19, 2024 · daaf762 · daaf762
2 parents fe0255a + 9cf43ee
commit daaf762
Show file tree

Hide file tree

Showing 278 changed files with 8,629 additions and 4,631 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,29 +1,45 @@
 # Labelling by the files touched
 
 ATL:
-  - sdk/lib/atl/**
+- changed-files:
+  - any-glob-to-any-file:
+    - sdk/lib/atl/**
 
 drivers:
-  - drivers/**
-  - sdk/lib/drivers/**
-  - any: ["win32ss/drivers/**", "!win32ss/drivers/font/**"]
+- changed-files:
+  - any-glob-to-any-file:
+    - drivers/**
+    - sdk/lib/drivers/**
+  - all-globs-to-any-file:
+    - win32ss/drivers/**
+    - '!win32ss/drivers/font/**'
 
 freeldr:
-  - boot/freeldr/**
+- changed-files:
+  - any-glob-to-any-file:
+    - boot/freeldr/**
 
 "kernel&hal":
-  - hal/**
-  - ntoskrnl/**
+- changed-files:
+  - any-glob-to-any-file:
+    - hal/**
+    - ntoskrnl/**
 
 ROSTESTS:
-  - modules/rostests/**
+- changed-files:
+  - any-glob-to-any-file:
+    - modules/rostests/**
 
 shell:
-  - base/shell/explorer/**
-  - base/shell/rshell/**
-  - dll/shellext/**
-  - dll/win32/browseui/**
-  - dll/win32/shell32/**
+- changed-files:
+  - any-glob-to-any-file:
+    - base/shell/explorer/**
+    - base/shell/rshell/**
+    - dll/shellext/**
+    - dll/win32/browseui/**
+    - dll/win32/shell32/**
 
 Win32SS:
-  - win32ss/**
+- changed-files:
+  - any-glob-to-any-file:
+    - win32ss/**
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
         wget https://gist.githubusercontent.com/zefklop/b2d6a0b470c70183e93d5285a03f5899/raw/build_rosbe_ci.sh
     - name: Get RosBE
       id: get_rosbe
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: RosBE-CI
         key: RosBE-CI-${{runner.os}}-${{steps.get_rosbe_spec.outputs.march-sha}}-${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}}
@@ -44,16 +44,16 @@ jobs:
         sudo ./llvm.sh $LLVM_VERSION
         echo "D_CLANG_VERSION=-DCLANG_VERSION=$LLVM_VERSION" >> $GITHUB_ENV
     - name: Source checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: src
     - name: Set up cache for ccache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ccache
-        key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
+        key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
         restore-keys: |
-          ccache-${{matrix.compiler}}-${{matrix.arch}}-
+          ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-
     - name: Set ccache settings
       run: |
         echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV
@@ -72,7 +72,7 @@ jobs:
     - name: Print ccache statistics
       run: ccache -s
     - name: Upload ISOs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
         path: |
@@ -127,25 +127,25 @@ jobs:
         arch: amd64
         toolset: ${{matrix.toolset}}
     - name: Source checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: src
     - name: Configure
-      run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DDLL_EXPORT_VERSION=${{matrix.dllver}}
+      run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DDLL_EXPORT_VERSION=${{matrix.dllver}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1
     - name: Build
       run: cmake --build build -- -k0
     - name: Generate ISOs
       run: cmake --build build --target bootcd --target livecd
     - name: Upload ISOs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
         path: |
           build/bootcd.iso
           build/livecd.iso
     - name: Upload debug symbols
       if: ${{ matrix.config == 'Debug' }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
         path: build/msvc_pdb
@@ -181,7 +181,7 @@ jobs:
         arch: amd64_arm64
         toolset: ${{matrix.toolset}}
     - name: Source checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: src
     - name: Configure
@@ -202,7 +202,7 @@ jobs:
       if: ${{ matrix.arch == 'arm64' }}
       run: cmake --build build --target calc magnify mstsc notepad osk regedit taskmgr winmine wordpad base/applications/screensavers/all -- -k0
     - name: Upload compiled binaries
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
         path: |
@@ -225,7 +225,7 @@ jobs:
           !**/*.tlb
     - name: Upload debug symbols
       if: ${{ matrix.config == 'Debug' }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
         path: build/msvc_pdb
@@ -266,7 +266,7 @@ jobs:
     - name: Add LLVM to PATH
       run: echo "${env:LLVM_PATH}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
     - name: Source checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: src
     - name: Configure
@@ -276,42 +276,41 @@ jobs:
     - name: Generate ISOs
       run: cmake --build build --target bootcd --target livecd
     - name: Upload ISOs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: reactos-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
         path: |
           build/bootcd.iso
           build/livecd.iso
     - name: Upload debug symbols
       if: ${{ matrix.config == 'Debug' }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: reactos-syms-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
         path: build/msvc_pdb
 
-# Disable MSBuild for the moment being until a proper fix is provided -- see CORE-18911
-#  build-msbuild-i386:
-#    name: MSBuild (i386)
-#    runs-on: windows-2019
-#    steps:
-#    - name: Install Flex and Bison
-#      run: |
-#        curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
-#        7z x flexbison.7z -O${{github.workspace}}\bin
-#        echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-#        echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-#        echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-#    - name: Add CL to PATH
-#      uses: ilammy/msvc-dev-cmd@v1
-#      with:
-#        arch: amd64_x86
-#    - uses: actions/checkout@v3
-#      with:
-#        path: src
-#    - name: Configure
-#      run: |
-#        mkdir build
-#        cd build
-#        cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src
-#    - name: Build
-#      run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd
+  build-msbuild-i386:
+    name: MSBuild (i386)
+    runs-on: windows-2019
+    steps:
+    - name: Install Flex and Bison
+      run: |
+        curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
+        7z x flexbison.7z -O${{github.workspace}}\bin
+        echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+    - name: Add CL to PATH
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: amd64_x86
+    - uses: actions/checkout@v4
+      with:
+        path: src
+    - name: Configure
+      run: |
+        mkdir build
+        cd build
+        cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src
+    - name: Build
+      run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -6,6 +6,6 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v3
+    - uses: actions/labeler@v5
       with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        sync-labels: true
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -14,11 +14,10 @@ jobs:
 
     runs-on: ubuntu-latest
     permissions:
-      issues: write
       pull-requests: write
 
     steps:
-    - uses: actions/stale@v5
+    - uses: actions/stale@v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-stale: 120

diff --git a/base/applications/cacls/lang/ro-RO.rc b/base/applications/cacls/lang/ro-RO.rc
@@ -1,4 +1,11 @@
-/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */
+/*
+ * PROJECT:     ReactOS CACLS
+ * LICENSE:     LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
+ * PURPOSE:     Romanian resource file
+ * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <[email protected]>
+ *              Copyright 2024 Andrei Miloiu <[email protected]>
+ */
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
@@ -34,7 +41,7 @@ Abrevieri:\n\
    OI - Moștenire obiecte.\n\
         ACE moștenită de fișiere.\n\
    IO - Moștenire simplă.\n\
-        ACE neaplicată dosarelor/fișierelor curente.\n"
+        ACE neaplicată folderelor/fișierelor curente.\n"
     IDS_ABBR_CI "(CI)"
     IDS_ABBR_OI "(OI)"
     IDS_ABBR_IO "(IO)"

diff --git a/base/applications/cmdutils/fc/lang/ro-RO.rc b/base/applications/cmdutils/fc/lang/ro-RO.rc
@@ -2,7 +2,7 @@
  * PROJECT:     Windivs FC Command
  * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2022 Andrei Miloiu <[email protected]>
+ * TRANSLATORS: Copyright 2022-2024 Andrei Miloiu <[email protected]>
  */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -39,7 +39,7 @@ FC /B [discul1:][calea1]numele fișierului1 [drive2:][path2]numele fișierului2\
     IDS_OUT_OF_MEMORY "FC: Fără memorie\n"
     IDS_CANNOT_READ "FC: nu poate fi citit din %ls\n"
     IDS_INVALID_SWITCH "FC: Comutator nevalidh\n"
-    IDS_CANNOT_OPEN "FC: nu poate fi deschis %ls - Nu există un astfel de fișier sau dosar\n"
+    IDS_CANNOT_OPEN "FC: nu poate fi deschis %ls - Nu există un astfel de fișier sau folder\n"
     IDS_NEEDS_FILES "FC: Număr insuficient de specificații pentru fișiere\n"
     IDS_CANT_USE_WILDCARD "Semnele speciale ('*' și '?') nu sunt acceptate deocamdată\n"
     IDS_DIFFERENT "FC: Fișierele %ls și %ls sunt diferite\n"

diff --git a/base/applications/ctfmon/CMakeLists.txt b/base/applications/ctfmon/CMakeLists.txt
@@ -6,9 +6,9 @@ list(APPEND SOURCE
 
 add_rc_deps(ctfmon.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/ctfmon.ico)
 add_executable(ctfmon ${SOURCE} ctfmon.rc)
-set_module_type(ctfmon win32gui)
+set_module_type(ctfmon win32gui UNICODE)
 add_dependencies(ctfmon msctf msutb)
-target_link_libraries(ctfmon uuid)
+target_link_libraries(ctfmon uuid cicero)
 add_importlibs(ctfmon msctf msutb advapi32 shell32 user32 msvcrt kernel32)
 add_pch(ctfmon precomp.h SOURCE)
 add_cd_file(TARGET ctfmon DESTINATION reactos/system32 FOR all)
diff --git a/base/applications/ctfmon/precomp.h b/base/applications/ctfmon/precomp.h
@@ -17,8 +17,8 @@
 #include <msctf.h>
 #include <ctfutb.h>
 #include <ctffunc.h>
-#include <cicero/cicbase.h>
-#include <cicero/cicutb.h>
+#include <cicbase.h>
+#include <cicutb.h>
 
 #include "resource.h"
 

diff --git a/base/applications/fltmc/lang/ro-RO.rc b/base/applications/fltmc/lang/ro-RO.rc
@@ -3,7 +3,7 @@
  * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     Romanian resource file
  * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <[email protected]>
- *              Copyright 2023 Andrei Miloiu <[email protected]>
+ *              Copyright 2023-2024 Andrei Miloiu <[email protected]>
  */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -31,9 +31,9 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_ERROR_PRIV      "Eșec la instituirea dreptului de încărcare pentru driverul (0x%X)\n"
-    IDS_ERROR_FILTERS   "Eșec la afișarea filtrelor (0x%X)\n"
-    IDS_ERROR_LOAD      "Eșec la încărcarea filtrului (0x%X)\n"
-    IDS_ERROR_UNLOAD    "Eșec la descărcarea filtrului (0x%X)\n"
-    IDS_ERROR_VOLUMES   "Eșec la afișarea volumelor (0x%X)\n"
+    IDS_ERROR_PRIV      "Nu s-a putut seta dreptul de încărcare pentru driverul (0x%X)\n"
+    IDS_ERROR_FILTERS   "Nu s-au putut afișa filtrele (0x%X)\n"
+    IDS_ERROR_LOAD      "Nu s-a putut încărca filtrul (0x%X)\n"
+    IDS_ERROR_UNLOAD    "Nu s-a putut descărca filtrul (0x%X)\n"
+    IDS_ERROR_VOLUMES   "Nu s-au putut afișa volumele (0x%X)\n"
 END
diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc
@@ -2,9 +2,9 @@
  * PROJECT:     Windivs Virtual Keyboard - OSK
  * LICENSE:     GPL - See COPYING in the top level directory
  * PURPOSE:     On screen keyboard (Romanian resources)
- * COPYRIGHT:   Copyright Denis ROBERT
- *              Copyright Ștefan Fulea (stefan dot fulea at mail dot com)
- *              Copyright 2018 George Bișoc ([email protected])
+ * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <[email protected]>
+ *              Copyright 2018 George Bișoc <[email protected]>
+ *              Copyright 2024 Andrei Miloiu <[email protected]>
  */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
@@ -44,25 +44,25 @@ BEGIN
     BEGIN
         MENUITEM "&Manual", IDM_HELP_TOPICS, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Despre Tastatura virtuală...", IDM_ABOUT
+        MENUITEM "&Despre Tastatura vizuală...", IDM_ABOUT
     END
 END
 
 IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "Tastatură virtuală"
+CAPTION "Tastatură vizuală"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14
     ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20
-    LTEXT "Tastatura virtuală asigură un nivel minim de funcționalitate pentru utilizatori cu dizabilități. Utilizatori cu dizabilități au nevoie de un program cu o mai mare funcționalitate pentru un uz zilnic.", IDC_STATIC, 36, 7, 207, 33
+    LTEXT "Tastatura vizuală asigură un nivel minim de funcționalitate pentru utilizatori cu dizabilități. Utilizatori cu dizabilități au nevoie de un program cu o mai mare funcționalitate pentru un uz zilnic.", IDC_STATIC, 36, 7, 207, 33
     CONTROL "Nu mai afișa acest mesaj", IDC_SHOWWARNINGCHECK, "Button",
             BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10
 END
 
 STRINGTABLE
 BEGIN
-    IDS_OSK "Tastatură virtuală"
+    IDS_OSK "Tastatură vizuală"
     IDS_AUTHORS "Drepturi de autor Denis Robert"
     IDS_NUMLOCK "Num"
     IDS_CAPSLOCK "Caps"