Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-03 01:01:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32] Try to read 'DhcpDomain' registry value if present, otherwise return 'Domain' one, when domain part is requested from GetComputerNameEx(). By Peter Hater. CORE-10440

Browse source 
svn path=/trunk/; revision=72722
This commit is contained in:
Amine Khaldi 2016-09-18 12:55:45 +00:00
parent b33dfb3ede
commit 15b97111e6
1 changed files with 59 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

71
reactos/dll/win32/kernel32/client/compname.c
View file

@ -137,6 +137,7 @@ GetComputerNameExW(COMPUTER_NAME_FORMAT NameType,
NTSTATUS Status; NTSTATUS Status;
BOOL ret = TRUE; BOOL ret = TRUE;
DWORD HostSize; DWORD HostSize;
DWORD nBufferSize;
if ((nSize == NULL) || if ((nSize == NULL) ||
(lpBuffer == NULL && *nSize > 0)) (lpBuffer == NULL && *nSize > 0))
@ -155,11 +156,27 @@ GetComputerNameExW(COMPUTER_NAME_FORMAT NameType,
nSize); nSize);
case ComputerNameDnsDomain: case ComputerNameDnsDomain:
return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" /* Save original buffer size for the second call if neccessery */
L"\\Services\\Tcpip\\Parameters", nBufferSize = *nSize;
L"Domain", if (!GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet"
lpBuffer, L"\\Services\\Tcpip\\Parameters",
nSize); L"DhcpDomain",
lpBuffer,
nSize))
{
/* The value is there, just the buffer is insufficient in length */
if (GetLastError() == ERROR_MORE_DATA)
return FALSE;
/* Restore original buffer size for the second call */
*nSize = nBufferSize;
return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet"
L"\\Services\\Tcpip\\Parameters",
L"Domain",
lpBuffer,
nSize);
}
else
return TRUE;
case ComputerNameDnsFullyQualified: case ComputerNameDnsFullyQualified:
ResultString.Length = 0; ResultString.Length = 0;
@ -195,7 +212,7 @@ GetComputerNameExW(COMPUTER_NAME_FORMAT NameType,
RtlFreeUnicodeString(&DomainPart); RtlFreeUnicodeString(&DomainPart);
RtlInitUnicodeString(&DomainPart, NULL); RtlInitUnicodeString(&DomainPart, NULL);
QueryTable[0].Name = L"Domain"; QueryTable[0].Name = L"DhcpDomain";
QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT;
QueryTable[0].EntryContext = &DomainPart; QueryTable[0].EntryContext = &DomainPart;
@ -207,7 +224,9 @@ GetComputerNameExW(COMPUTER_NAME_FORMAT NameType,
NULL, NULL,
NULL); NULL);
if (NT_SUCCESS(Status)) if ((NT_SUCCESS(Status)) &&
(DomainPart.Buffer != NULL) &&
(wcslen(DomainPart.Buffer) > 0))
{ {
Status = RtlAppendUnicodeStringToString(&ResultString, &DomainPart); Status = RtlAppendUnicodeStringToString(&ResultString, &DomainPart);
if ((!NT_SUCCESS(Status)) || (!ret)) if ((!NT_SUCCESS(Status)) || (!ret))
@ -221,6 +240,36 @@ GetComputerNameExW(COMPUTER_NAME_FORMAT NameType,
*nSize = ResultString.Length / sizeof(WCHAR) - 1; *nSize = ResultString.Length / sizeof(WCHAR) - 1;
return TRUE; return TRUE;
} }
else
{
RtlInitUnicodeString(&DomainPart, NULL);
QueryTable[0].Name = L"Domain";
QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT;
QueryTable[0].EntryContext = &DomainPart;
Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE,
L"\\Registry\\Machine\\System"
L"\\CurrentControlSet\\Services\\Tcpip"
L"\\Parameters",
QueryTable,
NULL,
NULL);
if (NT_SUCCESS(Status))
{
Status = RtlAppendUnicodeStringToString(&ResultString, &DomainPart);
if ((!NT_SUCCESS(Status)) || (!ret))
{
*nSize = HostSize + DomainPart.Length;
SetLastError(ERROR_MORE_DATA);
RtlFreeUnicodeString(&DomainPart);
return FALSE;
}
RtlFreeUnicodeString(&DomainPart);
*nSize = ResultString.Length / sizeof(WCHAR) - 1;
return TRUE;
}
}
} }
return FALSE; return FALSE;
@ -232,11 +281,9 @@ GetComputerNameExW(COMPUTER_NAME_FORMAT NameType,
nSize); nSize);
case ComputerNamePhysicalDnsDomain: case ComputerNamePhysicalDnsDomain:
return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" return GetComputerNameExW(ComputerNameDnsDomain,
L"\\Services\\Tcpip\\Parameters", lpBuffer,
L"Domain", nSize);
lpBuffer,
nSize);
/* XXX Redo these */ /* XXX Redo these */
case ComputerNamePhysicalDnsFullyQualified: case ComputerNamePhysicalDnsFullyQualified: