birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more replacements of A functions

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-05 19:30:52 -07:00
parent 895dc09176
commit 6d79f1beee
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/Platform/Windows/AzCore/Platform_Windows.cpp
+6 -6
View File
@@ -31,8 +31,8 @@ namespace AZ
// Query the machine guid generated at install time by windows, which is generated from
// hardware signatures. This guid is not enough, because images (AWS) may duplicate this,
// so include the hostname/username as well
TCHAR machineInfo[MAX_COMPUTERNAME_LENGTH + 1024] = { 0 };
ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Cryptography", 0, KEY_QUERY_VALUE, &key);
wchar_t machineInfo[MAX_COMPUTERNAME_LENGTH + 1024] = { 0 };
ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Cryptography", 0, KEY_QUERY_VALUE, &key);
if (ret == ERROR_SUCCESS)
{
DWORD dataType = REG_SZ;
@@ -45,17 +45,17 @@ namespace AZ
AZ_Error("System", false, "Failed to open HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography\\MachineGuid!")
}
TCHAR* hostname = machineInfo + wcslen(machineInfo);
wchar_t* hostname = machineInfo + wcslen(machineInfo);
// salt the guid time with ComputerName/UserName
DWORD bufCharCount = DWORD(sizeof(machineInfo) - (hostname - machineInfo));
if (!::GetComputerName(hostname, &bufCharCount))
if (!::GetComputerNameW(hostname, &bufCharCount))
{
AZ_Error("System", false, "GetComputerName filed with code %d", GetLastError());
}
TCHAR* username = hostname + wcslen(hostname);
wchar_t* username = hostname + wcslen(hostname);
bufCharCount = DWORD(sizeof(machineInfo) - (username - machineInfo));
if( !GetUserName( username, &bufCharCount ) )
if(!GetUserNameW(username, &bufCharCount))
{
AZ_Error("System",false,"GetUserName filed with code %d",GetLastError());
}