Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -84,7 +84,7 @@ namespace SaveData
// Get the 'known folder path'
wchar_t* knownFolderPathUTF16 = nullptr;
long result = SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, NULL, &knownFolderPathUTF16);
[[maybe_unused]] long result = SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, NULL, &knownFolderPathUTF16);
AZ_Assert(SUCCEEDED(result), "SHGetKnownFolderPath could not retrieve LocalAppData folder");
// Convert it from UTF-16 to UTF-8
@@ -103,7 +103,7 @@ namespace SaveData
AZStd::string GetExecutableName()
{
char moduleFileName[AZ_MAX_PATH_LEN];
DWORD pathLen = GetModuleFileNameA(nullptr, moduleFileName, AZ_MAX_PATH_LEN);
GetModuleFileNameA(nullptr, moduleFileName, AZ_MAX_PATH_LEN);
const AZStd::string moduleFileNameString(moduleFileName);
const size_t executableNameStart = moduleFileNameString.find_last_of('\\') + 1;