2303 publish to Github (#600)

Co-authored-by: Raul Gomez Rodriguez <[email protected]>
microsoft · Mar 23, 2023 · d5841d9 · d5841d9
1 parent f1a347b
commit d5841d9
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 2 deletions.
diff --git a/Include/xsapi-c/social_manager_c.h b/Include/xsapi-c/social_manager_c.h
@@ -263,6 +263,11 @@ typedef struct XblSocialManagerPresenceTitleRecord
     /// </summary>
     uint32_t titleId;
 
+    /// <summary>
+    /// The title name.
+    /// </summary>
+    char titleName[XBL_TITLE_NAME_CHAR_SIZE];
+
     /// <summary>
     /// The active state for the title.
     /// </summary>

diff --git a/Include/xsapi-c/types_c.h b/Include/xsapi-c/types_c.h
@@ -38,6 +38,7 @@ extern "C"
 #define XBL_UNIQUE_MODERN_GAMERTAG_CHAR_SIZE    (XBL_MODERN_GAMERTAG_CHAR_SIZE + 1 + 3 ) // modern gamertag + '#' + max suffix size for cases when MGT display length is 12. Null terminator already accoutned for in MGT
 #define XBL_REAL_NAME_CHAR_SIZE                 (255 * 3)
 #define XBL_RICH_PRESENCE_CHAR_SIZE             (100 * 3)
+#define XBL_TITLE_NAME_CHAR_SIZE                (100 * 3)
 #define XBL_XBOX_USER_ID_CHAR_SIZE              (21 * 3)
 #define XBL_LAST_TIME_PLAYED_CHAR_SIZE          25
 

diff --git a/Source/Services/Multiplayer/Manager/multiplayer_client_manager.cpp b/Source/Services/Multiplayer/Manager/multiplayer_client_manager.cpp
@@ -390,7 +390,7 @@ MultiplayerClientManager::JoinGame(
         gameSession->Join(nullptr, false);
         for (const auto& memberXuid : xboxUserIds)
         {
-            if (memberXuid == primaryContext->Xuid())
+            if (memberXuid != primaryContext->Xuid())
             {
                 gameSession->AddMemberReservation(memberXuid);
             }

diff --git a/Source/Services/Social/Manager/peoplehub_service.cpp b/Source/Services/Social/Manager/peoplehub_service.cpp
@@ -277,6 +277,18 @@ Result<XblSocialManagerPresenceTitleRecord> PeoplehubService::DeserializePresenc
     record.titleId = utils::internal_string_to_uint32(titleId);
     RETURN_HR_IF_FAILED(JsonUtils::ExtractJsonBool(json, "IsPrimary", record.isPrimary));
 
+    //get titleName from Presence string: format should be "Title - Rich Presence Text"
+    for (int i = 0; i < XBL_TITLE_NAME_CHAR_SIZE; i++)
+    {
+        char c = record.presenceText[i];
+        if (c == '-' || c == '\0')
+        {
+            record.titleName[i] = '\0';
+            break;
+        }
+        record.titleName[i] = c;
+    }
+
     return Result<XblSocialManagerPresenceTitleRecord>{ record };
 }
 

diff --git a/Source/Services/Social/Manager/social_graph.cpp b/Source/Services/Social/Manager/social_graph.cpp
@@ -749,6 +749,7 @@ XblSocialManagerPresenceRecord SocialGraph::ConvertPresenceRecord(
 
             smTitleRecord.titleId = newTitleRecord.titleId;
             smTitleRecord.isTitleActive = newTitleRecord.titleActive;
+            utils::strcpy(smTitleRecord.titleName, sizeof(smTitleRecord.titleName), newTitleRecord.titleName);
             utils::strcpy(smTitleRecord.presenceText, sizeof(smTitleRecord.presenceText), newTitleRecord.richPresenceString);
             smTitleRecord.isBroadcasting = newTitleRecord.broadcastRecord != nullptr;
             smTitleRecord.deviceType = deviceRecord.deviceType;

diff --git a/Source/Shared/build_version.h b/Source/Shared/build_version.h
@@ -9,4 +9,4 @@
 //*********************************************************
 #pragma once
 
-#define XBOX_SERVICES_API_VERSION_STRING "2022.10.20221025.1"
+#define XBOX_SERVICES_API_VERSION_STRING "2023.03.20230214.0"
diff --git a/Tests/ApiExplorer/Shared/mem_hook.cpp b/Tests/ApiExplorer/Shared/mem_hook.cpp
@@ -451,6 +451,7 @@ bool ApiRunerMemHook::IsStackInXSAPI(StackInfo& stackInfo)
 void ApiRunerMemHook::GetStackTrace(StackInfo &stackInfo)
 {
 #if HC_PLATFORM == HC_PLATFORM_WIN32 || (HC_PLATFORM == HC_PLATFORM_GDK && !_GAMING_XBOX)
+    std::lock_guard<std::recursive_mutex> guard(m_lock);
     void* stack[TRACE_MAX_STACK_FRAMES] = { 0 };
     WORD numberOfFrames = CaptureStackBackTrace(0, TRACE_MAX_STACK_FRAMES, stack, NULL);
     stackInfo.stackSize = numberOfFrames < 64 ? numberOfFrames : 64;