kernel32/tests: Despite the MSDN claims, GetComputerName() does not return the…

kernel32/tests: Despite the MSDN claims, GetComputerName() does not return the required buffer size... except on Vista. So update the tests accordingly.

kernel32/tests: Despite the MSDN claims, GetComputerName() does not return the…
00696510 · Francois Gouget · Alexandre Julliard · e3e2a5c0 · 00696510
Commit 00696510 authored Jan 11, 2008 by Francois Gouget Committed by Alexandre Julliard Jan 11, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 6 deletions

environ.c dlls/kernel32/tests/environ.c +11 -6

No files found.
--- a/dlls/kernel32/tests/environ.c
+++ b/dlls/kernel32/tests/environ.c
@@ -298,12 +298,17 @@ static void test_GetComputerName(void)
    error = GetLastError();
    todo_wine
    ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameA should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error);
-    size++; /* nul terminating character */
-    name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0]));
+    /* Only Vista returns the computer name length as documented in the MSDN */
-    ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError());
+    if (size != 0)
-    ret = GetComputerNameA(name, &size);
+    {
-    ok(ret, "GetComputerNameA failed with error %d\n", GetLastError());
+        size++; /* nul terminating character */
-    HeapFree(GetProcessHeap(), 0, name);
+        name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0]));
+        ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError());
+        ret = GetComputerNameA(name, &size);
+        ok(ret, "GetComputerNameA failed with error %d\n", GetLastError());
+        HeapFree(GetProcessHeap(), 0, name);
+    }
    size = MAX_COMPUTERNAME_LENGTH + 1;
    name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0]));