2203 GDK (#584)

Author: natiskan

Build/Microsoft.Xbox.Services.141.GDK.C.Thunks/Microsoft.Xbox.Services.141.GDK.C.Thunks.vcxproj

@@ -33,7 +33,8 @@
     <TargetName>Microsoft.Xbox.Services.141.GDK.C.Thunks</TargetName>
     <RootNamespace>Microsoft.Xbox.Services</RootNamespace>
     <XsapiPlatform>GDK</XsapiPlatform>
-    <XsapiBuildFromSource>1</XsapiBuildFromSource>
+    <XsapiLibBuildFromSource>true</XsapiLibBuildFromSource>
+    <LibHttpClientBuildFromSource>true</LibHttpClientBuildFromSource>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), xsapi.gdk.bwoi.props))\xsapi.gdk.bwoi.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

Build/Microsoft.Xbox.Services.Win32.C.Dll.def

@@ -20,6 +20,7 @@ EXPORTS
     HCHttpCallRequestGetHeaderAtIndex
     HCHttpCallRequestGetNumHeaders
     HCHttpCallRequestGetRequestBodyBytes
+    HCHttpCallRequestGetRequestBodyReadFunction
     HCHttpCallRequestGetRequestBodyString
     HCHttpCallRequestGetRetryAllowed
     HCHttpCallRequestGetRetryCacheId
@@ -29,6 +30,7 @@ EXPORTS
     HCHttpCallRequestGetUrl
     HCHttpCallRequestSetHeader
     HCHttpCallRequestSetRequestBodyBytes
+    HCHttpCallRequestSetRequestBodyReadFunction
     HCHttpCallRequestSetRequestBodyString
     HCHttpCallRequestSetRetryAllowed
     HCHttpCallRequestSetRetryCacheId
@@ -45,13 +47,15 @@ EXPORTS
     HCHttpCallResponseGetPlatformNetworkErrorMessage
     HCHttpCallResponseGetResponseBodyBytes
     HCHttpCallResponseGetResponseBodyBytesSize
+    HCHttpCallResponseGetResponseBodyWriteFunction
     HCHttpCallResponseGetResponseString
     HCHttpCallResponseGetStatusCode
     HCHttpCallResponseSetHeader
     HCHttpCallResponseSetHeaderWithLength
     HCHttpCallResponseSetNetworkErrorCode
     HCHttpCallResponseSetPlatformNetworkErrorMessage
     HCHttpCallResponseSetResponseBodyBytes
+    HCHttpCallResponseSetResponseBodyWriteFunction
     HCHttpCallResponseSetStatusCode
     HCHttpCallSetContext
     HCHttpCallSetTracing
@@ -497,6 +501,7 @@ EXPORTS
     XblRealTimeActivityRemoveResyncHandler
     XblRemoveServiceCallRoutedHandler
     XblSetOverrideConfiguration
+    XblSetOverrideLocale
     XblSocialAddSocialRelationshipChangedHandler
     XblSocialGetSocialRelationshipsAsync
     XblSocialGetSocialRelationshipsResult

Build/xsapi.gdk.bwoi.props

@@ -69,6 +69,41 @@
     <VCTargetsPath16>$(_AlternativeVCTargetsPath160)</VCTargetsPath16>
   </PropertyGroup>
 
+  <!--
+  ****************************************************************************************************
+  VCTargetsPath redirection (VS 2022)
+  For VS 2022, we have to copy the contents of 
+  C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\v160  
+  to a temp location, then xcopy in the files from 
+  C:\Program Files (x86)\Microsoft GDK\211000\GXDK\VS2019\flatDeployment\MSBuild\Microsoft\VC\v160 
+  and 
+    C:\Program Files (x86)\Microsoft GDK\211000\GRDK\VS2019\flatDeployment\MSBuild\Microsoft\VC\v160
+  and do the same for the v150 for v141 downlevel
+  ****************************************************************************************************
+  -->
+  <PropertyGroup Condition="'$(GDKUseBWOI)' == 'true'">
+    <_AlternativeVCTargetsPath160>$(GDKMSBuildForVS2019)v160\</_AlternativeVCTargetsPath160>
+    <_AlternativeVCTargetsPath150>$(GDKMSBuildForVS2019)v150\</_AlternativeVCTargetsPath150>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GDKUseBWOI)' == 'true' and ('$(Platform)' == 'Gaming.Xbox.XboxOne.x64' and '$(VisualStudioVersion)' == '17.0')">
+    <VCTargetsPath>$(_AlternativeVCTargetsPath160)</VCTargetsPath>
+    <VCTargetsPath15 Condition="'$(_AlternativeVCTargetsPath150)'!=''">$(_AlternativeVCTargetsPath150)</VCTargetsPath15>
+    <VCTargetsPath16>$(_AlternativeVCTargetsPath160)</VCTargetsPath16>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GDKUseBWOI)' == 'true' and ('$(Platform)' == 'Gaming.Xbox.Scarlett.x64' and '$(VisualStudioVersion)' == '17.0')">
+    <VCTargetsPath>$(_AlternativeVCTargetsPath160)</VCTargetsPath>
+    <VCTargetsPath15 Condition="'$(_AlternativeVCTargetsPath150)'!=''">$(_AlternativeVCTargetsPath150)</VCTargetsPath15>
+    <VCTargetsPath16>$(_AlternativeVCTargetsPath160)</VCTargetsPath16>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GDKUseBWOI)' == 'true' and ('$(Platform)' == 'Gaming.Desktop.x64' and '$(VisualStudioVersion)' == '17.0')">
+    <VCTargetsPath>$(_AlternativeVCTargetsPath160)</VCTargetsPath>
+    <VCTargetsPath15 Condition="'$(_AlternativeVCTargetsPath150)'!=''">$(_AlternativeVCTargetsPath150)</VCTargetsPath15>
+    <VCTargetsPath16>$(_AlternativeVCTargetsPath160)</VCTargetsPath16>
+  </PropertyGroup>
+
   <!--
   ****************************************************************************************************
   Debugging

External/Xal/External/libHttpClient

@@ -42,28 +42,39 @@ typedef enum XalPlatformOperationResult
 /// </summary>
 typedef enum XalShowUrlType
 {
-    /// <summary>The client should show the URL in a shared system browser if
+    /// <summary>
+    /// The client should show the URL in a shared system browser if
     /// one is present, otherwise the client should use an embedded browser.
     /// </summary>
     XalShowUrlType_Normal = 0,
-    /// <summary>The browser is being raised for the purposes of deleting
-    /// cookies. If the client is able clear the user's cookies without showing
-    /// UI the client should. Otherwise the URL should be loaded as normal.
+    /// <summary>
+    /// This case is deprecated and no longer used. Cookie removal is now
+    /// signaled exclusively using
+    /// XalShowUrlType_CookieRemovalSkipIfSharedCredentials.
     /// </summary>
-    XalShowUrlType_CookieRemoval = 1,
-    /// <summary>The browser is being raised for the purposes of deleting
+    /// <remarks>
+    /// Formerly, this value indicated that the browser was being raised for the
+    /// purposes of deleting cookies from both shared and embedded browsers.
+    /// </remarks>
+    XalShowUrlType_CookieRemoval_DEPRECATED = 1,
+    /// <summary>
+    /// The browser is being raised for the purposes of deleting
     /// cookies. If the client is using a shared system browser, this call
     /// should be ignored and the client should immediately call
     /// XalPlatformWebShowUrlComplete passing in success, and forwarding the
     /// received final URL back into Xal. If an embedded browser is being used,
-    /// the URL should be loaded as normal.</summary>
+    /// the cookies should be cleared without showing UI if possible. If silent
+    /// cookie-clearing is impossible, the URL should be loaded as normal.
+    /// </summary>
     XalShowUrlType_CookieRemovalSkipIfSharedCredentials = 2,
-    /// <summary>This is a web flow which does not rely on cookies. The client
+    /// <summary>
+    /// This is a web flow which does not rely on cookies. The client
     /// may use a shared system browser or an embedded browser depending on
     /// whichever browser would give the best user experience. If headers are
     /// required for the web request, this will be the show type asked for. If
     /// this is the case, an embedded browser might be required so those
-    /// request headers can be set.</summary>
+    /// request headers can be set.
+    /// </summary>
     XalShowUrlType_NonAuthFlow = 3,
 } XalShowUrlType;
 

External/Xal/Source/Xal/Include/Xal/xal_platform_types.h

@@ -400,25 +400,6 @@ typedef enum XalUserChangeType
 // That header is included at the top of this file
 #endif
 
-/// <summary>
-/// User detail change event handler.
-/// </summary>
-/// <param name="context">Optional pointer to data used by the event handler.
-/// </param>
-/// <param name="userId">The local id of the user that changed.</param>
-/// <param name="change">The type of change.</param>
-/// <returns></returns>
-#if !XAL_OS_IMPL
-typedef void (XalUserChangeEventHandler)(
-    _In_opt_ void* context,
-    _In_ XalUserLocalId userId,
-    _In_ XalUserChangeType change
-);
-#else
-// XalUserChangeEventHandler is defined in the platform specific header.
-// That header is included at the top of this file
-#endif
-
 /// <summary>
 /// A token returned when registering a callback to identify the registration. This token
 /// is later used to unregister the callback.

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

@@ -321,6 +321,25 @@ STDAPI XalUserResolveIssueWithUiResult(
 //-----------------------------------------------------------------------------
 // Events
 
+/// <summary>
+/// User detail change event handler.
+/// </summary>
+/// <param name="context">Optional pointer to data used by the event handler.
+/// </param>
+/// <param name="userId">The local id of the user that changed.</param>
+/// <param name="change">The type of change.</param>
+/// <returns></returns>
+#if !XAL_OS_IMPL
+typedef void (XalUserChangeEventHandler)(
+    _In_opt_ void* context,
+    _In_ XalUserLocalId userId,
+    _In_ XalUserChangeType change
+);
+#else
+// XalUserChangeEventHandler is defined in the platform specific header.
+// That header is included in xal_types.h
+#endif
+
 /// <summary>
 /// Register the event handler for user detail changes.
 /// </summary>

External/Xal/Source/Xal/Include/Xal/xal_user.h

@@ -20,6 +20,6 @@ extern "C"
 /// YYYYMMDD Date string describing the date the build was created
 /// rrr QFE number (000 indicates base release)
 /// </summary>
-#define XAL_VERSION "2021.10.20220111.002"
+#define XAL_VERSION "2021.11.20211021.000"
 
 }

External/Xal/Source/Xal/Include/Xal/xal_version.h

@@ -751,6 +751,7 @@ STDAPI XblAchievementsUpdateAchievementForTitleIdAsync(
 /// <param name="async">Caller allocated AsyncBlock.</param>
 /// <returns>HRESULT return code for this API operation.</returns>
 /// <remarks>
+/// If multiple achievements are required, use the batch API instead: <see cref="XblAchievementsGetAchievementsForTitleIdAsync"/> 
 /// To get the result, call <see cref="XblAchievementsGetAchievementResult"/> inside the AsyncBlock callback 
 /// or after the AsyncBlock is complete.
 /// </remarks>

Include/xsapi-c/achievements_c.h

@@ -34,6 +34,7 @@ STDAPI XblNotificationSubscribeToNotificationsAsync(
 ) XBL_NOEXCEPT;
 #endif
 
+#if HC_PLATFORM == HC_PLATFORM_IOS || HC_PLATFORM == HC_PLATFORM_ANDROID || HC_PLATFORM == HC_PLATFORM_UWP
 /// <summary>
 /// Unsubscribes the title from push notifications.
 /// </summary>
@@ -44,4 +45,5 @@ STDAPI XblNotificationUnsubscribeFromNotificationsAsync(
     _In_ XblContextHandle xboxLiveContext,
     _In_ XAsyncBlock* asyncBlock
 ) XBL_NOEXCEPT;
+#endif
 }