advapi32/service: Cater better for domain in test.
This commit is contained in:
parent
a0dd646eef
commit
0900c72bef
|
@ -140,8 +140,8 @@ static void test_open_svc(void)
|
||||||
static void test_create_delete_svc(void)
|
static void test_create_delete_svc(void)
|
||||||
{
|
{
|
||||||
SC_HANDLE scm_handle, svc_handle1;
|
SC_HANDLE scm_handle, svc_handle1;
|
||||||
CHAR username[UNLEN + 1], *domain;
|
CHAR username[UNLEN + 1], domain[MAX_PATH];
|
||||||
DWORD user_size = UNLEN + 1, domain_size = 0;
|
DWORD user_size = UNLEN + 1;
|
||||||
CHAR account[UNLEN + 3];
|
CHAR account[UNLEN + 3];
|
||||||
static const CHAR servicename [] = "Winetest";
|
static const CHAR servicename [] = "Winetest";
|
||||||
static const CHAR pathname [] = "we_dont_care.exe";
|
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 */
|
/* Get the username and turn it into an account to be used in some tests */
|
||||||
GetUserNameA(username, &user_size);
|
GetUserNameA(username, &user_size);
|
||||||
/* Get the domainname to cater for that situation */
|
/* Get the domainname to cater for that situation */
|
||||||
GetComputerNameEx(ComputerNameDnsDomain, NULL, &domain_size);
|
if (GetEnvironmentVariableA("USERDOMAIN", domain, MAX_PATH))
|
||||||
domain = HeapAlloc(GetProcessHeap(), 0, domain_size);
|
|
||||||
GetComputerNameEx(ComputerNameDnsDomain, domain, &domain_size);
|
|
||||||
if (domain_size > 1)
|
|
||||||
sprintf(account, "%s\\%s", domain, username);
|
sprintf(account, "%s\\%s", domain, username);
|
||||||
else
|
else
|
||||||
sprintf(account, ".\\%s", username);
|
sprintf(account, ".\\%s", username);
|
||||||
HeapFree(GetProcessHeap(), 0, domain);
|
|
||||||
|
|
||||||
/* All NULL */
|
/* All NULL */
|
||||||
SetLastError(0xdeadbeef);
|
SetLastError(0xdeadbeef);
|
||||||
|
|
Loading…
Reference in New Issue