Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 17:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KERNEL32]

Browse source 
- Fix GetComputerNameEx behavior with regard to NULL/non-NULL buffers and size calculation
CORE-11368

svn path=/trunk/; revision=71950
This commit is contained in:
Thomas Faber 2016-07-16 07:08:21 +00:00
parent 55cca82ae9
commit e556dea177
4 changed files with 215 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,7 +88,7 @@ GetComputerNameFromRegistry(LPWSTR RegistryKey,
if (!NT_SUCCESS(Status))
{
*nSize = ReturnSize;
*nSize = (ReturnSize - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data)) / sizeof(WCHAR);
goto failed;
}
@ -100,7 +100,7 @@ GetComputerNameFromRegistry(LPWSTR RegistryKey,
if (!lpBuffer || *nSize < (KeyInfo->DataLength / sizeof(WCHAR)))
{
*nSize = ReturnSize;
*nSize = (ReturnSize - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data)) / sizeof(WCHAR);
Status = STATUS_BUFFER_OVERFLOW;
goto failed;
}
@ -135,6 +135,13 @@ GetComputerNameExW(COMPUTER_NAME_FORMAT NameType,
BOOL ret = TRUE;
DWORD HostSize;
if ((nSize == NULL) ||
(lpBuffer == NULL && *nSize > 0))
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
switch (NameType)
{
case ComputerNameNetBIOS:
@ -263,19 +270,23 @@ GetComputerNameExA(COMPUTER_NAME_FORMAT NameType,
UNICODE_STRING UnicodeString;
ANSI_STRING AnsiString;
BOOL Result;
PWCHAR TempBuffer;
PWCHAR TempBuffer = NULL;
if (!lpBuffer)
if ((nSize == NULL) ||
(lpBuffer == NULL && *nSize > 0))
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
TempBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, *nSize * sizeof(WCHAR));
if (!TempBuffer)
if (*nSize > 0)
{
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
TempBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, *nSize * sizeof(WCHAR));
if (!TempBuffer)
{
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
}
}
AnsiString.MaximumLength = (USHORT)*nSize;
@ -287,7 +298,7 @@ GetComputerNameExA(COMPUTER_NAME_FORMAT NameType,
if (Result)
{
UnicodeString.MaximumLength = (USHORT)*nSize * sizeof(WCHAR) + sizeof(WCHAR);
UnicodeString.Length = (USHORT)*nSize * sizeof(WCHAR) + sizeof(WCHAR);
UnicodeString.Length = (USHORT)*nSize * sizeof(WCHAR);
UnicodeString.Buffer = TempBuffer;
RtlUnicodeStringToAnsiString(&AnsiString,

1
rostests/apitests/kernel32/CMakeLists.txt
View file

@ -2,6 +2,7 @@
list(APPEND SOURCE
dosdev.c
FindFiles.c
GetComputerNameEx.c
GetCurrentDirectory.c
GetDriveType.c
GetModuleFileName.c

192
rostests/apitests/kernel32/GetComputerNameEx.c Normal file
View file

@ -0,0 +1,192 @@
/*
* PROJECT: ReactOS API tests
* LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory
* PURPOSE: Test for GetComputerNameEx
* PROGRAMMER: Thomas Faber <thomas.faber@reactos.org>
*/
#include <apitest.h>
#define WIN32_NO_STATUS
#include <stdio.h>
#include <ndk/rtltypes.h>
static
VOID
TestGetComputerNameEx(
_In_ COMPUTER_NAME_FORMAT NameType)
{
WCHAR Reference[128];
DWORD ReferenceLen;
WCHAR BufferW[128];
CHAR BufferA[128];
BOOL Ret;
DWORD Size;
DWORD Error;
ULONG i;
Size = RTL_NUMBER_OF(Reference);
Ret = GetComputerNameExW(NameType, Reference, &Size);
ok(Ret == TRUE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret);
if (!Ret)
{
skip("[%d] Failed to get reference string\n", NameType);
return;
}
trace("[%d] Reference is %ls\n", NameType, Reference);
ReferenceLen = wcslen(Reference);
ok(ReferenceLen < RTL_NUMBER_OF(Reference),
"[%d] Unexpected ReferenceLen %lu\n", NameType, ReferenceLen);
if (NameType != ComputerNameDnsDomain && NameType != ComputerNamePhysicalDnsDomain)
{
ok(ReferenceLen != 0, "[%d] Unexpected ReferenceLen %lu\n", NameType, ReferenceLen);
}
ok(Size == ReferenceLen, "[%d] Size is %lu, expected %lu\n", NameType, Size, ReferenceLen);
/* NULL buffer, NULL size */
StartSeh()
Ret = GetComputerNameExW(NameType, NULL, NULL);
Error = GetLastError();
ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret);
ok(Error == ERROR_INVALID_PARAMETER, "[%d] GetComputerNameExW returned error %lu\n", NameType, Error);
EndSeh(STATUS_SUCCESS);
StartSeh()
Ret = GetComputerNameExA(NameType, NULL, NULL);
Error = GetLastError();
ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret);
ok(Error == ERROR_INVALID_PARAMETER, "[%d] GetComputerNameExW returned error %lu\n", NameType, Error);
EndSeh(STATUS_SUCCESS);
/* NULL buffer, nonzero size */
Size = 0x55555555;
Ret = GetComputerNameExW(NameType, NULL, &Size);
Error = GetLastError();
ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret);
ok(Error == ERROR_INVALID_PARAMETER, "[%d] GetComputerNameExW returned error %lu\n", NameType, Error);
ok(Size == 0x55555555, "[%d] Got Size %lu\n", NameType, Size);
Size = 0x55555555;
Ret = GetComputerNameExA(NameType, NULL, &Size);
Error = GetLastError();
ok(Ret == FALSE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret);
ok(Error == ERROR_INVALID_PARAMETER, "[%d] GetComputerNameExA returned error %lu\n", NameType, Error);
ok(Size == 0x55555555, "[%d] Got Size %lu\n", NameType, Size);
/* non-NULL buffer, NULL size */
RtlFillMemory(BufferW, sizeof(BufferW), 0x55);
Ret = GetComputerNameExW(NameType, BufferW, NULL);
Error = GetLastError();
ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret);
ok(Error == ERROR_INVALID_PARAMETER, "[%d] GetComputerNameExW returned error %lu\n", NameType, Error);
ok(BufferW[0] == 0x5555, "[%d] BufferW[0] = 0x%x\n", NameType, BufferW[0]);
RtlFillMemory(BufferA, sizeof(BufferA), 0x55);
Ret = GetComputerNameExA(NameType, BufferA, NULL);
Error = GetLastError();
ok(Ret == FALSE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret);
ok(Error == ERROR_INVALID_PARAMETER, "[%d] GetComputerNameExA returned error %lu\n", NameType, Error);
ok(BufferA[0] == 0x55, "[%d] BufferA[0] = 0x%x\n", NameType, BufferA[0]);
/* NULL buffer, zero size */
Size = 0;
Ret = GetComputerNameExW(NameType, NULL, &Size);
Error = GetLastError();
ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret);
ok(Error == ERROR_MORE_DATA, "[%d] GetComputerNameExW returned error %lu\n", NameType, Error);
ok(Size == ReferenceLen + 1, "[%d] Got Size %lu, expected %lu\n", NameType, Size, ReferenceLen + 1);
Size = 0;
Ret = GetComputerNameExA(NameType, NULL, &Size);
Error = GetLastError();
ok(Ret == FALSE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret);
ok(Error == ERROR_MORE_DATA, "[%d] GetComputerNameExA returned error %lu\n", NameType, Error);
ok(Size == ReferenceLen + 1, "[%d] Got Size %lu, expected %lu\n", NameType, Size, ReferenceLen + 1);
/* non-NULL buffer, zero size */
RtlFillMemory(BufferW, sizeof(BufferW), 0x55);
Size = 0;
Ret = GetComputerNameExW(NameType, BufferW, &Size);
Error = GetLastError();
ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret);
ok(Error == ERROR_MORE_DATA, "[%d] GetComputerNameExW returned error %lu\n", NameType, Error);
ok(Size == ReferenceLen + 1, "[%d] Got Size %lu, expected %lu\n", NameType, Size, ReferenceLen + 1);
ok(BufferW[0] == 0x5555, "[%d] BufferW[0] = 0x%x\n", NameType, BufferW[0]);
RtlFillMemory(BufferA, sizeof(BufferA), 0x55);
Size = 0;
Ret = GetComputerNameExA(NameType, BufferA, &Size);
Error = GetLastError();
ok(Ret == FALSE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret);
ok(Error == ERROR_MORE_DATA, "[%d] GetComputerNameExA returned error %lu\n", NameType, Error);
ok(Size == ReferenceLen + 1, "[%d] Got Size %lu, expected %lu\n", NameType, Size, ReferenceLen + 1);
ok(BufferA[0] == 0x55, "[%d] BufferA[0] = 0x%x\n", NameType, BufferA[0]);
/* non-NULL buffer, too small size */
RtlFillMemory(BufferW, sizeof(BufferW), 0x55);
Size = ReferenceLen;
Ret = GetComputerNameExW(NameType, BufferW, &Size);
Error = GetLastError();
ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret);
ok(Error == ERROR_MORE_DATA, "[%d] GetComputerNameExW returned error %lu\n", NameType, Error);
ok(Size == ReferenceLen + 1, "[%d] Got Size %lu, expected %lu\n", NameType, Size, ReferenceLen + 1);
if (NameType != ComputerNameNetBIOS && NameType != ComputerNamePhysicalNetBIOS)
{
if (ReferenceLen == 0)
{
ok(BufferW[0] == 0x5555, "[%d] BufferW[0] = 0x%x\n",
NameType, BufferW[0]);
}
else
{
ok(BufferW[0] == 0, "[%d] BufferW[0] = 0x%x\n",
NameType, BufferW[0]);
}
}
ok(BufferW[1] == 0x5555, "[%d] BufferW[1] = 0x%x\n", NameType, BufferW[1]);
RtlFillMemory(BufferA, sizeof(BufferA), 0x55);
Size = ReferenceLen;
Ret = GetComputerNameExA(NameType, BufferA, &Size);
Error = GetLastError();
ok(Ret == FALSE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret);
ok(Error == ERROR_MORE_DATA, "[%d] GetComputerNameExA returned error %lu\n", NameType, Error);
ok(Size == ReferenceLen + 1, "[%d] Got Size %lu, expected %lu\n", NameType, Size, ReferenceLen + 1);
ok(BufferA[0] == 0x55, "[%d] BufferA[0] = 0x%x\n", NameType, BufferA[0]);
/* non-NULL buffer, exact size */
RtlFillMemory(BufferW, sizeof(BufferW), 0x55);
Size = ReferenceLen + 1;
Ret = GetComputerNameExW(NameType, BufferW, &Size);
ok(Ret == TRUE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret);
ok(Size == ReferenceLen, "[%d] Got Size %lu, expected %lu\n", NameType, Size, ReferenceLen + 1);
ok(BufferW[ReferenceLen] == 0, "[%d] BufferW[ReferenceLen] = 0x%x\n", NameType, BufferW[ReferenceLen]);
ok(BufferW[ReferenceLen + 1] == 0x5555, "[%d] BufferW[ReferenceLen + 1] = 0x%x\n", NameType, BufferW[ReferenceLen + 1]);
ok(!wcscmp(BufferW, Reference), "[%d] '%ls' != '%ls'\n", NameType, BufferW, Reference);
RtlFillMemory(BufferA, sizeof(BufferA), 0x55);
Size = ReferenceLen + 1;
Ret = GetComputerNameExA(NameType, BufferA, &Size);
ok(Ret == TRUE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret);
ok(Size == ReferenceLen, "[%d] Got Size %lu, expected %lu\n", NameType, Size, ReferenceLen + 1);
ok(BufferA[ReferenceLen] == 0, "[%d] BufferA[ReferenceLen] = 0x%x\n", NameType, BufferA[ReferenceLen]);
ok(BufferA[ReferenceLen + 1] == 0x55, "[%d] BufferA[ReferenceLen + 1] = 0x%x\n", NameType, BufferA[ReferenceLen + 1]);
for (i = 0; i < ReferenceLen; i++)
{
if (BufferA[i] != Reference[i])
{
ok(0, "[%d] BufferA[%lu] = 0x%x, expected 0x%x\n", NameType, i, BufferA[i], Reference[i]);
}
}
}
START_TEST(GetComputerNameEx)
{
TestGetComputerNameEx(ComputerNameNetBIOS);
TestGetComputerNameEx(ComputerNameDnsHostname);
TestGetComputerNameEx(ComputerNameDnsDomain);
//TestGetComputerNameEx(ComputerNameDnsFullyQualified);
TestGetComputerNameEx(ComputerNamePhysicalNetBIOS);
TestGetComputerNameEx(ComputerNamePhysicalDnsHostname);
TestGetComputerNameEx(ComputerNamePhysicalDnsDomain);
//TestGetComputerNameEx(ComputerNamePhysicalDnsFullyQualified);
}

2
rostests/apitests/kernel32/testlist.c
View file

@ -5,6 +5,7 @@
extern void func_dosdev(void);
extern void func_FindFiles(void);
extern void func_GetComputerNameEx(void);
extern void func_GetCurrentDirectory(void);
extern void func_GetDriveType(void);
extern void func_GetModuleFileName(void);
@ -22,6 +23,7 @@ const struct test winetest_testlist[] =
{
{ "dosdev", func_dosdev },
{ "FindFiles", func_FindFiles },
{ "GetComputerNameEx", func_GetComputerNameEx },
{ "GetCurrentDirectory", func_GetCurrentDirectory },
{ "GetDriveType", func_GetDriveType },
{ "GetModuleFileName", func_GetModuleFileName },