Revert the generic cpp error to HRESULT mapping to E_FAIL. Fix minor te unittest build break. (#118)
This commit is contained in:
Родитель
571b1f6031
Коммит
660e75ce07
|
@ -838,7 +838,7 @@ utils::convert_xbox_live_error_code_to_hresult(
|
||||||
case xbox_live_error_code::invalid_config: return __HRESULT_FROM_WIN32(ERROR_BAD_CONFIGURATION);
|
case xbox_live_error_code::invalid_config: return __HRESULT_FROM_WIN32(ERROR_BAD_CONFIGURATION);
|
||||||
case xbox_live_error_code::unsupported: return E_NOTIMPL;
|
case xbox_live_error_code::unsupported: return E_NOTIMPL;
|
||||||
|
|
||||||
default: return err;
|
default: return E_FAIL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ((err & 0x87DD0000) == 0x87D8000)
|
else if ((err & 0x87DD0000) == 0x87D8000)
|
||||||
|
|
|
@ -984,7 +984,7 @@ public:
|
||||||
RelationshipFilter::Friends
|
RelationshipFilter::Friends
|
||||||
);
|
);
|
||||||
|
|
||||||
VERIFY_ARE_EQUAL(group->Users->Size, USER_LIST.size() - 1);
|
VERIFY_ARE_EQUAL_UINT(group->Users->Size, USER_LIST.size() - 1);
|
||||||
|
|
||||||
Cleanup(socialManagerInitializationStruct, xboxLiveContext, 1);
|
Cleanup(socialManagerInitializationStruct, xboxLiveContext, 1);
|
||||||
Cleanup(socialManagerInitializationStruct, xboxLiveContext1);
|
Cleanup(socialManagerInitializationStruct, xboxLiveContext1);
|
||||||
|
@ -1558,7 +1558,7 @@ public:
|
||||||
VERIFY_IS_TRUE(socialUserGroupLoaded->SocialUserGroup->SocialUserGroupType == SocialUserGroupType::UserListType);
|
VERIFY_IS_TRUE(socialUserGroupLoaded->SocialUserGroup->SocialUserGroupType == SocialUserGroupType::UserListType);
|
||||||
VERIFY_ARE_EQUAL_STR_IGNORE_CASE(socialUserGroupLoaded->SocialUserGroup->LocalUser->XboxUserId->Data(), xboxLiveContext->xbox_live_user_id().c_str());
|
VERIFY_ARE_EQUAL_STR_IGNORE_CASE(socialUserGroupLoaded->SocialUserGroup->LocalUser->XboxUserId->Data(), xboxLiveContext->xbox_live_user_id().c_str());
|
||||||
|
|
||||||
VERIFY_ARE_EQUAL(vec->Size, socialUserGroupLoaded->SocialUserGroup->UsersTrackedBySocialUserGroup->Size);
|
VERIFY_ARE_EQUAL_UINT(vec->Size, socialUserGroupLoaded->SocialUserGroup->UsersTrackedBySocialUserGroup->Size);
|
||||||
//VERIFY_ARE_EQUAL(vec->Size, socialUserGroupLoaded->SocialUserGroup->Users->Size);
|
//VERIFY_ARE_EQUAL(vec->Size, socialUserGroupLoaded->SocialUserGroup->Users->Size);
|
||||||
for (auto& user : vec)
|
for (auto& user : vec)
|
||||||
{
|
{
|
||||||
|
|
|
@ -13,6 +13,8 @@
|
||||||
#include "XboxLiveServicesSettings_WinRT.h"
|
#include "XboxLiveServicesSettings_WinRT.h"
|
||||||
|
|
||||||
using namespace xbox::services::system;
|
using namespace xbox::services::system;
|
||||||
|
using namespace Microsoft::Xbox::Services;
|
||||||
|
using namespace Microsoft::Xbox::Services::System;
|
||||||
|
|
||||||
NAMESPACE_MICROSOFT_XBOX_SERVICES_SYSTEM_CPP_BEGIN
|
NAMESPACE_MICROSOFT_XBOX_SERVICES_SYSTEM_CPP_BEGIN
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче