morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10988 from akallabeth/computer-name-fix

Browse Source 
[winpr,sysinfo] fix use of GetComputerNameExA
This commit is contained in:
akallabeth
2024-12-17 09:55:54 +01:00
committed by GitHub
parent a984fdc4bf 91ae892f91
commit be294b5341
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/rdpdr/client/rdpdr_main.c
View File

@@ -1165,7 +1165,7 @@ static UINT rdpdr_process_connect(rdpdrPlugin* rdpdr)
name = freerdp_settings_get_string(settings, FreeRDP_ComputerName);
if (!name)
{
DWORD size = sizeof(rdpdr->computerName) - 1;
DWORD size = ARRAYSIZE(rdpdr->computerName);
if (!GetComputerNameExA(ComputerNameNetBIOS, rdpdr->computerName, &size))
return ERROR_INTERNAL_ERROR;
}

2
libfreerdp/core/settings.c
View File

@@ -321,7 +321,7 @@ static void settings_load_hkey_local_machine(rdpSettings* settings)
static BOOL settings_init_computer_name(rdpSettings* settings)
{
CHAR computerName[MAX_COMPUTERNAME_LENGTH + 1] = { 0 };
DWORD nSize = MAX_COMPUTERNAME_LENGTH;
DWORD nSize = ARRAYSIZE(computerName);
if (!GetComputerNameExA(ComputerNameNetBIOS, computerName, &nSize))
return FALSE;

6
winpr/libwinpr/sysinfo/test/TestGetComputerName.c
View File

@@ -24,9 +24,9 @@ static BOOL Test_GetComputerName(void)
*
*/
CHAR netbiosName1[MAX_COMPUTERNAME_LENGTH + 1];
CHAR netbiosName2[MAX_COMPUTERNAME_LENGTH + 1];
const DWORD netbiosBufferSize = sizeof(netbiosName1) / sizeof(CHAR);
CHAR netbiosName1[MAX_COMPUTERNAME_LENGTH + 1] = { 0 };
CHAR netbiosName2[MAX_COMPUTERNAME_LENGTH + 1] = { 0 };
const size_t netbiosBufferSize = ARRAYSIZE(netbiosName1);
DWORD dwSize = 0;
DWORD dwNameLength = 0;
DWORD dwError = 0;