2203 GDK QFE1 (#589)

* 2203 GDK QFE1

Build/Microsoft.Xbox.Services.142.GDK.C/Microsoft.Xbox.Services.142.GDK.C.vcxproj

@@ -41,7 +41,6 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
@@ -50,7 +49,7 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ShowIncludes>
       <MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</MinimalRebuild>
-      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/permissive- /Zc:twoPhase- /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
       <FloatingPointModel>Fast</FloatingPointModel>
       <SupportJustMyCode>false</SupportJustMyCode>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -326,4 +325,4 @@
   </ItemGroup>
   <ItemGroup>
   </ItemGroup>
-</Project>
+</Project>

Build/Microsoft.Xbox.Services.UnitTest.141.TE/TestAll.runsettings

@@ -2,5 +2,6 @@
 <RunSettings>
   <RunConfiguration>
     <TargetPlatform>x64</TargetPlatform>
+    <BatchSize>1</BatchSize>
   </RunConfiguration>
 </RunSettings>

Build/Microsoft.Xbox.Services.UnitTest.141.TE/TestCodeCoverage.runsettings

@@ -2,6 +2,7 @@
 <RunSettings>
   <RunConfiguration>
     <TargetPlatform>x64</TargetPlatform>
+    <BatchSize>1</BatchSize>
   </RunConfiguration>
   <DataCollectionRunSettings>
     <DataCollectors>

Build/Microsoft.Xbox.Services.UnitTest.141.TE/TestMultiplayerManager.runsettings

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RunSettings>
   <RunConfiguration>
-    <TargetPlatform>x86</TargetPlatform>
+    <TargetPlatform>x64</TargetPlatform>
+    <BatchSize>1</BatchSize>
   </RunConfiguration>
   <DataCollectionRunSettings>
     <DataCollectors>

Build/Microsoft.Xbox.Services.UnitTest.141.TE/TestSocialManager.runsettings

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RunSettings>
   <RunConfiguration>
-    <TargetPlatform>x86</TargetPlatform>
+    <TargetPlatform>x64</TargetPlatform>
+    <BatchSize>1</BatchSize>
   </RunConfiguration>
   <DataCollectionRunSettings>
     <DataCollectors>

Build/Microsoft.Xbox.Services.UnitTest.142.TE/TestAll.runsettings

@@ -2,5 +2,6 @@
 <RunSettings>
   <RunConfiguration>
     <TargetPlatform>x64</TargetPlatform>
+    <BatchSize>1</BatchSize>
   </RunConfiguration>
 </RunSettings>

Build/Microsoft.Xbox.Services.UnitTest.142.TE/TestCodeCoverage.runsettings

@@ -2,6 +2,7 @@
 <RunSettings>
   <RunConfiguration>
     <TargetPlatform>x64</TargetPlatform>
+    <BatchSize>1</BatchSize>
   </RunConfiguration>
   <DataCollectionRunSettings>
     <DataCollectors>

Build/Microsoft.Xbox.Services.UnitTest.142.TE/TestMultiplayerManager.runsettings

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RunSettings>
   <RunConfiguration>
-    <TargetPlatform>x86</TargetPlatform>
+    <TargetPlatform>x64</TargetPlatform>
+    <BatchSize>1</BatchSize>
   </RunConfiguration>
   <DataCollectionRunSettings>
     <DataCollectors>

Build/Microsoft.Xbox.Services.UnitTest.142.TE/TestSocialManager.runsettings

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RunSettings>
   <RunConfiguration>
-    <TargetPlatform>x86</TargetPlatform>
+    <TargetPlatform>x64</TargetPlatform>
+    <BatchSize>1</BatchSize>
   </RunConfiguration>
   <DataCollectionRunSettings>
     <DataCollectors>

External/Xal/Source/Xal/Include/Xal/xal_internal_telemetry.h

@@ -20,43 +20,31 @@ extern "C"
 /// Controls if the event is to be uploaded immediately or can be batched.
 /// </summary>
 /// <remarks>
-/// This is a copy of cll::Latency and should be kept in sync with it.
+/// This is a copy of MAE::EventLatency and should be kept in sync with it.
 /// </remarks>
 typedef enum XalTelemetryLatency
 {
-    XalTelemetryLatency_Unspecified = 0,
+    XalTelemetryLatency_Unspecified = -1,
+    XalTelemetryLatency_Off = 0,
     XalTelemetryLatency_Normal = 0x0100,
-    XalTelemetryLatency_Realtime = 0x0200,
+    XalTelemetryLatency_CostDeferred = 0x0200,
+    XalTelemetryLatency_Realtime = 0x0300,
+    XalTelemetryLatency_Max = 0x0400,
 } XalTelemetryLatency;
 
 /// <summary>
-/// Controls the priority of keeping the event in case cll needs to evict some.
+/// Controls the priority of keeping the event in case 1DS needs to evict some.
 /// </summary>
 /// <remarks>
-/// This is a copy of cll::Persistence and should be kept in sync with it.
+/// This is a copy of MAE::EventPersistence and should be kept in sync with it.
 /// </remarks>
 typedef enum XalTelemetryPersistence
 {
-    XalTelemetryPersistence_Unspecified = 0,
-    XalTelemetryPersistence_Normal = 0x01,
-    XalTelemetryPersistence_Critical = 0x02,
+    XalTelemetryPersistence_Normal = 0x00,
+    XalTelemetryPersistence_Critical = 0x01,
+    XalTelemetryPersistence_DoNotStoreOnDisk = 0x02,
 } XalTelemetryPersistence;
 
-/// <summary>
-/// Controls the sensitivity of the event.
-/// </summary>
-/// <remarks>
-/// This is a copy of cll::Sensitivity and should be kept in sync with it.
-/// </remarks>
-typedef enum XalTelemetrySensitivity
-{
-    XalTelemetrySensitivityUnspecified = 0x000001,
-    XalTelemetrySensitivity_None = 0x000000,
-    XalTelemetrySensitivity_Mark = 0x080000,
-    XalTelemetrySensitivity_Hash = 0x100000,
-    XalTelemetrySensitivity_Drop = 0x200000,
-} XalTelemetrySensitivity;
-
 /// <summary>
 /// Controls the sampling rate of the event.
 /// </summary>
@@ -112,10 +100,9 @@ typedef struct XalTelemetryTicket
 /// be properly formatted JSON.</param>
 /// <param name="ticketCount">The number of tickets to send with the event.</param>
 /// <param name="tickets">Information about the tickets to send.</param>
-/// <param name="latency">The cll latency for this event.</param>
-/// <param name="persistence">The cll persistence for this event.</param>
-/// <param name="sensitivity">The cll sensitivity for this event.</param>
-/// <param name="sampleRate">The cll sampleRate for this event.</param>
+/// <param name="latency">The 1DS latency for this event.</param>
+/// <param name="persistence">The 1DS persistence for this event.</param>
+/// <param name="sampleRate">The 1DS sampleRate for this event.</param>
 STDAPI XalTelemetryWriteEvent(
     _In_ XalUserHandle user,
     _In_z_ char const* iKey,
@@ -125,7 +112,6 @@ STDAPI XalTelemetryWriteEvent(
     _In_reads_(ticketCount) XalTelemetryTicket* tickets,
     _In_ XalTelemetryLatency latency,
     _In_ XalTelemetryPersistence persistence,
-    _In_ XalTelemetrySensitivity sensitivity,
     _In_ XalTelemetrySampleRate sampleRate
 ) noexcept;
 

External/Xal/Source/Xal/Include/Xal/xal_platform.h

@@ -81,6 +81,15 @@ STDAPI XalPlatformWebSetEventHandler(
     _In_ XalPlatformWebShowUrlEventHandler2* handler
 ) noexcept;
 
+/// <summary>
+/// Clears the show url event handler.
+/// </summary>
+/// <returns>Result code for this API operation.</returns>
+/// <remarks>
+/// Must be called before XalInitialize or after XalCleanupAsync completes.
+/// </remarks>
+STDAPI XalPlatformWebClearEventHandler() noexcept;
+
 /// <summary>
 /// Completes a show url operation.
 /// </summary>
@@ -119,6 +128,15 @@ STDAPI XalPlatformStorageSetEventHandlers(
     _In_ XalPlatformStorageEventHandlers2* handlers
 ) noexcept;
 
+/// <summary>
+/// Clears the storage event handlers.
+/// </summary>
+/// <returns>Result code for this API operation.</returns>
+/// <remarks>
+/// Must be called before XalInitialize or after XalCleanupAsync completes.
+/// </remarks>
+STDAPI XalPlatformStorageClearEventHandlers() noexcept;
+
 /// <summary>
 /// Completes write to storage operation.
 /// </summary>
@@ -193,6 +211,15 @@ STDAPI XalPlatformRemoteConnectSetEventHandlers(
     _In_ XalPlatformRemoteConnectEventHandlers2* handlers
 ) noexcept;
 
+/// <summary>
+/// Clears the remote connect event handlers.
+/// </summary>
+/// <returns>Result code for this API operation.</returns>
+/// <remarks>
+/// Must be called before XalInitialize or after XalCleanupAsync completes.
+/// </remarks>
+STDAPI XalPlatformRemoteConnectClearEventHandlers() noexcept;
+
 /// <summary>
 /// Signal to Xal that the remote connect prompt has been dismissed by the user.
 /// </summary>

External/Xal/Source/Xal/Include/Xal/xal_types.h

@@ -64,6 +64,10 @@ extern "C"
 #define E_XAL_FAILEDTORESOLVE               MAKE_E_HC(0x5112L) // 0x89235112
 #define E_XAL_NOACCOUNTPROVIDER             MAKE_E_HC(0x5113L) // 0x89235113
 #define E_XAL_MISMATCHEDTITLEANDCLIENTIDS   MAKE_E_HC(0x5114L) // 0x89235114
+#define E_XAL_INVALIDAPPCONFIGURATION       MAKE_E_HC(0x5115L) // 0x89235115
+#define E_XAL_MALFORMEDCLIENTID             MAKE_E_HC(0x5116L) // 0x89235116
+#define E_XAL_MISSINGCLIENTID               MAKE_E_HC(0x5117L) // 0x89235117
+#define E_XAL_MISSINGTITLEID                MAKE_E_HC(0x5118L) // 0x89235118
 
 // E_XAL_INTERNAL_* values should never be returned to callers of XAL.
 #define E_XAL_INTERNAL_SWITCHUSER           MAKE_E_HC(0x5171L) // 0x89235171
@@ -84,15 +88,25 @@ extern "C"
 #undef E_XAL_NOTOKENREQUIRED
 #undef E_XAL_NODEFAULTUSER
 #undef E_XAL_FAILEDTORESOLVE
-
-#define E_XAL_USERSETFULL                   E_GAMEUSER_MAX_USERS_ADDED              // 0x89245100
-#define E_XAL_USERSIGNEDOUT                 E_GAMEUSER_SIGNED_OUT                   // 0x89245101
-#define E_XAL_UIREQUIRED                    E_GAMEUSER_RESOLVE_USER_ISSUE_REQUIRED  // 0x89245102
-#define E_XAL_DEFERRALNOTAVAILABLE          E_GAMEUSER_DEFERRAL_NOT_AVAILABLE       // 0x89245103
-#define E_XAL_USERNOTFOUND                  E_GAMEUSER_USER_NOT_FOUND               // 0x89245104
-#define E_XAL_NOTOKENREQUIRED               E_GAMEUSER_NO_TOKEN_REQUIRED            // 0x89245105
-#define E_XAL_NODEFAULTUSER                 E_GAMEUSER_NO_DEFAULT_USER              // 0x89245106
-#define E_XAL_FAILEDTORESOLVE               E_GAMEUSER_FAILED_TO_RESOLVE            // 0x89245107
+#undef E_XAL_MISMATCHEDTITLEANDCLIENTIDS
+#undef E_XAL_INVALIDAPPCONFIGURATION
+#undef E_XAL_MALFORMEDCLIENTID
+#undef E_XAL_MISSINGCLIENTID
+#undef E_XAL_MISSINGTITLEID
+
+#define E_XAL_USERSETFULL                   E_GAMEUSER_MAX_USERS_ADDED                      // 0x89245100
+#define E_XAL_USERSIGNEDOUT                 E_GAMEUSER_SIGNED_OUT                           // 0x89245101
+#define E_XAL_UIREQUIRED                    E_GAMEUSER_RESOLVE_USER_ISSUE_REQUIRED          // 0x89245102
+#define E_XAL_DEFERRALNOTAVAILABLE          E_GAMEUSER_DEFERRAL_NOT_AVAILABLE               // 0x89245103
+#define E_XAL_USERNOTFOUND                  E_GAMEUSER_USER_NOT_FOUND                       // 0x89245104
+#define E_XAL_NOTOKENREQUIRED               E_GAMEUSER_NO_TOKEN_REQUIRED                    // 0x89245105
+#define E_XAL_NODEFAULTUSER                 E_GAMEUSER_NO_DEFAULT_USER                      // 0x89245106
+#define E_XAL_FAILEDTORESOLVE               E_GAMEUSER_FAILED_TO_RESOLVE                    // 0x89245107
+#define E_XAL_MISSINGTITLEID                E_GAMEUSER_NO_TITLE_ID                          // 0x89245108
+#define E_XAL_INVALIDAPPCONFIGURATION       E_GAMEUSER_INVALID_APP_CONFIGURATION            // 0x89245112
+#define E_XAL_MALFORMEDCLIENTID             E_GAMEUSER_MALFORMED_MSAAPPID                   // 0x89245113
+#define E_XAL_MISMATCHEDTITLEANDCLIENTIDS   E_GAMEUSER_INCONSISTENT_MSAAPPID_AND_TITLEID    // 0x89245114
+#define E_XAL_MISSINGCLIENTID               E_GAMEUSER_NO_MSAAPPID                          // 0x89245115
 #endif
 
 //------------------------------------------------------------------------------
@@ -154,7 +168,9 @@ typedef enum XalPrivilege
     XalPrivilege_SocialNetworkSharing   = 220,
     /// <summary>Access user generated content in game</summary>
     XalPrivilege_Ugc                    = 247,
-    /// <summary>Use real time voice and text communication</summary>
+    /// <summary>Use real time voice and text communication with users in their friends list</summary>
+    XalPrivilege_CommsFriendsOnly       = 251,
+    /// <summary>Use real time voice and text communication with all users</summary>
     XalPrivilege_Comms                  = 252,
     /// <summary>Join multiplayer sessions</summary>
     XalPrivilege_Multiplayer            = 254,

Include/xsapi-c/multiplayer_manager_c.h

@@ -280,6 +280,11 @@ enum class XblMultiplayerEventType : uint32_t
     /// <summary>
     /// Indicates that the invite API operation has been completed.
     /// </summary>
+    /// <remarks>
+    /// On Xbox, receiving this event does not necessarily mean an invite has been sent successfully. 
+    /// You will receive this event as long as the game invite UI flow was successfully invoked, 
+    /// even if the user cancelled the UI flow without sending an invite, or the invite failed to submit to the service for various reasons. 
+    /// </remarks>
     InviteSent,
 
     /// <summary>

Source/Services/Achievements/Manager/achievements_manager_api.cpp

@@ -131,6 +131,7 @@ STDAPI XblAchievementsManagerDoWork(
     _Outptr_result_maybenull_ const XblAchievementsManagerEvent** achievementsEvents,
     _Out_ size_t* achievementsEventsCount
 ) XBL_NOEXCEPT
+try
 {
     INIT_OUT_PTR_PARAM(achievementsEvents);
 
@@ -149,12 +150,14 @@ STDAPI XblAchievementsManagerDoWork(
         }
     );
 }
+CATCH_RETURN()
 
 STDAPI XblAchievementsManagerGetAchievement(
     _In_ uint64_t xboxUserId,
     _In_ const char* achievementId,
     _Outptr_result_maybenull_ XblAchievementsManagerResultHandle* achievementResult
 ) XBL_NOEXCEPT
+try
 {
     RETURN_HR_INVALIDARGUMENT_IF(achievementId == nullptr || achievementResult == nullptr);
     RETURN_HR_INVALIDARGUMENT_IF_EMPTY_STRING(achievementId);
@@ -176,13 +179,15 @@ STDAPI XblAchievementsManagerGetAchievement(
         }
     );
 }
