Paul Vriens : kernel32/tests: GetComputerNameW is not implemented on win98.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Apr 25 07:06:59 CDT 2007


Module: wine
Branch: master
Commit: c1f6501808ca8ca8b03984f6218b905d095fb9c9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c1f6501808ca8ca8b03984f6218b905d095fb9c9

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Wed Apr 25 13:16:37 2007 +0200

kernel32/tests: GetComputerNameW is not implemented on win98.

---

 dlls/kernel32/tests/environ.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c
index dab57f7..b53a4b4 100644
--- a/dlls/kernel32/tests/environ.c
+++ b/dlls/kernel32/tests/environ.c
@@ -265,16 +265,22 @@ static void test_GetComputerName(void)
     HeapFree(GetProcessHeap(), 0, name);
 
     size = 0;
+    SetLastError(0xdeadbeef);
     ret = GetComputerNameW((LPWSTR)0xdeadbeef, &size);
     error = GetLastError();
-    todo_wine
-    ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameW should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error);
-    size++; /* nul terminating character */
-    nameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(nameW[0]));
-    ok(nameW != NULL, "HeapAlloc failed with error %d\n", GetLastError());
-    ret = GetComputerNameW(nameW, &size);
-    ok(ret, "GetComputerNameW failed with error %d\n", GetLastError());
-    HeapFree(GetProcessHeap(), 0, nameW);
+    if (error == ERROR_CALL_NOT_IMPLEMENTED)
+        skip("GetComputerNameW is not implemented\n");
+    else
+    {
+        todo_wine
+        ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameW should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error);
+        size++; /* nul terminating character */
+        nameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(nameW[0]));
+        ok(nameW != NULL, "HeapAlloc failed with error %d\n", GetLastError());
+        ret = GetComputerNameW(nameW, &size);
+        ok(ret, "GetComputerNameW failed with error %d\n", GetLastError());
+        HeapFree(GetProcessHeap(), 0, nameW);
+    }
 
     pGetComputerNameExA = GetProcAddress(GetModuleHandle("kernel32.dll"), "GetComputerNameExA");
     if (!pGetComputerNameExA)




More information about the wine-cvs mailing list