Merge commit '7b24b42711287733b1f8732ecb22b85068c107f4' of https://github.com/shadps4-emu/shadPS4 into rb4-test3

Author: LlysiX

src/common/div_ceil.h

@@ -1,25 +1,25 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <cstddef>
-#include <type_traits>
-
-namespace Common {
-
-/// Ceiled integer division.
-template <typename N, typename D>
-    requires std::is_integral_v<N> && std::is_unsigned_v<D>
-[[nodiscard]] constexpr N DivCeil(N number, D divisor) {
-    return static_cast<N>((static_cast<D>(number) + divisor - 1) / divisor);
-}
-
-/// Ceiled integer division with logarithmic divisor in base 2
-template <typename N, typename D>
-    requires std::is_integral_v<N> && std::is_unsigned_v<D>
-[[nodiscard]] constexpr N DivCeilLog2(N value, D alignment_log2) {
-    return static_cast<N>((static_cast<D>(value) + (D(1) << alignment_log2) - 1) >> alignment_log2);
-}
-
-} // namespace Common
+// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <cstddef>
+#include <type_traits>
+
+namespace Common {
+
+/// Ceiled integer division.
+template <typename N, typename D>
+    requires std::is_integral_v<N> && std::is_unsigned_v<D>
+[[nodiscard]] constexpr N DivCeil(N number, D divisor) {
+    return static_cast<N>((static_cast<D>(number) + divisor - 1) / divisor);
+}
+
+/// Ceiled integer division with logarithmic divisor in base 2
+template <typename N, typename D>
+    requires std::is_integral_v<N> && std::is_unsigned_v<D>
+[[nodiscard]] constexpr N DivCeilLog2(N value, D alignment_log2) {
+    return static_cast<N>((static_cast<D>(value) + (D(1) << alignment_log2) - 1) >> alignment_log2);
+}
+
+} // namespace Common

src/common/ntapi.cpp

@@ -1,30 +1,30 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#ifdef _WIN32
-
-#include "ntapi.h"
-
-NtClose_t NtClose = nullptr;
-NtSetInformationFile_t NtSetInformationFile = nullptr;
-NtCreateThread_t NtCreateThread = nullptr;
-NtTerminateThread_t NtTerminateThread = nullptr;
-NtQueueApcThreadEx_t NtQueueApcThreadEx = nullptr;
-
-namespace Common::NtApi {
-
-void Initialize() {
-    HMODULE nt_handle = GetModuleHandleA("ntdll.dll");
-
-    // http://stackoverflow.com/a/31411628/4725495
-    NtClose = (NtClose_t)GetProcAddress(nt_handle, "NtClose");
-    NtSetInformationFile =
-        (NtSetInformationFile_t)GetProcAddress(nt_handle, "NtSetInformationFile");
-    NtCreateThread = (NtCreateThread_t)GetProcAddress(nt_handle, "NtCreateThread");
-    NtTerminateThread = (NtTerminateThread_t)GetProcAddress(nt_handle, "NtTerminateThread");
-    NtQueueApcThreadEx = (NtQueueApcThreadEx_t)GetProcAddress(nt_handle, "NtQueueApcThreadEx");
-}
-
-} // namespace Common::NtApi
-
-#endif
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#ifdef _WIN32
+
+#include "ntapi.h"
+
+NtClose_t NtClose = nullptr;
+NtSetInformationFile_t NtSetInformationFile = nullptr;
+NtCreateThread_t NtCreateThread = nullptr;
+NtTerminateThread_t NtTerminateThread = nullptr;
+NtQueueApcThreadEx_t NtQueueApcThreadEx = nullptr;
+
+namespace Common::NtApi {
+
+void Initialize() {
+    HMODULE nt_handle = GetModuleHandleA("ntdll.dll");
+
+    // http://stackoverflow.com/a/31411628/4725495
+    NtClose = (NtClose_t)GetProcAddress(nt_handle, "NtClose");
+    NtSetInformationFile =
+        (NtSetInformationFile_t)GetProcAddress(nt_handle, "NtSetInformationFile");
+    NtCreateThread = (NtCreateThread_t)GetProcAddress(nt_handle, "NtCreateThread");
+    NtTerminateThread = (NtTerminateThread_t)GetProcAddress(nt_handle, "NtTerminateThread");
+    NtQueueApcThreadEx = (NtQueueApcThreadEx_t)GetProcAddress(nt_handle, "NtQueueApcThreadEx");
+}
+
+} // namespace Common::NtApi
+
+#endif