Paul Vriens : advapi32/service: Cater better for domain in test.

[Alexandre Julliard]

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

Author: Paul Vriens <paul.vriens.wine(a)gmail.com>
Date:   Tue Jul 31 13:06:53 2007 +0200

advapi32/service: Cater better for domain in test.

---

 dlls/advapi32/tests/service.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index 76d147f..7aea906 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -140,8 +140,8 @@ static void test_open_svc(void)
 static void test_create_delete_svc(void)
 {
     SC_HANDLE scm_handle, svc_handle1;
-    CHAR username[UNLEN + 1], *domain;
-    DWORD user_size = UNLEN + 1, domain_size = 0;
+    CHAR username[UNLEN + 1], domain[MAX_PATH];
+    DWORD user_size = UNLEN + 1;
     CHAR account[UNLEN + 3];
     static const CHAR servicename         [] = "Winetest";
     static const CHAR pathname            [] = "we_dont_care.exe";
@@ -155,14 +155,10 @@ static void test_create_delete_svc(void)
     /* Get the username and turn it into an account to be used in some tests */
     GetUserNameA(username, &user_size);
     /* Get the domainname to cater for that situation */
-    GetComputerNameEx(ComputerNameDnsDomain, NULL, &domain_size);
-    domain = HeapAlloc(GetProcessHeap(), 0, domain_size);
-    GetComputerNameEx(ComputerNameDnsDomain, domain, &domain_size);
-    if (domain_size > 1)
+    if (GetEnvironmentVariableA("USERDOMAIN", domain, MAX_PATH))
         sprintf(account, "%s\\%s", domain, username);
     else
         sprintf(account, ".\\%s", username);
-    HeapFree(GetProcessHeap(), 0, domain);
 
     /* All NULL */
     SetLastError(0xdeadbeef);