From def4466fd17f0506539671ec61226daaed408375 Mon Sep 17 00:00:00 2001
From: Paul Vriens <paul.vriens.wine@gmail.com>
Date: Mon, 30 Jul 2007 15:20:49 +0200
Subject: [PATCH] advapi32/service: Cater for domain in the test.

---
 dlls/advapi32/tests/service.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index a4eae988f8c..ae4698bceb0 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -19,6 +19,7 @@
  */
 
 #include <stdarg.h>
+#include <stdio.h>
 
 #include "windef.h"
 #include "winbase.h"
@@ -139,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];
-    DWORD user_size = UNLEN + 1;
+    CHAR username[UNLEN + 1], *domain;
+    DWORD user_size = UNLEN + 1, domain_size = 0;
     CHAR account[UNLEN + 3];
     static const CHAR servicename         [] = "Winetest";
     static const CHAR pathname            [] = "we_dont_care.exe";
@@ -153,8 +154,15 @@ 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);
-    lstrcpy(account, ".\\");
-    lstrcat(account, username);
+    /* 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)
+        sprintf(account, "%s\\%s", domain, username);
+    else
+        sprintf(account, ".\\%s", username);
+    HeapFree(GetProcessHeap(), 0, domain);
 
     /* All NULL */
     SetLastError(0xdeadbeef);