kernelbase: Remove trailing dot in GetComputerNameExW() when domain name is empty.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48293Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernelbase: Remove trailing dot in GetComputerNameExW() when domain name is empty.
b276bda5 · Alexandre Julliard · d96331d8 · b276bda5
Commit b276bda5 authored Jan 05, 2020 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

registry.c dlls/kernelbase/registry.c +7 -5

No files found.
--- a/dlls/kernelbase/registry.c
+++ b/dlls/kernelbase/registry.c
@@ -3146,13 +3146,15 @@ BOOL WINAPI GetComputerNameExW( COMPUTER_NAME_FORMAT type, WCHAR *name, DWORD *l
    case ComputerNameDnsFullyQualified:
    case ComputerNamePhysicalDnsFullyQualified:
    {
-        WCHAR buffer[256];
-        DWORD size = ARRAY_SIZE(buffer);
+        WCHAR *domain, buffer[256];
+        DWORD size = ARRAY_SIZE(buffer) - 1;

        if (!GetComputerNameExW( ComputerNameDnsHostname, buffer, &size )) return FALSE;
-        lstrcatW( buffer, L"." );
-        size = ARRAY_SIZE(buffer) - lstrlenW(buffer);
-        if (!GetComputerNameExW( ComputerNameDnsDomain, buffer + lstrlenW(buffer), &size )) return FALSE;
+        domain = buffer + lstrlenW(buffer);
+        *domain++ = '.';
+        size = ARRAY_SIZE(buffer) - (domain - buffer);
+        if (!GetComputerNameExW( ComputerNameDnsDomain, domain, &size )) return FALSE;
+        if (!*domain) domain[-1] = 0;
        size = lstrlenW(buffer);
        if (name && size < *len)
        {