Merge branch 'development' into cmake/linux_fix_warn_unused

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h

@@ -109,6 +109,19 @@
 #define AZ_TRAIT_USE_ERRNO_T_TYPEDEF 1
 #define AZ_TRAIT_USE_POSIX_TEMP_FOLDER 0
 
+// wchar_t/char formatting
+// Reason: https://docs.microsoft.com/en-us/cpp/c-runtime-library/format-specification-syntax-printf-and-wprintf-functions?view=msvc-160
+// The Z type character, and the behavior of the c, C, s, and S type characters when they're used with the printf and wprintf functions, 
+// are Microsoft extensions. The ISO C standard uses c and s consistently for narrow characters and strings, and C and S for wide characters
+// and strings, in all formatting functions.
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_CHAR "%c"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_WCHAR "%C"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_CHAR "%c"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_WCHAR "%C"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_STRING "%s"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_WSTRING "%S"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_STRING "%s"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_WSTRING "%S"
 // Legacy traits ...
 #define AZ_TRAIT_LEGACY_CRYCOMMON_USE_WINDOWS_STUBS 1
 #define AZ_TRAIT_LEGACY_CRYPAK_UNIX_LIKE_FILE_SYSTEM 1

Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/IO/Streamer/StreamerContext_WinAPI.cpp

@@ -49,7 +49,7 @@ namespace AZ::Platform
         AZ_Assert(m_events[0], "There is no synchronization event created for the main streamer thread to use to suspend.");
 
         DWORD result = ::WaitForMultipleObjects(m_handleCount, m_events, false, INFINITE);
-        if (result >= WAIT_OBJECT_0 && result < WAIT_OBJECT_0 + m_handleCount)
+        if (result < WAIT_OBJECT_0 + m_handleCount)
         {
             DWORD index = result - WAIT_OBJECT_0;
             ::ResetEvent(m_events[index]);

Code/Framework/AzCore/Platform/Common/azcore_profile_telemetry_files.cmake

@@ -1,12 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-#
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-set(FILES
-    RadTelemetry/ProfileTelemetry.h
-    RadTelemetry/ProfileTelemetryBus.h
-)

Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h

@@ -109,6 +109,20 @@
 #define AZ_TRAIT_USE_ERRNO_T_TYPEDEF 1
 #define AZ_TRAIT_USE_POSIX_TEMP_FOLDER 1
 
+// wchar_t/char formatting
+// Reason: https://docs.microsoft.com/en-us/cpp/c-runtime-library/format-specification-syntax-printf-and-wprintf-functions?view=msvc-160
+// The Z type character, and the behavior of the c, C, s, and S type characters when they're used with the printf and wprintf functions, 
+// are Microsoft extensions. The ISO C standard uses c and s consistently for narrow characters and strings, and C and S for wide characters
+// and strings, in all formatting functions.
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_CHAR "%c"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_WCHAR "%C"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_CHAR "%c"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_WCHAR "%C"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_STRING "%s"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_WSTRING "%S"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_STRING "%s"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_WSTRING "%S"
+
 // Legacy traits ...
 #define AZ_TRAIT_LEGACY_CRYCOMMON_USE_WINDOWS_STUBS 1
 #define AZ_TRAIT_LEGACY_CRYPAK_UNIX_LIKE_FILE_SYSTEM 1

Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h

@@ -109,6 +109,20 @@
 #define AZ_TRAIT_USE_ERRNO_T_TYPEDEF 0
 #define AZ_TRAIT_USE_POSIX_TEMP_FOLDER 1
 
+// wchar_t/char formatting
+// Reason: https://docs.microsoft.com/en-us/cpp/c-runtime-library/format-specification-syntax-printf-and-wprintf-functions?view=msvc-160
+// The Z type character, and the behavior of the c, C, s, and S type characters when they're used with the printf and wprintf functions, 
+// are Microsoft extensions. The ISO C standard uses c and s consistently for narrow characters and strings, and C and S for wide characters
+// and strings, in all formatting functions.
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_CHAR "%c"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_WCHAR "%C"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_CHAR "%c"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_WCHAR "%C"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_STRING "%s"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_WSTRING "%S"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_STRING "%s"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_WSTRING "%S"
+
 // Legacy traits ...
 #define AZ_TRAIT_LEGACY_CRYCOMMON_USE_WINDOWS_STUBS 1
 #define AZ_TRAIT_LEGACY_CRYPAK_UNIX_LIKE_FILE_SYSTEM 1

Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h

@@ -109,6 +109,20 @@
 #define AZ_TRAIT_USE_ERRNO_T_TYPEDEF 0
 #define AZ_TRAIT_USE_POSIX_TEMP_FOLDER 0
 
+// wchar_t/char formatting
+// Reason: https://docs.microsoft.com/en-us/cpp/c-runtime-library/format-specification-syntax-printf-and-wprintf-functions?view=msvc-160
+// The Z type character, and the behavior of the c, C, s, and S type characters when they're used with the printf and wprintf functions, 
+// are Microsoft extensions. The ISO C standard uses c and s consistently for narrow characters and strings, and C and S for wide characters
+// and strings, in all formatting functions.
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_CHAR "%c"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_WCHAR "%C"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_CHAR "%C"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_WCHAR "%c"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_STRING "%s"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_WSTRING "%S"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_STRING "%S"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_WSTRING "%s"
+
 // Legacy traits ...
 #define AZ_TRAIT_LEGACY_CRYCOMMON_USE_WINDOWS_STUBS 0
 #define AZ_TRAIT_LEGACY_CRYPAK_UNIX_LIKE_FILE_SYSTEM 0

Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h

@@ -110,6 +110,20 @@
 #define AZ_TRAIT_USE_ERRNO_T_TYPEDEF 0
 #define AZ_TRAIT_USE_POSIX_TEMP_FOLDER 0
 
+// wchar_t/char formatting
+// Reason: https://docs.microsoft.com/en-us/cpp/c-runtime-library/format-specification-syntax-printf-and-wprintf-functions?view=msvc-160
+// The Z type character, and the behavior of the c, C, s, and S type characters when they're used with the printf and wprintf functions, 
+// are Microsoft extensions. The ISO C standard uses c and s consistently for narrow characters and strings, and C and S for wide characters
+// and strings, in all formatting functions.
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_CHAR "%c"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_WCHAR "%C"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_CHAR "%c"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_WCHAR "%C"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_STRING "%s"
+#define AZ_TRAIT_FORMAT_STRING_PRINTF_WSTRING "%S"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_STRING "%s"
+#define AZ_TRAIT_FORMAT_STRING_WPRINTF_WSTRING "%S"
+
 // Legacy traits ...
 #define AZ_TRAIT_LEGACY_CRYCOMMON_USE_WINDOWS_STUBS 1
 #define AZ_TRAIT_LEGACY_CRYPAK_UNIX_LIKE_FILE_SYSTEM 1