+CATCH_RETURN()
 
 STDAPI XblAchievementsManagerGetAchievements(
     _In_ uint64_t xboxUserId,
     _In_ XblAchievementOrderBy sortField,
     _In_ XblAchievementsManagerSortOrder sortOrder,
     _Outptr_result_maybenull_ XblAchievementsManagerResultHandle* achievementsResult
 ) XBL_NOEXCEPT
+try
 {
     INIT_OUT_PTR_PARAM(achievementsResult);
 
@@ -229,6 +234,7 @@ STDAPI XblAchievementsManagerGetAchievements(
         }
     );
 }
+CATCH_RETURN()
 
 STDAPI XblAchievementsManagerGetAchievementsByState(
     _In_ uint64_t xboxUserId,
@@ -237,6 +243,7 @@ STDAPI XblAchievementsManagerGetAchievementsByState(
     _In_ XblAchievementProgressState achievementState,
     _Outptr_result_maybenull_ XblAchievementsManagerResultHandle* achievementsResult
 ) XBL_NOEXCEPT
+try
 {
     INIT_OUT_PTR_PARAM(achievementsResult);
 
@@ -291,12 +298,14 @@ STDAPI XblAchievementsManagerGetAchievementsByState(
         }
     );
 }
+CATCH_RETURN()
 
 STDAPI XblAchievementsManagerUpdateAchievement(
     _In_ uint64_t xboxUserId,
     _In_ const char* achievementId,
     _In_ uint8_t currentProgress
 ) XBL_NOEXCEPT
+try
 {
     return ApiImpl([&](AchievementsManager& achievementsManager)
         {
@@ -314,4 +323,5 @@ STDAPI XblAchievementsManagerUpdateAchievement(
             return S_OK;
         }
     );
-}
+}
+CATCH_RETURN()

Source/Services/Achievements/achievements_api.cpp

@@ -186,9 +186,11 @@ STDAPI XblAchievementsResultGetNextResult(
     _In_ XAsyncBlock* async,
     _Out_ XblAchievementsResultHandle* result
 ) XBL_NOEXCEPT
+try
 {
     return XAsyncGetResult(async, nullptr, sizeof(XblAchievementsResultHandle), result, nullptr);
 }
+CATCH_RETURN()
 
 STDAPI XblAchievementsUpdateAchievementAsyncInternal(
     _In_ XblContextHandle xboxLiveContextHandle,

Source/Services/Common/xbox_live_context_api.cpp

@@ -88,10 +88,12 @@ CATCH_RETURN()
 void XblSetApiType(
     _In_ XblApiType apiType
 ) XBL_NOEXCEPT
+try
 {
     auto state = GlobalState::Get();
     if (state)
     {
         state->ApiType = apiType;
     }
 }
+CATCH_RETURN_WITH(;)