advapi32: Return correct short domain name.

Also remove suffix and uppercase the returned name as Windows does. Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

advapi32: Return correct short domain name.
eb077e9f · Dmitry Timoshkov · Alexandre Julliard · a3bcaca4 · eb077e9f
Commit eb077e9f authored Mar 02, 2018 by Dmitry Timoshkov Committed by Alexandre Julliard Mar 02, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

lsa.c dlls/advapi32/lsa.c +8 -3

No files found.
--- a/dlls/advapi32/lsa.c
+++ b/dlls/advapi32/lsa.c
@@ -786,11 +786,16 @@ NTSTATUS WINAPI LsaQueryInformationPolicy(
            if (!xdi) return STATUS_NO_MEMORY;

            dwSize = MAX_COMPUTERNAME_LENGTH + 1;
-            if (GetComputerNameW(xdi->domain_name, &dwSize))
+            if (GetComputerNameExW(ComputerNamePhysicalDnsDomain, xdi->domain_name, &dwSize))
            {
+                WCHAR *dot;
+
+                dot = strrchrW(xdi->domain_name, '.');
+                if (dot) *dot = 0;
+                struprW(xdi->domain_name);
                xdi->info.Name.Buffer = xdi->domain_name;
-                xdi->info.Name.Length = dwSize * sizeof(WCHAR);
-                xdi->info.Name.MaximumLength = (dwSize + 1) * sizeof(WCHAR);
+                xdi->info.Name.Length = strlenW(xdi->domain_name) * sizeof(WCHAR);
+                xdi->info.Name.MaximumLength = xdi->info.Name.Length + sizeof(WCHAR);
                TRACE("setting Name to %s\n", debugstr_w(xdi->info.Name.Buffer));
            }