Merge branch 'reactos:master' into uxtheme-nt6plus-apis

Author: Splitwirez

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
           - dllver: 0x600
             config: Release
       fail-fast: false
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - name: Get RosBE build specifics
       id: get_rosbe_spec
@@ -165,6 +165,7 @@ jobs:
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: amd64_arm
+        sdk: 10.0.22621.0   # Windows SDK 10.0.26100.0 dropped support for 32-bit ARM
         toolset: ${{matrix.toolset}}
     - name: Activate VS cmd (arm64)
       if: ${{ matrix.arch == 'arm64' }}

CMakeLists.txt

@@ -140,6 +140,10 @@ if(NOT CMAKE_CROSSCOMPILING)
             add_definitions(/D_X86_ /D__i386__ /DWIN32 /D_WINDOWS)
         elseif(ARCH STREQUAL "amd64")
             add_definitions(-D_AMD64_ -D__x86_64__ /DWIN32 -D_WINDOWS)
+        elseif(ARCH STREQUAL "arm")
+            add_definitions(-D__arm__)
+        elseif(ARCH STREQUAL "arm64")
+            add_definitions(-D__aarch64__)
         endif()
         if(MSVC_VERSION GREATER 1699)
             add_definitions(/D_ALLOW_KEYWORD_MACROS)
@@ -233,6 +237,8 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
                     -D_WIN32_WINDOWS=0x502
                     -D_SETUPAPI_VER=0x502
                     -DMINGW_HAS_SECURE_API=1
+                    -DD3D_UMD_INTERFACE_VERSION=0x000C # Vista
+                    -DDXGKDDI_INTERFACE_VERSION=0x1052 # Vista
                     -DDLL_EXPORT_VERSION=${DLL_EXPORT_VERSION})
 
     # Arch Options
@@ -250,7 +256,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
     elseif(ARCH STREQUAL "amd64")
         # clang-cl defines this one for itself
         if (NOT (MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang"))
-            add_compile_definitions(_M_AMD64)
+            add_compile_definitions(_M_AMD64 _M_X64)
         endif()
         add_definitions(-D_AMD64_ -D__x86_64__ -D_WIN64)
     elseif(ARCH STREQUAL "arm")
@@ -310,17 +316,20 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
         sdk/include
         sdk/include/psdk
         sdk/include/dxsdk
+        sdk/include/winrt
         ${REACTOS_BINARY_DIR}/sdk/include
         ${REACTOS_BINARY_DIR}/sdk/include/psdk
         ${REACTOS_BINARY_DIR}/sdk/include/dxsdk
         ${REACTOS_BINARY_DIR}/sdk/include/ddk
         ${REACTOS_BINARY_DIR}/sdk/include/reactos
         ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc
         sdk/include/crt
+        sdk/include/vcruntime
         sdk/include/ddk
         sdk/include/ndk
         sdk/include/reactos
-        sdk/include/reactos/libs)
+        sdk/include/reactos/libs
+        sdk/lib/pseh/include)
 
     if(ARCH STREQUAL "arm")
         include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/arm)
@@ -337,7 +346,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
     add_subdirectory(sdk/include/asm)
 
     if(ARCH MATCHES "64$")
-        include(sdk/cmake/baseaddress64.cmake)  
+        include(sdk/cmake/baseaddress64.cmake)
     elseif(NO_ROSSYM)
         include(sdk/cmake/baseaddress_dwarf.cmake)
     elseif(MSVC)

base/applications/atactl/helper.h

@@ -35,4 +35,4 @@ typedef struct _SENDCMDINPARAMS {
 	ULONG  dwReserved[4];
 	UCHAR  bBuffer[1];
 } SENDCMDINPARAMS, *PSENDCMDINPARAMS, *LPSENDCMDINPARAMS;
-#include <poppack.h>
+#include <poppack.h>

base/applications/calc/resource.rc

@@ -28,7 +28,7 @@
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* Icons */
-IDI_CALC ICON DISCARDABLE "res/calc.ico"
+IDI_CALC ICON "res/calc.ico"
 
 /* Manifest */
 #include <reactos/manifest_exe.rc>

base/applications/calc/winmain.c

@@ -1015,10 +1015,16 @@ static void handle_copy_command(HWND hWnd)
     TCHAR display[MAX_CALC_SIZE];
     UINT  n;
 
+    // Read current text from output display
     n = GetDlgItemText(hWnd, IDC_TEXT_OUTPUT, display, SIZEOF(display));
 
-    if (calc.base == IDC_RADIO_DEC && _tcschr(calc.buffer, _T('.')) == NULL)
-        display[n - calc.sDecimal_len] = _T('\0');
+    // Check if result is a true number
+    if (!calc.is_nan)
+    {
+        // Remove trailing decimal point if no decimal digits exist
+        if (calc.base == IDC_RADIO_DEC && _tcschr(calc.buffer, _T('.')) == NULL)
+            display[n - calc.sDecimal_len] = _T('\0');
+    }
 
     CopyMemToClipboard(display);
 }

base/applications/charmap_new/Cell.cpp

@@ -91,4 +91,4 @@ CCell::SetCellCoordinates(
     )
 {
     m_CellCoordinates = Coordinates;
-}
+}

base/applications/charmap_new/GridView.cpp

@@ -519,4 +519,4 @@ CGridView::SetCellFocus(
     // Set the new active cell and give it focus
     m_ActiveCell = NewActiveCell;
     m_ActiveCell->SetFocus(true);
-}
+}

base/applications/charmap_new/MainWindow.h

@@ -81,4 +81,4 @@ class CCharMapWindow
 
     bool ChangeMapFont(
         );
-};
+};

base/applications/charmap_new/precomp.h

@@ -51,4 +51,4 @@
 
 //WINE_DEFAULT_DEBUG_CHANNEL(charmap);
 
-#endif
+#endif

base/applications/clipbrd/winutils.c

@@ -257,9 +257,9 @@ void SetDIBitsToDeviceFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE st
          *
          * FIXME: investigate!!
          * ANSWER: this is a Windows bug; part of the answer is there:
-         * https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/ac7ab3b5-8609-4478-b86a-976dab44c271/bug-clipboard-format-conversions-cfdib-cfdibv5-cfdib
+         * https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/ac7ab3b5-8609-4478-b86a-976dab44c271/bug-clipboard-format-conversions-cfdib-cfdibv5-cfdib (DEAD_LINK)
          * May be related:
-         * https://blog.talosintelligence.com/2015/10/dangerous-clipboard.html
+         * https://blog.talosintelligence.com/dangerous-clipboard/
          */
 #if 0
         if ((lpInfoHeader->biSize == sizeof(BITMAPINFOHEADER)) &&