Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 12:39:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32] Improvements to Get/SetComputerNameExW

Browse source 
- The ComputerNamePhysicalDnsDomain name type gets or sets the 'NV Domain' registry value.
- The ComputerNamePhysicalDnsHostname name type gets or sets the 'NV Hostname' registry value.
- IsValidComputerName: Enforce name length restrictions according to the name type.
This commit is contained in:
Eric Kohl 2020-01-19 13:28:02 +01:00
parent 0f4827edde
commit c645660384
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dll/win32/kernel32/client/compname.c
View file

@ -335,21 +335,24 @@ GetComputerNameExW(COMPUTER_NAME_FORMAT NameType,
case ComputerNamePhysicalDnsDomain: case ComputerNamePhysicalDnsDomain:
return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet"
L"\\Services\\Tcpip\\Parameters", L"\\Services\\Tcpip\\Parameters",
L"Domain", L"NV Domain",
lpBuffer, lpBuffer,
nSize); nSize);
/* XXX Redo these */ /* XXX Redo this */
case ComputerNamePhysicalDnsFullyQualified: case ComputerNamePhysicalDnsFullyQualified:
return GetComputerNameExW(ComputerNameDnsFullyQualified, return GetComputerNameExW(ComputerNameDnsFullyQualified,
lpBuffer, lpBuffer,
nSize); nSize);
case ComputerNamePhysicalDnsHostname: case ComputerNamePhysicalDnsHostname:
return GetComputerNameExW(ComputerNameDnsHostname, return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet"
lpBuffer, L"\\Services\\Tcpip\\Parameters",
nSize); L"NV Hostname",
lpBuffer,
nSize);
/* XXX Redo this */
case ComputerNamePhysicalNetBIOS: case ComputerNamePhysicalNetBIOS:
return GetComputerNameExW(ComputerNameNetBIOS, return GetComputerNameExW(ComputerNameNetBIOS,
lpBuffer, lpBuffer,
@ -477,7 +480,14 @@ IsValidComputerName(COMPUTER_NAME_FORMAT NameType,
p++; p++;
} }
if (Length == 0 || Length > MAX_COMPUTERNAME_LENGTH) if (NameType == ComputerNamePhysicalDnsDomain)
return TRUE;
if (Length == 0)
return FALSE;
if (NameType == ComputerNamePhysicalNetBIOS &&
Length > MAX_COMPUTERNAME_LENGTH)
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -600,12 +610,12 @@ SetComputerNameExW(COMPUTER_NAME_FORMAT NameType,
return FALSE; return FALSE;
} }
switch( NameType ) switch (NameType)
{ {
case ComputerNamePhysicalDnsDomain: case ComputerNamePhysicalDnsDomain:
return SetComputerNameToRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" return SetComputerNameToRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet"
L"\\Services\\Tcpip\\Parameters", L"\\Services\\Tcpip\\Parameters",
L"Domain", L"NV Domain",
lpBuffer); lpBuffer);
case ComputerNamePhysicalDnsHostname: case ComputerNamePhysicalDnsHostname: