Merge

.github/workflows/build.yml

@@ -82,24 +82,14 @@ jobs:
   build-msvc:
     strategy:
       matrix:
-        os: [windows-latest, windows-2019]
-        toolset: ['14.2', '14.1', '14.0'] # VS 2019, 2017, and 2015 (see below)
+        os: [windows-latest]
+        toolset: ['14.3','14.2'] # VS 2022, and 2019 (see below)
         arch: [i386, amd64]
         config: [Debug, Release]
         dllver: ['0x502', '0x600']
-        exclude: # VS 2019, 2017 only with windows-latest; VS 2015 only with windows-2019
-          - os: windows-2019
-            toolset: '14.2'
-          - os: windows-2019
-            toolset: '14.1'
-          - os: windows-latest
-            toolset: '14.0'
+        exclude: # Build NT6 ISOs only with the latest toolset when compiled as a debug build
           - dllver: 0x600
-            os: windows-2019
-          - dllver: 0x600
-            toolset: '14.1'
-          - dllver: 0x600
-            toolset: '14.0'
+            toolset: 14.2
           - dllver: 0x600
             config: Release
       fail-fast: false
@@ -153,7 +143,7 @@ jobs:
   build-msvc-arm:
     strategy:
       matrix:
-        toolset: ['14.2', '14.1'] # VS 2019, 2017
+        toolset: ['14.3','14.2'] # VS 2022, 2019
         arch: [arm, arm64]
         config: [Debug, Release]
       fail-fast: false
@@ -230,6 +220,7 @@ jobs:
         name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
         path: build/msvc_pdb
 
+  # FIXME: Does not boot on toolset 14.1, 14.3 is untested
   build-clang-cl:
     strategy:
       matrix:
@@ -256,13 +247,13 @@ jobs:
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: amd64_x86
-        toolset: '14.1' # latest masm build known to make bootable builds
+        toolset: '14.3'
     - name: Activate VS cmd (amd64)
       if: ${{ matrix.arch == 'amd64' }}
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: amd64
-        toolset: '14.1' # latest masm build known to make bootable builds
+        toolset: '14.3'
     - name: Add LLVM to PATH
       run: echo "${env:LLVM_PATH}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
     - name: Source checkout
@@ -291,7 +282,7 @@ jobs:
 
   build-msbuild-i386:
     name: MSBuild (i386)
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
     - name: Install Flex and Bison
       run: |
@@ -311,6 +302,6 @@ jobs:
       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
+        cmake -G "Visual Studio 17 2022" -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

CODEOWNERS

@@ -96,7 +96,7 @@
 # Apisets
 #   M: learn-more, learn_more, Mark Jansen
 #   S: Maintained
-/dll/apisets/   @learn-more
+/sdk/lib/apisets/   @learn-more
 
 # Application Compatibility subystem
 #   M: learn-more, learn_more, Mark Jansen

README.md

@@ -8,23 +8,17 @@
 
 <p align=center>
   <a href="https://reactos.org/project-news/reactos-0414-released/">
-    <img alt="ReactOS 0.4.14 Release" src="https://img.shields.io/badge/release-0.4.14-0688CB.svg">
-  </a>
+    <img alt="ReactOS 0.4.14 Release" src="https://img.shields.io/badge/release-0.4.14-0688CB.svg"></a>
   <a href="https://reactos.org/download/">
-    <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg">
-  </a>
+    <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg"></a>
   <a href="https://sourceforge.net/projects/reactos/">
-    <img alt="SourceForge Download" src="https://img.shields.io/sourceforge/dm/reactos.svg?colorB=0688CB">
-  </a>
+    <img alt="SourceForge Download" src="https://img.shields.io/sourceforge/dm/reactos.svg?colorB=0688CB"></a>
   <a href="https://github.com/reactos/reactos/blob/master/COPYING">
-    <img alt="License" src="https://img.shields.io/badge/license-GNU_GPL_2.0-0688CB.svg">
-  </a>
+    <img alt="License" src="https://img.shields.io/badge/license-GNU_GPL_2.0-0688CB.svg"></a>
   <a href="https://reactos.org/donate/">
-    <img alt="Donate" src="https://img.shields.io/badge/%24-donate-E44E4A.svg">
-  </a>
+    <img alt="Donate" src="https://img.shields.io/badge/%24-donate-E44E4A.svg"></a>
   <a href="https://twitter.com/reactos">
-    <img alt="Follow on Twitter" src="https://img.shields.io/twitter/follow/reactos.svg?style=social&label=Follow%20%40reactos">
-  </a>
+    <img alt="Follow on Twitter" src="https://img.shields.io/twitter/follow/reactos.svg?style=social&label=Follow%20%40reactos"></a>
 </p>
 
 ## Quick Links
@@ -56,7 +50,7 @@ The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/r
 To build the system it is strongly advised to use the _ReactOS Build Environment (RosBE)._
 Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: ["Build Environment"](https://reactos.org/wiki/Build_Environment).
 
-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).
+Alternatively one can use Microsoft Visual C++ (MSVC) version 2019+. 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.
 
@@ -127,10 +121,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.2.0-0688CB.svg
-[rosbeunix.badge]:  https://img.shields.io/badge/RosBE_Unix-2.2-0688CB.svg
+[rosbewin.badge]:   https://img.shields.io/badge/RosBE_Windows-2.2.1-0688CB.svg
+[rosbeunix.badge]:  https://img.shields.io/badge/RosBE_Unix-2.2.1-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.2.0/
-[rosbeunix.link]:   https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.2/
+[rosbewin.link]:    https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.2.1/
+[rosbeunix.link]:   https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.2.1/

base/applications/cmdutils/cscript/CMakeLists.txt

@@ -15,6 +15,7 @@ add_typelib(ihost.idl)
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb)
 target_link_libraries(cscript uuid wine)
 set_module_type(cscript win32cui UNICODE)
+add_delay_importlibs(cscript shlwapi)
 add_importlibs(cscript shell32 oleaut32 ole32 advapi32 user32 msvcrt kernel32 ntdll)
 add_dependencies(cscript stdole2 cscript_idlheader)
 add_pch(cscript ${wscript_folder}/precomp.h SOURCE)

base/applications/cmdutils/wscript/CMakeLists.txt

@@ -13,6 +13,7 @@ add_typelib(ihost.idl)
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb)
 target_link_libraries(wscript uuid wine)
 set_module_type(wscript win32gui UNICODE)
+add_delay_importlibs(wscript shlwapi)
 add_importlibs(wscript shell32 oleaut32 ole32 user32 advapi32 msvcrt kernel32 ntdll)
 add_dependencies(wscript stdole2 wscript_idlheader)
 add_pch(wscript precomp.h SOURCE)