From 38160b207d263849c83440bee473690ffb222180 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Mon, 7 Jan 2019 22:45:33 +0100 Subject: [PATCH] [KERNEL32] GetComputerNameExW: Fix crash in kernel32_winetest environ test --- dll/win32/kernel32/client/compname.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/compname.c b/dll/win32/kernel32/client/compname.c index 96aa505aed0..cfe9df51375 100644 --- a/dll/win32/kernel32/client/compname.c +++ b/dll/win32/kernel32/client/compname.c @@ -236,7 +236,8 @@ GetComputerNameExW(COMPUTER_NAME_FORMAT NameType, L"ComputerName", lpBuffer, nSize); - if (ret == FALSE) + if ((ret == FALSE) && + (GetLastError() != ERROR_MORE_DATA)) { ret = GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Control\\ComputerName\\ComputerName",